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

Piotr Caban : hidclass.sys: Treat all one-bit fields as buttons.
by Alexandre Julliard May 6, 2019

May 6, 2019

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

Andrew Eikum : winebus.sys: Fix some report descriptors.
by Alexandre Julliard May 6, 2019

May 6, 2019

Module: wine Branch: master Commit: 3039eeb72ebbe901a6c5fbc212616da77fc1e1ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=3039eeb72ebbe901a6c5fbc2… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 6 08:45:59 2019 -0500 winebus.sys: Fix some report descriptors. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 2 +- dlls/winebus.sys/controller.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index b774df7..724cd78 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -147,7 +147,7 @@ static const BYTE REPORT_AXIS_TAIL[] = { 0x95, 0x00, /* REPORT_COUNT (?) */ 0x81, 0x02, /* INPUT (Data,Var,Abs) */ }; -#define IDX_ABS_AXIS_COUNT 15 +#define IDX_ABS_AXIS_COUNT 23 static const BYTE CONTROLLER_BUTTONS[] = { 0x05, 0x09, /* USAGE_PAGE (Button) */ diff --git a/dlls/winebus.sys/controller.h b/dlls/winebus.sys/controller.h index 9546fe9..80e9c78 100644 --- a/dlls/winebus.sys/controller.h +++ b/dlls/winebus.sys/controller.h @@ -36,15 +36,15 @@ static const BYTE REPORT_BUTTONS[] = { 0x29, 0x03, /* USAGE_MAXIMUM (Button 3) */ 0x15, 0x00, /* LOGICAL_MINIMUM (0) */ 0x25, 0x01, /* LOGICAL_MAXIMUM (1) */ - 0x35, 0x00, /* LOGICAL_MINIMUM (0) */ - 0x45, 0x01, /* LOGICAL_MAXIMUM (1) */ + 0x35, 0x00, /* PHYSICAL_MINIMUM (0) */ + 0x45, 0x01, /* PHYSICAL_MAXIMUM (1) */ 0x95, 0x03, /* REPORT_COUNT (3) */ 0x75, 0x01, /* REPORT_SIZE (1) */ 0x81, 0x02, /* INPUT (Data,Var,Abs) */ }; #define IDX_BUTTON_MIN_USAGE 3 #define IDX_BUTTON_MAX_USAGE 5 -#define IDX_BUTTON_COUNT 11 +#define IDX_BUTTON_COUNT 15 static const BYTE REPORT_PADDING[] = { 0x95, 0x03, /* REPORT_COUNT (3) */

1 0

Andrew Eikum : winebus.sys: Fix udev report descriptor length.
by Alexandre Julliard May 6, 2019

May 6, 2019

Module: wine Branch: master Commit: 277822b3843898ff26e5c90735d0afd5c297349e URL: https://source.winehq.org/git/wine.git/?a=commit;h=277822b3843898ff26e5c907… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 6 08:46:03 2019 -0500 winebus.sys: Fix udev report descriptor length. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index e8e837a..a2c7240 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -422,11 +422,6 @@ static BOOL build_report_descriptor(struct wine_input_private *ext, struct udev_ abs_pages[ABS_TO_HID_MAP[i][0]][abs_pages[ABS_TO_HID_MAP[i][0]][0]] = i; ioctl(ext->base.device_fd, EVIOCGABS(i), &(ext->abs_map[i])); - if (abs_pages[ABS_TO_HID_MAP[i][0]][0] == 1) - { - descript_size += sizeof(REPORT_AXIS_HEADER); - descript_size += sizeof(REPORT_ABS_AXIS_TAIL); - } } /* Skip page 0, aka HID_USAGE_PAGE_UNDEFINED */ for (i = 1; i < TOP_ABS_PAGE; i++) @@ -441,6 +436,8 @@ static BOOL build_report_descriptor(struct wine_input_private *ext, struct udev_ } abs_count++; } + descript_size += sizeof(REPORT_AXIS_HEADER) * abs_count; + descript_size += sizeof(REPORT_ABS_AXIS_TAIL) * abs_count; rel_count = 0; memset(rel_pages, 0, sizeof(rel_pages)); @@ -449,11 +446,6 @@ static BOOL build_report_descriptor(struct wine_input_private *ext, struct udev_ { rel_pages[REL_TO_HID_MAP[i][0]][0]++; rel_pages[REL_TO_HID_MAP[i][0]][rel_pages[REL_TO_HID_MAP[i][0]][0]] = i; - if (rel_pages[REL_TO_HID_MAP[i][0]][0] == 1) - { - descript_size += sizeof(REPORT_AXIS_HEADER); - descript_size += sizeof(REPORT_REL_AXIS_TAIL); - } } /* Skip page 0, aka HID_USAGE_PAGE_UNDEFINED */ for (i = 1; i < TOP_REL_PAGE; i++) @@ -468,6 +460,8 @@ static BOOL build_report_descriptor(struct wine_input_private *ext, struct udev_ } rel_count++; } + descript_size += sizeof(REPORT_AXIS_HEADER) * rel_count; + descript_size += sizeof(REPORT_REL_AXIS_TAIL) * rel_count; hat_count = 0; for (i = ABS_HAT0X; i <=ABS_HAT3X; i+=2) @@ -479,6 +473,8 @@ static BOOL build_report_descriptor(struct wine_input_private *ext, struct udev_ report_size++; hat_count++; } + if (hat_count > 0) + descript_size += sizeof(REPORT_HATSWITCH); TRACE("Report Descriptor will be %i bytes\n", descript_size); TRACE("Report will be %i bytes\n", report_size);

