February 2021 - Wine-Devel - list.winehq.org

[PATCH] msado15: Fix copy-paste typos in IDispatch methods.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/msado15/command.c | 2 +- dlls/msado15/stream.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msado15/command.c b/dlls/msado15/command.c index aff12f6a108..8c8ec79a58e 100644 --- a/dlls/msado15/command.c +++ b/dlls/msado15/command.c @@ -133,7 +133,7 @@ static HRESULT WINAPI command_Invoke( _Command *iface, DISPID member, REFIID rii TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", command, member, debugstr_guid(riid), lcid, flags, params, result, excep_info, arg_err ); - hr = get_typeinfo(Connection_tid, &typeinfo); + hr = get_typeinfo(Command_tid, &typeinfo); if(SUCCEEDED(hr)) { hr = ITypeInfo_Invoke(typeinfo, &command->Command_iface, member, flags, params, diff --git a/dlls/msado15/stream.c b/dlls/msado15/stream.c index 961aed6a739..424ba722a26 100644 --- a/dlls/msado15/stream.c +++ b/dlls/msado15/stream.c @@ -113,7 +113,7 @@ static HRESULT WINAPI stream_GetIDsOfNames( _Stream *iface, REFIID riid, LPOLEST TRACE( "%p, %s, %p, %u, %u, %p\n", stream, debugstr_guid(riid), names, count, lcid, dispid ); - hr = get_typeinfo(Connection_tid, &typeinfo); + hr = get_typeinfo(Stream_tid, &typeinfo); if(SUCCEEDED(hr)) { hr = ITypeInfo_GetIDsOfNames(typeinfo, names, count, dispid); @@ -133,7 +133,7 @@ static HRESULT WINAPI stream_Invoke( _Stream *iface, DISPID member, REFIID riid, TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", stream, member, debugstr_guid(riid), lcid, flags, params, result, excep_info, arg_err ); - hr = get_typeinfo(Connection_tid, &typeinfo); + hr = get_typeinfo(Stream_tid, &typeinfo); if(SUCCEEDED(hr)) { hr = ITypeInfo_Invoke(typeinfo, &stream->Stream_iface, member, flags, params, -- 2.30.1

Feb. 27, 2021

Re: [PATCH 1/1] msvcrt: Null widechar pointer when wcsrtombs_l() is successful.

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=86189 Your paranoid android. === debiant2 (32 bit report) === msvcrt: string.c:2183: Test failed: pwstr = 00000000 (wszSimple = 00466F50) === debiant2 (32 bit Chinese:China report) === msvcrt: string.c:2183: Test failed: pwstr = 00000000 (wszSimple = 00466F50) === debiant2 (32 bit WoW report) === msvcrt: string.c:2183: Test failed: pwstr = 00000000 (wszSimple = 00466F50) === debiant2 (64 bit WoW report) === msvcrt: string.c:2183: Test failed: pwstr = 00000000 (wszSimple = 00466F50)

Feb. 27, 2021

[PATCH 1/1] msvcrt: Null widechar pointer when wcsrtombs_l() is successful.

by Bernhard Kölbl

Mimic how the function works on Windows. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50698 Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/msvcrt/wcs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 9a30e0fe149..7c8f50891cc 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -610,6 +610,7 @@ static size_t wcsrtombs_l(char *mbstr, const wchar_t **wcstr, mbstr[i] = (*wcstr)[i]; if(!(*wcstr)[i]) break; } + *wcstr = NULL; return i; } @@ -645,8 +646,9 @@ static size_t wcsrtombs_l(char *mbstr, const wchar_t **wcstr, if(tmp < count) { mbstr[tmp] = '\0'; - *wcstr = NULL; } + + *wcstr = NULL; return tmp; } -- 2.30.1

Feb. 27, 2021

Re: [PATCH V3 2/2] msxml3: Implement SAXContentHandler methods for DOMDocument mxwriter output.

by Nikolay Sivov

On Sat, Feb 27, 2021 at 11:30 AM Jefferson Carpenter < jeffersoncarpenter2(a)gmail.com> wrote: > I guess another possibility would be to write two vtables: one for > IStream and String, and another for IDOMDocumnt, and assign the vtable > during put_output. > > (I'm half joking, it would run properly but swapping out vtables is not > something I've ever heard of) > Yes, that would be better. You don't need to swap actual interface vtables, you'll need to come up with a set of functions that would be called internally from SAX methods, and then you can have multiple implementations of those. > > thanks, > Jefferson > > On 2/26/2021 10:49 PM, Jefferson Carpenter wrote: > > nsivov, > > > > Regarding implementation in mxwriter, do you think it would be all right > > to add switch statements and use an enum for output type like I did > > here, or do you think another way would be more suitable? > > > > Thanks, > > Jefferson >

Feb. 27, 2021

Re: [PATCH vkd3d v2 2/6] vkd3d-shader: Return a vkd3d_string_buffer from hlsl_modifiers_to_string().

by Matteo Bruni

On Fri, Feb 26, 2021 at 7:45 PM Zebediah Figura <zfigura(a)codeweavers.com> wrote: > > Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> > --- > libs/vkd3d-shader/hlsl.c | 54 +++++++++++++++++++++------------------- > libs/vkd3d-shader/hlsl.h | 3 ++- > libs/vkd3d-shader/hlsl.y | 16 ++++++------ > 3 files changed, 38 insertions(+), 35 deletions(-) > > diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c > index e2a77707..dbc03a80 100644 > --- a/libs/vkd3d-shader/hlsl.c > +++ b/libs/vkd3d-shader/hlsl.c > @@ -730,46 +730,45 @@ const char *debug_hlsl_type(const struct hlsl_type *type) > return ret; > } > > -char *hlsl_modifiers_to_string(unsigned int modifiers) > +struct vkd3d_string_buffer *hlsl_modifiers_to_string(struct vkd3d_string_buffer_list *string_buffers, > + unsigned int modifiers) It looks like this is the old version of the patch, not rebased on top of patch 1/6 v2.

