wine-commits October 2013

wine-commits@winehq.org

2 participants
757 discussions

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 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 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 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 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

Alexandre Julliard : user32: Get rid of the CreateCursorIcon driver entry point.
by Alexandre Julliard 22 Oct '13

22 Oct '13

Module: wine Branch: master Commit: a897e13fba192ad2460b02975ac8419b588066db URL: http://source.winehq.org/git/wine.git/?a=commit;h=a897e13fba192ad2460b02975… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 21 22:08:21 2013 +0200 user32: Get rid of the CreateCursorIcon driver entry point. --- dlls/user32/cursoricon.c | 3 --- dlls/user32/driver.c | 12 ------------ dlls/user32/user_private.h | 1 - 3 files changed, 0 insertions(+), 16 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 93aa0c6..53089c2 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -972,7 +972,6 @@ done: list_add_head( &icon_cache, &info->entry ); } release_icon_ptr( hObj, info ); - USER_Driver->pCreateCursorIcon( hObj ); } else { @@ -1609,7 +1608,6 @@ HICON WINAPI CopyIcon( HICON hIcon ) release_icon_ptr( hNew, ptrNew ); } release_icon_ptr( hIcon, ptrOld ); - if (hNew) USER_Driver->pCreateCursorIcon( hNew ); return hNew; } @@ -2212,7 +2210,6 @@ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo) } release_icon_ptr( hObj, info ); - USER_Driver->pCreateCursorIcon( hObj ); } return hObj; } diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 6a6241c..4cfc552 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -67,7 +67,6 @@ static const USER_DRIVER *load_driver(void) GET_USER_FUNC(UnloadKeyboardLayout); GET_USER_FUNC(UnregisterHotKey); GET_USER_FUNC(VkKeyScanEx); - GET_USER_FUNC(CreateCursorIcon); GET_USER_FUNC(DestroyCursorIcon); GET_USER_FUNC(SetCursor); GET_USER_FUNC(GetCursorPos); @@ -205,10 +204,6 @@ static SHORT CDECL nulldrv_VkKeyScanEx( WCHAR ch, HKL layout ) return -1; } -static void CDECL nulldrv_CreateCursorIcon( HCURSOR cursor ) -{ -} - static void CDECL nulldrv_DestroyCursorIcon( HCURSOR cursor ) { } @@ -439,7 +434,6 @@ static USER_DRIVER null_driver = nulldrv_UnregisterHotKey, nulldrv_VkKeyScanEx, /* cursor/icon functions */ - nulldrv_CreateCursorIcon, nulldrv_DestroyCursorIcon, nulldrv_SetCursor, nulldrv_GetCursorPos, @@ -559,11 +553,6 @@ static SHORT CDECL loaderdrv_VkKeyScanEx( WCHAR ch, HKL layout ) return load_driver()->pVkKeyScanEx( ch, layout ); } -static void CDECL loaderdrv_CreateCursorIcon( HCURSOR cursor ) -{ - load_driver()->pCreateCursorIcon( cursor ); -} - static void CDECL loaderdrv_DestroyCursorIcon( HCURSOR cursor ) { load_driver()->pDestroyCursorIcon( cursor ); @@ -787,7 +776,6 @@ static USER_DRIVER lazy_load_driver = loaderdrv_UnregisterHotKey, loaderdrv_VkKeyScanEx, /* cursor/icon functions */ - loaderdrv_CreateCursorIcon, loaderdrv_DestroyCursorIcon, loaderdrv_SetCursor, loaderdrv_GetCursorPos, diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 0f86bdf..9daa9f4 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -73,7 +73,6 @@ typedef struct tagUSER_DRIVER { void (CDECL *pUnregisterHotKey)(HWND, UINT, UINT); SHORT (CDECL *pVkKeyScanEx)(WCHAR, HKL); /* cursor/icon functions */ - void (CDECL *pCreateCursorIcon)(HCURSOR); void (CDECL *pDestroyCursorIcon)(HCURSOR); void (CDECL *pSetCursor)(HCURSOR); BOOL (CDECL *pGetCursorPos)(LPPOINT);

1 0

Alexandre Julliard : winemac: Use an init once function to register IME classes.
by Alexandre Julliard 22 Oct '13

22 Oct '13

