January 2023 - Wine-Commits

Francisco Casas : vkd3d-shader/hlsl: Add field-level documentation to struct hlsl_deref.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: vkd3d Branch: master Commit: 06b52c0343e9b11a5abd41d08e57f9ff327104e6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/06b52c0343e9b11a5abd41d08e57f… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Nov 16 00:33:20 2022 -0300 vkd3d-shader/hlsl: Add field-level documentation to struct hlsl_deref. --- libs/vkd3d-shader/hlsl.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index c1fa37be..3122f382 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -501,13 +501,25 @@ struct hlsl_ir_swizzle DWORD swizzle; }; +/* Reference to a variable, or a part of it (e.g. a vector within a matrix within a struct). */ struct hlsl_deref { struct hlsl_ir_var *var; + /* An array of references to instruction nodes, of data type uint, that are used to reach the + * desired part of the variable. + * If path_len is 0, then this is a reference to the whole variable. + * The value of each instruction node in the path corresponds to the index of the element/field + * that has to be selected on each nesting level to reach this part. + * The path shall not contain additional values once a type that cannot be subdivided + * (a.k.a. "component") is reached. */ unsigned int path_len; struct hlsl_src *path; + /* Single instruction node of data type uint used to represent the register offset (in register + * components), from the start of the variable, of the part referenced. + * The path is lowered to this single offset -- whose value may vary between SM1 and SM4 -- + * before writing the bytecode. */ struct hlsl_src offset; };

1 0

Francisco Casas : vkd3d-shader/hlsl: Add field-level documentation to function structs.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: vkd3d Branch: master Commit: eabd742f3e2936a394abe438e64de226eab6027f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/eabd742f3e2936a394abe438e64de… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Nov 16 15:20:35 2022 -0300 vkd3d-shader/hlsl: Add field-level documentation to function structs. --- libs/vkd3d-shader/hlsl.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index bc5b5fb6..07718316 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -384,21 +384,35 @@ struct hlsl_ir_var struct hlsl_ir_function { + /* Item entry in hlsl_ctx.functions */ struct rb_entry entry; + const char *name; + /* Tree containing function definitions, stored as hlsl_ir_function_decl structures, which would + * be more than one in case of function overloading. */ struct rb_tree overloads; }; struct hlsl_ir_function_decl { struct hlsl_type *return_type; + /* Synthetic variable used to store the return value of the function. */ struct hlsl_ir_var *return_var; + struct vkd3d_shader_location loc; + /* Item entry in hlsl_ir_function.overloads. The paremeters' types are used as key. */ struct rb_entry entry; + + /* Function to which this declaration corresponds. */ struct hlsl_ir_function *func; + /* List containing one variable for each parameter of the function; linked by the + * hlsl_ir_var.param_entry fields. */ struct list *parameters; + struct hlsl_block body; bool has_body; + /* Array of attributes (like numthreads) specified just before the function declaration. + * Not to be confused with the function parameters! */ unsigned int attr_count; const struct hlsl_attribute *const *attrs; };

1 0

