September 2023 - Wine-commits

Paul Gofman : wtsapi32: Implement WTSEnumerateSessionsA() on top of WTSEnumerateSessionsW().
by Alexandre Julliard 07 Sep '23

07 Sep '23

Module: wine Branch: master Commit: 7c248ff4c4ae72c7498ebc61f74022f3f6d40799 URL: https://gitlab.winehq.org/wine/wine/-/commit/7c248ff4c4ae72c7498ebc61f74022… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Sep 7 10:51:07 2023 -0600 wtsapi32: Implement WTSEnumerateSessionsA() on top of WTSEnumerateSessionsW(). --- dlls/wtsapi32/tests/wtsapi.c | 10 +++++++- dlls/wtsapi32/wtsapi32.c | 55 ++++++++++++++++++++++++++++++++++++-------- 2 files changed, 55 insertions(+), 10 deletions(-) diff --git a/dlls/wtsapi32/tests/wtsapi.c b/dlls/wtsapi32/tests/wtsapi.c index 39634985dae..cac5da94e77 100644 --- a/dlls/wtsapi32/tests/wtsapi.c +++ b/dlls/wtsapi32/tests/wtsapi.c @@ -310,14 +310,19 @@ static void test_WTSEnumerateSessions(void) { BOOL console_found = FALSE, services_found = FALSE; WTS_SESSION_INFOW *info; + WTS_SESSION_INFOA *infoA; + DWORD count, count2; unsigned int i; - DWORD count; BOOL bret; bret = WTSEnumerateSessionsW(WTS_CURRENT_SERVER_HANDLE, 0, 1, &info, &count); ok(bret, "got error %lu.\n", GetLastError()); todo_wine_if(count == 1) ok(count >= 2, "got %lu.\n", count); + bret = WTSEnumerateSessionsA(WTS_CURRENT_SERVER_HANDLE, 0, 1, &infoA, &count2); + ok(bret, "got error %lu.\n", GetLastError()); + ok(count2 == count, "got %lu.\n", count2); + for (i = 0; i < count; ++i) { trace("SessionId %lu, name %s, State %d.\n", info[i].SessionId, debugstr_w(info[i].pWinStationName), info[i].State); @@ -325,17 +330,20 @@ static void test_WTSEnumerateSessions(void) { console_found = TRUE; ok(info[i].State == WTSActive, "got State %d.\n", info[i].State); + ok(!strcmp(infoA[i].pWinStationName, "Console"), "got %s.\n", debugstr_a(infoA[i].pWinStationName)); } else if (!wcscmp(info[i].pWinStationName, L"Services")) { services_found = TRUE; ok(info[i].State == WTSDisconnected, "got State %d.\n", info[i].State); + ok(!strcmp(infoA[i].pWinStationName, "Services"), "got %s.\n", debugstr_a(infoA[i].pWinStationName)); } } ok(console_found, "Console session not found.\n"); todo_wine ok(services_found, "Services session not found.\n"); WTSFreeMemory(info); + WTSFreeMemory(infoA); } START_TEST (wtsapi) diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index 0071922d866..6eaea8d3c6f 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -266,7 +266,6 @@ BOOL WINAPI WTSEnumerateServersW(LPWSTR pDomainName, DWORD Reserved, DWORD Versi return FALSE; } - /************************************************************ * WTSEnumerateEnumerateSessionsExW (WTSAPI32.@) */ @@ -290,19 +289,57 @@ BOOL WINAPI WTSEnumerateSessionsExA(HANDLE server, DWORD *level, DWORD filter, W /************************************************************ * WTSEnumerateEnumerateSessionsA (WTSAPI32.@) */ -BOOL WINAPI WTSEnumerateSessionsA(HANDLE hServer, DWORD Reserved, DWORD Version, - PWTS_SESSION_INFOA* ppSessionInfo, DWORD* pCount) +BOOL WINAPI WTSEnumerateSessionsA(HANDLE server, DWORD reserved, DWORD version, + PWTS_SESSION_INFOA *session_info, DWORD *count) { - static int once; + PWTS_SESSION_INFOW infoW; + DWORD size, offset; + unsigned int i; + int len; - if (!once++) FIXME("Stub %p 0x%08lx 0x%08lx %p %p\n", hServer, Reserved, Version, - ppSessionInfo, pCount); + TRACE("%p 0x%08lx 0x%08lx %p %p.\n", server, reserved, version, session_info, count); - if (!ppSessionInfo || !pCount) return FALSE; + if (!session_info || !count) return FALSE; - *pCount = 0; - *ppSessionInfo = NULL; + if (!WTSEnumerateSessionsW(server, reserved, version, &infoW, count)) return FALSE; + + size = 0; + for (i = 0; i < *count; ++i) + { + if (!(len = WideCharToMultiByte(CP_ACP, 0, infoW[i].pWinStationName, -1, NULL, 0, NULL, NULL))) + { + ERR("WideCharToMultiByte failed.\n"); + WTSFreeMemory(infoW); + return FALSE; + } + size += sizeof(**session_info) + len; + } + + if (!(*session_info = heap_alloc(size))) + { + WTSFreeMemory(infoW); + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + + offset = *count * sizeof(**session_info); + for (i = 0; i < *count; ++i) + { + (*session_info)[i].State = infoW[i].State; + (*session_info)[i].SessionId = infoW[i].SessionId; + (*session_info)[i].pWinStationName = (char *)(*session_info) + offset; + len = WideCharToMultiByte(CP_ACP, 0, infoW[i].pWinStationName, -1, (*session_info)[i].pWinStationName, + size - offset, NULL, NULL); + if (!len) + { + ERR("WideCharToMultiByte failed.\n"); + WTSFreeMemory(*session_info); + WTSFreeMemory(infoW); + } + offset += len; + } + WTSFreeMemory(infoW); return TRUE; }

1 0

Paul Gofman : wtsapi32: Handle WTSConnectState class in WTSQuerySessionInformationW().
by Alexandre Julliard 07 Sep '23

07 Sep '23

Module: wine Branch: master Commit: 18ff9ce6226e888a04d2ff277ec5b652792dc777 URL: https://gitlab.winehq.org/wine/wine/-/commit/18ff9ce6226e888a04d2ff277ec5b6… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Sep 7 11:06:00 2023 -0600 wtsapi32: Handle WTSConnectState class in WTSQuerySessionInformationW(). --- dlls/wtsapi32/tests/wtsapi.c | 15 +++++++++++++++ dlls/wtsapi32/wtsapi32.c | 24 +++++++++++++----------- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/dlls/wtsapi32/tests/wtsapi.c b/dlls/wtsapi32/tests/wtsapi.c index cac5da94e77..d45d5776f39 100644 --- a/dlls/wtsapi32/tests/wtsapi.c +++ b/dlls/wtsapi32/tests/wtsapi.c @@ -192,10 +192,25 @@ static void test_WTSQuerySessionInformation(void) { WCHAR *buf1, usernameW[UNLEN + 1], computernameW[MAX_COMPUTERNAME_LENGTH + 1]; char *buf2, username[UNLEN + 1], computername[MAX_COMPUTERNAME_LENGTH + 1]; + WTS_CONNECTSTATE_CLASS *state; DWORD count, tempsize; USHORT *protocol; BOOL ret; + count = 0; + ret = WTSQuerySessionInformationW(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSConnectState, (WCHAR **)&state, &count); + ok(ret, "got error %lu\n", GetLastError()); + ok(count == sizeof(*state), "got %lu\n", count); + ok(*state == WTSActive, "got %d.\n", *state); + WTSFreeMemory(state); + + count = 0; + ret = WTSQuerySessionInformationA(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSConnectState, (char **)&state, &count); + ok(ret, "got error %lu\n", GetLastError()); + ok(count == sizeof(*state), "got %lu\n", count); + ok(*state == WTSActive, "got %d.\n", *state); + WTSFreeMemory(state); + SetLastError(0xdeadbeef); count = 0; ret = WTSQuerySessionInformationW(WTS_CURRENT_SERVER_HANDLE, WTS_CURRENT_SESSION, WTSUserName, NULL, &count); diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index 6eaea8d3c6f..f4072e7090b 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -468,17 +468,8 @@ BOOL WINAPI WTSQuerySessionInformationA(HANDLE server, DWORD session_id, WTS_INF return FALSE; } - if (class == WTSClientProtocolType) - { - USHORT *protocol; - - if (!(protocol = heap_alloc(sizeof(*protocol)))) return FALSE; - FIXME("returning 0 protocol type\n"); - *protocol = 0; - *buffer = (char *)protocol; - *count = sizeof(*protocol); - return TRUE; - } + if (class == WTSClientProtocolType || class == WTSConnectState) + return WTSQuerySessionInformationW(server, session_id, class, (WCHAR **)buffer, count); if (!WTSQuerySessionInformationW(server, session_id, class, &bufferW, count)) return FALSE; @@ -520,6 +511,17 @@ BOOL WINAPI WTSQuerySessionInformationW(HANDLE server, DWORD session_id, WTS_INF return FALSE; } + if (class == WTSConnectState) + { + WTS_CONNECTSTATE_CLASS *state; + + if (!(state = heap_alloc(sizeof(*state)))) return FALSE; + *state = WTSActive; + *buffer = (WCHAR *)state; + *count = sizeof(*state); + return TRUE; + } + if (class == WTSClientProtocolType) { USHORT *protocol;

