Commit 33b92a8c authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

ieframe: Compile tests with __WINESRC__ define.

parent c6262a14
TESTDLL = ieframe.dll TESTDLL = ieframe.dll
IMPORTS = ole32 oleaut32 user32 gdi32 advapi32 IMPORTS = ole32 oleaut32 user32 gdi32 advapi32
EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS
C_SRCS = \ C_SRCS = \
ie.c \ ie.c \
......
...@@ -222,7 +222,7 @@ static void test_navigate(IWebBrowser2 *wb, const char *url) ...@@ -222,7 +222,7 @@ static void test_navigate(IWebBrowser2 *wb, const char *url)
while(!navigate_complete && GetMessageW(&msg, NULL, 0, 0)) { while(!navigate_complete && GetMessageW(&msg, NULL, 0, 0)) {
TranslateMessage(&msg); TranslateMessage(&msg);
DispatchMessage(&msg); DispatchMessageW(&msg);
} }
CHECK_CALLED(Invoke_NAVIGATECOMPLETE2); CHECK_CALLED(Invoke_NAVIGATECOMPLETE2);
......
...@@ -265,7 +265,7 @@ static void test_ReadAndWriteProperties(void) ...@@ -265,7 +265,7 @@ static void test_ReadAndWriteProperties(void)
hr = urlAFromFile->lpVtbl->GetURL(urlAFromFile, &url); hr = urlAFromFile->lpVtbl->GetURL(urlAFromFile, &url);
ok(hr == S_OK, "Unable to get url from file, hr=0x%x\n", hr); 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); hr = urlAFromFile->lpVtbl->QueryInterface(urlAFromFile, &IID_IPropertySetStorage, (void **) &pPropSetStg);
......
...@@ -2779,9 +2779,9 @@ static void test_download(DWORD flags) ...@@ -2779,9 +2779,9 @@ static void test_download(DWORD flags)
SET_EXPECT(Exec_UPDATECOMMANDS); SET_EXPECT(Exec_UPDATECOMMANDS);
SET_EXPECT(QueryStatus_STOP); SET_EXPECT(QueryStatus_STOP);
while(!*b && GetMessage(&msg, NULL, 0, 0)) { while(!*b && GetMessageW(&msg, NULL, 0, 0)) {
TranslateMessage(&msg); TranslateMessage(&msg);
DispatchMessage(&msg); DispatchMessageW(&msg);
} }
if(flags & (DWL_EXPECT_BEFORE_NAVIGATE|(is_http ? DWL_FROM_PUT_HREF : 0))) if(flags & (DWL_EXPECT_BEFORE_NAVIGATE|(is_http ? DWL_FROM_PUT_HREF : 0)))
...@@ -2824,9 +2824,9 @@ static void test_download(DWORD flags) ...@@ -2824,9 +2824,9 @@ static void test_download(DWORD flags)
test_ready_state(READYSTATE_COMPLETE); 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); TranslateMessage(&msg);
DispatchMessage(&msg); DispatchMessageA(&msg);
} }
todo_wine CHECK_CALLED(Invoke_PROGRESSCHANGE); todo_wine CHECK_CALLED(Invoke_PROGRESSCHANGE);
...@@ -3565,10 +3565,10 @@ static BOOL is_ie_hardened(void) ...@@ -3565,10 +3565,10 @@ static BOOL is_ie_hardened(void)
DWORD ie_harden, type, size; DWORD ie_harden, type, size;
ie_harden = 0; 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) { 0, KEY_QUERY_VALUE, &zone_map) == ERROR_SUCCESS) {
size = sizeof(DWORD); 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) { type != REG_DWORD) {
ie_harden = 0; ie_harden = 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment