Changeset 4352 for trunk/src

Timestamp:

Oct 1, 2000, 2:06:32 PM (25 years ago)

Author:

sandervl

Message:

AddFontResourceW implemented

File:

• trunk/src/gdi32/font.cpp (modified) (3 diffs)

trunk/src/gdi32/font.cpp

@@ -1 @@
-/* $Id: font.cpp,v 1.12 2000-07-06 21:17:26 sandervl Exp $ */
+/* $Id: font.cpp,v 1.13 2000-10-01 12:06:32 sandervl Exp $ */
 
 /*
@@ -482 +482 @@
 //******************************************************************************
 //******************************************************************************
-int WIN32API AddFontResourceA( LPCSTR arg1)
-{
-    dprintf(("GDI32: AddFontResourceA"));
-    return O32_AddFontResource(arg1);
-}
-//******************************************************************************
-//******************************************************************************
-int WIN32API AddFontResourceW( LPCWSTR arg1)
-{
-    dprintf(("GDI32: AddFontResourceW STUB"));
+int WIN32API AddFontResourceA( LPCSTR szFont)
+{
+    dprintf(("GDI32: AddFontResourceA %s", szFont));
+    return O32_AddFontResource(szFont);
+}
+//******************************************************************************
+//******************************************************************************
+int WIN32API AddFontResourceW( LPCWSTR szFont)
+{
+ char *astring = UnicodeToAsciiString((LPWSTR)szFont);
+ BOOL  rc;
+
+    dprintf(("GDI32: AddFontResourceW"));
     // NOTE: This will not work as is (needs UNICODE support)
-//    return O32_AddFontResource(arg1);
-    return 0;
+    rc = AddFontResourceA(astring);
+    FreeAsciiString(astring);
+    return rc;
 }
 //******************************************************************************
@@ -505 +509 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API RemoveFontResourceW(LPCWSTR arg1)
-{
- char *astring = UnicodeToAsciiString((LPWSTR)arg1);
+BOOL WIN32API RemoveFontResourceW(LPCWSTR szFont)
+{
+ char *astring = UnicodeToAsciiString((LPWSTR)szFont);
  BOOL  rc;
 
-    dprintf(("GDI32: RemoveFontResourceW\n"));
-    rc = O32_RemoveFontResource(astring);
+    dprintf(("GDI32: RemoveFontResourceW"));
+    rc = RemoveFontResourceA(astring);
     FreeAsciiString(astring);
     return(rc);