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

Jeff Smith : gdiplus: Fix GdipGetAllPropertyItems return value when no properties exist.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: master Commit: b48a37f450ed17d45130ec56eddafd18b36a3187 URL: https://gitlab.winehq.org/wine/wine/-/commit/b48a37f450ed17d45130ec56eddafd… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Tue Jul 11 10:03:53 2023 -0500 gdiplus: Fix GdipGetAllPropertyItems return value when no properties exist. Discovered in researching https://bugs.winehq.org/show_bug.cgi?id=54748 --- dlls/gdiplus/image.c | 2 +- dlls/gdiplus/tests/image.c | 52 +++++++++++++++++++++++----------------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 7ad3ca0347e..4ba6b1efd95 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2846,7 +2846,7 @@ GpStatus WINGDIPAPI GdipGetAllPropertyItems(GpImage *image, UINT size, } reader = ((GpBitmap *)image)->metadata_reader; - if (!reader) return PropertyNotFound; + if (!reader) return GenericError; hr = IWICMetadataReader_GetEnumerator(reader, &enumerator); if (FAILED(hr)) return hresult_to_status(hr); diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index b718a6fca16..b5f86c7e1b9 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3681,6 +3681,7 @@ static void test_image_properties(void) }; GpStatus status, expected; GpImage *image; + PropertyItem *prop_item; UINT prop_count, prop_size, i; PROPID prop_id[16] = { 0 }; ImageType image_type; @@ -3816,6 +3817,31 @@ static void test_image_properties(void) status = GdipGetPropertySize(image, &prop_size, &prop_count); expect(expected, status); + status = GdipGetAllPropertyItems(image, 0, 0, NULL); + expect(InvalidParameter, status); + status = GdipGetAllPropertyItems(image, prop_size, prop_count, NULL); + expect(InvalidParameter, status); + prop_item = HeapAlloc(GetProcessHeap(), 0, prop_size); + expected = (image_type == ImageTypeMetafile) ? NotImplemented : InvalidParameter; + if (prop_count != 1) + { + status = GdipGetAllPropertyItems(image, prop_size, 1, prop_item); + expect(expected, status); + } + if (prop_size != 0) + { + status = GdipGetAllPropertyItems(image, 0, prop_count, prop_item); + expect(expected, status); + } + status = GdipGetAllPropertyItems(image, prop_size + 1, prop_count, prop_item); + expect(expected, status); + if (image_type != ImageTypeMetafile) + expected = (prop_count == 0) ? GenericError : Ok; + status = GdipGetAllPropertyItems(image, prop_size, prop_count, prop_item); + ok(status == expected || broken(status == Ok && prop_count == 0), /* XP */ + "Expected %d, got %d\n", expected, status); + HeapFree(GetProcessHeap(), 0, prop_item); + GdipDisposeImage(image); winetest_pop_context(); @@ -4176,19 +4202,6 @@ static void test_GdipGetAllPropertyItems(void) "expected total property size %u, got %u\n", prop_size, total_size); prop_item = HeapAlloc(GetProcessHeap(), 0, prop_size); - - status = GdipGetAllPropertyItems(image, 0, prop_count, prop_item); - expect(InvalidParameter, status); - status = GdipGetAllPropertyItems(image, prop_size, 1, prop_item); - expect(InvalidParameter, status); - status = GdipGetAllPropertyItems(image, prop_size, prop_count, NULL); - expect(InvalidParameter, status); - status = GdipGetAllPropertyItems(image, prop_size, prop_count, NULL); - expect(InvalidParameter, status); - status = GdipGetAllPropertyItems(image, 0, 0, NULL); - expect(InvalidParameter, status); - status = GdipGetAllPropertyItems(image, prop_size + 1, prop_count, prop_item); - expect(InvalidParameter, status); status = GdipGetAllPropertyItems(image, prop_size, prop_count, prop_item); expect(Ok, status); @@ -4932,19 +4945,6 @@ static void test_gif_properties(void) "expected total property size %u, got %u\n", prop_size, total_size); prop_item = HeapAlloc(GetProcessHeap(), 0, prop_size); - - status = GdipGetAllPropertyItems(image, 0, prop_count, prop_item); - expect(InvalidParameter, status); - status = GdipGetAllPropertyItems(image, prop_size, 1, prop_item); - expect(InvalidParameter, status); - status = GdipGetAllPropertyItems(image, prop_size, prop_count, NULL); - expect(InvalidParameter, status); - status = GdipGetAllPropertyItems(image, prop_size, prop_count, NULL); - expect(InvalidParameter, status); - status = GdipGetAllPropertyItems(image, 0, 0, NULL); - expect(InvalidParameter, status); - status = GdipGetAllPropertyItems(image, prop_size + 1, prop_count, prop_item); - expect(InvalidParameter, status); status = GdipGetAllPropertyItems(image, prop_size, prop_count, prop_item); expect(Ok, status);

1 0

Brendan Shanks : ntdll: Don't release address space on 64-bit macOS.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: master Commit: c1958ddc7a497c8bdf5e61a3677bc595a77fd389 URL: https://gitlab.winehq.org/wine/wine/-/commit/c1958ddc7a497c8bdf5e61a3677bc5… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Jun 19 20:56:43 2023 -0700 ntdll: Don't release address space on 64-bit macOS. --- dlls/ntdll/unix/virtual.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 392ac4d9966..62fc1c9dd1f 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -4128,6 +4128,13 @@ static void virtual_release_address_space(void) char *base = (char *)0x82000000; char *limit = get_wow_user_space_limit(); +#if defined(__APPLE__) && !defined(__i386__) + /* On 64-bit macOS, don't release any address space. + * It needs to be reserved for use by Wow64 + */ + return; +#endif + if (limit > (char *)0xfffff000) return; /* 64-bit limit, nothing to do */ if (limit > base)

1 0

Brendan Shanks : configure: Only attempt to build macOS preloader on Intel, and remove unnecessary flag checks.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: master Commit: 0920543876a38c366cb1ce85d2d47382ba15bb8f URL: https://gitlab.winehq.org/wine/wine/-/commit/0920543876a38c366cb1ce85d2d473… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Jun 19 21:39:13 2023 -0700 configure: Only attempt to build macOS preloader on Intel, and remove unnecessary flag checks. --- configure | 104 ++++++++--------------------------------------------------- configure.ac | 23 +++++++------ 2 files changed, 26 insertions(+), 101 deletions(-) diff --git a/configure b/configure index 4d3108303b8..7fb1685316b 100755 --- a/configure +++ b/configure @@ -9480,99 +9480,14 @@ fi ;; WINELOADER_LDFLAGS="-Wl,-pie,-segalign,0x1000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist" - wine_can_build_preloader=yes - WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7d400000,-segalign,0x1000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist,-segaddr,WINE_4GB_RESERVE,0x100000000" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-no_new_main -e _main" >&5 -printf %s "checking whether the compiler supports -Wl,-no_new_main -e _main... " >&6; } -if test ${ac_cv_cflags__Wl__no_new_main__e__main+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -Wl,-no_new_main -e _main" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int main(int argc, char **argv) { return 0; } -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - ac_cv_cflags__Wl__no_new_main__e__main=yes -else $as_nop - ac_cv_cflags__Wl__no_new_main__e__main=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext -CFLAGS=$ac_wine_try_cflags_saved -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl__no_new_main__e__main" >&5 -printf "%s\n" "$ac_cv_cflags__Wl__no_new_main__e__main" >&6; } -if test "x$ac_cv_cflags__Wl__no_new_main__e__main" = xyes -then : - WINEPRELOADER_LDFLAGS="-Wl,-no_new_main $WINEPRELOADER_LDFLAGS" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-no_new_main -e _main -mmacosx-version-min=10.7 -nostartfiles -nodefaultlibs" >&5 -printf %s "checking whether the compiler supports -Wl,-no_new_main -e _main -mmacosx-version-min=10.7 -nostartfiles -nodefaultlibs... " >&6; } -if test ${ac_cv_cflags__Wl__no_new_main__e__main__mmacosx_version_min_10_7__nostartfiles__nodefaultlibs+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -Wl,-no_new_main -e _main -mmacosx-version-min=10.7 -nostartfiles -nodefaultlibs" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int main(int argc, char **argv) { return 0; } -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - ac_cv_cflags__Wl__no_new_main__e__main__mmacosx_version_min_10_7__nostartfiles__nodefaultlibs=yes -else $as_nop - ac_cv_cflags__Wl__no_new_main__e__main__mmacosx_version_min_10_7__nostartfiles__nodefaultlibs=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext -CFLAGS=$ac_wine_try_cflags_saved -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wl__no_new_main__e__main__mmacosx_version_min_10_7__nostartfiles__nodefaultlibs" >&5 -printf "%s\n" "$ac_cv_cflags__Wl__no_new_main__e__main__mmacosx_version_min_10_7__nostartfiles__nodefaultlibs" >&6; } -if test "x$ac_cv_cflags__Wl__no_new_main__e__main__mmacosx_version_min_10_7__nostartfiles__nodefaultlibs" = xyes -then : - WINEPRELOADER_LDFLAGS="-mmacosx-version-min=10.7 $WINEPRELOADER_LDFLAGS" -else $as_nop - wine_can_build_preloader=no -fi -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -mmacosx-version-min=10.7 -nostartfiles -nodefaultlibs" >&5 -printf %s "checking whether the compiler supports -mmacosx-version-min=10.7 -nostartfiles -nodefaultlibs... " >&6; } -if test ${ac_cv_cflags__mmacosx_version_min_10_7__nostartfiles__nodefaultlibs+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -mmacosx-version-min=10.7 -nostartfiles -nodefaultlibs" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int main(int argc, char **argv) { return 0; } -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - ac_cv_cflags__mmacosx_version_min_10_7__nostartfiles__nodefaultlibs=yes -else $as_nop - ac_cv_cflags__mmacosx_version_min_10_7__nostartfiles__nodefaultlibs=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext -CFLAGS=$ac_wine_try_cflags_saved -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__mmacosx_version_min_10_7__nostartfiles__nodefaultlibs" >&5 -printf "%s\n" "$ac_cv_cflags__mmacosx_version_min_10_7__nostartfiles__nodefaultlibs" >&6; } -if test "x$ac_cv_cflags__mmacosx_version_min_10_7__nostartfiles__nodefaultlibs" = xyes -then : - WINEPRELOADER_LDFLAGS="-mmacosx-version-min=10.7 $WINEPRELOADER_LDFLAGS" -else $as_nop - wine_can_build_preloader=no -fi -fi + case $host_cpu in + *i[3456]86*|*x86_64*) wine_can_build_preloader=yes ;; + *) wine_can_build_preloader=no ;; + esac + if test "$wine_can_build_preloader" = "yes" then + WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -mmacosx-version-min=10.7 -Wl,-no_new_main,-image_base,0x7d400000,-segalign,0x1000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-no_pie" >&5 printf %s "checking whether the compiler supports -Wl,-no_pie... " >&6; } if test ${ac_cv_cflags__Wl__no_pie+y} @@ -9601,6 +9516,13 @@ if test "x$ac_cv_cflags__Wl__no_pie" = xyes then : WINEPRELOADER_LDFLAGS="-Wl,-no_pie $WINEPRELOADER_LDFLAGS" fi + case $host_cpu in + *i[3456]86*) + ;; + *x86_64*) + WINEPRELOADER_LDFLAGS="-Wl,-segalign,0x1000,-segaddr,WINE_4GB_RESERVE,0x100000000 $WINEPRELOADER_LDFLAGS" + ;; + esac WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -mmacosx-version-min=10.7" else as_fn_append wine_warnings "|can't build Wine preloader; many programs won't work" diff --git a/configure.ac b/configure.ac index c9ed1c8c431..da31051d8de 100644 --- a/configure.ac +++ b/configure.ac @@ -678,20 +678,23 @@ case $host_os in WINELOADER_LDFLAGS="-Wl,-pie,-segalign,0x1000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist" - wine_can_build_preloader=yes - WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7d400000,-segalign,0x1000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist,-segaddr,WINE_4GB_RESERVE,0x100000000" - WINE_TRY_CFLAGS([-Wl,-no_new_main -e _main], - [WINEPRELOADER_LDFLAGS="-Wl,-no_new_main $WINEPRELOADER_LDFLAGS" - WINE_TRY_CFLAGS([-Wl,-no_new_main -e _main -mmacosx-version-min=10.7 -nostartfiles -nodefaultlibs], - [WINEPRELOADER_LDFLAGS="-mmacosx-version-min=10.7 $WINEPRELOADER_LDFLAGS"], - [wine_can_build_preloader=no])], - [WINE_TRY_CFLAGS([-mmacosx-version-min=10.7 -nostartfiles -nodefaultlibs], - [WINEPRELOADER_LDFLAGS="-mmacosx-version-min=10.7 $WINEPRELOADER_LDFLAGS"], - [wine_can_build_preloader=no])]) + case $host_cpu in + *i[[3456]]86*|*x86_64*) wine_can_build_preloader=yes ;; + *) wine_can_build_preloader=no ;; + esac + if test "$wine_can_build_preloader" = "yes" then + WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -mmacosx-version-min=10.7 -Wl,-no_new_main,-image_base,0x7d400000,-segalign,0x1000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist" WINE_TRY_CFLAGS([-Wl,-no_pie], [WINEPRELOADER_LDFLAGS="-Wl,-no_pie $WINEPRELOADER_LDFLAGS"]) + case $host_cpu in + *i[[3456]]86*) + ;; + *x86_64*) + WINEPRELOADER_LDFLAGS="-Wl,-segalign,0x1000,-segaddr,WINE_4GB_RESERVE,0x100000000 $WINEPRELOADER_LDFLAGS" + ;; + esac dnl If preloader is used, the loader needs to be an LC_UNIXTHREAD binary to avoid AppKit/Core Animation problems. WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -mmacosx-version-min=10.7" else

