[PATCH v3 0/3] MR8050: win32u: Implement and use NtUserAlterWindowStyle.

[Rémi Bernon]

--
  v3: win32u: Implement and use NtUserAlterWindowStyle.
      win32u: Add NtUserAlterWindowStyle syscall stub.
      win32u: Rename set_window_style to set_window_style_bits.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8050

[PATCH v3 1/3] win32u: Rename set_window_style to set_window_style_bits.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

---
 dlls/win32u/defwnd.c         |  4 ++--
 dlls/win32u/message.c        |  2 +-
 dlls/win32u/scroll.c         |  2 +-
 dlls/win32u/win32u_private.h |  2 +-
 dlls/win32u/window.c         | 27 +++++++++++----------------
 5 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c
index ce1afa398d9..4246b5d7653 100644
--- a/dlls/win32u/defwnd.c
+++ b/dlls/win32u/defwnd.c
@@ -2542,11 +2542,11 @@ LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam,
         return 0;
 
     case WM_SETREDRAW:
-        if (wparam) set_window_style( hwnd, WS_VISIBLE, 0 );
+        if (wparam) set_window_style_bits( hwnd, WS_VISIBLE, 0 );
         else
         {
             NtUserRedrawWindow( hwnd, NULL, 0, RDW_ALLCHILDREN | RDW_VALIDATE );
-            set_window_style( hwnd, 0, WS_VISIBLE );
+            set_window_style_bits( hwnd, 0, WS_VISIBLE );
         }
         return 0;
 
diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c
index 1d527253fbd..2a824dbdab3 100644
--- a/dlls/win32u/message.c
+++ b/dlls/win32u/message.c
@@ -2142,7 +2142,7 @@ static LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPAR
         return set_window_long( hwnd, (short)LOWORD(wparam), HIWORD(wparam), lparam, FALSE );
     case WM_WINE_SETSTYLE:
         if (is_desktop_window( hwnd )) return 0;
