April 2020 - Wine-commits - list.winehq.org

Jacek Caban : api-ms-win-core-localization: Update spec files.
by Alexandre Julliard 10 Apr '20

10 Apr '20

Module: wine Branch: master Commit: 0f9e17e3375e1743fee710f6abd6efbf4df36b97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f9e17e3375e1743fee710f6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 10 17:31:27 2020 +0200 api-ms-win-core-localization: Update spec files. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-localization-l1-1-0.spec | 4 ++-- .../api-ms-win-core-localization-l1-2-0.spec | 6 +++--- .../api-ms-win-core-localization-l1-2-1.spec | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/api-ms-win-core-localization-l1-1-0/api-ms-win-core-localization-l1-1-0.spec b/dlls/api-ms-win-core-localization-l1-1-0/api-ms-win-core-localization-l1-1-0.spec index 81db61b945..d689e6fac9 100644 --- a/dlls/api-ms-win-core-localization-l1-1-0/api-ms-win-core-localization-l1-1-0.spec +++ b/dlls/api-ms-win-core-localization-l1-1-0/api-ms-win-core-localization-l1-1-0.spec @@ -11,8 +11,8 @@ @ stdcall GetFileMUIPath(long wstr wstr ptr ptr ptr ptr) kernel32.GetFileMUIPath @ stdcall GetLocaleInfoEx(wstr long ptr long) kernel32.GetLocaleInfoEx @ stdcall GetLocaleInfoW(long long ptr long) kernel32.GetLocaleInfoW -@ stub GetNLSVersion -@ stub GetNLSVersionEx +@ stdcall GetNLSVersion(long long ptr) kernel32.GetNLSVersion +@ stdcall GetNLSVersionEx(long wstr ptr) kernel32.GetNLSVersionEx @ stdcall GetOEMCP() kernel32.GetOEMCP @ stdcall GetProcessPreferredUILanguages(long ptr ptr ptr) kernel32.GetProcessPreferredUILanguages @ stdcall GetSystemDefaultLCID() kernel32.GetSystemDefaultLCID diff --git a/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec b/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec index 94971021d8..b9efc3878a 100644 --- a/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec +++ b/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec @@ -17,8 +17,8 @@ @ stdcall GetLocaleInfoA(long long ptr long) kernel32.GetLocaleInfoA @ stdcall GetLocaleInfoEx(wstr long ptr long) kernel32.GetLocaleInfoEx @ stdcall GetLocaleInfoW(long long ptr long) kernel32.GetLocaleInfoW -@ stub GetNLSVersion -@ stub GetNLSVersionEx +@ stdcall GetNLSVersion(long long ptr) kernel32.GetNLSVersion +@ stdcall GetNLSVersionEx(long wstr ptr) kernel32.GetNLSVersionEx @ stdcall GetOEMCP() kernel32.GetOEMCP @ stdcall GetProcessPreferredUILanguages(long ptr ptr ptr) kernel32.GetProcessPreferredUILanguages @ stdcall GetSystemDefaultLCID() kernel32.GetSystemDefaultLCID @@ -42,7 +42,7 @@ @ stdcall IsValidLanguageGroup(long long) kernel32.IsValidLanguageGroup @ stdcall IsValidLocale(long long) kernel32.IsValidLocale @ stdcall IsValidLocaleName(wstr) kernel32.IsValidLocaleName -@ stub IsValidNLSVersion +@ stdcall IsValidNLSVersion(long wstr ptr) kernel32.IsValidNLSVersion @ stdcall LCMapStringA(long long str long ptr long) kernel32.LCMapStringA @ stdcall LCMapStringEx(wstr long wstr long ptr long ptr ptr long) kernel32.LCMapStringEx @ stdcall LCMapStringW(long long wstr long ptr long) kernel32.LCMapStringW diff --git a/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec b/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec index 9b5f70eb21..b14e69e070 100644 --- a/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec +++ b/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec @@ -18,8 +18,8 @@ @ stdcall GetLocaleInfoA(long long ptr long) kernel32.GetLocaleInfoA @ stdcall GetLocaleInfoEx(wstr long ptr long) kernel32.GetLocaleInfoEx @ stdcall GetLocaleInfoW(long long ptr long) kernel32.GetLocaleInfoW -@ stub GetNLSVersion -@ stub GetNLSVersionEx +@ stdcall GetNLSVersion(long long ptr) kernel32.GetNLSVersion +@ stdcall GetNLSVersionEx(long wstr ptr) kernel32.GetNLSVersionEx @ stdcall GetOEMCP() kernel32.GetOEMCP @ stdcall GetProcessPreferredUILanguages(long ptr ptr ptr) kernel32.GetProcessPreferredUILanguages @ stdcall GetSystemDefaultLCID() kernel32.GetSystemDefaultLCID @@ -43,7 +43,7 @@ @ stdcall IsValidLanguageGroup(long long) kernel32.IsValidLanguageGroup @ stdcall IsValidLocale(long long) kernel32.IsValidLocale @ stdcall IsValidLocaleName(wstr) kernel32.IsValidLocaleName -@ stub IsValidNLSVersion +@ stdcall IsValidNLSVersion(long wstr ptr) kernel32.IsValidNLSVersion @ stdcall LCMapStringA(long long str long ptr long) kernel32.LCMapStringA @ stdcall LCMapStringEx(wstr long wstr long ptr long ptr ptr long) kernel32.LCMapStringEx @ stdcall LCMapStringW(long long wstr long ptr long) kernel32.LCMapStringW

