October 2013 - Wine-commits

Dmitry Timoshkov : kernel32/tests: Fix mailslot tests compilation with __WINESRC__ defined.
by Alexandre Julliard 22 Oct '13

22 Oct '13

Module: wine Branch: master Commit: 9d5ddd25e1fdfe9398d6a418525297c03e9dbb28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d5ddd25e1fdfe9398d6a4185… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 21 17:02:11 2013 +0900 kernel32/tests: Fix mailslot tests compilation with __WINESRC__ defined. --- dlls/kernel32/tests/mailslot.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/tests/mailslot.c b/dlls/kernel32/tests/mailslot.c index 4171504..da595e9 100644 --- a/dlls/kernel32/tests/mailslot.c +++ b/dlls/kernel32/tests/mailslot.c @@ -42,24 +42,24 @@ static int mailslot_test(void) &dwMsgCount, &dwTimeout ), "getmailslotinfo succeeded\n"); /* open a mailslot that doesn't exist */ - hWriter = CreateFile(szmspath, GENERIC_READ|GENERIC_WRITE, + hWriter = CreateFileA(szmspath, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); ok( hWriter == INVALID_HANDLE_VALUE, "nonexistent mailslot\n"); /* open a mailslot without the right name */ - hSlot = CreateMailslot( "blah", 0, 0, NULL ); + hSlot = CreateMailslotA( "blah", 0, 0, NULL ); ok( hSlot == INVALID_HANDLE_VALUE, "Created mailslot with invalid name\n"); ok( GetLastError() == ERROR_INVALID_NAME, "error should be ERROR_INVALID_NAME\n"); /* open a mailslot with a null name */ - hSlot = CreateMailslot( NULL, 0, 0, NULL ); + hSlot = CreateMailslotA( NULL, 0, 0, NULL ); ok( hSlot == INVALID_HANDLE_VALUE, "Created mailslot with invalid name\n"); ok( GetLastError() == ERROR_PATH_NOT_FOUND, "error should be ERROR_PATH_NOT_FOUND\n"); /* valid open, but with wacky parameters ... then check them */ - hSlot = CreateMailslot( szmspath, -1, -1, NULL ); + hSlot = CreateMailslotA( szmspath, -1, -1, NULL ); ok( hSlot != INVALID_HANDLE_VALUE , "mailslot with valid name failed\n"); dwMax = dwNext = dwMsgCount = dwTimeout = 0; ok( GetMailslotInfo( hSlot, &dwMax, &dwNext, &dwMsgCount, &dwTimeout ), @@ -73,7 +73,7 @@ static int mailslot_test(void) ok( CloseHandle(hSlot), "failed to close mailslot\n"); /* now open it for real */ - hSlot = CreateMailslot( szmspath, 0, 0, NULL ); + hSlot = CreateMailslotA( szmspath, 0, 0, NULL ); ok( hSlot != INVALID_HANDLE_VALUE , "valid mailslot failed\n"); /* try and read/write to it */ @@ -103,14 +103,14 @@ todo_wine ok( GetLastError() == ERROR_ACCESS_DENIED, "wrong error %u\n", GetLastError() ); /* now try and open the client, but with the wrong sharing mode */ - hWriter = CreateFile(szmspath, GENERIC_WRITE, + hWriter = CreateFileA(szmspath, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); ok( hWriter != INVALID_HANDLE_VALUE /* vista */ || GetLastError() == ERROR_SHARING_VIOLATION, "error should be ERROR_SHARING_VIOLATION got %p / %u\n", hWriter, GetLastError()); if (hWriter != INVALID_HANDLE_VALUE) CloseHandle( hWriter ); /* now open the client with the correct sharing mode */ - hWriter = CreateFile(szmspath, GENERIC_READ|GENERIC_WRITE, + hWriter = CreateFileA(szmspath, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); ok( hWriter != INVALID_HANDLE_VALUE, "existing mailslot err %u\n", GetLastError()); @@ -156,25 +156,25 @@ todo_wine else ok( count == 0, "wrong count %u\n", count ); /* now try open another writer... should fail */ - hWriter2 = CreateFile(szmspath, GENERIC_READ|GENERIC_WRITE, + hWriter2 = CreateFileA(szmspath, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); /* succeeds on vista, don't test */ if (hWriter2 != INVALID_HANDLE_VALUE) CloseHandle( hWriter2 ); /* now try open another as a reader ... also fails */ - hWriter2 = CreateFile(szmspath, GENERIC_READ, + hWriter2 = CreateFileA(szmspath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); /* succeeds on vista, don't test */ if (hWriter2 != INVALID_HANDLE_VALUE) CloseHandle( hWriter2 ); /* now try open another as a writer ... still fails */ - hWriter2 = CreateFile(szmspath, GENERIC_WRITE, + hWriter2 = CreateFileA(szmspath, GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); /* succeeds on vista, don't test */ if (hWriter2 != INVALID_HANDLE_VALUE) CloseHandle( hWriter2 ); /* now open another one */ - hSlot2 = CreateMailslot( szmspath, 0, 0, NULL ); + hSlot2 = CreateMailslotA( szmspath, 0, 0, NULL ); ok( hSlot2 == INVALID_HANDLE_VALUE , "opened two mailslots\n"); /* close the client again */ @@ -184,7 +184,7 @@ todo_wine * now try reopen it with slightly different permissions ... * shared writing */ - hWriter = CreateFile(szmspath, GENERIC_WRITE, + hWriter = CreateFileA(szmspath, GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); ok( hWriter != INVALID_HANDLE_VALUE, "sharing writer\n"); @@ -192,13 +192,13 @@ todo_wine * now try open another as a writer ... * but don't share with the first ... fail */ - hWriter2 = CreateFile(szmspath, GENERIC_WRITE, + hWriter2 = CreateFileA(szmspath, GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); /* succeeds on vista, don't test */ if (hWriter2 != INVALID_HANDLE_VALUE) CloseHandle( hWriter2 ); /* now try open another as a writer ... and share with the first */ - hWriter2 = CreateFile(szmspath, GENERIC_WRITE, + hWriter2 = CreateFileA(szmspath, GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); ok( hWriter2 != INVALID_HANDLE_VALUE, "2nd sharing writer\n"); @@ -316,7 +316,7 @@ todo_wine ok( CloseHandle( hSlot ), "closing the mailslot\n"); /* test timeouts */ - hSlot = CreateMailslot( szmspath, 0, 1000, NULL ); + hSlot = CreateMailslotA( szmspath, 0, 1000, NULL ); ok( hSlot != INVALID_HANDLE_VALUE , "valid mailslot failed\n"); count = 0; memset(buffer, 0, sizeof buffer);

1 0

Dmitry Timoshkov : kernel32/tests: Fix path tests compilation with __WINESRC__ defined.
by Alexandre Julliard 22 Oct '13

22 Oct '13

Module: wine Branch: master Commit: b2e9561a2dbc4d425729ae98de5051437db8e323 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2e9561a2dbc4d425729ae98d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 21 17:02:20 2013 +0900 kernel32/tests: Fix path tests compilation with __WINESRC__ defined. --- dlls/kernel32/tests/path.c | 46 ++++++++++++++++++++++---------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index e83e0a9..82bf776 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -1072,7 +1072,7 @@ static void test_GetLongPathNameA(void) memset(temppath, 0, MAX_PATH); length = pGetLongPathNameA(tempfile, temppath, 4); /* We have a failure so length should be the minimum plus the terminating '0' */ - ok(length >= lstrlen(tempfile) + 1, "Wrong length\n"); + ok(length >= strlen(tempfile) + 1, "Wrong length\n"); ok(temppath[0] == 0, "Buffer should not have been touched\n"); /* Some UNC syntax tests */ @@ -1103,7 +1103,7 @@ static void test_GetLongPathNameA(void) /* Now an UNC path with the computername */ lstrcpyA(unc_prefix, "\\\\"); hostsize = sizeof(unc_prefix) - 2; - GetComputerName(unc_prefix + 2, &hostsize); + GetComputerNameA(unc_prefix + 2, &hostsize); lstrcatA(unc_prefix, "\\"); /* Create a short syntax for the whole unc path */ @@ -1316,7 +1316,7 @@ static void test_GetSystemDirectory(void) DWORD total; SetLastError(0xdeadbeef); - res = GetSystemDirectory(NULL, 0); + res = GetSystemDirectoryA(NULL, 0); /* res includes the terminating Zero */ ok(res > 0, "returned %d with %d (expected '>0')\n", res, GetLastError()); @@ -1324,10 +1324,10 @@ static void test_GetSystemDirectory(void) /* this crashes on XP */ if (0) - GetSystemDirectory(NULL, total); + GetSystemDirectoryA(NULL, total); SetLastError(0xdeadbeef); - res = GetSystemDirectory(NULL, total-1); + res = GetSystemDirectoryA(NULL, total-1); /* 95+NT: total (includes the terminating Zero) 98+ME: 0 with ERROR_INVALID_PARAMETER */ ok( (res == total) || (!res && (GetLastError() == ERROR_INVALID_PARAMETER)), @@ -1338,7 +1338,7 @@ static void test_GetSystemDirectory(void) buffer[0] = '\0'; SetLastError(0xdeadbeef); - res = GetSystemDirectory(buffer, total); + res = GetSystemDirectoryA(buffer, total); /* res does not include the terminating Zero */ ok( (res == (total-1)) && (buffer[0]), "returned %d with %d and '%s' (expected '%d' and a string)\n", @@ -1346,7 +1346,7 @@ static void test_GetSystemDirectory(void) buffer[0] = '\0'; SetLastError(0xdeadbeef); - res = GetSystemDirectory(buffer, total + 1); + res = GetSystemDirectoryA(buffer, total + 1); /* res does not include the terminating Zero */ ok( (res == (total-1)) && (buffer[0]), "returned %d with %d and '%s' (expected '%d' and a string)\n", @@ -1355,7 +1355,7 @@ static void test_GetSystemDirectory(void) memset(buffer, '#', total + 1); buffer[total + 2] = '\0'; SetLastError(0xdeadbeef); - res = GetSystemDirectory(buffer, total-1); + res = GetSystemDirectoryA(buffer, total-1); /* res includes the terminating Zero) */ ok( res == total, "returned %d with %d and '%s' (expected '%d')\n", res, GetLastError(), buffer, total); @@ -1363,7 +1363,7 @@ static void test_GetSystemDirectory(void) memset(buffer, '#', total + 1); buffer[total + 2] = '\0'; SetLastError(0xdeadbeef); - res = GetSystemDirectory(buffer, total-2); + res = GetSystemDirectoryA(buffer, total-2); /* res includes the terminating Zero) */ ok( res == total, "returned %d with %d and '%s' (expected '%d')\n", res, GetLastError(), buffer, total); @@ -1376,17 +1376,17 @@ static void test_GetWindowsDirectory(void) DWORD total; SetLastError(0xdeadbeef); - res = GetWindowsDirectory(NULL, 0); + res = GetWindowsDirectoryA(NULL, 0); /* res includes the terminating Zero */ ok(res > 0, "returned %d with %d (expected '>0')\n", res, GetLastError()); total = res; /* this crashes on XP */ if (0) - GetWindowsDirectory(NULL, total); + GetWindowsDirectoryA(NULL, total); SetLastError(0xdeadbeef); - res = GetWindowsDirectory(NULL, total-1); + res = GetWindowsDirectoryA(NULL, total-1); /* 95+NT: total (includes the terminating Zero) 98+ME: 0 with ERROR_INVALID_PARAMETER */ ok( (res == total) || (!res && (GetLastError() == ERROR_INVALID_PARAMETER)), @@ -1397,7 +1397,7 @@ static void test_GetWindowsDirectory(void) buffer[0] = '\0'; SetLastError(0xdeadbeef); - res = GetWindowsDirectory(buffer, total); + res = GetWindowsDirectoryA(buffer, total); /* res does not include the terminating Zero */ ok( (res == (total-1)) && (buffer[0]), "returned %d with %d and '%s' (expected '%d' and a string)\n", @@ -1405,7 +1405,7 @@ static void test_GetWindowsDirectory(void) buffer[0] = '\0'; SetLastError(0xdeadbeef); - res = GetWindowsDirectory(buffer, total + 1); + res = GetWindowsDirectoryA(buffer, total + 1); /* res does not include the terminating Zero */ ok( (res == (total-1)) && (buffer[0]), "returned %d with %d and '%s' (expected '%d' and a string)\n", @@ -1414,7 +1414,7 @@ static void test_GetWindowsDirectory(void) memset(buffer, '#', total + 1); buffer[total + 2] = '\0'; SetLastError(0xdeadbeef); - res = GetWindowsDirectory(buffer, total-1); + res = GetWindowsDirectoryA(buffer, total-1); /* res includes the terminating Zero) */ ok( res == total, "returned %d with %d and '%s' (expected '%d')\n", res, GetLastError(), buffer, total); @@ -1422,7 +1422,7 @@ static void test_GetWindowsDirectory(void) memset(buffer, '#', total + 1); buffer[total + 2] = '\0'; SetLastError(0xdeadbeef); - res = GetWindowsDirectory(buffer, total-2); + res = GetWindowsDirectoryA(buffer, total-2); /* res includes the terminating Zero) */ ok( res == total, "returned %d with %d and '%s' (expected '%d')\n", res, GetLastError(), buffer, total); @@ -1491,7 +1491,7 @@ static void test_drive_letter_case(void) memset(buf, 0, sizeof(buf)); SetLastError(0xdeadbeef); - ret = GetWindowsDirectory(buf, sizeof(buf)); + ret = GetWindowsDirectoryA(buf, sizeof(buf)); ok(ret, "GetWindowsDirectory error %u\n", GetLastError()); ok(ret < sizeof(buf), "buffer should be %u bytes\n", ret); ok(buf[1] == ':', "expected buf[1] == ':' got %c\n", buf[1]); @@ -1500,7 +1500,7 @@ static void test_drive_letter_case(void) /* re-use the buffer returned by GetFullPathName */ buf[2] = '/'; SetLastError(0xdeadbeef); - ret = GetFullPathName(buf + 2, sizeof(buf), buf, NULL); + ret = GetFullPathNameA(buf + 2, sizeof(buf), buf, NULL); ok(ret, "GetFullPathName error %u\n", GetLastError()); ok(ret < sizeof(buf), "buffer should be %u bytes\n", ret); ok(buf[1] == ':', "expected buf[1] == ':' got %c\n", buf[1]); @@ -1508,7 +1508,7 @@ static void test_drive_letter_case(void) memset(buf, 0, sizeof(buf)); SetLastError(0xdeadbeef); - ret = GetSystemDirectory(buf, sizeof(buf)); + ret = GetSystemDirectoryA(buf, sizeof(buf)); ok(ret, "GetSystemDirectory error %u\n", GetLastError()); ok(ret < sizeof(buf), "buffer should be %u bytes\n", ret); ok(buf[1] == ':', "expected buf[1] == ':' got %c\n", buf[1]); @@ -1516,7 +1516,7 @@ static void test_drive_letter_case(void) memset(buf, 0, sizeof(buf)); SetLastError(0xdeadbeef); - ret = GetCurrentDirectory(sizeof(buf), buf); + ret = GetCurrentDirectoryA(sizeof(buf), buf); ok(ret, "GetCurrentDirectory error %u\n", GetLastError()); ok(ret < sizeof(buf), "buffer should be %u bytes\n", ret); ok(buf[1] == ':', "expected buf[1] == ':' got %c\n", buf[1]); @@ -1525,7 +1525,7 @@ static void test_drive_letter_case(void) /* TEMP is an environment variable, so it can't be tested for case-sensitivity */ memset(buf, 0, sizeof(buf)); SetLastError(0xdeadbeef); - ret = GetTempPath(sizeof(buf), buf); + ret = GetTempPathA(sizeof(buf), buf); ok(ret, "GetTempPath error %u\n", GetLastError()); ok(ret < sizeof(buf), "buffer should be %u bytes\n", ret); if (buf[0]) @@ -1536,7 +1536,7 @@ static void test_drive_letter_case(void) memset(buf, 0, sizeof(buf)); SetLastError(0xdeadbeef); - ret = GetFullPathName(".", sizeof(buf), buf, NULL); + ret = GetFullPathNameA(".", sizeof(buf), buf, NULL); ok(ret, "GetFullPathName error %u\n", GetLastError()); ok(ret < sizeof(buf), "buffer should be %u bytes\n", ret); ok(buf[1] == ':', "expected buf[1] == ':' got %c\n", buf[1]); @@ -1544,7 +1544,7 @@ static void test_drive_letter_case(void) /* re-use the buffer returned by GetFullPathName */ SetLastError(0xdeadbeef); - ret = GetShortPathName(buf, buf, sizeof(buf)); + ret = GetShortPathNameA(buf, buf, sizeof(buf)); ok(ret, "GetShortPathName error %u\n", GetLastError()); ok(ret < sizeof(buf), "buffer should be %u bytes\n", ret); ok(buf[1] == ':', "expected buf[1] == ':' got %c\n", buf[1]);

1 0

Dmitry Timoshkov : kernel32/tests: Fix module tests compilation with __WINESRC__ defined.
by Alexandre Julliard 22 Oct '13

22 Oct '13

Module: wine Branch: master Commit: f1a6bf70bfa3c18ced2ff0d7b2bea2c503050438 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1a6bf70bfa3c18ced2ff0d7b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 21 17:02:15 2013 +0900 kernel32/tests: Fix module tests compilation with __WINESRC__ defined. --- dlls/kernel32/tests/module.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index e8d51e1..6e9ad13 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -46,7 +46,7 @@ static void testGetModuleFileName(const char* name) WCHAR bufW[MAX_PATH]; DWORD len1A, len1W = 0, len2A, len2W = 0; - hMod = (name) ? GetModuleHandle(name) : NULL; + hMod = (name) ? GetModuleHandleA(name) : NULL; /* first test, with enough space in buffer */ memset(bufA, '-', sizeof(bufA)); @@ -157,7 +157,7 @@ static void testNestedLoadLibraryA(void) * - it must not already be loaded * - it must not have a 16-bit counterpart */ - GetWindowsDirectory(path1, sizeof(path1)); + GetWindowsDirectoryA(path1, sizeof(path1)); strcat(path1, "\\system\\"); strcat(path1, dllname); hModule1 = LoadLibraryA(path1); @@ -167,7 +167,7 @@ static void testNestedLoadLibraryA(void) return; } - GetWindowsDirectory(path2, sizeof(path2)); + GetWindowsDirectoryA(path2, sizeof(path2)); strcat(path2, "\\system32\\"); strcat(path2, dllname); hModule2 = LoadLibraryA(path2); @@ -189,7 +189,7 @@ static void testNestedLoadLibraryA(void) ok(FreeLibrary(hModule3), "FreeLibrary() failed\n"); ok(FreeLibrary(hModule2), "FreeLibrary() failed\n"); ok(FreeLibrary(hModule1), "FreeLibrary() failed\n"); - ok(GetModuleHandle(dllname) == NULL, "%s was not fully unloaded\n", dllname); + ok(GetModuleHandleA(dllname) == NULL, "%s was not fully unloaded\n", dllname); /* Try to load the dll again, if refcounting is ok, this should work */ hModule1 = LoadLibraryA(path1);

1 0

Dmitry Timoshkov : kernel32/tests: Fix pipe tests compilation with __WINESRC__ defined.
by Alexandre Julliard 22 Oct '13

22 Oct '13

Module: wine Branch: master Commit: 5628183bf4fc7a462ebb9fb0bbfb49b5efa47b67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5628183bf4fc7a462ebb9fb0b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 21 17:02:23 2013 +0900 kernel32/tests: Fix pipe tests compilation with __WINESRC__ defined. --- dlls/kernel32/tests/pipe.c | 77 +++++++++++++++++++++----------------------- 1 files changed, 37 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5628183bf4fc7a462ebb9…

1 0

Dmitry Timoshkov : kernel32/tests: Fix profile tests compilation with __WINESRC__ defined.
by Alexandre Julliard 22 Oct '13

22 Oct '13

Module: wine Branch: master Commit: f776e879fd19174404ffafad903909bccfb2cd79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f776e879fd19174404ffafad9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 21 17:02:27 2013 +0900 kernel32/tests: Fix profile tests compilation with __WINESRC__ defined. --- dlls/kernel32/tests/profile.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 211d0c6..9b83e85 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -382,19 +382,19 @@ static void test_profile_existing(void) for (i=0; i < sizeof(pe)/sizeof(pe[0]); i++) { - h = CreateFile(testfile1, pe[i].dwDesiredAccess, pe[i].dwShareMode, NULL, + h = CreateFileA(testfile1, pe[i].dwDesiredAccess, pe[i].dwShareMode, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); ok(INVALID_HANDLE_VALUE != h, "%d: CreateFile failed\n",i); SetLastError(0xdeadbeef); - ret = WritePrivateProfileString(SECTION, KEY, "12345", testfile1); + ret = WritePrivateProfileStringA(SECTION, KEY, "12345", testfile1); if (!pe[i].write_error) { if (!ret) ok( broken(GetLastError() == pe[i].broken_error), "%d: WritePrivateProfileString failed with error %u\n", i, GetLastError() ); CloseHandle(h); - size = GetPrivateProfileString(SECTION, KEY, 0, buffer, MAX_PATH, testfile1); + size = GetPrivateProfileStringA(SECTION, KEY, 0, buffer, MAX_PATH, testfile1); if (ret) ok( size == 5, "%d: test failed, number of characters copied: %d instead of 5\n", i, size ); else @@ -408,21 +408,21 @@ static void test_profile_existing(void) ok( err == pe[i].write_error, "%d: WritePrivateProfileString failed with error %u/%u\n", i, err, pe[i].write_error ); CloseHandle(h); - size = GetPrivateProfileString(SECTION, KEY, 0, buffer, MAX_PATH, testfile1); + size = GetPrivateProfileStringA(SECTION, KEY, 0, buffer, MAX_PATH, testfile1); ok( !size, "%d: test failed, number of characters copied: %d instead of 0\n", i, size ); } - ok( DeleteFile(testfile1), "delete failed\n" ); + ok( DeleteFileA(testfile1), "delete failed\n" ); } - h = CreateFile(testfile2, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + h = CreateFileA(testfile2, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); sprintf( buffer, "[%s]\r\n%s=123\r\n", SECTION, KEY ); ok( WriteFile( h, buffer, strlen(buffer), &size, NULL ), "failed to write\n" ); CloseHandle( h ); for (i=0; i < sizeof(pe)/sizeof(pe[0]); i++) { - h = CreateFile(testfile2, pe[i].dwDesiredAccess, pe[i].dwShareMode, NULL, + h = CreateFileA(testfile2, pe[i].dwDesiredAccess, pe[i].dwShareMode, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); ok(INVALID_HANDLE_VALUE != h, "%d: CreateFile failed\n",i); SetLastError(0xdeadbeef); @@ -436,7 +436,7 @@ static void test_profile_existing(void) ok( !ret, "%d: GetPrivateProfileString succeeded\n", i ); CloseHandle(h); } - ok( DeleteFile(testfile2), "delete failed\n" ); + ok( DeleteFileA(testfile2), "delete failed\n" ); } static void test_profile_delete_on_close(void) @@ -446,14 +446,14 @@ static void test_profile_delete_on_close(void) DWORD size, res; static const char contents[] = "[" SECTION "]\n" KEY "=123\n"; - h = CreateFile(testfile, GENERIC_WRITE, FILE_SHARE_READ, NULL, + h = CreateFileA(testfile, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, NULL); res = WriteFile( h, contents, sizeof contents - 1, &size, NULL ); ok( res, "Cannot write test file: %x\n", GetLastError() ); ok( size == sizeof contents - 1, "Test file: partial write\n"); SetLastError(0xdeadbeef); - res = GetPrivateProfileInt(SECTION, KEY, 0, testfile); + res = GetPrivateProfileIntA(SECTION, KEY, 0, testfile); ok( res == 123 || broken(res == 0 && GetLastError() == ERROR_SHARING_VIOLATION), /* Win9x, WinME */ "Got %d instead of 123\n", res); @@ -470,14 +470,14 @@ static void test_profile_refresh(void) static const char contents1[] = "[" SECTION "]\n" KEY "=123\n"; static const char contents2[] = "[" SECTION "]\n" KEY "=124\n"; - h = CreateFile(testfile, GENERIC_WRITE, FILE_SHARE_READ, NULL, + h = CreateFileA(testfile, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, NULL); res = WriteFile( h, contents1, sizeof contents1 - 1, &size, NULL ); ok( res, "Cannot write test file: %x\n", GetLastError() ); ok( size == sizeof contents1 - 1, "Test file: partial write\n"); SetLastError(0xdeadbeef); - res = GetPrivateProfileInt(SECTION, KEY, 0, testfile); + res = GetPrivateProfileIntA(SECTION, KEY, 0, testfile); ok( res == 123 || broken(res == 0 && GetLastError() == ERROR_SHARING_VIOLATION), /* Win9x, WinME */ "Got %d instead of 123\n", res); @@ -486,14 +486,14 @@ static void test_profile_refresh(void) /* Test proper invalidation of wine's profile file cache */ - h = CreateFile(testfile, GENERIC_WRITE, FILE_SHARE_READ, NULL, + h = CreateFileA(testfile, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, NULL); res = WriteFile( h, contents2, sizeof contents2 - 1, &size, NULL ); ok( res, "Cannot write test file: %x\n", GetLastError() ); ok( size == sizeof contents2 - 1, "Test file: partial write\n"); SetLastError(0xdeadbeef); - res = GetPrivateProfileInt(SECTION, KEY, 0, testfile); + res = GetPrivateProfileIntA(SECTION, KEY, 0, testfile); ok( res == 124 || broken(res == 0 && GetLastError() == 0xdeadbeef), /* Win9x, WinME */ "Got %d instead of 124\n", res); @@ -503,7 +503,7 @@ static void test_profile_refresh(void) /* Cache must be invalidated if file no longer exists and default must be returned */ SetLastError(0xdeadbeef); - res = GetPrivateProfileInt(SECTION, KEY, 421, testfile); + res = GetPrivateProfileIntA(SECTION, KEY, 421, testfile); ok( res == 421 || broken(res == 0 && GetLastError() == 0xdeadbeef), /* Win9x, WinME */ "Got %d instead of 421\n", res);

1 0

Dmitry Timoshkov : kernel32/tests: Fix resource tests compilation with __WINESRC__ defined.
by Alexandre Julliard 22 Oct '13

22 Oct '13

Module: wine Branch: master Commit: a18087e5d1005ce769093e75a33d26f29c949b3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a18087e5d1005ce769093e75a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 21 17:02:31 2013 +0900 kernel32/tests: Fix resource tests compilation with __WINESRC__ defined. --- dlls/kernel32/tests/resource.c | 70 ++++++++++++++++++++-------------------- 1 files changed, 35 insertions(+), 35 deletions(-) diff --git a/dlls/kernel32/tests/resource.c b/dlls/kernel32/tests/resource.c index a85e6d2..f94fed6 100644 --- a/dlls/kernel32/tests/resource.c +++ b/dlls/kernel32/tests/resource.c @@ -255,7 +255,7 @@ static int build_exe( const sec_build* sec_descr ) file_size = phys_end_of_section; } - file = CreateFile(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + file = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); ok (file != INVALID_HANDLE_VALUE, "failed to create file\n"); /* write out the header */ @@ -279,7 +279,7 @@ static void update_missing_exe( void ) HANDLE res; SetLastError(0xdeadbeef); - res = BeginUpdateResource( filename, TRUE ); + res = BeginUpdateResourceA( filename, TRUE ); GLE = GetLastError(); ok( res == NULL, "BeginUpdateResource should fail\n"); } @@ -289,29 +289,29 @@ static void update_empty_exe( void ) HANDLE file, res, test; BOOL r; - file = CreateFile(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + file = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); ok (file != INVALID_HANDLE_VALUE, "failed to create file\n"); CloseHandle( file ); - res = BeginUpdateResource( filename, TRUE ); + res = BeginUpdateResourceA( filename, TRUE ); if ( res != NULL || GetLastError() != ERROR_FILE_INVALID ) { ok( res != NULL, "BeginUpdateResource failed\n"); /* check if it's possible to open the file now */ - test = CreateFile(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + test = CreateFileA(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); ok (test != INVALID_HANDLE_VALUE, "failed to create file\n"); CloseHandle( test ); - r = EndUpdateResource( res, FALSE ); + r = EndUpdateResourceA( res, FALSE ); ok( r == FALSE, "EndUpdateResource failed\n"); } else skip( "Can't update resource in empty file\n" ); - res = BeginUpdateResource( filename, FALSE ); + res = BeginUpdateResourceA( filename, FALSE ); ok( res == NULL, "BeginUpdateResource failed\n"); } @@ -320,10 +320,10 @@ static void update_resources_none( void ) HMODULE res; BOOL r; - res = BeginUpdateResource( filename, FALSE ); + res = BeginUpdateResourceA( filename, FALSE ); ok( res != NULL, "BeginUpdateResource failed\n"); - r = EndUpdateResource( res, FALSE ); + r = EndUpdateResourceA( res, FALSE ); ok( r, "EndUpdateResource failed\n"); } @@ -332,10 +332,10 @@ static void update_resources_delete( void ) HMODULE res; BOOL r; - res = BeginUpdateResource( filename, TRUE ); + res = BeginUpdateResourceA( filename, TRUE ); ok( res != NULL, "BeginUpdateResource failed\n"); - r = EndUpdateResource( res, FALSE ); + r = EndUpdateResourceA( res, FALSE ); ok( r, "EndUpdateResource failed\n"); } @@ -345,27 +345,27 @@ static void update_resources_version( void ) BOOL r; char foo[] = "red and white"; - res = BeginUpdateResource( filename, TRUE ); + res = BeginUpdateResourceA( filename, TRUE ); ok( res != NULL, "BeginUpdateResource failed\n"); if (0) /* this causes subsequent tests to fail on Vista */ { - r = UpdateResource( res, - MAKEINTRESOURCE(0x1230), - MAKEINTRESOURCE(0x4567), + r = UpdateResourceA( res, + MAKEINTRESOURCEA(0x1230), + MAKEINTRESOURCEA(0x4567), 0xabcd, NULL, 0 ); ok( r == FALSE, "UpdateResource failed\n"); } - r = UpdateResource( res, - MAKEINTRESOURCE(0x1230), - MAKEINTRESOURCE(0x4567), + r = UpdateResourceA( res, + MAKEINTRESOURCEA(0x1230), + MAKEINTRESOURCEA(0x4567), 0xabcd, foo, sizeof foo ); ok( r == TRUE, "UpdateResource failed: %d\n", GetLastError()); - r = EndUpdateResource( res, FALSE ); + r = EndUpdateResourceA( res, FALSE ); ok( r, "EndUpdateResource failed: %d\n", GetLastError()); } @@ -375,17 +375,17 @@ static void update_resources_bigdata( void ) BOOL r; char foo[2*page_size] = "foobar"; - res = BeginUpdateResource( filename, TRUE ); + res = BeginUpdateResourceA( filename, TRUE ); ok( res != NULL, "BeginUpdateResource succeeded\n"); - r = UpdateResource( res, - MAKEINTRESOURCE(0x3012), - MAKEINTRESOURCE(0x5647), + r = UpdateResourceA( res, + MAKEINTRESOURCEA(0x3012), + MAKEINTRESOURCEA(0x5647), 0xcdba, foo, sizeof foo ); ok( r == TRUE, "UpdateResource failed: %d\n", GetLastError()); - r = EndUpdateResource( res, FALSE ); + r = EndUpdateResourceA( res, FALSE ); ok( r, "EndUpdateResource failed\n"); } @@ -399,13 +399,13 @@ static void check_exe( const sec_verify *verify ) HANDLE file, mapping; DWORD length, sec_count = 0; - file = CreateFile(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + file = CreateFileA(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); ok (file != INVALID_HANDLE_VALUE, "failed to create file (%d)\n", GetLastError()); length = GetFileSize( file, NULL ); ok( length >= verify->length, "file size wrong\n"); - mapping = CreateFileMapping( file, NULL, PAGE_READONLY, 0, 0, NULL ); + mapping = CreateFileMappingA( file, NULL, PAGE_READONLY, 0, 0, NULL ); ok (mapping != NULL, "failed to create file\n"); dos = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, length ); @@ -458,33 +458,33 @@ static void test_find_resource(void) { HRSRC rsrc; - rsrc = FindResourceW( GetModuleHandle(0), (LPCWSTR)MAKEINTRESOURCE(1), (LPCWSTR)RT_MENU ); + rsrc = FindResourceW( GetModuleHandleW(NULL), MAKEINTRESOURCEW(1), (LPCWSTR)RT_MENU ); ok( rsrc != 0, "resource not found\n" ); - rsrc = FindResourceExW( GetModuleHandle(0), (LPCWSTR)RT_MENU, (LPCWSTR)MAKEINTRESOURCE(1), + rsrc = FindResourceExW( GetModuleHandleW(NULL), (LPCWSTR)RT_MENU, MAKEINTRESOURCEW(1), MAKELANGID( LANG_NEUTRAL, SUBLANG_NEUTRAL )); ok( rsrc != 0, "resource not found\n" ); - rsrc = FindResourceExW( GetModuleHandle(0), (LPCWSTR)RT_MENU, (LPCWSTR)MAKEINTRESOURCE(1), + rsrc = FindResourceExW( GetModuleHandleW(NULL), (LPCWSTR)RT_MENU, MAKEINTRESOURCEW(1), MAKELANGID( LANG_GERMAN, SUBLANG_DEFAULT )); ok( rsrc != 0, "resource not found\n" ); SetLastError( 0xdeadbeef ); - rsrc = FindResourceW( GetModuleHandle(0), (LPCWSTR)MAKEINTRESOURCE(1), (LPCWSTR)RT_DIALOG ); + rsrc = FindResourceW( GetModuleHandleW(NULL), MAKEINTRESOURCEW(1), (LPCWSTR)RT_DIALOG ); ok( !rsrc, "resource found\n" ); ok( GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND, "wrong error %u\n", GetLastError() ); SetLastError( 0xdeadbeef ); - rsrc = FindResourceW( GetModuleHandle(0), (LPCWSTR)MAKEINTRESOURCE(2), (LPCWSTR)RT_MENU ); + rsrc = FindResourceW( GetModuleHandleW(NULL), MAKEINTRESOURCEW(2), (LPCWSTR)RT_MENU ); ok( !rsrc, "resource found\n" ); ok( GetLastError() == ERROR_RESOURCE_NAME_NOT_FOUND, "wrong error %u\n", GetLastError() ); SetLastError( 0xdeadbeef ); - rsrc = FindResourceExW( GetModuleHandle(0), (LPCWSTR)RT_MENU, (LPCWSTR)MAKEINTRESOURCE(1), + rsrc = FindResourceExW( GetModuleHandleW(NULL), (LPCWSTR)RT_MENU, MAKEINTRESOURCEW(1), MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ) ); ok( !rsrc, "resource found\n" ); ok( GetLastError() == ERROR_RESOURCE_LANG_NOT_FOUND, "wrong error %u\n", GetLastError() ); SetLastError( 0xdeadbeef ); - rsrc = FindResourceExW( GetModuleHandle(0), (LPCWSTR)RT_MENU, (LPCWSTR)MAKEINTRESOURCE(1), + rsrc = FindResourceExW( GetModuleHandleW(NULL), (LPCWSTR)RT_MENU, MAKEINTRESOURCEW(1), MAKELANGID( LANG_FRENCH, SUBLANG_DEFAULT ) ); ok( !rsrc, "resource found\n" ); ok( GetLastError() == ERROR_RESOURCE_LANG_NOT_FOUND, "wrong error %u\n", GetLastError() ); @@ -494,7 +494,7 @@ START_TEST(resource) { DWORD i; - DeleteFile( filename ); + DeleteFileA( filename ); update_missing_exe(); if (GLE == ERROR_CALL_NOT_IMPLEMENTED) @@ -517,7 +517,7 @@ START_TEST(resource) check_exe( &sec->chk_version ); update_resources_bigdata(); check_exe( &sec->chk_bigdata ); - DeleteFile( filename ); + DeleteFileA( filename ); } test_find_resource(); }

1 0

Dmitry Timoshkov : kernel32/tests: Fix synchronization tests compilation with __WINESRC__ defined.
by Alexandre Julliard 22 Oct '13

22 Oct '13

Module: wine Branch: master Commit: 31917bfa73f11d2ce66f99c215e77d14d18867d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31917bfa73f11d2ce66f99c21… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 21 17:02:35 2013 +0900 kernel32/tests: Fix synchronization tests compilation with __WINESRC__ defined. --- dlls/kernel32/tests/sync.c | 46 ++++++++++++++++++++++---------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index a040c59..b98d7c4 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -54,7 +54,7 @@ static void test_signalandwait(void) DWORD r; HANDLE event[2], semaphore[2], file; - kernel32 = GetModuleHandle("kernel32"); + kernel32 = GetModuleHandleA("kernel32.dll"); pSignalObjectAndWait = (void*) GetProcAddress(kernel32, "SignalObjectAndWait"); if (!pSignalObjectAndWait) @@ -69,8 +69,8 @@ static void test_signalandwait(void) } ok( r == WAIT_FAILED, "should fail\n"); - event[0] = CreateEvent(NULL, 0, 0, NULL); - event[1] = CreateEvent(NULL, 1, 1, NULL); + event[0] = CreateEventW(NULL, 0, 0, NULL); + event[1] = CreateEventW(NULL, 1, 1, NULL); ok( event[0] && event[1], "failed to create event flags\n"); @@ -105,8 +105,8 @@ static void test_signalandwait(void) CloseHandle(event[1]); /* semaphores */ - semaphore[0] = CreateSemaphore( NULL, 0, 1, NULL ); - semaphore[1] = CreateSemaphore( NULL, 1, 1, NULL ); + semaphore[0] = CreateSemaphoreW( NULL, 0, 1, NULL ); + semaphore[1] = CreateSemaphoreW( NULL, 1, 1, NULL ); ok( semaphore[0] && semaphore[1], "failed to create semaphore\n"); r = pSignalObjectAndWait(semaphore[0], semaphore[1], 0, FALSE); @@ -125,7 +125,7 @@ static void test_signalandwait(void) CloseHandle(semaphore[1]); /* try a registry key */ - file = CreateFile("x", GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, + file = CreateFileA("x", GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_DELETE_ON_CLOSE, NULL); r = pSignalObjectAndWait(file, file, 0, FALSE); ok( r == WAIT_FAILED, "should fail\n"); @@ -143,23 +143,23 @@ static void test_mutex(void) DWORD failed = 0; SetLastError(0xdeadbeef); - hOpened = OpenMutex(0, FALSE, "WineTestMutex"); + hOpened = OpenMutexA(0, FALSE, "WineTestMutex"); ok(hOpened == NULL, "OpenMutex succeeded\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); SetLastError(0xdeadbeef); - hCreated = CreateMutex(NULL, FALSE, "WineTestMutex"); + hCreated = CreateMutexA(NULL, FALSE, "WineTestMutex"); ok(hCreated != NULL, "CreateMutex failed with error %d\n", GetLastError()); SetLastError(0xdeadbeef); - hOpened = OpenMutex(0, FALSE, "WineTestMutex"); + hOpened = OpenMutexA(0, FALSE, "WineTestMutex"); todo_wine ok(hOpened == NULL, "OpenMutex succeeded\n"); todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "wrong error %u\n", GetLastError()); SetLastError(0xdeadbeef); - hOpened = OpenMutex(GENERIC_EXECUTE, FALSE, "WineTestMutex"); + hOpened = OpenMutexA(GENERIC_EXECUTE, FALSE, "WineTestMutex"); ok(hOpened != NULL, "OpenMutex failed with error %d\n", GetLastError()); wait_ret = WaitForSingleObject(hOpened, INFINITE); ok(wait_ret == WAIT_OBJECT_0, "WaitForSingleObject failed with error %d\n", GetLastError()); @@ -172,7 +172,7 @@ todo_wine } SetLastError(0xdeadbeef); - hOpened = OpenMutex(GENERIC_READ | GENERIC_WRITE, FALSE, "WineTestMutex"); + hOpened = OpenMutexA(GENERIC_READ | GENERIC_WRITE, FALSE, "WineTestMutex"); ok(hOpened != NULL, "OpenMutex failed with error %d\n", GetLastError()); wait_ret = WaitForSingleObject(hOpened, INFINITE); ok(wait_ret == WAIT_FAILED, "WaitForSingleObject succeeded\n"); @@ -181,7 +181,7 @@ todo_wine for (i = 0; i < 32; i++) { SetLastError(0xdeadbeef); - hOpened = OpenMutex(0x1 << i, FALSE, "WineTestMutex"); + hOpened = OpenMutexA(0x1 << i, FALSE, "WineTestMutex"); if(hOpened != NULL) { SetLastError(0xdeadbeef); @@ -211,23 +211,23 @@ todo_wine /* test case sensitivity */ SetLastError(0xdeadbeef); - hOpened = OpenMutex(READ_CONTROL, FALSE, "WINETESTMUTEX"); + hOpened = OpenMutexA(READ_CONTROL, FALSE, "WINETESTMUTEX"); ok(!hOpened, "OpenMutex succeeded\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); SetLastError(0xdeadbeef); - hOpened = OpenMutex(READ_CONTROL, FALSE, "winetestmutex"); + hOpened = OpenMutexA(READ_CONTROL, FALSE, "winetestmutex"); ok(!hOpened, "OpenMutex succeeded\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError()); SetLastError(0xdeadbeef); - hOpened = CreateMutex(NULL, FALSE, "WineTestMutex"); + hOpened = CreateMutexA(NULL, FALSE, "WineTestMutex"); ok(hOpened != NULL, "CreateMutex failed with error %d\n", GetLastError()); ok(GetLastError() == ERROR_ALREADY_EXISTS, "wrong error %u\n", GetLastError()); CloseHandle(hOpened); SetLastError(0xdeadbeef); - hOpened = CreateMutex(NULL, FALSE, "WINETESTMUTEX"); + hOpened = CreateMutexA(NULL, FALSE, "WINETESTMUTEX"); ok(hOpened != NULL, "CreateMutex failed with error %d\n", GetLastError()); ok(GetLastError() == 0, "wrong error %u\n", GetLastError()); CloseHandle(hOpened); @@ -254,7 +254,7 @@ static void test_slist(void) PSLIST_ENTRY (WINAPI *pInterlockedPushEntrySList)(PSLIST_HEADER,PSLIST_ENTRY); HMODULE kernel32; - kernel32 = GetModuleHandle("KERNEL32.DLL"); + kernel32 = GetModuleHandleA("KERNEL32.DLL"); pInitializeSListHead = (void*) GetProcAddress(kernel32, "InitializeSListHead"); pQueryDepthSList = (void*) GetProcAddress(kernel32, "QueryDepthSList"); pInterlockedFlushSList = (void*) GetProcAddress(kernel32, "InterlockedFlushSList"); @@ -536,7 +536,7 @@ static void test_iocp_callback(void) return; } - sem = CreateSemaphore(NULL, 0, 1, NULL); + sem = CreateSemaphoreW(NULL, 0, 1, NULL); ok(sem != INVALID_HANDLE_VALUE, "Creating a semaphore failed\n"); ret = GetTempPathA(MAX_PATH, temp_path); @@ -813,9 +813,9 @@ static void test_timer_queue(void) ok(n5 == 1, "Timer callback 5 expected 1 got %d\n", n5); /* Test synchronous deletion of the timer/queue with event trigger. */ - e = CreateEvent(NULL, TRUE, FALSE, NULL); - et1 = CreateEvent(NULL, TRUE, FALSE, NULL); - et2 = CreateEvent(NULL, TRUE, FALSE, NULL); + e = CreateEventW(NULL, TRUE, FALSE, NULL); + et1 = CreateEventW(NULL, TRUE, FALSE, NULL); + et2 = CreateEventW(NULL, TRUE, FALSE, NULL); if (!e || !et1 || !et2) { skip("Failed to create timer queue descruction event\n"); @@ -1123,7 +1123,7 @@ static void test_WaitForMultipleObjects(void) * we can wait on that many */ for (i=0; i<MAXIMUM_WAIT_OBJECTS; i++) { - maxevents[i] = CreateEvent(NULL, i==0, TRUE, NULL); + maxevents[i] = CreateEventW(NULL, i==0, TRUE, NULL); ok( maxevents[i] != 0, "should create enough events\n"); } @@ -1653,7 +1653,7 @@ static void test_condvars_base(void) { START_TEST(sync) { - HMODULE hdll = GetModuleHandle("kernel32"); + HMODULE hdll = GetModuleHandleA("kernel32.dll"); pChangeTimerQueueTimer = (void*)GetProcAddress(hdll, "ChangeTimerQueueTimer"); pCreateTimerQueue = (void*)GetProcAddress(hdll, "CreateTimerQueue"); pCreateTimerQueueTimer = (void*)GetProcAddress(hdll, "CreateTimerQueueTimer");

1 0

Dmitry Timoshkov : kernel32/tests: Fix thread tests compilation with __WINESRC__ defined.
by Alexandre Julliard 22 Oct '13

22 Oct '13

Module: wine Branch: master Commit: abbe8b3d02cadbe98290254b454855559c15b65d URL: http://source.winehq.org/git/wine.git/?a=commit;h=abbe8b3d02cadbe98290254b4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 21 17:02:45 2013 +0900 kernel32/tests: Fix thread tests compilation with __WINESRC__ defined. --- dlls/kernel32/tests/thread.c | 31 +++++++++++++++++-------------- 1 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 33797d8..964ad02 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -25,12 +25,15 @@ #include <stdarg.h> #include <stdio.h> -#include "wine/test.h" +/* the tests intentionally pass invalid pointers and need an exception handler */ +#define WINE_NO_INLINE_STRING + #include <windef.h> #include <winbase.h> #include <winnt.h> #include <winerror.h> #include <winnls.h> +#include "wine/test.h" /* Specify the number of simultaneous threads to test */ #define NUM_THREADS 4 @@ -86,12 +89,12 @@ static HANDLE create_target_process(const char *arg) char cmdline[MAX_PATH]; PROCESS_INFORMATION pi; BOOL ret; - STARTUPINFO si = { 0 }; + STARTUPINFOA si = { 0 }; si.cb = sizeof(si); winetest_get_mainargs( &argv ); sprintf(cmdline, "%s %s %s", argv[0], argv[1], arg); - ret = CreateProcess(NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "error: %u\n", GetLastError()); ret = CloseHandle(pi.hThread); ok(ret, "error %u\n", GetLastError()); @@ -116,9 +119,9 @@ static LONG num_synced; static void init_thread_sync_helpers(void) { - start_event = CreateEvent(NULL, TRUE, FALSE, NULL); + start_event = CreateEventW(NULL, TRUE, FALSE, NULL); ok(start_event != NULL, "CreateEvent failed\n"); - stop_event = CreateEvent(NULL, TRUE, FALSE, NULL); + stop_event = CreateEventW(NULL, TRUE, FALSE, NULL); ok(stop_event != NULL, "CreateEvent failed\n"); num_synced = -1; } @@ -298,10 +301,10 @@ static void create_function_addr_events(HANDLE events[2]) char buffer[256]; sprintf(buffer, "threadFunc_SetEvent %p", threadFunc_SetEvent); - events[0] = CreateEvent(NULL, FALSE, FALSE, buffer); + events[0] = CreateEventA(NULL, FALSE, FALSE, buffer); sprintf(buffer, "threadFunc_CloseHandle %p", threadFunc_CloseHandle); - events[1] = CreateEvent(NULL, FALSE, FALSE, buffer); + events[1] = CreateEventA(NULL, FALSE, FALSE, buffer); } /* check CreateRemoteThread */ @@ -325,7 +328,7 @@ static VOID test_CreateRemoteThread(void) } ok(ret == WAIT_OBJECT_0 || broken(ret == WAIT_OBJECT_0+1 /* nt4,w2k */), "WaitForAllObjects 2 events %d\n", ret); - hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); ok(hEvent != NULL, "Can't create event, err=%u\n", GetLastError()); ret = DuplicateHandle(GetCurrentProcess(), hEvent, hProcess, &hRemoteEvent, 0, FALSE, DUPLICATE_SAME_ACCESS); @@ -953,7 +956,7 @@ static void test_SetThreadContext(void) BOOL ret; SetLastError(0xdeadbeef); - event = CreateEvent( NULL, TRUE, FALSE, NULL ); + event = CreateEventW( NULL, TRUE, FALSE, NULL ); thread = CreateThread( NULL, 0, threadFunc6, (void *)2, 0, &threadid ); ok( thread != NULL, "CreateThread failed : (%d)\n", GetLastError() ); if (!thread) @@ -1034,7 +1037,7 @@ static void test_QueueUserWorkItem(void) /* QueueUserWorkItem not present on win9x */ if (!pQueueUserWorkItem) return; - finish_event = CreateEvent(NULL, TRUE, FALSE, NULL); + finish_event = CreateEventW(NULL, TRUE, FALSE, NULL); before = GetTickCount(); @@ -1082,8 +1085,8 @@ static void test_RegisterWaitForSingleObject(void) /* test signaled case */ - handle = CreateEvent(NULL, TRUE, TRUE, NULL); - complete_event = CreateEvent(NULL, FALSE, FALSE, NULL); + handle = CreateEventW(NULL, TRUE, TRUE, NULL); + complete_event = CreateEventW(NULL, FALSE, FALSE, NULL); ret = pRegisterWaitForSingleObject(&wait_handle, handle, signaled_function, complete_event, INFINITE, WT_EXECUTEONLYONCE); ok(ret, "RegisterWaitForSingleObject failed with error %d\n", GetLastError()); @@ -1426,7 +1429,7 @@ static WORD get_thread_fpu_cw(void) DWORD tid, res; HANDLE thread; - ctx.finished = CreateEvent(NULL, FALSE, FALSE, NULL); + ctx.finished = CreateEventW(NULL, FALSE, FALSE, NULL); ok(!!ctx.finished, "Failed to create event, last error %#x.\n", GetLastError()); thread = CreateThread(NULL, 0, fpu_thread, &ctx, 0, &tid); @@ -1598,7 +1601,7 @@ static void test_thread_actctx(void) static void init_funcs(void) { - HMODULE hKernel32 = GetModuleHandle("kernel32"); + HMODULE hKernel32 = GetModuleHandleA("kernel32.dll"); /* Neither Cygwin nor mingW export OpenThread, so do a dynamic check so that the compile passes */

1 0

Dmitry Timoshkov : kernel32/tests: Fix heap tests compilation with __WINESRC__ defined.
by Alexandre Julliard 21 Oct '13

21 Oct '13

Module: wine Branch: master Commit: e02774ad40775b57e82b8dc2a0aa829b021275b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e02774ad40775b57e82b8dc2a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 21 17:02:03 2013 +0900 kernel32/tests: Fix heap tests compilation with __WINESRC__ defined. --- dlls/kernel32/tests/heap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index e36336c..4a730c7 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -534,7 +534,7 @@ static void test_HeapQueryInformation(void) SIZE_T size; BOOL ret; - pHeapQueryInformation = (void *)GetProcAddress(GetModuleHandle("kernel32.dll"), "HeapQueryInformation"); + pHeapQueryInformation = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "HeapQueryInformation"); if (!pHeapQueryInformation) { win_skip("HeapQueryInformation is not available\n");

1 0

Dmitry Timoshkov : kernel32/tests: Fix locale tests compilation with __WINESRC__ defined.
by Alexandre Julliard 21 Oct '13

21 Oct '13

Module: wine Branch: master Commit: 020bd36323458ec0e910893ed96d6eac67d9273e URL: http://source.winehq.org/git/wine.git/?a=commit;h=020bd36323458ec0e910893ed… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 21 17:02:07 2013 +0900 kernel32/tests: Fix locale tests compilation with __WINESRC__ defined. --- dlls/kernel32/tests/locale.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 130e4e5..417e7d6 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -72,9 +72,9 @@ static inline int isdigitW( WCHAR wc ) static HMODULE hKernel32; static WORD enumCount; -static BOOL (WINAPI *pEnumSystemLanguageGroupsA)(LANGUAGEGROUP_ENUMPROC, DWORD, LONG_PTR); -static BOOL (WINAPI *pEnumLanguageGroupLocalesA)(LANGGROUPLOCALE_ENUMPROC, LGRPID, DWORD, LONG_PTR); -static BOOL (WINAPI *pEnumUILanguagesA)(UILANGUAGE_ENUMPROC, DWORD, LONG_PTR); +static BOOL (WINAPI *pEnumSystemLanguageGroupsA)(LANGUAGEGROUP_ENUMPROCA, DWORD, LONG_PTR); +static BOOL (WINAPI *pEnumLanguageGroupLocalesA)(LANGGROUPLOCALE_ENUMPROCA, LGRPID, DWORD, LONG_PTR); +static BOOL (WINAPI *pEnumUILanguagesA)(UILANGUAGE_ENUMPROCA, DWORD, LONG_PTR); static BOOL (WINAPI *pEnumSystemLocalesEx)(LOCALE_ENUMPROCEX, DWORD, LPARAM, LPVOID); static INT (WINAPI *pLCMapStringEx)(LPCWSTR, DWORD, LPCWSTR, INT, LPWSTR, INT, LPNLSVERSIONINFO, LPVOID, LPARAM); static LCID (WINAPI *pLocaleNameToLCID)(LPCWSTR, DWORD); @@ -118,7 +118,7 @@ static void InitFunctionPointers(void) #define COUNTOF(x) (sizeof(x)/sizeof(x)[0]) #define STRINGSA(x,y) strcpy(input, x); strcpy(Expected, y); SetLastError(0xdeadbeef); buffer[0] = '\0' -#define EXPECT_LENA ok(ret == lstrlen(Expected)+1, "Expected Len %d, got %d\n", lstrlen(Expected)+1, ret) +#define EXPECT_LENA ok(ret == lstrlenA(Expected)+1, "Expected len %d, got %d\n", lstrlenA(Expected)+1, ret) #define EXPECT_EQA ok(strncmp(buffer, Expected, strlen(Expected)) == 0, \ "Expected '%s', got '%s'\n", Expected, buffer) @@ -657,13 +657,13 @@ static void test_GetDateFormatA(void) "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); STRINGSA("ddd',' MMM dd ''''yy","5/4/2002"); /* Default to DATE_SHORTDATE */ - ret = GetDateFormat(lcid, NUO, &curtime, NULL, buffer, COUNTOF(buffer)); + ret = GetDateFormatA(lcid, NUO, &curtime, NULL, buffer, COUNTOF(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); if (strncmp(buffer, Expected, strlen(Expected)) && strncmp(buffer, "5/4/02", strlen(Expected)) != 0) ok (0, "Expected '%s' or '5/4/02', got '%s'\n", Expected, buffer); STRINGSA("ddd',' MMM dd ''''yy", "Saturday, May 04, 2002"); /* DATE_LONGDATE */ - ret = GetDateFormat(lcid, NUO|DATE_LONGDATE, &curtime, NULL, buffer, COUNTOF(buffer)); + ret = GetDateFormatA(lcid, NUO|DATE_LONGDATE, &curtime, NULL, buffer, COUNTOF(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); EXPECT_LENA; EXPECT_EQA; @@ -671,7 +671,7 @@ static void test_GetDateFormatA(void) /* NT4 returns ERROR_INVALID_FLAGS for DATE_YEARMONTH */ STRINGSA("ddd',' MMM dd ''''yy", ""); /* DATE_YEARMONTH */ SetLastError(0xdeadbeef); - ret = GetDateFormat(lcid, NUO|DATE_YEARMONTH, &curtime, input, buffer, COUNTOF(buffer)); + ret = GetDateFormatA(lcid, NUO|DATE_YEARMONTH, &curtime, input, buffer, COUNTOF(buffer)); ok(!ret && GetLastError() == ERROR_INVALID_FLAGS, "Expected ERROR_INVALID_FLAGS, got %d\n", GetLastError()); EXPECT_EQA; @@ -680,12 +680,12 @@ static void test_GetDateFormatA(void) /* and return values */ STRINGSA("m/d/y", ""); /* Invalid flags */ SetLastError(0xdeadbeef); - ret = GetDateFormat(lcid, DATE_YEARMONTH|DATE_SHORTDATE|DATE_LONGDATE, + ret = GetDateFormatA(lcid, DATE_YEARMONTH|DATE_SHORTDATE|DATE_LONGDATE, &curtime, input, buffer, COUNTOF(buffer)); ok(!ret && GetLastError() == ERROR_INVALID_FLAGS, "Expected ERROR_INVALID_FLAGS, got %d\n", GetLastError()); - ret = GetDateFormat(lcid_ru, 0, &curtime, "ddMMMM", buffer, COUNTOF(buffer)); + ret = GetDateFormatA(lcid_ru, 0, &curtime, "ddMMMM", buffer, COUNTOF(buffer)); if (!ret) { win_skip("LANG_RUSSIAN locale data unavailable\n"); @@ -694,37 +694,37 @@ static void test_GetDateFormatA(void) /* month part should be in genitive form */ strcpy(genitive_month, buffer + 2); - ret = GetDateFormat(lcid_ru, 0, &curtime, "MMMM", buffer, COUNTOF(buffer)); + ret = GetDateFormatA(lcid_ru, 0, &curtime, "MMMM", buffer, COUNTOF(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); strcpy(month, buffer); ok(strcmp(genitive_month, month) != 0, "Expected different month forms\n"); - ret = GetDateFormat(lcid_ru, 0, &curtime, "ddd", buffer, COUNTOF(buffer)); + ret = GetDateFormatA(lcid_ru, 0, &curtime, "ddd", buffer, COUNTOF(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); strcpy(short_day, buffer); STRINGSA("dd MMMMddd dd", ""); sprintf(Expected, "04 %s%s 04", genitive_month, short_day); - ret = GetDateFormat(lcid_ru, 0, &curtime, input, buffer, COUNTOF(buffer)); + ret = GetDateFormatA(lcid_ru, 0, &curtime, input, buffer, COUNTOF(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); EXPECT_EQA; STRINGSA("MMMMddd dd", ""); sprintf(Expected, "%s%s 04", month, short_day); - ret = GetDateFormat(lcid_ru, 0, &curtime, input, buffer, COUNTOF(buffer)); + ret = GetDateFormatA(lcid_ru, 0, &curtime, input, buffer, COUNTOF(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); EXPECT_EQA; STRINGSA("MMMMddd", ""); sprintf(Expected, "%s%s", month, short_day); - ret = GetDateFormat(lcid_ru, 0, &curtime, input, buffer, COUNTOF(buffer)); + ret = GetDateFormatA(lcid_ru, 0, &curtime, input, buffer, COUNTOF(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); EXPECT_EQA; STRINGSA("MMMMdd", ""); sprintf(Expected, "%s04", genitive_month); sprintf(Broken, "%s04", month); - ret = GetDateFormat(lcid_ru, 0, &curtime, input, buffer, COUNTOF(buffer)); + ret = GetDateFormatA(lcid_ru, 0, &curtime, input, buffer, COUNTOF(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); ok(strncmp(buffer, Expected, strlen(Expected)) == 0 || broken(strncmp(buffer, Broken, strlen(Broken)) == 0) /* nt4 */, @@ -733,7 +733,7 @@ static void test_GetDateFormatA(void) STRINGSA("MMMMdd ddd", ""); sprintf(Expected, "%s04 %s", genitive_month, short_day); sprintf(Broken, "%s04 %s", month, short_day); - ret = GetDateFormat(lcid_ru, 0, &curtime, input, buffer, COUNTOF(buffer)); + ret = GetDateFormatA(lcid_ru, 0, &curtime, input, buffer, COUNTOF(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); ok(strncmp(buffer, Expected, strlen(Expected)) == 0 || broken(strncmp(buffer, Broken, strlen(Broken)) == 0) /* nt4 */, @@ -741,14 +741,14 @@ static void test_GetDateFormatA(void) STRINGSA("dd dddMMMM", ""); sprintf(Expected, "04 %s%s", short_day, month); - ret = GetDateFormat(lcid_ru, 0, &curtime, input, buffer, COUNTOF(buffer)); + ret = GetDateFormatA(lcid_ru, 0, &curtime, input, buffer, COUNTOF(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); EXPECT_EQA; STRINGSA("dd dddMMMM ddd MMMMdd", ""); sprintf(Expected, "04 %s%s %s %s04", short_day, month, short_day, genitive_month); sprintf(Broken, "04 %s%s %s %s04", short_day, month, short_day, month); - ret = GetDateFormat(lcid_ru, 0, &curtime, input, buffer, COUNTOF(buffer)); + ret = GetDateFormatA(lcid_ru, 0, &curtime, input, buffer, COUNTOF(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); ok(strncmp(buffer, Expected, strlen(Expected)) == 0 || broken(strncmp(buffer, Broken, strlen(Broken)) == 0) /* nt4 */, @@ -758,7 +758,7 @@ static void test_GetDateFormatA(void) STRINGSA("ddd',' MMMM dd", ""); sprintf(Expected, "%s, %s 04", short_day, genitive_month); sprintf(Broken, "%s, %s 04", short_day, month); - ret = GetDateFormat(lcid_ru, 0, &curtime, input, buffer, COUNTOF(buffer)); + ret = GetDateFormatA(lcid_ru, 0, &curtime, input, buffer, COUNTOF(buffer)); ok(ret, "Expected ret != 0, got %d, error %d\n", ret, GetLastError()); ok(strncmp(buffer, Expected, strlen(Expected)) == 0 || broken(strncmp(buffer, Broken, strlen(Broken)) == 0) /* nt4 */, @@ -1452,7 +1452,7 @@ static void test_CompareStringA(void) ret = CompareStringA(lcid, NORM_IGNORECASE, "_", -1, ".", -1); todo_wine ok(ret == CSTR_GREATER_THAN, "\"_\" vs \".\" expected CSTR_GREATER_THAN, got %d\n", ret); - ret = lstrcmpi("#", "."); + ret = lstrcmpiA("#", "."); todo_wine ok(ret == -1, "\"#\" vs \".\" expected -1, got %d\n", ret); lcid = MAKELCID(MAKELANGID(LANG_POLISH, SUBLANG_DEFAULT), SORT_DEFAULT);

1 0