April 2024 - Wine-commits - list.winehq.org

Francisco Casas : vkd3d-shader/hlsl: Use LOGIC_AND instead of MUL in all().
by Alexandre Julliard 09 Apr '24

09 Apr '24

Module: vkd3d Branch: master Commit: 62bb12f322195ec201b671dc261f49e6c3820e34 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/62bb12f322195ec201b671dc261f4… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Mar 4 18:59:31 2024 -0300 vkd3d-shader/hlsl: Use LOGIC_AND instead of MUL in all(). --- libs/vkd3d-shader/hlsl.y | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 11e504ac..efac2505 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2763,30 +2763,14 @@ static bool add_combine_components(struct hlsl_ctx *ctx, const struct parse_init static bool intrinsic_all(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { - struct hlsl_ir_node *arg = params->args[0], *mul, *one, *zero, *load; - unsigned int i, count; - - if (!(one = hlsl_new_float_constant(ctx, 1.0f, loc))) - return false; - hlsl_block_add_instr(params->instrs, one); + struct hlsl_ir_node *arg = params->args[0], *cast; + struct hlsl_type *bool_type; - if (!(zero = hlsl_new_float_constant(ctx, 0.0f, loc))) + bool_type = convert_numeric_type(ctx, arg->data_type, HLSL_TYPE_BOOL); + if (!(cast = add_cast(ctx, params->instrs, arg, bool_type, loc))) return false; - hlsl_block_add_instr(params->instrs, zero); - - mul = one; - - count = hlsl_type_component_count(arg->data_type); - for (i = 0; i < count; ++i) - { - if (!(load = hlsl_add_load_component(ctx, params->instrs, arg, i, loc))) - return false; - - if (!(mul = add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, load, mul, loc))) - return false; - } - return !!add_binary_comparison_expr(ctx, params->instrs, HLSL_OP2_NEQUAL, mul, zero, loc); + return add_combine_components(ctx, params, cast, HLSL_OP2_LOGIC_AND, loc); } static bool intrinsic_any(struct hlsl_ctx *ctx, const struct parse_initializer *params,

1 0

Mohamad Al-Jaf : windows.ui: Return success in IInputPane2::TryShow().
by Alexandre Julliard 09 Apr '24

09 Apr '24

Module: wine Branch: master Commit: b17ef15e124d0a75ceed7ab9e16f0214a9e53286 URL: https://gitlab.winehq.org/wine/wine/-/commit/b17ef15e124d0a75ceed7ab9e16f02… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Apr 7 01:44:54 2024 -0400 windows.ui: Return success in IInputPane2::TryShow(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56536 --- dlls/windows.ui/inputpane.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/windows.ui/inputpane.c b/dlls/windows.ui/inputpane.c index cd1ddec217a..383ca877d46 100644 --- a/dlls/windows.ui/inputpane.c +++ b/dlls/windows.ui/inputpane.c @@ -158,7 +158,8 @@ DEFINE_IINSPECTABLE( inputpane2, IInputPane2, struct inputpane, IInputPane_iface static HRESULT WINAPI inputpane2_TryShow( IInputPane2 *iface, boolean *result ) { FIXME( "iface %p, result %p stub!\n", iface, result ); - return E_NOTIMPL; + *result = FALSE; + return S_OK; } static HRESULT WINAPI inputpane2_TryHide( IInputPane2 *iface, boolean *result )

1 0

Sam Joan Roque-Worcel : win32u: Make SCROLL_MIN_THUMB larger.
by Alexandre Julliard 09 Apr '24

09 Apr '24

Module: wine Branch: master Commit: 939b3d19318a2d8947997e80767659fd00f67e43 URL: https://gitlab.winehq.org/wine/wine/-/commit/939b3d19318a2d8947997e80767659… Author: Sam Joan Roque-Worcel <sam(a)roque-worcel.com> Date: Fri Apr 5 21:35:51 2024 +0100 win32u: Make SCROLL_MIN_THUMB larger. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54759 --- dlls/win32u/scroll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/scroll.c b/dlls/win32u/scroll.c index 19a9a1379f4..f72ef0c2929 100644 --- a/dlls/win32u/scroll.c +++ b/dlls/win32u/scroll.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(scroll); #define SCROLL_MIN_RECT 4 /* Minimum size of the thumb in pixels */ -#define SCROLL_MIN_THUMB 8 +#define SCROLL_MIN_THUMB 17 /* Overlap between arrows and thumb */ #define SCROLL_ARROW_THUMB_OVERLAP 0

1 0

Paul Gofman : winegstreamer: Try to handle broken IStream_Stat implementation in WM reader OpenStream().
by Alexandre Julliard 09 Apr '24

09 Apr '24

Module: wine Branch: master Commit: 6ad606483959dbacf3179b277983b5b0404423fe URL: https://gitlab.winehq.org/wine/wine/-/commit/6ad606483959dbacf3179b277983b5… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Apr 3 15:02:49 2024 -0600 winegstreamer: Try to handle broken IStream_Stat implementation in WM reader OpenStream(). --- dlls/winegstreamer/wm_reader.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 18910f87d40..c96d053ccae 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -2224,18 +2224,36 @@ static HRESULT WINAPI reader_Open(IWMSyncReader2 *iface, const WCHAR *filename) static HRESULT WINAPI reader_OpenStream(IWMSyncReader2 *iface, IStream *stream) { + static const ULONG64 canary_size = 0xdeadbeeffeedcafe; struct wm_reader *reader = impl_from_IWMSyncReader2(iface); STATSTG stat; HRESULT hr; TRACE("reader %p, stream %p.\n", reader, stream); + stat.cbSize.QuadPart = canary_size; if (FAILED(hr = IStream_Stat(stream, &stat, STATFLAG_NONAME))) { ERR("Failed to stat stream, hr %#lx.\n", hr); return hr; } + if (stat.cbSize.QuadPart == canary_size) + { + /* Call of Juarez: Gunslinger implements IStream_Stat as an empty function returning S_OK, leaving + * the output stat unchanged. Windows doesn't call IStream_Seek(_SEEK_END) and probably validates + * the size against WMV file headers so the bigger cbSize doesn't change anything. + * Such streams work as soon as the uninitialized cbSize is big enough which is usually the case + * (if that is not the case Windows will favour shorter cbSize). */ + static const LARGE_INTEGER zero = { 0 }; + ULARGE_INTEGER pos = { .QuadPart = canary_size }; + + if (SUCCEEDED(hr = IStream_Seek(stream, zero, STREAM_SEEK_END, &pos))) + IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); + stat.cbSize.QuadPart = pos.QuadPart == canary_size ? 0 : pos.QuadPart; + ERR("IStream_Stat did not fill the stream size, size from _Seek %I64u.\n", stat.cbSize.QuadPart); + } + EnterCriticalSection(&reader->cs); if (reader->wg_parser)

1 0

Jacek Caban : winebuild: Add -marm64x option for generating hybrid ARM64X import libraries.
by Alexandre Julliard 09 Apr '24

09 Apr '24

Module: wine Branch: master Commit: 4243befce51b420db46111100b2a566774651d3d URL: https://gitlab.winehq.org/wine/wine/-/commit/4243befce51b420db46111100b2a56… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 8 23:28:16 2024 +0200 winebuild: Add -marm64x option for generating hybrid ARM64X import libraries. --- tools/winebuild/build.h | 4 +++- tools/winebuild/import.c | 16 ++++++++++++++-- tools/winebuild/main.c | 4 +++- tools/winebuild/parser.c | 12 ++++++------ tools/winebuild/spec32.c | 5 ++--- tools/winebuild/utils.c | 2 ++ 6 files changed, 30 insertions(+), 13 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index a469a0e9042..b857e05aa14 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -162,6 +162,7 @@ typedef struct int unicode_app; /* default to unicode entry point */ ORDDEF *entry_points; /* spec entry points */ struct exports exports; /* dll exports */ + struct exports native_exports; /* dll native exports */ struct resource *resources; /* array of dll resources (format differs between Win16/Win32) */ struct apiset apiset; /* list of defined api sets */ } DLLSPEC; @@ -327,7 +328,7 @@ extern void output_bin_resources( DLLSPEC *spec, unsigned int start_rva ); extern void output_spec32_file( DLLSPEC *spec ); extern void output_fake_module( DLLSPEC *spec ); extern void output_data_module( DLLSPEC *spec ); -extern void output_def_file( DLLSPEC *spec, int import_only ); +extern void output_def_file( DLLSPEC *spec, struct exports *exports, int import_only ); extern void output_apiset_lib( DLLSPEC *spec, const struct apiset *apiset ); extern void load_res16_file( const char *name, DLLSPEC *spec ); extern void output_res16_data( DLLSPEC *spec ); @@ -372,6 +373,7 @@ extern int force_pointer_size; extern int unwind_tables; extern int use_dlltool; extern int use_msvcrt; +extern int native_arch; extern int safe_seh; extern int prefer_native; extern int data_only; diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 9cefb2afdfe..1ca2048284b 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1377,19 +1377,31 @@ void output_static_lib( const char *output_name, struct strarray files, int crea /* create a Windows-style import library using dlltool */ static void build_dlltool_import_lib( const char *lib_name, DLLSPEC *spec, struct strarray files ) { + const char *def_file, *native_def_file = NULL; struct strarray args; - char *def_file; def_file = open_temp_output_file( ".def" ); - output_def_file( spec, 1 ); + output_def_file( spec, &spec->exports, 1 ); fclose( output_file ); + if (native_arch != -1) + { + native_def_file = open_temp_output_file( ".def" ); + output_def_file( spec, &spec->native_exports, 1 ); + fclose( output_file ); + } + args = find_tool( "dlltool", NULL ); strarray_add( &args, "-k" ); strarray_add( &args, strendswith( lib_name, ".delay.a" ) ? "-y" : "-l" ); strarray_add( &args, lib_name ); strarray_add( &args, "-d" ); strarray_add( &args, def_file ); + if (native_def_file) + { + strarray_add( &args, "-N" ); + strarray_add( &args, native_def_file ); + } switch (target.cpu) { diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 71e61522578..dc2992b5c51 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -36,6 +36,7 @@ int UsePIC = 0; int nb_errors = 0; int display_warnings = 0; +int native_arch = -1; int kill_at = 0; int verbose = 0; int link_ext_symbols = 0; @@ -386,6 +387,7 @@ static void option_callback( int optc, char *optarg ) else if (!strcmp( optarg, "64" )) force_pointer_size = 8; else if (!strcmp( optarg, "no-cygwin" )) use_msvcrt = 1; else if (!strcmp( optarg, "unicode" )) main_spec->unicode_app = 1; + else if (!strcmp( optarg, "arm64x" )) native_arch = CPU_ARM64; else if (!strncmp( optarg, "cpu=", 4 )) cpu_option = xstrdup( optarg + 4 ); else if (!strncmp( optarg, "fpu=", 4 )) fpu_option = xstrdup( optarg + 4 ); else if (!strncmp( optarg, "arch=", 5 )) arch_option = xstrdup( optarg + 5 ); @@ -648,7 +650,7 @@ int main(int argc, char **argv) if (!spec_file_name) fatal_error( "missing .spec file\n" ); if (!parse_input_file( spec )) break; open_output_file(); - output_def_file( spec, 0 ); + output_def_file( spec, &spec->exports, 0 ); close_output_file(); break; case MODE_IMPLIB: diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index 5bd05e97ca9..ec42c240a0a 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -943,16 +943,15 @@ static void assign_ordinals( struct exports *exports ) } -static void assign_exports( DLLSPEC *spec ) +static void assign_exports( DLLSPEC *spec, unsigned int cpu, struct exports *exports ) { - struct exports *exports = &spec->exports; unsigned int i; exports->entry_points = xmalloc( spec->nb_entry_points * sizeof(*exports->entry_points) ); for (i = 0; i < spec->nb_entry_points; i++) { ORDDEF *entry = &spec->entry_points[i]; - if ((entry->flags & FLAG_CPU_MASK) && !(entry->flags & FLAG_CPU(target.cpu))) + if ((entry->flags & FLAG_CPU_MASK) && !(entry->flags & FLAG_CPU(cpu))) continue; exports->entry_points[exports->nb_entry_points++] = entry; } @@ -1018,7 +1017,7 @@ void add_16bit_exports( DLLSPEC *spec32, DLLSPEC *spec16 ) odp->u.func.nb_args * sizeof(odp->u.func.args[0]) ); } - assign_exports( spec32 ); + assign_exports( spec32, target.cpu, &spec32->exports ); } @@ -1061,7 +1060,8 @@ int parse_spec_file( FILE *file, DLLSPEC *spec ) } current_line = 0; /* no longer parsing the input file */ - assign_exports( spec ); + assign_exports( spec, target.cpu, &spec->exports ); + if (native_arch != -1) assign_exports( spec, native_arch, &spec->native_exports ); return !nb_errors; } @@ -1303,6 +1303,6 @@ int parse_def_file( FILE *file, DLLSPEC *spec ) } current_line = 0; /* no longer parsing the input file */ - assign_exports( spec ); + assign_exports( spec, target.cpu, &spec->exports ); return !nb_errors; } diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 857985cb292..718ce4666ef 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -1343,9 +1343,8 @@ void output_data_module( DLLSPEC *spec ) * * Build a Win32 def file from a spec file. */ -void output_def_file( DLLSPEC *spec, int import_only ) +void output_def_file( DLLSPEC *spec, struct exports *exports, int import_only ) { - struct exports *exports; DLLSPEC *spec32 = NULL; const char *name; int i, total; @@ -1355,8 +1354,8 @@ void output_def_file( DLLSPEC *spec, int import_only ) spec32 = alloc_dll_spec(); add_16bit_exports( spec32, spec ); spec = spec32; + exports = &spec->exports; } - exports = &spec->exports; if (spec_file_name) output( "; File generated automatically from %s; do not edit!\n\n", diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 62f05e535b6..05595f86d37 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -615,6 +615,7 @@ DLLSPEC *alloc_dll_spec(void) spec->subsystem_minor = 0; spec->dll_characteristics = IMAGE_DLLCHARACTERISTICS_NX_COMPAT | IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE; spec->exports.base = MAX_ORDINALS; + spec->native_exports.base = MAX_ORDINALS; return spec; } @@ -644,6 +645,7 @@ void free_dll_spec( DLLSPEC *spec ) free( odp->link_name ); } free_exports( &spec->exports ); + free_exports( &spec->native_exports ); free( spec->file_name ); free( spec->dll_name ); free( spec->c_name );

1 0

Jacek Caban : winegcc: Pass target and resources as arguments to build_spec_obj.
by Alexandre Julliard 09 Apr '24

09 Apr '24

Module: wine Branch: master Commit: 753f405536eb97b6fe06348a9d89d9a312a7c652 URL: https://gitlab.winehq.org/wine/wine/-/commit/753f405536eb97b6fe06348a9d89d9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Feb 17 01:49:18 2024 +0100 winegcc: Pass target and resources as arguments to build_spec_obj. --- tools/winegcc/winegcc.c | 76 ++++++++++++++++++++++++++----------------------- 1 file changed, 41 insertions(+), 35 deletions(-)

1 0

Jacek Caban : winegcc: Add -marm64x option for linking ARM64X images.
by Alexandre Julliard 09 Apr '24

09 Apr '24

Module: wine Branch: master Commit: 00198c4084a61f65f18574d16833d945e50c0614 URL: https://gitlab.winehq.org/wine/wine/-/commit/00198c4084a61f65f18574d16833d9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 8 23:35:25 2024 +0200 winegcc: Add -marm64x option for linking ARM64X images. --- tools/winegcc/winegcc.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 694242542ad..fb759063da9 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -191,6 +191,7 @@ struct options const char* entry_point; const char* debug_file; const char* out_implib; + const char* native_arch; struct strarray prefix; struct strarray lib_dirs; struct strarray args; @@ -1232,6 +1233,13 @@ static void build(struct options* opts) build_spec_obj( opts, spec_file, output_file, opts->target_alias, files, resources, lib_dirs, entry_point, &spec_objs ); + if (opts->native_arch) + { + const char *suffix = strchr( opts->target_alias, '-' ); + if (!suffix) suffix = ""; + build_spec_obj( opts, spec_file, output_file, strmake( "%s%s", opts->native_arch, suffix ), + files, empty_strarray, lib_dirs, entry_point, &spec_objs ); + } if (opts->fake_module) return; /* nothing else to do */ @@ -1707,6 +1715,11 @@ int main(int argc, char **argv) { raw_linker_arg = 1; } + else if (!strcmp("-marm64x", opts.args.str[i] )) + { + raw_linker_arg = 1; + opts.native_arch = "aarch64"; + } else if (!strncmp("-mcpu=", opts.args.str[i], 6) || !strncmp("-mfpu=", opts.args.str[i], 6) || !strncmp("-march=", opts.args.str[i], 7))

1 0

Hans Leidekker : msi/tests: Try restarting tests elevated.
by Alexandre Julliard 09 Apr '24

09 Apr '24

Module: wine Branch: master Commit: a6eb51f0e595b2e5ddc521fb61b10d72849dd0f2 URL: https://gitlab.winehq.org/wine/wine/-/commit/a6eb51f0e595b2e5ddc521fb61b10d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 5 09:29:18 2024 +0200 msi/tests: Try restarting tests elevated. Wine starts processes non-elevated since e92ba2de43d7afbe0704b11b29f7c30f44dfaeca which means that many tests are skipped now. --- dlls/msi/tests/action.c | 105 ++++++++++++++++++++++++++++------------- dlls/msi/tests/automation.c | 4 +- dlls/msi/tests/install.c | 111 ++++++++++++++++++-------------------------- dlls/msi/tests/msi.c | 26 ++++++----- dlls/msi/tests/package.c | 6 ++- dlls/msi/tests/patch.c | 8 ++-- dlls/msi/tests/source.c | 10 ++-- dlls/msi/tests/utils.h | 3 +- 8 files changed, 153 insertions(+), 120 deletions(-)

1 0

Hans Leidekker : msi/tests: Get rid of workarounds for old Windows versions.
by Alexandre Julliard 09 Apr '24

09 Apr '24

Module: wine Branch: master Commit: 738ec8285583248a84349939734ed600a47ba73d URL: https://gitlab.winehq.org/wine/wine/-/commit/738ec8285583248a84349939734ed6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 5 16:25:09 2024 +0200 msi/tests: Get rid of workarounds for old Windows versions. --- dlls/msi/tests/action.c | 260 +-- dlls/msi/tests/automation.c | 46 +- dlls/msi/tests/custom.c | 4 +- dlls/msi/tests/install.c | 115 +- dlls/msi/tests/msi.c | 4144 ++++++++++++++++--------------------------- dlls/msi/tests/package.c | 135 +- dlls/msi/tests/patch.c | 115 +- dlls/msi/tests/record.c | 2 +- dlls/msi/tests/source.c | 1485 ++++++---------- include/msi.h | 2 +- 10 files changed, 2203 insertions(+), 4105 deletions(-)

1 0

Hans Leidekker : msi: Install global assemblies before running deferred custom actions.
by Alexandre Julliard 09 Apr '24

09 Apr '24

Module: wine Branch: master Commit: 7f0ca9c284d15d03f14a8fefefac834990d622cd URL: https://gitlab.winehq.org/wine/wine/-/commit/7f0ca9c284d15d03f14a8fefefac83… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 5 09:22:06 2024 +0200 msi: Install global assemblies before running deferred custom actions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56493 --- dlls/msi/action.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 06f399223f4..e3c7c23b2bd 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5139,16 +5139,6 @@ static UINT ACTION_InstallFinalize(MSIPACKAGE *package) MSIFILE *file; MSIFILEPATCH *patch; - /* first do the same as an InstallExecute */ - rc = execute_script(package, SCRIPT_INSTALL); - if (rc != ERROR_SUCCESS) - return rc; - - /* then handle commit actions */ - rc = execute_script(package, SCRIPT_COMMIT); - if (rc != ERROR_SUCCESS) - return rc; - /* install global assemblies */ LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) { @@ -5187,6 +5177,16 @@ static UINT ACTION_InstallFinalize(MSIPACKAGE *package) } } + /* first do the same as an InstallExecute */ + rc = execute_script(package, SCRIPT_INSTALL); + if (rc != ERROR_SUCCESS) + return rc; + + /* then handle commit actions */ + rc = execute_script(package, SCRIPT_COMMIT); + if (rc != ERROR_SUCCESS) + return rc; + if (is_full_uninstall(package)) rc = ACTION_UnpublishProduct(package);

1 0