[ros-diffs] [amunger] 19965: Merge 19941, 19955, and 19956 to 0.2.9

[amunger at svn.reactos.com]

Merge 19941, 19955, and 19956 to 0.2.9
Modified: branches/ros-branch-0_2_9/reactos/lib/user32/misc/display.c
Modified: branches/ros-branch-0_2_9/reactos/subsys/win32k/objects/dc.c
  _____  

Modified: branches/ros-branch-0_2_9/reactos/lib/user32/misc/display.c
--- branches/ros-branch-0_2_9/reactos/lib/user32/misc/display.c
2005-12-08 11:54:01 UTC (rev 19964)
+++ branches/ros-branch-0_2_9/reactos/lib/user32/misc/display.c
2005-12-08 17:09:25 UTC (rev 19965)
@@ -61,7 +61,7 @@

       return FALSE;
     }
 
-  DisplayDeviceW.cb = lpDisplayDevice->cb;
+  DisplayDeviceW.cb = sizeof(DISPLAY_DEVICEW);  
   rc = NtUserEnumDisplayDevices (
     &Device,
     iDevNum,
  _____  

Modified: branches/ros-branch-0_2_9/reactos/subsys/win32k/objects/dc.c
--- branches/ros-branch-0_2_9/reactos/subsys/win32k/objects/dc.c
2005-12-08 11:54:01 UTC (rev 19964)
+++ branches/ros-branch-0_2_9/reactos/subsys/win32k/objects/dc.c
2005-12-08 17:09:25 UTC (rev 19965)
@@ -987,7 +987,9 @@

     }
   }
 
-  Ret = IntGdiCreateDC(&SafeDriver, &SafeDevice, NULL, &SafeInitData,
FALSE);
+  Ret = IntGdiCreateDC(NULL == Driver ? NULL : &SafeDriver,
+                       NULL == Device ? NULL : &SafeDevice, NULL,
+                       NULL == InitData ? NULL : &SafeInitData, FALSE);
 
   return Ret;
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://www.reactos.org/pipermail/ros-diffs/attachments/20051208/0e5e1245/attachment.html