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

[PATCH] dinput: Increase MAX_JOYDEV to 1024.
by Noor Schat 21 May '19

21 May '19

As defined in drivers/input/input.c in the linux kernel, the highest number an evdev node can get assigned is 1023. Signed-off-by: Noor Schat <creeperlwd(a)gmail.com> --- dlls/dinput/joystick_linuxinput.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index e4f5db848c..f6b0331f1a 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -179,7 +179,7 @@ static const GUID DInput_Wine_Joystick_Constant_Part_GUID = { #define test_bit(arr,bit) (((BYTE*)(arr))[(bit)>>3]&(1<<((bit)&7))) -#define MAX_JOYDEV 64 +#define MAX_JOYDEV 1024 static int have_joydevs = -1; static struct JoyDev *joydevs = NULL; -- 2.21.0

1 0

[PATCH] crypt32/tests: Fix some memory leaks (Valgrind).
by Gijs Vermeulen 21 May '19

21 May '19

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/crypt32/tests/cert.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index e4f4c59c76..880ae720a4 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -1736,6 +1736,7 @@ static void testGetIssuerCert(void) CertFreeCertificateContext(child); CertFreeCertificateContext(cert1); CertFreeCertificateContext(cert2); + CertFreeCertificateContext(cert3); CertCloseStore(store, 0); HeapFree(GetProcessHeap(), 0, certencoded); @@ -1750,6 +1751,7 @@ static void testGetIssuerCert(void) ok(!parent, "Expected NULL\n"); ok(GetLastError() == CRYPT_E_SELF_SIGNED, "Expected CRYPT_E_SELF_SIGNED, got %08X\n", GetLastError()); + CertFreeCertificateContext(cert1); CertCloseStore(store, 0); } -- 2.21.0

1 0

[PATCH] hid: Fix usage value mask
by Andrew Eikum 21 May '19

21 May '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47223 Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/hid/hidp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 8c046703b40..c780dbe2d30 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -64,7 +64,7 @@ static NTSTATUS get_report_data(BYTE *report, INT reportLength, INT startBit, IN if (remaining_bits < copy_bits) copy_bits = remaining_bits; - data |= ((report[byte_index] >> bit_index) & ((2 << copy_bits) - 1)) << shift; + data |= ((report[byte_index] >> bit_index) & ((1 << copy_bits) - 1)) << shift; shift += copy_bits; bit_index = 0; -- 2.21.0

2 1

[PATCH 1/7] setupapi: Add an initial implementation of SetupDiBuildDriverInfoList().
by Zebediah Figura 21 May '19

