December 2023 - Wine-commits

Zebediah Figura : quartz: Specify the mode as a VMRMode.
by Alexandre Julliard 06 Dec '23

06 Dec '23

Module: wine Branch: master Commit: 2c1dcf4b28dfdbbea31be17ed5e482c04731d791 URL: https://gitlab.winehq.org/wine/wine/-/commit/2c1dcf4b28dfdbbea31be17ed5e482… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Dec 6 12:46:46 2023 -0600 quartz: Specify the mode as a VMRMode. --- dlls/quartz/vmr7.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/quartz/vmr7.c b/dlls/quartz/vmr7.c index 8f8d6d4e89c..4770543b614 100644 --- a/dlls/quartz/vmr7.c +++ b/dlls/quartz/vmr7.c @@ -69,7 +69,7 @@ struct vmr7 DWORD stream_count; DWORD mixing_prefs; - VMR9Mode mode; + VMRMode mode; HMODULE d3d9_module; @@ -312,7 +312,7 @@ static HRESULT allocate_surfaces(struct vmr7 *filter, const AM_MEDIA_TYPE *mt) TRACE("Initializing in mode %u, our window %p, clipping window %p.\n", filter->mode, filter->window.hwnd, filter->clipping_window); - if (filter->mode == VMR9Mode_Windowless && !filter->clipping_window) + if (filter->mode == VMRMode_Windowless && !filter->clipping_window) return S_OK; info.Pool = D3DPOOL_DEFAULT; @@ -468,9 +468,9 @@ static HRESULT vmr_query_interface(struct strmbase_renderer *iface, REFIID iid, *out = &filter->IVMRFilterConfig_iface; else if (IsEqualGUID(iid, &IID_IVMRMonitorConfig)) *out = &filter->IVMRMonitorConfig_iface; - else if (IsEqualGUID(iid, &IID_IVMRSurfaceAllocatorNotify) && filter->mode == (VMR9Mode)VMRMode_Renderless) + else if (IsEqualGUID(iid, &IID_IVMRSurfaceAllocatorNotify) && filter->mode == VMRMode_Renderless) *out = &filter->IVMRSurfaceAllocatorNotify_iface; - else if (IsEqualGUID(iid, &IID_IVMRWindowlessControl) && filter->mode == (VMR9Mode)VMRMode_Windowless) + else if (IsEqualGUID(iid, &IID_IVMRWindowlessControl) && filter->mode == VMRMode_Windowless) *out = &filter->IVMRWindowlessControl_iface; else return E_NOINTERFACE; @@ -821,8 +821,8 @@ static HRESULT WINAPI filter_config_SetRenderingMode(IVMRFilterConfig *iface, DW switch (mode) { - case VMR9Mode_Windowed: - case VMR9Mode_Windowless: + case VMRMode_Windowed: + case VMRMode_Windowless: if (FAILED(hr = default_presenter_create(filter, &default_presenter))) { ERR("Failed to create default presenter, hr %#lx.\n", hr); @@ -834,7 +834,7 @@ static HRESULT WINAPI filter_config_SetRenderingMode(IVMRFilterConfig *iface, DW IVMRImagePresenter9_AddRef(filter->presenter); break; - case VMR9Mode_Renderless: + case VMRMode_Renderless: break; default: @@ -842,7 +842,7 @@ static HRESULT WINAPI filter_config_SetRenderingMode(IVMRFilterConfig *iface, DW return E_INVALIDARG; } - if (mode != VMR9Mode_Windowed) + if (mode != VMRMode_Windowed) video_window_cleanup(&filter->window); filter->mode = mode; @@ -1987,7 +1987,7 @@ static HRESULT WINAPI VMR9_SurfaceAllocator_InitializeDevice(IVMRSurfaceAllocato presenter->info = *info; - if (presenter->vmr->mode == VMR9Mode_Windowed) + if (presenter->vmr->mode == VMRMode_Windowed) window = presenter->vmr->window.hwnd; else window = presenter->vmr->clipping_window;

1 0

Jacek Caban : win32u: Provide extra space in buffers used to dispatch string getter messages.
by Alexandre Julliard 06 Dec '23

06 Dec '23

