April 2024 - Wine-commits - list.winehq.org

Dmitry Timoshkov : widl: Fix calculation of the SLTG library block size.
by Alexandre Julliard 25 Apr '24

25 Apr '24

Module: wine Branch: master Commit: ce6fe5d06e92a9ecde0f402038eabf0678e27cde URL: https://gitlab.winehq.org/wine/wine/-/commit/ce6fe5d06e92a9ecde0f402038eabf… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 24 15:50:03 2024 +0300 widl: Fix calculation of the SLTG library block size. This patch fixes a regression in comparison with SLTG generator in wine-staging, and allows oleview.exe from PSDK correctly load SLTG typelib generated by widl. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- tools/widl/write_sltg.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/widl/write_sltg.c b/tools/widl/write_sltg.c index 1f9976f3fa8..d09fdb37c5c 100644 --- a/tools/widl/write_sltg.c +++ b/tools/widl/write_sltg.c @@ -767,7 +767,6 @@ static short write_var_desc(struct sltg_typelib *typelib, struct sltg_data *data size_instance = NULL; /* don't account for element size */ } - append_data(data, array, size); desc_offset = data->size; @@ -1618,8 +1617,10 @@ static void sltg_write_header(struct sltg_typelib *sltg, int *library_block_star /* library block length includes helpstrings and name table */ entry.length = sltg->blocks[sltg->block_count - 1].length + 0x40 /* pad after library block */ + - sizeof(sltg->typeinfo_count) + sltg->typeinfo_size + 4 /* library block offset */ + 6 /* dummy help strings */ + - 12 /* name table header */ + 0x200 /* name table hash */ + sltg->name_table.size; + sizeof(sltg->typeinfo_count) + sltg->typeinfo_size + 4 /* library block size */ + 6 /* dummy help strings */ + + 12 /* name table header */ + 0x200 /* name table hash */ + + sizeof(sltg->name_table.size) + sltg->name_table.size + + 4 /* 0x01ffff01 */ + 4 /* 0 */; entry.index_string = sltg->blocks[sltg->block_count - 1].index_string; entry.next = 0; chat("sltg_write_header: writing library block entry %d: length %#x, index_string %#x, next %#x\n",

1 0

Dmitry Timoshkov : stdole32.tlb: Generate typelib in SLTG format.
by Alexandre Julliard 25 Apr '24

25 Apr '24

Module: wine Branch: master Commit: 7f190e67dacbbc488002933640a2bda13a0e698e URL: https://gitlab.winehq.org/wine/wine/-/commit/7f190e67dacbbc488002933640a2bd… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 24 11:03:39 2024 +0300 stdole32.tlb: Generate typelib in SLTG format. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/stdole32.tlb/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/stdole32.tlb/Makefile.in b/dlls/stdole32.tlb/Makefile.in index 8ae404a4711..4e5497f0525 100644 --- a/dlls/stdole32.tlb/Makefile.in +++ b/dlls/stdole32.tlb/Makefile.in @@ -1,5 +1,6 @@ MODULE = stdole32.tlb +EXTRAIDLFLAGS = --oldtlb --win32 EXTRADLLFLAGS = -Wb,--data-only SOURCES = \

1 0

Tuomas Räsänen : setupapi/tests: Add tests for reading INF class with %strkey% tokens.
by Alexandre Julliard 25 Apr '24

25 Apr '24

