diff --git a/reactos/include/reactos/win32k/ntuser.h b/reactos/include/reactos/win32k/ntuser.h index 6b61b580a20..73560d1a32b 100644 --- a/reactos/include/reactos/win32k/ntuser.h +++ b/reactos/include/reactos/win32k/ntuser.h @@ -1485,7 +1485,7 @@ NtUserGetUpdateRgn( HRGN hRgn, BOOL bErase); -DWORD +HDC NTAPI NtUserGetWindowDC( HWND hWnd); diff --git a/reactos/subsystems/win32/win32k/include/userfuncs.h b/reactos/subsystems/win32/win32k/include/userfuncs.h index 41b175a8158..448ca928e11 100644 --- a/reactos/subsystems/win32/win32k/include/userfuncs.h +++ b/reactos/subsystems/win32/win32k/include/userfuncs.h @@ -67,7 +67,7 @@ UserReleaseDC(PWINDOW_OBJECT Window, HDC hDc, BOOL EndPaint); HDC FASTCALL UserGetDCEx(PWINDOW_OBJECT Window OPTIONAL, HANDLE ClipRegion, ULONG Flags); -DWORD FASTCALL +HDC FASTCALL UserGetWindowDC(PWINDOW_OBJECT Wnd); diff --git a/reactos/subsystems/win32/win32k/ntuser/windc.c b/reactos/subsystems/win32/win32k/ntuser/windc.c index 222f234a41f..8d658001fff 100644 --- a/reactos/subsystems/win32/win32k/ntuser/windc.c +++ b/reactos/subsystems/win32/win32k/ntuser/windc.c @@ -837,10 +837,10 @@ UserReleaseDC(PWINDOW_OBJECT Window, HDC hDc, BOOL EndPaint) 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 @@ CLEANUP: * 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 diff --git a/reactos/subsystems/win32/win32k/objects/color.c b/reactos/subsystems/win32/win32k/objects/color.c index 20513ebabb0..f850fa2b28b 100644 --- a/reactos/subsystems/win32/win32k/objects/color.c +++ b/reactos/subsystems/win32/win32k/objects/color.c @@ -118,7 +118,7 @@ IntAnimatePalette(HPALETTE hPal, /* 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) { diff --git a/reactos/subsystems/win32/win32k/objects/dc.c b/reactos/subsystems/win32/win32k/objects/dc.c index 4c0fb16e605..b0fcf14d8d4 100644 --- a/reactos/subsystems/win32/win32k/objects/dc.c +++ b/reactos/subsystems/win32/win32k/objects/dc.c @@ -2796,7 +2796,7 @@ GetDisplayNumberFromDeviceName( PDC pDC; DesktopObject = UserGetDesktopWindow(); - DesktopHDC = (HDC)UserGetWindowDC(DesktopObject); + DesktopHDC = UserGetWindowDC(DesktopObject); pDC = DC_LockDc(DesktopHDC); *DisplayNumber = ((GDIDEVICE *)pDC->pPDev)->DisplayNumber; @@ -3320,7 +3320,7 @@ IntChangeDisplaySettings( return FALSE; } - hDC = (HDC)UserGetWindowDC(Wnd); + hDC = UserGetWindowDC(Wnd); DC = DC_LockDc(hDC); if (NULL == DC) diff --git a/reactos/subsystems/win32/win32k/objects/print.c b/reactos/subsystems/win32/win32k/objects/print.c index 7689b4e0d40..e40042e818d 100644 --- a/reactos/subsystems/win32/win32k/objects/print.c +++ b/reactos/subsystems/win32/win32k/objects/print.c @@ -164,7 +164,7 @@ NtGdiExtEscape( if (hDC == 0) { - hDC = (HDC)UserGetWindowDC(NULL); + hDC = UserGetWindowDC(NULL); } pDC = DC_LockDc(hDC);