- Wine-Commits - list.winehq.org

Alexandre Julliard : include: Add some new status codes.
by Alexandre Julliard March 15, 2024

March 15, 2024

Module: wine Branch: master Commit: 08f46b8de08310890df29cbb014f79f978477f12 URL: https://gitlab.winehq.org/wine/wine/-/commit/08f46b8de08310890df29cbb014f79… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 15 12:39:12 2024 +0100 include: Add some new status codes. And sort everything consistently. --- include/ntstatus.h | 1472 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 1337 insertions(+), 135 deletions(-)

1 0

Jinoh Kang : server: Generalize server request make_temporary to set_object_permanence.
by Alexandre Julliard March 15, 2024

March 15, 2024

Module: wine Branch: master Commit: e368515eefe82525c444fd374ff1b9b5f066e337 URL: https://gitlab.winehq.org/wine/wine/-/commit/e368515eefe82525c444fd374ff1b9… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Mon Mar 11 21:48:19 2024 +0900 server: Generalize server request make_temporary to set_object_permanence. Required for implementing NtMakePermanentObject(). --- dlls/ntdll/unix/sync.c | 3 ++- include/wine/server_protocol.h | 14 ++++++++------ server/handle.c | 9 +++++++-- server/protocol.def | 5 +++-- server/request.h | 9 +++++---- server/trace.c | 7 ++++--- 6 files changed, 29 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index cde6a0f8483..68a861f047a 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -1281,9 +1281,10 @@ NTSTATUS WINAPI NtMakeTemporaryObject( HANDLE handle ) TRACE("%p\n", handle); - SERVER_START_REQ( make_temporary ) + SERVER_START_REQ( set_object_permanence ) { req->handle = wine_server_obj_handle( handle ); + req->permanent = 0; ret = wine_server_call( req ); } SERVER_END_REQ; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 31ea45b9530..f9b591ef207 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1314,12 +1314,14 @@ struct compare_objects_reply -struct make_temporary_request +struct set_object_permanence_request { struct request_header __header; obj_handle_t handle; + int permanent; + char __pad_20[4]; }; -struct make_temporary_reply +struct set_object_permanence_reply { struct reply_header __header; }; @@ -5659,7 +5661,7 @@ enum request REQ_set_handle_info, REQ_dup_handle, REQ_compare_objects, - REQ_make_temporary, + REQ_set_object_permanence, REQ_open_process, REQ_open_thread, REQ_select, @@ -5951,7 +5953,7 @@ union generic_request struct set_handle_info_request set_handle_info_request; struct dup_handle_request dup_handle_request; struct compare_objects_request compare_objects_request; - struct make_temporary_request make_temporary_request; + struct set_object_permanence_request set_object_permanence_request; struct open_process_request open_process_request; struct open_thread_request open_thread_request; struct select_request select_request; @@ -6241,7 +6243,7 @@ union generic_reply struct set_handle_info_reply set_handle_info_reply; struct dup_handle_reply dup_handle_reply; struct compare_objects_reply compare_objects_reply; - struct make_temporary_reply make_temporary_reply; + struct set_object_permanence_reply set_object_permanence_reply; struct open_process_reply open_process_reply; struct open_thread_reply open_thread_reply; struct select_reply select_reply; @@ -6505,7 +6507,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 796 +#define SERVER_PROTOCOL_VERSION 797 /* ### protocol_version end ### */ diff --git a/server/handle.c b/server/handle.c index 71cdd2e328c..02a5a22edd1 100644 --- a/server/handle.c +++ b/server/handle.c @@ -885,13 +885,18 @@ DECL_HANDLER(get_system_handles) } } -DECL_HANDLER(make_temporary) +DECL_HANDLER(set_object_permanence) { struct object *obj; if (!(obj = get_handle_obj( current->process, req->handle, 0, NULL ))) return; - if (obj->is_permanent) + if (req->permanent && !obj->is_permanent) + { + grab_object( obj ); + make_object_permanent( obj ); + } + else if (!req->permanent && obj->is_permanent) { make_object_temporary( obj ); release_object( obj ); diff --git a/server/protocol.def b/server/protocol.def index 13aea96e796..814ad741f9a 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1175,9 +1175,10 @@ typedef struct @END -/* Make an object temporary */ -(a)REQ(make_temporary) +/* Make an object permanent or temporary */ +(a)REQ(set_object_permanence) obj_handle_t handle; /* handle to the object */ + int permanent; /* 1 to make permanent, 0 to make temporary */ @END diff --git a/server/request.h b/server/request.h index 8b07f5ee7c1..69d10bcb138 100644 --- a/server/request.h +++ b/server/request.h @@ -144,7 +144,7 @@ DECL_HANDLER(close_handle); DECL_HANDLER(set_handle_info); DECL_HANDLER(dup_handle); DECL_HANDLER(compare_objects); -DECL_HANDLER(make_temporary); +DECL_HANDLER(set_object_permanence); DECL_HANDLER(open_process); DECL_HANDLER(open_thread); DECL_HANDLER(select); @@ -435,7 +435,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_set_handle_info, (req_handler)req_dup_handle, (req_handler)req_compare_objects, - (req_handler)req_make_temporary, + (req_handler)req_set_object_permanence, (req_handler)req_open_process, (req_handler)req_open_thread, (req_handler)req_select, @@ -916,8 +916,9 @@ C_ASSERT( sizeof(struct dup_handle_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct compare_objects_request, first) == 12 ); C_ASSERT( FIELD_OFFSET(struct compare_objects_request, second) == 16 ); C_ASSERT( sizeof(struct compare_objects_request) == 24 ); -C_ASSERT( FIELD_OFFSET(struct make_temporary_request, handle) == 12 ); -C_ASSERT( sizeof(struct make_temporary_request) == 16 ); +C_ASSERT( FIELD_OFFSET(struct set_object_permanence_request, handle) == 12 ); +C_ASSERT( FIELD_OFFSET(struct set_object_permanence_request, permanent) == 16 ); +C_ASSERT( sizeof(struct set_object_permanence_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct open_process_request, pid) == 12 ); C_ASSERT( FIELD_OFFSET(struct open_process_request, access) == 16 ); C_ASSERT( FIELD_OFFSET(struct open_process_request, attributes) == 20 ); diff --git a/server/trace.c b/server/trace.c index 74a11f5fd6b..2852770a5d2 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1697,9 +1697,10 @@ static void dump_compare_objects_request( const struct compare_objects_request * fprintf( stderr, ", second=%04x", req->second ); } -static void dump_make_temporary_request( const struct make_temporary_request *req ) +static void dump_set_object_permanence_request( const struct set_object_permanence_request *req ) { fprintf( stderr, " handle=%04x", req->handle ); + fprintf( stderr, ", permanent=%d", req->permanent ); } static void dump_open_process_request( const struct open_process_request *req ) @@ -4621,7 +4622,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_set_handle_info_request, (dump_func)dump_dup_handle_request, (dump_func)dump_compare_objects_request, - (dump_func)dump_make_temporary_request, + (dump_func)dump_set_object_permanence_request, (dump_func)dump_open_process_request, (dump_func)dump_open_thread_request, (dump_func)dump_select_request, @@ -5197,7 +5198,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "set_handle_info", "dup_handle", "compare_objects", - "make_temporary", + "set_object_permanence", "open_process", "open_thread", "select",

