September 2020 - Wine-Devel

[PATCH] msvcirt: Be more obvious in out-of-memory situations.
by Arkadiusz Hiler Sept. 4, 2020

Sept. 4, 2020

Just like in the new ifstream, if we are out of memory it's better to fail loudly with an obvious FIXME message than to leave user with half-initialized object causing ephemeral issues that are hard to debug. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- dlls/msvcirt/msvcirt.c | 78 ++++++++++++++++++++++++++++-------------- 1 file changed, 53 insertions(+), 25 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 7e1d9977b78..c8aaa146e54 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -3012,11 +3012,16 @@ ostream* __thiscall ostrstream_buffer_ctor(ostream *this, char *buffer, int leng TRACE("(%p %p %d %d %d)\n", this, buffer, length, mode, virt_init); - if (ssb) { - strstreambuf_buffer_ctor(ssb, buffer, length, buffer); - if (mode & (OPENMODE_app|OPENMODE_ate)) - ssb->base.pptr = buffer + strlen(buffer); + if (!ssb) + { + FIXME("out of memory\n"); + return NULL; } + + strstreambuf_buffer_ctor(ssb, buffer, length, buffer); + if (mode & (OPENMODE_app|OPENMODE_ate)) + ssb->base.pptr = buffer + strlen(buffer); + return ostrstream_internal_sb_ctor(this, ssb, virt_init); } @@ -3029,8 +3034,14 @@ ostream* __thiscall ostrstream_ctor(ostream *this, BOOL virt_init) TRACE("(%p %d)\n", this, virt_init); - if (ssb) - strstreambuf_ctor(ssb); + if (!ssb) + { + FIXME("out of memory\n"); + return NULL; + } + + strstreambuf_ctor(ssb); + return ostrstream_internal_sb_ctor(this, ssb, virt_init); } @@ -4069,11 +4080,15 @@ istream* __thiscall istrstream_buffer_ctor(istream *this, char *buffer, int leng TRACE("(%p %p %d %d)\n", this, buffer, length, virt_init); - if (ssb) { - strstreambuf_buffer_ctor(ssb, buffer, length, NULL); - istream_sb_ctor(this, &ssb->base, virt_init); - } else - istream_ctor(this, virt_init); + if (!ssb) + { + FIXME("out of memory\n"); + return NULL; + } + + strstreambuf_buffer_ctor(ssb, buffer, length, NULL); + istream_sb_ctor(this, &ssb->base, virt_init); + base = istream_get_ios(this); base->vtable = &MSVCP_istrstream_vtable; base->delbuf = 1; @@ -4470,13 +4485,18 @@ iostream* __thiscall strstream_buffer_ctor(iostream *this, char *buffer, int len TRACE("(%p %p %d %d %d)\n", this, buffer, length, mode, virt_init); - if (ssb) { - strstreambuf_buffer_ctor(ssb, buffer, length, buffer); - if ((mode & OPENMODE_out) && (mode & (OPENMODE_app|OPENMODE_ate))) - ssb->base.pptr = buffer + strlen(buffer); - return iostream_internal_sb_ctor(this, &ssb->base, &MSVCP_strstream_vtable, virt_init); + if (!ssb) + { + FIXME("out of memory\n"); + return NULL; } - return iostream_internal_sb_ctor(this, NULL, &MSVCP_strstream_vtable, virt_init); + + strstreambuf_buffer_ctor(ssb, buffer, length, buffer); + + if ((mode & OPENMODE_out) && (mode & (OPENMODE_app|OPENMODE_ate))) + ssb->base.pptr = buffer + strlen(buffer); + + return iostream_internal_sb_ctor(this, &ssb->base, &MSVCP_strstream_vtable, virt_init); } /* ??0strstream@@QAE(a)XZ */ @@ -4488,11 +4508,15 @@ iostream* __thiscall strstream_ctor(iostream *this, BOOL virt_init) TRACE("(%p %d)\n", this, virt_init); - if (ssb) { - strstreambuf_ctor(ssb); - return iostream_internal_sb_ctor(this, &ssb->base, &MSVCP_strstream_vtable, virt_init); + if (!ssb) + { + FIXME("out of memory\n"); + return NULL; } - return iostream_internal_sb_ctor(this, NULL, &MSVCP_strstream_vtable, virt_init); + + strstreambuf_ctor(ssb); + + return iostream_internal_sb_ctor(this, &ssb->base, &MSVCP_strstream_vtable, virt_init); } /* ?pcount(a)strstream@@QBEHXZ */ @@ -4537,11 +4561,15 @@ iostream* __thiscall stdiostream_file_ctor(iostream *this, FILE *file, BOOL virt TRACE("(%p %p %d)\n", this, file, virt_init); - if (stb) { - stdiobuf_file_ctor(stb, file); - return iostream_internal_sb_ctor(this, &stb->base, &MSVCP_stdiostream_vtable, virt_init); + if (!stb) + { + FIXME("out of memory\n"); + return NULL; } - return iostream_internal_sb_ctor(this, NULL, &MSVCP_stdiostream_vtable, virt_init); + + stdiobuf_file_ctor(stb, file); + + return iostream_internal_sb_ctor(this, &stb->base, &MSVCP_stdiostream_vtable, virt_init); } /* ?rdbuf(a)stdiostream@@QBEPAVstdiobuf@@XZ */ -- 2.28.0

