Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-06 06:20:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

[IEFRAME] Sync with Wine Staging 2.2. CORE-12823

Browse source 
477e7fd ieframe: Fix moniker leak on error path.

svn path=/trunk/; revision=73949
This commit is contained in:
Amine Khaldi 2017-02-26 17:28:46 +00:00
parent 1f5449e7c5
commit bb98fff5c2
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
reactos/dll/win32/ieframe/navigate.c
View file

@ -690,13 +690,16 @@ static HRESULT bind_to_object(DocHost *This, IMoniker *mon, LPCWSTR url, IBindCt
hres = IMoniker_GetDisplayName(mon, 0, NULL, &display_name); hres = IMoniker_GetDisplayName(mon, 0, NULL, &display_name);
if(FAILED(hres)) { if(FAILED(hres)) {
FIXME("GetDisplayName failed: %08x\n", hres); FIXME("GetDisplayName failed: %08x\n", hres);
IMoniker_Release(mon);
return hres; return hres;
} }
hres = set_dochost_url(This, display_name); hres = set_dochost_url(This, display_name);
CoTaskMemFree(display_name); CoTaskMemFree(display_name);
if(FAILED(hres)) if(FAILED(hres)) {
IMoniker_Release(mon);
return hres; return hres;
}
IBindCtx_RegisterObjectParam(bindctx, (LPOLESTR)SZ_HTML_CLIENTSITE_OBJECTPARAM, IBindCtx_RegisterObjectParam(bindctx, (LPOLESTR)SZ_HTML_CLIENTSITE_OBJECTPARAM,
(IUnknown*)&This->IOleClientSite_iface); (IUnknown*)&This->IOleClientSite_iface);

2
reactos/media/doc/README.WINE
View file

@ -74,7 +74,7 @@ reactos/dll/win32/hlink # Synced to WineStaging-2.2
reactos/dll/win32/hnetcfg # Synced to WineStaging-1.9.16 reactos/dll/win32/hnetcfg # Synced to WineStaging-1.9.16
reactos/dll/win32/httpapi # Synced to WineStaging-1.9.11 reactos/dll/win32/httpapi # Synced to WineStaging-1.9.11
reactos/dll/win32/iccvid # Synced to WineStaging-2.2 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/imaadp32.acm # Synced to WineStaging-1.9.11
reactos/dll/win32/imagehlp # 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 reactos/dll/win32/imm32 # Synced to Wine-1.7.27