[ros-diffs] [tkreuzer] 33341: (Nt)UserGetWindowDC returns a HDC, not a DWORD

Author: tkreuzer
Date: Wed May  7 09:11:01 2008
New Revision: 33341

URL: http://svn.reactos.org/svn/reactos?rev=33341&view=rev
Log:
(Nt)UserGetWindowDC returns a HDC, not a DWORD

Modified:
    trunk/reactos/include/reactos/win32k/ntuser.h
    trunk/reactos/subsystems/win32/win32k/include/userfuncs.h
    trunk/reactos/subsystems/win32/win32k/ntuser/windc.c
    trunk/reactos/subsystems/win32/win32k/objects/color.c
    trunk/reactos/subsystems/win32/win32k/objects/dc.c
    trunk/reactos/subsystems/win32/win32k/objects/print.c

Modified: trunk/reactos/include/reactos/win32k/ntuser.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntus...
==============================================================================
--- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Wed May  7 09:11:01 2008
@@ -1485,7 +1485,7 @@
   HRGN hRgn,
   BOOL bErase);

-DWORD
+HDC
 NTAPI
 NtUserGetWindowDC(
   HWND hWnd);

Modified: trunk/reactos/subsystems/win32/win32k/include/userfuncs.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/inc...
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/userfuncs.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/include/userfuncs.h [iso-8859-1] Wed May  7 09:11:01 2008
@@ -67,7 +67,7 @@
 HDC FASTCALL
 UserGetDCEx(PWINDOW_OBJECT Window OPTIONAL, HANDLE ClipRegion, ULONG Flags);

-DWORD FASTCALL
+HDC FASTCALL
 UserGetWindowDC(PWINDOW_OBJECT Wnd);

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu...
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] Wed May  7 09:11:01 2008
@@ -837,10 +837,10 @@
   return nRet;
 }

-DWORD FASTCALL
+HDC FASTCALL
 UserGetWindowDC(PWINDOW_OBJECT Wnd)
 {
-  return (DWORD)UserGetDCEx(Wnd, 0, DCX_USESTYLE | DCX_WINDOW);
+  return UserGetDCEx(Wnd, 0, DCX_USESTYLE | DCX_WINDOW);
 }

HDC STDCALL
@@ -877,10 +877,10 @@
  * Status
  *    @implemented
  */
-DWORD STDCALL
+HDC STDCALL
 NtUserGetWindowDC(HWND hWnd)
 {
-  return (DWORD)NtUserGetDCEx(hWnd, 0, DCX_USESTYLE | DCX_WINDOW);
+  return NtUserGetDCEx(hWnd, 0, DCX_USESTYLE | DCX_WINDOW);
 }

HDC STDCALL

Modified: trunk/reactos/subsystems/win32/win32k/objects/color.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/obj...
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/color.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/color.c [iso-8859-1] Wed May  7 09:11:01 2008
@@ -118,7 +118,7 @@

/* Immediately apply the new palette if current window uses it */
         Wnd = UserGetDesktopWindow();
-        hDC =  (HDC)UserGetWindowDC(Wnd);
+        hDC =  UserGetWindowDC(Wnd);
         dc = DC_LockDc(hDC);
         if (NULL != dc)
         {

Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/obj...
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Wed May  7 09:11:01 2008
@@ -2796,7 +2796,7 @@
     PDC pDC;

DesktopObject = UserGetDesktopWindow();
-    DesktopHDC = (HDC)UserGetWindowDC(DesktopObject);
+    DesktopHDC = UserGetWindowDC(DesktopObject);
     pDC = DC_LockDc(DesktopHDC);

*DisplayNumber = ((GDIDEVICE *)pDC->pPDev)->DisplayNumber;
@@ -3320,7 +3320,7 @@
           return FALSE;
       }

-      hDC = (HDC)UserGetWindowDC(Wnd);
+      hDC = UserGetWindowDC(Wnd);

DC = DC_LockDc(hDC);
       if (NULL == DC)

Modified: trunk/reactos/subsystems/win32/win32k/objects/print.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/obj...
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/print.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/print.c [iso-8859-1] Wed May  7 09:11:01 2008
@@ -164,7 +164,7 @@

if (hDC == 0)
    {
-       hDC = (HDC)UserGetWindowDC(NULL);
+       hDC = UserGetWindowDC(NULL);
    }

pDC = DC_LockDc(hDC);