October 2022 - Wine-commits

Alexandre Julliard : makedep: Add support for architecture-specific sources.
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: wine Branch: master Commit: 2094dd96e6bd41a141ea7ff0e08371b824a0e3ee URL: https://gitlab.winehq.org/wine/wine/-/commit/2094dd96e6bd41a141ea7ff0e08371… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 25 11:08:26 2022 +0200 makedep: Add support for architecture-specific sources. --- tools/makedep.c | 128 +++++++++++++++++++++++++++++++------------------------- 1 file changed, 71 insertions(+), 57 deletions(-)

1 0

Alexandre Julliard : makedep: Add support for architecture-specific IDL objects.
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: wine Branch: master Commit: 6fb5e4d99acfe6fb6c660484e2c008f823409409 URL: https://gitlab.winehq.org/wine/wine/-/commit/6fb5e4d99acfe6fb6c660484e2c008… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 25 11:08:56 2022 +0200 makedep: Add support for architecture-specific IDL objects. --- tools/makedep.c | 88 +++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 60 insertions(+), 28 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index c7a9199fcf6..a6e053646db 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -115,7 +115,6 @@ static const struct { FLAG_IDL_PROXY, "_p.c" }, { FLAG_IDL_SERVER, "_s.c" }, { FLAG_IDL_REGISTER, "_r.res" }, - { FLAG_IDL_HEADER, ".h" } }; #define HASH_SIZE 197 @@ -2770,20 +2769,15 @@ static void output_source_res( struct makefile *make, struct incl_file *source, static void output_source_idl( struct makefile *make, struct incl_file *source, const char *obj ) { struct strarray defines = get_source_defines( make, source, obj ); - struct strarray targets = empty_strarray; - char *dest; - unsigned int i; + struct strarray headers = empty_strarray; + struct strarray multiarch_targets[MAX_ARCHS] = { empty_strarray }; + const char *dest; + unsigned int i, arch; + int multiarch; if (find_include_file( make, strmake( "%s.h", obj ))) source->file->flags |= FLAG_IDL_HEADER; if (!source->file->flags) return; - for (i = 0; i < ARRAY_SIZE(idl_outputs); i++) - { - if (!(source->file->flags & idl_outputs[i].flag)) continue; - dest = strmake( "%s%s", obj, idl_outputs[i].ext ); - if (!find_src_file( make, dest )) strarray_add( &make->clean_files, dest ); - strarray_add( &targets, dest ); - } if (source->file->flags & FLAG_IDL_PROXY) strarray_add( &make->dlldata_files, source->name ); if (source->file->flags & FLAG_INSTALL) { @@ -2793,28 +2787,66 @@ static void output_source_idl( struct makefile *make, struct incl_file *source, add_install_rule( make, source->name, strmake( "%s.h", obj ), strmake( "d$(includedir)/wine/%s.h", get_include_install_path( obj ) )); } - if (!targets.count) return; + if (source->file->flags & FLAG_IDL_HEADER) + { + dest = strmake( "%s.h", obj ); + strarray_add( &headers, dest ); + if (!find_src_file( make, dest )) strarray_add( &make->clean_files, dest ); + } - output_filenames_obj_dir( make, targets ); - output( ": %s\n", tools_path( make, "widl" )); - output( "\t%s%s -o $@", cmd_prefix( "WIDL" ), tools_path( make, "widl" ) ); - output_filenames( target_flags[0] ); - output_filename( "--nostdinc" ); - output_filename( "-Ldlls/\\*" ); - output_filenames( defines ); - output_filenames( get_expanded_make_var_array( make, "EXTRAIDLFLAGS" )); - output_filenames( get_expanded_file_local_var( make, obj, "EXTRAIDLFLAGS" )); + for (i = 0; i < ARRAY_SIZE(idl_outputs); i++) + { + if (!(source->file->flags & idl_outputs[i].flag)) continue; + multiarch = (make->use_msvcrt && archs.count > 1); + for (arch = 0; arch < archs.count; arch++) + { + if (!arch != !multiarch) continue; + dest = strmake( "%s%s", obj, idl_outputs[i].ext ); + if (!find_src_file( make, dest )) strarray_add( &make->clean_files, dest ); + strarray_add( &multiarch_targets[arch], dest ); + } + } + + for (arch = 0; arch < archs.count; arch++) + { + if (multiarch_targets[arch].count + (arch ? 0 : headers.count) == 0) continue; + if (!arch) output_filenames_obj_dir( make, headers ); + output_filenames_obj_dir( make, multiarch_targets[arch] ); + output( ":\n" ); + output( "\t%s%s -o $@", cmd_prefix( "WIDL" ), tools_path( make, "widl" ) ); + output_filenames( target_flags[arch] ); + output_filename( "--nostdinc" ); + output_filename( "-Ldlls/\\*" ); + output_filenames( defines ); + output_filenames( get_expanded_make_var_array( make, "EXTRAIDLFLAGS" )); + output_filenames( get_expanded_file_local_var( make, obj, "EXTRAIDLFLAGS" )); + output_filename( source->filename ); + output( "\n" ); + } + + output_filenames_obj_dir( make, headers ); + for (arch = 0; arch < archs.count; arch++) output_filenames_obj_dir( make, multiarch_targets[arch] ); + output( ":" ); + output_filename( tools_path( make, "widl" )); output_filename( source->filename ); - output( "\n" ); - output_filenames_obj_dir( make, targets ); - output( ": %s", source->filename ); output_filenames( source->dependencies ); - for (i = 0; i < source->importlibdeps.count; i++) + output( "\n" ); + + if (source->importlibdeps.count) { - struct makefile *submake = find_importlib_module( source->importlibdeps.str[i] ); - output_filename( obj_dir_path( submake, submake->module )); + for (arch = 0; arch < archs.count; arch++) + { + if (!multiarch_targets[arch].count) continue; + output_filenames_obj_dir( make, multiarch_targets[arch] ); + output( ":" ); + for (i = 0; i < source->importlibdeps.count; i++) + { + struct makefile *submake = find_importlib_module( source->importlibdeps.str[i] ); + output_filename( obj_dir_path( submake, submake->module )); + } + output( "\n" ); + } } - output( "\n" ); }

