Changeset 851 for trunk/src/ole32/clsid.cpp

Timestamp:

Sep 7, 1999, 9:26:19 AM (26 years ago)

Author:

davidr

Message:

Initial port of OLE2.
Added regsvr32

File:

• trunk/src/ole32/clsid.cpp (modified) (6 diffs)

trunk/src/ole32/clsid.cpp

@@ -33 +33 @@
     LONG                lDataLen = 80;
     oStringW            szKey(lpszProgID);
-    oStringW            szCLSID(lDataLen);
+    oStringW            szCLSID(lDataLen, 1);
     HKEY                hKey;
     HRESULT             rc;
@@ -156 +156 @@
 
 // ----------------------------------------------------------------------
-// StringFromCLSID
-// Memory allocated here on behalf of application should be freed using CoTaskMemFree()
-// ----------------------------------------------------------------------
-HRESULT WIN32API StringFromCLSID(REFCLSID rclsid, LPOLESTR *ppsz)
-{
-    char        tmp[50];
-    LPWSTR      szclsid;
-    size_t      strLen;
-
-    dprintf(("OLE32: StringFromCLSID"));
-
-    // Setup new string...
-    strLen  = sprintf(tmp, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}",
+// WINE_StringFromCLSID
+// ----------------------------------------------------------------------
+HRESULT WINE_StringFromCLSID(const CLSID *rclsid, LPSTR idstr)
+{
+    dprintf(("OLE32: WINE_StringFromCLSID"));
+
+    if (rclsid == NULL)
+    {
+        dprintf(("       clsid: (NULL)"));
+        *idstr = 0;
+        return E_FAIL;
+    }
+
+    // Setup new string...
+    sprintf(idstr, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}",
             rclsid->Data1,
             rclsid->Data2,
@@ -181 +183 @@
             rclsid->Data4[7]);
 
+    dprintf(("       clsid: %s", idstr));
+
+    return OLE_OK;
+}
+
+// ----------------------------------------------------------------------
+// StringFromCLSID
+// Memory allocated here on behalf of application should be freed using CoTaskMemFree()
+// ----------------------------------------------------------------------
+HRESULT WIN32API StringFromCLSID(REFCLSID rclsid, LPOLESTR *ppsz)
+{
+    char        tmp[50];
+    LPWSTR      szclsid;
+    size_t      strLen;
+
+    dprintf(("OLE32: StringFromCLSID"));
+
+    // Setup new string...
+    WINE_StringFromCLSID(rclsid, tmp);
+
+    strLen = strlen(tmp);
+
     // Grab buffer for string...
     szclsid = (LPWSTR)CoTaskMemAlloc((strLen + 1) * sizeof(WCHAR));
@@ -204 +228 @@
 
     // Setup new string...
-    strLen  = sprintf(tmp, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}",
-            riid->Data1,
-            riid->Data2,
-            riid->Data3,
-            riid->Data4[0],
-            riid->Data4[1],
-            riid->Data4[2],
-            riid->Data4[3],
-            riid->Data4[4],
-            riid->Data4[5],
-            riid->Data4[6],
-            riid->Data4[7]);
+    WINE_StringFromCLSID(riid, tmp);
+
+    strLen = strlen(tmp);
 
     // Grab buffer for string...
@@ -232 +247 @@
 int WIN32API StringFromGUID2(REFGUID rguid, LPOLESTR lpsz, int cbMax)
 {
-    char        tmp[64];
+    char        tmp[50];
     size_t      strLen;
 
@@ -238 +253 @@
 
     // Setup new string...
-    strLen  = sprintf(tmp, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}",
-            rguid->Data1,
-            rguid->Data2,
-            rguid->Data3,
-            rguid->Data4[0],
-            rguid->Data4[1],
-            rguid->Data4[2],
-            rguid->Data4[3],
-            rguid->Data4[4],
-            rguid->Data4[5],
-            rguid->Data4[6],
-            rguid->Data4[7]);
+    WINE_StringFromCLSID(rguid, tmp);
+
+    strLen = strlen(tmp);
 
     if(cbMax < (strLen * 2 + 1))