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

Piotr Caban : winedump: Handle empty list in variadic template.
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: wine Branch: master Commit: bdba9407d99d236a4c0e2cb8f8973bf5eb478862 URL: https://gitlab.winehq.org/wine/wine/-/commit/bdba9407d99d236a4c0e2cb8f8973b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 14 18:44:59 2024 +0200 winedump: Handle empty list in variadic template. --- tools/winedump/msmangle.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/winedump/msmangle.c b/tools/winedump/msmangle.c index 1b76178ce16..d24a9f0b881 100644 --- a/tools/winedump/msmangle.c +++ b/tools/winedump/msmangle.c @@ -273,6 +273,12 @@ static char* get_args(struct parsed_symbol* sym, BOOL z_term, sym->current++; break; } + /* Handle empty list in variadic template */ + if (!z_term && sym->current[0] == '$' && sym->current[1] == '$' && sym->current[2] == 'V') + { + sym->current += 3; + continue; + } if (!demangle_datatype(sym, &ct, IN_ARGS)) return NULL; /* 'void' terminates an argument list in a function */

1 0

Piotr Caban : ucrtbase: Handle empty list in variadic template.
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: wine Branch: master Commit: 841f33afbb1367ecf32e4a03993379738d211e5a URL: https://gitlab.winehq.org/wine/wine/-/commit/841f33afbb1367ecf32e4a03993379… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 14 18:43:05 2024 +0200 ucrtbase: Handle empty list in variadic template. --- dlls/msvcrt/undname.c | 6 ++++++ dlls/ucrtbase/tests/cpp.c | 10 ++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 85ee181fc2c..6b255109e1f 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -378,6 +378,12 @@ static char* get_args(struct parsed_symbol* sym, BOOL z_term, sym->current++; break; } + /* Handle empty list in variadic template */ + if (!z_term && sym->current[0] == '$' && sym->current[1] == '$' && sym->current[2] == 'V') + { + sym->current += 3; + continue; + } if (!demangle_datatype(sym, &ct, IN_ARGS)) return NULL; /* 'void' terminates an argument list in a function */ diff --git a/dlls/ucrtbase/tests/cpp.c b/dlls/ucrtbase/tests/cpp.c index 9a66d66d814..c20f889d686 100644 --- a/dlls/ucrtbase/tests/cpp.c +++ b/dlls/ucrtbase/tests/cpp.c @@ -24,6 +24,8 @@ #include <windef.h> #include <winbase.h> +#include <verrsrc.h> +#include <dbghelp.h> #include "wine/test.h" typedef unsigned char MSVCRT_bool; @@ -209,11 +211,15 @@ static void test___unDName(void) /* 5 */ {"?meth(a)Q@@QEGBA?AV1(a)XZ", "public: class Q Q::meth(void)const & ", "public: ?? :: ?? ::XZ::V1" /* W10 1507 fails on this :-( */, - 0x02 /*UNDNAME_NO_MS_KEYWORDS*/}, + UNDNAME_NO_MS_KEYWORDS}, /* 6 */ {"?meth(a)Q@@QEHAA?AV1(a)XZ", "public: class Q Q::meth(void)&& ", "public: ?? :: ?? ::XZ::V1" /* W10 1507 fails on this :-( */, - 0x02 /*UNDNAME_NO_MS_KEYWORDS*/}, + UNDNAME_NO_MS_KEYWORDS}, +/* 7 */ {"?AU?$my_iter(a)H$0A@$$V@@", + "struct my_iter<int,0>", + NULL, + UNDNAME_NO_ARGUMENTS}, }; unsigned i; for (i = 0; i < ARRAY_SIZE(und_tests); i++)

1 0

