- Wine-Devel - list.winehq.org

[RFC] Trying to fix desktop switches
by Rafał Mużyło July 3, 2020

July 3, 2020

This is yet another attempt at fixing the way wine handles X11 wm desktop switches. Currently, wine minimizes the windows on switch away, then restores them. That's the wrong thing to do. For example, that unpauses apps that pause on focus loss. First part of the problem is quite simple. Adding a check for NET_WM_STATE_HIDDEN and returning early if it's not set while the wmstate is iconic deals with that. The other part is a pain though. As the windows on other desktops are invisible, they shouldn't be considered valid input sinks by wine. The problem is two-fold: - can_activate_window is a static function both in winex11.drv and user32.dll; what's more one in user32.dll doesn't handle WS_EX_NOACTIVATE the way one in winex11.drv does - x11drv_win_data is (for obvious reasons) an internal detail of winex11.drv As such, it's hard to come up with something that would reach user32.dll and didn't have some nasty side effects. I'm trying to use WS_EX_NOACTIVATE in this version, but (as already mentioned) that isn't working with user32.dll *and* has some undesirable side-effects. Trying to use either WS_VISIBLE or WS_DISABLED doesn't work at all or at least I'm not able to use that properly. So, better ideas welcomed.

1 0

[PATCH] kernel32: Catch process creation breakpoint exceptions.
by Rémi Bernon July 3, 2020

July 3, 2020

Metal Gear Solid V: Ground Zeroes attaches itself and continues this specific breakpoint with DBG_EXCEPTION_NOT_HANDLED. It crashes the child process and the game terminates. It is correct for old Windows versions, but more recent versions are apparently catching exceptions here, and the process should continue. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44127 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/process.c | 9 +++++++++ dlls/kernel32/tests/debugger.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 8f506fcf132..cfc11c867ae 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -155,6 +155,15 @@ void CDECL __wine_start_process( LPTHREAD_START_ROUTINE entry, PEB *peb ) SetLastError( 0 ); /* clear error code */ if (being_debugged) DbgBreakPoint(); + } + __EXCEPT_ALL + { + /* do nothing */ + } + __ENDTRY + + __TRY + { ExitThread( call_process_entry( peb, entry )); } __EXCEPT(UnhandledExceptionFilter) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 33e18d82e62..0a43fe91e64 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -1062,15 +1062,46 @@ static void test_debug_children(const char *name, DWORD flag, BOOL debug_child, if (flag) { + DWORD last_thread; + next_event(&ctx, WAIT_EVENT_TIMEOUT); ok(ctx.ev.dwDebugEventCode == CREATE_PROCESS_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); ok(ctx.pid == pi.dwProcessId, "unexpected dwProcessId %x\n", ctx.ev.dwProcessId == ctx.pid); next_event(&ctx, WAIT_EVENT_TIMEOUT); ok(ctx.ev.dwDebugEventCode == LOAD_DLL_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); + last_thread = ctx.ev.dwThreadId; wait_for_breakpoint(&ctx); ok(ctx.dll_cnt > 2, "dll_cnt = %d\n", ctx.dll_cnt); + + ok(ctx.ev.dwDebugEventCode == EXCEPTION_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); + ok(ctx.ev.dwThreadId == last_thread, "unexpected thread\n"); + ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT, "ExceptionCode = %x\n", + ctx.ev.u.Exception.ExceptionRecord.ExceptionCode); + + /* Except for wxppro and w2008, the initial breakpoint is now somewhere else, possibly within LdrInitShimEngineDynamic, + * It's also catching exceptions and ContinueDebugEvent(DBG_EXCEPTION_NOT_HANDLED) should not crash the child now */ + if (broken(ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress == pDbgBreakPoint)) + { + win_skip("Ignoring initial breakpoint address check\n"); + pass_exception = FALSE; + } + else + { + todo_wine + ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress != pDbgBreakPoint, "ExceptionAddress == pDbgBreakPoint\n"); + } + + if (pass_exception) + { + ret = ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_EXCEPTION_NOT_HANDLED); + ok(ret, "ContinueDebugEvent failed, last error %d.\n", GetLastError()); + ctx.ev.dwDebugEventCode = -1; + + next_event(&ctx, WAIT_EVENT_TIMEOUT); + ok(ctx.ev.dwDebugEventCode != EXCEPTION_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); + } } else { @@ -1713,6 +1744,7 @@ START_TEST(debugger) test_debug_children(myARGV[0], DEBUG_PROCESS|DEBUG_ONLY_THIS_PROCESS, FALSE, FALSE); test_debug_children(myARGV[0], 0, FALSE, FALSE); test_debug_children(myARGV[0], 0, FALSE, TRUE); + test_debug_children(myARGV[0], DEBUG_ONLY_THIS_PROCESS, FALSE, TRUE); test_debugger(myARGV[0]); } } -- 2.27.0

