September 2023 - Wine-Commits

Alexandre Julliard : ntdll: Fixup the pc address for breakpoint exceptions on ARM64.
by Alexandre Julliard Sept. 15, 2023

Sept. 15, 2023

Module: wine Branch: master Commit: 4fabaa6a284fc9409faff03d69f5b48efc8e8aa6 URL: https://gitlab.winehq.org/wine/wine/-/commit/4fabaa6a284fc9409faff03d69f5b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 15 15:57:09 2023 +0200 ntdll: Fixup the pc address for breakpoint exceptions on ARM64. --- dlls/ntdll/unix/signal_arm64.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 6dbc3fd5a59..4897b8e1824 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -1018,6 +1018,9 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) return; } + /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */ + if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context.Pc -= 4; + stack = virtual_setup_exception( stack_ptr, (sizeof(*stack) + 15) & ~15, rec ); stack->rec = *rec; stack->context = context; @@ -1336,6 +1339,7 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) NtRaiseException( &rec, &ctx, FALSE ); return; } + PC_sig( context ) += 4; /* skip the brk instruction */ rec.ExceptionCode = EXCEPTION_BREAKPOINT; rec.NumberParameters = 1; break;

1 0

Alexandre Julliard : ntdll: Fix the hardcoded selector values for ARM64.
by Alexandre Julliard Sept. 15, 2023

Sept. 15, 2023

Module: wine Branch: master Commit: 75b3022aaa706663d968f7203a59ec9a38544dc3 URL: https://gitlab.winehq.org/wine/wine/-/commit/75b3022aaa706663d968f7203a59ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 15 15:56:37 2023 +0200 ntdll: Fix the hardcoded selector values for ARM64. --- dlls/ntdll/process.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 4ddf3ad59bd..3ca4195ab3d 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -249,13 +249,14 @@ NTSTATUS WINAPI RtlWow64GetThreadSelectorEntry( HANDLE handle, THREAD_DESCRIPTOR if (RtlWow64GetThreadContext( handle, &context )) { /* hardcoded values */ - context.SegCs = 0x23; #ifdef __x86_64__ + context.SegCs = 0x23; __asm__( "movw %%fs,%0" : "=m" (context.SegFs) ); __asm__( "movw %%ss,%0" : "=m" (context.SegSs) ); #else - context.SegSs = 0x2b; - context.SegFs = 0x53; + context.SegCs = 0x1b; + context.SegSs = 0x23; + context.SegFs = 0x3b; #endif }

1 0

Piotr Caban : wineps: Remove dynamic glyph list.
by Alexandre Julliard Sept. 15, 2023

Sept. 15, 2023

Module: wine Branch: master Commit: a59336bc31a762f972ba8b960c6dc5010bd5cff0 URL: https://gitlab.winehq.org/wine/wine/-/commit/a59336bc31a762f972ba8b960c6dc5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 25 20:00:01 2023 +0200 wineps: Remove dynamic glyph list. We can't do much without unicode mapping. --- dlls/wineps.drv/Makefile.in | 1 - dlls/wineps.drv/afm.c | 5 -- dlls/wineps.drv/glyphlist.c | 201 -------------------------------------------- dlls/wineps.drv/psdrv.h | 3 - dlls/wineps.drv/type1afm.c | 82 ++++++++---------- 5 files changed, 33 insertions(+), 259 deletions(-)

1 0

Piotr Caban : wineps: Fix EMRPOLYDRAW16 printing.
by Alexandre Julliard Sept. 15, 2023

Sept. 15, 2023

Module: wine Branch: master Commit: 4d26d30574b2162eabde73140ab0fac18cfb46ff URL: https://gitlab.winehq.org/wine/wine/-/commit/4d26d30574b2162eabde73140ab0fa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Sep 14 20:47:35 2023 +0200 wineps: Fix EMRPOLYDRAW16 printing. It fixes EMRPOLYDRAW16 printing when -O2 option is used (in GCC 12.3.1). The compiler assumes that apts table has 0 or 1 elements and optimizes the loop out. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55486 --- dlls/wineps.drv/printproc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index b899814f8c1..74f43b6d27c 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -2738,8 +2738,8 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, if (!pts) return 0; for (i = 0; i < p->cpts; i++) { - pts[i].x = p->apts[i].x; - pts[i].y = p->apts[i].y; + pts[i].x = ((const POINTS *)p->apts)[i].x; + pts[i].y = ((const POINTS *)p->apts)[i].y; } i = poly_draw(data->ctx, pts, (BYTE *)(p->apts + p->cpts), p->cpts) && MoveToEx(data->ctx->hdc, pts[p->cpts - 1].x, pts[p->cpts - 1].y, NULL);

1 0

Gerald Pfeifer : ntdll: Fix leave_handler for FreeBSD and NetBSD.
by Alexandre Julliard Sept. 15, 2023

Sept. 15, 2023

Module: wine Branch: master Commit: 4ae4accac55e5e0e1e1a2cf8efc93634f8bb82e1 URL: https://gitlab.winehq.org/wine/wine/-/commit/4ae4accac55e5e0e1e1a2cf8efc936… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Sep 15 02:55:28 2023 +0000 ntdll: Fix leave_handler for FreeBSD and NetBSD. With recent changes leave_handler writes to some of its parameter's fields (via DS_sig and ES_sig) on FreeBSD and NetBSD - which fails since it is declared const. Accordingly strip const-ness. --- dlls/ntdll/unix/signal_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 71e23ae46fc..48b5b4d5de9 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -812,7 +812,7 @@ static inline ucontext_t *init_handler( void *sigcontext ) /*********************************************************************** * leave_handler */ -static inline void leave_handler( const ucontext_t *sigcontext ) +static inline void leave_handler( ucontext_t *sigcontext ) { #ifdef __linux__ if (fs32_sel && !is_inside_signal_stack( (void *)RSP_sig(sigcontext )) && !is_inside_syscall(sigcontext))

1 0

Arkadiusz Hiler : dsound: Get rid of the global device GUID arrays.
by Alexandre Julliard Sept. 15, 2023

Sept. 15, 2023

