wine-commits August 2021

wine-commits@winehq.org

1 participants
1051 discussions

Gerald Pfeifer : ntdll: Only use sysinfo function when present.
by Alexandre Julliard 11 Aug '21

11 Aug '21

Module: wine Branch: master Commit: 59da79021a6e441e3b21b933c744aba922208ec1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59da79021a6e441e3b21b933… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Aug 10 22:36:27 2021 +0200 ntdll: Only use sysinfo function when present. On some systems <sys/sysinfo.h> may be present while the sysinfo function may not, or at least not as part of standard libraries, so check whether the function is actually available before using it. This fixes builds on FreeBSD with the devel/libsysinfo present. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/ntdll/unix/virtual.c | 3 ++- include/config.h.in | 3 +++ 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 1be0aa9d217..e8c1cb9e3a8 100755 --- a/configure +++ b/configure @@ -18068,6 +18068,7 @@ for ac_func in \ setprogname \ sigprocmask \ symlink \ + sysinfo \ tcdrain \ thr_kill2 diff --git a/configure.ac b/configure.ac index 69e27147088..065b3f231bf 100644 --- a/configure.ac +++ b/configure.ac @@ -2205,6 +2205,7 @@ AC_CHECK_FUNCS(\ setprogname \ sigprocmask \ symlink \ + sysinfo \ tcdrain \ thr_kill2 ) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index a252e25fbc6..2cca90ac952 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2737,7 +2737,8 @@ ULONG_PTR get_system_affinity_mask(void) */ void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info, BOOL wow64 ) { -#if defined(HAVE_STRUCT_SYSINFO_TOTALRAM) && defined(HAVE_STRUCT_SYSINFO_MEM_UNIT) +#if defined(HAVE_SYSINFO) \ + && defined(HAVE_STRUCT_SYSINFO_TOTALRAM) && defined(HAVE_STRUCT_SYSINFO_MEM_UNIT) struct sysinfo sinfo; if (!sysinfo(&sinfo)) diff --git a/include/config.h.in b/include/config.h.in index ad770281471..24f7b64ffd3 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -744,6 +744,9 @@ /* Define to 1 if you have the <syscall.h> header file. */ #undef HAVE_SYSCALL_H +/* Define to 1 if you have the `sysinfo' function. */ +#undef HAVE_SYSINFO + /* Define to 1 if you have the <SystemConfiguration/SCDynamicStoreCopyDHCPInfo.h> header file. */ #undef HAVE_SYSTEMCONFIGURATION_SCDYNAMICSTORECOPYDHCPINFO_H

1 0

Ziqing Hui : d2d1: Add D2D1Crop.
by Alexandre Julliard 11 Aug '21

11 Aug '21

Module: wine Branch: master Commit: a52b58473c4bf09e26592b5fb5ad51964b39180d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a52b58473c4bf09e26592b5f… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Aug 11 13:53:44 2021 +0800 d2d1: Add D2D1Crop. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/effect.c | 3 ++- dlls/d2d1/tests/d2d1.c | 1 + include/d2d1effects.idl | 8 ++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 5f334d19f71..0c33f956826 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -24,7 +24,8 @@ static const struct d2d_effect_info builtin_effects[] = { {&CLSID_D2D12DAffineTransform, 1, 1, 1}, {&CLSID_D2D13DPerspectiveTransform, 1, 1, 1}, - {&CLSID_D2D1Composite, 2, 1, 0xffffffff} + {&CLSID_D2D1Composite, 2, 1, 0xffffffff}, + {&CLSID_D2D1Crop, 1, 1, 1}, }; static inline struct d2d_effect *impl_from_ID2D1Effect(ID2D1Effect *iface) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 343a2363e14..cd58d642ce1 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9707,6 +9707,7 @@ static void test_effect(BOOL d3d11) {&CLSID_D2D12DAffineTransform, 1, 1, 1}, {&CLSID_D2D13DPerspectiveTransform, 1, 1, 1}, {&CLSID_D2D1Composite, 2, 1, 0xffffffff}, + {&CLSID_D2D1Crop, 1, 1, 1}, }; if (!init_test_context(&ctx, d3d11)) diff --git a/include/d2d1effects.idl b/include/d2d1effects.idl index 4154276345b..9bd0b7012ad 100644 --- a/include/d2d1effects.idl +++ b/include/d2d1effects.idl @@ -19,6 +19,7 @@ cpp_quote("DEFINE_GUID(CLSID_D2D12DAffineTransform, 0x6aa97485,0x6354,0x4cfc,0x90,0x8c,0xe4,0xa7,0x4f,0x62,0xc9,0x6c);") cpp_quote("DEFINE_GUID(CLSID_D2D13DPerspectiveTransform, 0xc2844d0b,0x3d86,0x46e7,0x85,0xba,0x52,0x6c,0x92,0x40,0xf3,0xfb);") cpp_quote("DEFINE_GUID(CLSID_D2D1Composite, 0x48fc9f51,0xf6ac,0x48f1,0x8b,0x58,0x3b,0x28,0xac,0x46,0xf7,0x6d);") +cpp_quote("DEFINE_GUID(CLSID_D2D1Crop, 0xe23f7110,0x0e9a,0x4324,0xaf,0x47,0x6a,0x2c,0x0c,0x46,0xf3,0x5b);") typedef enum D2D1_BORDER_MODE { @@ -75,3 +76,10 @@ typedef enum D2D1_COMPOSITE_PROP D2D1_COMPOSITE_PROP_MODE = 0x0, D2D1_COMPOSITE_PROP_FORCE_DWORD = 0xffffffff } D2D1_COMPOSITE_PROP; + +typedef enum D2D1_CROP_PROP +{ + D2D1_CROP_PROP_RECT = 0x0, + D2D1_CROP_PROP_BORDER_MODE = 0x1, + D2D1_CROP_PROP_FORCE_DWORD = 0xffffffff +} D2D1_CROP_PROP;

