Changeset 3449 for trunk/src

Timestamp:

Apr 26, 2000, 12:57:00 AM (25 years ago)

Author:

davidr

Message:

Fixed StringFromGUID2

File:

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

trunk/src/ole32/clsid.cpp

@@ -1 @@
-/* $Id: clsid.cpp,v 1.12 2000-04-02 22:07:34 davidr Exp $ */
+/* $Id: clsid.cpp,v 1.13 2000-04-25 22:57:00 davidr Exp $ */
 /*
  *
@@ -37 +37 @@
 
     dprintf(("OLE32: CoCreateGuid"));
-
     hr = UuidCreate(pguid);
 
-#if defined(DEBUG)
-    oStringA            tGUID(pguid);
-    dprintf(("       guid = %s", (char *)tGUID));
-#endif
     return hr;
 }
@@ -54 +49 @@
     LPCLSID             pclsid)         // [out] - CLSID
 {
-    dprintf(("OLE32: CLSIDFromProgID16"));
+//    dprintf(("OLE32: CLSIDFromProgID16"));
 
     LONG                lDataLen = 80;
@@ -87 +82 @@
     LPCLSID             pclsid)         // [out] - CLSID
 {
-    dprintf(("OLE32: CLSIDFromProgID"));
+//    dprintf(("OLE32: CLSIDFromProgID"));
 
     LONG                lDataLen = 80;
@@ -118 +113 @@
 HRESULT WIN32API IIDFromString(LPSTR lpsz, LPIID lpiid)
 {
-    dprintf(("OLE32: IIDFromString"));
+//    dprintf(("OLE32: IIDFromString"));
     return CLSIDFromString((LPCOLESTR)lpsz, (LPCLSID)lpiid);
 }
@@ -144 +139 @@
     LPCLSID             pclsid)         // [out] - Binary CLSID
 {
-    dprintf(("OLE32: CLSIDFromString16"));
+//    dprintf(("OLE32: CLSIDFromString16"));
 
     // Convert to binary CLSID
@@ -221 +216 @@
     LPCLSID             pclsid)         // [out] - Binary CLSID
 {
-    dprintf(("OLE32: CLSIDFromString"));
+//    dprintf(("OLE32: CLSIDFromString"));
 
     oStringA            tClsId(lpsz);
@@ -233 +228 @@
 HRESULT WIN32API WINE_StringFromCLSID(const CLSID *rclsid, LPSTR idstr)
 {
-    dprintf(("OLE32: WINE_StringFromCLSID"));
+//    dprintf(("OLE32: WINE_StringFromCLSID"));
 
     if (rclsid == NULL)
@@ -256 +251 @@
             rclsid->Data4[7]);
 
-    dprintf(("       clsid: %s", idstr));
+//    dprintf(("       clsid: %s", idstr));
 
     return OLE_OK;
@@ -271 +266 @@
     size_t      strLen;
 
-    dprintf(("OLE32: StringFromCLSID"));
+//    dprintf(("OLE32: StringFromCLSID"));
 
     // Setup new string...
@@ -298 +293 @@
     size_t      strLen;
 
-    dprintf(("OLE32: StringFromIID"));
+//    dprintf(("OLE32: StringFromIID"));
 
     // Setup new string...
@@ -320 +315 @@
 int WIN32API StringFromGUID2(REFGUID rguid, LPOLESTR lpsz, int cbMax)
 {
+// NB cbMax is a CHARACTER count not a BYTE count... :-)
     char        tmp[50];
     size_t      strLen;
 
-    dprintf(("OLE32: StringFromGUID2"));
-
     // Setup new string...
     WINE_StringFromCLSID(rguid, tmp);
 
-    strLen = strlen(tmp);
-
-    if ( (strLen / 2) + 1  > cbMax )
-        return 0;
-
-    AsciiToUnicode(tmp, lpsz);
-
-    return (strLen / 2) + 1;  // including 0 terminator
+    strLen = (strlen(tmp) + 1);
+    if (strLen > cbMax)
+        strLen = cbMax;
+
+    AsciiToUnicodeN(tmp, lpsz, strLen);
+
+    return strLen;  // Num CHARACTERS including 0 terminator
 }
 
@@ -397 +390 @@
     LPMALLOC            pMllc;
 
-    dprintf(("OLE32: ProgIDFromCLSID"));
-    dprintf(("       clsid = %s", (char *)tClsId));
+//    dprintf(("OLE32: ProgIDFromCLSID"));
+//    dprintf(("       clsid = %s", (char *)tClsId));
 
     szKey += tClsId + "\\ProgID";