- only convert the devmode if the caller passed one
authorJohannes Anderwald <johannes.anderwald@reactos.org>
Mon, 26 May 2008 18:13:17 +0000 (18:13 +0000)
committerJohannes Anderwald <johannes.anderwald@reactos.org>
Mon, 26 May 2008 18:13:17 +0000 (18:13 +0000)
- fixes a user32_winetest crash failure

svn path=/trunk/; revision=33716

reactos/dll/win32/user32/misc/desktop.c

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