Module: wine Branch: master Commit: 639c202ea7113f6e2b49733dd7041bc158284943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=639c202ea7113f6e2b49733dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 21 22:05:39 2013 +0200 winemac: Use an init once function to register IME classes. --- dlls/winemac.drv/ime.c | 50 +++++++++++++++++++++++--------------------- dlls/winemac.drv/macdrv.h | 2 - 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index 53a10f3..2c74f6e 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -563,25 +563,6 @@ static void UpdateDataInDefaultIMEWindow(HIMC hIMC, HWND hwnd, BOOL showable) UnlockRealIMC(hIMC); } -BOOL WINAPI ImeInquire(LPIMEINFO lpIMEInfo, LPWSTR lpszUIClass, LPCWSTR lpszOption) -{ - TRACE("\n"); - IME_RegisterClasses( macdrv_module ); - lpIMEInfo->dwPrivateDataSize = sizeof(IMEPRIVATE); - lpIMEInfo->fdwProperty = IME_PROP_UNICODE | IME_PROP_AT_CARET; - lpIMEInfo->fdwConversionCaps = IME_CMODE_NATIVE; - lpIMEInfo->fdwSentenceCaps = IME_SMODE_AUTOMATIC; - lpIMEInfo->fdwUICaps = UI_CAP_2700; - /* Tell App we cannot accept ImeSetCompositionString calls */ - /* FIXME: Can we? */ - lpIMEInfo->fdwSCSCaps = 0; - lpIMEInfo->fdwSelectCaps = SELECT_CAP_CONVERSION; - - lstrcpyW(lpszUIClass, UI_CLASS_NAME); - - return TRUE; -} - BOOL WINAPI ImeConfigure(HKL hKL, HWND hWnd, DWORD dwMode, LPVOID lpData) { FIXME("(%p, %p, %d, %p): stub\n", hKL, hWnd, dwMode, lpData); @@ -1394,10 +1375,7 @@ static LRESULT WINAPI IME_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM return rc; } - -/* Interfaces to other parts of the Mac driver */ - -void IME_RegisterClasses(HINSTANCE hImeInst) +static BOOL WINAPI register_classes( INIT_ONCE *once, void *param, void **context ) { WNDCLASSW wndClass; ZeroMemory(&wndClass, sizeof(WNDCLASSW)); @@ -1405,7 +1383,7 @@ void IME_RegisterClasses(HINSTANCE hImeInst) wndClass.lpfnWndProc = (WNDPROC) IME_WindowProc; wndClass.cbClsExtra = 0; wndClass.cbWndExtra = 2 * sizeof(LONG_PTR); - wndClass.hInstance = hImeInst; + wndClass.hInstance = macdrv_module; wndClass.hCursor = LoadCursorW(NULL, (LPWSTR)IDC_ARROW); wndClass.hIcon = LoadIconW(NULL, (LPWSTR)IDI_APPLICATION); wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); @@ -1421,8 +1399,32 @@ void IME_RegisterClasses(HINSTANCE hImeInst) WM_MSIME_RECONVERT = RegisterWindowMessageA("MSIMEReconvert"); WM_MSIME_QUERYPOSITION = RegisterWindowMessageA("MSIMEQueryPosition"); WM_MSIME_DOCUMENTFEED = RegisterWindowMessageA("MSIMEDocumentFeed"); + return TRUE; } +BOOL WINAPI ImeInquire(LPIMEINFO lpIMEInfo, LPWSTR lpszUIClass, LPCWSTR lpszOption) +{ + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + + TRACE("\n"); + InitOnceExecuteOnce( &init_once, register_classes, NULL, NULL ); + lpIMEInfo->dwPrivateDataSize = sizeof(IMEPRIVATE); + lpIMEInfo->fdwProperty = IME_PROP_UNICODE | IME_PROP_AT_CARET; + lpIMEInfo->fdwConversionCaps = IME_CMODE_NATIVE; + lpIMEInfo->fdwSentenceCaps = IME_SMODE_AUTOMATIC; + lpIMEInfo->fdwUICaps = UI_CAP_2700; + /* Tell App we cannot accept ImeSetCompositionString calls */ + /* FIXME: Can we? */ + lpIMEInfo->fdwSCSCaps = 0; + lpIMEInfo->fdwSelectCaps = SELECT_CAP_CONVERSION; + + lstrcpyW(lpszUIClass, UI_CLASS_NAME); + + return TRUE; +} + +/* Interfaces to other parts of the Mac driver */ + /*********************************************************************** * macdrv_im_set_text */ diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 24c3f65..98ecb90 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -210,8 +210,6 @@ extern void macdrv_status_item_mouse_move(const macdrv_event *event) DECLSPEC_HI * Mac IME driver */ -extern void IME_RegisterClasses(HINSTANCE hImeInst) DECLSPEC_HIDDEN; - extern BOOL macdrv_process_text_input(UINT vkey, UINT scan, UINT repeat, const BYTE *key_state, void *himc) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : winex11: Use an init once function to register IME classes.
by Alexandre Julliard 22 Oct '13

