Module: wine Branch: master Commit: e50dc73b86f2111db663de330fc03f6b25aa0d51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e50dc73b86f2111db663de330f...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Mon Nov 4 13:37:46 2013 +0400
urlmon/tests: Preparation for -D__WINESRC__.
---
dlls/urlmon/tests/misc.c | 4 ++-- dlls/urlmon/tests/protocol.c | 10 +++++----- dlls/urlmon/tests/sec_mgr.c | 8 ++++---- dlls/urlmon/tests/url.c | 18 +++++++++--------- 4 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index aa5e365..f0455ee 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -1783,7 +1783,7 @@ static void test_internet_features_registry(void) { RegCloseKey(feature); RegDeleteKeyA(feature_control, szFeatureBehaviorsKey); } else { - RegDeleteValue(feature, name); + RegDeleteValueA(feature, name); RegCloseKey(feature); }
@@ -1905,7 +1905,7 @@ START_TEST(misc) { HMODULE hurlmon;
- hurlmon = GetModuleHandle("urlmon.dll"); + hurlmon = GetModuleHandleA("urlmon.dll"); pCoInternetCompareUrl = (void *) GetProcAddress(hurlmon, "CoInternetCompareUrl"); pCoInternetGetSecurityUrl = (void*) GetProcAddress(hurlmon, "CoInternetGetSecurityUrl"); pCoInternetGetSession = (void*) GetProcAddress(hurlmon, "CoInternetGetSession"); diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index b4b8f19..4728f3c 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -3722,7 +3722,7 @@ START_TEST(protocol) { HMODULE hurlmon;
- hurlmon = GetModuleHandle("urlmon.dll"); + hurlmon = GetModuleHandleA("urlmon.dll"); pCoInternetGetSession = (void*) GetProcAddress(hurlmon, "CoInternetGetSession"); pReleaseBindInfo = (void*) GetProcAddress(hurlmon, "ReleaseBindInfo"); pCreateUri = (void*) GetProcAddress(hurlmon, "CreateUri"); @@ -3737,10 +3737,10 @@ START_TEST(protocol)
OleInitialize(NULL);
- event_complete = CreateEvent(NULL, FALSE, FALSE, NULL); - event_complete2 = CreateEvent(NULL, FALSE, FALSE, NULL); - event_continue = CreateEvent(NULL, FALSE, FALSE, NULL); - event_continue_done = CreateEvent(NULL, FALSE, FALSE, NULL); + event_complete = CreateEventW(NULL, FALSE, FALSE, NULL); + event_complete2 = CreateEventW(NULL, FALSE, FALSE, NULL); + event_continue = CreateEventW(NULL, FALSE, FALSE, NULL); + event_continue_done = CreateEventW(NULL, FALSE, FALSE, NULL); thread_id = GetCurrentThreadId();
test_file_protocol(); diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index d0e89ce..2eaddb9 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -514,7 +514,7 @@ static void test_url_action(IInternetSecurityManager *secmgr, IInternetZoneManag return; }
- wsprintf(buf, "%X", action); + wsprintfA(buf, "%X", action); size = sizeof(DWORD); res = RegQueryValueExA(hkey, buf, NULL, NULL, (BYTE*)®_policy, &size); RegCloseKey(hkey); @@ -843,7 +843,7 @@ static void run_child_process(void) char path[MAX_PATH]; char **argv; PROCESS_INFORMATION pi; - STARTUPINFO si = { 0 }; + STARTUPINFOA si = { 0 }; BOOL ret;
GetModuleFileNameA(NULL, path, MAX_PATH); @@ -851,7 +851,7 @@ static void run_child_process(void) si.cb = sizeof(si); winetest_get_mainargs(&argv); sprintf(cmdline, ""%s" %s domain_tests", argv[0], argv[1]); - ret = CreateProcess(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ret = CreateProcessA(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "Failed to spawn child process: %u\n", GetLastError()); winetest_wait_child_process(pi.hProcess); CloseHandle(pi.hThread); @@ -1991,7 +1991,7 @@ START_TEST(sec_mgr) int argc; char **argv;
- hurlmon = GetModuleHandle("urlmon.dll"); + hurlmon = GetModuleHandleA("urlmon.dll"); pCoInternetCreateSecurityManager = (void*) GetProcAddress(hurlmon, "CoInternetCreateSecurityManager"); pCoInternetCreateZoneManager = (void*) GetProcAddress(hurlmon, "CoInternetCreateZoneManager"); pCoInternetGetSecurityUrl = (void*) GetProcAddress(hurlmon, "CoInternetGetSecurityUrl"); diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index fcc4be6..7bfa75f 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -1977,9 +1977,9 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallbackEx *iface, DW if (mime_type[0]) { INT ret; clipfmt[0] = 0; - ret = GetClipboardFormatName(pformatetc->cfFormat, clipfmt, sizeof(clipfmt)-1); + ret = GetClipboardFormatNameA(pformatetc->cfFormat, clipfmt, sizeof(clipfmt)-1); ok(ret, "GetClipboardFormatName failed, error %d\n", GetLastError()); - ok(!lstrcmp(clipfmt, mime_type), "clipformat %x != mime_type, "%s" != "%s"\n", + ok(!strcmp(clipfmt, mime_type), "clipformat %x != mime_type, "%s" != "%s"\n", pformatetc->cfFormat, clipfmt, mime_type); } else { ok(pformatetc->cfFormat == 0, "clipformat=%x\n", pformatetc->cfFormat); @@ -3053,9 +3053,9 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) return;
if((bindf & BINDF_ASYNCHRONOUS) && !no_callback) { - while(!stopped_binding && GetMessage(&msg,NULL,0,0)) { + while(!stopped_binding && GetMessageA(&msg,NULL,0,0)) { TranslateMessage(&msg); - DispatchMessage(&msg); + DispatchMessageA(&msg); } }
@@ -3323,9 +3323,9 @@ static void test_BindToObject(int protocol, DWORD flags, HRESULT exhres) IUnknown_Release(unk);
while((bindf & BINDF_ASYNCHRONOUS) && - !((!emulate_protocol || stopped_binding) && stopped_obj_binding) && GetMessage(&msg,NULL,0,0)) { + !((!emulate_protocol || stopped_binding) && stopped_obj_binding) && GetMessageA(&msg,NULL,0,0)) { TranslateMessage(&msg); - DispatchMessage(&msg); + DispatchMessageA(&msg); }
CLEAR_CALLED(QueryInterface_IBindStatusCallbackEx); @@ -3835,7 +3835,7 @@ START_TEST(url) { HMODULE hurlmon;
- hurlmon = GetModuleHandle("urlmon.dll"); + hurlmon = GetModuleHandleA("urlmon.dll"); pCreateAsyncBindCtxEx = (void*) GetProcAddress(hurlmon, "CreateAsyncBindCtxEx");
if(!GetProcAddress(hurlmon, "CompareSecurityIds")) { @@ -3847,8 +3847,8 @@ START_TEST(url) if(!pCreateUri) win_skip("IUri not supported\n");
- complete_event = CreateEvent(NULL, FALSE, FALSE, NULL); - complete_event2 = CreateEvent(NULL, FALSE, FALSE, NULL); + complete_event = CreateEventW(NULL, FALSE, FALSE, NULL); + complete_event2 = CreateEventW(NULL, FALSE, FALSE, NULL); thread_id = GetCurrentThreadId(); create_html_file(); create_cache_file();