wine-commits December 2009

wine-commits@winehq.org

3 participants
1233 discussions

Rob Shearman : secur32: Don' t allocate context handle in wrapper InitializeSecurityContextA/ W if it is the same as the handle passed into the function.
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: 697955c922765214d61965ecc594e256853f6d12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=697955c922765214d61965ecc… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Dec 29 19:06:43 2009 +0000 secur32: Don't allocate context handle in wrapper InitializeSecurityContextA/W if it is the same as the handle passed into the function. --- dlls/secur32/wrapper.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/wrapper.c b/dlls/secur32/wrapper.c index 2ab241d..3d678a5 100644 --- a/dlls/secur32/wrapper.c +++ b/dlls/secur32/wrapper.c @@ -283,7 +283,8 @@ SECURITY_STATUS WINAPI InitializeSecurityContextA( cred, ctxt, pszTargetName, fContextReq, Reserved1, TargetDataRep, pInput, Reserved2, phNewContext ? &myCtxt : NULL, pOutput, pfContextAttr, ptsExpiry); - if ((ret == SEC_E_OK || ret == SEC_I_CONTINUE_NEEDED) && phNewContext) + if ((ret == SEC_E_OK || ret == SEC_I_CONTINUE_NEEDED) && + phNewContext && phNewContext != phContext) { SECURITY_STATUS ret2; ret2 = SECUR32_makeSecHandle(phNewContext, package, &myCtxt); @@ -346,7 +347,8 @@ SECURITY_STATUS WINAPI InitializeSecurityContextW( cred, ctxt, pszTargetName, fContextReq, Reserved1, TargetDataRep, pInput, Reserved2, phNewContext ? &myCtxt : NULL, pOutput, pfContextAttr, ptsExpiry); - if ((ret == SEC_E_OK || ret == SEC_I_CONTINUE_NEEDED) && phNewContext) + if ((ret == SEC_E_OK || ret == SEC_I_CONTINUE_NEEDED) && + phNewContext && phNewContext != phContext) { SECURITY_STATUS ret2; ret2 = SECUR32_makeSecHandle(phNewContext, package, &myCtxt);

1 0

