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

Timestamp:

Mar 19, 2000, 4:35:32 PM (25 years ago)

Author:

davidr

Message:

Ported changes from wine/corel sources

File:

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

trunk/src/ole32/clsid.cpp

@@ -1 @@
-/* $Id: clsid.cpp,v 1.9 1999-11-23 20:37:42 davidr Exp $ */
+/* $Id: clsid.cpp,v 1.10 2000-03-19 15:33:05 davidr Exp $ */
 /*
  *
@@ -24 +24 @@
 
 // ----------------------------------------------------------------------
+// CLSIDFromProgID16()
+// ----------------------------------------------------------------------
+HRESULT WIN32API CLSIDFromProgID16(
+    LPCOLESTR16         lpszProgID,     // [in] - UNICODE program id as found in registry
+    LPCLSID             pclsid)         // [out] - CLSID
+{
+    dprintf(("OLE32: CLSIDFromProgID16"));
+
+    LONG                lDataLen = 80;
+    oStringA            szKey(lpszProgID);
+    oStringA            szCLSID(lDataLen, 1);
+    HKEY                hKey;
+    HRESULT             rc;
+
+    // Create the registry lookup string...
+    szKey += "\\CLSID";
+
+    // Try to open the key in the registry...
+    rc = RegOpenKeyA(HKEY_CLASSES_ROOT, szKey, &hKey);
+    if (rc != 0)
+        return OLE_ERROR_GENERIC;
+
+    // Now get the data from the _default_ entry on this key...
+    rc = RegQueryValueA(hKey, NULL, szCLSID, &lDataLen);
+    RegCloseKey(hKey);
+    if (rc != 0)
+        return OLE_ERROR_GENERIC;
+
+    // Now convert from a string to a UUID
+    return CLSIDFromString16(szCLSID, pclsid);
+}
+
+// ----------------------------------------------------------------------
 // CLSIDFromProgID()
 // ----------------------------------------------------------------------
@@ -72 +105 @@
 // ----------------------------------------------------------------------
 
-// missing prototype
-LPWSTR WIN32API HEAP_strdupAtoW( HANDLE heap, DWORD flags, LPCSTR str );
-
 HRESULT WIN32API CLSIDFromStringA(
     LPCSTR              lpsz,           // [in] - ASCII string CLSID
     LPCLSID             pclsid)         // [out] - Binary CLSID
 {
-  LPWSTR  lpszOle = HEAP_strdupAtoW(GetProcessHeap(),
-                                    0,
-                                    lpsz);
-  HRESULT hRes;
-
-  dprintf(("OLE32: CLSIDFromStringA"));
-
-  hRes = CLSIDFromString(lpszOle, pclsid);
-  HeapFree(GetProcessHeap(), 0, lpszOle);
-  return hRes;
-}
-
+    return CLSIDFromString16(lpsz, pclsid);
+}
+
+
+// ----------------------------------------------------------------------
+// CLSIDFromString16()
+// ----------------------------------------------------------------------
+HRESULT WIN32API CLSIDFromString16(
+    LPCOLESTR16         lpsz,           // [in] - Unicode string CLSID
+    LPCLSID             pclsid)         // [out] - Binary CLSID
+{
+    dprintf(("OLE32: CLSIDFromString16"));
+
+    // Convert to binary CLSID
+    char *s = (char *) lpsz;
+    char *p;
+    int   i;
+    char table[256];
+
+    /* quick lookup table */
+    memset(table, 0, 256);
+
+    for (i = 0; i < 10; i++)
+    {
+        table['0' + i] = i;
+    }
+    for (i = 0; i < 6; i++)
+    {
+        table['A' + i] = i+10;
+        table['a' + i] = i+10;
+    }
+
+    /* in form {XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX} */
+
+    if (lstrlenA(lpsz) != 38)
+        return OLE_ERROR_OBJECT;
+
+    p = (char *) pclsid;
+
+    s++;  /* skip leading brace  */
+    for (i = 0; i < 4; i++)
+    {
+        p[3 - i] = table[*s]<<4 | table[*(s+1)];
+        s += 2;
+    }
+    p += 4;
+    s++;  /* skip - */
+
+    for (i = 0; i < 2; i++)
+    {
+        p[1-i] = table[*s]<<4 | table[*(s+1)];
+        s += 2;
+    }
+    p += 2;
+    s++;  /* skip - */
+
+    for (i = 0; i < 2; i++)
+    {
+        p[1-i] = table[*s]<<4 | table[*(s+1)];
+        s += 2;
+    }
+    p += 2;
+    s++;  /* skip - */
+
+    /* these are just sequential bytes */
+    for (i = 0; i < 2; i++)
+    {
+        *p++ = table[*s]<<4 | table[*(s+1)];
+        s += 2;
+    }
+    s++;  /* skip - */
+
+    for (i = 0; i < 6; i++)
+    {
+        *p++ = table[*s]<<4 | table[*(s+1)];
+        s += 2;
+    }
+
+    return S_OK;
+}
 
 // ----------------------------------------------------------------------
@@ -103 +201 @@
     oStringA            tClsId(lpsz);
 
-    HRESULT             ret = OLE_ERROR_GENERIC;
-
-    // Convert to binary CLSID
-    char *s = (char *) tClsId;
-    char *p;
-    int   i;
-    char table[256];
-
-    /* quick lookup table */
-    memset(table, 0, 256);
-
-    for (i = 0; i < 10; i++)
-    {
-        table['0' + i] = i;
-    }
-    for (i = 0; i < 6; i++)
-    {
-        table['A' + i] = i+10;
-        table['a' + i] = i+10;
-    }
-
-    /* in form {XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX} */
-
-    if (lstrlenW(lpsz) != 38)
-        return OLE_ERROR_OBJECT;
-
-    p = (char *) pclsid;
-
-    s++;  /* skip leading brace  */
-    for (i = 0; i < 4; i++)
-    {
-        p[3 - i] = table[*s]<<4 | table[*(s+1)];
-        s += 2;
-    }
-    p += 4;
-    s++;  /* skip - */
-
-    for (i = 0; i < 2; i++)
-    {
-        p[1-i] = table[*s]<<4 | table[*(s+1)];
-        s += 2;
-    }
-    p += 2;
-    s++;  /* skip - */
-
-    for (i = 0; i < 2; i++)
-    {
-        p[1-i] = table[*s]<<4 | table[*(s+1)];
-        s += 2;
-    }
-    p += 2;
-    s++;  /* skip - */
-
-    /* these are just sequential bytes */
-    for (i = 0; i < 2; i++)
-    {
-        *p++ = table[*s]<<4 | table[*(s+1)];
-        s += 2;
-    }
-    s++;  /* skip - */
-
-    for (i = 0; i < 6; i++)
-    {
-        *p++ = table[*s]<<4 | table[*(s+1)];
-        s += 2;
-    }
-
-    return S_OK;
+    return CLSIDFromString16(tClsId, pclsid);
 }