1 0

Alexandre Julliard : makedep: Make the resource files architecture-generic.
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: wine Branch: master Commit: 6c65fb9cb3975d35d2d8d3f3f9d0590043a618ec URL: https://gitlab.winehq.org/wine/wine/-/commit/6c65fb9cb3975d35d2d8d3f3f9d059… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 25 11:09:57 2022 +0200 makedep: Make the resource files architecture-generic. --- tools/makedep.c | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index a6e053646db..68bba96d5df 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -216,7 +216,6 @@ struct makefile struct strarray maintainerclean_files; struct strarray uninstall_files; struct strarray unixobj_files; - struct strarray res_files; struct strarray font_files; struct strarray debug_files; struct strarray dlldata_files; @@ -224,6 +223,7 @@ struct makefile struct strarray dependencies; struct strarray object_files[MAX_ARCHS]; struct strarray implib_files[MAX_ARCHS]; + struct strarray res_files[MAX_ARCHS]; struct strarray all_targets[MAX_ARCHS]; struct strarray install_rules[NB_INSTALL_RULES]; }; @@ -2693,19 +2693,19 @@ static void output_source_h( struct makefile *make, struct incl_file *source, co static void output_source_rc( struct makefile *make, struct incl_file *source, const char *obj ) { struct strarray defines = get_source_defines( make, source, obj ); - const char *po_dir = NULL; - unsigned int i; + const char *po_dir = NULL, *res_file = strmake( "%s.res", obj ); + unsigned int i, arch; if (source->file->flags & FLAG_RC_HEADER) return; if (source->file->flags & FLAG_GENERATED) strarray_add( &make->clean_files, source->name ); if (linguas.count && (source->file->flags & FLAG_RC_PO)) po_dir = "po"; - strarray_add( &make->res_files, strmake( "%s.res", obj )); + for (arch = 0; arch < archs.count; arch++) strarray_add( &make->res_files[arch], res_file ); if (source->file->flags & FLAG_RC_PO) { strarray_add( &make->pot_files, strmake( "%s.pot", obj )); output( "%s.pot ", obj_dir_path( make, obj ) ); } - output( "%s.res: %s", obj_dir_path( make, obj ), source->filename ); + output( "%s: %s", obj_dir_path( make, res_file ), source->filename ); output_filename( tools_path( make, "wrc" )); if (make->src_dir) output_filename( "nls/locale.nls" ); output_filenames( source->dependencies ); @@ -2719,7 +2719,7 @@ static void output_source_rc( struct makefile *make, struct incl_file *source, c output( "\n" ); if (po_dir) { - output( "%s.res:", obj_dir_path( make, obj )); + output( "%s:", obj_dir_path( make, res_file )); for (i = 0; i < linguas.count; i++) output_filename( strmake( "%s/%s.mo", po_dir, linguas.str[i] )); output( "\n" ); @@ -2732,10 +2732,11 @@ static void output_source_rc( struct makefile *make, struct incl_file *source, c */ static void output_source_mc( struct makefile *make, struct incl_file *source, const char *obj ) { - unsigned int i; + unsigned int i, arch; char *obj_path = obj_dir_path( make, obj ); + char *res_file = strmake( "%s.res", obj ); - strarray_add( &make->res_files, strmake( "%s.res", obj )); + for (arch = 0; arch < archs.count; arch++) strarray_add( &make->res_files[arch], res_file ); strarray_add( &make->pot_files, strmake( "%s.pot", obj )); output( "%s.pot %s.res: %s", obj_path, obj_path, source->filename ); output_filename( tools_path( make, "wmc" )); @@ -2759,7 +2760,7 @@ static void output_source_mc( struct makefile *make, struct incl_file *source, c */ static void output_source_res( struct makefile *make, struct incl_file *source, const char *obj ) { - strarray_add( &make->res_files, source->name ); + strarray_add( &make->res_files[source->arch], source->name ); } @@ -3033,7 +3034,7 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, output_file = obj_dir_path( make, dll_name ); strarray_add( &make->clean_files, dll_name ); - strarray_add( &make->res_files, strmake( "%s.res", obj )); + strarray_add( &make->res_files[arch], strmake( "%s.res", obj )); output( "%s.res:", obj_dir_path( make, obj )); output_filename( obj_dir_path( make, dll_name )); output_filename( tools_path( make, "wrc" )); @@ -3258,7 +3259,7 @@ static void output_module( struct makefile *make, unsigned int arch ) output( "%s:", obj_dir_path( make, module_name )); if (spec_file) output_filename( spec_file ); output_filenames_obj_dir( make, make->object_files[arch] ); - output_filenames_obj_dir( make, make->res_files ); + output_filenames_obj_dir( make, make->res_files[arch] ); output_filenames( dep_libs ); output_filename( tools_path( make, "winebuild" )); output_filename( tools_path( make, "winegcc" )); @@ -3272,7 +3273,7 @@ static void output_module( struct makefile *make, unsigned int arch ) } output_filenames( make->extradllflags ); output_filenames_obj_dir( make, make->object_files[arch] ); - output_filenames_obj_dir( make, make->res_files ); + output_filenames_obj_dir( make, make->res_files[arch] ); debug_file = get_debug_file( make, make->module, arch ); if (debug_file) output_filename( strmake( "-Wl,--debug-file,%s", obj_dir_path( make, debug_file ))); output_filenames( all_libs ); @@ -3302,7 +3303,7 @@ static void output_fake_module( struct makefile *make, unsigned int arch ) output( "%s:", obj_dir_path( make, make->module )); if (spec_file) output_filename( spec_file ); - output_filenames_obj_dir( make, make->res_files ); + output_filenames_obj_dir( make, make->res_files[arch] ); output_filename( tools_path( make, "winebuild" )); output_filename( tools_path( make, "winegcc" )); output( "\n" ); @@ -3314,7 +3315,7 @@ static void output_fake_module( struct makefile *make, unsigned int arch ) output_filename( spec_file ); } output_filenames( make->extradllflags ); - output_filenames_obj_dir( make, make->res_files ); + output_filenames_obj_dir( make, make->res_files[arch] ); output( "\n" ); } @@ -3503,7 +3504,7 @@ static void output_test_module( struct makefile *make, unsigned int arch ) output_winegcc_command( make, arch ); output_filenames( make->extradllflags ); output_filenames_obj_dir( make, make->object_files[arch] ); - output_filenames_obj_dir( make, make->res_files ); + output_filenames_obj_dir( make, make->res_files[arch] ); if ((debug_file = get_debug_file( make, testmodule, arch ))) output_filename( strmake( "-Wl,--debug-file,%s", obj_dir_path( make, debug_file ))); output_filenames( all_libs ); @@ -3515,13 +3516,13 @@ static void output_test_module( struct makefile *make, unsigned int arch ) output_filename( strmake( "-Wb,-F,%s", testmodule )); output_filenames( make->extradllflags ); output_filenames_obj_dir( make, make->object_files[arch] ); - output_filenames_obj_dir( make, make->res_files ); + output_filenames_obj_dir( make, make->res_files[arch] ); output_filenames( all_libs ); output_filename( arch ? "$(CROSSLDFLAGS)" : "$(LDFLAGS)" ); output( "\n" ); output( "%s%s %s%s:", obj_dir_path( make, testmodule ), ext, obj_dir_path( make, stripped ), ext ); output_filenames_obj_dir( make, make->object_files[arch] ); - output_filenames_obj_dir( make, make->res_files ); + output_filenames_obj_dir( make, make->res_files[arch] ); output_filenames( dep_libs ); output_filename( tools_path( make, "winebuild" )); output_filename( tools_path( make, "winegcc" )); @@ -3752,7 +3753,7 @@ static void output_sources( struct makefile *make ) if (submakes[i]->testdll && !submakes[i]->disabled) strarray_add( &tests, submakes[i]->testdll ); for (i = 0; i < tests.count; i++) - strarray_add( &make->res_files, replace_extension( tests.str[i], ".dll", "_test.res" )); + strarray_add( &make->res_files[arch], replace_extension( tests.str[i], ".dll", "_test.res" )); } if (make->dlldata_files.count) @@ -3807,10 +3808,10 @@ static void output_sources( struct makefile *make ) { strarray_addall_uniq( &make->clean_files, make->object_files[arch] ); strarray_addall_uniq( &make->clean_files, make->implib_files[arch] ); + strarray_addall_uniq( &make->clean_files, make->res_files[arch] ); strarray_addall_uniq( &make->clean_files, make->all_targets[arch] ); } strarray_addall( &make->clean_files, make->unixobj_files ); - strarray_addall( &make->clean_files, make->res_files ); strarray_addall( &make->clean_files, make->pot_files ); strarray_addall( &make->clean_files, make->debug_files );

