Convert initData as well

Dmitry Timoshkov dmitry at baikal.ru
Tue Aug 12 23:02:30 CDT 2003


Hello,

Changelog:
    Dmitry Timoshkov <dmitry at codeweavers.com>
    Convert initData as well.

--- cvs/hq/wine/objects/dc.c	Wed Aug 13 12:14:50 2003
+++ wine/objects/dc.c	Wed Aug 13 12:19:56 2003
@@ -630,6 +630,7 @@ HDC WINAPI CreateDCA( LPCSTR driver, LPC
                       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, LPC
     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;
 }
 






More information about the wine-patches mailing list