1 0

Brendan Shanks : loader: On 64-bit macOS, reserve the low 8GB using a zerofill section.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: master Commit: cfa0dd9dd91eea0e401347ba41141b9c0c23131d URL: https://gitlab.winehq.org/wine/wine/-/commit/cfa0dd9dd91eea0e401347ba41141b… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Jun 20 14:20:02 2023 -0700 loader: On 64-bit macOS, reserve the low 8GB using a zerofill section. A zerofill section is the only way to reserve address space and prevent system frameworks from using it, including preventing allocations before any preloader code runs: - starting with Ventura, dyld allocates private memory from 0x1000-0x81000. This breaks EXEs that have an image base of 0x10000. - Rosetta allocates memory starting at 0x100000000, which breaks EXEs based there. - starting with Monterey, for proper 10.7 binaries (which include a __program_vars section), libSystem initializes itself before the preloader runs. This fragments the <4GB address space which is needed for Wow64. This will need to be adjusted if any EXEs based at 0x200000000 or higher are found. --- configure | 5 +++-- configure.ac | 5 +++-- loader/preloader_mac.c | 26 +++++++++++++------------- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/configure b/configure index 7fb1685316b..4e021f19b5d 100755 --- a/configure +++ b/configure @@ -9487,7 +9487,7 @@ fi ;; if test "$wine_can_build_preloader" = "yes" then - WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -mmacosx-version-min=10.7 -Wl,-no_new_main,-image_base,0x7d400000,-segalign,0x1000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist" + WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -mmacosx-version-min=10.7 -Wl,-no_new_main,-segalign,0x1000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-no_pie" >&5 printf %s "checking whether the compiler supports -Wl,-no_pie... " >&6; } if test ${ac_cv_cflags__Wl__no_pie+y} @@ -9518,9 +9518,10 @@ then : fi case $host_cpu in *i[3456]86*) + WINEPRELOADER_LDFLAGS="-Wl,-image_base,0x7d400000 $WINEPRELOADER_LDFLAGS" ;; *x86_64*) - WINEPRELOADER_LDFLAGS="-Wl,-segalign,0x1000,-segaddr,WINE_4GB_RESERVE,0x100000000 $WINEPRELOADER_LDFLAGS" + WINEPRELOADER_LDFLAGS="-Wl,-image_base,0x200000000,-segalign,0x1000,-segaddr,WINE_RESERVE,0x1000 $WINEPRELOADER_LDFLAGS" ;; esac WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -mmacosx-version-min=10.7" diff --git a/configure.ac b/configure.ac index da31051d8de..71c9340b30d 100644 --- a/configure.ac +++ b/configure.ac @@ -685,14 +685,15 @@ case $host_os in if test "$wine_can_build_preloader" = "yes" then - WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -mmacosx-version-min=10.7 -Wl,-no_new_main,-image_base,0x7d400000,-segalign,0x1000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist" + WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -mmacosx-version-min=10.7 -Wl,-no_new_main,-segalign,0x1000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist" WINE_TRY_CFLAGS([-Wl,-no_pie], [WINEPRELOADER_LDFLAGS="-Wl,-no_pie $WINEPRELOADER_LDFLAGS"]) case $host_cpu in *i[[3456]]86*) + WINEPRELOADER_LDFLAGS="-Wl,-image_base,0x7d400000 $WINEPRELOADER_LDFLAGS" ;; *x86_64*) - WINEPRELOADER_LDFLAGS="-Wl,-segalign,0x1000,-segaddr,WINE_4GB_RESERVE,0x100000000 $WINEPRELOADER_LDFLAGS" + WINEPRELOADER_LDFLAGS="-Wl,-image_base,0x200000000,-segalign,0x1000,-segaddr,WINE_RESERVE,0x1000 $WINEPRELOADER_LDFLAGS" ;; esac dnl If preloader is used, the loader needs to be an LC_UNIXTHREAD binary to avoid AppKit/Core Animation problems. diff --git a/loader/preloader_mac.c b/loader/preloader_mac.c index 4e91128c575..11723cdaac9 100644 --- a/loader/preloader_mac.c +++ b/loader/preloader_mac.c @@ -49,18 +49,15 @@ #include "main.h" #if defined(__x86_64__) -/* Rosetta on Apple Silicon allocates memory starting at 0x100000000 (the 4GB line) - * before the preloader runs, which prevents any nonrelocatable EXEs with that - * base address from running. - * - * This empty linker section forces Rosetta's allocations (currently ~132 MB) - * to start at 0x114000000, and they should end below 0x120000000. +/* Reserve the low 8GB using a zero-fill section, this is the only way to + * prevent system frameworks from using any of it (including allocations + * before any preloader code runs) */ -__asm__(".zerofill WINE_4GB_RESERVE,WINE_4GB_RESERVE,___wine_4gb_reserve,0x14000000"); +__asm__(".zerofill WINE_RESERVE,WINE_RESERVE,___wine_reserve,0x1fffff000"); static const struct wine_preload_info zerofill_sections[] = { - { (void *)0x000100000000, 0x14000000 }, /* WINE_4GB_RESERVE section */ + { (void *)0x000000001000, 0x1fffff000 }, /* WINE_RESERVE section */ { 0, 0 } /* end of list */ }; #else @@ -92,10 +89,7 @@ static struct wine_preload_info preload_info[] = { (void *)0x00110000, 0x67ef0000 }, /* low memory area */ { (void *)0x7f000000, 0x03000000 }, /* top-down allocations + shared user data + virtual heap */ #else /* __i386__ */ - { (void *)0x000000010000, 0x00100000 }, /* DOS area */ - { (void *)0x000000110000, 0x67ef0000 }, /* low memory area */ - { (void *)0x00007f000000, 0x00ff0000 }, /* 32-bit top-down allocations + shared user data */ - { (void *)0x000100000000, 0x14000000 }, /* WINE_4GB_RESERVE section */ + { (void *)0x000000001000, 0x1fffff000 }, /* WINE_RESERVE section */ { (void *)0x7ff000000000, 0x01ff0000 }, /* top-down allocations + virtual heap */ #endif /* __i386__ */ { 0, 0 }, /* PE exe range set with WINEPRELOADRESERVE */ @@ -439,7 +433,7 @@ static int preloader_overlaps_range( const void *start, const void *end ) struct target_segment_command *seg = (struct target_segment_command*)cmd; const void *seg_start = (const void*)(seg->vmaddr + slide); const void *seg_end = (const char*)seg_start + seg->vmsize; - static const char reserved_segname[] = "WINE_4GB_RESERVE"; + static const char reserved_segname[] = "WINE_RESERVE"; if (!wld_strncmp( seg->segname, reserved_segname, sizeof(reserved_segname)-1 )) continue; @@ -653,7 +647,9 @@ static void set_program_vars( void *stack, void *mod ) void *wld_start( void *stack, int *is_unix_thread ) { +#ifdef __i386__ struct wine_preload_info builtin_dlls = { (void *)0x7a000000, 0x02000000 }; +#endif struct wine_preload_info **wine_main_preload_info; char **argv, **p, *reserve = NULL; struct target_mach_header *mh; @@ -692,15 +688,19 @@ void *wld_start( void *stack, int *is_unix_thread ) } } +#ifdef __i386__ if (!map_region( &builtin_dlls )) builtin_dlls.size = 0; +#endif /* load the main binary */ if (!(mod = pdlopen( argv[1], RTLD_NOW ))) fatal_error( "%s: could not load binary\n", argv[1] ); +#ifdef __i386__ if (builtin_dlls.size) wld_munmap( builtin_dlls.addr, builtin_dlls.size ); +#endif /* store pointer to the preload info into the appropriate main binary variable */ wine_main_preload_info = pdlsym( mod, "wine_main_preload_info" );