1 0

Esme Povirk : mscoree: Update Wine Mono to 7.4.0.
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: wine Branch: master Commit: 4493b10d17ecff23f483ed486127a123e90b3cc2 URL: https://gitlab.winehq.org/wine/wine/-/commit/4493b10d17ecff23f483ed486127a1… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat Oct 22 16:02:38 2022 -0500 mscoree: Update Wine Mono to 7.4.0. --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- tools/gitlab/test.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 88a830de2eb..b815ffbb5cb 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -58,10 +58,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "7.3.0" +#define MONO_VERSION "7.4.0" #if defined(__i386__) || defined(__x86_64__) #define MONO_ARCH "x86" -#define MONO_SHA "939e2f5669720d0d0fc7e305426622a11a33b7ae385c4d7e581e29ea264e22ff" +#define MONO_SHA "6413ff328ebbf7ec7689c648feb3546d8102ded865079d1fbf0331b14b3ab0ec" #else #define MONO_ARCH "" #define MONO_SHA "???" diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 0e51e0b3d7f..71e943d34c3 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "7.3.0" +#define WINE_MONO_VERSION "7.4.0" /* Mono embedding */ typedef struct _MonoDomain MonoDomain; diff --git a/tools/gitlab/test.yml b/tools/gitlab/test.yml index 66079527be5..d2b1966ad6e 100644 --- a/tools/gitlab/test.yml +++ b/tools/gitlab/test.yml @@ -7,7 +7,7 @@ variables: GIT_STRATEGY: none GECKO_VER: 2.47.3 - MONO_VER: 7.3.0 + MONO_VER: 7.4.0 cache: - key: wine-gecko-$GECKO_VER paths:

