Jacek Caban : mshtml: Compile tests with __WINESRC__ define.

Alexandre Julliard julliard at winehq.org
Thu Oct 10 13:26:52 CDT 2013


Module: wine
Branch: master
Commit: 5b52334f6d5cde57a7ebe80c55c26f7ea9d9b769
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5b52334f6d5cde57a7ebe80c55c26f7ea9d9b769

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Thu Oct 10 12:53:34 2013 +0200

mshtml: Compile tests with __WINESRC__ define.

---

 dlls/mshtml/tests/Makefile.in   |    2 --
 dlls/mshtml/tests/activex.c     |   10 +++++-----
 dlls/mshtml/tests/dom.c         |    4 ++--
 dlls/mshtml/tests/events.c      |   10 +++++-----
 dlls/mshtml/tests/htmldoc.c     |   12 ++++++------
 dlls/mshtml/tests/mshtml_test.h |    4 ++--
 dlls/mshtml/tests/script.c      |   12 ++++++------
 dlls/mshtml/tests/style.c       |    4 ++--
 8 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/dlls/mshtml/tests/Makefile.in b/dlls/mshtml/tests/Makefile.in
index 41d4040..e339175 100644
--- a/dlls/mshtml/tests/Makefile.in
+++ b/dlls/mshtml/tests/Makefile.in
@@ -1,7 +1,5 @@
 TESTDLL   = mshtml.dll
 IMPORTS   = ole32 oleaut32 wininet user32 urlmon gdi32 advapi32
-EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS
-
 C_SRCS = \
 	activex.c \
 	dom.c \
diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c
index fab2c92..16dfba5 100644
--- a/dlls/mshtml/tests/activex.c
+++ b/dlls/mshtml/tests/activex.c
@@ -283,7 +283,7 @@ static LRESULT WINAPI plugin_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa
     }
     }
 
-    return DefWindowProc(hwnd, msg, wParam, lParam);
+    return DefWindowProcW(hwnd, msg, wParam, lParam);
 }
 
 static void create_plugin_window(HWND parent, const RECT *rect)
@@ -2334,9 +2334,9 @@ static IHTMLDocument2 *create_doc(const char *str)
     doc_load_string(doc, str);
     do_advise((IUnknown*)doc, &IID_IPropertyNotifySink, (IUnknown*)&PropertyNotifySink);
 
-    while(!doc_complete && GetMessage(&msg, NULL, 0, 0)) {
+    while(!doc_complete && GetMessageW(&msg, NULL, 0, 0)) {
         TranslateMessage(&msg);
-        DispatchMessage(&msg);
+        DispatchMessageW(&msg);
     }
 
     return doc;
@@ -2591,7 +2591,7 @@ static void test_nooleobj_ax(void)
 
 static LRESULT WINAPI wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
-    return DefWindowProc(hwnd, msg, wParam, lParam);
+    return DefWindowProcW(hwnd, msg, wParam, lParam);
 }
 
 static HWND create_container_window(void)
@@ -2639,7 +2639,7 @@ static BOOL init_key(const char *key_name, const char *def_value, BOOL init)
     DWORD res;
 
     if(!init) {
-        RegDeleteKey(HKEY_CLASSES_ROOT, key_name);
+        RegDeleteKeyA(HKEY_CLASSES_ROOT, key_name);
         return TRUE;
     }
 
diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c
index 3141643..f1155d8 100644
--- a/dlls/mshtml/tests/dom.c
+++ b/dlls/mshtml/tests/dom.c
@@ -7542,9 +7542,9 @@ static void run_domtest(const char *str, domtest_t test)
 
     do_advise((IUnknown*)doc, &IID_IPropertyNotifySink, (IUnknown*)&PropertyNotifySink);
 
-    while(!doc_complete && GetMessage(&msg, NULL, 0, 0)) {
+    while(!doc_complete && GetMessageW(&msg, NULL, 0, 0)) {
         TranslateMessage(&msg);
-        DispatchMessage(&msg);
+        DispatchMessageW(&msg);
     }
 
     test(doc);
diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c
index 8e9d88c9..f1542f5 100644
--- a/dlls/mshtml/tests/events.c
+++ b/dlls/mshtml/tests/events.c
@@ -1398,12 +1398,12 @@ static void pump_msgs(BOOL *b)
     if(b) {
         while(!*b && GetMessageW(&msg, NULL, 0, 0)) {
             TranslateMessage(&msg);
-            DispatchMessage(&msg);
+            DispatchMessageW(&msg);
         }
     }else {
         while(!b && PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) {
             TranslateMessage(&msg);
-            DispatchMessage(&msg);
+            DispatchMessageW(&msg);
         }
     }
 }
@@ -2722,9 +2722,9 @@ static void run_test(const char *str, testfunc_t test)
     doc_load_string(doc, str);
     do_advise((IUnknown*)doc, &IID_IPropertyNotifySink, (IUnknown*)&PropertyNotifySink);
 
-    while(!doc_complete && GetMessage(&msg, NULL, 0, 0)) {
+    while(!doc_complete && GetMessageA(&msg, NULL, 0, 0)) {
         TranslateMessage(&msg);
-        DispatchMessage(&msg);
+        DispatchMessageA(&msg);
     }
 
     hres = IHTMLDocument2_get_body(doc, &body);
@@ -2751,7 +2751,7 @@ static void run_test(const char *str, testfunc_t test)
 
 static LRESULT WINAPI wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
-    return DefWindowProc(hwnd, msg, wParam, lParam);
+    return DefWindowProcA(hwnd, msg, wParam, lParam);
 }
 
 static HWND create_container_window(void)
diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c
index 70da9ae..1e872f3 100644
--- a/dlls/mshtml/tests/htmldoc.c
+++ b/dlls/mshtml/tests/htmldoc.c
@@ -368,9 +368,9 @@ static void test_timer(DWORD flags)
     if(flags & EXPECT_SETTITLE)
         SET_EXPECT(Exec_SETTITLE);
 
-    while(!*b && GetMessage(&msg, doc_hwnd, 0, 0)) {
+    while(!*b && GetMessageA(&msg, doc_hwnd, 0, 0)) {
         TranslateMessage(&msg);
-        DispatchMessage(&msg);
+        DispatchMessageA(&msg);
     }
 
     if(flags & EXPECT_UPDATEUI) {
@@ -1243,7 +1243,7 @@ static HRESULT WINAPI Binding_Abort(IBinding *iface)
 {
     CHECK_EXPECT(Abort);
     if(asynchronous_binding)
-        PeekMessage(NULL, container_hwnd, WM_CONTINUE_BINDING, WM_CONTINUE_BINDING, PM_REMOVE);
+        PeekMessageA(NULL, container_hwnd, WM_CONTINUE_BINDING, WM_CONTINUE_BINDING, PM_REMOVE);
     return S_OK;
 }
 
@@ -5225,7 +5225,7 @@ static LRESULT WINAPI wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam
         continue_binding(callback);
     }
 
-    return DefWindowProc(hwnd, msg, wParam, lParam);
+    return DefWindowProcW(hwnd, msg, wParam, lParam);
 }
 
 static void test_doscroll(IUnknown *unk)
@@ -5680,9 +5680,9 @@ static void test_download(DWORD flags)
     }
     expect_status_text = (LPWSTR)0xdeadbeef; /* TODO */
 
-    while(!*b && GetMessage(&msg, NULL, 0, 0)) {
+    while(!*b && GetMessageW(&msg, NULL, 0, 0)) {
         TranslateMessage(&msg);
-        DispatchMessage(&msg);
+        DispatchMessageA(&msg);
     }
 
     if(flags & DWL_REFRESH) {
diff --git a/dlls/mshtml/tests/mshtml_test.h b/dlls/mshtml/tests/mshtml_test.h
index 7f2cdf2..c084495 100644
--- a/dlls/mshtml/tests/mshtml_test.h
+++ b/dlls/mshtml/tests/mshtml_test.h
@@ -24,10 +24,10 @@ static BOOL is_ie_hardened(void)
     DWORD ie_harden, type, size;
 
     ie_harden = 0;
-    if(RegOpenKeyEx(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings\\ZoneMap",
+    if(RegOpenKeyExA(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings\\ZoneMap",
                     0, KEY_QUERY_VALUE, &zone_map) == ERROR_SUCCESS) {
         size = sizeof(DWORD);
-        if (RegQueryValueEx(zone_map, "IEHarden", NULL, &type, (LPBYTE) &ie_harden, &size) != ERROR_SUCCESS ||
+        if (RegQueryValueExA(zone_map, "IEHarden", NULL, &type, (LPBYTE) &ie_harden, &size) != ERROR_SUCCESS ||
             type != REG_DWORD) {
             ie_harden = 0;
         }
diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c
index 0c3c542..c0602d8 100644
--- a/dlls/mshtml/tests/script.c
+++ b/dlls/mshtml/tests/script.c
@@ -201,7 +201,7 @@ static BOOL init_key(const char *key_name, const char *def_value, BOOL init)
     DWORD res;
 
     if(!init) {
-        RegDeleteKey(HKEY_CLASSES_ROOT, key_name);
+        RegDeleteKeyA(HKEY_CLASSES_ROOT, key_name);
         return TRUE;
     }
 
@@ -1285,9 +1285,9 @@ static void load_doc(IHTMLDocument2 *doc, const char *str)
     load_string(doc, str);
     do_advise(doc, &IID_IPropertyNotifySink, (IUnknown*)&PropertyNotifySink);
 
-    while(!doc_complete && GetMessage(&msg, NULL, 0, 0)) {
+    while(!doc_complete && GetMessageW(&msg, NULL, 0, 0)) {
         TranslateMessage(&msg);
-        DispatchMessage(&msg);
+        DispatchMessageW(&msg);
     }
 
     hres = IHTMLDocument2_get_body(doc, &body);
@@ -2826,9 +2826,9 @@ static void run_js_script(const char *test_name)
 
     SET_EXPECT(external_success);
 
-    while(!called_external_success && GetMessage(&msg, NULL, 0, 0)) {
+    while(!called_external_success && GetMessageW(&msg, NULL, 0, 0)) {
         TranslateMessage(&msg);
-        DispatchMessage(&msg);
+        DispatchMessageW(&msg);
     }
 
     CHECK_CALLED(external_success);
@@ -2873,7 +2873,7 @@ static BOOL register_script_engine(void)
 
 static LRESULT WINAPI wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
-    return DefWindowProc(hwnd, msg, wParam, lParam);
+    return DefWindowProcA(hwnd, msg, wParam, lParam);
 }
 
 static HWND create_container_window(void)
diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c
index 71eb955..c434c1c 100644
--- a/dlls/mshtml/tests/style.c
+++ b/dlls/mshtml/tests/style.c
@@ -2686,9 +2686,9 @@ static void run_test(const char *str, style_test_t test)
 
     do_advise((IUnknown*)doc, &IID_IPropertyNotifySink, (IUnknown*)&PropertyNotifySink);
 
-    while(!doc_complete && GetMessage(&msg, NULL, 0, 0)) {
+    while(!doc_complete && GetMessageW(&msg, NULL, 0, 0)) {
         TranslateMessage(&msg);
-        DispatchMessage(&msg);
+        DispatchMessageW(&msg);
     }
 
     test(doc);




More information about the wine-cvs mailing list