1 0

Brendan Shanks : loader: In macOS preloader, add __program_vars section.
by Alexandre Julliard 19 Jul '23

19 Jul '23

Module: wine Branch: master Commit: 4e6dbf3b9efc4974e4c5b8f2f5603655f7958cbd URL: https://gitlab.winehq.org/wine/wine/-/commit/4e6dbf3b9efc4974e4c5b8f2f56036… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Apr 6 12:08:49 2023 -0700 loader: In macOS preloader, add __program_vars section. This is needed to be a correct macOS 10.7 binary. --- loader/preloader_mac.c | 47 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 43 insertions(+), 4 deletions(-) diff --git a/loader/preloader_mac.c b/loader/preloader_mac.c index 11723cdaac9..e35444fd133 100644 --- a/loader/preloader_mac.c +++ b/loader/preloader_mac.c @@ -106,6 +106,39 @@ void *__stack_chk_guard = 0; void __stack_chk_fail_local(void) { return; } void __stack_chk_fail(void) { return; } +/* Binaries targeting 10.6 and 10.7 contain the __program_vars section, and + * dyld4 (starting in Monterey) does not like it to be missing: + * - running vmmap on a Wine process prints this warning: + * "Process exists but has not fully started -- dyld has initialized but libSystem has not" + * - because libSystem is not initialized, dlerror() always returns NULL (causing GStreamer + * to crash on init). + * - starting with macOS Sonoma, Wine crashes on launch if libSystem is not initialized. + * + * Adding __program_vars fixes those issues, and also allows more of the vars to + * be set correctly by the preloader for the loaded binary. + * + * See also: + * <https://github.com/apple-oss-distributions/Csu/blob/Csu-88/crt.c#L42> + * <https://github.com/apple-oss-distributions/dyld/blob/dyld-1042.1/common/Mac…> + */ +int NXArgc = 0; +const char** NXArgv = NULL; +const char** environ = NULL; +const char* __progname = NULL; + +extern void* __dso_handle; +struct ProgramVars +{ + void* mh; + int* NXArgcPtr; + const char*** NXArgvPtr; + const char*** environPtr; + const char** __prognamePtr; +}; +__attribute__((used)) static struct ProgramVars pvars +__attribute__ ((section ("__DATA,__program_vars"))) = { &__dso_handle, &NXArgc, &NXArgv, &environ, &__progname }; + + /* * When 'start' is called, stack frame looks like: * @@ -620,15 +653,16 @@ static void fixup_stack( void *stack ) static void set_program_vars( void *stack, void *mod ) { int *pargc; - char **argv, **env; + const char **argv, **env; int *wine_NXArgc = pdlsym( mod, "NXArgc" ); - char ***wine_NXArgv = pdlsym( mod, "NXArgv" ); - char ***wine_environ = pdlsym( mod, "environ" ); + const char ***wine_NXArgv = pdlsym( mod, "NXArgv" ); + const char ***wine_environ = pdlsym( mod, "environ" ); pargc = stack; - argv = (char **)pargc + 1; + argv = (const char **)pargc + 1; env = &argv[*pargc-1] + 2; + /* set vars in the loaded binary */ if (wine_NXArgc) *wine_NXArgc = *pargc; else @@ -643,6 +677,11 @@ static void set_program_vars( void *stack, void *mod ) *wine_environ = env; else wld_printf( "preloader: Warning: failed to set environ\n" ); + + /* set vars in the __program_vars section */ + NXArgc = *pargc; + NXArgv = argv; + environ = env; } void *wld_start( void *stack, int *is_unix_thread )

1 0

Jacek Caban : wow64win: Define more 32-bit types.
by Alexandre Julliard 17 Jul '23

17 Jul '23

Module: wine Branch: master Commit: 3b9580a3c7d07af19f7a41bc8eb4254a33ba1611 URL: https://gitlab.winehq.org/wine/wine/-/commit/3b9580a3c7d07af19f7a41bc8eb425… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 16 15:37:23 2023 +0200 wow64win: Define more 32-bit types. --- dlls/wow64win/user.c | 120 ++++++++++++++++++++++++++++----------------------- 1 file changed, 66 insertions(+), 54 deletions(-) diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 602ccfa79b9..7c3a6ddd7ab 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -153,6 +153,26 @@ typedef struct DWORD dwExStyle; } CREATESTRUCT32; +typedef struct +{ + ULONG szClass; + ULONG szTitle; + ULONG hOwner; + INT x; + INT y; + INT cx; + INT cy; + DWORD style; + ULONG lParam; +} MDICREATESTRUCT32; + +typedef struct +{ + ULONG hmenuIn; + ULONG hmenuNext; + ULONG hwndNext; +} MDINEXTMENU32; + typedef struct { LONG lResult; @@ -173,6 +193,31 @@ typedef struct UINT flags; } WINDOWPOS32; +typedef struct +{ + RECT rgrc[3]; + ULONG lppos; +} NCCALCSIZE_PARAMS32; + +typedef struct +{ + UINT CtlType; + UINT CtlID; + ULONG hwndItem; + UINT itemID1; + ULONG itemData1; + UINT itemID2; + ULONG itemData2; + DWORD dwLocaleId; +} COMPAREITEMSTRUCT32; + +typedef struct +{ + ULONG dwData; + DWORD cbData; + ULONG lpData; +} COPYDATASTRUCT32; + typedef struct { UINT CtlType; @@ -294,6 +339,21 @@ struct win_proc_params32 ULONG procW; }; +struct win_hook_params32 +{ + ULONG proc; + ULONG handle; + DWORD pid; + DWORD tid; + int id; + int code; + ULONG wparam; + ULONG lparam; + UINT lparam_size; + BOOL prev_unicode; + BOOL next_unicode; +}; + struct win_event_hook_params32 { DWORD event; @@ -679,20 +739,7 @@ static UINT hook_lparam_64to32( struct win_hook_params *params, const void *lp, static NTSTATUS WINAPI wow64_NtUserCallWindowsHook( void *arg, ULONG size ) { struct win_hook_params *params = arg; - struct - { - ULONG proc; - ULONG handle; - DWORD pid; - DWORD tid; - int id; - int code; - ULONG wparam; - ULONG lparam; - UINT lparam_size; - BOOL prev_unicode; - BOOL next_unicode; - } *params32; + struct win_hook_params32 *params32; UINT lparam32_size = 0, module_size, size32; void *ret_ptr; ULONG ret_len; @@ -2853,18 +2900,7 @@ static LRESULT message_call_32to64( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l case WM_MDICREATE: { - struct - { - ULONG szClass; - ULONG szTitle; - ULONG hOwner; - INT x; - INT y; - INT cx; - INT cy; - DWORD style; - ULONG lParam; - } *cs32 = (void *)lparam; + MDICREATESTRUCT32 *cs32 = (void *)lparam; MDICREATESTRUCTW cs; cs.szClass = UlongToPtr( cs32->szClass ); @@ -2895,11 +2931,7 @@ static LRESULT message_call_32to64( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l case WM_NCCALCSIZE: if (wparam) { - struct - { - RECT rgrc[3]; - ULONG lppos; - } *params32 = (void *)lparam; + NCCALCSIZE_PARAMS32 *params32 = (void *)lparam; NCCALCSIZE_PARAMS params; WINDOWPOS winpos; @@ -2919,17 +2951,7 @@ static LRESULT message_call_32to64( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l case WM_COMPAREITEM: { - struct - { - UINT CtlType; - UINT CtlID; - ULONG hwndItem; - UINT itemID1; - ULONG itemData1; - UINT itemID2; - ULONG itemData2; - DWORD dwLocaleId; - } *cis32 = (void *)lparam; + COMPAREITEMSTRUCT32 *cis32 = (void *)lparam; COMPAREITEMSTRUCT cis; cis.CtlType = cis32->CtlType; @@ -2994,12 +3016,7 @@ static LRESULT message_call_32to64( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l case WM_COPYDATA: { - struct - { - ULONG dwData; - DWORD cbData; - ULONG lpData; - } *cds32 = (void *)lparam; + COPYDATASTRUCT32 *cds32 = (void *)lparam; COPYDATASTRUCT cds; cds.dwData = cds32->dwData; @@ -3021,12 +3038,7 @@ static LRESULT message_call_32to64( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l case WM_NEXTMENU: { - struct - { - ULONG hmenuIn; - ULONG hmenuNext; - ULONG hwndNext; - } *next32 = (void *)lparam; + MDINEXTMENU32 *next32 = (void *)lparam; MDINEXTMENU next; next.hmenuIn = LongToHandle( next32->hmenuIn );