1 0

Alexandre Julliard : include: Add some new error codes.
by Alexandre Julliard March 15, 2024

March 15, 2024

Module: wine Branch: master Commit: 98b7095a21688b38eabbab31ecc795bd93005558 URL: https://gitlab.winehq.org/wine/wine/-/commit/98b7095a21688b38eabbab31ecc795… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 15 11:17:39 2024 +0100 include: Add some new error codes. And sort everything consistently. --- dlls/jscript/jscript.h | 2 - include/d3d10.idl | 2 - include/dmerror.h | 1 - include/webservices.h | 3 + include/winerror.h | 4196 +++++++++++++++++++++++++++++++++++++++++++----- include/winsock2.h | 8 +- 6 files changed, 3782 insertions(+), 430 deletions(-)

1 0

Alexandre Julliard : ntdll: Add mappings for more status codes.
by Alexandre Julliard March 15, 2024

March 15, 2024

Module: wine Branch: master Commit: 72fd6e925179ee064f9535c34e3f621822a8d97d URL: https://gitlab.winehq.org/wine/wine/-/commit/72fd6e925179ee064f9535c34e3f62… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 15 14:28:31 2024 +0100 ntdll: Add mappings for more status codes. --- dlls/ntdll/error.h | 1744 ++++++++++++++++++++++++++++++++++++++++++++++-- dlls/ntdll/make_errors | 1382 +++++++++++++++++++++++++++++++++++++- 2 files changed, 3076 insertions(+), 50 deletions(-)

1 0

Jinoh Kang : ntdll: Implement NtMakePermanentObject.
by Alexandre Julliard March 15, 2024

March 15, 2024

Module: wine Branch: master Commit: ce41edab3feebba814d0504436af079f1aa341bd URL: https://gitlab.winehq.org/wine/wine/-/commit/ce41edab3feebba814d0504436af07… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Mon Mar 11 21:48:19 2024 +0900 ntdll: Implement NtMakePermanentObject. --- dlls/ntdll/ntdll.spec | 4 +- dlls/ntdll/ntsyscalls.h | 592 ++++++++++++++++++------------------ dlls/ntdll/signal_arm64ec.c | 5 + dlls/ntdll/tests/om.c | 37 +++ dlls/ntdll/unix/sync.c | 20 ++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/wow64/sync.c | 11 + include/winternl.h | 1 + 8 files changed, 374 insertions(+), 298 deletions(-)

1 0

Jinoh Kang : ntdll/tests: Add tests for NtMakeTemporaryObject.
by Alexandre Julliard March 15, 2024

March 15, 2024

