[PATCH v2 10/10] user32: Remove NtUserDriverCallback* kernel callbacks.

[Torge Matthies]

From: Torge Matthies

---
 dlls/wow64win/user.c | 61 --------------------------------------------
 include/ntuser.h     |  8 +++---
 2 files changed, 4 insertions(+), 65 deletions(-)

diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c
index 7c606101a29..33bd65c5fea 100644
--- a/dlls/wow64win/user.c
+++ b/dlls/wow64win/user.c
@@ -1450,56 +1450,6 @@ static NTSTATUS WINAPI wow64_NtUserCallDispatchCallback( void *arg, ULONG size )
     return dispatch_callback( NtUserCallDispatchCallback, arg, size );
 }

-static NTSTATUS WINAPI wow64_NtUserDriverCallbackFirst0( void *arg, ULONG size )
-{
-    return dispatch_callback( NtUserDriverCallbackFirst + 0, arg, size );
-}
-
-static NTSTATUS WINAPI wow64_NtUserDriverCallbackFirst1( void *arg, ULONG size )
-{
-    return dispatch_callback( NtUserDriverCallbackFirst + 1, arg, size );
-}
-
-static NTSTATUS WINAPI wow64_NtUserDriverCallbackFirst2( void *arg, ULONG size )
-{
-    return dispatch_callback( NtUserDriverCallbackFirst + 2, arg, size );
-}
-
-static NTSTATUS WINAPI wow64_NtUserDriverCallbackFirst3( void *arg, ULONG size )
-{
-    return dispatch_callback( NtUserDriverCallbackFirst + 3, arg, size );
-}
-
-static NTSTATUS WINAPI wow64_NtUserDriverCallbackFirst4( void *arg, ULONG size )
-{
-    return dispatch_callback( NtUserDriverCallbackFirst + 4, arg, size );
-}
-
-static NTSTATUS WINAPI wow64_NtUserDriverCallbackFirst5( void *arg, ULONG size )
-{
-    return dispatch_callback( NtUserDriverCallbackFirst + 5, arg, size );
-}
-
-static NTSTATUS WINAPI wow64_NtUserDriverCallbackFirst6( void *arg, ULONG size )
-{
-    return dispatch_callback( NtUserDriverCallbackFirst + 6, arg, size );
-}
-
-static NTSTATUS WINAPI wow64_NtUserDriverCallbackFirst7( void *arg, ULONG size )
-{
-    return dispatch_callback( NtUserDriverCallbackFirst + 7, arg, size );
-}
-
-static NTSTATUS WINAPI wow64_NtUserDriverCallbackFirst8( void *arg, ULONG size )
-{
-    return dispatch_callback( NtUserDriverCallbackFirst + 8, arg, size );
-}
-
-static NTSTATUS WINAPI wow64_NtUserDriverCallbackFirst9( void *arg, ULONG size )
-{
-    return dispatch_callback( NtUserDriverCallbackFirst + 9, arg, size );
-}
-
 ntuser_callback user_callbacks[] =
 {
     /* user32 callbacks */
@@ -1523,17 +1473,6 @@ ntuser_callback user_callbacks[] =
     wow64_NtUserPostDDEMessage,
     wow64_NtUserRenderSynthesizedFormat,
     wow64_NtUserUnpackDDEMessage,
-    /* Driver-specific callbacks */
-    wow64_NtUserDriverCallbackFirst0,
-    wow64_NtUserDriverCallbackFirst1,
-    wow64_NtUserDriverCallbackFirst2,
-    wow64_NtUserDriverCallbackFirst3,
-    wow64_NtUserDriverCallbackFirst4,
-    wow64_NtUserDriverCallbackFirst5,
-    wow64_NtUserDriverCallbackFirst6,
-    wow64_NtUserDriverCallbackFirst7,
-    wow64_NtUserDriverCallbackFirst8,
-    wow64_NtUserDriverCallbackFirst9,
 };

C_ASSERT( ARRAYSIZE(user_callbacks) == NtUserCallCount );
diff --git a/include/ntuser.h b/include/ntuser.h
index c8fbe4be57f..0a364e9f700 100644
--- a/include/ntuser.h
+++ b/include/ntuser.h
@@ -37,7 +37,10 @@
 typedef NTSTATUS (WINAPI *ntuser_callback)( void *args, ULONG len );
 NTSYSAPI NTSTATUS KeUserModeCallback( ULONG id, const void *args, ULONG len, void **ret_ptr, ULONG *ret_len );

-/* KernelCallbackTable codes, not compatible with Windows */
+/* KernelCallbackTable codes, not compatible with Windows.
+   All of these functions must live inside user32.dll. Overwatch 2's
+   KiUserCallbackDispatcher hook verifies this and prevents the callback from
+   running if that check fails. */
 enum
 {
     /* user32 callbacks */
@@ -61,9 +64,6 @@ enum
     NtUserPostDDEMessage,
     NtUserRenderSynthesizedFormat,
     NtUserUnpackDDEMessage,
-    /* Driver-specific callbacks */
-    NtUserDriverCallbackFirst,
-    NtUserDriverCallbackLast = NtUserDriverCallbackFirst + 9,
     NtUserCallCount
 };