July 2014 - Wine-commits - list.winehq.org

Andrei Slăvoiu : wined3d: Make the card selection for AMD binary driver use arrays only.
by Alexandre Julliard 30 Jul '14

30 Jul '14

Module: wine Branch: master Commit: 1e7c5d8ca4e1eb6cb7a79258a195a0ed20aee807 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e7c5d8ca4e1eb6cb7a79258a… Author: Andrei Slăvoiu <andrei.slavoiu(a)gmail.com> Date: Sat Jul 26 21:24:32 2014 +0300 wined3d: Make the card selection for AMD binary driver use arrays only. --- dlls/wined3d/directx.c | 53 +++++++++++++++++++------------------------------- 1 file changed, 20 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 222cc48..e67d985 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1900,6 +1900,26 @@ static enum wined3d_pci_device select_card_amd_binary(const char *gl_renderer) {"HD 3400", CARD_AMD_RADEON_HD2350}, /* HD2350/HD2400/HD3400 - lowend */ {"HD 2400", CARD_AMD_RADEON_HD2350}, /* HD2350/HD2400/HD3400 - lowend */ {"HD 2350", CARD_AMD_RADEON_HD2350}, /* HD2350/HD2400/HD3400 - lowend */ + /* Radeon R5xx */ + {"X1950", CARD_AMD_RADEON_X1600}, + {"X1900", CARD_AMD_RADEON_X1600}, + {"X1800", CARD_AMD_RADEON_X1600}, + {"X1650", CARD_AMD_RADEON_X1600}, + {"X1600", CARD_AMD_RADEON_X1600}, + /* Radeon R4xx + X1300/X1400/X1450/X1550/X2300/X2500/HD2300 (lowend R5xx) + * Note X2300/X2500/HD2300 are R5xx GPUs with a 2xxx naming but they are still DX9-only */ + {"HD 2300", CARD_AMD_RADEON_X700}, + {"X2500", CARD_AMD_RADEON_X700}, + {"X2300", CARD_AMD_RADEON_X700}, + {"X1550", CARD_AMD_RADEON_X700}, + {"X1450", CARD_AMD_RADEON_X700}, + {"X1400", CARD_AMD_RADEON_X700}, + {"X1300", CARD_AMD_RADEON_X700}, + {"X850", CARD_AMD_RADEON_X700}, + {"X800", CARD_AMD_RADEON_X700}, + {"X700", CARD_AMD_RADEON_X700}, + /* Radeon Xpress Series - onboard, DX9b, Shader 2.0, 300-400 MHz */ + {"Radeon Xpress", CARD_AMD_RADEON_XPRESS_200M}, }; for (i = 0; i < sizeof(cards) / sizeof(*cards); ++i) @@ -1908,39 +1928,6 @@ static enum wined3d_pci_device select_card_amd_binary(const char *gl_renderer) return cards[i].id; } - /* Radeon R5xx */ - if (strstr(gl_renderer, "X1600") - || strstr(gl_renderer, "X1650") - || strstr(gl_renderer, "X1800") - || strstr(gl_renderer, "X1900") - || strstr(gl_renderer, "X1950")) - { - return CARD_AMD_RADEON_X1600; - } - - /* Radeon R4xx + X1300/X1400/X1450/X1550/X2300/X2500/HD2300 (lowend R5xx) - * Note X2300/X2500/HD2300 are R5xx GPUs with a 2xxx naming but they are still DX9-only */ - if (strstr(gl_renderer, "X700") - || strstr(gl_renderer, "X800") - || strstr(gl_renderer, "X850") - || strstr(gl_renderer, "X1300") - || strstr(gl_renderer, "X1400") - || strstr(gl_renderer, "X1450") - || strstr(gl_renderer, "X1550") - || strstr(gl_renderer, "X2300") - || strstr(gl_renderer, "X2500") - || strstr(gl_renderer, "HD 2300") - ) - { - return CARD_AMD_RADEON_X700; - } - - /* Radeon Xpress Series - onboard, DX9b, Shader 2.0, 300-400 MHz */ - if (strstr(gl_renderer, "Radeon Xpress")) - { - return CARD_AMD_RADEON_XPRESS_200M; - } - return PCI_DEVICE_NONE; }

1 0

