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

Jacek Caban : win32u: Introduce inline helpers for NtUserCallHwndParam calls.
by Alexandre Julliard April 13, 2022

April 13, 2022

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 : win32u: Use NtUserCallHwndParam for MirrorRgn implementation.
by Alexandre Julliard April 13, 2022

April 13, 2022

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: Remove no longer needed NtUserCallOneParam exports.
by Alexandre Julliard April 13, 2022

April 13, 2022

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

Alexandre Julliard : ntdll: Add support for 2019 and 2020 WindowsSettings namespaces.
by Alexandre Julliard April 13, 2022

April 13, 2022

Module: wine Branch: master Commit: 1326687feb2b66d8013034387cfb47ea1bb99e7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1326687feb2b66d801303438… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 11 16:54:20 2022 +0200 ntdll: Add support for 2019 and 2020 WindowsSettings namespaces. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 92f2f0148b2..be003b7c267 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -615,6 +615,8 @@ static const WCHAR windowsSettings2005NSW[] = L"http://schemas.microsoft.com/SMI static const WCHAR windowsSettings2011NSW[] = L"http://schemas.microsoft.com/SMI/2011/WindowsSettings"; static const WCHAR windowsSettings2016NSW[] = L"http://schemas.microsoft.com/SMI/2016/WindowsSettings"; static const WCHAR windowsSettings2017NSW[] = L"http://schemas.microsoft.com/SMI/2017/WindowsSettings"; +static const WCHAR windowsSettings2019NSW[] = L"http://schemas.microsoft.com/SMI/2019/WindowsSettings"; +static const WCHAR windowsSettings2020NSW[] = L"http://schemas.microsoft.com/SMI/2020/WindowsSettings"; struct olemisc_entry { @@ -2535,12 +2537,14 @@ static void parse_windows_settings_elem( xmlbuf_t *xmlbuf, struct assembly *asse while (next_xml_elem( xmlbuf, &elem, parent )) { - if (xml_elem_cmp( &elem, L"autoElevate", windowsSettings2005NSW ) || + if (xml_elem_cmp( &elem, L"activeCodePage", windowsSettings2019NSW ) || + xml_elem_cmp( &elem, L"autoElevate", windowsSettings2005NSW ) || xml_elem_cmp( &elem, L"disableTheming", windowsSettings2005NSW ) || xml_elem_cmp( &elem, L"disableWindowFiltering", windowsSettings2011NSW ) || xml_elem_cmp( &elem, L"dpiAware", windowsSettings2005NSW ) || xml_elem_cmp( &elem, L"dpiAwareness", windowsSettings2016NSW ) || xml_elem_cmp( &elem, L"gdiScaling", windowsSettings2017NSW ) || + xml_elem_cmp( &elem, L"heapType", windowsSettings2020NSW ) || xml_elem_cmp( &elem, L"highResolutionScrollingAware", windowsSettings2017NSW ) || xml_elem_cmp( &elem, L"longPathAware", windowsSettings2016NSW ) || xml_elem_cmp( &elem, L"magicFutureSetting", windowsSettings2017NSW ) || @@ -2564,7 +2568,7 @@ static void parse_application_elem( xmlbuf_t *xmlbuf, struct assembly *assembly, while (next_xml_elem( xmlbuf, &elem, parent )) { - if (xml_elem_cmp( &elem, L"windowsSettings", asmv3W )) + if (xml_elem_cmp( &elem, L"windowsSettings", asmv1W )) { parse_windows_settings_elem( xmlbuf, assembly, acl, &elem ); } @@ -2783,7 +2787,7 @@ static void parse_assembly_elem( xmlbuf_t *xmlbuf, struct assembly* assembly, { parse_compatibility_elem(xmlbuf, assembly, acl, &elem); } - else if (xml_elem_cmp(&elem, L"application", asmv3W)) + else if (xml_elem_cmp(&elem, L"application", asmv1W)) { parse_application_elem(xmlbuf, assembly, acl, &elem); } @@ -5845,7 +5849,9 @@ NTSTATUS WINAPI RtlQueryActivationContextApplicationSettings( DWORD flags, HANDL if (wcscmp( ns, windowsSettings2005NSW ) && wcscmp( ns, windowsSettings2011NSW ) && wcscmp( ns, windowsSettings2016NSW ) && - wcscmp( ns, windowsSettings2017NSW )) + wcscmp( ns, windowsSettings2017NSW ) && + wcscmp( ns, windowsSettings2019NSW ) && + wcscmp( ns, windowsSettings2020NSW )) return STATUS_INVALID_PARAMETER; } else ns = windowsSettings2005NSW;

1 0

Alexandre Julliard : ntdll: Support overriding the codepage from the manifest.
by Alexandre Julliard April 13, 2022

April 13, 2022

