Module: wine Branch: master Commit: 965d903f33f7ae014cb238989c14d253c65d7193 URL: http://source.winehq.org/git/wine.git/?a=commit;h=965d903f33f7ae014cb238989c...
Author: Dmitry Timoshkov dmitry@baikal.ru Date: Mon Oct 21 17:02:53 2013 +0900
kernel32/tests: Fix toolhelp tests compilation with __WINESRC__ defined.
---
dlls/kernel32/tests/toolhelp.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/kernel32/tests/toolhelp.c b/dlls/kernel32/tests/toolhelp.c index bfa3127..af67688 100644 --- a/dlls/kernel32/tests/toolhelp.c +++ b/dlls/kernel32/tests/toolhelp.c @@ -75,13 +75,13 @@ static int init(void) case 4: /* the sub-process */ ev1 = (HANDLE)(INT_PTR)atoi(argv[2]); ev2 = (HANDLE)(INT_PTR)atoi(argv[3]); - ev3 = CreateEvent(NULL, FALSE, FALSE, NULL); + ev3 = CreateEventW(NULL, FALSE, FALSE, NULL);
if (ev3 == NULL) ExitProcess(WAIT_ABANDONED); hThread = CreateThread(NULL, 0, sub_thread, ev3, 0, &tid); if (hThread == NULL) ExitProcess(WAIT_ABANDONED); if (!LoadLibraryA("shell32.dll")) ExitProcess(WAIT_ABANDONED); - + /* signal init of sub-process is done */ SetEvent(ev1); /* wait for parent to have done all its queries */ @@ -242,7 +242,7 @@ static void test_module(DWORD pid, const char* expected[], unsigned num_expected me.th32ProcessID, me.modBaseAddr, me.modBaseSize, me.szExePath, me.szModule); ok(me.th32ProcessID == pid, "wrong returned process id\n"); for (i = 0; i < num_expected; i++) - if (!lstrcmpi(expected[i], me.szModule)) found[i]++; + if (!lstrcmpiA(expected[i], me.szModule)) found[i]++; num++; } while (pModule32Next( hSnapshot, &me )); } @@ -260,7 +260,7 @@ static void test_module(DWORD pid, const char* expected[], unsigned num_expected trace("PID=%x base=%p size=%x %s %s\n", me.th32ProcessID, me.modBaseAddr, me.modBaseSize, me.szExePath, me.szModule); for (i = 0; i < num_expected; i++) - if (!lstrcmpi(expected[i], me.szModule)) found[i]++; + if (!lstrcmpiA(expected[i], me.szModule)) found[i]++; num--; } while (pModule32Next( hSnapshot, &me )); } @@ -317,8 +317,8 @@ START_TEST(toolhelp) sa.lpSecurityDescriptor = NULL; sa.bInheritHandle = TRUE;
- ev1 = CreateEvent(&sa, FALSE, FALSE, NULL); - ev2 = CreateEvent(&sa, FALSE, FALSE, NULL); + ev1 = CreateEventW(&sa, FALSE, FALSE, NULL); + ev2 = CreateEventW(&sa, FALSE, FALSE, NULL); ok (ev1 != NULL && ev2 != NULL, "Couldn't create events\n"); memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup);