Internal PostScript printer driver improvements.

graphics/psdrv/afm.c

@@ -170,7 +170,7 @@ static AFM *PSDRV_AFMParse(char const *file)
 	
 	if(!strncmp("Weight", buf, 6)) {
 	    if(!strncmp("Roman", value, 5) || !strncmp("Medium", value, 6)
-	       || !strncmp("Book", value, 4))
+	       || !strncmp("Book", value, 4) || !strncmp("Regular", value, 7))
 	        afm->Weight = FW_NORMAL;
 	    else if(!strncmp("Demi", value, 4))
 	        afm->Weight = FW_DEMIBOLD;

graphics/psdrv/text.c

@@ -21,8 +21,8 @@ BOOL32 PSDRV_ExtTextOut( DC *dc, INT32 x, INT32 y, UINT32 flags,
     char *strbuf;
     SIZE32 sz;
 
-    TRACE(psdrv, "(x=%d, y=%d, flags=0x%08x, str='%s', count=%d)\n", x, y,
-	  flags, str, count);
+    TRACE(psdrv, "(x=%d, y=%d, flags=0x%08x, str='%.*s', count=%d)\n", x, y,
+	  flags, count, str, count);
 
     strbuf = (char *)HeapAlloc( PSDRV_Heap, 0, count + 1);
     if(!strbuf) {

if1632/dummy.c

@@ -5,8 +5,7 @@
 #include "wintypes.h"
 #include "debug.h"
 
-long WINAPI stub_GDI_379(void) { FIXME(relay, "STARTPAGE: stub\n"); return 1; }
-long WINAPI stub_GDI_380(void) { FIXME(relay, "ENDPAGE: stub\n"); return 1; }
+long WINAPI stub_GDI_379(HDC16 hdc) { FIXME(relay, "STARTPAGE: stub\n"); return 1; }
 long WINAPI stub_GDI_381(HDC16 hdc, SEGPTR proc) { FIXME(relay, "SETABORTPROC: stub\n"); return 1; }
 long WINAPI stub_GDI_382(void) { FIXME(relay, "ABORTPROC: stub\n"); return 1; }
 long WINAPI stub_GDI_530(void) { FIXME(relay, "stub\n"); return 0; }

if1632/gdi.spec

@@ -258,8 +258,8 @@ file	gdi.exe
 376 pascal16 ResetDC(word ptr) ResetDC16
 377 pascal16 StartDoc(word ptr) StartDoc16
 378 pascal16 EndDoc(word) EndDoc16
-379 pascal16 StartPage() stub_GDI_379
-380 pascal16 EndPage() stub_GDI_380
+379 pascal16 StartPage(word) stub_GDI_379
+380 pascal16 EndPage(word) EndPage16
 381 pascal16 SetAbortProc(word segptr) SetAbortProc16
 382 pascal16 AbortDoc() stub_GDI_382
 400 pascal16 FastWindowFrame(word ptr s_word s_word long) FastWindowFrame

misc/printdrv.c

@@ -41,6 +41,18 @@ INT16 WINAPI StartDoc16( HDC16 hdc, const DOCINFO16 *lpdoc )
 }
 
 /******************************************************************
+ *                  EndPage16  [GDI.380]
+ *
+ */
+INT16 WINAPI EndPage16( HDC16 hdc )
+{
+  INT16 retVal;
+  retVal =  Escape16(hdc, NEWFRAME, 0, 0, 0);
+  TRACE(print,"Escape16 returned %d\n",retVal);
+  return retVal;
+}
+
+/******************************************************************
  *                  StartDoc32A  [GDI32.347]
  *
  */