[Wine-patches] Fwd: Fwd: [eter-2.1 4/5] wineps.drv: Default page dimensions are part of DEVMODE, remove an old hack. (eterbug #8330)

[Roman Dadkov]

-------- Исходное сообщение --------
Тема: [Wine-patches] Fwd: [eter-2.1 4/5] wineps.drv: Default page 
dimensions are part of DEVMODE, remove an old hack. (eterbug #8330)
Дата: 25.01.2013 15:04
От: Roman Dadkov <romand на etersoft.ru>
Кому: <wine-patches на lists.etersoft.ru>
Ответить: wine-devel на lists.etersoft.ru



-------- Исходное сообщение --------
Тема: [Wine-patches] [eter-2.1 4/5] wineps.drv: Default page dimensions 
are part of DEVMODE, remove an old hack. (eterbug #8330)
Дата: 25.01.2013 09:49
От: Dmitry Timoshkov <dtimoshkov на etersoft.ru>
Кому: wine-patches на lists.etersoft.ru
Ответить: wine-devel на lists.etersoft.ru

(cherry picked from commit a3c832593c35ea074969e808a1bda6d23ac6e6fc)
---
  dlls/wineps.drv/init.c | 17 -----------------
  1 file changed, 17 deletions(-)

diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c
index 0c1d76c..dfd64d2 100644
--- a/dlls/wineps.drv/init.c
+++ b/dlls/wineps.drv/init.c
@@ -615,7 +615,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;
@@ -681,22 +680,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
-- 
1.8.0.2

_______________________________________________
Wine-patches mailing list
Wine-patches на lists.etersoft.ru
http://lists.etersoft.ru/mailman/listinfo/wine-patches

_______________________________________________
Wine-patches mailing list
Wine-patches на lists.etersoft.ru
http://lists.etersoft.ru/mailman/listinfo/wine-patches