wine-commits May 2023

wine-commits@winehq.org

1 participants
775 discussions

Davide Beatrici : wineoss: Use mmdevapi's AudioClient3.
by Alexandre Julliard 30 May '23

30 May '23

Module: wine Branch: master Commit: 11cc7af2e6d53120c2786eeac4f4d1e9a4394ca6 URL: https://gitlab.winehq.org/wine/wine/-/commit/11cc7af2e6d53120c2786eeac4f4d1… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri May 26 23:04:10 2023 +0200 wineoss: Use mmdevapi's AudioClient3. --- dlls/wineoss.drv/mmdevdrv.c | 40 +++++++++------------------------------- 1 file changed, 9 insertions(+), 31 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 9537a2f92fc..ef6eb77a9cf 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -999,38 +999,16 @@ static HRESULT WINAPI AudioClient_GetBufferSizeLimits(IAudioClient3 *iface, return E_NOTIMPL; } -static HRESULT WINAPI AudioClient_GetSharedModeEnginePeriod(IAudioClient3 *iface, +extern HRESULT WINAPI client_GetSharedModeEnginePeriod(IAudioClient3 *iface, const WAVEFORMATEX *format, UINT32 *default_period_frames, UINT32 *unit_period_frames, - UINT32 *min_period_frames, UINT32 *max_period_frames) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - - FIXME("(%p)->(%p, %p, %p, %p, %p)\n", This, format, default_period_frames, unit_period_frames, - min_period_frames, max_period_frames); - - return E_NOTIMPL; -} - -static HRESULT WINAPI AudioClient_GetCurrentSharedModeEnginePeriod(IAudioClient3 *iface, - WAVEFORMATEX **cur_format, UINT32 *cur_period_frames) -{ - ACImpl *This = impl_from_IAudioClient3(iface); + UINT32 *min_period_frames, UINT32 *max_period_frames); - FIXME("(%p)->(%p, %p)\n", This, cur_format, cur_period_frames); +extern HRESULT WINAPI client_GetCurrentSharedModeEnginePeriod(IAudioClient3 *iface, + WAVEFORMATEX **cur_format, UINT32 *cur_period_frames); - return E_NOTIMPL; -} - -static HRESULT WINAPI AudioClient_InitializeSharedAudioStream(IAudioClient3 *iface, +extern HRESULT WINAPI client_InitializeSharedAudioStream(IAudioClient3 *iface, DWORD flags, UINT32 period_frames, const WAVEFORMATEX *format, - const GUID *session_guid) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - - FIXME("(%p)->(0x%lx, %u, %p, %s)\n", This, flags, period_frames, format, debugstr_guid(session_guid)); - - return E_NOTIMPL; -} + const GUID *session_guid); static const IAudioClient3Vtbl AudioClient3_Vtbl = { @@ -1052,9 +1030,9 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl = AudioClient_IsOffloadCapable, AudioClient_SetClientProperties, AudioClient_GetBufferSizeLimits, - AudioClient_GetSharedModeEnginePeriod, - AudioClient_GetCurrentSharedModeEnginePeriod, - AudioClient_InitializeSharedAudioStream, + client_GetSharedModeEnginePeriod, + client_GetCurrentSharedModeEnginePeriod, + client_InitializeSharedAudioStream, }; static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client)

1 0

Davide Beatrici : winecoreaudio: Use mmdevapi's AudioClient3.
by Alexandre Julliard 30 May '23

30 May '23

Module: wine Branch: master Commit: f10b5dcb8a2c9d5533416c5c5de0eaf108e5bf9a URL: https://gitlab.winehq.org/wine/wine/-/commit/f10b5dcb8a2c9d5533416c5c5de0ea… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri May 26 23:03:02 2023 +0200 winecoreaudio: Use mmdevapi's AudioClient3. --- dlls/winecoreaudio.drv/mmdevdrv.c | 40 +++++++++------------------------------ 1 file changed, 9 insertions(+), 31 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 0372e320680..66f7b658e24 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1001,38 +1001,16 @@ static HRESULT WINAPI AudioClient_GetBufferSizeLimits(IAudioClient3 *iface, return E_NOTIMPL; } -static HRESULT WINAPI AudioClient_GetSharedModeEnginePeriod(IAudioClient3 *iface, +extern HRESULT WINAPI client_GetSharedModeEnginePeriod(IAudioClient3 *iface, const WAVEFORMATEX *format, UINT32 *default_period_frames, UINT32 *unit_period_frames, - UINT32 *min_period_frames, UINT32 *max_period_frames) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - - FIXME("(%p)->(%p, %p, %p, %p, %p)\n", This, format, default_period_frames, unit_period_frames, - min_period_frames, max_period_frames); - - return E_NOTIMPL; -} - -static HRESULT WINAPI AudioClient_GetCurrentSharedModeEnginePeriod(IAudioClient3 *iface, - WAVEFORMATEX **cur_format, UINT32 *cur_period_frames) -{ - ACImpl *This = impl_from_IAudioClient3(iface); + UINT32 *min_period_frames, UINT32 *max_period_frames); - FIXME("(%p)->(%p, %p)\n", This, cur_format, cur_period_frames); +extern HRESULT WINAPI client_GetCurrentSharedModeEnginePeriod(IAudioClient3 *iface, + WAVEFORMATEX **cur_format, UINT32 *cur_period_frames); - return E_NOTIMPL; -} - -static HRESULT WINAPI AudioClient_InitializeSharedAudioStream(IAudioClient3 *iface, +extern HRESULT WINAPI client_InitializeSharedAudioStream(IAudioClient3 *iface, DWORD flags, UINT32 period_frames, const WAVEFORMATEX *format, - const GUID *session_guid) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - - FIXME("(%p)->(0x%lx, %u, %p, %s)\n", This, flags, period_frames, format, debugstr_guid(session_guid)); - - return E_NOTIMPL; -} + const GUID *session_guid); static const IAudioClient3Vtbl AudioClient3_Vtbl = { @@ -1054,9 +1032,9 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl = AudioClient_IsOffloadCapable, AudioClient_SetClientProperties, AudioClient_GetBufferSizeLimits, - AudioClient_GetSharedModeEnginePeriod, - AudioClient_GetCurrentSharedModeEnginePeriod, - AudioClient_InitializeSharedAudioStream, + client_GetSharedModeEnginePeriod, + client_GetCurrentSharedModeEnginePeriod, + client_InitializeSharedAudioStream, }; static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client)

1 0

Davide Beatrici : winealsa: Use mmdevapi's AudioClient3.
by Alexandre Julliard 30 May '23

30 May '23

Module: wine Branch: master Commit: c0ba1bc9bb357570336f20014e619cffde7c0beb URL: https://gitlab.winehq.org/wine/wine/-/commit/c0ba1bc9bb357570336f20014e619c… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri May 26 23:01:59 2023 +0200 winealsa: Use mmdevapi's AudioClient3. --- dlls/winealsa.drv/mmdevdrv.c | 40 +++++++++------------------------------- 1 file changed, 9 insertions(+), 31 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 57a0ed06733..2793a01b2fc 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1036,38 +1036,16 @@ static HRESULT WINAPI AudioClient_GetBufferSizeLimits(IAudioClient3 *iface, return E_NOTIMPL; } -static HRESULT WINAPI AudioClient_GetSharedModeEnginePeriod(IAudioClient3 *iface, +extern HRESULT WINAPI client_GetSharedModeEnginePeriod(IAudioClient3 *iface, const WAVEFORMATEX *format, UINT32 *default_period_frames, UINT32 *unit_period_frames, - UINT32 *min_period_frames, UINT32 *max_period_frames) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - - FIXME("(%p)->(%p, %p, %p, %p, %p)\n", This, format, default_period_frames, unit_period_frames, - min_period_frames, max_period_frames); - - return E_NOTIMPL; -} - -static HRESULT WINAPI AudioClient_GetCurrentSharedModeEnginePeriod(IAudioClient3 *iface, - WAVEFORMATEX **cur_format, UINT32 *cur_period_frames) -{ - ACImpl *This = impl_from_IAudioClient3(iface); + UINT32 *min_period_frames, UINT32 *max_period_frames); - FIXME("(%p)->(%p, %p)\n", This, cur_format, cur_period_frames); +extern HRESULT WINAPI client_GetCurrentSharedModeEnginePeriod(IAudioClient3 *iface, + WAVEFORMATEX **cur_format, UINT32 *cur_period_frames); - return E_NOTIMPL; -} - -static HRESULT WINAPI AudioClient_InitializeSharedAudioStream(IAudioClient3 *iface, +extern HRESULT WINAPI client_InitializeSharedAudioStream(IAudioClient3 *iface, DWORD flags, UINT32 period_frames, const WAVEFORMATEX *format, - const GUID *session_guid) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - - FIXME("(%p)->(0x%lx, %u, %p, %s)\n", This, flags, period_frames, format, debugstr_guid(session_guid)); - - return E_NOTIMPL; -} + const GUID *session_guid); static const IAudioClient3Vtbl AudioClient3_Vtbl = { @@ -1089,9 +1067,9 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl = AudioClient_IsOffloadCapable, AudioClient_SetClientProperties, AudioClient_GetBufferSizeLimits, - AudioClient_GetSharedModeEnginePeriod, - AudioClient_GetCurrentSharedModeEnginePeriod, - AudioClient_InitializeSharedAudioStream, + client_GetSharedModeEnginePeriod, + client_GetCurrentSharedModeEnginePeriod, + client_InitializeSharedAudioStream, }; static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client)