1 0

Jinoh Kang : user32/tests: Test for window exposure behaviours.
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: wine Branch: master Commit: 5005bb970f14745ff0fe70d5d02d87013f543136 URL: https://gitlab.winehq.org/wine/wine/-/commit/5005bb970f14745ff0fe70d5d02d87… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Mon Jun 13 02:22:57 2022 +0900 user32/tests: Test for window exposure behaviours. --- dlls/user32/tests/msg.c | 382 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 382 insertions(+)

1 0

Nikolay Sivov : d2d1: Test device context type in BindDC().
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: wine Branch: master Commit: e6069c253063d54bb31401ffff5c93b6e6c024c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/e6069c253063d54bb31401ffff5c93… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 25 10:21:02 2022 +0300 d2d1: Test device context type in BindDC(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/dc_render_target.c | 4 +++- dlls/d2d1/tests/d2d1.c | 45 +++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 45 insertions(+), 4 deletions(-) diff --git a/dlls/d2d1/dc_render_target.c b/dlls/d2d1/dc_render_target.c index 01e1c348746..30eafe361d1 100644 --- a/dlls/d2d1/dc_render_target.c +++ b/dlls/d2d1/dc_render_target.c @@ -689,11 +689,13 @@ static HRESULT STDMETHODCALLTYPE d2d_dc_render_target_BindDC(ID2D1DCRenderTarget ID2D1DeviceContext *context; D2D1_SIZE_U bitmap_size; ID2D1Bitmap *bitmap; + DWORD obj_type; HRESULT hr; TRACE("iface %p, hdc %p, rect %s.\n", iface, hdc, wine_dbgstr_rect(rect)); - if (!hdc) + obj_type = GetObjectType(hdc); + if (obj_type != OBJ_DC && obj_type != OBJ_ENHMETADC && obj_type != OBJ_MEMDC) return E_INVALIDARG; /* Switch dxgi target to new surface. */ diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 08c7bc05224..3bfc8973c31 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -5825,15 +5825,18 @@ static void test_dc_target(BOOL d3d11) ID2D1Factory *factory; FLOAT dpi_x, dpi_y; D2D1_COLOR_F color; + HENHMETAFILE hemf; D2D1_SIZE_U sizeu; D2D1_SIZE_F size; D2D1_TAG t1, t2; unsigned int i; HDC hdc, hdc2; + HMETAFILE hmf; D2D_RECT_F r; COLORREF clr; HRESULT hr; RECT rect; + HWND hwnd; if (!init_test_context(&ctx, d3d11)) return; @@ -5997,7 +6000,7 @@ static void test_dc_target(BOOL d3d11) /* Invalid DC. */ hr = ID2D1DCRenderTarget_BindDC(rt, (HDC)0xdeadbeef, &rect); - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); ID2D1DCRenderTarget_BeginDraw(rt); @@ -6008,7 +6011,7 @@ static void test_dc_target(BOOL d3d11) ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); clr = GetPixel(hdc2, 0, 0); - todo_wine ok(clr == RGB(255, 0, 0), "Got unexpected colour 0x%08lx.\n", clr); + ok(clr == RGB(255, 0, 0), "Got unexpected colour 0x%08lx.\n", clr); hr = ID2D1DCRenderTarget_BindDC(rt, NULL, &rect); ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); @@ -6022,10 +6025,46 @@ static void test_dc_target(BOOL d3d11) ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); clr = GetPixel(hdc2, 0, 0); - todo_wine ok(clr == RGB(0, 0, 255), "Got unexpected colour 0x%08lx.\n", clr); + ok(clr == RGB(0, 0, 255), "Got unexpected colour 0x%08lx.\n", clr); DeleteDC(hdc); DeleteDC(hdc2); + + /* Metafile context. */ + hdc = CreateMetaFileA(NULL); + ok(!!hdc, "Failed to create a device context.\n"); + + hr = ID2D1DCRenderTarget_BindDC(rt, hdc, &rect); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + + hmf = CloseMetaFile(hdc); + ok(!!hmf, "Failed to close a metafile, error %ld.\n", GetLastError()); + DeleteMetaFile(hmf); + + /* Enhanced metafile context. */ + hdc = CreateEnhMetaFileA(NULL, NULL, NULL, NULL); + ok(!!hdc, "Failed to create a device context.\n"); + + hr = ID2D1DCRenderTarget_BindDC(rt, hdc, &rect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + hemf = CloseEnhMetaFile(hdc); + ok(!!hemf, "Failed to close a metafile, error %ld.\n", GetLastError()); + DeleteEnhMetaFile(hemf); + + /* Window context. */ + hwnd = CreateWindowExA(0, "static", NULL, WS_POPUP|WS_VISIBLE, 0, 0, 100, 100, 0, 0, 0, NULL); + ok(!!hwnd, "Failed to create a test window.\n"); + + hdc = GetDC(hwnd); + ok(!!hdc, "Failed to get a context.\n"); + + hr = ID2D1DCRenderTarget_BindDC(rt, hdc, &rect); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + ReleaseDC(hwnd, hdc); + DestroyWindow(hwnd); + ID2D1DCRenderTarget_Release(rt); ID2D1Factory_Release(factory); }

