May 2023 - Wine-commits - list.winehq.org

Gabriel Ivăncescu : mshtml: Handle protocols with no ports when checking target origin.
by Alexandre Julliard 30 May '23

30 May '23

Module: wine Branch: master Commit: 0db9f33b7df9ea089fab8080c3a0309165c0a9a9 URL: https://gitlab.winehq.org/wine/wine/-/commit/0db9f33b7df9ea089fab8080c3a030… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue May 30 19:44:13 2023 +0300 mshtml: Handle protocols with no ports when checking target origin. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlwindow.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 6c550172d68..c6072c7e9fa 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3161,6 +3161,7 @@ static HRESULT WINAPI window_private_matchMedia(IWineHTMLWindowPrivate *iface, B static HRESULT check_target_origin(HTMLInnerWindow *window, const WCHAR *target_origin) { + BOOL no_port = FALSE; IUri *uri, *target; DWORD port, port2; BSTR bstr, bstr2; @@ -3219,11 +3220,20 @@ static HRESULT check_target_origin(HTMLInnerWindow *window, const WCHAR *target_ goto done; hres = IUri_GetPort(uri, &port); - if(hres != S_OK) - goto done; + if(hres != S_OK) { + if(FAILED(hres)) + goto done; + no_port = TRUE; /* some protocols don't have ports (e.g. res) */ + } hres = IUri_GetPort(target, &port2); - if(hres == S_OK && port != port2) + if(hres != S_OK) { + if(FAILED(hres)) + goto done; + if(no_port) + hres = S_OK; + }else if(no_port || port != port2) { hres = S_FALSE; + } done: IUri_Release(target);

1 0

Eric Pouech : dbghelp: Better handle very long C++ qualified identifiers in dwarf.
by Alexandre Julliard 30 May '23

30 May '23

Module: wine Branch: master Commit: 542ccaaf8459133cbb552b7e969d5e1143150eb7 URL: https://gitlab.winehq.org/wine/wine/-/commit/542ccaaf8459133cbb552b7e969d5e… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue May 30 19:03:08 2023 +0200 dbghelp: Better handle very long C++ qualified identifiers in dwarf. This fixes some crashes especially when dealing with very long C++ names (like template classes). Fortunately, dwarf internals don't require type lookup by name (eg. on forward declaration), so the impact of thrashing some names is limited. It's very likely native doesn't store directly these very long names (it could either store the qualified mangled name - which can be way shorter for template classes - or use the names in lexical hierarchy: both boil down to storing less information, and recompute it (unmangle or class hierarchy walk) upon request). But this would need a proper C++ support in dbghelp. Not for today. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/dwarf.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 1402ffcb941..46da2968dbb 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1177,7 +1177,10 @@ static const char* dwarf2_get_cpp_name(dwarf2_debug_info_t* di, const char* name } if (!di->unit_ctx->cpp_name) + { di->unit_ctx->cpp_name = pool_alloc(&di->unit_ctx->pool, MAX_SYM_NAME); + if (!di->unit_ctx->cpp_name) return name; + } last = di->unit_ctx->cpp_name + MAX_SYM_NAME - strlen(name) - 1; strcpy(last, name); @@ -1194,7 +1197,11 @@ static const char* dwarf2_get_cpp_name(dwarf2_debug_info_t* di, const char* name { size_t len = strlen(diname.u.string); last -= 2 + len; - if (last < di->unit_ctx->cpp_name) return NULL; + if (last < di->unit_ctx->cpp_name) + { + WARN("Too long C++ qualified identifier for %s... using unqualified identifier\n", name); + return name; + } memcpy(last, diname.u.string, len); last[len] = last[len + 1] = ':'; }

1 0

Rémi Bernon : imm32: Query the new input context in ImmAssociateContextEx / IACE_DEFAULT.
by Alexandre Julliard 30 May '23

30 May '23

Module: wine Branch: master Commit: 7ed63c30e8dee3509c52e11230470be2dcfe6cf5 URL: https://gitlab.winehq.org/wine/wine/-/commit/7ed63c30e8dee3509c52e11230470b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 30 11:01:17 2023 +0200 imm32: Query the new input context in ImmAssociateContextEx / IACE_DEFAULT. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54991 --- dlls/imm32/imm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index c2cd5415e98..cc843ce4a8e 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1038,6 +1038,7 @@ BOOL WINAPI ImmAssociateContextEx( HWND hwnd, HIMC new_himc, DWORD flags ) ret = NtUserAssociateInputContext( hwnd, new_himc, flags ); if (ret == AICR_FOCUS_CHANGED) { + if (flags == IACE_DEFAULT) new_himc = NtUserGetWindowInputContext( hwnd ); ImmSetActiveContext( hwnd, old_himc, FALSE ); ImmSetActiveContext( hwnd, new_himc, TRUE ); if (hwnd == GetFocus()) set_ime_ui_window_himc( new_himc );

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

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: 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 : 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

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

Rémi Bernon : win32u: Rename user driver CreateDesktopWindow entry to SetDesktopWindow.
by Alexandre Julliard 30 May '23

30 May '23

Module: wine Branch: master Commit: 15dfe2ed2d625d0a80c6189472285af67a5f252d URL: https://gitlab.winehq.org/wine/wine/-/commit/15dfe2ed2d625d0a80c6189472285a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 29 13:50:11 2023 +0200 win32u: Rename user driver CreateDesktopWindow entry to SetDesktopWindow. This doesn't create anything, but instead notifies the user driver of the current desktop window, either when it is created, or when a thread calling NtUserGetDesktopWindow receives the current desktop window. --- dlls/win32u/driver.c | 23 +++++++++++------------ dlls/win32u/window.c | 4 +--- dlls/win32u/winstation.c | 5 ++--- dlls/winemac.drv/gdi.c | 2 +- dlls/winemac.drv/macdrv.h | 2 +- dlls/winemac.drv/window.c | 5 ++--- dlls/winex11.drv/init.c | 2 +- dlls/winex11.drv/window.c | 5 ++--- dlls/winex11.drv/x11drv.h | 2 +- include/wine/gdi_driver.h | 2 +- 10 files changed, 23 insertions(+), 29 deletions(-)

1 0

Rémi Bernon : win32u: Call SetDesktopWindow when desktop window is successfully created.
by Alexandre Julliard 30 May '23

30 May '23

Module: wine Branch: master Commit: 8b5bdb10d586d069e3ed5bc5138015f742a9183b URL: https://gitlab.winehq.org/wine/wine/-/commit/8b5bdb10d586d069e3ed5bc5138015… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 29 13:52:16 2023 +0200 win32u: Call SetDesktopWindow when desktop window is successfully created. When the default desktop window is created, its parent is always NULL, and SetDesktopWindow is never called here. --- dlls/win32u/window.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 599a0b7300e..e1cd80f8a36 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -4950,10 +4950,10 @@ static WND *create_window_handle( HWND parent, HWND owner, UNICODE_STRING *name, if (name->Buffer == (const WCHAR *)DESKTOP_CLASS_ATOM) { - if (!thread_info->top_window) - thread_info->top_window = HandleToUlong( full_parent ? full_parent : handle ); + if (!thread_info->top_window) thread_info->top_window = HandleToUlong( full_parent ? full_parent : handle ); else assert( full_parent == UlongToHandle( thread_info->top_window )); - if (full_parent) user_driver->pSetDesktopWindow( UlongToHandle( thread_info->top_window )); + if (!thread_info->top_window) ERR_(win)( "failed to create desktop window\n" ); + else user_driver->pSetDesktopWindow( UlongToHandle( thread_info->top_window )); register_builtin_classes(); } else /* HWND_MESSAGE parent */

1 0