[ros-diffs] [jimtabor] 28452: Removed NtUserReleaseDC, replaced it with CallOneParam.

Author: jimtabor
Date: Wed Aug 22 18:12:55 2007
New Revision: 28452

URL: http://svn.reactos.org/svn/reactos?rev=28452&view=rev
Log:
Removed NtUserReleaseDC, replaced it with CallOneParam.

Modified:
    trunk/reactos/dll/win32/user32/windows/dc.c
    trunk/reactos/include/reactos/win32k/ntuser.h
    trunk/reactos/subsystems/win32/win32k/ntuser/misc.c
    trunk/reactos/subsystems/win32/win32k/ntuser/windc.c
    trunk/reactos/subsystems/win32/win32k/w32ksvc.db

Modified: trunk/reactos/dll/win32/user32/windows/dc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d…
==============================================================================
--- trunk/reactos/dll/win32/user32/windows/dc.c (original)
+++ trunk/reactos/dll/win32/user32/windows/dc.c Wed Aug 22 18:12:55 2007
@@ -89,9 +89,8 @@
   if (!hDC) return FALSE; // Null hDC return zero.
 
   GdiReleaseDC ( hDC ); // Release locals.
-  // Win 3.1 throw back, hWnd should be ignored and not used.  
-  // Replace with NtUserCallOneParam ((DWORD) hDC, ONEPARAM_ROUTINE_RELEASEDC);
-  return NtUserReleaseDC(hWnd, hDC);
+  // Win 3.1 throw back, hWnd is ignored and not used.  
+  return NtUserCallOneParam( (DWORD) hDC, ONEPARAM_ROUTINE_RELEASEDC);
 }
 
 

Modified: trunk/reactos/include/reactos/win32k/ntuser.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu…
==============================================================================
--- trunk/reactos/include/reactos/win32k/ntuser.h (original)
+++ trunk/reactos/include/reactos/win32k/ntuser.h Wed Aug 22 18:12:55 2007
@@ -280,9 +280,6 @@
 
 LONG NTAPI
 NtUserGetWindowLong(HWND hWnd, DWORD Index, BOOL Ansi);
-
-INT NTAPI
-NtUserReleaseDC(HWND hWnd, HDC hDc);
 
 BOOL NTAPI
 NtUserGetWindowRect(HWND hWnd, LPRECT Rect);
@@ -460,6 +457,7 @@
 #define ONEPARAM_ROUTINE_GETKEYBOARDLAYOUT    0x29
 #define ONEPARAM_ROUTINE_SHOWCURSOR           0x30
 #define ONEPARAM_ROUTINE_REGISTERUSERMODULE   0x31
+#define ONEPARAM_ROUTINE_RELEASEDC            0x39
 DWORD
 NTAPI
 NtUserCallOneParam(

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Wed Aug 22 18:12:55 2007
@@ -427,6 +427,8 @@
               RETURN(TRUE);
           }
       }
+      case ONEPARAM_ROUTINE_RELEASEDC:
+         RETURN (UserReleaseDC(NULL, (HDC) Param, FALSE));
    }
    DPRINT1("Calling invalid routine number 0x%x in NtUserCallOneParam(),
Param=0x%x\n",
            Routine, Param);

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Wed Aug 22 18:12:55 2007
@@ -632,24 +632,6 @@
 }
 
 
-// Win 3.1 throw back, hWnd should be ignored and not used.
-// Replace with NtUserCallOneParam ((DWORD) hDC, ONEPARAM_ROUTINE_RELEASEDC);
-INT STDCALL
-NtUserReleaseDC(HWND hWnd, HDC hDc)
-{
-   DECLARE_RETURN(INT);
-
-   DPRINT("Enter NtUserReleaseDC\n");
-   UserEnterExclusive();
-
-   RETURN(UserReleaseDC(NULL, hDc, FALSE));
-
-CLEANUP:
-   DPRINT("Leave NtUserReleaseDC, ret=%i\n",_ret_);
-   UserLeave();
-   END_CLEANUP;
-}
-
 /***********************************************************************
  *           DceFreeDCE
  */

Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original)
+++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Wed Aug 22 18:12:55 2007
@@ -741,7 +741,6 @@
 NtUserMonitorFromPoint                  3
 NtUserMonitorFromRect                   2
 NtUserMonitorFromWindow                 2
-NtUserReleaseDC                         2
 NtUserRegisterClassEx                   6
 NtUserRegisterClipboardFormat           1 
 NtUserSendMessage                       5