1 0

[PATCH 1/2] user32/tests: Add tests for showing and minimizing owned windows.
by Haidong Yu Sept. 4, 2020

Sept. 4, 2020

2 1

[PATCH] ntdll: Add ARM64 SEH unwind directives for assembly functions in PE builds
by Martin Storsjo Sept. 4, 2020

Sept. 4, 2020

This fixes unwinding through RtlRaiseException and call_consolidate_callback in PE builds. Adjust the call_consolidate_callback function to store the whole context on the stack, and use the seh "context" opcode for unwinding to that context instead of the parent. Adjust the dwarf escape codes for reading from the context on the stack. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- Clang only got support for the ARM64 SEH assembler directives very recently (https://reviews.llvm.org/D86529 and https://reviews.llvm.org/D86889) in the master branch (that is slated to become Clang 12 in 6 months) fairly soon after the release branch for version 11 was branched off. (So the risk of users using a trunk version 12, before these directives were added is fairly low. But I guess it'd be good to keep track of what version the Android NDK updates to next.) --- dlls/ntdll/signal_arm64.c | 83 ++++++++++++++++++++++++--------------- include/wine/asm.h | 10 ++++- 2 files changed, 61 insertions(+), 32 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index d0d708c733..412947411f 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -959,9 +959,7 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG_PTR base, ULONG_PTR pc, * else. All CFI instructions are either DW_CFA_def_cfa_expression or * DW_CFA_expression, and the expressions have the following format: * - * DW_OP_breg29; sleb128 0x10 | Load x29 + 0x10 - * DW_OP_deref | Get *(x29 + 0x10) == context - * DW_OP_plus_uconst; uleb128 <OFFSET> | Add offset to get struct member + * DW_OP_breg31; sleb128 <OFFSET> | Load x31 + struct member offset * [DW_OP_deref] | Dereference, only for CFA */ extern void * WINAPI call_consolidate_callback( CONTEXT *context, @@ -969,40 +967,60 @@ extern void * WINAPI call_consolidate_callback( CONTEXT *context, EXCEPTION_RECORD *rec, TEB *teb ); __ASM_GLOBAL_FUNC( call_consolidate_callback, - "stp x29, x30, [sp, #-0x20]!\n\t" - __ASM_CFI(".cfi_def_cfa_offset 32\n\t") - __ASM_CFI(".cfi_offset 29, -32\n\t") - __ASM_CFI(".cfi_offset 30, -24\n\t") + "stp x29, x30, [sp, #-0x30]!\n\t" + __ASM_CFI(".cfi_def_cfa_offset 48\n\t") + __ASM_CFI(".cfi_offset 29, -48\n\t") + __ASM_CFI(".cfi_offset 30, -40\n\t") + __ASM_SEH(".seh_nop\n\t") + "stp x1, x2, [sp, #0x10]\n\t" + __ASM_SEH(".seh_nop\n\t") + "str x3, [sp, #0x20]\n\t" + __ASM_SEH(".seh_nop\n\t") "mov x29, sp\n\t" __ASM_CFI(".cfi_def_cfa_register 29\n\t") - "str x0, [sp, 0x10]\n\t" + __ASM_SEH(".seh_nop\n\t") __ASM_CFI(".cfi_remember_state\n\t") - __ASM_CFI(".cfi_escape 0x0f,0x07,0x8d,0x10,0x06,0x23,0x80,0x02,0x06\n\t") /* CFA */ - __ASM_CFI(".cfi_escape 0x10,0x13,0x06,0x8d,0x10,0x06,0x23,0xa0,0x01\n\t") /* x19 */ - __ASM_CFI(".cfi_escape 0x10,0x14,0x06,0x8d,0x10,0x06,0x23,0xa8,0x01\n\t") /* x20 */ - __ASM_CFI(".cfi_escape 0x10,0x15,0x06,0x8d,0x10,0x06,0x23,0xb0,0x01\n\t") /* x21 */ - __ASM_CFI(".cfi_escape 0x10,0x16,0x06,0x8d,0x10,0x06,0x23,0xb8,0x01\n\t") /* x22 */ - __ASM_CFI(".cfi_escape 0x10,0x17,0x06,0x8d,0x10,0x06,0x23,0xc0,0x01\n\t") /* x23 */ - __ASM_CFI(".cfi_escape 0x10,0x18,0x06,0x8d,0x10,0x06,0x23,0xc8,0x01\n\t") /* x24 */ - __ASM_CFI(".cfi_escape 0x10,0x19,0x06,0x8d,0x10,0x06,0x23,0xd0,0x01\n\t") /* x25 */ - __ASM_CFI(".cfi_escape 0x10,0x1a,0x06,0x8d,0x10,0x06,0x23,0xd8,0x01\n\t") /* x26 */ - __ASM_CFI(".cfi_escape 0x10,0x1b,0x06,0x8d,0x10,0x06,0x23,0xe0,0x01\n\t") /* x27 */ - __ASM_CFI(".cfi_escape 0x10,0x1c,0x06,0x8d,0x10,0x06,0x23,0xe8,0x01\n\t") /* x28 */ - __ASM_CFI(".cfi_escape 0x10,0x1d,0x06,0x8d,0x10,0x06,0x23,0xf0,0x01\n\t") /* x29 */ - __ASM_CFI(".cfi_escape 0x10,0x1e,0x06,0x8d,0x10,0x06,0x23,0xf8,0x01\n\t") /* x30 */ - __ASM_CFI(".cfi_escape 0x10,0x48,0x06,0x8d,0x10,0x06,0x23,0x90,0x03\n\t") /* d8 */ - __ASM_CFI(".cfi_escape 0x10,0x49,0x06,0x8d,0x10,0x06,0x23,0xa0,0x03\n\t") /* d9 */ - __ASM_CFI(".cfi_escape 0x10,0x4a,0x06,0x8d,0x10,0x06,0x23,0xb0,0x03\n\t") /* d10 */ - __ASM_CFI(".cfi_escape 0x10,0x4b,0x06,0x8d,0x10,0x06,0x23,0xc0,0x03\n\t") /* d11 */ - __ASM_CFI(".cfi_escape 0x10,0x4c,0x06,0x8d,0x10,0x06,0x23,0xd0,0x03\n\t") /* d12 */ - __ASM_CFI(".cfi_escape 0x10,0x4d,0x06,0x8d,0x10,0x06,0x23,0xe0,0x03\n\t") /* d13 */ - __ASM_CFI(".cfi_escape 0x10,0x4e,0x06,0x8d,0x10,0x06,0x23,0xf0,0x03\n\t") /* d14 */ - __ASM_CFI(".cfi_escape 0x10,0x4f,0x06,0x8d,0x10,0x06,0x23,0x80,0x04\n\t") /* d15 */ + /* Memcpy the context onto the stack */ + "sub sp, sp, #0x390\n\t" + __ASM_SEH(".seh_nop\n\t") + "mov x1, x0\n\t" + __ASM_SEH(".seh_nop\n\t") + "mov x0, sp\n\t" + __ASM_SEH(".seh_nop\n\t") + "mov x2, #0x390\n\t" + __ASM_SEH(".seh_nop\n\t") + "bl memcpy\n\t" + __ASM_CFI(".cfi_def_cfa 31, 0\n\t") + __ASM_CFI(".cfi_escape 0x0f,0x04,0x8f,0x80,0x02,0x06\n\t") /* CFA, DW_OP_breg31 + 0x100, DW_OP_deref */ + __ASM_CFI(".cfi_escape 0x10,0x13,0x03,0x8f,0xa0,0x01\n\t") /* x19, DW_OP_breg31 + 0xA0 */ + __ASM_CFI(".cfi_escape 0x10,0x14,0x03,0x8f,0xa8,0x01\n\t") /* x20 */ + __ASM_CFI(".cfi_escape 0x10,0x15,0x03,0x8f,0xb0,0x01\n\t") /* x21 */ + __ASM_CFI(".cfi_escape 0x10,0x16,0x03,0x8f,0xb8,0x01\n\t") /* x22 */ + __ASM_CFI(".cfi_escape 0x10,0x17,0x03,0x8f,0xc0,0x01\n\t") /* x23 */ + __ASM_CFI(".cfi_escape 0x10,0x18,0x03,0x8f,0xc8,0x01\n\t") /* x24 */ + __ASM_CFI(".cfi_escape 0x10,0x19,0x03,0x8f,0xd0,0x01\n\t") /* x25 */ + __ASM_CFI(".cfi_escape 0x10,0x1a,0x03,0x8f,0xd8,0x01\n\t") /* x26 */ + __ASM_CFI(".cfi_escape 0x10,0x1b,0x03,0x8f,0xe0,0x01\n\t") /* x27 */ + __ASM_CFI(".cfi_escape 0x10,0x1c,0x03,0x8f,0xe8,0x01\n\t") /* x28 */ + __ASM_CFI(".cfi_escape 0x10,0x1d,0x03,0x8f,0xf0,0x01\n\t") /* x29 */ + __ASM_CFI(".cfi_escape 0x10,0x1e,0x03,0x8f,0xf8,0x01\n\t") /* x30 */ + __ASM_CFI(".cfi_escape 0x10,0x48,0x03,0x8f,0x90,0x03\n\t") /* d8 */ + __ASM_CFI(".cfi_escape 0x10,0x49,0x03,0x8f,0x98,0x03\n\t") /* d9 */ + __ASM_CFI(".cfi_escape 0x10,0x4a,0x03,0x8f,0xa0,0x03\n\t") /* d10 */ + __ASM_CFI(".cfi_escape 0x10,0x4b,0x03,0x8f,0xa8,0x03\n\t") /* d11 */ + __ASM_CFI(".cfi_escape 0x10,0x4c,0x03,0x8f,0xb0,0x03\n\t") /* d12 */ + __ASM_CFI(".cfi_escape 0x10,0x4d,0x03,0x8f,0xb8,0x03\n\t") /* d13 */ + __ASM_CFI(".cfi_escape 0x10,0x4e,0x03,0x8f,0xc0,0x03\n\t") /* d14 */ + __ASM_CFI(".cfi_escape 0x10,0x4f,0x03,0x8f,0xc8,0x03\n\t") /* d15 */ + __ASM_SEH(".seh_context\n\t") + __ASM_SEH(".seh_endprologue\n\t") + "ldp x1, x2, [x29, #0x10]\n\t" + "ldr x18, [x29, #0x20]\n\t" "mov x0, x2\n\t" - "mov x18, x3\n\t" "blr x1\n\t" + "mov sp, x29\n\t" __ASM_CFI(".cfi_restore_state\n\t") - "ldp x29, x30, [sp], #32\n\t" + "ldp x29, x30, [sp], #48\n\t" __ASM_CFI(".cfi_restore 30\n\t") __ASM_CFI(".cfi_restore 29\n\t") __ASM_CFI(".cfi_def_cfa 31, 0\n\t") @@ -1207,6 +1225,9 @@ void WINAPI RtlUnwind( void *frame, void *target_ip, EXCEPTION_RECORD *rec, void __ASM_STDCALL_FUNC( RtlRaiseException, 4, "sub sp, sp, #0x3b0\n\t" /* 0x390 (context) + 0x20 */ "stp x29, x30, [sp]\n\t" + __ASM_SEH(".seh_stackalloc 0x3b0\n\t") + __ASM_SEH(".seh_save_fplr 0\n\t") + __ASM_SEH(".seh_endprologue\n\t") __ASM_CFI(".cfi_def_cfa x29, 944\n\t") __ASM_CFI(".cfi_offset x30, -936\n\t") __ASM_CFI(".cfi_offset x29, -944\n\t") diff --git a/include/wine/asm.h b/include/wine/asm.h index 592f638306..788e26126c 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -40,7 +40,15 @@ #endif #ifdef __SEH__ -# define __ASM_SEH(str) str +# if defined(__aarch64__) && defined(__clang_major__) && (__clang_major__ < 12 || defined(__apple_build_version__)) + /* Clang got support for aarch64 SEH assembly directives in Clang 12, + * before that, only .seh_startproc/.seh_endproc but nothing else was + * supported. Support for it doesn't exist in any Apple branded version + * of Clang yet. */ +# define __ASM_SEH(str) +# else +# define __ASM_SEH(str) str +# endif #else # define __ASM_SEH(str) #endif -- 2.17.1

1 0

[PATCH 5/5] d3dx10/tests: Add tests for D3DX10GetImageInfoFromFileW().
by Ziqing Hui Sept. 4, 2020

Sept. 4, 2020

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)