1 0

Rémi Bernon : dinput/tests: Report the driver success and skipped tests counters.
by Alexandre Julliard 07 Sep '23

07 Sep '23

Module: wine Branch: master Commit: 9523dec573c16497591b4b156ff4366078e16247 URL: https://gitlab.winehq.org/wine/wine/-/commit/9523dec573c16497591b4b156ff436… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 7 15:29:00 2023 +0200 dinput/tests: Report the driver success and skipped tests counters. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55535 --- dlls/dinput/tests/driver_hid.h | 6 ++++++ dlls/dinput/tests/hid.c | 3 +++ 2 files changed, 9 insertions(+) diff --git a/dlls/dinput/tests/driver_hid.h b/dlls/dinput/tests/driver_hid.h index 291cf8963c2..ee5d26cdbf7 100644 --- a/dlls/dinput/tests/driver_hid.h +++ b/dlls/dinput/tests/driver_hid.h @@ -98,8 +98,11 @@ struct winetest_shared_data int running_under_wine; int winetest_report_success; int winetest_debug; + LONG successes; LONG failures; + LONG todo_successes; LONG todo_failures; + LONG skipped; }; static inline const char *debugstr_pnp( ULONG code ) @@ -339,8 +342,11 @@ static inline void winetest_cleanup_( const char *file ) { data = addr; + InterlockedExchangeAdd( &data->successes, winetest_successes ); InterlockedExchangeAdd( &data->failures, winetest_failures ); + InterlockedExchangeAdd( &data->todo_successes, winetest_todo_successes ); InterlockedExchangeAdd( &data->todo_failures, winetest_todo_failures ); + InterlockedExchangeAdd( &data->skipped, winetest_skipped ); ZwUnmapViewOfSection( NtCurrentProcess(), addr ); } diff --git a/dlls/dinput/tests/hid.c b/dlls/dinput/tests/hid.c index 9a27f8e93ac..0a28fda6f99 100644 --- a/dlls/dinput/tests/hid.c +++ b/dlls/dinput/tests/hid.c @@ -520,8 +520,11 @@ void bus_device_stop(void) SetFilePointer( okfile, 0, NULL, FILE_BEGIN ); SetEndOfFile( okfile ); + InterlockedAdd( &winetest_successes, InterlockedExchange( &test_data->successes, 0 ) ); winetest_add_failures( InterlockedExchange( &test_data->failures, 0 ) ); + InterlockedAdd( &winetest_todo_successes, InterlockedExchange( &test_data->todo_successes, 0 ) ); winetest_add_failures( InterlockedExchange( &test_data->todo_failures, 0 ) ); + InterlockedAdd( &winetest_skipped, InterlockedExchange( &test_data->skipped, 0 ) ); GetFullPathNameW( L"winetest.inf", ARRAY_SIZE(path), path, NULL ); ret = SetupCopyOEMInfW( path, NULL, 0, 0, dest, ARRAY_SIZE(dest), NULL, &filepart );

1 0

Rémi Bernon : windows.applicationmodel/tests: Report success and skipped tests counters.
by Alexandre Julliard 07 Sep '23

07 Sep '23

Module: wine Branch: master Commit: 8afa570893dfe86c60548f91761da88489bb4b6a URL: https://gitlab.winehq.org/wine/wine/-/commit/8afa570893dfe86c60548f91761da8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 7 15:29:46 2023 +0200 windows.applicationmodel/tests: Report success and skipped tests counters. --- dlls/windows.applicationmodel/tests/winrt_test.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/windows.applicationmodel/tests/winrt_test.h b/dlls/windows.applicationmodel/tests/winrt_test.h index 7419782f8df..b7264320cc4 100644 --- a/dlls/windows.applicationmodel/tests/winrt_test.h +++ b/dlls/windows.applicationmodel/tests/winrt_test.h @@ -35,8 +35,11 @@ struct winetest_shared_data BOOL running_under_wine; BOOL winetest_report_success; BOOL winetest_debug; + LONG successes; LONG failures; + LONG todo_successes; LONG todo_failures; + LONG skipped; }; static HANDLE winrt_section; @@ -102,8 +105,11 @@ static void winrt_test_exit_( const char *file, int line ) data = MapViewOfFile( winrt_section, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, 1024 ); ok_(file, line)( !!data, "MapViewOfFile failed, error %lu\n", GetLastError() ); + InterlockedAdd( &winetest_successes, InterlockedExchange( &data->successes, 0 ) ); winetest_add_failures( InterlockedExchange( &data->failures, 0 ) ); + InterlockedAdd( &winetest_todo_successes, InterlockedExchange( &data->todo_successes, 0 ) ); winetest_add_failures( InterlockedExchange( &data->todo_failures, 0 ) ); + InterlockedAdd( &winetest_skipped, InterlockedExchange( &data->skipped, 0 ) ); UnmapViewOfFile( data ); CloseHandle( winrt_section ); } @@ -221,8 +227,11 @@ static inline void winrt_test_exit_( const char *file, int line ) data = MapViewOfFile( winrt_section, FILE_MAP_READ | FILE_MAP_WRITE, 0, 0, 1024 ); ok_(file, line)( !!data, "MapViewOfFile failed, error %lu\n", GetLastError() ); + InterlockedExchangeAdd( &data->successes, winetest_successes ); InterlockedExchangeAdd( &data->failures, winetest_failures ); + InterlockedExchangeAdd( &data->todo_successes, winetest_todo_successes ); InterlockedExchangeAdd( &data->todo_failures, winetest_todo_failures ); + InterlockedExchangeAdd( &data->skipped, winetest_skipped ); UnmapViewOfFile( data ); CloseHandle( winrt_section );

1 0

Rémi Bernon : ntoskrnl/tests: Use wine/test.h in the driver tests.
by Alexandre Julliard 07 Sep '23

07 Sep '23

Module: wine Branch: master Commit: 6afe77a259f8968458043102f06977071e7493aa URL: https://gitlab.winehq.org/wine/wine/-/commit/6afe77a259f8968458043102f06977… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 7 21:47:39 2023 +0200 ntoskrnl/tests: Use wine/test.h in the driver tests. --- dlls/ntoskrnl.exe/tests/driver.c | 2 +- dlls/ntoskrnl.exe/tests/driver.h | 3 + dlls/ntoskrnl.exe/tests/ntoskrnl.c | 3 + dlls/ntoskrnl.exe/tests/utils.h | 351 ++++++------------------------------- 4 files changed, 60 insertions(+), 299 deletions(-)

1 0

Alexandre Julliard : winegcc: Don't disable unwind tables for PE targets.
by Alexandre Julliard 07 Sep '23

07 Sep '23

Module: wine Branch: master Commit: 425bd55b02e375b9ac8f79b254ce3ca5c9e72719 URL: https://gitlab.winehq.org/wine/wine/-/commit/425bd55b02e375b9ac8f79b254ce3c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 7 16:02:12 2023 +0200 winegcc: Don't disable unwind tables for PE targets. --- tools/winegcc/winegcc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 34f8a1e4e87..968e472227e 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -832,8 +832,6 @@ static struct strarray get_winebuild_args(struct options *opts) for (i = 0; i < opts->prefix.count; i++) strarray_add( &spec_args, strmake( "-B%s", opts->prefix.str[i] )); strarray_addall( &spec_args, opts->winebuild_args ); - if (opts->unwind_tables) strarray_add( &spec_args, "-fasynchronous-unwind-tables" ); - else strarray_add( &spec_args, "-fno-asynchronous-unwind-tables" ); return spec_args; } @@ -961,6 +959,7 @@ static const char *build_spec_obj( struct options *opts, const char *spec_file, { if (opts->pic) strarray_add(&spec_args, "-fPIC"); if (opts->use_msvcrt) strarray_add(&spec_args, "-mno-cygwin"); + if (opts->unwind_tables) strarray_add( &spec_args, "-fasynchronous-unwind-tables" ); } strarray_add(&spec_args, opts->shared ? "--dll" : "--exe"); if (opts->fake_module)

1 0

Alexandre Julliard : winebuild: Add SEH information to relay entry points on ARM64.
by Alexandre Julliard 07 Sep '23

07 Sep '23