Module: wine Branch: master Commit: e1f0318ec4fe83fdc86407303d55f4ee5ba3d2e7 URL: https://gitlab.winehq.org/wine/wine/-/commit/e1f0318ec4fe83fdc86407303d55f4… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Fri Sep 15 00:16:47 2023 +0300 dsound: Get rid of the global device GUID arrays. They are not used for anything anymore and just impose limit of 10 devices of a given type (capturer / renderer) without doing bound checking. --- dlls/dsound/dsound_main.c | 31 +++++++++++-------------------- dlls/dsound/dsound_private.h | 6 +----- dlls/dsound/propset.c | 12 ++++-------- 3 files changed, 16 insertions(+), 33 deletions(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 84a118f43aa..810ae616308 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -73,9 +73,6 @@ static CRITICAL_SECTION_DEBUG DSOUND_renderers_lock_debug = }; CRITICAL_SECTION DSOUND_renderers_lock = { &DSOUND_renderers_lock_debug, -1, 0, 0, 0, 0 }; -GUID DSOUND_renderer_guids[MAXWAVEDRIVERS]; -GUID DSOUND_capture_guids[MAXWAVEDRIVERS]; - const WCHAR wine_vxd_drv[] = L"winemm.vxd"; /* All default settings, you most likely don't want to touch these, see wiki on UsefulRegistryKeys */ @@ -388,13 +385,13 @@ HRESULT get_mmdevice(EDataFlow flow, const GUID *tgt, IMMDevice **device) return DSERR_INVALIDPARAM; } -static BOOL send_device(IMMDevice *device, GUID *guid, - LPDSENUMCALLBACKW cb, void *user) +static BOOL send_device(IMMDevice *device, LPDSENUMCALLBACKW cb, void *user) { IPropertyStore *ps; PROPVARIANT pv; BOOL keep_going; HRESULT hr; + GUID guid; PropVariantInit(&pv); @@ -404,7 +401,7 @@ static BOOL send_device(IMMDevice *device, GUID *guid, return TRUE; } - hr = get_mmdevice_guid(device, ps, guid); + hr = get_mmdevice_guid(device, ps, &guid); if(FAILED(hr)){ IPropertyStore_Release(ps); return TRUE; @@ -418,10 +415,10 @@ static BOOL send_device(IMMDevice *device, GUID *guid, return TRUE; } - TRACE("Calling back with %s (%s)\n", wine_dbgstr_guid(guid), + TRACE("Calling back with %s (%s)\n", wine_dbgstr_guid(&guid), wine_dbgstr_w(pv.pwszVal)); - keep_going = cb(guid, pv.pwszVal, wine_vxd_drv, user); + keep_going = cb(&guid, pv.pwszVal, wine_vxd_drv, user); PropVariantClear(&pv); IPropertyStore_Release(ps); @@ -431,13 +428,12 @@ static BOOL send_device(IMMDevice *device, GUID *guid, /* S_FALSE means the callback returned FALSE at some point * S_OK means the callback always returned TRUE */ -HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids, - LPDSENUMCALLBACKW cb, void *user) +HRESULT enumerate_mmdevices(EDataFlow flow, LPDSENUMCALLBACKW cb, void *user) { IMMDeviceEnumerator *devenum; IMMDeviceCollection *coll; IMMDevice *defdev = NULL; - UINT count, i, n; + UINT count, i; BOOL keep_going; HRESULT hr, init_hr; @@ -476,10 +472,8 @@ HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids, eMultimedia, &defdev); if(FAILED(hr)){ defdev = NULL; - n = 0; }else{ - keep_going = send_device(defdev, &guids[0], cb, user); - n = 1; + keep_going = send_device(defdev, cb, user); } } @@ -493,8 +487,7 @@ HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids, } if(device != defdev){ - keep_going = send_device(device, &guids[n], cb, user); - ++n; + keep_going = send_device(device, cb, user); } IMMDevice_Release(device); @@ -537,8 +530,7 @@ HRESULT WINAPI DirectSoundEnumerateW( setup_dsound_options(); - hr = enumerate_mmdevices(eRender, DSOUND_renderer_guids, - lpDSEnumCallback, lpContext); + hr = enumerate_mmdevices(eRender, lpDSEnumCallback, lpContext); return SUCCEEDED(hr) ? DS_OK : hr; } @@ -601,8 +593,7 @@ DirectSoundCaptureEnumerateW( setup_dsound_options(); - hr = enumerate_mmdevices(eCapture, DSOUND_capture_guids, - lpDSEnumCallback, lpContext); + hr = enumerate_mmdevices(eCapture, lpDSEnumCallback, lpContext); return SUCCEEDED(hr) ? DS_OK : hr; } diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 46c150fc9fc..6c3eb672f31 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -255,9 +255,6 @@ HRESULT IDirectSoundCaptureImpl_Create(IUnknown *outer_unk, REFIID riid, void ** extern CRITICAL_SECTION DSOUND_renderers_lock; extern struct list DSOUND_renderers; -extern GUID DSOUND_renderer_guids[MAXWAVEDRIVERS]; -extern GUID DSOUND_capture_guids[MAXWAVEDRIVERS]; - extern const WCHAR wine_vxd_drv[]; void setup_dsound_options(void); @@ -266,5 +263,4 @@ HRESULT get_mmdevice(EDataFlow flow, const GUID *tgt, IMMDevice **device); BOOL DSOUND_check_supported(IAudioClient *client, DWORD rate, DWORD depth, WORD channels); -HRESULT enumerate_mmdevices(EDataFlow flow, GUID *guids, - LPDSENUMCALLBACKW cb, void *user); +HRESULT enumerate_mmdevices(EDataFlow flow, LPDSENUMCALLBACKW cb, void *user); diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index be284a6dda5..5d9ad45b01b 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -134,11 +134,9 @@ static HRESULT DSPROPERTY_WaveDeviceMappingW( search.found_guid = &ppd->DeviceId; if (ppd->DataFlow == DIRECTSOUNDDEVICE_DATAFLOW_RENDER) - hr = enumerate_mmdevices(eRender, DSOUND_renderer_guids, - search_callback, &search); + hr = enumerate_mmdevices(eRender, search_callback, &search); else if (ppd->DataFlow == DIRECTSOUNDDEVICE_DATAFLOW_CAPTURE) - hr = enumerate_mmdevices(eCapture, DSOUND_capture_guids, - search_callback, &search); + hr = enumerate_mmdevices(eCapture, search_callback, &search); else return DSERR_INVALIDPARAM; @@ -316,12 +314,10 @@ static HRESULT DSPROPERTY_EnumerateW( return E_PROP_ID_UNSUPPORTED; } - hr = enumerate_mmdevices(eRender, DSOUND_renderer_guids, - enum_callback, ppd); + hr = enumerate_mmdevices(eRender, enum_callback, ppd); if(hr == S_OK) - hr = enumerate_mmdevices(eCapture, DSOUND_capture_guids, - enum_callback, ppd); + hr = enumerate_mmdevices(eCapture, enum_callback, ppd); return SUCCEEDED(hr) ? DS_OK : hr; }