1 0

Chip Davis : d3d10_1: Introduce a function to convert d3d10_1 feature levels to D3D_FEATURE_LEVEL.
by Alexandre Julliard 10 Apr '20

10 Apr '20

Module: wine Branch: master Commit: 526e1138fcaaeb4176ae3913a03ff177a71e6ad9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=526e1138fcaaeb4176ae3913… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Fri Apr 10 21:51:49 2020 +0430 d3d10_1: Introduce a function to convert d3d10_1 feature levels to D3D_FEATURE_LEVEL. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10_1/d3d10_1_main.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10_1/d3d10_1_main.c b/dlls/d3d10_1/d3d10_1_main.c index 77b5cac710..f4fb1126ef 100644 --- a/dlls/d3d10_1/d3d10_1_main.c +++ b/dlls/d3d10_1/d3d10_1_main.c @@ -61,6 +61,11 @@ static const char *debug_d3d10_feature_level(D3D10_FEATURE_LEVEL1 feature_level) #undef WINE_D3D10_TO_STR +static D3D_FEATURE_LEVEL d3d_feature_level_from_d3d10_1(D3D10_FEATURE_LEVEL1 level) +{ + return (D3D_FEATURE_LEVEL)level; +} + static HRESULT d3d10_create_device1(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, D3D10_FEATURE_LEVEL1 hw_level, UINT sdk_version, ID3D10Device1 **device) { @@ -159,7 +164,8 @@ static HRESULT d3d10_create_device1(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE dri } } - hr = D3D10CoreCreateDevice(factory, adapter, flags, hw_level, (ID3D10Device **)device); + hr = D3D10CoreCreateDevice(factory, adapter, flags, + d3d_feature_level_from_d3d10_1(hw_level), (ID3D10Device **)device); IDXGIAdapter_Release(adapter); IDXGIFactory_Release(factory); if (FAILED(hr))

1 0

Chip Davis : wined3d: Use GL_APPLE_flush_render and GL_APPLE_rgb_422 to detect Apple OpenGL.
by Alexandre Julliard 10 Apr '20

10 Apr '20

