February 2019 - Wine-commits

Michael Stefaniuc : oleaut32/tests: Propagate the const instead of casting it away.
by Alexandre Julliard 18 Feb '19

18 Feb '19

Module: wine Branch: master Commit: e36476ff7e13fe8309bf1b057872e5df789dafce URL: https://source.winehq.org/git/wine.git/?a=commit;h=e36476ff7e13fe8309bf1b05… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Feb 15 23:08:15 2019 +0100 oleaut32/tests: Propagate the const instead of casting it away. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 857100e..ef0c32c 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -4807,7 +4807,7 @@ static void test_dump_typelib(const char *name) for (func = 0; func < typeattr->cFuncs; func++) { - function_info *fn_info = (function_info *)&ti->funcs[func]; + const function_info *fn_info = &ti->funcs[func]; FUNCDESC *desc; BSTR namesTab[256]; UINT cNames;

1 0

Nikolay Sivov : comctl32/toolbar: Draw button in idle state when mouse is captured.
by Alexandre Julliard 18 Feb '19

18 Feb '19

Module: wine Branch: master Commit: f037019e5d3e6b4d0d8abaf59063d9d96dfb7108 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f037019e5d3e6b4d0d8abaf5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 17 01:33:09 2019 +0300 comctl32/toolbar: Draw button in idle state when mouse is captured. When captured moving cursor over other buttons should not produce hot item feedback, only pressed button appearance changes. Hot item notifications are still delivered. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/toolbar.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index ec3b498..f4bdb60 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -717,7 +717,7 @@ static void TOOLBAR_DrawMasked(HIMAGELIST himl, int index, HDC hdc, INT x, INT y static UINT -TOOLBAR_TranslateState(const TBUTTON_INFO *btnPtr) +TOOLBAR_TranslateState(const TBUTTON_INFO *btnPtr, BOOL captured) { UINT retstate = 0; @@ -725,7 +725,7 @@ TOOLBAR_TranslateState(const TBUTTON_INFO *btnPtr) retstate |= (btnPtr->fsState & TBSTATE_PRESSED) ? CDIS_SELECTED : 0; retstate |= (btnPtr->fsState & TBSTATE_ENABLED) ? 0 : CDIS_DISABLED; retstate |= (btnPtr->fsState & TBSTATE_MARKED ) ? CDIS_MARKED : 0; - retstate |= (btnPtr->bHot ) ? CDIS_HOT : 0; + retstate |= (btnPtr->bHot & !captured ) ? CDIS_HOT : 0; retstate |= ((btnPtr->fsState & (TBSTATE_ENABLED|TBSTATE_INDETERMINATE)) == (TBSTATE_ENABLED|TBSTATE_INDETERMINATE)) ? CDIS_INDETERMINATE : 0; /* NOTE: we don't set CDIS_GRAYED, CDIS_FOCUS, CDIS_DEFAULT */ return retstate; @@ -987,7 +987,7 @@ TOOLBAR_DrawButton (const TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, HDC hdc, tbcd.rcText.top = 0; tbcd.rcText.right = rcText.right - rc.left; tbcd.rcText.bottom = rcText.bottom - rc.top; - tbcd.nmcd.uItemState = TOOLBAR_TranslateState(btnPtr); + tbcd.nmcd.uItemState = TOOLBAR_TranslateState(btnPtr, infoPtr->bCaptured); tbcd.nmcd.hdc = hdc; tbcd.nmcd.rc = btnPtr->rect; tbcd.hbrMonoDither = COMCTL32_hPattern55AABrush;

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

Zebediah Figura : wined3d: Get rid of the "state" field from struct wined3d_stateblock.
by Alexandre Julliard 15 Feb '19

15 Feb '19

Module: wine Branch: master Commit: c19a798003e5585407f6aba77e325001d62202c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c19a798003e5585407f6aba7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 15 00:38:13 2019 -0600 wined3d: Get rid of the "state" field from struct wined3d_stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/stateblock.c | 2 -- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 3 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index cd57e6c..cd72209 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -604,7 +604,6 @@ ULONG CDECL wined3d_stateblock_decref(struct wined3d_stateblock *stateblock) if (!refcount) { - state_cleanup(&stateblock->state); wined3d_stateblock_state_cleanup(&stateblock->stateblock_state); heap_free(stateblock); } @@ -1557,7 +1556,6 @@ static HRESULT stateblock_init(struct wined3d_stateblock *stateblock, stateblock->ref = 1; stateblock->device = device; - state_init(&stateblock->state, NULL, d3d_info, 0); wined3d_stateblock_state_init(&stateblock->stateblock_state, device, 0); if (type == WINED3D_SBT_RECORDED) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fbde36c..57df9f1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3604,7 +3604,6 @@ struct wined3d_stateblock /* Array indicating whether things have been set or changed */ struct wined3d_saved_states changed; - struct wined3d_state state; struct wined3d_stateblock_state stateblock_state; /* Contained state management */

1 0

Jacek Caban : mshtml: Expose nsIFormPOSTActionChannel interface from nsChannel object.
by Alexandre Julliard 15 Feb '19

15 Feb '19

Module: wine Branch: master Commit: 317d8c1674945fc8716ca78716368626035dca4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=317d8c1674945fc8716ca787… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 15 17:11:23 2019 +0100 mshtml: Expose nsIFormPOSTActionChannel interface from nsChannel object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsiface.idl | 9 +++++++++ dlls/mshtml/nsio.c | 3 +++ 2 files changed, 12 insertions(+) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index b3335ba..2584697 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -723,6 +723,15 @@ interface nsIUploadChannel : nsISupports [ object, + uuid(fc826b53-0db8-42b4-aa6a-5dd2cfca52a4), + local +] +interface nsIFormPOSTActionChannel : nsIUploadChannel +{ +} + +[ + object, uuid(8d171460-a716-41f1-92be-8c659db39b45), local ] diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index d5e4983..63038d2 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -540,6 +540,9 @@ static nsresult NSAPI nsChannel_QueryInterface(nsIHttpChannel *iface, nsIIDRef r }else if(IsEqualGUID(&IID_nsIUploadChannel, riid)) { TRACE("(%p)->(IID_nsIUploadChannel %p)\n", This, result); *result = &This->nsIUploadChannel_iface; + }else if(IsEqualGUID(&IID_nsIFormPOSTActionChannel, riid)) { + TRACE("(%p)->(IID_nsIFormPOSTActionChannel %p)\n", This, result); + *result = &This->nsIUploadChannel_iface; }else if(IsEqualGUID(&IID_nsIHttpChannelInternal, riid)) { TRACE("(%p)->(IID_nsIHttpChannelInternal %p)\n", This, result); *result = is_http_channel(This) ? &This->nsIHttpChannelInternal_iface : NULL;

1 0

Aric Stewart : configure: Use SDL2_LIBS if set.
by Alexandre Julliard 15 Feb '19

15 Feb '19

Module: wine Branch: master Commit: 967e2622fbcb830f88b636c613afa95c5cecd97e URL: https://source.winehq.org/git/wine.git/?a=commit;h=967e2622fbcb830f88b636c6… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Feb 15 10:53:51 2019 -0600 configure: Use SDL2_LIBS if set. Fix by Andrew Eikum. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 7f89b1e..87ebf3c 100755 --- a/configure +++ b/configure @@ -13925,7 +13925,7 @@ if ${ac_cv_lib_soname_SDL2+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_soname_save_LIBS=$LIBS -LIBS="-lSDL2 $LIBS" +LIBS="-lSDL2 $SDL2_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ diff --git a/configure.ac b/configure.ac index 36add65..60f8acc 100644 --- a/configure.ac +++ b/configure.ac @@ -1629,7 +1629,7 @@ if test "x$with_sdl" != "xno" then WINE_PACKAGE_FLAGS(SDL2,[sdl2],[-lSDL2],,, [AC_CHECK_HEADERS([SDL2/SDL.h], - [WINE_CHECK_SONAME(SDL2,SDL_Init,,,,[[libSDL2-2.0*]])])]) + [WINE_CHECK_SONAME(SDL2,SDL_Init,,,[$SDL2_LIBS],[[libSDL2-2.0*]])])]) fi WINE_NOTICE_WITH(sdl,[test "x$ac_cv_lib_soname_SDL2" = "x"], [libSDL2 ${notice_platform}development files not found, SDL2 won't be supported.])

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

Zebediah Figura : hid: Scale from logical t 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 : 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 : 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