May 2019 - Wine-commits - list.winehq.org

Nikolay Sivov : mfplat: Implement IsEndOfStream() for file stream.
by Alexandre Julliard 06 May '19

06 May '19

Module: wine Branch: master Commit: 52f374ad50b1ab9431c0ef7f913afc283a389827 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52f374ad50b1ab9431c0ef7f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 6 13:52:18 2019 +0300 mfplat: Implement IsEndOfStream() for file stream. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 0e21497..61521ce 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -2648,16 +2648,25 @@ static HRESULT WINAPI mfbytestream_SetCurrentPosition(IMFByteStream *iface, QWOR return E_NOTIMPL; } -static HRESULT WINAPI mfbytestream_IsEndOfStream(IMFByteStream *iface, BOOL *endstream) +static HRESULT WINAPI bytestream_file_IsEndOfStream(IMFByteStream *iface, BOOL *ret) { - mfbytestream *This = impl_from_IMFByteStream(iface); + struct bytestream *stream = impl_from_IMFByteStream(iface); + LARGE_INTEGER position, length; + HRESULT hr = S_OK; - FIXME("%p, %p\n", This, endstream); + TRACE("%p, %p.\n", iface, ret); - if(endstream) - *endstream = TRUE; + EnterCriticalSection(&stream->cs); - return S_OK; + position.QuadPart = 0; + if (SetFilePointerEx(stream->hfile, position, &length, FILE_END)) + *ret = stream->position >= length.QuadPart; + else + hr = HRESULT_FROM_WIN32(GetLastError()); + + LeaveCriticalSection(&stream->cs); + + return hr; } static HRESULT WINAPI bytestream_file_Read(IMFByteStream *iface, BYTE *buffer, ULONG size, ULONG *read_len) @@ -2771,7 +2780,7 @@ static const IMFByteStreamVtbl bytestream_file_vtbl = mfbytestream_SetLength, mfbytestream_GetCurrentPosition, mfbytestream_SetCurrentPosition, - mfbytestream_IsEndOfStream, + bytestream_file_IsEndOfStream, bytestream_file_Read, bytestream_BeginRead, bytestream_EndRead,

1 0

Piotr Caban : hid: Add HidP_SetUsages implementation.
by Alexandre Julliard 06 May '19

06 May '19

