From c39a3e3f1c24b0bc696276e3626790c05e6dd248 Mon Sep 17 00:00:00 2001
From: Sebastian <versat@users.noreply.github.com>
Date: Thu, 12 Apr 2018 08:52:31 +0200
Subject: [PATCH] windows string macros: Handle _T, _TEXT and TEXT internally,
 add tests (#1163)

Remove TEXT() macro from windows.cfg and handle it internally where it
can be correctly simplified (Ansi vs. Unicode).
Also add handling of _TEXT() macro which is just a synonym for _T().
Add tests to verify correct function and macro simplification.
---
 cfg/windows.cfg       |  1 -
 lib/tokenize.cpp      |  4 ++--
 test/testtokenize.cpp | 20 ++++++++++++++++++++
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/cfg/windows.cfg b/cfg/windows.cfg
index 7a7d47c39..4232b935c 100644
--- a/cfg/windows.cfg
+++ b/cfg/windows.cfg
@@ -5201,7 +5201,6 @@ HFONT CreateFont(
   <define name="INVALID_SOCKET" value="0"/>
   <define name="WINAPI" value=""/>
   <define name="__pragma(x)" value=""/>
-  <define name="TEXT(str)" value="str"/>
   <define name="_countof(_Array)" value="(sizeof(_Array) / sizeof(_Array[0]))"/>
   <define name="__wchar_t" value="wchar_t"/>
   <define name="RtlEqualMemory(Destination,Source,Length)" value="(!memcmp((Destination),(Source),(Length)))"/>
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
index 7cb23053b..2ef761997 100644
--- a/lib/tokenize.cpp
+++ b/lib/tokenize.cpp
@@ -9541,13 +9541,13 @@ void Tokenizer::simplifyMicrosoftStringFunctions()
         if (match!=apis.end()) {
             tok->str(ansi ? match->second.mbcs : match->second.unicode);
             tok->originalName(match->first);
-        } else if (Token::Match(tok, "_T ( %char%|%str% )")) {
+        } else if (Token::Match(tok, "_T|_TEXT|TEXT ( %char%|%str% )")) {
             tok->deleteNext();
             tok->deleteThis();
             tok->deleteNext();
             if (!ansi)
                 tok->isLong(true);
-            while (Token::Match(tok->next(), "_T ( %char%|%str% )")) {
+            while (Token::Match(tok->next(), "_T|_TEXT|TEXT ( %char%|%str% )")) {
                 tok->next()->deleteNext();
                 tok->next()->deleteThis();
                 tok->next()->deleteNext();
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
index 3fbe8081d..8188287d1 100644
--- a/test/testtokenize.cpp
+++ b/test/testtokenize.cpp
@@ -364,6 +364,7 @@ private:
         TEST_CASE(simplifyNamespaceStd);
 
         TEST_CASE(microsoftMemory);
+        TEST_CASE(microsoftString);
 
         TEST_CASE(borland);
 
@@ -5718,6 +5719,25 @@ private:
         ASSERT_EQUALS("void foo ( ) { memset ( f ( 1 , g ( a , b ) ) , 255 , h ( i , j ( 0 , 1 ) ) ) ; }", tokenizeAndStringify(code7,false,true,Settings::Win32A));
     }
 
+    void microsoftString() {
+        const char code1a[] = "void foo() { _tprintf (_T(\"test\") _T(\"1\")); }";
+        ASSERT_EQUALS("void foo ( ) { printf ( \"test1\" ) ; }", tokenizeAndStringify(code1a, false, true, Settings::Win32A));
+        const char code1b[] = "void foo() { _tprintf (_TEXT(\"test\") _TEXT(\"2\")); }";
+        ASSERT_EQUALS("void foo ( ) { printf ( \"test2\" ) ; }", tokenizeAndStringify(code1b, false, true, Settings::Win32A));
+        const char code1c[] = "void foo() { _tprintf (TEXT(\"test\") TEXT(\"3\")); }";
+        ASSERT_EQUALS("void foo ( ) { printf ( \"test3\" ) ; }", tokenizeAndStringify(code1c, false, true, Settings::Win32A));
+
+        const char code2a[] = "void foo() { _tprintf (_T(\"test\") _T(\"1\")); }";
+        ASSERT_EQUALS("void foo ( ) { wprintf ( L\"test1\" ) ; }", tokenizeAndStringify(code2a, false, true, Settings::Win32W));
+        ASSERT_EQUALS("void foo ( ) { wprintf ( L\"test1\" ) ; }", tokenizeAndStringify(code2a, false, true, Settings::Win64));
+        const char code2b[] = "void foo() { _tprintf (_TEXT(\"test\") _TEXT(\"2\")); }";
+        ASSERT_EQUALS("void foo ( ) { wprintf ( L\"test2\" ) ; }", tokenizeAndStringify(code2b, false, true, Settings::Win32W));
+        ASSERT_EQUALS("void foo ( ) { wprintf ( L\"test2\" ) ; }", tokenizeAndStringify(code2b, false, true, Settings::Win64));
+        const char code2c[] = "void foo() { _tprintf (TEXT(\"test\") TEXT(\"3\")); }";
+        ASSERT_EQUALS("void foo ( ) { wprintf ( L\"test3\" ) ; }", tokenizeAndStringify(code2c, false, true, Settings::Win32W));
+        ASSERT_EQUALS("void foo ( ) { wprintf ( L\"test3\" ) ; }", tokenizeAndStringify(code2c, false, true, Settings::Win64));
+    }
+
     void borland() {
         // __closure
         ASSERT_EQUALS("int * a ;",