January 2022 - Wine-Devel - list.winehq.org

[PATCH v2 1/5] include/windows.foundation.collections.idl: Add IVector<T> interface.

by Bernhard Kölbl

Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- v2: Added missing parameters and attributes. This and more incoming patches are part of a bigger branch: https://github.com/besentv/wine-patches/tree/main/windows.media.speech --- include/windows.foundation.collections.idl | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/include/windows.foundation.collections.idl b/include/windows.foundation.collections.idl index 876e15336a2..a2d2d75ec4f 100644 --- a/include/windows.foundation.collections.idl +++ b/include/windows.foundation.collections.idl @@ -118,6 +118,26 @@ cpp_quote("#endif") HRESULT IndexOf([in, optional] T element, [out] UINT32 *index, [out, retval] BOOLEAN *value); HRESULT GetMany([in] UINT32 start_index, [in] UINT32 items_size, [out] T *items, [out, retval] UINT32 *value); } + + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(913337e9-11a1-4345-a3a2-4e7f956e222d) + ] + interface IVector<T> : IInspectable + { + HRESULT GetAt([in, optional] UINT32 index, [out, retval] T *value); + [propget] HRESULT Size([out, retval] UINT32 *value); + HRESULT GetView([out, retval] IVectorView<T> **value); + HRESULT IndexOf([in, optional] T element, [out] UINT32 *index, [out, retval] BOOLEAN *value); + HRESULT SetAt([in] UINT32 index, [in, optional] T value); + HRESULT InsertAt([in] UINT32 index, [in, optional] T value); + HRESULT RemoveAt([in] UINT32 index); + HRESULT Append([in, optional] T value); + HRESULT RemoveAtEnd(); + HRESULT Clear(); + HRESULT GetMany([in] UINT32 start_index, [in] UINT32 items_size, [out] T *items, [out, retval] UINT32 *value); + HRESULT ReplaceAll([in] UINT32 count, [in] T *items); + } } #endif } -- 2.34.1

Jan. 31, 2022

Re: [PATCH v2 2/2] msxml3: Make utf-8 the default encoding.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>

Jan. 31, 2022

Re: [PATCH v2 1/2] msxml3/tests: Add test saving XML with non-english characters.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>

Jan. 31, 2022

Re: [PATCH 09/24] mfplat/tests: Avoid "misleading indentation" warnings.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>

Jan. 31, 2022

Re: [PATCH 2/5] user32/tests: Stop relying on pre-existing windows.

by Rémi Bernon

On 1/31/22 11:50, Marvin wrote: > Hi, > > While running your changed tests, I think I found new failures. > Being a bot and all I'm not very good at pattern recognition, so I might be > wrong, but could you please double-check? > > Full results can be found at: > https://testbot.winehq.org/JobDetails.pl?Key=106582 > > Your paranoid android. > > > === w1064v1809 (32 bit report) === > > user32: > win.c:9977: Test failed: WindowFromPoint returned 000301D4, expected 000202CE > win.c:9984: Test failed: WindowFromPoint returned 000301D4, expected 000302B6 > win.c:10068: Test failed: WindowFromPoint returned 000301D4, expected 000C0074 > win.c:10076: Test failed: WindowFromPoint returned 000301D4, expected 000302B6 > win.c:10005: Test failed: transparent window didn't get WM_NCHITTEST message > win.c:10006: Test failed: button under static window didn't get WM_LBUTTONUP > > === w10pro64_ja (64 bit report) === > > user32: > win.c:10578: Test failed: pos = 00c800c8 > win.c:10582: Test failed: pos = 00c800c8 > win.c:10586: Test failed: pos = 00c800c8 > > === w10pro64_zh_CN (64 bit report) === > > user32: > win.c:10578: Test failed: pos = 00c800c8 > win.c:10582: Test failed: pos = 00c800c8 > win.c:10586: Test failed: pos = 00c800c8 > > === debian11 (32 bit report) === > > user32: > win.c:10772: Test failed: Expected foreground window 00FF00C8, got 008400B4 > win.c:10774: Test failed: GetActiveWindow() = 00000000 > win.c:10774: Test failed: GetFocus() = 00000000 > win.c:10775: Test failed: Received WM_ACTIVATEAPP(1), did not expect it. > win.c:10776: Test failed: Received WM_ACTIVATEAPP(0), did not expect it. > win.c:10784: Test failed: Expected foreground window 00FF00C8, got 00000000 > win.c:10786: Test failed: GetActiveWindow() = 00000000 > win.c:10786: Test failed: GetFocus() = 00000000 > win.c:10794: Test failed: Received WM_ACTIVATEAPP(1), did not expect it. I think the patches help with some other failures such as pre-existing windows (like the firewall window problem after ntoskrnl.exe runs), but they apparently also add some flakiness. I'll resend without this one for now. -- Rémi Bernon <rbernon(a)codeweavers.com>