Module: wine Branch: master Commit: 04a74bdb507e289926f2d33a8c67e116070aa60f URL: https://gitlab.winehq.org/wine/wine/-/commit/04a74bdb507e289926f2d33a8c67e1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 7 17:12:55 2023 +0200 winebuild: Add SEH information to relay entry points on ARM64. --- dlls/ntdll/relay.c | 8 ++++---- tools/winebuild/spec32.c | 39 ++++++++++++++++++++------------------- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index afa4085fb33..adc8267ae1f 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -646,10 +646,11 @@ DECLSPEC_HIDDEN void WINAPI relay_trace_exit( struct relay_descr *descr, unsigne extern LONGLONG CDECL call_entry_point( void *func, int nb_args, const INT_PTR *args ); __ASM_GLOBAL_FUNC( call_entry_point, "stp x29, x30, [SP,#-16]!\n\t" - "stp x19, x20, [SP,#-16]!\n\t" + __ASM_SEH(".seh_save_fplr_x 16\n\t") "mov x29, SP\n\t" - "mov x19, x2\n\t" - "ldp x8, x9, [x19, #-32]\n\t" + __ASM_SEH(".seh_set_fp\n\t") + __ASM_SEH(".seh_endprologue\n\t") + "ldr x8, [x2, #-32]\n\t" "mov x9, x0\n\t" "cbz w1, 2f\n\t" "mov w10, w1\n\t" @@ -682,7 +683,6 @@ __ASM_GLOBAL_FUNC( call_entry_point, "cbnz w12, 1b\n\t" "2: blr x9\n\t" "mov SP, x29\n\t" - "ldp x19, x20, [SP], #16\n\t" "ldp x29, x30, [SP], #16\n\t" "ret\n" ) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 6e4131bd910..874c81d0ddc 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -329,28 +329,30 @@ static void output_relay_debug( DLLSPEC *spec ) } case CPU_ARM64: + { + int stack_size = 16 * ((min(odp->u.func.nb_args, 8) + 1) / 2); + output( "\t.align %d\n", get_alignment(4) ); output( "__wine_spec_relay_entry_point_%d:\n", i ); - output_cfi( ".cfi_startproc" ); - switch (odp->u.func.nb_args) + output_cfi( ".seh_proc __wine_spec_relay_entry_point_%d", i ); + output( "\tstp x29, x30, [sp, #-%u]!\n", stack_size + 16 ); + output_cfi( ".seh_save_fplr_x %u", stack_size + 16 ); + output( "\tmov x29, sp\n" ); + output_cfi( ".seh_set_fp" ); + output_cfi( ".seh_endprologue" ); + switch (stack_size) { - default: - case 8: - case 7: output( "\tstp x6, x7, [SP,#-16]!\n" ); + case 64: output( "\tstp x6, x7, [sp, #64]\n" ); /* fall through */ - case 6: - case 5: output( "\tstp x4, x5, [SP,#-16]!\n" ); + case 48: output( "\tstp x4, x5, [sp, #48]\n" ); /* fall through */ - case 4: - case 3: output( "\tstp x2, x3, [SP,#-16]!\n" ); + case 32: output( "\tstp x2, x3, [sp, #32]\n" ); /* fall through */ - case 2: - case 1: output( "\tstp x0, x1, [SP,#-16]!\n" ); + case 16: output( "\tstp x0, x1, [sp, #16]\n" ); /* fall through */ - case 0: break; + default: break; } - output( "\tmov x2, SP\n"); - output( "\tstp x29, x30, [SP,#-16]!\n" ); + output( "\tadd x2, sp, #16\n"); output( "\tstp x8, x9, [SP,#-16]!\n" ); output( "\tmov w1, #%u\n", odp->u.func.args_str_offset << 16 ); if (i - spec->base) output( "\tadd w1, w1, #%u\n", i - spec->base ); @@ -358,13 +360,12 @@ static void output_relay_debug( DLLSPEC *spec ) output( "\tadd x0, x0, #%s\n", arm64_pageoff(".L__wine_spec_relay_descr") ); output( "\tldr x3, [x0, #8]\n"); output( "\tblr x3\n"); - output( "\tadd SP, SP, #16\n" ); - output( "\tldp x29, x30, [SP], #16\n" ); - if (odp->u.func.nb_args) - output( "\tadd SP, SP, #%u\n", 8 * ((min(odp->u.func.nb_args, 8) + 1) & ~1) ); + output( "\tmov sp, x29\n" ); + output( "\tldp x29, x30, [sp], #%u\n", stack_size + 16 ); output( "\tret\n"); - output_cfi( ".cfi_endproc" ); + output_cfi( ".seh_endproc" ); break; + } case CPU_x86_64: output( "\t.align %d\n", get_alignment(4) );

1 0

