Changeset 8620 for trunk/src/ole32/compobj.c

Timestamp:

Jun 9, 2002, 6:37:22 PM (23 years ago)

Author:

sandervl

Message:

Resync with latest Wine

File:

• trunk/src/ole32/compobj.c (modified) (14 diffs)

trunk/src/ole32/compobj.c

@@ -50 +50 @@
 #include "ifs.h"
 
-#include "debugtools.h"
-
-DEFAULT_DEBUG_CHANNEL(ole);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(ole);
 
 /****************************************************************************
@@ -399 +399 @@
     return S_OK;
 }
-
 #ifndef __WIN32OS2__
 /***********************************************************************
@@ -413 +412 @@
 }
 #endif
-
 /******************************************************************************
  *              CoDisconnectObject      [COMPOBJ.15]
@@ -612 +610 @@
   return S_OK;
 }
-
 #ifndef __WIN32OS2__
 /******************************************************************************
@@ -656 +653 @@
 }
 #endif
-
 /******************************************************************************
  *              StringFromCLSID [OLE32.151]
@@ -932 +928 @@
         return S_OK;
 }
-
 #ifndef __WIN32OS2__
 /* FIXME: this function is not declared in the WINELIB headers. But where should it go ? */
@@ -955 +950 @@
         return 0;
 }
-#endif
+
 /* FIXME: this function is not declared in the WINELIB headers. But where should it go ? */
 /***********************************************************************
@@ -1013 +1008 @@
     return DosDateTimeToFileTime(wDosDate, wDosTime, ft);
 }
-
+#endif
 /***
  * COM_GetRegisteredClassObject
@@ -1300 +1295 @@
 }
 
-static HRESULT WINAPI Remote_CoGetClassObject(
-    REFCLSID rclsid, DWORD dwClsContext, COSERVERINFO *pServerInfo,
-    REFIID iid, LPVOID *ppv
-) {
-  HKEY          key;
-  char          buf[200];
-  HRESULT       hres = E_UNEXPECTED;
-  char          xclsid[80];
-  WCHAR         dllName[MAX_PATH+1];
-  DWORD         dllNameLen = sizeof(dllName);
-  STARTUPINFOW  sinfo;
-  PROCESS_INFORMATION   pinfo;
-
-  WINE_StringFromCLSID((LPCLSID)rclsid,xclsid);
-
-  sprintf(buf,"CLSID\\%s\\LocalServer32",xclsid);
-  hres = RegOpenKeyExA(HKEY_CLASSES_ROOT, buf, 0, KEY_READ, &key);
-
-  if (hres != ERROR_SUCCESS)
-      return REGDB_E_CLASSNOTREG;
-
-  memset(dllName,0,sizeof(dllName));
-  hres= RegQueryValueExW(key,NULL,NULL,NULL,(LPBYTE)dllName,&dllNameLen);
-  if (hres)
-          return REGDB_E_CLASSNOTREG; /* FIXME: check retval */
-  RegCloseKey(key);
-
-  TRACE("found LocalServer32 exe %s\n", debugstr_w(dllName));
-
-  memset(&sinfo,0,sizeof(sinfo));
-  sinfo.cb = sizeof(sinfo);
-  if (!CreateProcessW(NULL,dllName,NULL,NULL,FALSE,0,NULL,NULL,&sinfo,&pinfo))
-      return E_FAIL;
-  return create_marshalled_proxy(rclsid,iid,ppv);
-}
-
 /***********************************************************************
  *           CoGetClassObject [COMPOBJ.7]
  *           CoGetClassObject [OLE32.16]
  *
- * FIXME.  If request allows of several options and there is a failure 
+ * FIXME.  If request allows of several options and there is a failure
  *         with one (other than not being registered) do we try the
  *         others or return failure?  (E.g. inprocess is registered but
@@ -1363 +1322 @@
 #endif
     DllGetClassObjectFunc DllGetClassObject;
-    HKEY key;
-    char buf[200];
 
     WINE_StringFromCLSID((LPCLSID)rclsid,xclsid);
@@ -1397 +1354 @@
 
       return hres;
-    }
-
-    if (((CLSCTX_LOCAL_SERVER) & dwClsContext)
-        && !((CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER) & dwClsContext))
-        return Remote_CoGetClassObject(rclsid,dwClsContext,pServerInfo,iid,ppv);
-
-    /* remote servers not supported yet */
-    if (     ((CLSCTX_REMOTE_SERVER) & dwClsContext)
-        && !((CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER) & dwClsContext)
-    ){
-        FIXME("CLSCTX_REMOTE_SERVER not supported!\n");
-        return E_NOINTERFACE;
     }
 
@@ -1444 +1389 @@
         }
     }
-    
-
-    /* Finally try out of process */
-    /* out of process and remote servers not supported yet */
+
+
+    /* Next try out of process */
     if (CLSCTX_LOCAL_SERVER & dwClsContext)
     {
-        memset(ProviderName,0,sizeof(ProviderName));
-        sprintf(buf,"CLSID\\%s\\LocalServer32",xclsid);
-        if (((hres = RegOpenKeyExA(HKEY_CLASSES_ROOT, buf, 0, KEY_READ, &key)) != ERROR_SUCCESS) ||
-            ((hres = RegQueryValueExW(key,NULL,NULL,NULL,(LPBYTE)ProviderName,&ProviderNameLen)),
-             RegCloseKey (key),
-             hres != ERROR_SUCCESS))
-        {
-            hres = REGDB_E_CLASSNOTREG;
-        }
-        else
-        {
-            /* CO_E_APPNOTFOUND if no exe */
-            FIXME("CLSCTX_LOCAL_SERVER %s registered but not yet supported!\n",debugstr_w(ProviderName));
-            hres = E_ACCESSDENIED;
-        }
-    }
-
+        return create_marshalled_proxy(rclsid,iid,ppv);
+    }
+
+    /* Finally try remote */
     if (CLSCTX_REMOTE_SERVER & dwClsContext)
     {
         FIXME ("CLSCTX_REMOTE_SERVER not supported\n");
-        hres = E_ACCESSDENIED;
+        hres = E_NOINTERFACE;
     }
 
@@ -1576 +1507 @@
     return MK_E_INVALIDEXTENSION;
 }
-#ifndef __WIN32OS2__
 /******************************************************************************
  *              CoRegisterMessageFilter [COMPOBJ.27]
@@ -1587 +1517 @@
         return 0;
 }
-#endif
+
 /***********************************************************************
  *           CoCreateInstance [COMPOBJ.13]