Module: wine Branch: master Commit: d8bbf6d0aeaf98e52ed4df818b6d83791e6f7725 URL: https://gitlab.winehq.org/wine/wine/-/commit/d8bbf6d0aeaf98e52ed4df818b6d83… Author: Tuomas Räsänen <tuomas.rasanen(a)opinsys.fi> Date: Sat Apr 20 14:37:19 2024 +0300 setupapi/tests: Add tests for reading INF class with %strkey% tokens. --- dlls/setupapi/tests/devinst.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 2dc891d61f1..bc830aebc19 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -1876,6 +1876,8 @@ static void test_get_inf_class(void) static const char inffile[] = "winetest.inf"; static const char content[] = "[Version]\r\n\r\n"; static const char* signatures[] = {"\"$CHICAGO$\"", "\"$Windows NT$\""}; + static const GUID deadbeef_class_guid = {0xdeadbeef,0xdead,0xbeef,{0xde,0xad,0xbe,0xef,0xde,0xad,0xbe,0xef}}; + static const char deadbeef_class_name[] = "DeadBeef"; char cn[MAX_PATH]; char filename[MAX_PATH]; @@ -2014,6 +2016,27 @@ static void test_get_inf_class(void) todo_wine ok(count == 4, "expected count==4, got %lu(%s)\n", count, cn); + /* Test Strings substitution */ + WritePrivateProfileStringA("Version", "Class", "%ClassName%", filename); + WritePrivateProfileStringA("Version", "ClassGUID", "%ClassGuid%", filename); + + /* Without Strings section the ClassGUID is invalid (has non-substituted strkey token) */ + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, NULL); + ok(!retval, "expected SetupDiGetINFClassA to fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "expected error ERROR_INVALID_PARAMETER, got %lu\n", GetLastError()); + + /* With Strings section the ClassGUID and Class should be substituted */ + WritePrivateProfileStringA("Strings", "ClassName", deadbeef_class_name, filename); + WritePrivateProfileStringA("Strings", "ClassGuid", "{deadbeef-dead-beef-dead-beefdeadbeef}", filename); + count = 0xdeadbeef; + retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); +todo_wine { + ok(retval, "expected SetupDiGetINFClassA to succeed! error %lu\n", GetLastError()); + ok(count == lstrlenA(deadbeef_class_name) + 1, "expected count=%d, got %lu\n", lstrlenA(deadbeef_class_name) + 1, count); + ok(!lstrcmpA(deadbeef_class_name, cn), "expected class_name='%s', got '%s'\n", deadbeef_class_name, cn); + ok(IsEqualGUID(&deadbeef_class_guid, &guid), "expected ClassGUID to be deadbeef-dead-beef-dead-beefdeadbeef\n"); +} DeleteFileA(filename); } }

1 0

Tuomas Räsänen : setupapi: Use INF parser to read class GUID and class name.
by Alexandre Julliard 25 Apr '24

25 Apr '24