1 0

Jacek Caban : wow64win: Support in place conversion in 64to32 struct conversion helpers.
by Alexandre Julliard 17 Jul '23

17 Jul '23

Module: wine Branch: master Commit: e1ff3c8d2218107a0c842b61691d1d15da0dd2f5 URL: https://gitlab.winehq.org/wine/wine/-/commit/e1ff3c8d2218107a0c842b61691d1d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 16 15:50:09 2023 +0200 wow64win: Support in place conversion in 64to32 struct conversion helpers. --- dlls/wow64win/user.c | 111 +++++++++++++++++++++++++++++---------------------- 1 file changed, 64 insertions(+), 47 deletions(-) diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 7c3a6ddd7ab..553d40a8f29 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -399,16 +399,19 @@ static MSG *msg_32to64( MSG *msg, const MSG32 *msg32 ) return msg; } -static MSG32 *msg_64to32( const MSG *msg, MSG32 *msg32 ) +static MSG32 *msg_64to32( const MSG *msg64, MSG32 *msg32 ) { + MSG32 msg; + if (!msg32) return NULL; - msg32->hwnd = HandleToUlong( msg->hwnd ); - msg32->message = msg->message; - msg32->wParam = msg->wParam; - msg32->lParam = msg->lParam; - msg32->time = msg->time; - msg32->pt = msg->pt; + msg.hwnd = HandleToLong( msg64->hwnd ); + msg.message = msg64->message; + msg.wParam = msg64->wParam; + msg.lParam = msg64->lParam; + msg.time = msg64->time; + msg.pt = msg64->pt; + memcpy( msg32, &msg, sizeof(msg) ); return msg32; } @@ -422,32 +425,37 @@ static struct client_menu_name *client_menu_name_32to64( struct client_menu_name return name; } -static struct client_menu_name32 *client_menu_name_64to32( const struct client_menu_name *name, +static struct client_menu_name32 *client_menu_name_64to32( const struct client_menu_name *name64, struct client_menu_name32 *name32 ) { if (name32) { - name32->nameA = PtrToUlong( name->nameA ); - name32->nameW = PtrToUlong( name->nameW ); - name32->nameUS = PtrToUlong( name->nameUS ); + struct client_menu_name32 name; + name.nameA = PtrToUlong( name64->nameA ); + name.nameW = PtrToUlong( name64->nameW ); + name.nameUS = PtrToUlong( name64->nameUS ); + memcpy( name32, &name, sizeof(name) ); } return name32; } static void win_proc_params_64to32( const struct win_proc_params *src, struct win_proc_params32 *dst ) { - dst->func = PtrToUlong( src->func ); - dst->hwnd = HandleToUlong( src->hwnd ); - dst->msg = src->msg; - dst->wparam = src->wparam; - dst->lparam = src->lparam; - dst->ansi = src->ansi; - dst->ansi_dst = src->ansi_dst; - dst->needs_unpack = src->needs_unpack; - dst->mapping = src->mapping; - dst->dpi_awareness = HandleToUlong( src->dpi_awareness ); - dst->procA = PtrToUlong( src->procA ); - dst->procW = PtrToUlong( src->procW ); + struct win_proc_params32 params; + + params.func = PtrToUlong( src->func ); + params.hwnd = HandleToUlong( src->hwnd ); + params.msg = src->msg; + params.wparam = src->wparam; + params.lparam = src->lparam; + params.ansi = src->ansi; + params.ansi_dst = src->ansi_dst; + params.needs_unpack = src->needs_unpack; + params.mapping = src->mapping; + params.dpi_awareness = HandleToUlong( src->dpi_awareness ); + params.procA = PtrToUlong( src->procA ); + params.procW = PtrToUlong( src->procW ); + memcpy( dst, &params, sizeof(params) ); } static void createstruct_32to64( const CREATESTRUCT32 *from, CREATESTRUCTW *to ) @@ -469,16 +477,19 @@ static void createstruct_32to64( const CREATESTRUCT32 *from, CREATESTRUCTW *to ) static void createstruct_64to32( const CREATESTRUCTW *from, CREATESTRUCT32 *to ) { - to->lpCreateParams = PtrToUlong( from->lpCreateParams ); - to->hInstance = PtrToUlong( from->hInstance ); - to->hMenu = HandleToUlong( from->hMenu ); - to->hwndParent = HandleToUlong( from->hwndParent ); - to->cy = from->cy; - to->cx = from->cx; - to->y = from->y; - to->x = from->x; - to->style = from->style; - to->dwExStyle = from->dwExStyle; + CREATESTRUCT32 cs; + + cs.lpCreateParams = PtrToUlong( from->lpCreateParams ); + cs.hInstance = PtrToUlong( from->hInstance ); + cs.hMenu = HandleToUlong( from->hMenu ); + cs.hwndParent = HandleToUlong( from->hwndParent ); + cs.cy = from->cy; + cs.cx = from->cx; + cs.y = from->y; + cs.x = from->x; + cs.style = from->style; + cs.dwExStyle = from->dwExStyle; + memcpy( to, &cs, sizeof(cs) ); } static void winpos_32to64( WINDOWPOS *dst, const WINDOWPOS32 *src ) @@ -494,13 +505,16 @@ static void winpos_32to64( WINDOWPOS *dst, const WINDOWPOS32 *src ) static void winpos_64to32( const WINDOWPOS *src, WINDOWPOS32 *dst ) { - dst->hwnd = HandleToUlong( src->hwnd ); - dst->hwndInsertAfter = HandleToUlong( src->hwndInsertAfter ); - dst->x = src->x; - dst->y = src->y; - dst->cx = src->cx; - dst->cy = src->cy; - dst->flags = src->flags; + WINDOWPOS32 wp; + + wp.hwnd = HandleToUlong( src->hwnd ); + wp.hwndInsertAfter = HandleToUlong( src->hwndInsertAfter ); + wp.x = src->x; + wp.y = src->y; + wp.cx = src->cx; + wp.cy = src->cy; + wp.flags = src->flags; + memcpy( dst, &wp, sizeof(wp) ); } static PAINTSTRUCT *paintstruct_32to64( PAINTSTRUCT *ps, const PAINTSTRUCT32 *ps32 ) @@ -514,16 +528,19 @@ static PAINTSTRUCT *paintstruct_32to64( PAINTSTRUCT *ps, const PAINTSTRUCT32 *ps return ps; } -static MOUSEHOOKSTRUCTEX32 *mousehookstruct_64to32( const MOUSEHOOKSTRUCTEX *hook, +static MOUSEHOOKSTRUCTEX32 *mousehookstruct_64to32( const MOUSEHOOKSTRUCTEX *hook64, MOUSEHOOKSTRUCTEX32 *hook32 ) { - if (!hook) return NULL; + MOUSEHOOKSTRUCTEX32 hook; + + if (!hook64) return NULL; - hook32->pt = hook->pt; - hook32->hwnd = HandleToUlong( hook->hwnd ); - hook32->wHitTestCode = hook->wHitTestCode; - hook32->dwExtraInfo = hook->dwExtraInfo; - hook32->mouseData = hook->mouseData; + hook.pt = hook64->pt; + hook.hwnd = HandleToUlong( hook64->hwnd ); + hook.wHitTestCode = hook64->wHitTestCode; + hook.dwExtraInfo = hook64->dwExtraInfo; + hook.mouseData = hook64->mouseData; + memcpy( hook32, &hook, sizeof(hook) ); return hook32; }