Module: wine Branch: master Commit: 10424f0dbd160bf5c76551b9098d0ba41eb4f76b URL: https://gitlab.winehq.org/wine/wine/-/commit/10424f0dbd160bf5c76551b9098d0b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 6 18:27:25 2023 +0100 win32u: Provide extra space in buffers used to dispatch string getter messages. --- dlls/win32u/hook.c | 3 ++- dlls/win32u/message.c | 38 +++++++++++++++++++++++++------------- dlls/win32u/tests/win32u.c | 21 ++++++++++++++++++++- dlls/win32u/win32u_private.h | 2 +- 4 files changed, 48 insertions(+), 16 deletions(-) diff --git a/dlls/win32u/hook.c b/dlls/win32u/hook.c index e9b3ae7d70d..378eda40abb 100644 --- a/dlls/win32u/hook.c +++ b/dlls/win32u/hook.c @@ -241,6 +241,7 @@ static LRESULT call_hook( struct win_hook_params *info, const WCHAR *module, siz HHOOK prev = thread_info->hook; BOOL prev_unicode = thread_info->hook_unicode; struct win_hook_params *params = info; + size_t reply_size; void *ret_ptr; ULONG ret_len; @@ -252,7 +253,7 @@ static LRESULT call_hook( struct win_hook_params *info, const WCHAR *module, siz { CBT_CREATEWNDW *cbtc = (CBT_CREATEWNDW *)params->lparam; message_size = user_message_size( (HWND)params->wparam, WM_NCCREATE, - 0, (LPARAM)cbtc->lpcs, TRUE, FALSE ); + 0, (LPARAM)cbtc->lpcs, TRUE, FALSE, &reply_size ); lparam_size = lparam_ret_size = 0; } diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 56391977eae..91f836a60bd 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -1624,11 +1624,15 @@ static size_t copy_string( void *ptr, const void *str, BOOL ansi ) * Calculate size of packed message buffer. */ size_t user_message_size( HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam, - BOOL other_process, BOOL ansi ) + BOOL other_process, BOOL ansi, size_t *reply_size ) { const void *lparam_ptr = (const void *)lparam; size_t size = 0; + /* Windows provices space for at least 2048 bytes for string getters, which + * mitigates problems with buffer overflows. */ + static const size_t min_string_buffer_size = 2048; + switch (message) { case WM_NCCREATE: @@ -1645,8 +1649,8 @@ size_t user_message_size( HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam, break; case WM_GETTEXT: case WM_ASKCBFORMATNAME: - size = wparam * char_size( ansi ); - break; + *reply_size = wparam * char_size( ansi ); + return max( *reply_size, min_string_buffer_size ); case WM_WININICHANGE: case WM_SETTEXT: case WM_DEVMODECHANGE: @@ -1730,13 +1734,17 @@ size_t user_message_size( HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam, size = wparam * sizeof(UINT); break; case CB_GETLBTEXT: - size = send_message_timeout( hwnd, CB_GETLBTEXTLEN, wparam, 0, SMTO_NORMAL, 0, ansi ); - size = (size + 1) * char_size( ansi ); - break; + { + size_t len = send_message_timeout( hwnd, CB_GETLBTEXTLEN, wparam, 0, SMTO_NORMAL, 0, ansi ); + *reply_size = (len + 1) * char_size( ansi ); + return max( *reply_size, min_string_buffer_size ); + } case LB_GETTEXT: - size = send_message_timeout( hwnd, LB_GETTEXTLEN, wparam, 0, SMTO_NORMAL, 0, ansi ); - size = (size + 1) * char_size( ansi ); - break; + { + size_t len = send_message_timeout( hwnd, LB_GETTEXTLEN, wparam, 0, SMTO_NORMAL, 0, ansi ); + *reply_size = (len + 1) * char_size( ansi ); + return max( *reply_size, min_string_buffer_size ); + } case LB_GETSELITEMS: size = wparam * sizeof(UINT); break; @@ -1766,7 +1774,7 @@ size_t user_message_size( HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam, break; } - return size; + return *reply_size = size; } /*********************************************************************** @@ -1859,6 +1867,10 @@ void pack_user_message( void *buffer, size_t size, UINT message, return; } break; + case CB_GETLBTEXT: + case LB_GETTEXT: + if (size) memset( buffer, 0, size ); + return; } if (size) memcpy( buffer, lparam_ptr, size ); @@ -2167,7 +2179,7 @@ static LRESULT call_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpar { struct win_proc_params p, *params = &p; BOOL ansi = ansi_dst && type == MSG_ASCII; - size_t packed_size = 0, offset = sizeof(*params); + size_t packed_size = 0, offset = sizeof(*params), reply_size; LRESULT result = 0; CWPSTRUCT cwp; CWPRETSTRUCT cwpret; @@ -2179,7 +2191,7 @@ static LRESULT call_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpar if (!is_current_thread_window( hwnd )) return 0; - packed_size = user_message_size( hwnd, msg, wparam, lparam, type == MSG_OTHER_PROCESS, ansi ); + packed_size = user_message_size( hwnd, msg, wparam, lparam, type == MSG_OTHER_PROCESS, ansi, &reply_size ); /* first the WH_CALLWNDPROC hook */ cwp.lParam = lparam; @@ -2208,7 +2220,7 @@ static LRESULT call_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpar result = dispatch_win_proc_params( params, offset + packed_size, &ret_ptr, &ret_len ); if (params != &p) free( params ); - copy_user_result( ret_ptr, min( ret_len, packed_size ), result, msg, wparam, lparam, ansi ); + copy_user_result( ret_ptr, min( ret_len, reply_size ), result, msg, wparam, lparam, ansi ); /* and finally the WH_CALLWNDPROCRET hook */ cwpret.lResult = result; diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c index e118d081ead..f7fe74ed34c 100644 --- a/dlls/win32u/tests/win32u.c +++ b/dlls/win32u/tests/win32u.c @@ -1382,6 +1382,19 @@ static LPARAM callwnd_hook_lparam, callwnd_hook_lparam2, retwnd_hook_lparam, ret static LPARAM wndproc_lparam; static char lparam_buffer[521]; +static void check_zero_memory( const char *mem, size_t size ) +{ + size_t i; + for (i = 0; i < size; i++) + { + if (mem[i]) + { + ok( 0, "non-zero byte %x at offset %Iu\n", mem[i], i ); + return; + } + } +} + static void check_params( const struct lparam_hook_test *test, UINT message, WPARAM wparam, LPARAM lparam, BOOL is_ret ) { @@ -1428,8 +1441,14 @@ static void check_params( const struct lparam_hook_test *test, UINT message, } break; + case CB_GETLBTEXT: + case LB_GETTEXT: + check_zero_memory( (const char *)lparam, 2048 ); + break; + default: - if (test->check_size) { + if (test->check_size) + { const void *expected; if (is_ret && test->check_lparam) expected = test->check_lparam; diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 65105c4c1a6..b08c0ceb716 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -141,7 +141,7 @@ extern BOOL send_notify_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpar extern LRESULT send_message_timeout( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, UINT flags, UINT timeout, BOOL ansi ); extern size_t user_message_size( HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam, - BOOL other_process, BOOL ansi ); + BOOL other_process, BOOL ansi, size_t *reply_size ); extern void pack_user_message( void *buffer, size_t size, UINT message, WPARAM wparam, LPARAM lparam, BOOL ansi );