Module: wine Branch: master Commit: 987695a427868e77704bb19c3e2cf9d6069364d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/987695a427868e77704bb19c3e2cf9… Author: Tuomas Räsänen <tuomas.rasanen(a)opinsys.fi> Date: Fri Apr 19 14:50:32 2024 +0300 setupapi: Use INF parser to read class GUID and class name. Previously, SetupDiGetINFClassW read INF files with GetPrivateProfileString, which does not substitute %strkey% tokens. This caused device installation to fail for devices which had driver INF files using %strkey% tokens in Version section. An example of such device is Vernier LabQuest Mini (08f7:0008) for which Vernier's LoggerPro application includes a driver. The INF file in question adds a new device setup class and has following entries in Version section: Class = %ClassName% ClassGuid = %DeviceClassGUID% Strings section includes following entries: DeviceClassGUID = "{6B8429BF-10AD-4b66-9FBA-2FE72B891721}" ClassName = "VST_WinUSB" Previously, when LoggerPro was installed and LabQuest Mini was hotplugged, device installation failed with the following error: fixme:setupapi:SetupDiGetINFClassW failed to convert "L"%DeviceClassGUID"" into a guid This caused GUID_NULL to be used and Class was not set to the registry for the device. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56579 --- dlls/setupapi/devinst.c | 67 ++++++++++++++++++++++++++++++++++--------- dlls/setupapi/tests/devinst.c | 3 +- 2 files changed, 54 insertions(+), 16 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 7e2d683daa6..019505b01ec 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -4280,8 +4280,11 @@ BOOL WINAPI SetupDiGetINFClassW(PCWSTR inf, LPGUID class_guid, PWSTR class_name, DWORD size, PDWORD required_size) { BOOL have_guid, have_name; - DWORD dret; + DWORD class_name_len; WCHAR buffer[MAX_PATH]; + INFCONTEXT inf_ctx; + HINF hinf; + BOOL retval = FALSE; if (!inf) { @@ -4302,30 +4305,63 @@ BOOL WINAPI SetupDiGetINFClassW(PCWSTR inf, LPGUID class_guid, PWSTR class_name, return FALSE; } - if (!GetPrivateProfileStringW(Version, Signature, NULL, buffer, MAX_PATH, inf)) + if ((hinf = SetupOpenInfFileW(inf, NULL, INF_STYLE_WIN4, NULL)) == INVALID_HANDLE_VALUE) + { + ERR("failed to open INF file %s\n", debugstr_w(inf)); return FALSE; + } + + if (!SetupFindFirstLineW(hinf, Version, Signature, &inf_ctx)) + { + ERR("INF file %s does not have mandatory [Version].Signature\n", debugstr_w(inf)); + goto out; + } + + if (!SetupGetStringFieldW(&inf_ctx, 1, buffer, ARRAY_SIZE(buffer), NULL)) + { + ERR("failed to get [Version].Signature string from %s\n", debugstr_w(inf)); + goto out; + } if (lstrcmpiW(buffer, Chicago) && lstrcmpiW(buffer, WindowsNT)) - return FALSE; + { + ERR("INF file %s has invalid [Version].Signature: %s\n", debugstr_w(inf), debugstr_w(buffer)); + goto out; + } + + have_guid = SetupFindFirstLineW(hinf, Version, ClassGUID, &inf_ctx); - buffer[0] = '\0'; - have_guid = 0 < GetPrivateProfileStringW(Version, ClassGUID, NULL, buffer, MAX_PATH, inf); if (have_guid) { + if (!SetupGetStringFieldW(&inf_ctx, 1, buffer, ARRAY_SIZE(buffer), NULL)) + { + ERR("failed to get [Version].ClassGUID as a string from '%s'\n", debugstr_w(inf)); + goto out; + } + buffer[lstrlenW(buffer)-1] = 0; if (RPC_S_OK != UuidFromStringW(buffer + 1, class_guid)) { - FIXME("failed to convert \"%s\" into a guid\n", debugstr_w(buffer)); + ERR("INF file %s has invalid [Version].ClassGUID: %s\n", debugstr_w(inf), debugstr_w(buffer)); SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; + goto out; } } - buffer[0] = '\0'; - dret = GetPrivateProfileStringW(Version, Class, NULL, buffer, MAX_PATH, inf); - have_name = 0 < dret; + have_name = SetupFindFirstLineW(hinf, Version, Class, &inf_ctx); + + class_name_len = 0; + if (have_name) + { + if (!SetupGetStringFieldW(&inf_ctx, 1, buffer, ARRAY_SIZE(buffer), NULL)) + { + ERR("failed to get [Version].Class as a string from '%s'\n", debugstr_w(inf)); + goto out; + } + + class_name_len = lstrlenW(buffer); + } - if (dret >= MAX_PATH -1) FIXME("buffer might be too small\n"); if (have_guid && !have_name) { class_name[0] = '\0'; @@ -4334,7 +4370,7 @@ BOOL WINAPI SetupDiGetINFClassW(PCWSTR inf, LPGUID class_guid, PWSTR class_name, if (have_name) { - if (dret < size) lstrcpyW(class_name, buffer); + if (class_name_len < size) lstrcpyW(class_name, buffer); else { SetLastError(ERROR_INSUFFICIENT_BUFFER); @@ -4342,9 +4378,12 @@ BOOL WINAPI SetupDiGetINFClassW(PCWSTR inf, LPGUID class_guid, PWSTR class_name, } } - if (required_size) *required_size = dret + ((dret) ? 1 : 0); + if (required_size) *required_size = class_name_len + ((class_name_len) ? 1 : 0); - return (have_guid || have_name); + retval = (have_guid || have_name); +out: + SetupCloseInfFile(hinf); + return retval; } static LSTATUS get_device_property(struct device *device, const DEVPROPKEY *prop_key, DEVPROPTYPE *prop_type, diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index bc830aebc19..e54605d6987 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -2031,12 +2031,11 @@ static void test_get_inf_class(void) WritePrivateProfileStringA("Strings", "ClassGuid", "{deadbeef-dead-beef-dead-beefdeadbeef}", filename); count = 0xdeadbeef; retval = SetupDiGetINFClassA(filename, &guid, cn, MAX_PATH, &count); -todo_wine { ok(retval, "expected SetupDiGetINFClassA to succeed! error %lu\n", GetLastError()); ok(count == lstrlenA(deadbeef_class_name) + 1, "expected count=%d, got %lu\n", lstrlenA(deadbeef_class_name) + 1, count); ok(!lstrcmpA(deadbeef_class_name, cn), "expected class_name='%s', got '%s'\n", deadbeef_class_name, cn); ok(IsEqualGUID(&deadbeef_class_guid, &guid), "expected ClassGUID to be deadbeef-dead-beef-dead-beefdeadbeef\n"); -} + DeleteFileA(filename); } }

1 0

Alex Henrie : setupapi: Don't set RequiredSize when SetupDiGetClassDescription* fails.
by Alexandre Julliard 25 Apr '24

25 Apr '24

Module: wine Branch: master Commit: 6e0b07e8ecef393e964e831f6fb687a1ec5d7a40 URL: https://gitlab.winehq.org/wine/wine/-/commit/6e0b07e8ecef393e964e831f6fb687… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Apr 24 22:35:12 2024 -0600 setupapi: Don't set RequiredSize when SetupDiGetClassDescription* fails. Discovered while investigating Bug 56551. --- dlls/setupapi/devinst.c | 20 ++++++++++---------- dlls/setupapi/tests/devinst.c | 18 ++++++++++++++++++ 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 019505b01ec..9bbc1afb3ac 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2119,7 +2119,7 @@ BOOL WINAPI SetupDiGetClassDescriptionExA( { HKEY hKey; DWORD dwLength; - BOOL ret; + LSTATUS ls; hKey = SetupDiOpenClassRegKeyExA(ClassGuid, KEY_ALL_ACCESS, @@ -2133,11 +2133,11 @@ BOOL WINAPI SetupDiGetClassDescriptionExA( } dwLength = ClassDescriptionSize; - ret = !RegQueryValueExA( hKey, NULL, NULL, NULL, - (LPBYTE)ClassDescription, &dwLength ); - if (RequiredSize) *RequiredSize = dwLength; + ls = RegQueryValueExA(hKey, NULL, NULL, NULL, (BYTE *)ClassDescription, &dwLength); RegCloseKey(hKey); - return ret; + if ((!ls || ls == ERROR_MORE_DATA) && RequiredSize) + *RequiredSize = dwLength; + return !ls; } /*********************************************************************** @@ -2153,7 +2153,7 @@ BOOL WINAPI SetupDiGetClassDescriptionExW( { HKEY hKey; DWORD dwLength; - BOOL ret; + LSTATUS ls; hKey = SetupDiOpenClassRegKeyExW(ClassGuid, KEY_ALL_ACCESS, @@ -2167,11 +2167,11 @@ BOOL WINAPI SetupDiGetClassDescriptionExW( } dwLength = ClassDescriptionSize * sizeof(WCHAR); - ret = !RegQueryValueExW( hKey, NULL, NULL, NULL, - (LPBYTE)ClassDescription, &dwLength ); - if (RequiredSize) *RequiredSize = dwLength / sizeof(WCHAR); + ls = RegQueryValueExW(hKey, NULL, NULL, NULL, (BYTE *)ClassDescription, &dwLength); RegCloseKey(hKey); - return ret; + if ((!ls || ls == ERROR_MORE_DATA) && RequiredSize) + *RequiredSize = dwLength / sizeof(WCHAR); + return !ls; } /*********************************************************************** diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index e54605d6987..1d8df5faea1 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -162,6 +162,8 @@ static void test_install_class(void) '1','1','d','b','-','b','7','0','4','-', '0','0','1','1','9','5','5','c','2','b','d','b','}',0}; char tmpfile[MAX_PATH]; + char buf[32]; + DWORD size; BOOL ret; static const char inf_data[] = @@ -195,12 +197,28 @@ static void test_install_class(void) ok(!ret, "Expected failure.\n"); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Got unexpected error %#lx.\n", GetLastError()); + size = 123; + SetLastError(0xdeadbeef); + ret = SetupDiGetClassDescriptionA(&guid, buf, sizeof(buf), &size); + ok(!ret, "Expected failure.\n"); + ok(size == 123, "Expected 123, got %ld.\n", size); + todo_wine + ok(GetLastError() == ERROR_NOT_FOUND /* win7 */ || GetLastError() == ERROR_INVALID_CLASS /* win10 */, + "Got unexpected error %#lx.\n", GetLastError()); + /* The next call will succeed. Information is put into the registry but the * location(s) is/are depending on the Windows version. */ ret = SetupDiInstallClassA(NULL, tmpfile, 0, NULL); ok(ret, "Failed to install class, error %#lx.\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = SetupDiGetClassDescriptionA(&guid, buf, sizeof(buf), &size); + ok(ret == TRUE, "Failed to get class description.\n"); + ok(size == sizeof("Wine test devices"), "Expected %Iu, got %lu.\n", sizeof("Wine test devices"), size); + ok(!strcmp(buf, "Wine test devices"), "Got unexpected class description %s.\n", debugstr_a(buf)); + todo_wine ok(!GetLastError(), "Got unexpected error %#lx.\n", GetLastError()); + ret = RegDeleteKeyW(HKEY_LOCAL_MACHINE, classKey); ok(!ret, "Failed to delete class key, error %lu.\n", GetLastError()); DeleteFileA(tmpfile);

