May 2023 - Wine-commits - list.winehq.org

Alexandre Julliard : kernelbase: Add a helper function to validate process/thread attributes.
by Alexandre Julliard 24 May '23

24 May '23

Module: wine Branch: master Commit: ca7a7abe856c972fc08717595e95fa23551f34bc URL: https://gitlab.winehq.org/wine/wine/-/commit/ca7a7abe856c972fc08717595e95fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 24 09:11:26 2023 +0200 kernelbase: Add a helper function to validate process/thread attributes. --- dlls/kernelbase/process.c | 93 +++++++++++++++++------------------------------ 1 file changed, 34 insertions(+), 59 deletions(-) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 837bdfd5e87..3be5fc22596 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -1696,85 +1696,60 @@ BOOL WINAPI DECLSPEC_HOTPATCH InitializeProcThreadAttributeList( struct _PROC_TH } -/*********************************************************************** - * UpdateProcThreadAttribute (kernelbase.@) - */ -BOOL WINAPI DECLSPEC_HOTPATCH UpdateProcThreadAttribute( struct _PROC_THREAD_ATTRIBUTE_LIST *list, - DWORD flags, DWORD_PTR attr, void *value, - SIZE_T size, void *prev_ret, SIZE_T *size_ret ) +static inline DWORD validate_proc_thread_attribute( DWORD_PTR attr, SIZE_T size ) { - DWORD mask; - struct proc_thread_attr *entry; - - TRACE( "(%p %lx %08Ix %p %Id %p %p)\n", list, flags, attr, value, size, prev_ret, size_ret ); - - if (list->count >= list->size) - { - SetLastError( ERROR_GEN_FAILURE ); - return FALSE; - } - switch (attr) { case PROC_THREAD_ATTRIBUTE_PARENT_PROCESS: - if (size != sizeof(HANDLE)) - { - SetLastError( ERROR_BAD_LENGTH ); - return FALSE; - } + if (size != sizeof(HANDLE)) return ERROR_BAD_LENGTH; break; - case PROC_THREAD_ATTRIBUTE_HANDLE_LIST: - if ((size / sizeof(HANDLE)) * sizeof(HANDLE) != size) - { - SetLastError( ERROR_BAD_LENGTH ); - return FALSE; - } + if ((size / sizeof(HANDLE)) * sizeof(HANDLE) != size) return ERROR_BAD_LENGTH; break; - case PROC_THREAD_ATTRIBUTE_IDEAL_PROCESSOR: - if (size != sizeof(PROCESSOR_NUMBER)) - { - SetLastError( ERROR_BAD_LENGTH ); - return FALSE; - } + if (size != sizeof(PROCESSOR_NUMBER)) return ERROR_BAD_LENGTH; break; - case PROC_THREAD_ATTRIBUTE_CHILD_PROCESS_POLICY: - if (size != sizeof(DWORD) && size != sizeof(DWORD64)) - { - SetLastError( ERROR_BAD_LENGTH ); - return FALSE; - } + if (size != sizeof(DWORD) && size != sizeof(DWORD64)) return ERROR_BAD_LENGTH; break; - case PROC_THREAD_ATTRIBUTE_MITIGATION_POLICY: if (size != sizeof(DWORD) && size != sizeof(DWORD64) && size != sizeof(DWORD64) * 2) - { - SetLastError( ERROR_BAD_LENGTH ); - return FALSE; - } + return ERROR_BAD_LENGTH; break; - case PROC_THREAD_ATTRIBUTE_PSEUDOCONSOLE: - if (size != sizeof(HPCON)) - { - SetLastError( ERROR_BAD_LENGTH ); - return FALSE; - } + if (size != sizeof(HPCON)) return ERROR_BAD_LENGTH; break; - case PROC_THREAD_ATTRIBUTE_JOB_LIST: - if ((size / sizeof(HANDLE)) * sizeof(HANDLE) != size) - { - SetLastError( ERROR_BAD_LENGTH ); - return FALSE; - } + if ((size / sizeof(HANDLE)) * sizeof(HANDLE) != size) return ERROR_BAD_LENGTH; break; - default: - SetLastError( ERROR_NOT_SUPPORTED ); FIXME( "Unhandled attribute %Iu\n", attr & PROC_THREAD_ATTRIBUTE_NUMBER ); + return ERROR_NOT_SUPPORTED; + } + return 0; +} + + +/*********************************************************************** + * UpdateProcThreadAttribute (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH UpdateProcThreadAttribute( struct _PROC_THREAD_ATTRIBUTE_LIST *list, + DWORD flags, DWORD_PTR attr, void *value, + SIZE_T size, void *prev_ret, SIZE_T *size_ret ) +{ + DWORD mask, err; + struct proc_thread_attr *entry; + + TRACE( "(%p %lx %08Ix %p %Id %p %p)\n", list, flags, attr, value, size, prev_ret, size_ret ); + + if (list->count >= list->size) + { + SetLastError( ERROR_GEN_FAILURE ); + return FALSE; + } + if ((err = validate_proc_thread_attribute( attr, size ))) + { + SetLastError( err ); return FALSE; }