1 0

Francisco Casas : vkd3d-shader/hlsl: Rename "t1" and "t2" arguments as "src" and "dst".
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: vkd3d Branch: master Commit: 0a345a2b73fba6871dce14ec5eafe800999a50ec URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0a345a2b73fba6871dce14ec5eafe… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Oct 19 10:43:58 2022 -0300 vkd3d-shader/hlsl: Rename "t1" and "t2" arguments as "src" and "dst". --- libs/vkd3d-shader/hlsl.y | 110 +++++++++++++++++++++++------------------------ 1 file changed, 55 insertions(+), 55 deletions(-)

1 0

Francisco Casas : tests: Add additional tests for implicit casts that should fail.
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: vkd3d Branch: master Commit: fb751b48c5572d129508ecddefbdca1d6e6ac730 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fb751b48c5572d129508ecddefbdc… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Oct 19 23:48:09 2022 -0300 tests: Add additional tests for implicit casts that should fail. --- tests/cast-componentwise-equal.shader_test | 90 ++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/tests/cast-componentwise-equal.shader_test b/tests/cast-componentwise-equal.shader_test index ac329112..8a98b45c 100644 --- a/tests/cast-componentwise-equal.shader_test +++ b/tests/cast-componentwise-equal.shader_test @@ -224,3 +224,93 @@ float4 main() : sv_target b = a; return b.bb; } + + +[pixel shader fail todo] +float main() : SV_TARGET +{ + float arr[3] = {1, 2, 3}; + float v; + + v = arr; + return 0; +} + + +[pixel shader fail todo] +float main() : SV_TARGET +{ + float2 arr[3] = {1, 2, 3, 4, 5, 6}; + float2 vec; + + vec = arr; + return 0; +} + + +[pixel shader fail todo] +float4 main() : SV_TARGET +{ + int arr1[4] = {1, 2, 3, 4}; + float arr2[4]; + + arr2 = arr1; + return 0; +} + + +[pixel shader fail] +float4 main() : SV_TARGET +{ + float2x2 mat = {1, 2, 3, 4}; + float3 vec; + + vec = mat; + return 0; +} + + +[pixel shader fail todo] +float4 main() : SV_TARGET +{ + float4 f = {1, 2, 3, 4}; + float arr[4]; + + arr = f; + return 0; +} + + +[pixel shader fail todo] +float4 main() : SV_TARGET +{ + float arr[4] = {1, 2, 3, 4}; + float4 f; + + f = arr; + return 0; +} + + +[pixel shader fail] +float4 main() : SV_TARGET +{ + float3x2 mat1 = {1, 2, 3, 4, 5, 6}; + float2x3 mat2; + + mat2 = mat1; + return 0; +} + + +[pixel shader fail] +struct apple { + float aa; +}; + +float4 main() : SV_TARGET +{ + struct apple a = 3.0; + + return 0; +}

