Author: akhaldi Date: Sun Feb 26 17:28:46 2017 New Revision: 73949
URL: http://svn.reactos.org/svn/reactos?rev=73949&view=rev Log: [IEFRAME] Sync with Wine Staging 2.2. CORE-12823
477e7fd ieframe: Fix moniker leak on error path.
Modified: trunk/reactos/dll/win32/ieframe/navigate.c trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/ieframe/navigate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/navigate.... ============================================================================== --- trunk/reactos/dll/win32/ieframe/navigate.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/navigate.c [iso-8859-1] Sun Feb 26 17:28:46 2017 @@ -690,13 +690,16 @@ hres = IMoniker_GetDisplayName(mon, 0, NULL, &display_name); if(FAILED(hres)) { FIXME("GetDisplayName failed: %08x\n", hres); + IMoniker_Release(mon); return hres; }
hres = set_dochost_url(This, display_name); CoTaskMemFree(display_name); - if(FAILED(hres)) + if(FAILED(hres)) { + IMoniker_Release(mon); return hres; + }
IBindCtx_RegisterObjectParam(bindctx, (LPOLESTR)SZ_HTML_CLIENTSITE_OBJECTPARAM, (IUnknown*)&This->IOleClientSite_iface);
Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=7... ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Feb 26 17:28:46 2017 @@ -74,7 +74,7 @@ reactos/dll/win32/hnetcfg # Synced to WineStaging-1.9.16 reactos/dll/win32/httpapi # Synced to WineStaging-1.9.11 reactos/dll/win32/iccvid # Synced to WineStaging-2.2 -reactos/dll/win32/ieframe # Synced to WineStaging-1.9.16 +reactos/dll/win32/ieframe # Synced to WineStaging-2.2 reactos/dll/win32/imaadp32.acm # Synced to WineStaging-1.9.11 reactos/dll/win32/imagehlp # Synced to WineStaging-1.9.11 reactos/dll/win32/imm32 # Synced to Wine-1.7.27