From 33b92a8cf44e059bac2a2742fce13bba4ed2ba25 Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Thu, 10 Oct 2013 12:53:22 +0200 Subject: [PATCH] ieframe: Compile tests with __WINESRC__ define. --- dlls/ieframe/tests/Makefile.in | 1 - dlls/ieframe/tests/ie.c | 2 +- dlls/ieframe/tests/intshcut.c | 2 +- dlls/ieframe/tests/webbrowser.c | 12 ++++++------ 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/ieframe/tests/Makefile.in b/dlls/ieframe/tests/Makefile.in index 661869e4f5d..ec9853e74dc 100644 --- a/dlls/ieframe/tests/Makefile.in +++ b/dlls/ieframe/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = ieframe.dll IMPORTS = ole32 oleaut32 user32 gdi32 advapi32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ ie.c \ diff --git a/dlls/ieframe/tests/ie.c b/dlls/ieframe/tests/ie.c index 51cd8b33b17..daf47f7cf62 100644 --- a/dlls/ieframe/tests/ie.c +++ b/dlls/ieframe/tests/ie.c @@ -222,7 +222,7 @@ static void test_navigate(IWebBrowser2 *wb, const char *url) while(!navigate_complete && GetMessageW(&msg, NULL, 0, 0)) { TranslateMessage(&msg); - DispatchMessage(&msg); + DispatchMessageW(&msg); } CHECK_CALLED(Invoke_NAVIGATECOMPLETE2); diff --git a/dlls/ieframe/tests/intshcut.c b/dlls/ieframe/tests/intshcut.c index c9c105cfd42..bbc7a18172a 100644 --- a/dlls/ieframe/tests/intshcut.c +++ b/dlls/ieframe/tests/intshcut.c @@ -265,7 +265,7 @@ static void test_ReadAndWriteProperties(void) hr = urlAFromFile->lpVtbl->GetURL(urlAFromFile, &url); ok(hr == S_OK, "Unable to get url from file, hr=0x%x\n", hr); - ok(lstrcmp(url, testurl) == 0, "Wrong url read from file: %s\n",url); + ok(lstrcmpA(url, testurl) == 0, "Wrong url read from file: %s\n",url); hr = urlAFromFile->lpVtbl->QueryInterface(urlAFromFile, &IID_IPropertySetStorage, (void **) &pPropSetStg); diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 675bc1250fe..d0456581095 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -2779,9 +2779,9 @@ static void test_download(DWORD flags) SET_EXPECT(Exec_UPDATECOMMANDS); SET_EXPECT(QueryStatus_STOP); - while(!*b && GetMessage(&msg, NULL, 0, 0)) { + while(!*b && GetMessageW(&msg, NULL, 0, 0)) { TranslateMessage(&msg); - DispatchMessage(&msg); + DispatchMessageW(&msg); } if(flags & (DWL_EXPECT_BEFORE_NAVIGATE|(is_http ? DWL_FROM_PUT_HREF : 0))) @@ -2824,9 +2824,9 @@ static void test_download(DWORD flags) test_ready_state(READYSTATE_COMPLETE); - while(!called_Exec_UPDATECOMMANDS && GetMessage(&msg, NULL, 0, 0)) { + while(!called_Exec_UPDATECOMMANDS && GetMessageA(&msg, NULL, 0, 0)) { TranslateMessage(&msg); - DispatchMessage(&msg); + DispatchMessageA(&msg); } todo_wine CHECK_CALLED(Invoke_PROGRESSCHANGE); @@ -3565,10 +3565,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; }