1 0

[PATCH 4/5] d3dx10/tests: Introduce check_image_info().
by Ziqing Hui Sept. 4, 2020

Sept. 4, 2020

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 60 +++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 28 deletions(-)

1 0

[PATCH 3/5] d3dx10/tests: Introduce create_file() and delete_file().
by Ziqing Hui Sept. 4, 2020

Sept. 4, 2020

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 72 ++++++++++++++++++++++------------- 1 file changed, 46 insertions(+), 26 deletions(-)

1 0

[PATCH] winex11.drv: Don't wait for the desktop thread to store clipping window.
by Rémi Bernon Sept. 3, 2020

Sept. 3, 2020

The messages are in flight, the state will be updated eventually in the order they are received by the desktop thread, we shouldn't have to wait. If the clipping window gets overwritten, it will also receive a message from the desktop thread, which is sent asynchronously already. Call of Duty: WWII calls ClipCursor in a loop on startup while the foreground thread is stalled and the messages sometimes pile up. The recursive message processing that SendMessageW induces can then cause stack overflows. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49643 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winex11.drv/mouse.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index eb5e6a6c0d4..68e24a320af 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -445,7 +445,7 @@ static BOOL grab_clipping_window( const RECT *clip ) if (!data->clip_hwnd) sync_window_cursor( clip_window ); InterlockedExchangePointer( (void **)&cursor_window, msg_hwnd ); data->clip_hwnd = msg_hwnd; - SendMessageW( GetDesktopWindow(), WM_X11DRV_CLIP_CURSOR, 0, (LPARAM)msg_hwnd ); + SendNotifyMessageW( GetDesktopWindow(), WM_X11DRV_CLIP_CURSOR, 0, (LPARAM)msg_hwnd ); return TRUE; } @@ -465,7 +465,7 @@ void ungrab_clipping_window(void) XUnmapWindow( display, clip_window ); if (clipping_cursor) XUngrabPointer( display, CurrentTime ); clipping_cursor = FALSE; - SendMessageW( GetDesktopWindow(), WM_X11DRV_CLIP_CURSOR, 0, 0 ); + SendNotifyMessageW( GetDesktopWindow(), WM_X11DRV_CLIP_CURSOR, 0, 0 ); } /*********************************************************************** -- 2.28.0