2 1

[PATCH] msvcrt: Don't set MXCSR in _control87.
by Myah Caron July 3, 2020

July 3, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=27594 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- This appears to match native MSVCRT's behavior, at least the one provided by vcrun6. I'm not sure if the style is correct (the helper being directly below the __control87_2 comment). --- dlls/msvcrt/math.c | 61 +++++++++++++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 23 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index eae917076f..7ad79a07e5 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1101,6 +1101,41 @@ double CDECL MSVCRT__chgsign(double num) * Not exported by native msvcrt, added in msvcr80. */ #ifdef __i386__ +static unsigned int get_flags_from_mxcsr(void) { +#ifdef __GNUC__ + unsigned long fpword; + unsigned int flags; + + __asm__ __volatile__( "stmxcsr %0" : "=m" (fpword) ); + + /* Convert into mask constants */ + flags = 0; + if (fpword & 0x80) flags |= MSVCRT__EM_INVALID; + if (fpword & 0x100) flags |= MSVCRT__EM_DENORMAL; + if (fpword & 0x200) flags |= MSVCRT__EM_ZERODIVIDE; + if (fpword & 0x400) flags |= MSVCRT__EM_OVERFLOW; + if (fpword & 0x800) flags |= MSVCRT__EM_UNDERFLOW; + if (fpword & 0x1000) flags |= MSVCRT__EM_INEXACT; + switch (fpword & 0x6000) + { + case 0x6000: flags |= MSVCRT__RC_UP|MSVCRT__RC_DOWN; break; + case 0x4000: flags |= MSVCRT__RC_UP; break; + case 0x2000: flags |= MSVCRT__RC_DOWN; break; + } + switch (fpword & 0x8040) + { + case 0x0040: flags |= MSVCRT__DN_FLUSH_OPERANDS_SAVE_RESULTS; break; + case 0x8000: flags |= MSVCRT__DN_SAVE_OPERANDS_FLUSH_RESULTS; break; + case 0x8040: flags |= MSVCRT__DN_FLUSH; break; + } + + return flags; +#else + FIXME( "not implemented\n" ); + return 0; +#endif +} + int CDECL __control87_2( unsigned int newval, unsigned int mask, unsigned int *x86_cw, unsigned int *sse2_cw ) { @@ -1170,28 +1205,7 @@ int CDECL __control87_2( unsigned int newval, unsigned int mask, if (sse2_supported) { - __asm__ __volatile__( "stmxcsr %0" : "=m" (fpword) ); - - /* Convert into mask constants */ - flags = 0; - if (fpword & 0x80) flags |= MSVCRT__EM_INVALID; - if (fpword & 0x100) flags |= MSVCRT__EM_DENORMAL; - if (fpword & 0x200) flags |= MSVCRT__EM_ZERODIVIDE; - if (fpword & 0x400) flags |= MSVCRT__EM_OVERFLOW; - if (fpword & 0x800) flags |= MSVCRT__EM_UNDERFLOW; - if (fpword & 0x1000) flags |= MSVCRT__EM_INEXACT; - switch (fpword & 0x6000) - { - case 0x6000: flags |= MSVCRT__RC_UP|MSVCRT__RC_DOWN; break; - case 0x4000: flags |= MSVCRT__RC_UP; break; - case 0x2000: flags |= MSVCRT__RC_DOWN; break; - } - switch (fpword & 0x8040) - { - case 0x0040: flags |= MSVCRT__DN_FLUSH_OPERANDS_SAVE_RESULTS; break; - case 0x8000: flags |= MSVCRT__DN_SAVE_OPERANDS_FLUSH_RESULTS; break; - case 0x8040: flags |= MSVCRT__DN_FLUSH; break; - } + flags = get_flags_from_mxcsr(); TRACE( "sse2 flags=%08x newval=%08x mask=%08x\n", flags, newval, mask ); if (mask) @@ -1241,7 +1255,8 @@ unsigned int CDECL _control87(unsigned int newval, unsigned int mask) #ifdef __i386__ unsigned int sse2_cw; - __control87_2( newval, mask, &flags, &sse2_cw ); + __control87_2( newval, mask, &flags, 0 ); + sse2_cw = get_flags_from_mxcsr(); if ((flags ^ sse2_cw) & (MSVCRT__MCW_EM | MSVCRT__MCW_RC)) flags |= MSVCRT__EM_AMBIGUOUS; #elif defined(__x86_64__) -- 2.26.2

