- Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Report the correct address for breakpoint exception on ARM platforms.
by Alexandre Julliard Jan. 30, 2024

Jan. 30, 2024

Module: wine Branch: master Commit: 982e323070d5fb8dffbc68b75fb30c4be5f84e67 URL: https://gitlab.winehq.org/wine/wine/-/commit/982e323070d5fb8dffbc68b75fb30c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 30 15:45:48 2024 +0100 ntdll: Report the correct address for breakpoint exception on ARM platforms. --- dlls/ntdll/unix/signal_arm.c | 52 +++++++++++++++++++++++++++--------------- dlls/ntdll/unix/signal_arm64.c | 45 ++++++++++++++++++++++-------------- 2 files changed, 62 insertions(+), 35 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 2a375e6f15f..9ca0569bd62 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -967,33 +967,27 @@ NTSTATUS get_thread_wow64_context( HANDLE handle, void *ctx, ULONG size ) /*********************************************************************** - * setup_exception - * - * Modify the signal context to call the exception raise function. + * setup_raise_exception */ -static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) +static void setup_raise_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec, CONTEXT *context ) { struct exc_stack_layout *stack; void *stack_ptr = (void *)(SP_sig(sigcontext) & ~7); - CONTEXT context; NTSTATUS status; - rec->ExceptionAddress = (void *)PC_sig(sigcontext); - save_context( &context, sigcontext ); - - status = send_debug_event( rec, &context, TRUE ); + status = send_debug_event( rec, context, TRUE ); if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) { - restore_context( &context, sigcontext ); + restore_context( context, sigcontext ); return; } /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */ - if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context.Pc -= 2; + if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context->Pc -= 2; stack = virtual_setup_exception( stack_ptr, sizeof(*stack), rec ); stack->rec = *rec; - stack->context = context; + stack->context = *context; /* now modify the sigcontext to return to the raise function */ SP_sig(sigcontext) = (DWORD)stack; @@ -1003,6 +997,21 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) } +/*********************************************************************** + * setup_exception + * + * Modify the signal context to call the exception raise function. + */ +static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) +{ + CONTEXT context; + + rec->ExceptionAddress = (void *)PC_sig(sigcontext); + save_context( &context, sigcontext ); + setup_raise_exception( sigcontext, rec, &context ); +} + + /*********************************************************************** * call_user_apc_dispatcher */ @@ -1243,6 +1252,10 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { EXCEPTION_RECORD rec = { 0 }; ucontext_t *context = sigcontext; + CONTEXT ctx; + + rec.ExceptionAddress = (void *)PC_sig(context); + save_context( &ctx, sigcontext ); switch (get_trap_code(signal, context)) { @@ -1251,10 +1264,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { case 0xfb: /* __fastfail */ { - CONTEXT ctx; - save_context( &ctx, sigcontext ); rec.ExceptionCode = STATUS_STACK_BUFFER_OVERRUN; - rec.ExceptionAddress = (void *)ctx.Pc; rec.ExceptionFlags = EH_NONCONTINUABLE; rec.NumberParameters = 1; rec.ExceptionInformation[0] = ctx.R0; @@ -1262,7 +1272,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) return; } case 0xfe: /* breakpoint */ - PC_sig(context) += 2; /* skip the instruction */ + ctx.Pc += 2; /* skip the breakpoint instruction */ rec.ExceptionCode = EXCEPTION_BREAKPOINT; rec.NumberParameters = 1; break; @@ -1294,7 +1304,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) break; } if (handle_syscall_fault( context, &rec )) return; - setup_exception( context, &rec ); + setup_raise_exception( context, &rec, &ctx ); } @@ -1306,6 +1316,11 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { EXCEPTION_RECORD rec = { 0 }; + ucontext_t *context = sigcontext; + CONTEXT ctx; + + rec.ExceptionAddress = (void *)PC_sig(context); + save_context( &ctx, sigcontext ); switch (siginfo->si_code) { @@ -1314,11 +1329,12 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) break; case TRAP_BRKPT: default: + ctx.Pc += 2; /* skip the breakpoint instruction */ rec.ExceptionCode = EXCEPTION_BREAKPOINT; rec.NumberParameters = 1; break; } - setup_exception( sigcontext, &rec ); + setup_raise_exception( sigcontext, &rec, &ctx ); } diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 3b05f556e8e..bc5b8f0b88a 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -688,33 +688,27 @@ NTSTATUS get_thread_wow64_context( HANDLE handle, void *ctx, ULONG size ) /*********************************************************************** - * setup_exception - * - * Modify the signal context to call the exception raise function. + * setup_raise_exception */ -static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) +static void setup_raise_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec, CONTEXT *context ) { struct exc_stack_layout *stack; void *stack_ptr = (void *)(SP_sig(sigcontext) & ~15); - CONTEXT context; NTSTATUS status; - rec->ExceptionAddress = (void *)PC_sig(sigcontext); - save_context( &context, sigcontext ); - - status = send_debug_event( rec, &context, TRUE ); + status = send_debug_event( rec, context, TRUE ); if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) { - restore_context( &context, sigcontext ); + restore_context( context, sigcontext ); return; } /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */ - if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context.Pc -= 4; + if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context->Pc -= 4; stack = virtual_setup_exception( stack_ptr, sizeof(*stack), rec ); stack->rec = *rec; - stack->context = context; + stack->context = *context; SP_sig(sigcontext) = (ULONG_PTR)stack; PC_sig(sigcontext) = (ULONG_PTR)pKiUserExceptionDispatcher; @@ -722,6 +716,21 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) } +/*********************************************************************** + * setup_exception + * + * Modify the signal context to call the exception raise function. + */ +static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) +{ + CONTEXT context; + + rec->ExceptionAddress = (void *)PC_sig(sigcontext); + save_context( &context, sigcontext ); + setup_raise_exception( sigcontext, rec, &context ); +} + + /*********************************************************************** * call_user_apc_dispatcher */ @@ -1069,6 +1078,10 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { EXCEPTION_RECORD rec = { 0 }; ucontext_t *context = sigcontext; + CONTEXT ctx; + + rec.ExceptionAddress = (void *)PC_sig(context); + save_context( &ctx, sigcontext ); switch (siginfo->si_code) { @@ -1082,22 +1095,20 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) !(PC_sig( context ) & 3) && *(ULONG *)PC_sig( context ) == 0xd43e0060UL) /* brk #0xf003 -> __fastfail */ { - CONTEXT ctx; - save_context( &ctx, sigcontext ); rec.ExceptionCode = STATUS_STACK_BUFFER_OVERRUN; - rec.ExceptionAddress = (void *)ctx.Pc; rec.ExceptionFlags = EH_NONCONTINUABLE; rec.NumberParameters = 1; rec.ExceptionInformation[0] = ctx.X[0]; NtRaiseException( &rec, &ctx, FALSE ); return; } - PC_sig( context ) += 4; /* skip the brk instruction */ + ctx.Pc += 4; /* skip the brk instruction */ rec.ExceptionCode = EXCEPTION_BREAKPOINT; rec.NumberParameters = 1; break; } - setup_exception( sigcontext, &rec ); + + setup_raise_exception( sigcontext, &rec, &ctx ); }