1 0

Brendan Shanks : winepulse: Ensure unixlib function tables and enum stay in sync.
by Alexandre Julliard Sept. 15, 2023

Sept. 15, 2023

Module: wine Branch: master Commit: ca86155b1acc6e3ce5cd47d00fd95d5e0958ae5e URL: https://gitlab.winehq.org/wine/wine/-/commit/ca86155b1acc6e3ce5cd47d00fd95d… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Sep 14 21:23:32 2023 -0700 winepulse: Ensure unixlib function tables and enum stay in sync. --- dlls/winepulse.drv/pulse.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 370c361b02f..0ddddb00185 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -2572,6 +2572,8 @@ const unixlib_entry_t __wine_unix_call_funcs[] = pulse_not_implemented, }; +C_ASSERT(ARRAYSIZE(__wine_unix_call_funcs) == funcs_count); + #ifdef _WIN64 typedef UINT PTR32; @@ -3041,4 +3043,6 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = pulse_not_implemented, }; +C_ASSERT(ARRAYSIZE(__wine_unix_call_wow64_funcs) == funcs_count); + #endif /* _WIN64 */

1 0

Brendan Shanks : capi2032: Ensure unixlib function tables and enum stay in sync.
by Alexandre Julliard Sept. 15, 2023

Sept. 15, 2023

Module: wine Branch: master Commit: 59267189255c24c0a05a45c4fcb5439a58dd3aad URL: https://gitlab.winehq.org/wine/wine/-/commit/59267189255c24c0a05a45c4fcb543… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Sep 14 21:35:25 2023 -0700 capi2032: Ensure unixlib function tables and enum stay in sync. --- dlls/capi2032/unixlib.c | 4 +++- dlls/capi2032/unixlib.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/capi2032/unixlib.c b/dlls/capi2032/unixlib.c index 03706d99b32..a75fdd67000 100644 --- a/dlls/capi2032/unixlib.c +++ b/dlls/capi2032/unixlib.c @@ -117,7 +117,7 @@ static NTSTATUS capi_isinstalled( void *args ) return capi20_isinstalled(); } -unixlib_entry_t __wine_unix_call_funcs[] = +const unixlib_entry_t __wine_unix_call_funcs[] = { capi_register, capi_release, @@ -130,3 +130,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = capi_get_profile, capi_isinstalled, }; + +C_ASSERT( ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count ); diff --git a/dlls/capi2032/unixlib.h b/dlls/capi2032/unixlib.h index f4191313a9c..55d45864822 100644 --- a/dlls/capi2032/unixlib.h +++ b/dlls/capi2032/unixlib.h @@ -93,4 +93,5 @@ enum capi20_funcs unix_get_serial_number, unix_get_profile, unix_isinstalled, + unix_funcs_count };

