wine-commits February 2019

wine-commits@winehq.org

1 participants
672 discussions

Sven Baars : wbemprox: Initialize a variable (Coverity).
by Alexandre Julliard 18 Feb '19

18 Feb '19

Module: wine Branch: master Commit: 88399dee3f712f19c5f95fbb1b9e21070f947534 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88399dee3f712f19c5f95fbb… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat Feb 16 23:38:55 2019 +0100 wbemprox: Initialize a variable (Coverity). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index d2b7dc1..b206a2a 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1372,7 +1372,7 @@ static UINT get_logical_processor_count( UINT *num_physical, UINT *num_packages NTSTATUS status; ULONG len, offset = 0; BOOL smt_enabled = FALSE; - DWORD all; + DWORD all = RelationAll; if (num_packages) *num_packages = 1; status = NtQuerySystemInformationEx( SystemLogicalProcessorInformationEx, &all, sizeof(all), NULL, 0, &len );

1 0

Nikolay Sivov : wbemprox/tests: Add a simple test for semi-synchronous mode behaviour.
by Alexandre Julliard 18 Feb '19

18 Feb '19

Module: wine Branch: master Commit: 7e55129b7a652be643f97701e7ba5220a9ccb3a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e55129b7a652be643f97701… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 15 20:04:52 2019 +0300 wbemprox/tests: Add a simple test for semi-synchronous mode behaviour. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/tests/query.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index ae0106a..e8ddbcc 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1084,6 +1084,34 @@ static void test_query_async( IWbemServices *services ) SysFreeString( query ); } +static void test_query_semisync( IWbemServices *services ) +{ + static const WCHAR queryW[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','W','i','n','3','2','_','D','u','m','m','y',0}; + BSTR wql = SysAllocString( wqlW ), query = SysAllocString( queryW ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + ULONG count; + HRESULT hr; + + hr = IWbemServices_ExecQuery( services, wql, query, WBEM_FLAG_RETURN_IMMEDIATELY | WBEM_FLAG_FORWARD_ONLY, + NULL, &result ); + ok( hr == S_OK, "got %08x\n", hr ); + + count = 1; + obj = (void *)0xdeadbeef; + hr = IEnumWbemClassObject_Next( result, -1, 1, &obj, &count ); +todo_wine + ok( hr == WBEM_E_INVALID_CLASS, "Unexpected hr %#x.\n", hr ); + ok( count == 0, "Unexpected count %u.\n", count ); + ok( obj == (void *)0xdeadbeef, "Got object %p\n", obj ); + + IEnumWbemClassObject_Release( result ); + + SysFreeString( wql ); + SysFreeString( query ); +} + static void test_GetNames( IWbemServices *services ) { static const WCHAR queryW[] = @@ -1950,6 +1978,7 @@ START_TEST(query) test_StdRegProv( services ); test_notification_query_async( services ); test_query_async( services ); + test_query_semisync( services ); test_GetNames( services ); test_SystemSecurity( services ); test_Win32_OperatingSystem( services );

1 0

Alexandre Julliard : Wine release 4.2
by Alexandre Julliard 15 Feb '19

15 Feb '19

Module: website Branch: master Commit: 1e8f7a93353868a5abec853a1bfd80b4810a6652 URL: https://source.winehq.org/git/website.git/?a=commit;h=1e8f7a93353868a5abec8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 15 21:37:27 2019 +0100 Wine release 4.2 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019021501.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2019021501.xml b/news/en/2019021501.xml new file mode 100644 index 0000000..62a6872 --- /dev/null +++ b/news/en/2019021501.xml @@ -0,0 +1,16 @@ +<news> +<date>February 15, 2019</date> +<title>Wine 4.2 Released</title> +<body> + The Wine development release 4.2 is now available. + <a href="{$root}/announce/4.2">What's new</a> in this release: +<ul> + <li>Unicode string normalization support.</li> + <li>Support for ECC cryptographic keys.</li> + <li>Support for mixing 32/64-bit dlls in the load path.</li> + <li>Futex-based implementations for more synchronization primitives.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/4.x/wine-4.2.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-4.2 : Alexandre Julliard : Release 4.2
by Alexandre Julliard 15 Feb '19

15 Feb '19

Module: wine Branch: refs/tags/wine-4.2 Tag: 8b8bac42edaab7e7ed32b2c21a9e416514bf8d6f URL: https://source.winehq.org/git/wine.git/?a=tag;h=8b8bac42edaab7e7ed32b2c21a9… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 15 21:34:44 2019 +0100 Release 4.2

1 0

Alexandre Julliard : Release 4.2.
by Alexandre Julliard 15 Feb '19

15 Feb '19

Module: wine Branch: master Commit: 06531b1d9898ba3ac3b7c69d6192682202606f8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=06531b1d9898ba3ac3b7c69d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 15 21:34:44 2019 +0100 Release 4.2. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 794 +++++++++++++++++++++++++++++++------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 409 insertions(+), 406 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=06531b1d9898ba3ac3b7…

1 0

Zebediah Figura : xinput: Fix axis scaling arithmetic.
by Alexandre Julliard 15 Feb '19

15 Feb '19

Module: wine Branch: master Commit: 7fd8ae1e4f0f44f58745119d35ac3c1fd231780b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fd8ae1e4f0f44f58745119d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 12 00:06:07 2019 -0600 xinput: Fix axis scaling arithmetic. Cast difference to ULONGLONG to ensure unsigned division, and correct off-by-one error present when inverting axes (previously hidden by signed division bug). Fixes a regression introduced by bd9e130ee5b569433f2c847c5b2b562f0ae35ac5. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46623 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/hid.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/xinput1_3/hid.c b/dlls/xinput1_3/hid.c index 7553aab..c0c405f 100644 --- a/dlls/xinput1_3/hid.c +++ b/dlls/xinput1_3/hid.c @@ -318,8 +318,15 @@ void HID_destroy_gamepads(xinput_controller *devices) LeaveCriticalSection(&hid_xinput_crit); } -#define SCALE_SHORT(v,r) (SHORT)((((0xffff)*(v - (r).min))/(r).range)-32767) -#define SCALE_BYTE(v,r) (BYTE)((((0xff)*(v - (r).min))/(r).range)) +static SHORT scale_short(LONG value, const struct axis_info *axis) +{ + return ((((ULONGLONG)(value - axis->min)) * 0xffff) / axis->range) - 32768; +} + +static BYTE scale_byte(LONG value, const struct axis_info *axis) +{ + return (((ULONGLONG)(value - axis->min)) * 0xff) / axis->range; +} void HID_update_state(xinput_controller* device) { @@ -382,22 +389,22 @@ void HID_update_state(xinput_controller* device) } HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, &value, private->ppd, target_report, private->report_length); - device->state.Gamepad.sThumbLX = SCALE_SHORT(value, private->lx); + device->state.Gamepad.sThumbLX = scale_short(value, &private->lx); HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Y, &value, private->ppd, target_report, private->report_length); - device->state.Gamepad.sThumbLY = -SCALE_SHORT(value, private->ly); + device->state.Gamepad.sThumbLY = -scale_short(value, &private->ly) - 1; HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RX, &value, private->ppd, target_report, private->report_length); - device->state.Gamepad.sThumbRX = SCALE_SHORT(value, private->rx); + device->state.Gamepad.sThumbRX = scale_short(value, &private->rx); HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RY, &value, private->ppd, target_report, private->report_length); - device->state.Gamepad.sThumbRY = -SCALE_SHORT(value, private->ry); + device->state.Gamepad.sThumbRY = -scale_short(value, &private->ry) - 1; HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RZ, &value, private->ppd, target_report, private->report_length); - device->state.Gamepad.bRightTrigger = SCALE_BYTE(value, private->rtrigger); + device->state.Gamepad.bRightTrigger = scale_byte(value, &private->rtrigger); HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, &value, private->ppd, target_report, private->report_length); - device->state.Gamepad.bLeftTrigger = SCALE_BYTE(value, private->ltrigger); + device->state.Gamepad.bLeftTrigger = scale_byte(value, &private->ltrigger); LeaveCriticalSection(&private->crit); }

1 0

Zebediah Figura : xinput: Use a struct instead of an array to store axis information.
by Alexandre Julliard 15 Feb '19

15 Feb '19

Module: wine Branch: master Commit: c1c6ca2e94f7f372acd9627aaeeb5192660b0a73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1c6ca2e94f7f372acd9627a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 12 00:06:06 2019 -0600 xinput: Use a struct instead of an array to store axis information. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/hid.c | 80 ++++++++++++++++++++-------------------------------- 1 file changed, 30 insertions(+), 50 deletions(-) diff --git a/dlls/xinput1_3/hid.c b/dlls/xinput1_3/hid.c index f276fe3..7553aab 100644 --- a/dlls/xinput1_3/hid.c +++ b/dlls/xinput1_3/hid.c @@ -59,6 +59,13 @@ static CRITICAL_SECTION_DEBUG hid_critsect_debug = }; static CRITICAL_SECTION hid_xinput_crit = { &hid_critsect_debug, -1, 0, 0, 0, 0 }; +struct axis_info +{ + LONG min; + LONG range; + USHORT bits; +}; + struct hid_platform_private { PHIDP_PREPARSED_DATA ppd; HANDLE device; @@ -71,50 +78,23 @@ struct hid_platform_private { BYTE current_report; CHAR *reports[2]; - LONG ThumbLXRange[3]; - LONG ThumbLYRange[3]; - LONG LeftTriggerRange[3]; - LONG ThumbRXRange[3]; - LONG ThumbRYRange[3]; - LONG RightTriggerRange[3]; + struct axis_info lx, ly, ltrigger, rx, ry, rtrigger; }; static DWORD last_check = 0; static void MarkUsage(struct hid_platform_private *private, WORD usage, LONG min, LONG max, USHORT bits) { + struct axis_info info = {min, max-min, bits}; + switch (usage) { - case HID_USAGE_GENERIC_X: - private->ThumbLXRange[0] = min; - private->ThumbLXRange[1] = bits; - private->ThumbLXRange[2] = max - min; - break; - case HID_USAGE_GENERIC_Y: - private->ThumbLYRange[0] = min; - private->ThumbLYRange[1] = bits; - private->ThumbLYRange[2] = max - min; - break; - case HID_USAGE_GENERIC_Z: - private->LeftTriggerRange[0] = min; - private->LeftTriggerRange[1] = bits; - private->LeftTriggerRange[2] = max - min; - break; - case HID_USAGE_GENERIC_RX: - private->ThumbRXRange[0] = min; - private->ThumbRXRange[1] = bits; - private->ThumbRXRange[2] = max - min; - break; - case HID_USAGE_GENERIC_RY: - private->ThumbRYRange[0] = min; - private->ThumbRYRange[1] = bits; - private->ThumbRYRange[2] = max - min; - break; - case HID_USAGE_GENERIC_RZ: - private->RightTriggerRange[0] = min; - private->RightTriggerRange[1] = bits; - private->RightTriggerRange[2] = max - min; - break; + case HID_USAGE_GENERIC_X: private->lx = info; break; + case HID_USAGE_GENERIC_Y: private->ly = info; break; + case HID_USAGE_GENERIC_Z: private->ltrigger = info; break; + case HID_USAGE_GENERIC_RX: private->rx = info; break; + case HID_USAGE_GENERIC_RY: private->ry = info; break; + case HID_USAGE_GENERIC_RZ: private->rtrigger = info; break; } } @@ -166,27 +146,27 @@ static BOOL VerifyGamepad(PHIDP_PREPARSED_DATA ppd, XINPUT_CAPABILITIES *xinput_ } HeapFree(GetProcessHeap(), 0, value_caps); - if (private->LeftTriggerRange[1]) + if (private->ltrigger.bits) xinput_caps->Gamepad.bLeftTrigger = (1u << (sizeof(xinput_caps->Gamepad.bLeftTrigger) + 1)) - 1; else WARN("Missing axis LeftTrigger\n"); - if (private->RightTriggerRange[1]) + if (private->rtrigger.bits) xinput_caps->Gamepad.bRightTrigger = (1u << (sizeof(xinput_caps->Gamepad.bRightTrigger) + 1)) - 1; else WARN("Missing axis RightTrigger\n"); - if (private->ThumbLXRange[1]) + if (private->lx.bits) xinput_caps->Gamepad.sThumbLX = (1u << (sizeof(xinput_caps->Gamepad.sThumbLX) + 1)) - 1; else WARN("Missing axis ThumbLX\n"); - if (private->ThumbLYRange[1]) + if (private->ly.bits) xinput_caps->Gamepad.sThumbLY = (1u << (sizeof(xinput_caps->Gamepad.sThumbLY) + 1)) - 1; else WARN("Missing axis ThumbLY\n"); - if (private->ThumbRXRange[1]) + if (private->rx.bits) xinput_caps->Gamepad.sThumbRX = (1u << (sizeof(xinput_caps->Gamepad.sThumbRX) + 1)) - 1; else WARN("Missing axis ThumbRX\n"); - if (private->ThumbRYRange[1]) + if (private->ry.bits) xinput_caps->Gamepad.sThumbRY = (1u << (sizeof(xinput_caps->Gamepad.sThumbRY) + 1)) - 1; else WARN("Missing axis ThumbRY\n"); @@ -338,8 +318,8 @@ void HID_destroy_gamepads(xinput_controller *devices) LeaveCriticalSection(&hid_xinput_crit); } -#define SCALE_SHORT(v,r) (SHORT)((((0xffff)*(v - r[0]))/r[2])-32767) -#define SCALE_BYTE(v,r) (BYTE)((((0xff)*(v - r[0]))/r[2])) +#define SCALE_SHORT(v,r) (SHORT)((((0xffff)*(v - (r).min))/(r).range)-32767) +#define SCALE_BYTE(v,r) (BYTE)((((0xff)*(v - (r).min))/(r).range)) void HID_update_state(xinput_controller* device) { @@ -402,22 +382,22 @@ void HID_update_state(xinput_controller* device) } HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, &value, private->ppd, target_report, private->report_length); - device->state.Gamepad.sThumbLX = SCALE_SHORT(value, private->ThumbLXRange); + device->state.Gamepad.sThumbLX = SCALE_SHORT(value, private->lx); HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Y, &value, private->ppd, target_report, private->report_length); - device->state.Gamepad.sThumbLY = -SCALE_SHORT(value, private->ThumbLYRange); + device->state.Gamepad.sThumbLY = -SCALE_SHORT(value, private->ly); HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RX, &value, private->ppd, target_report, private->report_length); - device->state.Gamepad.sThumbRX = SCALE_SHORT(value, private->ThumbRXRange); + device->state.Gamepad.sThumbRX = SCALE_SHORT(value, private->rx); HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RY, &value, private->ppd, target_report, private->report_length); - device->state.Gamepad.sThumbRY = -SCALE_SHORT(value, private->ThumbRYRange); + device->state.Gamepad.sThumbRY = -SCALE_SHORT(value, private->ry); HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RZ, &value, private->ppd, target_report, private->report_length); - device->state.Gamepad.bRightTrigger = SCALE_BYTE(value, private->RightTriggerRange); + device->state.Gamepad.bRightTrigger = SCALE_BYTE(value, private->rtrigger); HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, &value, private->ppd, target_report, private->report_length); - device->state.Gamepad.bLeftTrigger = SCALE_BYTE(value, private->LeftTriggerRange); + device->state.Gamepad.bLeftTrigger = SCALE_BYTE(value, private->ltrigger); LeaveCriticalSection(&private->crit); }