21 May '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/devinst.c | 120 ++++++++++++++++++++++++++++++++++++++++ dlls/setupapi/stubs.c | 12 ---- 2 files changed, 120 insertions(+), 12 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 32bcd0ed39..2d7cb99590 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -103,6 +103,13 @@ static const WCHAR Control[] = {'C','o','n','t','r','o','l',0}; static const WCHAR Linked[] = {'L','i','n','k','e','d',0}; static const WCHAR emptyW[] = {0}; +struct driver +{ + WCHAR inf_path[MAX_PATH]; + WCHAR manufacturer[LINE_LEN]; + WCHAR description[LINE_LEN]; +}; + /* is used to identify if a DeviceInfoSet pointer is valid or not */ #define SETUP_DEVICE_INFO_SET_MAGIC 0xd00ff056 @@ -127,6 +134,9 @@ struct device struct list entry; BOOL removed; SP_DEVINSTALL_PARAMS_W params; + struct driver *drivers; + unsigned int driver_count; + struct driver *selected_driver; }; struct device_iface @@ -4113,3 +4123,113 @@ BOOL WINAPI SetupDiRegisterCoDeviceInstallers(HDEVINFO dev, PSP_DEVINFO_DATA inf SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/* Check whether the given hardware or compatible ID matches any of the device's + * own hardware or compatible IDs. */ +static BOOL device_matches_id(const struct device *device, const WCHAR *id_type, const WCHAR *id) +{ + WCHAR *device_ids; + const WCHAR *p; + DWORD size; + + if (!RegGetValueW(device->key, NULL, id_type, RRF_RT_REG_MULTI_SZ, NULL, NULL, &size)) + { + device_ids = heap_alloc(size); + if (!RegGetValueW(device->key, NULL, id_type, RRF_RT_REG_MULTI_SZ, NULL, device_ids, &size)) + { + for (p = device_ids; *p; p += strlenW(p) + 1) + { + if (!strcmpiW(p, id)) + { + heap_free(device_ids); + return TRUE; + } + } + } + heap_free(device_ids); + } + + return FALSE; +} + +static void enum_compat_drivers_from_file(struct device *device, const WCHAR *path) +{ + static const WCHAR manufacturerW[] = {'M','a','n','u','f','a','c','t','u','r','e','r',0}; + WCHAR mfg_name[LINE_LEN], mfg_key[LINE_LEN], mfg_key_ext[LINE_LEN], id[MAX_DEVICE_ID_LEN]; + INFCONTEXT ctx; + DWORD i, j, k; + HINF hinf; + + TRACE("Enumerating drivers from %s.\n", debugstr_w(path)); + + if ((hinf = SetupOpenInfFileW(path, NULL, INF_STYLE_WIN4, NULL)) == INVALID_HANDLE_VALUE) + return; + + for (i = 0; SetupGetLineByIndexW(hinf, manufacturerW, i, &ctx); ++i) + { + SetupGetStringFieldW(&ctx, 0, mfg_name, ARRAY_SIZE(mfg_name), NULL); + if (!SetupGetStringFieldW(&ctx, 1, mfg_key, ARRAY_SIZE(mfg_key), NULL)) + strcpyW(mfg_key, mfg_name); + + if (!SetupDiGetActualSectionToInstallW(hinf, mfg_key, mfg_key_ext, ARRAY_SIZE(mfg_key_ext), NULL, NULL)) + { + WARN("Failed to find section for %s, skipping.\n", debugstr_w(mfg_key)); + continue; + } + + for (j = 0; SetupGetLineByIndexW(hinf, mfg_key_ext, j, &ctx); ++j) + { + for (k = 2; SetupGetStringFieldW(&ctx, k, id, ARRAY_SIZE(id), NULL); ++k) + { + if (device_matches_id(device, HardwareId, id) || device_matches_id(device, CompatibleIDs, id)) + { + unsigned int count = ++device->driver_count; + + device->drivers = heap_realloc(device->drivers, count * sizeof(*device->drivers)); + strcpyW(device->drivers[count - 1].inf_path, path); + strcpyW(device->drivers[count - 1].manufacturer, mfg_name); + SetupGetStringFieldW(&ctx, 0, device->drivers[count - 1].description, + ARRAY_SIZE(device->drivers[count - 1].description), NULL); + + TRACE("Found compatible driver: manufacturer %s, desc %s.\n", + debugstr_w(mfg_name), debugstr_w(device->drivers[count - 1].description)); + } + } + } + } + + SetupCloseInfFile(hinf); +} + +/*********************************************************************** + * SetupDiBuildDriverInfoList (SETUPAPI.@) + */ +BOOL WINAPI SetupDiBuildDriverInfoList(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, DWORD type) +{ + struct device *device; + + TRACE("devinfo %p, device_data %p, type %#x.\n", devinfo, device_data, type); + + if (type != SPDIT_COMPATDRIVER) + { + FIXME("Unhandled type %#x.\n", type); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; + } + + if (!(device = get_device(devinfo, device_data))) + return FALSE; + + if (device->params.Flags & DI_ENUMSINGLEINF) + { + enum_compat_drivers_from_file(device, device->params.DriverPath); + } + else + { + FIXME("Searching in a directory is not yet implemented.\n"); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; + } + + return TRUE; +} diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index ede878f1de..1be10ced39 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -575,18 +575,6 @@ BOOL WINAPI SetupLogFileA( return FALSE; } -/*********************************************************************** - * SetupDiBuildDriverInfoList (SETUPAPI.@) - */ - -BOOL WINAPI SetupDiBuildDriverInfoList(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, DWORD DriverType) - { - FIXME(": stub %p, %p, %d\n", DeviceInfoSet, DeviceInfoData, DriverType); - - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; - } - /*********************************************************************** * SetupDiDestroyDriverInfoList (SETUPAPI.@) */ -- 2.21.0

2 9

[PATCH 3/3] libwine: Ignore 0 weights as described in Unicode collation algorithm.
by Piotr Caban 21 May '19

21 May '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/kernel32/tests/locale.c | 8 ++++---- libs/port/sortkey.c | 28 ++++++++++++++++++++++------ 2 files changed, 26 insertions(+), 10 deletions(-)

1 0

[PATCH 2/3] libwine: Decompose characters before comparing in wine_compare_string.
by Piotr Caban 21 May '19

21 May '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/kernel32/tests/locale.c | 24 +++++++++--------- libs/port/sortkey.c | 48 ++++++++++++++++++++++-------------- 2 files changed, 41 insertions(+), 31 deletions(-)

1 0

[PATCH 1/3] libwine: Add helper function to compare character weights.
by Piotr Caban 21 May '19

21 May '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- libs/port/sortkey.c | 169 ++++++++++---------------------------------- 1 file changed, 36 insertions(+), 133 deletions(-)

1 0

[PATCH 3/3] mshtml: Implement IOleInPlaceObjectWindowless::SetObjectRects.
by Jacek Caban 21 May '19

21 May '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/oleobj.c | 13 +++++++-- dlls/mshtml/tests/htmldoc.c | 56 +++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 3 deletions(-)

1 0

[PATCH 2/3] mshtml: Return rect relative to parent window in IOleDocumentView::GetRect.
by Jacek Caban 21 May '19

21 May '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/view.c | 1 + 1 file changed, 1 insertion(+)

1 0

[PATCH 1/3] mshtml: Fix window size in IOleDocumentView::SetRect implementation.
by Jacek Caban 21 May '19

21 May '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/view.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0