February 2021 - Wine-Commits

Zebediah Figura : advapi32/tests: Explicitly test the ACL contents in test_AddMandatoryAce().
by Alexandre Julliard Feb. 16, 2021

Feb. 16, 2021

Module: wine Branch: master Commit: f6a723f1214a55a03c613ab1c195e9b79e437263 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6a723f1214a55a03c613ab1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 15 19:50:53 2021 -0600 advapi32/tests: Explicitly test the ACL contents in test_AddMandatoryAce(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 69 +++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 38 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index d9849f44c9a..75217524315 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -6395,13 +6395,13 @@ static void test_AddMandatoryAce(void) static SID_IDENTIFIER_AUTHORITY sia_world = {SECURITY_WORLD_SID_AUTHORITY}; char buffer_sd[SECURITY_DESCRIPTOR_MIN_LENGTH]; SECURITY_DESCRIPTOR *sd2, *sd = (SECURITY_DESCRIPTOR *)&buffer_sd; - BOOL defaulted, present, ret, found, found2; + BOOL defaulted, present, ret; ACL_SIZE_INFORMATION acl_size_info; SYSTEM_MANDATORY_LABEL_ACE *ace; char buffer_acl[256]; ACL *acl = (ACL *)&buffer_acl; SECURITY_ATTRIBUTES sa; - DWORD index, size; + DWORD size; HANDLE handle; SID *everyone; ACL *sacl; @@ -6453,18 +6453,17 @@ static void test_AddMandatoryAce(void) ret = pAddMandatoryAce(acl, ACL_REVISION, 0, SYSTEM_MANDATORY_LABEL_NO_WRITE_UP, &low_level); ok(ret, "AddMandatoryAce failed with %u\n", GetLastError()); - index = 0; - found = FALSE; - while (GetAce(acl, index++, (void **)&ace)) - { - if (ace->Header.AceType != SYSTEM_MANDATORY_LABEL_ACE_TYPE) continue; - ok(ace->Header.AceFlags == 0, "Expected flags 0, got %x\n", ace->Header.AceFlags); - ok(ace->Mask == SYSTEM_MANDATORY_LABEL_NO_WRITE_UP, - "Expected mask SYSTEM_MANDATORY_LABEL_NO_WRITE_UP, got %x\n", ace->Mask); - ok(EqualSid(&ace->SidStart, &low_level), "Expected low integrity level\n"); - found = TRUE; - } - ok(found, "Could not find mandatory label ace\n"); + ret = GetAce(acl, 0, (void **)&ace); + ok(ret, "got error %u\n", GetLastError()); + ok(ace->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE, "got type %#x\n", ace->Header.AceType); + ok(!ace->Header.AceFlags, "got flags %#x\n", ace->Header.AceFlags); + ok(ace->Mask == SYSTEM_MANDATORY_LABEL_NO_WRITE_UP, "got mask %#x\n", ace->Mask); + ok(EqualSid(&ace->SidStart, &low_level), "wrong sid\n"); + + SetLastError(0xdeadbeef); + ret = GetAce(acl, 1, (void **)&ace); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got error %u\n", GetLastError()); ret = SetSecurityDescriptorSacl(sd, TRUE, acl, FALSE); ok(ret, "SetSecurityDescriptorSacl failed with error %u\n", GetLastError()); @@ -6525,30 +6524,24 @@ static void test_AddMandatoryAce(void) ok(sacl->AceCount == 2, "Expected 2 ACEs, got %d\n", sacl->AceCount); ok(!defaulted, "SACL defaulted\n"); - index = 0; - found = found2 = FALSE; - while (GetAce(sacl, index++, (void **)&ace)) - { - if (ace->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE) - { - if (EqualSid(&ace->SidStart, &low_level)) - { - found = TRUE; - ok(!ace->Header.AceFlags, "Expected 0 as flags, got %#x\n", ace->Header.AceFlags); - ok(ace->Mask == SYSTEM_MANDATORY_LABEL_NO_WRITE_UP, - "Expected SYSTEM_MANDATORY_LABEL_NO_WRITE_UP as mask, got %#x\n", ace->Mask); - } - if (EqualSid(&ace->SidStart, &medium_level)) - { - found2 = TRUE; - ok(!ace->Header.AceFlags, "Expected 0 as flags, got %#x\n", ace->Header.AceFlags); - ok(ace->Mask == SYSTEM_MANDATORY_LABEL_NO_EXECUTE_UP, - "Expected SYSTEM_MANDATORY_LABEL_NO_EXECUTE_UP as mask, got %#x\n", ace->Mask); - } - } - } - ok(found, "Could not find low mandatory label\n"); - ok(found2, "Could not find medium mandatory label\n"); + ret = GetAce(acl, 0, (void **)&ace); + ok(ret, "got error %u\n", GetLastError()); + ok(ace->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE, "got type %#x\n", ace->Header.AceType); + ok(!ace->Header.AceFlags, "got flags %#x\n", ace->Header.AceFlags); + ok(ace->Mask == SYSTEM_MANDATORY_LABEL_NO_WRITE_UP, "got mask %#x\n", ace->Mask); + ok(EqualSid(&ace->SidStart, &low_level), "wrong sid\n"); + + ret = GetAce(acl, 1, (void **)&ace); + ok(ret, "got error %u\n", GetLastError()); + ok(ace->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE, "got type %#x\n", ace->Header.AceType); + ok(!ace->Header.AceFlags, "got flags %#x\n", ace->Header.AceFlags); + ok(ace->Mask == SYSTEM_MANDATORY_LABEL_NO_EXECUTE_UP, "got mask %#x\n", ace->Mask); + ok(EqualSid(&ace->SidStart, &medium_level), "wrong sid\n"); + + SetLastError(0xdeadbeef); + ret = GetAce(acl, 2, (void **)&ace); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got error %u\n", GetLastError()); HeapFree(GetProcessHeap(), 0, sd2);

1 0

Zebediah Figura : advapi32/tests: Get rid of the test_luid() helper.
by Alexandre Julliard Feb. 16, 2021

Feb. 16, 2021

Module: wine Branch: master Commit: b250831adca4ad0f26400bee9def30571391d92f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b250831adca4ad0f26400bee… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 15 19:50:51 2021 -0600 advapi32/tests: Get rid of the test_luid() helper. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 1cd5f576621..e86b8e5cbde 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -769,13 +769,6 @@ static void test_lookupPrivilegeValue(void) } } -static void test_luid(void) -{ - test_allocateLuid(); - test_lookupPrivilegeName(); - test_lookupPrivilegeValue(); -} - static void test_FileSecurity(void) { char wintmpdir [MAX_PATH]; @@ -7963,7 +7956,9 @@ START_TEST(security) test_kernel_objects_security(); test_ConvertStringSidToSid(); test_trustee(); - test_luid(); + test_allocateLuid(); + test_lookupPrivilegeName(); + test_lookupPrivilegeValue(); test_CreateWellKnownSid(); test_FileSecurity(); test_AccessCheck();

1 0

Zebediah Figura : advapi32/tests: Skip test_token_label() if AddMandatoryAce() is not present.
by Alexandre Julliard Feb. 16, 2021

Feb. 16, 2021

Module: wine Branch: master Commit: d6fed9c360183df11a6274b286aceeea2e8c3ca4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6fed9c360183df11a6274b2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 15 19:50:54 2021 -0600 advapi32/tests: Skip test_token_label() if AddMandatoryAce() is not present. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 43 +++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 75217524315..f0b6c90390d 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -6955,6 +6955,12 @@ static void test_token_label(void) char *str; SID *sid; + if (!pAddMandatoryAce) + { + win_skip("Mandatory integrity control is not supported.\n"); + return; + } + ret = OpenProcessToken(GetCurrentProcess(), READ_CONTROL | WRITE_OWNER, &token); ok(ret, "OpenProcessToken failed with error %u\n", GetLastError()); @@ -6968,8 +6974,7 @@ static void test_token_label(void) ret = GetSecurityDescriptorControl(sd, &control, &revision); ok(ret, "GetSecurityDescriptorControl failed with error %u\n", GetLastError()); - todo_wine ok(control == (SE_SELF_RELATIVE | SE_SACL_AUTO_INHERITED | SE_SACL_PRESENT) || - broken(control == SE_SELF_RELATIVE) /* WinXP, Win2003 */, + todo_wine ok(control == (SE_SELF_RELATIVE | SE_SACL_AUTO_INHERITED | SE_SACL_PRESENT), "Unexpected security descriptor control %#x\n", control); ok(revision == 1, "Unexpected security descriptor revision %u\n", revision); @@ -6989,28 +6994,24 @@ static void test_token_label(void) ret = GetSecurityDescriptorSacl(sd, &present, &sacl, &defaulted); ok(ret, "GetSecurityDescriptorSacl failed with error %u\n", GetLastError()); - ok(present || broken(!present) /* WinXP, Win2003 */, "No SACL in the security descriptor\n"); - ok(sacl || broken(!sacl) /* WinXP, Win2003 */, "NULL SACL in the security descriptor\n"); - - if (present) - { - ok(!defaulted, "SACL defaulted\n"); - ok(sacl->AceCount == 1, "SACL contains an unexpected ACE count %u\n", sacl->AceCount); + ok(present, "No SACL in the security descriptor\n"); + ok(!!sacl, "NULL SACL in the security descriptor\n"); + ok(!defaulted, "SACL defaulted\n"); + ok(sacl->AceCount == 1, "SACL contains an unexpected ACE count %u\n", sacl->AceCount); - ret = GetAce(sacl, 0, (void **)&ace); - ok(ret, "GetAce failed with error %u\n", GetLastError()); + ret = GetAce(sacl, 0, (void **)&ace); + ok(ret, "GetAce failed with error %u\n", GetLastError()); - ok(ace->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE, - "Unexpected ACE type %#x\n", ace->Header.AceType); - ok(!ace->Header.AceFlags, "Unexpected ACE flags %#x\n", ace->Header.AceFlags); - ok(ace->Header.AceSize, "Unexpected ACE size %u\n", ace->Header.AceSize); - ok(ace->Mask == SYSTEM_MANDATORY_LABEL_NO_WRITE_UP, "Unexpected ACE mask %#x\n", ace->Mask); + ok(ace->Header.AceType == SYSTEM_MANDATORY_LABEL_ACE_TYPE, + "Unexpected ACE type %#x\n", ace->Header.AceType); + ok(!ace->Header.AceFlags, "Unexpected ACE flags %#x\n", ace->Header.AceFlags); + ok(ace->Header.AceSize, "Unexpected ACE size %u\n", ace->Header.AceSize); + ok(ace->Mask == SYSTEM_MANDATORY_LABEL_NO_WRITE_UP, "Unexpected ACE mask %#x\n", ace->Mask); - sid = (SID *)&ace->SidStart; - ConvertSidToStringSidA(sid, &str); - ok(EqualSid(sid, &medium_sid) || EqualSid(sid, &high_sid), "Got unexpected SID %s\n", str); - LocalFree(str); - } + sid = (SID *)&ace->SidStart; + ConvertSidToStringSidA(sid, &str); + ok(EqualSid(sid, &medium_sid) || EqualSid(sid, &high_sid), "Got unexpected SID %s\n", str); + LocalFree(str); ret = GetSecurityDescriptorDacl(sd, &present, &dacl, &defaulted); ok(ret, "GetSecurityDescriptorDacl failed with error %u\n", GetLastError());

1 0

Alexandre Julliard : ntdll: Reimplement local atom tables in user space.
by Alexandre Julliard Feb. 16, 2021

Feb. 16, 2021

Module: wine Branch: master Commit: e941079126c5459e853ba80a7b6346e7b2b16633 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e941079126c5459e853ba80a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 16 11:01:25 2021 +0100 ntdll: Reimplement local atom tables in user space. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/atom.c | 300 +++++++++++++++++++++++++++++++----------------- dlls/ntdll/tests/atom.c | 2 + include/winternl.h | 26 ++++- 3 files changed, 215 insertions(+), 113 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e941079126c5459e853b…

1 0

Alexandre Julliard : server: Remove support for process-local handle tables.
by Alexandre Julliard Feb. 16, 2021

Feb. 16, 2021

Module: wine Branch: master Commit: d3df2b12ce15e660865364efb74655b8b1b6bb44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3df2b12ce15e660865364ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 16 11:13:27 2021 +0100 server: Remove support for process-local handle tables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/sync.c | 3 -- include/wine/server_protocol.h | 61 ++------------------------ server/atom.c | 98 ++++-------------------------------------- server/protocol.def | 27 ------------ server/request.h | 29 ++----------- server/trace.c | 44 ++----------------- 6 files changed, 20 insertions(+), 242 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d3df2b12ce15e6608653…

1 0

Zebediah Figura : winegstreamer: Move get_stream_event() to the Unix library.
by Alexandre Julliard Feb. 16, 2021

Feb. 16, 2021

Module: wine Branch: master Commit: aa695e212522fdd8653877cdf95426255cbe80d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa695e212522fdd8653877cd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 15 17:01:52 2021 -0600 winegstreamer: Move get_stream_event() to the Unix library. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 2 ++ dlls/winegstreamer/gstdemux.c | 29 +---------------------------- dlls/winegstreamer/wg_parser.c | 27 +++++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 28 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 15c62fa29c5..08ff6ee21f0 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -221,6 +221,8 @@ struct unix_funcs void (CDECL *wg_parser_stream_get_preferred_format)(struct wg_parser_stream *stream, struct wg_format *format); void (CDECL *wg_parser_stream_enable)(struct wg_parser_stream *stream, const struct wg_format *format); void (CDECL *wg_parser_stream_disable)(struct wg_parser_stream *stream); + + bool (CDECL *wg_parser_stream_get_event)(struct wg_parser_stream *stream, struct wg_parser_event *event); }; extern const struct unix_funcs *unix_funcs; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 1f80a8fec8c..d4614ca5a65 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -686,33 +686,6 @@ static void send_buffer(struct parser_source *pin, GstBuffer *buf) gst_buffer_unref(buf); } -static bool get_stream_event(struct parser_source *pin, struct wg_parser_event *event) -{ - struct parser *filter = impl_from_strmbase_filter(pin->pin.pin.filter); - struct wg_parser_stream *stream = pin->wg_stream; - struct wg_parser *parser = filter->wg_parser; - - pthread_mutex_lock(&parser->mutex); - - while (!parser->flushing && stream->event.type == WG_PARSER_EVENT_NONE) - pthread_cond_wait(&stream->event_cond, &parser->mutex); - - if (parser->flushing) - { - pthread_mutex_unlock(&parser->mutex); - TRACE("Filter is flushing.\n"); - return false; - } - - *event = stream->event; - stream->event.type = WG_PARSER_EVENT_NONE; - - pthread_mutex_unlock(&parser->mutex); - pthread_cond_signal(&stream->event_empty_cond); - - return true; -} - static DWORD CALLBACK stream_thread(void *arg) { struct parser_source *pin = arg; @@ -726,7 +699,7 @@ static DWORD CALLBACK stream_thread(void *arg) EnterCriticalSection(&pin->flushing_cs); - if (!get_stream_event(pin, &event)) + if (!unix_funcs->wg_parser_stream_get_event(pin->wg_stream, &event)) { LeaveCriticalSection(&pin->flushing_cs); continue; diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 107dfdd1a7f..b3f8eff43ad 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -344,6 +344,31 @@ static void CDECL wg_parser_stream_disable(struct wg_parser_stream *stream) stream->enabled = false; } +static bool CDECL wg_parser_stream_get_event(struct wg_parser_stream *stream, struct wg_parser_event *event) +{ + struct wg_parser *parser = stream->parser; + + pthread_mutex_lock(&parser->mutex); + + while (!parser->flushing && stream->event.type == WG_PARSER_EVENT_NONE) + pthread_cond_wait(&stream->event_cond, &parser->mutex); + + if (parser->flushing) + { + pthread_mutex_unlock(&parser->mutex); + TRACE("Filter is flushing.\n"); + return false; + } + + *event = stream->event; + stream->event.type = WG_PARSER_EVENT_NONE; + + pthread_mutex_unlock(&parser->mutex); + pthread_cond_signal(&stream->event_empty_cond); + + return true; +} + static GstAutoplugSelectResult autoplug_blacklist(GstElement *bin, GstPad *pad, GstCaps *caps, GstElementFactory *fact, gpointer user) { const char *name = gst_element_factory_get_longname(fact); @@ -1501,6 +1526,8 @@ static const struct unix_funcs funcs = wg_parser_stream_get_preferred_format, wg_parser_stream_enable, wg_parser_stream_disable, + + wg_parser_stream_get_event, }; NTSTATUS CDECL __wine_init_unix_lib(HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out)

1 0

Henri Verbeet : vkd3d-shader: Add some colour to d3d-asm opcodes.
by Alexandre Julliard Feb. 16, 2021

Feb. 16, 2021

Module: vkd3d Branch: master Commit: 6680d9e8651c1b0d1a0e9773ab180835cd454130 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6680d9e8651c1b0d1a0e977… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 16 14:58:27 2021 +0100 vkd3d-shader: Add some colour to d3d-asm opcodes. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 51 ++++++++++++++++++++++++++++---- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- libs/vkd3d-shader/vkd3d_shader_private.h | 3 +- 3 files changed, 49 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 18e80e5..fb5370a 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -300,10 +300,17 @@ shader_input_sysval_semantic_names[] = {VKD3D_SIV_LINE_DENSITY_TESS_FACTOR, "finalLineDensityTessFactor"}, }; +struct vkd3d_d3d_asm_colours +{ + const char *reset; + const char *opcode; +}; + struct vkd3d_d3d_asm_compiler { struct vkd3d_string_buffer buffer; struct vkd3d_shader_version shader_version; + struct vkd3d_d3d_asm_colours colours; }; static int shader_ver_ge(const struct vkd3d_shader_version *v, int major, int minor) @@ -1334,7 +1341,8 @@ static void shader_dump_register_space(struct vkd3d_d3d_asm_compiler *compiler, static void shader_print_opcode(struct vkd3d_d3d_asm_compiler *compiler, enum vkd3d_shader_opcode opcode) { - vkd3d_string_buffer_printf(&compiler->buffer, "%s", shader_opcode_names[opcode]); + vkd3d_string_buffer_printf(&compiler->buffer, "%s%s%s", compiler->colours.opcode, + shader_opcode_names[opcode], compiler->colours.reset); } static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, @@ -1360,9 +1368,10 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, { case VKD3DSIH_DCL: case VKD3DSIH_DCL_UAV_TYPED: + vkd3d_string_buffer_printf(buffer, "%s", compiler->colours.opcode); shader_dump_decl_usage(compiler, &ins->declaration.semantic, ins->flags); shader_dump_ins_modifiers(compiler, &ins->declaration.semantic.resource.reg); - shader_addline(buffer, " "); + vkd3d_string_buffer_printf(buffer, "%s ", compiler->colours.reset); shader_dump_register(compiler, &ins->declaration.semantic.resource.reg.reg); shader_dump_register_space(compiler, ins->declaration.semantic.resource.register_space); break; @@ -1602,21 +1611,53 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, shader_addline(buffer, "\n"); } -enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, struct vkd3d_shader_code *out) +enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, + const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out) { + enum vkd3d_shader_compile_option_formatting_flags formatting; struct vkd3d_shader_version *shader_version; struct vkd3d_d3d_asm_compiler compiler; enum vkd3d_result result = VKD3D_OK; struct vkd3d_string_buffer *buffer; const DWORD *ptr; + unsigned int i; void *code; + static const struct vkd3d_d3d_asm_colours no_colours = + { + .reset = "", + .opcode = "", + }; + static const struct vkd3d_d3d_asm_colours colours = + { + .reset = "\x1b[m", + .opcode = "\x1b[96;1m", + }; + + formatting = VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT + | VKD3D_SHADER_COMPILE_OPTION_FORMATTING_HEADER; + if (compile_info) + { + for (i = 0; i < compile_info->option_count; ++i) + { + const struct vkd3d_shader_compile_option *option = &compile_info->options[i]; + + if (option->name == VKD3D_SHADER_COMPILE_OPTION_FORMATTING) + formatting = option->value; + } + } + + if (formatting & VKD3D_SHADER_COMPILE_OPTION_FORMATTING_COLOUR) + compiler.colours = colours; + else + compiler.colours = no_colours; + buffer = &compiler.buffer; vkd3d_string_buffer_init(buffer); shader_version = &compiler.shader_version; shader_sm4_read_header(data, &ptr, shader_version); - vkd3d_string_buffer_printf(buffer, "%s_%u_%u\n", + vkd3d_string_buffer_printf(buffer, "%s%s_%u_%u\n", compiler.colours.reset, shader_get_type_prefix(shader_version->type), shader_version->major, shader_version->minor); while (!shader_sm4_is_end(data, &ptr)) @@ -1656,7 +1697,7 @@ void vkd3d_shader_trace(void *data) const char *p, *q, *end; struct vkd3d_shader_code code; - if (vkd3d_dxbc_binary_to_text(data, &code) != VKD3D_OK) + if (vkd3d_dxbc_binary_to_text(data, NULL, &code) != VKD3D_OK) return; end = (const char *)code.code + code.size; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index c1306ca..6f1482a 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -920,7 +920,7 @@ static int compile_dxbc_tpf(const struct vkd3d_shader_compile_info *compile_info if (compile_info->target_type == VKD3D_SHADER_TARGET_D3D_ASM) { vkd3d_shader_free_scan_descriptor_info(&scan_descriptor_info); - ret = vkd3d_dxbc_binary_to_text(parser.data, out); + ret = vkd3d_dxbc_binary_to_text(parser.data, compile_info, out); vkd3d_shader_parser_destroy(&parser); return ret; } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 1975848..e9e10ba 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -851,7 +851,8 @@ struct vkd3d_string_buffer unsigned int content_size; }; -enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, struct vkd3d_shader_code *out) DECLSPEC_HIDDEN; +enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, + const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out) DECLSPEC_HIDDEN; void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN; void vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN; int vkd3d_string_buffer_printf(struct vkd3d_string_buffer *buffer,

1 0

Henri Verbeet : vkd3d-shader: Store the output buffer in struct vkd3d_d3d_asm_compiler.
by Alexandre Julliard Feb. 16, 2021

Feb. 16, 2021

Module: vkd3d Branch: master Commit: cee390d755fcffca8c63cda497a5cbdc3154a6a7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=cee390d755fcffca8c63cda… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 16 14:58:25 2021 +0100 vkd3d-shader: Store the output buffer in struct vkd3d_d3d_asm_compiler. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 247 +++++++++++++++++++++++++--------------------- 1 file changed, 134 insertions(+), 113 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=cee390d755fcffca8c6…

1 0

Henri Verbeet : vkd3d-shader: Introduce a helper to print d3d-asm opcodes.
by Alexandre Julliard Feb. 16, 2021

Feb. 16, 2021

Module: vkd3d Branch: master Commit: a5f98f260125f288e0467034c12b8c0b201bf92c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a5f98f260125f288e046703… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 16 14:58:26 2021 +0100 vkd3d-shader: Introduce a helper to print d3d-asm opcodes. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 98 ++++++++++++++++++++++------------------------- 1 file changed, 46 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=a5f98f260125f288e04…

1 0

Henri Verbeet : vkd3d-shader: Introduce struct vkd3d_d3d_asm_compiler.
by Alexandre Julliard Feb. 16, 2021

Feb. 16, 2021

Module: vkd3d Branch: master Commit: b5587f6a5b909a38fd79e8ce64edc40a6adf95df URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b5587f6a5b909a38fd79e8c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 16 14:58:24 2021 +0100 vkd3d-shader: Introduce struct vkd3d_d3d_asm_compiler. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 138 ++++++++++++++++++++++++---------------------- 1 file changed, 72 insertions(+), 66 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=b5587f6a5b909a38fd7…

1 0