reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-28 14:10:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

shell32/tests: Fix race conditions.

Browse Source
This commit is contained in:
Greg Geldorp 2010-12-28 13:34:11 +01:00 committed by Alexandre Julliard
parent ba9d311f0d
commit 519c288946
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/shell32/tests/shlexec.c
View File

@ -57,6 +57,7 @@ static char tmpdir[MAX_PATH];
static char child_file[MAX_PATH]; static char child_file[MAX_PATH];
static DLLVERSIONINFO dllver; static DLLVERSIONINFO dllver;
static BOOL skip_noassoc_tests = FALSE; static BOOL skip_noassoc_tests = FALSE;
static HANDLE dde_ready_event;
/*** /***
@ -572,13 +573,14 @@ static void doChild(int argc, char** argv)
timer = SetTimer(NULL, 0, 2500, childTimeout); timer = SetTimer(NULL, 0, 2500, childTimeout);
dde_ready = CreateEvent(NULL, FALSE, FALSE, "winetest_shlexec_dde_ready"); dde_ready = OpenEvent(EVENT_MODIFY_STATE, FALSE, "winetest_shlexec_dde_ready");
SetEvent(dde_ready); SetEvent(dde_ready);
CloseHandle(dde_ready); CloseHandle(dde_ready);
while (GetMessage(&msg, NULL, 0, 0)) while (GetMessage(&msg, NULL, 0, 0))
DispatchMessage(&msg); DispatchMessage(&msg);
Sleep(500);
KillTimer(NULL, timer); KillTimer(NULL, timer);
assert(DdeNameService(ddeInst, hszApplication, 0L, DNS_UNREGISTER)); assert(DdeNameService(ddeInst, hszApplication, 0L, DNS_UNREGISTER));
assert(DdeFreeStringHandle(ddeInst, hszTopic)); assert(DdeFreeStringHandle(ddeInst, hszTopic));
@ -587,7 +589,7 @@ static void doChild(int argc, char** argv)
} }
else else
{ {
dde_ready = CreateEvent(NULL, FALSE, FALSE, "winetest_shlexec_dde_ready"); dde_ready = OpenEvent(EVENT_MODIFY_STATE, FALSE, "winetest_shlexec_dde_ready");
SetEvent(dde_ready); SetEvent(dde_ready);
CloseHandle(dde_ready); CloseHandle(dde_ready);
} }
@ -1613,14 +1615,7 @@ static dde_tests_t dde_tests[] =
static DWORD WINAPI hooked_WaitForInputIdle(HANDLE process, DWORD timeout) static DWORD WINAPI hooked_WaitForInputIdle(HANDLE process, DWORD timeout)
{ {
HANDLE dde_ready; return WaitForSingleObject(dde_ready_event, timeout);
DWORD wait_result;
dde_ready = CreateEventA(NULL, FALSE, FALSE, "winetest_shlexec_dde_ready");
wait_result = WaitForSingleObject(dde_ready, timeout);
CloseHandle(dde_ready);
return wait_result;
} }
/* /*
@ -1732,7 +1727,9 @@ static void test_dde(void)
} }
ddeExec[0] = 0; ddeExec[0] = 0;
dde_ready_event = CreateEventA(NULL, FALSE, FALSE, "winetest_shlexec_dde_ready");
rc = shell_execute_ex(SEE_MASK_FLAG_DDEWAIT | SEE_MASK_FLAG_NO_UI, NULL, filename, NULL, NULL); rc = shell_execute_ex(SEE_MASK_FLAG_DDEWAIT | SEE_MASK_FLAG_NO_UI, NULL, filename, NULL, NULL);
CloseHandle(dde_ready_event);
if ((test->todo & 0x1)==0) if ((test->todo & 0x1)==0)
{ {
ok(32 < rc, "%s failed: rc=%d err=%d\n", shell_call, ok(32 < rc, "%s failed: rc=%d err=%d\n", shell_call,