1 0

Brendan Shanks : winecoreaudio: Ensure unixlib function tables and enum stay in sync.
by Alexandre Julliard Sept. 15, 2023

Sept. 15, 2023

Module: wine Branch: master Commit: 111e0cbd22a2e7976d612ab4e37f68b9eb4b3186 URL: https://gitlab.winehq.org/wine/wine/-/commit/111e0cbd22a2e7976d612ab4e37f68… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Sep 14 21:23:00 2023 -0700 winecoreaudio: Ensure unixlib function tables and enum stay in sync. --- dlls/winecoreaudio.drv/coreaudio.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index e2bce64ea14..5cdb3a4f676 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1796,7 +1796,7 @@ static NTSTATUS unix_set_event_handle(void *args) return STATUS_SUCCESS; } -unixlib_entry_t __wine_unix_call_funcs[] = +const unixlib_entry_t __wine_unix_call_funcs[] = { unix_process_attach, unix_not_implemented, @@ -1834,6 +1834,8 @@ unixlib_entry_t __wine_unix_call_funcs[] = unix_not_implemented, }; +C_ASSERT(ARRAYSIZE(__wine_unix_call_funcs) == funcs_count); + #ifdef _WIN64 typedef UINT PTR32; @@ -2249,7 +2251,7 @@ static NTSTATUS unix_wow64_get_prop_value(void *args) return STATUS_SUCCESS; } -unixlib_entry_t __wine_unix_call_wow64_funcs[] = +const unixlib_entry_t __wine_unix_call_wow64_funcs[] = { unix_process_attach, unix_not_implemented, @@ -2287,4 +2289,6 @@ unixlib_entry_t __wine_unix_call_wow64_funcs[] = unix_not_implemented, }; +C_ASSERT(ARRAYSIZE(__wine_unix_call_wow64_funcs) == funcs_count); + #endif /* _WIN64 */

1 0

Brendan Shanks : wineoss: Ensure unixlib function tables and enum stay in sync.
by Alexandre Julliard Sept. 15, 2023

Sept. 15, 2023

Module: wine Branch: master Commit: 39864e80e6f1dcad27d7d69134c74d814f164d24 URL: https://gitlab.winehq.org/wine/wine/-/commit/39864e80e6f1dcad27d7d69134c74d… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Sep 14 21:23:21 2023 -0700 wineoss: Ensure unixlib function tables and enum stay in sync. --- dlls/wineoss.drv/oss.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 1e839c57f5f..9a7a0fbb5d9 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1704,7 +1704,7 @@ static NTSTATUS oss_aux_message(void *args) return STATUS_SUCCESS; } -unixlib_entry_t __wine_unix_call_funcs[] = +const unixlib_entry_t __wine_unix_call_funcs[] = { oss_process_attach, oss_not_implemented, @@ -1742,6 +1742,8 @@ unixlib_entry_t __wine_unix_call_funcs[] = oss_aux_message, }; +C_ASSERT(ARRAYSIZE(__wine_unix_call_funcs) == funcs_count); + #ifdef _WIN64 typedef UINT PTR32; @@ -2197,7 +2199,7 @@ static NTSTATUS oss_wow64_aux_message(void *args) return oss_aux_message(&params); } -unixlib_entry_t __wine_unix_call_wow64_funcs[] = +const unixlib_entry_t __wine_unix_call_wow64_funcs[] = { oss_process_attach, oss_not_implemented, @@ -2235,4 +2237,6 @@ unixlib_entry_t __wine_unix_call_wow64_funcs[] = oss_wow64_aux_message, }; +C_ASSERT(ARRAYSIZE(__wine_unix_call_wow64_funcs) == funcs_count); + #endif /* _WIN64 */

1 0