November 2021 - Wine-Commits

Zhiyi Zhang : explorerframe: Implement taskbar_list_DeleteTab() for x11 driver.
by Alexandre Julliard Nov. 25, 2021

Nov. 25, 2021

Module: wine Branch: master Commit: d9b1df267a7e91efdba9cb2bdd2d3a7148ca88e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9b1df267a7e91efdba9cb2b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Nov 25 14:41:35 2021 +0800 explorerframe: Implement taskbar_list_DeleteTab() for x11 driver. Partially fix Excel 2007 and 2010 showing an extra taskbar icon when opening multiple documents in one instance. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/taskbarlist.c | 7 +++++-- dlls/explorerframe/tests/taskbarlist.c | 8 -------- dlls/winex11.drv/window.c | 26 ++++++++++++++++++++++++-- dlls/winex11.drv/x11drv.h | 4 +++- 4 files changed, 32 insertions(+), 13 deletions(-) diff --git a/dlls/explorerframe/taskbarlist.c b/dlls/explorerframe/taskbarlist.c index 6f24f359927..839ae210daa 100644 --- a/dlls/explorerframe/taskbarlist.c +++ b/dlls/explorerframe/taskbarlist.c @@ -25,6 +25,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(explorerframe); +#define WM_WINE_DELETE_TAB (WM_USER + 1) + struct taskbar_list { ITaskbarList4 ITaskbarList4_iface; @@ -103,9 +105,10 @@ static HRESULT STDMETHODCALLTYPE taskbar_list_AddTab(ITaskbarList4 *iface, HWND static HRESULT STDMETHODCALLTYPE taskbar_list_DeleteTab(ITaskbarList4 *iface, HWND hwnd) { - FIXME("iface %p, hwnd %p stub!\n", iface, hwnd); + TRACE("iface %p, hwnd %p\n", iface, hwnd); - return E_NOTIMPL; + SendMessageW(GetDesktopWindow(), WM_WINE_DELETE_TAB, (WPARAM)hwnd, 0); + return S_OK; } static HRESULT STDMETHODCALLTYPE taskbar_list_ActivateTab(ITaskbarList4 *iface, HWND hwnd) diff --git a/dlls/explorerframe/tests/taskbarlist.c b/dlls/explorerframe/tests/taskbarlist.c index ed1bc44a6ac..9b2de996000 100644 --- a/dlls/explorerframe/tests/taskbarlist.c +++ b/dlls/explorerframe/tests/taskbarlist.c @@ -55,7 +55,6 @@ static void test_ITaskbarList(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); /* Call ITaskbarList::HrInit() */ @@ -88,7 +87,6 @@ static void test_ITaskbarList(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); /* Test ITaskbarList::SetActiveAlt() */ @@ -116,7 +114,6 @@ static void test_ITaskbarList(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); /* Test ITaskbarList::ActivateTab() */ @@ -144,21 +141,17 @@ static void test_ITaskbarList(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); /* Test ITaskbarList::DeleteTab() */ /* Check invalid parameters */ hr = ITaskbarList_DeleteTab(taskbarlist, NULL); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_DeleteTab(taskbarlist, (HWND)0xdeadbeef); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); /* Normal ITaskbarList::DeleteTab() */ @@ -167,7 +160,6 @@ static void test_ITaskbarList(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); ref_count = ITaskbarList_Release(taskbarlist); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index bcb0b8044bc..f3891fdd080 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -994,9 +994,9 @@ void update_net_wm_states( struct x11drv_win_data *data ) ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); if (ex_style & WS_EX_TOPMOST) new_state |= (1 << NET_WM_STATE_ABOVE); - if (ex_style & (WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE)) + if (data->skip_taskbar || (ex_style & (WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE))) new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR) | (1 << NET_WM_STATE_SKIP_PAGER); - if (!(ex_style & WS_EX_APPWINDOW) && GetWindow( data->hwnd, GW_OWNER )) + else if (!(ex_style & WS_EX_APPWINDOW) && GetWindow( data->hwnd, GW_OWNER )) new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR); if (!data->mapped) /* set the _NET_WM_STATE atom directly */ @@ -1858,6 +1858,7 @@ BOOL CDECL X11DRV_CreateDesktopWindow( HWND hwnd ) static WNDPROC desktop_orig_wndproc; #define WM_WINE_NOTIFY_ACTIVITY WM_USER +#define WM_WINE_DELETE_TAB (WM_USER + 1) static LRESULT CALLBACK desktop_wndproc_wrapper( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) { @@ -1877,6 +1878,9 @@ static LRESULT CALLBACK desktop_wndproc_wrapper( HWND hwnd, UINT msg, WPARAM wp, } break; } + case WM_WINE_DELETE_TAB: + SendNotifyMessageW( (HWND)wp, WM_X11DRV_DELETE_TAB, 0, 0 ); + break; } return desktop_orig_wndproc( hwnd, msg, wp, lp ); } @@ -2777,6 +2781,21 @@ done: return ret; } +/* Delete a window from taskbar */ +static void taskbar_delete_tab( HWND hwnd ) +{ + struct x11drv_win_data *data; + + TRACE("hwnd %p\n", hwnd); + + data = get_win_data( hwnd ); + if (!data) + return; + + data->skip_taskbar = TRUE; + update_net_wm_states( data ); + release_win_data( data ); +} /********************************************************************** * X11DRV_WindowMessage (X11DRV.@) @@ -2813,6 +2832,9 @@ LRESULT CDECL X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) return clip_cursor_notify( hwnd, (HWND)wp, (HWND)lp ); case WM_X11DRV_CLIP_CURSOR_REQUEST: return clip_cursor_request( hwnd, (BOOL)wp, (BOOL)lp ); + case WM_X11DRV_DELETE_TAB: + taskbar_delete_tab( hwnd ); + return 0; default: FIXME( "got window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, wp, lp ); return 0; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 4b4ee8daaeb..6a38fc5a20e 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -584,7 +584,8 @@ enum x11drv_window_messages WM_X11DRV_RESIZE_DESKTOP, WM_X11DRV_SET_CURSOR, WM_X11DRV_CLIP_CURSOR_NOTIFY, - WM_X11DRV_CLIP_CURSOR_REQUEST + WM_X11DRV_CLIP_CURSOR_REQUEST, + WM_X11DRV_DELETE_TAB }; /* _NET_WM_STATE properties that we keep track of */ @@ -619,6 +620,7 @@ struct x11drv_win_data BOOL shaped : 1; /* is window using a custom region shape? */ BOOL layered : 1; /* is window layered and with valid attributes? */ BOOL use_alpha : 1; /* does window use an alpha channel? */ + BOOL skip_taskbar : 1; /* does window should be deleted from taskbar */ int wm_state; /* current value of the WM_STATE property */ DWORD net_wm_state; /* bit mask of active x11drv_net_wm_state values */ Window embedder; /* window id of embedder */