Francisco Casas : vkd3d-shader/hlsl: Add documentation to small hlsl.h structs.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: vkd3d Branch: master Commit: ba56833bb526f51297ba3115217507ad5e34babe URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ba56833bb526f51297ba311521750… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Nov 16 00:34:36 2022 -0300 vkd3d-shader/hlsl: Add documentation to small hlsl.h structs. --- libs/vkd3d-shader/hlsl.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 3122f382..4d1ff0fc 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -185,6 +185,8 @@ struct hlsl_type size_t bytecode_offset; }; +/* In HLSL, a semantic is a string linked to a variable (or a field) to be recognized across + * different shader stages in the graphics pipeline. */ struct hlsl_semantic { const char *name; @@ -276,6 +278,7 @@ struct hlsl_ir_node struct hlsl_block { + /* List containing instruction nodes; linked by the hlsl_ir_node.entry fields. */ struct list instrs; }; @@ -323,6 +326,8 @@ struct hlsl_attribute #define HLSL_ARRAY_ELEMENTS_COUNT_IMPLICIT 0 +/* Reservation of a specific register to a variable, field, or buffer, written in the HLSL source + * using the register(·) syntax */ struct hlsl_reg_reservation { char type;

1 0

Francois Gouget : nsi: Add some margin to the tables size in NsiAllocateAndGetTable().
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: 31792f43701d74589e2f06dc5b6446a84d5d4614 URL: https://gitlab.winehq.org/wine/wine/-/commit/31792f43701d74589e2f06dc5b6446… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 17 19:39:41 2023 +0100 nsi: Add some margin to the tables size in NsiAllocateAndGetTable(). The table size typically keeps increasing such that in some cases the size we got is already too small by the time we try to get the table content in the next iteration. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54328 --- dlls/nsi/nsi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index 6d8ae40a5c7..3f324ef555b 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -71,6 +71,7 @@ DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWOR err = NsiEnumerateObjectsAllParameters( unk, 0, module, table, NULL, 0, NULL, 0, NULL, 0, NULL, 0, &num ); if (err) return err; err = ERROR_OUTOFMEMORY; /* fail if this is the last attempt */ + num += num >> 4; /* the tables may grow before the next iteration; get ahead */ } if (!err)

1 0

Brendan Shanks : kernel32/tests: Test GetFileType() with additional types of handles.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: 3bcda5aefa41e83d24879911ee1c7c364a6f82a0 URL: https://gitlab.winehq.org/wine/wine/-/commit/3bcda5aefa41e83d24879911ee1c7c… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Jan 18 09:18:59 2023 -0800 kernel32/tests: Test GetFileType() with additional types of handles. --- dlls/kernel32/tests/file.c | 71 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 70 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index b29e2c3dc4e..73ae75d52af 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3142,7 +3142,9 @@ static void test_MapFile(void) static void test_GetFileType(void) { DWORD type, type2; - HANDLE h = CreateFileA( filename, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + HANDLE h, h2; + BOOL ret; + h = CreateFileA( filename, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 ); ok( h != INVALID_HANDLE_VALUE, "open %s failed\n", filename ); type = GetFileType(h); ok( type == FILE_TYPE_DISK, "expected type disk got %ld\n", type ); @@ -3158,6 +3160,73 @@ static void test_GetFileType(void) type = GetFileType( (HANDLE)STD_OUTPUT_HANDLE ); type2 = GetFileType( h ); ok(type == type2, "expected type %ld for STD_OUTPUT_HANDLE got %ld\n", type2, type); + + ret = CreatePipe( &h, &h2, NULL, 0 ); + ok( ret, "CreatePipe failed\n" ); + type = GetFileType( h ); + ok( type == FILE_TYPE_PIPE, "expected type pipe got %ld\n", type ); + type = GetFileType( h2 ); + ok( type == FILE_TYPE_PIPE, "expected type pipe got %ld\n", type ); + CloseHandle( h2 ); + CloseHandle( h ); + + h = CreateNamedPipeW( L"\\\\.\\pipe\\wine_test", PIPE_ACCESS_DUPLEX, 0, 2, 32, 32, 0, NULL ); + ok( h != INVALID_HANDLE_VALUE, "CreateNamedPipe failed\n" ); + type = GetFileType( h ); + ok( type == FILE_TYPE_PIPE, "expected type pipe got %ld\n", type ); + CloseHandle( h ); + + h = CreateFileA( filename, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0 ); + ok( h != INVALID_HANDLE_VALUE, "open %s failed\n", filename ); + h2 = CreateFileMappingW( h, NULL, PAGE_READWRITE, 0, 0x1000, NULL ); + ok( h2 != NULL, "CreateFileMapping failed\n" ); + SetLastError( 12345678 ); + type = GetFileType( h2 ); + todo_wine + ok( type == FILE_TYPE_UNKNOWN, "expected type unknown got %ld\n", type ); + todo_wine + ok( GetLastError() == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE got %lx\n", GetLastError() ); + CloseHandle( h2 ); + CloseHandle( h ); + DeleteFileA( filename ); + + h = CreateFileMappingW( INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, 0x1000, NULL ); + ok( h != NULL, "CreateFileMapping failed\n" ); + SetLastError( 12345678 ); + type = GetFileType( h ); + todo_wine + ok( type == FILE_TYPE_UNKNOWN, "expected type unknown got %ld\n", type ); + todo_wine + ok( GetLastError() == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE got %lx\n", GetLastError() ); + CloseHandle( h ); + + h = CreateMailslotW( L"\\\\.\\mailslot\\wine_test", 0, 0, NULL ); + ok( h != INVALID_HANDLE_VALUE, "CreateMailslot failed\n" ); + SetLastError( 12345678 ); + type = GetFileType( h ); + todo_wine + ok( type == FILE_TYPE_UNKNOWN, "expected type unknown got %ld\n", type ); + todo_wine + ok( GetLastError() == NO_ERROR, "expected ERROR_NO_ERROR got %lx\n", GetLastError() ); + CloseHandle( h ); + + SetLastError( 12345678 ); + type = GetFileType( GetCurrentProcess() ); + ok( type == FILE_TYPE_UNKNOWN, "expected type unknown got %ld\n", type ); + ok( GetLastError() == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE got %lx\n", GetLastError() ); + + SetLastError( 12345678 ); + type = GetFileType( GetCurrentThread() ); + ok( type == FILE_TYPE_UNKNOWN, "expected type unknown got %ld\n", type ); + ok( GetLastError() == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE got %lx\n", GetLastError() ); + + h = CreateMutexW( NULL, TRUE, NULL ); + ok( h != NULL, "CreateMutex failed\n" ); + SetLastError( 12345678 ); + type = GetFileType( h ); + ok( type == FILE_TYPE_UNKNOWN, "expected type unknown got %ld\n", type ); + ok( GetLastError() == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE got %lx\n", GetLastError() ); + CloseHandle( h ); } static int completion_count;

1 0

Santino Mazza : iphlpapi: Set Ipv4Enabled and Ipv6Enabled flags accordingly.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: f659ae65e4671721334d1affed8e39505d21990e URL: https://gitlab.winehq.org/wine/wine/-/commit/f659ae65e4671721334d1affed8e39… Author: Santino Mazza <smazza(a)codeweavers.com> Date: Wed Jan 18 20:59:14 2023 -0300 iphlpapi: Set Ipv4Enabled and Ipv6Enabled flags accordingly. --- dlls/iphlpapi/iphlpapi_main.c | 2 ++ dlls/iphlpapi/tests/iphlpapi.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index f8fb5de3f0e..6286c168277 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -959,12 +959,14 @@ static DWORD unicast_addresses_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG family, UL { SOCKADDR_IN *in = (SOCKADDR_IN *)addr->Address.lpSockaddr; in->sin_addr = key4->addr; + aa->Ipv4Enabled = TRUE; } else { SOCKADDR_IN6 *in6 = (SOCKADDR_IN6 *)addr->Address.lpSockaddr; in6->sin6_addr = key6->addr; in6->sin6_scope_id = dyn[i].scope_id; + aa->Ipv6Enabled = TRUE; } addr->PrefixOrigin = rw[i].prefix_origin; addr->SuffixOrigin = rw[i].suffix_origin; diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 46cff204254..b8fa82d2a56 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1819,9 +1819,9 @@ static void test_GetAdaptersAddresses(void) dns_eligible_found = TRUE; if(ua->Address.lpSockaddr->sa_family == AF_INET) - todo_wine ok(aa->Ipv4Enabled == TRUE, "expected Ipv4Enabled flag to be set in interface %ls\n", aa->FriendlyName); + ok(aa->Ipv4Enabled == TRUE, "expected Ipv4Enabled flag to be set in interface %ls\n", aa->FriendlyName); else if(ua->Address.lpSockaddr->sa_family == AF_INET6) - todo_wine ok(aa->Ipv6Enabled == TRUE, "expected Ipv6Enabled flag to be set in interface %ls\n", aa->FriendlyName); + ok(aa->Ipv6Enabled == TRUE, "expected Ipv6Enabled flag to be set in interface %ls\n", aa->FriendlyName); ua = ua->Next; }

1 0

Francisco Casas : vkd3d-shader/hlsl: Add field-level documentation to struct hlsl_buffer.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: vkd3d Branch: master Commit: c68d0ecfe0cc60d851a1b7af6f7b2b7ab91ade6c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c68d0ecfe0cc60d851a1b7af6f7b2… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Nov 16 14:02:15 2022 -0300 vkd3d-shader/hlsl: Add field-level documentation to struct hlsl_buffer. --- libs/vkd3d-shader/hlsl.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 4d1ff0fc..bc5b5fb6 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -612,15 +612,25 @@ enum hlsl_buffer_type HLSL_BUFFER_TEXTURE, }; +/* In SM4, uniform variables are organized in different buffers. Besides buffers defined in the + * source code, there is also the implicit $Globals buffer and the implicit $Params buffer, + * to which uniform globals and parameters belong by default. */ struct hlsl_buffer { struct vkd3d_shader_location loc; enum hlsl_buffer_type type; const char *name; + /* Register reserved for this buffer, if any. + * If provided, it should be of type 'b' if type is HLSL_BUFFER_CONSTANT and 't' if type is + * HLSL_BUFFER_TEXTURE. */ struct hlsl_reg_reservation reservation; + /* Item entry for hlsl_ctx.buffers */ struct list entry; + /* The size of the buffer (in register components), and the size of the buffer as determined + * by its last variable that's actually used. */ unsigned size, used_size; + /* Register of type 'b' on which the buffer is allocated. */ struct hlsl_reg reg; };

1 0

Santino Mazza : iphlpapi/tests: Test for Ipv4Enabled and Ipv6Enabled flags.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: wine Branch: master Commit: a331f1e61404a5a27e435bc562088a09933e52f6 URL: https://gitlab.winehq.org/wine/wine/-/commit/a331f1e61404a5a27e435bc562088a… Author: Santino Mazza <smazza(a)codeweavers.com> Date: Wed Jan 18 20:57:35 2023 -0300 iphlpapi/tests: Test for Ipv4Enabled and Ipv6Enabled flags. --- dlls/iphlpapi/tests/iphlpapi.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 1a0cb76bcf5..46cff204254 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1818,6 +1818,11 @@ static void test_GetAdaptersAddresses(void) if (ua->Flags & IP_ADAPTER_ADDRESS_DNS_ELIGIBLE) dns_eligible_found = TRUE; + if(ua->Address.lpSockaddr->sa_family == AF_INET) + todo_wine ok(aa->Ipv4Enabled == TRUE, "expected Ipv4Enabled flag to be set in interface %ls\n", aa->FriendlyName); + else if(ua->Address.lpSockaddr->sa_family == AF_INET6) + todo_wine ok(aa->Ipv6Enabled == TRUE, "expected Ipv6Enabled flag to be set in interface %ls\n", aa->FriendlyName); + ua = ua->Next; } for (i = 0, temp[0] = '\0'; i < ARRAY_SIZE(aa->ZoneIndices); i++)