1 0

Jacek Caban : user32: Remove unused argument for unpack_message.
by Alexandre Julliard 06 Dec '23

06 Dec '23

Module: wine Branch: master Commit: 814807a1d9ba4bf7bb755e0d6b836c948fb2e026 URL: https://gitlab.winehq.org/wine/wine/-/commit/814807a1d9ba4bf7bb755e0d6b836c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 6 18:30:53 2023 +0100 user32: Remove unused argument for unpack_message. --- dlls/user32/hook.c | 6 +++--- dlls/user32/user_private.h | 2 +- dlls/user32/winproc.c | 5 ++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index b2e213f42fe..024bb5b7116 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -478,7 +478,7 @@ BOOL WINAPI User32CallWindowsHook( struct win_hook_params *params, ULONG size ) { cbtc.hwndInsertAfter = HWND_TOP; unpack_message( (HWND)params->wparam, WM_CREATE, NULL, (LPARAM *)&cbtc.lpcs, - ret_ptr, ret_size, FALSE ); + ret_ptr, FALSE ); params->lparam = (LPARAM)&cbtc; ret_size = sizeof(*cbtc.lpcs); } @@ -490,7 +490,7 @@ BOOL WINAPI User32CallWindowsHook( struct win_hook_params *params, ULONG size ) size_t offset = (lparam_offset + sizeof(*cwp) + 15) & ~15; unpack_message( cwp->hwnd, cwp->message, &cwp->wParam, &cwp->lParam, - (char *)params + offset, size - offset, !params->prev_unicode ); + (char *)params + offset, !params->prev_unicode ); ret_size = 0; break; } @@ -501,7 +501,7 @@ BOOL WINAPI User32CallWindowsHook( struct win_hook_params *params, ULONG size ) size_t offset = (lparam_offset + sizeof(*cwpret) + 15) & ~15; unpack_message( cwpret->hwnd, cwpret->message, &cwpret->wParam, &cwpret->lParam, - (char *)params + offset, size - offset, !params->prev_unicode ); + (char *)params + offset, !params->prev_unicode ); ret_size = 0; break; } diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index a9bbdd16fb0..50d4005d973 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -52,7 +52,7 @@ extern BOOL unpack_dde_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM extern void free_cached_data( UINT format, HANDLE handle ); extern HANDLE render_synthesized_format( UINT format, UINT from ); extern void unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam, - void *buffer, size_t size, BOOL ansi ); + void *buffer, BOOL ansi ); extern void CLIPBOARD_ReleaseOwner( HWND hwnd ); extern HDC get_display_dc(void); diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 8804199aed1..d2e4b29fc44 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -738,8 +738,7 @@ static size_t string_size( const void *str, BOOL ansi ) * * Unpack a message received from win32u. */ -void unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam, - void *buffer, size_t size, BOOL ansi ) +void unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam, void *buffer, BOOL ansi ) { switch(message) { @@ -816,7 +815,7 @@ BOOL WINAPI User32CallWindowProc( struct win_proc_params *params, ULONG size ) buffer = (char *)params + offset; unpack_message( params->hwnd, params->msg, &params->wparam, &params->lparam, - buffer, packed_size, params->ansi ); + buffer, params->ansi ); } result = dispatch_win_proc_params( params );

1 0

Daniel Lehman : msxml3: Handle default namespace in get_prefix.
by Alexandre Julliard 06 Dec '23

06 Dec '23

Module: wine Branch: master Commit: f0c08bd01e6d3b01bfc28961bb5922b94ecbb7bc URL: https://gitlab.winehq.org/wine/wine/-/commit/f0c08bd01e6d3b01bfc28961bb5922… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Tue Nov 28 21:51:28 2023 -0800 msxml3: Handle default namespace in get_prefix. --- dlls/msxml3/attribute.c | 13 +++++-------- dlls/msxml3/tests/domdoc.c | 2 -- dlls/msxml4/tests/domdoc.c | 2 -- dlls/msxml6/tests/domdoc.c | 2 -- 4 files changed, 5 insertions(+), 14 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index 89a1f630021..76c690e1ad0 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -589,14 +589,11 @@ static HRESULT WINAPI domattr_get_prefix( *prefix = NULL; - if (ns) - { - /* special case for default namespace definition */ - if (xmlStrEqual(This->node.node->name, xmlns)) - *prefix = bstr_from_xmlChar(xmlns); - else if (ns->prefix) - *prefix = bstr_from_xmlChar(ns->prefix); - } + if (xmldoc_version(This->node.node->doc) != MSXML6 && + xmlStrEqual(This->node.node->name, xmlns)) + *prefix = bstr_from_xmlChar(xmlns); + else if (ns && ns->prefix) + *prefix = bstr_from_xmlChar(ns->prefix); TRACE("prefix: %s\n", debugstr_w(*prefix)); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 3117ddabe4e..7997106bbd0 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -13785,10 +13785,8 @@ static void test_namespaces_as_attributes(void) hr = IXMLDOMNode_get_prefix(item, &str); if (test->prefixes[i]) { - todo_wine_if(test->todo) { ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!lstrcmpW(str, _bstr_(test->prefixes[i])), "got %s\n", wine_dbgstr_w(str)); - } SysFreeString(str); } else diff --git a/dlls/msxml4/tests/domdoc.c b/dlls/msxml4/tests/domdoc.c index b2af7a1658e..3c5c34f3cb7 100644 --- a/dlls/msxml4/tests/domdoc.c +++ b/dlls/msxml4/tests/domdoc.c @@ -269,11 +269,9 @@ static void test_namespaces_as_attributes(void) if (test->prefixes[i]) { /* MSXML4 can report different results with different service packs */ - todo_wine_if(test->todo) { ok(hr == S_OK || broken(hr == S_FALSE), "Unexpected hr %#lx.\n", hr); ok(!lstrcmpW(str, test->prefixes[i]) || broken(!str), "got %s\n", wine_dbgstr_w(str)); - } SysFreeString(str); } else diff --git a/dlls/msxml6/tests/domdoc.c b/dlls/msxml6/tests/domdoc.c index 9283379731d..b36b8e6510a 100644 --- a/dlls/msxml6/tests/domdoc.c +++ b/dlls/msxml6/tests/domdoc.c @@ -105,10 +105,8 @@ static void test_create_attribute(void) } else { - todo_wine_if(ptr->todo) { ok(hr == S_FALSE, "%d: unexpected hr %#lx\n", i, hr); ok(str == NULL, "%d: got prefix %s\n", i, wine_dbgstr_w(str)); - } } SysFreeString(str);

1 0

Brendan Shanks : winemac: Use RTL_CONSTANT_STRING.
by Alexandre Julliard 06 Dec '23

06 Dec '23

Module: wine Branch: master Commit: e4ec6f87e0be4c4ea9908bc22b59c829a2e4ad67 URL: https://gitlab.winehq.org/wine/wine/-/commit/e4ec6f87e0be4c4ea9908bc22b59c8… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Dec 5 14:32:24 2023 -0800 winemac: Use RTL_CONSTANT_STRING. --- dlls/winemac.drv/clipboard.c | 3 +-- dlls/winemac.drv/display.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index ef0c3ae9c25..5a1065cf7c4 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1665,8 +1665,7 @@ void macdrv_UpdateClipboard(void) if (!NtUserIsWindow(clipboard_manager)) { - UNICODE_STRING str; - RtlInitUnicodeString(&str, clipboard_classname); + UNICODE_STRING str = RTL_CONSTANT_STRING(clipboard_classname); clipboard_manager = NtUserFindWindowEx(NULL, NULL, &str, NULL, 0); if (!clipboard_manager) { diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 14c09649211..9bc8c79896f 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -149,7 +149,7 @@ static BOOL write_display_settings(HKEY parent_hkey, CGDirectDisplayID displayID char display_key_name[19]; HKEY display_hkey; CGDisplayModeRef display_mode; - UNICODE_STRING str; + UNICODE_STRING str = RTL_CONSTANT_STRING(pixelencodingW); DWORD val; CFStringRef pixel_encoding; size_t len; @@ -189,7 +189,6 @@ static BOOL write_display_settings(HKEY parent_hkey, CGDirectDisplayID displayID CFStringGetCharacters(pixel_encoding, CFRangeMake(0, len), (UniChar*)buf); buf[len] = 0; CFRelease(pixel_encoding); - RtlInitUnicodeString(&str, pixelencodingW); if (NtSetValueKey(display_hkey, &str, 0, REG_SZ, (const BYTE*)buf, (len + 1) * sizeof(WCHAR))) goto fail;

1 0

Nikolay Sivov : include: Add missing enum to wdm.h.
by Alexandre Julliard 06 Dec '23

06 Dec '23