Module: wine Branch: master Commit: 2929a3a056e29fcf89c80acc5df1623f9aff83d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2929a3a056e29fcf89c80acc… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Fri Apr 10 21:51:50 2020 +0430 wined3d: Use GL_APPLE_flush_render and GL_APPLE_rgb_422 to detect Apple OpenGL. In addition to the existing GL_APPLE_ycbcr_422. Core contexts on Mac OS don't advertise GL_APPLE_fence or GL_APPLE_ycbcr_422... but they do have GL_APPLE_flush_render and GL_APPLE_rgb_422. So, go back to using GL_APPLE_flush_render in our OS X detection, and accept GL_APPLE_rgb_422 in addition to GL_APPLE_ycbcr_422. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 5 ++++- dlls/wined3d/wined3d_gl.h | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 77fe4ca720..a1170fa12d 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -53,6 +53,8 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_APPLE_fence", APPLE_FENCE }, {"GL_APPLE_float_pixels", APPLE_FLOAT_PIXELS }, {"GL_APPLE_flush_buffer_range", APPLE_FLUSH_BUFFER_RANGE }, + {"GL_APPLE_flush_render", APPLE_FLUSH_RENDER }, + {"GL_APPLE_rgb_422", APPLE_RGB_422 }, {"GL_APPLE_ycbcr_422", APPLE_YCBCR_422 }, /* ARB */ @@ -1225,7 +1227,8 @@ static enum wined3d_gl_vendor wined3d_guess_gl_vendor(const struct wined3d_gl_in * is specific to the Mac OS X window management, and GL_APPLE_ycbcr_422 is QuickTime specific. So * the chance that other implementations support them is rather small since Win32 QuickTime uses * DirectDraw, not OpenGL. */ - if (gl_info->supported[APPLE_FENCE] && gl_info->supported[APPLE_YCBCR_422]) + if (gl_info->supported[APPLE_FLUSH_RENDER] + && (gl_info->supported[APPLE_YCBCR_422] || gl_info->supported[APPLE_RGB_422])) return GL_VENDOR_APPLE; if (strstr(gl_vendor_string, "NVIDIA")) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 6b1c99e6da..2dbc56ab79 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -37,6 +37,8 @@ enum wined3d_gl_extension APPLE_FENCE, APPLE_FLOAT_PIXELS, APPLE_FLUSH_BUFFER_RANGE, + APPLE_FLUSH_RENDER, + APPLE_RGB_422, APPLE_YCBCR_422, /* ARB */ ARB_BASE_INSTANCE,

1 0

Zhiyi Zhang : dxgi/tests: Add a test for IDXGIFactory5 feature support queries.
by Alexandre Julliard 10 Apr '20

10 Apr '20

