Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-20 04:20:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Sync up wine dde test to current. CORE-????.

Browse source 
svn path=/trunk/; revision=60909
This commit is contained in:
James Tabor 2013-11-09 23:30:25 +00:00
parent a46f0a5974
commit db803c9f06
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
rostests/winetests/user32/dde.c
View file

@ -53,7 +53,7 @@ static void flush_events(void)
while (diff > 0) while (diff > 0)
{ {
if (MsgWaitForMultipleObjects( 0, NULL, FALSE, min_timeout, QS_ALLINPUT ) == WAIT_TIMEOUT) break; if (MsgWaitForMultipleObjects( 0, NULL, FALSE, min_timeout, QS_ALLINPUT ) == WAIT_TIMEOUT) break;
while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); while (PeekMessageA( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageA( &msg );
diff = time - GetTickCount(); diff = time - GetTickCount();
min_timeout = 10; min_timeout = 10;
} }
@ -80,7 +80,7 @@ static void create_dde_window(HWND *hwnd, LPCSTR name, WNDPROC wndproc)
static void destroy_dde_window(HWND *hwnd, LPCSTR name) static void destroy_dde_window(HWND *hwnd, LPCSTR name)
{ {
DestroyWindow(*hwnd); DestroyWindow(*hwnd);
UnregisterClass(name, GetModuleHandleA(0)); UnregisterClassA(name, GetModuleHandleA(NULL));
} }
static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) static LRESULT WINAPI dde_server_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
@ -255,7 +255,7 @@ static void test_msg_server(HANDLE hproc, HANDLE hthread)
while (MsgWaitForMultipleObjects( 1, &hproc, FALSE, INFINITE, QS_ALLINPUT ) != 0) while (MsgWaitForMultipleObjects( 1, &hproc, FALSE, INFINITE, QS_ALLINPUT ) != 0)
{ {
while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg);
} }
destroy_dde_window(&hwnd, "dde_server"); destroy_dde_window(&hwnd, "dde_server");
@ -825,10 +825,10 @@ static void test_ddeml_server(HANDLE hproc)
/* set up DDE server */ /* set up DDE server */
server_pid = 0; server_pid = 0;
res = DdeInitialize(&server_pid, server_ddeml_callback, APPCLASS_STANDARD, 0); res = DdeInitializeA(&server_pid, server_ddeml_callback, APPCLASS_STANDARD, 0);
ok(res == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", res); ok(res == DMLERR_NO_ERROR, "Expected DMLERR_NO_ERROR, got %d\n", res);
server = DdeCreateStringHandle(server_pid, "TestDDEServer", CP_WINANSI); server = DdeCreateStringHandleA(server_pid, "TestDDEServer", CP_WINANSI);
ok(server != NULL, "Expected non-NULL string handle\n"); ok(server != NULL, "Expected non-NULL string handle\n");
hdata = DdeNameService(server_pid, server, 0, DNS_REGISTER); hdata = DdeNameService(server_pid, server, 0, DNS_REGISTER);
@ -836,7 +836,7 @@ static void test_ddeml_server(HANDLE hproc)
while (MsgWaitForMultipleObjects( 1, &hproc, FALSE, INFINITE, QS_ALLINPUT ) != 0) while (MsgWaitForMultipleObjects( 1, &hproc, FALSE, INFINITE, QS_ALLINPUT ) != 0)
{ {
while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg);
} }
ret = DdeUninitialize(server_pid); ret = DdeUninitialize(server_pid);
ok(ret == TRUE, "Expected TRUE, got %d\n", ret); ok(ret == TRUE, "Expected TRUE, got %d\n", ret);
@ -1074,7 +1074,7 @@ static void test_msg_client(void)
flush_events(); flush_events();
item = GlobalAddAtom("request"); item = GlobalAddAtomA("request");
ok(item != 0, "Expected non-NULL item\n"); ok(item != 0, "Expected non-NULL item\n");
/* WM_DDE_REQUEST, bad clipboard format */ /* WM_DDE_REQUEST, bad clipboard format */
@ -2672,7 +2672,7 @@ static void test_end_to_end_server(HANDLE hproc, HANDLE hthread, BOOL type_a)
while (MsgWaitForMultipleObjects( 1, &hproc, FALSE, INFINITE, QS_ALLINPUT ) != 0) while (MsgWaitForMultipleObjects( 1, &hproc, FALSE, INFINITE, QS_ALLINPUT ) != 0)
{ {
while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg);
} }
ret = DdeUninitialize(server_pid); ret = DdeUninitialize(server_pid);
@ -2686,7 +2686,7 @@ START_TEST(dde)
int argc; int argc;
char **argv; char **argv;
char buffer[MAX_PATH]; char buffer[MAX_PATH];
STARTUPINFO startup; STARTUPINFOA startup;
PROCESS_INFORMATION proc; PROCESS_INFORMATION proc;
DWORD dde_inst = 0xdeadbeef; DWORD dde_inst = 0xdeadbeef;
@ -2715,7 +2715,7 @@ START_TEST(dde)
return; return;
} }
ZeroMemory(&startup, sizeof(STARTUPINFO)); ZeroMemory(&startup, sizeof(STARTUPINFOA));
sprintf(buffer, "%s dde ddeml", argv[0]); sprintf(buffer, "%s dde ddeml", argv[0]);
startup.cb = sizeof(startup); startup.cb = sizeof(startup);
startup.dwFlags = STARTF_USESHOWWINDOW; startup.dwFlags = STARTF_USESHOWWINDOW;