1 0

Etaash Mathamsetty : user32: Fake success from RegisterTouchWindow.
by Alexandre Julliard 25 Apr '24

25 Apr '24

Module: wine Branch: master Commit: 6236c508074fc8aeea6584ba3fe0f7609b695610 URL: https://gitlab.winehq.org/wine/wine/-/commit/6236c508074fc8aeea6584ba3fe0f7… Author: Etaash Mathamsetty <etaash.mathamsetty(a)gmail.com> Date: Tue Apr 23 18:54:41 2024 -0400 user32: Fake success from RegisterTouchWindow. --- dlls/user32/input.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 00337aa72b7..c1c20ad8a84 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -723,8 +723,7 @@ BOOL WINAPI IsTouchWindow( HWND hwnd, ULONG *flags ) BOOL WINAPI RegisterTouchWindow( HWND hwnd, ULONG flags ) { FIXME( "hwnd %p, flags %#lx stub!\n", hwnd, flags ); - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return FALSE; + return TRUE; } /*****************************************************************************

1 0

Etaash Mathamsetty : user32: Fake success from UnregisterTouchWindow.
by Alexandre Julliard 25 Apr '24

25 Apr '24

Module: wine Branch: master Commit: c7375748016049c7312d53617e22b72e940e18bb URL: https://gitlab.winehq.org/wine/wine/-/commit/c7375748016049c7312d53617e22b7… Author: Etaash Mathamsetty <etaash.mathamsetty(a)gmail.com> Date: Tue Apr 23 18:55:23 2024 -0400 user32: Fake success from UnregisterTouchWindow. --- dlls/user32/input.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index c1c20ad8a84..108592f018f 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -732,8 +732,7 @@ BOOL WINAPI RegisterTouchWindow( HWND hwnd, ULONG flags ) BOOL WINAPI UnregisterTouchWindow( HWND hwnd ) { FIXME( "hwnd %p stub!\n", hwnd ); - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return FALSE; + return TRUE; } /*****************************************************************************

1 0

Paul Gofman : crypt32: Mind constructor tag in CRYPT_AsnDecodeOCSPSignatureInfoCertEncoded().
by Alexandre Julliard 25 Apr '24