1 0

Davide Beatrici : winepulse: Move AudioClient3 into mmdevapi.
by Alexandre Julliard 30 May '23

30 May '23

Module: wine Branch: master Commit: a7c23cee023a4595891dba841142000011ecc83b URL: https://gitlab.winehq.org/wine/wine/-/commit/a7c23cee023a4595891dba84114200… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Fri May 26 23:00:24 2023 +0200 winepulse: Move AudioClient3 into mmdevapi. --- dlls/mmdevapi/client.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/winepulse.drv/mmdevdrv.c | 40 +++++++++------------------------------- 2 files changed, 47 insertions(+), 31 deletions(-) diff --git a/dlls/mmdevapi/client.c b/dlls/mmdevapi/client.c index ea279da34a1..eebae0d3dca 100644 --- a/dlls/mmdevapi/client.c +++ b/dlls/mmdevapi/client.c @@ -53,6 +53,11 @@ static inline struct audio_client *impl_from_IAudioCaptureClient(IAudioCaptureCl return CONTAINING_RECORD(iface, struct audio_client, IAudioCaptureClient_iface); } +static inline struct audio_client *impl_from_IAudioClient3(IAudioClient3 *iface) +{ + return CONTAINING_RECORD(iface, struct audio_client, IAudioClient3_iface); +} + static inline struct audio_client *impl_from_IAudioClock(IAudioClock *iface) { return CONTAINING_RECORD(iface, struct audio_client, IAudioClock_iface); @@ -189,6 +194,39 @@ const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl = capture_GetNextPacketSize }; +HRESULT WINAPI client_GetSharedModeEnginePeriod(IAudioClient3 *iface, + const WAVEFORMATEX *format, + UINT32 *default_period_frames, + UINT32 *unit_period_frames, + UINT32 *min_period_frames, + UINT32 *max_period_frames) +{ + struct audio_client *This = impl_from_IAudioClient3(iface); + FIXME("(%p)->(%p, %p, %p, %p, %p) - stub\n", This, format, default_period_frames, + unit_period_frames, min_period_frames, + max_period_frames); + return E_NOTIMPL; +} + +HRESULT WINAPI client_GetCurrentSharedModeEnginePeriod(IAudioClient3 *iface, + WAVEFORMATEX **cur_format, + UINT32 *cur_period_frames) +{ + struct audio_client *This = impl_from_IAudioClient3(iface); + FIXME("(%p)->(%p, %p) - stub\n", This, cur_format, cur_period_frames); + return E_NOTIMPL; +} + +HRESULT WINAPI client_InitializeSharedAudioStream(IAudioClient3 *iface, DWORD flags, + UINT32 period_frames, + const WAVEFORMATEX *format, + const GUID *session_guid) +{ + struct audio_client *This = impl_from_IAudioClient3(iface); + FIXME("(%p)->(0x%lx, %u, %p, %s) - stub\n", This, flags, period_frames, format, debugstr_guid(session_guid)); + return E_NOTIMPL; +} + static HRESULT WINAPI clock_QueryInterface(IAudioClock *iface, REFIID riid, void **ppv) { struct audio_client *This = impl_from_IAudioClock(iface); diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 110f23e1319..99be7ccb43e 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -1129,38 +1129,16 @@ static HRESULT WINAPI AudioClient_GetBufferSizeLimits(IAudioClient3 *iface, return E_NOTIMPL; } -static HRESULT WINAPI AudioClient_GetSharedModeEnginePeriod(IAudioClient3 *iface, +extern HRESULT WINAPI client_GetSharedModeEnginePeriod(IAudioClient3 *iface, const WAVEFORMATEX *format, UINT32 *default_period_frames, UINT32 *unit_period_frames, - UINT32 *min_period_frames, UINT32 *max_period_frames) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - - FIXME("(%p)->(%p, %p, %p, %p, %p)\n", This, format, default_period_frames, unit_period_frames, - min_period_frames, max_period_frames); - - return E_NOTIMPL; -} - -static HRESULT WINAPI AudioClient_GetCurrentSharedModeEnginePeriod(IAudioClient3 *iface, - WAVEFORMATEX **cur_format, UINT32 *cur_period_frames) -{ - ACImpl *This = impl_from_IAudioClient3(iface); + UINT32 *min_period_frames, UINT32 *max_period_frames); - FIXME("(%p)->(%p, %p)\n", This, cur_format, cur_period_frames); +extern HRESULT WINAPI client_GetCurrentSharedModeEnginePeriod(IAudioClient3 *iface, + WAVEFORMATEX **cur_format, UINT32 *cur_period_frames); - return E_NOTIMPL; -} - -static HRESULT WINAPI AudioClient_InitializeSharedAudioStream(IAudioClient3 *iface, +extern HRESULT WINAPI client_InitializeSharedAudioStream(IAudioClient3 *iface, DWORD flags, UINT32 period_frames, const WAVEFORMATEX *format, - const GUID *session_guid) -{ - ACImpl *This = impl_from_IAudioClient3(iface); - - FIXME("(%p)->(0x%lx, %u, %p, %s)\n", This, flags, period_frames, format, debugstr_guid(session_guid)); - - return E_NOTIMPL; -} + const GUID *session_guid); static const IAudioClient3Vtbl AudioClient3_Vtbl = { @@ -1182,9 +1160,9 @@ static const IAudioClient3Vtbl AudioClient3_Vtbl = AudioClient_IsOffloadCapable, AudioClient_SetClientProperties, AudioClient_GetBufferSizeLimits, - AudioClient_GetSharedModeEnginePeriod, - AudioClient_GetCurrentSharedModeEnginePeriod, - AudioClient_InitializeSharedAudioStream, + client_GetSharedModeEnginePeriod, + client_GetCurrentSharedModeEnginePeriod, + client_InitializeSharedAudioStream, }; static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client)