Gabriel Ivăncescu : mshtml: Expose an EventTarget interface on the outer window for events' target dispatch.
by Alexandre Julliard 07 Sep '23

07 Sep '23

Module: wine Branch: master Commit: 32ce98e94d9bcfbb06fca31a5bd6de44b11a626b URL: https://gitlab.winehq.org/wine/wine/-/commit/32ce98e94d9bcfbb06fca31a5bd6de… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Sep 7 16:07:00 2023 +0300 mshtml: Expose an EventTarget interface on the outer window for events' target dispatch. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlevent.c | 35 +++++++++++-- dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/htmlwindow.c | 116 ++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/events.c | 18 +++++++ dlls/mshtml/tests/script.c | 18 +++++++ 6 files changed, 182 insertions(+), 7 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Return interface directly from node vtbl's QI instead of HRESULT, without AddRef.
by Alexandre Julliard 07 Sep '23

07 Sep '23

Module: wine Branch: master Commit: c7f18c3118a8c83ea1f18603b2f065e1d9220a3a URL: https://gitlab.winehq.org/wine/wine/-/commit/c7f18c3118a8c83ea1f18603b2f065… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Sep 7 16:07:00 2023 +0300 mshtml: Return interface directly from node vtbl's QI instead of HRESULT, without AddRef. This will simplify it when the QI moves to the dispex's vtbl. The node's QI does have a temporary workaround right now that will get removed. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlanchor.c | 27 ++---- dlls/mshtml/htmlarea.c | 15 +--- dlls/mshtml/htmlbody.c | 32 +++---- dlls/mshtml/htmlcomment.c | 15 +--- dlls/mshtml/htmldoc.c | 199 ++++++++++++++++++++----------------------- dlls/mshtml/htmlelem.c | 74 ++++++++-------- dlls/mshtml/htmlform.c | 32 +++---- dlls/mshtml/htmlframe.c | 56 +++++------- dlls/mshtml/htmlgeneric.c | 15 +--- dlls/mshtml/htmlhead.c | 60 +++++-------- dlls/mshtml/htmlimg.c | 15 +--- dlls/mshtml/htmlinput.c | 77 ++++++----------- dlls/mshtml/htmllink.c | 13 +-- dlls/mshtml/htmlnode.c | 49 +++++++---- dlls/mshtml/htmlobject.c | 89 +++++++++---------- dlls/mshtml/htmlscript.c | 27 ++---- dlls/mshtml/htmlselect.c | 54 ++++-------- dlls/mshtml/htmlstyleelem.c | 28 +++--- dlls/mshtml/htmltable.c | 89 +++++++------------ dlls/mshtml/htmltextarea.c | 27 ++---- dlls/mshtml/htmltextnode.c | 15 ++-- dlls/mshtml/ifacewrap.c | 2 +- dlls/mshtml/mshtml_private.h | 6 +- dlls/mshtml/svg.c | 48 +++-------- 24 files changed, 399 insertions(+), 665 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Introduce query_interface in dispex vtbl and use it for DOM Nodes.
by Alexandre Julliard 07 Sep '23

07 Sep '23