1 0

Jacek Caban : wow64win: Convert parameters in place in wow64_NtUserCallWinProc.
by Alexandre Julliard 17 Jul '23

17 Jul '23

Module: wine Branch: master Commit: 2149bdfda785937329a5baeddb5d84e3a74434f2 URL: https://gitlab.winehq.org/wine/wine/-/commit/2149bdfda785937329a5baeddb5d84… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 16 17:56:05 2023 +0200 wow64win: Convert parameters in place in wow64_NtUserCallWinProc. --- dlls/wow64win/user.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 553d40a8f29..c5506304718 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -615,19 +615,15 @@ static NTSTATUS WINAPI wow64_NtUserCallWinEventHook( void *arg, ULONG size ) static NTSTATUS WINAPI wow64_NtUserCallWinProc( void *arg, ULONG size ) { struct win_proc_params *params = arg; - struct win_proc_params32 params32_buf, *params32 = &params32_buf; + struct win_proc_params32 *params32 = arg; LRESULT result = 0; void *ret_ptr; ULONG ret_len; NTSTATUS status; - if (size > sizeof(*params)) - { - if (!(params32 = Wow64AllocateTemp( size - sizeof(*params) + sizeof(*params32) ))) - return 0; - memcpy( params32 + 1, params + 1, size - sizeof(*params) ); - } win_proc_params_64to32( params, params32 ); + if (size > sizeof(*params)) + memmove( params32 + 1, params + 1, size - sizeof(*params) ); status = Wow64KiUserCallbackDispatcher( NtUserCallWinProc, params32, size - sizeof(*params) + sizeof(*params32),