1 0

Jacek Caban : ntdll: Get rid of hacks for direct unix calls.
by Alexandre Julliard 30 May '23

30 May '23

Module: wine Branch: master Commit: cd61eee30f3cf17fafd1ad329b30223dccb4ee33 URL: https://gitlab.winehq.org/wine/wine/-/commit/cd61eee30f3cf17fafd1ad329b3022… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 30 11:01:25 2023 +0200 ntdll: Get rid of hacks for direct unix calls. --- dlls/ntdll/unix/signal_arm.c | 10 +--------- dlls/ntdll/unix/signal_arm64.c | 10 +--------- dlls/ntdll/unix/signal_i386.c | 10 +--------- dlls/ntdll/unix/signal_x86_64.c | 10 +--------- 4 files changed, 4 insertions(+), 36 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 640ea39f5d9..f862610497f 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -1213,14 +1213,6 @@ NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void void *args_data = (void *)((frame->sp - len) & ~15); ULONG_PTR *stack = args_data; - /* if we have no syscall frame, call the callback directly */ - if ((char *)&frame < (char *)ntdll_get_thread_data()->kernel_stack || - (char *)&frame > (char *)arm_thread_data()->syscall_frame) - { - NTSTATUS (WINAPI *func)(const void *, ULONG) = ((void **)NtCurrentTeb()->Peb->KernelCallbackTable)[id]; - return func( args, len ); - } - if ((char *)ntdll_get_thread_data()->kernel_stack + min_kernel_stack > (char *)&frame) return STATUS_STACK_OVERFLOW; @@ -1254,7 +1246,7 @@ static BOOL handle_syscall_fault( ucontext_t *context, EXCEPTION_RECORD *rec ) struct syscall_frame *frame = arm_thread_data()->syscall_frame; UINT i; - if (!is_inside_syscall( context ) && !ntdll_get_thread_data()->jmp_buf) return FALSE; + if (!is_inside_syscall( context )) return FALSE; TRACE( "code=%lx flags=%lx addr=%p pc=%08lx\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, (DWORD)PC_sig(context) ); diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index dd492fef8fe..75ba53acda3 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -1169,14 +1169,6 @@ NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void void *args_data = (void *)((frame->sp - len) & ~15); ULONG_PTR *stack = args_data; - /* if we have no syscall frame, call the callback directly */ - if ((char *)&frame < (char *)ntdll_get_thread_data()->kernel_stack || - (char *)&frame > (char *)arm64_thread_data()->syscall_frame) - { - NTSTATUS (WINAPI *func)(const void *, ULONG) = ((void **)NtCurrentTeb()->Peb->KernelCallbackTable)[id]; - return func( args, len ); - } - if ((char *)ntdll_get_thread_data()->kernel_stack + min_kernel_stack > (char *)&frame) return STATUS_STACK_OVERFLOW; @@ -1210,7 +1202,7 @@ static BOOL handle_syscall_fault( ucontext_t *context, EXCEPTION_RECORD *rec ) struct syscall_frame *frame = arm64_thread_data()->syscall_frame; DWORD i; - if (!is_inside_syscall( context ) && !ntdll_get_thread_data()->jmp_buf) return FALSE; + if (!is_inside_syscall( context )) return FALSE; TRACE( "code=%x flags=%x addr=%p pc=%p tid=%04x\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 89af605443d..748828ad99e 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1653,14 +1653,6 @@ NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void void *args_data = (void *)((frame->esp - len) & ~15); ULONG_PTR *stack = args_data; - /* if we have no syscall frame, call the callback directly */ - if ((char *)&frame < (char *)ntdll_get_thread_data()->kernel_stack || - (char *)&frame > (char *)x86_thread_data()->syscall_frame) - { - NTSTATUS (WINAPI *func)(const void *, ULONG) = ((void **)NtCurrentTeb()->Peb->KernelCallbackTable)[id]; - return func( args, len ); - } - if ((char *)ntdll_get_thread_data()->kernel_stack + min_kernel_stack > (char *)&frame) return STATUS_STACK_OVERFLOW; @@ -1771,7 +1763,7 @@ static BOOL handle_syscall_fault( ucontext_t *sigcontext, void *stack_ptr, struct syscall_frame *frame = x86_thread_data()->syscall_frame; UINT i, *stack; - if (!is_inside_syscall( sigcontext ) && !ntdll_get_thread_data()->jmp_buf) return FALSE; + if (!is_inside_syscall( sigcontext )) return FALSE; TRACE( "code=%lx flags=%lx addr=%p ip=%08lx\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress, context->Eip ); diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 2875ead70d4..0a233384c5c 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1708,14 +1708,6 @@ NTSTATUS WINAPI KeUserModeCallback( ULONG id, const void *args, ULONG len, void void *args_data = (void *)((frame->rsp - len) & ~15); ULONG_PTR *stack = args_data; - /* if we have no syscall frame, call the callback directly */ - if ((char *)&frame < (char *)ntdll_get_thread_data()->kernel_stack || - (char *)&frame > (char *)amd64_thread_data()->syscall_frame) - { - NTSTATUS (WINAPI *func)(const void *, ULONG) = ((void **)NtCurrentTeb()->Peb->KernelCallbackTable)[id]; - return func( args, len ); - } - if ((char *)ntdll_get_thread_data()->kernel_stack + min_kernel_stack > (char *)&frame) return STATUS_STACK_OVERFLOW; @@ -1882,7 +1874,7 @@ static BOOL handle_syscall_fault( ucontext_t *sigcontext, EXCEPTION_RECORD *rec, struct syscall_frame *frame = amd64_thread_data()->syscall_frame; DWORD i; - if (!is_inside_syscall( sigcontext ) && !ntdll_get_thread_data()->jmp_buf) return FALSE; + if (!is_inside_syscall( sigcontext )) return FALSE; TRACE_(seh)( "code=%x flags=%x addr=%p ip=%lx tid=%04x\n", rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress,

