Commit ee3147f4 authored by Misha Koshelev's avatar Misha Koshelev Committed by Alexandre Julliard

shell32/tests: Save threadid from CreateThread as required by winme/98/95.

parent 37deec74
...@@ -1144,6 +1144,7 @@ static void test_dde(void) ...@@ -1144,6 +1144,7 @@ static void test_dde(void)
dde_thread_info_t info = { filename, GetCurrentThreadId() }; dde_thread_info_t info = { filename, GetCurrentThreadId() };
const dde_tests_t* test; const dde_tests_t* test;
char params[1024]; char params[1024];
DWORD threadId;
MSG msg; MSG msg;
int rc; int rc;
...@@ -1173,7 +1174,7 @@ static void test_dde(void) ...@@ -1173,7 +1174,7 @@ static void test_dde(void)
denyNextConnection = TRUE; denyNextConnection = TRUE;
ddeExec[0] = 0; ddeExec[0] = 0;
assert(CreateThread(NULL, 0, ddeThread, (LPVOID)&info, 0, NULL)); assert(CreateThread(NULL, 0, ddeThread, (LPVOID)&info, 0, &threadId));
while (GetMessage(&msg, NULL, 0, 0)) DispatchMessage(&msg); while (GetMessage(&msg, NULL, 0, 0)) DispatchMessage(&msg);
rc = msg.wParam > 32 ? 33 : msg.wParam; rc = msg.wParam > 32 ? 33 : msg.wParam;
if ((test->todo & 0x1)==0) if ((test->todo & 0x1)==0)
...@@ -1284,6 +1285,7 @@ static void test_dde_default_app(void) ...@@ -1284,6 +1285,7 @@ static void test_dde_default_app(void)
dde_thread_info_t info = { filename, GetCurrentThreadId() }; dde_thread_info_t info = { filename, GetCurrentThreadId() };
const dde_default_app_tests_t* test; const dde_default_app_tests_t* test;
char params[1024]; char params[1024];
DWORD threadId;
MSG msg; MSG msg;
int rc; int rc;
...@@ -1316,7 +1318,7 @@ static void test_dde_default_app(void) ...@@ -1316,7 +1318,7 @@ static void test_dde_default_app(void)
* so don't wait for it */ * so don't wait for it */
SetEvent(hEvent); SetEvent(hEvent);
assert(CreateThread(NULL, 0, ddeThread, (LPVOID)&info, 0, NULL)); assert(CreateThread(NULL, 0, ddeThread, (LPVOID)&info, 0, &threadId));
while (GetMessage(&msg, NULL, 0, 0)) DispatchMessage(&msg); while (GetMessage(&msg, NULL, 0, 0)) DispatchMessage(&msg);
rc = msg.wParam > 32 ? 33 : msg.wParam; rc = msg.wParam > 32 ? 33 : msg.wParam;
if ((test->todo & 0x1)==0) if ((test->todo & 0x1)==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