1 0

Georg Lehmann : winevulkan: Update to VK spec version 1.2.188.
by Alexandre Julliard 11 Aug '21

11 Aug '21

Module: wine Branch: master Commit: cd1a612b1d179d274b99ba8f72916e5c851c7da8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd1a612b1d179d274b99ba8f… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue Aug 10 21:05:58 2021 +0200 winevulkan: Update to VK spec version 1.2.188. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 1 + dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 20 +++++++++++++------- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 5e683d42de7..55b5b71691e 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.2.185" +VK_XML_VERSION = "1.2.188" WINE_VK_VERSION = (1, 2) # Filenames to create. diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 11cc9bf8220..fd3ed950930 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -8093,6 +8093,7 @@ static const char * const vk_device_extensions[] = "VK_EXT_index_type_uint8", "VK_EXT_inline_uniform_block", "VK_EXT_line_rasterization", + "VK_EXT_load_store_op_none", "VK_EXT_memory_budget", "VK_EXT_memory_priority", "VK_EXT_multi_draw", diff --git a/dlls/winevulkan/winevulkan.json b/dlls/winevulkan/winevulkan.json index 018bad1c3d4..71f737293fa 100644 --- a/dlls/winevulkan/winevulkan.json +++ b/dlls/winevulkan/winevulkan.json @@ -2,6 +2,6 @@ "file_format_version": "1.0.0", "ICD": { "library_path": ".\\winevulkan.dll", - "api_version": "1.2.185" + "api_version": "1.2.188" } } diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index 6f80ae95ca6..983d3143f89 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -452,7 +452,9 @@ #define VK_EXT_GLOBAL_PRIORITY_QUERY_EXTENSION_NAME "VK_EXT_global_priority_query" #define VK_EXT_MULTI_DRAW_SPEC_VERSION 1 #define VK_EXT_MULTI_DRAW_EXTENSION_NAME "VK_EXT_multi_draw" -#define VK_KHR_ACCELERATION_STRUCTURE_SPEC_VERSION 11 +#define VK_EXT_LOAD_STORE_OP_NONE_SPEC_VERSION 1 +#define VK_EXT_LOAD_STORE_OP_NONE_EXTENSION_NAME "VK_EXT_load_store_op_none" +#define VK_KHR_ACCELERATION_STRUCTURE_SPEC_VERSION 12 #define VK_KHR_ACCELERATION_STRUCTURE_EXTENSION_NAME "VK_KHR_acceleration_structure" #define VK_KHR_RAY_TRACING_PIPELINE_SPEC_VERSION 1 #define VK_KHR_RAY_TRACING_PIPELINE_EXTENSION_NAME "VK_KHR_ray_tracing_pipeline" @@ -473,7 +475,7 @@ #define VK_API_VERSION_1_0 VK_MAKE_API_VERSION(0, 1, 0, 0) #define VK_API_VERSION_1_1 VK_MAKE_API_VERSION(0, 1, 1, 0) #define VK_API_VERSION_1_2 VK_MAKE_API_VERSION(0, 1, 2, 0) -#define VK_HEADER_VERSION 185 +#define VK_HEADER_VERSION 187 #define VK_HEADER_VERSION_COMPLETE VK_MAKE_API_VERSION(0, 1, 2, VK_HEADER_VERSION) #define VK_DEFINE_HANDLE(object) typedef struct object##_T* object; #define VK_USE_64_BIT_PTR_DEFINES 0 @@ -703,7 +705,7 @@ typedef VkFlags VkToolPurposeFlagsEXT; typedef VkFlags VkValidationCacheCreateFlagsEXT; typedef VkFlags VkViSurfaceCreateFlagsNN; typedef VkFlags VkVideoBeginCodingFlagsKHR; -typedef VkFlags VkVideoCapabilitiesFlagsKHR; +typedef VkFlags VkVideoCapabilityFlagsKHR; typedef VkFlags VkVideoChromaSubsamplingFlagsKHR; typedef VkFlags VkVideoCodecOperationFlagsKHR; typedef VkFlags VkVideoCodingControlFlagsKHR; @@ -711,10 +713,10 @@ typedef VkFlags VkVideoCodingQualityPresetFlagsKHR; typedef VkFlags VkVideoComponentBitDepthFlagsKHR; typedef VkFlags VkVideoDecodeFlagsKHR; typedef VkFlags VkVideoDecodeH264CreateFlagsEXT; -typedef VkFlags VkVideoDecodeH264FieldLayoutFlagsEXT; +typedef VkFlags VkVideoDecodeH264PictureLayoutFlagsEXT; typedef VkFlags VkVideoDecodeH265CreateFlagsEXT; typedef VkFlags VkVideoEncodeFlagsKHR; -typedef VkFlags VkVideoEncodeH264CapabilitiesFlagsEXT; +typedef VkFlags VkVideoEncodeH264CapabilityFlagsEXT; typedef VkFlags VkVideoEncodeH264CreateFlagsEXT; typedef VkFlags VkVideoEncodeH264InputModeFlagsEXT; typedef VkFlags VkVideoEncodeH264OutputModeFlagsEXT; @@ -868,6 +870,7 @@ typedef enum VkAttachmentLoadOp VK_ATTACHMENT_LOAD_OP_LOAD = 0, VK_ATTACHMENT_LOAD_OP_CLEAR = 1, VK_ATTACHMENT_LOAD_OP_DONT_CARE = 2, + VK_ATTACHMENT_LOAD_OP_NONE_EXT = 1000400000, VK_ATTACHMENT_LOAD_OP_MAX_ENUM = 0x7fffffff, } VkAttachmentLoadOp; @@ -875,7 +878,8 @@ typedef enum VkAttachmentStoreOp { VK_ATTACHMENT_STORE_OP_STORE = 0, VK_ATTACHMENT_STORE_OP_DONT_CARE = 1, - VK_ATTACHMENT_STORE_OP_NONE_QCOM = 1000301000, + VK_ATTACHMENT_STORE_OP_NONE_EXT = 1000301000, + VK_ATTACHMENT_STORE_OP_NONE_QCOM = VK_ATTACHMENT_STORE_OP_NONE_EXT, VK_ATTACHMENT_STORE_OP_MAX_ENUM = 0x7fffffff, } VkAttachmentStoreOp; @@ -1419,6 +1423,7 @@ typedef enum VkDriverId VK_DRIVER_ID_MOLTENVK = 14, VK_DRIVER_ID_COREAVI_PROPRIETARY = 15, VK_DRIVER_ID_JUICE_PROPRIETARY = 16, + VK_DRIVER_ID_VERISILICON_PROPRIETARY = 17, VK_DRIVER_ID_AMD_PROPRIETARY_KHR = VK_DRIVER_ID_AMD_PROPRIETARY, VK_DRIVER_ID_AMD_OPEN_SOURCE_KHR = VK_DRIVER_ID_AMD_OPEN_SOURCE, VK_DRIVER_ID_MESA_RADV_KHR = VK_DRIVER_ID_MESA_RADV, @@ -1981,9 +1986,10 @@ typedef VkGeometryFlagBitsKHR VkGeometryFlagBitsNV; typedef enum VkGeometryInstanceFlagBitsKHR { VK_GEOMETRY_INSTANCE_TRIANGLE_FACING_CULL_DISABLE_BIT_KHR = 0x00000001, - VK_GEOMETRY_INSTANCE_TRIANGLE_FRONT_COUNTERCLOCKWISE_BIT_KHR = 0x00000002, + VK_GEOMETRY_INSTANCE_TRIANGLE_FLIP_FACING_BIT_KHR = 0x00000002, VK_GEOMETRY_INSTANCE_FORCE_OPAQUE_BIT_KHR = 0x00000004, VK_GEOMETRY_INSTANCE_FORCE_NO_OPAQUE_BIT_KHR = 0x00000008, + VK_GEOMETRY_INSTANCE_TRIANGLE_FRONT_COUNTERCLOCKWISE_BIT_KHR = VK_GEOMETRY_INSTANCE_TRIANGLE_FLIP_FACING_BIT_KHR, VK_GEOMETRY_INSTANCE_TRIANGLE_CULL_DISABLE_BIT_NV = VK_GEOMETRY_INSTANCE_TRIANGLE_FACING_CULL_DISABLE_BIT_KHR, VK_GEOMETRY_INSTANCE_TRIANGLE_FRONT_COUNTERCLOCKWISE_BIT_NV = VK_GEOMETRY_INSTANCE_TRIANGLE_FRONT_COUNTERCLOCKWISE_BIT_KHR, VK_GEOMETRY_INSTANCE_FORCE_OPAQUE_BIT_NV = VK_GEOMETRY_INSTANCE_FORCE_OPAQUE_BIT_KHR,

