From d543aa9e03cabf60b2a33fd308a30a7b9f0f0721 Mon Sep 17 00:00:00 2001
From: Johannes Anderwald <johannes.anderwald@reactos.org>
Date: Mon, 26 May 2008 18:13:17 +0000
Subject: [PATCH] - only convert the devmode if the caller passed one - fixes a
 user32_winetest crash failure

svn path=/trunk/; revision=33716
---
 reactos/dll/win32/user32/misc/desktop.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/reactos/dll/win32/user32/misc/desktop.c b/reactos/dll/win32/user32/misc/desktop.c
index 400cc618685..0ebd88ce217 100644
--- a/reactos/dll/win32/user32/misc/desktop.c
+++ b/reactos/dll/win32/user32/misc/desktop.c
@@ -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,