PATCH: ole16 stubs

[Marcus Meissner]

Hi,

CoCreateInstance and CoGetClassObject implementations
cannot be shared between 16 and 32bit. So make the 16 bit
version a stub for now.
Added OleLoad stub.

Ciao, Marcus

Changelog:
	Added CoCreateInstance16, CoGetClassObject16, OleLoad16 stubs.

Index: dlls/ole32/compobj.c
===================================================================
RCS file: /home/wine/wine/dlls/ole32/compobj.c,v
retrieving revision 1.155
diff -u -r1.155 compobj.c
--- dlls/ole32/compobj.c	19 Jul 2005 11:40:22 -0000	1.155
+++ dlls/ole32/compobj.c	14 Aug 2005 08:45:26 -0000
@@ -1562,7 +1562,6 @@
 }
 
 /***********************************************************************
- *           CoGetClassObject [COMPOBJ.7]
  *           CoGetClassObject [OLE32.@]
  *
  * FIXME.  If request allows of several options and there is a failure
@@ -1664,6 +1663,23 @@
 
     return hres;
 }
+
+/***********************************************************************
+ *           CoGetClassObject [COMPOBJ.7]
+ *
+ */
+HRESULT WINAPI CoGetClassObject16(
+    REFCLSID rclsid, DWORD dwClsContext, COSERVERINFO *pServerInfo,
+    REFIID iid, LPVOID *ppv)
+{
+    FIXME(", stub!\n\tCLSID:\t%s,\n\tIID:\t%s\n", debugstr_guid(rclsid), debugstr_guid(iid));
+
+    if (pServerInfo) {
+	FIXME("\tpServerInfo: name=%s\n",debugstr_w(pServerInfo->pwszName));
+	FIXME("\t\tpAuthInfo=%p\n",pServerInfo->pAuthInfo);
+    }
+    return E_NOTIMPL;
+}
 /***********************************************************************
  *        CoResumeClassObjects (OLE32.@)
  *
@@ -1772,8 +1788,8 @@
 
     return MK_E_INVALIDEXTENSION;
 }
+
 /***********************************************************************
- *           CoCreateInstance [COMPOBJ.13]
  *           CoCreateInstance [OLE32.@]
  */
 HRESULT WINAPI CoCreateInstance(
@@ -1838,6 +1854,23 @@
 		debugstr_guid(iid), debugstr_guid(rclsid),hres);
 
 	return hres;
+}
+
+/***********************************************************************
+ *           CoCreateInstance [COMPOBJ.13]
+ */
+HRESULT WINAPI CoCreateInstance16(
+	REFCLSID rclsid,
+	LPUNKNOWN pUnkOuter,
+	DWORD dwClsContext,
+	REFIID iid,
+	LPVOID *ppv)
+{
+  FIXME("(%s, %p, %lx, %s, %p), stub!\n", 
+	debugstr_guid(rclsid), pUnkOuter, dwClsContext, debugstr_guid(iid),
+	ppv
+  );
+  return E_NOTIMPL;
 }
 
 /***********************************************************************
Index: dlls/ole32/compobj.spec
===================================================================
RCS file: /home/wine/wine/dlls/ole32/compobj.spec,v
retrieving revision 1.10
diff -u -r1.10 compobj.spec
--- dlls/ole32/compobj.spec	24 Jul 2005 16:15:24 -0000	1.10
+++ dlls/ole32/compobj.spec	14 Aug 2005 08:45:26 -0000
@@ -4,13 +4,13 @@
 4 pascal CoGetMalloc(long ptr) CoGetMalloc16
 5 pascal CoRegisterClassObject(ptr ptr long long ptr) CoRegisterClassObject16
 6 pascal CoRevokeClassObject(long) CoRevokeClassObject16
-7 pascal CoGetClassObject(ptr long ptr ptr ptr) CoGetClassObject
+7 pascal CoGetClassObject(ptr long ptr ptr ptr) CoGetClassObject16
 8 stub COMARSHALINTERFACE
 9 stub COUNMARSHALINTERFACE
 10 stub COLOADLIBRARY
 11 stub COFREELIBRARY
 12 stub COFREEALLLIBRARIES
-13 pascal CoCreateInstance(ptr ptr long ptr ptr) CoCreateInstance
+13 pascal CoCreateInstance(ptr ptr long ptr ptr) CoCreateInstance16
 14 stub STRINGFROMIID
 15 pascal CoDisconnectObject(ptr long) CoDisconnectObject
 16 stub CORELEASEMARSHALDATA
Index: dlls/ole32/ole2.spec
===================================================================
RCS file: /home/wine/wine/dlls/ole32/ole2.spec,v
retrieving revision 1.12
diff -u -r1.12 ole2.spec
--- dlls/ole32/ole2.spec	10 Aug 2005 09:53:47 -0000	1.12
+++ dlls/ole32/ole2.spec	14 Aug 2005 08:45:27 -0000
@@ -9,7 +9,7 @@
 9 stub OLECREATELINKFROMDATA
 10 stub OLECREATE
 11 stub OLECREATELINK
-12 stub OLELOAD
+12 pascal OleLoad(segptr ptr segptr ptr) OleLoad16
 13 stub OLESAVE
 14 stub OLERUN
 #15 ___EXPORTEDSTUB
Index: dlls/ole32/ole2_16.c
===================================================================
RCS file: /home/wine/wine/dlls/ole32/ole2_16.c,v
retrieving revision 1.7
diff -u -r1.7 ole2_16.c
--- dlls/ole32/ole2_16.c	24 Jul 2005 16:15:24 -0000	1.7
+++ dlls/ole32/ole2_16.c	14 Aug 2005 08:45:27 -0000
@@ -192,3 +192,16 @@
 		return FALSE;
 	return TRUE;
 }
+
+/******************************************************************************
+ *              OleLoad        [OLE2.12]
+ */
+HRESULT WINAPI OleLoad16(
+  /*LPSTORAGE16*/	SEGPTR		pStg,
+  REFIID            			riid,
+  /*LPOLECLIENTSITE16*/	SEGPTR		pClientSite,
+  LPVOID*				ppvObj)
+{
+  FIXME("(%lx,%s,%lx,%p), stub!\n", pStg, debugstr_guid(riid), pClientSite, ppvObj);
+  return E_NOTIMPL;
+}