Module: wine Branch: master Commit: d282208ac3840de97258871a214948d1d0ce82c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/d282208ac3840de97258871a214948… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Mon Mar 11 23:32:53 2024 +0900 ntdll/tests: Add tests for NtMakeTemporaryObject. --- dlls/ntdll/tests/om.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 70 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index e9ba93890c1..ee511cb6afb 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -3161,14 +3161,48 @@ static void test_object_permanence(void) static const struct object_permanence_test { const char *name; ULONG initial_attr; + ACCESS_MASK access; + BOOLEAN make_temporary; + NTSTATUS make_temp_status; } tests[] = { { .name = "permanent object persists", .initial_attr = OBJ_PERMANENT, + .access = GENERIC_ALL, }, + { + .name = "NtMakeTemporaryObject() succeeds", + .initial_attr = OBJ_PERMANENT, + .access = GENERIC_ALL, + .make_temporary = TRUE, + .make_temp_status = STATUS_SUCCESS, + }, + { + .name = "NtMakeTemporaryObject() fails w/o DELETE access", + .initial_attr = OBJ_PERMANENT, + .access = EVENT_ALL_ACCESS & ~DELETE, + .make_temporary = TRUE, + .make_temp_status = STATUS_ACCESS_DENIED, + }, + { .name = "temporary object disappears", .initial_attr = 0, + .access = GENERIC_ALL, + }, + { + .name = "NtMakeTemporaryObject() succeeds even if already temporary", + .initial_attr = 0, + .access = GENERIC_ALL, + .make_temporary = TRUE, + .make_temp_status = STATUS_SUCCESS, + }, + { + .name = "NtMakeTemporaryObject() fails w/o DELETE access even if already temporary", + .initial_attr = 0, + .access = EVENT_ALL_ACCESS & ~DELETE, + .make_temporary = TRUE, + .make_temp_status = STATUS_ACCESS_DENIED, }, }; const struct object_permanence_test *test; @@ -3216,7 +3250,7 @@ static void test_object_permanence(void) for (test = &tests[0]; test != &tests[ARRAY_SIZE(tests)]; test++) { NTSTATUS make_perma_status = creatpermapriv ? STATUS_SUCCESS : STATUS_PRIVILEGE_NOT_HELD; - HANDLE handle; + HANDLE handle, handle2; OBJECT_BASIC_INFORMATION obi; OBJECT_ATTRIBUTES attr; UNICODE_STRING name; @@ -3228,7 +3262,7 @@ static void test_object_permanence(void) RtlInitUnicodeString( &name, L"\\BaseNamedObjects\\test_object_permanence" ); InitializeObjectAttributes( &attr, &name, test->initial_attr, 0, NULL ); - status = NtCreateEvent( &handle, GENERIC_ALL, &attr, NotificationEvent, FALSE ); + status = NtCreateEvent( &handle, test->access, &attr, NotificationEvent, FALSE ); if (test->initial_attr & OBJ_PERMANENT) { todo_wine_if(status == STATUS_SUCCESS || status == STATUS_PRIVILEGE_NOT_HELD) @@ -3250,6 +3284,39 @@ static void test_object_permanence(void) todo_wine_if(test->initial_attr != 0) ok( obi.Attributes == test->initial_attr, "expected attr %08lx, got %08lx\n", test->initial_attr, obi.Attributes ); + if (test->make_temporary) + { + if (test->make_temp_status == STATUS_ACCESS_DENIED) + ok( !(obi.GrantedAccess & DELETE), "expected no DELETE access in %08lx\n", obi.GrantedAccess ); + if (test->make_temp_status == STATUS_SUCCESS) + ok( !!(obi.GrantedAccess & DELETE), "expected DELETE access in %08lx\n", obi.GrantedAccess ); + + status = NtMakeTemporaryObject( handle ); + todo_wine_if(test->make_temp_status == STATUS_ACCESS_DENIED) + ok( status == test->make_temp_status, "NtMakeTemporaryObject returned %08lx\n", status ); + if (!NT_ERROR(status)) is_permanent = FALSE; + } + + if (winetest_debug > 1) + trace( "NOTE: object still has unclosed handle (%p) and shouldn't be deleted", handle ); + + winetest_push_context( "first handle (%p) still open", handle ); + status = NtOpenEvent( &handle2, GENERIC_ALL, &attr ); + ok( status == STATUS_SUCCESS, "NtOpenEvent returned %08lx\n", status ); + if (!NT_ERROR(status)) + { + ULONG expect_attr = (obi.Attributes & ~OBJ_PERMANENT) | (is_permanent ? OBJ_PERMANENT : 0); + OBJECT_BASIC_INFORMATION obi2; + + status = NtQueryObject( handle2, ObjectBasicInformation, &obi2, sizeof(obi2), &len ); + ok( status == STATUS_SUCCESS, "NtQueryObject returned %08lx\n", status ); + todo_wine_if(expect_attr != 0) + ok( obi2.Attributes == expect_attr, "expected attr %08lx, got %08lx\n", expect_attr, obi2.Attributes ); + + NtClose( handle2 ); + } + winetest_pop_context(); + if (winetest_debug > 1) trace( "NOTE: about to close earlier handle (%p) which should be the last", handle ); NtClose( handle ); @@ -3259,7 +3326,7 @@ static void test_object_permanence(void) ok( status == (is_permanent ? STATUS_SUCCESS : STATUS_OBJECT_NAME_NOT_FOUND), "NtOpenEvent returned %08lx\n", status ); if (!NT_ERROR(status)) { - ULONG expect_attr = obi.Attributes; + ULONG expect_attr = (obi.Attributes & ~OBJ_PERMANENT) | (is_permanent ? OBJ_PERMANENT : 0); OBJECT_BASIC_INFORMATION obi_new; status = NtQueryObject( handle, ObjectBasicInformation, &obi_new, sizeof(obi_new), &len );

1 0

Jinoh Kang : ntdll/tests: Add tests for OBJ_PERMANENT object attribute.
by Alexandre Julliard March 15, 2024

March 15, 2024

Module: wine Branch: master Commit: a4ad64dda303e887d0ffc5e50a02db2af83e05db URL: https://gitlab.winehq.org/wine/wine/-/commit/a4ad64dda303e887d0ffc5e50a02db… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Mon Mar 11 21:48:19 2024 +0900 ntdll/tests: Add tests for OBJ_PERMANENT object attribute. --- dlls/ntdll/tests/om.c | 126 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 62659fc8cb4..e9ba93890c1 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -3156,6 +3156,131 @@ static void test_null_in_object_name(void) skip("Limited access to \\Registry\\Machine\\Software key, skipping the tests\n"); } +static void test_object_permanence(void) +{ + static const struct object_permanence_test { + const char *name; + ULONG initial_attr; + } tests[] = { + { + .name = "permanent object persists", + .initial_attr = OBJ_PERMANENT, + }, + { + .name = "temporary object disappears", + .initial_attr = 0, + }, + }; + const struct object_permanence_test *test; + HANDLE process_token = NULL, thread_token = NULL; + SECURITY_QUALITY_OF_SERVICE token_qos = { + .Length = sizeof(token_qos), + .ImpersonationLevel = SecurityDelegation, + .ContextTrackingMode = SECURITY_STATIC_TRACKING, + .EffectiveOnly = FALSE, + }; + OBJECT_ATTRIBUTES token_attr = { + .Length = sizeof(token_attr), + .SecurityQualityOfService = &token_qos, + }; + TOKEN_PRIVILEGES new_privs = { + .PrivilegeCount = 1, + .Privileges = { + { + .Luid = { .LowPart = SE_CREATE_PERMANENT_PRIVILEGE }, + .Attributes = SE_PRIVILEGE_ENABLED, + }, + }, + }; + NTSTATUS status; + BOOL creatpermapriv = FALSE; + + status = NtOpenProcessToken( GetCurrentProcess(), TOKEN_DUPLICATE, &process_token ); + ok( status == STATUS_SUCCESS, "NtOpenProcessToken returned %08lx\n", status ); + + status = NtDuplicateToken( process_token, TOKEN_IMPERSONATE | TOKEN_ADJUST_PRIVILEGES, + &token_attr, FALSE, TokenImpersonation, &thread_token ); + ok( status == STATUS_SUCCESS, "NtDuplicateToken returned %08lx\n", status ); + NtClose( process_token ); + + status = NtAdjustPrivilegesToken( thread_token, FALSE, &new_privs, sizeof(new_privs), NULL, NULL ); + ok( status == STATUS_SUCCESS || status == STATUS_NOT_ALL_ASSIGNED, "NtAdjustPrivilegesToken returned %08lx\n", status ); + creatpermapriv = (status == STATUS_SUCCESS); + + status = NtSetInformationThread( GetCurrentThread(), ThreadImpersonationToken, &thread_token, sizeof(thread_token) ); + ok( status == STATUS_SUCCESS, "NtSetInformationThread returned %08lx\n", status ); + NtClose( thread_token ); + + if (!creatpermapriv) skip( "no privileges, tests may be limited\n" ); + + for (test = &tests[0]; test != &tests[ARRAY_SIZE(tests)]; test++) + { + NTSTATUS make_perma_status = creatpermapriv ? STATUS_SUCCESS : STATUS_PRIVILEGE_NOT_HELD; + HANDLE handle; + OBJECT_BASIC_INFORMATION obi; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING name; + BOOL is_permanent; + ULONG len = 0; + + winetest_push_context( "test#%Iu", test - &tests[0] ); + trace( "(%s)\n", test->name ); + + RtlInitUnicodeString( &name, L"\\BaseNamedObjects\\test_object_permanence" ); + InitializeObjectAttributes( &attr, &name, test->initial_attr, 0, NULL ); + status = NtCreateEvent( &handle, GENERIC_ALL, &attr, NotificationEvent, FALSE ); + if (test->initial_attr & OBJ_PERMANENT) + { + todo_wine_if(status == STATUS_SUCCESS || status == STATUS_PRIVILEGE_NOT_HELD) + ok( status == make_perma_status, "NtCreateEvent returned %08lx (expected %08lx)\n", status, make_perma_status ); + } + else + { + ok( status == STATUS_SUCCESS, "NtCreateEvent returned %08lx\n", status ); + } + if (NT_ERROR(status)) + { + winetest_pop_context(); + continue; + } + is_permanent = (test->initial_attr & OBJ_PERMANENT) != 0; + + status = NtQueryObject( handle, ObjectBasicInformation, &obi, sizeof(obi), &len ); + ok( status == STATUS_SUCCESS, "NtQueryObject returned %08lx\n", status ); + todo_wine_if(test->initial_attr != 0) + ok( obi.Attributes == test->initial_attr, "expected attr %08lx, got %08lx\n", test->initial_attr, obi.Attributes ); + + if (winetest_debug > 1) + trace( "NOTE: about to close earlier handle (%p) which should be the last", handle ); + NtClose( handle ); + + winetest_push_context( "first handle closed" ); + status = NtOpenEvent( &handle, GENERIC_ALL, &attr ); + ok( status == (is_permanent ? STATUS_SUCCESS : STATUS_OBJECT_NAME_NOT_FOUND), "NtOpenEvent returned %08lx\n", status ); + if (!NT_ERROR(status)) + { + ULONG expect_attr = obi.Attributes; + OBJECT_BASIC_INFORMATION obi_new; + + status = NtQueryObject( handle, ObjectBasicInformation, &obi_new, sizeof(obi_new), &len ); + ok( status == STATUS_SUCCESS, "NtQueryObject returned %08lx\n", status ); + todo_wine_if(expect_attr != 0) + ok( obi_new.Attributes == expect_attr, "expected attr %08lx, got %08lx\n", expect_attr, obi_new.Attributes ); + + /* ensure object is deleted */ + NtMakeTemporaryObject( handle ); + NtClose( handle ); + } + winetest_pop_context(); + + winetest_pop_context(); + } + + thread_token = NULL; + status = NtSetInformationThread( GetCurrentThread(), ThreadImpersonationToken, &thread_token, sizeof(thread_token) ); + ok( status == STATUS_SUCCESS, "NtSetInformationThread returned %08lx\n", status ); +} + START_TEST(om) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -3219,4 +3344,5 @@ START_TEST(om) test_globalroot(); test_object_identity(); test_query_directory(); + test_object_permanence(); }

1 0

Henri Verbeet : vkd3d-shader/ir: Pass a struct vsir_program to flatten_control_flow_constructs().
by Alexandre Julliard March 14, 2024

March 14, 2024

Module: vkd3d Branch: master Commit: 7af3e9300fd58d2457ee91d96003529fdb314a0e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7af3e9300fd58d2457ee91d960035… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 12 22:37:04 2024 +0100 vkd3d-shader/ir: Pass a struct vsir_program to flatten_control_flow_constructs(). --- libs/vkd3d-shader/ir.c | 55 ++++++++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 24 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index d7544093..e409b7ae 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1792,10 +1792,10 @@ struct cf_flattener_info struct cf_flattener { - struct vkd3d_shader_parser *parser; + struct vsir_program *program; struct vkd3d_shader_location location; - bool allocation_failed; + enum vkd3d_result status; struct vkd3d_shader_instruction *instructions; size_t instruction_capacity; @@ -1815,13 +1815,20 @@ struct cf_flattener size_t control_flow_info_size; }; +static void cf_flattener_set_error(struct cf_flattener *flattener, enum vkd3d_result error) +{ + if (flattener->status != VKD3D_OK) + return; + flattener->status = error; +} + static struct vkd3d_shader_instruction *cf_flattener_require_space(struct cf_flattener *flattener, size_t count) { if (!vkd3d_array_reserve((void **)&flattener->instructions, &flattener->instruction_capacity, flattener->instruction_count + count, sizeof(*flattener->instructions))) { ERR("Failed to allocate instructions.\n"); - flattener->allocation_failed = true; + cf_flattener_set_error(flattener, VKD3D_ERROR_OUT_OF_MEMORY); return NULL; } return &flattener->instructions[flattener->instruction_count]; @@ -1853,9 +1860,9 @@ static struct vkd3d_shader_src_param *instruction_src_params_alloc(struct vkd3d_ { struct vkd3d_shader_src_param *params; - if (!(params = vsir_program_get_src_params(&flattener->parser->program, count))) + if (!(params = vsir_program_get_src_params(flattener->program, count))) { - flattener->allocation_failed = true; + cf_flattener_set_error(flattener, VKD3D_ERROR_OUT_OF_MEMORY); return NULL; } ins->src = params; @@ -1869,10 +1876,10 @@ static void cf_flattener_emit_label(struct cf_flattener *flattener, unsigned int if (!(ins = cf_flattener_require_space(flattener, 1))) return; - if (vsir_instruction_init_label(ins, &flattener->location, label_id, &flattener->parser->program)) + if (vsir_instruction_init_label(ins, &flattener->location, label_id, flattener->program)) ++flattener->instruction_count; else - flattener->allocation_failed = true; + cf_flattener_set_error(flattener, VKD3D_ERROR_OUT_OF_MEMORY); } /* For conditional branches, this returns the false target branch parameter. */ @@ -1950,7 +1957,7 @@ static struct cf_flattener_info *cf_flattener_push_control_flow_level(struct cf_ flattener->control_flow_depth + 1, sizeof(*flattener->control_flow_info))) { ERR("Failed to allocate control flow info structure.\n"); - flattener->allocation_failed = true; + cf_flattener_set_error(flattener, VKD3D_ERROR_OUT_OF_MEMORY); return NULL; } @@ -2017,12 +2024,12 @@ static void VKD3D_PRINTF_FUNC(3, 4) cf_flattener_create_block_name(struct cf_fla flattener->block_names[block_id] = buffer.buffer; } -static enum vkd3d_result cf_flattener_iterate_instruction_array(struct cf_flattener *flattener) +static enum vkd3d_result cf_flattener_iterate_instruction_array(struct cf_flattener *flattener, + struct vkd3d_shader_message_context *message_context) { bool main_block_open, is_hull_shader, after_declarations_section; - struct vkd3d_shader_parser *parser = flattener->parser; struct vkd3d_shader_instruction_array *instructions; - struct vsir_program *program = &parser->program; + struct vsir_program *program = flattener->program; struct vkd3d_shader_instruction *dst_ins; size_t i; @@ -2074,7 +2081,8 @@ static enum vkd3d_result cf_flattener_iterate_instruction_array(struct cf_flatte break; case VKD3DSIH_LABEL: - vkd3d_shader_parser_error(parser, VKD3D_SHADER_ERROR_VSIR_NOT_IMPLEMENTED, + vkd3d_shader_error(message_context, &instruction->location, + VKD3D_SHADER_ERROR_VSIR_NOT_IMPLEMENTED, "Aborting due to not yet implemented feature: Label instruction."); return VKD3D_ERROR_NOT_IMPLEMENTED; @@ -2239,8 +2247,10 @@ static enum vkd3d_result cf_flattener_iterate_instruction_array(struct cf_flatte if (src->swizzle != VKD3D_SHADER_SWIZZLE(X, X, X, X)) { WARN("Unexpected src swizzle %#x.\n", src->swizzle); - vkd3d_shader_parser_error(parser, VKD3D_SHADER_ERROR_VSIR_INVALID_SWIZZLE, + vkd3d_shader_error(message_context, &instruction->location, + VKD3D_SHADER_ERROR_VSIR_INVALID_SWIZZLE, "The swizzle for a switch case value is not scalar X."); + cf_flattener_set_error(flattener, VKD3D_ERROR_INVALID_SHADER); } value = *src->reg.u.immconst_u32; @@ -2368,21 +2378,18 @@ static enum vkd3d_result cf_flattener_iterate_instruction_array(struct cf_flatte ++flattener->instruction_count; } - return flattener->allocation_failed ? VKD3D_ERROR_OUT_OF_MEMORY : VKD3D_OK; + return flattener->status; } -static enum vkd3d_result flatten_control_flow_constructs(struct vkd3d_shader_parser *parser) +static enum vkd3d_result vsir_program_flatten_control_flow_constructs(struct vsir_program *program, + struct vkd3d_shader_message_context *message_context) { - struct vsir_program *program = &parser->program; - struct cf_flattener flattener = {0}; + struct cf_flattener flattener = {.program = program}; enum vkd3d_result result; - flattener.parser = parser; - result = cf_flattener_iterate_instruction_array(&flattener); - - if (result >= 0) + if ((result = cf_flattener_iterate_instruction_array(&flattener, message_context)) >= 0) { - vkd3d_free(parser->program.instructions.elements); + vkd3d_free(program->instructions.elements); program->instructions.elements = flattener.instructions; program->instructions.capacity = flattener.instruction_capacity; program->instructions.count = flattener.instruction_count; @@ -4377,13 +4384,13 @@ enum vkd3d_result vkd3d_shader_normalise(struct vkd3d_shader_parser *parser, return result; } - if ((result = flatten_control_flow_constructs(parser)) < 0) + if ((result = vsir_program_flatten_control_flow_constructs(program, message_context)) < 0) return result; if (TRACE_ON()) vkd3d_shader_trace(program); - if (!parser->failed && (result = vsir_validate(parser)) < 0) + if ((result = vsir_validate(parser)) < 0) return result; if (parser->failed)

1 0

Henri Verbeet : vkd3d-shader/ir: Pass a struct vsir_program to vsir_validate().
by Alexandre Julliard March 14, 2024

March 14, 2024

Module: vkd3d Branch: master Commit: abf76372e0a44dd3920e3fb796d75e920d0c07bb URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/abf76372e0a44dd3920e3fb796d75… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 13 14:37:45 2024 +0100 vkd3d-shader/ir: Pass a struct vsir_program to vsir_validate(). --- libs/vkd3d-shader/d3dbc.c | 2 +- libs/vkd3d-shader/dxil.c | 2 +- libs/vkd3d-shader/ir.c | 43 +++++++++++++++++++------------- libs/vkd3d-shader/tpf.c | 2 +- libs/vkd3d-shader/vkd3d_shader_private.h | 12 +++++++-- 5 files changed, 38 insertions(+), 23 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index aca0f993..9f153a1d 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -1358,7 +1358,7 @@ int vkd3d_shader_sm1_parser_create(const struct vkd3d_shader_compile_info *compi sm1->p.shader_desc.flat_constant_count[i].external = get_external_constant_count(sm1, i); if (!sm1->p.failed) - ret = vsir_validate(&sm1->p); + ret = vkd3d_shader_parser_validate(&sm1->p); if (sm1->p.failed && ret >= 0) ret = VKD3D_ERROR_INVALID_SHADER; diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index b3e4f053..86671c07 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -8674,7 +8674,7 @@ int vkd3d_shader_sm6_parser_create(const struct vkd3d_shader_compile_info *compi vkd3d_free(byte_code); if (!sm6->p.failed && ret >= 0) - ret = vsir_validate(&sm6->p); + ret = vkd3d_shader_parser_validate(&sm6->p); if (sm6->p.failed && ret >= 0) ret = VKD3D_ERROR_INVALID_SHADER; diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index e409b7ae..55d12164 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -4390,21 +4390,21 @@ enum vkd3d_result vkd3d_shader_normalise(struct vkd3d_shader_parser *parser, if (TRACE_ON()) vkd3d_shader_trace(program); - if ((result = vsir_validate(parser)) < 0) + if ((result = vsir_program_validate(program, parser->config_flags, + compile_info->source_name, message_context)) < 0) return result; - if (parser->failed) - result = VKD3D_ERROR_INVALID_SHADER; - return result; } struct validation_context { - struct vkd3d_shader_parser *parser; + struct vkd3d_shader_message_context *message_context; const struct vsir_program *program; size_t instruction_idx; + struct vkd3d_shader_location null_location; bool invalid_instruction_idx; + enum vkd3d_result status; bool dcl_temps_found; enum vkd3d_shader_opcode phase; enum cf_type @@ -4450,16 +4450,21 @@ static void VKD3D_PRINTF_FUNC(3, 4) validator_error(struct validation_context *c if (ctx->invalid_instruction_idx) { - vkd3d_shader_parser_error(ctx->parser, error, "%s", buf.buffer); + vkd3d_shader_error(ctx->message_context, &ctx->null_location, error, "%s", buf.buffer); ERR("VSIR validation error: %s\n", buf.buffer); } else { - vkd3d_shader_parser_error(ctx->parser, error, "instruction %zu: %s", ctx->instruction_idx + 1, buf.buffer); + const struct vkd3d_shader_instruction *ins = &ctx->program->instructions.elements[ctx->instruction_idx]; + vkd3d_shader_error(ctx->message_context, &ins->location, error, + "instruction %zu: %s", ctx->instruction_idx + 1, buf.buffer); ERR("VSIR validation error: instruction %zu: %s\n", ctx->instruction_idx + 1, buf.buffer); } vkd3d_string_buffer_cleanup(&buf); + + if (!ctx->status) + ctx->status = VKD3D_ERROR_INVALID_SHADER; } static void vsir_validate_src_param(struct validation_context *ctx, @@ -4513,10 +4518,10 @@ static void vsir_validate_register(struct validation_context *ctx, if (reg->idx[0].rel_addr) validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX, "Non-NULL relative address for a TEMP register."); - if (reg->idx[0].offset >= ctx->parser->program.temp_count) + if (reg->idx[0].offset >= ctx->program->temp_count) { validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX, "TEMP register index %u exceeds the maximum count %u.", - reg->idx[0].offset, ctx->parser->program.temp_count); + reg->idx[0].offset, ctx->program->temp_count); break; } @@ -4706,7 +4711,7 @@ static void vsir_validate_dst_param(struct validation_context *ctx, switch (dst->reg.type) { case VKD3DSPR_SSA: - if (dst->reg.idx[0].offset < ctx->parser->program.ssa_count) + if (dst->reg.idx[0].offset < ctx->program->ssa_count) { struct validation_context_ssa_data *data = &ctx->ssas[dst->reg.idx[0].offset]; @@ -4759,7 +4764,7 @@ static void vsir_validate_src_param(struct validation_context *ctx, switch (src->reg.type) { case VKD3DSPR_SSA: - if (src->reg.idx[0].offset < ctx->parser->program.ssa_count) + if (src->reg.idx[0].offset < ctx->program->ssa_count) { struct validation_context_ssa_data *data = &ctx->ssas[src->reg.idx[0].offset]; unsigned int i; @@ -4850,7 +4855,6 @@ static void vsir_validate_instruction(struct validation_context *ctx) size_t i; instruction = &ctx->program->instructions.elements[ctx->instruction_idx]; - ctx->parser->location = instruction->location; for (i = 0; i < instruction->dst_count; ++i) vsir_validate_dst_param(ctx, &instruction->dst[i]); @@ -5201,17 +5205,20 @@ static void vsir_validate_instruction(struct validation_context *ctx) } } -enum vkd3d_result vsir_validate(struct vkd3d_shader_parser *parser) +enum vkd3d_result vsir_program_validate(struct vsir_program *program, uint64_t config_flags, + const char *source_name, struct vkd3d_shader_message_context *message_context) { struct validation_context ctx = { - .parser = parser, - .program = &parser->program, + .message_context = message_context, + .program = program, + .null_location = {.source_name = source_name}, + .status = VKD3D_OK, .phase = VKD3DSIH_INVALID, }; unsigned int i; - if (!(parser->config_flags & VKD3D_SHADER_CONFIG_FLAG_FORCE_VALIDATION)) + if (!(config_flags & VKD3D_SHADER_CONFIG_FLAG_FORCE_VALIDATION)) return VKD3D_OK; if (!(ctx.temps = vkd3d_calloc(ctx.program->temp_count, sizeof(*ctx.temps)))) @@ -5220,7 +5227,7 @@ enum vkd3d_result vsir_validate(struct vkd3d_shader_parser *parser) if (!(ctx.ssas = vkd3d_calloc(ctx.program->ssa_count, sizeof(*ctx.ssas)))) goto fail; - for (ctx.instruction_idx = 0; ctx.instruction_idx < parser->program.instructions.count; ++ctx.instruction_idx) + for (ctx.instruction_idx = 0; ctx.instruction_idx < program->instructions.count; ++ctx.instruction_idx) vsir_validate_instruction(&ctx); ctx.invalid_instruction_idx = true; @@ -5245,7 +5252,7 @@ enum vkd3d_result vsir_validate(struct vkd3d_shader_parser *parser) vkd3d_free(ctx.temps); vkd3d_free(ctx.ssas); - return VKD3D_OK; + return ctx.status; fail: vkd3d_free(ctx.blocks); diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 5c6c8e42..cb4f6d4d 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -2726,7 +2726,7 @@ int vkd3d_shader_sm4_parser_create(const struct vkd3d_shader_compile_info *compi shader_sm4_validate_default_phase_index_ranges(sm4); if (!sm4->p.failed) - vsir_validate(&sm4->p); + vkd3d_shader_parser_validate(&sm4->p); if (sm4->p.failed) { diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index f4df32d6..57065bac 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -814,6 +814,8 @@ enum vkd3d_shader_type VKD3D_SHADER_TYPE_COUNT, }; +struct vkd3d_shader_message_context; + struct vkd3d_shader_version { enum vkd3d_shader_type type; @@ -1319,6 +1321,8 @@ struct vsir_program bool vsir_program_init(struct vsir_program *program, const struct vkd3d_shader_version *version, unsigned int reserve); void vsir_program_cleanup(struct vsir_program *program); +enum vkd3d_result vsir_program_validate(struct vsir_program *program, uint64_t config_flags, + const char *source_name, struct vkd3d_shader_message_context *message_context); static inline struct vkd3d_shader_dst_param *vsir_program_get_dst_params( struct vsir_program *program, unsigned int count) @@ -1364,6 +1368,12 @@ static inline void vkd3d_shader_parser_destroy(struct vkd3d_shader_parser *parse parser->ops->parser_destroy(parser); } +static inline enum vkd3d_result vkd3d_shader_parser_validate(struct vkd3d_shader_parser *parser) +{ + return vsir_program_validate(&parser->program, parser->config_flags, + parser->location.source_name, parser->message_context); +} + struct vkd3d_shader_descriptor_info1 { enum vkd3d_shader_descriptor_type type; @@ -1527,8 +1537,6 @@ int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, int hlsl_compile_shader(const struct vkd3d_shader_code *hlsl, const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context); -enum vkd3d_result vsir_validate(struct vkd3d_shader_parser *parser); - static inline enum vkd3d_shader_component_type vkd3d_component_type_from_data_type( enum vkd3d_data_type data_type) {

1 0

Henri Verbeet : vkd3d-shader/ir: Pass a struct vsir_program to normalise_combined_samplers().
by Alexandre Julliard March 14, 2024

March 14, 2024

Module: vkd3d Branch: master Commit: 268989f5b9e7356e5001725560671a44f1ce105d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/268989f5b9e7356e5001725560671… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 12 21:43:41 2024 +0100 vkd3d-shader/ir: Pass a struct vsir_program to normalise_combined_samplers(). --- libs/vkd3d-shader/ir.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index f964e65c..d7544093 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1670,19 +1670,20 @@ static void remove_dead_code(struct vsir_program *program) } } -static enum vkd3d_result normalise_combined_samplers(struct vkd3d_shader_parser *parser) +static enum vkd3d_result vsir_program_normalise_combined_samplers(struct vsir_program *program, + struct vkd3d_shader_message_context *message_context) { unsigned int i; - for (i = 0; i < parser->program.instructions.count; ++i) + for (i = 0; i < program->instructions.count; ++i) { - struct vkd3d_shader_instruction *ins = &parser->program.instructions.elements[i]; + struct vkd3d_shader_instruction *ins = &program->instructions.elements[i]; struct vkd3d_shader_src_param *srcs; switch (ins->handler_idx) { case VKD3DSIH_TEX: - if (!(srcs = shader_src_param_allocator_get(&parser->program.instructions.src_params, 3))) + if (!(srcs = shader_src_param_allocator_get(&program->instructions.src_params, 3))) return VKD3D_ERROR_OUT_OF_MEMORY; memset(srcs, 0, sizeof(*srcs) * 3); @@ -1725,7 +1726,7 @@ static enum vkd3d_result normalise_combined_samplers(struct vkd3d_shader_parser case VKD3DSIH_TEXREG2AR: case VKD3DSIH_TEXREG2GB: case VKD3DSIH_TEXREG2RGB: - vkd3d_shader_parser_error(parser, VKD3D_SHADER_ERROR_VSIR_NOT_IMPLEMENTED, + vkd3d_shader_error(message_context, &ins->location, VKD3D_SHADER_ERROR_VSIR_NOT_IMPLEMENTED, "Aborting due to not yet implemented feature: " "Combined sampler instruction %#x.", ins->handler_idx); return VKD3D_ERROR_NOT_IMPLEMENTED; @@ -4372,7 +4373,7 @@ enum vkd3d_result vkd3d_shader_normalise(struct vkd3d_shader_parser *parser, remove_dead_code(program); - if ((result = normalise_combined_samplers(parser)) < 0) + if ((result = vsir_program_normalise_combined_samplers(program, message_context)) < 0) return result; }

1 0