Module: wine Branch: master Commit: 2bfe9ce883e1f0f18dada51e836ea61286abb0dc URL: https://gitlab.winehq.org/wine/wine/-/commit/2bfe9ce883e1f0f18dada51e836ea61...
Author: Piotr Caban piotr@codeweavers.com Date: Tue Feb 21 12:40:12 2023 +0100
wineps: Remove no longer used output parameter handling from PSDRV_CreateDC.
We're storing it now in DC attributes.
---
dlls/wineps.drv/escape.c | 10 +--------- dlls/wineps.drv/init.c | 3 --- dlls/wineps.drv/psdrv.h | 1 - 3 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index 0149e192520..9ced2221b1c 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -459,17 +459,9 @@ INT CDECL PSDRV_StartDoc( PHYSDEV dev, const DOCINFOW *doc ) }
di.pDocName = (LPWSTR) doc->lpszDocName; + di.pOutputFile = (LPWSTR) doc->lpszOutput; di.pDatatype = NULL;
- if(doc->lpszOutput) - di.pOutputFile = (LPWSTR) doc->lpszOutput; - else if(physDev->job.output) - di.pOutputFile = physDev->job.output; - else - di.pOutputFile = NULL; - - TRACE("using output: %s\n", debugstr_w(di.pOutputFile)); - /* redirection located in HKCU\Software\Wine\Printing\Spooler is done during winspool.drv,ScheduleJob */ physDev->job.id = StartDocPrinterW(physDev->job.hprinter, 1, (LPBYTE) &di); diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 0d4467b6964..579e59e621b 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -387,8 +387,6 @@ static BOOL CDECL PSDRV_CreateDC( PHYSDEV *pdev, LPCWSTR device, LPCWSTR output,
if (!(physDev = create_psdrv_physdev( pi ))) return FALSE;
- if (output && *output) physDev->job.output = strdupW( output ); - if(initData) { dump_devmode(initData); @@ -432,7 +430,6 @@ static BOOL CDECL PSDRV_DeleteDC( PHYSDEV dev ) TRACE("\n");
HeapFree( GetProcessHeap(), 0, physDev->Devmode ); - HeapFree( GetProcessHeap(), 0, physDev->job.output ); HeapFree( GetProcessHeap(), 0, physDev );
return TRUE; diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 2af021508b7..153601d4c86 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -352,7 +352,6 @@ enum passthrough typedef struct { DWORD id; /* Job id */ HANDLE hprinter; /* Printer handle */ - LPWSTR output; /* Output file/port */ LPWSTR doc_name; /* Document Name */ BOOL banding; /* Have we received a NEXTBAND */ BOOL OutOfPage; /* Page header not sent yet */