Jacek Caban : winebuild: Use .drectve section for exports on ARM64EC.
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: wine Branch: master Commit: ab9201be5cd2e20b6b06514998651cd1999daa05 URL: https://gitlab.winehq.org/wine/wine/-/commit/ab9201be5cd2e20b6b06514998651c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 1 12:16:15 2023 +0200 winebuild: Use .drectve section for exports on ARM64EC. --- tools/winebuild/spec32.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 718ce4666ef..f06c40ca9b1 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -411,6 +411,48 @@ void output_exports( DLLSPEC *spec ) if (!nr_exports) return; + /* ARM64EC exports are more tricky than other targets. For functions implemented in ARM64EC, + * linker generates x86_64 thunk and relevant metadata. Use .drectve section to pass export + * directives to the linker. */ + if (target.cpu == CPU_ARM64EC) + { + output( "\t.section .drectve\n" ); + for (i = exports->base; i <= exports->limit; i++) + { + ORDDEF *odp = exports->ordinals[i]; + const char *symbol; + + if (!odp) continue; + + switch (odp->type) + { + case TYPE_EXTERN: + case TYPE_STDCALL: + case TYPE_VARARGS: + case TYPE_CDECL: + if (odp->flags & FLAG_FORWARD) + symbol = odp->link_name; + else if (odp->flags & FLAG_EXT_LINK) + symbol = strmake( "%s_%s", asm_name("__wine_spec_ext_link"), odp->link_name ); + else + symbol = asm_name( get_link_name( odp )); + break; + case TYPE_STUB: + symbol = asm_name( get_stub_name( odp, spec )); + break; + default: + assert( 0 ); + } + + output( "\t.ascii \" -export:%s=%s,@%u%s%s\"\n", + odp->name ? odp->name : strmake( "_noname%u", i ), + symbol, i, + odp->name ? "" : ",NONAME", + odp->type == TYPE_EXTERN ? ",DATA" : "" ); + } + return; + } + output( "\n/* export table */\n\n" ); output( "\t%s\n", get_asm_export_section() ); output( "\t.balign 4\n" );

1 0

Alexandre Julliard : winemac.drv: Remove some no longer used code.
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: wine Branch: master Commit: 7ee4b28517015a30a43183eb9cd66ebf2bdf4cdc URL: https://gitlab.winehq.org/wine/wine/-/commit/7ee4b28517015a30a43183eb9cd66e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 14 21:03:49 2024 +0200 winemac.drv: Remove some no longer used code. Unused since 320442a48b3de75470bb545831ebc9e80adaaab3. --- dlls/winemac.drv/display.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index fe9e6dcb5bd..c8e29cbf908 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1116,17 +1116,6 @@ void macdrv_displays_changed(const macdrv_event *event) static BOOL force_display_devices_refresh; -static BOOL is_same_devmode(const DEVMODEW *a, const DEVMODEW *b) -{ - return a->dmDisplayOrientation == b->dmDisplayOrientation && - a->dmDisplayFixedOutput == b->dmDisplayFixedOutput && - a->dmBitsPerPel == b->dmBitsPerPel && - a->dmPelsWidth == b->dmPelsWidth && - a->dmPelsHeight == b->dmPelsHeight && - a->dmDisplayFlags == b->dmDisplayFlags && - a->dmDisplayFrequency == b->dmDisplayFrequency; -} - UINT macdrv_UpdateDisplayDevices( const struct gdi_device_manager *device_manager, BOOL force, void *param ) { struct macdrv_adapter *adapters, *adapter; @@ -1134,8 +1123,7 @@ UINT macdrv_UpdateDisplayDevices( const struct gdi_device_manager *device_manage struct macdrv_gpu *gpus, *gpu; struct macdrv_display *displays, *display; INT gpu_count, adapter_count, monitor_count, mode_count, display_count; - DEVMODEW *mode, *modes; - DWORD len; + DEVMODEW *modes; if (!force && !force_display_devices_refresh) return STATUS_ALREADY_COMPLETE; force_display_devices_refresh = FALSE;

1 0

Tim Clem : winemac.drv: Do not consider the "valid" and "safe" flags as making a display mode unique.
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: wine Branch: master Commit: 15968690eb541f3eb0c145e538f7dc7bab85f60a URL: https://gitlab.winehq.org/wine/wine/-/commit/15968690eb541f3eb0c145e538f7dc… Author: Tim Clem <tclem(a)codeweavers.com> Date: Tue May 7 14:35:21 2024 -0700 winemac.drv: Do not consider the "valid" and "safe" flags as making a display mode unique. In the case that unsafe/invalid modes aren't excluded entirely by the include_unsupported flag to copy_display_modes, we actually want to compare them to their counterparts with the same resolution, so that we can prefer the safe and valid alternatives. --- dlls/winemac.drv/display.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index ed27390ac30..fe9e6dcb5bd 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -420,8 +420,7 @@ static CFDictionaryRef create_mode_dict(CGDisplayModeRef display_mode, BOOL is_o height *= 2; } - io_flags &= kDisplayModeValidFlag | kDisplayModeSafeFlag | kDisplayModeInterlacedFlag | - kDisplayModeStretchedFlag | kDisplayModeTelevisionFlag; + io_flags &= kDisplayModeInterlacedFlag | kDisplayModeStretchedFlag | kDisplayModeTelevisionFlag; cf_io_flags = CFNumberCreate(NULL, kCFNumberSInt32Type, &io_flags); cf_width = CFNumberCreate(NULL, kCFNumberSInt64Type, &width); cf_height = CFNumberCreate(NULL, kCFNumberSInt64Type, &height);

1 0

Elizabeth Figura : winegstreamer: Link to msvcrt instead of ucrtbase.
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: wine Branch: master Commit: 3f5640609bc1de7dc381af816a8c612c1d75bab3 URL: https://gitlab.winehq.org/wine/wine/-/commit/3f5640609bc1de7dc381af816a8c61… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Mon Apr 1 19:48:40 2024 -0500 winegstreamer: Link to msvcrt instead of ucrtbase. It links to strmbase, which is built against msvcrt. --- dlls/winegstreamer/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in index abf3d82d6a8..e33aa6c4d18 100644 --- a/dlls/winegstreamer/Makefile.in +++ b/dlls/winegstreamer/Makefile.in @@ -1,7 +1,7 @@ MODULE = winegstreamer.dll UNIXLIB = winegstreamer.so IMPORTLIB = winegstreamer -IMPORTS = strmbase ole32 oleaut32 msdmo +IMPORTS = strmbase ole32 oleaut32 msdmo msvcrt DELAYIMPORTS = mfplat mf UNIX_CFLAGS = $(GSTREAMER_CFLAGS) UNIX_LIBS = $(GSTREAMER_LIBS) $(PTHREAD_LIBS)

1 0

Tim Clem : winemac.drv: Document mode_is_preferred.
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: wine Branch: master Commit: 64f67f412d807337a85cef63c10648c0ccfad600 URL: https://gitlab.winehq.org/wine/wine/-/commit/64f67f412d807337a85cef63c10648… Author: Tim Clem <tclem(a)codeweavers.com> Date: Tue May 7 14:31:25 2024 -0700 winemac.drv: Document mode_is_preferred. --- dlls/winemac.drv/display.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index edf740b260e..b1a5a4500d2 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -457,6 +457,17 @@ static CFDictionaryRef create_mode_dict(CGDisplayModeRef display_mode, BOOL is_o } +/*********************************************************************** + * mode_is_preferred + * + * Returns whether new_mode ought to be preferred over old_mode - that is, + * whether new_mode is a better option to expose as a valid mode to switch to. + * old_mode may be NULL, in which case the function returns true if the mode + * should be considered at all. + * old_mode and new_mode are guaranteed to have identical return values from + * create_mode_dict. So, they will have the same point dimension and relevant + * IO flags, among other properties. + */ static BOOL mode_is_preferred(CGDisplayModeRef new_mode, CGDisplayModeRef old_mode, struct display_mode_descriptor *original_mode_desc, BOOL include_unsupported)

1 0

Tim Clem : winemac.drv: Prefer display modes that are marked as usable for desktop.
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: wine Branch: master Commit: 28dfeefccafda17ade9776722367f816fd3539a1 URL: https://gitlab.winehq.org/wine/wine/-/commit/28dfeefccafda17ade9776722367f8… Author: Tim Clem <tclem(a)codeweavers.com> Date: Tue May 7 14:33:17 2024 -0700 winemac.drv: Prefer display modes that are marked as usable for desktop. Some devices, like the Apple Studio Display, have modes that differ only in this flag, and switching to the ones that are not usable for desktop results in an error. --- dlls/winemac.drv/display.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index b1a5a4500d2..ed27390ac30 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -475,6 +475,7 @@ static BOOL mode_is_preferred(CGDisplayModeRef new_mode, CGDisplayModeRef old_mo BOOL new_is_supported; CFStringRef pixel_encoding; size_t width_points, height_points; + BOOL new_usable_for_desktop, old_usable_for_desktop; size_t old_width_pixels, old_height_pixels, new_width_pixels, new_height_pixels; BOOL old_size_same, new_size_same; @@ -516,6 +517,12 @@ static BOOL mode_is_preferred(CGDisplayModeRef new_mode, CGDisplayModeRef old_mo if (!new_is_supported && display_mode_is_supported(old_mode)) return FALSE; + /* Prefer modes that are usable for desktop over ones that aren't. */ + new_usable_for_desktop = CGDisplayModeIsUsableForDesktopGUI(new_mode); + old_usable_for_desktop = CGDisplayModeIsUsableForDesktopGUI(old_mode); + if (new_usable_for_desktop && !old_usable_for_desktop) + return TRUE; + /* Otherwise, prefer a mode whose pixel size equals its point size over one which is scaled. */ width_points = CGDisplayModeGetWidth(new_mode);

1 0

Elizabeth Figura : qedit: Link to msvcrt instead of ucrtbase.
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: wine Branch: master Commit: 0c4811be0eeb3e06553e015607d2109db3c54edf URL: https://gitlab.winehq.org/wine/wine/-/commit/0c4811be0eeb3e06553e015607d210… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Mon Apr 1 19:48:30 2024 -0500 qedit: Link to msvcrt instead of ucrtbase. It links to strmbase, which is built against msvcrt. --- dlls/qedit/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qedit/Makefile.in b/dlls/qedit/Makefile.in index 9545b21c091..80635294961 100644 --- a/dlls/qedit/Makefile.in +++ b/dlls/qedit/Makefile.in @@ -1,5 +1,5 @@ MODULE = qedit.dll -IMPORTS = strmiids strmbase uuid oleaut32 ole32 advapi32 +IMPORTS = strmiids strmbase uuid oleaut32 ole32 advapi32 msvcrt SOURCES = \ main.c \

1 0

Elizabeth Figura : quartz: Link to msvcrt instead of ucrtbase.
by Alexandre Julliard May 14, 2024

May 14, 2024

Module: wine Branch: master Commit: 058439ce49ddde7326caca73ed8fa708ed159bc1 URL: https://gitlab.winehq.org/wine/wine/-/commit/058439ce49ddde7326caca73ed8fa7… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Mon Apr 1 19:48:35 2024 -0500 quartz: Link to msvcrt instead of ucrtbase. It links to strmbase, which is built against msvcrt. --- dlls/quartz/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in index 1456d281cb8..db6280f27ed 100644 --- a/dlls/quartz/Makefile.in +++ b/dlls/quartz/Makefile.in @@ -1,6 +1,6 @@ MODULE = quartz.dll IMPORTLIB = quartz -IMPORTS = strmiids dxguid strmbase uuid dsound msacm32 msvfw32 ole32 oleaut32 rpcrt4 user32 gdi32 advapi32 winmm +IMPORTS = strmiids dxguid strmbase uuid dsound msacm32 msvfw32 ole32 oleaut32 rpcrt4 user32 gdi32 advapi32 winmm msvcrt DELAYIMPORTS = ddraw SOURCES = \

1 0