Module: wine Branch: master Commit: 6e07317939a785b6edbaba5bf9ea6fdccca1bd90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e07317939a785b6edbaba5bf9...
Author: Dmitry Timoshkov dmitry@baikal.ru Date: Thu Oct 17 11:45:36 2013 +0900
kernel32/tests: Fix communication port tests compilation with __WINESRC__ defined.
---
dlls/kernel32/tests/comm.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index c444e90..cf1c0c2 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -646,7 +646,7 @@ static void test_BuildCommDCB(void) COMMCONFIG commconfig; DWORD size = sizeof(COMMCONFIG);
- if(GetDefaultCommConfig(port_name, &commconfig, &size)) + if(GetDefaultCommConfigA(port_name, &commconfig, &size)) { port = port_name[3]; break; @@ -697,7 +697,7 @@ static HANDLE test_OpenComm(BOOL doOverlap) /* Try to find a port */ for(port_name[3] = '1'; port_name[3] <= '9'; port_name[3]++) { - hcom = CreateFile( port_name, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, + hcom = CreateFileA( port_name, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, (doOverlap)?FILE_FLAG_OVERLAPPED:0, NULL ); if (hcom != INVALID_HANDLE_VALUE) break; @@ -835,7 +835,7 @@ static void test_waittxempty(void)
S(U(ovl_write)).Offset = 0; S(U(ovl_write)).OffsetHigh = 0; - ovl_write.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + ovl_write.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); before = GetTickCount(); SetLastError(0xdeadbeef); res = WriteFile(hcom, tbuf, sizeof(tbuf), &bytes, &ovl_write); @@ -850,7 +850,7 @@ todo_wine
S(U(ovl_wait)).Offset = 0; S(U(ovl_wait)).OffsetHigh = 0; - ovl_wait.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + ovl_wait.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); evtmask = 0; before = GetTickCount(); SetLastError(0xdeadbeef); @@ -911,7 +911,7 @@ todo_wine { S(U(ovl_write)).Offset = 0; S(U(ovl_write)).OffsetHigh = 0; - ovl_write.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + ovl_write.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); before = GetTickCount(); SetLastError(0xdeadbeef); res = WriteFile(hcom, tbuf, sizeof(tbuf), &bytes, &ovl_write); @@ -941,7 +941,7 @@ todo_wine
S(U(ovl_wait)).Offset = 0; S(U(ovl_wait)).OffsetHigh = 0; - ovl_wait.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + ovl_wait.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); evtmask = 0; SetLastError(0xdeadbeef); res = WaitCommEvent(hcom, &evtmask, &ovl_wait); @@ -967,7 +967,7 @@ todo_wine
S(U(ovl_wait2)).Offset = 0; S(U(ovl_wait2)).OffsetHigh = 0; - ovl_wait2.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + ovl_wait2.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); SetLastError(0xdeadbeef); res = WaitCommEvent(hcom, &evtmask, &ovl_wait2); ok(!res, "WaitCommEvent should fail if there is a pending wait\n"); @@ -1344,12 +1344,12 @@ static void test_WaitRx(void) if (hcom == INVALID_HANDLE_VALUE) return;
ok(SetCommMask(hcom, EV_RXCHAR), "SetCommMask failed\n"); - hComPortEvent = CreateEvent( NULL, TRUE, FALSE, NULL ); + hComPortEvent = CreateEventW( NULL, TRUE, FALSE, NULL ); ok(hComPortEvent != 0, "CreateEvent failed\n"); ZeroMemory( &overlapped, sizeof(overlapped)); overlapped.hEvent = hComPortEvent;
- hComWriteEvent = CreateEvent( NULL, TRUE, FALSE, NULL ); + hComWriteEvent = CreateEventW( NULL, TRUE, FALSE, NULL ); ok(hComWriteEvent != NULL, "CreateEvent res %d\n", GetLastError()); ZeroMemory( &overlapped_w, sizeof(overlapped_w)); overlapped_w.hEvent = hComWriteEvent; @@ -1464,7 +1464,7 @@ static void test_WaitCts(void) trace("test_WaitCts timeout %ld clt 0x%08lx handle %p\n",args[0], args[1], hcom);
ok(SetCommMask(hcom, EV_CTS), "SetCommMask failed\n"); - hComPortEvent = CreateEvent( NULL, TRUE, FALSE, NULL ); + hComPortEvent = CreateEventW( NULL, TRUE, FALSE, NULL ); ok(hComPortEvent != 0, "CreateEvent failed\n"); args[3] = (DWORD_PTR)hComPortEvent; alarmThread = CreateThread(NULL, 0, toggle_ctlLine, args, 0, &alarmThreadId); @@ -1558,7 +1558,7 @@ static void test_AbortWaitCts(void) trace("test_AbortWaitCts timeout %ld handle %p\n",args[0], hcom);
ok(SetCommMask(hcom, EV_CTS), "SetCommMask failed\n"); - hComPortEvent = CreateEvent( NULL, TRUE, FALSE, NULL ); + hComPortEvent = CreateEventW( NULL, TRUE, FALSE, NULL ); ok(hComPortEvent != 0, "CreateEvent failed\n"); alarmThread = CreateThread(NULL, 0, reset_CommMask, args, 0, &alarmThreadId); /* Wait a minimum to let the thread start up */ @@ -1630,7 +1630,7 @@ static void test_WaitDsr(void) trace("test_WaitDsr timeout %ld clt 0x%08lx handle %p\n",args[0], args[1], hcom);
ok(SetCommMask(hcom, EV_DSR), "SetCommMask failed\n"); - hComPortEvent = CreateEvent( NULL, TRUE, FALSE, NULL ); + hComPortEvent = CreateEventW( NULL, TRUE, FALSE, NULL ); ok(hComPortEvent != 0, "CreateEvent failed\n"); alarmThread = CreateThread(NULL, 0, toggle_ctlLine, args, 0, &alarmThreadId); ok(alarmThread !=0 , "CreateThread Failed\n"); @@ -1716,7 +1716,7 @@ static void test_WaitRing(void) trace("test_WaitRing timeout %ld clt 0x%08lx handle %p\n",args[0], args[1], hcom);
ok(SetCommMask(hcom, EV_RING), "SetCommMask failed\n"); - hComPortEvent = CreateEvent( NULL, TRUE, FALSE, NULL ); + hComPortEvent = CreateEventW( NULL, TRUE, FALSE, NULL ); ok(hComPortEvent != 0, "CreateEvent failed\n"); alarmThread = CreateThread(NULL, 0, toggle_ctlLine, args, 0, &alarmThreadId); ok(alarmThread !=0 , "CreateThread Failed\n"); @@ -1795,7 +1795,7 @@ static void test_WaitDcd(void) trace("test_WaitDcd timeout %ld clt 0x%08lx handle %p\n",args[0], args[1], hcom);
ok(SetCommMask(hcom, EV_RLSD), "SetCommMask failed\n"); - hComPortEvent = CreateEvent( NULL, TRUE, FALSE, NULL ); + hComPortEvent = CreateEventW( NULL, TRUE, FALSE, NULL ); ok(hComPortEvent != 0, "CreateEvent failed\n"); alarmThread = CreateThread(NULL, 0, toggle_ctlLine, args, 0, &alarmThreadId); ok(alarmThread !=0 , "CreateThread Failed\n"); @@ -1874,7 +1874,7 @@ static void test_WaitBreak(void) if (hcom == INVALID_HANDLE_VALUE) return;
ok(SetCommMask(hcom, EV_BREAK), "SetCommMask failed\n"); - hComPortEvent = CreateEvent( NULL, TRUE, FALSE, NULL ); + hComPortEvent = CreateEventW( NULL, TRUE, FALSE, NULL ); ok(hComPortEvent != 0, "CreateEvent failed\n");
trace("test_WaitBreak\n"); @@ -1947,7 +1947,7 @@ static void test_WaitCommEvent(void)
S(U(ovl_wait)).Offset = 0; S(U(ovl_wait)).OffsetHigh = 0; - ovl_wait.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + ovl_wait.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL);
trace("waiting 10 secs for com port events (turn on/off the device)...\n"); last_event_time = 0; @@ -2111,7 +2111,7 @@ todo_wine
S(U(ovl_wait)).Offset = 0; S(U(ovl_wait)).OffsetHigh = 0; - ovl_wait.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + ovl_wait.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL);
trace("waiting 3 secs for modem response...\n"); last_event_time = 0; @@ -2198,7 +2198,7 @@ done:
START_TEST(comm) { - HMODULE ntdll = GetModuleHandle("ntdll.dll"); + HMODULE ntdll = GetModuleHandleA("ntdll.dll"); if (ntdll) { pNtReadFile = (void *)GetProcAddress(ntdll, "NtReadFile");