1 0

Gabriel Ivăncescu : mshtml/tests: Test RegExp.toString on object with separate RegExp flag props.
by Alexandre Julliard 30 May '23

30 May '23

Module: wine Branch: master Commit: 964f213e19e57274a566e0d91e13143ec93d268f URL: https://gitlab.winehq.org/wine/wine/-/commit/964f213e19e57274a566e0d91e1314… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon May 29 21:58:37 2023 +0300 mshtml/tests: Test RegExp.toString on object with separate RegExp flag props. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/tests/documentmode.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index cd639712a9f..1a9f36927d0 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -2147,6 +2147,12 @@ sync_test("builtins_diffs", function() { }catch(e) { ok(e.number === 0xa1398 - 0x80000000, "RegExp.toString with non-regexp: exception = " + e.number); } + try { + RegExp.prototype.toString.call({source: "abc", global: true, ignoreCase: true, multiline: true}); + ok(false, "RegExp.toString with non-regexp 2: expected exception"); + }catch(e) { + ok(e.number === 0xa1398 - 0x80000000, "RegExp.toString with non-regexp 2: exception = " + e.number); + } try { /a/.lastIndex();

1 0

Gabriel Ivăncescu : jscript: Throw proper error for out of memory conditions in RegExp.
by Alexandre Julliard 30 May '23