Module: wine Branch: master Commit: dbeaaf2b0fa4bab687b434a23f258088c07a7fd3 URL: https://gitlab.winehq.org/wine/wine/-/commit/dbeaaf2b0fa4bab687b434a23f2580… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 5 21:27:13 2023 +0100 include: Add missing enum to wdm.h. --- include/ddk/wdm.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 7dcec028a50..54b9e6aa199 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1657,8 +1657,12 @@ static inline void IoCopyCurrentIrpStackLocationToNext(IRP *irp) next->Control = 0; } -#define KernelMode 0 -#define UserMode 1 +typedef enum _MODE +{ + KernelMode, + UserMode, + MaximumMode +} MODE; /* directory object access rights */ #define DIRECTORY_QUERY 0x0001

1 0

Nikolay Sivov : ntdll: Use public type for SystemSupportedProcessorArchitectures returned data.
by Alexandre Julliard 06 Dec '23

06 Dec '23

Module: wine Branch: master Commit: 26f11bdfe5365d8fa9354b530638b42de6aa2c42 URL: https://gitlab.winehq.org/wine/wine/-/commit/26f11bdfe5365d8fa9354b530638b4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Dec 5 17:41:33 2023 +0100 ntdll: Use public type for SystemSupportedProcessorArchitectures returned data. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ntdll/process.c | 20 +++++++++--------- dlls/ntdll/tests/wow64.c | 48 +++++++++++++++++++++----------------------- dlls/ntdll/unix/system.c | 23 +++++++++++++++------ dlls/wow64/system.c | 2 +- include/winnt.h | 11 ++++++++++ programs/regsvr32/regsvr32.c | 9 +++++---- programs/wineboot/wineboot.c | 17 ++++++++-------- 7 files changed, 76 insertions(+), 54 deletions(-)

1 0

Alexandre Julliard : ntdll: Add a helper to build a path and exec it.
by Alexandre Julliard 06 Dec '23

06 Dec '23

Module: wine Branch: master Commit: 7c777af498cbc93a95292577f5e613fd0d8b34ce URL: https://gitlab.winehq.org/wine/wine/-/commit/7c777af498cbc93a95292577f5e613… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 6 10:48:06 2023 +0100 ntdll: Add a helper to build a path and exec it. --- dlls/ntdll/unix/loader.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 090f9906e9f..7b7005d282d 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -297,14 +297,26 @@ static char *build_path( const char *dir, const char *name ) size_t len = strlen( dir ); char *ret = malloc( len + strlen( name ) + 2 ); - memcpy( ret, dir, len ); - if (len && ret[len - 1] != '/') ret[len++] = '/'; - if (name[0] == '/') name++; + if (len) + { + memcpy( ret, dir, len ); + if (ret[len - 1] != '/') ret[len++] = '/'; + if (name[0] == '/') name++; + } strcpy( ret + len, name ); return ret; } +/* build a path to a binary and exec it */ +static void build_path_and_exec( const char *dir, const char *name, char **argv ) +{ + argv[0] = build_path( dir, name ); + execv( argv[0], argv ); + free( argv[0] ); +} + + static const char *get_pe_dir( WORD machine ) { if (!machine) machine = current_machine; @@ -564,34 +576,22 @@ static void exec_wineserver( char **argv ) if (!is_win64) /* look for 64-bit server */ { char *loader = realpath_dirname( build_path( build_dir, "loader/wine64" )); - if (loader) - { - argv[0] = build_path( loader, "../server/wineserver" ); - execv( argv[0], argv ); - } + if (loader) build_path_and_exec( loader, "../server/wineserver", argv ); } - argv[0] = build_path( build_dir, "server/wineserver" ); - execv( argv[0], argv ); + build_path_and_exec( build_dir, "server/wineserver", argv ); return; } - argv[0] = build_path( bin_dir, "wineserver" ); - execv( argv[0], argv ); + build_path_and_exec( bin_dir, "wineserver", argv ); - argv[0] = getenv( "WINESERVER" ); - if (argv[0]) execv( argv[0], argv ); + if ((path = getenv( "WINESERVER" ))) build_path_and_exec( "", path, argv ); if ((path = getenv( "PATH" ))) { for (path = strtok( strdup( path ), ":" ); path; path = strtok( NULL, ":" )) - { - argv[0] = build_path( path, "wineserver" ); - execvp( argv[0], argv ); - } + build_path_and_exec( path, "wineserver", argv ); } - - argv[0] = build_path( BINDIR, "wineserver" ); - execv( argv[0], argv ); + build_path_and_exec( BINDIR, "wineserver", argv ); }