1 0

Zebediah Figura : xinput: Use HidP_GetScaledUsageValue().
by Alexandre Julliard 15 Feb '19

15 Feb '19

Module: wine Branch: master Commit: 681414400eda0bd085217a7d0019d9eac9a5e1f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=681414400eda0bd085217a7d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 12 00:06:05 2019 -0600 xinput: Use HidP_GetScaledUsageValue(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/hid.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/xinput1_3/hid.c b/dlls/xinput1_3/hid.c index d7e2248..f276fe3 100644 --- a/dlls/xinput1_3/hid.c +++ b/dlls/xinput1_3/hid.c @@ -338,9 +338,8 @@ void HID_destroy_gamepads(xinput_controller *devices) LeaveCriticalSection(&hid_xinput_crit); } -#define SIGN(v,b) ((b==8)?(BYTE)v:(b==16)?(SHORT)v:(INT)v) -#define SCALE_SHORT(v,r) (SHORT)((((0xffff)*(SIGN(v,r[1]) - r[0]))/r[2])-32767) -#define SCALE_BYTE(v,r) (BYTE)((((0xff)*(SIGN(v,r[1]) - r[0]))/r[2])) +#define SCALE_SHORT(v,r) (SHORT)((((0xffff)*(v - r[0]))/r[2])-32767) +#define SCALE_BYTE(v,r) (BYTE)((((0xff)*(v - r[0]))/r[2])) void HID_update_state(xinput_controller* device) { @@ -351,7 +350,7 @@ void HID_update_state(xinput_controller* device) USAGE buttons[15]; ULONG button_length; - ULONG value; + LONG value; if (!private->enabled) return; @@ -402,22 +401,22 @@ void HID_update_state(xinput_controller* device) } } - HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, &value, private->ppd, target_report, private->report_length); + HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, &value, private->ppd, target_report, private->report_length); device->state.Gamepad.sThumbLX = SCALE_SHORT(value, private->ThumbLXRange); - HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Y, &value, private->ppd, target_report, private->report_length); + HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Y, &value, private->ppd, target_report, private->report_length); device->state.Gamepad.sThumbLY = -SCALE_SHORT(value, private->ThumbLYRange); - HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RX, &value, private->ppd, target_report, private->report_length); + HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RX, &value, private->ppd, target_report, private->report_length); device->state.Gamepad.sThumbRX = SCALE_SHORT(value, private->ThumbRXRange); - HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RY, &value, private->ppd, target_report, private->report_length); + HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RY, &value, private->ppd, target_report, private->report_length); device->state.Gamepad.sThumbRY = -SCALE_SHORT(value, private->ThumbRYRange); - HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RZ, &value, private->ppd, target_report, private->report_length); + HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RZ, &value, private->ppd, target_report, private->report_length); device->state.Gamepad.bRightTrigger = SCALE_BYTE(value, private->RightTriggerRange); - HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, &value, private->ppd, target_report, private->report_length); + HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, &value, private->ppd, target_report, private->report_length); device->state.Gamepad.bLeftTrigger = SCALE_BYTE(value, private->LeftTriggerRange); LeaveCriticalSection(&private->crit); }

