commit 91547cbf6a50502b05d35134ec64fe4aafae9af6
author Huw D M Davies <h.davies1@physics.ox.ac.uk> Sat Jul 24 10:11:05 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Sat Jul 24 10:11:05 1999 +0000
tree 129c5bf98d8ebc080de90379ae64513784157618
parent 5d68f79a8b819761693d7f1e7b1cd79dfb23e2af

Fix stupid `rubbish at end of %%Title' bug.
Don't complain about palette relative RGBs.
If output param to CreateDC is NULL default to `LPT1:' - Hack.

graphics/psdrv/color.c

diff --git a/graphics/psdrv/color.c b/graphics/psdrv/color.c
index 91a3f5a..f0052fc 100644
--- a/graphics/psdrv/color.c
+++ b/graphics/psdrv/color.c
@@ -80,7 +80,7 @@
     int ctype = wincolor >> 24;
     float r, g, b;
 
-    if(ctype != 0)
+    if(ctype != 0 && ctype != 2)
         FIXME("Colour is %08lx\n", wincolor);
 
     r = (wincolor & 0xff) / 256.0;

graphics/psdrv/init.c

diff --git a/graphics/psdrv/init.c b/graphics/psdrv/init.c
index cf6bf28..f750199 100644
--- a/graphics/psdrv/init.c
+++ b/graphics/psdrv/init.c
@@ -13,6 +13,7 @@
 #include "winreg.h"
 #include "winspool.h"
 #include "winerror.h"
+#include "options.h"
 
 DEFAULT_DEBUG_CHANNEL(psdrv)
 
@@ -297,8 +298,9 @@
     			    dc->w.devCaps->vertRes);
     
     dc->w.hFont = PSDRV_DefaultFont;
-    physDev->job.output = output ? HEAP_strdupA( PSDRV_Heap, 0, output ) :
-      NULL;
+    physDev->job.output = output ?
+      HEAP_strdupA( PSDRV_Heap, 0, output ) :
+      HEAP_strdupA( PSDRV_Heap, 0, "LPT1:" );  /* HACK */
     physDev->job.hJob = 0;
     return TRUE;
 }

graphics/psdrv/ps.c

diff --git a/graphics/psdrv/ps.c b/graphics/psdrv/ps.c
index 01394d4..33b8e9c 100644
--- a/graphics/psdrv/ps.c
+++ b/graphics/psdrv/ps.c
@@ -319,7 +319,7 @@
 
     /* FIXME should do something better with BBox */
 
-    sprintf(buf, psheader, title, 0, 0, urx, ury, orient);		
+    sprintf(buf, psheader, titlebuf, 0, 0, urx, ury, orient);		
 
     if( WriteSpool16( physDev->job.hJob, buf, strlen(buf) ) != 
 	                                             strlen(buf) ) {