30 May '23

Module: wine Branch: master Commit: c0e8f1669fb74591a873cd49572b6afba080d04d URL: https://gitlab.winehq.org/wine/wine/-/commit/c0e8f1669fb74591a873cd49572b6a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon May 29 21:58:37 2023 +0300 jscript: Throw proper error for out of memory conditions in RegExp. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/regexp.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index ddfef9f5b89..325b5ad56d6 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -45,8 +45,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); #define ReportRegExpErrorHelper(a,b,c,d) throw_error((a)->context, E_FAIL, L"") #define JS_ReportErrorNumber(a,b,c,d) throw_error((a), E_FAIL, L"") #define JS_ReportErrorFlagsAndNumber(a,b,c,d,e,f) throw_error((a), E_FAIL, L"") -#define js_ReportOutOfScriptQuota(a) throw_error((a), E_FAIL, L"") -#define JS_ReportOutOfMemory(a) throw_error((a), E_FAIL, L"") #define JS_COUNT_OPERATION(a,b) throw_error((a), E_FAIL, L"") @@ -412,7 +410,7 @@ NewRENode(CompilerState *state, REOp op) ren = heap_pool_alloc(state->pool, sizeof(*ren)); if (!ren) { - /* js_ReportOutOfScriptQuota(cx); */ + throw_error(state->context, E_OUTOFMEMORY, L""); return NULL; } ren->op = op; @@ -1944,7 +1942,7 @@ PushBackTrackState(REGlobalData *gData, REOp op, btincr = ((btincr+btsize-1)/btsize)*btsize; gData->backTrackStack = heap_pool_grow(gData->pool, gData->backTrackStack, btsize, btincr); if (!gData->backTrackStack) { - js_ReportOutOfScriptQuota(gData->cx); + throw_error(gData->cx, E_OUTOFMEMORY, L""); gData->ok = FALSE; return NULL; } @@ -2112,7 +2110,7 @@ ProcessCharSet(REGlobalData *gData, RECharSet *charSet) byteLength = (charSet->length >> 3) + 1; charSet->u.bits = malloc(byteLength); if (!charSet->u.bits) { - JS_ReportOutOfMemory(gData->cx); + throw_error(gData->cx, E_OUTOFMEMORY, L""); gData->ok = FALSE; return FALSE; } @@ -2300,7 +2298,7 @@ ReallocStateStack(REGlobalData *gData) gData->stateStack = heap_pool_grow(gData->pool, gData->stateStack, sz, sz); if (!gData->stateStack) { - js_ReportOutOfScriptQuota(gData->cx); + throw_error(gData->cx, E_OUTOFMEMORY, L""); gData->ok = FALSE; return FALSE; } @@ -3131,7 +3129,6 @@ static HRESULT InitMatch(regexp_t *re, void *cx, heap_pool_t *pool, REGlobalData return S_OK; bad: - js_ReportOutOfScriptQuota(cx); gData->ok = FALSE; return E_OUTOFMEMORY; }

1 0

Gabriel Ivăncescu : jscript: Throw proper error for unexpected quantifiers in RegExp.
by Alexandre Julliard 30 May '23

30 May '23