1 0

Zebediah Figura : hid:=?UTF-8?Q?=20Scale=20from=20logical=20t?= o physical coördinates in HidP_GetScaledUsageValue().
by Alexandre Julliard 15 Feb '19

15 Feb '19

Module: wine Branch: master Commit: 6ca21b56b43e1f843c4997eed4775096f0d92a57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ca21b56b43e1f843c4997ee… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 12 00:06:04 2019 -0600 hid: Scale from logical to physical coördinates in HidP_GetScaledUsageValue(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index ac5f222..7c58426 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -272,6 +272,18 @@ static LONG sign_extend(ULONG value, const WINE_HID_ELEMENT *element) return value; } +static LONG logical_to_physical(LONG value, const WINE_HID_ELEMENT *element) +{ + if (element->caps.value.PhysicalMin || element->caps.value.PhysicalMax) + { + value = (((ULONGLONG)(value - element->caps.value.LogicalMin) + * (element->caps.value.PhysicalMax - element->caps.value.PhysicalMin)) + / (element->caps.value.LogicalMax - element->caps.value.LogicalMin)) + + element->caps.value.PhysicalMin; + } + return value; +} + NTSTATUS WINAPI HidP_GetScaledUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, PLONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength) @@ -290,7 +302,7 @@ NTSTATUS WINAPI HidP_GetScaledUsageValue(HIDP_REPORT_TYPE ReportType, USAGE Usag element->valueStartBit, element->bitCount, &rawValue); if (rc != HIDP_STATUS_SUCCESS) return rc; - *UsageValue = sign_extend(rawValue, element); + *UsageValue = logical_to_physical(sign_extend(rawValue, element), element); } return rc;

