Changeset 7916 for trunk/src/oleaut32/olefont.c

Timestamp:

Feb 15, 2002, 4:07:41 PM (24 years ago)

Author:

sandervl

Message:

Wine 20020215 resync + added extended logging

File:

• trunk/src/oleaut32/olefont.c (modified) (8 diffs)

trunk/src/oleaut32/olefont.c

@@ -26 +26 @@
 #include "olectl.h"
 #include "debugtools.h"
-#include "heap.h"
 #include "connpt.h" /* for CreateConnectionPoint */
 
@@ -292 +291 @@
   *ppvObj = 0;
 
+  if (lpFontDesc == 0)
+    return NO_ERROR; /* MSDN Oct 2001 */
+
   /*
    * Try to construct a new instance of the class.
@@ -1341 +1343 @@
   BYTE  bAttributes;
   BYTE  bStringSize;
+  INT len;
 
   _ICOM_THIS_From_IPersistStream(OLEFontImpl, iface);
@@ -1399 +1402 @@
     return E_FAIL;
 
-  memset(readBuffer, 0, 0x100);
   IStream_Read(pLoadStream, readBuffer, bStringSize, &cbRead);
 
@@ -1408 +1410 @@
     HeapFree(GetProcessHeap(), 0, this->description.lpstrName);
 
-  this->description.lpstrName = HEAP_strdupAtoW(GetProcessHeap(), 
-                                                    HEAP_ZERO_MEMORY,
-                                                    readBuffer);
+  len = MultiByteToWideChar( CP_ACP, 0, readBuffer, bStringSize, NULL, 0 );
+  this->description.lpstrName = HeapAlloc( GetProcessHeap(), 0, (len+1) * sizeof(WCHAR) );
+  MultiByteToWideChar( CP_ACP, 0, readBuffer, bStringSize, this->description.lpstrName, len );
+  this->description.lpstrName[len] = 0;
 
   return S_OK;
@@ -1488 +1491 @@
    */
   if (this->description.lpstrName!=0)
-    bStringSize = lstrlenW(this->description.lpstrName);
+    bStringSize = WideCharToMultiByte( CP_ACP, 0, this->description.lpstrName,
+                                       strlenW(this->description.lpstrName), NULL, 0, NULL, NULL );
   else
     bStringSize = 0;
@@ -1499 +1503 @@
   if (bStringSize!=0)
   {
-    writeBuffer = HEAP_strdupWtoA(GetProcessHeap(), 
-                                  HEAP_ZERO_MEMORY,
-                                  this->description.lpstrName);
-
-    if (writeBuffer==0)
-      return E_OUTOFMEMORY;
+      if (!(writeBuffer = HeapAlloc( GetProcessHeap(), 0, bStringSize ))) return E_OUTOFMEMORY;
+      WideCharToMultiByte( CP_ACP, 0, this->description.lpstrName,
+                           strlenW(this->description.lpstrName),
+                           writeBuffer, bStringSize, NULL, NULL );
 
     IStream_Write(pOutStream, writeBuffer, bStringSize, &cbWritten);
-    
     HeapFree(GetProcessHeap(), 0, writeBuffer);
 
@@ -1660 +1661 @@
         LPCLASSFACTORY iface,LPUNKNOWN pOuter,REFIID riid,LPVOID *ppobj
 ) {
-        ICOM_THIS(IClassFactoryImpl,iface);
-
-        if (IsEqualGUID(riid,&IID_IFont)) {
-            FONTDESC fd;
-
-            WCHAR fname[] = { 'S','y','s','t','e','m',0 };
-
-            fd.cbSizeofstruct = sizeof(fd);
-            fd.lpstrName      = fname;
-            fd.cySize.s.Lo    = 80000;
-            fd.cySize.s.Hi    = 0;
-            fd.sWeight        = 0;
-            fd.sCharset       = 0;
-            fd.fItalic        = 0;
-            fd.fUnderline     = 0;
-            fd.fStrikethrough = 0;
-            return OleCreateFontIndirect(&fd,riid,ppobj);
-        }
-
-        FIXME("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj);
-        return E_NOINTERFACE;
+        FONTDESC fd;
+
+        WCHAR fname[] = { 'S','y','s','t','e','m',0 };
+
+        fd.cbSizeofstruct = sizeof(fd);
+        fd.lpstrName      = fname;
+        fd.cySize.s.Lo    = 80000;
+        fd.cySize.s.Hi    = 0;
+        fd.sWeight            = 0;
+        fd.sCharset       = 0;
+        fd.fItalic            = 0;
+        fd.fUnderline     = 0;
+        fd.fStrikethrough = 0;
+        return OleCreateFontIndirect(&fd,riid,ppobj);
+
 }