-        return set_window_style( hwnd, wparam, lparam );
+        return set_window_style_bits( hwnd, wparam, lparam );
     case WM_WINE_SETACTIVEWINDOW:
     {
         HWND prev;
diff --git a/dlls/win32u/scroll.c b/dlls/win32u/scroll.c
index 7ada572b658..8db26fc8aa6 100644
--- a/dlls/win32u/scroll.c
+++ b/dlls/win32u/scroll.c
@@ -162,7 +162,7 @@ static BOOL show_scroll_bar( HWND hwnd, int bar, BOOL show_horz, BOOL show_vert
         return FALSE;  /* Nothing to do! */
     }
 
-    old_style = set_window_style( hwnd, set_bits, clear_bits );
+    old_style = set_window_style_bits( hwnd, set_bits, clear_bits );
     if ((old_style & clear_bits) != 0 || (old_style & set_bits) != set_bits)
     {
         /* frame has been changed, let the window redraw itself */
diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h
index a7bee5bd93a..69e43ad5a5b 100644
--- a/dlls/win32u/win32u_private.h
+++ b/dlls/win32u/win32u_private.h
@@ -274,7 +274,7 @@ extern BOOL screen_to_client( HWND hwnd, POINT *pt );
 extern LONG_PTR set_window_long( HWND hwnd, INT offset, UINT size, LONG_PTR newval,
                                  BOOL ansi );
 extern BOOL set_window_pos( WINDOWPOS *winpos, int parent_x, int parent_y );
-extern ULONG set_window_style( HWND hwnd, ULONG set_bits, ULONG clear_bits );
+extern UINT set_window_style_bits( HWND hwnd, UINT set_bits, UINT clear_bits );
 extern void update_window_state( HWND hwnd );
 extern HWND window_from_point( HWND hwnd, POINT pt, INT *hittest );
 extern HWND get_shell_window(void);
diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c
index 3b3a3ba5eac..1f59ac4c303 100644
--- a/dlls/win32u/window.c
+++ b/dlls/win32u/window.c
@@ -796,7 +796,7 @@ BOOL WINAPI NtUserEnableWindow( HWND hwnd, BOOL enable )
 
     if (enable)
     {
-        ret = (set_window_style( hwnd, 0, WS_DISABLED ) & WS_DISABLED) != 0;
+        ret = (set_window_style_bits( hwnd, 0, WS_DISABLED ) & WS_DISABLED) != 0;
         if (ret)
         {
             NtUserNotifyWinEvent( EVENT_OBJECT_STATECHANGE, hwnd, OBJID_WINDOW, 0 );
@@ -808,7 +808,7 @@ BOOL WINAPI NtUserEnableWindow( HWND hwnd, BOOL enable )
     {
         send_message( hwnd, WM_CANCELMODE, 0, 0 );
 
-        ret = (set_window_style( hwnd, WS_DISABLED, 0 ) & WS_DISABLED) != 0;
+        ret = (set_window_style_bits( hwnd, WS_DISABLED, 0 ) & WS_DISABLED) != 0;
         if (!ret)
         {
             NtUserNotifyWinEvent( EVENT_OBJECT_STATECHANGE, hwnd, OBJID_WINDOW, 0 );
@@ -1116,12 +1116,7 @@ static WORD get_window_word( HWND hwnd, INT offset )
     return get_window_long_size( hwnd, offset, sizeof(WORD), TRUE );
 }
 
-/***********************************************************************
- *           set_window_style
- *
- * Change the style of a window.
- */
-ULONG set_window_style( HWND hwnd, ULONG set_bits, ULONG clear_bits )
+UINT set_window_style_bits( HWND hwnd, UINT set_bits, UINT clear_bits )
 {
     BOOL ok, made_visible = FALSE;
     STYLESTRUCT style;
@@ -4426,7 +4421,7 @@ static UINT window_min_maximize( HWND hwnd, UINT cmd, RECT *rect )
                 NtUserSetFocus( 0 );
         }
 
-        old_style = set_window_style( hwnd, WS_MINIMIZE, WS_MAXIMIZE );
+        old_style = set_window_style_bits( hwnd, WS_MINIMIZE, WS_MAXIMIZE );
 
         wpl.ptMinPosition = get_minimized_pos( hwnd, wpl.ptMinPosition );
 
@@ -4443,7 +4438,7 @@ static UINT window_min_maximize( HWND hwnd, UINT cmd, RECT *rect )
 
         minmax = get_min_max_info( hwnd );
 
-        old_style = set_window_style( hwnd, WS_MAXIMIZE, WS_MINIMIZE );
+        old_style = set_window_style_bits( hwnd, WS_MAXIMIZE, WS_MINIMIZE );
         if (old_style & WS_MINIMIZE)
             win_set_flags( hwnd, WIN_RESTORE_MAX, 0 );
 
@@ -4459,14 +4454,14 @@ static UINT window_min_maximize( HWND hwnd, UINT cmd, RECT *rect )
     case SW_SHOWNORMAL:
     case SW_RESTORE:
     case SW_SHOWDEFAULT: /* FIXME: should have its own handler */
-        old_style = set_window_style( hwnd, 0, WS_MINIMIZE | WS_MAXIMIZE );
+        old_style = set_window_style_bits( hwnd, 0, WS_MINIMIZE | WS_MAXIMIZE );
         if (old_style & WS_MINIMIZE)
         {
             if (win_get_flags( hwnd ) & WIN_RESTORE_MAX)
             {
                 /* Restore to maximized position */
                 minmax = get_min_max_info( hwnd );
-                set_window_style( hwnd, WS_MAXIMIZE, 0 );
+                set_window_style_bits( hwnd, WS_MAXIMIZE, 0 );
                 swp_flags |= SWP_STATECHANGED;
                 SetRect( rect, minmax.ptMaxPosition.x, minmax.ptMaxPosition.y,
                          minmax.ptMaxPosition.x + minmax.ptMaxSize.x,
@@ -4663,8 +4658,8 @@ static BOOL show_window( HWND hwnd, INT cmd )
     if (parent && !is_window_visible( parent ) && !(swp & SWP_STATECHANGED))
     {
         /* if parent is not visible simply toggle WS_VISIBLE and return */
-        if (show_flag) set_window_style( hwnd, WS_VISIBLE, 0 );
-        else set_window_style( hwnd, 0, WS_VISIBLE );
+        if (show_flag) set_window_style_bits( hwnd, WS_VISIBLE, 0 );
+        else set_window_style_bits( hwnd, 0, WS_VISIBLE );
     }
     else
         NtUserSetWindowPos( hwnd, HWND_TOP, newPos.left, newPos.top,
@@ -5676,7 +5671,7 @@ HWND WINAPI NtUserCreateWindowEx( DWORD ex_style, UNICODE_STRING *class_name,
 
     /* Show the window, maximizing or minimizing if needed */
 
-    style = set_window_style( hwnd, 0, WS_MAXIMIZE | WS_MINIMIZE );
+    style = set_window_style_bits( hwnd, 0, WS_MAXIMIZE | WS_MINIMIZE );
     if (style & (WS_MINIMIZE | WS_MAXIMIZE))
     {
         RECT new_pos;
@@ -5959,7 +5954,7 @@ ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code )
     case NtUserSetWindowStyle:
         {
             STYLESTRUCT *style = (void *)param;
-            return set_window_style( hwnd, style->styleNew, style->styleOld );
+            return set_window_style_bits( hwnd, style->styleNew, style->styleOld );
         }
 
     default:
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/8050

[PATCH v3 2/3] win32u: Add NtUserAlterWindowStyle syscall stub.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

---
 dlls/win32u/main.c          |    5 +
 dlls/win32u/tests/win32u.c  |   64 +++
 dlls/win32u/win32syscalls.h | 1046 ++++++++++++++++++-----------------
 dlls/win32u/win32u.spec     |    2 +-
 dlls/win32u/window.c        |    9 +
 dlls/wow64win/user.c        |    9 +
 include/ntuser.h            |    1 +
 7 files changed, 613 insertions(+), 523 deletions(-)

diff --git a/dlls/win32u/main.c b/dlls/win32u/main.c
index cccfcd6e246..c085996be7a 100644
--- a/dlls/win32u/main.c
+++ b/dlls/win32u/main.c
@@ -1107,6 +1107,11 @@ HKL SYSCALL_API NtUserActivateKeyboardLayout( HKL layout, UINT flags )
     SYSCALL_FUNC( NtUserActivateKeyboardLayout );
 }
 
+BOOL SYSCALL_API NtUserAlterWindowStyle( HWND hwnd, UINT mask, UINT style )
+{
+    SYSCALL_FUNC( NtUserAlterWindowStyle );
+}
+
 BOOL SYSCALL_API NtUserAddClipboardFormatListener( HWND hwnd )
 {
     SYSCALL_FUNC( NtUserAddClipboardFormatListener );
diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c
index 249245dd79c..71ceabfd3b4 100644
--- a/dlls/win32u/tests/win32u.c
+++ b/dlls/win32u/tests/win32u.c
@@ -270,6 +270,69 @@ static void test_class(void)
 
 }
 
+static LRESULT CALLBACK test_adjust_window_style_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam )
+{
+    ok( 0, "unexpected msg %#x\n", msg );
+    return DefWindowProcW( hwnd, msg, wparam, lparam );
+}
+
+static void test_NtUserAlterWindowStyle(void)
+{
+    UINT style, expect_style;
+    ULONG_PTR ret, old_proc;
+    HWND hwnd;
+
+    ret = NtUserAlterWindowStyle( 0, 0, 0 );
+    ok( ret == 0, "got %#Ix\n", ret );
+
+    expect_style = WS_OVERLAPPEDWINDOW | WS_HSCROLL | WS_VSCROLL | WS_CLIPSIBLINGS;
+    hwnd = CreateWindowW( L"static", L"static", expect_style, CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, 0, 0, NULL, 0 );
+    flush_events();
+
+    old_proc = SetWindowLongPtrW( hwnd, GWLP_WNDPROC, (ULONG_PTR)test_adjust_window_style_proc );
+    style = GetWindowLongW( hwnd, GWL_STYLE );
+    ok( style == expect_style, "got %#x\n", style );
+
+    ret = NtUserAlterWindowStyle( hwnd, 0, 0 );
+    todo_wine ok( ret == 1, "got %#Ix\n", ret );
+    style = GetWindowLongW( hwnd, GWL_STYLE );
+    ok( style == expect_style, "got %#x\n", style );
+
+    ret = NtUserAlterWindowStyle( hwnd, -1, -1 );
+    todo_wine ok( ret == 1, "got %#Ix\n", ret );
+    style = GetWindowLongW( hwnd, GWL_STYLE );
+    todo_wine ok( style == (expect_style | 0x23f), "got %#x\n", style );
+
+    ret = NtUserAlterWindowStyle( hwnd, -1, 0 );
+    todo_wine ok( ret == 1, "got %#Ix\n", ret );
+    style = GetWindowLongW( hwnd, GWL_STYLE );
+    todo_wine ok( style == (expect_style & ~(WS_VSCROLL | WS_HSCROLL)), "got %#x\n", style );
+
+    ret = NtUserAlterWindowStyle( hwnd, 0, -1 );
+    todo_wine ok( ret == 1, "got %#Ix\n", ret );
+    style = GetWindowLongW( hwnd, GWL_STYLE );
+    todo_wine ok( style == (expect_style & ~(WS_VSCROLL | WS_HSCROLL)), "got %#x\n", style );
+
+    ret = NtUserAlterWindowStyle( hwnd, -1, 0xe1e1e1e1 );
+    todo_wine ok( ret == 1, "got %#Ix\n", ret );
+    style = GetWindowLongW( hwnd, GWL_STYLE );
+    todo_wine ok( style == ((expect_style & ~WS_HSCROLL) | 0x21), "got %#x\n", style );
+
+    ret = NtUserAlterWindowStyle( hwnd, -1, 0 );
+    todo_wine ok( ret == 1, "got %#Ix\n", ret );
+    style = GetWindowLongW( hwnd, GWL_STYLE );
+    todo_wine ok( style == (expect_style & ~(WS_VSCROLL | WS_HSCROLL)), "got %#x\n", style );
+
+    ret = NtUserAlterWindowStyle( hwnd, 0x20, 0xe1e1e1e1 );
+    todo_wine ok( ret == 1, "got %#Ix\n", ret );
+    style = GetWindowLongW( hwnd, GWL_STYLE );
+    todo_wine ok( style == ((expect_style & ~(WS_VSCROLL | WS_HSCROLL)) | 0x20), "got %#x\n", style );
+
+    flush_events();
+    SetWindowLongPtrW( hwnd, GWLP_WNDPROC, old_proc );
+    DestroyWindow( hwnd );
+}
+
 static void test_NtUserCreateInputContext(void)
 {
     UINT_PTR value, attr3;
@@ -2561,6 +2624,7 @@ START_TEST(win32u)
     test_NtUserEnumDisplayDevices();
     test_window_props();
     test_class();
+    test_NtUserAlterWindowStyle();
     test_NtUserCreateInputContext();
     test_NtUserBuildHimcList();
     test_NtUserBuildHwndList();
diff --git a/dlls/win32u/win32syscalls.h b/dlls/win32u/win32syscalls.h
index 6f328b500b1..2b22d25a576 100644
--- a/dlls/win32u/win32syscalls.h
+++ b/dlls/win32u/win32syscalls.h
@@ -202,267 +202,268 @@
     SYSCALL_ENTRY( 0x10c6, NtGdiWidenPath, 4 ) \
     SYSCALL_ENTRY( 0x10c7, NtUserActivateKeyboardLayout, 8 ) \
     SYSCALL_ENTRY( 0x10c8, NtUserAddClipboardFormatListener, 4 ) \
-    SYSCALL_ENTRY( 0x10c9, NtUserArrangeIconicWindows, 4 ) \
-    SYSCALL_ENTRY( 0x10ca, NtUserAssociateInputContext, 12 ) \
-    SYSCALL_ENTRY( 0x10cb, NtUserAttachThreadInput, 12 ) \
-    SYSCALL_ENTRY( 0x10cc, NtUserBeginDeferWindowPos, 4 ) \
-    SYSCALL_ENTRY( 0x10cd, NtUserBeginPaint, 8 ) \
-    SYSCALL_ENTRY( 0x10ce, NtUserBuildHimcList, 16 ) \
-    SYSCALL_ENTRY( 0x10cf, NtUserBuildHwndList, 32 ) \
-    SYSCALL_ENTRY( 0x10d0, NtUserBuildNameList, 16 ) \
-    SYSCALL_ENTRY( 0x10d1, NtUserBuildPropList, 16 ) \
-    SYSCALL_ENTRY( 0x10d2, NtUserCallHwnd, 8 ) \
-    SYSCALL_ENTRY( 0x10d3, NtUserCallHwndParam, 12 ) \
-    SYSCALL_ENTRY( 0x10d4, NtUserCallMsgFilter, 8 ) \
-    SYSCALL_ENTRY( 0x10d5, NtUserCallNextHookEx, 16 ) \
-    SYSCALL_ENTRY( 0x10d6, NtUserCallNoParam, 4 ) \
-    SYSCALL_ENTRY( 0x10d7, NtUserCallOneParam, 8 ) \
-    SYSCALL_ENTRY( 0x10d8, NtUserCallTwoParam, 12 ) \
-    SYSCALL_ENTRY( 0x10d9, NtUserChangeClipboardChain, 8 ) \
-    SYSCALL_ENTRY( 0x10da, NtUserChangeDisplaySettings, 20 ) \
-    SYSCALL_ENTRY( 0x10db, NtUserCheckMenuItem, 12 ) \
-    SYSCALL_ENTRY( 0x10dc, NtUserChildWindowFromPointEx, 16 ) \
-    SYSCALL_ENTRY( 0x10dd, NtUserClipCursor, 4 ) \
-    SYSCALL_ENTRY( 0x10de, NtUserCloseClipboard, 0 ) \
-    SYSCALL_ENTRY( 0x10df, NtUserCloseDesktop, 4 ) \
-    SYSCALL_ENTRY( 0x10e0, NtUserCloseWindowStation, 4 ) \
-    SYSCALL_ENTRY( 0x10e1, NtUserCopyAcceleratorTable, 12 ) \
-    SYSCALL_ENTRY( 0x10e2, NtUserCountClipboardFormats, 0 ) \
-    SYSCALL_ENTRY( 0x10e3, NtUserCreateAcceleratorTable, 8 ) \
-    SYSCALL_ENTRY( 0x10e4, NtUserCreateCaret, 16 ) \
-    SYSCALL_ENTRY( 0x10e5, NtUserCreateDesktopEx, 24 ) \
-    SYSCALL_ENTRY( 0x10e6, NtUserCreateInputContext, 4 ) \
-    SYSCALL_ENTRY( 0x10e7, NtUserCreateMenu, 0 ) \
-    SYSCALL_ENTRY( 0x10e8, NtUserCreatePopupMenu, 0 ) \
-    SYSCALL_ENTRY( 0x10e9, NtUserCreateWindowEx, 68 ) \
-    SYSCALL_ENTRY( 0x10ea, NtUserCreateWindowStation, 28 ) \
-    SYSCALL_ENTRY( 0x10eb, NtUserDeferWindowPosAndBand, 40 ) \
-    SYSCALL_ENTRY( 0x10ec, NtUserDeleteMenu, 12 ) \
-    SYSCALL_ENTRY( 0x10ed, NtUserDestroyAcceleratorTable, 4 ) \
-    SYSCALL_ENTRY( 0x10ee, NtUserDestroyCaret, 0 ) \
-    SYSCALL_ENTRY( 0x10ef, NtUserDestroyCursor, 8 ) \
-    SYSCALL_ENTRY( 0x10f0, NtUserDestroyInputContext, 4 ) \
-    SYSCALL_ENTRY( 0x10f1, NtUserDestroyMenu, 4 ) \
-    SYSCALL_ENTRY( 0x10f2, NtUserDestroyWindow, 4 ) \
-    SYSCALL_ENTRY( 0x10f3, NtUserDisableThreadIme, 4 ) \
-    SYSCALL_ENTRY( 0x10f4, NtUserDispatchMessage, 4 ) \
-    SYSCALL_ENTRY( 0x10f5, NtUserDisplayConfigGetDeviceInfo, 4 ) \
-    SYSCALL_ENTRY( 0x10f6, NtUserDragDetect, 12 ) \
-    SYSCALL_ENTRY( 0x10f7, NtUserDragObject, 20 ) \
-    SYSCALL_ENTRY( 0x10f8, NtUserDrawCaptionTemp, 28 ) \
-    SYSCALL_ENTRY( 0x10f9, NtUserDrawIconEx, 36 ) \
-    SYSCALL_ENTRY( 0x10fa, NtUserDrawMenuBar, 4 ) \
-    SYSCALL_ENTRY( 0x10fb, NtUserDrawMenuBarTemp, 20 ) \
-    SYSCALL_ENTRY( 0x10fc, NtUserEmptyClipboard, 0 ) \
-    SYSCALL_ENTRY( 0x10fd, NtUserEnableMenuItem, 12 ) \
-    SYSCALL_ENTRY( 0x10fe, NtUserEnableMouseInPointer, 4 ) \
-    SYSCALL_ENTRY( 0x10ff, NtUserEnableMouseInPointerForThread, 0 ) \
-    SYSCALL_ENTRY( 0x1100, NtUserEnableScrollBar, 12 ) \
-    SYSCALL_ENTRY( 0x1101, NtUserEnableWindow, 8 ) \
-    SYSCALL_ENTRY( 0x1102, NtUserEndDeferWindowPosEx, 8 ) \
-    SYSCALL_ENTRY( 0x1103, NtUserEndMenu, 0 ) \
-    SYSCALL_ENTRY( 0x1104, NtUserEndPaint, 8 ) \
-    SYSCALL_ENTRY( 0x1105, NtUserEnumClipboardFormats, 4 ) \
-    SYSCALL_ENTRY( 0x1106, NtUserEnumDisplayDevices, 16 ) \
-    SYSCALL_ENTRY( 0x1107, NtUserEnumDisplayMonitors, 16 ) \
-    SYSCALL_ENTRY( 0x1108, NtUserEnumDisplaySettings, 16 ) \
-    SYSCALL_ENTRY( 0x1109, NtUserExcludeUpdateRgn, 8 ) \
-    SYSCALL_ENTRY( 0x110a, NtUserFindExistingCursorIcon, 12 ) \
-    SYSCALL_ENTRY( 0x110b, NtUserFindWindowEx, 20 ) \
-    SYSCALL_ENTRY( 0x110c, NtUserFlashWindowEx, 4 ) \
-    SYSCALL_ENTRY( 0x110d, NtUserGetAncestor, 8 ) \
-    SYSCALL_ENTRY( 0x110e, NtUserGetAsyncKeyState, 4 ) \
-    SYSCALL_ENTRY( 0x110f, NtUserGetAtomName, 8 ) \
-    SYSCALL_ENTRY( 0x1110, NtUserGetCaretBlinkTime, 0 ) \
-    SYSCALL_ENTRY( 0x1111, NtUserGetCaretPos, 4 ) \
-    SYSCALL_ENTRY( 0x1112, NtUserGetClassInfoEx, 20 ) \
-    SYSCALL_ENTRY( 0x1113, NtUserGetClassName, 12 ) \
-    SYSCALL_ENTRY( 0x1114, NtUserGetClipCursor, 4 ) \
-    SYSCALL_ENTRY( 0x1115, NtUserGetClipboardData, 8 ) \
-    SYSCALL_ENTRY( 0x1116, NtUserGetClipboardFormatName, 12 ) \
-    SYSCALL_ENTRY( 0x1117, NtUserGetClipboardOwner, 0 ) \
-    SYSCALL_ENTRY( 0x1118, NtUserGetClipboardSequenceNumber, 0 ) \
-    SYSCALL_ENTRY( 0x1119, NtUserGetClipboardViewer, 0 ) \
-    SYSCALL_ENTRY( 0x111a, NtUserGetCurrentInputMessageSource, 4 ) \
-    SYSCALL_ENTRY( 0x111b, NtUserGetCursor, 0 ) \
-    SYSCALL_ENTRY( 0x111c, NtUserGetCursorFrameInfo, 16 ) \
-    SYSCALL_ENTRY( 0x111d, NtUserGetCursorInfo, 4 ) \
-    SYSCALL_ENTRY( 0x111e, NtUserGetDC, 4 ) \
-    SYSCALL_ENTRY( 0x111f, NtUserGetDCEx, 12 ) \
-    SYSCALL_ENTRY( 0x1120, NtUserGetDisplayConfigBufferSizes, 12 ) \
-    SYSCALL_ENTRY( 0x1121, NtUserGetDoubleClickTime, 0 ) \
-    SYSCALL_ENTRY( 0x1122, NtUserGetDpiForMonitor, 16 ) \
-    SYSCALL_ENTRY( 0x1123, NtUserGetForegroundWindow, 0 ) \
-    SYSCALL_ENTRY( 0x1124, NtUserGetGUIThreadInfo, 8 ) \
-    SYSCALL_ENTRY( 0x1125, NtUserGetIconInfo, 24 ) \
-    SYSCALL_ENTRY( 0x1126, NtUserGetIconSize, 16 ) \
-    SYSCALL_ENTRY( 0x1127, NtUserGetInternalWindowPos, 12 ) \
-    SYSCALL_ENTRY( 0x1128, NtUserGetKeyNameText, 12 ) \
-    SYSCALL_ENTRY( 0x1129, NtUserGetKeyState, 4 ) \
-    SYSCALL_ENTRY( 0x112a, NtUserGetKeyboardLayout, 4 ) \
-    SYSCALL_ENTRY( 0x112b, NtUserGetKeyboardLayoutList, 8 ) \
-    SYSCALL_ENTRY( 0x112c, NtUserGetKeyboardLayoutName, 4 ) \
-    SYSCALL_ENTRY( 0x112d, NtUserGetKeyboardState, 4 ) \
-    SYSCALL_ENTRY( 0x112e, NtUserGetLayeredWindowAttributes, 16 ) \
-    SYSCALL_ENTRY( 0x112f, NtUserGetMenuBarInfo, 16 ) \
-    SYSCALL_ENTRY( 0x1130, NtUserGetMenuItemRect, 16 ) \
-    SYSCALL_ENTRY( 0x1131, NtUserGetMessage, 16 ) \
-    SYSCALL_ENTRY( 0x1132, NtUserGetMouseMovePointsEx, 20 ) \
-    SYSCALL_ENTRY( 0x1133, NtUserGetObjectInformation, 20 ) \
-    SYSCALL_ENTRY( 0x1134, NtUserGetOpenClipboardWindow, 0 ) \
-    SYSCALL_ENTRY( 0x1135, NtUserGetPointerInfoList, 32 ) \
-    SYSCALL_ENTRY( 0x1136, NtUserGetPriorityClipboardFormat, 8 ) \
-    SYSCALL_ENTRY( 0x1137, NtUserGetProcessDefaultLayout, 4 ) \
-    SYSCALL_ENTRY( 0x1138, NtUserGetProcessDpiAwarenessContext, 4 ) \
-    SYSCALL_ENTRY( 0x1139, NtUserGetProcessWindowStation, 0 ) \
-    SYSCALL_ENTRY( 0x113a, NtUserGetProp, 8 ) \
-    SYSCALL_ENTRY( 0x113b, NtUserGetQueueStatus, 4 ) \
-    SYSCALL_ENTRY( 0x113c, NtUserGetRawInputBuffer, 12 ) \
-    SYSCALL_ENTRY( 0x113d, NtUserGetRawInputData, 20 ) \
-    SYSCALL_ENTRY( 0x113e, NtUserGetRawInputDeviceInfo, 16 ) \
-    SYSCALL_ENTRY( 0x113f, NtUserGetRawInputDeviceList, 12 ) \
-    SYSCALL_ENTRY( 0x1140, NtUserGetRegisteredRawInputDevices, 12 ) \
-    SYSCALL_ENTRY( 0x1141, NtUserGetScrollBarInfo, 12 ) \
-    SYSCALL_ENTRY( 0x1142, NtUserGetSystemDpiForProcess, 4 ) \
-    SYSCALL_ENTRY( 0x1143, NtUserGetSystemMenu, 8 ) \
-    SYSCALL_ENTRY( 0x1144, NtUserGetThreadDesktop, 4 ) \
-    SYSCALL_ENTRY( 0x1145, NtUserGetThreadState, 4 ) \
-    SYSCALL_ENTRY( 0x1146, NtUserGetTitleBarInfo, 8 ) \
-    SYSCALL_ENTRY( 0x1147, NtUserGetUpdateRect, 12 ) \
-    SYSCALL_ENTRY( 0x1148, NtUserGetUpdateRgn, 12 ) \
-    SYSCALL_ENTRY( 0x1149, NtUserGetUpdatedClipboardFormats, 12 ) \
-    SYSCALL_ENTRY( 0x114a, NtUserGetWindowContextHelpId, 4 ) \
-    SYSCALL_ENTRY( 0x114b, NtUserGetWindowDC, 4 ) \
-    SYSCALL_ENTRY( 0x114c, NtUserGetWindowPlacement, 8 ) \
-    SYSCALL_ENTRY( 0x114d, NtUserGetWindowRgnEx, 12 ) \
-    SYSCALL_ENTRY( 0x114e, NtUserHideCaret, 4 ) \
-    SYSCALL_ENTRY( 0x114f, NtUserHiliteMenuItem, 16 ) \
-    SYSCALL_ENTRY( 0x1150, NtUserInitializeClientPfnArrays, 16 ) \
-    SYSCALL_ENTRY( 0x1151, NtUserInternalGetWindowIcon, 8 ) \
-    SYSCALL_ENTRY( 0x1152, NtUserInternalGetWindowText, 12 ) \
-    SYSCALL_ENTRY( 0x1153, NtUserInvalidateRect, 12 ) \
-    SYSCALL_ENTRY( 0x1154, NtUserInvalidateRgn, 12 ) \
-    SYSCALL_ENTRY( 0x1155, NtUserIsChildWindowDpiMessageEnabled, 4 ) \
-    SYSCALL_ENTRY( 0x1156, NtUserIsClipboardFormatAvailable, 4 ) \
-    SYSCALL_ENTRY( 0x1157, NtUserIsMouseInPointerEnabled, 0 ) \
-    SYSCALL_ENTRY( 0x1158, NtUserKillSystemTimer, 8 ) \
-    SYSCALL_ENTRY( 0x1159, NtUserKillTimer, 8 ) \
-    SYSCALL_ENTRY( 0x115a, NtUserLockWindowUpdate, 4 ) \
-    SYSCALL_ENTRY( 0x115b, NtUserLogicalToPerMonitorDPIPhysicalPoint, 8 ) \
-    SYSCALL_ENTRY( 0x115c, NtUserMapVirtualKeyEx, 12 ) \
-    SYSCALL_ENTRY( 0x115d, NtUserMenuItemFromPoint, 16 ) \
-    SYSCALL_ENTRY( 0x115e, NtUserMessageBeep, 4 ) \
-    SYSCALL_ENTRY( 0x115f, NtUserMessageCall, 28 ) \
-    SYSCALL_ENTRY( 0x1160, NtUserMoveWindow, 24 ) \
-    SYSCALL_ENTRY( 0x1161, NtUserMsgWaitForMultipleObjectsEx, 20 ) \
-    SYSCALL_ENTRY( 0x1162, NtUserNotifyIMEStatus, 8 ) \
-    SYSCALL_ENTRY( 0x1163, NtUserNotifyWinEvent, 16 ) \
-    SYSCALL_ENTRY( 0x1164, NtUserOpenClipboard, 8 ) \
-    SYSCALL_ENTRY( 0x1165, NtUserOpenDesktop, 12 ) \
-    SYSCALL_ENTRY( 0x1166, NtUserOpenInputDesktop, 12 ) \
-    SYSCALL_ENTRY( 0x1167, NtUserOpenWindowStation, 8 ) \
-    SYSCALL_ENTRY( 0x1168, NtUserPeekMessage, 20 ) \
-    SYSCALL_ENTRY( 0x1169, NtUserPerMonitorDPIPhysicalToLogicalPoint, 8 ) \
-    SYSCALL_ENTRY( 0x116a, NtUserPostMessage, 16 ) \
-    SYSCALL_ENTRY( 0x116b, NtUserPostQuitMessage, 4 ) \
-    SYSCALL_ENTRY( 0x116c, NtUserPostThreadMessage, 16 ) \
-    SYSCALL_ENTRY( 0x116d, NtUserPrintWindow, 12 ) \
-    SYSCALL_ENTRY( 0x116e, NtUserQueryDisplayConfig, 24 ) \
-    SYSCALL_ENTRY( 0x116f, NtUserQueryInputContext, 8 ) \
-    SYSCALL_ENTRY( 0x1170, NtUserQueryWindow, 8 ) \
-    SYSCALL_ENTRY( 0x1171, NtUserRealChildWindowFromPoint, 12 ) \
-    SYSCALL_ENTRY( 0x1172, NtUserRealizePalette, 4 ) \
-    SYSCALL_ENTRY( 0x1173, NtUserRedrawWindow, 16 ) \
-    SYSCALL_ENTRY( 0x1174, NtUserRegisterClassExWOW, 28 ) \
-    SYSCALL_ENTRY( 0x1175, NtUserRegisterHotKey, 16 ) \
-    SYSCALL_ENTRY( 0x1176, NtUserRegisterRawInputDevices, 12 ) \
-    SYSCALL_ENTRY( 0x1177, NtUserRegisterTouchPadCapable, 4 ) \
-    SYSCALL_ENTRY( 0x1178, NtUserReleaseCapture, 0 ) \
-    SYSCALL_ENTRY( 0x1179, NtUserReleaseDC, 8 ) \
-    SYSCALL_ENTRY( 0x117a, NtUserRemoveClipboardFormatListener, 4 ) \
-    SYSCALL_ENTRY( 0x117b, NtUserRemoveMenu, 12 ) \
-    SYSCALL_ENTRY( 0x117c, NtUserRemoveProp, 8 ) \
-    SYSCALL_ENTRY( 0x117d, NtUserReplyMessage, 4 ) \
-    SYSCALL_ENTRY( 0x117e, NtUserScrollDC, 28 ) \
-    SYSCALL_ENTRY( 0x117f, NtUserScrollWindowEx, 32 ) \
-    SYSCALL_ENTRY( 0x1180, NtUserSelectPalette, 12 ) \
-    SYSCALL_ENTRY( 0x1181, NtUserSendInput, 12 ) \
-    SYSCALL_ENTRY( 0x1182, NtUserSetActiveWindow, 4 ) \
-    SYSCALL_ENTRY( 0x1183, NtUserSetAdditionalForegroundBoostProcesses, 12 ) \
-    SYSCALL_ENTRY( 0x1184, NtUserSetCapture, 4 ) \
-    SYSCALL_ENTRY( 0x1185, NtUserSetCaretBlinkTime, 4 ) \
-    SYSCALL_ENTRY( 0x1186, NtUserSetCaretPos, 8 ) \
-    SYSCALL_ENTRY( 0x1187, NtUserSetClassLong, 16 ) \
-    SYSCALL_ENTRY( 0x1188, NtUserSetClassLongPtr, 16 ) \
-    SYSCALL_ENTRY( 0x1189, NtUserSetClassWord, 12 ) \
-    SYSCALL_ENTRY( 0x118a, NtUserSetClipboardData, 12 ) \
-    SYSCALL_ENTRY( 0x118b, NtUserSetClipboardViewer, 4 ) \
-    SYSCALL_ENTRY( 0x118c, NtUserSetCursor, 4 ) \
-    SYSCALL_ENTRY( 0x118d, NtUserSetCursorIconData, 16 ) \
-    SYSCALL_ENTRY( 0x118e, NtUserSetCursorPos, 8 ) \
-    SYSCALL_ENTRY( 0x118f, NtUserSetFocus, 4 ) \
-    SYSCALL_ENTRY( 0x1190, NtUserSetForegroundWindow, 4 ) \
-    SYSCALL_ENTRY( 0x1191, NtUserSetInternalWindowPos, 16 ) \
-    SYSCALL_ENTRY( 0x1192, NtUserSetKeyboardState, 4 ) \
-    SYSCALL_ENTRY( 0x1193, NtUserSetLayeredWindowAttributes, 16 ) \
-    SYSCALL_ENTRY( 0x1194, NtUserSetMenu, 8 ) \
-    SYSCALL_ENTRY( 0x1195, NtUserSetMenuContextHelpId, 8 ) \
-    SYSCALL_ENTRY( 0x1196, NtUserSetMenuDefaultItem, 12 ) \
-    SYSCALL_ENTRY( 0x1197, NtUserSetObjectInformation, 16 ) \
-    SYSCALL_ENTRY( 0x1198, NtUserSetParent, 8 ) \
-    SYSCALL_ENTRY( 0x1199, NtUserSetProcessDefaultLayout, 4 ) \
-    SYSCALL_ENTRY( 0x119a, NtUserSetProcessDpiAwarenessContext, 8 ) \
-    SYSCALL_ENTRY( 0x119b, NtUserSetProcessWindowStation, 4 ) \
-    SYSCALL_ENTRY( 0x119c, NtUserSetProgmanWindow, 4 ) \
-    SYSCALL_ENTRY( 0x119d, NtUserSetProp, 12 ) \
-    SYSCALL_ENTRY( 0x119e, NtUserSetScrollInfo, 16 ) \
-    SYSCALL_ENTRY( 0x119f, NtUserSetShellWindowEx, 8 ) \
-    SYSCALL_ENTRY( 0x11a0, NtUserSetSysColors, 12 ) \
-    SYSCALL_ENTRY( 0x11a1, NtUserSetSystemMenu, 8 ) \
-    SYSCALL_ENTRY( 0x11a2, NtUserSetSystemTimer, 12 ) \
-    SYSCALL_ENTRY( 0x11a3, NtUserSetTaskmanWindow, 4 ) \
-    SYSCALL_ENTRY( 0x11a4, NtUserSetThreadDesktop, 4 ) \
-    SYSCALL_ENTRY( 0x11a5, NtUserSetTimer, 20 ) \
-    SYSCALL_ENTRY( 0x11a6, NtUserSetWinEventHook, 32 ) \
-    SYSCALL_ENTRY( 0x11a7, NtUserSetWindowContextHelpId, 8 ) \
-    SYSCALL_ENTRY( 0x11a8, NtUserSetWindowLong, 16 ) \
-    SYSCALL_ENTRY( 0x11a9, NtUserSetWindowLongPtr, 16 ) \
-    SYSCALL_ENTRY( 0x11aa, NtUserSetWindowPlacement, 8 ) \
-    SYSCALL_ENTRY( 0x11ab, NtUserSetWindowPos, 28 ) \
-    SYSCALL_ENTRY( 0x11ac, NtUserSetWindowRgn, 12 ) \
-    SYSCALL_ENTRY( 0x11ad, NtUserSetWindowWord, 12 ) \
-    SYSCALL_ENTRY( 0x11ae, NtUserSetWindowsHookEx, 24 ) \
-    SYSCALL_ENTRY( 0x11af, NtUserShowCaret, 4 ) \
-    SYSCALL_ENTRY( 0x11b0, NtUserShowCursor, 4 ) \
-    SYSCALL_ENTRY( 0x11b1, NtUserShowOwnedPopups, 8 ) \
-    SYSCALL_ENTRY( 0x11b2, NtUserShowScrollBar, 12 ) \
-    SYSCALL_ENTRY( 0x11b3, NtUserShowWindow, 8 ) \
-    SYSCALL_ENTRY( 0x11b4, NtUserShowWindowAsync, 8 ) \
-    SYSCALL_ENTRY( 0x11b5, NtUserSwitchDesktop, 4 ) \
-    SYSCALL_ENTRY( 0x11b6, NtUserSystemParametersInfo, 16 ) \
-    SYSCALL_ENTRY( 0x11b7, NtUserSystemParametersInfoForDpi, 20 ) \
-    SYSCALL_ENTRY( 0x11b8, NtUserThunkedMenuInfo, 8 ) \
-    SYSCALL_ENTRY( 0x11b9, NtUserThunkedMenuItemInfo, 24 ) \
-    SYSCALL_ENTRY( 0x11ba, NtUserToUnicodeEx, 28 ) \
-    SYSCALL_ENTRY( 0x11bb, NtUserTrackMouseEvent, 4 ) \
-    SYSCALL_ENTRY( 0x11bc, NtUserTrackPopupMenuEx, 24 ) \
-    SYSCALL_ENTRY( 0x11bd, NtUserTranslateAccelerator, 12 ) \
-    SYSCALL_ENTRY( 0x11be, NtUserTranslateMessage, 8 ) \
-    SYSCALL_ENTRY( 0x11bf, NtUserUnhookWinEvent, 4 ) \
-    SYSCALL_ENTRY( 0x11c0, NtUserUnhookWindowsHook, 8 ) \
-    SYSCALL_ENTRY( 0x11c1, NtUserUnhookWindowsHookEx, 4 ) \
-    SYSCALL_ENTRY( 0x11c2, NtUserUnregisterClass, 12 ) \
-    SYSCALL_ENTRY( 0x11c3, NtUserUnregisterHotKey, 8 ) \
-    SYSCALL_ENTRY( 0x11c4, NtUserUpdateInputContext, 12 ) \
-    SYSCALL_ENTRY( 0x11c5, NtUserUpdateLayeredWindow, 40 ) \
-    SYSCALL_ENTRY( 0x11c6, NtUserValidateRect, 8 ) \
-    SYSCALL_ENTRY( 0x11c7, NtUserValidateRgn, 8 ) \
-    SYSCALL_ENTRY( 0x11c8, NtUserVkKeyScanEx, 8 ) \
-    SYSCALL_ENTRY( 0x11c9, NtUserWaitForInputIdle, 12 ) \
-    SYSCALL_ENTRY( 0x11ca, NtUserWaitMessage, 0 ) \
-    SYSCALL_ENTRY( 0x11cb, NtUserWindowFromDC, 4 ) \
-    SYSCALL_ENTRY( 0x11cc, NtUserWindowFromPoint, 8 ) \
-    SYSCALL_ENTRY( 0x11cd, __wine_get_icm_profile, 16 )
+    SYSCALL_ENTRY( 0x10c9, NtUserAlterWindowStyle, 12 ) \
+    SYSCALL_ENTRY( 0x10ca, NtUserArrangeIconicWindows, 4 ) \
+    SYSCALL_ENTRY( 0x10cb, NtUserAssociateInputContext, 12 ) \
+    SYSCALL_ENTRY( 0x10cc, NtUserAttachThreadInput, 12 ) \
+    SYSCALL_ENTRY( 0x10cd, NtUserBeginDeferWindowPos, 4 ) \
+    SYSCALL_ENTRY( 0x10ce, NtUserBeginPaint, 8 ) \
+    SYSCALL_ENTRY( 0x10cf, NtUserBuildHimcList, 16 ) \
+    SYSCALL_ENTRY( 0x10d0, NtUserBuildHwndList, 32 ) \
+    SYSCALL_ENTRY( 0x10d1, NtUserBuildNameList, 16 ) \
+    SYSCALL_ENTRY( 0x10d2, NtUserBuildPropList, 16 ) \
+    SYSCALL_ENTRY( 0x10d3, NtUserCallHwnd, 8 ) \
+    SYSCALL_ENTRY( 0x10d4, NtUserCallHwndParam, 12 ) \
+    SYSCALL_ENTRY( 0x10d5, NtUserCallMsgFilter, 8 ) \
+    SYSCALL_ENTRY( 0x10d6, NtUserCallNextHookEx, 16 ) \
+    SYSCALL_ENTRY( 0x10d7, NtUserCallNoParam, 4 ) \
+    SYSCALL_ENTRY( 0x10d8, NtUserCallOneParam, 8 ) \
+    SYSCALL_ENTRY( 0x10d9, NtUserCallTwoParam, 12 ) \
+    SYSCALL_ENTRY( 0x10da, NtUserChangeClipboardChain, 8 ) \
+    SYSCALL_ENTRY( 0x10db, NtUserChangeDisplaySettings, 20 ) \
+    SYSCALL_ENTRY( 0x10dc, NtUserCheckMenuItem, 12 ) \
+    SYSCALL_ENTRY( 0x10dd, NtUserChildWindowFromPointEx, 16 ) \
+    SYSCALL_ENTRY( 0x10de, NtUserClipCursor, 4 ) \
+    SYSCALL_ENTRY( 0x10df, NtUserCloseClipboard, 0 ) \
+    SYSCALL_ENTRY( 0x10e0, NtUserCloseDesktop, 4 ) \
+    SYSCALL_ENTRY( 0x10e1, NtUserCloseWindowStation, 4 ) \
+    SYSCALL_ENTRY( 0x10e2, NtUserCopyAcceleratorTable, 12 ) \
+    SYSCALL_ENTRY( 0x10e3, NtUserCountClipboardFormats, 0 ) \
+    SYSCALL_ENTRY( 0x10e4, NtUserCreateAcceleratorTable, 8 ) \
+    SYSCALL_ENTRY( 0x10e5, NtUserCreateCaret, 16 ) \
+    SYSCALL_ENTRY( 0x10e6, NtUserCreateDesktopEx, 24 ) \
+    SYSCALL_ENTRY( 0x10e7, NtUserCreateInputContext, 4 ) \
+    SYSCALL_ENTRY( 0x10e8, NtUserCreateMenu, 0 ) \
+    SYSCALL_ENTRY( 0x10e9, NtUserCreatePopupMenu, 0 ) \
+    SYSCALL_ENTRY( 0x10ea, NtUserCreateWindowEx, 68 ) \
+    SYSCALL_ENTRY( 0x10eb, NtUserCreateWindowStation, 28 ) \
+    SYSCALL_ENTRY( 0x10ec, NtUserDeferWindowPosAndBand, 40 ) \
+    SYSCALL_ENTRY( 0x10ed, NtUserDeleteMenu, 12 ) \
+    SYSCALL_ENTRY( 0x10ee, NtUserDestroyAcceleratorTable, 4 ) \
+    SYSCALL_ENTRY( 0x10ef, NtUserDestroyCaret, 0 ) \
+    SYSCALL_ENTRY( 0x10f0, NtUserDestroyCursor, 8 ) \
+    SYSCALL_ENTRY( 0x10f1, NtUserDestroyInputContext, 4 ) \
+    SYSCALL_ENTRY( 0x10f2, NtUserDestroyMenu, 4 ) \
+    SYSCALL_ENTRY( 0x10f3, NtUserDestroyWindow, 4 ) \
+    SYSCALL_ENTRY( 0x10f4, NtUserDisableThreadIme, 4 ) \
+    SYSCALL_ENTRY( 0x10f5, NtUserDispatchMessage, 4 ) \
+    SYSCALL_ENTRY( 0x10f6, NtUserDisplayConfigGetDeviceInfo, 4 ) \
+    SYSCALL_ENTRY( 0x10f7, NtUserDragDetect, 12 ) \
+    SYSCALL_ENTRY( 0x10f8, NtUserDragObject, 20 ) \
+    SYSCALL_ENTRY( 0x10f9, NtUserDrawCaptionTemp, 28 ) \
+    SYSCALL_ENTRY( 0x10fa, NtUserDrawIconEx, 36 ) \
+    SYSCALL_ENTRY( 0x10fb, NtUserDrawMenuBar, 4 ) \
+    SYSCALL_ENTRY( 0x10fc, NtUserDrawMenuBarTemp, 20 ) \
+    SYSCALL_ENTRY( 0x10fd, NtUserEmptyClipboard, 0 ) \
+    SYSCALL_ENTRY( 0x10fe, NtUserEnableMenuItem, 12 ) \
+    SYSCALL_ENTRY( 0x10ff, NtUserEnableMouseInPointer, 4 ) \
+    SYSCALL_ENTRY( 0x1100, NtUserEnableMouseInPointerForThread, 0 ) \
+    SYSCALL_ENTRY( 0x1101, NtUserEnableScrollBar, 12 ) \
+    SYSCALL_ENTRY( 0x1102, NtUserEnableWindow, 8 ) \
+    SYSCALL_ENTRY( 0x1103, NtUserEndDeferWindowPosEx, 8 ) \
+    SYSCALL_ENTRY( 0x1104, NtUserEndMenu, 0 ) \
+    SYSCALL_ENTRY( 0x1105, NtUserEndPaint, 8 ) \
+    SYSCALL_ENTRY( 0x1106, NtUserEnumClipboardFormats, 4 ) \
+    SYSCALL_ENTRY( 0x1107, NtUserEnumDisplayDevices, 16 ) \
+    SYSCALL_ENTRY( 0x1108, NtUserEnumDisplayMonitors, 16 ) \
+    SYSCALL_ENTRY( 0x1109, NtUserEnumDisplaySettings, 16 ) \
+    SYSCALL_ENTRY( 0x110a, NtUserExcludeUpdateRgn, 8 ) \
+    SYSCALL_ENTRY( 0x110b, NtUserFindExistingCursorIcon, 12 ) \
+    SYSCALL_ENTRY( 0x110c, NtUserFindWindowEx, 20 ) \
+    SYSCALL_ENTRY( 0x110d, NtUserFlashWindowEx, 4 ) \
+    SYSCALL_ENTRY( 0x110e, NtUserGetAncestor, 8 ) \
+    SYSCALL_ENTRY( 0x110f, NtUserGetAsyncKeyState, 4 ) \
+    SYSCALL_ENTRY( 0x1110, NtUserGetAtomName, 8 ) \
+    SYSCALL_ENTRY( 0x1111, NtUserGetCaretBlinkTime, 0 ) \
+    SYSCALL_ENTRY( 0x1112, NtUserGetCaretPos, 4 ) \
+    SYSCALL_ENTRY( 0x1113, NtUserGetClassInfoEx, 20 ) \
+    SYSCALL_ENTRY( 0x1114, NtUserGetClassName, 12 ) \
+    SYSCALL_ENTRY( 0x1115, NtUserGetClipCursor, 4 ) \
+    SYSCALL_ENTRY( 0x1116, NtUserGetClipboardData, 8 ) \
+    SYSCALL_ENTRY( 0x1117, NtUserGetClipboardFormatName, 12 ) \
+    SYSCALL_ENTRY( 0x1118, NtUserGetClipboardOwner, 0 ) \
+    SYSCALL_ENTRY( 0x1119, NtUserGetClipboardSequenceNumber, 0 ) \
+    SYSCALL_ENTRY( 0x111a, NtUserGetClipboardViewer, 0 ) \
+    SYSCALL_ENTRY( 0x111b, NtUserGetCurrentInputMessageSource, 4 ) \
+    SYSCALL_ENTRY( 0x111c, NtUserGetCursor, 0 ) \
+    SYSCALL_ENTRY( 0x111d, NtUserGetCursorFrameInfo, 16 ) \
+    SYSCALL_ENTRY( 0x111e, NtUserGetCursorInfo, 4 ) \
+    SYSCALL_ENTRY( 0x111f, NtUserGetDC, 4 ) \
+    SYSCALL_ENTRY( 0x1120, NtUserGetDCEx, 12 ) \
+    SYSCALL_ENTRY( 0x1121, NtUserGetDisplayConfigBufferSizes, 12 ) \
+    SYSCALL_ENTRY( 0x1122, NtUserGetDoubleClickTime, 0 ) \
+    SYSCALL_ENTRY( 0x1123, NtUserGetDpiForMonitor, 16 ) \
+    SYSCALL_ENTRY( 0x1124, NtUserGetForegroundWindow, 0 ) \
+    SYSCALL_ENTRY( 0x1125, NtUserGetGUIThreadInfo, 8 ) \
+    SYSCALL_ENTRY( 0x1126, NtUserGetIconInfo, 24 ) \
+    SYSCALL_ENTRY( 0x1127, NtUserGetIconSize, 16 ) \
+    SYSCALL_ENTRY( 0x1128, NtUserGetInternalWindowPos, 12 ) \
+    SYSCALL_ENTRY( 0x1129, NtUserGetKeyNameText, 12 ) \
+    SYSCALL_ENTRY( 0x112a, NtUserGetKeyState, 4 ) \
+    SYSCALL_ENTRY( 0x112b, NtUserGetKeyboardLayout, 4 ) \
+    SYSCALL_ENTRY( 0x112c, NtUserGetKeyboardLayoutList, 8 ) \
+    SYSCALL_ENTRY( 0x112d, NtUserGetKeyboardLayoutName, 4 ) \
+    SYSCALL_ENTRY( 0x112e, NtUserGetKeyboardState, 4 ) \
+    SYSCALL_ENTRY( 0x112f, NtUserGetLayeredWindowAttributes, 16 ) \
+    SYSCALL_ENTRY( 0x1130, NtUserGetMenuBarInfo, 16 ) \
+    SYSCALL_ENTRY( 0x1131, NtUserGetMenuItemRect, 16 ) \
+    SYSCALL_ENTRY( 0x1132, NtUserGetMessage, 16 ) \
+    SYSCALL_ENTRY( 0x1133, NtUserGetMouseMovePointsEx, 20 ) \
+    SYSCALL_ENTRY( 0x1134, NtUserGetObjectInformation, 20 ) \
+    SYSCALL_ENTRY( 0x1135, NtUserGetOpenClipboardWindow, 0 ) \
+    SYSCALL_ENTRY( 0x1136, NtUserGetPointerInfoList, 32 ) \
+    SYSCALL_ENTRY( 0x1137, NtUserGetPriorityClipboardFormat, 8 ) \
+    SYSCALL_ENTRY( 0x1138, NtUserGetProcessDefaultLayout, 4 ) \
+    SYSCALL_ENTRY( 0x1139, NtUserGetProcessDpiAwarenessContext, 4 ) \
+    SYSCALL_ENTRY( 0x113a, NtUserGetProcessWindowStation, 0 ) \
+    SYSCALL_ENTRY( 0x113b, NtUserGetProp, 8 ) \
+    SYSCALL_ENTRY( 0x113c, NtUserGetQueueStatus, 4 ) \
+    SYSCALL_ENTRY( 0x113d, NtUserGetRawInputBuffer, 12 ) \
+    SYSCALL_ENTRY( 0x113e, NtUserGetRawInputData, 20 ) \
+    SYSCALL_ENTRY( 0x113f, NtUserGetRawInputDeviceInfo, 16 ) \
+    SYSCALL_ENTRY( 0x1140, NtUserGetRawInputDeviceList, 12 ) \
+    SYSCALL_ENTRY( 0x1141, NtUserGetRegisteredRawInputDevices, 12 ) \
+    SYSCALL_ENTRY( 0x1142, NtUserGetScrollBarInfo, 12 ) \
+    SYSCALL_ENTRY( 0x1143, NtUserGetSystemDpiForProcess, 4 ) \
+    SYSCALL_ENTRY( 0x1144, NtUserGetSystemMenu, 8 ) \
+    SYSCALL_ENTRY( 0x1145, NtUserGetThreadDesktop, 4 ) \
+    SYSCALL_ENTRY( 0x1146, NtUserGetThreadState, 4 ) \
+    SYSCALL_ENTRY( 0x1147, NtUserGetTitleBarInfo, 8 ) \
+    SYSCALL_ENTRY( 0x1148, NtUserGetUpdateRect, 12 ) \
+    SYSCALL_ENTRY( 0x1149, NtUserGetUpdateRgn, 12 ) \
+    SYSCALL_ENTRY( 0x114a, NtUserGetUpdatedClipboardFormats, 12 ) \
+    SYSCALL_ENTRY( 0x114b, NtUserGetWindowContextHelpId, 4 ) \
+    SYSCALL_ENTRY( 0x114c, NtUserGetWindowDC, 4 ) \
+    SYSCALL_ENTRY( 0x114d, NtUserGetWindowPlacement, 8 ) \
+    SYSCALL_ENTRY( 0x114e, NtUserGetWindowRgnEx, 12 ) \
+    SYSCALL_ENTRY( 0x114f, NtUserHideCaret, 4 ) \
+    SYSCALL_ENTRY( 0x1150, NtUserHiliteMenuItem, 16 ) \
+    SYSCALL_ENTRY( 0x1151, NtUserInitializeClientPfnArrays, 16 ) \
+    SYSCALL_ENTRY( 0x1152, NtUserInternalGetWindowIcon, 8 ) \
+    SYSCALL_ENTRY( 0x1153, NtUserInternalGetWindowText, 12 ) \
+    SYSCALL_ENTRY( 0x1154, NtUserInvalidateRect, 12 ) \
+    SYSCALL_ENTRY( 0x1155, NtUserInvalidateRgn, 12 ) \
+    SYSCALL_ENTRY( 0x1156, NtUserIsChildWindowDpiMessageEnabled, 4 ) \
+    SYSCALL_ENTRY( 0x1157, NtUserIsClipboardFormatAvailable, 4 ) \
+    SYSCALL_ENTRY( 0x1158, NtUserIsMouseInPointerEnabled, 0 ) \
+    SYSCALL_ENTRY( 0x1159, NtUserKillSystemTimer, 8 ) \
+    SYSCALL_ENTRY( 0x115a, NtUserKillTimer, 8 ) \
+    SYSCALL_ENTRY( 0x115b, NtUserLockWindowUpdate, 4 ) \
+    SYSCALL_ENTRY( 0x115c, NtUserLogicalToPerMonitorDPIPhysicalPoint, 8 ) \
+    SYSCALL_ENTRY( 0x115d, NtUserMapVirtualKeyEx, 12 ) \
+    SYSCALL_ENTRY( 0x115e, NtUserMenuItemFromPoint, 16 ) \
+    SYSCALL_ENTRY( 0x115f, NtUserMessageBeep, 4 ) \
+    SYSCALL_ENTRY( 0x1160, NtUserMessageCall, 28 ) \
+    SYSCALL_ENTRY( 0x1161, NtUserMoveWindow, 24 ) \
+    SYSCALL_ENTRY( 0x1162, NtUserMsgWaitForMultipleObjectsEx, 20 ) \
+    SYSCALL_ENTRY( 0x1163, NtUserNotifyIMEStatus, 8 ) \
+    SYSCALL_ENTRY( 0x1164, NtUserNotifyWinEvent, 16 ) \
+    SYSCALL_ENTRY( 0x1165, NtUserOpenClipboard, 8 ) \
+    SYSCALL_ENTRY( 0x1166, NtUserOpenDesktop, 12 ) \
+    SYSCALL_ENTRY( 0x1167, NtUserOpenInputDesktop, 12 ) \
+    SYSCALL_ENTRY( 0x1168, NtUserOpenWindowStation, 8 ) \
+    SYSCALL_ENTRY( 0x1169, NtUserPeekMessage, 20 ) \
+    SYSCALL_ENTRY( 0x116a, NtUserPerMonitorDPIPhysicalToLogicalPoint, 8 ) \
+    SYSCALL_ENTRY( 0x116b, NtUserPostMessage, 16 ) \
+    SYSCALL_ENTRY( 0x116c, NtUserPostQuitMessage, 4 ) \
+    SYSCALL_ENTRY( 0x116d, NtUserPostThreadMessage, 16 ) \
+    SYSCALL_ENTRY( 0x116e, NtUserPrintWindow, 12 ) \
+    SYSCALL_ENTRY( 0x116f, NtUserQueryDisplayConfig, 24 ) \
+    SYSCALL_ENTRY( 0x1170, NtUserQueryInputContext, 8 ) \
+    SYSCALL_ENTRY( 0x1171, NtUserQueryWindow, 8 ) \
+    SYSCALL_ENTRY( 0x1172, NtUserRealChildWindowFromPoint, 12 ) \
+    SYSCALL_ENTRY( 0x1173, NtUserRealizePalette, 4 ) \
+    SYSCALL_ENTRY( 0x1174, NtUserRedrawWindow, 16 ) \
+    SYSCALL_ENTRY( 0x1175, NtUserRegisterClassExWOW, 28 ) \
+    SYSCALL_ENTRY( 0x1176, NtUserRegisterHotKey, 16 ) \
+    SYSCALL_ENTRY( 0x1177, NtUserRegisterRawInputDevices, 12 ) \
+    SYSCALL_ENTRY( 0x1178, NtUserRegisterTouchPadCapable, 4 ) \
+    SYSCALL_ENTRY( 0x1179, NtUserReleaseCapture, 0 ) \
+    SYSCALL_ENTRY( 0x117a, NtUserReleaseDC, 8 ) \
+    SYSCALL_ENTRY( 0x117b, NtUserRemoveClipboardFormatListener, 4 ) \
+    SYSCALL_ENTRY( 0x117c, NtUserRemoveMenu, 12 ) \
+    SYSCALL_ENTRY( 0x117d, NtUserRemoveProp, 8 ) \
+    SYSCALL_ENTRY( 0x117e, NtUserReplyMessage, 4 ) \
+    SYSCALL_ENTRY( 0x117f, NtUserScrollDC, 28 ) \
+    SYSCALL_ENTRY( 0x1180, NtUserScrollWindowEx, 32 ) \
+    SYSCALL_ENTRY( 0x1181, NtUserSelectPalette, 12 ) \
+    SYSCALL_ENTRY( 0x1182, NtUserSendInput, 12 ) \
+    SYSCALL_ENTRY( 0x1183, NtUserSetActiveWindow, 4 ) \
+    SYSCALL_ENTRY( 0x1184, NtUserSetAdditionalForegroundBoostProcesses, 12 ) \
+    SYSCALL_ENTRY( 0x1185, NtUserSetCapture, 4 ) \
+    SYSCALL_ENTRY( 0x1186, NtUserSetCaretBlinkTime, 4 ) \
+    SYSCALL_ENTRY( 0x1187, NtUserSetCaretPos, 8 ) \
+    SYSCALL_ENTRY( 0x1188, NtUserSetClassLong, 16 ) \
+    SYSCALL_ENTRY( 0x1189, NtUserSetClassLongPtr, 16 ) \
+    SYSCALL_ENTRY( 0x118a, NtUserSetClassWord, 12 ) \
+    SYSCALL_ENTRY( 0x118b, NtUserSetClipboardData, 12 ) \
+    SYSCALL_ENTRY( 0x118c, NtUserSetClipboardViewer, 4 ) \
+    SYSCALL_ENTRY( 0x118d, NtUserSetCursor, 4 ) \
+    SYSCALL_ENTRY( 0x118e, NtUserSetCursorIconData, 16 ) \
+    SYSCALL_ENTRY( 0x118f, NtUserSetCursorPos, 8 ) \
+    SYSCALL_ENTRY( 0x1190, NtUserSetFocus, 4 ) \
+    SYSCALL_ENTRY( 0x1191, NtUserSetForegroundWindow, 4 ) \
+    SYSCALL_ENTRY( 0x1192, NtUserSetInternalWindowPos, 16 ) \
+    SYSCALL_ENTRY( 0x1193, NtUserSetKeyboardState, 4 ) \
+    SYSCALL_ENTRY( 0x1194, NtUserSetLayeredWindowAttributes, 16 ) \
+    SYSCALL_ENTRY( 0x1195, NtUserSetMenu, 8 ) \
+    SYSCALL_ENTRY( 0x1196, NtUserSetMenuContextHelpId, 8 ) \
+    SYSCALL_ENTRY( 0x1197, NtUserSetMenuDefaultItem, 12 ) \
+    SYSCALL_ENTRY( 0x1198, NtUserSetObjectInformation, 16 ) \
+    SYSCALL_ENTRY( 0x1199, NtUserSetParent, 8 ) \
+    SYSCALL_ENTRY( 0x119a, NtUserSetProcessDefaultLayout, 4 ) \
+    SYSCALL_ENTRY( 0x119b, NtUserSetProcessDpiAwarenessContext, 8 ) \
+    SYSCALL_ENTRY( 0x119c, NtUserSetProcessWindowStation, 4 ) \
+    SYSCALL_ENTRY( 0x119d, NtUserSetProgmanWindow, 4 ) \
+    SYSCALL_ENTRY( 0x119e, NtUserSetProp, 12 ) \
+    SYSCALL_ENTRY( 0x119f, NtUserSetScrollInfo, 16 ) \
+    SYSCALL_ENTRY( 0x11a0, NtUserSetShellWindowEx, 8 ) \
+    SYSCALL_ENTRY( 0x11a1, NtUserSetSysColors, 12 ) \
+    SYSCALL_ENTRY( 0x11a2, NtUserSetSystemMenu, 8 ) \
+    SYSCALL_ENTRY( 0x11a3, NtUserSetSystemTimer, 12 ) \
+    SYSCALL_ENTRY( 0x11a4, NtUserSetTaskmanWindow, 4 ) \
+    SYSCALL_ENTRY( 0x11a5, NtUserSetThreadDesktop, 4 ) \
+    SYSCALL_ENTRY( 0x11a6, NtUserSetTimer, 20 ) \
+    SYSCALL_ENTRY( 0x11a7, NtUserSetWinEventHook, 32 ) \
+    SYSCALL_ENTRY( 0x11a8, NtUserSetWindowContextHelpId, 8 ) \
+    SYSCALL_ENTRY( 0x11a9, NtUserSetWindowLong, 16 ) \
+    SYSCALL_ENTRY( 0x11aa, NtUserSetWindowLongPtr, 16 ) \
+    SYSCALL_ENTRY( 0x11ab, NtUserSetWindowPlacement, 8 ) \
+    SYSCALL_ENTRY( 0x11ac, NtUserSetWindowPos, 28 ) \
+    SYSCALL_ENTRY( 0x11ad, NtUserSetWindowRgn, 12 ) \
+    SYSCALL_ENTRY( 0x11ae, NtUserSetWindowWord, 12 ) \
+    SYSCALL_ENTRY( 0x11af, NtUserSetWindowsHookEx, 24 ) \
+    SYSCALL_ENTRY( 0x11b0, NtUserShowCaret, 4 ) \
+    SYSCALL_ENTRY( 0x11b1, NtUserShowCursor, 4 ) \
+    SYSCALL_ENTRY( 0x11b2, NtUserShowOwnedPopups, 8 ) \
+    SYSCALL_ENTRY( 0x11b3, NtUserShowScrollBar, 12 ) \
+    SYSCALL_ENTRY( 0x11b4, NtUserShowWindow, 8 ) \
+    SYSCALL_ENTRY( 0x11b5, NtUserShowWindowAsync, 8 ) \
+    SYSCALL_ENTRY( 0x11b6, NtUserSwitchDesktop, 4 ) \
+    SYSCALL_ENTRY( 0x11b7, NtUserSystemParametersInfo, 16 ) \
+    SYSCALL_ENTRY( 0x11b8, NtUserSystemParametersInfoForDpi, 20 ) \
+    SYSCALL_ENTRY( 0x11b9, NtUserThunkedMenuInfo, 8 ) \
+    SYSCALL_ENTRY( 0x11ba, NtUserThunkedMenuItemInfo, 24 ) \
+    SYSCALL_ENTRY( 0x11bb, NtUserToUnicodeEx, 28 ) \
+    SYSCALL_ENTRY( 0x11bc, NtUserTrackMouseEvent, 4 ) \
+    SYSCALL_ENTRY( 0x11bd, NtUserTrackPopupMenuEx, 24 ) \
+    SYSCALL_ENTRY( 0x11be, NtUserTranslateAccelerator, 12 ) \
+    SYSCALL_ENTRY( 0x11bf, NtUserTranslateMessage, 8 ) \
+    SYSCALL_ENTRY( 0x11c0, NtUserUnhookWinEvent, 4 ) \
+    SYSCALL_ENTRY( 0x11c1, NtUserUnhookWindowsHook, 8 ) \
+    SYSCALL_ENTRY( 0x11c2, NtUserUnhookWindowsHookEx, 4 ) \
+    SYSCALL_ENTRY( 0x11c3, NtUserUnregisterClass, 12 ) \
+    SYSCALL_ENTRY( 0x11c4, NtUserUnregisterHotKey, 8 ) \
+    SYSCALL_ENTRY( 0x11c5, NtUserUpdateInputContext, 12 ) \
+    SYSCALL_ENTRY( 0x11c6, NtUserUpdateLayeredWindow, 40 ) \
+    SYSCALL_ENTRY( 0x11c7, NtUserValidateRect, 8 ) \
+    SYSCALL_ENTRY( 0x11c8, NtUserValidateRgn, 8 ) \
+    SYSCALL_ENTRY( 0x11c9, NtUserVkKeyScanEx, 8 ) \
+    SYSCALL_ENTRY( 0x11ca, NtUserWaitForInputIdle, 12 ) \
+    SYSCALL_ENTRY( 0x11cb, NtUserWaitMessage, 0 ) \
+    SYSCALL_ENTRY( 0x11cc, NtUserWindowFromDC, 4 ) \
+    SYSCALL_ENTRY( 0x11cd, NtUserWindowFromPoint, 8 ) \
+    SYSCALL_ENTRY( 0x11ce, __wine_get_icm_profile, 16 )
 #ifdef _WIN64
 #define ALL_SYSCALLS \
     SYSCALL_ENTRY( 0x1000, NtGdiAbortDoc, 8 ) \
@@ -666,267 +667,268 @@
     SYSCALL_ENTRY( 0x10c6, NtGdiWidenPath, 8 ) \
     SYSCALL_ENTRY( 0x10c7, NtUserActivateKeyboardLayout, 16 ) \
     SYSCALL_ENTRY( 0x10c8, NtUserAddClipboardFormatListener, 8 ) \
-    SYSCALL_ENTRY( 0x10c9, NtUserArrangeIconicWindows, 8 ) \
-    SYSCALL_ENTRY( 0x10ca, NtUserAssociateInputContext, 24 ) \
-    SYSCALL_ENTRY( 0x10cb, NtUserAttachThreadInput, 24 ) \
-    SYSCALL_ENTRY( 0x10cc, NtUserBeginDeferWindowPos, 8 ) \
-    SYSCALL_ENTRY( 0x10cd, NtUserBeginPaint, 16 ) \
-    SYSCALL_ENTRY( 0x10ce, NtUserBuildHimcList, 32 ) \
-    SYSCALL_ENTRY( 0x10cf, NtUserBuildHwndList, 64 ) \
-    SYSCALL_ENTRY( 0x10d0, NtUserBuildNameList, 32 ) \
-    SYSCALL_ENTRY( 0x10d1, NtUserBuildPropList, 32 ) \
-    SYSCALL_ENTRY( 0x10d2, NtUserCallHwnd, 16 ) \
-    SYSCALL_ENTRY( 0x10d3, NtUserCallHwndParam, 24 ) \
-    SYSCALL_ENTRY( 0x10d4, NtUserCallMsgFilter, 16 ) \
-    SYSCALL_ENTRY( 0x10d5, NtUserCallNextHookEx, 32 ) \
-    SYSCALL_ENTRY( 0x10d6, NtUserCallNoParam, 8 ) \
-    SYSCALL_ENTRY( 0x10d7, NtUserCallOneParam, 16 ) \
-    SYSCALL_ENTRY( 0x10d8, NtUserCallTwoParam, 24 ) \
-    SYSCALL_ENTRY( 0x10d9, NtUserChangeClipboardChain, 16 ) \
-    SYSCALL_ENTRY( 0x10da, NtUserChangeDisplaySettings, 40 ) \
-    SYSCALL_ENTRY( 0x10db, NtUserCheckMenuItem, 24 ) \
-    SYSCALL_ENTRY( 0x10dc, NtUserChildWindowFromPointEx, 32 ) \
-    SYSCALL_ENTRY( 0x10dd, NtUserClipCursor, 8 ) \
-    SYSCALL_ENTRY( 0x10de, NtUserCloseClipboard, 0 ) \
-    SYSCALL_ENTRY( 0x10df, NtUserCloseDesktop, 8 ) \
-    SYSCALL_ENTRY( 0x10e0, NtUserCloseWindowStation, 8 ) \
-    SYSCALL_ENTRY( 0x10e1, NtUserCopyAcceleratorTable, 24 ) \
-    SYSCALL_ENTRY( 0x10e2, NtUserCountClipboardFormats, 0 ) \
-    SYSCALL_ENTRY( 0x10e3, NtUserCreateAcceleratorTable, 16 ) \
-    SYSCALL_ENTRY( 0x10e4, NtUserCreateCaret, 32 ) \
-    SYSCALL_ENTRY( 0x10e5, NtUserCreateDesktopEx, 48 ) \
-    SYSCALL_ENTRY( 0x10e6, NtUserCreateInputContext, 8 ) \
-    SYSCALL_ENTRY( 0x10e7, NtUserCreateMenu, 0 ) \
-    SYSCALL_ENTRY( 0x10e8, NtUserCreatePopupMenu, 0 ) \
-    SYSCALL_ENTRY( 0x10e9, NtUserCreateWindowEx, 136 ) \
-    SYSCALL_ENTRY( 0x10ea, NtUserCreateWindowStation, 56 ) \
-    SYSCALL_ENTRY( 0x10eb, NtUserDeferWindowPosAndBand, 80 ) \
-    SYSCALL_ENTRY( 0x10ec, NtUserDeleteMenu, 24 ) \
-    SYSCALL_ENTRY( 0x10ed, NtUserDestroyAcceleratorTable, 8 ) \
-    SYSCALL_ENTRY( 0x10ee, NtUserDestroyCaret, 0 ) \
-    SYSCALL_ENTRY( 0x10ef, NtUserDestroyCursor, 16 ) \
-    SYSCALL_ENTRY( 0x10f0, NtUserDestroyInputContext, 8 ) \
-    SYSCALL_ENTRY( 0x10f1, NtUserDestroyMenu, 8 ) \
-    SYSCALL_ENTRY( 0x10f2, NtUserDestroyWindow, 8 ) \
-    SYSCALL_ENTRY( 0x10f3, NtUserDisableThreadIme, 8 ) \
-    SYSCALL_ENTRY( 0x10f4, NtUserDispatchMessage, 8 ) \
-    SYSCALL_ENTRY( 0x10f5, NtUserDisplayConfigGetDeviceInfo, 8 ) \
-    SYSCALL_ENTRY( 0x10f6, NtUserDragDetect, 24 ) \
-    SYSCALL_ENTRY( 0x10f7, NtUserDragObject, 40 ) \
-    SYSCALL_ENTRY( 0x10f8, NtUserDrawCaptionTemp, 56 ) \
-    SYSCALL_ENTRY( 0x10f9, NtUserDrawIconEx, 72 ) \
-    SYSCALL_ENTRY( 0x10fa, NtUserDrawMenuBar, 8 ) \
-    SYSCALL_ENTRY( 0x10fb, NtUserDrawMenuBarTemp, 40 ) \
-    SYSCALL_ENTRY( 0x10fc, NtUserEmptyClipboard, 0 ) \
-    SYSCALL_ENTRY( 0x10fd, NtUserEnableMenuItem, 24 ) \
-    SYSCALL_ENTRY( 0x10fe, NtUserEnableMouseInPointer, 8 ) \
-    SYSCALL_ENTRY( 0x10ff, NtUserEnableMouseInPointerForThread, 0 ) \
-    SYSCALL_ENTRY( 0x1100, NtUserEnableScrollBar, 24 ) \
-    SYSCALL_ENTRY( 0x1101, NtUserEnableWindow, 16 ) \
-    SYSCALL_ENTRY( 0x1102, NtUserEndDeferWindowPosEx, 16 ) \
-    SYSCALL_ENTRY( 0x1103, NtUserEndMenu, 0 ) \
-    SYSCALL_ENTRY( 0x1104, NtUserEndPaint, 16 ) \
-    SYSCALL_ENTRY( 0x1105, NtUserEnumClipboardFormats, 8 ) \
-    SYSCALL_ENTRY( 0x1106, NtUserEnumDisplayDevices, 32 ) \
-    SYSCALL_ENTRY( 0x1107, NtUserEnumDisplayMonitors, 32 ) \
-    SYSCALL_ENTRY( 0x1108, NtUserEnumDisplaySettings, 32 ) \
-    SYSCALL_ENTRY( 0x1109, NtUserExcludeUpdateRgn, 16 ) \
-    SYSCALL_ENTRY( 0x110a, NtUserFindExistingCursorIcon, 24 ) \
-    SYSCALL_ENTRY( 0x110b, NtUserFindWindowEx, 40 ) \
-    SYSCALL_ENTRY( 0x110c, NtUserFlashWindowEx, 8 ) \
-    SYSCALL_ENTRY( 0x110d, NtUserGetAncestor, 16 ) \
-    SYSCALL_ENTRY( 0x110e, NtUserGetAsyncKeyState, 8 ) \
-    SYSCALL_ENTRY( 0x110f, NtUserGetAtomName, 16 ) \
-    SYSCALL_ENTRY( 0x1110, NtUserGetCaretBlinkTime, 0 ) \
-    SYSCALL_ENTRY( 0x1111, NtUserGetCaretPos, 8 ) \
-    SYSCALL_ENTRY( 0x1112, NtUserGetClassInfoEx, 40 ) \
-    SYSCALL_ENTRY( 0x1113, NtUserGetClassName, 24 ) \
-    SYSCALL_ENTRY( 0x1114, NtUserGetClipCursor, 8 ) \
-    SYSCALL_ENTRY( 0x1115, NtUserGetClipboardData, 16 ) \
-    SYSCALL_ENTRY( 0x1116, NtUserGetClipboardFormatName, 24 ) \
-    SYSCALL_ENTRY( 0x1117, NtUserGetClipboardOwner, 0 ) \
-    SYSCALL_ENTRY( 0x1118, NtUserGetClipboardSequenceNumber, 0 ) \
-    SYSCALL_ENTRY( 0x1119, NtUserGetClipboardViewer, 0 ) \
-    SYSCALL_ENTRY( 0x111a, NtUserGetCurrentInputMessageSource, 8 ) \
-    SYSCALL_ENTRY( 0x111b, NtUserGetCursor, 0 ) \
-    SYSCALL_ENTRY( 0x111c, NtUserGetCursorFrameInfo, 32 ) \
-    SYSCALL_ENTRY( 0x111d, NtUserGetCursorInfo, 8 ) \
-    SYSCALL_ENTRY( 0x111e, NtUserGetDC, 8 ) \
-    SYSCALL_ENTRY( 0x111f, NtUserGetDCEx, 24 ) \
-    SYSCALL_ENTRY( 0x1120, NtUserGetDisplayConfigBufferSizes, 24 ) \
-    SYSCALL_ENTRY( 0x1121, NtUserGetDoubleClickTime, 0 ) \
-    SYSCALL_ENTRY( 0x1122, NtUserGetDpiForMonitor, 32 ) \
-    SYSCALL_ENTRY( 0x1123, NtUserGetForegroundWindow, 0 ) \
-    SYSCALL_ENTRY( 0x1124, NtUserGetGUIThreadInfo, 16 ) \
-    SYSCALL_ENTRY( 0x1125, NtUserGetIconInfo, 48 ) \
-    SYSCALL_ENTRY( 0x1126, NtUserGetIconSize, 32 ) \
-    SYSCALL_ENTRY( 0x1127, NtUserGetInternalWindowPos, 24 ) \
-    SYSCALL_ENTRY( 0x1128, NtUserGetKeyNameText, 24 ) \
-    SYSCALL_ENTRY( 0x1129, NtUserGetKeyState, 8 ) \
-    SYSCALL_ENTRY( 0x112a, NtUserGetKeyboardLayout, 8 ) \
-    SYSCALL_ENTRY( 0x112b, NtUserGetKeyboardLayoutList, 16 ) \
-    SYSCALL_ENTRY( 0x112c, NtUserGetKeyboardLayoutName, 8 ) \
-    SYSCALL_ENTRY( 0x112d, NtUserGetKeyboardState, 8 ) \
-    SYSCALL_ENTRY( 0x112e, NtUserGetLayeredWindowAttributes, 32 ) \
-    SYSCALL_ENTRY( 0x112f, NtUserGetMenuBarInfo, 32 ) \
-    SYSCALL_ENTRY( 0x1130, NtUserGetMenuItemRect, 32 ) \
-    SYSCALL_ENTRY( 0x1131, NtUserGetMessage, 32 ) \
-    SYSCALL_ENTRY( 0x1132, NtUserGetMouseMovePointsEx, 40 ) \
-    SYSCALL_ENTRY( 0x1133, NtUserGetObjectInformation, 40 ) \
-    SYSCALL_ENTRY( 0x1134, NtUserGetOpenClipboardWindow, 0 ) \
-    SYSCALL_ENTRY( 0x1135, NtUserGetPointerInfoList, 64 ) \
-    SYSCALL_ENTRY( 0x1136, NtUserGetPriorityClipboardFormat, 16 ) \
-    SYSCALL_ENTRY( 0x1137, NtUserGetProcessDefaultLayout, 8 ) \
-    SYSCALL_ENTRY( 0x1138, NtUserGetProcessDpiAwarenessContext, 8 ) \
-    SYSCALL_ENTRY( 0x1139, NtUserGetProcessWindowStation, 0 ) \
-    SYSCALL_ENTRY( 0x113a, NtUserGetProp, 16 ) \
-    SYSCALL_ENTRY( 0x113b, NtUserGetQueueStatus, 8 ) \
-    SYSCALL_ENTRY( 0x113c, NtUserGetRawInputBuffer, 24 ) \
-    SYSCALL_ENTRY( 0x113d, NtUserGetRawInputData, 40 ) \
-    SYSCALL_ENTRY( 0x113e, NtUserGetRawInputDeviceInfo, 32 ) \
-    SYSCALL_ENTRY( 0x113f, NtUserGetRawInputDeviceList, 24 ) \
-    SYSCALL_ENTRY( 0x1140, NtUserGetRegisteredRawInputDevices, 24 ) \
-    SYSCALL_ENTRY( 0x1141, NtUserGetScrollBarInfo, 24 ) \
-    SYSCALL_ENTRY( 0x1142, NtUserGetSystemDpiForProcess, 8 ) \
-    SYSCALL_ENTRY( 0x1143, NtUserGetSystemMenu, 16 ) \
-    SYSCALL_ENTRY( 0x1144, NtUserGetThreadDesktop, 8 ) \
-    SYSCALL_ENTRY( 0x1145, NtUserGetThreadState, 8 ) \
-    SYSCALL_ENTRY( 0x1146, NtUserGetTitleBarInfo, 16 ) \
-    SYSCALL_ENTRY( 0x1147, NtUserGetUpdateRect, 24 ) \
-    SYSCALL_ENTRY( 0x1148, NtUserGetUpdateRgn, 24 ) \
-    SYSCALL_ENTRY( 0x1149, NtUserGetUpdatedClipboardFormats, 24 ) \
-    SYSCALL_ENTRY( 0x114a, NtUserGetWindowContextHelpId, 8 ) \
-    SYSCALL_ENTRY( 0x114b, NtUserGetWindowDC, 8 ) \
-    SYSCALL_ENTRY( 0x114c, NtUserGetWindowPlacement, 16 ) \
-    SYSCALL_ENTRY( 0x114d, NtUserGetWindowRgnEx, 24 ) \
-    SYSCALL_ENTRY( 0x114e, NtUserHideCaret, 8 ) \
-    SYSCALL_ENTRY( 0x114f, NtUserHiliteMenuItem, 32 ) \
-    SYSCALL_ENTRY( 0x1150, NtUserInitializeClientPfnArrays, 32 ) \
-    SYSCALL_ENTRY( 0x1151, NtUserInternalGetWindowIcon, 16 ) \
-    SYSCALL_ENTRY( 0x1152, NtUserInternalGetWindowText, 24 ) \
-    SYSCALL_ENTRY( 0x1153, NtUserInvalidateRect, 24 ) \
-    SYSCALL_ENTRY( 0x1154, NtUserInvalidateRgn, 24 ) \
-    SYSCALL_ENTRY( 0x1155, NtUserIsChildWindowDpiMessageEnabled, 8 ) \
-    SYSCALL_ENTRY( 0x1156, NtUserIsClipboardFormatAvailable, 8 ) \
-    SYSCALL_ENTRY( 0x1157, NtUserIsMouseInPointerEnabled, 0 ) \
-    SYSCALL_ENTRY( 0x1158, NtUserKillSystemTimer, 16 ) \
-    SYSCALL_ENTRY( 0x1159, NtUserKillTimer, 16 ) \
-    SYSCALL_ENTRY( 0x115a, NtUserLockWindowUpdate, 8 ) \
-    SYSCALL_ENTRY( 0x115b, NtUserLogicalToPerMonitorDPIPhysicalPoint, 16 ) \
-    SYSCALL_ENTRY( 0x115c, NtUserMapVirtualKeyEx, 24 ) \
-    SYSCALL_ENTRY( 0x115d, NtUserMenuItemFromPoint, 32 ) \
-    SYSCALL_ENTRY( 0x115e, NtUserMessageBeep, 8 ) \
-    SYSCALL_ENTRY( 0x115f, NtUserMessageCall, 56 ) \
-    SYSCALL_ENTRY( 0x1160, NtUserMoveWindow, 48 ) \
-    SYSCALL_ENTRY( 0x1161, NtUserMsgWaitForMultipleObjectsEx, 40 ) \
-    SYSCALL_ENTRY( 0x1162, NtUserNotifyIMEStatus, 16 ) \
-    SYSCALL_ENTRY( 0x1163, NtUserNotifyWinEvent, 32 ) \
-    SYSCALL_ENTRY( 0x1164, NtUserOpenClipboard, 16 ) \
-    SYSCALL_ENTRY( 0x1165, NtUserOpenDesktop, 24 ) \
-    SYSCALL_ENTRY( 0x1166, NtUserOpenInputDesktop, 24 ) \
-    SYSCALL_ENTRY( 0x1167, NtUserOpenWindowStation, 16 ) \
-    SYSCALL_ENTRY( 0x1168, NtUserPeekMessage, 40 ) \
-    SYSCALL_ENTRY( 0x1169, NtUserPerMonitorDPIPhysicalToLogicalPoint, 16 ) \
-    SYSCALL_ENTRY( 0x116a, NtUserPostMessage, 32 ) \
-    SYSCALL_ENTRY( 0x116b, NtUserPostQuitMessage, 8 ) \
-    SYSCALL_ENTRY( 0x116c, NtUserPostThreadMessage, 32 ) \
-    SYSCALL_ENTRY( 0x116d, NtUserPrintWindow, 24 ) \
-    SYSCALL_ENTRY( 0x116e, NtUserQueryDisplayConfig, 48 ) \
-    SYSCALL_ENTRY( 0x116f, NtUserQueryInputContext, 16 ) \
-    SYSCALL_ENTRY( 0x1170, NtUserQueryWindow, 16 ) \
-    SYSCALL_ENTRY( 0x1171, NtUserRealChildWindowFromPoint, 24 ) \
-    SYSCALL_ENTRY( 0x1172, NtUserRealizePalette, 8 ) \
-    SYSCALL_ENTRY( 0x1173, NtUserRedrawWindow, 32 ) \
-    SYSCALL_ENTRY( 0x1174, NtUserRegisterClassExWOW, 56 ) \
-    SYSCALL_ENTRY( 0x1175, NtUserRegisterHotKey, 32 ) \
-    SYSCALL_ENTRY( 0x1176, NtUserRegisterRawInputDevices, 24 ) \
-    SYSCALL_ENTRY( 0x1177, NtUserRegisterTouchPadCapable, 8 ) \
-    SYSCALL_ENTRY( 0x1178, NtUserReleaseCapture, 0 ) \
-    SYSCALL_ENTRY( 0x1179, NtUserReleaseDC, 16 ) \
-    SYSCALL_ENTRY( 0x117a, NtUserRemoveClipboardFormatListener, 8 ) \
-    SYSCALL_ENTRY( 0x117b, NtUserRemoveMenu, 24 ) \
-    SYSCALL_ENTRY( 0x117c, NtUserRemoveProp, 16 ) \
-    SYSCALL_ENTRY( 0x117d, NtUserReplyMessage, 8 ) \
-    SYSCALL_ENTRY( 0x117e, NtUserScrollDC, 56 ) \
-    SYSCALL_ENTRY( 0x117f, NtUserScrollWindowEx, 64 ) \
-    SYSCALL_ENTRY( 0x1180, NtUserSelectPalette, 24 ) \
-    SYSCALL_ENTRY( 0x1181, NtUserSendInput, 24 ) \
-    SYSCALL_ENTRY( 0x1182, NtUserSetActiveWindow, 8 ) \
-    SYSCALL_ENTRY( 0x1183, NtUserSetAdditionalForegroundBoostProcesses, 24 ) \
-    SYSCALL_ENTRY( 0x1184, NtUserSetCapture, 8 ) \
-    SYSCALL_ENTRY( 0x1185, NtUserSetCaretBlinkTime, 8 ) \
-    SYSCALL_ENTRY( 0x1186, NtUserSetCaretPos, 16 ) \
-    SYSCALL_ENTRY( 0x1187, NtUserSetClassLong, 32 ) \
-    SYSCALL_ENTRY( 0x1188, NtUserSetClassLongPtr, 32 ) \
-    SYSCALL_ENTRY( 0x1189, NtUserSetClassWord, 24 ) \
-    SYSCALL_ENTRY( 0x118a, NtUserSetClipboardData, 24 ) \
-    SYSCALL_ENTRY( 0x118b, NtUserSetClipboardViewer, 8 ) \
-    SYSCALL_ENTRY( 0x118c, NtUserSetCursor, 8 ) \
-    SYSCALL_ENTRY( 0x118d, NtUserSetCursorIconData, 32 ) \
-    SYSCALL_ENTRY( 0x118e, NtUserSetCursorPos, 16 ) \
-    SYSCALL_ENTRY( 0x118f, NtUserSetFocus, 8 ) \
-    SYSCALL_ENTRY( 0x1190, NtUserSetForegroundWindow, 8 ) \
-    SYSCALL_ENTRY( 0x1191, NtUserSetInternalWindowPos, 32 ) \
-    SYSCALL_ENTRY( 0x1192, NtUserSetKeyboardState, 8 ) \
-    SYSCALL_ENTRY( 0x1193, NtUserSetLayeredWindowAttributes, 32 ) \
-    SYSCALL_ENTRY( 0x1194, NtUserSetMenu, 16 ) \
-    SYSCALL_ENTRY( 0x1195, NtUserSetMenuContextHelpId, 16 ) \
-    SYSCALL_ENTRY( 0x1196, NtUserSetMenuDefaultItem, 24 ) \
-    SYSCALL_ENTRY( 0x1197, NtUserSetObjectInformation, 32 ) \
-    SYSCALL_ENTRY( 0x1198, NtUserSetParent, 16 ) \
-    SYSCALL_ENTRY( 0x1199, NtUserSetProcessDefaultLayout, 8 ) \
-    SYSCALL_ENTRY( 0x119a, NtUserSetProcessDpiAwarenessContext, 16 ) \
-    SYSCALL_ENTRY( 0x119b, NtUserSetProcessWindowStation, 8 ) \
-    SYSCALL_ENTRY( 0x119c, NtUserSetProgmanWindow, 8 ) \
-    SYSCALL_ENTRY( 0x119d, NtUserSetProp, 24 ) \
-    SYSCALL_ENTRY( 0x119e, NtUserSetScrollInfo, 32 ) \
-    SYSCALL_ENTRY( 0x119f, NtUserSetShellWindowEx, 16 ) \
-    SYSCALL_ENTRY( 0x11a0, NtUserSetSysColors, 24 ) \
-    SYSCALL_ENTRY( 0x11a1, NtUserSetSystemMenu, 16 ) \
-    SYSCALL_ENTRY( 0x11a2, NtUserSetSystemTimer, 24 ) \
-    SYSCALL_ENTRY( 0x11a3, NtUserSetTaskmanWindow, 8 ) \
-    SYSCALL_ENTRY( 0x11a4, NtUserSetThreadDesktop, 8 ) \
-    SYSCALL_ENTRY( 0x11a5, NtUserSetTimer, 40 ) \
-    SYSCALL_ENTRY( 0x11a6, NtUserSetWinEventHook, 64 ) \
-    SYSCALL_ENTRY( 0x11a7, NtUserSetWindowContextHelpId, 16 ) \
-    SYSCALL_ENTRY( 0x11a8, NtUserSetWindowLong, 32 ) \
-    SYSCALL_ENTRY( 0x11a9, NtUserSetWindowLongPtr, 32 ) \
-    SYSCALL_ENTRY( 0x11aa, NtUserSetWindowPlacement, 16 ) \
-    SYSCALL_ENTRY( 0x11ab, NtUserSetWindowPos, 56 ) \
-    SYSCALL_ENTRY( 0x11ac, NtUserSetWindowRgn, 24 ) \
-    SYSCALL_ENTRY( 0x11ad, NtUserSetWindowWord, 24 ) \
-    SYSCALL_ENTRY( 0x11ae, NtUserSetWindowsHookEx, 48 ) \
-    SYSCALL_ENTRY( 0x11af, NtUserShowCaret, 8 ) \
-    SYSCALL_ENTRY( 0x11b0, NtUserShowCursor, 8 ) \
-    SYSCALL_ENTRY( 0x11b1, NtUserShowOwnedPopups, 16 ) \
-    SYSCALL_ENTRY( 0x11b2, NtUserShowScrollBar, 24 ) \
-    SYSCALL_ENTRY( 0x11b3, NtUserShowWindow, 16 ) \
-    SYSCALL_ENTRY( 0x11b4, NtUserShowWindowAsync, 16 ) \
-    SYSCALL_ENTRY( 0x11b5, NtUserSwitchDesktop, 8 ) \
-    SYSCALL_ENTRY( 0x11b6, NtUserSystemParametersInfo, 32 ) \
-    SYSCALL_ENTRY( 0x11b7, NtUserSystemParametersInfoForDpi, 40 ) \
-    SYSCALL_ENTRY( 0x11b8, NtUserThunkedMenuInfo, 16 ) \
-    SYSCALL_ENTRY( 0x11b9, NtUserThunkedMenuItemInfo, 48 ) \
-    SYSCALL_ENTRY( 0x11ba, NtUserToUnicodeEx, 56 ) \
-    SYSCALL_ENTRY( 0x11bb, NtUserTrackMouseEvent, 8 ) \
-    SYSCALL_ENTRY( 0x11bc, NtUserTrackPopupMenuEx, 48 ) \
-    SYSCALL_ENTRY( 0x11bd, NtUserTranslateAccelerator, 24 ) \
-    SYSCALL_ENTRY( 0x11be, NtUserTranslateMessage, 16 ) \
-    SYSCALL_ENTRY( 0x11bf, NtUserUnhookWinEvent, 8 ) \
-    SYSCALL_ENTRY( 0x11c0, NtUserUnhookWindowsHook, 16 ) \
-    SYSCALL_ENTRY( 0x11c1, NtUserUnhookWindowsHookEx, 8 ) \
-    SYSCALL_ENTRY( 0x11c2, NtUserUnregisterClass, 24 ) \
-    SYSCALL_ENTRY( 0x11c3, NtUserUnregisterHotKey, 16 ) \
-    SYSCALL_ENTRY( 0x11c4, NtUserUpdateInputContext, 24 ) \
-    SYSCALL_ENTRY( 0x11c5, NtUserUpdateLayeredWindow, 80 ) \
-    SYSCALL_ENTRY( 0x11c6, NtUserValidateRect, 16 ) \
-    SYSCALL_ENTRY( 0x11c7, NtUserValidateRgn, 16 ) \
-    SYSCALL_ENTRY( 0x11c8, NtUserVkKeyScanEx, 16 ) \
-    SYSCALL_ENTRY( 0x11c9, NtUserWaitForInputIdle, 24 ) \
-    SYSCALL_ENTRY( 0x11ca, NtUserWaitMessage, 0 ) \
-    SYSCALL_ENTRY( 0x11cb, NtUserWindowFromDC, 8 ) \
-    SYSCALL_ENTRY( 0x11cc, NtUserWindowFromPoint, 16 ) \
-    SYSCALL_ENTRY( 0x11cd, __wine_get_icm_profile, 32 )
+    SYSCALL_ENTRY( 0x10c9, NtUserAlterWindowStyle, 24 ) \
+    SYSCALL_ENTRY( 0x10ca, NtUserArrangeIconicWindows, 8 ) \
+    SYSCALL_ENTRY( 0x10cb, NtUserAssociateInputContext, 24 ) \
+    SYSCALL_ENTRY( 0x10cc, NtUserAttachThreadInput, 24 ) \
+    SYSCALL_ENTRY( 0x10cd, NtUserBeginDeferWindowPos, 8 ) \
+    SYSCALL_ENTRY( 0x10ce, NtUserBeginPaint, 16 ) \
+    SYSCALL_ENTRY( 0x10cf, NtUserBuildHimcList, 32 ) \
+    SYSCALL_ENTRY( 0x10d0, NtUserBuildHwndList, 64 ) \
+    SYSCALL_ENTRY( 0x10d1, NtUserBuildNameList, 32 ) \
+    SYSCALL_ENTRY( 0x10d2, NtUserBuildPropList, 32 ) \
+    SYSCALL_ENTRY( 0x10d3, NtUserCallHwnd, 16 ) \
+    SYSCALL_ENTRY( 0x10d4, NtUserCallHwndParam, 24 ) \
+    SYSCALL_ENTRY( 0x10d5, NtUserCallMsgFilter, 16 ) \
+    SYSCALL_ENTRY( 0x10d6, NtUserCallNextHookEx, 32 ) \
+    SYSCALL_ENTRY( 0x10d7, NtUserCallNoParam, 8 ) \
+    SYSCALL_ENTRY( 0x10d8, NtUserCallOneParam, 16 ) \
+    SYSCALL_ENTRY( 0x10d9, NtUserCallTwoParam, 24 ) \
+    SYSCALL_ENTRY( 0x10da, NtUserChangeClipboardChain, 16 ) \
+    SYSCALL_ENTRY( 0x10db, NtUserChangeDisplaySettings, 40 ) \
+    SYSCALL_ENTRY( 0x10dc, NtUserCheckMenuItem, 24 ) \
+    SYSCALL_ENTRY( 0x10dd, NtUserChildWindowFromPointEx, 32 ) \
+    SYSCALL_ENTRY( 0x10de, NtUserClipCursor, 8 ) \
+    SYSCALL_ENTRY( 0x10df, NtUserCloseClipboard, 0 ) \
+    SYSCALL_ENTRY( 0x10e0, NtUserCloseDesktop, 8 ) \
+    SYSCALL_ENTRY( 0x10e1, NtUserCloseWindowStation, 8 ) \
+    SYSCALL_ENTRY( 0x10e2, NtUserCopyAcceleratorTable, 24 ) \
+    SYSCALL_ENTRY( 0x10e3, NtUserCountClipboardFormats, 0 ) \
+    SYSCALL_ENTRY( 0x10e4, NtUserCreateAcceleratorTable, 16 ) \
+    SYSCALL_ENTRY( 0x10e5, NtUserCreateCaret, 32 ) \
+    SYSCALL_ENTRY( 0x10e6, NtUserCreateDesktopEx, 48 ) \
+    SYSCALL_ENTRY( 0x10e7, NtUserCreateInputContext, 8 ) \
+    SYSCALL_ENTRY( 0x10e8, NtUserCreateMenu, 0 ) \
+    SYSCALL_ENTRY( 0x10e9, NtUserCreatePopupMenu, 0 ) \
+    SYSCALL_ENTRY( 0x10ea, NtUserCreateWindowEx, 136 ) \
+    SYSCALL_ENTRY( 0x10eb, NtUserCreateWindowStation, 56 ) \
+    SYSCALL_ENTRY( 0x10ec, NtUserDeferWindowPosAndBand, 80 ) \
+    SYSCALL_ENTRY( 0x10ed, NtUserDeleteMenu, 24 ) \
+    SYSCALL_ENTRY( 0x10ee, NtUserDestroyAcceleratorTable, 8 ) \
+    SYSCALL_ENTRY( 0x10ef, NtUserDestroyCaret, 0 ) \
+    SYSCALL_ENTRY( 0x10f0, NtUserDestroyCursor, 16 ) \
+    SYSCALL_ENTRY( 0x10f1, NtUserDestroyInputContext, 8 ) \
+    SYSCALL_ENTRY( 0x10f2, NtUserDestroyMenu, 8 ) \
+    SYSCALL_ENTRY( 0x10f3, NtUserDestroyWindow, 8 ) \
+    SYSCALL_ENTRY( 0x10f4, NtUserDisableThreadIme, 8 ) \
+    SYSCALL_ENTRY( 0x10f5, NtUserDispatchMessage, 8 ) \
+    SYSCALL_ENTRY( 0x10f6, NtUserDisplayConfigGetDeviceInfo, 8 ) \
+    SYSCALL_ENTRY( 0x10f7, NtUserDragDetect, 24 ) \
+    SYSCALL_ENTRY( 0x10f8, NtUserDragObject, 40 ) \
+    SYSCALL_ENTRY( 0x10f9, NtUserDrawCaptionTemp, 56 ) \
+    SYSCALL_ENTRY( 0x10fa, NtUserDrawIconEx, 72 ) \
+    SYSCALL_ENTRY( 0x10fb, NtUserDrawMenuBar, 8 ) \
+    SYSCALL_ENTRY( 0x10fc, NtUserDrawMenuBarTemp, 40 ) \
+    SYSCALL_ENTRY( 0x10fd, NtUserEmptyClipboard, 0 ) \
+    SYSCALL_ENTRY( 0x10fe, NtUserEnableMenuItem, 24 ) \
+    SYSCALL_ENTRY( 0x10ff, NtUserEnableMouseInPointer, 8 ) \
+    SYSCALL_ENTRY( 0x1100, NtUserEnableMouseInPointerForThread, 0 ) \
+    SYSCALL_ENTRY( 0x1101, NtUserEnableScrollBar, 24 ) \
+    SYSCALL_ENTRY( 0x1102, NtUserEnableWindow, 16 ) \
+    SYSCALL_ENTRY( 0x1103, NtUserEndDeferWindowPosEx, 16 ) \
+    SYSCALL_ENTRY( 0x1104, NtUserEndMenu, 0 ) \
+    SYSCALL_ENTRY( 0x1105, NtUserEndPaint, 16 ) \
+    SYSCALL_ENTRY( 0x1106, NtUserEnumClipboardFormats, 8 ) \
+    SYSCALL_ENTRY( 0x1107, NtUserEnumDisplayDevices, 32 ) \
+    SYSCALL_ENTRY( 0x1108, NtUserEnumDisplayMonitors, 32 ) \
+    SYSCALL_ENTRY( 0x1109, NtUserEnumDisplaySettings, 32 ) \
+    SYSCALL_ENTRY( 0x110a, NtUserExcludeUpdateRgn, 16 ) \
+    SYSCALL_ENTRY( 0x110b, NtUserFindExistingCursorIcon, 24 ) \
+    SYSCALL_ENTRY( 0x110c, NtUserFindWindowEx, 40 ) \
+    SYSCALL_ENTRY( 0x110d, NtUserFlashWindowEx, 8 ) \
+    SYSCALL_ENTRY( 0x110e, NtUserGetAncestor, 16 ) \
+    SYSCALL_ENTRY( 0x110f, NtUserGetAsyncKeyState, 8 ) \
+    SYSCALL_ENTRY( 0x1110, NtUserGetAtomName, 16 ) \
+    SYSCALL_ENTRY( 0x1111, NtUserGetCaretBlinkTime, 0 ) \
+    SYSCALL_ENTRY( 0x1112, NtUserGetCaretPos, 8 ) \
+    SYSCALL_ENTRY( 0x1113, NtUserGetClassInfoEx, 40 ) \
+    SYSCALL_ENTRY( 0x1114, NtUserGetClassName, 24 ) \
+    SYSCALL_ENTRY( 0x1115, NtUserGetClipCursor, 8 ) \
+    SYSCALL_ENTRY( 0x1116, NtUserGetClipboardData, 16 ) \
+    SYSCALL_ENTRY( 0x1117, NtUserGetClipboardFormatName, 24 ) \
+    SYSCALL_ENTRY( 0x1118, NtUserGetClipboardOwner, 0 ) \
+    SYSCALL_ENTRY( 0x1119, NtUserGetClipboardSequenceNumber, 0 ) \
+    SYSCALL_ENTRY( 0x111a, NtUserGetClipboardViewer, 0 ) \
+    SYSCALL_ENTRY( 0x111b, NtUserGetCurrentInputMessageSource, 8 ) \
+    SYSCALL_ENTRY( 0x111c, NtUserGetCursor, 0 ) \
+    SYSCALL_ENTRY( 0x111d, NtUserGetCursorFrameInfo, 32 ) \
+    SYSCALL_ENTRY( 0x111e, NtUserGetCursorInfo, 8 ) \
+    SYSCALL_ENTRY( 0x111f, NtUserGetDC, 8 ) \
+    SYSCALL_ENTRY( 0x1120, NtUserGetDCEx, 24 ) \
+    SYSCALL_ENTRY( 0x1121, NtUserGetDisplayConfigBufferSizes, 24 ) \
+    SYSCALL_ENTRY( 0x1122, NtUserGetDoubleClickTime, 0 ) \
+    SYSCALL_ENTRY( 0x1123, NtUserGetDpiForMonitor, 32 ) \
+    SYSCALL_ENTRY( 0x1124, NtUserGetForegroundWindow, 0 ) \
+    SYSCALL_ENTRY( 0x1125, NtUserGetGUIThreadInfo, 16 ) \
+    SYSCALL_ENTRY( 0x1126, NtUserGetIconInfo, 48 ) \
+    SYSCALL_ENTRY( 0x1127, NtUserGetIconSize, 32 ) \
+    SYSCALL_ENTRY( 0x1128, NtUserGetInternalWindowPos, 24 ) \
+    SYSCALL_ENTRY( 0x1129, NtUserGetKeyNameText, 24 ) \
+    SYSCALL_ENTRY( 0x112a, NtUserGetKeyState, 8 ) \
+    SYSCALL_ENTRY( 0x112b, NtUserGetKeyboardLayout, 8 ) \
+    SYSCALL_ENTRY( 0x112c, NtUserGetKeyboardLayoutList, 16 ) \
+    SYSCALL_ENTRY( 0x112d, NtUserGetKeyboardLayoutName, 8 ) \
+    SYSCALL_ENTRY( 0x112e, NtUserGetKeyboardState, 8 ) \
+    SYSCALL_ENTRY( 0x112f, NtUserGetLayeredWindowAttributes, 32 ) \
+    SYSCALL_ENTRY( 0x1130, NtUserGetMenuBarInfo, 32 ) \
+    SYSCALL_ENTRY( 0x1131, NtUserGetMenuItemRect, 32 ) \
+    SYSCALL_ENTRY( 0x1132, NtUserGetMessage, 32 ) \
+    SYSCALL_ENTRY( 0x1133, NtUserGetMouseMovePointsEx, 40 ) \
+    SYSCALL_ENTRY( 0x1134, NtUserGetObjectInformation, 40 ) \
+    SYSCALL_ENTRY( 0x1135, NtUserGetOpenClipboardWindow, 0 ) \
+    SYSCALL_ENTRY( 0x1136, NtUserGetPointerInfoList, 64 ) \
+    SYSCALL_ENTRY( 0x1137, NtUserGetPriorityClipboardFormat, 16 ) \
+    SYSCALL_ENTRY( 0x1138, NtUserGetProcessDefaultLayout, 8 ) \
+    SYSCALL_ENTRY( 0x1139, NtUserGetProcessDpiAwarenessContext, 8 ) \
+    SYSCALL_ENTRY( 0x113a, NtUserGetProcessWindowStation, 0 ) \
+    SYSCALL_ENTRY( 0x113b, NtUserGetProp, 16 ) \
+    SYSCALL_ENTRY( 0x113c, NtUserGetQueueStatus, 8 ) \
+    SYSCALL_ENTRY( 0x113d, NtUserGetRawInputBuffer, 24 ) \
+    SYSCALL_ENTRY( 0x113e, NtUserGetRawInputData, 40 ) \
+    SYSCALL_ENTRY( 0x113f, NtUserGetRawInputDeviceInfo, 32 ) \
+    SYSCALL_ENTRY( 0x1140, NtUserGetRawInputDeviceList, 24 ) \
+    SYSCALL_ENTRY( 0x1141, NtUserGetRegisteredRawInputDevices, 24 ) \
+    SYSCALL_ENTRY( 0x1142, NtUserGetScrollBarInfo, 24 ) \
+    SYSCALL_ENTRY( 0x1143, NtUserGetSystemDpiForProcess, 8 ) \
+    SYSCALL_ENTRY( 0x1144, NtUserGetSystemMenu, 16 ) \
+    SYSCALL_ENTRY( 0x1145, NtUserGetThreadDesktop, 8 ) \
+    SYSCALL_ENTRY( 0x1146, NtUserGetThreadState, 8 ) \
+    SYSCALL_ENTRY( 0x1147, NtUserGetTitleBarInfo, 16 ) \
+    SYSCALL_ENTRY( 0x1148, NtUserGetUpdateRect, 24 ) \
+    SYSCALL_ENTRY( 0x1149, NtUserGetUpdateRgn, 24 ) \
+    SYSCALL_ENTRY( 0x114a, NtUserGetUpdatedClipboardFormats, 24 ) \
+    SYSCALL_ENTRY( 0x114b, NtUserGetWindowContextHelpId, 8 ) \
+    SYSCALL_ENTRY( 0x114c, NtUserGetWindowDC, 8 ) \
+    SYSCALL_ENTRY( 0x114d, NtUserGetWindowPlacement, 16 ) \
+    SYSCALL_ENTRY( 0x114e, NtUserGetWindowRgnEx, 24 ) \
+    SYSCALL_ENTRY( 0x114f, NtUserHideCaret, 8 ) \
+    SYSCALL_ENTRY( 0x1150, NtUserHiliteMenuItem, 32 ) \
+    SYSCALL_ENTRY( 0x1151, NtUserInitializeClientPfnArrays, 32 ) \
+    SYSCALL_ENTRY( 0x1152, NtUserInternalGetWindowIcon, 16 ) \
+    SYSCALL_ENTRY( 0x1153, NtUserInternalGetWindowText, 24 ) \
+    SYSCALL_ENTRY( 0x1154, NtUserInvalidateRect, 24 ) \
+    SYSCALL_ENTRY( 0x1155, NtUserInvalidateRgn, 24 ) \
+    SYSCALL_ENTRY( 0x1156, NtUserIsChildWindowDpiMessageEnabled, 8 ) \
+    SYSCALL_ENTRY( 0x1157, NtUserIsClipboardFormatAvailable, 8 ) \
+    SYSCALL_ENTRY( 0x1158, NtUserIsMouseInPointerEnabled, 0 ) \
+    SYSCALL_ENTRY( 0x1159, NtUserKillSystemTimer, 16 ) \
+    SYSCALL_ENTRY( 0x115a, NtUserKillTimer, 16 ) \
+    SYSCALL_ENTRY( 0x115b, NtUserLockWindowUpdate, 8 ) \
+    SYSCALL_ENTRY( 0x115c, NtUserLogicalToPerMonitorDPIPhysicalPoint, 16 ) \
+    SYSCALL_ENTRY( 0x115d, NtUserMapVirtualKeyEx, 24 ) \
+    SYSCALL_ENTRY( 0x115e, NtUserMenuItemFromPoint, 32 ) \
+    SYSCALL_ENTRY( 0x115f, NtUserMessageBeep, 8 ) \
+    SYSCALL_ENTRY( 0x1160, NtUserMessageCall, 56 ) \
+    SYSCALL_ENTRY( 0x1161, NtUserMoveWindow, 48 ) \
+    SYSCALL_ENTRY( 0x1162, NtUserMsgWaitForMultipleObjectsEx, 40 ) \
+    SYSCALL_ENTRY( 0x1163, NtUserNotifyIMEStatus, 16 ) \
+    SYSCALL_ENTRY( 0x1164, NtUserNotifyWinEvent, 32 ) \
+    SYSCALL_ENTRY( 0x1165, NtUserOpenClipboard, 16 ) \
+    SYSCALL_ENTRY( 0x1166, NtUserOpenDesktop, 24 ) \
+    SYSCALL_ENTRY( 0x1167, NtUserOpenInputDesktop, 24 ) \
+    SYSCALL_ENTRY( 0x1168, NtUserOpenWindowStation, 16 ) \
+    SYSCALL_ENTRY( 0x1169, NtUserPeekMessage, 40 ) \
+    SYSCALL_ENTRY( 0x116a, NtUserPerMonitorDPIPhysicalToLogicalPoint, 16 ) \
+    SYSCALL_ENTRY( 0x116b, NtUserPostMessage, 32 ) \
+    SYSCALL_ENTRY( 0x116c, NtUserPostQuitMessage, 8 ) \
+    SYSCALL_ENTRY( 0x116d, NtUserPostThreadMessage, 32 ) \
+    SYSCALL_ENTRY( 0x116e, NtUserPrintWindow, 24 ) \
+    SYSCALL_ENTRY( 0x116f, NtUserQueryDisplayConfig, 48 ) \
+    SYSCALL_ENTRY( 0x1170, NtUserQueryInputContext, 16 ) \
+    SYSCALL_ENTRY( 0x1171, NtUserQueryWindow, 16 ) \
+    SYSCALL_ENTRY( 0x1172, NtUserRealChildWindowFromPoint, 24 ) \
+    SYSCALL_ENTRY( 0x1173, NtUserRealizePalette, 8 ) \
+    SYSCALL_ENTRY( 0x1174, NtUserRedrawWindow, 32 ) \
+    SYSCALL_ENTRY( 0x1175, NtUserRegisterClassExWOW, 56 ) \
+    SYSCALL_ENTRY( 0x1176, NtUserRegisterHotKey, 32 ) \
+    SYSCALL_ENTRY( 0x1177, NtUserRegisterRawInputDevices, 24 ) \
+    SYSCALL_ENTRY( 0x1178, NtUserRegisterTouchPadCapable, 8 ) \
+    SYSCALL_ENTRY( 0x1179, NtUserReleaseCapture, 0 ) \
+    SYSCALL_ENTRY( 0x117a, NtUserReleaseDC, 16 ) \
+    SYSCALL_ENTRY( 0x117b, NtUserRemoveClipboardFormatListener, 8 ) \
+    SYSCALL_ENTRY( 0x117c, NtUserRemoveMenu, 24 ) \
+    SYSCALL_ENTRY( 0x117d, NtUserRemoveProp, 16 ) \
+    SYSCALL_ENTRY( 0x117e, NtUserReplyMessage, 8 ) \
+    SYSCALL_ENTRY( 0x117f, NtUserScrollDC, 56 ) \
+    SYSCALL_ENTRY( 0x1180, NtUserScrollWindowEx, 64 ) \
+    SYSCALL_ENTRY( 0x1181, NtUserSelectPalette, 24 ) \
+    SYSCALL_ENTRY( 0x1182, NtUserSendInput, 24 ) \
+    SYSCALL_ENTRY( 0x1183, NtUserSetActiveWindow, 8 ) \
+    SYSCALL_ENTRY( 0x1184, NtUserSetAdditionalForegroundBoostProcesses, 24 ) \
+    SYSCALL_ENTRY( 0x1185, NtUserSetCapture, 8 ) \
+    SYSCALL_ENTRY( 0x1186, NtUserSetCaretBlinkTime, 8 ) \
+    SYSCALL_ENTRY( 0x1187, NtUserSetCaretPos, 16 ) \
+    SYSCALL_ENTRY( 0x1188, NtUserSetClassLong, 32 ) \
+    SYSCALL_ENTRY( 0x1189, NtUserSetClassLongPtr, 32 ) \
+    SYSCALL_ENTRY( 0x118a, NtUserSetClassWord, 24 ) \
+    SYSCALL_ENTRY( 0x118b, NtUserSetClipboardData, 24 ) \
+    SYSCALL_ENTRY( 0x118c, NtUserSetClipboardViewer, 8 ) \
+    SYSCALL_ENTRY( 0x118d, NtUserSetCursor, 8 ) \
+    SYSCALL_ENTRY( 0x118e, NtUserSetCursorIconData, 32 ) \
+    SYSCALL_ENTRY( 0x118f, NtUserSetCursorPos, 16 ) \
+    SYSCALL_ENTRY( 0x1190, NtUserSetFocus, 8 ) \
+    SYSCALL_ENTRY( 0x1191, NtUserSetForegroundWindow, 8 ) \
+    SYSCALL_ENTRY( 0x1192, NtUserSetInternalWindowPos, 32 ) \
+    SYSCALL_ENTRY( 0x1193, NtUserSetKeyboardState, 8 ) \
+    SYSCALL_ENTRY( 0x1194, NtUserSetLayeredWindowAttributes, 32 ) \
+    SYSCALL_ENTRY( 0x1195, NtUserSetMenu, 16 ) \
+    SYSCALL_ENTRY( 0x1196, NtUserSetMenuContextHelpId, 16 ) \
+    SYSCALL_ENTRY( 0x1197, NtUserSetMenuDefaultItem, 24 ) \
+    SYSCALL_ENTRY( 0x1198, NtUserSetObjectInformation, 32 ) \
+    SYSCALL_ENTRY( 0x1199, NtUserSetParent, 16 ) \
+    SYSCALL_ENTRY( 0x119a, NtUserSetProcessDefaultLayout, 8 ) \
+    SYSCALL_ENTRY( 0x119b, NtUserSetProcessDpiAwarenessContext, 16 ) \
+    SYSCALL_ENTRY( 0x119c, NtUserSetProcessWindowStation, 8 ) \
+    SYSCALL_ENTRY( 0x119d, NtUserSetProgmanWindow, 8 ) \
+    SYSCALL_ENTRY( 0x119e, NtUserSetProp, 24 ) \
+    SYSCALL_ENTRY( 0x119f, NtUserSetScrollInfo, 32 ) \
+    SYSCALL_ENTRY( 0x11a0, NtUserSetShellWindowEx, 16 ) \
+    SYSCALL_ENTRY( 0x11a1, NtUserSetSysColors, 24 ) \
+    SYSCALL_ENTRY( 0x11a2, NtUserSetSystemMenu, 16 ) \
+    SYSCALL_ENTRY( 0x11a3, NtUserSetSystemTimer, 24 ) \
+    SYSCALL_ENTRY( 0x11a4, NtUserSetTaskmanWindow, 8 ) \
+    SYSCALL_ENTRY( 0x11a5, NtUserSetThreadDesktop, 8 ) \
+    SYSCALL_ENTRY( 0x11a6, NtUserSetTimer, 40 ) \
+    SYSCALL_ENTRY( 0x11a7, NtUserSetWinEventHook, 64 ) \
+    SYSCALL_ENTRY( 0x11a8, NtUserSetWindowContextHelpId, 16 ) \
+    SYSCALL_ENTRY( 0x11a9, NtUserSetWindowLong, 32 ) \
+    SYSCALL_ENTRY( 0x11aa, NtUserSetWindowLongPtr, 32 ) \
+    SYSCALL_ENTRY( 0x11ab, NtUserSetWindowPlacement, 16 ) \
+    SYSCALL_ENTRY( 0x11ac, NtUserSetWindowPos, 56 ) \
+    SYSCALL_ENTRY( 0x11ad, NtUserSetWindowRgn, 24 ) \
+    SYSCALL_ENTRY( 0x11ae, NtUserSetWindowWord, 24 ) \
+    SYSCALL_ENTRY( 0x11af, NtUserSetWindowsHookEx, 48 ) \
+    SYSCALL_ENTRY( 0x11b0, NtUserShowCaret, 8 ) \
+    SYSCALL_ENTRY( 0x11b1, NtUserShowCursor, 8 ) \
+    SYSCALL_ENTRY( 0x11b2, NtUserShowOwnedPopups, 16 ) \
+    SYSCALL_ENTRY( 0x11b3, NtUserShowScrollBar, 24 ) \
+    SYSCALL_ENTRY( 0x11b4, NtUserShowWindow, 16 ) \
+    SYSCALL_ENTRY( 0x11b5, NtUserShowWindowAsync, 16 ) \
+    SYSCALL_ENTRY( 0x11b6, NtUserSwitchDesktop, 8 ) \
+    SYSCALL_ENTRY( 0x11b7, NtUserSystemParametersInfo, 32 ) \
+    SYSCALL_ENTRY( 0x11b8, NtUserSystemParametersInfoForDpi, 40 ) \
+    SYSCALL_ENTRY( 0x11b9, NtUserThunkedMenuInfo, 16 ) \
+    SYSCALL_ENTRY( 0x11ba, NtUserThunkedMenuItemInfo, 48 ) \
+    SYSCALL_ENTRY( 0x11bb, NtUserToUnicodeEx, 56 ) \
+    SYSCALL_ENTRY( 0x11bc, NtUserTrackMouseEvent, 8 ) \
+    SYSCALL_ENTRY( 0x11bd, NtUserTrackPopupMenuEx, 48 ) \
+    SYSCALL_ENTRY( 0x11be, NtUserTranslateAccelerator, 24 ) \
+    SYSCALL_ENTRY( 0x11bf, NtUserTranslateMessage, 16 ) \
+    SYSCALL_ENTRY( 0x11c0, NtUserUnhookWinEvent, 8 ) \
+    SYSCALL_ENTRY( 0x11c1, NtUserUnhookWindowsHook, 16 ) \
+    SYSCALL_ENTRY( 0x11c2, NtUserUnhookWindowsHookEx, 8 ) \
+    SYSCALL_ENTRY( 0x11c3, NtUserUnregisterClass, 24 ) \
+    SYSCALL_ENTRY( 0x11c4, NtUserUnregisterHotKey, 16 ) \
+    SYSCALL_ENTRY( 0x11c5, NtUserUpdateInputContext, 24 ) \
+    SYSCALL_ENTRY( 0x11c6, NtUserUpdateLayeredWindow, 80 ) \
+    SYSCALL_ENTRY( 0x11c7, NtUserValidateRect, 16 ) \
+    SYSCALL_ENTRY( 0x11c8, NtUserValidateRgn, 16 ) \
+    SYSCALL_ENTRY( 0x11c9, NtUserVkKeyScanEx, 16 ) \
+    SYSCALL_ENTRY( 0x11ca, NtUserWaitForInputIdle, 24 ) \
+    SYSCALL_ENTRY( 0x11cb, NtUserWaitMessage, 0 ) \
+    SYSCALL_ENTRY( 0x11cc, NtUserWindowFromDC, 8 ) \
+    SYSCALL_ENTRY( 0x11cd, NtUserWindowFromPoint, 16 ) \
+    SYSCALL_ENTRY( 0x11ce, __wine_get_icm_profile, 32 )
 #else
 #define ALL_SYSCALLS ALL_SYSCALLS32
 #endif
diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec
index 913ad8f79ab..1d32c121e54 100644
--- a/dlls/win32u/win32u.spec
+++ b/dlls/win32u/win32u.spec
@@ -797,7 +797,7 @@
 @ stub NtUserAddVisualIdentifier
 @ stub NtUserAllowForegroundActivation
 @ stub NtUserAllowSetForegroundWindow
-@ stub NtUserAlterWindowStyle
+@ stdcall -syscall NtUserAlterWindowStyle(ptr long long)
 @ stub NtUserApplyWindowAction
 @ stdcall -syscall NtUserArrangeIconicWindows(long)
 @ stdcall -syscall NtUserAssociateInputContext(long long long)
diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c
index 1f59ac4c303..1fc7f779b89 100644
--- a/dlls/win32u/window.c
+++ b/dlls/win32u/window.c
@@ -1165,6 +1165,15 @@ UINT set_window_style_bits( HWND hwnd, UINT set_bits, UINT clear_bits )
     return style.styleOld;
 }
 
+/**********************************************************************
+ *           NtUserAlterWindowStyle (win32u.@)
+ */
+ULONG WINAPI NtUserAlterWindowStyle( HWND hwnd, UINT mask, UINT style )
+{
+    FIXME( "hwnd %p, mask %#x, style %#x stub!\n", hwnd, mask, style );
+    return 0;
+}
+
 static DWORD fix_exstyle( DWORD style, DWORD exstyle )
 {
     if ((exstyle & WS_EX_DLGMODALFRAME) ||
diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c
index 9aa4ef1d343..a08621ac25b 100644
--- a/dlls/wow64win/user.c
+++ b/dlls/wow64win/user.c
@@ -1545,6 +1545,15 @@ NTSTATUS WINAPI wow64_NtUserActivateKeyboardLayout( UINT *args )
     return HandleToUlong( NtUserActivateKeyboardLayout( layout, flags ));
 }
 
+NTSTATUS WINAPI wow64_NtUserAlterWindowStyle( UINT *args )
+{
+    HWND hwnd = get_handle( &args );
+    UINT mask = get_ulong( &args );
+    UINT style = get_ulong( &args );
+
+    return NtUserAlterWindowStyle( hwnd, mask, style );
+}
+
 NTSTATUS WINAPI wow64_NtUserAddClipboardFormatListener( UINT *args )
 {
     HWND hwnd = get_handle( &args );
diff --git a/include/ntuser.h b/include/ntuser.h
index 0647efe7082..f4480bb650b 100644
--- a/include/ntuser.h
+++ b/include/ntuser.h
@@ -737,6 +737,7 @@ typedef enum _USERTHREADSTATECLASS
 
 W32KAPI HKL     WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags );
 W32KAPI BOOL    WINAPI NtUserAddClipboardFormatListener( HWND hwnd );
+W32KAPI ULONG   WINAPI NtUserAlterWindowStyle( HWND hwnd, UINT mask, UINT style );
 W32KAPI UINT    WINAPI NtUserArrangeIconicWindows( HWND parent );
 W32KAPI UINT    WINAPI NtUserAssociateInputContext( HWND hwnd, HIMC ctx, ULONG flags );
 W32KAPI BOOL    WINAPI NtUserAttachThreadInput( DWORD from, DWORD to, BOOL attach );
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/8050

[PATCH v3 3/3] win32u: Implement and use NtUserAlterWindowStyle.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

---
 dlls/user32/button.c       | 13 ++++---------
 dlls/user32/user_private.h |  1 -
 dlls/user32/win.c          | 14 --------------
 dlls/win32u/tests/win32u.c | 18 +++++++++---------
 dlls/win32u/window.c       | 13 ++++---------
 include/ntuser.h           |  2 --
 6 files changed, 17 insertions(+), 44 deletions(-)

diff --git a/dlls/user32/button.c b/dlls/user32/button.c
index 75885be0f17..f4dbec7767c 100644
--- a/dlls/user32/button.c
+++ b/dlls/user32/button.c
@@ -195,11 +195,7 @@ LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam,
             return -1; /* abort */
 
         /* XP turns a BS_USERBUTTON into BS_PUSHBUTTON */
-        if (btn_type == BS_USERBUTTON )
-        {
-            style = (style & ~BS_TYPEMASK) | BS_PUSHBUTTON;
-            WIN_SetStyle( hWnd, style, BS_TYPEMASK & ~style );
-        }
+        if (btn_type == BS_USERBUTTON ) NtUserAlterWindowStyle( hWnd, BS_TYPEMASK, BS_PUSHBUTTON );
         set_button_state( hWnd, BST_UNCHECKED );
         return 0;
 
@@ -408,8 +404,7 @@ LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam,
 
     case BM_SETSTYLE:
         btn_type = wParam & BS_TYPEMASK;
-        style = (style & ~BS_TYPEMASK) | btn_type;
-        WIN_SetStyle( hWnd, style, BS_TYPEMASK & ~style );
+        NtUserAlterWindowStyle( hWnd, BS_TYPEMASK, btn_type );
 
         NtUserNotifyWinEvent( EVENT_OBJECT_STATECHANGE, hWnd, OBJID_CLIENT, 0 );
 
@@ -452,8 +447,8 @@ LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam,
         state = get_button_state( hWnd );
         if ((btn_type == BS_RADIOBUTTON) || (btn_type == BS_AUTORADIOBUTTON))
         {
-            if (wParam) WIN_SetStyle( hWnd, WS_TABSTOP, 0 );
-            else WIN_SetStyle( hWnd, 0, WS_TABSTOP );
+            if (wParam) NtUserAlterWindowStyle( hWnd, WS_TABSTOP, WS_TABSTOP );
+            else NtUserAlterWindowStyle( hWnd, WS_TABSTOP, 0 );
         }
         if ((state & 3) != wParam)
         {
diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h
index fbf6cd7bc23..a324968400f 100644
--- a/dlls/user32/user_private.h
+++ b/dlls/user32/user_private.h
@@ -173,7 +173,6 @@ BOOL is_desktop_window( HWND hwnd );
 HWND WIN_GetFullHandle( HWND hwnd );
 HWND WIN_IsCurrentProcess( HWND hwnd );
 HWND WIN_IsCurrentThread( HWND hwnd );
-ULONG WIN_SetStyle( HWND hwnd, ULONG set_bits, ULONG clear_bits );
 HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, BOOL unicode );
 HWND *WIN_ListChildren( HWND hwnd );
 void MDI_CalcDefaultChildPos( HWND hwndClient, INT total, LPPOINT lpPos, INT delta, UINT *id );
diff --git a/dlls/user32/win.c b/dlls/user32/win.c
index bfb0681a8f2..8741c07a671 100644
--- a/dlls/user32/win.c
+++ b/dlls/user32/win.c
@@ -150,20 +150,6 @@ HWND WIN_GetFullHandle( HWND hwnd )
 }
 
 
-/***********************************************************************
- *           WIN_SetStyle
- *
- * Change the style of a window.
- */
-ULONG WIN_SetStyle( HWND hwnd, ULONG set_bits, ULONG clear_bits )
-{
-    /* FIXME: Use SetWindowLong or move callers to win32u instead.
-     * We use STYLESTRUCT to pass params, but meaning of its field does not match our usage. */
-    STYLESTRUCT style = { .styleNew = set_bits, .styleOld = clear_bits };
-    return NtUserCallHwndParam( hwnd, (UINT_PTR)&style, NtUserSetWindowStyle );
-}
-
-
 /***********************************************************************
  *           dump_window_styles
  */
diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c
index 71ceabfd3b4..3f0fe8d55bb 100644
--- a/dlls/win32u/tests/win32u.c
+++ b/dlls/win32u/tests/win32u.c
@@ -294,37 +294,37 @@ static void test_NtUserAlterWindowStyle(void)
     ok( style == expect_style, "got %#x\n", style );
 
     ret = NtUserAlterWindowStyle( hwnd, 0, 0 );
-    todo_wine ok( ret == 1, "got %#Ix\n", ret );
+    ok( ret == 1, "got %#Ix\n", ret );
     style = GetWindowLongW( hwnd, GWL_STYLE );
     ok( style == expect_style, "got %#x\n", style );
 
     ret = NtUserAlterWindowStyle( hwnd, -1, -1 );
-    todo_wine ok( ret == 1, "got %#Ix\n", ret );
+    ok( ret == 1, "got %#Ix\n", ret );
     style = GetWindowLongW( hwnd, GWL_STYLE );
-    todo_wine ok( style == (expect_style | 0x23f), "got %#x\n", style );
+    ok( style == (expect_style | 0x23f), "got %#x\n", style );
 
     ret = NtUserAlterWindowStyle( hwnd, -1, 0 );
-    todo_wine ok( ret == 1, "got %#Ix\n", ret );
+    ok( ret == 1, "got %#Ix\n", ret );
     style = GetWindowLongW( hwnd, GWL_STYLE );
     todo_wine ok( style == (expect_style & ~(WS_VSCROLL | WS_HSCROLL)), "got %#x\n", style );
 
     ret = NtUserAlterWindowStyle( hwnd, 0, -1 );
-    todo_wine ok( ret == 1, "got %#Ix\n", ret );
+    ok( ret == 1, "got %#Ix\n", ret );
     style = GetWindowLongW( hwnd, GWL_STYLE );
     todo_wine ok( style == (expect_style & ~(WS_VSCROLL | WS_HSCROLL)), "got %#x\n", style );
 
     ret = NtUserAlterWindowStyle( hwnd, -1, 0xe1e1e1e1 );
-    todo_wine ok( ret == 1, "got %#Ix\n", ret );
+    ok( ret == 1, "got %#Ix\n", ret );
     style = GetWindowLongW( hwnd, GWL_STYLE );
-    todo_wine ok( style == ((expect_style & ~WS_HSCROLL) | 0x21), "got %#x\n", style );
+    ok( style == ((expect_style & ~WS_HSCROLL) | 0x21), "got %#x\n", style );
 
     ret = NtUserAlterWindowStyle( hwnd, -1, 0 );
-    todo_wine ok( ret == 1, "got %#Ix\n", ret );
+    ok( ret == 1, "got %#Ix\n", ret );
     style = GetWindowLongW( hwnd, GWL_STYLE );
     todo_wine ok( style == (expect_style & ~(WS_VSCROLL | WS_HSCROLL)), "got %#x\n", style );
 
     ret = NtUserAlterWindowStyle( hwnd, 0x20, 0xe1e1e1e1 );
-    todo_wine ok( ret == 1, "got %#Ix\n", ret );
+    ok( ret == 1, "got %#Ix\n", ret );
     style = GetWindowLongW( hwnd, GWL_STYLE );
     todo_wine ok( style == ((expect_style & ~(WS_VSCROLL | WS_HSCROLL)) | 0x20), "got %#x\n", style );
 
diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c
index 1fc7f779b89..3cc3addc298 100644
--- a/dlls/win32u/window.c
+++ b/dlls/win32u/window.c
@@ -1170,8 +1170,10 @@ UINT set_window_style_bits( HWND hwnd, UINT set_bits, UINT clear_bits )
  */
 ULONG WINAPI NtUserAlterWindowStyle( HWND hwnd, UINT mask, UINT style )
 {
-    FIXME( "hwnd %p, mask %#x, style %#x stub!\n", hwnd, mask, style );
-    return 0;
+    TRACE( "hwnd %p, mask %#x, style %#x\n", hwnd, mask, style );
+    /* FIXME: WS_TABSTOP shouldn't be there but we need it for BM_SETCHECK */
+    mask &= WS_TABSTOP | WS_VSCROLL | WS_HSCROLL | 0x23f;
+    return !!set_window_style_bits( hwnd, style & mask, mask & ~style );
 }
 
 static DWORD fix_exstyle( DWORD style, DWORD exstyle )
@@ -5959,13 +5961,6 @@ ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code )
         return set_raw_window_pos( hwnd, params->rect, params->flags, params->internal );
     }
 
-    /* temporary exports */
-    case NtUserSetWindowStyle:
-        {
-            STYLESTRUCT *style = (void *)param;
-            return set_window_style_bits( hwnd, style->styleNew, style->styleOld );
-        }
-
     default:
         FIXME( "invalid code %u\n", code );
         return 0;
diff --git a/include/ntuser.h b/include/ntuser.h
index f4480bb650b..41c9fc84cd2 100644
--- a/include/ntuser.h
+++ b/include/ntuser.h
@@ -1398,8 +1398,6 @@ enum
     NtUserCallHwndParam_ExposeWindowSurface,
     NtUserCallHwndParam_GetWinMonitorDpi,
     NtUserCallHwndParam_SetRawWindowPos,
-    /* temporary exports */
-    NtUserSetWindowStyle,
 };
 
 struct get_window_rects_params
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/8050