1 0

Alexandre Julliard : ntdll: Use posix_spawn() to start the server.
by Alexandre Julliard 06 Dec '23

06 Dec '23

Module: wine Branch: master Commit: 48182726e93be7a573c989c822b52eb56d5fbad9 URL: https://gitlab.winehq.org/wine/wine/-/commit/48182726e93be7a573c989c822b52e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 6 11:38:45 2023 +0100 ntdll: Use posix_spawn() to start the server. Based on a patch by Brendan Shanks. --- dlls/ntdll/unix/loader.c | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 7b7005d282d..ee71584b953 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -30,6 +30,7 @@ #include <stdarg.h> #include <stdio.h> #include <signal.h> +#include <spawn.h> #include <string.h> #include <stdlib.h> #include <sys/types.h> @@ -69,7 +70,6 @@ # include <mach/mach_error.h> # include <mach-o/getsect.h> # include <crt_externs.h> -# include <spawn.h> # ifndef _POSIX_SPAWN_DISABLE_ASLR # define _POSIX_SPAWN_DISABLE_ASLR 0x0100 # endif @@ -77,6 +77,7 @@ #ifdef __ANDROID__ # include <jni.h> #endif +extern char **environ; #include "ntstatus.h" #define WIN32_NO_STATUS @@ -309,11 +310,14 @@ static char *build_path( const char *dir, const char *name ) /* build a path to a binary and exec it */ -static void build_path_and_exec( const char *dir, const char *name, char **argv ) +static int build_path_and_exec( pid_t *pid, const char *dir, const char *name, char **argv ) { + int ret; + argv[0] = build_path( dir, name ); - execv( argv[0], argv ); + ret = posix_spawn( pid, argv[0], NULL, NULL, argv, environ ); free( argv[0] ); + return ret; } @@ -567,7 +571,7 @@ NTSTATUS exec_wineloader( char **argv, int socketfd, const pe_image_info_t *pe_i * * Exec a new wine server. */ -static void exec_wineserver( char **argv ) +static int exec_wineserver( pid_t *pid, char **argv ) { char *path; @@ -576,22 +580,20 @@ static void exec_wineserver( char **argv ) if (!is_win64) /* look for 64-bit server */ { char *loader = realpath_dirname( build_path( build_dir, "loader/wine64" )); - if (loader) build_path_and_exec( loader, "../server/wineserver", argv ); + if (loader && !build_path_and_exec( pid, loader, "../server/wineserver", argv )) return 0; } - build_path_and_exec( build_dir, "server/wineserver", argv ); - return; + return build_path_and_exec( pid, build_dir, "server/wineserver", argv ); } - build_path_and_exec( bin_dir, "wineserver", argv ); - - if ((path = getenv( "WINESERVER" ))) build_path_and_exec( "", path, argv ); + if (!build_path_and_exec( pid, bin_dir, "wineserver", argv )) return 0; + if ((path = getenv( "WINESERVER" )) && !build_path_and_exec( pid, "", path, argv )) return 0; if ((path = getenv( "PATH" ))) { for (path = strtok( strdup( path ), ":" ); path; path = strtok( NULL, ":" )) - build_path_and_exec( path, "wineserver", argv ); + if (!build_path_and_exec( pid, path, "wineserver", argv )) return 0; } - build_path_and_exec( BINDIR, "wineserver", argv ); + return build_path_and_exec( pid, BINDIR, "wineserver", argv ); } @@ -609,15 +611,11 @@ void start_server( BOOL debug ) if (!started) { int status; - int pid = fork(); - if (pid == -1) fatal_error( "fork: %s", strerror(errno) ); - if (!pid) - { - argv[1] = debug ? debug_flag : NULL; - argv[2] = NULL; - exec_wineserver( argv ); - fatal_error( "could not exec wineserver\n" ); - } + pid_t pid; + + argv[1] = debug ? debug_flag : NULL; + argv[2] = NULL; + if (exec_wineserver( &pid, argv )) fatal_error( "could not exec wineserver\n" ); waitpid( pid, &status, 0 ); status = WIFEXITED(status) ? WEXITSTATUS(status) : 1; if (status == 2) return; /* server lock held by someone else, will retry later */

