May 2024 - Wine-Commits - list.winehq.org

Nikolay Sivov : vkd3d-shader/fx: Write depth stencil view object variables.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: vkd3d Branch: master Commit: a879ac55363f19e2387b943b8d944577fbc4f191 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a879ac55363f19e2387b943b8d944… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 6 23:29:15 2024 +0200 vkd3d-shader/fx: Write depth stencil view object variables. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/fx.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index 07c78528..e99ca782 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -87,6 +87,7 @@ struct fx_write_context uint32_t shared_object_count; uint32_t shader_variable_count; uint32_t parameter_count; + uint32_t dsv_count; int status; bool child_effect; @@ -1032,6 +1033,10 @@ static void write_fx_4_object_variable(struct hlsl_ir_var *var, struct fx_write_ ++fx->shader_variable_count; break; + case HLSL_CLASS_DEPTH_STENCIL_VIEW: + fx->dsv_count += elements_count; + break; + default: hlsl_fixme(ctx, &ctx->location, "Writing initializer for object type %u is not implemented.", type->e.numeric.type); @@ -1117,6 +1122,7 @@ static bool is_object_variable(const struct hlsl_ir_var *var) switch (type->class) { + case HLSL_CLASS_DEPTH_STENCIL_VIEW: case HLSL_CLASS_PIXEL_SHADER: case HLSL_CLASS_RENDER_TARGET_VIEW: case HLSL_CLASS_SAMPLER: @@ -1182,7 +1188,7 @@ static int hlsl_fx_4_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out) put_u32(&buffer, 0); /* Rasterizer state count. */ put_u32(&buffer, 0); /* Sampler state count. */ put_u32(&buffer, 0); /* Rendertarget view count. */ - put_u32(&buffer, 0); /* Depth stencil view count. */ + put_u32(&buffer, fx.dsv_count); put_u32(&buffer, fx.shader_variable_count); /* Shader count. */ put_u32(&buffer, 0); /* Inline shader count. */ @@ -1240,7 +1246,7 @@ static int hlsl_fx_5_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out) put_u32(&buffer, 0); /* Rasterizer state count. */ put_u32(&buffer, 0); /* Sampler state count. */ put_u32(&buffer, 0); /* Rendertarget view count. */ - put_u32(&buffer, 0); /* Depth stencil view count. */ + put_u32(&buffer, fx.dsv_count); put_u32(&buffer, fx.shader_variable_count); /* Shader count. */ put_u32(&buffer, 0); /* Inline shader count. */ put_u32(&buffer, fx.group_count); /* Group count. */

1 0

Nikolay Sivov : vkd3d-shader/fx: Set texture count in the header.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: vkd3d Branch: master Commit: cb1a271151e845ce309f45dd18afbd3ffaf9271d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/cb1a271151e845ce309f45dd18afb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 20 16:28:34 2024 +0200 vkd3d-shader/fx: Set texture count in the header. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/fx.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index 9e61fc23..9528bf98 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -89,6 +89,7 @@ struct fx_write_context uint32_t parameter_count; uint32_t dsv_count; uint32_t rtv_count; + uint32_t texture_count; int status; bool child_effect; @@ -1025,6 +1026,8 @@ static void write_fx_4_object_variable(struct hlsl_ir_var *var, struct fx_write_ fx->rtv_count += elements_count; break; case HLSL_CLASS_TEXTURE: + fx->texture_count += elements_count; + break; case HLSL_CLASS_UAV: break; @@ -1185,7 +1188,7 @@ static int hlsl_fx_4_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out) put_u32(&buffer, fx.technique_count); size_offset = put_u32(&buffer, 0); /* Unstructured size. */ put_u32(&buffer, 0); /* String count. */ - put_u32(&buffer, 0); /* Texture object count. */ + put_u32(&buffer, fx.texture_count); put_u32(&buffer, 0); /* Depth stencil state count. */ put_u32(&buffer, 0); /* Blend state count. */ put_u32(&buffer, 0); /* Rasterizer state count. */ @@ -1243,7 +1246,7 @@ static int hlsl_fx_5_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out) put_u32(&buffer, fx.technique_count); size_offset = put_u32(&buffer, 0); /* Unstructured size. */ put_u32(&buffer, 0); /* String count. */ - put_u32(&buffer, 0); /* Texture object count. */ + put_u32(&buffer, fx.texture_count); put_u32(&buffer, 0); /* Depth stencil state count. */ put_u32(&buffer, 0); /* Blend state count. */ put_u32(&buffer, 0); /* Rasterizer state count. */

