dlls/explorerframe: build tests with -D__WINESRC__

Austin English austinenglish at gmail.com
Mon Oct 14 13:44:18 CDT 2013


https://newtestbot.winehq.org/JobDetails.pl?Key=2749

-- 
-Austin
-------------- next part --------------
From e11ba5be1e9696be5f19e771810b54b427c6c228 Mon Sep 17 00:00:00 2001
From: Austin English <austinenglish at gmail.com>
Date: Mon, 14 Oct 2013 10:59:12 -0700
Subject: [PATCH] explorerframe: build tests with -D__WINESRC__

---
 dlls/explorerframe/tests/Makefile.in |  1 -
 dlls/explorerframe/tests/nstc.c      | 14 +++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/dlls/explorerframe/tests/Makefile.in b/dlls/explorerframe/tests/Makefile.in
index 727670e..921eaa9 100644
--- a/dlls/explorerframe/tests/Makefile.in
+++ b/dlls/explorerframe/tests/Makefile.in
@@ -1,6 +1,5 @@
 TESTDLL   = explorerframe.dll
 IMPORTS   = uuid shell32 ole32 user32
-EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS
 
 C_SRCS = \
 	nstc.c
diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c
index ab6a0ce..94ca06c 100644
--- a/dlls/explorerframe/tests/nstc.c
+++ b/dlls/explorerframe/tests/nstc.c
@@ -418,10 +418,10 @@ static void process_msgs(void)
     do {
         got_msg = FALSE;
         Sleep(100);
-        while(PeekMessage( &msg, NULL, 0, 0, PM_REMOVE))
+        while(PeekMessageW( &msg, NULL, 0, 0, PM_REMOVE))
         {
             TranslateMessage(&msg);
-            DispatchMessage(&msg);
+            DispatchMessageW(&msg);
             got_msg = TRUE;
         }
     } while(got_msg);
@@ -432,10 +432,10 @@ static void process_msgs(void)
        sending WM_TIMER manually does not seem to help us.) */
     Sleep(500);
 
-    while(PeekMessage( &msg, NULL, 0, 0, PM_REMOVE))
+    while(PeekMessageW( &msg, NULL, 0, 0, PM_REMOVE))
     {
         TranslateMessage(&msg);
-        DispatchMessage(&msg);
+        DispatchMessageW(&msg);
     }
 }
 
@@ -1928,17 +1928,17 @@ static void test_events(void)
 
         /* Test On*Expand */
         hroot = (HTREEITEM)SendMessageW(hwnd_tv, TVM_GETNEXTITEM, TVGN_ROOT, 0);
-        SendMessage(hwnd_tv, TVM_EXPAND, TVE_EXPAND, (LPARAM)hroot);
+        SendMessageW(hwnd_tv, TVM_EXPAND, TVE_EXPAND, (LPARAM)hroot);
         process_msgs();
         ok_event_count(pnstceimpl, OnBeforeExpand, 1);
         ok_event_count(pnstceimpl, OnAfterExpand, 1);
         ok_event_broken(pnstceimpl, OnItemAdded); /* No event on Vista */
         todo_wine ok_event_count(pnstceimpl, OnSelectionChanged, 1);
         ok_no_events(pnstceimpl);
-        SendMessage(hwnd_tv, TVM_EXPAND, TVE_COLLAPSE, (LPARAM)hroot);
+        SendMessageW(hwnd_tv, TVM_EXPAND, TVE_COLLAPSE, (LPARAM)hroot);
         process_msgs();
         ok_no_events(pnstceimpl);
-        SendMessage(hwnd_tv, TVM_EXPAND, TVE_EXPAND, (LPARAM)hroot);
+        SendMessageW(hwnd_tv, TVM_EXPAND, TVE_EXPAND, (LPARAM)hroot);
         process_msgs();
         ok_no_events(pnstceimpl);
 
-- 
1.8.3.2


More information about the wine-patches mailing list