July 2020 - Wine-Commits - list.winehq.org

Francois Gouget : tests: Trace elapsed time when $WINETEST_TIME is set.
by Alexandre Julliard July 21, 2020

July 21, 2020

Module: wine Branch: master Commit: 9f60ce22fb3e8291dda6f064655f6b3c877be1bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f60ce22fb3e8291dda6f064… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jul 17 13:34:32 2020 +0200 tests: Trace elapsed time when $WINETEST_TIME is set. This simplifies narrowing down where a test gets stuck or is slow if it times out but prints few messages. Note that the elapsed time is relative to the current process start time. So subprocesses will have a different elapsed time. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48094 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/test.h | 75 ++++++++++++++++++++++++++++++++++------------------- 1 file changed, 49 insertions(+), 26 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index 84ac1e516b..869d8f8e33 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -47,6 +47,9 @@ /* debug level */ extern int winetest_debug; +/* trace timing information */ +extern int winetest_time; + /* running in interactive mode? */ extern int winetest_interactive; @@ -199,6 +202,10 @@ extern const struct test winetest_testlist[]; /* debug level */ int winetest_debug = 1; +/* trace timing information */ +int winetest_time = 0; +DWORD winetest_start_time, winetest_last_time; + /* interactive mode? */ int winetest_interactive = 0; @@ -278,11 +285,20 @@ void winetest_set_location( const char* file, int line ) data->current_line=line; } +const char *winetest_elapsed(void) +{ + DWORD now; + + if (!winetest_time) return ""; + winetest_last_time = now = GetTickCount(); + return wine_dbg_sprintf( "%.3f", (now - winetest_start_time) / 1000.0); +} + void winetest_subtest( const char* name ) { struct tls_data *data = get_tls_data(); - printf( "%s:%d: Subtest %s\n", - data->current_file, data->current_line, name); + printf( "%s:%d:%s Subtest %s\n", + data->current_file, data->current_line, winetest_elapsed(), name ); } int broken( int condition ) @@ -302,9 +318,9 @@ static LONG winetest_add_line( void ) index = data->current_line % ARRAY_SIZE(line_counters); count = InterlockedIncrement(line_counters + index) - 1; if (count == winetest_mute_threshold) - printf( "%s:%d Line has been silenced after %d occurrences\n", - data->current_file, data->current_line, - winetest_mute_threshold); + printf( "%s:%d:%s Line has been silenced after %d occurrences\n", + data->current_file, data->current_line, winetest_elapsed(), + winetest_mute_threshold ); return count; } @@ -327,8 +343,8 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { if (condition) { - printf( "%s:%d: Test succeeded inside todo block: ", - data->current_file, data->current_line ); + printf( "%s:%d:%s Test succeeded inside todo block: ", + data->current_file, data->current_line, winetest_elapsed() ); vprintf(msg, args); InterlockedIncrement(&todo_failures); return 0; @@ -340,8 +356,8 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { if (winetest_debug > 0) { - printf( "%s:%d: Test marked todo: ", - data->current_file, data->current_line ); + printf( "%s:%d:%s Test marked todo: ", + data->current_file, data->current_line, winetest_elapsed() ); vprintf(msg, args); } InterlockedIncrement(&todo_successes); @@ -355,17 +371,20 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { if (!condition) { - printf( "%s:%d: Test failed: ", - data->current_file, data->current_line ); + printf( "%s:%d:%s Test failed: ", + data->current_file, data->current_line, winetest_elapsed() ); vprintf(msg, args); InterlockedIncrement(&failures); return 0; } else { - if (winetest_report_success) - printf( "%s:%d: Test succeeded\n", - data->current_file, data->current_line); + if (winetest_report_success || + (winetest_time && GetTickCount() >= winetest_last_time + 1000)) + { + printf( "%s:%d:%s Test succeeded\n", + data->current_file, data->current_line, winetest_elapsed() ); + } InterlockedIncrement(&successes); return 1; } @@ -390,7 +409,7 @@ void __winetest_cdecl winetest_trace( const char *msg, ... ) if (winetest_add_line() < winetest_mute_threshold) { struct tls_data *data = get_tls_data(); - printf( "%s:%d: ", data->current_file, data->current_line ); + printf( "%s:%d:%s ", data->current_file, data->current_line, winetest_elapsed() ); __winetest_va_start(valist, msg); vprintf(msg, valist); __winetest_va_end(valist); @@ -404,7 +423,7 @@ void winetest_vskip( const char *msg, __winetest_va_list args ) if (winetest_add_line() < winetest_mute_threshold) { struct tls_data *data = get_tls_data(); - printf( "%s:%d: Tests skipped: ", data->current_file, data->current_line ); + printf( "%s:%d:%s Tests skipped: ", data->current_file, data->current_line, winetest_elapsed() ); vprintf(msg, args); InterlockedIncrement(&skipped); } @@ -490,14 +509,16 @@ void winetest_wait_child_process( HANDLE process ) if (exit_code > 255) { DWORD pid = GetProcessId( process ); - printf( "%s:%d: unhandled exception %08x in child process %04x\n", - current_test->name, data->current_line, exit_code, pid ); + printf( "%s:%d:%s unhandled exception %08x in child process %04x\n", + current_test->name, data->current_line, winetest_elapsed(), + exit_code, pid ); InterlockedIncrement( &failures ); } else if (exit_code) { - printf( "%s:%d: %u failures in child process\n", - current_test->name, data->current_line, exit_code ); + printf( "%s:%d:%s %u failures in child process\n", + current_test->name, data->current_line, winetest_elapsed(), + exit_code ); while (exit_code-- > 0) InterlockedIncrement(&failures); } @@ -553,11 +574,11 @@ static int run_test( const char *name ) if (winetest_debug) { if (muted_todo_successes || muted_skipped || muted_traces) - printf( "%04x:%s: Silenced %d todos, %d skips and %d traces.\n", - GetCurrentProcessId(), test->name, + printf( "%04x:%s:%s Silenced %d todos, %d skips and %d traces.\n", + GetCurrentProcessId(), test->name, winetest_elapsed(), muted_todo_successes, muted_skipped, muted_traces); - printf( "%04x:%s: %d tests executed (%d marked as todo, %d %s), %d skipped.\n", - GetCurrentProcessId(), test->name, + printf( "%04x:%s:%s %d tests executed (%d marked as todo, %d %s), %d skipped.\n", + GetCurrentProcessId(), test->name, winetest_elapsed(), successes + failures + todo_successes + todo_failures, todo_successes, failures + todo_failures, (failures + todo_failures != 1) ? "failures" : "failure", @@ -584,8 +605,8 @@ static LONG CALLBACK exc_filter( EXCEPTION_POINTERS *ptrs ) if (data->current_file) printf( "%s:%d: this is the last test seen before the exception\n", data->current_file, data->current_line ); - printf( "%04x:%s: unhandled exception %08x at %p\n", - GetCurrentProcessId(), current_test->name, + printf( "%04x:%s:%s unhandled exception %08x at %p\n", + GetCurrentProcessId(), current_test->name, winetest_elapsed(), ptrs->ExceptionRecord->ExceptionCode, ptrs->ExceptionRecord->ExceptionAddress ); fflush( stdout ); return EXCEPTION_EXECUTE_HANDLER; @@ -621,6 +642,8 @@ int main( int argc, char **argv ) if (GetEnvironmentVariableA( "WINETEST_DEBUG", p, sizeof(p) )) winetest_debug = atoi(p); if (GetEnvironmentVariableA( "WINETEST_INTERACTIVE", p, sizeof(p) )) winetest_interactive = atoi(p); if (GetEnvironmentVariableA( "WINETEST_REPORT_SUCCESS", p, sizeof(p) )) winetest_report_success = atoi(p); + if (GetEnvironmentVariableA( "WINETEST_TIME", p, sizeof(p) )) winetest_time = atoi(p); + winetest_last_time = winetest_start_time = GetTickCount(); if (!strcmp( winetest_platform, "windows" )) SetUnhandledExceptionFilter( exc_filter ); if (!winetest_interactive) SetErrorMode( SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX );

1 0

Zebediah Figura : wine.inf: Map the Windows section of win.ini to the registry.
by Alexandre Julliard July 21, 2020

July 21, 2020

Module: wine Branch: master Commit: f8be6935caef49705f7523cb413828e35def4070 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8be6935caef49705f7523cb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 20 21:50:46 2020 -0500 wine.inf: Map the Windows section of win.ini to the registry. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 4c8f657f50..23b91af480 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -565,6 +565,7 @@ HKLM,%CurrentVersionNT%\FontSubstitutes,,16 HKLM,%CurrentVersionNT%\Gre_Initialize,,16 HKLM,%CurrentVersionNT%\Hotfix\Q246009,"Installed",,"1" HKLM,%CurrentVersionNT%\Image File Execution Options,,16 +HKLM,%CurrentVersionNT%\IniFileMapping\win.ini\windows,,,"USR:Software\Microsoft\Windows NT\CurrentVersion\Windows" HKLM,%CurrentVersionNT%\IniFileMapping\win.ini\windows,"CursorBlinkRate",,"USR:Control Panel\Desktop" HKLM,%CurrentVersionNT%\LanguagePack,,16 HKLM,%CurrentVersionNT%\NetworkCards,,16

1 0

Zhiyi Zhang : user32: Trace ChangeDisplaySettingsExW() results.
by Alexandre Julliard July 21, 2020

July 21, 2020

Module: wine Branch: master Commit: f7aefadd1f70d49c958990c429bdd5e0e2aa8048 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7aefadd1f70d49c958990c4… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jul 21 14:49:25 2020 +0800 user32: Trace ChangeDisplaySettingsExW() results. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 6c0c3e76db..61cd06f691 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3310,12 +3310,18 @@ LONG WINAPI ChangeDisplaySettingsExW( LPCWSTR devname, LPDEVMODEW devmode, HWND WCHAR primary_adapter[CCHDEVICENAME]; BOOL def_mode = TRUE; DEVMODEW dm; + LONG ret; TRACE("%s %p %p %#x %p\n", debugstr_w(devname), devmode, hwnd, flags, lparam); TRACE("flags=%s\n", _CDS_flags(flags)); if (!devname && !devmode) - return USER_Driver->pChangeDisplaySettingsEx(NULL, NULL, hwnd, flags, lparam); + { + ret = USER_Driver->pChangeDisplaySettingsEx(NULL, NULL, hwnd, flags, lparam); + if (ret != DISP_CHANGE_SUCCESSFUL) + ERR("Restoring all displays to their registry settings returned %d.\n", ret); + return ret; + } if (!devname && devmode) { @@ -3359,7 +3365,10 @@ LONG WINAPI ChangeDisplaySettingsExW( LPCWSTR devname, LPDEVMODEW devmode, HWND return DISP_CHANGE_BADMODE; } - return USER_Driver->pChangeDisplaySettingsEx(devname, devmode, hwnd, flags, lparam); + ret = USER_Driver->pChangeDisplaySettingsEx(devname, devmode, hwnd, flags, lparam); + if (ret != DISP_CHANGE_SUCCESSFUL) + ERR("Changing %s display settings returned %d.\n", wine_dbgstr_w(devname), ret); + return ret; }

1 0

Zhiyi Zhang : user32/tests: Add more ChangeDisplaySettings() tests.
by Alexandre Julliard July 21, 2020

July 21, 2020

Module: wine Branch: master Commit: dcf8bd769bef3a793ce0c1e29a501bcb03e16029 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcf8bd769bef3a793ce0c1e2… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jul 21 14:50:05 2020 +0800 user32/tests: Add more ChangeDisplaySettings() tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 63 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 49 insertions(+), 14 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 5d7069591b..fe763e46b4 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -351,7 +351,7 @@ static void _expect_dm(INT line, DEVMODEA expected, const CHAR *device, DWORD te static void test_ChangeDisplaySettingsEx(void) { DPI_AWARENESS_CONTEXT context = NULL; - UINT primary, device, side, mode; + UINT primary, device, test, mode; UINT device_size, device_count; struct device_info *devices; INT count, old_count; @@ -362,6 +362,21 @@ static void test_ChangeDisplaySettingsEx(void) LONG res; int i; + /* Test invalid device names */ + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + res = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &dm); + ok(res, "EnumDisplaySettingsA failed, error %#x\n", GetLastError()); + + res = ChangeDisplaySettingsExA("invalid", &dm, NULL, CDS_TEST, NULL); + todo_wine ok(res == DISP_CHANGE_BADPARAM, "ChangeDisplaySettingsA returned unexpected %d\n", res); + + res = ChangeDisplaySettingsExA("\\\\.\\DISPLAY0", &dm, NULL, CDS_TEST, NULL); + todo_wine ok(res == DISP_CHANGE_BADPARAM, "ChangeDisplaySettingsA returned unexpected %d\n", res); + + res = ChangeDisplaySettingsExA("\\\\.\\DISPLAY1\\Monitor0", &dm, NULL, CDS_TEST, NULL); + todo_wine ok(res == DISP_CHANGE_BADPARAM, "ChangeDisplaySettingsA returned unexpected %d\n", res); + /* Test dmDriverExtra */ memset(&dm, 0, sizeof(dm)); dm.dmSize = sizeof(dm); @@ -795,43 +810,63 @@ static void test_ChangeDisplaySettingsEx(void) expect_dm(dm2, devices[1].name, 0); /* Test placing the secondary adapter to all sides of the primary adapter */ - for (side = 0; side < 4; ++side) + for (test = 0; test < 8; ++test) { - switch (side) + switch (test) { - /* Bottom */ + /* Bottom side with x offset */ case 0: - dm2.dmPosition.x = dm.dmPosition.x; + dm2.dmPosition.x = dm.dmPosition.x + dm.dmPelsWidth / 2; dm2.dmPosition.y = dm.dmPosition.y + dm.dmPelsHeight; break; - /* Left */ + /* Left side with y offset */ case 1: dm2.dmPosition.x = dm.dmPosition.x - dm2.dmPelsWidth; - dm2.dmPosition.y = dm.dmPosition.y; + dm2.dmPosition.y = dm.dmPosition.y + dm.dmPelsHeight / 2; break; - /* Top */ + /* Top side with x offset */ case 2: - dm2.dmPosition.x = dm.dmPosition.x; + dm2.dmPosition.x = dm.dmPosition.x + dm.dmPelsWidth / 2; dm2.dmPosition.y = dm.dmPosition.y - dm2.dmPelsHeight; break; - /* Right */ + /* Right side with y offset */ case 3: + dm2.dmPosition.x = dm.dmPosition.x + dm.dmPelsWidth; + dm2.dmPosition.y = dm.dmPosition.y + dm.dmPelsHeight / 2; + break; + /* Bottom side with the same x */ + case 4: + dm2.dmPosition.x = dm.dmPosition.x; + dm2.dmPosition.y = dm.dmPosition.y + dm.dmPelsHeight; + break; + /* Left side with the same y */ + case 5: + dm2.dmPosition.x = dm.dmPosition.x - dm2.dmPelsWidth; + dm2.dmPosition.y = dm.dmPosition.y; + break; + /* Top side with the same x */ + case 6: + dm2.dmPosition.x = dm.dmPosition.x; + dm2.dmPosition.y = dm.dmPosition.y - dm2.dmPelsHeight; + break; + /* Right side with the same y */ + case 7: dm2.dmPosition.x = dm.dmPosition.x + dm.dmPelsWidth; dm2.dmPosition.y = dm.dmPosition.y; break; } res = ChangeDisplaySettingsExA(devices[1].name, &dm2, NULL, CDS_RESET, NULL); - ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s side %d returned unexpected %d\n", - devices[1].name, side, res); + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s test %d returned unexpected %d\n", + devices[1].name, test, res); if (res != DISP_CHANGE_SUCCESSFUL) { - win_skip("ChangeDisplaySettingsExA %s side %d returned unexpected %d.\n", devices[1].name, side, res); + win_skip("ChangeDisplaySettingsExA %s test %d returned unexpected %d.\n", devices[1].name, test, res); continue; } flush_events(); - expect_dm(dm2, devices[1].name, side); + expect_dm(dm2, devices[1].name, test); } /* Test automatic position update when other adapters change resolution */

1 0

Alexandre Julliard : ntdll: Implement KiRaiseUserExceptionDispatcher().
by Alexandre Julliard July 21, 2020

July 21, 2020

Module: wine Branch: master Commit: 5eefbc6db98985a5b63bec78fde7eef2f7fa02f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5eefbc6db98985a5b63bec78… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 21 15:50:03 2020 +0200 ntdll: Implement KiRaiseUserExceptionDispatcher(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/exception.c | 10 ++++++++++ dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/unix/loader.c | 2 ++ dlls/ntdll/unix/unix_private.h | 1 + 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 1fc8710897..b32665611f 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -176,6 +176,16 @@ void WINAPI RtlRaiseStatus( NTSTATUS status ) } +/******************************************************************* + * KiRaiseUserExceptionDispatcher (NTDLL.@) + */ +void WINAPI KiRaiseUserExceptionDispatcher(void) +{ + EXCEPTION_RECORD rec = { NtCurrentTeb()->ExceptionCode }; + RtlRaiseException( &rec ); +} + + /******************************************************************* * RtlAddVectoredContinueHandler (NTDLL.@) */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index a3bc57716d..0bfe3d3545 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -66,7 +66,7 @@ # @ stub KiFastSystemCall # @ stub KiFastSystemCallRet # @ stub KiIntSystemCall -@ stub KiRaiseUserExceptionDispatcher +@ stdcall -norelay KiRaiseUserExceptionDispatcher() @ stub KiUserApcDispatcher @ stub KiUserCallbackDispatcher @ stdcall -norelay KiUserExceptionDispatcher(ptr ptr) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index a343274087..fba785c2b6 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -95,6 +95,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(module); extern IMAGE_NT_HEADERS __wine_spec_nt_header; void (WINAPI *pDbgUiRemoteBreakin)( void *arg ) = NULL; +void (WINAPI *pKiRaiseUserExceptionDispatcher)(void) = NULL; NTSTATUS (WINAPI *pKiUserExceptionDispatcher)(EXCEPTION_RECORD*,CONTEXT*) = NULL; void (WINAPI *pLdrInitializeThunk)(CONTEXT*,void**,ULONG_PTR,ULONG_PTR) = NULL; void (WINAPI *pRtlUserThreadStart)( PRTL_THREAD_START_ROUTINE entry, void *arg ) = NULL; @@ -833,6 +834,7 @@ static void fixup_ntdll_imports( const IMAGE_NT_HEADERS *nt ) ERR( "%s not found\n", #name ) GET_FUNC( DbgUiRemoteBreakin ); + GET_FUNC( KiRaiseUserExceptionDispatcher ); GET_FUNC( KiUserExceptionDispatcher ); GET_FUNC( LdrInitializeThunk ); GET_FUNC( RtlUserThreadStart ); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 19f742c200..60883bfa39 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -72,6 +72,7 @@ static const UINT_PTR page_size = 0x1000; /* callbacks to PE ntdll from the Unix side */ extern void (WINAPI *pDbgUiRemoteBreakin)( void *arg ) DECLSPEC_HIDDEN; +extern void (WINAPI *pKiRaiseUserExceptionDispatcher)(void) DECLSPEC_HIDDEN; extern NTSTATUS (WINAPI *pKiUserExceptionDispatcher)(EXCEPTION_RECORD*,CONTEXT*) DECLSPEC_HIDDEN; extern void (WINAPI *pLdrInitializeThunk)(CONTEXT*,void**,ULONG_PTR,ULONG_PTR) DECLSPEC_HIDDEN; extern void (WINAPI *pRtlUserThreadStart)( PRTL_THREAD_START_ROUTINE entry, void *arg ) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : sxs: Implement surrogate data lookup in SxsLookupClrGuid().
by Alexandre Julliard July 21, 2020

July 21, 2020

Module: wine Branch: master Commit: fe2c271ecca7620b6a8a693ff2ee8a7ad7469a88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe2c271ecca7620b6a8a693f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 21 15:03:28 2020 +0300 sxs: Implement surrogate data lookup in SxsLookupClrGuid(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sxs/sxs.c | 80 ++++++++++++++++++++++++++++--------- dlls/sxs/tests/comtest_dll.manifest | 5 +++ dlls/sxs/tests/interfaces.idl | 5 +++ dlls/sxs/tests/sxs.c | 33 +++++++++++++++ 4 files changed, 104 insertions(+), 19 deletions(-) diff --git a/dlls/sxs/sxs.c b/dlls/sxs/sxs.c index 0b59eb5d2e..92ba18ab0e 100644 --- a/dlls/sxs/sxs.c +++ b/dlls/sxs/sxs.c @@ -60,6 +60,7 @@ typedef struct _SXS_GUID_INFORMATION_CLR #define SXS_LOOKUP_CLR_GUID_USE_ACTCTX 0x00000001 #define SXS_LOOKUP_CLR_GUID_FIND_SURROGATE 0x00010000 #define SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS 0x00020000 +#define SXS_LOOKUP_CLR_GUID_FIND_ANY (SXS_LOOKUP_CLR_GUID_FIND_SURROGATE | SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS) struct comclassredirect_data { @@ -96,27 +97,54 @@ struct clrclass_data DWORD res2[2]; }; +struct clrsurrogate_data +{ + ULONG size; + DWORD res; + GUID clsid; + ULONG version_offset; + ULONG version_len; + ULONG name_offset; + ULONG name_len; +}; + BOOL WINAPI SxsLookupClrGuid(DWORD flags, GUID *clsid, HANDLE actctx, void *buffer, SIZE_T buffer_len, SIZE_T *buffer_len_required) { ACTCTX_SECTION_KEYED_DATA guid_info = { sizeof(ACTCTX_SECTION_KEYED_DATA) }; ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION *assembly_info; SIZE_T bytes_assembly_info; - struct comclassredirect_data *redirect_data; - struct clrclass_data *class_data; - int len_version = 0, len_name, len_identity; + unsigned int len_version = 0, len_name, len_identity; const void *ptr_name, *ptr_version, *ptr_identity; SXS_GUID_INFORMATION_CLR *ret = buffer; + BOOL retval = FALSE; char *ret_strings; - TRACE("(%x, %s, %p, %p, %08lx, %p): stub\n", flags, wine_dbgstr_guid(clsid), actctx, + TRACE("%#x, %s, %p, %p, %lx, %p.\n", flags, wine_dbgstr_guid(clsid), actctx, buffer, buffer_len, buffer_len_required); - if (flags & ~SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS) - FIXME("Ignored flags: %x\n", flags & ~SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS); + if (flags & ~SXS_LOOKUP_CLR_GUID_FIND_ANY) + FIXME("Ignored flags: %x\n", flags & ~SXS_LOOKUP_CLR_GUID_FIND_ANY); - if (!FindActCtxSectionGuid(FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX, 0, - ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION, clsid, &guid_info)) + if (flags & SXS_LOOKUP_CLR_GUID_FIND_SURROGATE) + { + if ((retval = FindActCtxSectionGuid(FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX, 0, + ACTIVATION_CONTEXT_SECTION_CLR_SURROGATES, clsid, &guid_info))) + { + flags &= ~SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS; + } + } + + if (!retval && (flags & SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS)) + { + if ((retval = FindActCtxSectionGuid(FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX, 0, + ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION, clsid, &guid_info))) + { + flags &= ~SXS_LOOKUP_CLR_GUID_FIND_SURROGATE; + } + } + + if (!retval) { SetLastError(ERROR_NOT_FOUND); return FALSE; @@ -139,17 +167,30 @@ BOOL WINAPI SxsLookupClrGuid(DWORD flags, GUID *clsid, HANDLE actctx, void *buff return FALSE; } - redirect_data = guid_info.lpData; - class_data = (void *)((char*)redirect_data + redirect_data->clrdata_offset); + if (flags & SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS) + { + const struct comclassredirect_data *redirect_data = guid_info.lpData; + const struct clrclass_data *class_data; + + class_data = (void *)((char *)redirect_data + redirect_data->clrdata_offset); + ptr_name = (char *)class_data + class_data->name_offset; + ptr_version = (char *)class_data + class_data->version_offset; + len_name = class_data->name_len + sizeof(WCHAR); + if (class_data->version_len) + len_version = class_data->version_len + sizeof(WCHAR); + } + else + { + const struct clrsurrogate_data *surrogate = guid_info.lpData; + ptr_name = (char *)surrogate + surrogate->name_offset; + ptr_version = (char *)surrogate + surrogate->version_offset; + len_name = surrogate->name_len + sizeof(WCHAR); + if (surrogate->version_len) + len_version = surrogate->version_len + sizeof(WCHAR); + } ptr_identity = assembly_info->lpAssemblyEncodedAssemblyIdentity; - ptr_name = (char *)class_data + class_data->name_offset; - ptr_version = (char *)class_data + class_data->version_offset; - len_identity = assembly_info->ulEncodedAssemblyIdentityLength + sizeof(WCHAR); - len_name = class_data->name_len + sizeof(WCHAR); - if (class_data->version_len > 0) - len_version = class_data->version_len + sizeof(WCHAR); *buffer_len_required = sizeof(SXS_GUID_INFORMATION_CLR) + len_identity + len_version + len_name; if (!buffer || buffer_len < *buffer_len_required) @@ -160,11 +201,12 @@ BOOL WINAPI SxsLookupClrGuid(DWORD flags, GUID *clsid, HANDLE actctx, void *buff return FALSE; } - ret->cbSize = sizeof(SXS_GUID_INFORMATION_CLR); - ret->dwFlags = SXS_GUID_INFORMATION_CLR_FLAG_IS_CLASS; + ret->cbSize = sizeof(*ret); + ret->dwFlags = flags & SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS ? SXS_GUID_INFORMATION_CLR_FLAG_IS_CLASS : + SXS_GUID_INFORMATION_CLR_FLAG_IS_SURROGATE; /* Copy strings into buffer */ - ret_strings = (char *)ret + sizeof(SXS_GUID_INFORMATION_CLR); + ret_strings = (char *)ret + sizeof(*ret); memcpy(ret_strings, ptr_identity, len_identity); ret->pcwszAssemblyIdentity = (WCHAR *)ret_strings; diff --git a/dlls/sxs/tests/comtest_dll.manifest b/dlls/sxs/tests/comtest_dll.manifest index ef6924de9e..b3273457ed 100644 --- a/dlls/sxs/tests/comtest_dll.manifest +++ b/dlls/sxs/tests/comtest_dll.manifest @@ -11,6 +11,11 @@ name="DLL.Test" runtimeVersion="v4.0.0.0"> </clrClass> + <clrSurrogate + clsid="{2e106e50-e7a4-4489-8538-83643f100fdd}" + name="Surrogate.Test" + runtimeVersion="v4.0.0.1"> + </clrSurrogate> <file name="comtest.dll"> </file> </assembly> diff --git a/dlls/sxs/tests/interfaces.idl b/dlls/sxs/tests/interfaces.idl index 6f8ac615bf..f34660db75 100644 --- a/dlls/sxs/tests/interfaces.idl +++ b/dlls/sxs/tests/interfaces.idl @@ -33,3 +33,8 @@ interface ITest : IUnknown { uuid(2e106e50-e7a4-4489-8538-83643f100fdc), ] coclass Test { interface ITest; }; + +[ + uuid(2e106e50-e7a4-4489-8538-83643f100fdd), +] +coclass SurrogateTest { interface ITest; }; diff --git a/dlls/sxs/tests/sxs.c b/dlls/sxs/tests/sxs.c index 4215c5045b..9887871422 100644 --- a/dlls/sxs/tests/sxs.c +++ b/dlls/sxs/tests/sxs.c @@ -86,6 +86,10 @@ static void run_test(void) BOOL ret; SXS_GUID_INFORMATION_CLR *info; + ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_ANY, (GUID*)&CLSID_Test, NULL, NULL, 0, &buffer_size); + ok(!ret, "Unexpected return value %d.\n", ret); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Got %d\n", GetLastError()); + ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS, (GUID*)&CLSID_Test, NULL, NULL, 0, &buffer_size); ok(ret == FALSE, "Got %d\n", ret); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Got %d\n", GetLastError()); @@ -103,6 +107,29 @@ static void run_test(void) wine_dbgstr_w(info->pcwszRuntimeVersion)); heap_free(info); + + ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_SURROGATE, (GUID *)&CLSID_SurrogateTest, NULL, NULL, 0, &buffer_size); + ok(!ret, "Unexpected return value %d.\n", ret); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Got %d\n", GetLastError()); + + info = heap_alloc(buffer_size); + ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_SURROGATE, (GUID *)&CLSID_SurrogateTest, NULL, info, + buffer_size, &buffer_size); + ok(ret, "Unexpected return value %d.\n", ret); + ok(GetLastError() == 0, "Got %d\n", GetLastError()); + + ok(info->dwFlags == SXS_GUID_INFORMATION_CLR_FLAG_IS_SURROGATE, "Unexpected flags %#x.\n", info->dwFlags); + ok(!lstrcmpW(info->pcwszTypeName, L"Surrogate.Test"), "Unexpected typename %s.\n", wine_dbgstr_w(info->pcwszTypeName)); + ok(!lstrcmpW(info->pcwszAssemblyIdentity, L"comtest,type=\"win32\",version=\"1.0.0.0\""), + "Unexpected assembly identity %s.\n", wine_dbgstr_w(info->pcwszAssemblyIdentity)); + ok(!lstrcmpW(info->pcwszRuntimeVersion, L"v4.0.0.1"), "Unexpected runtime version %s.\n", + wine_dbgstr_w(info->pcwszRuntimeVersion)); + + heap_free(info); + + ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_ANY, (GUID *)&CLSID_SurrogateTest, NULL, NULL, 0, &buffer_size); + ok(!ret, "Unexpected return value %d.\n", ret); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Got %d\n", GetLastError()); } static void prepare_and_run_test(void) @@ -199,10 +226,16 @@ static void test_SxsLookupClrGuid(void) SIZE_T buffer_size; BOOL ret; + SetLastError(0xdeadbeef); ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS, (GUID*)&CLSID_Test, NULL, NULL, 0, &buffer_size); ok(ret == FALSE, "Expected FALSE, got %d\n", ret); ok(GetLastError() == ERROR_NOT_FOUND, "Expected ERROR_NOT_FOUND, got %d\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_SURROGATE, (GUID *)&CLSID_Test, NULL, NULL, 0, &buffer_size); + ok(!ret, "Unexpected return value %d.\n", ret); + ok(GetLastError() == ERROR_NOT_FOUND, "Expected ERROR_NOT_FOUND, got %d\n", GetLastError()); + run_child_process(); }

1 0

Nikolay Sivov : sxs: Add support for SXS_LOOKUP_CLR_GUID_USE_ACTCTX in SxsLookupClrGuid().
by Alexandre Julliard July 21, 2020

July 21, 2020

Module: wine Branch: master Commit: 2cfc85dc55d403a7fcb885a62bb28f8d73498c2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cfc85dc55d403a7fcb885a6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 21 15:03:29 2020 +0300 sxs: Add support for SXS_LOOKUP_CLR_GUID_USE_ACTCTX in SxsLookupClrGuid(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sxs/sxs.c | 56 +++++++++++++++++++++++++++------------------------- dlls/sxs/tests/sxs.c | 24 ++++++++++++++++++++++ 2 files changed, 53 insertions(+), 27 deletions(-) diff --git a/dlls/sxs/sxs.c b/dlls/sxs/sxs.c index 92ba18ab0e..7150f55c33 100644 --- a/dlls/sxs/sxs.c +++ b/dlls/sxs/sxs.c @@ -112,59 +112,58 @@ BOOL WINAPI SxsLookupClrGuid(DWORD flags, GUID *clsid, HANDLE actctx, void *buff SIZE_T *buffer_len_required) { ACTCTX_SECTION_KEYED_DATA guid_info = { sizeof(ACTCTX_SECTION_KEYED_DATA) }; - ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION *assembly_info; + ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION *assembly_info = NULL; SIZE_T bytes_assembly_info; unsigned int len_version = 0, len_name, len_identity; const void *ptr_name, *ptr_version, *ptr_identity; SXS_GUID_INFORMATION_CLR *ret = buffer; BOOL retval = FALSE; char *ret_strings; + ULONG_PTR cookie; TRACE("%#x, %s, %p, %p, %lx, %p.\n", flags, wine_dbgstr_guid(clsid), actctx, buffer, buffer_len, buffer_len_required); - if (flags & ~SXS_LOOKUP_CLR_GUID_FIND_ANY) - FIXME("Ignored flags: %x\n", flags & ~SXS_LOOKUP_CLR_GUID_FIND_ANY); + if (flags & SXS_LOOKUP_CLR_GUID_USE_ACTCTX) + { + if (!ActivateActCtx(actctx, &cookie)) + { + WARN("Failed to activate context.\n"); + return FALSE; + } + } if (flags & SXS_LOOKUP_CLR_GUID_FIND_SURROGATE) { - if ((retval = FindActCtxSectionGuid(FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX, 0, - ACTIVATION_CONTEXT_SECTION_CLR_SURROGATES, clsid, &guid_info))) - { + if ((retval = FindActCtxSectionGuid(0, NULL, ACTIVATION_CONTEXT_SECTION_CLR_SURROGATES, clsid, &guid_info))) flags &= ~SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS; - } } if (!retval && (flags & SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS)) { - if ((retval = FindActCtxSectionGuid(FIND_ACTCTX_SECTION_KEY_RETURN_HACTCTX, 0, - ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION, clsid, &guid_info))) - { + if ((retval = FindActCtxSectionGuid(0, NULL, ACTIVATION_CONTEXT_SECTION_COM_SERVER_REDIRECTION, clsid, &guid_info))) flags &= ~SXS_LOOKUP_CLR_GUID_FIND_SURROGATE; - } } if (!retval) { SetLastError(ERROR_NOT_FOUND); - return FALSE; + goto out; } - QueryActCtxW(0, guid_info.hActCtx, &guid_info.ulAssemblyRosterIndex, + retval = QueryActCtxW(QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX, NULL, &guid_info.ulAssemblyRosterIndex, AssemblyDetailedInformationInActivationContext, NULL, 0, &bytes_assembly_info); - if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + if (!retval && GetLastError() != ERROR_INSUFFICIENT_BUFFER) { - ReleaseActCtx(guid_info.hActCtx); - return FALSE; + goto out; } + assembly_info = heap_alloc(bytes_assembly_info); - if(!QueryActCtxW(0, guid_info.hActCtx, &guid_info.ulAssemblyRosterIndex, + if (!(retval = QueryActCtxW(QUERY_ACTCTX_FLAG_USE_ACTIVE_ACTCTX, NULL, &guid_info.ulAssemblyRosterIndex, AssemblyDetailedInformationInActivationContext, assembly_info, - bytes_assembly_info, &bytes_assembly_info)) + bytes_assembly_info, &bytes_assembly_info))) { - heap_free(assembly_info); - ReleaseActCtx(guid_info.hActCtx); - return FALSE; + goto out; } if (flags & SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS) @@ -192,13 +191,12 @@ BOOL WINAPI SxsLookupClrGuid(DWORD flags, GUID *clsid, HANDLE actctx, void *buff ptr_identity = assembly_info->lpAssemblyEncodedAssemblyIdentity; len_identity = assembly_info->ulEncodedAssemblyIdentityLength + sizeof(WCHAR); - *buffer_len_required = sizeof(SXS_GUID_INFORMATION_CLR) + len_identity + len_version + len_name; + *buffer_len_required = sizeof(*ret) + len_identity + len_version + len_name; if (!buffer || buffer_len < *buffer_len_required) { SetLastError(ERROR_INSUFFICIENT_BUFFER); - heap_free(assembly_info); - ReleaseActCtx(guid_info.hActCtx); - return FALSE; + retval = FALSE; + goto out; } ret->cbSize = sizeof(*ret); @@ -226,7 +224,11 @@ BOOL WINAPI SxsLookupClrGuid(DWORD flags, GUID *clsid, HANDLE actctx, void *buff SetLastError(0); - ReleaseActCtx(guid_info.hActCtx); +out: + + if (flags & SXS_LOOKUP_CLR_GUID_USE_ACTCTX) + DeactivateActCtx(0, cookie); + heap_free(assembly_info); - return TRUE; + return retval; } diff --git a/dlls/sxs/tests/sxs.c b/dlls/sxs/tests/sxs.c index 9887871422..2a7afcde25 100644 --- a/dlls/sxs/tests/sxs.c +++ b/dlls/sxs/tests/sxs.c @@ -86,15 +86,30 @@ static void run_test(void) BOOL ret; SXS_GUID_INFORMATION_CLR *info; + SetLastError(0xdeadbeef); + ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_ANY | SXS_LOOKUP_CLR_GUID_USE_ACTCTX, (GUID *)&CLSID_Test, + NULL, NULL, 0, &buffer_size); + ok(!ret, "Unexpected return value %d.\n", ret); + ok(GetLastError() == ERROR_NOT_FOUND, "Unexpected error %d.\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_ANY | SXS_LOOKUP_CLR_GUID_USE_ACTCTX, (GUID *)&CLSID_Test, + NULL, NULL, 0, &buffer_size); + ok(!ret, "Unexpected return value %d.\n", ret); + ok(GetLastError() == ERROR_NOT_FOUND, "Unexpected error %d.\n", GetLastError()); + + SetLastError(0xdeadbeef); ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_ANY, (GUID*)&CLSID_Test, NULL, NULL, 0, &buffer_size); ok(!ret, "Unexpected return value %d.\n", ret); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Got %d\n", GetLastError()); + SetLastError(0xdeadbeef); ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS, (GUID*)&CLSID_Test, NULL, NULL, 0, &buffer_size); ok(ret == FALSE, "Got %d\n", ret); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Got %d\n", GetLastError()); info = heap_alloc(buffer_size); + SetLastError(0xdeadbeef); ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS, (GUID*)&CLSID_Test, NULL, info, buffer_size, &buffer_size); ok(ret == TRUE, "Got %d\n", ret); ok(GetLastError() == 0, "Got %d\n", GetLastError()); @@ -108,11 +123,13 @@ static void run_test(void) heap_free(info); + SetLastError(0xdeadbeef); ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_SURROGATE, (GUID *)&CLSID_SurrogateTest, NULL, NULL, 0, &buffer_size); ok(!ret, "Unexpected return value %d.\n", ret); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Got %d\n", GetLastError()); info = heap_alloc(buffer_size); + SetLastError(0xdeadbeef); ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_SURROGATE, (GUID *)&CLSID_SurrogateTest, NULL, info, buffer_size, &buffer_size); ok(ret, "Unexpected return value %d.\n", ret); @@ -127,6 +144,7 @@ static void run_test(void) heap_free(info); + SetLastError(0xdeadbeef); ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_ANY, (GUID *)&CLSID_SurrogateTest, NULL, NULL, 0, &buffer_size); ok(!ret, "Unexpected return value %d.\n", ret); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Got %d\n", GetLastError()); @@ -231,6 +249,12 @@ static void test_SxsLookupClrGuid(void) ok(ret == FALSE, "Expected FALSE, got %d\n", ret); ok(GetLastError() == ERROR_NOT_FOUND, "Expected ERROR_NOT_FOUND, got %d\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS | SXS_LOOKUP_CLR_GUID_USE_ACTCTX, (GUID *)&CLSID_Test, + NULL, NULL, 0, &buffer_size); + ok(!ret, "Unexpected return value %d.\n", ret); + ok(GetLastError() == ERROR_NOT_FOUND, "Expected ERROR_NOT_FOUND, got %d\n", GetLastError()); + SetLastError(0xdeadbeef); ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_SURROGATE, (GUID *)&CLSID_Test, NULL, NULL, 0, &buffer_size); ok(!ret, "Unexpected return value %d.\n", ret);

1 0

Jacek Caban : server: Introduce IOCTL_CONDRV_SET_TITLE ioctl.
by Alexandre Julliard July 21, 2020

July 21, 2020

Module: wine Branch: master Commit: cb28c2dbb0d92bcddea768bd5d43c5caecba6a0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb28c2dbb0d92bcddea768bd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 21 14:56:42 2020 +0200 server: Introduce IOCTL_CONDRV_SET_TITLE ioctl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 1 + server/console.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index f6888443c9..42ca77d382 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -34,6 +34,7 @@ #define IOCTL_CONDRV_GET_INPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 13, METHOD_BUFFERED, FILE_READ_PROPERTIES) #define IOCTL_CONDRV_SET_INPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 14, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) #define IOCTL_CONDRV_GET_TITLE CTL_CODE(FILE_DEVICE_CONSOLE, 15, METHOD_BUFFERED, FILE_READ_PROPERTIES) +#define IOCTL_CONDRV_SET_TITLE CTL_CODE(FILE_DEVICE_CONSOLE, 16, METHOD_BUFFERED, FILE_WRITE_PROPERTIES) /* console output ioctls */ #define IOCTL_CONDRV_GET_OUTPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 32, METHOD_BUFFERED, FILE_READ_PROPERTIES) diff --git a/server/console.c b/server/console.c index 3a3260645d..df84334448 100644 --- a/server/console.c +++ b/server/console.c @@ -1610,6 +1610,27 @@ static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async * if (!console->title_len) return 1; return set_reply_data( console->title, min( console->title_len, get_reply_max_size() )) != NULL; + case IOCTL_CONDRV_SET_TITLE: + { + data_size_t len = get_req_data_size(); + struct condrv_renderer_event evt; + WCHAR *title = NULL; + + if (len % sizeof(WCHAR)) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + + if (len && !(title = memdup( get_req_data(), len ))) return 0; + free( console->title ); + console->title = title; + console->title_len = len; + evt.event = CONSOLE_RENDERER_TITLE_EVENT; + console_input_events_append( console, &evt ); + return 1; + } + default: set_error( STATUS_INVALID_HANDLE ); return 0;

1 0

Alexandre Julliard : ntdll: Set a better exit status when the main image fails to load.
by Alexandre Julliard July 21, 2020

July 21, 2020

Module: wine Branch: master Commit: f8d42a31c624f28f6c9bfd9678fb025bf15e9c12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8d42a31c624f28f6c9bfd96… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 21 15:23:28 2020 +0200 ntdll: Set a better exit status when the main image fails to load. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49593 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index c21e9ec5b1..06e7c1bb37 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -513,7 +513,7 @@ done: failed: MESSAGE( "wine: cannot find %s\n", debugstr_w(name) ); - RtlExitUserProcess( GetLastError() ); + RtlExitUserProcess( STATUS_DLL_NOT_FOUND ); }

1 0

Piotr Caban : msvcrt: Copy wcscat implementation from ntdll.
by Alexandre Julliard July 21, 2020

July 21, 2020

Module: wine Branch: master Commit: 2c5bf68a5e7525ae9c50ee0dfc6d819da79c4861 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c5bf68a5e7525ae9c50ee0d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 21 12:21:39 2020 +0200 msvcrt: Copy wcscat implementation from ntdll. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/crtdll.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 9 +++++++++ dlls/msvcrtd/msvcrtd.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 13 files changed, 21 insertions(+), 11 deletions(-) diff --git a/dlls/crtdll/crtdll.spec b/dlls/crtdll/crtdll.spec index 45491455d0..aae66d828c 100644 --- a/dlls/crtdll/crtdll.spec +++ b/dlls/crtdll/crtdll.spec @@ -504,7 +504,7 @@ @ cdecl vsprintf(ptr str ptr) MSVCRT_vsprintf @ cdecl vswprintf(ptr wstr ptr) MSVCRT_vswprintf @ cdecl vwprintf(wstr ptr) MSVCRT_vwprintf -@ cdecl wcscat(wstr wstr) ntdll.wcscat +@ cdecl wcscat(wstr wstr) MSVCRT_wcscat @ cdecl wcschr(wstr long) MSVCRT_wcschr @ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp @ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index e37c0dbe5e..68d1ee3f0f 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1854,7 +1854,7 @@ @ cdecl vwprintf_s(wstr ptr) MSVCRT_vwprintf_s @ cdecl wcrtomb(ptr long ptr) MSVCRT_wcrtomb @ cdecl wcrtomb_s(ptr ptr long long ptr) MSVCRT_wcrtomb_s -@ cdecl wcscat(wstr wstr) ntdll.wcscat +@ cdecl wcscat(wstr wstr) MSVCRT_wcscat @ cdecl wcscat_s(wstr long wstr) MSVCRT_wcscat_s @ cdecl wcschr(wstr long) MSVCRT_wcschr @ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 8f1d9f9397..13abe6ad64 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2212,7 +2212,7 @@ @ cdecl vwprintf_s(wstr ptr) MSVCRT_vwprintf_s @ cdecl wcrtomb(ptr long ptr) MSVCRT_wcrtomb @ cdecl wcrtomb_s(ptr ptr long long ptr) MSVCRT_wcrtomb_s -@ cdecl wcscat(wstr wstr) ntdll.wcscat +@ cdecl wcscat(wstr wstr) MSVCRT_wcscat @ cdecl wcscat_s(wstr long wstr) MSVCRT_wcscat_s @ cdecl wcschr(wstr long) MSVCRT_wcschr @ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 731e001ac2..7181184938 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2447,7 +2447,7 @@ @ stub vwscanf_s @ cdecl wcrtomb(ptr long ptr) MSVCRT_wcrtomb @ cdecl wcrtomb_s(ptr ptr long long ptr) MSVCRT_wcrtomb_s -@ cdecl wcscat(wstr wstr) ntdll.wcscat +@ cdecl wcscat(wstr wstr) MSVCRT_wcscat @ cdecl wcscat_s(wstr long wstr) MSVCRT_wcscat_s @ cdecl wcschr(wstr long) MSVCRT_wcschr @ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 2aa111cab5..d4114a24fe 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -850,7 +850,7 @@ @ cdecl vsprintf(ptr str ptr) MSVCRT_vsprintf @ cdecl vswprintf(ptr wstr ptr) MSVCRT_vswprintf @ cdecl vwprintf(wstr ptr) MSVCRT_vwprintf -@ cdecl wcscat(wstr wstr) ntdll.wcscat +@ cdecl wcscat(wstr wstr) MSVCRT_wcscat @ cdecl wcschr(wstr long) MSVCRT_wcschr @ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp @ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index da6827789e..c1b1c68f1f 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -846,7 +846,7 @@ @ cdecl vsprintf(ptr str ptr) MSVCRT_vsprintf @ cdecl vswprintf(ptr wstr ptr) MSVCRT_vswprintf @ cdecl vwprintf(wstr ptr) MSVCRT_vwprintf -@ cdecl wcscat(wstr wstr) ntdll.wcscat +@ cdecl wcscat(wstr wstr) MSVCRT_wcscat @ cdecl wcschr(wstr long) MSVCRT_wcschr @ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp @ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 1847a93c71..916245cb26 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1534,7 +1534,7 @@ @ cdecl vwprintf_s(wstr ptr) MSVCRT_vwprintf_s @ cdecl wcrtomb(ptr long ptr) MSVCRT_wcrtomb @ cdecl wcrtomb_s(ptr ptr long long ptr) MSVCRT_wcrtomb_s -@ cdecl wcscat(wstr wstr) ntdll.wcscat +@ cdecl wcscat(wstr wstr) MSVCRT_wcscat @ cdecl wcscat_s(wstr long wstr) MSVCRT_wcscat_s @ cdecl wcschr(wstr long) MSVCRT_wcschr @ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 8a53cf47a5..b2967858bc 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1507,7 +1507,7 @@ @ cdecl vwprintf_s(wstr ptr) MSVCRT_vwprintf_s @ cdecl wcrtomb(ptr long ptr) MSVCRT_wcrtomb @ cdecl wcrtomb_s(ptr ptr long long ptr) MSVCRT_wcrtomb_s -@ cdecl wcscat(wstr wstr) ntdll.wcscat +@ cdecl wcscat(wstr wstr) MSVCRT_wcscat @ cdecl wcscat_s(wstr long wstr) MSVCRT_wcscat_s @ cdecl wcschr(wstr long) MSVCRT_wcschr @ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 7e854704b1..7449cbb2de 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1210,6 +1210,7 @@ int __cdecl MSVCRT__iswlower_l(MSVCRT_wchar_t, MSVCRT__locale_t); int __cdecl MSVCRT__iswupper_l(MSVCRT_wchar_t, MSVCRT__locale_t); int __cdecl MSVCRT__iswprint_l(MSVCRT_wchar_t, MSVCRT__locale_t); int __cdecl MSVCRT__iswpunct_l(MSVCRT_wchar_t, MSVCRT__locale_t); +MSVCRT_size_t __cdecl MSVCRT_wcslen(const MSVCRT_wchar_t*); /* Maybe one day we'll enable the invalid parameter handlers with the full set of information (msvcrXXd) * #define MSVCRT_INVALID_PMT(x) MSVCRT_call_invalid_parameter_handler(x, __FUNCTION__, __FILE__, __LINE__, 0) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index ac1269c53f..51ecb095db 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1481,7 +1481,7 @@ @ cdecl vwprintf_s(wstr ptr) MSVCRT_vwprintf_s @ cdecl wcrtomb(ptr long ptr) MSVCRT_wcrtomb @ cdecl wcrtomb_s(ptr ptr long long ptr) MSVCRT_wcrtomb_s -@ cdecl wcscat(wstr wstr) ntdll.wcscat +@ cdecl wcscat(wstr wstr) MSVCRT_wcscat @ cdecl wcscat_s(wstr long wstr) MSVCRT_wcscat_s @ cdecl wcschr(wstr long) MSVCRT_wcschr @ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index b553f27d27..31ec0dd33f 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2255,6 +2255,15 @@ INT CDECL MSVCRT_wcscat_s(MSVCRT_wchar_t* dst, MSVCRT_size_t elem, const MSVCRT_ return MSVCRT_ERANGE; } +/*********************************************************************** + * wcscat (MSVCRT.@) + */ +MSVCRT_wchar_t* __cdecl MSVCRT_wcscat( MSVCRT_wchar_t *dst, const MSVCRT_wchar_t *src ) +{ + MSVCRT_wcscpy( dst + MSVCRT_wcslen(dst), src ); + return dst; +} + /********************************************************************* * wcsncat_s (MSVCRT.@) * diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index 0f6af7cce7..8c775c61a4 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -802,7 +802,7 @@ @ cdecl vsprintf(ptr str ptr) MSVCRT_vsprintf @ cdecl vswprintf(ptr wstr ptr) MSVCRT_vswprintf @ cdecl vwprintf(wstr ptr) MSVCRT_vwprintf -@ cdecl wcscat(wstr wstr) ntdll.wcscat +@ cdecl wcscat(wstr wstr) MSVCRT_wcscat @ cdecl wcschr(wstr long) MSVCRT_wcschr @ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp @ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 2367e5a08d..2577649421 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2554,7 +2554,7 @@ @ cdecl ungetwc(long ptr) MSVCRT_ungetwc @ cdecl wcrtomb(ptr long ptr) MSVCRT_wcrtomb @ cdecl wcrtomb_s(ptr ptr long long ptr) MSVCRT_wcrtomb_s -@ cdecl wcscat(wstr wstr) ntdll.wcscat +@ cdecl wcscat(wstr wstr) MSVCRT_wcscat @ cdecl wcscat_s(wstr long wstr) MSVCRT_wcscat_s @ cdecl wcschr(wstr long) MSVCRT_wcschr @ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp

1 0