Module: wine Branch: master Commit: 47393c300eaa2c9d713596c01eaee13127b477ef URL: https://gitlab.winehq.org/wine/wine/-/commit/47393c300eaa2c9d713596c01eaee1… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Sep 7 16:07:00 2023 +0300 mshtml: Introduce query_interface in dispex vtbl and use it for DOM Nodes. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/dispex.c | 31 ++++++++++++++++++------------- dlls/mshtml/htmldoc.c | 2 ++ dlls/mshtml/htmlelem.c | 1 + dlls/mshtml/htmlevent.c | 13 +++++++++++++ dlls/mshtml/htmlnode.c | 32 +++++++++++++------------------- dlls/mshtml/htmltextnode.c | 1 + dlls/mshtml/mshtml_private.h | 5 +++++ 7 files changed, 53 insertions(+), 32 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index b5d8ac83346..ec781351291 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1968,9 +1968,15 @@ static IDispatchExVtbl DispatchExVtbl = { BOOL dispex_query_interface(DispatchEx *This, REFIID riid, void **ppv) { - if(IsEqualGUID(&IID_IDispatch, riid)) - *ppv = &This->IDispatchEx_iface; - else if(IsEqualGUID(&IID_IDispatchEx, riid)) + TRACE("%s (%p)->(%s %p)\n", This->info->desc->name, This, debugstr_mshtml_guid(riid), ppv); + + if(This->info->desc->vtbl->query_interface) { + *ppv = This->info->desc->vtbl->query_interface(This, riid); + if(*ppv) + goto ret; + } + + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IDispatch, riid) || IsEqualGUID(&IID_IDispatchEx, riid)) *ppv = &This->IDispatchEx_iface; else if(IsEqualGUID(&IID_nsXPCOMCycleCollectionParticipant, riid)) { *ppv = &dispex_ccp; @@ -1978,19 +1984,18 @@ BOOL dispex_query_interface(DispatchEx *This, REFIID riid, void **ppv) }else if(IsEqualGUID(&IID_nsCycleCollectionISupports, riid)) { *ppv = &This->IDispatchEx_iface; return TRUE; - }else if(IsEqualGUID(&IID_IDispatchJS, riid)) - *ppv = NULL; - else if(IsEqualGUID(&IID_UndocumentedScriptIface, riid)) - *ppv = NULL; - else if(IsEqualGUID(&IID_IMarshal, riid)) + }else if(IsEqualGUID(&IID_IDispatchJS, riid) || + IsEqualGUID(&IID_UndocumentedScriptIface, riid) || + IsEqualGUID(&IID_IMarshal, riid) || + IsEqualGUID(&IID_IManagedObject, riid)) { *ppv = NULL; - else if(IsEqualGUID(&IID_IManagedObject, riid)) - *ppv = NULL; - else + return TRUE; + }else { return FALSE; + } - if(*ppv) - IUnknown_AddRef((IUnknown*)*ppv); +ret: + IDispatchEx_AddRef(&This->IDispatchEx_iface); return TRUE; } diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 01199ab4304..bff2452f4cd 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -355,6 +355,7 @@ static IHTMLEventObj *DocumentType_set_current_event(DispatchEx *dispex, IHTMLEv static const event_target_vtbl_t DocumentType_event_target_vtbl = { { + .query_interface = HTMLDOMNode_query_interface, .destructor = HTMLDOMNode_destructor, .traverse = HTMLDOMNode_traverse, .unlink = HTMLDOMNode_unlink @@ -6067,6 +6068,7 @@ static HRESULT HTMLDocumentNode_location_hook(DispatchEx *dispex, WORD flags, DI static const event_target_vtbl_t HTMLDocumentNode_event_target_vtbl = { { + .query_interface = HTMLDOMNode_query_interface, .destructor = HTMLDOMNode_destructor, .traverse = HTMLDOMNode_traverse, .unlink = HTMLDOMNode_unlink, diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index af6551cc9fc..ad71d128266 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -7350,6 +7350,7 @@ static const tid_t HTMLElement_iface_tids[] = { const event_target_vtbl_t HTMLElement_event_target_vtbl = { { + .query_interface = HTMLDOMNode_query_interface, .destructor = HTMLDOMNode_destructor, .traverse = HTMLDOMNode_traverse, .unlink = HTMLDOMNode_unlink, diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 2ba912f5fb3..c64eded6a0a 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -4564,6 +4564,19 @@ static HRESULT get_gecko_target(IEventTarget *target, nsIDOMEventTarget **ret) return S_OK; } +void *EventTarget_query_interface(EventTarget *event_target, REFIID riid) +{ + if(IsEqualGUID(riid, &IID_IEventTarget)) { + if(use_event_quirks(event_target)) { + WARN("IEventTarget queried, but not supported by in document mode\n"); + return NULL; + } + return &event_target->IEventTarget_iface; + } + + return NULL; +} + HRESULT EventTarget_QI(EventTarget *event_target, REFIID riid, void **ppv) { if(IsEqualGUID(riid, &IID_IEventTarget)) { diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index d9c955691d5..f0dc460d596 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -493,17 +493,11 @@ static HRESULT WINAPI HTMLDOMNode_QueryInterface(IHTMLDOMNode *iface, { HTMLDOMNode *This = impl_from_IHTMLDOMNode(iface); - /* FIXME: Get rid of this when dispex handles QI */ - if(IsEqualGUID(&IID_nsXPCOMCycleCollectionParticipant, riid) || IsEqualGUID(&IID_nsCycleCollectionISupports, riid)) { - dispex_query_interface(&This->event_target.dispex, riid, ppv); - return S_OK; - } - - if((*ppv = This->vtbl->qi(This, riid))) { - IHTMLDOMNode_AddRef(&This->IHTMLDOMNode_iface); - return S_OK; - } + if(dispex_query_interface(&This->event_target.dispex, riid, ppv)) + return *ppv ? S_OK : E_NOINTERFACE; + *ppv = NULL; + WARN("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); return E_NOINTERFACE; } @@ -1437,6 +1431,13 @@ static inline HTMLDOMNode *HTMLDOMNode_from_DispatchEx(DispatchEx *iface) return CONTAINING_RECORD(iface, HTMLDOMNode, event_target.dispex); } +void *HTMLDOMNode_query_interface(DispatchEx *dispex, REFIID riid) +{ + HTMLDOMNode *This = HTMLDOMNode_from_DispatchEx(dispex); + + return This->vtbl->qi(This, riid); +} + void HTMLDOMNode_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) { HTMLDOMNode *This = HTMLDOMNode_from_DispatchEx(dispex); @@ -1477,9 +1478,6 @@ void HTMLDOMNode_destructor(DispatchEx *dispex) void *HTMLDOMNode_QI(HTMLDOMNode *This, REFIID riid) { - IUnknown *unk; - HRESULT hres; - if(IsEqualGUID(&IID_IUnknown, riid)) return &This->IHTMLDOMNode_iface; if(IsEqualGUID(&IID_IDispatch, riid)) @@ -1491,12 +1489,7 @@ void *HTMLDOMNode_QI(HTMLDOMNode *This, REFIID riid) if(IsEqualGUID(&IID_IHTMLDOMNode3, riid)) return &This->IHTMLDOMNode3_iface; - hres = EventTarget_QI(&This->event_target, riid, (void**)&unk); - if(hres != S_OK) - return NULL; - - IUnknown_Release(unk); - return unk; + return EventTarget_query_interface(&This->event_target, riid); } static HRESULT HTMLDOMNode_clone(HTMLDOMNode *This, nsIDOMNode *nsnode, HTMLDOMNode **ret) @@ -1542,6 +1535,7 @@ void HTMLDOMNode_Init(HTMLDocumentNode *doc, HTMLDOMNode *node, nsIDOMNode *nsno } static const dispex_static_data_vtbl_t HTMLDOMNode_dispex_vtbl = { + .query_interface = HTMLDOMNode_query_interface, .destructor = HTMLDOMNode_destructor, .traverse = HTMLDOMNode_traverse, .unlink = HTMLDOMNode_unlink diff --git a/dlls/mshtml/htmltextnode.c b/dlls/mshtml/htmltextnode.c index 6fd1a102612..f3302fcaf6f 100644 --- a/dlls/mshtml/htmltextnode.c +++ b/dlls/mshtml/htmltextnode.c @@ -352,6 +352,7 @@ static const NodeImplVtbl HTMLDOMTextNodeImplVtbl = { }; static const dispex_static_data_vtbl_t HTMLDOMTextNode_dispex_vtbl = { + .query_interface = HTMLDOMNode_query_interface, .destructor = HTMLDOMNode_destructor, .traverse = HTMLDOMNode_traverse, .unlink = HTMLDOMNode_unlink diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index dfbbd3fec83..0e7ad70e9c2 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -352,6 +352,9 @@ typedef struct { - dynamic props: These props are generally allocated by external code (e.g. 'document.wine = 42' creates 'wine' dynamic prop on document) */ typedef struct { + /* Used to provide object specific interfaces (do not AddRef, just return the iface) */ + void *(*query_interface)(DispatchEx*,REFIID); + /* Used to implement Cycle Collection callbacks; note that the destructor is not optional! Unlike delete_cycle_collectable, unlink is called before the destructor (if available). */ void (*destructor)(DispatchEx*); @@ -1207,10 +1210,12 @@ void HTMLDOMNode_Init(HTMLDocumentNode*,HTMLDOMNode*,nsIDOMNode*,dispex_static_d void HTMLElement_Init(HTMLElement*,HTMLDocumentNode*,nsIDOMElement*,dispex_static_data_t*); void EventTarget_Init(EventTarget*,IUnknown*,dispex_static_data_t*,compat_mode_t); +void *EventTarget_query_interface(EventTarget*,REFIID); HRESULT EventTarget_QI(EventTarget*,REFIID,void**); void EventTarget_init_dispex_info(dispex_data_t*,compat_mode_t); void *HTMLDOMNode_QI(HTMLDOMNode*,REFIID); +void *HTMLDOMNode_query_interface(DispatchEx*,REFIID); void HTMLDOMNode_destructor(DispatchEx*); void HTMLDOMNode_traverse(DispatchEx*,nsCycleCollectionTraversalCallback*); void HTMLDOMNode_unlink(DispatchEx*);

1 0