1 0

Alexandre Julliard : kernelbase: Add support for the PROC_THREAD_ATTRIBUTE_MACHINE_TYPE attribute.
by Alexandre Julliard 24 May '23

24 May '23

Module: wine Branch: master Commit: d203af0fd74a72ffc01e4f3c090d8d285bad7742 URL: https://gitlab.winehq.org/wine/wine/-/commit/d203af0fd74a72ffc01e4f3c090d8d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 24 09:11:48 2023 +0200 kernelbase: Add support for the PROC_THREAD_ATTRIBUTE_MACHINE_TYPE attribute. --- dlls/kernelbase/process.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 3be5fc22596..54a524abe04 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -257,13 +257,14 @@ struct _PROC_THREAD_ATTRIBUTE_LIST static NTSTATUS create_nt_process( HANDLE token, HANDLE debug, SECURITY_ATTRIBUTES *psa, SECURITY_ATTRIBUTES *tsa, DWORD process_flags, RTL_USER_PROCESS_PARAMETERS *params, - RTL_USER_PROCESS_INFORMATION *info, HANDLE parent, + RTL_USER_PROCESS_INFORMATION *info, + HANDLE parent, USHORT machine, const struct proc_thread_attr *handle_list, const struct proc_thread_attr *job_list) { OBJECT_ATTRIBUTES process_attr, thread_attr; PS_CREATE_INFO create_info; - ULONG_PTR buffer[offsetof( PS_ATTRIBUTE_LIST, Attributes[8] ) / sizeof(ULONG_PTR)]; + ULONG_PTR buffer[offsetof( PS_ATTRIBUTE_LIST, Attributes[9] ) / sizeof(ULONG_PTR)]; PS_ATTRIBUTE_LIST *attr = (PS_ATTRIBUTE_LIST *)buffer; UNICODE_STRING nameW; NTSTATUS status; @@ -330,6 +331,14 @@ static NTSTATUS create_nt_process( HANDLE token, HANDLE debug, SECURITY_ATTRIBUT attr->Attributes[pos].ReturnLength = NULL; pos++; } + if (machine) + { + attr->Attributes[pos].Attribute = PS_ATTRIBUTE_MACHINE_TYPE; + attr->Attributes[pos].Size = sizeof(machine); + attr->Attributes[pos].Value = machine; + attr->Attributes[pos].ReturnLength = NULL; + pos++; + } attr->TotalLength = offsetof( PS_ATTRIBUTE_LIST, Attributes[pos] ); InitializeObjectAttributes( &process_attr, NULL, 0, NULL, psa ? psa->lpSecurityDescriptor : NULL ); @@ -371,7 +380,7 @@ static NTSTATUS create_vdm_process( HANDLE token, HANDLE debug, SECURITY_ATTRIBU winevdm, params->ImagePathName.Buffer, params->CommandLine.Buffer ); RtlInitUnicodeString( &params->ImagePathName, winevdm ); RtlInitUnicodeString( &params->CommandLine, newcmdline ); - status = create_nt_process( token, debug, psa, tsa, flags, params, info, NULL, NULL, NULL ); + status = create_nt_process( token, debug, psa, tsa, flags, params, info, 0, 0, NULL, NULL ); HeapFree( GetProcessHeap(), 0, newcmdline ); return status; } @@ -400,7 +409,7 @@ static NTSTATUS create_cmd_process( HANDLE token, HANDLE debug, SECURITY_ATTRIBU swprintf( newcmdline, len, L"%s /s/c \"%s\"", comspec, params->CommandLine.Buffer ); RtlInitUnicodeString( &params->ImagePathName, comspec ); RtlInitUnicodeString( &params->CommandLine, newcmdline ); - status = create_nt_process( token, debug, psa, tsa, flags, params, info, NULL, NULL, NULL ); + status = create_nt_process( token, debug, psa, tsa, flags, params, info, 0, 0, NULL, NULL ); RtlFreeHeap( GetProcessHeap(), 0, newcmdline ); return status; } @@ -510,6 +519,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalW( HANDLE token, const WCHAR RTL_USER_PROCESS_INFORMATION rtl_info; HANDLE parent = 0, debug = 0; ULONG nt_flags = 0; + USHORT machine = 0; NTSTATUS status; /* Process the AppName and/or CmdLine to get module name and path */ @@ -602,6 +612,10 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalW( HANDLE token, const WCHAR TRACE( "PROC_THREAD_ATTRIBUTE_JOB_LIST handle count %Iu.\n", attrs->attrs[i].size / sizeof(HANDLE) ); break; + case PROC_THREAD_ATTRIBUTE_MACHINE_TYPE: + machine = *(USHORT *)attrs->attrs[i].value; + TRACE( "PROC_THREAD_ATTRIBUTE_MACHINE %x.\n", machine ); + break; default: FIXME("Unsupported attribute %#Ix.\n", attrs->attrs[i].attr); break; @@ -616,7 +630,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateProcessInternalW( HANDLE token, const WCHAR if (flags & CREATE_SUSPENDED) nt_flags |= PROCESS_CREATE_FLAGS_SUSPENDED; status = create_nt_process( token, debug, process_attr, thread_attr, - nt_flags, params, &rtl_info, parent, handle_list, job_list ); + nt_flags, params, &rtl_info, parent, machine, handle_list, job_list ); switch (status) { case STATUS_SUCCESS: @@ -1722,6 +1736,9 @@ static inline DWORD validate_proc_thread_attribute( DWORD_PTR attr, SIZE_T size case PROC_THREAD_ATTRIBUTE_JOB_LIST: if ((size / sizeof(HANDLE)) * sizeof(HANDLE) != size) return ERROR_BAD_LENGTH; break; + case PROC_THREAD_ATTRIBUTE_MACHINE_TYPE: + if (size != sizeof(USHORT)) return ERROR_BAD_LENGTH; + break; default: FIXME( "Unhandled attribute %Iu\n", attr & PROC_THREAD_ATTRIBUTE_NUMBER ); return ERROR_NOT_SUPPORTED;

1 0

Alexandre Julliard : start: Move memory allocation into parse_title().
by Alexandre Julliard 24 May '23

24 May '23

Module: wine Branch: master Commit: 4ae7de5bf786ead7d453f66540f797ff6d49682b URL: https://gitlab.winehq.org/wine/wine/-/commit/4ae7de5bf786ead7d453f66540f797… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 24 09:12:31 2023 +0200 start: Move memory allocation into parse_title(). --- programs/start/start.c | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/programs/start/start.c b/programs/start/start.c index 4fd6cfc4481..c1cc58df7c1 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -220,7 +220,7 @@ static BOOL is_option(const WCHAR* arg, const WCHAR* opt) arg, -1, opt, -1) == CSTR_EQUAL; } -static void parse_title(const WCHAR *arg, WCHAR *title, int size) +static WCHAR *parse_title(const WCHAR *arg) { /* See: * WCMD_start() in programs/cmd/builtins.c @@ -228,15 +228,13 @@ static void parse_title(const WCHAR *arg, WCHAR *title, int size) * The shell has already tokenized the command line for us. * All we need to do is filter out all the quotes. */ - int next; const WCHAR *p = arg; + WCHAR *title = malloc( wcslen(arg) * sizeof(WCHAR) ); - for (next = 0; next < (size-1) && *p; p++) { - if (*p != '"') - title[next++] = *p; - } - title[next] = '\0'; + for (next = 0; *p; p++) if (*p != '"') title[next++] = *p; + title[next] = 0; + return title; } static BOOL search_path(const WCHAR *firstParam, WCHAR **full_path) @@ -417,15 +415,7 @@ int __cdecl wmain (int argc, WCHAR *argv[]) for (i=1; i<argc; i++) { /* parse first quoted argument as console title */ if (!title && argv[i][0] == '"') { - /* it will remove at least 1 quote */ - int maxChars = lstrlenW(argv[1]); - title = HeapAlloc(GetProcessHeap(), 0, maxChars*sizeof(WCHAR)); - if (title) - parse_title(argv[i], title, maxChars); - else { - WINE_ERR("out of memory\n"); - ExitProcess(1); - } + title = parse_title(argv[i]); continue; } if (argv[i][0] != '/') @@ -669,7 +659,6 @@ done: HeapFree( GetProcessHeap(), 0, dos_filename ); HeapFree( GetProcessHeap(), 0, fullpath ); HeapFree( GetProcessHeap(), 0, parent_directory ); - HeapFree( GetProcessHeap(), 0, title ); if (sei.fMask & SEE_MASK_NOCLOSEPROCESS) { DWORD exitcode;