Jan. 31, 2022

Re: [PATCH 5/5] user32/tests: Add some possible broken results on Win7.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=106586 Your paranoid android. === w10pro64_ja (64 bit report) === user32: win.c:10681: Test failed: pos = 00c800c8 win.c:10685: Test failed: pos = 00c800c8 win.c:10689: Test failed: pos = 00c800c8 === w10pro64_zh_CN (64 bit report) === user32: win.c:10681: Test failed: pos = 00c800c8 win.c:10685: Test failed: pos = 00c800c8 win.c:10689: Test failed: pos = 00c800c8

Jan. 31, 2022

Re: [PATCH 4/5] user32/tests: Add proper tests for SetActiveWindow(0).

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=106585 Your paranoid android. === w1064_2qxl (64 bit report) === user32: win.c:4403: Test failed: hwnd 0000000000390256/0000000000390256 message 0200 win.c:4406: Test failed: hwnd 0000000000390256/0000000000390256 message 0201 === w10pro64_ja (64 bit report) === user32: win.c:10672: Test failed: pos = 00c800c8 win.c:10676: Test failed: pos = 00c800c8 win.c:10680: Test failed: pos = 00c800c8 === w10pro64_zh_CN (64 bit report) === user32: win.c:10672: Test failed: pos = 00c800c8 win.c:10676: Test failed: pos = 00c800c8 win.c:10680: Test failed: pos = 00c800c8 === debian11 (32 bit Chinese:China report) === user32: win.c:10849: Test failed: Expected foreground window 00F700D0, got 0087005E

Jan. 31, 2022

Re: [PATCH 3/5] user32/tests: Ignore messages for UserAdapterWindowClass windows.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=106584 Your paranoid android. === w10pro64_ja (64 bit report) === user32: win.c:10583: Test failed: pos = 00c800c8 win.c:10587: Test failed: pos = 00c800c8 win.c:10591: Test failed: pos = 00c800c8 === w10pro64_zh_CN (64 bit report) === user32: win.c:10583: Test failed: pos = 00c800c8 win.c:10587: Test failed: pos = 00c800c8 win.c:10591: Test failed: pos = 00c800c8

Jan. 31, 2022

[PATCH vkd3d 3/3] vkd3d-shader: Use LONG type with InterlockedIncrement.

by Alexandre Julliard

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 47fe3d60d27f..ae0662b83cac 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -308,7 +308,7 @@ void set_u32(struct vkd3d_bytecode_buffer *buffer, size_t offset, uint32_t value static void vkd3d_shader_dump_blob(const char *path, const char *prefix, const char *suffix, const void *data, size_t size) { - static int shader_id = 0; + static LONG shader_id = 0; char filename[1024]; unsigned int id; FILE *f; -- 2.34.1

Jan. 31, 2022

[PATCH vkd3d 2/3] vkd3d-shader: Fix some DWORD/unsigned int pointer mismatches.

by Alexandre Julliard

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 9476765fb7af..be24a74963dd 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1155,7 +1155,7 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in struct hlsl_type *lhs_type = lhs->data_type; struct hlsl_ir_store *store; struct hlsl_ir_expr *copy; - DWORD writemask = 0; + unsigned int writemask = 0; if (assign_op == ASSIGN_OP_SUB) { @@ -2359,7 +2359,7 @@ struct_declaration: var_modifiers struct_spec variables_def_optional ';' { struct hlsl_type *type; - DWORD modifiers = $1; + unsigned int modifiers = $1; if (!$3) { @@ -2449,7 +2449,7 @@ field: var_modifiers field_type variables_def ';' { struct hlsl_type *type; - DWORD modifiers = $1; + unsigned int modifiers = $1; if (!(type = apply_type_modifiers(ctx, $2, &modifiers, @1))) YYABORT; @@ -2619,7 +2619,7 @@ parameter: input_mods var_modifiers type any_identifier colon_attribute { struct hlsl_type *type; - DWORD modifiers = $2; + unsigned int modifiers = $2; if (!(type = apply_type_modifiers(ctx, $3, &modifiers, @2))) YYABORT; @@ -2858,7 +2858,7 @@ declaration: var_modifiers type variables_def ';' { struct hlsl_type *type; - DWORD modifiers = $1; + unsigned int modifiers = $1; if (!(type = apply_type_modifiers(ctx, $2, &modifiers, @1))) YYABORT; -- 2.34.1

Jan. 31, 2022