Module: wine Branch: master Commit: c5d704334fc1f179900a4e1c4433f5ccbbc0541f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5d704334fc1f179900a4e1c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 3 11:59:02 2019 +0200 hid: Add HidP_SetUsages implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hid.spec | 2 +- dlls/hid/hidp.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index 5714d6c..b50e04d 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -38,7 +38,7 @@ @ stub HidP_SetScaledUsageValue @ stdcall HidP_SetUsageValue(long long long long long ptr ptr long) @ stub HidP_SetUsageValueArray -@ stub HidP_SetUsages +@ stdcall HidP_SetUsages(long long long ptr ptr ptr ptr long) @ stdcall HidP_TranslateUsagesToI8042ScanCodes(ptr long long ptr ptr ptr) @ stub HidP_UnsetUsages @ stub HidP_UsageListDifference diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 7c58426..e4d4820 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -616,6 +616,38 @@ NTSTATUS WINAPI HidP_SetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, } +NTSTATUS WINAPI HidP_SetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, + PUSAGE UsageList, PULONG UsageLength, PHIDP_PREPARSED_DATA PreparsedData, + PCHAR Report, ULONG ReportLength) +{ + WINE_HID_ELEMENT *element; + NTSTATUS rc; + ULONG i; + + TRACE("(%i, %x, %i, %p, %p, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, UsageList, + UsageLength, PreparsedData, Report, ReportLength); + + for (i = 0; i < *UsageLength; i++) + { + rc = find_value(ReportType, UsagePage, LinkCollection, + UsageList[i], PreparsedData, Report, &element); + if (rc == HIDP_STATUS_SUCCESS) + { + rc = set_report_data((BYTE*)Report, ReportLength, + element->valueStartBit, element->bitCount, -1); + + if (rc != HIDP_STATUS_SUCCESS) + { + *UsageLength = i; + return rc; + } + } + } + + return HIDP_STATUS_SUCCESS; +} + + NTSTATUS WINAPI HidP_TranslateUsagesToI8042ScanCodes(USAGE *ChangedUsageList, ULONG UsageListLength, HIDP_KEYBOARD_DIRECTION KeyAction, HIDP_KEYBOARD_MODIFIER_STATE *ModifierState,

1 0

Piotr Caban : hid: Add support for ranges in find_value.
by Alexandre Julliard 06 May '19

06 May '19

Module: wine Branch: master Commit: 6249de6e5d3e5f781a023e925c59672f1a3171d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6249de6e5d3e5f781a023e92… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 3 11:59:06 2019 +0200 hid: Add support for ranges in find_value. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index e4d4820..bfdc888 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -199,7 +199,7 @@ NTSTATUS WINAPI HidP_GetCaps(PHIDP_PREPARSED_DATA PreparsedData, static NTSTATUS find_value(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, - WINE_HID_ELEMENT **element) + WINE_HID_ELEMENT *element) { PWINE_HIDP_PREPARSED_DATA data = (PWINE_HIDP_PREPARSED_DATA)PreparsedData; WINE_HID_REPORT *report = NULL; @@ -247,11 +247,22 @@ static NTSTATUS find_value(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT for (i = 0; i < report->elementCount; i++) { - if (report->Elements[i].ElementType == ValueElement && - report->Elements[i].caps.value.UsagePage == UsagePage && - report->Elements[i].caps.value.u.NotRange.Usage == Usage) + HIDP_VALUE_CAPS *value = &report->Elements[i].caps.value; + + if (report->Elements[i].ElementType != ValueElement || + value->UsagePage != UsagePage) + continue; + + if (value->IsRange && value->u.Range.UsageMin <= Usage && Usage <= value->u.Range.UsageMax) + { + *element = report->Elements[i]; + element->valueStartBit += value->BitSize * (Usage - value->u.Range.UsageMin); + element->bitCount = value->BitSize; + return HIDP_STATUS_SUCCESS; + } + else if (report->Elements[i].caps.value.u.NotRange.Usage == Usage) { - *element = &report->Elements[i]; + *element = report->Elements[i]; return HIDP_STATUS_SUCCESS; } } @@ -289,7 +300,7 @@ NTSTATUS WINAPI HidP_GetScaledUsageValue(HIDP_REPORT_TYPE ReportType, USAGE Usag PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength) { NTSTATUS rc; - WINE_HID_ELEMENT *element; + WINE_HID_ELEMENT element; TRACE("(%i, %x, %i, %i, %p, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, Usage, UsageValue, PreparsedData, Report, ReportLength); @@ -299,10 +310,10 @@ NTSTATUS WINAPI HidP_GetScaledUsageValue(HIDP_REPORT_TYPE ReportType, USAGE Usag { ULONG rawValue; rc = get_report_data((BYTE*)Report, ReportLength, - element->valueStartBit, element->bitCount, &rawValue); + element.valueStartBit, element.bitCount, &rawValue); if (rc != HIDP_STATUS_SUCCESS) return rc; - *UsageValue = logical_to_physical(sign_extend(rawValue, element), element); + *UsageValue = logical_to_physical(sign_extend(rawValue, &element), &element); } return rc; @@ -313,7 +324,7 @@ NTSTATUS WINAPI HidP_GetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USAGE Usage, PULONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength) { - WINE_HID_ELEMENT *element; + WINE_HID_ELEMENT element; NTSTATUS rc; TRACE("(%i, %x, %i, %i, %p, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, Usage, UsageValue, @@ -324,7 +335,7 @@ NTSTATUS WINAPI HidP_GetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, if (rc == HIDP_STATUS_SUCCESS) { return get_report_data((BYTE*)Report, ReportLength, - element->valueStartBit, element->bitCount, UsageValue); + element.valueStartBit, element.bitCount, UsageValue); } return rc; @@ -598,7 +609,7 @@ NTSTATUS WINAPI HidP_SetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USAGE Usage, ULONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, CHAR *Report, ULONG ReportLength) { - WINE_HID_ELEMENT *element; + WINE_HID_ELEMENT element; NTSTATUS rc; TRACE("(%i, %x, %i, %i, %i, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, Usage, UsageValue, @@ -609,7 +620,7 @@ NTSTATUS WINAPI HidP_SetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, if (rc == HIDP_STATUS_SUCCESS) { return set_report_data((BYTE*)Report, ReportLength, - element->valueStartBit, element->bitCount, UsageValue); + element.valueStartBit, element.bitCount, UsageValue); } return rc; @@ -620,7 +631,7 @@ NTSTATUS WINAPI HidP_SetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USH PUSAGE UsageList, PULONG UsageLength, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength) { - WINE_HID_ELEMENT *element; + WINE_HID_ELEMENT element; NTSTATUS rc; ULONG i; @@ -634,7 +645,7 @@ NTSTATUS WINAPI HidP_SetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USH if (rc == HIDP_STATUS_SUCCESS) { rc = set_report_data((BYTE*)Report, ReportLength, - element->valueStartBit, element->bitCount, -1); + element.valueStartBit, element.bitCount, -1); if (rc != HIDP_STATUS_SUCCESS) {

1 0

Piotr Caban : hid: Only set first usage in an array in HidP_SetUsageValue.
by Alexandre Julliard 06 May '19

06 May '19

Module: wine Branch: master Commit: 028e1ee3db8232c5e92533dda99e936cd694b3d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=028e1ee3db8232c5e92533dd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 3 11:59:13 2019 +0200 hid: Only set first usage in an array in HidP_SetUsageValue. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index bfdc888..2c4e98a 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -263,6 +263,7 @@ static NTSTATUS find_value(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT else if (report->Elements[i].caps.value.u.NotRange.Usage == Usage) { *element = report->Elements[i]; + element->bitCount = value->BitSize; return HIDP_STATUS_SUCCESS; } }

1 0

Piotr Caban : hidclass.sys: Set LinkCollection field in build_elements function.
by Alexandre Julliard 06 May '19

06 May '19

Module: wine Branch: master Commit: 5c01898c9d07c8bafbfa5a527d5181ef843c61bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c01898c9d07c8bafbfa5a52… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 3 12:00:28 2019 +0200 hidclass.sys: Set LinkCollection field in build_elements function. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 09f9401..90ba3d1 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -713,6 +713,7 @@ static void build_elements(WINE_HID_REPORT *wine_report, struct feature* feature wine_element->caps.button.UsagePage = feature->caps.UsagePage; wine_element->caps.button.ReportID = feature->caps.ReportID; wine_element->caps.button.BitField = feature->BitField; + wine_element->caps.button.LinkCollection = feature->collection->index; wine_element->caps.button.IsRange = feature->caps.IsRange; wine_element->caps.button.IsStringRange = feature->caps.IsStringRange; wine_element->caps.button.IsDesignatorRange = feature->caps.IsDesignatorRange; @@ -748,6 +749,7 @@ static void build_elements(WINE_HID_REPORT *wine_report, struct feature* feature wine_element->caps.value.UsagePage = feature->caps.UsagePage; wine_element->caps.value.ReportID = feature->caps.ReportID; wine_element->caps.value.BitField = feature->BitField; + wine_element->caps.value.LinkCollection = feature->collection->index; wine_element->caps.value.IsRange = feature->caps.IsRange; wine_element->caps.value.IsStringRange = feature->caps.IsStringRange; wine_element->caps.value.IsDesignatorRange = feature->caps.IsDesignatorRange;

1 0

Piotr Caban : hidclass.sys: Set LinkUsagePage field in build_elements function.
by Alexandre Julliard 06 May '19

06 May '19

Module: wine Branch: master Commit: 31cd586c8cfc679441be2e3e54735df1c6b46fa1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31cd586c8cfc679441be2e3e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 3 12:00:38 2019 +0200 hidclass.sys: Set LinkUsagePage field in build_elements function. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 90ba3d1..adf9a98 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -714,6 +714,7 @@ static void build_elements(WINE_HID_REPORT *wine_report, struct feature* feature wine_element->caps.button.ReportID = feature->caps.ReportID; wine_element->caps.button.BitField = feature->BitField; wine_element->caps.button.LinkCollection = feature->collection->index; + wine_element->caps.button.LinkUsagePage = feature->collection->caps.UsagePage; wine_element->caps.button.IsRange = feature->caps.IsRange; wine_element->caps.button.IsStringRange = feature->caps.IsStringRange; wine_element->caps.button.IsDesignatorRange = feature->caps.IsDesignatorRange; @@ -750,6 +751,7 @@ static void build_elements(WINE_HID_REPORT *wine_report, struct feature* feature wine_element->caps.value.ReportID = feature->caps.ReportID; wine_element->caps.value.BitField = feature->BitField; wine_element->caps.value.LinkCollection = feature->collection->index; + wine_element->caps.value.LinkUsagePage = feature->collection->caps.UsagePage; wine_element->caps.value.IsRange = feature->caps.IsRange; wine_element->caps.value.IsStringRange = feature->caps.IsStringRange; wine_element->caps.value.IsDesignatorRange = feature->caps.IsDesignatorRange;

1 0

Piotr Caban : hidclass.sys: Set LinkUsage field in build_elements function.
by Alexandre Julliard 06 May '19

06 May '19

Module: wine Branch: master Commit: 37d129e8fe21c8b1c86ba7f61b61e87ca1268169 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37d129e8fe21c8b1c86ba7f6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 3 12:00:43 2019 +0200 hidclass.sys: Set LinkUsage field in build_elements function. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index adf9a98..279d8dd 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -714,6 +714,7 @@ static void build_elements(WINE_HID_REPORT *wine_report, struct feature* feature wine_element->caps.button.ReportID = feature->caps.ReportID; wine_element->caps.button.BitField = feature->BitField; wine_element->caps.button.LinkCollection = feature->collection->index; + wine_element->caps.button.LinkUsage = feature->collection->caps.u.NotRange.Usage[0]; wine_element->caps.button.LinkUsagePage = feature->collection->caps.UsagePage; wine_element->caps.button.IsRange = feature->caps.IsRange; wine_element->caps.button.IsStringRange = feature->caps.IsStringRange; @@ -751,6 +752,7 @@ static void build_elements(WINE_HID_REPORT *wine_report, struct feature* feature wine_element->caps.value.ReportID = feature->caps.ReportID; wine_element->caps.value.BitField = feature->BitField; wine_element->caps.value.LinkCollection = feature->collection->index; + wine_element->caps.value.LinkUsage = feature->collection->caps.u.NotRange.Usage[0]; wine_element->caps.value.LinkUsagePage = feature->collection->caps.UsagePage; wine_element->caps.value.IsRange = feature->caps.IsRange; wine_element->caps.value.IsStringRange = feature->caps.IsStringRange;

1 0

Piotr Caban : hidclass.sys: Treat all one-bit fields as buttons.
by Alexandre Julliard 06 May '19

06 May '19

Module: wine Branch: master Commit: 431637399820454daa3607a7f745a6884c38ea7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=431637399820454daa3607a7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 3 12:00:50 2019 +0200 hidclass.sys: Treat all one-bit fields as buttons. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 279d8dd..4686b71 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -707,7 +707,7 @@ static void build_elements(WINE_HID_REPORT *wine_report, struct feature* feature WINE_HID_ELEMENT *wine_element = &wine_report->Elements[wine_report->elementCount]; wine_element->valueStartBit = *bitOffset; - if (feature->caps.UsagePage == HID_USAGE_PAGE_BUTTON) + if (feature->caps.BitSize == 1) { wine_element->ElementType = ButtonElement; wine_element->caps.button.UsagePage = feature->caps.UsagePage; @@ -809,7 +809,7 @@ static void build_elements(WINE_HID_REPORT *wine_report, struct feature* feature static void count_elements(struct feature* feature, USHORT *buttons, USHORT *values) { - if (feature->caps.UsagePage == HID_USAGE_PAGE_BUTTON) + if (feature->caps.BitSize == 1) { if (feature->caps.IsRange) *buttons = *buttons + 1;

1 0

Alistair Leslie-Hughes : dinput: Use a helper function to get device type.
by Alexandre Julliard 06 May '19

06 May '19

Module: wine Branch: master Commit: 1daeef73325e9d35073231baf874600050126c7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1daeef73325e9d35073231ba… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon May 6 01:58:55 2019 +0000 dinput: Use a helper function to get device type. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_private.h | 1 + dlls/dinput/joystick.c | 6 ++++++ dlls/dinput/joystick_linux.c | 6 +----- dlls/dinput/joystick_linuxinput.c | 6 +----- dlls/dinput/joystick_osx.c | 12 ++---------- 5 files changed, 11 insertions(+), 20 deletions(-) diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index acda6c8..c97a493 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -81,6 +81,7 @@ extern void _copy_diactionformatWtoA(LPDIACTIONFORMATA, LPDIACTIONFORMATW) DECLS extern HRESULT _configure_devices(IDirectInput8W *iface, LPDICONFIGUREDEVICESCALLBACK lpdiCallback, LPDICONFIGUREDEVICESPARAMSW lpdiCDParams, DWORD dwFlags, LPVOID pvRefData) DECLSPEC_HIDDEN; extern WCHAR* get_mapping_path(const WCHAR *device, const WCHAR *username) DECLSPEC_HIDDEN; +extern DWORD get_device_type(DWORD version) DECLSPEC_HIDDEN; #define IS_DIPROP(x) (((ULONG_PTR)(x) >> 16) == 0) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 0ec1ceb..9240ba3 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -76,6 +76,12 @@ DWORD typeFromGUID(REFGUID guid) } } +DWORD get_device_type(DWORD version) +{ + return version >= 0x0800 ? DI8DEVTYPE_GAMEPAD | (DI8DEVTYPEJOYSTICK_STANDARD << 8) : + DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_GAMEPAD << 8); +} + static void _dump_DIEFFECT_flags(DWORD dwFlags) { if (TRACE_ON(dinput)) { diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index f93fc2f..fb1b878 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -322,11 +322,7 @@ static void fill_joystick_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD ver lpddi->guidInstance = DInput_Wine_Joystick_GUID; lpddi->guidInstance.Data3 = id; lpddi->guidProduct = joystick_devices[id].guid_product; - /* we only support traditional joysticks for now */ - if (version >= 0x0800) - lpddi->dwDevType = DI8DEVTYPE_GAMEPAD | (DI8DEVTYPEJOYSTICK_STANDARD << 8); - else - lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_GAMEPAD << 8); + lpddi->dwDevType = get_device_type(version); /* Assume the joystick as HID if it is attached to USB bus and has a valid VID/PID */ if (joystick_devices[id].bus_type == BUS_USB && diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 320696f..bc3c4de 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -350,11 +350,7 @@ static void fill_joystick_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD ver lpddi->guidInstance = joydevs[id].guid; lpddi->guidProduct = joydevs[id].guid_product; lpddi->guidFFDriver = GUID_NULL; - - if (version >= 0x0800) - lpddi->dwDevType = DI8DEVTYPE_GAMEPAD | (DI8DEVTYPEJOYSTICK_STANDARD << 8); - else - lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_GAMEPAD << 8); + lpddi->dwDevType = get_device_type(version); /* Assume the joystick as HID if it is attached to USB bus and has a valid VID/PID */ if (joydevs[id].bus_type == BUS_USB && diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index daef1a1..cb88b2f 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -967,11 +967,7 @@ static HRESULT joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS lpddi->guidInstance.Data3 = id; lpddi->guidProduct = DInput_Wine_OsX_Joystick_GUID; lpddi->guidProduct.Data1 = make_vid_pid(device); - /* we only support traditional joysticks for now */ - if (version >= 0x0800) - lpddi->dwDevType = DI8DEVTYPE_GAMEPAD | (DI8DEVTYPEJOYSTICK_STANDARD << 8); - else - lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_GAMEPAD << 8); + lpddi->dwDevType = get_device_type(version); lpddi->dwDevType |= DIDEVTYPE_HID; lpddi->wUsagePage = 0x01; /* Desktop */ lpddi->wUsage = 0x05; /* Game Pad */ @@ -1014,11 +1010,7 @@ static HRESULT joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS lpddi->guidInstance.Data3 = id; lpddi->guidProduct = DInput_Wine_OsX_Joystick_GUID; lpddi->guidProduct.Data1 = make_vid_pid(device); - /* we only support traditional joysticks for now */ - if (version >= 0x0800) - lpddi->dwDevType = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8); - else - lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8); + lpddi->dwDevType = get_device_type(version); sprintf(friendly, "Joystick %d", id); MultiByteToWideChar(CP_ACP, 0, friendly, -1, lpddi->tszInstanceName, MAX_PATH); /* get the device name */

1 0

Rafał Harabień : ntoskrnl.exe: Fix handling relocations on page boundary.
by Alexandre Julliard 06 May '19

06 May '19

Module: wine Branch: master Commit: 6c0a8c3592148759a26126bd48ec0cd053932223 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c0a8c3592148759a26126bd… Author: Rafał Harabień <rafalh92(a)outlook.com> Date: Sat May 4 13:55:53 2019 +0000 ntoskrnl.exe: Fix handling relocations on page boundary. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=28254 Signed-off-by: Rafał Harabień <rafalh92(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 111 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 89 insertions(+), 22 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index cf5cde9..86111b4 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3674,6 +3674,84 @@ static LDR_MODULE *find_ldr_module( HMODULE module ) return ldr; } +/* convert PE image VirtualAddress to Real Address */ +static inline void *get_rva( HMODULE module, DWORD va ) +{ + return (void *)((char *)module + va); +} + +/* Copied from ntdll with checks for page alignment and characteristics removed */ +static NTSTATUS perform_relocations( void *module, SIZE_T len ) +{ + IMAGE_NT_HEADERS *nt; + char *base; + IMAGE_BASE_RELOCATION *rel, *end; + const IMAGE_DATA_DIRECTORY *relocs; + const IMAGE_SECTION_HEADER *sec; + INT_PTR delta; + ULONG protect_old[96], i; + + nt = RtlImageNtHeader( module ); + base = (char *)nt->OptionalHeader.ImageBase; + + assert( module != base ); + + relocs = &nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC]; + + if (nt->FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED) + { + WARN( "Need to relocate module from %p to %p, but there are no relocation records\n", + base, module ); + return STATUS_CONFLICTING_ADDRESSES; + } + + if (!relocs->Size) return STATUS_SUCCESS; + if (!relocs->VirtualAddress) return STATUS_CONFLICTING_ADDRESSES; + + if (nt->FileHeader.NumberOfSections > ARRAY_SIZE( protect_old )) + return STATUS_INVALID_IMAGE_FORMAT; + + sec = (const IMAGE_SECTION_HEADER *)((const char *)&nt->OptionalHeader + + nt->FileHeader.SizeOfOptionalHeader); + for (i = 0; i < nt->FileHeader.NumberOfSections; i++) + { + void *addr = get_rva( module, sec[i].VirtualAddress ); + SIZE_T size = sec[i].SizeOfRawData; + NtProtectVirtualMemory( NtCurrentProcess(), &addr, + &size, PAGE_READWRITE, &protect_old[i] ); + } + + TRACE( "relocating from %p-%p to %p-%p\n", + base, base + len, module, (char *)module + len ); + + rel = get_rva( module, relocs->VirtualAddress ); + end = get_rva( module, relocs->VirtualAddress + relocs->Size ); + delta = (char *)module - base; + + while (rel < end - 1 && rel->SizeOfBlock) + { + if (rel->VirtualAddress >= len) + { + WARN( "invalid address %p in relocation %p\n", get_rva( module, rel->VirtualAddress ), rel ); + return STATUS_ACCESS_VIOLATION; + } + rel = LdrProcessRelocationBlock( get_rva( module, rel->VirtualAddress ), + (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), + (USHORT *)(rel + 1), delta ); + if (!rel) return STATUS_INVALID_IMAGE_FORMAT; + } + + for (i = 0; i < nt->FileHeader.NumberOfSections; i++) + { + void *addr = get_rva( module, sec[i].VirtualAddress ); + SIZE_T size = sec[i].SizeOfRawData; + NtProtectVirtualMemory( NtCurrentProcess(), &addr, + &size, protect_old[i], &protect_old[i] ); + } + + return STATUS_SUCCESS; +} + /* load the driver module file */ static HMODULE load_driver_module( const WCHAR *name ) { @@ -3683,6 +3761,8 @@ static HMODULE load_driver_module( const WCHAR *name ) int i; INT_PTR delta; ULONG size; + DWORD old; + NTSTATUS status; HMODULE module = LoadLibraryW( name ); if (!module) return NULL; @@ -3697,28 +3777,15 @@ static HMODULE load_driver_module( const WCHAR *name ) if (nt->OptionalHeader.SectionAlignment < info.PageSize || !(nt->FileHeader.Characteristics & IMAGE_FILE_DLL)) { - DWORD old; - IMAGE_BASE_RELOCATION *rel, *end; - - if ((rel = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_BASERELOC, &size ))) - { - TRACE( "%s: relocating from %p to %p\n", wine_dbgstr_w(name), (char *)module - delta, module ); - end = (IMAGE_BASE_RELOCATION *)((char *)rel + size); - while (rel < end && rel->SizeOfBlock) - { - void *page = (char *)module + rel->VirtualAddress; - VirtualProtect( page, info.PageSize, PAGE_EXECUTE_READWRITE, &old ); - rel = LdrProcessRelocationBlock( page, (rel->SizeOfBlock - sizeof(*rel)) / sizeof(USHORT), - (USHORT *)(rel + 1), delta ); - if (old != PAGE_EXECUTE_READWRITE) VirtualProtect( page, info.PageSize, old, &old ); - if (!rel) goto error; - } - /* make sure we don't try again */ - size = FIELD_OFFSET( IMAGE_NT_HEADERS, OptionalHeader ) + nt->FileHeader.SizeOfOptionalHeader; - VirtualProtect( nt, size, PAGE_READWRITE, &old ); - nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress = 0; - VirtualProtect( nt, size, old, &old ); - } + status = perform_relocations(module, nt->OptionalHeader.SizeOfImage); + if (status != STATUS_SUCCESS) + goto error; + + /* make sure we don't try again */ + size = FIELD_OFFSET( IMAGE_NT_HEADERS, OptionalHeader ) + nt->FileHeader.SizeOfOptionalHeader; + VirtualProtect( nt, size, PAGE_READWRITE, &old ); + nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].Size = 0; + VirtualProtect( nt, size, old, &old ); } /* make sure imports are relocated too */

1 0