Huw Davies : wineps: Pass the devmode to OpenPrinter.
Alexandre Julliard
julliard at winehq.org
Thu Apr 12 15:23:11 CDT 2012
Module: wine
Branch: master
Commit: 83ba3189b3f669318dc9af35d5a942496268eae9
URL: http://source.winehq.org/git/wine.git/?a=commit;h=83ba3189b3f669318dc9af35d5a942496268eae9
Author: Huw Davies <huw at codeweavers.com>
Date: Thu Apr 12 13:03:11 2012 +0100
wineps: Pass the devmode to OpenPrinter.
---
dlls/wineps.drv/escape.c | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c
index 512dfb7..d2a8d2a 100644
--- a/dlls/wineps.drv/escape.c
+++ b/dlls/wineps.drv/escape.c
@@ -415,6 +415,7 @@ INT PSDRV_StartDoc( PHYSDEV dev, const DOCINFOW *doc )
{
PSDRV_PDEVICE *physDev = get_psdrv_dev( dev );
DOC_INFO_1W di;
+ PRINTER_DEFAULTSW prn_def;
TRACE("(%p, %p) => %s, %s, %s\n", physDev, doc, debugstr_w(doc->lpszDocName),
debugstr_w(doc->lpszOutput), debugstr_w(doc->lpszDatatype));
@@ -424,8 +425,12 @@ INT PSDRV_StartDoc( PHYSDEV dev, const DOCINFOW *doc )
return 0;
}
- /* FIXME: use PRINTER_DEFAULTS here */
- if(!OpenPrinterW( physDev->pi->friendly_name, &physDev->job.hprinter, NULL )) {
+ prn_def.pDatatype = NULL;
+ prn_def.pDevMode = &physDev->pi->Devmode->dmPublic;
+ prn_def.DesiredAccess = PRINTER_ACCESS_USE;
+
+ if (!OpenPrinterW( physDev->pi->friendly_name, &physDev->job.hprinter, &prn_def ))
+ {
WARN("OpenPrinter(%s, ...) failed: %d\n",
debugstr_w(physDev->pi->friendly_name), GetLastError());
return 0;
More information about the wine-cvs
mailing list