Commit 9d549a9c authored by Jeremy White's avatar Jeremy White Committed by Alexandre Julliard

winspool: Remove unvarying unicode parameter from WINSPOOL_GetDefaultDevMode.

parent c0238d96
...@@ -3257,18 +3257,17 @@ static BOOL WINSPOOL_GetStringFromReg(HKEY hkey, LPCWSTR ValueName, LPBYTE ptr, ...@@ -3257,18 +3257,17 @@ static BOOL WINSPOOL_GetStringFromReg(HKEY hkey, LPCWSTR ValueName, LPBYTE ptr,
static void WINSPOOL_GetDefaultDevMode( static void WINSPOOL_GetDefaultDevMode(
LPBYTE ptr, LPBYTE ptr,
DWORD buflen, DWORD *needed, DWORD buflen, DWORD *needed)
BOOL unicode)
{ {
DEVMODEA dm; DEVMODEW dm;
static const char szwps[] = "wineps.drv"; static const WCHAR szWwps[] = {'w', 'i', 'n', 'e', 'p', 's', '.', 'd', 'r', 'v', 0 };
/* fill default DEVMODE - should be read from ppd... */ /* fill default DEVMODE - should be read from ppd... */
ZeroMemory( &dm, sizeof(dm) ); ZeroMemory( &dm, sizeof(dm) );
memcpy(dm.dmDeviceName,szwps,sizeof szwps); memcpy(dm.dmDeviceName,szWwps,sizeof szWwps);
dm.dmSpecVersion = DM_SPECVERSION; dm.dmSpecVersion = DM_SPECVERSION;
dm.dmDriverVersion = 1; dm.dmDriverVersion = 1;
dm.dmSize = sizeof(DEVMODEA); dm.dmSize = sizeof(DEVMODEW);
dm.dmDriverExtra = 0; dm.dmDriverExtra = 0;
dm.dmFields = dm.dmFields =
DM_ORIENTATION | DM_PAPERSIZE | DM_ORIENTATION | DM_PAPERSIZE |
...@@ -3308,21 +3307,9 @@ static void WINSPOOL_GetDefaultDevMode( ...@@ -3308,21 +3307,9 @@ static void WINSPOOL_GetDefaultDevMode(
/* dm.dmPanningWidth */ /* dm.dmPanningWidth */
/* dm.dmPanningHeight */ /* dm.dmPanningHeight */
if(unicode) { if(buflen >= sizeof(DEVMODEW))
if(buflen >= sizeof(DEVMODEW)) { memcpy(ptr, &dm, sizeof(DEVMODEW));
DEVMODEW *pdmW = GdiConvertToDevmodeW(&dm); *needed = sizeof(DEVMODEW);
memcpy(ptr, pdmW, sizeof(DEVMODEW));
HeapFree(GetProcessHeap(),0,pdmW);
}
*needed = sizeof(DEVMODEW);
}
else
{
if(buflen >= sizeof(DEVMODEA)) {
memcpy(ptr, &dm, sizeof(DEVMODEA));
}
*needed = sizeof(DEVMODEA);
}
} }
/***************************************************************************** /*****************************************************************************
...@@ -3494,7 +3481,7 @@ static BOOL WINSPOOL_GetPrinter_2(HKEY hkeyPrinter, PRINTER_INFO_2W *pi2, ...@@ -3494,7 +3481,7 @@ static BOOL WINSPOOL_GetPrinter_2(HKEY hkeyPrinter, PRINTER_INFO_2W *pi2,
} }
else else
{ {
WINSPOOL_GetDefaultDevMode(ptr, left, &size, TRUE); WINSPOOL_GetDefaultDevMode(ptr, left, &size);
if(space && size <= left) { if(space && size <= left) {
pi2->pDevMode = (LPDEVMODEW)ptr; pi2->pDevMode = (LPDEVMODEW)ptr;
ptr += size; ptr += size;
...@@ -3692,7 +3679,7 @@ static BOOL WINSPOOL_GetPrinter_9(HKEY hkeyPrinter, PRINTER_INFO_9W *pi9, LPBYTE ...@@ -3692,7 +3679,7 @@ static BOOL WINSPOOL_GetPrinter_9(HKEY hkeyPrinter, PRINTER_INFO_9W *pi9, LPBYTE
} }
else else
{ {
WINSPOOL_GetDefaultDevMode(buf, cbBuf, &size, TRUE); WINSPOOL_GetDefaultDevMode(buf, cbBuf, &size);
if(space && size <= cbBuf) { if(space && size <= cbBuf) {
pi9->pDevMode = (LPDEVMODEW)buf; pi9->pDevMode = (LPDEVMODEW)buf;
} else } else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment