April 2022 - Wine-commits - list.winehq.org

Zebediah Figura : ntdll: Write a null terminator in NtQueryDirectoryObject.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: 1e750b5b442f6cfbc5f38c8920e7ec1180d190ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e750b5b442f6cfbc5f38c89… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 12 22:00:50 2022 -0500 ntdll: Write a null terminator in NtQueryDirectoryObject. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 15 +++++++-------- dlls/ntdll/unix/sync.c | 19 ++++++++++++++----- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 89cd2b8e3f4..2e03abd13ed 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -2532,7 +2532,7 @@ static void test_query_directory(void) status = NtQueryDirectoryObject( dir, info, 0, TRUE, TRUE, &context, &size ); ok( status == STATUS_NO_MORE_ENTRIES, "got %#lx\n", status ); ok( context == 0xdeadbeef, "got context %#lx\n", context ); - todo_wine ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); + ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); context = 0xdeadbeef; size = 0xdeadbeef; @@ -2547,7 +2547,7 @@ static void test_query_directory(void) status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, &context, &size ); ok( status == STATUS_NO_MORE_ENTRIES, "got %#lx\n", status ); ok( context == 0xdeadbeef, "got context %#lx\n", context ); - todo_wine ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); + ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); if (size == sizeof(*info)) ok( !memcmp( &info[0], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); @@ -2600,8 +2600,7 @@ static void test_query_directory(void) } check_unicode_string( &info[0].ObjectName, name1 ); check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); - todo_wine - ok( !memcmp( &info[1], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + ok( !memcmp( &info[1], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); memset( buffer, 0xcc, sizeof(buffer) ); status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, FALSE, &context, &size ); @@ -2609,13 +2608,13 @@ static void test_query_directory(void) ok( context == 2, "got context %#lx\n", context ); check_unicode_string( &info[0].ObjectName, name2 ); check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); - todo_wine ok( !memcmp( &info[1], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + ok( !memcmp( &info[1], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); size = 0xdeadbeef; status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, FALSE, &context, &size ); ok( status == STATUS_NO_MORE_ENTRIES, "got %#lx\n", status ); ok( context == 2, "got context %#lx\n", context ); - todo_wine ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); + ok( size == sizeof(*info) || broken(!size) /* WoW64 */, "got size %lu\n", size ); memset( buffer, 0xcc, sizeof(buffer) ); status = NtQueryDirectoryObject( dir, info, sizeof(buffer), TRUE, TRUE, &context, &size ); @@ -2623,7 +2622,7 @@ static void test_query_directory(void) ok( context == 1, "got context %#lx\n", context ); check_unicode_string( &info[0].ObjectName, name1 ); check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); - todo_wine ok( !memcmp( &info[1], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + ok( !memcmp( &info[1], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); needed_size = size; @@ -2650,7 +2649,7 @@ static void test_query_directory(void) ok( context == 1, "got context %#lx\n", context ); check_unicode_string( &info[0].ObjectName, name1 ); check_unicode_string( &info[0].ObjectTypeName, L"Mutant" ); - todo_wine ok( !memcmp( &info[1], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); + ok( !memcmp( &info[1], &empty_info, sizeof(*info) ), "entry was not cleared\n" ); memset( buffer, 0xcc, sizeof(buffer) ); status = NtQueryDirectoryObject( dir, info, sizeof(buffer), FALSE, TRUE, &context, &size ); diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index efbe363c210..1695e6ed570 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -1108,14 +1108,14 @@ NTSTATUS WINAPI NtQueryDirectoryObject( HANDLE handle, DIRECTORY_BASIC_INFORMATI { req->handle = wine_server_obj_handle( handle ); req->index = index; - if (size >= sizeof(*buffer) + 2 * sizeof(WCHAR)) - wine_server_set_reply( req, buffer + 1, size - sizeof(*buffer) - 2 * sizeof(WCHAR) ); + if (size >= 2 * sizeof(*buffer) + 2 * sizeof(WCHAR)) + wine_server_set_reply( req, buffer + 2, size - 2 * sizeof(*buffer) - 2 * sizeof(WCHAR) ); if (!(ret = wine_server_call( req ))) { - buffer->ObjectName.Buffer = (WCHAR *)(buffer + 1); + buffer->ObjectName.Buffer = (WCHAR *)(buffer + 2); buffer->ObjectName.Length = reply->name_len; buffer->ObjectName.MaximumLength = reply->name_len + sizeof(WCHAR); - buffer->ObjectTypeName.Buffer = (WCHAR *)(buffer + 1) + reply->name_len/sizeof(WCHAR) + 1; + buffer->ObjectTypeName.Buffer = (WCHAR *)(buffer + 2) + reply->name_len/sizeof(WCHAR) + 1; buffer->ObjectTypeName.Length = wine_server_reply_size( reply ) - reply->name_len; buffer->ObjectTypeName.MaximumLength = buffer->ObjectTypeName.Length + sizeof(WCHAR); /* make room for the terminating null */ @@ -1123,11 +1123,20 @@ NTSTATUS WINAPI NtQueryDirectoryObject( HANDLE handle, DIRECTORY_BASIC_INFORMATI buffer->ObjectTypeName.Length ); buffer->ObjectName.Buffer[buffer->ObjectName.Length/sizeof(WCHAR)] = 0; buffer->ObjectTypeName.Buffer[buffer->ObjectTypeName.Length/sizeof(WCHAR)] = 0; + + memset( &buffer[1], 0, sizeof(buffer[1]) ); + *context = index + 1; } + else if (ret == STATUS_NO_MORE_ENTRIES) + { + if (size > sizeof(*buffer)) + memset( buffer, 0, sizeof(*buffer) ); + if (ret_size) *ret_size = sizeof(*buffer); + } if (ret_size && (!ret || ret == STATUS_BUFFER_TOO_SMALL)) - *ret_size = sizeof(*buffer) + reply->total_len + 2 * sizeof(WCHAR); + *ret_size = 2 * sizeof(*buffer) + reply->total_len + 2 * sizeof(WCHAR); } SERVER_END_REQ; }

1 0

Daniel Lehman : include: Add some math declarations.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: 47ce525c2b1edf38b58d56a0d9a13e7693ea5b18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47ce525c2b1edf38b58d56a0… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Apr 11 22:24:05 2022 -0700 include: Add some math declarations. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/math.h | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index da07303bcd9..dba2b07be37 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -69,12 +69,16 @@ _ACRTIMP double __cdecl fabs(double); _ACRTIMP double __cdecl ldexp(double, int); _ACRTIMP double __cdecl frexp(double, int*); _ACRTIMP double __cdecl modf(double, double*); +_ACRTIMP double __cdecl fdim(double, double); _ACRTIMP double __cdecl fmod(double, double); _ACRTIMP double __cdecl fmin(double, double); _ACRTIMP double __cdecl fmax(double, double); _ACRTIMP double __cdecl erf(double); +_ACRTIMP double __cdecl remainder(double, double); _ACRTIMP double __cdecl remquo(double, double, int*); _ACRTIMP float __cdecl remquof(float, float, int*); +_ACRTIMP double __cdecl lgamma(double); +_ACRTIMP double __cdecl tgamma(double); _ACRTIMP double __cdecl _hypot(double, double); _ACRTIMP double __cdecl _j0(double); @@ -86,18 +90,31 @@ _ACRTIMP double __cdecl _yn(int, double); _ACRTIMP double __cdecl cbrt(double); _ACRTIMP double __cdecl exp2(double); +_ACRTIMP double __cdecl expm1(double); +_ACRTIMP double __cdecl log1p(double); _ACRTIMP double __cdecl log2(double); +_ACRTIMP double __cdecl logb(double); _ACRTIMP double __cdecl rint(double); _ACRTIMP double __cdecl round(double); _ACRTIMP double __cdecl trunc(double); _ACRTIMP float __cdecl cbrtf(float); _ACRTIMP float __cdecl exp2f(float); +_ACRTIMP float __cdecl expm1f(float); +_ACRTIMP float __cdecl log1pf(float); _ACRTIMP float __cdecl log2f(float); +_ACRTIMP float __cdecl logbf(float); _ACRTIMP float __cdecl rintf(float); _ACRTIMP float __cdecl roundf(float); _ACRTIMP float __cdecl truncf(float); +_ACRTIMP int __cdecl ilogb(double); +_ACRTIMP int __cdecl ilogbf(float); + +_ACRTIMP __int64 __cdecl llrint(double); +_ACRTIMP __int64 __cdecl llrintf(float); +_ACRTIMP __int64 __cdecl llround(double); +_ACRTIMP __int64 __cdecl llroundf(float); _ACRTIMP __msvcrt_long __cdecl lrint(double); _ACRTIMP __msvcrt_long __cdecl lrintf(float); _ACRTIMP __msvcrt_long __cdecl lround(double); @@ -105,6 +122,8 @@ _ACRTIMP __msvcrt_long __cdecl lroundf(float); _ACRTIMP double __cdecl scalbn(double,int); _ACRTIMP float __cdecl scalbnf(float,int); +_ACRTIMP double __cdecl scalbln(double,__msvcrt_long); +_ACRTIMP float __cdecl scalblnf(float,__msvcrt_long); _ACRTIMP double __cdecl _copysign (double, double); _ACRTIMP double __cdecl _chgsign (double); @@ -115,6 +134,8 @@ _ACRTIMP int __cdecl _finite(double); _ACRTIMP int __cdecl _isnan(double); _ACRTIMP int __cdecl _fpclass(double); +_ACRTIMP double __cdecl nextafter(double, double); + #ifndef __i386__ _ACRTIMP float __cdecl sinf(float); @@ -199,15 +220,20 @@ _ACRTIMP float __cdecl _logbf(float); _ACRTIMP float __cdecl acoshf(float); _ACRTIMP float __cdecl asinhf(float); _ACRTIMP float __cdecl atanhf(float); +_ACRTIMP float __cdecl erff(float); +_ACRTIMP float __cdecl fdimf(float, float); +_ACRTIMP float __cdecl fmaxf(float, float); +_ACRTIMP float __cdecl fminf(float, float); +_ACRTIMP float __cdecl lgammaf(float); +_ACRTIMP float __cdecl nextafterf(float, float); +_ACRTIMP float __cdecl remainderf(float, float); +_ACRTIMP float __cdecl tgammaf(float); #else static inline float _chgsignf(float x) { return _chgsign(x); } static inline float _copysignf(float x, float y) { return _copysign(x, y); } static inline float _logbf(float x) { return _logb(x); } -static inline float acoshf(float x) { return acosh(x); } -static inline float asinhf(float x) { return asinh(x); } -static inline float atanhf(float x) { return atanh(x); } #endif

1 0

Jacek Caban : win32u: Introduce inline helpers for NtUserCallNoParam calls.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: 6f1e48f4242f817ed04c8db6c162fbd296486f31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f1e48f4242f817ed04c8db6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 13 15:06:44 2022 +0200 win32u: Introduce inline helpers for NtUserCallNoParam calls. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 4 ++-- dlls/user32/menu.c | 2 +- dlls/user32/win.c | 2 +- dlls/win32u/sysparams.c | 15 +++++++++++---- include/ntuser.h | 46 +++++++++++++++++++++++++++++++++------------- 5 files changed, 48 insertions(+), 21 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 39c215a0b09..2407b9d2960 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -173,7 +173,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetCursorPos( POINT *pt ) */ BOOL WINAPI DECLSPEC_HOTPATCH ReleaseCapture(void) { - return NtUserCallNoParam( NtUserReleaseCapture ); + return NtUserReleaseCapture(); } @@ -193,7 +193,7 @@ HWND WINAPI GetCapture(void) */ BOOL WINAPI GetInputState(void) { - return NtUserCallNoParam( NtUserGetInputState ); + return NtUserGetInputState(); } diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index c6fdb01c113..185d596fbb8 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -4213,7 +4213,7 @@ BOOL WINAPI SetMenuItemBitmaps( HMENU hMenu, UINT nPos, UINT wFlags, */ HMENU WINAPI CreateMenu(void) { - return UlongToHandle( NtUserCallNoParam( NtUserCreateMenu )); + return NtUserCreateMenu(); } diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 881825b5510..ec5a964b3c2 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -871,7 +871,7 @@ HWND WINAPI GetDesktopWindow(void) struct user_thread_info *thread_info = get_user_thread_info(); if (thread_info->top_window) return thread_info->top_window; - return UlongToHandle( NtUserCallNoParam( NtUserGetDesktopWindow )); + return NtUserGetDesktopWindow(); } diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index c542de61451..77a6a70e27f 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4632,24 +4632,31 @@ ULONG_PTR WINAPI NtUserCallNoParam( ULONG code ) { switch(code) { - case NtUserCreateMenu: + case NtUserCallNoParam_CreateMenu: return HandleToUlong( create_menu() ); - case NtUserGetDesktopWindow: + + case NtUserCallNoParam_GetDesktopWindow: return HandleToUlong( get_desktop_window() ); - case NtUserGetInputState: + + case NtUserCallNoParam_GetInputState: return get_input_state(); - case NtUserReleaseCapture: + + case NtUserCallNoParam_ReleaseCapture: return release_capture(); + /* temporary exports */ case NtUserExitingThread: exiting_thread_id = GetCurrentThreadId(); return 0; + case NtUserThreadDetach: thread_detach(); return 0; + case NtUserUpdateClipboard: user_driver->pUpdateClipboard(); return 0; + default: FIXME( "invalid code %u\n", code ); return 0; diff --git a/include/ntuser.h b/include/ntuser.h index 081760333e9..5190bec5560 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -131,19 +131,6 @@ struct win_hook_params #define NTUSER_DPI_PER_MONITOR_AWARE_V2 0x00000022 #define NTUSER_DPI_PER_UNAWARE_GDISCALED 0x40006010 -/* NtUserCallNoParam codes, not compatible with Windows */ -enum -{ - NtUserCreateMenu, - NtUserGetDesktopWindow, - NtUserGetInputState, - NtUserReleaseCapture, - /* temporary exports */ - NtUserExitingThread, - NtUserThreadDetach, - NtUserUpdateClipboard, -}; - /* NtUserCallOneParam codes, not compatible with Windows */ enum { @@ -676,4 +663,37 @@ DWORD WINAPI NtUserWaitForInputIdle( HANDLE process, DWORD timeout, BOOL wow ) HWND WINAPI NtUserWindowFromDC( HDC hdc ); HWND WINAPI NtUserWindowFromPoint( LONG x, LONG y ); +/* NtUserCallNoParam codes, not compatible with Windows */ +enum +{ + NtUserCallNoParam_CreateMenu, + NtUserCallNoParam_GetDesktopWindow, + NtUserCallNoParam_GetInputState, + NtUserCallNoParam_ReleaseCapture, + /* temporary exports */ + NtUserExitingThread, + NtUserThreadDetach, + NtUserUpdateClipboard, +}; + +static inline HMENU NtUserCreateMenu(void) +{ + return UlongToHandle( NtUserCallNoParam( NtUserCallNoParam_CreateMenu )); +} + +static inline HWND NtUserGetDesktopWindow(void) +{ + return UlongToHandle( NtUserCallNoParam( NtUserCallNoParam_GetDesktopWindow )); +} + +static inline BOOL NtUserGetInputState(void) +{ + return NtUserCallNoParam( NtUserCallNoParam_GetInputState ); +} + +static inline BOOL NtUserReleaseCapture(void) +{ + return NtUserCallNoParam( NtUserCallNoParam_ReleaseCapture ); +} + #endif /* _NTUSER_ */

1 0

Jacek Caban : win32u: Use NtUserCallHwndParam for MirrorRgn implementation.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: dcca04606e83c5c6df8abe5cc183d734bb99e1b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcca04606e83c5c6df8abe5c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 13 15:06:51 2022 +0200 win32u: Use NtUserCallHwndParam for MirrorRgn implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/objects.c | 2 +- dlls/win32u/sysparams.c | 2 -- dlls/win32u/window.c | 2 ++ include/ntuser.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 0260027a484..88b36f279a3 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -695,7 +695,7 @@ HRGN WINAPI CreatePolygonRgn( const POINT *points, INT count, INT mode ) */ BOOL WINAPI MirrorRgn( HWND hwnd, HRGN hrgn ) { - return NtUserCallTwoParam( HandleToUlong(hwnd), HandleToUlong(hrgn), NtUserMirrorRgn ); + return NtUserCallHwndParam( hwnd, HandleToUlong(hrgn), NtUserMirrorRgn ); } /*********************************************************************** diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 77a6a70e27f..36461d81fde 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4752,8 +4752,6 @@ ULONG_PTR WINAPI NtUserCallTwoParam( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code return get_monitor_info( UlongToHandle(arg1), (MONITORINFO *)arg2 ); case NtUserGetSystemMetricsForDpi: return get_system_metrics_for_dpi( arg1, arg2 ); - case NtUserMirrorRgn: - return mirror_window_region( UlongToHandle(arg1), UlongToHandle(arg2) ); case NtUserMonitorFromRect: return HandleToUlong( monitor_from_rect( (const RECT *)arg1, arg2, get_thread_dpi() )); case NtUserReplyMessage: diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index f6fd52b9029..b2913b267c4 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -5048,6 +5048,8 @@ ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) return is_child( hwnd, UlongToHandle(param) ); case NtUserKillSystemTimer: return kill_system_timer( hwnd, param ); + case NtUserMirrorRgn: + return mirror_window_region( hwnd, UlongToHandle(param) ); case NtUserMonitorFromWindow: return HandleToUlong( monitor_from_window( hwnd, param, NtUserMonitorFromWindow )); case NtUserScreenToClient: diff --git a/include/ntuser.h b/include/ntuser.h index 5190bec5560..e33855261ce 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -166,7 +166,6 @@ enum { NtUserGetMonitorInfo, NtUserGetSystemMetricsForDpi, - NtUserMirrorRgn, NtUserMonitorFromRect, NtUserReplyMessage, NtUserSetIconParam, @@ -213,6 +212,7 @@ enum NtUserGetWindowWord, NtUserIsChild, NtUserKillSystemTimer, + NtUserMirrorRgn, NtUserMonitorFromWindow, NtUserScreenToClient, NtUserSetCaptureWindow,

1 0

Jacek Caban : win32u: Introduce inline helpers for NtUserCallOneParam calls.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: 7f64eead50bc8e7a079a2a71986366d7fcad21e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f64eead50bc8e7a079a2a71… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 13 15:07:13 2022 +0200 win32u: Introduce inline helpers for NtUserCallOneParam calls. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 2 +- dlls/user.exe16/message.c | 2 +- dlls/user.exe16/user.c | 2 +- dlls/user.exe16/window.c | 2 +- dlls/user32/cursoricon.c | 4 +- dlls/user32/input.c | 2 +- dlls/user32/message.c | 4 +- dlls/user32/sysparams.c | 10 ++-- dlls/user32/user_main.c | 2 +- dlls/user32/winpos.c | 2 +- dlls/win32u/sysparams.c | 56 +++++++++++++----- dlls/winex11.drv/display.c | 8 +-- include/ntuser.h | 144 +++++++++++++++++++++++++++++++++++---------- 13 files changed, 172 insertions(+), 68 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7f64eead50bc8e7a079a…

1 0

Jacek Caban : win32u: Remove no longer needed NtUserCallOneParam exports.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: 322ee7938386e0c96ba5423ba92a45520dda3f60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=322ee7938386e0c96ba5423b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 13 15:07:30 2022 +0200 win32u: Remove no longer needed NtUserCallOneParam exports. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 15 --------------- dlls/user32/win.c | 11 ----------- dlls/user32/win.h | 1 - dlls/win32u/message.c | 2 +- dlls/win32u/ntuser_private.h | 3 --- dlls/win32u/sysparams.c | 10 ---------- include/ntuser.h | 2 -- 7 files changed, 1 insertion(+), 43 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index e45c5fb0425..72f5c084432 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -266,21 +266,6 @@ static void map_wparam_WtoA( MSG *msg, BOOL remove ) } -/*********************************************************************** - * handle_internal_message - * - * Handle an internal Wine message instead of calling the window proc. - */ -LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) -{ - MSG m; - m.hwnd = hwnd; - m.message = msg; - m.wParam = wparam; - m.lParam = lparam; - return NtUserCallOneParam( (UINT_PTR)&m, NtUserHandleInternalMessage ); -} - /* since the WM_DDE_ACK response to a WM_DDE_EXECUTE message should contain the handle * to the memory handle, we keep track (in the server side) of all pairs of handle * used (the client passes its value and the content of the memory handle), and diff --git a/dlls/user32/win.c b/dlls/user32/win.c index ec5a964b3c2..24aeaaeadfd 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -142,17 +142,6 @@ BOOL is_desktop_window( HWND hwnd ) } -/******************************************************************* - * flush_window_surfaces - * - * Flush pending output from all window surfaces. - */ -void flush_window_surfaces( BOOL idle ) -{ - NtUserCallOneParam( idle, NtUserFlushWindowSurfaces ); -} - - /*********************************************************************** * WIN_GetPtr * diff --git a/dlls/user32/win.h b/dlls/user32/win.h index 8e0998e3715..d741965d2be 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -36,7 +36,6 @@ struct tagDIALOGINFO; /* Window functions */ extern HWND get_hwnd_message_parent(void) DECLSPEC_HIDDEN; extern BOOL is_desktop_window( HWND hwnd ) DECLSPEC_HIDDEN; -extern void flush_window_surfaces( BOOL idle ) DECLSPEC_HIDDEN; extern WND *WIN_GetPtr( HWND hwnd ) DECLSPEC_HIDDEN; extern HWND WIN_GetFullHandle( HWND hwnd ) DECLSPEC_HIDDEN; extern HWND WIN_IsCurrentProcess( HWND hwnd ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 9479595ae53..36bafccc9a4 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -1079,7 +1079,7 @@ BOOL reply_message_result( LRESULT result, MSG *msg ) * * Handle an internal Wine message instead of calling the window proc. */ -LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) +static LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) { switch(msg) { diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 6ba47443dc7..5aee58fa1e3 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -292,9 +292,6 @@ HICON alloc_cursoricon_handle( BOOL is_icon ) DECLSPEC_HIDDEN; extern void free_dce( struct dce *dce, HWND hwnd ) DECLSPEC_HIDDEN; extern void invalidate_dce( WND *win, const RECT *extra_rect ) DECLSPEC_HIDDEN; -/* message.c */ -LRESULT handle_internal_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN; - /* window.c */ HANDLE alloc_user_handle( struct user_object *ptr, unsigned int type ) DECLSPEC_HIDDEN; void *free_user_handle( HANDLE handle, unsigned int type ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 080efded675..0a4fa4f524d 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4729,22 +4729,12 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) params->next_unicode ); } - case NtUserFlushWindowSurfaces: - flush_window_surfaces( arg ); - return 0; - case NtUserGetDeskPattern: return get_entry( &entry_DESKPATTERN, 256, (WCHAR *)arg ); case NtUserGetWinProcPtr: return (UINT_PTR)get_winproc_ptr( UlongToHandle(arg) ); - case NtUserHandleInternalMessage: - { - MSG *msg = (MSG *)arg; - return handle_internal_message( msg->hwnd, msg->message, msg->wParam, msg->lParam ); - } - case NtUserLock: switch( arg ) { diff --git a/include/ntuser.h b/include/ntuser.h index 1535a813a79..5cf25aca64f 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -687,10 +687,8 @@ enum NtUserCallOneParam_RealizePalette, /* temporary exports */ NtUserCallHooks, - NtUserFlushWindowSurfaces, NtUserGetDeskPattern, NtUserGetWinProcPtr, - NtUserHandleInternalMessage, NtUserLock, NtUserSetCallbacks, NtUserSpyGetVKeyName,

1 0

Jacek Caban : win32u: Introduce inline helpers for NtUserCallTwoParam calls.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: dae11519da7791bb0fe824111a65848816a31875 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dae11519da7791bb0fe82411… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 13 15:07:48 2022 +0200 win32u: Introduce inline helpers for NtUserCallTwoParam calls. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/user.c | 4 ++-- dlls/user32/hook.c | 2 +- dlls/user32/message.c | 2 +- dlls/user32/sysparams.c | 6 ++--- dlls/user32/winproc.c | 2 +- dlls/win32u/sysparams.c | 20 ++++++++++++----- include/ntuser.h | 60 +++++++++++++++++++++++++++++++++++++------------ 7 files changed, 68 insertions(+), 28 deletions(-) diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index b94d5958ce0..75b81b0ea05 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -300,7 +300,7 @@ static HICON store_icon_32( HICON16 icon16, HICON icon ) { memcpy( &ret, (char *)(ptr + 1) + and_size + xor_size, sizeof(ret) ); memcpy( (char *)(ptr + 1) + and_size + xor_size, &icon, sizeof(icon) ); - NtUserCallTwoParam( HandleToUlong(icon), icon16, NtUserSetIconParam ); + NtUserSetIconParam( icon, icon16 ); } release_icon_ptr( icon16, ptr ); } @@ -342,7 +342,7 @@ HICON get_icon_32( HICON16 icon16 ) DeleteObject( iinfo.hbmMask ); DeleteObject( iinfo.hbmColor ); memcpy( (char *)(ptr + 1) + xor_size + and_size, &ret, sizeof(ret) ); - NtUserCallTwoParam( HandleToUlong(ret), icon16, NtUserSetIconParam ); + NtUserSetIconParam( ret, icon16 ); } } release_icon_ptr( icon16, ptr ); diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index e6db8590934..76033f0dee1 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -379,7 +379,7 @@ HHOOK WINAPI SetWindowsHookExW( INT id, HOOKPROC proc, HINSTANCE inst, DWORD tid */ BOOL WINAPI UnhookWindowsHook( INT id, HOOKPROC proc ) { - return NtUserCallTwoParam( id, (UINT_PTR)proc, NtUserUnhookWindowsHook ); + return NtUserUnhookWindowsHook( id, proc ); } diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 72f5c084432..d2ab94dbf37 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -694,7 +694,7 @@ BOOL WINAPI SendMessageCallbackW( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpa */ BOOL WINAPI ReplyMessage( LRESULT result ) { - return NtUserCallTwoParam( result, 0, NtUserReplyMessage ); + return NtUserReplyMessage( result, NULL ); } diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 4bfdde4bfcb..c2b570b6119 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -453,7 +453,7 @@ INT WINAPI GetSystemMetrics( INT index ) */ INT WINAPI GetSystemMetricsForDpi( INT index, UINT dpi ) { - return NtUserCallTwoParam( index, dpi, NtUserGetSystemMetricsForDpi ); + return NtUserGetSystemMetricsForDpi( index, dpi ); } @@ -994,7 +994,7 @@ BOOL WINAPI PhysicalToLogicalPointForPerMonitorDPI( HWND hwnd, POINT *pt ) */ HMONITOR WINAPI MonitorFromRect( const RECT *rect, DWORD flags ) { - return UlongToHandle( NtUserCallTwoParam( (LONG_PTR)rect, flags, NtUserMonitorFromRect )); + return NtUserMonitorFromRect( rect, flags ); } /*********************************************************************** @@ -1045,7 +1045,7 @@ BOOL WINAPI GetMonitorInfoA( HMONITOR monitor, LPMONITORINFO info ) */ BOOL WINAPI GetMonitorInfoW( HMONITOR monitor, LPMONITORINFO info ) { - return NtUserCallTwoParam( HandleToUlong(monitor), (ULONG_PTR)info, NtUserGetMonitorInfo ); + return NtUserGetMonitorInfo( monitor, info ); } #ifdef __i386__ diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 9ac57b5239a..7b9b2000c06 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -1268,7 +1268,7 @@ BOOL WINAPI User32CallWindowProc( struct win_proc_params *params, ULONG size ) msg.lParam = params->lparam; dispatch_win_proc_params( params ); - NtUserCallTwoParam( result, (UINT_PTR)&msg, NtUserReplyMessage ); + NtUserReplyMessage( result, &msg ); if (buffer != stack_buffer && buffer != params + 1) HeapFree( GetProcessHeap(), 0, buffer ); } diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 0a4fa4f524d..a760a2ca3a4 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4762,23 +4762,31 @@ ULONG_PTR WINAPI NtUserCallTwoParam( ULONG_PTR arg1, ULONG_PTR arg2, ULONG code { switch(code) { - case NtUserGetMonitorInfo: + case NtUserCallTwoParam_GetMonitorInfo: return get_monitor_info( UlongToHandle(arg1), (MONITORINFO *)arg2 ); - case NtUserGetSystemMetricsForDpi: + + case NtUserCallTwoParam_GetSystemMetricsForDpi: return get_system_metrics_for_dpi( arg1, arg2 ); - case NtUserMonitorFromRect: + + case NtUserCallTwoParam_MonitorFromRect: return HandleToUlong( monitor_from_rect( (const RECT *)arg1, arg2, get_thread_dpi() )); - case NtUserReplyMessage: + + case NtUserCallTwoParam_ReplyMessage: return reply_message_result( arg1, (MSG *)arg2 ); - case NtUserSetIconParam: + + case NtUserCallTwoParam_SetIconParam: return set_icon_param( UlongToHandle(arg1), arg2 ); - case NtUserUnhookWindowsHook: + + case NtUserCallTwoParam_UnhookWindowsHook: return unhook_windows_hook( arg1, (HOOKPROC)arg2 ); + /* temporary exports */ case NtUserAllocWinProc: return (UINT_PTR)alloc_winproc( (WNDPROC)arg1, arg2 ); + case NtUserGetHandlePtr: return (UINT_PTR)get_user_handle_ptr( UlongToHandle(arg1), arg2 ); + default: FIXME( "invalid code %u\n", code ); return 0; diff --git a/include/ntuser.h b/include/ntuser.h index 5cf25aca64f..8d94fc133da 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -131,20 +131,6 @@ struct win_hook_params #define NTUSER_DPI_PER_MONITOR_AWARE_V2 0x00000022 #define NTUSER_DPI_PER_UNAWARE_GDISCALED 0x40006010 -/* NtUserCallTwoParam codes, not compatible with Windows */ -enum -{ - NtUserGetMonitorInfo, - NtUserGetSystemMetricsForDpi, - NtUserMonitorFromRect, - NtUserReplyMessage, - NtUserSetIconParam, - NtUserUnhookWindowsHook, - /* temporary exports */ - NtUserAllocWinProc, - NtUserGetHandlePtr, -}; - /* NtUserCallHwnd codes, not compatible with Windows */ enum { @@ -778,4 +764,50 @@ static inline UINT NtUserRealizePalette( HDC hdc ) return NtUserCallOneParam( HandleToUlong(hdc), NtUserCallOneParam_RealizePalette ); } +/* NtUserCallTwoParam codes, not compatible with Windows */ +enum +{ + NtUserCallTwoParam_GetMonitorInfo, + NtUserCallTwoParam_GetSystemMetricsForDpi, + NtUserCallTwoParam_MonitorFromRect, + NtUserCallTwoParam_ReplyMessage, + NtUserCallTwoParam_SetIconParam, + NtUserCallTwoParam_UnhookWindowsHook, + /* temporary exports */ + NtUserAllocWinProc, + NtUserGetHandlePtr, +}; + +static inline BOOL NtUserGetMonitorInfo( HMONITOR monitor, MONITORINFO *info ) +{ + return NtUserCallTwoParam( HandleToUlong(monitor), (ULONG_PTR)info, + NtUserCallTwoParam_GetMonitorInfo ); +} + +static inline INT NtUserGetSystemMetricsForDpi( INT index, UINT dpi ) +{ + return NtUserCallTwoParam( index, dpi, NtUserCallTwoParam_GetSystemMetricsForDpi ); +} + +static inline HMONITOR NtUserMonitorFromRect( const RECT *rect, DWORD flags ) +{ + ULONG ret = NtUserCallTwoParam( (LONG_PTR)rect, flags, NtUserCallTwoParam_MonitorFromRect ); + return UlongToHandle( ret ); +} + +static inline BOOL NtUserReplyMessage( LRESULT result, MSG *msg ) +{ + return NtUserCallTwoParam( result, (UINT_PTR)msg, NtUserCallTwoParam_ReplyMessage ); +} + +static inline UINT_PTR NtUserSetIconParam( HICON icon, ULONG_PTR param ) +{ + return NtUserCallTwoParam( HandleToUlong(icon), param, NtUserCallTwoParam_SetIconParam ); +} + +static inline BOOL NtUserUnhookWindowsHook( INT id, HOOKPROC proc ) +{ + return NtUserCallTwoParam( id, (UINT_PTR)proc, NtUserCallTwoParam_UnhookWindowsHook ); +} + #endif /* _NTUSER_ */

1 0

Jacek Caban : win32u: Introduce inline helpers for NtUserCallHwnd calls.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: 31dbce9675b6f2b25a4af5d4102fc36213838137 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31dbce9675b6f2b25a4af5d4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 13 15:08:02 2022 +0200 win32u: Introduce inline helpers for NtUserCallHwnd calls. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 20 ++++++------- dlls/user32/winpos.c | 2 +- dlls/win32u/window.c | 30 ++++++++++++------- include/ntuser.h | 81 ++++++++++++++++++++++++++++++++++++++++++---------- 4 files changed, 97 insertions(+), 36 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 24aeaaeadfd..5223c776d5f 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -906,7 +906,7 @@ BOOL WINAPI EnableWindow( HWND hwnd, BOOL enable ) */ BOOL WINAPI IsWindowEnabled( HWND hwnd ) { - return NtUserCallHwnd( hwnd, NtUserIsWindowEnabled ); + return NtUserIsWindowEnabled( hwnd ); } /*********************************************************************** @@ -914,7 +914,7 @@ BOOL WINAPI IsWindowEnabled( HWND hwnd ) */ BOOL WINAPI IsWindowUnicode( HWND hwnd ) { - return NtUserCallHwnd( hwnd, NtUserIsWindowUnicode ); + return NtUserIsWindowUnicode( hwnd ); } @@ -923,7 +923,7 @@ BOOL WINAPI IsWindowUnicode( HWND hwnd ) */ DPI_AWARENESS_CONTEXT WINAPI GetWindowDpiAwarenessContext( HWND hwnd ) { - return (DPI_AWARENESS_CONTEXT)NtUserCallHwnd( hwnd, NtUserGetWindowDpiAwarenessContext ); + return NtUserGetWindowDpiAwarenessContext( hwnd ); } @@ -932,7 +932,7 @@ DPI_AWARENESS_CONTEXT WINAPI GetWindowDpiAwarenessContext( HWND hwnd ) */ UINT WINAPI GetDpiForWindow( HWND hwnd ) { - return NtUserCallHwnd( hwnd, NtUserGetDpiForWindow ); + return NtUserGetDpiForWindow( hwnd ); } @@ -1215,7 +1215,7 @@ INT WINAPI GetWindowTextLengthA( HWND hwnd ) /* when window belongs to other process, don't send a message */ GetCPInfo( CP_ACP, &info ); - return NtUserCallHwnd( hwnd, NtUserGetWindowTextLength ) * info.MaxCharSize; + return NtUserGetWindowTextLength( hwnd ) * info.MaxCharSize; } /******************************************************************* @@ -1226,7 +1226,7 @@ INT WINAPI GetWindowTextLengthW( HWND hwnd ) if (WIN_IsCurrentProcess( hwnd )) return SendMessageW( hwnd, WM_GETTEXTLENGTH, 0, 0 ); /* when window belongs to other process, don't send a message */ - return NtUserCallHwnd( hwnd, NtUserGetWindowTextLength ); + return NtUserGetWindowTextLength( hwnd ); } @@ -1235,7 +1235,7 @@ INT WINAPI GetWindowTextLengthW( HWND hwnd ) */ BOOL WINAPI IsWindow( HWND hwnd ) { - return NtUserCallHwnd( hwnd, NtUserIsWindow ); + return NtUserIsWindow( hwnd ); } @@ -1253,7 +1253,7 @@ DWORD WINAPI GetWindowThreadProcessId( HWND hwnd, LPDWORD process ) */ HWND WINAPI GetParent( HWND hwnd ) { - return UlongToHandle( NtUserCallHwnd( hwnd, NtUserGetParent )); + return NtUserGetParent( hwnd ); } @@ -1271,7 +1271,7 @@ BOOL WINAPI IsChild( HWND parent, HWND child ) */ BOOL WINAPI IsWindowVisible( HWND hwnd ) { - return NtUserCallHwnd( hwnd, NtUserIsWindowVisible ); + return NtUserIsWindowVisible( hwnd ); } @@ -1564,7 +1564,7 @@ BOOL WINAPI FlashWindow( HWND hWnd, BOOL bInvert ) */ DWORD WINAPI GetWindowContextHelpId( HWND hwnd ) { - return NtUserCallHwnd( hwnd, NtUserGetWindowContextHelpId ); + return NtUserGetWindowContextHelpId( hwnd ); } diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 3f7a38a75c9..04a3ddb5e21 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -895,7 +895,7 @@ BOOL WINAPI EndDeferWindowPos( HDWP hdwp ) */ UINT WINAPI ArrangeIconicWindows( HWND parent ) { - return NtUserCallHwnd( parent, NtUserArrangeIconicWindows ); + return NtUserArrangeIconicWindows( parent ); } diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index b2913b267c4..b7a6ebb7090 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -4976,26 +4976,36 @@ ULONG_PTR WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ) { switch (code) { - case NtUserArrangeIconicWindows: + case NtUserCallHwnd_ArrangeIconicWindows: return arrange_iconic_windows( hwnd ); - case NtUserGetDpiForWindow: + + case NtUserCallHwnd_GetDpiForWindow: return get_dpi_for_window( hwnd ); - case NtUserGetParent: + + case NtUserCallHwnd_GetParent: return HandleToUlong( get_parent( hwnd )); - case NtUserGetWindowContextHelpId: + + case NtUserCallHwnd_GetWindowContextHelpId: return get_window_context_help_id( hwnd ); - case NtUserGetWindowDpiAwarenessContext: + + case NtUserCallHwnd_GetWindowDpiAwarenessContext: return (ULONG_PTR)get_window_dpi_awareness_context( hwnd ); - case NtUserGetWindowTextLength: + + case NtUserCallHwnd_GetWindowTextLength: return get_server_window_text( hwnd, NULL, 0 ); - case NtUserIsWindow: + + case NtUserCallHwnd_IsWindow: return is_window( hwnd ); - case NtUserIsWindowEnabled: + + case NtUserCallHwnd_IsWindowEnabled: return is_window_enabled( hwnd ); - case NtUserIsWindowUnicode: + + case NtUserCallHwnd_IsWindowUnicode: return is_window_unicode( hwnd ); - case NtUserIsWindowVisible: + + case NtUserCallHwnd_IsWindowVisible: return is_window_visible( hwnd ); + default: FIXME( "invalid code %u\n", code ); return 0; diff --git a/include/ntuser.h b/include/ntuser.h index 8d94fc133da..df89c63b405 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -131,21 +131,6 @@ struct win_hook_params #define NTUSER_DPI_PER_MONITOR_AWARE_V2 0x00000022 #define NTUSER_DPI_PER_UNAWARE_GDISCALED 0x40006010 -/* NtUserCallHwnd codes, not compatible with Windows */ -enum -{ - NtUserArrangeIconicWindows, - NtUserGetDpiForWindow, - NtUserGetParent, - NtUserGetWindowContextHelpId, - NtUserGetWindowDpiAwarenessContext, - NtUserGetWindowTextLength, - NtUserIsWindow, - NtUserIsWindowEnabled, - NtUserIsWindowUnicode, - NtUserIsWindowVisible, -}; - /* NtUserCallHwndParam codes, not compatible with Windows */ enum { @@ -810,4 +795,70 @@ static inline BOOL NtUserUnhookWindowsHook( INT id, HOOKPROC proc ) return NtUserCallTwoParam( id, (UINT_PTR)proc, NtUserCallTwoParam_UnhookWindowsHook ); } +/* NtUserCallHwnd codes, not compatible with Windows */ +enum +{ + NtUserCallHwnd_ArrangeIconicWindows, + NtUserCallHwnd_GetDpiForWindow, + NtUserCallHwnd_GetParent, + NtUserCallHwnd_GetWindowContextHelpId, + NtUserCallHwnd_GetWindowDpiAwarenessContext, + NtUserCallHwnd_GetWindowTextLength, + NtUserCallHwnd_IsWindow, + NtUserCallHwnd_IsWindowEnabled, + NtUserCallHwnd_IsWindowUnicode, + NtUserCallHwnd_IsWindowVisible, +}; + +static inline UINT NtUserArrangeIconicWindows( HWND parent ) +{ + return NtUserCallHwnd( parent, NtUserCallHwnd_ArrangeIconicWindows ); +} + +static inline DWORD NtUserGetWindowContextHelpId( HWND hwnd ) +{ + return NtUserCallHwnd( hwnd, NtUserCallHwnd_GetWindowContextHelpId ); +} + +static inline UINT NtUserGetDpiForWindow( HWND hwnd ) +{ + return NtUserCallHwnd( hwnd, NtUserCallHwnd_GetDpiForWindow ); +} + +static inline HWND NtUserGetParent( HWND hwnd ) +{ + return UlongToHandle( NtUserCallHwnd( hwnd, NtUserCallHwnd_GetParent )); +} + +static inline DPI_AWARENESS_CONTEXT NtUserGetWindowDpiAwarenessContext( HWND hwnd ) +{ + return (DPI_AWARENESS_CONTEXT)NtUserCallHwnd( hwnd, + NtUserCallHwnd_GetWindowDpiAwarenessContext ); +} + +static inline INT NtUserGetWindowTextLength( HWND hwnd ) +{ + return NtUserCallHwnd( hwnd, NtUserCallHwnd_GetWindowTextLength ); +} + +static inline BOOL NtUserIsWindow( HWND hwnd ) +{ + return NtUserCallHwnd( hwnd, NtUserCallHwnd_IsWindow ); +} + +static inline BOOL NtUserIsWindowEnabled( HWND hwnd ) +{ + return NtUserCallHwnd( hwnd, NtUserCallHwnd_IsWindowEnabled ); +} + +static inline BOOL NtUserIsWindowUnicode( HWND hwnd ) +{ + return NtUserCallHwnd( hwnd, NtUserCallHwnd_IsWindowUnicode ); +} + +static inline BOOL NtUserIsWindowVisible( HWND hwnd ) +{ + return NtUserCallHwnd( hwnd, NtUserCallHwnd_IsWindowVisible ); +} + #endif /* _NTUSER_ */

1 0

Jacek Caban : win32u: Introduce inline helpers for NtUserCallHwndParam calls.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: cfb6f9a1e82caa56eac9dccf7d7d0c0f3cd9a9a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfb6f9a1e82caa56eac9dccf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 13 15:08:21 2022 +0200 win32u: Introduce inline helpers for NtUserCallHwndParam calls. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/objects.c | 2 +- dlls/user32/class.c | 10 +-- dlls/user32/focus.c | 4 +- dlls/user32/message.c | 2 +- dlls/user32/sysparams.c | 2 +- dlls/user32/win.c | 20 ++--- dlls/user32/win.h | 1 - dlls/user32/winpos.c | 24 ++---- dlls/win32u/window.c | 82 +++++++++++++------- include/ntuser.h | 193 +++++++++++++++++++++++++++++++++++++++--------- 10 files changed, 240 insertions(+), 100 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cfb6f9a1e82caa56eac9…

1 0

Jacek Caban : winex11: Remove no longer needed helpers.
by Alexandre Julliard 13 Apr '22

13 Apr '22

Module: wine Branch: master Commit: 523a6eba0250e734a30b9310ab694e2a2af6d6ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=523a6eba0250e734a30b9310… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 13 15:08:36 2022 +0200 winex11: Remove no longer needed helpers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/desktop.c | 10 +++++----- dlls/winex11.drv/display.c | 18 ++++-------------- dlls/winex11.drv/init.c | 2 +- dlls/winex11.drv/mouse.c | 6 +++--- dlls/winex11.drv/window.c | 6 +++--- dlls/winex11.drv/x11drv.h | 4 +--- 6 files changed, 17 insertions(+), 29 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 0ac538d06ed..a89824772d0 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -118,7 +118,7 @@ static BOOL X11DRV_desktop_get_modes( ULONG_PTR id, DWORD flags, DEVMODEW **new_ RECT primary_rect; DEVMODEW *modes; - primary_rect = get_primary_monitor_rect(); + primary_rect = NtUserGetPrimaryMonitorRect(); screen_width = primary_rect.right - primary_rect.left; screen_height = primary_rect.bottom - primary_rect.top; @@ -166,7 +166,7 @@ static void X11DRV_desktop_free_modes( DEVMODEW *modes ) static BOOL X11DRV_desktop_get_current_mode( ULONG_PTR id, DEVMODEW *mode ) { - RECT primary_rect = get_primary_monitor_rect(); + RECT primary_rect = NtUserGetPrimaryMonitorRect(); mode->dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY | DM_POSITION; @@ -374,7 +374,7 @@ BOOL CDECL X11DRV_create_desktop( UINT width, UINT height ) BOOL is_desktop_fullscreen(void) { - RECT primary_rect = get_primary_monitor_rect(); + RECT primary_rect = NtUserGetPrimaryMonitorRect(); return (primary_rect.right - primary_rect.left == max_width && primary_rect.bottom - primary_rect.top == max_height); } @@ -421,8 +421,8 @@ void X11DRV_resize_desktop( BOOL send_display_change ) HWND hwnd = GetDesktopWindow(); INT width, height; - virtual_rect = get_virtual_screen_rect(); - primary_rect = get_primary_monitor_rect(); + virtual_rect = NtUserGetVirtualScreenRect(); + primary_rect = NtUserGetPrimaryMonitorRect(); width = primary_rect.right; height = primary_rect.bottom; diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 77b3d9e303c..87287854044 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -44,7 +44,7 @@ void release_display_device_init_mutex(HANDLE mutex) POINT virtual_screen_to_root(INT x, INT y) { - RECT virtual = get_virtual_screen_rect(); + RECT virtual = NtUserGetVirtualScreenRect(); POINT pt; pt.x = x - virtual.left; @@ -54,7 +54,7 @@ POINT virtual_screen_to_root(INT x, INT y) POINT root_to_virtual_screen(INT x, INT y) { - RECT virtual = get_virtual_screen_rect(); + RECT virtual = NtUserGetVirtualScreenRect(); POINT pt; pt.x = x + virtual.left; @@ -62,16 +62,6 @@ POINT root_to_virtual_screen(INT x, INT y) return pt; } -RECT get_virtual_screen_rect(void) -{ - return NtUserGetVirtualScreenRect(); -} - -RECT get_primary_monitor_rect(void) -{ - return NtUserGetPrimaryMonitorRect(); -} - /* Get the primary monitor rect from the host system */ RECT get_host_primary_monitor_rect(void) { @@ -214,9 +204,9 @@ void X11DRV_DisplayDevices_Update(BOOL send_display_change) HWND foreground; UINT mask = 0; - old_virtual_rect = get_virtual_screen_rect(); + old_virtual_rect = NtUserGetVirtualScreenRect(); X11DRV_DisplayDevices_Init(TRUE); - new_virtual_rect = get_virtual_screen_rect(); + new_virtual_rect = NtUserGetVirtualScreenRect(); /* Calculate XReconfigureWMWindow() mask */ if (old_virtual_rect.left != new_virtual_rect.left) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 6f24e1bf370..8f4bb9fd7e9 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -91,7 +91,7 @@ static BOOL CDECL X11DRV_CreateDC( PHYSDEV *pdev, LPCWSTR device, LPCWSTR output physDev->depth = default_visual.depth; physDev->color_shifts = &X11DRV_PALETTE_default_shifts; - physDev->dc_rect = get_virtual_screen_rect(); + physDev->dc_rect = NtUserGetVirtualScreenRect(); OffsetRect( &physDev->dc_rect, -physDev->dc_rect.left, -physDev->dc_rect.top ); push_dc_driver( pdev, &physDev->dev, &x11drv_funcs.dc_funcs ); if (xrender_funcs && !xrender_funcs->pCreateDC( pdev, device, output, initData )) return FALSE; diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 895928c4a31..65e04d6cab5 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -562,7 +562,7 @@ BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) if (!GetMonitorInfoW( monitor, &monitor_info )) return FALSE; if (!grab_fullscreen) { - RECT virtual_rect = get_virtual_screen_rect(); + RECT virtual_rect = NtUserGetVirtualScreenRect(); if (!EqualRect( &monitor_info.rcMonitor, &virtual_rect )) return FALSE; if (is_virtual_desktop()) return FALSE; } @@ -1540,7 +1540,7 @@ BOOL X11DRV_GetCursorPos(LPPOINT pos) */ BOOL X11DRV_ClipCursor( LPCRECT clip ) { - RECT virtual_rect = get_virtual_screen_rect(); + RECT virtual_rect = NtUserGetVirtualScreenRect(); if (!clip) clip = &virtual_rect; @@ -1853,7 +1853,7 @@ static BOOL map_raw_event_coords( XIRawEvent *event, INPUT *input ) } if (event->deviceid != thread_data->xi2_current_slave) return FALSE; - virtual_rect = get_virtual_screen_rect(); + virtual_rect = NtUserGetVirtualScreenRect(); if (x->max <= x->min) x_scale = 1; else x_scale = (virtual_rect.right - virtual_rect.left) / (x->max - x->min); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index b3202847bb7..1803a546dad 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1836,7 +1836,7 @@ BOOL X11DRV_CreateDesktopWindow( HWND hwnd ) if (!width && !height) /* not initialized yet */ { - RECT rect = get_virtual_screen_rect(); + RECT rect = NtUserGetVirtualScreenRect(); SERVER_START_REQ( set_window_pos ) { @@ -2205,7 +2205,7 @@ void X11DRV_ReleaseDC( HWND hwnd, HDC hdc ) escape.code = X11DRV_SET_DRAWABLE; escape.drawable = root_window; escape.mode = IncludeInferiors; - escape.dc_rect = get_virtual_screen_rect(); + escape.dc_rect = NtUserGetVirtualScreenRect(); OffsetRect( &escape.dc_rect, -2 * escape.dc_rect.left, -2 * escape.dc_rect.top ); NtGdiExtEscape( hdc, NULL, 0, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL ); } @@ -2320,7 +2320,7 @@ done: static inline BOOL get_surface_rect( const RECT *visible_rect, RECT *surface_rect ) { - *surface_rect = get_virtual_screen_rect(); + *surface_rect = NtUserGetVirtualScreenRect(); if (!IntersectRect( surface_rect, surface_rect, visible_rect )) return FALSE; OffsetRect( surface_rect, -visible_rect->left, -visible_rect->top ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 2112980aab5..83da0a88bd7 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -699,8 +699,6 @@ extern void X11DRV_X_to_window_rect( struct x11drv_win_data *data, RECT *rect, i extern BOOL is_window_rect_full_screen( const RECT *rect ) DECLSPEC_HIDDEN; extern POINT virtual_screen_to_root( INT x, INT y ) DECLSPEC_HIDDEN; extern POINT root_to_virtual_screen( INT x, INT y ) DECLSPEC_HIDDEN; -extern RECT get_virtual_screen_rect(void) DECLSPEC_HIDDEN; -extern RECT get_primary_monitor_rect(void) DECLSPEC_HIDDEN; extern RECT get_host_primary_monitor_rect(void) DECLSPEC_HIDDEN; extern RECT get_work_area( const RECT *monitor_rect ) DECLSPEC_HIDDEN; extern void xinerama_init( unsigned int width, unsigned int height ) DECLSPEC_HIDDEN; @@ -833,7 +831,7 @@ extern void X11DRV_SetPreeditState(HWND hwnd, BOOL fOpen) DECLSPEC_HIDDEN; static inline BOOL is_window_rect_mapped( const RECT *rect ) { - RECT virtual_rect = get_virtual_screen_rect(); + RECT virtual_rect = NtUserGetVirtualScreenRect(); return (rect->left < virtual_rect.right && rect->top < virtual_rect.bottom && max( rect->right, rect->left + 1 ) > virtual_rect.left &&

1 0