- only convert the devmode if the caller passed one

- fixes a user32_winetest crash failure

svn path=/trunk/; revision=33716
This commit is contained in:
Johannes Anderwald 2008-05-26 18:13:17 +00:00
parent 32a9a804de
commit d543aa9e03

View file

@ -466,7 +466,7 @@ CreateDesktopA(LPCSTR lpszDesktop,
ANSI_STRING DesktopNameA; ANSI_STRING DesktopNameA;
UNICODE_STRING DesktopNameU; UNICODE_STRING DesktopNameU;
HDESK hDesktop; HDESK hDesktop;
LPDEVMODEW DevmodeW; LPDEVMODEW DevmodeW = NULL;
if (lpszDesktop != NULL) if (lpszDesktop != NULL)
{ {
@ -478,7 +478,10 @@ CreateDesktopA(LPCSTR lpszDesktop,
RtlInitUnicodeString(&DesktopNameU, NULL); RtlInitUnicodeString(&DesktopNameU, NULL);
} }
if (pDevmode)
{
DevmodeW = GdiConvertToDevmodeW(pDevmode); DevmodeW = GdiConvertToDevmodeW(pDevmode);
}
hDesktop = CreateDesktopW(DesktopNameU.Buffer, hDesktop = CreateDesktopW(DesktopNameU.Buffer,
NULL, NULL,