Changeset 795 for trunk/src/shell32/new/shellole.cpp

Timestamp:

Sep 2, 1999, 7:25:19 PM (26 years ago)

Author:

phaller

Message:

.

File:

• trunk/src/shell32/new/shellole.cpp (modified) (7 diffs)

trunk/src/shell32/new/shellole.cpp

@@ -66 +66 @@
         WINE_StringFromCLSID(refiid,xiid);
         if (unknownouter)
-                WINE_StringFromCLSID(unknownouter,xuout);
+                WINE_StringFromCLSID((const CLSID*)unknownouter,xuout);
         
         TRACE("(%p,\n\tCLSID:\t%s\n\tUOUT:\t%s\n\tIID:\t%s,%p)\n",
@@ -140 +140 @@
 {
         if (VERSION_OsIsUnicode())
-          return SHCLSIDFromStringW (clsid, id);
-        return SHCLSIDFromStringA (clsid, id);
+          return SHCLSIDFromStringW ((LPWSTR)clsid, id);
+        return SHCLSIDFromStringA ((LPSTR)clsid, id);
 }
 
@@ -178 +178 @@
           if(lpclf)
           {
-            hres = IClassFactory_CreateInstance(lpclf,NULL,(REFIID)&IID_IShellFolder, (void*)&pdesktopfolder);
+            hres = IClassFactory_CreateInstance(lpclf,NULL,(REFIID)&IID_IShellFolder, (LPVOID*)&pdesktopfolder);
             IClassFactory_Release(lpclf);
           }
@@ -206 +206 @@
 } IClassFactoryImpl;
 
-static ICOM_VTABLE(IClassFactory) clfvt;
-
-/**************************************************************************
- *  IClassFactory_Constructor
- */
-
-LPCLASSFACTORY IClassFactory_Constructor(REFCLSID rclsid)
-{
-        IClassFactoryImpl* lpclf;
-
-        lpclf= (IClassFactoryImpl*)HeapAlloc(GetProcessHeap(),0,sizeof(IClassFactoryImpl));
-        lpclf->ref = 1;
-        lpclf->lpvtbl = &clfvt;
-        lpclf->rclsid = (CLSID*)rclsid;
-
-        TRACE("(%p)->()\n",lpclf);
-        shell32_ObjCount++;
-        return (LPCLASSFACTORY)lpclf;
-}
+//static ICOM_VTABLE(IClassFactory) clfvt;
+
 /**************************************************************************
  *  IClassFactory_QueryInterface
@@ -348 +331 @@
 
 /**************************************************************************
+ *  IClassFactory_Constructor
+ */
+
+LPCLASSFACTORY IClassFactory_Constructor(REFCLSID rclsid)
+{
+        IClassFactoryImpl* lpclf;
+
+        lpclf= (IClassFactoryImpl*)HeapAlloc(GetProcessHeap(),0,sizeof(IClassFactoryImpl));
+        lpclf->ref = 1;
+        lpclf->lpvtbl = &clfvt;
+        lpclf->rclsid = (CLSID*)rclsid;
+
+        TRACE("(%p)->()\n",lpclf);
+        shell32_ObjCount++;
+        return (LPCLASSFACTORY)lpclf;
+}
+
+
+/**************************************************************************
  * Default ClassFactory Implementation
  *
@@ -369 +371 @@
 } IDefClFImpl;
 
-static ICOM_VTABLE(IClassFactory) dclfvt;
-
-/**************************************************************************
- *  IDefClF_fnConstructor
- */
-
-IClassFactory * IDefClF_fnConstructor(LPFNCREATEINSTANCE lpfnCI, UINT * pcRefDll, REFIID riidInst)
-{
-        IDefClFImpl* lpclf;
-        char    xriidInst[50];
-
-        WINE_StringFromCLSID((LPCLSID)riidInst,xriidInst);
-
-        lpclf = (IDefClFImpl*)HeapAlloc(GetProcessHeap(),0,sizeof(IDefClFImpl));
-        lpclf->ref = 1;
-        lpclf->lpvtbl = &dclfvt;
-        lpclf->lpfnCI = lpfnCI;
-        lpclf->pcRefDll = pcRefDll;
-
-        if (pcRefDll)
-          (*pcRefDll)++;
-
-        lpclf->riidInst = riidInst;
-
-        TRACE("(%p)\n\tIID:\t%s\n",lpclf, xriidInst);
-        shell32_ObjCount++;
-        return (LPCLASSFACTORY)lpclf;
-}
+//static ICOM_VTABLE(IClassFactory) dclfvt;
+
 /**************************************************************************
  *  IDefClF_fnQueryInterface
@@ -505 +481 @@
 };
 
+/**************************************************************************
+ *  IDefClF_fnConstructor
+ */
+
+IClassFactory * IDefClF_fnConstructor(LPFNCREATEINSTANCE lpfnCI, UINT * pcRefDll, REFIID riidInst)
+{
+        IDefClFImpl* lpclf;
+        char    xriidInst[50];
+
+        WINE_StringFromCLSID((LPCLSID)riidInst,xriidInst);
+
+        lpclf = (IDefClFImpl*)HeapAlloc(GetProcessHeap(),0,sizeof(IDefClFImpl));
+        lpclf->ref = 1;
+        lpclf->lpvtbl = &dclfvt;
+        lpclf->lpfnCI = lpfnCI;
+        lpclf->pcRefDll = pcRefDll;
+
+        if (pcRefDll)
+          (*pcRefDll)++;
+
+        lpclf->riidInst = riidInst;
+
+        TRACE("(%p)\n\tIID:\t%s\n",lpclf, xriidInst);
+        shell32_ObjCount++;
+        return (LPCLASSFACTORY)lpclf;
+}
+
+
 /******************************************************************************
  * SHCreateDefClassObject                       [SHELL32.70]