Commit 91547cbf authored by Huw D M Davies's avatar Huw D M Davies Committed by Alexandre Julliard

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.
parent 5d68f79a
...@@ -80,7 +80,7 @@ void PSDRV_CreateColor( PSDRV_PDEVICE *physDev, PSCOLOR *pscolor, ...@@ -80,7 +80,7 @@ void PSDRV_CreateColor( PSDRV_PDEVICE *physDev, PSCOLOR *pscolor,
int ctype = wincolor >> 24; int ctype = wincolor >> 24;
float r, g, b; float r, g, b;
if(ctype != 0) if(ctype != 0 && ctype != 2)
FIXME("Colour is %08lx\n", wincolor); FIXME("Colour is %08lx\n", wincolor);
r = (wincolor & 0xff) / 256.0; r = (wincolor & 0xff) / 256.0;
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include "winreg.h" #include "winreg.h"
#include "winspool.h" #include "winspool.h"
#include "winerror.h" #include "winerror.h"
#include "options.h"
DEFAULT_DEBUG_CHANNEL(psdrv) DEFAULT_DEBUG_CHANNEL(psdrv)
...@@ -297,8 +298,9 @@ static BOOL PSDRV_CreateDC( DC *dc, LPCSTR driver, LPCSTR device, ...@@ -297,8 +298,9 @@ static BOOL PSDRV_CreateDC( DC *dc, LPCSTR driver, LPCSTR device,
dc->w.devCaps->vertRes); dc->w.devCaps->vertRes);
dc->w.hFont = PSDRV_DefaultFont; dc->w.hFont = PSDRV_DefaultFont;
physDev->job.output = output ? HEAP_strdupA( PSDRV_Heap, 0, output ) : physDev->job.output = output ?
NULL; HEAP_strdupA( PSDRV_Heap, 0, output ) :
HEAP_strdupA( PSDRV_Heap, 0, "LPT1:" ); /* HACK */
physDev->job.hJob = 0; physDev->job.hJob = 0;
return TRUE; return TRUE;
} }
......
...@@ -319,7 +319,7 @@ INT PSDRV_WriteHeader( DC *dc, char *title, int len ) ...@@ -319,7 +319,7 @@ INT PSDRV_WriteHeader( DC *dc, char *title, int len )
/* FIXME should do something better with BBox */ /* 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) ) != if( WriteSpool16( physDev->job.hJob, buf, strlen(buf) ) !=
strlen(buf) ) { strlen(buf) ) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment