August 2021 - Wine-commits - list.winehq.org

Zebediah Figura : vkd3d-shader: Move SM4 byte code definitions to a separate header.
by Alexandre Julliard 06 Aug '21

06 Aug '21

Module: vkd3d Branch: master Commit: 688cdb218e2721b89c7ad9314b8400d92fbaea94 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=688cdb218e2721b89c7ad93… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Aug 4 21:21:07 2021 -0500 vkd3d-shader: Move SM4 byte code definitions to a separate header. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 + libs/vkd3d-shader/dxbc.c | 460 +---------------------------- libs/vkd3d-shader/sm4.h | 488 +++++++++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 13 - 4 files changed, 490 insertions(+), 472 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=688cdb218e2721b89c7…

1 0

Rémi Bernon : xinput1_3: Statically allocate SP_DEVICE_INTERFACE_DETAIL_DATA_W.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: 47ac0b0bdcfb0ade7af1e3de4df9a0ad7ec6031d URL: https://source.winehq.org/git/wine.git/?a=commit;h=47ac0b0bdcfb0ade7af1e3de… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 5 17:12:07 2021 +0200 xinput1_3: Statically allocate SP_DEVICE_INTERFACE_DETAIL_DATA_W. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/hid.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/xinput1_3/hid.c b/dlls/xinput1_3/hid.c index e7a77813c71..ac95ad3c402 100644 --- a/dlls/xinput1_3/hid.c +++ b/dlls/xinput1_3/hid.c @@ -223,12 +223,12 @@ failed: void HID_find_gamepads(xinput_controller *devices) { + char buffer[sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W) + MAX_PATH * sizeof(WCHAR)]; + SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail = (SP_DEVICE_INTERFACE_DETAIL_DATA_W *)buffer; HDEVINFO device_info_set; GUID hid_guid; SP_DEVICE_INTERFACE_DATA interface_data; - SP_DEVICE_INTERFACE_DETAIL_DATA_W *data; PHIDP_PREPARSED_DATA ppd; - DWORD detail_size = MAX_PATH * sizeof(WCHAR); HANDLE device; HIDP_CAPS caps; NTSTATUS status; @@ -251,9 +251,7 @@ void HID_find_gamepads(xinput_controller *devices) HidD_GetHidGuid(&hid_guid); device_info_set = SetupDiGetClassDevsW(&hid_guid, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); - - if (!(data = malloc(sizeof(*data) + detail_size))) goto done; - data->cbSize = sizeof(*data); + detail->cbSize = sizeof(*detail); ZeroMemory(&interface_data, sizeof(interface_data)); interface_data.cbSize = sizeof(interface_data); @@ -262,17 +260,16 @@ void HID_find_gamepads(xinput_controller *devices) while (SetupDiEnumDeviceInterfaces(device_info_set, NULL, &hid_guid, idx++, &interface_data)) { - if (!SetupDiGetDeviceInterfaceDetailW(device_info_set, - &interface_data, data, sizeof(*data) + detail_size, NULL, NULL)) + if (!SetupDiGetDeviceInterfaceDetailW(device_info_set, &interface_data, detail, sizeof(buffer), NULL, NULL)) continue; - if (!wcsstr(data->DevicePath, L"IG_")) + if (!wcsstr(detail->DevicePath, L"IG_")) continue; - if (find_opened_device(devices, data, &i)) continue; /* already opened */ + if (find_opened_device(devices, detail, &i)) continue; /* already opened */ if (i == XUSER_MAX_COUNT) break; /* no more slots */ - device = CreateFileW(data->DevicePath, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); + device = CreateFileW(detail->DevicePath, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); if (device == INVALID_HANDLE_VALUE) continue; @@ -285,7 +282,7 @@ void HID_find_gamepads(xinput_controller *devices) WARN("ignoring HID device, unsupported usage page %04x\n", caps.UsagePage); else if (caps.Usage != HID_USAGE_GENERIC_GAMEPAD && caps.Usage != HID_USAGE_GENERIC_JOYSTICK && caps.Usage != HID_USAGE_GENERIC_MULTI_AXIS_CONTROLLER) WARN("ignoring HID device, unsupported usage %04x:%04x\n", caps.UsagePage, caps.Usage); - else if (!init_controller(&devices[i], ppd, &caps, device, data->DevicePath)) + else if (!init_controller(&devices[i], ppd, &caps, device, detail->DevicePath)) WARN("ignoring HID device, failed to initialize\n"); else goto done; @@ -295,7 +292,6 @@ void HID_find_gamepads(xinput_controller *devices) } done: - free(data); SetupDiDestroyDeviceInfoList(device_info_set); LeaveCriticalSection(&xinput_crit); }

1 0

Rémi Bernon : xinput1_3: Continue enumeration until there's no more slot.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: 1371bcf3ad8d6107dab30d49e40bf6ea1765e97f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1371bcf3ad8d6107dab30d49… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 5 17:12:08 2021 +0200 xinput1_3: Continue enumeration until there's no more slot. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/hid.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/xinput1_3/hid.c b/dlls/xinput1_3/hid.c index ac95ad3c402..382469a0be9 100644 --- a/dlls/xinput1_3/hid.c +++ b/dlls/xinput1_3/hid.c @@ -285,13 +285,12 @@ void HID_find_gamepads(xinput_controller *devices) else if (!init_controller(&devices[i], ppd, &caps, device, detail->DevicePath)) WARN("ignoring HID device, failed to initialize\n"); else - goto done; + continue; CloseHandle(device); HidD_FreePreparsedData(ppd); } -done: SetupDiDestroyDeviceInfoList(device_info_set); LeaveCriticalSection(&xinput_crit); }

1 0

Rémi Bernon : xinput1_3: Access controller list in HID code directly.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: db1160672802fcc34a4bce1174423d3f4aed266e URL: https://source.winehq.org/git/wine.git/?a=commit;h=db1160672802fcc34a4bce11… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 5 17:12:09 2021 +0200 xinput1_3: Access controller list in HID code directly. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/hid.c | 14 +++++++------- dlls/xinput1_3/xinput_main.c | 10 +++++----- dlls/xinput1_3/xinput_private.h | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/xinput1_3/hid.c b/dlls/xinput1_3/hid.c index 382469a0be9..00907b54bed 100644 --- a/dlls/xinput1_3/hid.c +++ b/dlls/xinput1_3/hid.c @@ -71,7 +71,7 @@ struct hid_platform_private { static DWORD last_check = 0; -static BOOL find_opened_device(xinput_controller *devices, SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail, int *free_slot) +static BOOL find_opened_device(SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail, int *free_slot) { struct hid_platform_private *private; int i; @@ -79,7 +79,7 @@ static BOOL find_opened_device(xinput_controller *devices, SP_DEVICE_INTERFACE_D *free_slot = XUSER_MAX_COUNT; for (i = XUSER_MAX_COUNT; i > 0; i--) { - if (!(private = devices[i - 1].platform_private)) *free_slot = i - 1; + if (!(private = controllers[i - 1].platform_private)) *free_slot = i - 1; else if (!wcscmp(detail->DevicePath, private->device_path)) return TRUE; } return FALSE; @@ -221,7 +221,7 @@ failed: return FALSE; } -void HID_find_gamepads(xinput_controller *devices) +void HID_find_gamepads(void) { char buffer[sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W) + MAX_PATH * sizeof(WCHAR)]; SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail = (SP_DEVICE_INTERFACE_DETAIL_DATA_W *)buffer; @@ -266,7 +266,7 @@ void HID_find_gamepads(xinput_controller *devices) if (!wcsstr(detail->DevicePath, L"IG_")) continue; - if (find_opened_device(devices, detail, &i)) continue; /* already opened */ + if (find_opened_device(detail, &i)) continue; /* already opened */ if (i == XUSER_MAX_COUNT) break; /* no more slots */ device = CreateFileW(detail->DevicePath, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); @@ -282,7 +282,7 @@ void HID_find_gamepads(xinput_controller *devices) WARN("ignoring HID device, unsupported usage page %04x\n", caps.UsagePage); else if (caps.Usage != HID_USAGE_GENERIC_GAMEPAD && caps.Usage != HID_USAGE_GENERIC_JOYSTICK && caps.Usage != HID_USAGE_GENERIC_MULTI_AXIS_CONTROLLER) WARN("ignoring HID device, unsupported usage %04x:%04x\n", caps.UsagePage, caps.Usage); - else if (!init_controller(&devices[i], ppd, &caps, device, detail->DevicePath)) + else if (!init_controller(&controllers[i], ppd, &caps, device, detail->DevicePath)) WARN("ignoring HID device, failed to initialize\n"); else continue; @@ -317,11 +317,11 @@ static void remove_gamepad(xinput_controller *device) LeaveCriticalSection(&device->crit); } -void HID_destroy_gamepads(xinput_controller *devices) +void HID_destroy_gamepads(void) { int i; for (i = 0; i < XUSER_MAX_COUNT; i++) - remove_gamepad(&devices[i]); + remove_gamepad(&controllers[i]); } static SHORT scale_short(LONG value, const struct axis_info *axis) diff --git a/dlls/xinput1_3/xinput_main.c b/dlls/xinput1_3/xinput_main.c index 63b7dd7f0b5..2d9f54c83f2 100644 --- a/dlls/xinput1_3/xinput_main.c +++ b/dlls/xinput1_3/xinput_main.c @@ -104,7 +104,7 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) break; case DLL_PROCESS_DETACH: if (reserved) break; - HID_destroy_gamepads(controllers); + HID_destroy_gamepads(); break; } return TRUE; @@ -120,7 +120,7 @@ void WINAPI DECLSPEC_HOTPATCH XInputEnable(BOOL enable) to the controllers. Setting to true will send the last vibration value (sent to XInputSetState) to the controller and allow messages to be sent */ - HID_find_gamepads(controllers); + HID_find_gamepads(); for (index = 0; index < XUSER_MAX_COUNT; index ++) { @@ -136,7 +136,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH XInputSetState(DWORD index, XINPUT_VIBRATION* vib TRACE("(index %u, vibration %p)\n", index, vibration); - HID_find_gamepads(controllers); + HID_find_gamepads(); if (index >= XUSER_MAX_COUNT) return ERROR_BAD_ARGUMENTS; @@ -157,7 +157,7 @@ static DWORD xinput_get_state(DWORD index, XINPUT_STATE *state) if (!state) return ERROR_BAD_ARGUMENTS; - HID_find_gamepads(controllers); + HID_find_gamepads(); if (index >= XUSER_MAX_COUNT) return ERROR_BAD_ARGUMENTS; @@ -421,7 +421,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH XInputGetCapabilities(DWORD index, DWORD flags, X { TRACE("(index %u, flags 0x%x, capabilities %p)\n", index, flags, capabilities); - HID_find_gamepads(controllers); + HID_find_gamepads(); if (index >= XUSER_MAX_COUNT) return ERROR_BAD_ARGUMENTS; diff --git a/dlls/xinput1_3/xinput_private.h b/dlls/xinput1_3/xinput_private.h index 0de4f3b0b03..2bf16c0ffce 100644 --- a/dlls/xinput1_3/xinput_private.h +++ b/dlls/xinput1_3/xinput_private.h @@ -30,8 +30,8 @@ typedef struct _xinput_controller extern CRITICAL_SECTION xinput_crit; extern xinput_controller controllers[XUSER_MAX_COUNT]; -void HID_find_gamepads(xinput_controller *devices) DECLSPEC_HIDDEN; -void HID_destroy_gamepads(xinput_controller *devices) DECLSPEC_HIDDEN; +void HID_find_gamepads(void) DECLSPEC_HIDDEN; +void HID_destroy_gamepads(void) DECLSPEC_HIDDEN; void HID_update_state(xinput_controller* device, XINPUT_STATE *state) DECLSPEC_HIDDEN; DWORD HID_set_state(xinput_controller* device, XINPUT_VIBRATION* state) DECLSPEC_HIDDEN; void HID_enable(xinput_controller* device, BOOL enable) DECLSPEC_HIDDEN;