Module: wine Branch: master Commit: 5928da917ddcbf7bfea5ae917f2cf73559c6e684 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5928da917ddcbf7bfea5ae91… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Apr 10 21:51:51 2020 +0430 dxgi/tests: Add a test for IDXGIFactory5 feature support queries. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index b5dcd5b0de..cb6ef6c0ec 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -6150,6 +6150,44 @@ static void test_cursor_clipping(IUnknown *device, BOOL is_d3d12) ok(refcount == !is_d3d12, "Got unexpected refcount %u.\n", refcount); } +static void test_factory_check_feature_support(void) +{ + IDXGIFactory5 *factory; + ULONG ref_count; + HRESULT hr; + BOOL data; + + if (FAILED(hr = CreateDXGIFactory(&IID_IDXGIFactory5, (void**)&factory))) + { + win_skip("IDXGIFactory5 is not available.\n"); + return; + } + + hr = IDXGIFactory5_CheckFeatureSupport(factory, 0x12345678, (void *)&data, sizeof(data)); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + /* Crashes on Windows. */ + if (0) + { + hr = IDXGIFactory5_CheckFeatureSupport(factory, DXGI_FEATURE_PRESENT_ALLOW_TEARING, NULL, sizeof(data)); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + } + + hr = IDXGIFactory5_CheckFeatureSupport(factory, DXGI_FEATURE_PRESENT_ALLOW_TEARING, &data, sizeof(data) - 1); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + hr = IDXGIFactory5_CheckFeatureSupport(factory, DXGI_FEATURE_PRESENT_ALLOW_TEARING, &data, sizeof(data) + 1); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + data = (BOOL)0xdeadbeef; + hr = IDXGIFactory5_CheckFeatureSupport(factory, DXGI_FEATURE_PRESENT_ALLOW_TEARING, &data, sizeof(data)); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(data == TRUE || data == FALSE, "Got unexpected data %#x.\n", data); + + ref_count = IDXGIFactory5_Release(factory); + ok(!ref_count, "Factory has %u references left.\n", ref_count); +} + static void run_on_d3d10(void (*test_func)(IUnknown *device, BOOL is_d3d12)) { IDXGIDevice *device; @@ -6242,6 +6280,7 @@ START_TEST(dxgi) queue_test(test_output_desc); queue_test(test_object_wrapping); queue_test(test_multi_adapter); + queue_test(test_factory_check_feature_support); run_queued_tests();

1 0

Alistair Leslie-Hughes : secur32: Fix compile for older gnutls libraries.
by Alexandre Julliard 10 Apr '20

10 Apr '20

Module: wine Branch: master Commit: 353c16f0d60f591b683ab75ab78d13cc94ee0891 URL: https://source.winehq.org/git/wine.git/?a=commit;h=353c16f0d60f591b683ab75a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 10 13:30:44 2020 +1000 secur32: Fix compile for older gnutls libraries. GNUTLS_ALPN_SERVER_PRECEDENCE was introduced into 3.5. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_gnutls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index f177d90dfd..c4a36a899a 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -119,7 +119,7 @@ MAKE_FUNCPTR(gnutls_x509_privkey_deinit); #define GNUTLS_KX_ECDHE_PSK 14 #endif -#if GNUTLS_VERSION_MAJOR < 3 || (GNUTLS_VERSION_MAJOR == 3 && GNUTLS_VERSION_MINOR < 2) +#if GNUTLS_VERSION_MAJOR < 3 || (GNUTLS_VERSION_MAJOR == 3 && GNUTLS_VERSION_MINOR < 5) #define GNUTLS_ALPN_SERVER_PRECEDENCE (1<<1) #endif

1 0

Zebediah Figura : user32: Rename the "hid_device" structure to "device".
by Alexandre Julliard 10 Apr '20

10 Apr '20

Module: wine Branch: master Commit: 9e195ba9a64ab88a04e26c7f2a3c0837993f2581 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e195ba9a64ab88a04e26c7f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 9 17:32:41 2020 -0500 user32: Rename the "hid_device" structure to "device". Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 85ff0c5e80..54d836b22b 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -39,7 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(rawinput); -struct hid_device +struct device { WCHAR *path; HANDLE file; @@ -47,7 +47,7 @@ struct hid_device PHIDP_PREPARSED_DATA data; }; -static struct hid_device *hid_devices; +static struct device *hid_devices; static unsigned int hid_devices_count, hid_devices_max; static CRITICAL_SECTION hid_devices_cs; @@ -86,10 +86,10 @@ static BOOL array_reserve(void **elements, unsigned int *capacity, unsigned int return TRUE; } -static struct hid_device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) +static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) { SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail; - struct hid_device *device; + struct device *device; HANDLE file; WCHAR *path; DWORD size; @@ -147,7 +147,7 @@ static void find_hid_devices(void) static ULONGLONG last_check; SP_DEVICE_INTERFACE_DATA iface = { sizeof(iface) }; - struct hid_device *device; + struct device *device; HIDD_ATTRIBUTES attr; HIDP_CAPS caps; GUID hid_guid; @@ -398,7 +398,7 @@ UINT WINAPI GetRawInputDeviceInfoA(HANDLE device, UINT command, void *data, UINT /*********************************************************************** * GetRawInputDeviceInfoW (USER32.@) */ -UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT *data_size) +UINT WINAPI GetRawInputDeviceInfoW(HANDLE handle, UINT command, void *data, UINT *data_size) { /* FIXME: Most of this is made up. */ static const WCHAR keyboard_name[] = {'\\','\\','?','\\','W','I','N','E','_','K','E','Y','B','O','A','R','D',0}; @@ -407,12 +407,12 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT static const RID_DEVICE_INFO_MOUSE mouse_info = {1, 5, 0, FALSE}; RID_DEVICE_INFO info; - struct hid_device *hid_device = device; + struct device *device = handle; const void *to_copy; UINT to_copy_bytes, avail_bytes; - TRACE("device %p, command %#x, data %p, data_size %p.\n", - device, command, data, data_size); + TRACE("handle %p, command %#x, data %p, data_size %p.\n", + handle, command, data, data_size); if (!data_size) return ~0U; @@ -427,20 +427,20 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT case RIDI_DEVICENAME: /* for RIDI_DEVICENAME, data_size is in characters, not bytes */ avail_bytes = *data_size * sizeof(WCHAR); - if (device == WINE_MOUSE_HANDLE) + if (handle == WINE_MOUSE_HANDLE) { *data_size = ARRAY_SIZE(mouse_name); to_copy = mouse_name; } - else if (device == WINE_KEYBOARD_HANDLE) + else if (handle == WINE_KEYBOARD_HANDLE) { *data_size = ARRAY_SIZE(keyboard_name); to_copy = keyboard_name; } else { - *data_size = strlenW(hid_device->path) + 1; - to_copy = hid_device->path; + *data_size = strlenW(device->path) + 1; + to_copy = device->path; } to_copy_bytes = *data_size * sizeof(WCHAR); break; @@ -448,12 +448,12 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT case RIDI_DEVICEINFO: avail_bytes = *data_size; info.cbSize = sizeof(info); - if (device == WINE_MOUSE_HANDLE) + if (handle == WINE_MOUSE_HANDLE) { info.dwType = RIM_TYPEMOUSE; info.u.mouse = mouse_info; } - else if (device == WINE_KEYBOARD_HANDLE) + else if (handle == WINE_KEYBOARD_HANDLE) { info.dwType = RIM_TYPEKEYBOARD; info.u.keyboard = keyboard_info; @@ -461,7 +461,7 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT else { info.dwType = RIM_TYPEHID; - info.u.hid = hid_device->info; + info.u.hid = device->info; } to_copy_bytes = sizeof(info); *data_size = to_copy_bytes; @@ -470,8 +470,7 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT case RIDI_PREPARSEDDATA: avail_bytes = *data_size; - if (device == WINE_MOUSE_HANDLE || - device == WINE_KEYBOARD_HANDLE) + if (handle == WINE_MOUSE_HANDLE || handle == WINE_KEYBOARD_HANDLE) { to_copy_bytes = 0; *data_size = 0; @@ -479,9 +478,9 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT } else { - to_copy_bytes = ((WINE_HIDP_PREPARSED_DATA*)hid_device->data)->dwSize; + to_copy_bytes = ((WINE_HIDP_PREPARSED_DATA*)device->data)->dwSize; *data_size = to_copy_bytes; - to_copy = hid_device->data; + to_copy = device->data; } break;

1 0

Zebediah Figura : user32: Rename hid_devices_* variables to rawinput_devices_*.
by Alexandre Julliard 10 Apr '20

10 Apr '20

Module: wine Branch: master Commit: da87589ee2e3be826a197604be2a63b65f67b68b URL: https://source.winehq.org/git/wine.git/?a=commit;h=da87589ee2e3be826a197604… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 9 17:32:42 2020 -0500 user32: Rename hid_devices_* variables to rawinput_devices_*. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 49 +++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 54d836b22b..e89bb027f3 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -47,17 +47,17 @@ struct device PHIDP_PREPARSED_DATA data; }; -static struct device *hid_devices; -static unsigned int hid_devices_count, hid_devices_max; +static struct device *rawinput_devices; +static unsigned int rawinput_devices_count, rawinput_devices_max; -static CRITICAL_SECTION hid_devices_cs; -static CRITICAL_SECTION_DEBUG hid_devices_cs_debug = +static CRITICAL_SECTION rawinput_devices_cs; +static CRITICAL_SECTION_DEBUG rawinput_devices_cs_debug = { - 0, 0, &hid_devices_cs, - { &hid_devices_cs_debug.ProcessLocksList, &hid_devices_cs_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": hid_devices_cs") } + 0, 0, &rawinput_devices_cs, + { &rawinput_devices_cs_debug.ProcessLocksList, &rawinput_devices_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": rawinput_devices_cs") } }; -static CRITICAL_SECTION hid_devices_cs = { &hid_devices_cs_debug, -1, 0, 0, 0, 0 }; +static CRITICAL_SECTION rawinput_devices_cs = { &rawinput_devices_cs_debug, -1, 0, 0, 0, 0 }; static BOOL array_reserve(void **elements, unsigned int *capacity, unsigned int count, unsigned int size) { @@ -127,7 +127,8 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) return NULL; } - if (!array_reserve((void **)&hid_devices, &hid_devices_max, hid_devices_count + 1, sizeof(*hid_devices))) + if (!array_reserve((void **)&rawinput_devices, &rawinput_devices_max, + rawinput_devices_count + 1, sizeof(*rawinput_devices))) { ERR("Failed to allocate memory.\n"); CloseHandle(file); @@ -135,14 +136,14 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) return NULL; } - device = &hid_devices[hid_devices_count++]; + device = &rawinput_devices[rawinput_devices_count++]; device->path = path; device->file = file; return device; } -static void find_hid_devices(void) +static void find_devices(void) { static ULONGLONG last_check; @@ -162,16 +163,16 @@ static void find_hid_devices(void) set = SetupDiGetClassDevsW(&hid_guid, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); - EnterCriticalSection(&hid_devices_cs); + EnterCriticalSection(&rawinput_devices_cs); /* destroy previous list */ - for (idx = 0; idx < hid_devices_count; ++idx) + for (idx = 0; idx < rawinput_devices_count; ++idx) { - CloseHandle(hid_devices[idx].file); - heap_free(hid_devices[idx].path); + CloseHandle(rawinput_devices[idx].file); + heap_free(rawinput_devices[idx].path); } - hid_devices_count = 0; + rawinput_devices_count = 0; for (idx = 0; SetupDiEnumDeviceInterfaces(set, NULL, &hid_guid, idx, &iface); ++idx) { if (!(device = add_device(set, &iface))) @@ -194,7 +195,7 @@ static void find_hid_devices(void) device->info.usUsage = caps.Usage; } - LeaveCriticalSection(&hid_devices_cs); + LeaveCriticalSection(&rawinput_devices_cs); SetupDiDestroyDeviceInfoList(set); } @@ -219,18 +220,18 @@ UINT WINAPI GetRawInputDeviceList(RAWINPUTDEVICELIST *devices, UINT *device_coun return ~0U; } - find_hid_devices(); + find_devices(); if (!devices) { - *device_count = 2 + hid_devices_count; + *device_count = 2 + rawinput_devices_count; return 0; } - if (*device_count < 2 + hid_devices_count) + if (*device_count < 2 + rawinput_devices_count) { SetLastError(ERROR_INSUFFICIENT_BUFFER); - *device_count = 2 + hid_devices_count; + *device_count = 2 + rawinput_devices_count; return ~0U; } @@ -239,13 +240,13 @@ UINT WINAPI GetRawInputDeviceList(RAWINPUTDEVICELIST *devices, UINT *device_coun devices[1].hDevice = WINE_KEYBOARD_HANDLE; devices[1].dwType = RIM_TYPEKEYBOARD; - for (i = 0; i < hid_devices_count; ++i) + for (i = 0; i < rawinput_devices_count; ++i) { - devices[2 + i].hDevice = &hid_devices[i]; + devices[2 + i].hDevice = &rawinput_devices[i]; devices[2 + i].dwType = RIM_TYPEHID; } - return 2 + hid_devices_count; + return 2 + rawinput_devices_count; } /***********************************************************************

1 0

Zebediah Figura : user32: Also scan for mouse devices in GetRawInputDeviceList().
by Alexandre Julliard 10 Apr '20

10 Apr '20

Module: wine Branch: master Commit: 19c6524e48db1d785095953d25591f1e2d2872d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19c6524e48db1d785095953d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 9 17:32:43 2020 -0500 user32: Also scan for mouse devices in GetRawInputDeviceList(). Halo: Spartan Strike attempts to discover input devices using rawinput. It expects to be able to open at least one device file with a zero access mask. It does not perform any other operations on the file. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 47 ++++++++++++++++++++++++++++++++++------------- dlls/user32/tests/input.c | 5 ++--- 2 files changed, 36 insertions(+), 16 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index e89bb027f3..2465262f74 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -37,13 +37,16 @@ #include "user_private.h" +#include "initguid.h" +#include "ntddmou.h" + WINE_DEFAULT_DEBUG_CHANNEL(rawinput); struct device { WCHAR *path; HANDLE file; - RID_DEVICE_INFO_HID info; + RID_DEVICE_INFO info; PHIDP_PREPARSED_DATA data; }; @@ -139,6 +142,7 @@ static struct device *add_device(HDEVINFO set, SP_DEVICE_INTERFACE_DATA *iface) device = &rawinput_devices[rawinput_devices_count++]; device->path = path; device->file = file; + device->info.cbSize = sizeof(RID_DEVICE_INFO); return device; } @@ -161,8 +165,6 @@ static void find_devices(void) HidD_GetHidGuid(&hid_guid); - set = SetupDiGetClassDevsW(&hid_guid, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); - EnterCriticalSection(&rawinput_devices_cs); /* destroy previous list */ @@ -171,8 +173,10 @@ static void find_devices(void) CloseHandle(rawinput_devices[idx].file); heap_free(rawinput_devices[idx].path); } - rawinput_devices_count = 0; + + set = SetupDiGetClassDevsW(&hid_guid, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); + for (idx = 0; SetupDiEnumDeviceInterfaces(set, NULL, &hid_guid, idx, &iface); ++idx) { if (!(device = add_device(set, &iface))) @@ -181,9 +185,11 @@ static void find_devices(void) attr.Size = sizeof(HIDD_ATTRIBUTES); if (!HidD_GetAttributes(device->file, &attr)) WARN("Failed to get attributes.\n"); - device->info.dwVendorId = attr.VendorID; - device->info.dwProductId = attr.ProductID; - device->info.dwVersionNumber = attr.VersionNumber; + + device->info.dwType = RIM_TYPEHID; + device->info.u.hid.dwVendorId = attr.VendorID; + device->info.u.hid.dwProductId = attr.ProductID; + device->info.u.hid.dwVersionNumber = attr.VersionNumber; if (!HidD_GetPreparsedData(device->file, &device->data)) WARN("Failed to get preparsed data.\n"); @@ -191,12 +197,28 @@ static void find_devices(void) if (!HidP_GetCaps(device->data, &caps)) WARN("Failed to get caps.\n"); - device->info.usUsagePage = caps.UsagePage; - device->info.usUsage = caps.Usage; + device->info.u.hid.usUsagePage = caps.UsagePage; + device->info.u.hid.usUsage = caps.Usage; + } + + SetupDiDestroyDeviceInfoList(set); + + set = SetupDiGetClassDevsW(&GUID_DEVINTERFACE_MOUSE, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); + + for (idx = 0; SetupDiEnumDeviceInterfaces(set, NULL, &GUID_DEVINTERFACE_MOUSE, idx, &iface); ++idx) + { + static const RID_DEVICE_INFO_MOUSE mouse_info = {1, 5, 0, FALSE}; + + if (!(device = add_device(set, &iface))) + continue; + + device->info.dwType = RIM_TYPEMOUSE; + device->info.u.mouse = mouse_info; } - LeaveCriticalSection(&rawinput_devices_cs); SetupDiDestroyDeviceInfoList(set); + + LeaveCriticalSection(&rawinput_devices_cs); } /*********************************************************************** @@ -243,7 +265,7 @@ UINT WINAPI GetRawInputDeviceList(RAWINPUTDEVICELIST *devices, UINT *device_coun for (i = 0; i < rawinput_devices_count; ++i) { devices[2 + i].hDevice = &rawinput_devices[i]; - devices[2 + i].dwType = RIM_TYPEHID; + devices[2 + i].dwType = rawinput_devices[i].info.dwType; } return 2 + rawinput_devices_count; @@ -461,8 +483,7 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE handle, UINT command, void *data, UINT } else { - info.dwType = RIM_TYPEHID; - info.u.hid = device->info; + info = device->info; } to_copy_bytes = sizeof(info); *data_size = to_copy_bytes; diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 3fc84f6108..43fdd34191 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1686,7 +1686,7 @@ static void test_GetRawInputDeviceList(void) * understand that; so use the \\?\ prefix instead */ name[1] = '\\'; file = CreateFileW(name, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); - todo_wine_if(info.dwType != RIM_TYPEHID) + todo_wine_if(i == 0 || i == 1) ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %u\n", wine_dbgstr_w(name), GetLastError()); sz = 0; @@ -1716,8 +1716,7 @@ static void test_GetRawInputDeviceList(void) { /* succeeds on hardware, fails in some VMs */ br = HidD_GetPreparsedData(file, &preparsed); - todo_wine - ok(br == TRUE || broken(br == FALSE), "HidD_GetPreparsedData failed\n"); + ok(br == TRUE || broken(br == FALSE), "HidD_GetPreparsedData failed\n"); } if (br)

1 0

Zebediah Figura : maintainers: Add Paul Gofman to the Staging branch section.
by Alexandre Julliard 10 Apr '20

10 Apr '20

Module: wine Branch: master Commit: f57776117b9cb69c061d0a34bddfe24cc9274894 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f57776117b9cb69c061d0a34… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 9 19:13:11 2020 -0500 maintainers: Add Paul Gofman to the Staging branch section. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 93e89193b7..82f434af2b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -313,5 +313,6 @@ W: https://wiki.winehq.org/StableRules Staging Branch M: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> P: Zebediah Figura <z.figura12(a)gmail.com> +P: Paul Gofman <gofmanp(a)gmail.com> P: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> W: https://wine-staging.com/

1 0

Zebediah Figura : maintainers: Add myself to some sections.
by Alexandre Julliard 10 Apr '20

10 Apr '20

Module: wine Branch: master Commit: 99c020a0265aad7b825e29d7038629921eac3372 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99c020a0265aad7b825e29d7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 9 19:13:12 2020 -0500 maintainers: Add myself to some sections. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 82f434af2b..88876773d2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -104,13 +104,15 @@ F: dlls/dpwsockx/ DirectShow P: Andrew Eikum <aeikum(a)codeweavers.com> +P: Zebediah Figura <z.figura12(a)gmail.com> F: dlls/amstream/ F: dlls/mciqtz32/ +F: dlls/qasf/ F: dlls/qcap/ F: dlls/qedit/ F: dlls/quartz/ F: dlls/strmbase/ -F: dlls/winegstreamer/ +F: dlls/winegstreamer/gstdemux.c F: dlls/wineqtdecoder/ DirectWrite @@ -139,6 +141,11 @@ F: dlls/hid/ F: dlls/hidclass.sys/ F: dlls/winehid.sys/ +HTTP server +P: Zebediah Figura <z.figura12(a)gmail.com> +F: dlls/httpapi/ +F: dlls/http.sys/ + Input methods M: Aric Stewart <aric(a)codeweavers.com> F: dlls/imm32/ @@ -162,6 +169,7 @@ F: dlls/msvc*/ MSI installers M: Hans Leidekker <hans(a)codeweavers.com> +P: Zebediah Figura <z.figura12(a)gmail.com> F: dlls/msi/ Netstat @@ -205,6 +213,12 @@ P: Andrew Eikum <aeikum(a)codeweavers.com> P: Huw Davies <huw(a)codeweavers.com> F: dlls/oleaut32/typelib.c +Plug and Play +P: Zebediah Figura <z.figura12(a)gmail.com> +F: dlls/newdev/ +F: dlls/ntoskrnl.exe/pnp.c +F: dlls/setupapi/devinst.c + Postscript Driver M: Huw Davies <huw(a)codeweavers.com> F: dlls/wineps.drv/ @@ -222,6 +236,7 @@ F: dlls/riched20 RPC Runtime P: Huw Davies <huw(a)codeweavers.com> +P: Zebediah Figura <z.figura12(a)gmail.com> F: dlls/rpcrt4 F: tools/widl

1 0