1 0

Zhiyi Zhang : explorerframe: Implement taskbar_list_AddTab() for x11 driver.
by Alexandre Julliard Nov. 25, 2021

Nov. 25, 2021

Module: wine Branch: master Commit: 1c1fe30cc50da2b0596096b04b75d8c1e598f8e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c1fe30cc50da2b0596096b0… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Nov 25 14:41:44 2021 +0800 explorerframe: Implement taskbar_list_AddTab() for x11 driver. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/taskbarlist.c | 6 ++++-- dlls/explorerframe/tests/taskbarlist.c | 8 -------- dlls/winex11.drv/window.c | 36 ++++++++++++++++++++++++++++++---- dlls/winex11.drv/x11drv.h | 4 +++- 4 files changed, 39 insertions(+), 15 deletions(-) diff --git a/dlls/explorerframe/taskbarlist.c b/dlls/explorerframe/taskbarlist.c index 839ae210daa..7e1f5b92c5b 100644 --- a/dlls/explorerframe/taskbarlist.c +++ b/dlls/explorerframe/taskbarlist.c @@ -26,6 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(explorerframe); #define WM_WINE_DELETE_TAB (WM_USER + 1) +#define WM_WINE_ADD_TAB (WM_USER + 2) struct taskbar_list { @@ -98,9 +99,10 @@ static HRESULT STDMETHODCALLTYPE taskbar_list_HrInit(ITaskbarList4 *iface) static HRESULT STDMETHODCALLTYPE taskbar_list_AddTab(ITaskbarList4 *iface, HWND hwnd) { - FIXME("iface %p, hwnd %p stub!\n", iface, hwnd); + TRACE("iface %p, hwnd %p\n", iface, hwnd); - return E_NOTIMPL; + SendMessageW(GetDesktopWindow(), WM_WINE_ADD_TAB, (WPARAM)hwnd, 0); + return S_OK; } static HRESULT STDMETHODCALLTYPE taskbar_list_DeleteTab(ITaskbarList4 *iface, HWND hwnd) diff --git a/dlls/explorerframe/tests/taskbarlist.c b/dlls/explorerframe/tests/taskbarlist.c index 9b2de996000..5f5cc98c5b4 100644 --- a/dlls/explorerframe/tests/taskbarlist.c +++ b/dlls/explorerframe/tests/taskbarlist.c @@ -43,7 +43,6 @@ static void test_ITaskbarList(void) /* Test calling methods before calling ITaskbarList::HrInit() */ hr = ITaskbarList_AddTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_SetActiveAlt(taskbarlist, hwnd); @@ -69,21 +68,17 @@ static void test_ITaskbarList(void) /* Test ITaskbarList::AddTab() */ /* Check invalid parameters */ hr = ITaskbarList_AddTab(taskbarlist, NULL); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_AddTab(taskbarlist, (HWND)0xdeadbeef); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); /* Normal ITaskbarList::AddTab() */ hr = ITaskbarList_AddTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); /* Repeat ITaskbarList::AddTab() with the same hwnd */ hr = ITaskbarList_AddTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); @@ -101,7 +96,6 @@ static void test_ITaskbarList(void) /* Normal ITaskbarList::SetActiveAlt() */ hr = ITaskbarList_AddTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_SetActiveAlt(taskbarlist, hwnd); @@ -128,7 +122,6 @@ static void test_ITaskbarList(void) /* Normal ITaskbarList::ActivateTab() */ hr = ITaskbarList_AddTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_ActivateTab(taskbarlist, hwnd); @@ -156,7 +149,6 @@ static void test_ITaskbarList(void) /* Normal ITaskbarList::DeleteTab() */ hr = ITaskbarList_AddTab(taskbarlist, hwnd); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); hr = ITaskbarList_DeleteTab(taskbarlist, hwnd); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index f3891fdd080..b4b7357f245 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -994,10 +994,13 @@ void update_net_wm_states( struct x11drv_win_data *data ) ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); if (ex_style & WS_EX_TOPMOST) new_state |= (1 << NET_WM_STATE_ABOVE); - if (data->skip_taskbar || (ex_style & (WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE))) - new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR) | (1 << NET_WM_STATE_SKIP_PAGER); - else if (!(ex_style & WS_EX_APPWINDOW) && GetWindow( data->hwnd, GW_OWNER )) - new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR); + if (!data->add_taskbar) + { + if (data->skip_taskbar || (ex_style & (WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE))) + new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR) | (1 << NET_WM_STATE_SKIP_PAGER); + else if (!(ex_style & WS_EX_APPWINDOW) && GetWindow( data->hwnd, GW_OWNER )) + new_state |= (1 << NET_WM_STATE_SKIP_TASKBAR); + } if (!data->mapped) /* set the _NET_WM_STATE atom directly */ { @@ -1859,6 +1862,7 @@ static WNDPROC desktop_orig_wndproc; #define WM_WINE_NOTIFY_ACTIVITY WM_USER #define WM_WINE_DELETE_TAB (WM_USER + 1) +#define WM_WINE_ADD_TAB (WM_USER + 2) static LRESULT CALLBACK desktop_wndproc_wrapper( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) { @@ -1881,6 +1885,9 @@ static LRESULT CALLBACK desktop_wndproc_wrapper( HWND hwnd, UINT msg, WPARAM wp, case WM_WINE_DELETE_TAB: SendNotifyMessageW( (HWND)wp, WM_X11DRV_DELETE_TAB, 0, 0 ); break; + case WM_WINE_ADD_TAB: + SendNotifyMessageW( (HWND)wp, WM_X11DRV_ADD_TAB, 0, 0 ); + break; } return desktop_orig_wndproc( hwnd, msg, wp, lp ); } @@ -2781,6 +2788,23 @@ done: return ret; } +/* Add a window to taskbar */ +static void taskbar_add_tab( HWND hwnd ) +{ + struct x11drv_win_data *data; + + TRACE("hwnd %p\n", hwnd); + + data = get_win_data( hwnd ); + if (!data) + return; + + data->add_taskbar = TRUE; + data->skip_taskbar = FALSE; + update_net_wm_states( data ); + release_win_data( data ); +} + /* Delete a window from taskbar */ static void taskbar_delete_tab( HWND hwnd ) { @@ -2793,6 +2817,7 @@ static void taskbar_delete_tab( HWND hwnd ) return; data->skip_taskbar = TRUE; + data->add_taskbar = FALSE; update_net_wm_states( data ); release_win_data( data ); } @@ -2835,6 +2860,9 @@ LRESULT CDECL X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) case WM_X11DRV_DELETE_TAB: taskbar_delete_tab( hwnd ); return 0; + case WM_X11DRV_ADD_TAB: + taskbar_add_tab( hwnd ); + return 0; default: FIXME( "got window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, wp, lp ); return 0; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 6a38fc5a20e..d678d93905d 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -585,7 +585,8 @@ enum x11drv_window_messages WM_X11DRV_SET_CURSOR, WM_X11DRV_CLIP_CURSOR_NOTIFY, WM_X11DRV_CLIP_CURSOR_REQUEST, - WM_X11DRV_DELETE_TAB + WM_X11DRV_DELETE_TAB, + WM_X11DRV_ADD_TAB }; /* _NET_WM_STATE properties that we keep track of */ @@ -621,6 +622,7 @@ struct x11drv_win_data BOOL layered : 1; /* is window layered and with valid attributes? */ BOOL use_alpha : 1; /* does window use an alpha channel? */ BOOL skip_taskbar : 1; /* does window should be deleted from taskbar */ + BOOL add_taskbar : 1; /* does window should be added to taskbar regardless of style */ int wm_state; /* current value of the WM_STATE property */ DWORD net_wm_state; /* bit mask of active x11drv_net_wm_state values */ Window embedder; /* window id of embedder */

1 0

Jinoh Kang : ntdll: Save/restore FPU context in arm64 signal handlers.
by Alexandre Julliard Nov. 25, 2021

Nov. 25, 2021

Module: wine Branch: master Commit: 9f0df41a6cc594c2cbffe2205e3d969d62bc5b85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f0df41a6cc594c2cbffe220… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Wed Nov 24 17:33:12 2021 +0900 ntdll: Save/restore FPU context in arm64 signal handlers. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51996 Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm64.c | 115 +++++++++++++++++++++++------------------ 1 file changed, 65 insertions(+), 50 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index a52e9bccc49..680a14223c6 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -84,7 +84,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(seh); # define FP_sig(context) REGn_sig(29, context) /* Frame pointer */ # define LR_sig(context) REGn_sig(30, context) /* Link Register */ -static struct _aarch64_ctx *get_extended_sigcontext( ucontext_t *sigcontext, unsigned int magic ) +static struct _aarch64_ctx *get_extended_sigcontext( const ucontext_t *sigcontext, unsigned int magic ) { struct _aarch64_ctx *ctx = (struct _aarch64_ctx *)sigcontext->uc_mcontext.__reserved; while ((char *)ctx < (char *)(&sigcontext->uc_mcontext + 1) && ctx->magic && ctx->size) @@ -95,7 +95,7 @@ static struct _aarch64_ctx *get_extended_sigcontext( ucontext_t *sigcontext, uns return NULL; } -static struct fpsimd_context *get_fpsimd_context( ucontext_t *sigcontext ) +static struct fpsimd_context *get_fpsimd_context( const ucontext_t *sigcontext ) { return (struct fpsimd_context *)get_extended_sigcontext( sigcontext, FPSIMD_MAGIC ); } @@ -324,50 +324,12 @@ NTSTATUS CDECL unwind_builtin_dll( ULONG type, DISPATCHER_CONTEXT *dispatch, CON } -/*********************************************************************** - * save_context - * - * Set the register values from a sigcontext. - */ -static void save_context( CONTEXT *context, const ucontext_t *sigcontext ) -{ - DWORD i; - - context->ContextFlags = (CONTEXT_FULL & ~CONTEXT_FLOATING_POINT) | - CONTEXT_ARM64; - context->u.s.Fp = FP_sig(sigcontext); /* Frame pointer */ - context->u.s.Lr = LR_sig(sigcontext); /* Link register */ - context->Sp = SP_sig(sigcontext); /* Stack pointer */ - context->Pc = PC_sig(sigcontext); /* Program Counter */ - context->Cpsr = PSTATE_sig(sigcontext); /* Current State Register */ - for (i = 0; i <= 28; i++) context->u.X[i] = REGn_sig( i, sigcontext ); -} - - -/*********************************************************************** - * restore_context - * - * Build a sigcontext from the register values. - */ -static void restore_context( const CONTEXT *context, ucontext_t *sigcontext ) -{ - DWORD i; - - FP_sig(sigcontext) = context->u.s.Fp; /* Frame pointer */ - LR_sig(sigcontext) = context->u.s.Lr; /* Link register */ - SP_sig(sigcontext) = context->Sp; /* Stack pointer */ - PC_sig(sigcontext) = context->Pc; /* Program Counter */ - PSTATE_sig(sigcontext) = context->Cpsr; /* Current State Register */ - for (i = 0; i <= 28; i++) REGn_sig( i, sigcontext ) = context->u.X[i]; -} - - /*********************************************************************** * save_fpu * * Set the FPU context from a sigcontext. */ -static void save_fpu( CONTEXT *context, ucontext_t *sigcontext ) +static void save_fpu( CONTEXT *context, const ucontext_t *sigcontext ) { #ifdef linux struct fpsimd_context *fp = get_fpsimd_context( sigcontext ); @@ -391,23 +353,62 @@ static void save_fpu( CONTEXT *context, ucontext_t *sigcontext ) * * Restore the FPU context to a sigcontext. */ -static void restore_fpu( struct syscall_frame *frame, ucontext_t *sigcontext ) +static void restore_fpu( const CONTEXT *context, ucontext_t *sigcontext ) { #ifdef linux struct fpsimd_context *fp = get_fpsimd_context( sigcontext ); if (!fp) return; - fp->fpcr = frame->fpcr; - fp->fpsr = frame->fpsr; - memcpy( fp->vregs, frame->v, sizeof(fp->vregs) ); + fp->fpcr = context->Fpcr; + fp->fpsr = context->Fpsr; + memcpy( fp->vregs, context->V, sizeof(fp->vregs) ); #elif defined(__APPLE__) - sigcontext->uc_mcontext->__ns.__fpcr = frame->fpcr; - sigcontext->uc_mcontext->__ns.__fpsr = frame->fpsr; - memcpy( sigcontext->uc_mcontext->__ns.__v, frame->v, sizeof(frame->v) ); + sigcontext->uc_mcontext->__ns.__fpcr = context->Fpcr; + sigcontext->uc_mcontext->__ns.__fpsr = context->Fpsr; + memcpy( sigcontext->uc_mcontext->__ns.__v, context->V, sizeof(context->v) ); #endif } +/*********************************************************************** + * save_context + * + * Set the register values from a sigcontext. + */ +static void save_context( CONTEXT *context, const ucontext_t *sigcontext ) +{ + DWORD i; + + context->ContextFlags = CONTEXT_FULL; + context->u.s.Fp = FP_sig(sigcontext); /* Frame pointer */ + context->u.s.Lr = LR_sig(sigcontext); /* Link register */ + context->Sp = SP_sig(sigcontext); /* Stack pointer */ + context->Pc = PC_sig(sigcontext); /* Program Counter */ + context->Cpsr = PSTATE_sig(sigcontext); /* Current State Register */ + for (i = 0; i <= 28; i++) context->u.X[i] = REGn_sig( i, sigcontext ); + save_fpu( context, sigcontext ); +} + + +/*********************************************************************** + * restore_context + * + * Build a sigcontext from the register values. + */ +static void restore_context( const CONTEXT *context, ucontext_t *sigcontext ) +{ + DWORD i; + + FP_sig(sigcontext) = context->u.s.Fp; /* Frame pointer */ + LR_sig(sigcontext) = context->u.s.Lr; /* Link register */ + SP_sig(sigcontext) = context->Sp; /* Stack pointer */ + PC_sig(sigcontext) = context->Pc; /* Program Counter */ + PSTATE_sig(sigcontext) = context->Cpsr; /* Current State Register */ + for (i = 0; i <= 28; i++) REGn_sig( i, sigcontext ) = context->u.X[i]; + restore_fpu( context, sigcontext ); +} + + /*********************************************************************** * signal_set_full_context */ @@ -632,7 +633,6 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) rec->ExceptionAddress = (void *)PC_sig(sigcontext); save_context( &context, sigcontext ); - save_fpu( &context, sigcontext ); status = send_debug_event( rec, &context, TRUE ); if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) @@ -1056,7 +1056,22 @@ static void usr2_handler( int signal, siginfo_t *siginfo, void *sigcontext ) PC_sig(context) = frame->pc; PSTATE_sig(context) = frame->cpsr; for (i = 0; i <= 28; i++) REGn_sig( i, context ) = frame->x[i]; - restore_fpu( frame, context ); + +#ifdef linux + { + struct fpsimd_context *fp = get_fpsimd_context( sigcontext ); + if (fp) + { + fp->fpcr = frame->fpcr; + fp->fpsr = frame->fpsr; + memcpy( fp->vregs, frame->v, sizeof(fp->vregs) ); + } + } +#elif defined(__APPLE__) + sigcontext->uc_mcontext->__ns.__fpcr = frame->fpcr; + sigcontext->uc_mcontext->__ns.__fpsr = frame->fpsr; + memcpy( sigcontext->uc_mcontext->__ns.__v, frame->v, sizeof(frame->v) ); +#endif }

1 0

Jinoh Kang : server: Implement the \??\GLOBALROOT symbolic link.
by Alexandre Julliard Nov. 25, 2021

Nov. 25, 2021

Module: wine Branch: master Commit: 3b375843165c731448cbb141a3a38ff52c3d01bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b375843165c731448cbb141… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Thu Nov 25 01:29:29 2021 +0900 server: Implement the \??\GLOBALROOT symbolic link. \??\GLOBALROOT is a well-known NT symbolic link that allows applications to access the NT object manager's root namespace via Win32 APIs. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++ server/directory.c | 3 +++ server/object.h | 2 ++ server/symlink.c | 13 ++++++++++++ 4 files changed, 77 insertions(+) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 77eb58a23b5..250984ebdda 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -2388,6 +2388,64 @@ static void test_get_next_thread(void) CloseHandle(thread); } +static void test_globalroot(void) +{ + NTSTATUS status; + IO_STATUS_BLOCK iosb; + UNICODE_STRING str; + OBJECT_ATTRIBUTES attr; + HANDLE h; + WCHAR buffer[256]; + ULONG len, full_len, i; + static const struct { const WCHAR *name, *target; } symlinks[] = { + { L"\\??\\GLOBALROOT", L"" }, + { L"\\??\\GLOBALROOT\\??\\GLOBALROOT", L"" }, + { L"\\??\\GLOBALROOT\\??\\GLOBALROOT\\??\\GLOBALROOT", L"" }, + { L"\\??\\GLOBALROOT\\DosDevices", L"\\??" }, + { L"\\??\\GLOBALROOT\\BaseNamedObjects\\Global", NULL }, + }; + + for (i = 0; i < ARRAY_SIZE(symlinks); i++) + { + pRtlInitUnicodeString(&str, symlinks[i].name); + InitializeObjectAttributes(&attr, &str, 0, 0, NULL); + status = pNtOpenSymbolicLinkObject( &h, SYMBOLIC_LINK_QUERY, &attr ); + ok(status == STATUS_SUCCESS, "NtOpenSymbolicLinkObject failed %08x\n", status); + + str.Buffer = buffer; + str.MaximumLength = sizeof(buffer); + len = 0xdeadbeef; + memset( buffer, 0xaa, sizeof(buffer) ); + status = pNtQuerySymbolicLinkObject( h, &str, &len); + ok( status == STATUS_SUCCESS, "NtQuerySymbolicLinkObject failed %08x\n", status ); + full_len = str.Length + sizeof(WCHAR); + ok( len == full_len, "bad length %u (expected %u)\n", len, full_len ); + ok( buffer[len / sizeof(WCHAR) - 1] == 0, "no terminating null\n" ); + + if (symlinks[i].target) + { + ok( compare_unicode_string( &str, symlinks[i].target ), + "symlink %s: target expected %s, got %s\n", + debugstr_w( symlinks[i].name ), + debugstr_w( symlinks[i].target ), + debugstr_w( str.Buffer ) ); + } + + pNtClose(h); + } + + pRtlInitUnicodeString(&str, L"\\??\\GLOBALROOT\\Device\\Null"); + InitializeObjectAttributes(&attr, &str, OBJ_CASE_INSENSITIVE, 0, NULL); + status = pNtOpenFile(&h, GENERIC_READ | GENERIC_WRITE, &attr, &iosb, + FILE_SHARE_READ | FILE_SHARE_WRITE, 0); + ok(status == STATUS_SUCCESS, + "expected STATUS_SUCCESS, got %08x\n", status); + + test_object_type(h, L"File"); + + pNtClose(h); +} + START_TEST(om) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -2446,4 +2504,5 @@ START_TEST(om) test_duplicate_object(); test_object_types(); test_get_next_thread(); + test_globalroot(); } diff --git a/server/directory.c b/server/directory.c index 70a34d3f1bb..2cd61be0838 100644 --- a/server/directory.c +++ b/server/directory.c @@ -378,6 +378,7 @@ void init_directories( struct fd *intl_fd ) /* symlinks */ static const WCHAR link_dosdevW[] = {'D','o','s','D','e','v','i','c','e','s'}; + static const WCHAR link_globalrootW[] = {'G','L','O','B','A','L','R','O','O','T'}; static const WCHAR link_globalW[] = {'G','l','o','b','a','l'}; static const WCHAR link_nulW[] = {'N','U','L'}; static const WCHAR link_pipeW[] = {'P','I','P','E'}; @@ -392,6 +393,7 @@ void init_directories( struct fd *intl_fd ) static const WCHAR link_consoleW[] = {'\\','D','e','v','i','c','e','\\','C','o','n','D','r','v', '\\','C','o','n','s','o','l','e'}; static const struct unicode_str link_dosdev_str = {link_dosdevW, sizeof(link_dosdevW)}; + static const struct unicode_str link_globalroot_str = {link_globalrootW, sizeof(link_globalrootW)}; static const struct unicode_str link_global_str = {link_globalW, sizeof(link_globalW)}; static const struct unicode_str link_nul_str = {link_nulW, sizeof(link_nulW)}; static const struct unicode_str link_pipe_str = {link_pipeW, sizeof(link_pipeW)}; @@ -470,6 +472,7 @@ void init_directories( struct fd *intl_fd ) /* symlinks */ release_object( create_obj_symlink( &root_directory->obj, &link_dosdev_str, OBJ_PERMANENT, &dir_global->obj, NULL )); + release_object( create_root_symlink( &dir_global->obj, &link_globalroot_str, OBJ_PERMANENT, NULL )); release_object( create_obj_symlink( &dir_global->obj, &link_global_str, OBJ_PERMANENT, &dir_global->obj, NULL )); release_object( create_obj_symlink( &dir_global->obj, &link_nul_str, OBJ_PERMANENT, null_device, NULL )); release_object( create_obj_symlink( &dir_global->obj, &link_pipe_str, OBJ_PERMANENT, named_pipe_device, NULL )); diff --git a/server/object.h b/server/object.h index 97d6c0e91f8..f156f1d2f13 100644 --- a/server/object.h +++ b/server/object.h @@ -279,6 +279,8 @@ extern void init_directories( struct fd *intl_fd ); /* symbolic link functions */ +extern struct object *create_root_symlink( struct object *root, const struct unicode_str *name, + unsigned int attr, const struct security_descriptor *sd ); extern struct object *create_obj_symlink( struct object *root, const struct unicode_str *name, unsigned int attr, struct object *target, const struct security_descriptor *sd ); diff --git a/server/symlink.c b/server/symlink.c index fa97d9155fa..27d48e2f994 100644 --- a/server/symlink.c +++ b/server/symlink.c @@ -110,6 +110,8 @@ static struct object *symlink_lookup_name( struct object *obj, struct unicode_st if (!name->len && (attr & OBJ_OPENLINK)) return NULL; if (obj == root) return NULL; + if (!symlink->len) return get_root_directory(); + target_str.str = symlink->target; target_str.len = symlink->len; if ((target = lookup_named_object( NULL, &target_str, attr, &name_left ))) @@ -131,6 +133,17 @@ static void symlink_destroy( struct object *obj ) free( symlink->target ); } +struct object *create_root_symlink( struct object *root, const struct unicode_str *name, + unsigned int attr, const struct security_descriptor *sd ) +{ + struct symlink *symlink; + + if (!(symlink = create_named_object( root, &symlink_ops, name, attr, sd ))) return NULL; + symlink->target = NULL; + symlink->len = 0; + return &symlink->obj; +} + struct object *create_symlink( struct object *root, const struct unicode_str *name, unsigned int attr, const struct unicode_str *target, const struct security_descriptor *sd )

1 0

Jactry Zeng : comsvcs: Stub ISharedPropertyGroupManager interface.
by Alexandre Julliard Nov. 25, 2021

Nov. 25, 2021

Module: wine Branch: master Commit: 5d4022a85f632609a309b120ad6b71907c4e1f34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d4022a85f632609a309b120… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu Nov 25 00:20:45 2021 -0600 comsvcs: Stub ISharedPropertyGroupManager interface. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/Makefile.in | 3 +- dlls/comsvcs/comsvcs_private.h | 34 +++++++++ dlls/comsvcs/main.c | 25 ++++--- dlls/comsvcs/property.c | 166 +++++++++++++++++++++++++++++++++++++++++ dlls/comsvcs/tests/Makefile.in | 3 +- dlls/comsvcs/tests/property.c | 115 ++++++++++++++++++++++++++++ 6 files changed, 335 insertions(+), 11 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5d4022a85f632609a309…

1 0

Alex Henrie : shcore: Add GetFeatureEnabledState stub.
by Alexandre Julliard Nov. 25, 2021

Nov. 25, 2021

Module: wine Branch: master Commit: 67d0509f2f523935b0f4dbd3a713125252b37627 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67d0509f2f523935b0f4dbd3… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Nov 21 22:02:57 2021 -0700 shcore: Add GetFeatureEnabledState stub. Also for Windows PC Health Check. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-featurestaging-l1-1-0.spec | 2 +- dlls/shcore/main.c | 9 +++++++++ dlls/shcore/shcore.spec | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-featurestaging-l1-1-0/api-ms-win-core-featurestaging-l1-1-0.spec b/dlls/api-ms-win-core-featurestaging-l1-1-0/api-ms-win-core-featurestaging-l1-1-0.spec index 696e57f695a..eb7bbe9460e 100644 --- a/dlls/api-ms-win-core-featurestaging-l1-1-0/api-ms-win-core-featurestaging-l1-1-0.spec +++ b/dlls/api-ms-win-core-featurestaging-l1-1-0/api-ms-win-core-featurestaging-l1-1-0.spec @@ -1,4 +1,4 @@ -@ stub GetFeatureEnabledState +@ stdcall GetFeatureEnabledState(long long) shcore.GetFeatureEnabledState @ stub RecordFeatureError @ stub RecordFeatureUsage @ stdcall SubscribeFeatureStateChangeNotification(ptr ptr ptr) shcore.SubscribeFeatureStateChangeNotification diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 213569b4acf..633628b4c72 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -2515,3 +2515,12 @@ void WINAPI SubscribeFeatureStateChangeNotification(FEATURE_STATE_CHANGE_SUBSCRI { FIXME("(%p, %p, %p) stub\n", subscription, callback, context); } + +/************************************************************************* + * GetFeatureEnabledState [SHCORE.@] + */ +FEATURE_ENABLED_STATE WINAPI GetFeatureEnabledState(UINT32 feature, FEATURE_CHANGE_TIME change_time) +{ + FIXME("(%u, %u) stub\n", feature, change_time); + return FEATURE_ENABLED_STATE_DEFAULT; +} diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index 836a90ee5cf..9ed7c87b0fe 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -9,7 +9,7 @@ @ stdcall GetCurrentProcessExplicitAppUserModelID(ptr) @ stdcall GetDpiForMonitor(long long ptr ptr) @ stub GetDpiForShellUIComponent -# @ stub GetFeatureEnabledState +@ stdcall GetFeatureEnabledState(long long) # @ stub GetFeatureVariant @ stdcall GetProcessDpiAwareness(long ptr) @ stdcall GetProcessReference(ptr)

1 0

Gabriel Ivăncescu : jscript: Get rid of the value_prop from jsdisp props.
by Alexandre Julliard Nov. 25, 2021

Nov. 25, 2021

Module: wine Branch: master Commit: adad45504938b2b94d6d742fb63ae00433667e28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=adad45504938b2b94d6d742f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Nov 25 21:01:28 2021 +0100 jscript: Get rid of the value_prop from jsdisp props. The mapping between DISPID and index into props has to be adjusted since the value_prop (props[0]) is now gone. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 89 +++++++++++++++++++++++++-------------------------- 1 file changed, 43 insertions(+), 46 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index a00e36b9654..555dd1335b3 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -80,16 +80,19 @@ static void fix_protref_prop(jsdisp_t *jsdisp, dispex_prop_t *prop) static inline DISPID prop_to_id(jsdisp_t *This, dispex_prop_t *prop) { - return prop - This->props; + /* don't overlap with DISPID_VALUE */ + return prop - This->props + 1; } static inline dispex_prop_t *get_prop(jsdisp_t *This, DISPID id) { - if(id < 0 || id >= This->prop_cnt) + DWORD idx = id - 1; + + if(idx >= This->prop_cnt) return NULL; - fix_protref_prop(This, &This->props[id]); + fix_protref_prop(This, &This->props[idx]); - return This->props[id].type == PROP_DELETED ? NULL : &This->props[id]; + return This->props[idx].type == PROP_DELETED ? NULL : &This->props[idx]; } static inline BOOL is_function_prop(dispex_prop_t *prop) @@ -189,7 +192,7 @@ static inline HRESULT resize_props(jsdisp_t *This) This->props[i].bucket_next = ~0; } - for(i=1; i<This->prop_cnt; i++) { + for(i=0; i<This->prop_cnt; i++) { props = This->props+i; bucket = get_props_idx(This, props->hash); @@ -547,26 +550,22 @@ static HRESULT invoke_prop_func(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t switch(prop->type) { case PROP_BUILTIN: { + vdisp_t vthis; + if(flags == DISPATCH_CONSTRUCT && (prop->flags & PROPF_METHOD)) { WARN("%s is not a constructor\n", debugstr_w(prop->name)); return E_INVALIDARG; } - if(prop->name || This->builtin_info->class != JSCLASS_FUNCTION) { - vdisp_t vthis; + if(This->builtin_info->class != JSCLASS_FUNCTION && prop->u.p->invoke != JSGlobal_eval) + flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; + if(jsthis) + set_disp(&vthis, jsthis); + else + set_jsdisp(&vthis, This); + hres = prop->u.p->invoke(This->ctx, &vthis, flags, argc, argv, r); + vdisp_release(&vthis); - if(This->builtin_info->class != JSCLASS_FUNCTION && prop->u.p->invoke != JSGlobal_eval) - flags &= ~DISPATCH_JSCRIPT_INTERNAL_MASK; - if(jsthis) - set_disp(&vthis, jsthis); - else - set_jsdisp(&vthis, This); - hres = prop->u.p->invoke(This->ctx, &vthis, flags, argc, argv, r); - vdisp_release(&vthis); - }else { - /* Function object calls are special case */ - hres = Function_invoke(This, jsthis, flags, argc, argv, r); - } return hres; } case PROP_PROTREF: @@ -629,8 +628,6 @@ static HRESULT fill_protrefs(jsdisp_t *This) fill_protrefs(This->prototype); for(iter = This->prototype->props; iter < This->prototype->props+This->prototype->prop_cnt; iter++) { - if(!iter->name) - continue; hres = find_prop_name(This, iter->hash, iter->name, &prop); if(FAILED(hres)) return hres; @@ -1422,7 +1419,7 @@ static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LC for (prop = This->props, end = prop + This->prop_cnt; prop != end; prop++) { - if (!prop->name || prop->type != PROP_JSVAL || !(prop->flags & PROPF_ENUMERABLE)) + if (prop->type != PROP_JSVAL || !(prop->flags & PROPF_ENUMERABLE)) continue; /* If two identifiers differ only by case, the TypeInfo fails */ @@ -1477,7 +1474,7 @@ static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LC typevar = typeinfo->vars; for (prop = This->props; prop != end; prop++) { - if (!prop->name || prop->type != PROP_JSVAL || !(prop->flags & PROPF_ENUMERABLE)) + if (prop->type != PROP_JSVAL || !(prop->flags & PROPF_ENUMERABLE)) continue; if (is_function_prop(prop)) @@ -1572,12 +1569,10 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc V_VT(pvarRes) = VT_EMPTY; prop = get_prop(This, id); - if(!prop || prop->type == PROP_DELETED) { + if(!prop && id != DISPID_VALUE) { TRACE("invalid id\n"); return DISP_E_MEMBERNOTFOUND; } - if(id == DISPID_VALUE && wFlags & (DISPATCH_PROPERTYGET | DISPATCH_PROPERTYPUT)) - prop = NULL; enter_script(This->ctx, &ei); @@ -1594,7 +1589,11 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc if(FAILED(hres)) break; - hres = invoke_prop_func(This, get_this(pdp), prop, wFlags, argc, argv, pvarRes ? &r : NULL, pspCaller); + if(prop) + hres = invoke_prop_func(This, get_this(pdp), prop, wFlags, argc, argv, pvarRes ? &r : NULL, pspCaller); + else + hres = jsdisp_call_value(This, get_this(pdp), wFlags, argc, argv, pvarRes ? &r : NULL); + if(argv != buf) heap_free(argv); if(SUCCEEDED(hres) && pvarRes) { @@ -1738,7 +1737,7 @@ static HRESULT WINAPI DispatchEx_GetMemberName(IDispatchEx *iface, DISPID id, BS TRACE("(%p)->(%x %p)\n", This, id, pbstrName); prop = get_prop(This, id); - if(!prop || !prop->name || prop->type == PROP_DELETED) + if(!prop) return DISP_E_MEMBERNOTFOUND; *pbstrName = SysAllocString(prop->name); @@ -1751,11 +1750,12 @@ static HRESULT WINAPI DispatchEx_GetMemberName(IDispatchEx *iface, DISPID id, BS static HRESULT WINAPI DispatchEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex, DISPID id, DISPID *pid) { jsdisp_t *This = impl_from_IDispatchEx(iface); - HRESULT hres; + HRESULT hres = S_FALSE; TRACE("(%p)->(%x %x %p)\n", This, grfdex, id, pid); - hres = jsdisp_next_prop(This, id, JSDISP_ENUM_ALL, pid); + if(id != DISPID_VALUE) + hres = jsdisp_next_prop(This, id, JSDISP_ENUM_ALL, pid); if(hres == S_FALSE) *pid = DISPID_STARTENUM; return hres; @@ -1807,6 +1807,7 @@ HRESULT init_dispex(jsdisp_t *dispex, script_ctx_t *ctx, const builtin_info_t *b dispex->ref = 1; dispex->builtin_info = builtin_info; dispex->extensible = TRUE; + dispex->prop_cnt = 0; dispex->props = heap_alloc_zero(sizeof(dispex_prop_t)*(dispex->buf_size=4)); if(!dispex->props) @@ -1821,14 +1822,6 @@ HRESULT init_dispex(jsdisp_t *dispex, script_ctx_t *ctx, const builtin_info_t *b if(prototype) jsdisp_addref(prototype); - dispex->prop_cnt = 1; - if(builtin_info->value_prop.invoke || builtin_info->value_prop.getter) { - dispex->props[0].type = PROP_BUILTIN; - dispex->props[0].u.p = &builtin_info->value_prop; - }else { - dispex->props[0].type = PROP_DELETED; - } - script_addref(ctx); dispex->ctx = ctx; @@ -2446,19 +2439,23 @@ HRESULT disp_delete(IDispatch *disp, DISPID id, BOOL *ret) HRESULT jsdisp_next_prop(jsdisp_t *obj, DISPID id, enum jsdisp_enum_type enum_type, DISPID *ret) { dispex_prop_t *iter; + DWORD idx = id; HRESULT hres; - if(id == DISPID_STARTENUM && enum_type == JSDISP_ENUM_ALL) { - hres = fill_protrefs(obj); - if(FAILED(hres)) - return hres; + if(id == DISPID_STARTENUM) { + if (enum_type == JSDISP_ENUM_ALL) { + hres = fill_protrefs(obj); + if(FAILED(hres)) + return hres; + } + idx = 0; } - if(id + 1 < 0 || id+1 >= obj->prop_cnt) + if(idx >= obj->prop_cnt) return S_FALSE; - for(iter = &obj->props[id + 1]; iter < obj->props + obj->prop_cnt; iter++) { - if(!iter->name || iter->type == PROP_DELETED) + for(iter = &obj->props[idx]; iter < obj->props + obj->prop_cnt; iter++) { + if(iter->type == PROP_DELETED) continue; if(enum_type != JSDISP_ENUM_ALL && iter->type == PROP_PROTREF) continue; @@ -2765,7 +2762,7 @@ HRESULT jsdisp_get_prop_name(jsdisp_t *obj, DISPID id, jsstr_t **r) { dispex_prop_t *prop = get_prop(obj, id); - if(!prop || !prop->name || prop->type == PROP_DELETED) + if(!prop) return DISP_E_MEMBERNOTFOUND; *r = jsstr_alloc(prop->name);

1 0

Gabriel Ivăncescu : jscript: Replace the value_prop in builtin_info with a call method.
by Alexandre Julliard Nov. 25, 2021

Nov. 25, 2021

Module: wine Branch: master Commit: ce1b3f5f1d8a83d819b24a49ebb4f6a86bf7cdc0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce1b3f5f1d8a83d819b24a49… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Nov 25 21:01:37 2021 +0100 jscript: Replace the value_prop in builtin_info with a call method. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/array.c | 15 +++------------ dlls/jscript/bool.c | 4 ++-- dlls/jscript/date.c | 13 +++---------- dlls/jscript/dispex.c | 6 +++--- dlls/jscript/enumerator.c | 6 +++--- dlls/jscript/error.c | 4 ++-- dlls/jscript/function.c | 6 +++--- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.c | 2 +- dlls/jscript/jscript.h | 3 +-- dlls/jscript/json.c | 2 +- dlls/jscript/jsregexp.c | 6 +++--- dlls/jscript/math.c | 2 +- dlls/jscript/number.c | 14 ++------------ dlls/jscript/object.c | 20 +++----------------- dlls/jscript/set.c | 8 ++++---- dlls/jscript/string.c | 16 +++------------- dlls/jscript/vbarray.c | 2 +- 18 files changed, 40 insertions(+), 91 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ce1b3f5f1d8a83d819b2…

1 0

Paul Gofman : ntdll: Fix context arch flag cleanup for AMD64 in context_from_server().
by Alexandre Julliard Nov. 25, 2021

Nov. 25, 2021

Module: wine Branch: master Commit: 6747ecdefdc2565c3fb4732170883c3fe01a0a06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6747ecdefdc2565c3fb47321… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Nov 24 18:06:39 2021 +0300 ntdll: Fix context arch flag cleanup for AMD64 in context_from_server(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/thread.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 38a03bd4b60..00261edb593 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -755,7 +755,7 @@ static NTSTATUS context_from_server( void *dst, const context_t *from, USHORT ma { AMD64_CONTEXT *to = dst; - to_flags = to->ContextFlags & ~CONTEXT_i386; + to_flags = to->ContextFlags & ~CONTEXT_AMD64; if ((from->flags & SERVER_CTX_CONTROL) && (to_flags & CONTEXT_AMD64_CONTROL)) { to->ContextFlags |= CONTEXT_AMD64_CONTROL; @@ -830,7 +830,7 @@ static NTSTATUS context_from_server( void *dst, const context_t *from, USHORT ma { AMD64_CONTEXT *to = dst; - to_flags = to->ContextFlags & ~CONTEXT_i386; + to_flags = to->ContextFlags & ~CONTEXT_AMD64; if ((from->flags & SERVER_CTX_CONTROL) && (to_flags & CONTEXT_AMD64_CONTROL)) { to->ContextFlags |= CONTEXT_AMD64_CONTROL;

1 0

Alex Henrie : include: Add featurestagingapi.h.
by Alexandre Julliard Nov. 25, 2021

Nov. 25, 2021

Module: wine Branch: master Commit: 35d6f414add91a35fa69f63f83c4b97c2cad0b80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35d6f414add91a35fa69f63f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Nov 21 22:02:55 2021 -0700 include: Add featurestagingapi.h. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/featurestagingapi.h | 49 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 756e25dcc82..acb55b37f6c 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -302,6 +302,7 @@ SOURCES = \ exposeenums2managed.h \ fci.h \ fdi.h \ + featurestagingapi.h \ fileapi.h \ filter.idl \ fltdefs.h \ diff --git a/include/featurestagingapi.h b/include/featurestagingapi.h new file mode 100644 index 00000000000..9a9237eb13c --- /dev/null +++ b/include/featurestagingapi.h @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2021 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _FEATURESTAGINGAPI_H_ +#define _FEATURESTAGINGAPI_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +DECLARE_HANDLE(FEATURE_STATE_CHANGE_SUBSCRIPTION); + +typedef void WINAPI FEATURE_STATE_CHANGE_CALLBACK(void*); + +typedef enum FEATURE_CHANGE_TIME +{ + FEATURE_CHANGE_TIME_READ, + FEATURE_CHANGE_TIME_MODULE_RELOAD, + FEATURE_CHANGE_TIME_SESSION, + FEATURE_CHANGE_TIME_REBOOT +} FEATURE_CHANGE_TIME; + +typedef enum FEATURE_ENABLED_STATE +{ + FEATURE_ENABLED_STATE_DEFAULT, + FEATURE_ENABLED_STATE_DISABLED, + FEATURE_ENABLED_STATE_ENABLED +} FEATURE_ENABLED_STATE; + +#ifdef __cplusplus +} +#endif + +#endif

1 0