1 0

Zebediah Figura : vkd3d-shader/fx: Skip uniform copy logic for global variables.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: vkd3d Branch: master Commit: c2eb563e503c787ab63b79971e4c462a2225e08d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c2eb563e503c787ab63b79971e4c4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 23 21:38:06 2024 +0200 vkd3d-shader/fx: Skip uniform copy logic for global variables. --- libs/vkd3d-shader/fx.c | 14 ++++++++++---- libs/vkd3d-shader/hlsl.h | 1 - libs/vkd3d-shader/hlsl_codegen.c | 17 +++++------------ 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index fae9d791..07c78528 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -169,7 +169,7 @@ static void fx_write_context_init(struct hlsl_ctx *ctx, const struct fx_write_co struct fx_write_context *fx) { unsigned int version = ctx->profile->major_version; - struct hlsl_block block; + struct hlsl_ir_var *var; memset(fx, 0, sizeof(*fx)); @@ -197,9 +197,15 @@ static void fx_write_context_init(struct hlsl_ctx *ctx, const struct fx_write_co fx->child_effect = fx->ops->are_child_effects_supported && ctx->child_effect; fx->include_empty_buffers = version == 4 && ctx->include_empty_buffers; - hlsl_block_init(&block); - hlsl_prepend_global_uniform_copy(fx->ctx, &block); - hlsl_block_cleanup(&block); + LIST_FOR_EACH_ENTRY(var, &ctx->globals->vars, struct hlsl_ir_var, scope_entry) + { + if (var->storage_modifiers & HLSL_STORAGE_UNIFORM) + { + list_add_tail(&ctx->extern_vars, &var->extern_entry); + var->is_uniform = 1; + } + } + hlsl_calculate_buffer_offsets(fx->ctx); } diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 556d6b5f..4e33c1bd 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -1400,7 +1400,6 @@ unsigned int hlsl_type_get_sm4_offset(const struct hlsl_type *type, unsigned int bool hlsl_types_are_equal(const struct hlsl_type *t1, const struct hlsl_type *t2); void hlsl_calculate_buffer_offsets(struct hlsl_ctx *ctx); -void hlsl_prepend_global_uniform_copy(struct hlsl_ctx *ctx, struct hlsl_block *block); const struct hlsl_type *hlsl_get_multiarray_element_type(const struct hlsl_type *type); unsigned int hlsl_get_multiarray_size(const struct hlsl_type *type); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index e0254ef4..8882deaf 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -5314,17 +5314,6 @@ static void remove_unreachable_code(struct hlsl_ctx *ctx, struct hlsl_block *bod } } -void hlsl_prepend_global_uniform_copy(struct hlsl_ctx *ctx, struct hlsl_block *body) -{ - struct hlsl_ir_var *var; - - LIST_FOR_EACH_ENTRY(var, &ctx->globals->vars, struct hlsl_ir_var, scope_entry) - { - if (var->storage_modifiers & HLSL_STORAGE_UNIFORM) - prepend_uniform_copy(ctx, body, var); - } -} - int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry_func, enum vkd3d_shader_target_type target_type, struct vkd3d_shader_code *out) { @@ -5353,7 +5342,11 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry lower_ir(ctx, lower_matrix_swizzles, body); lower_ir(ctx, lower_index_loads, body); - hlsl_prepend_global_uniform_copy(ctx, body); + LIST_FOR_EACH_ENTRY(var, &ctx->globals->vars, struct hlsl_ir_var, scope_entry) + { + if (var->storage_modifiers & HLSL_STORAGE_UNIFORM) + prepend_uniform_copy(ctx, body, var); + } for (i = 0; i < entry_func->parameters.count; ++i) {

1 0

Francisco Casas : vkd3d-shader/hlsl: Turn hlsl_state_block_entry arguments into hlsl_src.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: vkd3d Branch: master Commit: 68483d070f6f02c6d7c5d280dda719ab34dfd16e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/68483d070f6f02c6d7c5d280dda71… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Apr 19 15:15:19 2024 -0400 vkd3d-shader/hlsl: Turn hlsl_state_block_entry arguments into hlsl_src. This allows to apply passes that replace instructions in hlsl_state_block_entry.instrs. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 4 ++++ libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/hlsl.y | 8 +++++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index bb25e0ea..96e73d23 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -136,7 +136,11 @@ struct hlsl_ir_var *hlsl_get_var(struct hlsl_scope *scope, const char *name) static void free_state_block_entry(struct hlsl_state_block_entry *entry) { + unsigned int i; + vkd3d_free(entry->name); + for (i = 0; i < entry->args_count; ++i) + hlsl_src_remove(&entry->args[i]); vkd3d_free(entry->args); hlsl_block_cleanup(entry->instrs); vkd3d_free(entry->instrs); diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 4a8e3524..556d6b5f 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -483,7 +483,7 @@ struct hlsl_state_block_entry struct hlsl_block *instrs; /* For assignments, arguments of the rhs initializer. */ - struct hlsl_ir_node **args; + struct hlsl_src *args; unsigned int args_count; }; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 266ed50c..79317bb0 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -6912,6 +6912,7 @@ state_block: | state_block stateblock_lhs_identifier state_block_index_opt '=' complex_initializer ';' { struct hlsl_state_block_entry *entry; + unsigned int i; if (!(entry = hlsl_alloc(ctx, sizeof(*entry)))) YYABORT; @@ -6921,8 +6922,13 @@ state_block: entry->lhs_index = $3.index; entry->instrs = $5.instrs; - entry->args = $5.args; + entry->args_count = $5.args_count; + if (!(entry->args = hlsl_alloc(ctx, sizeof(*entry->args) * entry->args_count))) + YYABORT; + for (i = 0; i < entry->args_count; ++i) + hlsl_src_from_node(&entry->args[i], $5.args[i]); + vkd3d_free($5.args); $$ = $1; state_block_add_entry($$, entry);

1 0

Eric Pouech : cmd: Introduce xrealloc helper.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: wine Branch: master Commit: 93354bbd88e51fbaf97897fa653014b870f7e736 URL: https://gitlab.winehq.org/wine/wine/-/commit/93354bbd88e51fbaf97897fa653014… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Apr 22 09:51:17 2024 +0200 cmd: Introduce xrealloc helper. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/directory.c | 8 +------- programs/cmd/wcmd.h | 7 ++++++- programs/cmd/wcmdmain.c | 6 +++--- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 709bbb52287..afec5f6ed75 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -271,13 +271,7 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le if (tmpLen > widest) widest = tmpLen; } - fd = realloc(fd, (entry_count + 1) * sizeof(WIN32_FIND_DATAW)); - if (fd == NULL) { - FindClose (hff); - WINE_ERR("Out of memory\n"); - errorlevel = 1; - return parms->next; - } + fd = xrealloc(fd, (entry_count + 1) * sizeof(WIN32_FIND_DATAW)); } while (FindNextFileW(hff, &fd[entry_count]) != 0); FindClose (hff); } diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 1935bbcdcd2..72e5ef1ad36 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -124,7 +124,12 @@ void WCMD_free_commands(CMD_LIST *cmds); void WCMD_execute (const WCHAR *orig_command, const WCHAR *redirects, CMD_LIST **cmdList, BOOL retrycall); -void *xalloc(size_t) __WINE_ALLOC_SIZE(1) __WINE_DEALLOC(free) __WINE_MALLOC; +void *xrealloc(void *, size_t) __WINE_ALLOC_SIZE(2) __WINE_DEALLOC(free) __WINE_MALLOC; + +static inline void *xalloc(size_t sz) +{ + return xrealloc(NULL, sz); +} static inline WCHAR *xstrdupW(const WCHAR *str) { diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 059920c9608..128610b0800 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -423,12 +423,12 @@ static void WCMD_show_prompt (BOOL newLine) { WCMD_output_asis (out_string); } -void *xalloc(size_t size) +void *xrealloc(void *ptr, size_t size) { void *ret; - ret = malloc(size); - if(!ret) { + if (!(ret = realloc(ptr, size))) + { ERR("Out of memory\n"); ExitProcess(1); }

1 0

Eric Pouech : cmd: Consistenly use the same variable to identify current command.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: wine Branch: master Commit: 371eda6c4c95319d11e84c4663c20bdf9ed0dabb URL: https://gitlab.winehq.org/wine/wine/-/commit/371eda6c4c95319d11e84c4663c20b… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Apr 9 12:55:44 2024 +0200 cmd: Consistenly use the same variable to identify current command. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/wcmdmain.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index eb66b29836e..ffd63d9771a 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1319,11 +1319,10 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, while (IsCharAlphaNumericW(whichcmd[count])) { count++; } - for (i=0; i<=WCMD_EXIT; i++) { + for (cmd_index=0; cmd_index<=WCMD_EXIT; cmd_index++) { if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - whichcmd, count, inbuilt[i], -1) == CSTR_EQUAL) break; + whichcmd, count, inbuilt[cmd_index], -1) == CSTR_EQUAL) break; } - cmd_index = i; parms_start = WCMD_skip_leading_spaces (&whichcmd[count]); /* If the next command is a pipe then we implement pipes by redirecting @@ -1491,15 +1490,15 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, WCMD_parse (parms_start, quals, param1, param2); WINE_TRACE("param1: %s, param2: %s\n", wine_dbgstr_w(param1), wine_dbgstr_w(param2)); - if (i <= WCMD_EXIT && (parms_start[0] == '/') && (parms_start[1] == '?')) { + if (cmd_index <= WCMD_EXIT && (parms_start[0] == '/') && (parms_start[1] == '?')) { /* this is a help request for a builtin program */ - i = WCMD_HELP; + cmd_index = WCMD_HELP; memcpy(parms_start, whichcmd, count * sizeof(WCHAR)); parms_start[count] = '\0'; } - switch (i) { + switch (cmd_index) { case WCMD_CALL: WCMD_call (parms_start); @@ -1633,8 +1632,8 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, these two commands, neither 'for' nor 'if' is supported when called, i.e. 'call if 1==1...' will fail. */ if (!retrycall) { - if (i==WCMD_FOR) WCMD_for (parms_start, cmdList); - else if (i==WCMD_IF) WCMD_if (parms_start, cmdList); + if (cmd_index==WCMD_FOR) WCMD_for (parms_start, cmdList); + else if (cmd_index==WCMD_IF) WCMD_if (parms_start, cmdList); break; } /* else: drop through */

1 0

Eric Pouech : cmd: No longer keep track of last element in command list.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: wine Branch: master Commit: 76237079d1430fec63ff37bbe90914252619a310 URL: https://gitlab.winehq.org/wine/wine/-/commit/76237079d1430fec63ff37bbe90914… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Apr 11 16:06:03 2024 +0200 cmd: No longer keep track of last element in command list. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/wcmdmain.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index ffd63d9771a..059920c9608 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1699,7 +1699,7 @@ static void WCMD_addCommand(WCHAR *command, int *commandLen, WCHAR *redirs, int *redirLen, WCHAR **copyTo, int **copyToLen, CMD_DELIMITERS prevDelim, int curDepth, - CMD_LIST **lastEntry, CMD_LIST **output) { + CMD_LIST **output) { CMD_LIST *thisEntry = NULL; @@ -1734,12 +1734,9 @@ static void WCMD_addCommand(WCHAR *command, int *commandLen, thisEntry->nextcommand = NULL; thisEntry->prevDelim = prevDelim; thisEntry->bracketDepth = curDepth; - if (*lastEntry) { - (*lastEntry)->nextcommand = thisEntry; - } else { - *output = thisEntry; - } - *lastEntry = thisEntry; + + for (; *output; output = &((*output)->nextcommand)) {} + *output = thisEntry; } @@ -1822,7 +1819,6 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE WCHAR *curCopyTo; int *curLen; int curDepth = 0; - CMD_LIST *lastEntry = NULL; CMD_DELIMITERS prevDelim = CMD_NONE; static WCHAR *extraSpace = NULL; /* Deliberately never freed */ BOOL inOneLine = FALSE; @@ -1842,6 +1838,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE int lineCurDepth; /* Bracket depth when line was read in */ BOOL resetAtEndOfLine = FALSE; /* Do we need to reset curdepth at EOL */ + *output = NULL; /* Allocate working space for a command read from keyboard, file etc */ if (!extraSpace) extraSpace = xalloc((MAXSTRING + 1) * sizeof(WCHAR)); @@ -2093,7 +2090,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE curRedirs, &curRedirsLen, &curCopyTo, &curLen, prevDelim, curDepth, - &lastEntry, output); + output); } @@ -2167,7 +2164,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE curRedirs, &curRedirsLen, &curCopyTo, &curLen, prevDelim, curDepth, - &lastEntry, output); + output); curDepth++; } else { @@ -2198,7 +2195,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE curRedirs, &curRedirsLen, &curCopyTo, &curLen, prevDelim, curDepth, - &lastEntry, output); + output); } @@ -2231,7 +2228,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE curRedirs, &curRedirsLen, &curCopyTo, &curLen, prevDelim, curDepth, - &lastEntry, output); + output); } /* Add an empty entry to the command list */ @@ -2240,7 +2237,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE curRedirs, &curRedirsLen, &curCopyTo, &curLen, prevDelim, curDepth, - &lastEntry, output); + output); curDepth--; /* Leave inIn if necessary */ @@ -2276,7 +2273,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE curRedirs, &curRedirsLen, &curCopyTo, &curLen, prevDelim, curDepth, - &lastEntry, output); + output); /* If we had a single line if or else, and we pretended to add brackets, end them now */

1 0

Eric Pouech : cmd: Use CRT's popen instead of rewriting it.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: wine Branch: master Commit: ae9bdbda3be2b4ab5be34463fe1daec6c11cc7e6 URL: https://gitlab.winehq.org/wine/wine/-/commit/ae9bdbda3be2b4ab5be34463fe1dae… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Apr 18 10:02:23 2024 +0200 cmd: Use CRT's popen instead of rewriting it. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/builtins.c | 69 +++++++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 39 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index ca703af52ec..779df2b65b0 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2062,47 +2062,38 @@ static void WCMD_parse_line(CMD_LIST *cmdStart, * * Returns a file handle which can be used to read the input lines from. */ -static FILE* WCMD_forf_getinput(BOOL usebackq, WCHAR *itemstr, BOOL iscmd) { - WCHAR temp_str[MAX_PATH]; - WCHAR temp_file[MAX_PATH]; - WCHAR temp_cmd[MAXSTRING]; - WCHAR *trimmed = NULL; - FILE* ret; - - /* Remove leading and trailing character (but there may be trailing whitespace too) */ - if ((iscmd && (itemstr[0] == '`' && usebackq)) || - (iscmd && (itemstr[0] == '\'' && !usebackq)) || - (!iscmd && (itemstr[0] == '"' && usebackq))) - { - trimmed = WCMD_strtrim(itemstr); - if (trimmed) { - itemstr = trimmed; - } - itemstr[lstrlenW(itemstr)-1] = 0x00; - itemstr++; - } - - if (iscmd) { - /* Get temp filename */ - GetTempPathW(ARRAY_SIZE(temp_str), temp_str); - GetTempFileNameW(temp_str, L"CMD", 0, temp_file); +static FILE* WCMD_forf_getinput(BOOL usebackq, WCHAR *itemstr, BOOL iscmd) +{ + WCHAR *trimmed = NULL; + FILE* ret; - /* Redirect output to the temporary file */ - wsprintfW(temp_str, L">%s", temp_file); - wsprintfW(temp_cmd, L"CMD.EXE /C %s", itemstr); - WINE_TRACE("Issuing '%s' with redirs '%s'\n", - wine_dbgstr_w(temp_cmd), wine_dbgstr_w(temp_str)); - WCMD_execute (temp_cmd, temp_str, NULL, FALSE); + /* Remove leading and trailing character (but there may be trailing whitespace too) */ + if ((iscmd && (itemstr[0] == '`' && usebackq)) || + (iscmd && (itemstr[0] == '\'' && !usebackq)) || + (!iscmd && (itemstr[0] == '"' && usebackq))) + { + trimmed = WCMD_strtrim(itemstr); + if (trimmed) + itemstr = trimmed; + itemstr[lstrlenW(itemstr)-1] = 0x00; + itemstr++; + } - /* Open the file, read line by line and process */ - ret = _wfopen(temp_file, L"rt,ccs=unicode"); - } else { - /* Open the file, read line by line and process */ - WINE_TRACE("Reading input to parse from '%s'\n", wine_dbgstr_w(itemstr)); - ret = _wfopen(itemstr, L"rt,ccs=unicode"); - } - free(trimmed); - return ret; + if (iscmd) + { + WCHAR temp_cmd[MAXSTRING]; + wsprintfW(temp_cmd, L"CMD.EXE /C %s", itemstr); + WINE_TRACE("Reading output of '%s'\n", wine_dbgstr_w(temp_cmd)); + ret = _wpopen(temp_cmd, L"rt,ccs=unicode"); + } + else + { + /* Open the file, read line by line and process */ + WINE_TRACE("Reading input to parse from '%s'\n", wine_dbgstr_w(itemstr)); + ret = _wfopen(itemstr, L"rt,ccs=unicode"); + } + free(trimmed); + return ret; } /**************************************************************************

1 0

Daniel Lehman : msvcrt/tests: Add result for Turkish_Türkiye.1254.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: wine Branch: master Commit: 218c4ac11564f57a2feb4486e4f661854f18bef5 URL: https://gitlab.winehq.org/wine/wine/-/commit/218c4ac11564f57a2feb4486e4f661… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed May 1 15:26:56 2024 -0700 msvcrt/tests: Add result for Turkish_Türkiye.1254. --- dlls/msvcrt/tests/locale.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index f77e8f93abb..ede9728517e 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -573,12 +573,14 @@ static void test_setlocale(void) ret = setlocale(LC_ALL, "trk"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) - ok(!strcmp(ret, "Turkish_Turkey.1254"), "ret = %s\n", ret); + ok(!strcmp(ret, "Turkish_Turkey.1254") + || !strcmp(ret, "Turkish_T\xfcrkiye.1254"), "ret = %s\n", ret); ret = setlocale(LC_ALL, "turkish"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) - ok(!strcmp(ret, "Turkish_Turkey.1254"), "ret = %s\n", ret); + ok(!strcmp(ret, "Turkish_Turkey.1254") + || !strcmp(ret, "Turkish_T\xfcrkiye.1254"), "ret = %s\n", ret); ret = setlocale(LC_ALL, "uk"); ok(ret != NULL, "ret == NULL\n");

1 0

Elizabeth Figura : maintainers: Change the full form of my name.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: wine Branch: master Commit: 06cb24bb65d0b91d4e77d03c17111f04d7d233c6 URL: https://gitlab.winehq.org/wine/wine/-/commit/06cb24bb65d0b91d4e77d03c17111f… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Wed May 8 00:15:17 2024 -0500 maintainers: Change the full form of my name. And update to a more reliable email address. --- .mailmap | 3 ++- AUTHORS | 2 +- MAINTAINERS | 22 +++++++++++----------- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.mailmap b/.mailmap index 7cf13e67174..2439fd362ad 100644 --- a/.mailmap +++ b/.mailmap @@ -25,6 +25,8 @@ Dimitrie O. Paun <dimi(a)bigfoot.com> Dimitrie O. Paun <dimi(a)lattica.com> EA Durbin <eadurbin(a)freebsd.org> Eduardo García <eduardo.garcia(a)gmx.com> +Elizabeth Figura <z.figura12(a)gmail.com> +Elizabeth Figura <zfigura(a)codeweavers.com> Erich Hoover <erich.e.hoover(a)gmail.com> Erich Hoover <erich.e.hoover(a)wine-staging.com> Erwin Wolff <erwinwolffnl(a)microformatica.com> @@ -156,7 +158,6 @@ William Poetra Yoga Hadisoesen <williampoetra(a)yahoo.com> Won Kyu Park <wkpark(a)kldp.org> Yuri Kozlov <yuriy.kozlov(a)gmail.com> Zachary Brown <zac(a)zacbrown.org> -Zebediah Figura <zfigura(a)codeweavers.com> Zoltan Nagy <nagyzoli(a)drotposta.hu> unidentified <9700584(a)cs.stadia.fi> unidentified <develop(a)stueben.com> diff --git a/AUTHORS b/AUTHORS index da301ba9d1a..117940d75ce 100644 --- a/AUTHORS +++ b/AUTHORS @@ -490,6 +490,7 @@ Ekaterine Papava Elias Benali Elias Ross Elie Morisse +Elizabeth Figura Emilio Cobos Álvarez Emmanuel Maillard Enol Puente @@ -1896,7 +1897,6 @@ Zachary Brown Zach Goldberg Zach Gorman Zach Smith -Zebediah Figura Zhangrong Huang Zhang Shuai Zhan Jianyu diff --git a/MAINTAINERS b/MAINTAINERS index 34c2acdd56b..22979d93ea1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -66,7 +66,7 @@ P: Henri Verbeet <hverbeet(a)codeweavers.com> F: dlls/d2d*/ Direct3D -M: Zebediah Figura <z.figura12(a)gmail.com> +M: Elizabeth Figura <zfigura(a)codeweavers.com> M: Jan Sikorski <jsikorski(a)codeweavers.com> P: Henri Verbeet <hverbeet(a)codeweavers.com> P: Stefan Dösinger <stefan(a)codeweavers.com> @@ -106,7 +106,7 @@ F: dlls/dpnet/ F: dlls/dpwsockx/ DirectShow -M: Zebediah Figura <z.figura12(a)gmail.com> +M: Elizabeth Figura <zfigura(a)codeweavers.com> P: Rémi Bernon <rbernon(a)codeweavers.com> F: dlls/amstream/ F: dlls/devenum/ @@ -159,7 +159,7 @@ M: Marcus Meissner <marcus(a)jet.franken.de> F: dlls/gphoto2.ds/ GStreamer multimedia backend -M: Zebediah Figura <z.figura12(a)gmail.com> +M: Elizabeth Figura <zfigura(a)codeweavers.com> P: Rémi Bernon <rbernon(a)codeweavers.com> F: dlls/winegstreamer/ @@ -173,7 +173,7 @@ F: dlls/mouhid.sys/ F: dlls/winehid.sys/ HTTP server -M: Zebediah Figura <z.figura12(a)gmail.com> +M: Elizabeth Figura <zfigura(a)codeweavers.com> F: dlls/httpapi/ F: dlls/http.sys/ @@ -214,7 +214,7 @@ F: dlls/msacm32/ Media Foundation GStreamer backend M: Rémi Bernon <rbernon(a)codeweavers.com> P: Nikolay Sivov <nsivov(a)codeweavers.com> -P: Zebediah Figura <z.figura12(a)gmail.com> +P: Elizabeth Figura <zfigura(a)codeweavers.com> F: dlls/mf/tests/transform.c F: dlls/winegstreamer/aac_decoder.c F: dlls/winegstreamer/color_convert.c @@ -238,7 +238,7 @@ F: dlls/vcruntime140_1/ MSI installers M: Hans Leidekker <hans(a)codeweavers.com> -P: Zebediah Figura <z.figura12(a)gmail.com> +P: Elizabeth Figura <zfigura(a)codeweavers.com> F: dlls/msi/ Netstat @@ -288,7 +288,7 @@ P: Huw Davies <huw(a)codeweavers.com> F: dlls/oleaut32/typelib.c Plug and Play -P: Zebediah Figura <z.figura12(a)gmail.com> +P: Elizabeth Figura <zfigura(a)codeweavers.com> F: dlls/newdev/ F: dlls/ntoskrnl.exe/pnp.c F: dlls/setupapi/devinst.c @@ -310,7 +310,7 @@ F: dlls/riched20/ RPC Runtime P: Huw Davies <huw(a)codeweavers.com> -P: Zebediah Figura <z.figura12(a)gmail.com> +P: Elizabeth Figura <zfigura(a)codeweavers.com> F: dlls/rpcrt4/ Theming @@ -349,7 +349,7 @@ F: dlls/shdocvw/ WIDL P: Huw Davies <huw(a)codeweavers.com> P: Rémi Bernon <rbernon(a)codeweavers.com> -P: Zebediah Figura <z.figura12(a)gmail.com> +P: Elizabeth Figura <zfigura(a)codeweavers.com> F: tools/widl/ Windows Imaging Component @@ -365,7 +365,7 @@ F: dlls/wbemprox/ F: dlls/wmiutils/ Windows Media Format -M: Zebediah Figura <z.figura12(a)gmail.com> +M: Elizabeth Figura <zfigura(a)codeweavers.com> P: Rémi Bernon <rbernon(a)codeweavers.com> F: dlls/wmp/ F: dlls/wmvcore/ @@ -431,7 +431,7 @@ W: https://wiki.winehq.org/StableRules Staging Branch M: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -P: Zebediah Figura <z.figura12(a)gmail.com> +P: Elizabeth Figura <zfigura(a)codeweavers.com> P: Paul Gofman <gofmanp(a)gmail.com> P: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> W: https://wine-staging.com/

1 0