1 0

Alexandre Julliard : start: Add a separate helper to parse command line options.
by Alexandre Julliard 24 May '23

24 May '23

Module: wine Branch: master Commit: df0483aa9bdf0512072fd9dfaad059b1d5882ce8 URL: https://gitlab.winehq.org/wine/wine/-/commit/df0483aa9bdf0512072fd9dfaad059… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 24 09:12:54 2023 +0200 start: Add a separate helper to parse command line options. --- programs/start/start.c | 377 +++++++++++++++++++++++-------------------------- 1 file changed, 177 insertions(+), 200 deletions(-)

1 0

Alexandre Julliard : start: Use CRT allocation functions.
by Alexandre Julliard 24 May '23

24 May '23

Module: wine Branch: master Commit: 850e3bcc5da106b58256d41cb93695a93dae853d URL: https://gitlab.winehq.org/wine/wine/-/commit/850e3bcc5da106b58256d41cb93695… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 24 09:13:16 2023 +0200 start: Use CRT allocation functions. --- programs/start/start.c | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/programs/start/start.c b/programs/start/start.c index 8eff595d44b..4c53c1eca20 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -51,11 +51,11 @@ static void output(const WCHAR *message) char *mesA; /* Convert to OEM, then output */ len = WideCharToMultiByte( GetOEMCP(), 0, message, wlen, NULL, 0, NULL, NULL ); - mesA = HeapAlloc(GetProcessHeap(), 0, len*sizeof(char)); + mesA = malloc(len); if (!mesA) return; WideCharToMultiByte( GetOEMCP(), 0, message, wlen, mesA, len, NULL, NULL ); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), mesA, len, &count, FALSE); - HeapFree(GetProcessHeap(), 0, mesA); + free(mesA); } } @@ -207,7 +207,7 @@ static WCHAR *get_parent_dir(WCHAR* path) else len = last_slash - path + 1; - result = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + result = malloc( len * sizeof(WCHAR) ); CopyMemory(result, path, (len-1)*sizeof(WCHAR)); result[len-1] = '\0'; @@ -387,10 +387,8 @@ static BOOL search_path(const WCHAR *firstParam, WCHAR **full_path) } if (found) { - int needed_size = lstrlenW(thisDir) + 1; - *full_path = HeapAlloc(GetProcessHeap(), 0, needed_size * sizeof(WCHAR)); - if (*full_path) - lstrcpyW(*full_path, thisDir); + *full_path = wcsdup(thisDir); + if (!*full_path) fatal_string_error(STRING_EXECFAIL, ERROR_OUTOFMEMORY, firstParam); return TRUE; } } @@ -535,11 +533,7 @@ static void parse_command_line( int argc, WCHAR *argv[] ) { WCHAR *fullpath; - if (search_path(file, &fullpath)) - { - if (!fullpath) fatal_string_error(STRING_EXECFAIL, ERROR_OUTOFMEMORY, file); - opts.sei.lpFile = fullpath; - } + if (search_path(file, &fullpath)) opts.sei.lpFile = fullpath; else opts.sei.lpFile = file; } } @@ -555,12 +549,12 @@ int __cdecl wmain (int argc, WCHAR *argv[]) WCHAR *commandline; STARTUPINFOW startup_info; PROCESS_INFORMATION process_information; + int len = lstrlenW(opts.sei.lpFile) + 4 + lstrlenW(opts.sei.lpParameters); /* explorer on windows always quotes the filename when running a binary on windows (see bug 5224) so we have to use CreateProcessW in this case */ - commandline = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(opts.sei.lpFile)+4+lstrlenW(opts.sei.lpParameters))*sizeof(WCHAR)); - swprintf(commandline, lstrlenW(opts.sei.lpFile) + 4 + lstrlenW(opts.sei.lpParameters), - L"\"%s\" %s", opts.sei.lpFile, opts.sei.lpParameters); + commandline = malloc(len * sizeof(WCHAR)); + swprintf(commandline, len, L"\"%s\" %s", opts.sei.lpFile, opts.sei.lpParameters); ZeroMemory(&startup_info, sizeof(startup_info)); startup_info.cb = sizeof(startup_info); @@ -597,13 +591,13 @@ int __cdecl wmain (int argc, WCHAR *argv[]) { WCHAR *start, *ptr; - env = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + env = malloc(size * sizeof(WCHAR)); if (!env) fatal_string_error(STRING_EXECFAIL, ERROR_OUTOFMEMORY, opts.sei.lpFile); GetEnvironmentVariableW(L"PATHEXT", env, size); filename_len = lstrlenW(filename); - name = HeapAlloc(GetProcessHeap(), 0, (filename_len + size) * sizeof(WCHAR)); + name = malloc((filename_len + size) * sizeof(WCHAR)); if (!name) fatal_string_error(STRING_EXECFAIL, ERROR_OUTOFMEMORY, opts.sei.lpFile); @@ -621,13 +615,7 @@ int __cdecl wmain (int argc, WCHAR *argv[]) memcpy(&name[filename_len], start, (ptr - start) * sizeof(WCHAR)); name[filename_len + (ptr - start)] = 0; - if (ShellExecuteExW(&opts.sei)) - { - HeapFree(GetProcessHeap(), 0, name); - HeapFree(GetProcessHeap(), 0, env); - goto done; - } - + if (ShellExecuteExW(&opts.sei)) goto done; start = ptr + 1; }

1 0

Francisco Casas : tests: Add minimal tests for temp lifetimes within a loop.
by Alexandre Julliard 24 May '23

24 May '23

Module: vkd3d Branch: master Commit: fbd2df2ad5080f689d8c5548fe9ca91b8481162e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fbd2df2ad5080f689d8c5548fe9ca… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon May 15 15:57:38 2023 -0400 tests: Add minimal tests for temp lifetimes within a loop. --- Makefile.am | 1 + tests/loop.shader_test | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/Makefile.am b/Makefile.am index 0a61365d..954b0ffd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -136,6 +136,7 @@ vkd3d_shader_tests = \ tests/load-level.shader_test \ tests/log.shader_test \ tests/logic-operations.shader_test \ + tests/loop.shader_test \ tests/majority-syntax.shader_test \ tests/math.shader_test \ tests/matrix-semantics.shader_test \ diff --git a/tests/loop.shader_test b/tests/loop.shader_test new file mode 100644 index 00000000..08cf7e55 --- /dev/null +++ b/tests/loop.shader_test @@ -0,0 +1,43 @@ +[pixel shader] +float a; + +float4 main() : sv_target +{ + float res = 0; + + for (int i = 0; i < 10; ++i) + { + res += a; + // The temp copy of 'a' must reserve its registers for the rest of the loop. + // It shall not be overwritten. + } + return res; +} + +[test] +uniform 0 float 5.0 +draw quad +todo probe all rgba (50.0, 50.0, 50.0, 50.0) + + +[pixel shader] +float a; + +float4 main() : sv_target +{ + float res = 0; + + for (int i = 0; i < 10; ++i) + { + res += a; + // The temp copy of 'a' must reserve its registers for the rest of the loop. + // It shall not be overwritten. + i++; + } + return res; +} + +[test] +uniform 0 float 4.0 +draw quad +todo probe all rgba (20.0, 20.0, 20.0, 20.0)

1 0

Francisco Casas : vkd3d-shader/hlsl: Extend the liveness of nodes produced outside loops.
by Alexandre Julliard 24 May '23

24 May '23

Module: vkd3d Branch: master Commit: e060773c1951ceb4a7cca8b61ebecf661fe0f5e0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e060773c1951ceb4a7cca8b61ebec… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed May 10 12:30:39 2023 -0400 vkd3d-shader/hlsl: Extend the liveness of nodes produced outside loops. Otherwise, it is possible that the register used by the temp is overridden by a subsequent instruction within the same loop. --- libs/vkd3d-shader/hlsl_codegen.c | 54 ++++++++++++++++++++-------------------- tests/loop.shader_test | 4 +-- tests/return.shader_test | 6 ++--- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index b4e10c97..bbb5223b 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -2587,9 +2587,9 @@ static void allocate_register_reservations(struct hlsl_ctx *ctx) /* Compute the earliest and latest liveness for each variable. In the case that * a variable is accessed inside of a loop, we promote its liveness to extend - * to at least the range of the entire loop. Note that we don't need to do this - * for anonymous nodes, since there's currently no way to use a node which was - * calculated in an earlier iteration of the loop. */ + * to at least the range of the entire loop. We also do this for nodes, so that + * nodes produced before the loop have their temp register protected from being + * overridden after the last read within an iteration. */ static void compute_liveness_recurse(struct hlsl_block *block, unsigned int loop_first, unsigned int loop_last) { struct hlsl_ir_node *instr; @@ -2597,7 +2597,7 @@ static void compute_liveness_recurse(struct hlsl_block *block, unsigned int loop LIST_FOR_EACH_ENTRY(instr, &block->instrs, struct hlsl_ir_node, entry) { - const unsigned int var_last_read = loop_last ? max(instr->index, loop_last) : instr->index; + const unsigned int last_read = loop_last ? max(instr->index, loop_last) : instr->index; switch (instr->type) { @@ -2612,9 +2612,9 @@ static void compute_liveness_recurse(struct hlsl_block *block, unsigned int loop var = store->lhs.var; if (!var->first_write) var->first_write = loop_first ? min(instr->index, loop_first) : instr->index; - store->rhs.node->last_read = instr->index; + store->rhs.node->last_read = last_read; if (store->lhs.offset.node) - store->lhs.offset.node->last_read = instr->index; + store->lhs.offset.node->last_read = last_read; break; } case HLSL_IR_EXPR: @@ -2623,7 +2623,7 @@ static void compute_liveness_recurse(struct hlsl_block *block, unsigned int loop unsigned int i; for (i = 0; i < ARRAY_SIZE(expr->operands) && expr->operands[i].node; ++i) - expr->operands[i].node->last_read = instr->index; + expr->operands[i].node->last_read = last_read; break; } case HLSL_IR_IF: @@ -2632,7 +2632,7 @@ static void compute_liveness_recurse(struct hlsl_block *block, unsigned int loop compute_liveness_recurse(&iff->then_block, loop_first, loop_last); compute_liveness_recurse(&iff->else_block, loop_first, loop_last); - iff->condition.node->last_read = instr->index; + iff->condition.node->last_read = last_read; break; } case HLSL_IR_LOAD: @@ -2640,9 +2640,9 @@ static void compute_liveness_recurse(struct hlsl_block *block, unsigned int loop struct hlsl_ir_load *load = hlsl_ir_load(instr); var = load->src.var; - var->last_read = max(var->last_read, var_last_read); + var->last_read = max(var->last_read, last_read); if (load->src.offset.node) - load->src.offset.node->last_read = instr->index; + load->src.offset.node->last_read = last_read; break; } case HLSL_IR_LOOP: @@ -2658,28 +2658,28 @@ static void compute_liveness_recurse(struct hlsl_block *block, unsigned int loop struct hlsl_ir_resource_load *load = hlsl_ir_resource_load(instr); var = load->resource.var; - var->last_read = max(var->last_read, var_last_read); + var->last_read = max(var->last_read, last_read); if (load->resource.offset.node) - load->resource.offset.node->last_read = instr->index; + load->resource.offset.node->last_read = last_read; if ((var = load->sampler.var)) { - var->last_read = max(var->last_read, var_last_read); + var->last_read = max(var->last_read, last_read); if (load->sampler.offset.node) - load->sampler.offset.node->last_read = instr->index; + load->sampler.offset.node->last_read = last_read; } - load->coords.node->last_read = instr->index; + load->coords.node->last_read = last_read; if (load->texel_offset.node) - load->texel_offset.node->last_read = instr->index; + load->texel_offset.node->last_read = last_read; if (load->lod.node) - load->lod.node->last_read = instr->index; + load->lod.node->last_read = last_read; if (load->ddx.node) - load->ddx.node->last_read = instr->index; + load->ddx.node->last_read = last_read; if (load->ddy.node) - load->ddy.node->last_read = instr->index; + load->ddy.node->last_read = last_read; if (load->sample_index.node) - load->sample_index.node->last_read = instr->index; + load->sample_index.node->last_read = last_read; break; } case HLSL_IR_RESOURCE_STORE: @@ -2687,26 +2687,26 @@ static void compute_liveness_recurse(struct hlsl_block *block, unsigned int loop struct hlsl_ir_resource_store *store = hlsl_ir_resource_store(instr); var = store->resource.var; - var->last_read = max(var->last_read, var_last_read); + var->last_read = max(var->last_read, last_read); if (store->resource.offset.node) - store->resource.offset.node->last_read = instr->index; - store->coords.node->last_read = instr->index; - store->value.node->last_read = instr->index; + store->resource.offset.node->last_read = last_read; + store->coords.node->last_read = last_read; + store->value.node->last_read = last_read; break; } case HLSL_IR_SWIZZLE: { struct hlsl_ir_swizzle *swizzle = hlsl_ir_swizzle(instr); - swizzle->val.node->last_read = instr->index; + swizzle->val.node->last_read = last_read; break; } case HLSL_IR_INDEX: { struct hlsl_ir_index *index = hlsl_ir_index(instr); - index->val.node->last_read = instr->index; - index->idx.node->last_read = instr->index; + index->val.node->last_read = last_read; + index->idx.node->last_read = last_read; break; } case HLSL_IR_CONSTANT: diff --git a/tests/loop.shader_test b/tests/loop.shader_test index 08cf7e55..75a31f7a 100644 --- a/tests/loop.shader_test +++ b/tests/loop.shader_test @@ -17,7 +17,7 @@ float4 main() : sv_target [test] uniform 0 float 5.0 draw quad -todo probe all rgba (50.0, 50.0, 50.0, 50.0) +probe all rgba (50.0, 50.0, 50.0, 50.0) [pixel shader] @@ -40,4 +40,4 @@ float4 main() : sv_target [test] uniform 0 float 4.0 draw quad -todo probe all rgba (20.0, 20.0, 20.0, 20.0) +probe all rgba (20.0, 20.0, 20.0, 20.0) diff --git a/tests/return.shader_test b/tests/return.shader_test index 3c9ea611..9f800d1a 100644 --- a/tests/return.shader_test +++ b/tests/return.shader_test @@ -175,15 +175,15 @@ probe all rgba (0.2, 0.2, 0.2, 0.2) 1 uniform 0 float 0.3 draw quad -todo probe all rgba (0.4, 0.4, 0.4, 0.4) 1 +probe all rgba (0.4, 0.4, 0.4, 0.4) 1 uniform 0 float 0.7 draw quad -todo probe all rgba (0.8, 0.8, 0.8, 0.8) 1 +probe all rgba (0.8, 0.8, 0.8, 0.8) 1 uniform 0 float 0.9 draw quad -todo probe all rgba (0.9, 0.9, 0.9, 0.9) 1 +probe all rgba (0.9, 0.9, 0.9, 0.9) 1 [pixel shader]

1 0

Davide Beatrici : explorer: Fix uninitialized variable warning.
by Alexandre Julliard 23 May '23

23 May '23

Module: wine Branch: master Commit: f266dc094a9b4fbe95792ed706891609901834e3 URL: https://gitlab.winehq.org/wine/wine/-/commit/f266dc094a9b4fbe95792ed7068916… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sat May 20 07:34:03 2023 +0200 explorer: Fix uninitialized variable warning. programs/explorer/desktop.c:104:16: warning: ‘hres’ may be used uninitialized in this function [-Wmaybe-uninitialized] 104 | return hres; | ^~~~ --- programs/explorer/desktop.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 81eb0d1d01b..0e370fe3c2f 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -98,10 +98,11 @@ static HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) { HRESULT hres; - if (!typelib) + if (!typelib) { hres = load_typelib(); - if (!typelib) - return hres; + if (!typelib) + return hres; + } if (!typeinfos[tid]) { ITypeInfo *ti;

1 0

Zebediah Figura : qcap/tests: Remove duplicated tests for allocator identity.
by Alexandre Julliard 23 May '23

23 May '23

Module: wine Branch: master Commit: bc9c8684fdbde6c39eb7fbeb9954bcf97dec0ac4 URL: https://gitlab.winehq.org/wine/wine/-/commit/bc9c8684fdbde6c39eb7fbeb9954bc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 23 11:41:05 2023 -0500 qcap/tests: Remove duplicated tests for allocator identity. We test once above that the source does not use the existing allocator, but then implicitly release the allocator we are testing against (when the source assigns a new allocator to the sink). As a result, these ok() statements were testing that newly allocated allocators had a different address than the original allocator, which of course sometimes fails. Since we don't need to perform this test more than once anyway, just get rid of the offending ok() statements. --- dlls/qcap/tests/audiorecord.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/qcap/tests/audiorecord.c b/dlls/qcap/tests/audiorecord.c index ed6c54648d0..e0a130fefb3 100644 --- a/dlls/qcap/tests/audiorecord.c +++ b/dlls/qcap/tests/audiorecord.c @@ -705,8 +705,6 @@ static void test_source_allocator(IFilterGraph2 *graph, IMediaControl *control, hr = IFilterGraph2_ConnectDirect(graph, source, &testsink->sink.pin.IPin_iface, &mt); ok(hr == S_OK, "Got hr %#lx.\n", hr); - todo_wine ok(testsink->sink.pAllocator && testsink->sink.pAllocator != allocator, - "Got unexpected allocator %p.\n", testsink->sink.pAllocator); hr = IMemAllocator_GetProperties(testsink->sink.pAllocator, &props); ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(props.cBuffers == req_props.cBuffers, "Got %ld buffers.\n", props.cBuffers); @@ -728,8 +726,6 @@ static void test_source_allocator(IFilterGraph2 *graph, IMediaControl *control, hr = IFilterGraph2_ConnectDirect(graph, source, &testsink->sink.pin.IPin_iface, &mt); ok(hr == S_OK, "Got hr %#lx.\n", hr); - todo_wine ok(testsink->sink.pAllocator && testsink->sink.pAllocator != allocator, - "Got unexpected allocator %p.\n", testsink->sink.pAllocator); hr = IMemAllocator_GetProperties(testsink->sink.pAllocator, &props); ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(props.cBuffers == 4, "Got %ld buffers.\n", props.cBuffers);

1 0

Jactry Zeng : comdlg32: Calculate button height of toolbar with DPI for item dialog.
by Alexandre Julliard 23 May '23

23 May '23

Module: wine Branch: master Commit: 80b332c050e25247eebe4fa9e2a86a42b8425709 URL: https://gitlab.winehq.org/wine/wine/-/commit/80b332c050e25247eebe4fa9e2a86a… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu May 18 01:36:26 2023 -0500 comdlg32: Calculate button height of toolbar with DPI for item dialog. --- dlls/comdlg32/itemdlg.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 95778c2f358..e6f4ecb55b9 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -1896,6 +1896,7 @@ static void init_toolbar(FileDialogImpl *This, HWND hwnd) HWND htoolbar; TBADDBITMAP tbab; TBBUTTON button[2]; + int height; htoolbar = CreateWindowExW(0, TOOLBARCLASSNAMEW, NULL, TBSTYLE_FLAT | WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, @@ -1920,7 +1921,8 @@ static void init_toolbar(FileDialogImpl *This, HWND hwnd) button[1].iString = 0; SendMessageW(htoolbar, TB_ADDBUTTONSW, 2, (LPARAM)button); - SendMessageW(htoolbar, TB_SETBUTTONSIZE, 0, MAKELPARAM(24,24)); + height = MulDiv(24, This->dpi_y, USER_DEFAULT_SCREEN_DPI); + SendMessageW(htoolbar, TB_SETBUTTONSIZE, 0, MAKELPARAM(height, height)); SendMessageW(htoolbar, TB_AUTOSIZE, 0, 0); }

1 0