Rob Shearman : secur32: Fix memory leaks in ntlm_InitializeSecurityContextW .
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: 1346834605ebcc0dfdc60353298f2c1032238011 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1346834605ebcc0dfdc603532… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Dec 29 19:06:23 2009 +0000 secur32: Fix memory leaks in ntlm_InitializeSecurityContextW. --- dlls/secur32/ntlm.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 3313fe4..a7330e2 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -549,6 +549,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( goto isc_end; } username = ntlm_GetUsernameArg(ui->wkui1_username, -1); + NetApiBufferFree(ui); TRACE("using cached credentials\n"); @@ -820,6 +821,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( ret = SEC_E_BUFFER_TOO_SMALL; if ((phContext == NULL) && (pInput == NULL)) { + HeapFree(GetProcessHeap(), 0, helper->session_key); cleanup_helper(helper); phNewContext->dwUpper = 0; phNewContext->dwLower = 0; @@ -838,6 +840,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( ret = SEC_E_BUFFER_TOO_SMALL; if ((phContext == NULL) && (pInput == NULL)) { + HeapFree(GetProcessHeap(), 0, helper->session_key); cleanup_helper(helper); phNewContext->dwUpper = 0; phNewContext->dwLower = 0; @@ -851,6 +854,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW( ret = SEC_E_INTERNAL_ERROR; if ((phContext == NULL) && (pInput == NULL)) { + HeapFree(GetProcessHeap(), 0, helper->session_key); cleanup_helper(helper); phNewContext->dwUpper = 0; phNewContext->dwLower = 0;

1 0

Rob Shearman : secur32: Simplify memory management by not allocating memory for the CredHandle and CtxtHandle pointers .
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: 693433a3f22ce470ae35b5f99dc7c07c71a032cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=693433a3f22ce470ae35b5f99… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Dec 29 19:05:54 2009 +0000 secur32: Simplify memory management by not allocating memory for the CredHandle and CtxtHandle pointers. Instead store the handles directly in the SspiData structure and pass the addresses of these into SSPI functions. --- dlls/secur32/tests/ntlm.c | 161 ++++++++++++++++++++------------------------- 1 files changed, 71 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=693433a3f22ce470ae35b…

1 0

Rob Shearman : secur32: Fix memory leaks in tests.
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: 5f01280edf8c14cab746066029f81ecbfd9d43cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f01280edf8c14cab74606602… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Dec 29 19:04:29 2009 +0000 secur32: Fix memory leaks in tests. --- dlls/secur32/tests/ntlm.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index d9f9538..130666a 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -321,6 +321,7 @@ static SECURITY_STATUS setupClient(SspiData *sspi_data, SEC_CHAR *provider) ok(ret == SEC_E_OK, "QuerySecurityPackageInfo returned %s\n", getSecError(ret)); setupBuffers(sspi_data, sec_pkg_info); + pFreeContextBuffer(sec_pkg_info); if((ret = pAcquireCredentialsHandleA(NULL, provider, SECPKG_CRED_OUTBOUND, NULL, sspi_data->id, NULL, NULL, sspi_data->cred, &ttl)) @@ -352,6 +353,7 @@ static SECURITY_STATUS setupServer(SspiData *sspi_data, SEC_CHAR *provider) ok(ret == SEC_E_OK, "QuerySecurityPackageInfo returned %s\n", getSecError(ret)); setupBuffers(sspi_data, sec_pkg_info); + pFreeContextBuffer(sec_pkg_info); if((ret = pAcquireCredentialsHandleA(NULL, provider, SECPKG_CRED_INBOUND, NULL, NULL, NULL, NULL, sspi_data->cred, &ttl)) != SEC_E_OK) @@ -382,6 +384,7 @@ static SECURITY_STATUS setupFakeServer(SspiData *sspi_data, SEC_CHAR *provider) ok(ret == SEC_E_OK, "QuerySecurityPackageInfo returned %s\n", getSecError(ret)); ret = setupBuffers(sspi_data, sec_pkg_info); + pFreeContextBuffer(sec_pkg_info); return ret; } @@ -627,6 +630,7 @@ static void testInitializeSecurityContextFlags(void) ok(((packet[12] & 0x10) == 0) && ((packet[12] & 0x20) == 0), "With req_attr == 0, flags are 0x%02x%02x%02x%02x.\n", packet[15], packet[14], packet[13], packet[12]); + pDeleteSecurityContext(client.ctxt); /* With ISC_REQ_CONNECTION, the lowest byte should not have bits 0x20 or 0x10 set*/ req_attr = ISC_REQ_CONNECTION; @@ -643,6 +647,7 @@ static void testInitializeSecurityContextFlags(void) ok(((packet[12] & 0x10) == 0) && ((packet[12] & 0x20) == 0), "For ISC_REQ_CONNECTION, flags are 0x%02x%02x%02x%02x.\n", packet[15], packet[14], packet[13], packet[12]); + pDeleteSecurityContext(client.ctxt); /* With ISC_REQ_EXTENDED_ERROR, the lowest byte should not have bits 0x20 or 0x10 set*/ req_attr = ISC_REQ_EXTENDED_ERROR; @@ -659,6 +664,7 @@ static void testInitializeSecurityContextFlags(void) ok(((packet[12] & 0x10) == 0) && ((packet[12] & 0x20) == 0), "For ISC_REQ_EXTENDED_ERROR, flags are 0x%02x%02x%02x%02x.\n", packet[15], packet[14], packet[13], packet[12]); + pDeleteSecurityContext(client.ctxt); /* With ISC_REQ_MUTUAL_AUTH, the lowest byte should not have bits 0x20 or 0x10 set*/ req_attr = ISC_REQ_MUTUAL_AUTH; @@ -675,6 +681,7 @@ static void testInitializeSecurityContextFlags(void) ok(((packet[12] & 0x10) == 0) && ((packet[12] & 0x20) == 0), "For ISC_REQ_MUTUAL_AUTH, flags are 0x%02x%02x%02x%02x.\n", packet[15], packet[14], packet[13], packet[12]); + pDeleteSecurityContext(client.ctxt); /* With ISC_REQ_USE_DCE_STYLE, the lowest byte should not have bits 0x20 or 0x10 set*/ req_attr = ISC_REQ_USE_DCE_STYLE; @@ -691,6 +698,7 @@ static void testInitializeSecurityContextFlags(void) ok(((packet[12] & 0x10) == 0) && ((packet[12] & 0x20) == 0), "For ISC_REQ_USE_DCE_STYLE, flags are 0x%02x%02x%02x%02x.\n", packet[15], packet[14], packet[13], packet[12]); + pDeleteSecurityContext(client.ctxt); /* With ISC_REQ_DELEGATE, the lowest byte should not have bits 0x20 or 0x10 set*/ req_attr = ISC_REQ_DELEGATE; @@ -707,6 +715,7 @@ static void testInitializeSecurityContextFlags(void) ok(((packet[12] & 0x10) == 0) && ((packet[12] & 0x20) == 0), "For ISC_REQ_DELEGATE, flags are 0x%02x%02x%02x%02x.\n", packet[15], packet[14], packet[13], packet[12]); + pDeleteSecurityContext(client.ctxt); /* With ISC_REQ_INTEGRITY, the lowest byte should have bit 0x10 set */ req_attr = ISC_REQ_INTEGRITY; @@ -723,6 +732,7 @@ static void testInitializeSecurityContextFlags(void) ok((packet[12] & 0x10) != 0, "For ISC_REQ_INTEGRITY, flags are 0x%02x%02x%02x%02x.\n", packet[15], packet[14], packet[13], packet[12]); + pDeleteSecurityContext(client.ctxt); /* With ISC_REQ_REPLAY_DETECT, the lowest byte should have bit 0x10 set */ req_attr = ISC_REQ_REPLAY_DETECT; @@ -739,6 +749,7 @@ static void testInitializeSecurityContextFlags(void) ok((packet[12] & 0x10) != 0, "For ISC_REQ_REPLAY_DETECT, flags are 0x%02x%02x%02x%02x.\n", packet[15], packet[14], packet[13], packet[12]); + pDeleteSecurityContext(client.ctxt); /* With ISC_REQ_SEQUENCE_DETECT, the lowest byte should have bit 0x10 set */ req_attr = ISC_REQ_SEQUENCE_DETECT; @@ -755,6 +766,7 @@ static void testInitializeSecurityContextFlags(void) ok((packet[12] & 0x10) != 0, "For ISC_REQ_SEQUENCE_DETECT, flags are 0x%02x%02x%02x%02x.\n", packet[15], packet[14], packet[13], packet[12]); + pDeleteSecurityContext(client.ctxt); /* With ISC_REQ_CONFIDENTIALITY, the lowest byte should have bit 0x20 set */ req_attr = ISC_REQ_CONFIDENTIALITY; @@ -771,6 +783,7 @@ static void testInitializeSecurityContextFlags(void) ok((packet[12] & 0x20) != 0, "For ISC_REQ_CONFIDENTIALITY, flags are 0x%02x%02x%02x%02x.\n", packet[15], packet[14], packet[13], packet[12]); + pDeleteSecurityContext(client.ctxt); tISCFend: cleanupBuffers(&client); @@ -1370,6 +1383,12 @@ static void test_null_auth_data(void) NULL, 0, &ctx, &buffer_desc, &attr, &ttl); ok(status == SEC_I_CONTINUE_NEEDED, "InitializeSecurityContextA failed %s\n", getSecError(status)); + ret = pDeleteSecurityContext(&ctx); + ok(ret == SEC_E_OK, "DeleteSecurityContext failed with error 0x%x\n", ret); + ret = pFreeCredentialsHandle(&cred); + ok(ret == SEC_E_OK, "FreeCredentialsHandle failed with error 0x%x\n", ret); + + pFreeContextBuffer(info); HeapFree(GetProcessHeap(), 0, buffers[0].pvBuffer); }

1 0

Rob Shearman : winex11.drv: Empty clipboard cache on process unload to avoid false positives being reported for memory leaks .
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: e4888b0e3c3ef1c7a9a36b6a7c315fee41aedd21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4888b0e3c3ef1c7a9a36b6a7… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Dec 29 19:03:40 2009 +0000 winex11.drv: Empty clipboard cache on process unload to avoid false positives being reported for memory leaks. --- dlls/winex11.drv/clipboard.c | 10 ++++++++++ dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 1 + 3 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 706d378..f4e49e2 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -3282,3 +3282,13 @@ void X11DRV_SelectionClear( HWND hWnd, XEvent *xev ) X11DRV_CLIPBOARD_ReleaseSelection( event->display, event->selection, event->window, hWnd, event->time ); } + +/*********************************************************************** + * X11DRV_Clipboard_Cleanup + */ +void X11DRV_Clipboard_Cleanup(void) +{ + selectionAcquired = S_NOSELECTION; + + X11DRV_EmptyClipboard(FALSE); +} diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 3dd5edf..62e275d 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -765,6 +765,7 @@ extern XContext winContext; extern void X11DRV_InitClipboard(void); extern int CDECL X11DRV_AcquireClipboard(HWND hWndClipWindow); +extern void X11DRV_Clipboard_Cleanup(void); extern void X11DRV_ResetSelectionOwner(void); extern void CDECL X11DRV_SetFocus( HWND hwnd ); extern Cursor X11DRV_GetCursor( Display *display, struct tagCURSORICONINFO *ptr ); diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 3bd934b..a7f7ae0 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -583,6 +583,7 @@ static void thread_detach(void) */ static void process_detach(void) { + X11DRV_Clipboard_Cleanup(); #ifdef SONAME_LIBXXF86VM /* cleanup XVidMode */ X11DRV_XF86VM_Cleanup();

1 0

Rob Shearman : shell32: Fix a potentially large memory leak in IQueryAssociations_fnGetString.
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: 3547ea011a98fb902c530bec867d28b32f488412 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3547ea011a98fb902c530bec8… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Dec 29 19:02:54 2009 +0000 shell32: Fix a potentially large memory leak in IQueryAssociations_fnGetString. --- dlls/shell32/assoc.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index 85efa07..066e8ba 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -505,7 +505,9 @@ static HRESULT WINAPI IQueryAssociations_fnGetString( /* Does strlenW(bufW) == 0 mean we use the filename? */ len = strlenW(bufW) + 1; TRACE("found FileDescription: %s\n", debugstr_w(bufW)); - return ASSOC_ReturnData(pszOut, pcchOut, bufW, len); + hr = ASSOC_ReturnData(pszOut, pcchOut, bufW, len); + HeapFree(GetProcessHeap(), 0, verinfoW); + return hr; } } } @@ -513,7 +515,9 @@ get_friendly_name_fail: PathRemoveExtensionW(path); PathStripPathW(path); TRACE("using filename: %s\n", debugstr_w(path)); - return ASSOC_ReturnData(pszOut, pcchOut, path, strlenW(path) + 1); + hr = ASSOC_ReturnData(pszOut, pcchOut, path, strlenW(path) + 1); + HeapFree(GetProcessHeap(), 0, verinfoW); + return hr; } case ASSOCSTR_CONTENTTYPE:

1 0

Rob Shearman : shell32: Fix memory leaks in autocomplete tests.
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: 16f4b56345a5928fe8528d3d3305ef7c15284440 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16f4b56345a5928fe8528d3d3… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Dec 29 19:02:16 2009 +0000 shell32: Fix memory leaks in autocomplete tests. --- dlls/shell32/tests/autocomplete.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/tests/autocomplete.c b/dlls/shell32/tests/autocomplete.c index ab60259..042e238 100644 --- a/dlls/shell32/tests/autocomplete.c +++ b/dlls/shell32/tests/autocomplete.c @@ -33,7 +33,7 @@ static HWND hMainWnd, hEdit; static HINSTANCE hinst; static int killfocus_count; -static BOOL test_init(void) +static IAutoComplete *test_init(void) { HRESULT r; IAutoComplete* ac; @@ -45,7 +45,7 @@ static BOOL test_init(void) if (r == REGDB_E_CLASSNOTREG) { win_skip("CLSID_AutoComplete is not registered\n"); - return FALSE; + return NULL; } ok(SUCCEEDED(r), "no IID_IAutoComplete (0x%08x)\n", r); @@ -55,7 +55,7 @@ static BOOL test_init(void) if (r == REGDB_E_CLASSNOTREG) { win_skip("CLSID_ACLMulti is not registered\n"); - return FALSE; + return NULL; } ok(SUCCEEDED(r), "no IID_IACList (0x%08x)\n", r); @@ -63,7 +63,9 @@ static BOOL test_init(void) r = IAutoComplete_Init(ac, hEdit, acSource, NULL, NULL); ok(SUCCEEDED(r), "Init failed (0x%08x)\n", r); - return TRUE; + IUnknown_Release(acSource); + + return ac; } static void test_killfocus(void) @@ -116,6 +118,7 @@ START_TEST(autocomplete) { HRESULT r; MSG msg; + IAutoComplete* ac; r = CoInitialize(NULL); ok(SUCCEEDED(r), "CoInitialize failed (0x%08x). Tests aborted.\n", r); @@ -127,7 +130,8 @@ START_TEST(autocomplete) if(!ok(hMainWnd != NULL, "Failed to create parent window. Tests aborted.\n")) return; - if (!test_init()) + ac = test_init(); + if (!ac) goto cleanup; test_killfocus(); @@ -137,6 +141,8 @@ START_TEST(autocomplete) DispatchMessageA(&msg); } + IAutoComplete_Release(ac); + cleanup: DestroyWindow(hEdit); DestroyWindow(hMainWnd);

1 0

Rob Shearman : shell32: Fix style in autocomplete tests to more match the typical style used in the rest of Wine .
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: 0fd772be996d895ace3bd4d957c1fc487e5cffd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fd772be996d895ace3bd4d95… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Dec 29 19:01:29 2009 +0000 shell32: Fix style in autocomplete tests to more match the typical style used in the rest of Wine. --- dlls/shell32/tests/autocomplete.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/tests/autocomplete.c b/dlls/shell32/tests/autocomplete.c index 20315c7..ab60259 100644 --- a/dlls/shell32/tests/autocomplete.c +++ b/dlls/shell32/tests/autocomplete.c @@ -33,7 +33,8 @@ static HWND hMainWnd, hEdit; static HINSTANCE hinst; static int killfocus_count; -static BOOL test_init(void) { +static BOOL test_init(void) +{ HRESULT r; IAutoComplete* ac; IUnknown *acSource; @@ -64,7 +65,9 @@ static BOOL test_init(void) { return TRUE; } -static void test_killfocus(void) { + +static void test_killfocus(void) +{ /* Test if WM_KILLFOCUS messages are handled properly by checking if * the parent receives an EN_KILLFOCUS message. */ SetFocus(hEdit); @@ -72,7 +75,9 @@ static void test_killfocus(void) { SetFocus(0); ok(killfocus_count == 1, "Expected one EN_KILLFOCUS message, got: %d\n", killfocus_count); } -static LRESULT CALLBACK MyWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { + +static LRESULT CALLBACK MyWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ switch(msg) { case WM_CREATE: /* create edit control */ @@ -87,7 +92,9 @@ static LRESULT CALLBACK MyWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa } return DefWindowProcA(hWnd, msg, wParam, lParam); } -static void createMainWnd(void) { + +static void createMainWnd(void) +{ WNDCLASSA wc; wc.style = CS_HREDRAW | CS_VREDRAW; wc.cbClsExtra = 0; @@ -104,7 +111,9 @@ static void createMainWnd(void) { hMainWnd = CreateWindowExA(0, "MyTestWnd", "Blah", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, 130, 105, NULL, NULL, GetModuleHandleA(NULL), 0); } -START_TEST(autocomplete) { + +START_TEST(autocomplete) +{ HRESULT r; MSG msg;

1 0

Rob Shearman : ole32: Handle SetClipboardData failing in OLE clipboard functions.
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: 88219db8ab809de8ebc031a872f42b4fee7d026e URL: http://source.winehq.org/git/wine.git/?a=commit;h=88219db8ab809de8ebc031a87… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Dec 29 19:00:53 2009 +0000 ole32: Handle SetClipboardData failing in OLE clipboard functions. --- dlls/ole32/clipboard.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 51e750a..2afc77e 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -1701,7 +1701,11 @@ static HRESULT set_clipboard_formats(ole_clipbrd *clipbrd, IDataObject *data) td_offs_to_ptr(clipbrd->cached_enum, (DWORD_PTR)clipbrd->cached_enum->entries[idx].fmtetc.ptd); GlobalUnlock(priv_data_handle); - SetClipboardData(ole_private_data_clipboard_format, priv_data_handle); + if(!SetClipboardData(ole_private_data_clipboard_format, priv_data_handle)) + { + GlobalFree(priv_data_handle); + return CLIPBRD_E_CANT_SET; + } return S_OK; } @@ -1759,7 +1763,11 @@ static HRESULT expose_marshalled_dataobject(ole_clipbrd *clipbrd, IDataObject *d if(!h) return E_OUTOFMEMORY; - SetClipboardData(wine_marshal_clipboard_format, h); + if(!SetClipboardData(wine_marshal_clipboard_format, h)) + { + GlobalFree(h); + return CLIPBRD_E_CANT_SET; + } return S_OK; }

1 0

Rob Shearman : ole32: Fix stream reference leak in test_ReadClassStm.
by Alexandre Julliard 30 Dec '09

30 Dec '09

Module: wine Branch: master Commit: 36bfaea96de8854ce112c1e8150912ed18130365 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36bfaea96de8854ce112c1e81… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Dec 29 19:00:22 2009 +0000 ole32: Fix stream reference leak in test_ReadClassStm. --- dlls/ole32/tests/storage32.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index e8a7ec9..19c1e8f 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1593,6 +1593,8 @@ static void test_ReadClassStm(void) hr = ReadClassStm(pStream, &clsid); ok_ole_success(hr, "ReadClassStm"); ok(IsEqualCLSID(&clsid, &test_stg_cls), "clsid should have been set to CLSID_WineTest\n"); + + IStream_Release(pStream); } struct access_res

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
124
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 December 2009