1 0

Piotr Caban : hid: Add HidP_SetUsages implementation.
by Alexandre Julliard May 6, 2019

May 6, 2019

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

Alexandre Julliard : uninstaller: Explicitly mark a qsort() callback funtion cdecl.
by Alexandre Julliard May 6, 2019

May 6, 2019

Module: wine Branch: master Commit: 89cbab5d518fda590a5fb45a1bbd300b0bcb4c69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89cbab5d518fda590a5fb45a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 6 03:40:58 2019 -0500 uninstaller: Explicitly mark a qsort() callback funtion cdecl. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/uninstaller/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index fa9a23c..5e48306 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -46,7 +46,6 @@ static WCHAR *sFilter; static int FetchUninstallInformation(void); static void UninstallProgram(void); -static int cmp_by_name(const void *a, const void *b); static const WCHAR DisplayNameW[] = {'D','i','s','p','l','a','y','N','a','m','e',0}; static const WCHAR PathUninstallW[] = { @@ -233,7 +232,7 @@ int wmain(int argc, WCHAR *argv[]) /** * Used to sort entries by name. */ -static int cmp_by_name(const void *a, const void *b) +static int __cdecl cmp_by_name(const void *a, const void *b) { return lstrcmpiW(((const uninst_entry *)a)->descr, ((const uninst_entry *)b)->descr); }

1 0

Alexandre Julliard : winhttp/tests: Get a test file from the WineHQ tests subdirectory.
by Alexandre Julliard May 6, 2019

May 6, 2019

Module: wine Branch: master Commit: 4cc3ef939143118b226b4a2e9193776e3e2119d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4cc3ef939143118b226b4a2e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 6 03:41:14 2019 -0500 winhttp/tests: Get a test file from the WineHQ tests subdirectory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 3a28acf..dfd3c4d 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -4637,7 +4637,7 @@ static void test_WinHttpGetProxyForUrl(void) static void test_chunked_read(void) { - static const WCHAR verb[] = {'/','t','e','s','t','c','h','u','n','k','e','d',0}; + static const WCHAR verb[] = {'/','t','e','s','t','s','/','c','h','u','n','k','e','d',0}; static const WCHAR chunked[] = {'c','h','u','n','k','e','d',0}; WCHAR header[32]; DWORD len, err;

1 0

Alistair Leslie-Hughes : dinput: Don' t report that we cannot open a device.
by Alexandre Julliard May 6, 2019

May 6, 2019

Module: wine Branch: master Commit: b59f8c0c50586a28d99302dd2ff6213057abb596 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b59f8c0c50586a28d99302dd… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat May 4 05:30:49 2019 +0000 dinput: Don't report that we cannot open a device. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_linuxinput.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index cea669b..320696f 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -211,10 +211,7 @@ static void find_joydevs(void) } if (fd == -1) - { - WARN("Failed to open \"%s\": %d %s\n", buf, errno, strerror(errno)); continue; - } if (ioctl(fd, EVIOCGBIT(0, sizeof(joydev.evbits)), joydev.evbits) == -1) {

1 0

Alexandre Julliard : cmd: Explicitly mark qsort() callback funtions cdecl.
by Alexandre Julliard May 6, 2019

May 6, 2019

Module: wine Branch: master Commit: 7f0272a59ab0780086051e6396949fe784503837 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f0272a59ab0780086051e63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 6 03:40:25 2019 -0500 cmd: Explicitly mark qsort() callback funtions cdecl. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 2 +- programs/cmd/directory.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 5fc1921..62ae19a 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -3562,7 +3562,7 @@ void WCMD_setshow_date (void) { * Note: Native displays 'fred' before 'fred ', so need to only compare up to * the equals sign. */ -static int WCMD_compare( const void *a, const void *b ) +static int __cdecl WCMD_compare( const void *a, const void *b ) { int r; const WCHAR * const *str_a = a, * const *str_b = b; diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 02ea487..c38bdfc 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -101,7 +101,7 @@ static WCHAR * WCMD_filesize64 (ULONGLONG n) { * * Sort based on the /O options supplied on the command line */ -static int WCMD_dir_sort (const void *a, const void *b) +static int __cdecl WCMD_dir_sort (const void *a, const void *b) { const WIN32_FIND_DATAW *filea = (const WIN32_FIND_DATAW *)a; const WIN32_FIND_DATAW *fileb = (const WIN32_FIND_DATAW *)b;

1 0

Vijay Kiran Kamuju : wpcap: Fix compile warnings for redefinition of PCAP_OPENFLAG_PROMISCUOUS.
by Alexandre Julliard May 6, 2019

May 6, 2019

Module: wine Branch: master Commit: 660399b8fd905a208f192781723f7fe881b132fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=660399b8fd905a208f192781… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri May 3 18:49:48 2019 +0200 wpcap: Fix compile warnings for redefinition of PCAP_OPENFLAG_PROMISCUOUS. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wpcap/wpcap.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index f163235..6450a0e 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -254,7 +254,9 @@ int CDECL wine_pcap_next_ex(pcap_t *p, struct pcap_pkthdr **pkt_header, const un return pcap_next_ex(p, pkt_header, pkt_data); } +#ifndef PCAP_OPENFLAG_PROMISCUOUS #define PCAP_OPENFLAG_PROMISCUOUS 1 +#endif pcap_t* CDECL wine_pcap_open(const char *source, int snaplen, int flags, int read_timeout, void *auth, char *errbuf)

1 0

Vincent Povirk : mscoree: Accept old framework build in exe metadata.
by Alexandre Julliard May 6, 2019

May 6, 2019

Module: wine Branch: master Commit: 6ee29c048cbbd6291e672a0c9b4ecdf0f770673c URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ee29c048cbbd6291e672a0c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat May 4 13:25:58 2019 -0500 mscoree: Accept old framework build in exe metadata. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=27185 Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/metahost.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index b268acc..c740727 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -1723,11 +1723,35 @@ HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config_file, if (exefile && !version) { + DWORD major, minor, build; + hr = CLRMetaHost_GetVersionFromFile(0, exefile, local_version, &local_version_size); version = local_version; if (FAILED(hr)) return hr; + + /* When running an executable, specifically when getting the version number from + * the exe, native accepts a matching major.minor with build <= expected build. */ + if (!parse_runtime_version(version, &major, &minor, &build)) + { + ERR("Cannot parse %s\n", debugstr_w(version)); + return CLR_E_SHIM_RUNTIME; + } + + if (legacy) + i = 3; + else + i = NUM_RUNTIMES; + + while (i--) + { + if (runtimes[i].major == major && runtimes[i].minor == minor && runtimes[i].build >= build) + { + return ICLRRuntimeInfo_QueryInterface(&runtimes[i].ICLRRuntimeInfo_iface, + &IID_ICLRRuntimeInfo, (void **)result); + } + } } if (version)

1 0