December 2009 - Wine-commits

Juan Lang : rsaenh: Use helper function to release and install a key into a crypt provider.
by Alexandre Julliard 09 Dec '09

09 Dec '09

Module: wine Branch: master Commit: ac4ac88a517f125d4ac0366d71fdcb9d5a8c7914 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac4ac88a517f125d4ac0366d7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Dec 8 13:17:59 2009 -0800 rsaenh: Use helper function to release and install a key into a crypt provider. --- dlls/rsaenh/rsaenh.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 0228696..2ccbf5c 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -3065,9 +3065,9 @@ BOOL WINAPI RSAENH_CPGenKey(HCRYPTPROV hProv, ALG_ID Algid, DWORD dwFlags, HCRYP if (pCryptKey) { new_key_impl(pCryptKey->aiAlgid, &pCryptKey->context, pCryptKey->dwKeyLen); setup_key(pCryptKey); - RSAENH_CPDestroyKey(hProv, pKeyContainer->hSignatureKeyPair); - copy_handle(&handle_table, *phKey, RSAENH_MAGIC_KEY, - &pKeyContainer->hSignatureKeyPair); + release_and_install_key(hProv, *phKey, + &pKeyContainer->hSignatureKeyPair, + FALSE); } break; @@ -3077,9 +3077,9 @@ BOOL WINAPI RSAENH_CPGenKey(HCRYPTPROV hProv, ALG_ID Algid, DWORD dwFlags, HCRYP if (pCryptKey) { new_key_impl(pCryptKey->aiAlgid, &pCryptKey->context, pCryptKey->dwKeyLen); setup_key(pCryptKey); - RSAENH_CPDestroyKey(hProv, pKeyContainer->hKeyExchangeKeyPair); - copy_handle(&handle_table, *phKey, RSAENH_MAGIC_KEY, - &pKeyContainer->hKeyExchangeKeyPair); + release_and_install_key(hProv, *phKey, + &pKeyContainer->hKeyExchangeKeyPair, + FALSE); } break;

1 0

Juan Lang : rsaenh: Free a verify context's keys when it's destroyed.
by Alexandre Julliard 09 Dec '09

09 Dec '09

Module: wine Branch: master Commit: 71880e48184ec66fbb04d074404c5c3e8f32fe35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71880e48184ec66fbb04d0744… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Dec 8 13:32:19 2009 -0800 rsaenh: Free a verify context's keys when it's destroyed. --- dlls/rsaenh/rsaenh.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 2ccbf5c..5c2b8b0 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -1219,6 +1219,8 @@ static void destroy_key_container(OBJECTHDR *pObjectHdr) store_key_container_permissions(pKeyContainer); release_key_container_keys(pKeyContainer); } + else + release_key_container_keys(pKeyContainer); HeapFree( GetProcessHeap(), 0, pKeyContainer ); }

1 0

Juan Lang : winhttp/tests: Only free a certificate context if retrieving it succeeded.
by Alexandre Julliard 09 Dec '09

09 Dec '09

Module: wine Branch: master Commit: b0f5b96efe86a0728b4c69198b2b9404b4684e02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0f5b96efe86a0728b4c69198… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Dec 8 13:43:49 2009 -0800 winhttp/tests: Only free a certificate context if retrieving it succeeded. --- dlls/winhttp/tests/winhttp.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 2810fbb..342dde2 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -787,7 +787,8 @@ static void test_secure_connection(void) size = sizeof(cert); ret = WinHttpQueryOption(req, WINHTTP_OPTION_SERVER_CERT_CONTEXT, &cert, &size ); ok(ret, "failed to retrieve certificate context %u\n", GetLastError()); - CertFreeCertificateContext(cert); + if (ret) + CertFreeCertificateContext(cert); size = sizeof(bitness); ret = WinHttpQueryOption(req, WINHTTP_OPTION_SECURITY_KEY_BITNESS, &bitness, &size );

1 0

Jacek Caban : wininet: Correctly handle dwContentRead for gzip encoded requests.
by Alexandre Julliard 09 Dec '09

09 Dec '09

Module: wine Branch: master Commit: 2d1c4e69282e23feb96c75d0defbfd001bea4988 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d1c4e69282e23feb96c75d0d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 8 23:51:46 2009 +0100 wininet: Correctly handle dwContentRead for gzip encoded requests. --- dlls/wininet/http.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b75986f..19f854d 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1967,6 +1967,7 @@ static DWORD read_gzip_data(http_request_t *req, BYTE *buf, int size, BOOL sync, zstream->avail_out = size-read; zres = inflate(zstream, Z_FULL_FLUSH); read = size - zstream->avail_out; + req->dwContentRead += req->read_size-zstream->avail_in; remove_data(req, req->read_size-zstream->avail_in); if(zres == Z_STREAM_END) { TRACE("end of data\n"); @@ -2086,9 +2087,9 @@ static DWORD HTTPREQ_Read(http_request_t *req, void *buffer, DWORD size, DWORD * } finished_reading = !bytes_read && req->dwContentRead == req->dwContentLength; + req->dwContentRead += bytes_read; } done: - req->dwContentRead += bytes_read; *read = bytes_read; TRACE( "retrieved %u bytes (%u/%u)\n", bytes_read, req->dwContentRead, req->dwContentLength );

1 0

Piotr Caban : urlmon: Added ProxyStub implementation.
by Alexandre Julliard 09 Dec '09

09 Dec '09

Module: wine Branch: master Commit: dc78e8d31532da68d9e4dc13a8dc0f92f378c6b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc78e8d31532da68d9e4dc13a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 8 16:02:19 2009 +0100 urlmon: Added ProxyStub implementation. --- .gitignore | 2 + dlls/urlmon/Makefile.in | 11 ++- dlls/urlmon/regsvr.c | 30 +++++--- dlls/urlmon/urlmon_main.c | 5 + dlls/urlmon/urlmon_main.h | 6 ++ dlls/urlmon/urlmon_urlmon.idl | 19 +++++ dlls/urlmon/usrmarshal.c | 162 +++++++++++++++++++++++++++++++++++++++++ 7 files changed, 223 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dc78e8d31532da68d9e4d…

1 0

Piotr Caban : urlmon: Added InternetSecurityManager marshalling test.
by Alexandre Julliard 09 Dec '09

09 Dec '09

Module: wine Branch: master Commit: 6894d841cda7727755c09582bd78c4d5f7ffcac2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6894d841cda7727755c09582b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 8 16:02:52 2009 +0100 urlmon: Added InternetSecurityManager marshalling test. --- dlls/urlmon/tests/sec_mgr.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 62471cf..06df952 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -605,6 +605,31 @@ static void test_GetZoneAttributes(void) ok(hr == S_OK, "got 0x%x (expected S_OK)\n", hr); } +static void test_InternetSecurityMarshalling(void) +{ + IInternetSecurityManager *secmgr = NULL; + IUnknown *unk; + IStream *stream; + HRESULT hres; + + hres = CoInternetCreateSecurityManager(NULL, &secmgr, 0); + if(FAILED(hres)) + return; + + hres = IInternetSecurityManager_QueryInterface(secmgr, &IID_IUnknown, (void**)&unk); + ok(hres == S_OK, "QueryInterface returned: %08x\n", hres); + + hres = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hres == S_OK, "CreateStreamOnHGlobal returned: %08x\n", hres); + + hres = CoMarshalInterface(stream, &IID_IInternetSecurityManager, unk, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); + ok(hres == S_OK, "CoMarshalInterface returned: %08x\n", hres); + + IStream_Release(stream); + IUnknown_Release(unk); + IInternetSecurityManager_Release(secmgr); +} + START_TEST(sec_mgr) { @@ -617,6 +642,7 @@ START_TEST(sec_mgr) test_GetZoneActionPolicy(); test_GetZoneAt(); test_GetZoneAttributes(); + test_InternetSecurityMarshalling(); OleUninitialize(); }

1 0

Marcus Meissner : dbghelp: Add a missing NULL check (Coverity).
by Alexandre Julliard 09 Dec '09

09 Dec '09

