Module: wine Branch: master Commit: f739bfc3c25e5924f6bc1364420f3f0aec8b87fa URL: https://gitlab.winehq.org/wine/wine/-/commit/f739bfc3c25e5924f6bc1364420f3f0...
Author: Piotr Caban piotr@codeweavers.com Date: Mon May 8 11:19:37 2023 +0200
wineps: Remove no longer used PSDRV_StartDoc and PSDRV_EndDoc functions.
---
dlls/wineps.drv/escape.c | 90 ------------------------------------------------ dlls/wineps.drv/psdrv.h | 2 -- 2 files changed, 92 deletions(-)
diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index e85ccb0f9e5..9bf16ba0a31 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -194,93 +194,3 @@ INT CDECL PSDRV_EndPage( PHYSDEV dev ) physDev->job.OutOfPage = TRUE; return 1; } - - -/************************************************************************ - * PSDRV_StartDoc - */ -INT CDECL 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)); - - if(physDev->job.id) { - FIXME("hJob != 0. Now what?\n"); - return 0; - } - - 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: %ld\n", - debugstr_w(physDev->pi->friendly_name), GetLastError()); - return 0; - } - - di.pDocName = (LPWSTR) doc->lpszDocName; - di.pOutputFile = (LPWSTR) doc->lpszOutput; - di.pDatatype = NULL; - - /* redirection located in HKCU\Software\Wine\Printing\Spooler - is done during winspool.drv,ScheduleJob */ - physDev->job.id = StartDocPrinterW(physDev->job.hprinter, 1, (LPBYTE) &di); - if(!physDev->job.id) { - WARN("StartDocPrinter() failed: %ld\n", GetLastError()); - ClosePrinter(physDev->job.hprinter); - return 0; - } - - if (!PSDRV_WriteHeader( dev, doc->lpszDocName )) { - WARN("Failed to write header\n"); - ClosePrinter(physDev->job.hprinter); - return 0; - } - - physDev->job.OutOfPage = TRUE; - physDev->job.PageNo = 0; - physDev->job.quiet = FALSE; - physDev->job.passthrough_state = passthrough_none; - physDev->job.doc_name = strdupW( doc->lpszDocName ); - - return physDev->job.id; -} - -/************************************************************************ - * PSDRV_EndDoc - */ -INT CDECL PSDRV_EndDoc( PHYSDEV dev ) -{ - PSDRV_PDEVICE *physDev = get_psdrv_dev( dev ); - INT ret = 1; - - TRACE("%p\n", dev->hdc); - - if(!physDev->job.id) { - FIXME("hJob == 0. Now what?\n"); - return 0; - } - - if(!physDev->job.OutOfPage) { - WARN("Somebody forgot an EndPage\n"); - PSDRV_EndPage( dev ); - } - - if (physDev->job.PageNo) - PSDRV_WriteFooter( dev ); - - ret = EndDocPrinter(physDev->job.hprinter); - ClosePrinter(physDev->job.hprinter); - physDev->job.hprinter = NULL; - physDev->job.id = 0; - HeapFree( GetProcessHeap(), 0, physDev->job.doc_name ); - physDev->job.doc_name = NULL; - - return ret; -} diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index baa080a56df..6c05ce51392 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -422,7 +422,6 @@ extern BOOL CDECL PSDRV_Arc( PHYSDEV dev, INT left, INT top, INT right, INT bott extern BOOL CDECL PSDRV_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, INT xstart, INT ystart, INT xend, INT yend ) DECLSPEC_HIDDEN; extern BOOL CDECL PSDRV_Ellipse( PHYSDEV dev, INT left, INT top, INT right, INT bottom) DECLSPEC_HIDDEN; -extern INT CDECL PSDRV_EndDoc( PHYSDEV dev ) DECLSPEC_HIDDEN; extern INT CDECL PSDRV_EndPage( PHYSDEV dev ) DECLSPEC_HIDDEN; extern INT CDECL PSDRV_ExtEscape( PHYSDEV dev, INT nEscape, INT cbInput, LPCVOID in_data, INT cbOutput, LPVOID out_data ) DECLSPEC_HIDDEN; @@ -452,7 +451,6 @@ extern COLORREF CDECL PSDRV_SetDCBrushColor( PHYSDEV dev, COLORREF color ) DECLS extern COLORREF CDECL PSDRV_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF CDECL PSDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF CDECL PSDRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; -extern INT CDECL PSDRV_StartDoc( PHYSDEV dev, const DOCINFOW *doc ) DECLSPEC_HIDDEN; extern BOOL CDECL PSDRV_StrokeAndFillPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL CDECL PSDRV_StrokePath( PHYSDEV dev ) DECLSPEC_HIDDEN;