Convert initData as well.
This commit is contained in:
parent
2892dbdf5f
commit
0a26343bfb
|
@ -630,6 +630,7 @@ HDC WINAPI CreateDCA( LPCSTR driver, LPCSTR device, LPCSTR output,
|
||||||
const DEVMODEA *initData )
|
const DEVMODEA *initData )
|
||||||
{
|
{
|
||||||
UNICODE_STRING driverW, deviceW, outputW;
|
UNICODE_STRING driverW, deviceW, outputW;
|
||||||
|
DEVMODEW *initDataW;
|
||||||
HDC ret;
|
HDC ret;
|
||||||
|
|
||||||
if (driver) RtlCreateUnicodeStringFromAsciiz(&driverW, driver);
|
if (driver) RtlCreateUnicodeStringFromAsciiz(&driverW, driver);
|
||||||
|
@ -641,13 +642,15 @@ HDC WINAPI CreateDCA( LPCSTR driver, LPCSTR device, LPCSTR output,
|
||||||
if (output) RtlCreateUnicodeStringFromAsciiz(&outputW, output);
|
if (output) RtlCreateUnicodeStringFromAsciiz(&outputW, output);
|
||||||
else outputW.Buffer = NULL;
|
else outputW.Buffer = NULL;
|
||||||
|
|
||||||
|
if (initData) initDataW = GdiConvertToDevmodeW(initData);
|
||||||
|
else initDataW = NULL;
|
||||||
|
|
||||||
ret = CreateDCW( driverW.Buffer, deviceW.Buffer, outputW.Buffer,
|
ret = CreateDCW( driverW.Buffer, deviceW.Buffer, outputW.Buffer, initDataW );
|
||||||
(const DEVMODEW *)initData /*FIXME*/ );
|
|
||||||
|
|
||||||
RtlFreeUnicodeString(&driverW);
|
RtlFreeUnicodeString(&driverW);
|
||||||
RtlFreeUnicodeString(&deviceW);
|
RtlFreeUnicodeString(&deviceW);
|
||||||
RtlFreeUnicodeString(&outputW);
|
RtlFreeUnicodeString(&outputW);
|
||||||
|
if (initDataW) HeapFree(GetProcessHeap(), 0, initDataW);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue