Sync with trunk r63174.

[reactos.git] / dll / win32 / urlmon / umon.c

diff --git a/dll/win32/urlmon/umon.c b/dll/win32/urlmon/umon.c
index 926fb7a..132e97e 100644 (file)
--- a/dll/win32/urlmon/umon.c
+++ b/dll/win32/urlmon/umon.c
@@ -22,14 +22,8 @@
 
 #include "urlmon_main.h"
 
-//#include "winreg.h"
-#include <shlwapi.h>
+#include <shellapi.h>
 #include <hlink.h>
-//#include "shellapi.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
 
 typedef struct {
     IMoniker      IMoniker_iface;
@@ -233,7 +227,22 @@ static HRESULT WINAPI URLMoniker_BindToObject(IMoniker *iface, IBindCtx* pbc, IM
 
     hres = IBindCtx_GetRunningObjectTable(pbc, &obj_tbl);
     if(SUCCEEDED(hres)) {
-        FIXME("use running object table\n");
+        hres = IRunningObjectTable_IsRunning(obj_tbl, &This->IMoniker_iface);
+        if(hres == S_OK) {
+            IUnknown *unk = NULL;
+
+            TRACE("Found in running object table\n");
+
+            hres = IRunningObjectTable_GetObject(obj_tbl, &This->IMoniker_iface, &unk);
+            if(SUCCEEDED(hres)) {
+                hres = IUnknown_QueryInterface(unk, riid, ppv);
+                IUnknown_Release(unk);
+            }
+
+            IRunningObjectTable_Release(obj_tbl);
+            return hres;
+        }
+
         IRunningObjectTable_Release(obj_tbl);
     }