1 0

Giovanni Mascellani : tests: Test proper initialization of static structs to zero.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: vkd3d Branch: master Commit: 207643b8e89091de7adbf52b2aa3697301f1eda8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/207643b8e89091de7adbf52b2aa36… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Dec 8 14:52:11 2022 -0300 tests: Test proper initialization of static structs to zero. --- tests/hlsl-static-initializer.shader_test | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/tests/hlsl-static-initializer.shader_test b/tests/hlsl-static-initializer.shader_test index 2ab25f65..e959cd2b 100644 --- a/tests/hlsl-static-initializer.shader_test +++ b/tests/hlsl-static-initializer.shader_test @@ -23,3 +23,33 @@ float4 main() : sv_target { return 1 / i; } + + +[pixel shader] +static struct +{ + float4 x; + float4 y; +} x; + +float4 main() : sv_target +{ + return 0; +} + + +[pixel shader] +static struct +{ + float4 x; + float3 y; +} x; + +float4 main() : sv_target +{ + return float4(1, 2, 3, 4) + x.x; +} + +[test] +draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0)

1 0

Francisco Casas : vkd3d-shader/hlsl: Allow uninitialized static objects.
by Alexandre Julliard Jan. 25, 2023

Jan. 25, 2023

Module: vkd3d Branch: master Commit: aab9886021914385dc5ec55da042258e8d7005e1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/aab9886021914385dc5ec55da0422… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Dec 5 15:13:57 2022 -0300 vkd3d-shader/hlsl: Allow uninitialized static objects. validate_static_object_references() validates that uninitialized static objects are not referenced in the shader. In case a static variable contains both numeric and object types, the "Static variables cannot have both numeric and resource components." error should preempt uninitialized numeric values to reach further compilation steps. --- libs/vkd3d-shader/hlsl.y | 1 - tests/hlsl-static-initializer.shader_test | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 73266006..7d3b23cf 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2184,7 +2184,6 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t if (type_has_object_components(var->data_type, false)) { - hlsl_fixme(ctx, &var->loc, "Uninitialized static objects."); vkd3d_free(v); continue; } diff --git a/tests/hlsl-static-initializer.shader_test b/tests/hlsl-static-initializer.shader_test index 480eae19..6dc874f9 100644 --- a/tests/hlsl-static-initializer.shader_test +++ b/tests/hlsl-static-initializer.shader_test @@ -65,7 +65,7 @@ size (1, 1) 1.0 2.0 3.0 4.0 -[pixel shader fail todo] +[pixel shader fail] static Texture2D tex; sampler sam; @@ -75,7 +75,7 @@ float4 main() : sv_target } -[pixel shader todo] +[pixel shader] // This is allowed in 10.0.10011.16384 but not in 9.29.952.3111 static Texture2D tex; @@ -113,7 +113,7 @@ float4 main() : sv_target } -[pixel shader fail todo] +[pixel shader fail] static Texture2D tex1; sampler sam; @@ -124,7 +124,7 @@ float4 main() : sv_target } -[pixel shader fail todo] +[pixel shader fail] static Texture2D tex1; sampler sam; @@ -150,7 +150,7 @@ draw quad probe all rgba (1, 2, 3, 4) -[pixel shader todo] +[pixel shader] Texture2D real_tex; static Texture2D tex; sampler sam; @@ -162,8 +162,8 @@ float4 main() : sv_target } [test] -todo draw quad -todo probe all rgba (1, 2, 3, 4) +draw quad +probe all rgba (1, 2, 3, 4) [require]

1 0