ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prevent CreateDCA from crashing if a bad lpInitData parameter is 

provided.
This commit is contained in:
Maxime Bellengé 2005-04-25 16:02:27 +00:00 committed by Alexandre Julliard
parent 26d2b8bf5e
commit 6762313cdf
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/gdi/dc.c
View File

@ -38,6 +38,8 @@
WINE_DEFAULT_DEBUG_CHANNEL(dc);
static const WCHAR displayW[] = { 'd','i','s','p','l','a','y',0 };
static BOOL DC_DeleteObject( HGDIOBJ handle, void *obj );
static const struct gdi_obj_funcs dc_funcs =
@ -670,8 +672,13 @@ 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;
initDataW = NULL;
if (initData)
{
/* don't convert initData for DISPLAY driver, it's not used */
if (!driverW.Buffer || strcmpiW( driverW.Buffer, displayW ))
initDataW = GdiConvertToDevmodeW(initData);
}
ret = CreateDCW( driverW.Buffer, deviceW.Buffer, outputW.Buffer, initDataW );
@ -725,7 +732,6 @@ HDC WINAPI CreateCompatibleDC( HDC hdc )
}
else
{
static const WCHAR displayW[] = { 'd','i','s','p','l','a','y',0 };
funcs = DRIVER_load_driver( displayW );
physDev = NULL;
}