wine-commits November 2021

wine-commits@winehq.org

2 participants
951 discussions

Mark Jansen : comctl32: Safely handle large wParam in SB_GETPARTS.
by Alexandre Julliard 12 Nov '21

12 Nov '21

Module: wine Branch: master Commit: bb24e756253272a929b970ea8b76336cb8c14254 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb24e756253272a929b970ea… Author: Mark Jansen <mark.jansen(a)reactos.org> Date: Fri Nov 12 10:46:52 2021 -0500 comctl32: Safely handle large wParam in SB_GETPARTS. Signed-off-by: Mark Jansen <mark.jansen(a)reactos.org> Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/status.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 9078e4a70bc..ac93d7712c0 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -401,6 +401,8 @@ STATUSBAR_GetParts (const STATUS_INFO *infoPtr, INT num_parts, INT parts[]) TRACE("(%d)\n", num_parts); if (parts) { + if (num_parts > infoPtr->numParts) + num_parts = infoPtr->numParts; for (i = 0; i < num_parts; i++) { parts[i] = infoPtr->parts[i].x; }

1 0

Gabriel Ivăncescu : user32: Redraw children when the combo box is dropped down.
by Alexandre Julliard 12 Nov '21

12 Nov '21

Module: wine Branch: master Commit: 0d4392077e1b41ae23535ec41a22c6732bc9f168 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d4392077e1b41ae23535ec4… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 12 18:50:02 2021 +0200 user32: Redraw children when the combo box is dropped down. Some applications subclass the combo box and handle WM_ERASEBKGND themselves, without using WS_CLIPCHILDREN. This causes them to erase over the editbox child, so it requires a refresh as well. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22260 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/combo.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 1b53a2d6ad8..aeb7fa08e5f 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -1003,8 +1003,7 @@ static void CBDropDown( LPHEADCOMBO lphc ) if( !(lphc->wState & CBF_NOREDRAW) ) - RedrawWindow( lphc->self, NULL, 0, RDW_INVALIDATE | - RDW_ERASE | RDW_UPDATENOW | RDW_NOCHILDREN ); + RedrawWindow( lphc->self, NULL, 0, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW ); EnableWindow( lphc->hWndLBox, TRUE ); if (GetCapture() != lphc->self)

1 0

Gabriel Ivăncescu : comctl32: Redraw children when the combo box is dropped down.
by Alexandre Julliard 12 Nov '21

12 Nov '21

Module: wine Branch: master Commit: c82d6ee4a77f9fc0f44e0d36d155a3c3f3a6f6d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c82d6ee4a77f9fc0f44e0d36… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 12 18:50:01 2021 +0200 comctl32: Redraw children when the combo box is dropped down. Some applications subclass the combo box and handle WM_ERASEBKGND themselves, without using WS_CLIPCHILDREN. This causes them to erase over the editbox child, so it requires a refresh as well. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22260 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/combo.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/comctl32/combo.c b/dlls/comctl32/combo.c index 4208ff8b9c9..2f3652c64bd 100644 --- a/dlls/comctl32/combo.c +++ b/dlls/comctl32/combo.c @@ -1003,8 +1003,7 @@ static void CBDropDown( LPHEADCOMBO lphc ) if( !(lphc->wState & CBF_NOREDRAW) ) - RedrawWindow( lphc->self, NULL, 0, RDW_INVALIDATE | - RDW_ERASE | RDW_UPDATENOW | RDW_NOCHILDREN ); + RedrawWindow( lphc->self, NULL, 0, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW ); EnableWindow( lphc->hWndLBox, TRUE ); if (GetCapture() != lphc->self)

1 0

Rémi Bernon : services: Terminate all service processes on shutdown.
by Alexandre Julliard 12 Nov '21

12 Nov '21

Module: wine Branch: master Commit: 7f749d58d9cbb0b3d54f2db75dbd88695b20901a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f749d58d9cbb0b3d54f2db7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 10 10:26:46 2021 +0100 services: Terminate all service processes on shutdown. Instead of waiting for wineserver to kill them on shutdown, after a 2s delay. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/services.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/services/services.c b/programs/services/services.c index 39cd9ee4ffa..d969cf81ab9 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -520,6 +520,7 @@ static void scmdatabase_wait_terminate(struct scmdatabase *db) { struct process_entry *process = grab_process(LIST_ENTRY(ptr, struct process_entry, entry)); + process_terminate(process); scmdatabase_unlock(db); WaitForSingleObject(process->process, INFINITE); scmdatabase_lock(db);

1 0

Rémi Bernon : server: Wait for process exit more often and using increasing delay.
by Alexandre Julliard 12 Nov '21

12 Nov '21

Module: wine Branch: master Commit: c37a6e8e40e50e96e4e8a5414ce702f0156fde77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c37a6e8e40e50e96e4e8a541… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 10 10:26:45 2021 +0100 server: Wait for process exit more often and using increasing delay. Instead of waiting for 1s before considering it dead, when most of the time the process dies quickly, delaying desktop or wineserver shutdown. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/process.c | 19 +++++++++++++++---- server/process.h | 1 + 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/server/process.c b/server/process.c index 48b5d6d6dd4..343ad78270c 100644 --- a/server/process.c +++ b/server/process.c @@ -595,10 +595,20 @@ static void process_died( struct process *process ) static void process_sigkill( void *private ) { struct process *process = private; + int signal = 0; - process->sigkill_timeout = NULL; - kill( process->unix_pid, SIGKILL ); - process_died( process ); + process->sigkill_delay *= 2; + if (process->sigkill_delay >= TICKS_PER_SEC / 2) + signal = SIGKILL; + + if (!kill( process->unix_pid, signal ) && !signal) + process->sigkill_timeout = add_timeout_user( -process->sigkill_delay, process_sigkill, process ); + else + { + process->sigkill_delay = TICKS_PER_SEC / 64; + process->sigkill_timeout = NULL; + process_died( process ); + } } /* start the sigkill timer for a process upon exit */ @@ -606,7 +616,7 @@ static void start_sigkill_timer( struct process *process ) { grab_object( process ); if (process->unix_pid != -1) - process->sigkill_timeout = add_timeout_user( -TICKS_PER_SEC, process_sigkill, process ); + process->sigkill_timeout = add_timeout_user( -process->sigkill_delay, process_sigkill, process ); else process_died( process ); } @@ -630,6 +640,7 @@ struct process *create_process( int fd, struct process *parent, unsigned int fla process->handles = NULL; process->msg_fd = NULL; process->sigkill_timeout = NULL; + process->sigkill_delay = TICKS_PER_SEC / 64; process->unix_pid = -1; process->exit_code = STILL_ACTIVE; process->running_threads = 0; diff --git a/server/process.h b/server/process.h index 55e4d6dced6..22ee8178368 100644 --- a/server/process.h +++ b/server/process.h @@ -53,6 +53,7 @@ struct process process_id_t group_id; /* group id of the process */ unsigned int session_id; /* session id */ struct timeout_user *sigkill_timeout; /* timeout for final SIGKILL */ + timeout_t sigkill_delay; /* delay before final SIGKILL */ unsigned short machine; /* client machine type */ int unix_pid; /* Unix pid for final SIGKILL */ int exit_code; /* process exit code */

1 0

Ivo Ivanov : winebus.sys: Accept whitespaces in strings parsed from uevent.
by Alexandre Julliard 12 Nov '21

12 Nov '21

Module: wine Branch: master Commit: 57161ff6937e7ce738ce461032f894e9134a68af URL: https://source.winehq.org/git/wine.git/?a=commit;h=57161ff6937e7ce738ce4610… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Fri Nov 12 09:49:47 2021 +0100 winebus.sys: Accept whitespaces in strings parsed from uevent. Fixes the device names appearing with the first words in joy.cpl and probably in games, when the UDEV bus is used in HIDRAW mode. Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index dad5344a54c..5ff1719848d 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1121,13 +1121,13 @@ static void get_device_subsystem_info(struct udev_device *dev, char const *subsy if (!strncmp(ptr, "HID_UNIQ=", 9)) { if (desc->serialnumber[0]) continue; - if (sscanf(ptr, "HID_UNIQ=%256s\n", buffer) == 1) + if (sscanf(ptr, "HID_UNIQ=%256[^\n]", buffer) == 1) ntdll_umbstowcs(buffer, strlen(buffer) + 1, desc->serialnumber, ARRAY_SIZE(desc->serialnumber)); } if (!strncmp(ptr, "HID_NAME=", 9)) { if (desc->product[0]) continue; - if (sscanf(ptr, "HID_NAME=%256s\n", buffer) == 1) + if (sscanf(ptr, "HID_NAME=%256[^\n]", buffer) == 1) ntdll_umbstowcs(buffer, strlen(buffer) + 1, desc->product, ARRAY_SIZE(desc->product)); } if (!strncmp(ptr, "HID_PHYS=", 9) || !strncmp(ptr, "PHYS=\"", 6))

1 0

Ivo Ivanov : dinput: Pass buffer byte length to HidD_GetProductString.
by Alexandre Julliard 12 Nov '21

12 Nov '21

Module: wine Branch: master Commit: 16bc6b053db582d816e4fe4ac77481d1671ae08f URL: https://source.winehq.org/git/wine.git/?a=commit;h=16bc6b053db582d816e4fe4a… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Fri Nov 12 09:49:46 2021 +0100 dinput: Pass buffer byte length to HidD_GetProductString. Instead of then number of WCHAR. Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index efb90b4e2e9..a5fbfb81332 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1239,8 +1239,8 @@ static BOOL hid_joystick_device_try_open( UINT32 handle, const WCHAR *path, HAND if (caps->UsagePage != HID_USAGE_PAGE_GENERIC) goto failed; if (caps->Usage != HID_USAGE_GENERIC_GAMEPAD && caps->Usage != HID_USAGE_GENERIC_JOYSTICK) goto failed; - if (!HidD_GetProductString( device_file, instance->tszInstanceName, MAX_PATH )) goto failed; - if (!HidD_GetProductString( device_file, instance->tszProductName, MAX_PATH )) goto failed; + if (!HidD_GetProductString( device_file, instance->tszInstanceName, MAX_PATH * sizeof(WCHAR) )) goto failed; + if (!HidD_GetProductString( device_file, instance->tszProductName, MAX_PATH * sizeof(WCHAR) )) goto failed; instance->guidInstance = hid_joystick_guid; instance->guidInstance.Data1 ^= handle;

1 0

Rémi Bernon : dinput: Use a specific buffer for set envelope output report.
by Alexandre Julliard 12 Nov '21

12 Nov '21

Module: wine Branch: master Commit: 6501968dd8d5147124ecc6b5eeb802b89f7de7e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6501968dd8d5147124ecc6b5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 12 09:49:45 2021 +0100 dinput: Use a specific buffer for set envelope output report. Instead of a generic type_specific_buf[1], and factor code for all effects that use an envelope. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 134 ++++++++++++++++++++++----------------------- 1 file changed, 64 insertions(+), 70 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6501968dd8d5147124ec…

1 0

Ivo Ivanov : dinput: Set effect block index in the second type specific report.
by Alexandre Julliard 12 Nov '21

12 Nov '21

Module: wine Branch: master Commit: 576bf9239f63fb61ecb04327808bb9753a5aeceb URL: https://source.winehq.org/git/wine.git/?a=commit;h=576bf9239f63fb61ecb04327… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Fri Nov 12 09:49:44 2021 +0100 dinput: Set effect block index in the second type specific report. Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index c49e840f845..500ae05d481 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -2581,6 +2581,11 @@ static HRESULT WINAPI hid_joystick_effect_Download( IDirectInputEffect *iface ) impl->index, impl->joystick->preparsed, impl->type_specific_buf[0], report_len ); if (status != HIDP_STATUS_SUCCESS) WARN( "HidP_SetUsageValue returned %#x\n", status ); + if (!impl->type_specific_buf[1][0]) status = HIDP_STATUS_SUCCESS; + else status = HidP_SetUsageValue( HidP_Output, HID_USAGE_PAGE_PID, 0, PID_USAGE_EFFECT_BLOCK_INDEX, + impl->index, impl->joystick->preparsed, impl->type_specific_buf[1], report_len ); + if (status != HIDP_STATUS_SUCCESS) WARN( "HidP_SetUsageValue returned %#x\n", status ); + status = HidP_SetUsageValue( HidP_Output, HID_USAGE_PAGE_PID, 0, PID_USAGE_EFFECT_BLOCK_INDEX, impl->index, impl->joystick->preparsed, impl->effect_update_buf, report_len ); if (status != HIDP_STATUS_SUCCESS) hr = status;

1 0

Rémi Bernon : dinput: Support up to 6 effect conditions.
by Alexandre Julliard 12 Nov '21

12 Nov '21

Module: wine Branch: master Commit: ab4bed67750163d6a3c13e509fcde72312ed9c7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab4bed67750163d6a3c13e50… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 12 09:49:43 2021 +0100 dinput: Support up to 6 effect conditions. As we support up to 6 force feedback axes and directions, the number of condition should match. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 4fdf961a04d..c49e840f845 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -188,7 +188,7 @@ struct hid_joystick_effect LONG directions[6]; DICONSTANTFORCE constant_force; DIRAMPFORCE ramp_force; - DICONDITION condition[2]; + DICONDITION condition[6]; DIENVELOPE envelope; DIPERIODIC periodic; DIEFFECT params; @@ -1878,6 +1878,9 @@ static HRESULT WINAPI hid_joystick_effect_Initialize( IDirectInputEffect *iface, joystick->preparsed, impl->effect_update_buf, report_len ); if (status != HIDP_STATUS_SUCCESS) return DIERR_DEVICENOTREG; + impl->type_specific_buf[0][0] = 0; + impl->type_specific_buf[1][0] = 0; + switch (type) { case PID_USAGE_ET_SQUARE: @@ -1899,9 +1902,6 @@ static HRESULT WINAPI hid_joystick_effect_Initialize( IDirectInputEffect *iface, status = HidP_InitializeReportForID( HidP_Output, joystick->pid_set_condition.id, joystick->preparsed, impl->type_specific_buf[0], report_len ); if (status != HIDP_STATUS_SUCCESS) return DIERR_DEVICENOTREG; - status = HidP_InitializeReportForID( HidP_Output, joystick->pid_set_condition.id, joystick->preparsed, - impl->type_specific_buf[1], report_len ); - if (status != HIDP_STATUS_SUCCESS) return DIERR_DEVICENOTREG; break; case PID_USAGE_ET_CONSTANT_FORCE: status = HidP_InitializeReportForID( HidP_Output, joystick->pid_set_constant_force.id, joystick->preparsed, @@ -1921,8 +1921,6 @@ static HRESULT WINAPI hid_joystick_effect_Initialize( IDirectInputEffect *iface, break; case PID_USAGE_ET_CUSTOM_FORCE_DATA: FIXME( "effect type %#x not implemented!\n", type ); - impl->type_specific_buf[0][0] = 0; - impl->type_specific_buf[1][0] = 0; break; } @@ -2626,22 +2624,22 @@ static HRESULT WINAPI hid_joystick_effect_Download( IDirectInputEffect *iface ) case PID_USAGE_ET_DAMPER: case PID_USAGE_ET_INERTIA: case PID_USAGE_ET_FRICTION: - for (i = 0; i < min( 2, impl->params.cbTypeSpecificParams / sizeof(DICONDITION) ); ++i) + for (i = 0; i < impl->params.cbTypeSpecificParams / sizeof(DICONDITION); ++i) { - set_parameter_value( impl, impl->type_specific_buf[i], set_condition->center_point_offset_caps, + set_parameter_value( impl, impl->type_specific_buf[0], set_condition->center_point_offset_caps, impl->condition[i].lOffset ); - set_parameter_value( impl, impl->type_specific_buf[i], set_condition->positive_coefficient_caps, + set_parameter_value( impl, impl->type_specific_buf[0], set_condition->positive_coefficient_caps, impl->condition[i].lPositiveCoefficient ); - set_parameter_value( impl, impl->type_specific_buf[i], set_condition->negative_coefficient_caps, + set_parameter_value( impl, impl->type_specific_buf[0], set_condition->negative_coefficient_caps, impl->condition[i].lNegativeCoefficient ); - set_parameter_value( impl, impl->type_specific_buf[i], set_condition->positive_saturation_caps, + set_parameter_value( impl, impl->type_specific_buf[0], set_condition->positive_saturation_caps, impl->condition[i].dwPositiveSaturation ); - set_parameter_value( impl, impl->type_specific_buf[i], set_condition->negative_saturation_caps, + set_parameter_value( impl, impl->type_specific_buf[0], set_condition->negative_saturation_caps, impl->condition[i].dwNegativeSaturation ); - set_parameter_value( impl, impl->type_specific_buf[i], set_condition->dead_band_caps, + set_parameter_value( impl, impl->type_specific_buf[0], set_condition->dead_band_caps, impl->condition[i].lDeadBand ); - if (WriteFile( device, impl->type_specific_buf[i], report_len, NULL, NULL )) hr = DI_OK; + if (WriteFile( device, impl->type_specific_buf[0], report_len, NULL, NULL )) hr = DI_OK; else hr = DIERR_INPUTLOST; } break;

1 0

← Newer
1
...
50
51
52
53
54
55
56
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2021