1 0

Jacek Caban : wow64win: Convert parameters in place in wow64_NtUserCallWindowsHook.
by Alexandre Julliard 17 Jul '23

17 Jul '23

Module: wine Branch: master Commit: 8f168ea69bc3cd5da5fe72d2f57a5fac1369cefa URL: https://gitlab.winehq.org/wine/wine/-/commit/8f168ea69bc3cd5da5fe72d2f57a5f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 16 18:46:19 2023 +0200 wow64win: Convert parameters in place in wow64_NtUserCallWindowsHook. --- dlls/wow64win/user.c | 178 +++++++++++++++++++++++++++------------------------ 1 file changed, 95 insertions(+), 83 deletions(-)

1 0

Jacek Caban : user32: Always use NtCallbackReturn to pass result from User32CallWindowsHook.
by Alexandre Julliard 17 Jul '23

17 Jul '23

Module: wine Branch: master Commit: 730d462b7f9c866efb2f6413a6ea74d97efc5c2e URL: https://gitlab.winehq.org/wine/wine/-/commit/730d462b7f9c866efb2f6413a6ea74… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 16 22:24:40 2023 +0200 user32: Always use NtCallbackReturn to pass result from User32CallWindowsHook. --- dlls/user32/hook.c | 16 +++++++--------- dlls/wow64win/user.c | 2 +- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index 9fea8a59e0e..6f202a0f5d9 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -457,9 +457,9 @@ BOOL WINAPI User32CallWindowsHook( struct win_hook_params *params, ULONG size ) HOOKPROC proc = params->proc; const WCHAR *module = NULL; HMODULE free_module = 0; - void *ret_lparam = NULL; + void *ret_ptr = NULL; CBT_CREATEWNDW cbtc; - UINT ret_lparam_size = 0; + UINT ret_size = 0; LRESULT ret; if (size > sizeof(*params) + params->lparam_size) @@ -467,9 +467,9 @@ BOOL WINAPI User32CallWindowsHook( struct win_hook_params *params, ULONG size ) if (params->lparam_size) { - ret_lparam = (void *)params->lparam; - ret_lparam_size = params->lparam_size; - params->lparam = (LPARAM)(params + 1); + ret_size = params->lparam_size; + ret_ptr = params + 1; + params->lparam = (LPARAM)ret_ptr; if (params->id == WH_CBT && params->code == HCBT_CREATEWND) { @@ -487,7 +487,7 @@ BOOL WINAPI User32CallWindowsHook( struct win_hook_params *params, ULONG size ) cbtc.hwndInsertAfter = HWND_TOP; cbtc.lpcs = cs; params->lparam = (LPARAM)&cbtc; - ret_lparam_size = sizeof(*cs); + ret_size = sizeof(*cs); } } if (module && !(proc = get_hook_proc( proc, module, &free_module ))) return FALSE; @@ -496,9 +496,7 @@ BOOL WINAPI User32CallWindowsHook( struct win_hook_params *params, ULONG size ) params->prev_unicode, params->next_unicode ); if (free_module) FreeLibrary( free_module ); - if (ret_lparam) memcpy( ret_lparam, params + 1, ret_lparam_size ); - else if (ret_lparam_size) NtCallbackReturn( params + 1, ret_lparam_size, ret ); - return ret; + return NtCallbackReturn( ret_ptr, ret_size, ret ); } /*********************************************************************** diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 37eeb0b7ed3..c60df5052dc 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -769,7 +769,7 @@ static NTSTATUS WINAPI wow64_NtUserCallWindowsHook( void *arg, ULONG size ) params32.id = params->id; params32.code = params->code; params32.wparam = params->wparam; - params32.lparam = lparam64_size ? 0 : params->lparam; + params32.lparam = params->lparam; params32.prev_unicode = params->prev_unicode; params32.next_unicode = params->next_unicode; params32.lparam_size = hook_lparam_64to32( params32.id, params32.code, params + 1,

1 0