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

[URLMON] Sync with Wine Staging 1.9.23. CORE-12409

Browse source 
svn path=/trunk/; revision=73294
This commit is contained in:
Amine Khaldi 2016-11-17 23:10:44 +00:00
parent 129d8806b0
commit 01cc187f9e
3 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/win32/urlmon/sec_mgr.c
View file

@ -1820,7 +1820,7 @@ HRESULT ZoneMgrImpl_Construct(IUnknown *pUnkOuter, LPVOID *ppobj)
TRACE("(%p %p)\n", pUnkOuter, ppobj); TRACE("(%p %p)\n", pUnkOuter, ppobj);
ret->IInternetZoneManagerEx2_iface.lpVtbl = &ZoneMgrImplVtbl; ret->IInternetZoneManagerEx2_iface.lpVtbl = &ZoneMgrImplVtbl;
ret->ref = 1; ret->ref = 1;
*ppobj = (IInternetZoneManagerEx*)ret; *ppobj = &ret->IInternetZoneManagerEx2_iface;
URLMON_LockModule(); URLMON_LockModule();

32
reactos/dll/win32/urlmon/usrmarshal.c
View file

@ -49,35 +49,35 @@ HRESULT __RPC_STUB IWinInetInfo_QueryOption_Stub(IWinInetInfo* This,
} }
HRESULT CALLBACK IBindHost_MonikerBindToStorage_Proxy(IBindHost* This, HRESULT CALLBACK IBindHost_MonikerBindToStorage_Proxy(IBindHost* This,
IMoniker *pMk, IBindCtx *pBC, IBindStatusCallback *pBSC, IMoniker *moniker, IBindCtx *bc, IBindStatusCallback *bsc,
REFIID riid, void **ppvObj) REFIID riid, void **obj)
{ {
FIXME("stub\n"); TRACE("(%p %p %p %p %s %p)\n", This, moniker, bc, bsc, debugstr_guid(riid), obj);
return E_NOTIMPL; return IBindHost_RemoteMonikerBindToStorage_Proxy(This, moniker, bc, bsc, riid, (IUnknown**)obj);
} }
HRESULT __RPC_STUB IBindHost_MonikerBindToStorage_Stub(IBindHost* This, HRESULT __RPC_STUB IBindHost_MonikerBindToStorage_Stub(IBindHost* This,
IMoniker *pMk, IBindCtx *pBC, IBindStatusCallback *pBSC, IMoniker *moniker, IBindCtx *bc, IBindStatusCallback *bsc,
REFIID riid, IUnknown **ppvObj) REFIID riid, IUnknown **obj)
{ {
FIXME("stub\n"); TRACE("(%p %p %p %p %s %p)\n", This, moniker, bc, bsc, debugstr_guid(riid), obj);
return E_NOTIMPL; return IBindHost_MonikerBindToStorage(This, moniker, bc, bsc, riid, (void**)obj);
} }
HRESULT CALLBACK IBindHost_MonikerBindToObject_Proxy(IBindHost* This, HRESULT CALLBACK IBindHost_MonikerBindToObject_Proxy(IBindHost* This,
IMoniker *pMk, IBindCtx *pBC, IBindStatusCallback *pBSC, IMoniker *moniker, IBindCtx *bc, IBindStatusCallback *bsc,
REFIID riid, void **ppvObj) REFIID riid, void **obj)
{ {
FIXME("stub\n"); TRACE("(%p %p %p %p %s %p)\n", This, moniker, bc, bsc, debugstr_guid(riid), obj);
return E_NOTIMPL; return IBindHost_RemoteMonikerBindToObject_Proxy(This, moniker, bc, bsc, riid, (IUnknown**)obj);
} }
HRESULT __RPC_STUB IBindHost_MonikerBindToObject_Stub(IBindHost* This, HRESULT __RPC_STUB IBindHost_MonikerBindToObject_Stub(IBindHost* This,
IMoniker *pMk, IBindCtx *pBC, IBindStatusCallback *pBSC, IMoniker *moniker, IBindCtx *bc, IBindStatusCallback *bsc,
REFIID riid, IUnknown **ppvObj) REFIID riid, IUnknown **obj)
{ {
FIXME("stub\n"); TRACE("(%p %p %p %p %s %p)\n", This, moniker, bc, bsc, debugstr_guid(riid), obj);
return E_NOTIMPL; return IBindHost_MonikerBindToObject(This, moniker, bc, bsc, riid, (void**)obj);
} }
HRESULT CALLBACK IBindStatusCallbackEx_GetBindInfoEx_Proxy( HRESULT CALLBACK IBindStatusCallbackEx_GetBindInfoEx_Proxy(

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

@ -188,7 +188,7 @@ reactos/dll/win32/traffic # Synced to WineStaging-1.9.11
reactos/dll/win32/twain_32 # Synced to WineStaging-1.9.11 reactos/dll/win32/twain_32 # Synced to WineStaging-1.9.11
reactos/dll/win32/updspapi # Synced to WineStaging-1.9.11 reactos/dll/win32/updspapi # Synced to WineStaging-1.9.11
reactos/dll/win32/url # Synced to WineStaging-1.9.11 reactos/dll/win32/url # Synced to WineStaging-1.9.11
reactos/dll/win32/urlmon # Synced to WineStaging-1.9.16 reactos/dll/win32/urlmon # Synced to WineStaging-1.9.23
reactos/dll/win32/usp10 # Synced to WineStaging-1.9.16 reactos/dll/win32/usp10 # Synced to WineStaging-1.9.16
reactos/dll/win32/uxtheme # Forked reactos/dll/win32/uxtheme # Forked
reactos/dll/win32/vbscript # Synced to WineStaging-1.9.11 reactos/dll/win32/vbscript # Synced to WineStaging-1.9.11