February 2021 - Wine-Commits

Zebediah Figura : vkd3d-shader: Replace BOOL with bool.
by Alexandre Julliard Feb. 4, 2021

Feb. 4, 2021

Module: vkd3d Branch: master Commit: c2c092b1431d5eea09c0116938dd4ce59b6f7ec4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c2c092b1431d5eea09c0116… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 2 16:11:17 2021 -0600 vkd3d-shader: Replace BOOL with bool. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 164 +++++++++++++++++++++++------------------------ libs/vkd3d-shader/hlsl.h | 18 +++--- libs/vkd3d-shader/hlsl.l | 2 +- libs/vkd3d-shader/hlsl.y | 154 ++++++++++++++++++++++---------------------- 4 files changed, 169 insertions(+), 169 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=c2c092b1431d5eea09c…

1 0

Zebediah Figura : vkd3d-shader: Implement global resource memory barriers.
by Alexandre Julliard Feb. 4, 2021

Feb. 4, 2021

Module: vkd3d Branch: master Commit: 16aceacc0c14244b405b53582a6acb57e8cf574f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=16aceacc0c14244b405b535… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 3 21:09:17 2021 -0600 vkd3d-shader: Implement global resource memory barriers. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 7 +++++++ libs/vkd3d-shader/trace.c | 5 +++++ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 3 files changed, 13 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index a997ec6..106c298 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -8866,6 +8866,13 @@ static void vkd3d_dxbc_compiler_emit_sync(struct vkd3d_dxbc_compiler *compiler, flags &= ~VKD3DSSF_THREAD_GROUP; } + if (flags & VKD3DSSF_GLOBAL_UAV) + { + memory_scope = SpvScopeDevice; + memory_semantics |= SpvMemorySemanticsImageMemoryMask; + flags &= ~VKD3DSSF_GLOBAL_UAV; + } + if (flags) { FIXME("Unhandled sync flags %#x.\n", flags); diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index cab5b80..40b3e31 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -368,6 +368,11 @@ static void shader_dump_global_flags(struct vkd3d_string_buffer *buffer, DWORD g static void shader_dump_sync_flags(struct vkd3d_string_buffer *buffer, DWORD sync_flags) { + if (sync_flags & VKD3DSSF_GLOBAL_UAV) + { + shader_addline(buffer, "_uglobal"); + sync_flags &= ~VKD3DSSF_GLOBAL_UAV; + } if (sync_flags & VKD3DSSF_GROUP_SHARED_MEMORY) { shader_addline(buffer, "_g"); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 52196ca..01ad087 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -475,6 +475,7 @@ enum vkd3d_shader_sync_flags { VKD3DSSF_THREAD_GROUP = 0x1, VKD3DSSF_GROUP_SHARED_MEMORY = 0x2, + VKD3DSSF_GLOBAL_UAV = 0x8, }; enum vkd3d_shader_uav_flags

1 0

Zebediah Figura : vkd3d-shader: Rename debug_dump_*() to dump_*().
by Alexandre Julliard Feb. 4, 2021

Feb. 4, 2021

Module: vkd3d Branch: master Commit: db1765c283be92e795e6dc3552c3b21b8cb5d830 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=db1765c283be92e795e6dc3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 2 16:11:15 2021 -0600 vkd3d-shader: Rename debug_dump_*() to dump_*(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.c | 67 ++++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 20b4fa7..ddc690e 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -748,20 +748,20 @@ const char *hlsl_node_type_to_string(enum hlsl_ir_node_type type) return names[type]; } -static void debug_dump_instr(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_node *instr); +static void dump_instr(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_node *instr); -static void debug_dump_instr_list(struct vkd3d_string_buffer *buffer, const struct list *list) +static void dump_instr_list(struct vkd3d_string_buffer *buffer, const struct list *list) { struct hlsl_ir_node *instr; LIST_FOR_EACH_ENTRY(instr, list, struct hlsl_ir_node, entry) { - debug_dump_instr(buffer, instr); + dump_instr(buffer, instr); vkd3d_string_buffer_printf(buffer, "\n"); } } -static void debug_dump_src(struct vkd3d_string_buffer *buffer, const struct hlsl_src *src) +static void dump_src(struct vkd3d_string_buffer *buffer, const struct hlsl_src *src) { if (src->node->index) vkd3d_string_buffer_printf(buffer, "@%u", src->node->index); @@ -769,7 +769,7 @@ static void debug_dump_src(struct vkd3d_string_buffer *buffer, const struct hlsl vkd3d_string_buffer_printf(buffer, "%p", src->node); } -static void debug_dump_ir_var(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_var *var) +static void dump_ir_var(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_var *var) { if (var->modifiers) vkd3d_string_buffer_printf(buffer, "%s ", hlsl_debug_modifiers(var->modifiers)); @@ -778,7 +778,7 @@ static void debug_dump_ir_var(struct vkd3d_string_buffer *buffer, const struct h vkd3d_string_buffer_printf(buffer, " : %s", var->semantic); } -static void debug_dump_deref(struct vkd3d_string_buffer *buffer, const struct hlsl_deref *deref) +static void dump_deref(struct vkd3d_string_buffer *buffer, const struct hlsl_deref *deref) { if (deref->offset.node) /* Print the variable's type for convenience. */ @@ -788,7 +788,7 @@ static void debug_dump_deref(struct vkd3d_string_buffer *buffer, const struct hl if (deref->offset.node) { vkd3d_string_buffer_printf(buffer, "["); - debug_dump_src(buffer, &deref->offset); + dump_src(buffer, &deref->offset); vkd3d_string_buffer_printf(buffer, "]"); } } @@ -812,18 +812,18 @@ static const char *debug_writemask(DWORD writemask) return vkd3d_dbg_sprintf(".%s", string); } -static void debug_dump_ir_assignment(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_assignment *assign) +static void dump_ir_assignment(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_assignment *assign) { vkd3d_string_buffer_printf(buffer, "= ("); - debug_dump_deref(buffer, &assign->lhs); + dump_deref(buffer, &assign->lhs); if (assign->writemask != VKD3DSP_WRITEMASK_ALL) vkd3d_string_buffer_printf(buffer, "%s", debug_writemask(assign->writemask)); vkd3d_string_buffer_printf(buffer, " "); - debug_dump_src(buffer, &assign->rhs); + dump_src(buffer, &assign->rhs); vkd3d_string_buffer_printf(buffer, ")"); } -static void debug_dump_ir_constant(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_constant *constant) +static void dump_ir_constant(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_constant *constant) { struct hlsl_type *type = constant->node.data_type; unsigned int x; @@ -939,32 +939,31 @@ static const char *debug_expr_op(const struct hlsl_ir_expr *expr) return op_names[expr->op]; } -/* Dumps the expression in a prefix "operator (operands)" form */ -static void debug_dump_ir_expr(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_expr *expr) +static void dump_ir_expr(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_expr *expr) { unsigned int i; vkd3d_string_buffer_printf(buffer, "%s (", debug_expr_op(expr)); for (i = 0; i < 3 && expr->operands[i].node; ++i) { - debug_dump_src(buffer, &expr->operands[i]); + dump_src(buffer, &expr->operands[i]); vkd3d_string_buffer_printf(buffer, " "); } vkd3d_string_buffer_printf(buffer, ")"); } -static void debug_dump_ir_if(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_if *if_node) +static void dump_ir_if(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_if *if_node) { vkd3d_string_buffer_printf(buffer, "if ("); - debug_dump_src(buffer, &if_node->condition); + dump_src(buffer, &if_node->condition); vkd3d_string_buffer_printf(buffer, ")\n{\n"); - debug_dump_instr_list(buffer, &if_node->then_instrs); + dump_instr_list(buffer, &if_node->then_instrs); vkd3d_string_buffer_printf(buffer, "}\nelse\n{\n"); - debug_dump_instr_list(buffer, &if_node->else_instrs); + dump_instr_list(buffer, &if_node->else_instrs); vkd3d_string_buffer_printf(buffer, "}\n"); } -static void debug_dump_ir_jump(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_jump *jump) +static void dump_ir_jump(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_jump *jump) { switch (jump->type) { @@ -986,18 +985,18 @@ static void debug_dump_ir_jump(struct vkd3d_string_buffer *buffer, const struct } } -static void debug_dump_ir_loop(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_loop *loop) +static void dump_ir_loop(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_loop *loop) { vkd3d_string_buffer_printf(buffer, "for (;;)\n{\n"); - debug_dump_instr_list(buffer, &loop->body); + dump_instr_list(buffer, &loop->body); vkd3d_string_buffer_printf(buffer, "}\n"); } -static void debug_dump_ir_swizzle(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_swizzle *swizzle) +static void dump_ir_swizzle(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_swizzle *swizzle) { unsigned int i; - debug_dump_src(buffer, &swizzle->val); + dump_src(buffer, &swizzle->val); vkd3d_string_buffer_printf(buffer, "."); if (swizzle->val.node->data_type->dimy > 1) { @@ -1013,7 +1012,7 @@ static void debug_dump_ir_swizzle(struct vkd3d_string_buffer *buffer, const stru } } -static void debug_dump_instr(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_node *instr) +static void dump_instr(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_node *instr) { if (instr->index) vkd3d_string_buffer_printf(buffer, "%4u: ", instr->index); @@ -1025,35 +1024,35 @@ static void debug_dump_instr(struct vkd3d_string_buffer *buffer, const struct hl switch (instr->type) { case HLSL_IR_ASSIGNMENT: - debug_dump_ir_assignment(buffer, hlsl_ir_assignment(instr)); + dump_ir_assignment(buffer, hlsl_ir_assignment(instr)); break; case HLSL_IR_CONSTANT: - debug_dump_ir_constant(buffer, hlsl_ir_constant(instr)); + dump_ir_constant(buffer, hlsl_ir_constant(instr)); break; case HLSL_IR_EXPR: - debug_dump_ir_expr(buffer, hlsl_ir_expr(instr)); + dump_ir_expr(buffer, hlsl_ir_expr(instr)); break; case HLSL_IR_IF: - debug_dump_ir_if(buffer, hlsl_ir_if(instr)); + dump_ir_if(buffer, hlsl_ir_if(instr)); break; case HLSL_IR_JUMP: - debug_dump_ir_jump(buffer, hlsl_ir_jump(instr)); + dump_ir_jump(buffer, hlsl_ir_jump(instr)); break; case HLSL_IR_LOAD: - debug_dump_deref(buffer, &hlsl_ir_load(instr)->src); + dump_deref(buffer, &hlsl_ir_load(instr)->src); break; case HLSL_IR_LOOP: - debug_dump_ir_loop(buffer, hlsl_ir_loop(instr)); + dump_ir_loop(buffer, hlsl_ir_loop(instr)); break; case HLSL_IR_SWIZZLE: - debug_dump_ir_swizzle(buffer, hlsl_ir_swizzle(instr)); + dump_ir_swizzle(buffer, hlsl_ir_swizzle(instr)); break; default: @@ -1071,13 +1070,13 @@ void hlsl_dump_function(const struct hlsl_ir_function_decl *func) vkd3d_string_buffer_printf(&buffer, "Function parameters:\n"); LIST_FOR_EACH_ENTRY(param, func->parameters, struct hlsl_ir_var, param_entry) { - debug_dump_ir_var(&buffer, param); + dump_ir_var(&buffer, param); vkd3d_string_buffer_printf(&buffer, "\n"); } if (func->semantic) vkd3d_string_buffer_printf(&buffer, "Function semantic: %s\n", func->semantic); if (func->body) - debug_dump_instr_list(&buffer, func->body); + dump_instr_list(&buffer, func->body); vkd3d_string_buffer_trace(&buffer); vkd3d_string_buffer_cleanup(&buffer);

1 0

Francois Gouget : testbot/WineTest: Always work around explorer's 'fresh WINEPREFIX' bug.
by Alexandre Julliard Feb. 4, 2021

Feb. 4, 2021

Module: tools Branch: master Commit: b89f7fb79cf65d38b9df1f978fca987a8537717f URL: https://source.winehq.org/git/tools.git/?a=commit;h=b89f7fb79cf65d38b9df1f9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 3 18:58:58 2021 +0100 testbot/WineTest: Always work around explorer's 'fresh WINEPREFIX' bug. WineTest.pl assumed that the wineprefix had been set up by WineReconfig so that pre-initializing it to work around explorer's 'fresh WINEPREFIX' bug (41713) was not necessary. But that's no longer true so make sure to always fully initialize the wineprefix before starting any test. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48671 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/WineTest.pl | 41 +++++++++++++++-------------------------- 1 file changed, 15 insertions(+), 26 deletions(-) diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 84ba1cb..dd41fcf 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -63,6 +63,18 @@ sub SetupTest($$) my $BaseName = SetupWineEnvironment($Mission); InfoMsg "\nRunning $Test in the $BaseName Wine\n"; InfoMsg "LANG=$ENV{LANG}\n"; + + if (!-d $ENV{WINEPREFIX}) + { + # FIXME Wait for the wineserver as a workaround for bug 41713. + my $ErrMessage = CreateWinePrefix($Mission, "wait"); + if (defined $ErrMessage) + { + LogMsg "Could not create the $BaseName wineprefix: $ErrMessage\n"; + return 0; + } + } + return $BaseName; } @@ -70,10 +82,9 @@ sub WineTestSuite($$$$) { my ($Mission, $NoSubmit, $BaseTag, $Args) = @_; - my $BaseName = SetupTest("WineTest", $Mission); - # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. + my $BaseName = SetupTest("WineTest", $Mission); my $Tag = SanitizeTag("$BaseTag-$BaseName"); RunWine($Mission, "winetest.exe", "-c -o '$DataDir/$BaseName.report' -t $Tag ". ShArgv2Cmd(@$Args)); @@ -128,20 +139,9 @@ sub TestPatch($$) return 1 if (!@TestList); } - my $BaseName = SetupTest("the tests", $Mission); - if (!-d $ENV{WINEPREFIX}) - { - # FIXME Wait for the wineserver as a workaround for bug 41713. - my $ErrMessage = CreateWinePrefix($Mission, "wait"); - if (defined $ErrMessage) - { - LogMsg "Could not create the $BaseName wineprefix: $ErrMessage\n"; - return 0; - } - } - # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. + my $BaseName = SetupTest("the tests", $Mission); RunWine($Mission, "winetest.exe", "-c -o '$DataDir/$BaseName.report' -t do.not.submit ". join(" ", @TestList)); @@ -177,18 +177,7 @@ sub TestExe($$$) my ($Mission, $FileName, $Args) = @_; my $BaseName = SetupTest("the tests", $Mission); - if (!-d $ENV{WINEPREFIX}) - { - # FIXME Wait for the wineserver as a workaround for bug 41713. - my $ErrMessage = CreateWinePrefix($Mission, "wait"); - if (defined $ErrMessage) - { - LogMsg "Could not create the $BaseName wineprefix: $ErrMessage\n"; - return 0; - } - } - - my $TestDir = GetTestDir($Mission); + my $TestDir = GetTestDir($Mission); # needs $WINEPREFIX if ($TestDir eq ".") { $FileName = "$DataDir/staging/$FileName";

1 0

Francois Gouget : patches: Fix the install instructions.
by Alexandre Julliard Feb. 4, 2021

Feb. 4, 2021

Module: tools Branch: master Commit: bb7a2682dcee8c02f1ec6dade240d865b88f9336 URL: https://source.winehq.org/git/tools.git/?a=commit;h=bb7a2682dcee8c02f1ec6da… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 3 02:08:36 2021 +0100 patches: Fix the install instructions. The webpatches directory belongs to the TestBot so grab it from there. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/doc/vhost_source.conf | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/patches/doc/vhost_source.conf b/patches/doc/vhost_source.conf index 01c6dee..ce2334c 100644 --- a/patches/doc/vhost_source.conf +++ b/patches/doc/vhost_source.conf @@ -5,7 +5,14 @@ ServerName source.example.com ServerAdmin winehq(a)example.com + # Contains the emails: patches and replies from developers and the TestBot + Alias /patches/data /home/winehq/sites/testbot/var/webpatches + <Directory /home/winehq/opt/source> Require all granted </Directory> + + <Directory /home/winehq/tools/testbot/web/webpatches> + Require all granted + </Directory> </VirtualHost>

1 0

Francois Gouget : testbot: Fix the webpatches setup instructions.
by Alexandre Julliard Feb. 4, 2021

Feb. 4, 2021

Module: tools Branch: master Commit: 8fb57085db757d676acce6392bcc109da6e890e5 URL: https://source.winehq.org/git/tools.git/?a=commit;h=8fb57085db757d676acce63… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 3 02:08:30 2021 +0100 testbot: Fix the webpatches setup instructions. The webpatches directory should be created in the TestBot directory. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/doc/INSTALL.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 0dd5710..7565d6b 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -79,9 +79,8 @@ Setup for Wine's patches site: using the WineTestBot web interface and that the results are sane. You may also want to run with $PatchFromEMailOverride set for a while to spot any issue under load. -- In $HOME/tools/testbot/var, set up the webpatches symbolic link to point to - where the patches website stores its patches and test results. Typically: - ln -s $HOME/patches $HOME/tools/testbot/var/webpatches +- In $HOME/tools/testbot/var, create the webpatches directory: + mkdir $HOME/tools/testbot/var/webpatches - Use a cron job to run WinePatchesWebSubmit.pl periodically. For instance: */5 * * * * $HOME/tools/testbot/bin/WinePatchesWebSubmit.pl

1 0

Piotr Caban : msvcr120: Don't export thiscall functions on arm.
by Alexandre Julliard Feb. 3, 2021

Feb. 3, 2021

Module: wine Branch: master Commit: 9aa8ba68ddcd71687354db8036ca1bda9fe8ab0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9aa8ba68ddcd71687354db80… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 3 16:22:52 2021 +0100 msvcr120: Don't export thiscall functions on arm. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr120/msvcr120.spec | 24 ++++++++++++------------ dlls/msvcr120_app/msvcr120_app.spec | 24 ++++++++++++------------ 2 files changed, 24 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9aa8ba68ddcd71687354…

1 0

Nikolay Sivov : mfplat/allocator: Add support for MF_SA_BUFFERS_PER_SAMPLE.
by Alexandre Julliard Feb. 3, 2021

Feb. 3, 2021

Module: wine Branch: master Commit: d2a30424ef64fd817a5cbfdac6943830c59489fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2a30424ef64fd817a5cbfda… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 3 14:28:02 2021 +0300 mfplat/allocator: Add support for MF_SA_BUFFERS_PER_SAMPLE. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/sample.c | 4 +++- dlls/mfplat/tests/mfplat.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/sample.c b/dlls/mfplat/sample.c index 8a0281abf6c..acdc8836cc8 100644 --- a/dlls/mfplat/sample.c +++ b/dlls/mfplat/sample.c @@ -1355,12 +1355,15 @@ static HRESULT sample_allocator_initialize(struct sample_allocator *allocator, u { allocator->attributes = attributes; IMFAttributes_AddRef(allocator->attributes); + + IMFAttributes_GetUINT32(attributes, &MF_SA_BUFFERS_PER_SAMPLE, &allocator->frame_desc.buffer_count); } allocator->frame_desc.d3d9_format = subtype.Data1; allocator->frame_desc.dxgi_format = MFMapDX9FormatToDXGIFormat(allocator->frame_desc.d3d9_format); allocator->frame_desc.width = frame_size >> 32; allocator->frame_desc.height = frame_size; + allocator->frame_desc.buffer_count = max(1, allocator->frame_desc.buffer_count); if (FAILED(hr = sample_allocator_get_surface_service(allocator, &service))) return hr; @@ -1673,7 +1676,6 @@ HRESULT WINAPI MFCreateVideoSampleAllocatorEx(REFIID riid, void **obj) object->IMFVideoSampleAllocatorCallback_iface.lpVtbl = &sample_allocator_callback_vtbl; object->tracking_callback.lpVtbl = &sample_allocator_tracking_callback_vtbl; object->refcount = 1; - object->frame_desc.buffer_count = 1; list_init(&object->used_samples); list_init(&object->free_samples); InitializeCriticalSection(&object->cs); diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index ed862ab9bdb..deb9e78efba 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6439,6 +6439,9 @@ todo_wine hr = IMFAttributes_SetUINT32(attributes, &MF_SA_BUFFERS_PER_SAMPLE, 2); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFVideoSampleAllocatorEx_AllocateSample(allocatorex, &sample); + ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + EXPECT_REF(attributes, 1); hr = IMFVideoSampleAllocatorEx_InitializeSampleAllocatorEx(allocatorex, 0, 0, attributes, video_type); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -6454,7 +6457,6 @@ todo_wine hr = IMFSample_GetBufferCount(sample, &buffer_count); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine ok(buffer_count == 2, "Unexpected buffer count %u.\n", buffer_count); hr = IMFVideoSampleAllocatorEx_AllocateSample(allocatorex, &sample2);

1 0

Piotr Caban : concrt140: Add arm exports.
by Alexandre Julliard Feb. 3, 2021

Feb. 3, 2021

Module: wine Branch: master Commit: 2201ca08fb03d069fa2ccf46773c150a6f7988bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=2201ca08fb03d069fa2ccf46… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 3 16:23:03 2021 +0100 concrt140: Add arm exports. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 259 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 233 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2201ca08fb03d069fa2c…

1 0

Nikolay Sivov : mfplat/allocator: Keep a reference to initialization attributes.
by Alexandre Julliard Feb. 3, 2021

Feb. 3, 2021

Module: wine Branch: master Commit: d100d92f93ab607781c4254719e5614dc25847ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=d100d92f93ab607781c42547… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 3 14:28:01 2021 +0300 mfplat/allocator: Keep a reference to initialization attributes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/sample.c | 9 ++++++++- dlls/mfplat/tests/mfplat.c | 1 - 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/sample.c b/dlls/mfplat/sample.c index 266bb6f0726..8a0281abf6c 100644 --- a/dlls/mfplat/sample.c +++ b/dlls/mfplat/sample.c @@ -75,6 +75,8 @@ struct sample_allocator unsigned int buffer_count; } frame_desc; + IMFAttributes *attributes; + unsigned int free_sample_count; unsigned int cold_sample_count; struct list free_samples; @@ -1129,6 +1131,8 @@ static ULONG WINAPI sample_allocator_Release(IMFVideoSampleAllocatorEx *iface) IDirect3DDeviceManager9_Release(allocator->d3d9_device_manager); if (allocator->dxgi_device_manager) IMFDXGIDeviceManager_Release(allocator->dxgi_device_manager); + if (allocator->attributes) + IMFAttributes_Release(allocator->attributes); sample_allocator_release_samples(allocator); DeleteCriticalSection(&allocator->cs); heap_free(allocator); @@ -1348,7 +1352,10 @@ static HRESULT sample_allocator_initialize(struct sample_allocator *allocator, u max_sample_count = max(1, max_sample_count); if (attributes) - FIXME("Initialization attributes ignored.\n"); + { + allocator->attributes = attributes; + IMFAttributes_AddRef(allocator->attributes); + } allocator->frame_desc.d3d9_format = subtype.Data1; allocator->frame_desc.dxgi_format = MFMapDX9FormatToDXGIFormat(allocator->frame_desc.d3d9_format); diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 3d6e553ce35..ed862ab9bdb 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6442,7 +6442,6 @@ todo_wine EXPECT_REF(attributes, 1); hr = IMFVideoSampleAllocatorEx_InitializeSampleAllocatorEx(allocatorex, 0, 0, attributes, video_type); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine EXPECT_REF(attributes, 2); count = 0;

1 0