1 0

Alexandre Julliard : ntdll: Export KeAddSystemServiceTable() instead of the KeServiceDescriptorTable variable.
by Alexandre Julliard 06 Dec '23

06 Dec '23

Module: wine Branch: master Commit: 0fea0db866d843c14070a45b3f5e5fb26d4c5cb9 URL: https://gitlab.winehq.org/wine/wine/-/commit/0fea0db866d843c14070a45b3f5e5f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 6 12:42:34 2023 +0100 ntdll: Export KeAddSystemServiceTable() instead of the KeServiceDescriptorTable variable. --- dlls/ntdll/unix/loader.c | 15 +++++++++++++++ dlls/win32u/syscall.c | 15 +++------------ include/wine/unixlib.h | 3 ++- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index ee71584b953..803d8079213 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -625,6 +625,21 @@ void start_server( BOOL debug ) } +/*********************************************************************** + * KeAddSystemServiceTable + */ +BOOLEAN KeAddSystemServiceTable( ULONG_PTR *funcs, ULONG_PTR *counters, ULONG limit, + BYTE *arguments, ULONG index ) +{ + if (index >= ARRAY_SIZE(KeServiceDescriptorTable)) return FALSE; + KeServiceDescriptorTable[index].ServiceTable = funcs; + KeServiceDescriptorTable[index].CounterTable = counters; + KeServiceDescriptorTable[index].ServiceLimit = limit; + KeServiceDescriptorTable[index].ArgumentTable = arguments; + return TRUE; +} + + /************************************************************************* * map_so_dll * diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 2320ac18744..c03118821d9 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -36,9 +36,9 @@ ULONG_PTR zero_bits = 0; -static void * const syscalls[] = +static ULONG_PTR syscalls[] = { -#define SYSCALL_ENTRY(id,name,args) name, +#define SYSCALL_ENTRY(id,name,args) (ULONG_PTR)name, #ifdef _WIN64 ALL_SYSCALLS64 #else @@ -58,14 +58,6 @@ static BYTE arguments[ARRAY_SIZE(syscalls)] = #undef SYSCALL_ENTRY }; -static const SYSTEM_SERVICE_TABLE syscall_table = -{ - (ULONG_PTR *)syscalls, - 0, - ARRAY_SIZE(syscalls), - arguments -}; - static NTSTATUS init( void *args ) { #ifdef _WIN64 @@ -77,8 +69,7 @@ static NTSTATUS init( void *args ) zero_bits = (ULONG_PTR)info.HighestUserAddress | 0x7fffffff; } #endif - - KeServiceDescriptorTable[1] = syscall_table; + KeAddSystemServiceTable( syscalls, NULL, ARRAY_SIZE(syscalls), arguments, 1 ); return STATUS_SUCCESS; } diff --git a/include/wine/unixlib.h b/include/wine/unixlib.h index 2a615179e64..04978dcd680 100644 --- a/include/wine/unixlib.h +++ b/include/wine/unixlib.h @@ -31,7 +31,6 @@ typedef NTSTATUS (*unixlib_entry_t)( void *args ); extern DECLSPEC_EXPORT const unixlib_entry_t __wine_unix_call_funcs[]; extern DECLSPEC_EXPORT const unixlib_entry_t __wine_unix_call_wow64_funcs[]; -extern DECLSPEC_EXPORT SYSTEM_SERVICE_TABLE KeServiceDescriptorTable[4]; /* some useful helpers from ntdll */ NTSYSAPI const char *ntdll_get_build_dir(void); @@ -84,6 +83,8 @@ NTSYSAPI void ntdll_set_exception_jmp_buf( __wine_jmp_buf *jmp ); } \ } while (0); +NTSYSAPI BOOLEAN KeAddSystemServiceTable( ULONG_PTR *funcs, ULONG_PTR *counters, ULONG limit, + BYTE *arguments, ULONG index ); NTSYSAPI NTSTATUS KeUserModeCallback( ULONG id, const void *args, ULONG len, void **ret_ptr, ULONG *ret_len ); /* wide char string functions */

1 0