Module: wine Branch: master Commit: e7b06b0dddff71127645aa92afdac417085ab404 URL: https://gitlab.winehq.org/wine/wine/-/commit/e7b06b0dddff71127645aa92afdac4… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon May 29 21:58:37 2023 +0300 jscript: Throw proper error for unexpected quantifiers in RegExp. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/error.c | 1 + dlls/jscript/jscript.h | 1 + dlls/jscript/jscript.rc | 1 + dlls/jscript/jsregexp.c | 2 +- dlls/jscript/regexp.c | 19 +++++++++---------- dlls/jscript/resource.h | 1 + dlls/jscript/tests/regexp.js | 7 +++++++ dlls/mshtml/tests/es5.js | 9 +++++++++ po/ar.po | 40 +++++++++++++++++++++++----------------- po/ast.po | 40 +++++++++++++++++++++++----------------- po/bg.po | 38 +++++++++++++++++++++----------------- po/ca.po | 40 +++++++++++++++++++++++----------------- po/cs.po | 40 +++++++++++++++++++++++----------------- po/da.po | 40 +++++++++++++++++++++++----------------- po/de.po | 40 +++++++++++++++++++++++----------------- po/el.po | 38 +++++++++++++++++++++----------------- po/en.po | 38 +++++++++++++++++++++----------------- po/en_US.po | 38 +++++++++++++++++++++----------------- po/eo.po | 38 +++++++++++++++++++++----------------- po/es.po | 40 +++++++++++++++++++++++----------------- po/fa.po | 38 +++++++++++++++++++++----------------- po/fi.po | 40 +++++++++++++++++++++++----------------- po/fr.po | 40 +++++++++++++++++++++++----------------- po/he.po | 40 +++++++++++++++++++++++----------------- po/hi.po | 38 +++++++++++++++++++++----------------- po/hr.po | 40 +++++++++++++++++++++++----------------- po/hu.po | 40 +++++++++++++++++++++++----------------- po/it.po | 40 +++++++++++++++++++++++----------------- po/ja.po | 40 +++++++++++++++++++++++----------------- po/ko.po | 40 +++++++++++++++++++++++----------------- po/lt.po | 40 +++++++++++++++++++++++----------------- po/ml.po | 38 +++++++++++++++++++++----------------- po/nb_NO.po | 40 +++++++++++++++++++++++----------------- po/nl.po | 40 +++++++++++++++++++++++----------------- po/or.po | 38 +++++++++++++++++++++----------------- po/pa.po | 38 +++++++++++++++++++++----------------- po/pl.po | 40 +++++++++++++++++++++++----------------- po/pt_BR.po | 40 +++++++++++++++++++++++----------------- po/pt_PT.po | 40 +++++++++++++++++++++++----------------- po/rm.po | 38 +++++++++++++++++++++----------------- po/ro.po | 40 +++++++++++++++++++++++----------------- po/ru.po | 40 +++++++++++++++++++++++----------------- po/si.po | 40 +++++++++++++++++++++++----------------- po/sk.po | 40 +++++++++++++++++++++++----------------- po/sl.po | 40 +++++++++++++++++++++++----------------- po/sr_RS(a)cyrillic.po | 39 ++++++++++++++++++++++----------------- po/sr_RS(a)latin.po | 39 ++++++++++++++++++++++----------------- po/sv.po | 40 +++++++++++++++++++++++----------------- po/ta.po | 38 +++++++++++++++++++++----------------- po/te.po | 38 +++++++++++++++++++++----------------- po/th.po | 38 +++++++++++++++++++++----------------- po/tr.po | 40 +++++++++++++++++++++++----------------- po/uk.po | 40 +++++++++++++++++++++++----------------- po/wa.po | 38 +++++++++++++++++++++----------------- po/wine.pot | 38 +++++++++++++++++++++----------------- po/zh_CN.po | 40 +++++++++++++++++++++++----------------- po/zh_TW.po | 40 +++++++++++++++++++++++----------------- 57 files changed, 1123 insertions(+), 844 deletions(-)

1 0

Gabriel Ivăncescu : jscript: Return undefined for empty RegExp captures in ES5+ mode.
by Alexandre Julliard 30 May '23

30 May '23

Module: wine Branch: master Commit: 627e5b3bf1b4236a1eef35eeafb2ef44b7f96dd2 URL: https://gitlab.winehq.org/wine/wine/-/commit/627e5b3bf1b4236a1eef35eeafb2ef… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon May 29 21:58:37 2023 +0300 jscript: Return undefined for empty RegExp captures in ES5+ mode. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/jsregexp.c | 23 ++++++++++++++--------- dlls/jscript/tests/regexp.js | 12 ++++++++++++ dlls/mshtml/tests/es5.js | 16 ++++++++++++++++ 3 files changed, 42 insertions(+), 9 deletions(-) diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c index 3775df823c3..af96b63fe70 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -361,17 +361,22 @@ static HRESULT create_match_array(script_ctx_t *ctx, jsstr_t *input_str, return hres; for(i=0; i < result->paren_count; i++) { - if(result->parens[i].index != -1) - str = jsstr_substr(input_str, result->parens[i].index, result->parens[i].length); - else - str = jsstr_empty(); - if(!str) { - hres = E_OUTOFMEMORY; - break; + jsval_t val; + + if(result->parens[i].index != -1) { + if(!(str = jsstr_substr(input_str, result->parens[i].index, result->parens[i].length))) { + hres = E_OUTOFMEMORY; + break; + } + val = jsval_string(str); + }else if(ctx->version < SCRIPTLANGUAGEVERSION_ES5) { + val = jsval_string(jsstr_empty()); + }else { + val = jsval_undefined(); } - hres = jsdisp_propput_idx(array, i+1, jsval_string(str)); - jsstr_release(str); + hres = jsdisp_propput_idx(array, i+1, val); + jsval_release(val); if(FAILED(hres)) break; } diff --git a/dlls/jscript/tests/regexp.js b/dlls/jscript/tests/regexp.js index 31b83216235..fb6ed0891d5 100644 --- a/dlls/jscript/tests/regexp.js +++ b/dlls/jscript/tests/regexp.js @@ -625,6 +625,18 @@ ok(tmp === "x*y", '"x/y".replace(/[/]/, "*") = ' + tmp); tmp = "x/y".replace(/[xy/]/g, "*"); ok(tmp === "***", '"x/y".replace(/[xy/]/, "*") = ' + tmp); +tmp = /()/.exec("")[1]; +ok(tmp === "", "/()/ captured: " + tmp); +tmp = /()?/.exec("")[1]; +ok(tmp === "", "/()?/ captured: " + tmp); +tmp = /()??/.exec("")[1]; +ok(tmp === "", "/()??/ captured: " + tmp); +tmp = /()*/.exec("")[1]; +ok(tmp === "", "/()*/ captured: " + tmp); +tmp = /()??()/.exec(""); +ok(tmp[1] === "", "/()??()/ [1] captured: " + tmp); +ok(tmp[2] === "", "/()??()/ [2] captured: " + tmp); + /(b)/.exec("abc"); ok(RegExp.$1 === "b", "RegExp.$1 = " + RegExp.$1); ok("$2" in RegExp, "RegExp.$2 doesn't exist"); diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 982544f6b84..d466c1f9919 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -1610,6 +1610,22 @@ sync_test("isFrozen", function() { } }); +sync_test("RegExp", function() { + var r; + + r = /()/.exec("")[1]; + ok(r === "", "/()/ captured: " + r); + r = /()?/.exec("")[1]; + ok(r === undefined, "/()?/ captured: " + r); + r = /()??/.exec("")[1]; + ok(r === undefined, "/()??/ captured: " + r); + r = /()*/.exec("")[1]; + ok(r === undefined, "/()*/ captured: " + r); + r = /()??()/.exec(""); + ok(r[1] === undefined, "/()??()/ [1] captured: " + r); + ok(r[2] === "", "/()??()/ [2] captured: " + r); +}); + sync_test("builtin_context", function() { var nullDisp = external.nullDisp; var tests = [

1 0

Gabriel Ivăncescu : mshtml: Fix classList toggle() when return value pointer is NULL.
by Alexandre Julliard 30 May '23

30 May '23

Module: wine Branch: master Commit: ce453e4210821fd998a9cb657561f2ee7c8f1e20 URL: https://gitlab.winehq.org/wine/wine/-/commit/ce453e4210821fd998a9cb657561f2… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon May 29 21:58:37 2023 +0300 mshtml: Fix classList toggle() when return value pointer is NULL. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 21a1ad69254..5dd812c9ca6 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -7568,7 +7568,8 @@ static HRESULT WINAPI token_list_remove(IWineDOMTokenList *iface, BSTR token) static HRESULT WINAPI token_list_toggle(IWineDOMTokenList *iface, BSTR token, VARIANT_BOOL *p) { - return token_list_add_remove(iface, token, FALSE, p); + VARIANT_BOOL tmp; + return token_list_add_remove(iface, token, FALSE, p ? p : &tmp); } static HRESULT WINAPI token_list_contains(IWineDOMTokenList *iface, BSTR token, VARIANT_BOOL *p)

1 0

← Newer
1
2
3
4
5
6
7
...
78
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2023