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

Henri Verbeet : wined3d: Don' t try to resolve vertex buffer locations in context_stream_info_from_declaration ().
by Alexandre Julliard July 14, 2014

July 14, 2014

Module: wine Branch: master Commit: 1360af6adcbc5c77a7b3c5e32f3c886e450456f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1360af6adcbc5c77a7b3c5e32… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 14 10:04:22 2014 +0200 wined3d: Don't try to resolve vertex buffer locations in context_stream_info_from_declaration(). --- dlls/wined3d/context.c | 99 +++++++++++++++++++++++--------------------------- dlls/wined3d/device.c | 18 +++++---- 2 files changed, 55 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1360af6adcbc5c77a7b3c…

1 0

Bruno Jesus : rsaenh/tests: Make the tests pass in Windows <= NT4.
by Alexandre Julliard July 14, 2014

July 14, 2014

Module: wine Branch: master Commit: 50ded4b2f8eb84001a318487dcffd9bec175fc90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50ded4b2f8eb84001a318487d… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jul 12 13:11:14 2014 -0300 rsaenh/tests: Make the tests pass in Windows <= NT4. --- dlls/rsaenh/tests/rsaenh.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index abc90e1..c90bc79 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -450,6 +450,11 @@ static void test_hashes(void) ok(!result && GetLastError() == NTE_BAD_FLAGS, "%08x\n", GetLastError()); result = CryptHashData(hHash, pbData, sizeof(pbData), CRYPT_USERDATA); + if (!result && GetLastError() == NTE_BAD_FLAGS) /* <= NT4 */ + { + ok(broken(1), "Failed to support CRYPT_USERDATA flag\n"); + result = CryptHashData(hHash, pbData, sizeof(pbData), 0); + } ok(result, "%08x\n", GetLastError()); len = sizeof(DWORD); @@ -477,6 +482,11 @@ static void test_hashes(void) ok(!result && GetLastError() == NTE_BAD_FLAGS, "%08x\n", GetLastError()); result = CryptHashData(hHash, pbData, sizeof(pbData), CRYPT_USERDATA); + if (!result && GetLastError() == NTE_BAD_FLAGS) /* <= NT4 */ + { + ok(broken(1), "Failed to support CRYPT_USERDATA flag\n"); + result = CryptHashData(hHash, pbData, sizeof(pbData), 0); + } ok(result, "%08x\n", GetLastError()); len = 16; @@ -526,6 +536,11 @@ static void test_hashes(void) ok(result, "%08x\n", GetLastError()); result = CryptHashData(hHash, pbData, 5, CRYPT_USERDATA); + if (!result && GetLastError() == NTE_BAD_FLAGS) /* <= NT4 */ + { + ok(broken(1), "Failed to support CRYPT_USERDATA flag\n"); + result = CryptHashData(hHash, pbData, 5, 0); + } ok(result, "%08x\n", GetLastError()); if(pCryptDuplicateHash) {

1 0

Henri Verbeet : wined3d: Clarify WINED3DUSAGE_WRITEONLY a bit.
by Alexandre Julliard July 14, 2014

July 14, 2014

Module: wine Branch: master Commit: 63f2b65141ada3e5c5ba55d606c0f2bf6dc7c626 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63f2b65141ada3e5c5ba55d60… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 14 10:04:23 2014 +0200 wined3d: Clarify WINED3DUSAGE_WRITEONLY a bit. --- dlls/wined3d/resource.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index caec580..934cabc 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -59,6 +59,12 @@ static void resource_check_usage(DWORD usage) | WINED3DUSAGE_OVERLAY | WINED3DUSAGE_TEXTURE; + /* WINED3DUSAGE_WRITEONLY is supposed to result in write-combined mappings + * being returned. OpenGL doesn't give us explicit control over that, but + * the hints and access flags we set for typical access patterns on + * dynamic resources should in theory have the same effect on the OpenGL + * driver. */ + if (usage & ~handled) FIXME("Unhandled usage flags %#x.\n", usage & ~handled); if ((usage & (WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY)) == WINED3DUSAGE_DYNAMIC)

1 0

Bruno Jesus : rsaenh/tests: Add DES/3DES-112 const buffer test.
by Alexandre Julliard July 14, 2014

July 14, 2014

Module: wine Branch: master Commit: c579945b98e86ad7dc7dbd4ae17a867d229cd6de URL: http://source.winehq.org/git/wine.git/?a=commit;h=c579945b98e86ad7dc7dbd4ae… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jul 12 13:11:30 2014 -0300 rsaenh/tests: Add DES/3DES-112 const buffer test. --- dlls/rsaenh/tests/rsaenh.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index c90bc79..4fabaad 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -802,6 +802,9 @@ static void test_3des112(void) BOOL result; DWORD dwLen; unsigned char pbData[16], enc_data[16], bad_data[16]; + static const BYTE des112[16] = { + 0x8e, 0x0c, 0x3c, 0xa3, 0x05, 0x88, 0x5f, 0x7a, + 0x32, 0xa1, 0x06, 0x52, 0x64, 0xd2, 0x44, 0x1c }; int i; result = derive_key(CALG_3DES_112, &hKey, 0); @@ -817,6 +820,8 @@ static void test_3des112(void) result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwLen, 16); ok(result, "%08x\n", GetLastError()); + ok(!memcmp(pbData, des112, sizeof(des112)), "3DES_112 encryption failed!\n"); + result = CryptDecrypt(hKey, 0, TRUE, 0, pbData, &dwLen); ok(result, "%08x\n", GetLastError()); @@ -886,9 +891,12 @@ static void test_des(void) BOOL result; DWORD dwLen, dwMode; unsigned char pbData[16], enc_data[16], bad_data[16]; + static const BYTE des[16] = { + 0x58, 0x86, 0x42, 0x46, 0x65, 0x4b, 0x92, 0x62, + 0xcf, 0x0f, 0x65, 0x37, 0x43, 0x7a, 0x82, 0xb9 }; int i; - result = derive_key(CALG_DES, &hKey, 56); + result = derive_key(CALG_DES, &hKey, 0); if (!result) { /* rsaenh compiled without OpenSSL */ ok(GetLastError()==NTE_BAD_ALGID, "%08x\n", GetLastError()); @@ -909,6 +917,8 @@ static void test_des(void) result = CryptEncrypt(hKey, 0, TRUE, 0, pbData, &dwLen, 16); ok(result, "%08x\n", GetLastError()); + ok(!memcmp(pbData, des, sizeof(des)), "DES encryption failed!\n"); + result = CryptDecrypt(hKey, 0, TRUE, 0, pbData, &dwLen); ok(result, "%08x\n", GetLastError());

1 0

Thomas Faber : cmd: Do not omit mandatory argument to WriteFile.
by Alexandre Julliard July 14, 2014

July 14, 2014

Module: wine Branch: master Commit: d4c4f0ab95871201ff120b6382bfbe722293d539 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4c4f0ab95871201ff120b638… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jul 12 10:39:13 2014 +0200 cmd: Do not omit mandatory argument to WriteFile. --- programs/cmd/builtins.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 4c95b43..cb7dfef 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -436,6 +436,7 @@ void WCMD_choice (const WCHAR * args) { static BOOL WCMD_AppendEOF(WCHAR *filename) { HANDLE h; + DWORD bytes_written; char eof = '\x1a'; @@ -448,7 +449,7 @@ static BOOL WCMD_AppendEOF(WCHAR *filename) return FALSE; } else { SetFilePointer (h, 0, NULL, FILE_END); - if (!WriteFile(h, &eof, 1, NULL, NULL)) { + if (!WriteFile(h, &eof, 1, &bytes_written, NULL)) { WINE_ERR("Failed to append EOF to %s (%d)\n", wine_dbgstr_w(filename), GetLastError()); CloseHandle(h); return FALSE;

1 0

Thomas Faber : wininet: Do not omit mandatory argument to WriteFile.
by Alexandre Julliard July 14, 2014

July 14, 2014

Module: wine Branch: master Commit: 9609df86e3ad9ec90ca936c3f11de7c60a4482ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=9609df86e3ad9ec90ca936c3f… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jul 12 10:30:29 2014 +0200 wininet: Do not omit mandatory argument to WriteFile. --- dlls/wininet/cookie.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index 34234db..2c8dd84 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -416,6 +416,7 @@ static BOOL save_persistent_cookie(cookie_container_t *container) BOOL do_save = FALSE; char buf[64], *dyn_buf; FILETIME time; + DWORD bytes_written; if (!create_cookie_url(container->domain->domain, container->path, cookie_url, sizeof(cookie_url)/sizeof(cookie_url[0]))) return FALSE; @@ -454,31 +455,31 @@ static BOOL save_persistent_cookie(cookie_container_t *container) continue; dyn_buf = heap_strdupWtoA(cookie_container->name); - if(!dyn_buf || !WriteFile(cookie_handle, dyn_buf, strlen(dyn_buf), NULL, NULL)) { + if(!dyn_buf || !WriteFile(cookie_handle, dyn_buf, strlen(dyn_buf), &bytes_written, NULL)) { heap_free(dyn_buf); do_save = FALSE; break; } heap_free(dyn_buf); - if(!WriteFile(cookie_handle, "\n", 1, NULL, NULL)) { + if(!WriteFile(cookie_handle, "\n", 1, &bytes_written, NULL)) { do_save = FALSE; break; } dyn_buf = heap_strdupWtoA(cookie_container->data); - if(!dyn_buf || !WriteFile(cookie_handle, dyn_buf, strlen(dyn_buf), NULL, NULL)) { + if(!dyn_buf || !WriteFile(cookie_handle, dyn_buf, strlen(dyn_buf), &bytes_written, NULL)) { heap_free(dyn_buf); do_save = FALSE; break; } heap_free(dyn_buf); - if(!WriteFile(cookie_handle, "\n", 1, NULL, NULL)) { + if(!WriteFile(cookie_handle, "\n", 1, &bytes_written, NULL)) { do_save = FALSE; break; } dyn_buf = heap_strdupWtoA(container->domain->domain); - if(!dyn_buf || !WriteFile(cookie_handle, dyn_buf, strlen(dyn_buf), NULL, NULL)) { + if(!dyn_buf || !WriteFile(cookie_handle, dyn_buf, strlen(dyn_buf), &bytes_written, NULL)) { heap_free(dyn_buf); do_save = FALSE; break; @@ -486,7 +487,7 @@ static BOOL save_persistent_cookie(cookie_container_t *container) heap_free(dyn_buf); dyn_buf = heap_strdupWtoA(container->path); - if(!dyn_buf || !WriteFile(cookie_handle, dyn_buf, strlen(dyn_buf), NULL, NULL)) { + if(!dyn_buf || !WriteFile(cookie_handle, dyn_buf, strlen(dyn_buf), &bytes_written, NULL)) { heap_free(dyn_buf); do_save = FALSE; break; @@ -496,7 +497,7 @@ static BOOL save_persistent_cookie(cookie_container_t *container) sprintf(buf, "\n%u\n%u\n%u\n%u\n%u\n*\n", cookie_container->flags, cookie_container->expiry.dwLowDateTime, cookie_container->expiry.dwHighDateTime, cookie_container->create.dwLowDateTime, cookie_container->create.dwHighDateTime); - if(!WriteFile(cookie_handle, buf, strlen(buf), NULL, NULL)) { + if(!WriteFile(cookie_handle, buf, strlen(buf), &bytes_written, NULL)) { do_save = FALSE; break; }

1 0

Jacek Caban : wininet: Rewrite structs storing cookies to represent domains as a tree.
by Alexandre Julliard July 14, 2014

July 14, 2014

Module: wine Branch: master Commit: 4707b4483bfaa4ef55c6c0665dd20fe6c26226e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4707b4483bfaa4ef55c6c0665… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 14 15:21:38 2014 +0200 wininet: Rewrite structs storing cookies to represent domains as a tree. --- dlls/wininet/cookie.c | 571 ++++++++++++++++++++++++++------------------------ 1 file changed, 301 insertions(+), 270 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4707b4483bfaa4ef55c6c…

1 0

Thomas Faber : d3dx9_36: Do not omit mandatory argument to WriteFile.
by Alexandre Julliard July 14, 2014

July 14, 2014

Module: wine Branch: master Commit: 5bd5c89596f66bb13a0f2ceb4be41dd24b438d83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bd5c89596f66bb13a0f2ceb4… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jul 12 10:32:44 2014 +0200 d3dx9_36: Do not omit mandatory argument to WriteFile. --- dlls/d3dx9_36/util.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index 3b3f308..94899cf 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -181,6 +181,7 @@ HRESULT write_buffer_to_file(const WCHAR *dst_filename, ID3DXBuffer *buffer) HRESULT hr = S_OK; void *buffer_pointer; DWORD buffer_size; + DWORD bytes_written; HANDLE file = CreateFileW(dst_filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); if (file == INVALID_HANDLE_VALUE) return HRESULT_FROM_WIN32(GetLastError()); @@ -188,7 +189,7 @@ HRESULT write_buffer_to_file(const WCHAR *dst_filename, ID3DXBuffer *buffer) buffer_pointer = ID3DXBuffer_GetBufferPointer(buffer); buffer_size = ID3DXBuffer_GetBufferSize(buffer); - if (!WriteFile(file, buffer_pointer, buffer_size, NULL, NULL)) + if (!WriteFile(file, buffer_pointer, buffer_size, &bytes_written, NULL)) hr = HRESULT_FROM_WIN32(GetLastError()); CloseHandle(file);

1 0

Thomas Faber : d3dxof: Do not omit mandatory argument to WriteFile.
by Alexandre Julliard July 14, 2014

July 14, 2014

Module: wine Branch: master Commit: 21b821677394ce760ad4e3065031f2d358961bab URL: http://source.winehq.org/git/wine.git/?a=commit;h=21b821677394ce760ad4e3065… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jul 12 10:33:21 2014 +0200 d3dxof: Do not omit mandatory argument to WriteFile. --- dlls/d3dxof/d3dxof.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 4172c62..8ca5793 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -136,6 +136,7 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV HRESULT hr; LPBYTE file_buffer; DWORD file_size; + DWORD bytes_written; TRACE("(%p/%p)->(%p,%x,%p)\n", This, iface, pvSource, dwLoadOptions, ppEnumObj); @@ -240,7 +241,7 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV file = CreateFileA(tmp, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, 0, NULL); if (file != INVALID_HANDLE_VALUE) { - WriteFile(file, file_buffer, file_size, NULL, NULL); + WriteFile(file, file_buffer, file_size, &bytes_written, NULL); CloseHandle(file); } } @@ -304,6 +305,7 @@ static HRESULT WINAPI IDirectXFileImpl_RegisterTemplates(IDirectXFile* iface, LP parse_buffer buf; HRESULT hr; LPBYTE decomp_buffer = NULL; + DWORD bytes_written; ZeroMemory(&buf, sizeof(buf)); buf.buffer = pvData; @@ -325,7 +327,7 @@ static HRESULT WINAPI IDirectXFileImpl_RegisterTemplates(IDirectXFile* iface, LP file = CreateFileA(tmp, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, 0, NULL); if (file != INVALID_HANDLE_VALUE) { - WriteFile(file, pvData, cbSize, NULL, NULL); + WriteFile(file, pvData, cbSize, &bytes_written, NULL); CloseHandle(file); } }

1 0

Jacek Caban : wininet: Use stored server name in HTTP_InsertCookies.
by Alexandre Julliard July 14, 2014

July 14, 2014

Module: wine Branch: master Commit: ffec675b4f1dfdadda6635f2a819b126ac00338c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffec675b4f1dfdadda6635f2a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 14 15:21:11 2014 +0200 wininet: Use stored server name in HTTP_InsertCookies. --- dlls/wininet/http.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index ffd31e6..8ff42a2 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4177,16 +4177,11 @@ static LPWSTR HTTP_build_req( LPCWSTR *list, int len ) static void HTTP_InsertCookies(http_request_t *request) { DWORD cookie_size, size, cnt = 0; - HTTPHEADERW *host; WCHAR *cookies; static const WCHAR cookieW[] = {'C','o','o','k','i','e',':',' ',0}; - host = HTTP_GetHeader(request, hostW); - if(!host) - return; - - if(get_cookie(host->lpszValue, request->path, NULL, &cookie_size, INTERNET_COOKIE_HTTPONLY) != ERROR_SUCCESS) + if(get_cookie(request->server->name, request->path, NULL, &cookie_size, INTERNET_COOKIE_HTTPONLY) != ERROR_SUCCESS) return; size = sizeof(cookieW) + cookie_size * sizeof(WCHAR) + sizeof(szCrLf); @@ -4194,7 +4189,7 @@ static void HTTP_InsertCookies(http_request_t *request) return; cnt += sprintfW(cookies, cookieW); - get_cookie(host->lpszValue, request->path, cookies+cnt, &cookie_size, INTERNET_COOKIE_HTTPONLY); + get_cookie(request->server->name, request->path, cookies+cnt, &cookie_size, INTERNET_COOKIE_HTTPONLY); strcatW(cookies, szCrLf); HTTP_HttpAddRequestHeadersW(request, cookies, strlenW(cookies), HTTP_ADDREQ_FLAG_REPLACE);

1 0