Changeset 3170 for trunk/src

Timestamp:

Mar 19, 2000, 11:33:36 PM (25 years ago)

Author:

davidr

Message:

Created ReadClassStm, WriteClassStm, ProgIDFromCLSID

Location:

trunk/src/ole32

Files:

• clsid.cpp (modified) (2 diffs)
• stubs.cpp (modified) (5 diffs)

trunk/src/ole32/clsid.cpp

@@ -1 @@
-/* $Id: clsid.cpp,v 1.10 2000-03-19 15:33:05 davidr Exp $ */
+/* $Id: clsid.cpp,v 1.11 2000-03-19 22:32:12 davidr Exp $ */
 /*
  *
@@ -332 +332 @@
 }
 
+// ----------------------------------------------------------------------
+// ReadClassStm
+// ----------------------------------------------------------------------
+HRESULT WIN32API ReadClassStm(IStream *pStm, CLSID *rclsid)
+{
+    ULONG nbByte;
+    HRESULT res;
+
+    dprintf(("OLE32: ReadClassStm"));
+
+    if (rclsid == NULL)
+        return E_INVALIDARG;
+
+    res = IStream_Read(pStm,(void*)rclsid,sizeof(CLSID),&nbByte);
+
+    if (FAILED(res))
+        return res;
+
+    if (nbByte != sizeof(CLSID))
+        return S_FALSE;
+
+    return S_OK;
+}
+
+// ----------------------------------------------------------------------
+// WriteClassStm
+// ----------------------------------------------------------------------
+HRESULT WIN32API WriteClassStm(IStream *pStm, REFCLSID rclsid)
+{
+    dprintf(("OLE32: WriteClassStm"));
+
+    if (rclsid == NULL)
+        return E_INVALIDARG;
+
+    return IStream_Write(pStm, rclsid, sizeof(CLSID), NULL);
+}
+
+// ----------------------------------------------------------------------
+// ProgIDFromCLSID
+// ----------------------------------------------------------------------
+HRESULT WIN32API ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *lplpszProgID)
+{
+    oStringA            tClsId(clsid);
+    oStringA            szKey("CLSID\\");
+    LONG                lDataLen = 255;
+    oStringA            szProgID(lDataLen, 1);
+    HKEY                hKey;
+    HRESULT             rc;
+    LPOLESTR            tmp;
+    LPMALLOC            pMllc;
+
+    dprintf(("OLE32: ProgIDFromCLSID"));
+    dprintf(("       clsid = %s", (char *)tClsId));
+
+    szKey += tClsId + "\\ProgID";
+
+    // Open key...
+    if (RegOpenKeyA(HKEY_CLASSES_ROOT, szKey, &hKey))
+        return REGDB_E_CLASSNOTREG;
+
+    // Get default string from the key...
+    rc = RegQueryValueA(hKey, NULL, szProgID, &lDataLen);
+    RegCloseKey(hKey);
+    if (rc != 0)
+        return REGDB_E_CLASSNOTREG;
+
+    if (CoGetMalloc(0, &pMllc))         // Singleton instance, no need to release
+        return E_OUTOFMEMORY;
+
+    tmp = (LPOLESTR)IMalloc_Alloc(pMllc, (strlen(szProgID) + 1) * 2); 
+    if (tmp == NULL)
+        return E_OUTOFMEMORY;
+
+    AsciiToUnicode(szProgID, tmp);
+    *lplpszProgID = tmp;
+
+    return S_OK;
+}

trunk/src/ole32/stubs.cpp

@@ -1 @@
-/* $Id: stubs.cpp,v 1.11 2000-03-19 15:33:09 davidr Exp $ */
+/* $Id: stubs.cpp,v 1.12 2000-03-19 22:32:13 davidr Exp $ */
 /* 
  * Win32 COM/OLE stubs for OS/2
@@ -15 +15 @@
 #include "ole32.h"
 
+//*******************************************************************************
+//*******************************************************************************
+HRESULT WIN32API DllDebugObjectRPCHook()
+{
+    dprintf(("OLE32: DllDebugObjectRPCHook, UNKNOWN API - stub"));
+    return 0;
+}
+//*******************************************************************************
+//*******************************************************************************
+HRESULT WIN32API DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
+{
+    dprintf(("OLE32: DllGetClassObject - stub"));
+    return E_OUTOFMEMORY;
+}
+//*******************************************************************************
+//*******************************************************************************
+HRESULT WIN32API DllGetClassObjectWOW()
+{
+    dprintf(("OLE32: DllGetClassObjectWOW, UNKNOWN API - stub"));
+    return 0;
+}
 //*****************************************************************************
 //*****************************************************************************
@@ -227 +248 @@
     dprintf(("OLE32: CreatePointerMoniker - stub"));
     return E_OUTOFMEMORY;
-}
-//*******************************************************************************
-//*******************************************************************************
-HRESULT WIN32API DllDebugObjectRPCHook()
-{
-    dprintf(("OLE32: DllDebugObjectRPCHook, UNKNOWN API - stub"));
-    return 0;
-}
-//*******************************************************************************
-//*******************************************************************************
-HRESULT WIN32API DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
-{
-    dprintf(("OLE32: DllGetClassObject - stub"));
-    return E_OUTOFMEMORY;
-}
-//*******************************************************************************
-//*******************************************************************************
-HRESULT WIN32API DllGetClassObjectWOW()
-{
-    dprintf(("OLE32: DllGetClassObjectWOW, UNKNOWN API - stub"));
-    return 0;
 }
 //*******************************************************************************
@@ -567 +567 @@
 //*******************************************************************************
 //*******************************************************************************
-HRESULT WIN32API ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *lplpszProgID)
-{
-    dprintf(("OLE32: ProgIDFromCLSID - stub"));
-    return(REGDB_E_CLASSNOTREG);
-}
-//*******************************************************************************
-//*******************************************************************************
-HRESULT WIN32API ReadClassStm(IStream *pStm, CLSID *pclsid)
-{
-    dprintf(("OLE32: ReadClassStm - stub"));
-    return(STG_E_READFAULT);
-}
-//*******************************************************************************
-//*******************************************************************************
 HRESULT WIN32API ReadFmtUserTypeStg(IStorage *pStg, CLIPFORMAT *pcf,
                                        LPWSTR *lplpszUserType)
@@ -651 +637 @@
     return(E_OUTOFMEMORY);
 }
-//*******************************************************************************
-//*******************************************************************************
-HRESULT WIN32API WriteClassStm(IStream *pStm, REFCLSID rclsid)
-{
-    dprintf(("OLE32: WriteClassStm - stub"));
-    return(STG_E_MEDIUMFULL);
-}
+
 //*******************************************************************************
 //*******************************************************************************