25 Apr '24

Module: wine Branch: master Commit: 7300b40b47a226b38715952e664d1ba8a01efac4 URL: https://gitlab.winehq.org/wine/wine/-/commit/7300b40b47a226b38715952e664d1b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Apr 24 17:21:59 2024 -0600 crypt32: Mind constructor tag in CRYPT_AsnDecodeOCSPSignatureInfoCertEncoded(). --- dlls/crypt32/decode.c | 17 +++++- dlls/crypt32/tests/encode.c | 122 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 137 insertions(+), 2 deletions(-)

1 0

Paul Gofman : cryptnet: Do not use InternetCombineUrlW() in build_request_url().
by Alexandre Julliard 25 Apr '24

25 Apr '24

Module: wine Branch: master Commit: 798f158a60dbf2f3e9ce004a728febbad6b7be91 URL: https://gitlab.winehq.org/wine/wine/-/commit/798f158a60dbf2f3e9ce004a728feb… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Apr 24 19:43:37 2024 -0600 cryptnet: Do not use InternetCombineUrlW() in build_request_url(). --- dlls/cryptnet/cryptnet_main.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 7768e9e5bd3..1068dd26868 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1869,15 +1869,16 @@ static WCHAR *build_request_url(const WCHAR *base_url, const BYTE *data, DWORD d DWORD len = 0; if (!(path = build_request_path(data, data_size))) return NULL; - - InternetCombineUrlW(base_url, path, NULL, &len, 0); + len = (wcslen(base_url) + wcslen(path) + 1) * sizeof(WCHAR); if (!(ret = malloc(len * sizeof(WCHAR)))) { free(path); return NULL; } - InternetCombineUrlW(base_url, path, ret, &len, 0); + wcscpy(ret, base_url); + wcscat(ret, path); free(path); + TRACE("-> %s.\n", debugstr_w(ret)); return ret; }

1 0

Francisco Casas : tests: Add additional conditional tests for shader model 3.0.
by Alexandre Julliard 24 Apr '24

24 Apr '24