2 2

[PATCH] ntdll: Initialize StatusWord and TagWord in i386 init_thread_context.
by Jefferson Carpenter July 3, 2020

July 3, 2020

This does not resolve the bug, but moves toward resolving it. I have not been able to get a consistent read on what to initialize the remaining members to. Thanks, Jefferson

1 0

[PATCH V3 1/2] xactengine3_7: Add new dll.
by Vijay Kiran Kamuju July 3, 2020

July 3, 2020

Based on original patch from Ethan Lee Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 2/2] d3dx10: Implement D3DX10GetImageInfoFromMemory().
by Ziqing Hui July 3, 2020

July 3, 2020

According to our tests, except for DDS image, the "Format" field of the result will be set to DXGI_FORMAT_R8G8B8A8_UNORM no matter what its actual format is. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/Makefile.in | 1 + dlls/d3dx10_43/d3dx10_43_main.c | 142 +++++++++++++++++++++++++++++++- dlls/d3dx10_43/tests/d3dx10.c | 7 +- 3 files changed, 143 insertions(+), 7 deletions(-)

1 0

[PATCH 1/2] d3dx10/tests: Add more test images.
by Ziqing Hui July 3, 2020

July 3, 2020

CoInitialize() is required for WMP format, see https://docs.microsoft.com/en-us/windows/win32/direct3d10/d3dx10-image-file… Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/tests/Makefile.in | 2 +- dlls/d3dx10_43/tests/d3dx10.c | 155 ++++++++++++++++++++++++++++++- 2 files changed, 153 insertions(+), 4 deletions(-)

1 0

crypt32: Add parameter validation.
by Zhipeng Zhao July 3, 2020

July 3, 2020

3 4

[PATCH V2 2/2] xactengine3_7: Implement IXACT3Engine interface.
by Vijay Kiran Kamuju July 3, 2020

July 3, 2020

Based on patch from Ethan Lee. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 1

[PATCH vkd3d 3/5] vkd3d-compiler: Add an explicit --help option.
by Henri Verbeet July 3, 2020

July 3, 2020

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- programs/vkd3d-compiler/main.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 8fa4d4f..e975572 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -31,7 +31,8 @@ enum { - OPTION_STRIP_DEBUG = CHAR_MAX + 1, + OPTION_HELP = CHAR_MAX + 1, + OPTION_STRIP_DEBUG, }; static bool read_shader(struct vkd3d_shader_code *shader, const char *filename) @@ -97,6 +98,7 @@ static void print_usage(const char *program_name) static const char usage[] = "[options...] file\n" "Options:\n" + " -h, --help Display this information and exit.\n" " -o <file> Write the output to <file>.\n" " --strip-debug Strip debug information from the output.\n" " -- Stop option processing. Any subsequent argument is\n" @@ -109,6 +111,7 @@ struct options { const char *filename; const char *output_filename; + struct vkd3d_shader_compile_option compile_options[MAX_COMPILE_OPTIONS]; unsigned int compile_option_count; }; @@ -147,6 +150,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) static struct option long_options[] = { + {"help", no_argument, NULL, OPTION_HELP}, {"strip-debug", no_argument, NULL, OPTION_STRIP_DEBUG}, {NULL, 0, NULL, 0}, }; @@ -155,7 +159,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) for (;;) { - if ((option = getopt_long(argc, argv, "o:", long_options, NULL)) == -1) + if ((option = getopt_long(argc, argv, "ho:", long_options, NULL)) == -1) break; switch (option) -- 2.11.0

3 2