Module: wine Branch: refs/heads/master Commit: c50fe5609617f63eed2edebf2b1fb6cb78454793 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c50fe5609617f63eed2edebf...
Author: Andrew Talbot Andrew.Talbot@talbotville.com Date: Wed Aug 9 23:06:50 2006 +0100
wineps.drv: Write-strings warnings fix.
---
dlls/wineps.drv/init.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index f50d4f5..0ec109a 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -531,6 +531,7 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCST char* ppdFileName = NULL; HKEY hkey; BOOL using_default_devmode = FALSE; + static CHAR paper_size[] = "Paper Size";
TRACE("'%s'\n", name);
@@ -598,10 +599,12 @@ #ifdef HAVE_CUPS_CUPS_H } #endif if (!ppdFileName) { - res = GetPrinterDataA(hPrinter, "PPD File", NULL, NULL, 0, &needed); + static CHAR ppd_file[] = "PPD File"; + + res = GetPrinterDataA(hPrinter, ppd_file, NULL, NULL, 0, &needed); if ((res==ERROR_SUCCESS) || (res==ERROR_MORE_DATA)) { ppdFileName=HeapAlloc(PSDRV_Heap, 0, needed); - res = GetPrinterDataA(hPrinter, "PPD File", &ppdType, (LPBYTE)ppdFileName, needed, &needed); + res = GetPrinterDataA(hPrinter, ppd_file, &ppdType, (LPBYTE)ppdFileName, needed, &needed); } } /* Look for a ppd file for this printer in the config file. @@ -695,7 +698,7 @@ #endif * the Devmode structure, but Wine doesn't currently provide a convenient * way to configure printers. */ - res = GetPrinterDataA (hPrinter, "Paper Size", NULL, (LPBYTE) &dwPaperSize, + res = GetPrinterDataA (hPrinter, paper_size, NULL, (LPBYTE) &dwPaperSize, sizeof (DWORD), &needed); if (res == ERROR_SUCCESS) pi->Devmode->dmPublic.u1.s1.dmPaperSize = (SHORT) dwPaperSize;