[ros-diffs] [akhaldi] 73294: [URLMON] Sync with Wine Staging 1.9.23. CORE-12409

Author: akhaldi
Date: Thu Nov 17 23:10:44 2016
New Revision: 73294

URL: http://svn.reactos.org/svn/reactos?rev=73294&view=rev
Log:
[URLMON] Sync with Wine Staging 1.9.23. CORE-12409

Modified:
    trunk/reactos/dll/win32/urlmon/sec_mgr.c
    trunk/reactos/dll/win32/urlmon/usrmarshal.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/urlmon/sec_mgr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/sec_mgr.c…
==============================================================================
--- trunk/reactos/dll/win32/urlmon/sec_mgr.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/urlmon/sec_mgr.c	[iso-8859-1] Thu Nov 17 23:10:44 2016
@@ -1820,7 +1820,7 @@
     TRACE("(%p %p)\n", pUnkOuter, ppobj);
     ret->IInternetZoneManagerEx2_iface.lpVtbl = &ZoneMgrImplVtbl;
     ret->ref = 1;
-    *ppobj = (IInternetZoneManagerEx*)ret;
+    *ppobj = &ret->IInternetZoneManagerEx2_iface;
 
     URLMON_LockModule();
 

Modified: trunk/reactos/dll/win32/urlmon/usrmarshal.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/usrmarsha…
==============================================================================
--- trunk/reactos/dll/win32/urlmon/usrmarshal.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/urlmon/usrmarshal.c	[iso-8859-1] Thu Nov 17 23:10:44 2016
@@ -49,35 +49,35 @@
 }
 
 HRESULT CALLBACK IBindHost_MonikerBindToStorage_Proxy(IBindHost* This,
-        IMoniker *pMk, IBindCtx *pBC, IBindStatusCallback *pBSC,
-        REFIID riid, void **ppvObj)
+        IMoniker *moniker, IBindCtx *bc, IBindStatusCallback *bsc,
+        REFIID riid, void **obj)
 {
-    FIXME("stub\n");
-    return E_NOTIMPL;
+    TRACE("(%p %p %p %p %s %p)\n", This, moniker, bc, bsc, debugstr_guid(riid),
obj);
+    return IBindHost_RemoteMonikerBindToStorage_Proxy(This, moniker, bc, bsc, riid,
(IUnknown**)obj);
 }
 
 HRESULT __RPC_STUB IBindHost_MonikerBindToStorage_Stub(IBindHost* This,
-        IMoniker *pMk, IBindCtx *pBC, IBindStatusCallback *pBSC,
-        REFIID riid, IUnknown **ppvObj)
+        IMoniker *moniker, IBindCtx *bc, IBindStatusCallback *bsc,
+        REFIID riid, IUnknown **obj)
 {
-    FIXME("stub\n");
-    return E_NOTIMPL;
+    TRACE("(%p %p %p %p %s %p)\n", This, moniker, bc, bsc, debugstr_guid(riid),
obj);
+    return IBindHost_MonikerBindToStorage(This, moniker, bc, bsc, riid, (void**)obj);
 }
 
 HRESULT CALLBACK IBindHost_MonikerBindToObject_Proxy(IBindHost* This,
-        IMoniker *pMk, IBindCtx *pBC, IBindStatusCallback *pBSC,
-        REFIID riid, void **ppvObj)
+        IMoniker *moniker, IBindCtx *bc, IBindStatusCallback *bsc,
+        REFIID riid, void **obj)
 {
-    FIXME("stub\n");
-    return E_NOTIMPL;
+    TRACE("(%p %p %p %p %s %p)\n", This, moniker, bc, bsc, debugstr_guid(riid),
obj);
+    return IBindHost_RemoteMonikerBindToObject_Proxy(This, moniker, bc, bsc, riid,
(IUnknown**)obj);
 }
 
 HRESULT __RPC_STUB IBindHost_MonikerBindToObject_Stub(IBindHost* This,
-        IMoniker *pMk, IBindCtx *pBC, IBindStatusCallback *pBSC,
-        REFIID riid, IUnknown **ppvObj)
+        IMoniker *moniker, IBindCtx *bc, IBindStatusCallback *bsc,
+        REFIID riid, IUnknown **obj)
 {
-    FIXME("stub\n");
-    return E_NOTIMPL;
+    TRACE("(%p %p %p %p %s %p)\n", This, moniker, bc, bsc, debugstr_guid(riid),
obj);
+    return IBindHost_MonikerBindToObject(This, moniker, bc, bsc, riid, (void**)obj);
 }
 
 HRESULT CALLBACK IBindStatusCallbackEx_GetBindInfoEx_Proxy(

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Thu Nov 17 23:10:44 2016
@@ -188,7 +188,7 @@
 reactos/dll/win32/twain_32            # 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/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/uxtheme             # Forked
 reactos/dll/win32/vbscript            # Synced to WineStaging-1.9.11