winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
November 2021
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
951 discussions
Start a n
N
ew thread
Eric Pouech : dbghelp: Protect against missing compiland when adding global function.
by Alexandre Julliard
22 Nov '21
22 Nov '21
Module: wine Branch: master Commit: 0bbb161c41dd6dcb505ddef40d18d32065925341 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=0bbb161c41dd6dcb505ddef4…
Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 22 15:19:59 2021 +0100 dbghelp: Protect against missing compiland when adding global function. Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=52045
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/symbol.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 435d94bc8eb..2443dbf7e73 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -353,8 +353,11 @@ struct symt_function* symt_new_function(struct module* module, init_function_or_inlinesite(sym, module, SymTagFunction, &compiland->symt, name, addr, size, sig_type); sym->next_inlinesite = NULL; /* first of list */ symt_add_module_ht(module, (struct symt_ht*)sym); - p = vector_add(&compiland->vchildren, &module->pool); - *p = &sym->symt; + if (compiland) + { + p = vector_add(&compiland->vchildren, &module->pool); + *p = &sym->symt; + } } return sym; }
1
0
0
0
Eric Pouech : dbghelp: Fix potential crash when loading a builtin PE module embedded in an ELF image.
by Alexandre Julliard
22 Nov '21
22 Nov '21
Module: wine Branch: master Commit: 5e56bc3b21c5955962f93c4369720964e3e05a94 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=5e56bc3b21c5955962f93c43…
Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 22 15:19:46 2021 +0100 dbghelp: Fix potential crash when loading a builtin PE module embedded in an ELF image. Regression introduced by ced12a1a3aca214c64887e1dc65df67015015394. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index fe65683c6e1..1b64bb57eb7 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -990,7 +990,7 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam module_remove(pcs, altmodule); } - if ((dbghelp_options & SYMOPT_DEFERRED_LOADS) == 0) + if ((dbghelp_options & SYMOPT_DEFERRED_LOADS) == 0 && !module_get_container(pcs, module)) module_load_debug(module); return module->module.BaseOfImage; }
1
0
0
0
Jan Sikorski : ntdll: Save status from attaching dependencies in process_attach().
by Alexandre Julliard
22 Nov '21
22 Nov '21
Module: wine Branch: master Commit: 064dd051d80f1353fcb4af91cd0d78e936d1f7c2 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=064dd051d80f1353fcb4af91…
Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Mon Nov 22 14:59:48 2021 +0100 ntdll: Save status from attaching dependencies in process_attach(). Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 5cf538f3319..c6d9689f408 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1552,7 +1552,7 @@ static NTSTATUS process_attach( LDR_DDAG_NODE *node, LPVOID lpReserved ) if (wm->ldr.ActivationContext) RtlActivateActivationContext( 0, wm->ldr.ActivationContext, &cookie ); /* Recursively attach all DLLs this one depends on */ - walk_node_dependencies( node, lpReserved, process_attach ); + status = walk_node_dependencies( node, lpReserved, process_attach ); if (!wm->ldr.InInitializationOrderLinks.Flink) InsertTailList(&NtCurrentTeb()->Peb->LdrData->InInitializationOrderModuleList,
1
0
0
0
Ivo Ivanov : dinput: Mark effect parameters as modified when duration is set.
by Alexandre Julliard
22 Nov '21
22 Nov '21
Module: wine Branch: master Commit: 13aea4844a9a7c301fdc3591e46560ab93008c02 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=13aea4844a9a7c301fdc3591…
Author: Ivo Ivanov <logos128(a)gmail.com> Date: Mon Nov 22 11:05:49 2021 +0100 dinput: Mark effect parameters as modified when duration is set. Even if it doesn't actually change. Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=52061
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 2 +- dlls/dinput8/tests/hid.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 62856cefa44..99436bd8b05 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -2554,7 +2554,7 @@ static HRESULT WINAPI hid_joystick_effect_SetParameters( IDirectInputEffect *ifa if (flags & DIEP_DURATION) { - if (impl->params.dwDuration != params->dwDuration) impl->modified |= DIEP_DURATION; + impl->modified |= DIEP_DURATION; impl->params.dwDuration = params->dwDuration; } if (flags & DIEP_GAIN) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 4159c3edd90..0c63ed835e8 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -6471,6 +6471,15 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file, DWO hr = IDirectInputEffect_SetParameters( effect, &expect_desc, 0 ); ok( hr == DI_OK, "SetParameters returned %#x\n", hr ); wait_hid_expect( file, 100 ); /* these updates are sent asynchronously */ + desc = expect_desc; + desc.dwDuration = INFINITE; + desc.dwTriggerButton = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( 0 ) | DIDFT_FFEFFECTTRIGGER, + hr = IDirectInputEffect_SetParameters( effect, &desc, DIEP_NODOWNLOAD|DIEP_DURATION|DIEP_TRIGGERBUTTON ); + ok( hr == DI_DOWNLOADSKIPPED, "SetParameters returned %#x\n", hr ); + set_hid_expect( file, expect_update, sizeof(expect_update) ); + hr = IDirectInputEffect_SetParameters( effect, &expect_desc, 0 ); + ok( hr == DI_OK, "SetParameters returned %#x\n", hr ); + wait_hid_expect( file, 100 ); /* these updates are sent asynchronously */ desc = expect_desc; desc.lpEnvelope = &envelope;
1
0
0
0
Ivo Ivanov : dinput: Send only the reports that have been modified.
by Alexandre Julliard
22 Nov '21
22 Nov '21
Module: wine Branch: master Commit: 0059dc2567ada71242a5aba94b047a51266bd0dd URL:
https://source.winehq.org/git/wine.git/?a=commit;h=0059dc2567ada71242a5aba9…
Author: Ivo Ivanov <logos128(a)gmail.com> Date: Mon Nov 22 11:05:48 2021 +0100 dinput: Send only the reports that have been modified. Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=52061
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 71 ++++++++++++++++++++++++++++------------------ dlls/dinput8/tests/hid.c | 32 --------------------- 2 files changed, 44 insertions(+), 59 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=0059dc2567ada71242a5…
1
0
0
0
Ivo Ivanov : winebus.sys: Support arbitrary effect parameter updates.
by Alexandre Julliard
22 Nov '21
22 Nov '21
Module: wine Branch: master Commit: 31a668439b95b93424a3c6bc3c2c05f702ce49e5 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=31a668439b95b93424a3c6bc…
Author: Ivo Ivanov <logos128(a)gmail.com> Date: Mon Nov 22 11:05:47 2021 +0100 winebus.sys: Support arbitrary effect parameter updates. DInput will only send the output reports that have been modified, we need to support sparse effect updates. Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=52061
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 1 + dlls/winebus.sys/bus_udev.c | 1 + dlls/winebus.sys/hid.c | 21 ++++++++++++++++++--- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index e3932e31ff5..003f6652f05 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -569,6 +569,7 @@ static NTSTATUS sdl_device_physical_effect_update(struct unix_device *iface, BYT TRACE("iface %p, index %u, params %p.\n", iface, index, params); + if (params->effect_type == PID_USAGE_UNDEFINED) return STATUS_SUCCESS; if ((status = set_effect_type_from_usage(&effect, params->effect_type))) return status; switch (params->effect_type) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 3a7a5db723d..521ae4192b5 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1024,6 +1024,7 @@ static NTSTATUS lnxev_device_physical_effect_update(struct unix_device *iface, B TRACE("iface %p, index %u, params %p.\n", iface, index, params); + if (params->effect_type == PID_USAGE_UNDEFINED) return STATUS_SUCCESS; if ((status = set_effect_type_from_usage(&effect, params->effect_type))) return status; effect.replay.length = params->duration; diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index 56f30338481..beb2ebe8ad9 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -1033,7 +1033,11 @@ static void hid_device_set_output_report(struct unix_device *iface, HID_XFER_PAC else if (!(control = pid_device_control_usages[report->control_index])) io->Status = STATUS_INVALID_PARAMETER; else + { io->Status = iface->hid_vtbl->physical_device_control(iface, control); + if (control == PID_USAGE_DC_DEVICE_RESET && io->Status == STATUS_SUCCESS) + memset(physical->effect_params, 0, sizeof(physical->effect_params)); + } } else if (packet->reportId == physical->device_gain_report) { @@ -1088,8 +1092,6 @@ static void hid_device_set_output_report(struct unix_device *iface, HID_XFER_PAC params->direction[1] = report->direction[1]; io->Status = iface->hid_vtbl->physical_effect_update(iface, report->index, params); - - params->condition_count = 0; } } else if (packet->reportId == physical->set_periodic_report) @@ -1106,6 +1108,8 @@ static void hid_device_set_output_report(struct unix_device *iface, HID_XFER_PAC params->periodic.offset = report->offset; params->periodic.phase = report->phase; params->periodic.period = report->period; + + io->Status = iface->hid_vtbl->physical_effect_update(iface, report->index, params); } } else if (packet->reportId == physical->set_envelope_report) @@ -1122,6 +1126,8 @@ static void hid_device_set_output_report(struct unix_device *iface, HID_XFER_PAC params->envelope.fade_level = report->fade_level; params->envelope.attack_time = report->attack_time; params->envelope.fade_time = report->fade_time; + + io->Status = iface->hid_vtbl->physical_effect_update(iface, report->index, params); } } else if (packet->reportId == physical->set_condition_report) @@ -1134,10 +1140,11 @@ static void hid_device_set_output_report(struct unix_device *iface, HID_XFER_PAC io->Information = sizeof(*report) + 1; if (packet->reportBufferLen < io->Information) io->Status = STATUS_BUFFER_TOO_SMALL; - else if ((index = params->condition_count++) >= ARRAY_SIZE(params->condition)) + else if ((index = report->condition_index) >= ARRAY_SIZE(params->condition)) io->Status = STATUS_INVALID_PARAMETER; else { + if (params->condition_count <= index) params->condition_count = index + 1; condition = params->condition + index; condition->center_point_offset = report->center_point_offset; condition->positive_coefficient = report->positive_coefficient; @@ -1145,6 +1152,8 @@ static void hid_device_set_output_report(struct unix_device *iface, HID_XFER_PAC condition->positive_saturation = report->positive_saturation; condition->negative_saturation = report->negative_saturation; condition->dead_band = report->dead_band; + + io->Status = iface->hid_vtbl->physical_effect_update(iface, report->index, params); } } else if (packet->reportId == physical->set_constant_force_report) @@ -1156,7 +1165,11 @@ static void hid_device_set_output_report(struct unix_device *iface, HID_XFER_PAC if (packet->reportBufferLen < io->Information) io->Status = STATUS_BUFFER_TOO_SMALL; else + { params->constant_force.magnitude = report->magnitude; + + io->Status = iface->hid_vtbl->physical_effect_update(iface, report->index, params); + } } else if (packet->reportId == physical->set_ramp_force_report) { @@ -1170,6 +1183,8 @@ static void hid_device_set_output_report(struct unix_device *iface, HID_XFER_PAC { params->ramp_force.ramp_start = report->ramp_start; params->ramp_force.ramp_end = report->ramp_end; + + io->Status = iface->hid_vtbl->physical_effect_update(iface, report->index, params); } } else
1
0
0
0
Rémi Bernon : dinput: Send -1 for infinite durations in HID reports.
by Alexandre Julliard
22 Nov '21
22 Nov '21
Module: wine Branch: master Commit: a95f76094e9563230b131cfdea39f906678d8ce4 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=a95f76094e9563230b131cfd…
Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 22 11:05:46 2021 +0100 dinput: Send -1 for infinite durations in HID reports. Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=52061
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 3 ++- dlls/dinput8/tests/hid.c | 11 +---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 3d90e721fb6..5ecf54e2281 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -2728,7 +2728,8 @@ static void set_parameter_value_us( struct hid_joystick_effect *impl, char *repo LONG exp; if (!caps) return; exp = caps->units_exp; - if (caps->units != 0x1003) WARN( "unknown time unit caps %x\n", caps->units ); + if (value == INFINITE) value = caps->physical_min - 1; + else if (caps->units != 0x1003) WARN( "unknown time unit caps %x\n", caps->units ); else if (exp < -6) while (exp++ < -6) value *= 10; else if (exp > -6) while (exp-- > -6) value /= 10; set_parameter_value( impl, report_buf, caps, value ); diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 884a0100abe..26a5406fa57 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -5650,15 +5650,6 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file, DWO .report_id = 3, .report_len = 11, .report_buf = {0x03,0x01,0x02,0x08,0xff,0xff,version >= 0x700 ? 0x06 : 0x00,0x00,0x01,0x55,0xd5}, - .todo = TRUE, - }, - /* update effect */ - { - .code = IOCTL_HID_WRITE_REPORT, - .report_id = 3, - .report_len = 11, - .report_buf = {0x03,0x01,0x02,0x08,0x00,0x00,version >= 0x700 ? 0x06 : 0x00,0x00,0x01,0x55,0xd5}, - .wine_only = TRUE, .todo = TRUE, }, }; struct hid_expect expect_set_envelope[] = @@ -5683,7 +5674,7 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file, DWO .code = IOCTL_HID_WRITE_REPORT, .report_id = 3, .report_len = 11, - .report_buf = {0x03,0x01,0x02,0x08,0x00,0x00,version >= 0x700 ? 0x06 : 0x00,0x00,0x01,0x55,0xd5}, + .report_buf = {0x03,0x01,0x02,0x08,0xff,0xff,version >= 0x700 ? 0x06 : 0x00,0x00,0x01,0x55,0xd5}, .wine_only = TRUE, .todo = TRUE, }, };
1
0
0
0
Rémi Bernon : dinput8/tests: Add some partial effect update tests.
by Alexandre Julliard
22 Nov '21
22 Nov '21
Module: wine Branch: master Commit: c188a87020a91c50bad679f15785f9bdec8e750b URL:
https://source.winehq.org/git/wine.git/?a=commit;h=c188a87020a91c50bad679f1…
Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 22 11:05:45 2021 +0100 dinput8/tests: Add some partial effect update tests. Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=52061
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/driver_hid.c | 13 ++-- dlls/dinput8/tests/driver_hid.h | 1 + dlls/dinput8/tests/hid.c | 135 +++++++++++++++++++++++++++++++++++++--- 3 files changed, 137 insertions(+), 12 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=c188a87020a91c50bad6…
1
0
0
0
Rémi Bernon : dinput8/tests: Use WaitForSingleObject instead of GetOverlappedResultEx.
by Alexandre Julliard
22 Nov '21
22 Nov '21
Module: wine Branch: master Commit: 1560f6df5f10c67bffef519cfbd9e7392baaec01 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=1560f6df5f10c67bffef519c…
Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 22 11:05:44 2021 +0100 dinput8/tests: Use WaitForSingleObject instead of GetOverlappedResultEx. Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=52075
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index cbb202530ac..f1342c5714d 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -745,16 +745,18 @@ static inline void check_hidp_value_caps_( int line, HIDP_VALUE_CAPS *caps, cons static BOOL sync_ioctl( HANDLE file, DWORD code, void *in_buf, DWORD in_len, void *out_buf, DWORD *ret_len, DWORD timeout ) { + DWORD res, out_len = ret_len ? *ret_len : 0; OVERLAPPED ovl = {0}; - DWORD out_len = ret_len ? *ret_len : 0; BOOL ret; ovl.hEvent = CreateEventW( NULL, TRUE, FALSE, NULL ); ret = DeviceIoControl( file, code, in_buf, in_len, out_buf, out_len, &out_len, &ovl ); if (!ret && GetLastError() == ERROR_IO_PENDING) { - ret = GetOverlappedResultEx( file, &ovl, &out_len, timeout, TRUE ); - ok( ret, "GetOverlappedResultEx returned %u\n", GetLastError() ); + res = WaitForSingleObject( ovl.hEvent, timeout ); + ok( res == WAIT_OBJECT_0, "WaitForSingleObject returned %#x\n", res ); + ret = GetOverlappedResult( file, &ovl, &out_len, FALSE ); + ok( ret, "GetOverlappedResult returned %u\n", GetLastError() ); } CloseHandle( ovl.hEvent );
1
0
0
0
Rémi Bernon : winebus.sys: Initialize last_report length and buffer.
by Alexandre Julliard
22 Nov '21
22 Nov '21
Module: wine Branch: master Commit: 6d3b3aab25cfd1afc2909a4d65a76088fba02ea8 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=6d3b3aab25cfd1afc2909a4d…
Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 22 11:05:43 2021 +0100 winebus.sys: Initialize last_report length and buffer. Fixes a regression from e9c3c494fd2f388acd046c95ac6b121c0830bb46 where although we use the last report length, it was only initialized after the first corresponding report was received. Calling HidD_GetInputReport before that could cause a buffer overlow and report invalid data. Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=52068
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index d805f887a6f..111953c3bae 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -444,8 +444,6 @@ static void process_hid_report(DEVICE_OBJECT *device, BYTE *report_buf, DWORD re if (!ext->collection_desc.ReportIDs[0].ReportID) last_report = ext->last_reports[0]; else last_report = ext->last_reports[report_buf[0]]; - - last_report->length = report_len; memcpy(last_report->buffer, report_buf, report_len); if ((irp = pop_pending_read(ext))) @@ -861,7 +859,13 @@ static NTSTATUS pdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) { if (!(size = reports[i].InputLength)) continue; size = offsetof( struct hid_report, buffer[size] ); - if (!(ext->last_reports[reports[i].ReportID] = RtlAllocateHeap(GetProcessHeap(), 0, size))) status = STATUS_NO_MEMORY; + if (!(report = RtlAllocateHeap(GetProcessHeap(), HEAP_ZERO_MEMORY, size))) status = STATUS_NO_MEMORY; + else + { + report->length = reports[i].InputLength; + report->buffer[0] = reports[i].ReportID; + ext->last_reports[reports[i].ReportID] = report; + } } if (!status) ext->state = DEVICE_STATE_STARTED; }
1
0
0
0
← Newer
1
...
23
24
25
26
27
28
29
...
96
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
Results per page:
10
25
50
100
200