December 2009 - Wine-Commits

Rob Shearman : secur32: Fix memory leaks in ntlm_InitializeSecurityContextW .
by Alexandre Julliard Dec. 30, 2009

Dec. 30, 2009

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

Nikolay Sivov : user32/sysparams: Return NULL from GetSysColorBrush() for invalid index.
by Alexandre Julliard Dec. 30, 2009

Dec. 30, 2009

Module: wine Branch: master Commit: 385b8dcb95b2853d452ec95d140ea5fa0c05aeef URL: http://source.winehq.org/git/wine.git/?a=commit;h=385b8dcb95b2853d452ec95d1… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Dec 29 19:27:14 2009 +0300 user32/sysparams: Return NULL from GetSysColorBrush() for invalid index. --- dlls/user32/sysparams.c | 2 +- dlls/user32/tests/sysparams.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 09e7eb5..08dde39 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3028,7 +3028,7 @@ HBRUSH WINAPI GetSysColorBrush( INT index ) { if (0 <= index && index < NUM_SYS_COLORS) return SysColorBrushes[index]; WARN("Unknown index(%d)\n", index ); - return GetStockObject(LTGRAY_BRUSH); + return NULL; } diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index a9b79fa..ba1c802 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -2770,7 +2770,7 @@ static void test_GetSysColorBrush(void) SetLastError(0xdeadbeef); hbr = GetSysColorBrush(-1); - todo_wine ok(hbr == NULL, "Expected NULL brush\n"); + ok(hbr == NULL, "Expected NULL brush\n"); ok(GetLastError() == 0xdeadbeef, "Expected last error not set, got %x\n", GetLastError()); /* greater than max index */ hbr = GetSysColorBrush(COLOR_MENUBAR); @@ -2778,7 +2778,7 @@ static void test_GetSysColorBrush(void) { SetLastError(0xdeadbeef); hbr = GetSysColorBrush(COLOR_MENUBAR + 1); - todo_wine ok(hbr == NULL, "Expected NULL brush\n"); + ok(hbr == NULL, "Expected NULL brush\n"); ok(GetLastError() == 0xdeadbeef, "Expected last error not set, got %x\n", GetLastError()); } else

1 0

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

Dec. 30, 2009

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

Michael Stefaniuc : Revert "Revert "wpp: config.h and wine/port. h should be included first."".
by Alexandre Julliard Dec. 30, 2009

Dec. 30, 2009

Module: wine Branch: master Commit: e470475151692bd498124f1d3a7e2fca4be9092a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e470475151692bd498124f1d3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 29 18:07:44 2009 +0100 Revert "Revert "wpp: config.h and wine/port.h should be included first."". This reverts commit 8e729245412e6b1e24b9871a0252b7e660fd24ec. Wine now requires a new enough flex version. --- libs/wpp/ppl.l | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index 05e7af2..1ce98fb 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -121,6 +121,11 @@ * */ +%top{ +#include "config.h" +#include "wine/port.h" +} + /* * Special flex options and exclusive scanner start-conditions */ @@ -156,8 +161,6 @@ cident [a-zA-Z_][0-9a-zA-Z_]* ul [uUlL]|[uUlL][lL]|[lL][uU]|[lL][lL][uU]|[uU][lL][lL]|[lL][uU][lL] %{ -#include "config.h" -#include "wine/port.h" #include <stdio.h> #include <stdlib.h> #include <string.h>

1 0

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

Dec. 30, 2009

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 : ole32: Fix stream reference leak in test_ReadClassStm.
by Alexandre Julliard Dec. 30, 2009

Dec. 30, 2009

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

Rob Shearman : ole32: Release the data object and free the cached enum data upon OleUninitialize .
by Alexandre Julliard Dec. 30, 2009

Dec. 30, 2009

Module: wine Branch: master Commit: b7d86b54d94a26f3c52d6e9841364bf6b1c48cc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7d86b54d94a26f3c52d6e984… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Dec 29 18:59:37 2009 +0000 ole32: Release the data object and free the cached enum data upon OleUninitialize. --- dlls/ole32/clipboard.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 7f19d16..51e750a 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -1608,6 +1608,8 @@ void OLEClipbrd_UnInitialize(void) } IStream_Release(clipbrd->marshal_data); + if (clipbrd->src_data) IDataObject_Release(clipbrd->src_data); + HeapFree(GetProcessHeap(), 0, clipbrd->cached_enum); HeapFree(GetProcessHeap(), 0, clipbrd); theOleClipboard = NULL; }

1 0

Rob Shearman : secur32: Fix memory leaks in tests.
by Alexandre Julliard Dec. 30, 2009

Dec. 30, 2009

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 Dec. 30, 2009

Dec. 30, 2009

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 : ole32: Handle SetClipboardData failing in OLE clipboard functions.
by Alexandre Julliard Dec. 30, 2009

Dec. 30, 2009

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