1 0

Alex Henrie : shell32: Fix use of uninitialized variable in paste_pidls (Clang).
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: adb4259aa92599bf7bbad8271f1a372027443a46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=adb4259aa92599bf7bbad827… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 3 22:03:48 2021 -0600 shell32: Fix use of uninitialized variable in paste_pidls (Clang). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlview_cmenu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index ef11957e921..e116e343446 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -1158,7 +1158,7 @@ static HRESULT paste_pidls(ContextMenu *This, ITEMIDLIST **pidls, UINT count) if (psfFrom) { /* get source and destination shellfolder */ - ISFHelper *psfhlpdst, *psfhlpsrc; + ISFHelper *psfhlpdst = NULL, *psfhlpsrc = NULL; hr = IShellFolder_QueryInterface(This->parent, &IID_ISFHelper, (void**)&psfhlpdst); if (SUCCEEDED(hr)) hr = IShellFolder_QueryInterface(psfFrom, &IID_ISFHelper, (void**)&psfhlpsrc);

1 0

Martin Storsjö : loader: Add support for ARM linux in the preloader.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: 29922c22765bb65352d48a3922c8fc07eebe7353 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29922c22765bb65352d48a39… Author: Martin Storsjö <martin(a)martin.st> Date: Tue Aug 3 23:24:12 2021 +0300 loader: Add support for ARM linux in the preloader. Since 28fe84da45bea7de56539b50eac8ebcec54342de, the main exe image must be mappable at its desired base address, which essentially requires the preloader. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51539 Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 +- configure.ac | 4 +- dlls/ntdll/unix/loader.c | 6 +-- loader/preloader.c | 124 ++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 128 insertions(+), 10 deletions(-) diff --git a/configure b/configure index d3c60b4ff4c..1be0aa9d217 100755 --- a/configure +++ b/configure @@ -9473,7 +9473,7 @@ fi WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000" case $host_cpu in - *i[3456789]86* | x86_64 | *aarch64*) + *i[3456789]86* | x86_64 | *aarch64* | arm*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-Ttext-segment=0x7bc00000" >&5 $as_echo_n "checking whether the compiler supports -Wl,-Ttext-segment=0x7bc00000... " >&6; } if ${ac_cv_cflags__Wl__Ttext_segment_0x7bc00000+:} false; then : @@ -18025,7 +18025,7 @@ esac case $host_os in linux*) case $host_cpu in - *i[3456789]86*|x86_64*|*aarch64*) + *i[3456789]86*|x86_64*|*aarch64*|arm*) test "$wine_binary" = wine || wine_fn_append_file CONFIGURE_TARGETS "loader/wine-preloader" WINELOADER_PROGRAMS="$WINELOADER_PROGRAMS $wine_binary-preloader" ;; diff --git a/configure.ac b/configure.ac index 5d9ca31099e..69e27147088 100644 --- a/configure.ac +++ b/configure.ac @@ -940,7 +940,7 @@ case $host_os in WINEPRELOADER_LDFLAGS="-static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7d400000" case $host_cpu in - *i[[3456789]]86* | x86_64 | *aarch64*) + *i[[3456789]]86* | x86_64 | *aarch64* | arm*) WINE_TRY_CFLAGS([-Wl,-Ttext-segment=0x7bc00000], [case $host_os in freebsd* | kfreebsd*-gnu) WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-Ttext-segment=0x60000000" ;; @@ -2161,7 +2161,7 @@ esac case $host_os in linux*) case $host_cpu in - *i[[3456789]]86*|x86_64*|*aarch64*) + *i[[3456789]]86*|x86_64*|*aarch64*|arm*) test "$wine_binary" = wine || WINE_IGNORE_FILE("loader/wine-preloader") WINELOADER_PROGRAMS="$WINELOADER_PROGRAMS $wine_binary-preloader" ;; diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 8888376f2f0..55fc73d2d06 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -2155,11 +2155,7 @@ static int pre_exec(void) int temp; check_vmsplit( &temp ); -#ifdef __i386__ - return 1; /* we have a preloader on x86 */ -#else - return 0; -#endif + return 1; /* we have a preloader on x86/arm */ } #elif defined(__linux__) && (defined(__x86_64__) || defined(__aarch64__)) diff --git a/loader/preloader.c b/loader/preloader.c index bb16ecd96a4..86308484182 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -111,7 +111,7 @@ static struct wine_preload_info preload_info[] = { -#ifdef __i386__ +#if defined(__i386__) || defined(__arm__) { (void *)0x00000000, 0x00010000 }, /* low 64k */ { (void *)0x00010000, 0x00100000 }, /* DOS area */ { (void *)0x00110000, 0x67ef0000 }, /* low memory area */ @@ -536,6 +536,125 @@ SYSCALL_NOERR( wld_geteuid, 175 /* SYS_geteuid */ ); gid_t wld_getegid(void); SYSCALL_NOERR( wld_getegid, 177 /* SYS_getegid */ ); +#elif defined(__arm__) + +void *thread_data[256]; + +/* + * The _start function is the entry and exit point of this program + * + * It calls wld_start, passing a pointer to the args it receives + * then jumps to the address wld_start returns. + */ +void _start(void); +extern char _end[]; +__ASM_GLOBAL_FUNC(_start, + "mov r0, sp\n\t" + "sub sp, sp, #144\n\t" /* allocate some space for extra aux values */ + "str r0, [sp]\n\t" /* orig stack pointer */ + "ldr r0, =thread_data\n\t" + "movw r7, #0x0005\n\t" /* __ARM_NR_set_tls */ + "movt r7, #0xf\n\t" /* __ARM_NR_set_tls */ + "svc #0\n\t" + "mov r0, sp\n\t" /* ptr to orig stack pointer */ + "bl wld_start\n\t" + "ldr r1, [sp]\n\t" /* new stack pointer */ + "mov sp, r1\n\t" + "mov lr, r0\n\t" + "mov r0, #0\n\t" + "mov r1, #0\n\t" + "mov r2, #0\n\t" + "mov r3, #0\n\t" + "mov r12, #0\n\t" + "bx lr\n\t" + ".ltorg\n\t") + +#define SYSCALL_FUNC( name, nr ) \ + __ASM_GLOBAL_FUNC( name, \ + "push {r4-r5,r7,lr}\n\t" \ + "ldr r4, [sp, #16]\n\t" \ + "ldr r5, [sp, #20]\n\t" \ + "mov r7, #" #nr "\n\t" \ + "svc #0\n\t" \ + "cmn r0, #4096\n\t" \ + "it hi\n\t" \ + "movhi r0, #-1\n\t" \ + "pop {r4-r5,r7,pc}\n\t" ) + +#define SYSCALL_NOERR( name, nr ) \ + __ASM_GLOBAL_FUNC( name, \ + "push {r7,lr}\n\t" \ + "mov r7, #" #nr "\n\t" \ + "svc #0\n\t" \ + "pop {r7,pc}\n\t" ) + +void wld_exit( int code ) __attribute__((noreturn)); +SYSCALL_NOERR( wld_exit, 1 /* SYS_exit */ ); + +ssize_t wld_read( int fd, void *buffer, size_t len ); +SYSCALL_FUNC( wld_read, 3 /* SYS_read */ ); + +ssize_t wld_write( int fd, const void *buffer, size_t len ); +SYSCALL_FUNC( wld_write, 4 /* SYS_write */ ); + +int wld_openat( int dirfd, const char *name, int flags ); +SYSCALL_FUNC( wld_openat, 322 /* SYS_openat */ ); + +int wld_open( const char *name, int flags ) +{ + return wld_openat(-100 /* AT_FDCWD */, name, flags); +} + +int wld_close( int fd ); +SYSCALL_FUNC( wld_close, 6 /* SYS_close */ ); + +void *wld_mmap2( void *start, size_t len, int prot, int flags, int fd, int offset ); +SYSCALL_FUNC( wld_mmap2, 192 /* SYS_mmap2 */ ); + +void *wld_mmap( void *start, size_t len, int prot, int flags, int fd, off_t offset ) +{ + return wld_mmap2(start, len, prot, flags, fd, offset >> 12); +} + +int wld_mprotect( const void *addr, size_t len, int prot ); +SYSCALL_FUNC( wld_mprotect, 125 /* SYS_mprotect */ ); + +int wld_prctl( int code, long arg ); +SYSCALL_FUNC( wld_prctl, 172 /* SYS_prctl */ ); + +uid_t wld_getuid(void); +SYSCALL_NOERR( wld_getuid, 24 /* SYS_getuid */ ); + +gid_t wld_getgid(void); +SYSCALL_NOERR( wld_getgid, 47 /* SYS_getgid */ ); + +uid_t wld_geteuid(void); +SYSCALL_NOERR( wld_geteuid, 49 /* SYS_geteuid */ ); + +gid_t wld_getegid(void); +SYSCALL_NOERR( wld_getegid, 50 /* SYS_getegid */ ); + +unsigned long long __aeabi_uidivmod(unsigned int num, unsigned int den) +{ + unsigned int bit = 1; + unsigned int quota = 0; + if (!den) + wld_exit(1); + while (den < num && !(den & 0x80000000)) { + den <<= 1; + bit <<= 1; + } + do { + if (den <= num) { + quota |= bit; + num -= den; + } + bit >>= 1; + den >>= 1; + } while (bit); + return ((unsigned long long)num << 32) | quota; +} + #else #error preloader not implemented for this CPU #endif @@ -809,6 +928,9 @@ static void map_so_lib( const char *name, struct wld_link_map *l) #elif defined(__aarch64__) if( header->e_machine != EM_AARCH64 ) fatal_error("%s: not an aarch64 ELF binary... don't know how to load it\n", name ); +#elif defined(__arm__) + if( header->e_machine != EM_ARM ) + fatal_error("%s: not an arm ELF binary... don't know how to load it\n", name ); #endif if (header->e_phnum > sizeof(loadcmds)/sizeof(loadcmds[0]))

1 0

Jacek Caban : gdi32: Use NtGdiSetTextJustification for SetTextJustification.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: c4f038ec21e6526b4409225ef418e69a6ff60f48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4f038ec21e6526b4409225e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 5 11:25:19 2021 +0200 gdi32: Use NtGdiSetTextJustification for SetTextJustification. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/dc.c | 8 ++++---- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/font.c | 40 +++++++++++++++--------------------- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 14 +++++++++++++ dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - 9 files changed, 41 insertions(+), 33 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index a0eb0c33344..f4c8ff709a6 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -63,14 +63,14 @@ BOOL EMFDC_SetTextAlign( DC_ATTR *dc_attr, UINT align ) return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } -BOOL CDECL EMFDRV_SetTextJustification(PHYSDEV dev, INT nBreakExtra, INT nBreakCount) +BOOL EMFDC_SetTextJustification( DC_ATTR *dc_attr, INT extra, INT breaks ) { EMRSETTEXTJUSTIFICATION emr; emr.emr.iType = EMR_SETTEXTJUSTIFICATION; emr.emr.nSize = sizeof(emr); - emr.nBreakExtra = nBreakExtra; - emr.nBreakCount = nBreakCount; - return EMFDRV_WriteRecord(dev, &emr.emr); + emr.nBreakExtra = extra; + emr.nBreakCount = breaks; + return EMFDRV_WriteRecord( dc_attr->emf, &emr.emr ); } BOOL EMFDC_SetBkMode( DC_ATTR *dc_attr, INT mode ) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index 89b1cd6abfd..6e9cb2ad046 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -119,7 +119,6 @@ extern INT CDECL EMFDRV_SetMapMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN extern DWORD CDECL EMFDRV_SetMapperFlags( PHYSDEV dev, DWORD flags ) DECLSPEC_HIDDEN; extern COLORREF CDECL EMFDRV_SetPixel( PHYSDEV dev, INT x, INT y, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF CDECL EMFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; -extern BOOL CDECL EMFDRV_SetTextJustification( PHYSDEV dev, INT nBreakExtra, INT nBreakCount ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_SetViewportExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; extern BOOL CDECL EMFDRV_SetWindowExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 7969029151a..260de37ec5a 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -135,7 +135,7 @@ static const struct gdi_dc_funcs emfdrv_driver = EMFDRV_SetPixel, /* pSetPixel */ NULL, /* pSetTextCharacterExtra */ EMFDRV_SetTextColor, /* pSetTextColor */ - EMFDRV_SetTextJustification, /* pSetTextJustification */ + NULL, /* pSetTextJustification */ EMFDRV_SetViewportExtEx, /* pSetViewportExtEx */ EMFDRV_SetViewportOrgEx, /* pSetViewportOrgEx */ EMFDRV_SetWindowExtEx, /* pSetWindowExtEx */ diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 7eccc982bbe..039976dbc16 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -4773,36 +4773,30 @@ INT WINAPI SetTextCharacterExtra( HDC hdc, INT extra ) /*********************************************************************** - * SetTextJustification (GDI32.@) + * NtGdiSetTextJustification (win32u.@) */ -BOOL WINAPI SetTextJustification( HDC hdc, INT extra, INT breaks ) +BOOL WINAPI NtGdiSetTextJustification( HDC hdc, INT extra, INT breaks ) { - BOOL ret; - PHYSDEV physdev; - DC * dc = get_dc_ptr( hdc ); + DC *dc; - if (!dc) return FALSE; + if (!(dc = get_dc_ptr( hdc ))) return FALSE; - physdev = GET_DC_PHYSDEV( dc, pSetTextJustification ); - ret = physdev->funcs->pSetTextJustification( physdev, extra, breaks ); - if (ret) + extra = abs( (extra * dc->attr->vport_ext.cx + dc->attr->wnd_ext.cx / 2) / + dc->attr->wnd_ext.cx ); + if (!extra) breaks = 0; + if (breaks) { - extra = abs( (extra * dc->attr->vport_ext.cx + dc->attr->wnd_ext.cx / 2) / - dc->attr->wnd_ext.cx ); - if (!extra) breaks = 0; - if (breaks) - { - dc->breakExtra = extra / breaks; - dc->breakRem = extra - (breaks * dc->breakExtra); - } - else - { - dc->breakExtra = 0; - dc->breakRem = 0; - } + dc->breakExtra = extra / breaks; + dc->breakRem = extra - (breaks * dc->breakExtra); + } + else + { + dc->breakExtra = 0; + dc->breakRem = 0; } + release_dc_ptr( dc ); - return ret; + return TRUE; } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index e183c40aec5..3a043f37966 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -82,6 +82,7 @@ extern BOOL METADC_SetRelAbs( HDC hdc, INT mode ) DECLSPEC_HIDDEN; extern BOOL METADC_SetROP2( HDC hdc, INT rop ) DECLSPEC_HIDDEN; extern BOOL METADC_SetStretchBltMode( HDC hdc, INT mode ) DECLSPEC_HIDDEN; extern BOOL METADC_SetTextAlign( HDC hdc, UINT align ) DECLSPEC_HIDDEN; +extern BOOL METADC_SetTextJustification( HDC hdc, INT extra, INT breaks ) DECLSPEC_HIDDEN; /* enhanced metafiles */ extern BOOL EMFDC_AbortPath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN; @@ -138,5 +139,6 @@ extern BOOL EMFDC_SetPolyFillMode( DC_ATTR *dc_attr, INT mode ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetROP2( DC_ATTR *dc_attr, INT rop ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetStretchBltMode( DC_ATTR *dc_attr, INT mode ) DECLSPEC_HIDDEN; extern BOOL EMFDC_SetTextAlign( DC_ATTR *dc_attr, UINT align ) DECLSPEC_HIDDEN; +extern BOOL EMFDC_SetTextJustification( DC_ATTR *dc_attr, INT extra, INT breaks ) DECLSPEC_HIDDEN; #endif /* __WINE_GDI_PRIVATE_H */ diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index baa6c199b87..45314781b37 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -992,6 +992,20 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, const RECT *rect, return NtGdiExtTextOutW( hdc, x, y, flags, rect, str, count, dx, 0 ); } +/*********************************************************************** + * SetTextJustification (GDI32.@) + */ +BOOL WINAPI SetTextJustification( HDC hdc, INT extra, INT breaks ) +{ + DC_ATTR *dc_attr; + + if (is_meta_dc( hdc )) return METADC_SetTextJustification( hdc, extra, breaks ); + if (!(dc_attr = get_dc_attr( hdc ))) return FALSE; + if (dc_attr->emf && !EMFDC_SetTextJustification( dc_attr, extra, breaks )) + return FALSE; + return NtGdiSetTextJustification( hdc, extra, breaks ); +} + /*********************************************************************** * PatBlt (GDI32.@) */ diff --git a/dlls/gdi32/mfdrv/dc.c b/dlls/gdi32/mfdrv/dc.c index 363274a40b0..013a2c98d4d 100644 --- a/dlls/gdi32/mfdrv/dc.c +++ b/dlls/gdi32/mfdrv/dc.c @@ -135,9 +135,9 @@ BOOL CDECL MFDRV_ScaleWindowExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, return MFDRV_MetaParam4( dev, META_SCALEWINDOWEXT, xNum, xDenom, yNum, yDenom ); } -BOOL CDECL MFDRV_SetTextJustification( PHYSDEV dev, INT extra, INT breaks ) +BOOL METADC_SetTextJustification( HDC hdc, INT extra, INT breaks ) { - return MFDRV_MetaParam2( dev, META_SETTEXTJUSTIFICATION, extra, breaks ); + return metadc_param2( hdc, META_SETTEXTJUSTIFICATION, extra, breaks ); } INT CDECL MFDRV_SetTextCharacterExtra( PHYSDEV dev, INT extra ) diff --git a/dlls/gdi32/mfdrv/init.c b/dlls/gdi32/mfdrv/init.c index f49b03cd127..48fdbe5ebe9 100644 --- a/dlls/gdi32/mfdrv/init.c +++ b/dlls/gdi32/mfdrv/init.c @@ -200,7 +200,7 @@ static const struct gdi_dc_funcs MFDRV_Funcs = NULL, /* pSetPixel */ MFDRV_SetTextCharacterExtra, /* pSetTextCharacterExtra */ MFDRV_SetTextColor, /* pSetTextColor */ - MFDRV_SetTextJustification, /* pSetTextJustification */ + NULL, /* pSetTextJustification */ MFDRV_SetViewportExtEx, /* pSetViewportExtEx */ MFDRV_SetViewportOrgEx, /* pSetViewportOrgEx */ MFDRV_SetWindowExtEx, /* pSetWindowExtEx */ diff --git a/dlls/gdi32/mfdrv/metafiledrv.h b/dlls/gdi32/mfdrv/metafiledrv.h index 52768e641bc..dab24768a53 100644 --- a/dlls/gdi32/mfdrv/metafiledrv.h +++ b/dlls/gdi32/mfdrv/metafiledrv.h @@ -108,7 +108,6 @@ extern INT CDECL MFDRV_SetMapMode( PHYSDEV dev, INT mode ) DECLSPEC_HIDDEN; extern DWORD CDECL MFDRV_SetMapperFlags( PHYSDEV dev, DWORD flags ) DECLSPEC_HIDDEN; extern INT CDECL MFDRV_SetTextCharacterExtra( PHYSDEV dev, INT extra ) DECLSPEC_HIDDEN; extern COLORREF CDECL MFDRV_SetTextColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; -extern BOOL CDECL MFDRV_SetTextJustification( PHYSDEV dev, INT extra, INT breaks ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_SetViewportExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt ) DECLSPEC_HIDDEN; extern BOOL CDECL MFDRV_SetWindowExtEx( PHYSDEV dev, INT x, INT y, SIZE *size ) DECLSPEC_HIDDEN;

1 0

Jacek Caban : gdi32: Use NtGdiTransformPoints for DPtoLP.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: d57865a032990a43f4f06f003a923e1792df9bb2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d57865a032990a43f4f06f00… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 5 11:25:32 2021 +0200 gdi32: Use NtGdiTransformPoints for DPtoLP. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/gdidc.c | 8 ++++++++ dlls/gdi32/mapping.c | 33 ++++++++++++++++++++++++++++----- include/ntgdi.h | 9 ++++++++- 3 files changed, 44 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 45314781b37..79d5133b30c 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -1147,6 +1147,14 @@ INT WINAPI SetMetaRgn( HDC hdc ) return NtGdiSetMetaRgn( hdc ); } +/*********************************************************************** + * DPtoLP (GDI32.@) + */ +BOOL WINAPI DPtoLP( HDC hdc, POINT *points, INT count ) +{ + return NtGdiTransformPoints( hdc, points, points, count, NtGdiDPtoLP ); +} + /*********************************************************************** * GdiSetPixelFormat (GDI32.@) */ diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index 6eafc4a362c..8ab0b3b3ef3 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -332,16 +332,39 @@ BOOL dp_to_lp( DC *dc, POINT *points, INT count ) } /*********************************************************************** - * DPtoLP (GDI32.@) + * NtGdiTransformPoints (win32u.@) */ -BOOL WINAPI DPtoLP( HDC hdc, POINT *points, INT count ) +BOOL WINAPI NtGdiTransformPoints( HDC hdc, const POINT *points_in, POINT *points_out, + INT count, UINT mode ) { - DC * dc = get_dc_ptr( hdc ); - BOOL ret; + DC *dc = get_dc_ptr( hdc ); + int i = 0; + BOOL ret = FALSE; if (!dc) return FALSE; - ret = dp_to_lp( dc, points, count ); + switch (mode) + { + case NtGdiDPtoLP: + if (!dc->vport2WorldValid) break; + for (i = 0; i < count; i++) + { + double x = points_in[i].x; + double y = points_in[i].y; + points_out[i].x = floor( x * dc->xformVport2World.eM11 + + y * dc->xformVport2World.eM21 + + dc->xformVport2World.eDx + 0.5 ); + points_out[i].y = floor( x * dc->xformVport2World.eM12 + + y * dc->xformVport2World.eM22 + + dc->xformVport2World.eDy + 0.5 ); + } + ret = TRUE; + break; + + default: + WARN( "invalid mode %x\n", mode ); + break; + } release_dc_ptr( dc ); return ret; diff --git a/include/ntgdi.h b/include/ntgdi.h index c2f61fca6df..9be37414dce 100644 --- a/include/ntgdi.h +++ b/include/ntgdi.h @@ -93,6 +93,12 @@ enum NtGdiPolyPolygonRgn, }; +enum +{ + NtGdiLPtoDP, + NtGdiDPtoLP, +}; + /* structs not compatible with native Windows */ #ifdef __WINESRC__ @@ -251,7 +257,8 @@ INT WINAPI NtGdiStartDoc( HDC hdc, const DOCINFOW *doc ); INT WINAPI NtGdiStartPage( HDC hdc ); BOOL WINAPI NtGdiStrokePath( HDC hdc ); BOOL WINAPI NtGdiStrokeAndFillPath( HDC hdc ); -BOOL WINAPI NtGdiTransformPoints( HDC hdc, POINT *points, INT count, UINT mode ); +BOOL WINAPI NtGdiTransformPoints( HDC hdc, const POINT *points_in, POINT *points_out, + INT count, UINT mode ); BOOL WINAPI NtGdiUnrealizeObject( HGDIOBJ obj ); BOOL WINAPI NtGdiWidenPath( HDC hdc );

1 0

Jacek Caban : gdi32: Use NtGdiTransformPoints for LPtoDP.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: 32317fb1e5de9126446bd154744da4b9f0223b34 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32317fb1e5de9126446bd154… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 5 11:25:45 2021 +0200 gdi32: Use NtGdiTransformPoints for LPtoDP. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/gdidc.c | 9 +++++++++ dlls/gdi32/mapping.c | 30 +++++++++++++++--------------- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/gdidc.c b/dlls/gdi32/gdidc.c index 79d5133b30c..3d1fb9049a6 100644 --- a/dlls/gdi32/gdidc.c +++ b/dlls/gdi32/gdidc.c @@ -1155,6 +1155,15 @@ BOOL WINAPI DPtoLP( HDC hdc, POINT *points, INT count ) return NtGdiTransformPoints( hdc, points, points, count, NtGdiDPtoLP ); } +/*********************************************************************** + * LPtoDP (GDI32.@) + */ +BOOL WINAPI LPtoDP( HDC hdc, POINT *points, INT count ) +{ + return NtGdiTransformPoints( hdc, points, points, count, NtGdiLPtoDP ); +} + + /*********************************************************************** * GdiSetPixelFormat (GDI32.@) */ diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index 8ab0b3b3ef3..3dea94efc68 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -345,6 +345,21 @@ BOOL WINAPI NtGdiTransformPoints( HDC hdc, const POINT *points_in, POINT *points switch (mode) { + case NtGdiLPtoDP: + for (i = 0; i < count; i++) + { + double x = points_in[i].x; + double y = points_in[i].y; + points_out[i].x = floor( x * dc->xformWorld2Vport.eM11 + + y * dc->xformWorld2Vport.eM21 + + dc->xformWorld2Vport.eDx + 0.5 ); + points_out[i].y = floor( x * dc->xformWorld2Vport.eM12 + + y * dc->xformWorld2Vport.eM22 + + dc->xformWorld2Vport.eDy + 0.5 ); + } + ret = TRUE; + break; + case NtGdiDPtoLP: if (!dc->vport2WorldValid) break; for (i = 0; i < count; i++) @@ -392,21 +407,6 @@ void lp_to_dp( DC *dc, POINT *points, INT count ) } } -/*********************************************************************** - * LPtoDP (GDI32.@) - */ -BOOL WINAPI LPtoDP( HDC hdc, POINT *points, INT count ) -{ - DC * dc = get_dc_ptr( hdc ); - if (!dc) return FALSE; - - lp_to_dp( dc, points, count ); - - release_dc_ptr( dc ); - return TRUE; -} - - /*********************************************************************** * SetMapMode (GDI32.@) */

1 0

Jacek Caban : gdi32: Use ntgdi interface for SetMapMode implementation.
by Alexandre Julliard 05 Aug '21

05 Aug '21

Module: wine Branch: master Commit: f7824d43829b2ca6ae496074057e2e2766ec328b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7824d43829b2ca6ae496074… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 5 11:25:57 2021 +0200 gdi32: Use ntgdi interface for SetMapMode implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dc.c | 28 ++++++++++++++++++++++++++++ dlls/gdi32/enhmfdrv/dc.c | 12 ++---------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 - dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/gdi_private.h | 2 ++ dlls/gdi32/gdidc.c | 16 ++++++++++++++++ dlls/gdi32/mapping.c | 33 +++++++++------------------------ dlls/gdi32/mfdrv/dc.c | 4 ++-- dlls/gdi32/mfdrv/init.c | 2 +- dlls/gdi32/mfdrv/metafiledrv.h | 1 - dlls/gdi32/ntgdi_private.h | 1 + include/ntgdi.h | 5 +++++ 12 files changed, 67 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f7824d43829b2ca6ae49…

1 0