1 0

[PATCH vkd3d 1/5] include: Document vkd3d-shader swizzles.
by Zebediah Figura Sept. 3, 2020

Sept. 3, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- include/vkd3d_shader.h | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index cc5615c9..527d5789 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -961,7 +961,7 @@ struct vkd3d_shader_signature unsigned int element_count; }; -/* swizzle bits fields: wwzzyyxx */ +/** Possible values for a single component of a vkd3d-shader swizzle. */ enum vkd3d_shader_swizzle_component { VKD3D_SHADER_SWIZZLE_X = 0x0, @@ -972,17 +972,33 @@ enum vkd3d_shader_swizzle_component VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_SWIZZLE_COMPONENT), }; +/** + * A mask selecting one component from a vkd3d-shader swizzle. The component has + * type \ref vkd3d_shader_swizzle_component. + */ #define VKD3D_SHADER_SWIZZLE_MASK (0xffu) +/** The offset, in bits, of the nth parameter of a vkd3d-shader swizzle. */ #define VKD3D_SHADER_SWIZZLE_SHIFT(idx) (8u * (idx)) +/** + * A helper macro which returns a vkd3d-shader swizzle with the given + * components. The components are specified as the suffixes to members of + * \ref vkd3d_shader_swizzle_component. For example, the swizzle ".xwyy" can be + * represented as: + * \code + * VKD3D_SHADER_SWIZZLE(X, W, Y, Y) + * \endcode + */ #define VKD3D_SHADER_SWIZZLE(x, y, z, w) \ vkd3d_shader_create_swizzle(VKD3D_SHADER_SWIZZLE_ ## x, \ VKD3D_SHADER_SWIZZLE_ ## y, \ VKD3D_SHADER_SWIZZLE_ ## z, \ VKD3D_SHADER_SWIZZLE_ ## w) +/** The identity swizzle, ie ".xyzw". */ #define VKD3D_SHADER_NO_SWIZZLE VKD3D_SHADER_SWIZZLE(X, Y, Z, W) +/** Programmatically build a vkd3d-shader swizzle with the given components. */ static inline uint32_t vkd3d_shader_create_swizzle(enum vkd3d_shader_swizzle_component x, enum vkd3d_shader_swizzle_component y, enum vkd3d_shader_swizzle_component z, enum vkd3d_shader_swizzle_component w) -- 2.28.0

3 10

[PATCH v3 2/2] ntdll/tests: Raise an exception to check that EFlags.AC is cleared.
by Jefferson Carpenter Sept. 3, 2020

Sept. 3, 2020

1 0

[PATCH 2/2] ntdll/tests: Raise an exception to check that EFlags.AC
by Jefferson Carpenter Sept. 3, 2020

Sept. 3, 2020

2 1