1 0

Rémi Bernon : xinput1_3: Read the controller state in the update thread.
by Alexandre Julliard 11 Aug '21

11 Aug '21

Module: wine Branch: master Commit: 43f0c8096b2d81052a30d8542372adc46dab8292 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43f0c8096b2d81052a30d854… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 10 13:27:24 2021 +0200 xinput1_3: Read the controller state in the update thread. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/main.c | 235 +++++++++++++++++++++++++------------------------- 1 file changed, 118 insertions(+), 117 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=43f0c8096b2d81052a30…

1 0

Rémi Bernon : xinput1_3: Update the controller list in the update thread.
by Alexandre Julliard 11 Aug '21

11 Aug '21

Module: wine Branch: master Commit: 8bf147b99096c0a940b55ccc42e05f36c39a6fbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bf147b99096c0a940b55ccc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 10 13:27:23 2021 +0200 xinput1_3: Update the controller list in the update thread. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/main.c | 49 ++++++++++++++++++++++--------------------------- 1 file changed, 22 insertions(+), 27 deletions(-) diff --git a/dlls/xinput1_3/main.c b/dlls/xinput1_3/main.c index 63f125ae528..45ccb5f79db 100644 --- a/dlls/xinput1_3/main.c +++ b/dlls/xinput1_3/main.c @@ -118,7 +118,6 @@ static struct xinput_controller controllers[XUSER_MAX_COUNT] = {{ &controller_critsect_debug[3], -1, 0, 0, 0, 0 }}, }; -static DWORD last_check = 0; static HANDLE stop_event; static HANDLE done_event; @@ -296,12 +295,8 @@ failed: return FALSE; } -static BOOL WINAPI start_update_thread_once( INIT_ONCE *once, void *param, void **context ); - -static void HID_find_gamepads(void) +static void update_controller_list(void) { - static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; - char buffer[sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W) + MAX_PATH * sizeof(WCHAR)]; SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail = (SP_DEVICE_INTERFACE_DETAIL_DATA_W *)buffer; SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; @@ -314,20 +309,6 @@ static void HID_find_gamepads(void) GUID guid; int i; - InitOnceExecuteOnce(&init_once, start_update_thread_once, NULL, NULL); - - idx = GetTickCount(); - if ((idx - last_check) < 2000) return; - - EnterCriticalSection(&xinput_crit); - - if ((idx - last_check) < 2000) - { - LeaveCriticalSection(&xinput_crit); - return; - } - last_check = idx; - HidD_GetHidGuid(&guid); set = SetupDiGetClassDevsW(&guid, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT); @@ -368,7 +349,6 @@ static void HID_find_gamepads(void) } SetupDiDestroyDeviceInfoList(set); - LeaveCriticalSection(&xinput_crit); } static void controller_destroy(struct xinput_controller *controller) @@ -541,14 +521,18 @@ static void HID_update_state(struct xinput_controller *controller, XINPUT_STATE static DWORD WINAPI hid_update_thread_proc(void *param) { HANDLE events[1]; - DWORD count, ret; + DWORD count, ret = WAIT_TIMEOUT; do { + EnterCriticalSection(&xinput_crit); + if (ret == WAIT_TIMEOUT) update_controller_list(); + count = 0; events[count++] = stop_event; + LeaveCriticalSection(&xinput_crit); } - while ((ret = WaitForMultipleObjectsEx( count, events, FALSE, INFINITE, TRUE )) < count - 1); + while ((ret = WaitForMultipleObjectsEx( count, events, FALSE, 2000, TRUE )) < count - 1 || ret == WAIT_TIMEOUT); if (ret != count - 1) ERR("update thread exited unexpectedly, ret %u\n", ret); SetEvent(done_event); @@ -569,9 +553,20 @@ static BOOL WINAPI start_update_thread_once( INIT_ONCE *once, void *param, void if (!thread) ERR("failed to create update thread, error %u\n", GetLastError()); CloseHandle(thread); + /* do it once now, to resolve delayed imports and populate the initial list */ + EnterCriticalSection(&xinput_crit); + update_controller_list(); + LeaveCriticalSection(&xinput_crit); + return TRUE; } +static void start_update_thread(void) +{ + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + InitOnceExecuteOnce(&init_once, start_update_thread_once, NULL, NULL); +} + static BOOL controller_lock(struct xinput_controller *controller) { if (!controller->device) return FALSE; @@ -617,7 +612,7 @@ void WINAPI DECLSPEC_HOTPATCH XInputEnable(BOOL enable) to the controllers. Setting to true will send the last vibration value (sent to XInputSetState) to the controller and allow messages to be sent */ - HID_find_gamepads(); + start_update_thread(); for (index = 0; index < XUSER_MAX_COUNT; index++) { @@ -634,7 +629,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH XInputSetState(DWORD index, XINPUT_VIBRATION *vib TRACE("(index %u, vibration %p)\n", index, vibration); - HID_find_gamepads(); + start_update_thread(); if (index >= XUSER_MAX_COUNT) return ERROR_BAD_ARGUMENTS; if (!controller_lock(&controllers[index])) return ERROR_DEVICE_NOT_CONNECTED; @@ -652,7 +647,7 @@ static DWORD xinput_get_state(DWORD index, XINPUT_STATE *state) { if (!state) return ERROR_BAD_ARGUMENTS; - HID_find_gamepads(); + start_update_thread(); if (index >= XUSER_MAX_COUNT) return ERROR_BAD_ARGUMENTS; if (!controller_lock(&controllers[index])) return ERROR_DEVICE_NOT_CONNECTED; @@ -908,7 +903,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH XInputGetCapabilities(DWORD index, DWORD flags, X { TRACE("(index %u, flags 0x%x, capabilities %p)\n", index, flags, capabilities); - HID_find_gamepads(); + start_update_thread(); if (index >= XUSER_MAX_COUNT) return ERROR_BAD_ARGUMENTS;

1 0

Rémi Bernon : xinput1_3: Create a new background update thread.
by Alexandre Julliard 11 Aug '21

11 Aug '21

Module: wine Branch: master Commit: 40cb5510aea7f829b34daf66aee9bb8ec3f2620c URL: https://source.winehq.org/git/wine.git/?a=commit;h=40cb5510aea7f829b34daf66… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 10 13:27:22 2021 +0200 xinput1_3: Create a new background update thread. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/main.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 51 insertions(+), 2 deletions(-) diff --git a/dlls/xinput1_3/main.c b/dlls/xinput1_3/main.c index ae2670ba306..63f125ae528 100644 --- a/dlls/xinput1_3/main.c +++ b/dlls/xinput1_3/main.c @@ -119,6 +119,8 @@ static struct xinput_controller controllers[XUSER_MAX_COUNT] = }; static DWORD last_check = 0; +static HANDLE stop_event; +static HANDLE done_event; static BOOL find_opened_device(SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail, int *free_slot) { @@ -294,8 +296,12 @@ failed: return FALSE; } +static BOOL WINAPI start_update_thread_once( INIT_ONCE *once, void *param, void **context ); + static void HID_find_gamepads(void) { + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + char buffer[sizeof(SP_DEVICE_INTERFACE_DETAIL_DATA_W) + MAX_PATH * sizeof(WCHAR)]; SP_DEVICE_INTERFACE_DETAIL_DATA_W *detail = (SP_DEVICE_INTERFACE_DETAIL_DATA_W *)buffer; SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; @@ -308,6 +314,8 @@ static void HID_find_gamepads(void) GUID guid; int i; + InitOnceExecuteOnce(&init_once, start_update_thread_once, NULL, NULL); + idx = GetTickCount(); if ((idx - last_check) < 2000) return; @@ -383,9 +391,16 @@ static void controller_destroy(struct xinput_controller *controller) LeaveCriticalSection(&controller->crit); } -static void HID_destroy_gamepads(void) +static void stop_update_thread(void) { int i; + + SetEvent(stop_event); + WaitForSingleObject(done_event, INFINITE); + + CloseHandle(stop_event); + CloseHandle(done_event); + for (i = 0; i < XUSER_MAX_COUNT; i++) controller_destroy(&controllers[i]); } @@ -523,6 +538,40 @@ static void HID_update_state(struct xinput_controller *controller, XINPUT_STATE memcpy(state, &controller->state, sizeof(*state)); } +static DWORD WINAPI hid_update_thread_proc(void *param) +{ + HANDLE events[1]; + DWORD count, ret; + + do + { + count = 0; + events[count++] = stop_event; + } + while ((ret = WaitForMultipleObjectsEx( count, events, FALSE, INFINITE, TRUE )) < count - 1); + + if (ret != count - 1) ERR("update thread exited unexpectedly, ret %u\n", ret); + SetEvent(done_event); + return ret; +} + +static BOOL WINAPI start_update_thread_once( INIT_ONCE *once, void *param, void **context ) +{ + HANDLE thread; + + stop_event = CreateEventA(NULL, FALSE, FALSE, NULL); + if (!stop_event) ERR("failed to create stop event, error %u\n", GetLastError()); + + done_event = CreateEventA(NULL, FALSE, FALSE, NULL); + if (!done_event) ERR("failed to create stop event, error %u\n", GetLastError()); + + thread = CreateThread(NULL, 0, hid_update_thread_proc, NULL, 0, NULL); + if (!thread) ERR("failed to create update thread, error %u\n", GetLastError()); + CloseHandle(thread); + + return TRUE; +} + static BOOL controller_lock(struct xinput_controller *controller) { if (!controller->device) return FALSE; @@ -552,7 +601,7 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) break; case DLL_PROCESS_DETACH: if (reserved) break; - HID_destroy_gamepads(); + stop_update_thread(); break; } return TRUE;

1 0

Rémi Bernon : xinput1_3/tests: Add some HID report tests.
by Alexandre Julliard 11 Aug '21

11 Aug '21

Module: wine Branch: master Commit: 7a571127e4fb5e3eba3f382446f4a82ef5728b90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a571127e4fb5e3eba3f3824… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 10 13:22:16 2021 +0200 xinput1_3/tests: Add some HID report tests. This adds tests to validate the bogus HID devices exposed native XInput driver. Interactive tests are also included to validate the HID report values, and more specifically the weird combined triggers, which is currently not implemented correctly in Wine. Some third-party libraries, such as SDL, are known to rely on this bogus HID devices and hardcode the expected report structure. This has been tested on Windows 10 with XBox 360 controllers as well as Xbox One S controllers. The latter are detected as 045e:02ea on Linux, but as 045e:02ff on Windows for some reason, and their descriptor seems a little bit different. Their exposed HID device also doesn't seem to work at all and ReadFile never succeeds, so the interactive tests are skipped for these devices. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/tests/Makefile.in | 2 +- dlls/xinput1_3/tests/xinput.c | 516 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 517 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7a571127e4fb5e3eba3f…

1 0

Nikolay Sivov : d3dx11/tests: Add some tests for D3DX11GetImageInfoFromMemory().
by Alexandre Julliard 11 Aug '21

11 Aug '21

Module: wine Branch: master Commit: fa20ac430bf613cbc119c52f034b44044f25a93f URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa20ac430bf613cbc119c52f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 10 13:57:29 2021 +0300 d3dx11/tests: Add some tests for D3DX11GetImageInfoFromMemory(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx11_43/tests/d3dx11.c | 595 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 595 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fa20ac430bf613cbc119…

1 0

Nikolay Sivov : d3dx9: Implement getting/setting line width.
by Alexandre Julliard 11 Aug '21

11 Aug '21

Module: wine Branch: master Commit: ebb99bde64f8a134466f45547d82ff974524ee47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebb99bde64f8a134466f4554… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 10 11:54:05 2021 +0300 d3dx9: Implement getting/setting line width. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/line.c | 19 +++++++++++++++---- dlls/d3dx9_36/tests/line.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/line.c b/dlls/d3dx9_36/line.c index 7b2e3b5428f..647eb1b5b2a 100644 --- a/dlls/d3dx9_36/line.c +++ b/dlls/d3dx9_36/line.c @@ -29,6 +29,7 @@ struct d3dx9_line IDirect3DDevice9 *device; IDirect3DStateBlock9 *state; + float width; }; static inline struct d3dx9_line *impl_from_ID3DXLine(ID3DXLine *iface) @@ -192,16 +193,25 @@ static float WINAPI d3dx9_line_GetPatternScale(ID3DXLine *iface) static HRESULT WINAPI d3dx9_line_SetWidth(ID3DXLine *iface, float width) { - FIXME("iface %p, width %.8e stub!\n", iface, width); + struct d3dx9_line *line = impl_from_ID3DXLine(iface); - return E_NOTIMPL; + TRACE("iface %p, width %.8e.\n", iface, width); + + if (width <= 0.0f) + return D3DERR_INVALIDCALL; + + line->width = width; + + return D3D_OK; } static float WINAPI d3dx9_line_GetWidth(ID3DXLine *iface) { - FIXME("iface %p stub!\n", iface); + struct d3dx9_line *line = impl_from_ID3DXLine(iface); - return 1.0f; + TRACE("iface %p.\n", iface); + + return line->width; } static HRESULT WINAPI d3dx9_line_SetAntialias(ID3DXLine *iface, BOOL antialias) @@ -306,6 +316,7 @@ HRESULT WINAPI D3DXCreateLine(struct IDirect3DDevice9 *device, struct ID3DXLine object->ref = 1; object->device = device; IDirect3DDevice9_AddRef(device); + object->width = 1.0f; *line = &object->ID3DXLine_iface; diff --git a/dlls/d3dx9_36/tests/line.c b/dlls/d3dx9_36/tests/line.c index ae8d07e0623..d89ae160ba5 100644 --- a/dlls/d3dx9_36/tests/line.c +++ b/dlls/d3dx9_36/tests/line.c @@ -115,6 +115,38 @@ static void test_create_line(IDirect3DDevice9* device) ok(ref == 0, "Got %x references to line %p, expected 0\n", ref, line); } +static void test_line_width(IDirect3DDevice9* device) +{ + ID3DXLine *line = NULL; + ULONG refcount; + float width; + HRESULT hr; + + hr = D3DXCreateLine(device, &line); + ok(hr == D3D_OK, "Failed to create a line, hr %#x.\n", hr); + + width = ID3DXLine_GetWidth(line); + ok(width == 1.0f, "Unexpected line width %.8e.\n", width); + + hr = ID3DXLine_SetWidth(line, 0.0f); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + width = ID3DXLine_GetWidth(line); + ok(width == 1.0f, "Unexpected line width %.8e.\n", width); + + hr = ID3DXLine_SetWidth(line, -1.0f); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + width = ID3DXLine_GetWidth(line); + ok(width == 1.0f, "Unexpected line width %.8e.\n", width); + + hr = ID3DXLine_SetWidth(line, 10.0f); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + width = ID3DXLine_GetWidth(line); + ok(width == 10.0f, "Unexpected line width %.8e.\n", width); + + refcount = ID3DXLine_Release(line); + ok(!refcount, "Got %u references to line.\n", refcount); +} + START_TEST(line) { HWND wnd; @@ -148,6 +180,7 @@ START_TEST(line) } test_create_line(device); + test_line_width(device); IDirect3DDevice9_Release(device); IDirect3D9_Release(d3d);

1 0

Alexandre Julliard : ntdll: Avoid CDECL on internal functions.
by Alexandre Julliard 11 Aug '21

11 Aug '21

Module: wine Branch: master Commit: 2941e5185535781b58bbe5c2b63393a132c30098 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2941e5185535781b58bbe5c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 11 20:07:29 2021 +0200 ntdll: Avoid CDECL on internal functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 372447eb8af..a252e25fbc6 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -381,7 +381,7 @@ static int mmap_is_in_reserved_area( void *addr, SIZE_T size ) return 0; } -static int mmap_enum_reserved_areas( int (CDECL *enum_func)(void *base, SIZE_T size, void *arg), +static int mmap_enum_reserved_areas( int (*enum_func)(void *base, SIZE_T size, void *arg), void *arg, int top_down ) { int ret = 0; @@ -1451,7 +1451,7 @@ struct area_boundary * in the specified region. If no boundaries are found, result is NULL. * virtual_mutex must be held by caller. */ -static int CDECL get_area_boundary_callback( void *start, SIZE_T size, void *arg ) +static int get_area_boundary_callback( void *start, SIZE_T size, void *arg ) { struct area_boundary *area = arg; void *end = (char *)start + size; @@ -1818,7 +1818,7 @@ struct alloc_area * * Try to map some space inside a reserved area. Callback for mmap_enum_reserved_areas. */ -static int CDECL alloc_reserved_area_callback( void *start, SIZE_T size, void *arg ) +static int alloc_reserved_area_callback( void *start, SIZE_T size, void *arg ) { struct alloc_area *alloc = arg; void *end = (char *)start + size; @@ -2633,7 +2633,7 @@ struct alloc_virtual_heap }; /* callback for mmap_enum_reserved_areas to allocate space for the virtual heap */ -static int CDECL alloc_virtual_heap( void *base, SIZE_T size, void *arg ) +static int alloc_virtual_heap( void *base, SIZE_T size, void *arg ) { struct alloc_virtual_heap *alloc = arg; void *end = (char *)base + size; @@ -3668,7 +3668,7 @@ struct free_range }; /* free reserved areas above the limit; callback for mmap_enum_reserved_areas */ -static int CDECL free_reserved_memory( void *base, SIZE_T size, void *arg ) +static int free_reserved_memory( void *base, SIZE_T size, void *arg ) { struct free_range *range = arg; @@ -4048,7 +4048,7 @@ NTSTATUS WINAPI NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T /* retrieve state for a free memory area; callback for mmap_enum_reserved_areas */ -static int CDECL get_free_mem_state_callback( void *start, SIZE_T size, void *arg ) +static int get_free_mem_state_callback( void *start, SIZE_T size, void *arg ) { MEMORY_BASIC_INFORMATION *info = arg; void *end = (char *)start + size;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2021