Dmitry Timoshkov : wineps.drv: Default page dimensions are part of DEVMODE, remove an old hack.

Alexandre Julliard julliard at winehq.org
Mon Jan 14 15:55:49 CST 2013


Module: wine
Branch: master
Commit: a3c832593c35ea074969e808a1bda6d23ac6e6fc
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a3c832593c35ea074969e808a1bda6d23ac6e6fc

Author: Dmitry Timoshkov <dmitry at baikal.ru>
Date:   Mon Jan 14 11:16:05 2013 +0800

wineps.drv: Default page dimensions are part of DEVMODE, remove an old hack.

---

 dlls/wineps.drv/init.c |   17 -----------------
 1 files changed, 0 insertions(+), 17 deletions(-)

diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c
index 2085a47..2a7c90d 100644
--- a/dlls/wineps.drv/init.c
+++ b/dlls/wineps.drv/init.c
@@ -612,7 +612,6 @@ static struct list printer_list = LIST_INIT( printer_list );
  */
 PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name)
 {
-    DWORD needed, res, dwPaperSize;
     PRINTERINFO *pi;
     FONTNAME *font;
     const AFM *afm;
@@ -678,22 +677,6 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name)
         PSDRV_MergeDevmodes(pi->Devmode, &dm, pi);
     }
 
-    /*
-     *	This is a hack.  The default paper size should be read in as part of
-     *	the Devmode structure, but Wine doesn't currently provide a convenient
-     *	way to configure printers.
-     */
-    res = GetPrinterDataExA(hPrinter, "PrinterDriverData", "Paper Size", NULL,
-                            (LPBYTE)&dwPaperSize, sizeof(DWORD), &needed);
-    if (res == ERROR_SUCCESS)
-	pi->Devmode->dmPublic.u1.s1.dmPaperSize = (SHORT) dwPaperSize;
-    else if (res == ERROR_FILE_NOT_FOUND)
-	TRACE ("No 'Paper Size' for printer '%s'\n", debugstr_w(name));
-    else {
-	ERR ("GetPrinterDataA returned %i\n", res);
-	goto fail;
-    }
-
     /* Duplex is indicated by the setting of the DM_DUPLEX bit in dmFields.
        WinDuplex == 0 is a special case which means that the ppd has a
        *DefaultDuplex: NotCapable entry.  In this case we'll try not to confuse




More information about the wine-cvs mailing list