March 2020 - Wine-Commits - list.winehq.org

Zebediah Figura : d3dcompiler: Rename HLSL_MODIFIER_{IN, OUT} to HLSL_STORAGE_{IN, OUT}.
by Alexandre Julliard March 19, 2020

March 19, 2020

Module: wine Branch: master Commit: a82ec54862fb092df32acd1d9690af4784c31624 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a82ec54862fb092df32acd1d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 15 16:25:09 2020 -0500 d3dcompiler: Rename HLSL_MODIFIER_{IN, OUT} to HLSL_STORAGE_{IN, OUT}. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/d3dcompiler_private.h | 4 ++-- dlls/d3dcompiler_43/hlsl.y | 8 ++++---- dlls/d3dcompiler_43/utils.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 830434c9ff..957fc24e20 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -734,8 +734,8 @@ struct hlsl_ir_node #define HLSL_MODIFIER_CONST 0x00000100 #define HLSL_MODIFIER_ROW_MAJOR 0x00000200 #define HLSL_MODIFIER_COLUMN_MAJOR 0x00000400 -#define HLSL_MODIFIER_IN 0x00000800 -#define HLSL_MODIFIER_OUT 0x00001000 +#define HLSL_STORAGE_IN 0x00000800 +#define HLSL_STORAGE_OUT 0x00001000 #define HLSL_TYPE_MODIFIERS_MASK (HLSL_MODIFIER_PRECISE | HLSL_STORAGE_VOLATILE | \ HLSL_MODIFIER_CONST | HLSL_MODIFIER_ROW_MAJOR | \ diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 6a5dddf5d4..fca4ebc529 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1489,7 +1489,7 @@ parameter: input_mods var_modifiers type any_identifier colon_att if (!(type = apply_type_modifiers($3, &modifiers, get_location(&@2)))) YYABORT; - $$.modifiers = $1 ? $1 : HLSL_MODIFIER_IN; + $$.modifiers = $1 ? $1 : HLSL_STORAGE_IN; $$.modifiers |= modifiers; $$.type = type; $$.name = $4; @@ -1514,15 +1514,15 @@ input_mods: /* Empty */ input_mod: KW_IN { - $$ = HLSL_MODIFIER_IN; + $$ = HLSL_STORAGE_IN; } | KW_OUT { - $$ = HLSL_MODIFIER_OUT; + $$ = HLSL_STORAGE_OUT; } | KW_INOUT { - $$ = HLSL_MODIFIER_IN | HLSL_MODIFIER_OUT; + $$ = HLSL_STORAGE_IN | HLSL_STORAGE_OUT; } type: base_type diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 29b35c3d7e..3e8e229c8c 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1808,11 +1808,11 @@ const char *debug_modifiers(DWORD modifiers) strcat(string, " row_major"); /* 10 */ if (modifiers & HLSL_MODIFIER_COLUMN_MAJOR) strcat(string, " column_major"); /* 13 */ - if ((modifiers & (HLSL_MODIFIER_IN | HLSL_MODIFIER_OUT)) == (HLSL_MODIFIER_IN | HLSL_MODIFIER_OUT)) + if ((modifiers & (HLSL_STORAGE_IN | HLSL_STORAGE_OUT)) == (HLSL_STORAGE_IN | HLSL_STORAGE_OUT)) strcat(string, " inout"); /* 6 */ - else if (modifiers & HLSL_MODIFIER_IN) + else if (modifiers & HLSL_STORAGE_IN) strcat(string, " in"); /* 3 */ - else if (modifiers & HLSL_MODIFIER_OUT) + else if (modifiers & HLSL_STORAGE_OUT) strcat(string, " out"); /* 4 */ return wine_dbg_sprintf("%s", string[0] ? string + 1 : "");

1 0

Zebediah Figura : d3dcompiler: Ensure that the lhs of an assignment is reducible to a variable.
by Alexandre Julliard March 19, 2020

March 19, 2020