Andrei Slăvoiu : wined3d: Replace vendor specific callbacks with generic code that uses vendor specific renderer string tables.
by Alexandre Julliard 30 Jul '14

30 Jul '14

Module: wine Branch: master Commit: 01b2b3074d60e021c5ae53ba0e94cbfde19a2085 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01b2b3074d60e021c5ae53ba0… Author: Andrei Slăvoiu <andrei.slavoiu(a)gmail.com> Date: Mon Jul 28 23:06:52 2014 +0300 wined3d: Replace vendor specific callbacks with generic code that uses vendor specific renderer string tables. --- dlls/wined3d/directx.c | 971 ++++++++++++++++++++++--------------------------- 1 file changed, 445 insertions(+), 526 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=01b2b3074d60e021c5ae5…

1 0

Nikolay Sivov : dwrite: Added some layout tests, simplify debug output for text ranges.
by Alexandre Julliard 30 Jul '14

30 Jul '14

Module: wine Branch: master Commit: 1c23bf04c77fd3f7078c2d836e5c5c39c0ee6280 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c23bf04c77fd3f7078c2d836… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jul 30 19:21:36 2014 +0400 dwrite: Added some layout tests, simplify debug output for text ranges. --- dlls/dwrite/analyzer.c | 2 - dlls/dwrite/dwrite_private.h | 6 +++ dlls/dwrite/font.c | 2 - dlls/dwrite/layout.c | 26 +++++------ dlls/dwrite/tests/layout.c | 102 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 120 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c23bf04c77fd3f7078c2…

1 0

Ken Thomases : ntdll: In find_file_in_dir(), don't test directory entries' short names if the target name isn't a short name.
by Alexandre Julliard 30 Jul '14

30 Jul '14

