add TextInclude1Test2

Author: katahiromz

tests/CMakeLists.txt

@@ -3,3 +3,4 @@ add_subdirectory(ResTest)
 add_subdirectory(ResTest2)
 add_subdirectory(ToolbarTest)
 add_subdirectory(TextInclude1Test)
+add_subdirectory(TextInclude1Test2)

tests/TextInclude1Test2/CMakeLists.txt

@@ -0,0 +1,6 @@
+add_executable(TextInclude1Test2 WIN32 TextInclude1Test2.cpp TextInclude1Test2_res.rc)
+target_link_libraries(TextInclude1Test2 comctl32)
+
+# do statically link
+set_target_properties(TextInclude1Test2 PROPERTIES LINK_SEARCH_START_STATIC 1)
+set_target_properties(TextInclude1Test2 PROPERTIES LINK_SEARCH_END_STATIC 1)

tests/TextInclude1Test2/TextInclude1Test2.cpp

@@ -0,0 +1,66 @@
+// TextInclude1Test2.cpp
+// Test case for TEXTINCLUDE 1 support (Issue #301)
+//////////////////////////////////////////////////////////////////////////////
+
+#include <windows.h>
+#include <windowsx.h>
+#include <commctrl.h>
+#include <tchar.h>
+#include "include/custom_resource.h"
+
+#ifdef _MSC_VER
+#pragma comment(linker,"/manifestdependency:\"type='win32' \
+    name='Microsoft.Windows.Common-Controls' \
+    version='6.0.0.0' \
+    processorArchitecture='*' \
+    publicKeyToken='6595b64144ccf1df' \
+    language='*'\"")
+#endif
+
+//////////////////////////////////////////////////////////////////////////////
+
+BOOL OnInitDialog(HWND hwnd, HWND hwndFocus, LPARAM lParam)
+{
+    return TRUE;
+}
+
+void OnCommand(HWND hwnd, int id, HWND hwndCtl, UINT codeNotify)
+{
+    switch (id)
+    {
+    case IDC_BTN_OK:
+    case IDOK:
+        EndDialog(hwnd, IDOK);
+        break;
+    case IDC_BTN_CANCEL:
+    case IDCANCEL:
+        EndDialog(hwnd, IDCANCEL);
+        break;
+    }
+}
+
+INT_PTR CALLBACK
+DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+    switch (uMsg)
+    {
+        HANDLE_MSG(hwnd, WM_INITDIALOG, OnInitDialog);
+        HANDLE_MSG(hwnd, WM_COMMAND, OnCommand);
+    }
+    return 0;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+
+extern "C" INT WINAPI
+_tWinMain(HINSTANCE   hInstance,
+          HINSTANCE   hPrevInstance,
+          LPTSTR      lpCmdLine,
+          INT         nCmdShow)
+{
+    InitCommonControls();
+    DialogBox(hInstance, MAKEINTRESOURCE(IDD_MAIN), NULL, DialogProc);
+    return 0;
+}
+
+//////////////////////////////////////////////////////////////////////////////

tests/TextInclude1Test2/TextInclude1Test2_res.rc

@@ -0,0 +1,57 @@
+// TextInclude1Test2_res.rc
+// Test case for TEXTINCLUDE 1 support (Issue #301)
+// This file uses a custom header file name in TEXTINCLUDE 1.
+// † <-- This dagger helps UTF-8 detection.
+
+#include "include\\custom_resource.h"
+
+#define APSTUDIO_HIDDEN_SYMBOLS
+#include <windows.h>
+#include <commctrl.h>
+#undef APSTUDIO_HIDDEN_SYMBOLS
+#pragma code_page(65001) // UTF-8
+
+//////////////////////////////////////////////////////////////////////////////
+
+LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
+
+//////////////////////////////////////////////////////////////////////////////
+// RT_DIALOG
+
+IDD_MAIN DIALOG 0, 0, 215, 100
+CAPTION "TextInclude1Test2"
+STYLE DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION
+FONT 9, "Arial"
+{
+    DEFPUSHBUTTON "OK", IDC_BTN_OK, 35, 80, 60, 14
+    PUSHBUTTON "Cancel", IDC_BTN_CANCEL, 115, 80, 60, 14
+}
+
+//////////////////////////////////////////////////////////////////////////////
+// TEXTINCLUDE
+
+#ifdef APSTUDIO_INVOKED
+
+1 TEXTINCLUDE
+BEGIN
+    "include\\custom_resource.h\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+    "#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
+    "#include <windows.h>\r\n"
+    "#include <commctrl.h>\r\n"
+    "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+//////////////////////////////////////////////////////////////////////////////

tests/TextInclude1Test2/include/custom_resource.h

@@ -0,0 +1 @@
+#include "..\\resource.h"

tests/TextInclude1Test2/resource.h

@@ -0,0 +1,6 @@
+// custom_resource.h - Custom header file for TEXTINCLUDE 1 testing
+// Issue #301: Support TEXTINCLUDE 1
+
+#define IDD_MAIN 1
+#define IDC_BTN_OK 100
+#define IDC_BTN_CANCEL 101