[PATCH v2 0/2] MR7581: user32, win32u: Implement ordinal 2705 with a stub for NtUserIsChildWindowDpiMessageEnabled.

[Tim Clem (＠tclem)]

Office 2016/365 has started calling user32.2705 and crashing since it was added in 6e5f547a3907e6fdacf2de7debf9b22abfdaa14d.

--
  v2: user32: Forward ordinal 2705 to NtUserIsChildWindowDpiMessageEnabled.
      win32u: Add a stub for NtUserIsChildWindowDpiMessageEnabled.

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

[PATCH v2 1/2] win32u: Add a stub for NtUserIsChildWindowDpiMessageEnabled.

[Tim Clem]

From: Tim Clem

---
 dlls/win32u/main.c      | 5 +++++
 dlls/win32u/win32u.spec | 2 +-
 dlls/win32u/window.c    | 9 +++++++++
 dlls/wow64win/user.c    | 7 +++++++
 include/ntuser.h        | 1 +
 5 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/dlls/win32u/main.c b/dlls/win32u/main.c
index f2a3571aebc..6a2606c365c 100644
--- a/dlls/win32u/main.c
+++ b/dlls/win32u/main.c
@@ -1821,6 +1821,11 @@ BOOL SYSCALL_API NtUserInvalidateRgn( HWND hwnd, HRGN hrgn, BOOL erase )
     SYSCALL_FUNC( NtUserInvalidateRgn );
 }

+BOOL SYSCALL_API NtUserIsChildWindowDpiMessageEnabled( HWND hwnd )
+{
+    SYSCALL_FUNC( NtUserIsChildWindowDpiMessageEnabled );
+}
+
 BOOL SYSCALL_API NtUserIsClipboardFormatAvailable( UINT format )
 {
     SYSCALL_FUNC( NtUserIsClipboardFormatAvailable );
diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec
index 952aa121b9a..a6763331819 100644
--- a/dlls/win32u/win32u.spec
+++ b/dlls/win32u/win32u.spec
@@ -1165,7 +1165,7 @@
 @ stub NtUserInternalToUnicode
 @ stdcall -syscall NtUserInvalidateRect(long ptr long)
 @ stdcall -syscall NtUserInvalidateRgn(long long long)
-@ stub NtUserIsChildWindowDpiMessageEnabled
+@ stdcall -syscall NtUserIsChildWindowDpiMessageEnabled(ptr)
 @ stdcall -syscall NtUserIsClipboardFormatAvailable(long)
 @ stdcall -syscall NtUserIsMouseInPointerEnabled()
 @ stub NtUserIsMouseInputEnabled
diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c
index 83494b1ec62..0a3d6b28e47 100644
--- a/dlls/win32u/window.c
+++ b/dlls/win32u/window.c
@@ -6246,3 +6246,12 @@ HWND WINAPI NtUserSetTaskmanWindow( HWND hwnd )
     SERVER_END_REQ;
     return hwnd;
 }
+
+/***********************************************************************
+ *            NtUserIsChildWindowDpiMessageEnabled (win32u.@)
+ */
+BOOL WINAPI NtUserIsChildWindowDpiMessageEnabled( HWND hwnd )
+{
+    FIXME( "%p: stub\n", hwnd );
+    return FALSE;
+}
diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c
index f0acb3a7314..39637fac51d 100644
--- a/dlls/wow64win/user.c
+++ b/dlls/wow64win/user.c
@@ -3293,6 +3293,13 @@ NTSTATUS WINAPI wow64_NtUserInvalidateRgn( UINT *args )
     return NtUserInvalidateRgn( hwnd, hrgn, erase );
 }

+NTSTATUS WINAPI wow64_NtUserIsChildWindowDpiMessageEnabled( UINT *args )
+{
+    HWND hwnd = get_handle( &args );
+
+    return NtUserIsChildWindowDpiMessageEnabled( hwnd );
+}
+
 NTSTATUS WINAPI wow64_NtUserIsClipboardFormatAvailable( UINT *args )
 {
     UINT format = get_ulong( &args );
diff --git a/include/ntuser.h b/include/ntuser.h
index 18b8e966132..749a56f3c9e 100644
--- a/include/ntuser.h
+++ b/include/ntuser.h
@@ -878,6 +878,7 @@ W32KAPI NTSTATUS WINAPI NtUserInitializeClientPfnArrays( const ntuser_client_fun
                                                          const ntuser_client_func_ptr *client_workers, HINSTANCE user_module );
 W32KAPI HICON   WINAPI NtUserInternalGetWindowIcon( HWND hwnd, UINT type );
 W32KAPI INT     WINAPI NtUserInternalGetWindowText( HWND hwnd, WCHAR *text, INT count );
+W32KAPI BOOL    WINAPI NtUserIsChildWindowDpiMessageEnabled( HWND hwnd );
 W32KAPI BOOL    WINAPI NtUserIsClipboardFormatAvailable( UINT format );
 W32KAPI BOOL    WINAPI NtUserIsMouseInPointerEnabled(void);
 W32KAPI BOOL    WINAPI NtUserInvalidateRect( HWND hwnd, const RECT *rect, BOOL erase );

[PATCH v2 2/2] user32: Forward ordinal 2705 to NtUserIsChildWindowDpiMessageEnabled.

[Tim Clem]

From: Tim Clem

---
 dlls/user32/user32.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec
index 4f706ff71f8..f670b75a699 100644
--- a/dlls/user32/user32.spec
+++ b/dlls/user32/user32.spec
@@ -198,7 +198,7 @@

2703 stub @
 2704 stub @
-2705 stub @
+2705 stdcall -noname Ordinal2705(ptr) NtUserIsChildWindowDpiMessageEnabled
 2706 stub @
 2707 stub @
 2708 stub @

[Dmitry Timoshkov (＠dmitry)]

Dmitry Timoshkov (@dmitry) commented about dlls/user32/user32.spec:
> 2703 stub @
>  2704 stub @
> -2705 stub @
> +2705 stdcall -noname Ordinal2705(ptr) NtUserIsChildWindowDpiMessageEnabled

Some spec files in Wine suggest that using

2705 stdcall -noname @(ptr) NtUserIsChildWindowDpiMessageEnabled

should work. Alternatively

2705 stdcall -noname IsChildWindowDpiMessageEnabled(ptr) NtUserIsChildWindowDpiMessageEnabled

could be preferrable.