22 Oct '13

Module: wine Branch: master Commit: 7cc272cdefaa19ff2b6f0d2e961abdd840bce204 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cc272cdefaa19ff2b6f0d2e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 21 22:05:34 2013 +0200 winex11: Use an init once function to register IME classes. --- dlls/winex11.drv/ime.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index aa6c7dd..cd40f77 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -122,14 +122,10 @@ static BOOL UnlockRealIMC(HIMC hIMC) return FALSE; } -static void IME_RegisterClasses(void) +static BOOL WINAPI register_classes( INIT_ONCE *once, void *param, void **context ) { - static BOOL done = FALSE; WNDCLASSW wndClass; - if (done) return; - done = TRUE; - ZeroMemory(&wndClass, sizeof(WNDCLASSW)); wndClass.style = CS_GLOBALCLASS | CS_IME | CS_HREDRAW | CS_VREDRAW; wndClass.lpfnWndProc = IME_WindowProc; @@ -151,6 +147,7 @@ static void IME_RegisterClasses(void) WM_MSIME_RECONVERT = RegisterWindowMessageA("MSIMEReconvert"); WM_MSIME_QUERYPOSITION = RegisterWindowMessageA("MSIMEQueryPosition"); WM_MSIME_DOCUMENTFEED = RegisterWindowMessageA("MSIMEDocumentFeed"); + return TRUE; } static HIMCC ImeCreateBlankCompStr(void) @@ -561,8 +558,10 @@ static void IME_AddToSelected(HIMC hIMC) BOOL WINAPI ImeInquire(LPIMEINFO lpIMEInfo, LPWSTR lpszUIClass, LPCWSTR lpszOption) { + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + TRACE("\n"); - IME_RegisterClasses(); + InitOnceExecuteOnce( &init_once, register_classes, NULL, NULL ); lpIMEInfo->dwPrivateDataSize = sizeof (IMEPRIVATE); lpIMEInfo->fdwProperty = IME_PROP_UNICODE | IME_PROP_AT_CARET; lpIMEInfo->fdwConversionCaps = IME_CMODE_NATIVE;

1 0

Jacek Caban : crypt32: Get rid of no longer needed hCertStore checks.
by Alexandre Julliard 21 Oct '13

21 Oct '13

Module: wine Branch: master Commit: 217e0119d92bb701e9a140ad4c42a6d9b7f4cb9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=217e0119d92bb701e9a140ad4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 21 15:59:11 2013 +0200 crypt32: Get rid of no longer needed hCertStore checks. --- dlls/crypt32/cert.c | 10 +--------- dlls/crypt32/crl.c | 9 +-------- dlls/crypt32/ctl.c | 32 ++++++++++---------------------- dlls/crypt32/store.c | 40 ++++++++++++++-------------------------- 4 files changed, 26 insertions(+), 65 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index f23629b..1858a1b 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -555,15 +555,7 @@ BOOL WINAPI CertGetCertificateContextProperty(PCCERT_CONTEXT pCertContext, ret = FALSE; break; case CERT_ACCESS_STATE_PROP_ID: - if (pCertContext->hCertStore) - ret = CertGetStoreProperty(pCertContext->hCertStore, dwPropId, - pvData, pcbData); - else - { - DWORD state = 0; - - ret = CertContext_CopyParam(pvData, pcbData, &state, sizeof(state)); - } + ret = CertGetStoreProperty(cert->ctx.hCertStore, dwPropId, pvData, pcbData); break; case CERT_KEY_PROV_HANDLE_PROP_ID: { diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index 07e86b2..db80651 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -499,14 +499,7 @@ BOOL WINAPI CertGetCRLContextProperty(PCCRL_CONTEXT pCRLContext, } else { - if (pCRLContext->hCertStore) - ret = CertGetStoreProperty(pCRLContext->hCertStore, dwPropId, - pvData, pcbData); - else - { - *(DWORD *)pvData = 0; - ret = TRUE; - } + ret = CertGetStoreProperty(pCRLContext->hCertStore, dwPropId, pvData, pcbData); } break; default: diff --git a/dlls/crypt32/ctl.c b/dlls/crypt32/ctl.c index 6893e2d..fa98556 100644 --- a/dlls/crypt32/ctl.c +++ b/dlls/crypt32/ctl.c @@ -341,26 +341,21 @@ PCCTL_CONTEXT WINAPI CertFindCTLInStore(HCERTSTORE hCertStore, BOOL WINAPI CertDeleteCTLFromStore(PCCTL_CONTEXT pCtlContext) { + WINECRYPT_CERTSTORE *hcs = pCtlContext->hCertStore; + ctl_t *ctl = ctl_from_ptr(pCtlContext); BOOL ret; TRACE("(%p)\n", pCtlContext); if (!pCtlContext) - ret = TRUE; - else if (!pCtlContext->hCertStore) - ret = CertFreeCTLContext(pCtlContext); - else - { - WINECRYPT_CERTSTORE *hcs = pCtlContext->hCertStore; - ctl_t *ctl = ctl_from_ptr(pCtlContext); + return TRUE; - if (hcs->dwMagic != WINE_CRYPTCERTSTORE_MAGIC) - ret = FALSE; - else - ret = hcs->vtbl->ctls.delete(hcs, &ctl->base); - if (ret) - ret = CertFreeCTLContext(pCtlContext); - } + if (hcs->dwMagic != WINE_CRYPTCERTSTORE_MAGIC) + return FALSE; + + ret = hcs->vtbl->ctls.delete(hcs, &ctl->base); + if (ret) + ret = CertFreeCTLContext(pCtlContext); return ret; } @@ -621,14 +616,7 @@ BOOL WINAPI CertGetCTLContextProperty(PCCTL_CONTEXT pCTLContext, } else { - if (pCTLContext->hCertStore) - ret = CertGetStoreProperty(pCTLContext->hCertStore, dwPropId, - pvData, pcbData); - else - { - *(DWORD *)pvData = 0; - ret = TRUE; - } + ret = CertGetStoreProperty(pCTLContext->hCertStore, dwPropId, pvData, pcbData); } break; default: diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 7e22b95..6c34e55 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -949,24 +949,17 @@ PCCERT_CONTEXT WINAPI CertEnumCertificatesInStore(HCERTSTORE hCertStore, PCCERT_ BOOL WINAPI CertDeleteCertificateFromStore(PCCERT_CONTEXT pCertContext) { - BOOL ret; + WINECRYPT_CERTSTORE *hcs = pCertContext->hCertStore; TRACE("(%p)\n", pCertContext); if (!pCertContext) - ret = TRUE; - else if (!pCertContext->hCertStore) - ret = CertFreeCertificateContext(pCertContext); - else - { - WINECRYPT_CERTSTORE *hcs = pCertContext->hCertStore; + return TRUE; - if (hcs->dwMagic != WINE_CRYPTCERTSTORE_MAGIC) - ret = FALSE; - else - ret = hcs->vtbl->certs.delete(hcs, &cert_from_ptr(pCertContext)->base); - } - return ret; + if (hcs->dwMagic != WINE_CRYPTCERTSTORE_MAGIC) + return FALSE; + + return hcs->vtbl->certs.delete(hcs, &cert_from_ptr(pCertContext)->base); } BOOL WINAPI CertAddCRLContextToStore(HCERTSTORE hCertStore, @@ -1091,25 +1084,20 @@ BOOL WINAPI CertAddCRLContextToStore(HCERTSTORE hCertStore, BOOL WINAPI CertDeleteCRLFromStore(PCCRL_CONTEXT pCrlContext) { + WINECRYPT_CERTSTORE *hcs = pCrlContext->hCertStore; BOOL ret; TRACE("(%p)\n", pCrlContext); if (!pCrlContext) - ret = TRUE; - else if (!pCrlContext->hCertStore) - ret = CertFreeCRLContext(pCrlContext); - else - { - WINECRYPT_CERTSTORE *hcs = pCrlContext->hCertStore; + return TRUE; - if (hcs->dwMagic != WINE_CRYPTCERTSTORE_MAGIC) - ret = FALSE; - else - ret = hcs->vtbl->crls.delete(hcs, &crl_from_ptr(pCrlContext)->base); - if (ret) - ret = CertFreeCRLContext(pCrlContext); - } + if (hcs->dwMagic != WINE_CRYPTCERTSTORE_MAGIC) + return FALSE; + + ret = hcs->vtbl->crls.delete(hcs, &crl_from_ptr(pCrlContext)->base); + if (ret) + ret = CertFreeCRLContext(pCrlContext); return ret; }

1 0

Jacek Caban : crypt32: Get rid of no longer needed contextInterface arguments.
by Alexandre Julliard 21 Oct '13

21 Oct '13

Module: wine Branch: master Commit: 9a4401afcb6d1fa7018d0ea1015d63be26e47c87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a4401afcb6d1fa7018d0ea10… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 21 15:59:55 2013 +0200 crypt32: Get rid of no longer needed contextInterface arguments. --- dlls/crypt32/collectionstore.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/collectionstore.c b/dlls/crypt32/collectionstore.c index 6abcef0..bfb83d1 100644 --- a/dlls/crypt32/collectionstore.c +++ b/dlls/crypt32/collectionstore.c @@ -148,7 +148,7 @@ static BOOL CRYPT_CollectionAddContext(WINE_COLLECTIONSTORE *store, */ static context_t *CRYPT_CollectionAdvanceEnum(WINE_COLLECTIONSTORE *store, WINE_STORE_LIST_ENTRY *storeEntry, const CONTEXT_FUNCS *contextFuncs, - const WINE_CONTEXT_INTERFACE *contextInterface, context_t *prev) + context_t *prev) { context_t *child, *ret; struct list *storeNext = list_next(&store->stores, &storeEntry->entry); @@ -188,7 +188,7 @@ static context_t *CRYPT_CollectionAdvanceEnum(WINE_COLLECTIONSTORE *store, (CONTEXT_FUNCS*)((LPBYTE)storeNextEntry->store->vtbl + offset); ret = CRYPT_CollectionAdvanceEnum(store, storeNextEntry, - storeNextContexts, contextInterface, NULL); + storeNextContexts, NULL); } else { @@ -235,7 +235,7 @@ static context_t *Collection_enumCert(WINECRYPT_CERTSTORE *store, context_t *pre WINE_STORE_LIST_ENTRY *storeEntry = prev->u.ptr; ret = CRYPT_CollectionAdvanceEnum(cs, storeEntry, - &storeEntry->store->vtbl->certs, pCertInterface, prev); + &storeEntry->store->vtbl->certs, prev); } else { @@ -245,7 +245,7 @@ static context_t *Collection_enumCert(WINECRYPT_CERTSTORE *store, context_t *pre WINE_STORE_LIST_ENTRY, entry); ret = CRYPT_CollectionAdvanceEnum(cs, storeEntry, - &storeEntry->store->vtbl->certs, pCertInterface, NULL); + &storeEntry->store->vtbl->certs, NULL); } else { @@ -304,7 +304,7 @@ static context_t *Collection_enumCRL(WINECRYPT_CERTSTORE *store, context_t *prev WINE_STORE_LIST_ENTRY *storeEntry = prev->u.ptr; ret = CRYPT_CollectionAdvanceEnum(cs, storeEntry, - &storeEntry->store->vtbl->crls, pCRLInterface, prev); + &storeEntry->store->vtbl->crls, prev); } else { @@ -314,7 +314,7 @@ static context_t *Collection_enumCRL(WINECRYPT_CERTSTORE *store, context_t *prev WINE_STORE_LIST_ENTRY, entry); ret = CRYPT_CollectionAdvanceEnum(cs, storeEntry, - &storeEntry->store->vtbl->crls, pCRLInterface, NULL); + &storeEntry->store->vtbl->crls, NULL); } else { @@ -372,7 +372,7 @@ static context_t *Collection_enumCTL(WINECRYPT_CERTSTORE *store, context_t *prev WINE_STORE_LIST_ENTRY *storeEntry = prev->u.ptr; ret = CRYPT_CollectionAdvanceEnum(cs, storeEntry, - &storeEntry->store->vtbl->ctls, pCTLInterface, prev); + &storeEntry->store->vtbl->ctls, prev); } else { @@ -382,7 +382,7 @@ static context_t *Collection_enumCTL(WINECRYPT_CERTSTORE *store, context_t *prev WINE_STORE_LIST_ENTRY, entry); ret = CRYPT_CollectionAdvanceEnum(cs, storeEntry, - &storeEntry->store->vtbl->ctls, pCTLInterface, NULL); + &storeEntry->store->vtbl->ctls, NULL); } else {

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2013