Module: wine Branch: master Commit: aaa625217b202dc0a22d67e63e941b027146a456 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aaa625217b202dc0a22d67e6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 15 16:25:13 2020 -0500 d3dcompiler: Ensure that the lhs of an assignment is reducible to a variable. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/utils.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 921ef7c2c7..6e9bb593e0 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1456,6 +1456,29 @@ static unsigned int invert_swizzle(unsigned int *swizzle, unsigned int writemask return new_writemask; } +static BOOL validate_lhs_deref(const struct hlsl_ir_node *lhs) +{ + struct hlsl_ir_deref *deref; + + if (lhs->type != HLSL_IR_DEREF) + { + hlsl_report_message(lhs->loc, HLSL_LEVEL_ERROR, "invalid lvalue"); + return FALSE; + } + + deref = deref_from_node(lhs); + + if (deref->src.type == HLSL_IR_DEREF_VAR) + return TRUE; + if (deref->src.type == HLSL_IR_DEREF_ARRAY) + return validate_lhs_deref(deref->src.v.array.array); + if (deref->src.type == HLSL_IR_DEREF_RECORD) + return validate_lhs_deref(deref->src.v.record.record); + + assert(0); + return FALSE; +} + struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *lhs, enum parse_assign_op assign_op, struct hlsl_ir_node *rhs) { @@ -1509,6 +1532,12 @@ struct hlsl_ir_node *make_assignment(struct hlsl_ir_node *lhs, enum parse_assign lhs = lhs_inner; } + if (!validate_lhs_deref(lhs)) + { + d3dcompiler_free(assign); + return NULL; + } + TRACE("Creating proper assignment expression.\n"); if (writemask == BWRITERSP_WRITEMASK_ALL) type = lhs->data_type;

1 0

Dmitry Timoshkov : activeds: ADsOpenObject should return E_FAIL by default.
by Alexandre Julliard March 19, 2020

March 19, 2020

Module: wine Branch: master Commit: 2a1841f5cfe936c69a8bfd9aca202f4e3e6a894a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a1841f5cfe936c69a8bfd9a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 13 11:53:14 2020 +0800 activeds: ADsOpenObject should return E_FAIL by default. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/activeds/activeds_main.c | 6 +++--- dlls/adsldp/tests/Makefile.in | 2 +- dlls/adsldp/tests/ldap.c | 6 ++++++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/activeds/activeds_main.c b/dlls/activeds/activeds_main.c index c997cab912..564acab93e 100644 --- a/dlls/activeds/activeds_main.c +++ b/dlls/activeds/activeds_main.c @@ -127,10 +127,10 @@ HRESULT WINAPI ADsOpenObject(LPCWSTR path, LPCWSTR user, LPCWSTR password, DWORD if (!path || !riid || !obj) return E_INVALIDARG; - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\ADs\\Providers", 0, KEY_READ, &hkey)) - return E_ADS_BAD_PATHNAME; + hr = E_FAIL; - hr = E_ADS_BAD_PATHNAME; + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\ADs\\Providers", 0, KEY_READ, &hkey)) + return hr; for (;;) { diff --git a/dlls/adsldp/tests/Makefile.in b/dlls/adsldp/tests/Makefile.in index 52141139d5..26b937aa68 100644 --- a/dlls/adsldp/tests/Makefile.in +++ b/dlls/adsldp/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = adsldp.dll -IMPORTS = ole32 oleaut32 secur32 advapi32 uuid +IMPORTS = ole32 oleaut32 secur32 advapi32 activeds uuid C_SRCS = \ ldap.c \ diff --git a/dlls/adsldp/tests/ldap.c b/dlls/adsldp/tests/ldap.c index 6f8c00aa89..e0e562e8bf 100644 --- a/dlls/adsldp/tests/ldap.c +++ b/dlls/adsldp/tests/ldap.c @@ -28,6 +28,7 @@ #include "objbase.h" #include "iads.h" #include "adserr.h" +#include "adshlp.h" #include "wine/test.h" @@ -98,6 +99,11 @@ static void test_LDAP(void) if (hr == S_OK) IDispatch_Release(disp); + hr = ADsOpenObject(path, user, password, test[i].flags, &IID_IADs, (void **)&ads); + ok(hr == test[i].hr || hr == test[i].hr_ads_get, "%d: got %#x, expected %#x\n", i, hr, test[i].hr); + if (hr == S_OK) + IADs_Release(ads); + SysFreeString(path); SysFreeString(user); SysFreeString(password);

1 0

Zebediah Figura : d3dcompiler/tests: Add more tests for swizzles.
by Alexandre Julliard March 19, 2020

March 19, 2020

Module: wine Branch: master Commit: 18b8393ff9a409656de52ef24d0717bab0e44712 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18b8393ff9a409656de52ef2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 15 16:25:12 2020 -0500 d3dcompiler/tests: Add more tests for swizzles. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 167 +++++++++++++++++++++------------- 1 file changed, 106 insertions(+), 61 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index 3edee34d8d..b96ab16679 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -294,78 +294,123 @@ static void test_swizzle(void) ID3DXConstantTable *constants; ID3D10Blob *ps_code = NULL; IDirect3DDevice9 *device; + unsigned int i; struct vec4 v; HRESULT hr; - static const char ps_source[] = - "uniform float4 color;\n" - "float4 main() : COLOR\n" - "{\n" - " float4 ret = color;\n" - " ret.gb = ret.ra;\n" - " ret.ra = float2(0.0101, 0.0404);\n" - " return ret;\n" - "}"; - - static const char ps_multiple_lhs_source[] = - "float4 main() : COLOR\n" - "{\n" - " float4 ret = float4(0.1, 0.2, 0.3, 0.4);\n" - " ret.wyz.yx = float2(0.5, 0.6).yx;\n" - " return ret;\n" - "}"; - - static const char ps_multiple_rhs_source[] = - "float4 main() : COLOR\n" - "{\n" - " float4 ret = float4(0.1, 0.2, 0.3, 0.4).ywxz.zyyz;\n" - " return ret;\n" - "}"; - - if (!init_test_context(&test_context)) - return; - device = test_context.device; - - todo_wine ps_code = compile_shader(ps_source, "ps_2_0"); - if (ps_code) + static const struct { - hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(ps_code), &constants); - ok(hr == D3D_OK, "Failed to get constant table, hr %#x.\n", hr); - hr = ID3DXConstantTable_SetVector(constants, device, "color", &color); - ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); - ID3DXConstantTable_Release(constants); - - draw_quad(device, ps_code); - - v = get_color_vec4(device, 0, 0); - ok(compare_vec4(&v, 0.0101f, 0.0303f, 0.0202f, 0.0404f, 0), - "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); - - ID3D10Blob_Release(ps_code); + const char *source; + struct vec4 color; } - - todo_wine ps_code = compile_shader(ps_multiple_lhs_source, "ps_2_0"); - if (ps_code) + tests[] = { - draw_quad(device, ps_code); - - v = get_color_vec4(device, 0, 0); - ok(compare_vec4(&v, 0.1f, 0.6f, 0.3f, 0.5f, 0), - "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + { + "uniform float4 color;\n" + "float4 main() : COLOR\n" + "{\n" + " float4 ret = color;\n" + " ret.gb = ret.ra;\n" + " ret.ra = float2(0.0101, 0.0404);\n" + " return ret;\n" + "}", + {0.0101f, 0.0303f, 0.0202f, 0.0404f} + }, + { + "float4 main() : COLOR\n" + "{\n" + " float4 ret = float4(0.1, 0.2, 0.3, 0.4);\n" + " ret.wyz.yx = float2(0.5, 0.6).yx;\n" + " return ret;\n" + "}", + {0.1f, 0.6f, 0.3f, 0.5f} + }, + { + "float4 main() : COLOR\n" + "{\n" + " float4 ret;\n" + " ret.zwyx = float4(0.1, 0.2, 0.3, 0.4);\n" + " return ret;\n" + "}", + {0.4f, 0.3f, 0.1f, 0.2f} + }, + { + "float4 main() : COLOR\n" + "{\n" + " float4 ret;\n" + " ret.yw.y = 0.1;\n" + " ret.xzy.yz.y.x = 0.2;\n" + " ret.yzwx.yzwx.wz.y = 0.3;\n" + " ret.zxy.xyz.zxy.xy.y = 0.4;\n" + " return ret;\n" + "}", + {0.3f, 0.2f, 0.4f, 0.1f} + }, + { + "float4 main() : COLOR\n" + "{\n" + " float4 ret;\n" + " ret.yxz.yx = float2(0.1, 0.2);\n" + " ret.w.x = 0.3;\n" + " ret.wzyx.zyx.yx.x = 0.4;\n" + " return ret;\n" + "}", + {0.1f, 0.2f, 0.4f, 0.3f} + }, + { + "float4 main() : COLOR\n" + "{\n" + " float4 ret = float4(0.1, 0.2, 0.3, 0.4).ywxz.zyyz;\n" + " return ret;\n" + "}", + {0.1f, 0.4f, 0.4f, 0.1f} + }, + { + "float4 main() : COLOR\n" + "{\n" + " float4 ret = float4(0.1, 0.2, 0.3, 0.4);\n" + " ret.yxwz = ret;\n" + " ret = ret.wyzx;\n" + " return ret;\n" + "}", + {0.3f, 0.1f, 0.4f, 0.2f} + }, + { + "float4 main() : COLOR\n" + "{\n" + " float4 ret;\n" + " ret.xyzw.xyzw = float4(0.1, 0.2, 0.3, 0.4);\n" + " return ret;\n" + "}", + {0.1f, 0.2f, 0.3f, 0.4f} + }, + }; - ID3D10Blob_Release(ps_code); - } + if (!init_test_context(&test_context)) + return; + device = test_context.device; - todo_wine ps_code = compile_shader(ps_multiple_rhs_source, "ps_2_0"); - if (ps_code) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { - draw_quad(device, ps_code); + todo_wine ps_code = compile_shader(tests[i].source, "ps_2_0"); + if (ps_code) + { + if (i == 0) + { + hr = pD3DXGetShaderConstantTable(ID3D10Blob_GetBufferPointer(ps_code), &constants); + ok(hr == D3D_OK, "Failed to get constant table, hr %#x.\n", hr); + hr = ID3DXConstantTable_SetVector(constants, device, "color", &color); + ok(hr == D3D_OK, "Failed to set constant, hr %#x.\n", hr); + ID3DXConstantTable_Release(constants); + } + draw_quad(device, ps_code); - v = get_color_vec4(device, 0, 0); - ok(compare_vec4(&v, 0.1f, 0.4f, 0.4f, 0.1f, 0), - "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + v = get_color_vec4(device, 0, 0); + ok(compare_vec4(&v, tests[i].color.x, tests[i].color.y, tests[i].color.z, tests[i].color.w, 0), + "Test %u: Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", i, v.x, v.y, v.z, v.w); - ID3D10Blob_Release(ps_code); + ID3D10Blob_Release(ps_code); + } } release_test_context(&test_context);

1 0

Rémi Bernon : tools: Only update protocol version if something changed.
by Alexandre Julliard March 19, 2020

March 19, 2020

Module: wine Branch: master Commit: f181d5ce82470639459555cd59a076963861a61d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f181d5ce82470639459555cd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Mar 19 12:28:37 2020 +0100 tools: Only update protocol version if something changed. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 4 ++++ tools/make_requests | 17 +++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index af4507b5d1..ba70d13a39 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -6706,6 +6706,10 @@ union generic_reply struct resume_process_reply resume_process_reply; }; +/* ### protocol_version begin ### */ + #define SERVER_PROTOCOL_VERSION 596 +/* ### protocol_version end ### */ + #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/tools/make_requests b/tools/make_requests index 4e39bb65a9..a30c9be905 100755 --- a/tools/make_requests +++ b/tools/make_requests @@ -406,10 +406,23 @@ print SERVER_PROT " struct reply_header reply_header;\n"; foreach my $req (@requests) { print SERVER_PROT " struct ${req}_reply ${req}_reply;\n"; } print SERVER_PROT "};\n\n"; -printf SERVER_PROT "#define SERVER_PROTOCOL_VERSION %d\n\n", $protocol + 1; +print SERVER_PROT "/* ### protocol_version begin ### */\n\n"; +printf SERVER_PROT "#define SERVER_PROTOCOL_VERSION %d\n\n", $protocol; +print SERVER_PROT "/* ### protocol_version end ### */\n\n"; print SERVER_PROT "#endif /* __WINE_WINE_SERVER_PROTOCOL_H */\n"; close SERVER_PROT; -update_file( "include/wine/server_protocol.h" ); + +if (update_file( "include/wine/server_protocol.h" )) +{ + my @version_lines = (); + + push @version_lines, sprintf( "#define SERVER_PROTOCOL_VERSION %d\n", $protocol + 1 ); + + replace_in_file( "include/wine/server_protocol.h", + "### protocol_version begin ###", + "### protocol_version end ###", + @version_lines ); +} ### Output the dumping function tables

1 0

Zebediah Figura : kernel32/tests: Add some tests for mounted folders.
by Alexandre Julliard March 19, 2020

March 19, 2020

Module: wine Branch: master Commit: 5885c70b18f7293e33537a04581363faa887016b URL: https://source.winehq.org/git/wine.git/?a=commit;h=5885c70b18f7293e33537a04… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 15 16:56:52 2020 -0500 kernel32/tests: Add some tests for mounted folders. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/volume.c | 231 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 231 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5885c70b18f7293e3353…

1 0

Vijay Kiran Kamuju : include: Add missing effect related defines and enums in dsound.h.
by Alexandre Julliard March 19, 2020

March 19, 2020

Module: wine Branch: master Commit: 8f1ec07e48c8bed452a533a10f49d8c3e8f5440c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f1ec07e48c8bed452a533a1… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sun Mar 15 18:27:00 2020 +0100 include: Add missing effect related defines and enums in dsound.h. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dsound.h | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/include/dsound.h b/include/dsound.h index b4a2509e89..d397e2315c 100644 --- a/include/dsound.h +++ b/include/dsound.h @@ -1769,6 +1769,92 @@ DECLARE_INTERFACE_(IDirectSoundFXWavesReverb,IUnknown) #define IDirectSoundFXWavesReverb_GetAllParameters(p,a) (p)->GetAllParameters(a) #endif +enum +{ + DSFX_I3DL2_MATERIAL_PRESET_SINGLEWINDOW, + DSFX_I3DL2_MATERIAL_PRESET_DOUBLEWINDOW, + DSFX_I3DL2_MATERIAL_PRESET_THINDOOR, + DSFX_I3DL2_MATERIAL_PRESET_THICKDOOR, + DSFX_I3DL2_MATERIAL_PRESET_WOODWALL, + DSFX_I3DL2_MATERIAL_PRESET_BRICKWALL, + DSFX_I3DL2_MATERIAL_PRESET_STONEWALL, + DSFX_I3DL2_MATERIAL_PRESET_CURTAIN +}; + +#define I3DL2_MATERIAL_PRESET_SINGLEWINDOW -2800,0.71f +#define I3DL2_MATERIAL_PRESET_DOUBLEWINDOW -5000,0.40f +#define I3DL2_MATERIAL_PRESET_THINDOOR -1800,0.66f +#define I3DL2_MATERIAL_PRESET_THICKDOOR -4400,0.64f +#define I3DL2_MATERIAL_PRESET_WOODWALL -4000,0.50f +#define I3DL2_MATERIAL_PRESET_BRICKWALL -5000,0.60f +#define I3DL2_MATERIAL_PRESET_STONEWALL -6000,0.68f +#define I3DL2_MATERIAL_PRESET_CURTAIN -1200,0.15f + +enum +{ + DSFX_I3DL2_ENVIRONMENT_PRESET_DEFAULT, + DSFX_I3DL2_ENVIRONMENT_PRESET_GENERIC, + DSFX_I3DL2_ENVIRONMENT_PRESET_PADDEDCELL, + DSFX_I3DL2_ENVIRONMENT_PRESET_ROOM, + DSFX_I3DL2_ENVIRONMENT_PRESET_BATHROOM, + DSFX_I3DL2_ENVIRONMENT_PRESET_LIVINGROOM, + DSFX_I3DL2_ENVIRONMENT_PRESET_STONEROOM, + DSFX_I3DL2_ENVIRONMENT_PRESET_AUDITORIUM, + DSFX_I3DL2_ENVIRONMENT_PRESET_CONCERTHALL, + DSFX_I3DL2_ENVIRONMENT_PRESET_CAVE, + DSFX_I3DL2_ENVIRONMENT_PRESET_ARENA, + DSFX_I3DL2_ENVIRONMENT_PRESET_HANGAR, + DSFX_I3DL2_ENVIRONMENT_PRESET_CARPETEDHALLWAY, + DSFX_I3DL2_ENVIRONMENT_PRESET_HALLWAY, + DSFX_I3DL2_ENVIRONMENT_PRESET_STONECORRIDOR, + DSFX_I3DL2_ENVIRONMENT_PRESET_ALLEY, + DSFX_I3DL2_ENVIRONMENT_PRESET_FOREST, + DSFX_I3DL2_ENVIRONMENT_PRESET_CITY, + DSFX_I3DL2_ENVIRONMENT_PRESET_MOUNTAINS, + DSFX_I3DL2_ENVIRONMENT_PRESET_QUARRY, + DSFX_I3DL2_ENVIRONMENT_PRESET_PLAIN, + DSFX_I3DL2_ENVIRONMENT_PRESET_PARKINGLOT, + DSFX_I3DL2_ENVIRONMENT_PRESET_SEWERPIPE, + DSFX_I3DL2_ENVIRONMENT_PRESET_UNDERWATER, + DSFX_I3DL2_ENVIRONMENT_PRESET_SMALLROOM, + DSFX_I3DL2_ENVIRONMENT_PRESET_MEDIUMROOM, + DSFX_I3DL2_ENVIRONMENT_PRESET_LARGEROOM, + DSFX_I3DL2_ENVIRONMENT_PRESET_MEDIUMHALL, + DSFX_I3DL2_ENVIRONMENT_PRESET_LARGEHALL, + DSFX_I3DL2_ENVIRONMENT_PRESET_PLATE +}; + +#define I3DL2_ENVIRONMENT_PRESET_DEFAULT -1000,-100,0.0f,1.49f,0.83f,-2602,0.007f,200,0.011f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_GENERIC -1000,-100,0.0f,1.49f,0.83f,-2602,0.007f,200,0.011f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_PADDEDCELL -1000,-6000,0.0f,0.17f,0.10f,-1204,0.001f,207,0.002f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_ROOM -1000,-454,0.0f,0.40f,0.83f,-1646,0.002f,53,0.003f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_BATHROOM -1000,-1200,0.0f,1.49f,0.54f,-370,0.007f,1030,0.011f,100.0f,60.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_LIVINGROOM -1000,-6000,0.0f,0.50f,0.10f,-1376,0.003f,-1104,0.004f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_STONEROOM -1000,-300,0.0f,2.31f,0.64f,-711,0.012f,83,0.017f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_AUDITORIUM -1000,-476,0.0f,4.32f,0.59f,-789,0.020f,-289,0.030f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_CONCERTHALL -1000,-500,0.0f,3.92f,0.70f,-1230,0.020f,-2,0.029f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_CAVE -1000,0,0.0f,2.91f,1.30f,-602,0.015f,-302,0.022f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_ARENA -1000,-698,0.0f,7.24f,0.33f,-1166,0.020f,16,0.030f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_HANGAR -1000,-1000,0.0f,10.05f,0.23f,-602,0.020f,198,0.030f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_CARPETEDHALLWAY -1000,-4000,0.0f,0.30f,0.10f,-1831,0.002f,-1630,0.030f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_HALLWAY -1000,-300,0.0f,1.49f,0.59f,-1219,0.007f,441,0.011f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_STONECORRIDOR -1000,-237,0.0f,2.70f,0.79f,-1214,0.013f,395,0.020f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_ALLEY -1000,-270,0.0f,1.49f,0.86f,-1204,0.007f,-4,0.011f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_FOREST -1000,-3300,0.0f,1.49f,0.54f,-2560,0.162f,-613,0.088f,79.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_CITY -1000,-800,0.0f,1.49f,0.67f,-2273,0.007f,2217,0.011f,50.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_MOUNTAINS -1000,-2500,0.0f,1.49f,0.21f,-2780,0.300f,-2014,0.100f,27.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_QUARRY -1000,-1000,0.0f,1.49f,0.83f,-10000,0.061f,500,0.025f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_PLAIN -1000,-2000,0.0f,1.49f,0.50f,-2466,0.179f,-2514,0.100f,21.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_PARKINGLOT -1000,0,0.0f,1.65f,1.50f,-1363,0.008f,-1153,0.012f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_SEWERPIPE -1000,-1000,0.0f,2.81f,0.14f,429,0.014f,648,0.011f,80.0f,60.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_UNDERWATER -1000,-4000,0.0f,1.49f,0.10f,-449,0.007f,1700,0.011f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_SMALLROOM -1000,-600,0.0f,1.10f,0.83f,-400,0.005f,500,0.010f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_MEDIUMROOM -1000,-600,0.0f,1.30f,0.83f,-1000,0.010f,-200,0.020f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_LARGEROOM -1000,-600,0.0f,1.50f,0.83f,-1600,0.020f,-1000,0.040f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_MEDIUMHALL -1000,-600,0.0f,1.80f,0.70f,-1300,0.015f,-800,0.030f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_LARGEHALL -1000,-600,0.0f,1.80f,0.70f,-2000,0.030f,-1400,0.060f,100.0f,100.0f,5000.0f +#define I3DL2_ENVIRONMENT_PRESET_PLATE -1000,-200,0.0f,1.30f,0.90f,0,0.002f,0,0.010f,100.0f,75.0f,5000.0f + #ifdef __cplusplus } /* extern "C" */ #endif /* defined(__cplusplus) */

1 0

Jacek Caban : dbghelp: Use Windows API to map macho files.
by Alexandre Julliard March 19, 2020

March 19, 2020

Module: wine Branch: master Commit: ebf57f01f4890b726a0af702ab7751258f5ab03d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebf57f01f4890b726a0af702… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 19 18:35:54 2020 +0100 dbghelp: Use Windows API to map macho files. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/image_private.h | 2 +- dlls/dbghelp/macho_module.c | 136 +++++++++++++++++++------------------------ 2 files changed, 61 insertions(+), 77 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ebf57f01f4890b726a0a…

1 0

Zebediah Figura : kernel32/tests: Remove a test for Unix-style paths.
by Alexandre Julliard March 19, 2020

March 19, 2020

Module: wine Branch: master Commit: 7c6222838c40f11e44c6076b1a8c8b019920040f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c6222838c40f11e44c6076b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Mar 15 16:56:53 2020 -0500 kernel32/tests: Remove a test for Unix-style paths. Wine intentionally treats these specially, so there is no point in testing them. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/volume.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index cb834aa3c3..ded167f3e0 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -847,26 +847,22 @@ static void test_GetVolumePathNameA(void) NO_ERROR, NO_ERROR }, { /* test 37 */ - "/unix-style/absolute/path", "%CurrentDrive%\\", sizeof(volume_path), - NO_ERROR, NO_ERROR - }, - { /* test 38 */ "\\??\\C:\\NonExistent", "%CurrentDrive%\\", sizeof(volume_path), NO_ERROR, NO_ERROR }, - { /* test 39 */ + { /* test 38 */ "\\??\\M:\\NonExistent", "%CurrentDrive%\\", sizeof(volume_path), NO_ERROR, NO_ERROR }, - { /* test 40 */ + { /* test 39 */ "somefile:def", "%CurrentDrive%\\", sizeof(volume_path), NO_ERROR, NO_ERROR }, - { /* test 41 */ + { /* test 40 */ "s:omefile", "S:\\" /* win2k, winxp */, sizeof(volume_path), ERROR_FILE_NOT_FOUND, NO_ERROR }, - { /* test 42: a reasonable forward slash path that is guaranteed to exist */ + { /* test 41: a reasonable forward slash path that is guaranteed to exist */ "C:/windows/system32", "C:\\", sizeof(volume_path), NO_ERROR, NO_ERROR },

1 0

Zhiyi Zhang : d3d9: Report d3d9 adapter group information in device caps.
by Alexandre Julliard March 19, 2020

March 19, 2020

Module: wine Branch: master Commit: 2c39a955f490bcca6632894c133d352fef7775ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c39a955f490bcca6632894c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Mar 19 17:08:09 2020 +0800 d3d9: Report d3d9 adapter group information in device caps. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/d3d9_private.h | 3 ++- dlls/d3d9/device.c | 47 +++++++++++++++++++++++++++++++++++++++-------- dlls/d3d9/directx.c | 2 +- dlls/wined3d/directx.c | 4 ---- include/wine/wined3d.h | 4 ---- 5 files changed, 42 insertions(+), 18 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index a0daaf4288..ff9a8fec0b 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -59,7 +59,6 @@ enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) DECLSPEC_H unsigned int wined3dmapflags_from_d3dmapflags(unsigned int flags, unsigned int usage) DECLSPEC_HIDDEN; void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS *present_parameters, const struct wined3d_swapchain_desc *swapchain_desc, DWORD presentation_interval) DECLSPEC_HIDDEN; -void d3dcaps_from_wined3dcaps(D3DCAPS9 *caps, const struct wined3d_caps *wined3d_caps) DECLSPEC_HIDDEN; struct d3d9 { @@ -71,6 +70,8 @@ struct d3d9 BOOL extended; }; +void d3d9_caps_from_wined3dcaps(const struct d3d9 *d3d9, unsigned int adapter_ordinal, + D3DCAPS9 *caps, const struct wined3d_caps *wined3d_caps) DECLSPEC_HIDDEN; BOOL d3d9_init(struct d3d9 *d3d9, BOOL extended) DECLSPEC_HIDDEN; struct fvf_declaration diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 85798db444..4ac38c0e89 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -360,7 +360,8 @@ static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapch return TRUE; } -void d3dcaps_from_wined3dcaps(D3DCAPS9 *caps, const struct wined3d_caps *wined3d_caps) +void d3d9_caps_from_wined3dcaps(const struct d3d9 *d3d9, unsigned int adapter_ordinal, + D3DCAPS9 *caps, const struct wined3d_caps *wined3d_caps) { static const DWORD ps_minor_version[] = {0, 4, 0, 0}; static const DWORD vs_minor_version[] = {0, 1, 0, 0}; @@ -370,9 +371,14 @@ void d3dcaps_from_wined3dcaps(D3DCAPS9 *caps, const struct wined3d_caps *wined3d D3DPTFILTERCAPS_MIPFPOINT | D3DPTFILTERCAPS_MIPFLINEAR | D3DPTFILTERCAPS_MAGFPOINT | D3DPTFILTERCAPS_MAGFLINEAR |D3DPTFILTERCAPS_MAGFANISOTROPIC|D3DPTFILTERCAPS_MAGFPYRAMIDALQUAD| D3DPTFILTERCAPS_MAGFGAUSSIANQUAD; + struct wined3d_adapter *wined3d_adapter; + struct wined3d_output_desc output_desc; + struct wined3d_output *wined3d_output; + unsigned int output_idx; + HRESULT hr; caps->DeviceType = (D3DDEVTYPE)wined3d_caps->DeviceType; - caps->AdapterOrdinal = wined3d_caps->AdapterOrdinal; + caps->AdapterOrdinal = adapter_ordinal; caps->Caps = wined3d_caps->Caps; caps->Caps2 = wined3d_caps->Caps2; caps->Caps3 = wined3d_caps->Caps3; @@ -426,9 +432,6 @@ void d3dcaps_from_wined3dcaps(D3DCAPS9 *caps, const struct wined3d_caps *wined3d caps->PixelShader1xMaxValue = wined3d_caps->PixelShader1xMaxValue; caps->DevCaps2 = wined3d_caps->DevCaps2; caps->MaxNpatchTessellationLevel = wined3d_caps->MaxNpatchTessellationLevel; - caps->MasterAdapterOrdinal = wined3d_caps->MasterAdapterOrdinal; - caps->AdapterOrdinalInGroup = wined3d_caps->AdapterOrdinalInGroup; - caps->NumberOfAdaptersInGroup = wined3d_caps->NumberOfAdaptersInGroup; caps->DeclTypes = wined3d_caps->DeclTypes; caps->NumSimultaneousRTs = wined3d_caps->NumSimultaneousRTs; caps->StretchRectFilterCaps = wined3d_caps->StretchRectFilterCaps; @@ -520,6 +523,32 @@ void d3dcaps_from_wined3dcaps(D3DCAPS9 *caps, const struct wined3d_caps *wined3d DWORD major = caps->VertexShaderVersion; caps->VertexShaderVersion = D3DVS_VERSION(major, vs_minor_version[major]); } + + /* Get adapter group information */ + output_idx = adapter_ordinal; + wined3d_output = d3d9->wined3d_outputs[output_idx]; + + wined3d_mutex_lock(); + hr = wined3d_output_get_desc(wined3d_output, &output_desc); + wined3d_mutex_unlock(); + + if (FAILED(hr)) + { + ERR("Failed to get output desc, hr %#x.\n", hr); + return; + } + + caps->MasterAdapterOrdinal = output_idx - output_desc.ordinal; + caps->AdapterOrdinalInGroup = output_desc.ordinal; + if (!caps->AdapterOrdinalInGroup) + { + wined3d_adapter = wined3d_output_get_adapter(wined3d_output); + caps->NumberOfAdaptersInGroup = wined3d_adapter_get_output_count(wined3d_adapter); + } + else + { + caps->NumberOfAdaptersInGroup = 0; + } } static void device_reset_viewport_state(struct d3d9_device *device) @@ -709,7 +738,7 @@ static HRESULT WINAPI d3d9_device_GetDeviceCaps(IDirect3DDevice9Ex *iface, D3DCA hr = wined3d_device_get_device_caps(device->wined3d_device, &wined3d_caps); wined3d_mutex_unlock(); - d3dcaps_from_wined3dcaps(caps, &wined3d_caps); + d3d9_caps_from_wined3dcaps(device->d3d_parent, device->adapter_ordinal, caps, &wined3d_caps); return hr; } @@ -4595,9 +4624,10 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine struct wined3d_swapchain_desc *swapchain_desc; struct wined3d_adapter *wined3d_adapter; struct d3d9_swapchain *d3d_swapchain; - struct wined3d_caps caps; + struct wined3d_caps wined3d_caps; unsigned int output_idx; unsigned i, count = 1; + D3DCAPS9 caps; HRESULT hr; static const enum wined3d_feature_level feature_levels[] = @@ -4636,7 +4666,8 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine return hr; } - wined3d_get_device_caps(wined3d_adapter, device_type, &caps); + wined3d_get_device_caps(wined3d_adapter, device_type, &wined3d_caps); + d3d9_caps_from_wined3dcaps(parent, adapter, &caps, &wined3d_caps); device->max_user_clip_planes = caps.MaxUserClipPlanes; device->vs_uniform_count = caps.MaxVertexShaderConst; if (flags & D3DCREATE_ADAPTERGROUP_DEVICE) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 9113ec1d5a..070387dde3 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -439,7 +439,7 @@ static HRESULT WINAPI d3d9_GetDeviceCaps(IDirect3D9Ex *iface, UINT adapter, D3DD hr = wined3d_get_device_caps(wined3d_adapter, device_type, &wined3d_caps); wined3d_mutex_unlock(); - d3dcaps_from_wined3dcaps(caps, &wined3d_caps); + d3d9_caps_from_wined3dcaps(d3d9, adapter, caps, &wined3d_caps); return hr; } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4f3c9803c4..42cc5c8f92 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1888,7 +1888,6 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d_adapter *adapter, d3d_info = &adapter->d3d_info; caps->DeviceType = (device_type == WINED3D_DEVICE_TYPE_HAL) ? WINED3D_DEVICE_TYPE_HAL : WINED3D_DEVICE_TYPE_REF; - caps->AdapterOrdinal = adapter->ordinal; caps->Caps = 0; caps->Caps2 = WINED3DCAPS2_CANRENDERWINDOWED | @@ -2078,9 +2077,6 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d_adapter *adapter, caps->DevCaps2 = WINED3DDEVCAPS2_STREAMOFFSET | WINED3DDEVCAPS2_VERTEXELEMENTSCANSHARESTREAMOFFSET; caps->MaxNpatchTessellationLevel = 0; - caps->MasterAdapterOrdinal = 0; - caps->AdapterOrdinalInGroup = 0; - caps->NumberOfAdaptersInGroup = 1; caps->NumSimultaneousRTs = d3d_info->limits.max_rt_count; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index e989fff089..30b6f9a7e8 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1909,7 +1909,6 @@ struct wined3d_ddraw_caps struct wined3d_caps { enum wined3d_device_type DeviceType; - UINT AdapterOrdinal; DWORD Caps; DWORD Caps2; @@ -1977,9 +1976,6 @@ struct wined3d_caps float MaxNpatchTessellationLevel; - UINT MasterAdapterOrdinal; - UINT AdapterOrdinalInGroup; - UINT NumberOfAdaptersInGroup; DWORD DeclTypes; DWORD NumSimultaneousRTs; DWORD StretchRectFilterCaps;

1 0