1 0

Francisco Casas : vkd3d-shader/hlsl: Handle complex types in add_cast().
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: vkd3d Branch: master Commit: d93ce28995c149faab90b2930679fa9ccb0347b4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d93ce28995c149faab90b2930679f… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Oct 19 13:50:50 2022 -0300 vkd3d-shader/hlsl: Handle complex types in add_cast(). This extends the support of this function, whether doing broadcasts or component-wise casts, to struct and array types. --- libs/vkd3d-shader/hlsl.y | 40 ++++++++++++------------- tests/cast-broadcast.shader_test | 4 +-- tests/cast-componentwise-compatible.shader_test | 20 ++++++------- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index cc0a40ff..184a8613 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -284,18 +284,21 @@ static struct hlsl_ir_node *add_cast(struct hlsl_ctx *ctx, struct list *instrs, if (hlsl_types_are_equal(src_type, dst_type)) return node; - if ((src_type->type == HLSL_CLASS_MATRIX || dst_type->type == HLSL_CLASS_MATRIX) - && src_type->type <= HLSL_CLASS_LAST_NUMERIC && dst_type->type <= HLSL_CLASS_LAST_NUMERIC) + if (src_type->type > HLSL_CLASS_VECTOR || dst_type->type > HLSL_CLASS_VECTOR) { + unsigned int src_comp_count = hlsl_type_component_count(src_type); + unsigned int dst_comp_count = hlsl_type_component_count(dst_type); struct hlsl_deref var_deref; + bool broadcast, matrix_cast; struct hlsl_ir_load *load; struct hlsl_ir_var *var; unsigned int dst_idx; - bool broadcast; - broadcast = src_type->dimx == 1 && src_type->dimy == 1; - assert(dst_type->dimx * dst_type->dimy <= src_type->dimx * src_type->dimy || broadcast); - if (src_type->type == HLSL_CLASS_MATRIX && dst_type->type == HLSL_CLASS_MATRIX && !broadcast) + broadcast = src_type->type <= HLSL_CLASS_LAST_NUMERIC && src_type->dimx == 1 && src_type->dimy == 1; + matrix_cast = !broadcast && dst_comp_count != src_comp_count + && src_type->type == HLSL_CLASS_MATRIX && dst_type->type == HLSL_CLASS_MATRIX; + assert(src_comp_count >= dst_comp_count || broadcast); + if (matrix_cast) { assert(dst_type->dimx <= src_type->dimx); assert(dst_type->dimy <= src_type->dimy); @@ -305,9 +308,9 @@ static struct hlsl_ir_node *add_cast(struct hlsl_ctx *ctx, struct list *instrs, return NULL; hlsl_init_simple_deref_from_var(&var_deref, var); - for (dst_idx = 0; dst_idx < dst_type->dimx * dst_type->dimy; ++dst_idx) + for (dst_idx = 0; dst_idx < dst_comp_count; ++dst_idx) { - struct hlsl_type *dst_scalar_type; + struct hlsl_type *dst_comp_type; struct hlsl_ir_store *store; struct hlsl_block block; unsigned int src_idx; @@ -316,26 +319,23 @@ static struct hlsl_ir_node *add_cast(struct hlsl_ctx *ctx, struct list *instrs, { src_idx = 0; } - else + else if (matrix_cast) { - if (src_type->type == HLSL_CLASS_MATRIX && dst_type->type == HLSL_CLASS_MATRIX) - { - unsigned int x = dst_idx % dst_type->dimx, y = dst_idx / dst_type->dimx; + unsigned int x = dst_idx % dst_type->dimx, y = dst_idx / dst_type->dimx; - src_idx = y * src_type->dimx + x; - } - else - { - src_idx = dst_idx; - } + src_idx = y * src_type->dimx + x; + } + else + { + src_idx = dst_idx; } - dst_scalar_type = hlsl_type_get_component_type(ctx, dst_type, dst_idx); + dst_comp_type = hlsl_type_get_component_type(ctx, dst_type, dst_idx); if (!(load = add_load_component(ctx, instrs, node, src_idx, loc))) return NULL; - if (!(cast = hlsl_new_cast(ctx, &load->node, dst_scalar_type, loc))) + if (!(cast = hlsl_new_cast(ctx, &load->node, dst_comp_type, loc))) return NULL; list_add_tail(instrs, &cast->node.entry); diff --git a/tests/cast-broadcast.shader_test b/tests/cast-broadcast.shader_test index e21e65b0..d8571fc8 100644 --- a/tests/cast-broadcast.shader_test +++ b/tests/cast-broadcast.shader_test @@ -19,8 +19,8 @@ float4 main() : SV_TARGET } [test] -todo draw quad -todo probe all rgba (84.0, 84.0, 84.0, 84.0) +draw quad +probe all rgba (84.0, 84.0, 84.0, 84.0) [pixel shader fail] diff --git a/tests/cast-componentwise-compatible.shader_test b/tests/cast-componentwise-compatible.shader_test index c6402cf5..286c180b 100644 --- a/tests/cast-componentwise-compatible.shader_test +++ b/tests/cast-componentwise-compatible.shader_test @@ -16,8 +16,8 @@ float4 main() : sv_target [test] -todo draw quad -todo probe all rgba (1.0, 2.0, 3.0, 1.0) +draw quad +probe all rgba (1.0, 2.0, 3.0, 1.0) [pixel shader] @@ -39,8 +39,8 @@ float4 main() : sv_target [test] -todo draw quad -todo probe all rgba (5.0, 6.0, 7.0, 8.0) +draw quad +probe all rgba (5.0, 6.0, 7.0, 8.0) [pixel shader] @@ -55,8 +55,8 @@ float4 main() : sv_target [test] -todo draw quad -todo probe all rgba (1.0, 2.0, 3.0, 4.0) +draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0) [pixel shader] @@ -86,8 +86,8 @@ float4 main() : sv_target } [test] -todo draw quad -todo probe all rgba (7.0, 7.0, 7.0, 7.0) +draw quad +probe all rgba (7.0, 7.0, 7.0, 7.0) [pixel shader] @@ -119,8 +119,8 @@ float4 main() : sv_target } [test] -todo draw quad -todo probe all rgba (3.0, 3.0, 3.0, 3.0) +draw quad +probe all rgba (3.0, 3.0, 3.0, 3.0) [pixel shader fail]

1 0

Francisco Casas : vkd3d-shader/hlsl: Remove incorrect criteria for accepting implicit casts.
by Alexandre Julliard 25 Oct '22

25 Oct '22

Module: vkd3d Branch: master Commit: 1c778116484d22b57b34fd8baac10e5238a11294 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1c778116484d22b57b34fd8baac10… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Oct 20 10:42:31 2022 -0300 vkd3d-shader/hlsl: Remove incorrect criteria for accepting implicit casts. --- libs/vkd3d-shader/hlsl.y | 16 ---------------- tests/cast-componentwise-equal.shader_test | 10 +++++----- 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 184a8613..d0bbee9e 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -222,22 +222,6 @@ static bool implicit_compatible_data_types(struct hlsl_type *src, struct hlsl_ty return true; } - if (src->type == HLSL_CLASS_ARRAY && dst->type == HLSL_CLASS_ARRAY) - { - return hlsl_type_component_count(src) == hlsl_type_component_count(dst); - } - - if ((src->type == HLSL_CLASS_ARRAY && dst->type <= HLSL_CLASS_LAST_NUMERIC) - || (src->type <= HLSL_CLASS_LAST_NUMERIC && dst->type == HLSL_CLASS_ARRAY)) - { - /* e.g. float4[3] to float4 is allowed */ - if (src->type == HLSL_CLASS_ARRAY && hlsl_types_are_equal(src->e.array.type, dst)) - return true; - if (hlsl_type_component_count(src) == hlsl_type_component_count(dst)) - return true; - return false; - } - if (src->type <= HLSL_CLASS_VECTOR && dst->type <= HLSL_CLASS_VECTOR) { if (src->dimx >= dst->dimx) diff --git a/tests/cast-componentwise-equal.shader_test b/tests/cast-componentwise-equal.shader_test index 8a98b45c..30c26c63 100644 --- a/tests/cast-componentwise-equal.shader_test +++ b/tests/cast-componentwise-equal.shader_test @@ -226,7 +226,7 @@ float4 main() : sv_target } -[pixel shader fail todo] +[pixel shader fail] float main() : SV_TARGET { float arr[3] = {1, 2, 3}; @@ -237,7 +237,7 @@ float main() : SV_TARGET } -[pixel shader fail todo] +[pixel shader fail] float main() : SV_TARGET { float2 arr[3] = {1, 2, 3, 4, 5, 6}; @@ -248,7 +248,7 @@ float main() : SV_TARGET } -[pixel shader fail todo] +[pixel shader fail] float4 main() : SV_TARGET { int arr1[4] = {1, 2, 3, 4}; @@ -270,7 +270,7 @@ float4 main() : SV_TARGET } -[pixel shader fail todo] +[pixel shader fail] float4 main() : SV_TARGET { float4 f = {1, 2, 3, 4}; @@ -281,7 +281,7 @@ float4 main() : SV_TARGET } -[pixel shader fail todo] +[pixel shader fail] float4 main() : SV_TARGET { float arr[4] = {1, 2, 3, 4};

1 0