Changeset 9443 for trunk/src

Timestamp:

Nov 29, 2002, 2:46:04 PM (23 years ago)

Author:

sandervl

Message:

logging updates

Location:

trunk/src/gdi32

Files:

• font.cpp (modified) (5 diffs)
• gdi32.cpp (modified) (2 diffs)
• oslibgpi.cpp (modified) (2 diffs)
• oslibgpi.h (modified) (2 diffs)

trunk/src/gdi32/font.cpp

@@ -1 @@
-/* $Id: font.cpp,v 1.27 2002-11-26 10:53:08 sandervl Exp $ */
+/* $Id: font.cpp,v 1.28 2002-11-29 13:46:03 sandervl Exp $ */
 
 /*
@@ -39 +39 @@
 #include <odininst.h>
 #include <stats.h>
+#include "oslibgpi.h"
 
 #define DBG_LOCALLOG    DBG_font
@@ -582 +583 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API RemoveFontResourceA(LPCSTR arg1)
-{
-    dprintf(("GDI32: RemoveFontResourceA %s\n", arg1));
-    return O32_RemoveFontResource(arg1);
+BOOL WIN32API RemoveFontResourceA(LPCSTR lpszFont)
+{
+    dprintf(("GDI32: RemoveFontResourceA %s", lpszFont));
+    return O32_RemoveFontResource(lpszFont);
 }
 //******************************************************************************
@@ -620 +621 @@
                                           LPCSTR lpszCurrentPath)
 {
-  dprintf(("GDI32: CreateScalableFontResourceA not implemented.\n"));
-
-  return (FALSE);
+  dprintf(("GDI32: CreateScalableFontResourceA %x %s %s %s not implemented", fdwHidden, lpszFontRes, lpszFontFile, lpszCurrentPath));
+
+//  return OSLibGpiLoadFonts((LPSTR)lpszFontFile);
+  return FALSE;
 }
 
@@ -647 +649 @@
                                           LPCWSTR lpszCurrentPath)
 {
-  dprintf(("GDI32: CreateScalableFontResourceW not implemented.\n"));
-
-  return (FALSE);
+  LPSTR lpszFontFileA = NULL, lpszFontResA = NULL, lpszCurrentPathA = NULL;
+
+  dprintf(("GDI32: CreateScalableFontResourceW %x %ls %ls %ls not implemented", fdwHidden, lpszFontRes, lpszFontFile, lpszCurrentPath));
+
+  STACK_strdupWtoA(lpszFontFile, lpszFontFileA);
+  STACK_strdupWtoA(lpszFontRes, lpszFontResA);
+  STACK_strdupWtoA(lpszCurrentPath, lpszCurrentPathA);
+  return CreateScalableFontResourceA(fdwHidden, lpszFontResA, lpszFontFileA, lpszCurrentPathA);
 }
 

trunk/src/gdi32/gdi32.cpp

@@ -1 @@
-/* $Id: gdi32.cpp,v 1.85 2002-11-26 10:53:08 sandervl Exp $ */
+/* $Id: gdi32.cpp,v 1.86 2002-11-29 13:46:04 sandervl Exp $ */
 
 /*
@@ -653 +653 @@
  int rc;
 
+#ifdef DEBUG
+  if(cbInput && lpvInData) {
+        ULONG *tmp = (ULONG *)lpvInData;
+        for(int i=0;i<cbInput/4;i++) {
+                dprintf(("GDI32: Escape par %d: %x", i, *tmp++));
+        }
+  }
+#endif
     rc = O32_Escape(hdc, nEscape, cbInput, lpvInData, lpvOutData);
     if(rc == 0) {

trunk/src/gdi32/oslibgpi.cpp

@@ -1 @@
-/* $Id: oslibgpi.cpp,v 1.11 2001-05-10 17:03:18 sandervl Exp $ */
+/* $Id: oslibgpi.cpp,v 1.12 2002-11-29 13:46:04 sandervl Exp $ */
 
 /*
@@ -430 +430 @@
 }
 #endif
-
+//******************************************************************************
+//******************************************************************************
 BOOL OSLibDevQueryCaps(pDCData pHps, LONG lStart, LONG lCount, LONG *alArray)
 {
    return DevQueryCaps(pHps->hdc, lStart, lCount, alArray);
 }
+//******************************************************************************
+//******************************************************************************
+BOOL OSLibGpiLoadFonts(LPSTR lpszFontFile)
+{
+   return GpiLoadFonts(0, lpszFontFile);
+}
+//******************************************************************************
+//******************************************************************************

trunk/src/gdi32/oslibgpi.h

@@ -1 @@
-/* $Id: oslibgpi.h,v 1.10 2001-05-19 19:43:54 sandervl Exp $ */
+/* $Id: oslibgpi.h,v 1.11 2002-11-29 13:46:04 sandervl Exp $ */
 
 /*
@@ -104 +104 @@
 BOOL OSLibGpiQueryCurrentPosition(PVOID pHps,PPOINTLOS2 ptl);
 BOOL OSLibGpiSetCurrentPosition(PVOID pHps,PPOINTLOS2 ptl);
+
+BOOL OSLibGpiLoadFonts(LPSTR lpszFontFile);
 
 #define CHSOS_OPAQUE                 0x0001L