Module: wine Branch: master Commit: a14ed527d858e22cc754a5513eabf7c250eec7a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a14ed527d858e22cc754a5513… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jul 28 12:58:23 2014 -0500 ntdll: In find_file_in_dir(), don't test directory entries' short names if the target name isn't a short name. hash_short_file_name() will always create a short name of at least 8 characters with the 5th being a tilde (~). If the target name isn't of that form, then it can never match any short name constructed from the directory entries. --- dlls/ntdll/directory.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 04a5b75..a2796b2 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2250,6 +2250,9 @@ static NTSTATUS find_file_in_dir( char *unix_name, int pos, const WCHAR *name, i str.Length = length * sizeof(WCHAR); str.MaximumLength = str.Length; is_name_8_dot_3 = RtlIsNameLegalDOS8Dot3( &str, NULL, &spaces ) && !spaces; +#ifndef VFAT_IOCTL_READDIR_BOTH + is_name_8_dot_3 = is_name_8_dot_3 && length >= 8 && name[4] == '~'; +#endif if (!is_name_8_dot_3 && !get_dir_case_sensitivity( unix_name )) goto not_found;

1 0

Ken Thomases : winemac: Use new API when available to list all display modes available on Retina Macs.
by Alexandre Julliard 30 Jul '14

30 Jul '14

Module: wine Branch: master Commit: c3d7f5b7ec8ce1142ad23e477eee8d3ff2fbf991 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3d7f5b7ec8ce1142ad23e477… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jul 28 19:16:43 2014 -0500 winemac: Use new API when available to list all display modes available on Retina Macs. --- dlls/winemac.drv/cocoa_app.m | 17 +++- dlls/winemac.drv/display.c | 179 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 193 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c3d7f5b7ec8ce1142ad23…

1 0

Bruno Jesus : winhttp/tests: Add a no-content header test.
by Alexandre Julliard 30 Jul '14

30 Jul '14

Module: wine Branch: master Commit: 1697eb6ee227b23d097b53ee01aac286f73b5ec1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1697eb6ee227b23d097b53ee0… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jul 30 13:31:17 2014 -0300 winhttp/tests: Add a no-content header test. --- dlls/winhttp/tests/winhttp.c | 87 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index f214879..0d8f8be 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1767,6 +1767,11 @@ static const char okmsg[] = "Server: winetest\r\n" "\r\n"; +static const char nocontentmsg[] = +"HTTP/1.1 204 No Content\r\n" +"Server: winetest\r\n" +"\r\n"; + static const char noauthmsg[] = "HTTP/1.1 401 Unauthorized\r\n" "Server: winetest\r\n" @@ -1850,6 +1855,10 @@ static DWORD CALLBACK server_thread(LPVOID param) { send(c, page1, sizeof page1 - 1, 0); } + if (strstr(buffer, "GET /no_content")) + { + send(c, nocontentmsg, sizeof nocontentmsg - 1, 0); + } if (strstr(buffer, "GET /quit")) { send(c, okmsg, sizeof okmsg - 1, 0); @@ -2087,6 +2096,83 @@ static void test_no_headers(int port) WinHttpCloseHandle(ses); } +static void test_no_content(int port) +{ + static const WCHAR no_contentW[] = {'/','n','o','_','c','o','n','t','e','n','t',0}; + HINTERNET ses, con, req; + WCHAR buf[128]; + DWORD size, len = sizeof(buf), bytes_read, status; + BOOL ret; + + ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); + ok(ses != NULL, "failed to open session %u\n", GetLastError()); + + con = WinHttpConnect(ses, localhostW, port, 0); + ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + + req = WinHttpOpenRequest(con, NULL, no_contentW, NULL, NULL, NULL, 0); + ok(req != NULL, "failed to open a request %u\n", GetLastError()); + + size = 12345; + SetLastError(0xdeadbeef); + ret = WinHttpQueryDataAvailable(req, &size); + todo_wine { + ok(!ret, "expected error\n"); + ok(GetLastError() == ERROR_WINHTTP_INCORRECT_HANDLE_STATE, + "expected ERROR_WINHTTP_INCORRECT_HANDLE_STATE, got 0x%08x\n", GetLastError()); + ok(size == 12345 || broken(size == 0) /* Win <= 2003 */, + "expected 12345, got %u\n", size); + } + + ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); + ok(ret, "expected success\n"); + + ret = WinHttpReceiveResponse(req, NULL); + ok(ret, "expected success\n"); + + size = sizeof(status); + ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, + NULL, &status, &size, NULL); + ok(ret, "expected success\n"); + ok(status == 204, "expected status 204, got %d\n", status); + + SetLastError(0xdeadbeef); + size = sizeof(status); + status = 12345; + ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_CONTENT_LENGTH | WINHTTP_QUERY_FLAG_NUMBER, + NULL, &status, &size, 0); + ok(!ret, "expected no content-length header\n"); + ok(GetLastError() == ERROR_WINHTTP_HEADER_NOT_FOUND, + "wrong error %u\n", GetLastError() ); + ok(status == 12345, "expected 0, got %d\n", status); + + size = 12345; + ret = WinHttpQueryDataAvailable(req, &size); + ok(ret, "expected success\n"); + ok(size == 0, "expected 0, got %d\n", size); + + ret = WinHttpReadData(req, buf, len, &bytes_read); + ok( bytes_read == 0, "expected 0, got %u available\n", bytes_read ); + + size = 12345; + ret = WinHttpQueryDataAvailable(req, &size); + ok(ret, "expected success\n"); + ok(size == 0, "expected 0, got %d\n", size); + + WinHttpCloseHandle(req); + + size = 12345; + SetLastError(0xdeadbeef); + ret = WinHttpQueryDataAvailable(req, &size); + ok(!ret, "expected error\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, + "expected ERROR_INVALID_HANDLE, got 0x%08x\n", GetLastError()); + ok(size == 12345, "expected 12345, got %u\n", size); + + WinHttpCloseHandle(con); + WinHttpCloseHandle(ses); +} + static void test_bad_header( int port ) { static const WCHAR bad_headerW[] = @@ -3078,6 +3164,7 @@ START_TEST (winhttp) test_connection_info(si.port); test_basic_request(si.port, NULL, basicW); test_no_headers(si.port); + test_no_content(si.port); test_basic_authentication(si.port); test_bad_header(si.port); test_multiple_reads(si.port);

1 0

Bruno Jesus : rsaenh/tests: Run the tests in the Base and Strong providers too.
by Alexandre Julliard 30 Jul '14

30 Jul '14

Module: wine Branch: master Commit: d429e602af82c39fd2d4d4d0dc8ae77aa123e7f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d429e602af82c39fd2d4d4d0d… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Jul 30 16:21:26 2014 -0300 rsaenh/tests: Run the tests in the Base and Strong providers too. --- dlls/rsaenh/tests/rsaenh.c | 124 ++++++++++++++++++++++++++++++++------------- 1 file changed, 90 insertions(+), 34 deletions(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 7106c80..1dfca3c 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -30,8 +30,14 @@ #include "winreg.h" static HCRYPTPROV hProv; +static const char *szProviders[] = {MS_ENHANCED_PROV_A, MS_DEF_PROV_A, MS_STRONG_PROV_A}; +static int iProv; static const char szContainer[] = "winetest"; -static const char szProvider[] = MS_ENHANCED_PROV_A; +static const char *szProvider; + +#define ENHANCED_PROV (iProv == 0) +#define BASE_PROV (iProv == 1) +#define STRONG_PROV (iProv == 2) typedef struct _ctdatatype { unsigned char origstr[32]; @@ -122,10 +128,12 @@ static void trace_hex(BYTE *pbData, DWORD dwLen) { } */ -static BOOL init_base_environment(DWORD dwKeyFlags) +static BOOL init_base_environment(const char *provider, DWORD dwKeyFlags) { HCRYPTKEY hKey; BOOL result; + + if (provider) szProvider = provider; pCryptDuplicateHash = (void *)GetProcAddress(GetModuleHandleA("advapi32.dll"), "CryptDuplicateHash"); @@ -901,6 +909,9 @@ static void test_des(void) static const BYTE des_old_behavior[16] = { 0xb0, 0xfd, 0x11, 0x69, 0x76, 0xb1, 0xa1, 0x03, 0xf7, 0xbc, 0x23, 0xaa, 0xd4, 0xc1, 0xc9, 0x55 }; + static const BYTE des_old_strong[16] = { + 0x9b, 0xc1, 0x2a, 0xec, 0x4a, 0xf9, 0x0f, 0x14, + 0x0a, 0xed, 0xf6, 0xd3, 0xdc, 0xad, 0xf7, 0x0c }; int i; result = derive_key(CALG_DES, &hKey, 0); @@ -1001,8 +1012,9 @@ static void test_des(void) dwLen = 13; result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwLen, 16); ok(result, "%08x\n", GetLastError()); - - ok(!memcmp(pbData, des, sizeof(des)) || broken(!memcmp(pbData, des_old_behavior, sizeof(des))) /* <= 2000 */, + ok(!memcmp(pbData, des, sizeof(des)) || broken( + !memcmp(pbData, des_old_behavior, sizeof(des)) || + (STRONG_PROV && !memcmp(pbData, des_old_strong, sizeof(des)))) /* <= 2000 */, "DES encryption failed!\n"); result = CryptDestroyKey(hKey); @@ -1337,8 +1349,11 @@ static void test_rc2(void) 0xc0, 0x9a, 0xe4, 0x2f, 0x0a, 0x47, 0x67, 0x11, 0xfb, 0x18, 0x87, 0xce, 0x0c, 0x75, 0x07, 0xb1 }; static const BYTE rc2_128_encrypted[] = { - 0x82,0x81,0xf7,0xff,0xdd,0xd7,0x88,0x8c,0x2a,0x2a,0xc0,0xce,0x4c,0x89, - 0xb6,0x66 }; + 0x82,0x81,0xf7,0xff,0xdd,0xd7,0x88,0x8c, + 0x2a,0x2a,0xc0,0xce,0x4c,0x89,0xb6,0x66 }; + static const BYTE rc2_40def_encrypted[] = { + 0x23,0xc8,0x70,0x13,0x42,0x2e,0xa8,0x98, + 0x5c,0xdf,0x7a,0x9b,0xea,0xdb,0x96,0x1b }; HCRYPTHASH hHash; HCRYPTKEY hKey; BOOL result; @@ -1511,13 +1526,28 @@ static void test_rc2(void) dwKeyLen = 128; result = CryptSetKeyParam(hKey, KP_EFFECTIVE_KEYLEN, (LPBYTE)&dwKeyLen, 0); - ok(result, "%d\n", GetLastError()); + if (!BASE_PROV) + ok(result, "expected success, got error 0x%08X\n", GetLastError()); + else + todo_wine + ok(!result, "expected error\n"); dwLen = sizeof(dwKeyLen); CryptGetKeyParam(hKey, KP_KEYLEN, (BYTE *)&dwKeyLen, &dwLen, 0); ok(dwKeyLen == 56, "%d (%08x)\n", dwKeyLen, GetLastError()); CryptGetKeyParam(hKey, KP_EFFECTIVE_KEYLEN, (BYTE *)&dwKeyLen, &dwLen, 0); - ok(dwKeyLen == 128, "%d (%08x)\n", dwKeyLen, GetLastError()); + /* Remove IF when fixed */ + if(BASE_PROV) + { + todo_wine + ok((!BASE_PROV && dwKeyLen == 128) || (BASE_PROV && dwKeyLen == 40), + "%d (%08x)\n", dwKeyLen, GetLastError()); + } + else + { + ok((!BASE_PROV && dwKeyLen == 128) || (BASE_PROV && dwKeyLen == 40), + "%d (%08x)\n", dwKeyLen, GetLastError()); + } result = CryptDestroyHash(hHash); ok(result, "%08x\n", GetLastError()); @@ -1526,8 +1556,18 @@ static void test_rc2(void) result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwDataLen, 24); ok(result, "%08x\n", GetLastError()); - ok(!memcmp(pbData, rc2_128_encrypted, sizeof(rc2_128_encrypted)), - "RC2 encryption failed!\n"); + /* Remove IF when fixed */ + if(BASE_PROV) + { + todo_wine + ok(!memcmp(pbData, !BASE_PROV ? rc2_128_encrypted : rc2_40def_encrypted, + sizeof(rc2_128_encrypted)), "RC2 encryption failed!\n"); + } + else + { + ok(!memcmp(pbData, !BASE_PROV ? rc2_128_encrypted : rc2_40def_encrypted, + sizeof(rc2_128_encrypted)), "RC2 encryption failed!\n"); + } /* Oddly enough this succeeds, though it should have no effect */ dwKeyLen = 40; @@ -1795,8 +1835,9 @@ static void test_import_private(void) dwLen = (DWORD)sizeof(abEncryptedMessage); result = CryptDecrypt(hSessionKey, 0, TRUE, 0, abEncryptedMessage, &dwLen); - ok(result && dwLen == 12 && !memcmp(abEncryptedMessage, "Wine rocks!",12), - "%08x, len: %d\n", GetLastError(), dwLen); + ok(result, "%08x\n", GetLastError()); + ok(dwLen == 12, "expected 12, got %d\n", dwLen); + ok(!memcmp(abEncryptedMessage, "Wine rocks!", 12), "decrypt failed\n"); CryptDestroyKey(hSessionKey); if (!derive_key(CALG_RC4, &hSessionKey, 56)) return; @@ -2132,6 +2173,11 @@ static void test_rsa_encrypt(void) dwLen = 12; result = CryptEncrypt(hRSAKey, 0, TRUE, 0, NULL, &dwLen, (DWORD)sizeof(abData)); + if(!ENHANCED_PROV && !result && GetLastError() == NTE_BAD_KEY) + { + CryptDestroyKey(hRSAKey); + return; + } ok(result, "CryptEncrypt failed: %08x\n", GetLastError()); ok(dwLen == 128, "Unexpected length %d\n", dwLen); dwLen = 12; @@ -3123,7 +3169,7 @@ static void test_key_permissions(void) BOOL result; /* Create keys that are exportable */ - if (!init_base_environment(CRYPT_EXPORTABLE)) + if (!init_base_environment(NULL, CRYPT_EXPORTABLE)) return; result = CryptGetUserKey(hProv, AT_KEYEXCHANGE, &hKey1); @@ -3576,27 +3622,37 @@ err: START_TEST(rsaenh) { - if (!init_base_environment(0)) - return; - test_prov(); - test_gen_random(); - test_hashes(); - test_rc4(); - test_rc2(); - test_des(); - test_3des112(); - test_3des(); - test_hmac(); - test_mac(); - test_block_cipher_modes(); - test_import_private(); - test_verify_signature(); - test_rsa_encrypt(); - test_import_export(); - test_import_hmac(); - test_enum_container(); - test_key_derivation("RSA"); - clean_up_base_environment(); + for (iProv = 0; iProv < sizeof(szProviders) / sizeof(szProviders[0]); iProv++) + { + if (!init_base_environment(szProviders[iProv], 0)) + return; + trace("Testing '%s'\n", szProviders[iProv]); + test_prov(); + test_gen_random(); + test_hashes(); + test_rc4(); + test_rc2(); + test_des(); + if(!BASE_PROV) + { + test_3des112(); + test_3des(); + } + if(ENHANCED_PROV) + { + test_import_private(); + } + test_hmac(); + test_mac(); + test_block_cipher_modes(); + test_verify_signature(); + test_rsa_encrypt(); + test_import_export(); + test_import_hmac(); + test_enum_container(); + if(!BASE_PROV) test_key_derivation(STRONG_PROV ? "STRONG" : "ENH"); + clean_up_base_environment(); + } test_key_permissions(); test_key_initialization(); test_schannel_provider();

1 0

Stefan Dösinger : user32: Make GetRegisteredRawInputDevices hotpatchable.
by Alexandre Julliard 30 Jul '14

30 Jul '14

Module: wine Branch: master Commit: 3e993bf1d8a4fa4f4929e6bb3b0df68529fbcacc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e993bf1d8a4fa4f4929e6bb3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 30 20:45:20 2014 +0000 user32: Make GetRegisteredRawInputDevices hotpatchable. --- dlls/user32/input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 457e67c..ec81e60 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -696,7 +696,7 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT /****************************************************************** * GetRegisteredRawInputDevices (USER32.@) */ -UINT WINAPI GetRegisteredRawInputDevices(PRAWINPUTDEVICE pRawInputDevices, PUINT puiNumDevices, UINT cbSize) +UINT WINAPI DECLSPEC_HOTPATCH GetRegisteredRawInputDevices(PRAWINPUTDEVICE pRawInputDevices, PUINT puiNumDevices, UINT cbSize) { FIXME("(pRawInputDevices=%p, puiNumDevices=%p, cbSize=%d) stub!\n", pRawInputDevices, puiNumDevices, cbSize);

1 0

Bruno Jesus : rsaenh: Detect AES prototype provider correctly.
by Alexandre Julliard 28 Jul '14

28 Jul '14

Module: wine Branch: master Commit: d2793fe242ac65b4e41cc11e8012e6e6379831f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2793fe242ac65b4e41cc11e8… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jul 26 17:41:58 2014 -0300 rsaenh: Detect AES prototype provider correctly. --- dlls/rsaenh/rsaenh.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index b4829f0..3ad28f9 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -1286,7 +1286,8 @@ static HCRYPTPROV new_key_container(PCCH pszContainerName, DWORD dwFlags, const pKeyContainer->dwPersonality = RSAENH_PERSONALITY_ENHANCED; } else if (!strcmp(pVTable->pszProvName, MS_DEF_RSA_SCHANNEL_PROV_A)) { pKeyContainer->dwPersonality = RSAENH_PERSONALITY_SCHANNEL; - } else if (!strcmp(pVTable->pszProvName, MS_ENH_RSA_AES_PROV_A)) { + } else if (!strcmp(pVTable->pszProvName, MS_ENH_RSA_AES_PROV_A) || + !strcmp(pVTable->pszProvName, MS_ENH_RSA_AES_PROV_XP_A)) { pKeyContainer->dwPersonality = RSAENH_PERSONALITY_AES; } else { pKeyContainer->dwPersonality = RSAENH_PERSONALITY_STRONG;

1 0

Bruno Jesus : dmime/tests: Fix a crash in Windows 2000.
by Alexandre Julliard 28 Jul '14

28 Jul '14

Module: wine Branch: master Commit: 147bf5bd6f3c5f96ad8725ebfbba23fcfe406fc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=147bf5bd6f3c5f96ad8725ebf… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jul 26 23:31:42 2014 -0300 dmime/tests: Fix a crash in Windows 2000. --- dlls/dmime/tests/dmime.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 1258d40..03b0a37 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -380,6 +380,10 @@ static void test_audiopathconfig(void) hr = CoCreateInstance(&CLSID_DirectMusicAudioPathConfig, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (void**)&dmo); + if (hr == REGDB_E_CLASSNOTREG) { + win_skip("DirectMusicAudioPathConfig not registered\n"); + return; + } ok(hr == S_OK, "DirectMusicAudioPathConfig create failed: %08x, expected S_OK\n", hr); /* IPersistStream */

1 0