Module: vkd3d Branch: master Commit: 74c998a2a49740adba2e148244f7e3a67a53bc6a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/74c998a2a49740adba2e148244f7e… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Apr 1 20:14:58 2024 -0300 tests: Add additional conditional tests for shader model 3.0. --- tests/hlsl/conditional.shader_test | 168 +++++++++++++++++++++++++++++++++++++ 1 file changed, 168 insertions(+) diff --git a/tests/hlsl/conditional.shader_test b/tests/hlsl/conditional.shader_test index 89e00dce..5eafa2b1 100644 --- a/tests/hlsl/conditional.shader_test +++ b/tests/hlsl/conditional.shader_test @@ -74,6 +74,26 @@ float main() : sv_target [require] shader model >= 3.0 + +[pixel shader todo(sm<4)] +uniform float a; + +float4 main() : sv_target +{ + if (a < 4) + return float4(1, 2, 3, 4); + return float4(10, 20, 30, 40); +} + +[test] +uniform 0 float -2 +todo(sm<4 | glsl) draw quad +probe all rgba (1, 2, 3, 4) +uniform 0 float 10 +todo(sm<4 | glsl) draw quad +probe all rgba (10, 20, 30, 40) + + [pixel shader todo(sm<4)] uniform float4 u; @@ -107,3 +127,151 @@ float4 main() : sv_target [test] todo(glsl) draw quad probe all rgba (9.0, 10.0, 11.0, 12.0) + + +[pixel shader todo(sm<4)] +int a, b; + +float4 main() : sv_target +{ + if (a < b) + return -1.0; + else + return 1.0; +} + +[test] +if(sm<4) uniform 0 float 8 +if(sm<4) uniform 4 float 9 +if(sm>=4) uniform 0 int 8 +if(sm>=4) uniform 1 int 9 +todo(sm<4 | glsl) draw quad +probe all rgba (-1.0, -1.0, -1.0, -1.0) +if(sm<4) uniform 0 float -3 +if(sm<4) uniform 4 float -4 +if(sm>=4) uniform 0 int -3 +if(sm>=4) uniform 1 int -4 +todo(sm<4 | glsl) draw quad +probe all rgba (1.0, 1.0, 1.0, 1.0) +if(sm<4) uniform 0 float 7 +if(sm<4) uniform 4 float 7 +if(sm>=4) uniform 0 int 7 +if(sm>=4) uniform 1 int 7 +todo(sm<4 | glsl) draw quad +probe all rgba (1.0, 1.0, 1.0, 1.0) + + +[pixel shader todo(sm<4)] +int a, b; + +float4 main() : sv_target +{ + if (a <= b) + return -1.0; + else + return 1.0; +} + +[test] +if(sm<4) uniform 0 float 8 +if(sm<4) uniform 4 float 9 +if(sm>=4) uniform 0 int 8 +if(sm>=4) uniform 1 int 9 +todo(sm<4 | glsl) draw quad +probe all rgba (-1.0, -1.0, -1.0, -1.0) +if(sm<4) uniform 0 float -3 +if(sm<4) uniform 4 float -4 +if(sm>=4) uniform 0 int -3 +if(sm>=4) uniform 1 int -4 +todo(sm<4 | glsl) draw quad +probe all rgba (1.0, 1.0, 1.0, 1.0) +if(sm<4) uniform 0 float 7 +if(sm<4) uniform 4 float 7 +if(sm>=4) uniform 0 int 7 +if(sm>=4) uniform 1 int 7 +todo(sm<4 | glsl) draw quad +probe all rgba (-1.0, -1.0, -1.0, -1.0) + + +[pixel shader todo(sm<4)] +int a, b; + +float4 main() : sv_target +{ + if (a != b) + return -1.0; + else + return 1.0; +} + +[test] +if(sm<4) uniform 0 float -3 +if(sm<4) uniform 4 float -2 +if(sm>=4) uniform 0 int -3 +if(sm>=4) uniform 1 int -2 +todo(sm<4 | glsl) draw quad +probe all rgba (-1.0, -1.0, -1.0, -1.0) +if(sm<4) uniform 0 float 4 +if(sm<4) uniform 4 float 4 +if(sm>=4) uniform 0 int 4 +if(sm>=4) uniform 1 int 4 +todo(sm<4 | glsl) draw quad +probe all rgba (1.0, 1.0, 1.0, 1.0) + + +% Test "if" conditionals, using resource loads to ensure we aren't removing these instruction with optimizations. +[srv 0] +size (2d, 2, 2) +0.0 0.0 0.0 4.0 1.0 0.0 0.0 4.0 +0.0 1.0 0.0 4.0 1.0 1.0 0.0 4.0 + +[sampler 0] +filter linear linear linear +address clamp clamp clamp + +[pixel shader todo(sm<4)] +Texture2D tex; +sampler sam; +float a; + +float4 main() : sv_target +{ + if (a < 4) + return tex.Sample(sam, float2(0, 0)); + return float4(1, 2, 3, 4); +} + +[test] +uniform 0 float -2 +todo(sm<4 | glsl) draw quad +probe all rgba (0.0, 0.0, 0.0, 4.0) +uniform 0 float 4 +todo(sm<4 | glsl) draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0) + + +[pixel shader todo(sm<4)] +Texture2D tex; +sampler sam; +float a; + +float4 main() : sv_target +{ + if (a >= 2) + return tex.Sample(sam, float2(0, 0)); + else if (a >= 1) + return tex.Sample(sam, float2(1, 0)); + else + return tex.Sample(sam, float2(1, 1)); +} + +[test] +uniform 0 float 2 +todo(sm<4 | glsl) draw quad +probe all rgba (0.0, 0.0, 0.0, 4.0) +uniform 0 float 1 +todo(sm<4 | glsl) draw quad +probe all rgba (1.0, 0.0, 0.0, 4.0) +uniform 0 float 0 +todo(sm<4 | glsl) draw quad +probe all rgba (1.0, 1.0, 0.0, 4.0)

1 0