From 0a26343bfbcafa0ef2de4fc1f24b67185d780a8b Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Wed, 13 Aug 2003 19:35:52 +0000 Subject: [PATCH] Convert initData as well. --- objects/dc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/objects/dc.c b/objects/dc.c index eeef646f3fa..cf03aef7834 100644 --- a/objects/dc.c +++ b/objects/dc.c @@ -630,6 +630,7 @@ HDC WINAPI CreateDCA( LPCSTR driver, LPCSTR device, LPCSTR output, const DEVMODEA *initData ) { UNICODE_STRING driverW, deviceW, outputW; + DEVMODEW *initDataW; HDC ret; if (driver) RtlCreateUnicodeStringFromAsciiz(&driverW, driver); @@ -641,13 +642,15 @@ HDC WINAPI CreateDCA( LPCSTR driver, LPCSTR device, LPCSTR output, if (output) RtlCreateUnicodeStringFromAsciiz(&outputW, output); else outputW.Buffer = NULL; + if (initData) initDataW = GdiConvertToDevmodeW(initData); + else initDataW = NULL; - ret = CreateDCW( driverW.Buffer, deviceW.Buffer, outputW.Buffer, - (const DEVMODEW *)initData /*FIXME*/ ); + ret = CreateDCW( driverW.Buffer, deviceW.Buffer, outputW.Buffer, initDataW ); RtlFreeUnicodeString(&driverW); RtlFreeUnicodeString(&deviceW); RtlFreeUnicodeString(&outputW); + if (initDataW) HeapFree(GetProcessHeap(), 0, initDataW); return ret; }