1 0

Alexandre Julliard : include: Include cfg.h from cfgmgr32.h.
by Alexandre Julliard Jan. 30, 2024

Jan. 30, 2024

Module: wine Branch: master Commit: 008f64557d3ad9ef83e956204079b48f8fa1eaa7 URL: https://gitlab.winehq.org/wine/wine/-/commit/008f64557d3ad9ef83e956204079b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 30 16:45:45 2024 +0100 include: Include cfg.h from cfgmgr32.h. --- dlls/cfgmgr32/main.c | 1 + dlls/cfgmgr32/tests/cfgmgr32.c | 1 + dlls/hidclass.sys/hid.h | 1 + dlls/win32u/sysparams.c | 2 +- dlls/winexinput.sys/main.c | 1 + include/cfgmgr32.h | 23 ++--------------------- 6 files changed, 7 insertions(+), 22 deletions(-) diff --git a/dlls/cfgmgr32/main.c b/dlls/cfgmgr32/main.c index 7d48a96be85..b545d761f68 100644 --- a/dlls/cfgmgr32/main.c +++ b/dlls/cfgmgr32/main.c @@ -17,6 +17,7 @@ */ #include "wine/debug.h" +#include "winreg.h" #include "cfgmgr32.h" WINE_DEFAULT_DEBUG_CHANNEL(setupapi); diff --git a/dlls/cfgmgr32/tests/cfgmgr32.c b/dlls/cfgmgr32/tests/cfgmgr32.c index aa1a2100ee1..22344c45afc 100644 --- a/dlls/cfgmgr32/tests/cfgmgr32.c +++ b/dlls/cfgmgr32/tests/cfgmgr32.c @@ -17,6 +17,7 @@ */ #include "wine/test.h" +#include "winreg.h" #include "cfgmgr32.h" static void test_CM_MapCrToWin32Err(void) diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index 3eefbf87f63..7b5d5f19298 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -22,6 +22,7 @@ #include "winbase.h" #include "winternl.h" #include "winioctl.h" +#include "winreg.h" #include "ddk/wdm.h" #include "hidusage.h" #include "ddk/hidport.h" diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index e2c5b10da9e..9a43de8fd76 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -31,7 +31,7 @@ #define WIN32_NO_STATUS #include "ntgdi_private.h" #include "ntuser_private.h" -#include "devpropdef.h" +#include "winreg.h" #include "cfgmgr32.h" #include "d3dkmdt.h" #include "wine/wingdi16.h" diff --git a/dlls/winexinput.sys/main.c b/dlls/winexinput.sys/main.c index f07e6b31bd5..26764fa78ef 100644 --- a/dlls/winexinput.sys/main.c +++ b/dlls/winexinput.sys/main.c @@ -27,6 +27,7 @@ #include "winbase.h" #include "winternl.h" #include "winioctl.h" +#include "winreg.h" #include "cfgmgr32.h" #include "ddk/wdm.h" diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h index ee1846b0e97..0893e42b399 100644 --- a/include/cfgmgr32.h +++ b/include/cfgmgr32.h @@ -19,15 +19,13 @@ #ifndef _CFGMGR32_H_ #define _CFGMGR32_H_ -/* FIXME: #include <cfg.h> */ +#include <cfg.h> +#include <devpropdef.h> #ifndef GUID_DEFINED # include <guiddef.h> #endif -#include <winreg.h> -#include <devpropdef.h> - /* cfgmgr32 doesn't use the normal convention, it adds an underscore before A/W */ #ifdef WINE_NO_UNICODE_MACROS # define DECL_WINELIB_CFGMGR32_TYPE_AW(type) /* nothing */ @@ -193,23 +191,6 @@ typedef CHAR *DEVNODEID_A, *DEVINSTID_A; typedef WCHAR *DEVNODEID_W, *DEVINSTID_W; typedef ULONG REGDISPOSITION; -typedef enum _PNP_VETO_TYPE -{ - PNP_VetoTypeUnknown, - PNP_VetoLegacyDevice, - PNP_VetoPendingClose, - PNP_VetoWindowsApp, - PNP_VetoWindowsService, - PNP_VetoOutstandingOpen, - PNP_VetoDevice, - PNP_VetoDriver, - PNP_VetoIllegalDeviceRequest, - PNP_VetoInsufficientPower, - PNP_VetoNonDisableable, - PNP_VetoLegacyDriver, - PNP_VetoInsufficientRights -} PNP_VETO_TYPE, *PPNP_VETO_TYPE; - typedef enum _CM_NOTIFY_FILTER_TYPE { CM_NOTIFY_FILTER_TYPE_DEVICEINTERFACE,

1 0

Alexandre Julliard : dbghelp/tests: Mark failing tests as todo.
by Alexandre Julliard Jan. 30, 2024

Jan. 30, 2024

Module: wine Branch: master Commit: 87a21586a86fbc3b19ad5a1c2e87c9dbb720bc36 URL: https://gitlab.winehq.org/wine/wine/-/commit/87a21586a86fbc3b19ad5a1c2e87c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 30 17:19:55 2024 +0100 dbghelp/tests: Mark failing tests as todo. --- dlls/dbghelp/tests/dbghelp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index e41dd5f94a0..d1c2f219533 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -876,6 +876,7 @@ static void test_loaded_modules(void) aggregation.count_systemdir, aggregation.count_wowdir); break; case PCSKIND_WINE_OLD_WOW64: + todo_wine ok(aggregation.count_systemdir == 1 && aggregation.count_wowdir > 2, "Wrong directory aggregation count %u %u\n", aggregation.count_systemdir, aggregation.count_wowdir); break; @@ -1353,6 +1354,7 @@ static void test_live_modules_proc(WCHAR* exename, BOOL with_32) ok(aggregation_event.count_exe == 1, "Unexpected event.count_exe %u\n", aggregation_event.count_exe); ok(aggregation_event.count_32bit >= MODCOUNT, "Unexpected event.count_32bit %u\n", aggregation_event.count_32bit); ok(aggregation_event.count_64bit == 0, "Unexpected event.count_64bit %u\n", aggregation_event.count_64bit); + todo_wine ok(aggregation_event.count_systemdir == 0, "Unexpected event.count_systemdir %u\n", aggregation_event.count_systemdir); ok(aggregation_event.count_wowdir >= MODCOUNT, "Unexpected event.count_wowdir %u\n", aggregation_event.count_wowdir); ok(aggregation_event.count_ntdll == 1, "Unexpected event.count_ntdll %u\n", aggregation_event.count_ntdll); @@ -1418,6 +1420,7 @@ static void test_live_modules_proc(WCHAR* exename, BOOL with_32) ok(aggregation_event.count_exe == 1, "Unexpected event.count_exe %u\n", aggregation_event.count_exe); ok(aggregation_event.count_32bit >= MODCOUNT, "Unexpected event.count_32bit %u\n", aggregation_event.count_32bit); ok(aggregation_event.count_64bit == 0, "Unexpected event.count_64bit %u\n", aggregation_event.count_64bit); + todo_wine ok(aggregation_event.count_systemdir == 1, "Unexpected event.count_systemdir %u\n", aggregation_event.count_systemdir); ok(aggregation_event.count_wowdir >= MODCOUNT, "Unexpected event.count_wowdir %u\n", aggregation_event.count_wowdir); ok(aggregation_event.count_ntdll == 1, "Unexpected event.count_ntdll %u\n", aggregation_event.count_ntdll);

1 0

Helix Graziani : cfgmgr32: Add CM_Get_Device_Interface_PropertyW stub.
by Alexandre Julliard Jan. 30, 2024

Jan. 30, 2024

Module: wine Branch: master Commit: 91d60983acad0e8791b94f60dad5d318b67c0166 URL: https://gitlab.winehq.org/wine/wine/-/commit/91d60983acad0e8791b94f60dad5d3… Author: Helix Graziani <helix.graziani(a)hotmail.com> Date: Mon Jan 29 19:24:07 2024 -0500 cfgmgr32: Add CM_Get_Device_Interface_PropertyW stub. --- dlls/cfgmgr32/cfgmgr32.spec | 2 +- dlls/cfgmgr32/main.c | 13 +++++++++++++ include/cfgmgr32.h | 2 ++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index e4cd845e2a4..29de7bbdc55 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -91,7 +91,7 @@ @ stdcall CM_Get_Device_Interface_List_SizeW(ptr ptr wstr long) setupapi.CM_Get_Device_Interface_List_SizeW @ stdcall CM_Get_Device_Interface_List_Size_ExA(ptr ptr str long ptr) setupapi.CM_Get_Device_Interface_List_Size_ExA @ stdcall CM_Get_Device_Interface_List_Size_ExW(ptr ptr wstr long ptr) setupapi.CM_Get_Device_Interface_List_Size_ExW -@ stub CM_Get_Device_Interface_PropertyW +@ stdcall CM_Get_Device_Interface_PropertyW(wstr ptr ptr ptr ptr long) @ stub CM_Get_First_Log_Conf @ stub CM_Get_First_Log_Conf_Ex @ stub CM_Get_Global_State diff --git a/dlls/cfgmgr32/main.c b/dlls/cfgmgr32/main.c index f40068af0df..7d48a96be85 100644 --- a/dlls/cfgmgr32/main.c +++ b/dlls/cfgmgr32/main.c @@ -67,3 +67,16 @@ CONFIGRET WINAPI CM_Register_Notification( CM_NOTIFY_FILTER *filter, void *conte return CR_CALL_NOT_IMPLEMENTED; } + +/*********************************************************************** + * CM_Get_Device_Interface_PropertyW (cfgmgr32.@) + */ +CONFIGRET WINAPI CM_Get_Device_Interface_PropertyW( LPCWSTR device_interface, const DEVPROPKEY *property_key, + DEVPROPTYPE *property_type, BYTE *property_buffer, + ULONG *property_buffer_size, ULONG flags ) +{ + FIXME("%s %p %p %p %p %ld stub!\n", debugstr_w(device_interface), property_key, property_type, + property_buffer, property_buffer_size, flags); + + return CR_CALL_NOT_IMPLEMENTED; +} diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h index a0bb89a2a67..ee1846b0e97 100644 --- a/include/cfgmgr32.h +++ b/include/cfgmgr32.h @@ -26,6 +26,7 @@ #endif #include <winreg.h> +#include <devpropdef.h> /* cfgmgr32 doesn't use the normal convention, it adds an underscore before A/W */ #ifdef WINE_NO_UNICODE_MACROS @@ -312,6 +313,7 @@ CMAPI CONFIGRET WINAPI CM_Get_Device_ID_List_ExW(PCWSTR,PWCHAR,ULONG,ULONG,HMACH #define CM_Get_Device_ID_List_Ex WINELIB_NAME_AW(CM_Get_Device_ID_List_Ex) CMAPI CONFIGRET WINAPI CM_Get_Device_ID_Size(PULONG,DEVINST,ULONG); CMAPI CONFIGRET WINAPI CM_Get_Device_ID_Size_Ex(PULONG,DEVINST,ULONG,HMACHINE); +CMAPI CONFIGRET WINAPI CM_Get_Device_Interface_PropertyW(LPCWSTR,const DEVPROPKEY*,DEVPROPTYPE*,PBYTE,PULONG,ULONG); CMAPI CONFIGRET WINAPI CM_Get_DevNode_Status(PULONG,PULONG,DEVINST,ULONG); CMAPI CONFIGRET WINAPI CM_Get_DevNode_Status_Ex(PULONG,PULONG,DEVINST,ULONG,HMACHINE); CMAPI CONFIGRET WINAPI CM_Get_Sibling(PDEVINST,DEVINST,ULONG);

1 0

Gabriel Ivăncescu : mshtml: Implement Exec for CGID_ScriptSite's CMDID_SCRIPTSITE_SECURITY_WINDOW.
by Alexandre Julliard Jan. 30, 2024

Jan. 30, 2024

Module: wine Branch: master Commit: 62000c28c9de6c4a53fffc3140d51c6729e4cf8b URL: https://gitlab.winehq.org/wine/wine/-/commit/62000c28c9de6c4a53fffc3140d51c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Jan 29 16:59:39 2024 +0200 mshtml: Implement Exec for CGID_ScriptSite's CMDID_SCRIPTSITE_SECURITY_WINDOW. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/script.c | 29 +++++++++++++++++++++++++++-- dlls/mshtml/tests/script.c | 16 +++++++++++++++- 2 files changed, 42 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 3448203dc6f..d1da451cb98 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -730,9 +730,34 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID { ScriptHost *This = impl_from_IOleCommandTarget(iface); - FIXME("(%p)->(%s %ld %ld %s %p)\n", This, debugstr_guid(pguidCmdGroup), nCmdID, nCmdexecopt, wine_dbgstr_variant(pvaIn), pvaOut); + TRACE("(%p)->(%s %ld %ld %s %p)\n", This, debugstr_guid(pguidCmdGroup), nCmdID, nCmdexecopt, wine_dbgstr_variant(pvaIn), pvaOut); - return E_NOTIMPL; + if(!pguidCmdGroup) { + FIXME("Unsupported pguidCmdGroup %s\n", debugstr_guid(pguidCmdGroup)); + return OLECMDERR_E_UNKNOWNGROUP; + } + + if(IsEqualGUID(&CGID_ScriptSite, pguidCmdGroup)) { + switch(nCmdID) { + case CMDID_SCRIPTSITE_SECURITY_WINDOW: + if(!This->window || !This->window->base.outer_window) { + FIXME("No window\n"); + return E_FAIL; + } + V_VT(pvaOut) = VT_DISPATCH; + V_DISPATCH(pvaOut) = (IDispatch*)&This->window->base.outer_window->base.IHTMLWindow2_iface; + IDispatch_AddRef(V_DISPATCH(pvaOut)); + break; + + default: + FIXME("Unsupported nCmdID %ld of CGID_ScriptSite group\n", nCmdID); + return OLECMDERR_E_NOTSUPPORTED; + } + return S_OK; + } + + FIXME("Unsupported pguidCmdGroup %s\n", debugstr_guid(pguidCmdGroup)); + return OLECMDERR_E_UNKNOWNGROUP; } static const IOleCommandTargetVtbl OleCommandTargetVtbl = { diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 360f9e36d81..5959a2b7500 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -3079,11 +3079,12 @@ static void test_ui(void) static void test_sp(void) { IServiceProvider *sp, *doc_sp, *doc_obj_sp, *window_sp; + IHTMLWindow2 *window, *cmdtarget_window; IOleCommandTarget *cmdtarget; - IHTMLWindow2 *window; IHTMLDocument2 *doc; IUnknown *unk; HRESULT hres; + VARIANT var; hres = IDispatchEx_QueryInterface(window_dispex, &IID_IHTMLWindow2, (void**)&window); ok(hres == S_OK, "QueryInterface(IHTMLWindow2) failed: %08lx\n", hres); @@ -3161,6 +3162,19 @@ static void test_sp(void) IUnknown_Release(unk); } + V_VT(&var) = VT_EMPTY; + hres = IOleCommandTarget_Exec(cmdtarget, &CGID_ScriptSite, CMDID_SCRIPTSITE_SECURITY_WINDOW, 0, NULL, &var); + ok(hres == S_OK, "Exec failed: %08lx\n", hres); + ok(V_VT(&var) == VT_DISPATCH, "V_VT(CMDID_SCRIPTSITE_SECURITY_WINDOW) = %d\n", V_VT(&var)); + ok(V_DISPATCH(&var) != NULL, "V_DISPATCH(CMDID_SCRIPTSITE_SECURITY_WINDOW) = NULL\n"); + + hres = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IHTMLWindow2, (void**)&cmdtarget_window); + ok(hres == S_OK, "QueryInterface(IHTMLWindow2) failed: %08lx\n", hres); + ok(cmdtarget_window != NULL, "cmdtarget_window is NULL\n"); + ok(window == cmdtarget_window, "window != cmdtarget_window\n"); + IHTMLWindow2_Release(cmdtarget_window); + VariantClear(&var); + IOleCommandTarget_Release(cmdtarget); IServiceProvider_Release(window_sp); IServiceProvider_Release(doc_obj_sp);

1 0

Gabriel Ivăncescu : jscript: Implement IActiveScriptSite service.
by Alexandre Julliard Jan. 30, 2024

Jan. 30, 2024

Module: wine Branch: master Commit: 9373ec4c3c2b376069ab41184a9f1e36543ef2b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/9373ec4c3c2b376069ab41184a9f1e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Jan 29 16:59:39 2024 +0200 jscript: Implement IActiveScriptSite service. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/jsutils.c | 8 ++++++++ dlls/jscript/tests/caller.c | 10 ++++++++++ dlls/mshtml/tests/script.c | 31 +++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 80e068fc529..12f41acd398 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -1035,6 +1035,14 @@ static HRESULT WINAPI JSCaller_QueryService(IServiceProvider *iface, REFGUID gui { JSCaller *This = impl_from_IServiceProvider(iface); + if(IsEqualGUID(guidService, &IID_IActiveScriptSite)) { + TRACE("(%p)->(IID_IActiveScriptSite)\n", This); + if(This->ctx && This->ctx->site) + return IActiveScriptSite_QueryInterface(This->ctx->site, riid, ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + if(IsEqualGUID(guidService, &SID_GetCaller)) { TRACE("(%p)->(SID_GetCaller)\n", This); *ppv = NULL; diff --git a/dlls/jscript/tests/caller.c b/dlls/jscript/tests/caller.c index 99b6a21e7fb..7bb7d4a8fe1 100644 --- a/dlls/jscript/tests/caller.c +++ b/dlls/jscript/tests/caller.c @@ -75,6 +75,7 @@ static const CLSID CLSID_JScript = expect_ ## func = called_ ## func = FALSE DEFINE_EXPECT(sp_caller_QI_NULL); +DEFINE_EXPECT(site_QI_NULL); DEFINE_EXPECT(testArgConv); DEFINE_EXPECT(testGetCaller); DEFINE_EXPECT(testGetCallerJS); @@ -254,6 +255,7 @@ static void test_change_types(IVariantChangeType *change_type, IDispatch *obj_di static void test_caller(IServiceProvider *caller, IDispatch *arg_obj) { IVariantChangeType *change_type; + IUnknown *unk; HRESULT hres; hres = IServiceProvider_QueryService(caller, &SID_VariantConversion, &IID_IVariantChangeType, (void**)&change_type); @@ -263,6 +265,12 @@ static void test_caller(IServiceProvider *caller, IDispatch *arg_obj) test_change_types(change_type, arg_obj); IVariantChangeType_Release(change_type); + + SET_EXPECT(site_QI_NULL); + hres = IServiceProvider_QueryService(caller, &IID_IActiveScriptSite, &IID_NULL, (void**)&unk); + ok(hres == E_NOINTERFACE, "Querying for IActiveScriptSite->NULL returned: %08lx\n", hres); + ok(!unk, "unk != NULL\n"); + CHECK_CALLED(site_QI_NULL); } static IServiceProvider sp_caller_obj; @@ -567,6 +575,8 @@ static HRESULT WINAPI ActiveScriptSite_QueryInterface(IActiveScriptSite *iface, }else if(IsEqualGUID(&IID_IActiveScriptSite, riid)) { *ppv = iface; }else { + if(IsEqualGUID(&IID_NULL, riid)) + CHECK_EXPECT(site_QI_NULL); *ppv = NULL; return E_NOINTERFACE; } diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 5959a2b7500..5c969e4a3d9 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -313,6 +313,36 @@ fail: return SysAllocString(L"File"); } +static void test_sp_caller(IServiceProvider *sp) +{ + IOleCommandTarget *cmdtarget; + IServiceProvider *caller; + IHTMLWindow2 *window; + HRESULT hres; + VARIANT var; + + hres = IServiceProvider_QueryService(sp, &SID_GetCaller, &IID_IServiceProvider, (void**)&caller); + ok(hres == S_OK, "QueryService(SID_GetCaller) returned: %08lx\n", hres); + ok(!caller, "caller != NULL\n"); + + hres = IServiceProvider_QueryService(sp, &IID_IActiveScriptSite, &IID_IOleCommandTarget, (void**)&cmdtarget); + ok(hres == S_OK, "QueryService(IActiveScriptSite->IOleCommandTarget) failed: %08lx\n", hres); + ok(cmdtarget != NULL, "IOleCommandTarget is NULL\n"); + + V_VT(&var) = VT_EMPTY; + hres = IOleCommandTarget_Exec(cmdtarget, &CGID_ScriptSite, CMDID_SCRIPTSITE_SECURITY_WINDOW, 0, NULL, &var); + ok(hres == S_OK, "Exec failed: %08lx\n", hres); + ok(V_VT(&var) == VT_DISPATCH, "V_VT(CMDID_SCRIPTSITE_SECURITY_WINDOW) = %d\n", V_VT(&var)); + ok(V_DISPATCH(&var) != NULL, "V_DISPATCH(CMDID_SCRIPTSITE_SECURITY_WINDOW) = NULL\n"); + IOleCommandTarget_Release(cmdtarget); + + hres = IDispatch_QueryInterface(V_DISPATCH(&var), &IID_IHTMLWindow2, (void**)&window); + ok(hres == S_OK, "QueryInterface(IHTMLWindow2) failed: %08lx\n", hres); + ok(window != NULL, "window is NULL\n"); + IHTMLWindow2_Release(window); + VariantClear(&var); +} + static void test_script_vars(unsigned argc, VARIANTARG *argv) { static const WCHAR *const jsobj_names[] = { L"abc", L"foO", L"bar", L"TostRing", L"hasownpropERty" }; @@ -1170,6 +1200,7 @@ static HRESULT WINAPI externalDisp_InvokeEx(IDispatchEx *iface, DISPID id, LCID ok(!pvarRes, "pvarRes != NULL\n"); ok(pei != NULL, "pei == NULL\n"); + test_sp_caller(pspCaller); return S_OK; case DISPID_EXTERNAL_TODO_WINE_OK:

1 0

Gabriel Ivăncescu : mshtml: Implement IActiveScriptSite service.
by Alexandre Julliard Jan. 30, 2024

Jan. 30, 2024

Module: wine Branch: master Commit: a0624a7e188911b8bd5352f325cb6bd4a87c64ec URL: https://gitlab.winehq.org/wine/wine/-/commit/a0624a7e188911b8bd5352f325cb6b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Jan 29 16:59:39 2024 +0200 mshtml: Implement IActiveScriptSite service. With IOleCommandTarget stub, since it's the interface used. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlscript.h | 3 ++ dlls/mshtml/script.c | 66 +++++++++++++++++++++++++++++ dlls/mshtml/service.c | 16 +++++++ dlls/mshtml/tests/events.c | 31 +++++++++++++- dlls/mshtml/tests/htmldoc.c | 52 +++++++++++++++++++++++ dlls/mshtml/tests/script.c | 101 ++++++++++++++++++++++++++++++++++++++++---- 6 files changed, 258 insertions(+), 11 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Forward SID_SInternetHostSecurityManager of the document obj to the doc node.
by Alexandre Julliard Jan. 30, 2024

Jan. 30, 2024

Module: wine Branch: master Commit: 370a339055918c028eabe46dbe2677d674b735b7 URL: https://gitlab.winehq.org/wine/wine/-/commit/370a339055918c028eabe46dbe2677… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Jan 29 16:59:39 2024 +0200 mshtml: Forward SID_SInternetHostSecurityManager of the document obj to the doc node. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/service.c | 5 +++++ dlls/mshtml/tests/script.c | 17 +++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/dlls/mshtml/service.c b/dlls/mshtml/service.c index 01dd9fee836..6042dca4111 100644 --- a/dlls/mshtml/service.c +++ b/dlls/mshtml/service.c @@ -425,6 +425,11 @@ static HRESULT WINAPI DocObjServiceProvider_QueryService(IServiceProvider *iface return IOleUndoManager_QueryInterface(This->undomgr, riid, ppv); } + if(IsEqualGUID(&SID_SInternetHostSecurityManager, guidService)) { + TRACE("SID_SInternetHostSecurityManager\n"); + return IInternetHostSecurityManager_QueryInterface(&This->doc_node->IInternetHostSecurityManager_iface, riid, ppv); + } + if(IsEqualGUID(&SID_SContainerDispatch, guidService)) { TRACE("SID_SContainerDispatch\n"); return IHTMLDocument2_QueryInterface(&This->IHTMLDocument2_iface, riid, ppv); diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 35c3680093d..b38a36f3462 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -4541,7 +4541,9 @@ static void test_exec_script(IHTMLDocument2 *doc, const WCHAR *codew, const WCHA static void test_simple_script(void) { + IInternetHostSecurityManager *sec_mgr, *sec_mgr2; IHTMLDocument2 *doc_node; + IServiceProvider *sp; IHTMLWindow2 *window; IHTMLDocument2 *doc; HRESULT hres; @@ -4621,6 +4623,21 @@ static void test_simple_script(void) hres = IHTMLWindow2_get_document(window, &doc_node); ok(hres == S_OK, "get_document failed: %08lx\n", hres); + hres = IHTMLDocument2_QueryInterface(doc, &IID_IServiceProvider, (void**)&sp); + ok(hres == S_OK, "Could not get IServiceProvider iface: %08lx\n", hres); + hres = IServiceProvider_QueryService(sp, &SID_SInternetHostSecurityManager, &IID_IInternetHostSecurityManager, (void**)&sec_mgr); + ok(hres == S_OK, "QueryService failed: %08lx\n", hres); + IServiceProvider_Release(sp); + + hres = IHTMLDocument2_QueryInterface(doc_node, &IID_IServiceProvider, (void**)&sp); + ok(hres == S_OK, "Could not get IServiceProvider iface: %08lx\n", hres); + hres = IServiceProvider_QueryService(sp, &SID_SInternetHostSecurityManager, &IID_IInternetHostSecurityManager, (void**)&sec_mgr2); + ok(hres == S_OK, "QueryService failed: %08lx\n", hres); + ok(iface_cmp(sec_mgr, sec_mgr2), "sec_mgr != sec_mgr2\n"); + IInternetHostSecurityManager_Release(sec_mgr2); + IInternetHostSecurityManager_Release(sec_mgr); + IServiceProvider_Release(sp); + SET_EXPECT(SetScriptState_DISCONNECTED); SET_EXPECT(Close); SET_EXPECT(Close2);

1 0

Rémi Bernon : mf/topology_loader: Try to connect transform nodes with their current types first.
by Alexandre Julliard Jan. 30, 2024

Jan. 30, 2024

Module: wine Branch: master Commit: 2d88c5771611ad43767d19dc5b4fe990ec252304 URL: https://gitlab.winehq.org/wine/wine/-/commit/2d88c5771611ad43767d19dc5b4fe9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 24 15:27:25 2024 +0100 mf/topology_loader: Try to connect transform nodes with their current types first. And only if that fails try again by enumerating types. --- dlls/mf/tests/mf.c | 4 ---- dlls/mf/topology_loader.c | 7 +++++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 2ca9d37abb6..ea801bf3af5 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -3705,17 +3705,13 @@ todo_wine { hr = IMFTopology_SetUINT32(full_topology, &IID_IMFTopology, 123); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFTopoLoader_Load(loader, full_topology, &topology2, NULL); - todo_wine_if(IsEqualGUID(&test->decoder_class, &CLSID_MSH264DecoderMFT)) ok(hr == S_OK, "Failed to resolve topology, hr %#lx.\n", hr); - if (hr == S_OK) - { ok(full_topology != topology2, "Unexpected instance.\n"); hr = IMFTopology_GetUINT32(topology2, &IID_IMFTopology, &value); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ref = IMFTopology_Release(topology2); ok(ref == 0, "Release returned %ld\n", ref); - } ref = IMFTopology_Release(full_topology); ok(ref == 0, "Release returned %ld\n", ref); } diff --git a/dlls/mf/topology_loader.c b/dlls/mf/topology_loader.c index 83398dbb12f..806f61f8c33 100644 --- a/dlls/mf/topology_loader.c +++ b/dlls/mf/topology_loader.c @@ -525,8 +525,11 @@ static HRESULT topology_loader_resolve_branches(struct topoloader_context *conte else if (FAILED(hr = topology_branch_clone_nodes(context, branch))) WARN("Failed to clone nodes for branch %s\n", debugstr_topology_branch(branch)); else - hr = topology_branch_connect(context->output_topology, MF_CONNECT_ALLOW_DECODER, - branch, enumerate_source_types || node_type == MF_TOPOLOGY_TRANSFORM_NODE); + { + hr = topology_branch_connect(context->output_topology, MF_CONNECT_ALLOW_DECODER, branch, enumerate_source_types); + if (hr == MF_E_INVALIDMEDIATYPE && !enumerate_source_types && node_type == MF_TOPOLOGY_TRANSFORM_NODE) + hr = topology_branch_connect(context->output_topology, MF_CONNECT_ALLOW_DECODER, branch, TRUE); + } topology_branch_destroy(branch); if (FAILED(hr))

1 0

Nikolay Sivov : mfplat/tests: Skip tests that require d3d9 support.
by Alexandre Julliard Jan. 30, 2024

Jan. 30, 2024

Module: wine Branch: master Commit: e450bf42ab4052e9bd8412a89afdbabb93e29c82 URL: https://gitlab.winehq.org/wine/wine/-/commit/e450bf42ab4052e9bd8412a89afdba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 30 10:11:43 2024 +0100 mfplat/tests: Skip tests that require d3d9 support. --- dlls/mfplat/tests/mfplat.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 42d682be426..d75ad051d35 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -7765,9 +7765,13 @@ static void test_MFCreateDXSurfaceBuffer(void) return; } - window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); - ok(!!d3d, "Failed to create a D3D object.\n"); + if (!d3d) + { + skip("Failed to create a D3D9 object, skipping tests.\n"); + return; + } + window = create_window(); if (!(device = create_d3d9_device(d3d, window))) { skip("Failed to create a D3D device, skipping tests.\n"); @@ -9124,9 +9128,13 @@ static void test_sample_allocator_d3d9(void) if (!pMFCreateVideoSampleAllocatorEx) return; - window = create_window(); d3d9 = Direct3DCreate9(D3D_SDK_VERSION); - ok(!!d3d9, "Failed to create a D3D9 object.\n"); + if (!d3d9) + { + skip("Failed to create a D3D9 object, skipping tests.\n"); + return; + } + window = create_window(); if (!(d3d9_device = create_d3d9_device(d3d9, window))) { skip("Failed to create a D3D9 device, skipping tests.\n");

1 0