Feb. 27, 2021

Re: [PATCH V3 2/2] msxml3: Implement SAXContentHandler methods for DOMDocument mxwriter output.

by Jefferson Carpenter

I guess another possibility would be to write two vtables: one for IStream and String, and another for IDOMDocumnt, and assign the vtable during put_output. (I'm half joking, it would run properly but swapping out vtables is not something I've ever heard of) thanks, Jefferson On 2/26/2021 10:49 PM, Jefferson Carpenter wrote: > nsivov, > > Regarding implementation in mxwriter, do you think it would be all right > to add switch statements and use an enum for output type like I did > here, or do you think another way would be more suitable? > > Thanks, > Jefferson

Feb. 27, 2021

Wine staging 6.3 release

by Alistair Leslie-Hughes

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 6.3 (694 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * imagehlp: Implement parts of BindImageEx to make freezing Python scripts work. * widl: Support WinRT parameterized interface type. * ntdll: Implement SystemExtendedHandleInformation in NtQuerySystemInformation. * ntdll: Set object type for System(Extended)HandleInformation in NtQuerySystemInformation. * user32: Send a WM_ACTIVATE message after restoring a minimized window. * widl: Support WinRT delegate type. * widl: Support WinRT parameterized delegate type. * widl: Compute signatures for parameterized types. * widl: Compute uuids for parameterized types. * xactengine3_7: Implement IXACT3Engine PrepareWave * widl: Never use the namespace ABI prefix for global types. * widl: Precompute qualified type names, and use them for C++ interfaces. * widl: Define the C type name as an alias for the C++ qualified name. * shell32: Implement process elevation using runas verb. Added: * [40613] Multiple applications require UAC implementation to run installer/app as a normal user instead of administrator (WhatsApp Desktop, Smartflix, Squirrel Installers, OneDrive) * [39262] DiscordSetup.exe (.NET 4.5.2 app): Squirrell installer requires being run as unelevated process ('explorer.exe' should run unelevated by default with Vista+ setting) Updated: * packager-DllMain * nvcuda-CUDA_Support * api-ms-win-Stub_DLLs * nvapi-Stub_DLL * ntdll-Junction_Points Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

Feb. 27, 2021

Re: [PATCH V3 2/2] msxml3: Implement SAXContentHandler methods for DOMDocument mxwriter output.

by Jefferson Carpenter

nsivov, Regarding implementation in mxwriter, do you think it would be all right to add switch statements and use an enum for output type like I did here, or do you think another way would be more suitable? Thanks, Jefferson

Feb. 26, 2021

[PATCH vkd3d v2 6/6] vkd3d-shader: Factor out hlsl_new_loop().

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 11 +++++++++++ libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.y | 4 +--- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 5864b4af..da37adaa 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -510,6 +510,17 @@ struct hlsl_ir_jump *hlsl_new_jump(enum hlsl_ir_jump_type type, struct vkd3d_sha return jump; } +struct hlsl_ir_loop *hlsl_new_loop(struct vkd3d_shader_location loc) +{ + struct hlsl_ir_loop *loop; + + if (!(loop = vkd3d_calloc(1, sizeof(*loop)))) + return NULL; + init_node(&loop->node, HLSL_IR_LOOP, NULL, loc); + list_init(&loop->body); + return loop; +} + bool hlsl_type_is_void(const struct hlsl_type *type) { return type->type == HLSL_CLASS_OBJECT && type->base_type == HLSL_TYPE_VOID; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 2f9d5526..d8d146e6 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -530,6 +530,7 @@ struct hlsl_ir_function_decl *hlsl_new_func_decl(struct hlsl_ctx *ctx, struct hl struct list *parameters, const char *semantic, struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; struct hlsl_ir_if *hlsl_new_if(struct hlsl_ir_node *condition, struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; struct hlsl_ir_jump *hlsl_new_jump(enum hlsl_ir_jump_type type, struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; +struct hlsl_ir_loop *hlsl_new_loop(struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; struct hlsl_ir_assignment *hlsl_new_simple_assignment(struct hlsl_ir_var *lhs, struct hlsl_ir_node *rhs) DECLSPEC_HIDDEN; struct hlsl_type *hlsl_new_struct_type(struct hlsl_ctx *ctx, const char *name, struct list *fields) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 45b97420..1341de13 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -403,11 +403,9 @@ static struct list *create_loop(enum loop_type type, struct list *init, struct l if (init) list_move_head(list, init); - if (!(loop = vkd3d_calloc(1, sizeof(*loop)))) + if (!(loop = hlsl_new_loop(loc))) goto oom; - init_node(&loop->node, HLSL_IR_LOOP, NULL, loc); list_add_tail(list, &loop->node.entry); - list_init(&loop->body); if (!append_conditional_break(cond)) goto oom; -- 2.30.1

Feb. 26, 2021

[PATCH vkd3d v2 5/6] vkd3d-shader: Factor out hlsl_new_jump().

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 11 +++++++++++ libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.y | 8 ++------ 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index ceeec334..5864b4af 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -499,6 +499,17 @@ struct hlsl_ir_swizzle *hlsl_new_swizzle(struct hlsl_ctx *ctx, DWORD s, unsigned return swizzle; } +struct hlsl_ir_jump *hlsl_new_jump(enum hlsl_ir_jump_type type, struct vkd3d_shader_location loc) +{ + struct hlsl_ir_jump *jump; + + if (!(jump = vkd3d_malloc(sizeof(*jump)))) + return NULL; + init_node(&jump->node, HLSL_IR_JUMP, NULL, loc); + jump->type = type; + return jump; +} + bool hlsl_type_is_void(const struct hlsl_type *type) { return type->type == HLSL_CLASS_OBJECT && type->base_type == HLSL_TYPE_VOID; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 2b0b8a97..2f9d5526 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -529,6 +529,7 @@ struct hlsl_ir_expr *hlsl_new_cast(struct hlsl_ir_node *node, struct hlsl_type * struct hlsl_ir_function_decl *hlsl_new_func_decl(struct hlsl_ctx *ctx, struct hlsl_type *return_type, struct list *parameters, const char *semantic, struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; struct hlsl_ir_if *hlsl_new_if(struct hlsl_ir_node *condition, struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; +struct hlsl_ir_jump *hlsl_new_jump(enum hlsl_ir_jump_type type, struct vkd3d_shader_location loc) DECLSPEC_HIDDEN; struct hlsl_ir_assignment *hlsl_new_simple_assignment(struct hlsl_ir_var *lhs, struct hlsl_ir_node *rhs) DECLSPEC_HIDDEN; struct hlsl_type *hlsl_new_struct_type(struct hlsl_ctx *ctx, const char *name, struct list *fields) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 5ad50b0c..45b97420 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -377,10 +377,8 @@ static bool append_conditional_break(struct list *cond_list) return false; list_add_tail(cond_list, &iff->node.entry); - if (!(jump = vkd3d_malloc(sizeof(*jump)))) + if (!(jump = hlsl_new_jump(HLSL_IR_JUMP_BREAK, condition->loc))) return false; - init_node(&jump->node, HLSL_IR_JUMP, NULL, condition->loc); - jump->type = HLSL_IR_JUMP_BREAK; list_add_head(&iff->then_instrs, &jump->node.entry); return true; } @@ -563,10 +561,8 @@ static struct hlsl_ir_jump *add_return(struct hlsl_ctx *ctx, struct list *instrs return NULL; } - if (!(jump = vkd3d_malloc(sizeof(*jump)))) + if (!(jump = hlsl_new_jump(HLSL_IR_JUMP_RETURN, loc))) return NULL; - init_node(&jump->node, HLSL_IR_JUMP, NULL, loc); - jump->type = HLSL_IR_JUMP_RETURN; list_add_tail(instrs, &jump->node.entry); return jump; -- 2.30.1

Feb. 26, 2021