- Wine-Devel - list.winehq.org

[PATCH 1/5] d2d1/tests: Add more test xml.
by Ziqing Hui June 7, 2022

June 7, 2022

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index bc662b4f8ae..3e385b2b05f 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -170,6 +170,29 @@ L"<?xml version='1.0'?> \ </Effect> \ "; +static const WCHAR *effect_xml_wrong_type = +L"<?xml version='1.0'?> \ + <Effect> \ + <Property name='DisplayName' type='string' value='TestEffect'/> \ + <Property name='Author' type='uint32' value='32'/> \ + <Property name='Category' type='string' value='Test'/> \ + <Property name='Description' type='string' value='Test effect.'/> \ + <Inputs/> \ + </Effect> \ +"; + +static const WCHAR *effect_xml_duplicate_property = +L"<?xml version='1.0'?> \ + <Effect> \ + <Property name='DisplayName' type='string'/> \ + <Property name='Author' type='string'/> \ + <Property name='Category' type='string'/> \ + <Property name='Description' type='string'/> \ + <Property name='Description' type='string'/> \ + <Inputs/> \ + </Effect> \ +"; + static const DWORD test_vs[] = { #if 0 @@ -10615,6 +10638,8 @@ static void test_effect_register(BOOL d3d11) {effect_xml_without_category, E_INVALIDARG}, {effect_xml_without_description, E_INVALIDARG}, {effect_xml_without_type, E_INVALIDARG}, + {effect_xml_wrong_type, E_INVALIDARG}, + {effect_xml_duplicate_property, E_INVALIDARG}, }; const D2D1_PROPERTY_BINDING binding[] = -- 2.25.1

3 17

[PATCH 0/7] MR191: wineandroid: PE conversion preparation
by Jacek Caban (＠jacek) June 6, 2022

June 6, 2022

This MR removes Android audio driver. It was considered not worth the effort. If we ever need it, we may restore that from git history (maybe on top of future audio drivers interface unification). For the rest of the rest of driver, the conversion is rather straightforward, so I went ahead and just did it. The tricky part is that I could only build test it... Luckily, most of changes are sed or copy&paste. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/191

6 12

Re: [PATCH v2 0/7] MR191: wineandroid: PE conversion preparation - approved
by Alexandre Julliard (＠julliard) June 6, 2022

June 6, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/191

1 0

Re: [PATCH v3 0/6] MR173: preparation for sharing code in d3dx10/d3dx11 - approved
by Alexandre Julliard (＠julliard) June 6, 2022

June 6, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/173

1 0

Re: [PATCH v2 0/1] MR185: d2d1: Use d3d11 constants for constant buffer description. - approved
by Alexandre Julliard (＠julliard) June 6, 2022

June 6, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/185

1 0

Re: [PATCH v3 0/4] MR183: kernelbase: Implement VirtualAlloc2FromApp(). - approved
by Alexandre Julliard (＠julliard) June 6, 2022

June 6, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/183

1 0

Re: [PATCH v2 0/1] MR186: secur32/schannel: Avoid use-after-free in AcquireClientCredentials() (Coverity). - approved
by Alexandre Julliard (＠julliard) June 6, 2022

June 6, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/186

1 0

Re: [PATCH v2 0/1] MR188: wow64: Fix NtQueryDirectoryObject wrapper. - approved
by Alexandre Julliard (＠julliard) June 6, 2022

June 6, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/188

1 0

Re: [PATCH v2 0/1] MR189: windows.gaming.input: Fix a leak on error path (Coverity). - approved
by Alexandre Julliard (＠julliard) June 6, 2022

June 6, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/189

1 0

[PATCH] wined3d: Parse the eval_centroid opcode.
by Zebediah Figura June 6, 2022

June 6, 2022

This fixes rendering of trees and other objects in SnowRunner with the Vulkan renderer. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 5c45df8e6fa..dcdee479e17 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5080,6 +5080,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_ENDREP */ shader_hw_endrep, /* WINED3DSIH_ENDSWITCH */ NULL, /* WINED3DSIH_EQ */ NULL, + /* WINED3DSIH_EVAL_CENTROID */ NULL, /* WINED3DSIH_EVAL_SAMPLE_INDEX */ NULL, /* WINED3DSIH_EXP */ shader_hw_scalar_op, /* WINED3DSIH_EXPP */ shader_hw_scalar_op, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0c9822a95aa..40b5442ed04 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -11323,6 +11323,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ENDREP */ shader_glsl_end, /* WINED3DSIH_ENDSWITCH */ shader_glsl_end, /* WINED3DSIH_EQ */ shader_glsl_relop, + /* WINED3DSIH_EVAL_CENTROID */ NULL, /* WINED3DSIH_EVAL_SAMPLE_INDEX */ shader_glsl_interpolate, /* WINED3DSIH_EXP */ shader_glsl_scalar_op, /* WINED3DSIH_EXPP */ shader_glsl_expp, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index c02f82b4d7b..c2e77021bb3 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -133,6 +133,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_ENDREP */ "endrep", /* WINED3DSIH_ENDSWITCH */ "endswitch", /* WINED3DSIH_EQ */ "eq", + /* WINED3DSIH_EVAL_CENTROID */ "eval_centroid", /* WINED3DSIH_EVAL_SAMPLE_INDEX */ "eval_sample_index", /* WINED3DSIH_EXP */ "exp", /* WINED3DSIH_EXPP */ "expp", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 266b54d1d15..e60eb9b2fc4 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -305,6 +305,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_IMM_ATOMIC_UMIN = 0xbd, WINED3D_SM5_OP_SYNC = 0xbe, WINED3D_SM5_OP_EVAL_SAMPLE_INDEX = 0xcc, + WINED3D_SM5_OP_EVAL_CENTROID = 0xcd, WINED3D_SM5_OP_DCL_GS_INSTANCES = 0xce, }; @@ -1124,6 +1125,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_SYNC, WINED3DSIH_SYNC, "", "", shader_sm5_read_sync}, {WINED3D_SM5_OP_EVAL_SAMPLE_INDEX, WINED3DSIH_EVAL_SAMPLE_INDEX, "f", "fi"}, + {WINED3D_SM5_OP_EVAL_CENTROID, WINED3DSIH_EVAL_CENTROID, "f", "f"}, {WINED3D_SM5_OP_DCL_GS_INSTANCES, WINED3DSIH_DCL_GS_INSTANCES, "", "", shader_sm4_read_declaration_count}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e2c8c3804db..affef24d353 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -917,6 +917,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_ENDREP, WINED3DSIH_ENDSWITCH, WINED3DSIH_EQ, + WINED3DSIH_EVAL_CENTROID, WINED3DSIH_EVAL_SAMPLE_INDEX, WINED3DSIH_EXP, WINED3DSIH_EXPP, -- 2.36.1

1 0