Module: wine Branch: master Commit: 967ef0bf41fc6742398313ebdebd681c1b33dbc3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=967ef0bf41fc6742398313eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 13 15:58:59 2022 +0200 ntdll: Support overriding the codepage from the manifest. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52223 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- dlls/ntdll/locale.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index b6cc53763af..d750f7a7579 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4126,8 +4126,8 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR RtlInitAnsiString( &func_name, "CtrlRoutine" ); LdrGetProcedureAddress( kernel32->ldr.DllBase, &func_name, 0, (void **)&pCtrlRoutine ); - locale_init(); actctx_init(); + locale_init(); if (wm->ldr.Flags & LDR_COR_ILONLY) status = fixup_imports_ilonly( wm, NULL, entry ); else diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 3c96a742e4e..b95b3522fce 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -209,6 +209,27 @@ void locale_init(void) oem_cp = get_locale_data( entry->idx )->idefaultcodepage; } + if (!RtlQueryActivationContextApplicationSettings( 0, NULL, L"http://schemas.microsoft.com/SMI/2019/WindowsSettings", + L"activeCodePage", locale, ARRAY_SIZE(locale), NULL )) + { + const NLS_LOCALE_LCNAME_INDEX *entry = find_lcname_entry( locale ); + + if (!wcsicmp( locale, L"utf-8" )) + { + ansi_cp = oem_cp = CP_UTF8; + } + else if (!wcsicmp( locale, L"legacy" )) + { + if (ansi_cp == CP_UTF8) ansi_cp = 1252; + if (oem_cp == CP_UTF8) oem_cp = 437; + } + else if ((entry = find_lcname_entry( locale ))) + { + ansi_cp = get_locale_data( entry->idx )->idefaultansicodepage; + oem_cp = get_locale_data( entry->idx )->idefaultcodepage; + } + } + NtGetNlsSectionPtr( 10, 0, NULL, &case_ptr, &size ); NtCurrentTeb()->Peb->UnicodeCaseTableData = case_ptr; if (ansi_cp != CP_UTF8)

1 0

Zebediah Figura : ntdll: Don't return STATUS_BUFFER_OVERFLOW if the buffer is too small to hold one entry.
by Alexandre Julliard April 13, 2022

April 13, 2022

Module: wine Branch: master Commit: 4b57ae1674f5ff9ee9380c2c02e43472ba7320c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b57ae1674f5ff9ee9380c2c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 12 22:00:49 2022 -0500 ntdll: Don't return STATUS_BUFFER_OVERFLOW if the buffer is too small to hold one entry. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 6 +++--- dlls/ntdll/unix/sync.c | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 7d7b4b09e73..89cd2b8e3f4 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -2530,7 +2530,7 @@ static void test_query_directory(void) context = 0xdeadbeef; size = 0xdeadbeef; status = NtQueryDirectoryObject( dir, info, 0, TRUE, TRUE, &context, &size ); - todo_wine ok( status == STATUS_NO_MORE_ENTRIES, "got %#lx\n", status ); + 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 ); @@ -2630,9 +2630,9 @@ static void test_query_directory(void) size = 0xdeadbeef; context = 0xdeadbeef; status = NtQueryDirectoryObject( dir, info, 0, TRUE, TRUE, &context, &size ); - todo_wine ok( status == STATUS_BUFFER_TOO_SMALL, "got %#lx\n", status ); + ok( status == STATUS_BUFFER_TOO_SMALL, "got %#lx\n", status ); ok( context == 0xdeadbeef, "got context %#lx\n", context ); - todo_wine ok( size == needed_size, "expected size %lu, got %lu\n", needed_size, size ); + ok( size == needed_size, "expected size %lu, got %lu\n", needed_size, size ); size = 0xdeadbeef; memset( buffer, 0xcc, sizeof(buffer) ); diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 46facdd2b0e..efbe363c210 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -1104,13 +1104,12 @@ NTSTATUS WINAPI NtQueryDirectoryObject( HANDLE handle, DIRECTORY_BASIC_INFORMATI if (single_entry) { - if (size <= sizeof(*buffer) + 2 * sizeof(WCHAR)) return STATUS_BUFFER_OVERFLOW; - SERVER_START_REQ( get_directory_entry ) { req->handle = wine_server_obj_handle( handle ); req->index = index; - wine_server_set_reply( req, buffer + 1, size - sizeof(*buffer) - 2*sizeof(WCHAR) ); + if (size >= sizeof(*buffer) + 2 * sizeof(WCHAR)) + wine_server_set_reply( req, buffer + 1, size - sizeof(*buffer) - 2 * sizeof(WCHAR) ); if (!(ret = wine_server_call( req ))) { buffer->ObjectName.Buffer = (WCHAR *)(buffer + 1);

1 0

Daniel Lehman : include: Add some math declarations.
by Alexandre Julliard April 13, 2022

April 13, 2022

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 NtUserCallOneParam calls.
by Alexandre Julliard April 13, 2022

April 13, 2022

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: Introduce inline helpers for NtUserCallNoParam calls.
by Alexandre Julliard April 13, 2022

April 13, 2022

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 : winex11: Directly use win32u for user functions in window.c.
by Alexandre Julliard April 13, 2022

April 13, 2022

Module: wine Branch: master Commit: 55f4cf8c851cc156c5b77f9e333e4feed61387b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55f4cf8c851cc156c5b77f9e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 13 15:08:59 2022 +0200 winex11: Directly use win32u for user functions in window.c. 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/window.c | 205 ++++++++++++++++++++++++---------------------- dlls/winex11.drv/x11drv.h | 19 +++++ 2 files changed, 124 insertions(+), 100 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=55f4cf8c851cc156c5b7…

1 0