Module: wine Branch: master Commit: 30c1df4a087c3e8794a848b83960df7aa8a796a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30c1df4a087c3e8794a848b83… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Dec 9 00:01:29 2009 +0100 dbghelp: Add a missing NULL check (Coverity). --- dlls/dbghelp/symbol.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index c322a62..c266ce2 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1034,6 +1034,7 @@ static BOOL sym_enum(HANDLE hProcess, ULONG64 BaseOfDll, PCSTR Mask, regex_t mod_regex, sym_regex; pair.pcs = process_find_by_handle(hProcess); + if (!pair.pcs) return FALSE; if (BaseOfDll == 0) { /* do local variables ? */

1 0

Alexandre Julliard : ole32: Fix some pointer cast warnings on 64-bit.
by Alexandre Julliard 09 Dec '09

09 Dec '09

Module: wine Branch: master Commit: 44a9bae9f8f97180f26501dcc6d59e9f73f63fa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44a9bae9f8f97180f26501dcc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 9 12:04:01 2009 +0100 ole32: Fix some pointer cast warnings on 64-bit. --- dlls/ole32/compobj.c | 8 +++----- dlls/ole32/rpc.c | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 58e8f0d..583a9cb 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2062,6 +2062,7 @@ HRESULT WINAPI CoRegisterClassObject( DWORD flags, LPDWORD lpdwRegister) { + static LONG next_cookie; RegisteredClass* newClass; LPUNKNOWN foundObject; HRESULT hr; @@ -2115,11 +2116,8 @@ HRESULT WINAPI CoRegisterClassObject( newClass->pMarshaledData = NULL; newClass->RpcRegistration = NULL; - /* - * Use the address of the chain node as the cookie since we are sure it's - * unique. FIXME: not on 64-bit platforms. - */ - newClass->dwCookie = (DWORD)newClass; + if (!(newClass->dwCookie = InterlockedIncrement( &next_cookie ))) + newClass->dwCookie = InterlockedIncrement( &next_cookie ); /* * Since we're making a copy of the object pointer, we have to increase its diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 9a34465..0daa4ab 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -1358,7 +1358,7 @@ void RPC_ExecuteCall(struct dispatch_params *params) handlecall = IMessageFilter_HandleInComingCall(COM_CurrentApt()->filter, calltype, - (HTASK)GetCurrentProcessId(), + UlongToHandle(GetCurrentProcessId()), 0 /* FIXME */, &interface_info); TRACE("IMessageFilter_HandleInComingCall returned %d\n", handlecall);

1 0

Alexandre Julliard : uxtheme: Fix some pointer cast warnings on 64-bit.
by Alexandre Julliard 09 Dec '09

09 Dec '09

Module: wine Branch: master Commit: de3e06a745e38df5d04ade13fb95e62dc4082f2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=de3e06a745e38df5d04ade13f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 9 12:04:08 2009 +0100 uxtheme: Fix some pointer cast warnings on 64-bit. --- dlls/uxtheme/draw.c | 5 ++--- dlls/uxtheme/system.c | 7 ++----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 9e22025..17900f8 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -56,7 +56,7 @@ HRESULT WINAPI EnableThemeDialogTexture(HWND hwnd, DWORD dwFlags) TRACE("(%p,0x%08x\n", hwnd, dwFlags); res = SetPropW (hwnd, (LPCWSTR)MAKEINTATOM(atDialogThemeEnabled), - (HANDLE)(dwFlags|0x80000000)); + UlongToHandle(dwFlags|0x80000000)); /* 0x80000000 serves as a "flags set" flag */ if (!res) return HRESULT_FROM_WIN32(GetLastError()); @@ -74,8 +74,7 @@ BOOL WINAPI IsThemeDialogTextureEnabled(HWND hwnd) DWORD dwDialogTextureFlags; TRACE("(%p)\n", hwnd); - dwDialogTextureFlags = (DWORD)GetPropW (hwnd, - (LPCWSTR)MAKEINTATOM(atDialogThemeEnabled)); + dwDialogTextureFlags = HandleToUlong( GetPropW( hwnd, (LPCWSTR)MAKEINTATOM(atDialogThemeEnabled) )); if (dwDialogTextureFlags == 0) /* Means EnableThemeDialogTexture wasn't called for this dialog */ return TRUE; diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 2839539..b84e978 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -393,8 +393,7 @@ static void UXTHEME_RestoreSystemMetrics(void) if (RegQueryValueExW (hKey, bsp->keyName, 0, &type, (LPBYTE)&value, &count) == ERROR_SUCCESS) { - SystemParametersInfoW (bsp->spiSet, 0, (LPVOID)value, - SPIF_UPDATEINIFILE); + SystemParametersInfoW (bsp->spiSet, 0, UlongToPtr(value), SPIF_UPDATEINIFILE); } bsp++; @@ -445,9 +444,7 @@ static void UXTHEME_SaveSystemMetrics(void) DWORD value; SystemParametersInfoW (bsp->spiGet, 0, &value, 0); - SystemParametersInfoW (bsp->spiSet, 0, (LPVOID)value, - SPIF_UPDATEINIFILE); - + SystemParametersInfoW (bsp->spiSet, 0, UlongToPtr(value), SPIF_UPDATEINIFILE); bsp++; }

1 0

Alexandre Julliard : d3d8/tests: Fix some pointer cast warnings on 64-bit.
by Alexandre Julliard 09 Dec '09

09 Dec '09

Module: wine Branch: master Commit: 6062679b086a172f1726dd6702f535aa735d3980 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6062679b086a172f1726dd670… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 9 12:04:22 2009 +0100 d3d8/tests: Fix some pointer cast warnings on 64-bit. --- dlls/d3d8/tests/stateblock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/tests/stateblock.c b/dlls/d3d8/tests/stateblock.c index 630c4de..33cc56d 100644 --- a/dlls/d3d8/tests/stateblock.c +++ b/dlls/d3d8/tests/stateblock.c @@ -1745,7 +1745,7 @@ static void resource_test_data_init(IDirect3DDevice8 *device, static void resource_poison_data_init(struct resource_test_data *data, const struct resource_test_arg *arg) { - DWORD poison = 0xdeadbeef; + DWORD_PTR poison = 0xdeadbeef; unsigned int i; data->vs = poison++;

1 0