1 0

Zebediah Figura : hid: Correctly sign-extend all values in HidP_GetScaledUsageValue().
by Alexandre Julliard 15 Feb '19

15 Feb '19

Module: wine Branch: master Commit: fbc1a89a402cafae812aa829c6ad38598d108555 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbc1a89a402cafae812aa829… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 12 00:06:03 2019 -0600 hid: Correctly sign-extend all values in HidP_GetScaledUsageValue(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 15d827e..ac5f222 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -259,6 +259,19 @@ static NTSTATUS find_value(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT return HIDP_STATUS_USAGE_NOT_FOUND; } +static LONG sign_extend(ULONG value, const WINE_HID_ELEMENT *element) +{ + UINT bit_count = element->bitCount; + + if ((value & (1 << (bit_count - 1))) + && element->ElementType == ValueElement + && element->caps.value.LogicalMin < 0) + { + value -= (1 << bit_count); + } + return value; +} + NTSTATUS WINAPI HidP_GetScaledUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, PLONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength) @@ -277,7 +290,7 @@ NTSTATUS WINAPI HidP_GetScaledUsageValue(HIDP_REPORT_TYPE ReportType, USAGE Usag element->valueStartBit, element->bitCount, &rawValue); if (rc != HIDP_STATUS_SUCCESS) return rc; - *UsageValue = rawValue; + *UsageValue = sign_extend(rawValue, element); } return rc;

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
68
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 February 2019