- Wine-Commits - list.winehq.org

Rémi Bernon : vulkan-1/tests: Create surface and device before calling test_null_hwnd.
by Alexandre Julliard Jan. 31, 2024

Jan. 31, 2024

Module: wine Branch: master Commit: beb75c50b02bec7f70b0999928eeb2a66833ff9e URL: https://gitlab.winehq.org/wine/wine/-/commit/beb75c50b02bec7f70b0999928eeb2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Nov 25 15:34:51 2023 +0100 vulkan-1/tests: Create surface and device before calling test_null_hwnd. --- dlls/vulkan-1/tests/Makefile.in | 2 +- dlls/vulkan-1/tests/vulkan.c | 111 +++++++++++++++++++++------------------- 2 files changed, 60 insertions(+), 53 deletions(-) diff --git a/dlls/vulkan-1/tests/Makefile.in b/dlls/vulkan-1/tests/Makefile.in index 32822d89e60..34c7c860b05 100644 --- a/dlls/vulkan-1/tests/Makefile.in +++ b/dlls/vulkan-1/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = vulkan-1.dll -IMPORTS = vulkan-1 +IMPORTS = vulkan-1 user32 SOURCES = \ vulkan.c diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c index d8040a1dbf3..919f2300f43 100644 --- a/dlls/vulkan-1/tests/vulkan.c +++ b/dlls/vulkan-1/tests/vulkan.c @@ -449,48 +449,41 @@ static void test_private_data(VkPhysicalDevice vk_physical_device) vkDestroyDevice(vk_device, NULL); } -static const char *test_null_hwnd_extensions[] = +static const char *test_win32_surface_extensions[] = { "VK_KHR_surface", "VK_KHR_win32_surface", "VK_KHR_device_group_creation", + "VK_KHR_get_surface_capabilities2", }; -static void test_null_hwnd(VkInstance vk_instance, VkPhysicalDevice vk_physical_device) +static void test_win32_surface_hwnd(VkInstance vk_instance, VkPhysicalDevice vk_physical_device, + VkDevice device, VkSurfaceKHR surface, HWND hwnd) { PFN_vkGetPhysicalDeviceSurfacePresentModesKHR pvkGetPhysicalDeviceSurfacePresentModesKHR; PFN_vkGetPhysicalDevicePresentRectanglesKHR pvkGetPhysicalDevicePresentRectanglesKHR; VkDeviceGroupPresentModeFlagsKHR present_mode_flags; - VkWin32SurfaceCreateInfoKHR surface_create_info; VkSurfaceCapabilitiesKHR surf_caps; VkSurfaceFormatKHR *formats; uint32_t queue_family_index; VkPresentModeKHR *modes; - VkSurfaceKHR surface; + RECT client_rect; uint32_t count; VkRect2D rect; VkBool32 bval; VkResult vr; + if (!GetClientRect(hwnd, &client_rect)) + SetRect(&client_rect, 0, 0, 0, 0); + pvkGetPhysicalDeviceSurfacePresentModesKHR = (void *)vkGetInstanceProcAddr(vk_instance, "vkGetPhysicalDeviceSurfacePresentModesKHR"); pvkGetPhysicalDevicePresentRectanglesKHR = (void *)vkGetInstanceProcAddr(vk_instance, "vkGetPhysicalDevicePresentRectanglesKHR"); - surface_create_info.sType = VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR; - surface_create_info.pNext = NULL; - surface_create_info.flags = 0; - surface_create_info.hinstance = NULL; - surface_create_info.hwnd = NULL; - bval = find_queue_family(vk_physical_device, VK_QUEUE_GRAPHICS_BIT, &queue_family_index); ok(bval, "Could not find presentation queue.\n"); - surface = 0xdeadbeef; - vr = vkCreateWin32SurfaceKHR(vk_instance, &surface_create_info, NULL, &surface); - ok(vr == VK_SUCCESS, "Got unexpected vr %d.\n", vr); - ok(surface != 0xdeadbeef, "Surface not created.\n"); - count = 0; vr = vkGetPhysicalDeviceSurfaceFormatsKHR(vk_physical_device, surface, &count, NULL); ok(vr == VK_SUCCESS, "Got unexpected vr %d.\n", vr); @@ -515,49 +508,63 @@ static void test_null_hwnd(VkInstance vk_instance, VkPhysicalDevice vk_physical_ ok(vr == VK_SUCCESS, "Got unexpected vr %d.\n", vr); free(modes); - if (pvkGetPhysicalDevicePresentRectanglesKHR) + count = 0; + vr = pvkGetPhysicalDevicePresentRectanglesKHR(vk_physical_device, surface, &count, NULL); + ok(vr == VK_SUCCESS, "Got unexpected vr %d.\n", vr); + ok(count == 1, "Got unexpected count %u.\n", count); + + memset(&rect, 0xcc, sizeof(rect)); + vr = pvkGetPhysicalDevicePresentRectanglesKHR(vk_physical_device, surface, &count, &rect); + todo_wine + ok(vr == VK_SUCCESS /* Nvidia */ || vr == VK_ERROR_UNKNOWN /* AMD */, "Got unexpected vr %d.\n", vr); + if (vr == VK_SUCCESS) { - VkDevice vk_device; + RECT tmp_rect = + { + rect.offset.x, + rect.offset.y, + rect.offset.x + rect.extent.width, + rect.offset.y + rect.extent.height, + }; - count = 0; - vr = pvkGetPhysicalDevicePresentRectanglesKHR(vk_physical_device, surface, &count, NULL); - ok(vr == VK_SUCCESS, "Got unexpected vr %d.\n", vr); ok(count == 1, "Got unexpected count %u.\n", count); - memset(&rect, 0xcc, sizeof(rect)); - vr = pvkGetPhysicalDevicePresentRectanglesKHR(vk_physical_device, surface, &count, &rect); - if (vr == VK_SUCCESS) /* Fails on AMD, succeeds on Nvidia. */ - { - ok(count == 1, "Got unexpected count %u.\n", count); - ok(!rect.offset.x && !rect.offset.y && !rect.extent.width && !rect.extent.height, - "Got unexpected rect %d, %d, %u, %u.\n", - rect.offset.x, rect.offset.y, rect.extent.width, rect.extent.height); - } + todo_wine_if(IsRectEmpty(&client_rect)) + ok(EqualRect(&tmp_rect, &client_rect), "Got unexpected rect %s.\n", wine_dbgstr_rect(&tmp_rect)); + } - if ((vr = create_device(vk_physical_device, 0, NULL, NULL, &vk_device)) < 0) - { - skip("Failed to create device, vr %d.\n", vr); - vkDestroySurfaceKHR(vk_instance, surface, NULL); - return; - } + vr = vkGetDeviceGroupSurfacePresentModesKHR(device, surface, &present_mode_flags); + ok(vr == VK_SUCCESS, "Got unexpected vr %d.\n", vr); +} - if (0) - { - /* Causes access violation on Windows. */ - vr = vkGetDeviceGroupSurfacePresentModesKHR(vk_device, surface, &present_mode_flags); - ok(vr == VK_SUCCESS, "Got unexpected vr %d.\n", vr); - } +static void test_win32_surface(VkInstance instance, VkPhysicalDevice physical_device) +{ + static const char *const device_extensions[] = {"VK_KHR_swapchain", "VK_KHR_device_group"}; - vkDestroyDevice(vk_device, NULL); - } - else - { - /* The function should be available in practice with VK_KHR_device_group_creation, but spec lists - * it as a part of VK_KHR_device_group device extension which we don't check, so consider the - * absence of the function. */ - win_skip("pvkGetPhysicalDevicePresentRectanglesKHR is no available.\n"); - } + VkWin32SurfaceCreateInfoKHR create_info = {.sType = VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR}; + VkSurfaceKHR surface; + VkDevice device; + VkResult vr; + + vr = create_device(physical_device, ARRAY_SIZE(device_extensions), device_extensions, NULL, &device); + if (vr != VK_SUCCESS) /* Wine testbot is missing VK_KHR_device_group */ + vr = create_device(physical_device, ARRAY_SIZE(device_extensions) - 1, device_extensions, NULL, &device); + ok(vr == VK_SUCCESS, "Got unexpected vr %d.\n", vr); + + /* test NULL window */ + + winetest_push_context("null"); + + surface = 0xdeadbeef; + vr = vkCreateWin32SurfaceKHR(instance, &create_info, NULL, &surface); + ok(vr == VK_SUCCESS, "Got unexpected vr %d.\n", vr); + ok(surface != 0xdeadbeef, "Surface not created.\n"); + + test_win32_surface_hwnd(instance, physical_device, device, surface, NULL); + + vkDestroySurfaceKHR(instance, surface, NULL); + winetest_pop_context(); - vkDestroySurfaceKHR(vk_instance, surface, NULL); + vkDestroyDevice(device, NULL); } static uint32_t find_memory_type(VkPhysicalDevice vk_physical_device, VkMemoryPropertyFlagBits flags, uint32_t mask) @@ -955,6 +962,6 @@ START_TEST(vulkan) test_unsupported_instance_extensions(); for_each_device(test_unsupported_device_extensions); for_each_device(test_private_data); - for_each_device_instance(ARRAY_SIZE(test_null_hwnd_extensions), test_null_hwnd_extensions, test_null_hwnd, NULL); + for_each_device_instance(ARRAY_SIZE(test_win32_surface_extensions), test_win32_surface_extensions, test_win32_surface, NULL); for_each_device_instance(ARRAY_SIZE(test_external_memory_extensions), test_external_memory_extensions, test_external_memory, NULL); }

1 0

Rémi Bernon : vulkan-1/tests: Enable VK_VERSION_1_1 as requested by validation layers.
by Alexandre Julliard Jan. 31, 2024

Jan. 31, 2024

Module: wine Branch: master Commit: 69b6a929786576f4b8082bf31eef365714f2efc4 URL: https://gitlab.winehq.org/wine/wine/-/commit/69b6a929786576f4b8082bf31eef36… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Nov 26 15:06:29 2023 +0100 vulkan-1/tests: Enable VK_VERSION_1_1 as requested by validation layers. --- dlls/vulkan-1/tests/vulkan.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c index c4fd0f40256..d8040a1dbf3 100644 --- a/dlls/vulkan-1/tests/vulkan.c +++ b/dlls/vulkan-1/tests/vulkan.c @@ -23,12 +23,15 @@ static VkResult create_instance(uint32_t extension_count, const char * const *enabled_extensions, VkInstance *vk_instance) { + VkApplicationInfo app_info = {.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO}; VkInstanceCreateInfo create_info; + app_info.apiVersion = VK_API_VERSION_1_1; + create_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; create_info.pNext = NULL; create_info.flags = 0; - create_info.pApplicationInfo = NULL; + create_info.pApplicationInfo = &app_info; create_info.enabledLayerCount = 0; create_info.ppEnabledLayerNames = NULL; create_info.enabledExtensionCount = extension_count;

1 0

Louis Lenders : ntdll: Add stub for RtlGetDeviceFamilyInfoEnum.
by Alexandre Julliard Jan. 31, 2024

Jan. 31, 2024

Module: wine Branch: master Commit: a24039ad09abd72f47c4d76544d337a76fb626cf URL: https://gitlab.winehq.org/wine/wine/-/commit/a24039ad09abd72f47c4d76544d337… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Jan 30 10:28:47 2024 +0100 ntdll: Add stub for RtlGetDeviceFamilyInfoEnum. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56259 --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/rtl.c | 12 +++++++++++ dlls/ntdll/tests/rtl.c | 24 +++++++++++++++++++++ include/winnt.h | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 94 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 18dddf928cf..64fdb6fdb24 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -711,6 +711,7 @@ @ stdcall RtlFreeThreadActivationContextStack() @ stdcall RtlFreeUnicodeString(ptr) @ stdcall RtlFreeUserStack(ptr) +@ stdcall RtlGetDeviceFamilyInfoEnum(ptr ptr ptr) @ stdcall RtlGUIDFromString(ptr ptr) @ stub RtlGenerate8dot3Name @ stdcall RtlGetAce(ptr long ptr) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 0d0b2d370f3..a077108b8d0 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -2193,3 +2193,15 @@ char WINAPI RtlQueryProcessPlaceholderCompatibilityMode(void) FIXME("stub\n"); return PHCM_APPLICATION_DEFAULT; } + +/********************************************************************* + * RtlGetDeviceFamilyInfoEnum [NTDLL.@] + */ +void WINAPI RtlGetDeviceFamilyInfoEnum(ULONGLONG *version, DWORD *family, DWORD *form) +{ + FIXME("%p %p %p: stub\n", version, family, form); + + if (version) *version = 0; + if (family) *family = DEVICEFAMILYINFOENUM_DESKTOP; + if (form) *form = DEVICEFAMILYDEVICEFORM_UNKNOWN; +} diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 754f5b711dd..4a4370d5903 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -99,6 +99,7 @@ static void * (WINAPI *pRtlFindExportedRoutineByName)(HMODULE,const char *); static NTSTATUS (WINAPI *pLdrEnumerateLoadedModules)(void *, void *, void *); static NTSTATUS (WINAPI *pLdrRegisterDllNotification)(ULONG, PLDR_DLL_NOTIFICATION_FUNCTION, void *, void **); static NTSTATUS (WINAPI *pLdrUnregisterDllNotification)(void *); +static VOID (WINAPI *pRtlGetDeviceFamilyInfoEnum)(ULONGLONG *,DWORD *,DWORD *); static HMODULE hkernel32 = 0; static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); @@ -142,6 +143,7 @@ static void InitFunctionPtrs(void) pLdrEnumerateLoadedModules = (void *)GetProcAddress(hntdll, "LdrEnumerateLoadedModules"); pLdrRegisterDllNotification = (void *)GetProcAddress(hntdll, "LdrRegisterDllNotification"); pLdrUnregisterDllNotification = (void *)GetProcAddress(hntdll, "LdrUnregisterDllNotification"); + pRtlGetDeviceFamilyInfoEnum = (void *)GetProcAddress(hntdll, "RtlGetDeviceFamilyInfoEnum"); } hkernel32 = LoadLibraryA("kernel32.dll"); ok(hkernel32 != 0, "LoadLibrary failed\n"); @@ -3754,6 +3756,27 @@ static void test_RtlFindExportedRoutineByName(void) ok( proc == NULL, "Shouldn't find forwarded function\n" ); } +static void test_RtlGetDeviceFamilyInfoEnum(void) +{ + ULONGLONG version; + DWORD family, form; + + if (!pRtlGetDeviceFamilyInfoEnum) + { + win_skip( "RtlGetDeviceFamilyInfoEnum is not present\n" ); + return; + } + + version = 0x1234567; + family = 1234567; + form = 1234567; + pRtlGetDeviceFamilyInfoEnum(&version, &family, &form); + ok( version != 0x1234567, "got unexpected unchanged value 0x1234567\n" ); + ok( family <= DEVICEFAMILYINFOENUM_MAX, "got unexpected %lu\n", family ); + ok( form <= DEVICEFAMILYDEVICEFORM_MAX, "got unexpected %lu\n", form ); + trace( "UAP version is %#I64x, device family is %lu, form factor is %lu\n", version, family, form ); +} + START_TEST(rtl) { InitFunctionPtrs(); @@ -3802,4 +3825,5 @@ START_TEST(rtl) test_RtlInitializeSid(); test_RtlValidSecurityDescriptor(); test_RtlFindExportedRoutineByName(); + test_RtlGetDeviceFamilyInfoEnum(); } diff --git a/include/winnt.h b/include/winnt.h index e9fef20c76d..e1de2f29ecd 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5915,6 +5915,63 @@ typedef struct _TAPE_GET_MEDIA_PARAMETERS { ) /* ------------------------------ end registry ------------------------------ */ +#define DEVICEFAMILYINFOENUM_UAP 0x00 +#define DEVICEFAMILYINFOENUM_WINDOWS_8X 0x01 +#define DEVICEFAMILYINFOENUM_WINDOWS_PHONE_8X 0x02 +#define DEVICEFAMILYINFOENUM_DESKTOP 0x03 +#define DEVICEFAMILYINFOENUM_MOBILE 0x04 +#define DEVICEFAMILYINFOENUM_XBOX 0x05 +#define DEVICEFAMILYINFOENUM_TEAM 0x06 +#define DEVICEFAMILYINFOENUM_IOT 0x07 +#define DEVICEFAMILYINFOENUM_IOT_HEADLESS 0x08 +#define DEVICEFAMILYINFOENUM_SERVER 0x09 +#define DEVICEFAMILYINFOENUM_HOLOGRAPHIC 0x0A +#define DEVICEFAMILYINFOENUM_XBOXSRA 0x0B +#define DEVICEFAMILYINFOENUM_XBOXERA 0x0C +#define DEVICEFAMILYINFOENUM_SERVER_NANO 0x0D +#define DEVICEFAMILYINFOENUM_8828080 0x0E +#define DEVICEFAMILYINFOENUM_7067329 0x0F +#define DEVICEFAMILYINFOENUM_WINDOWS_CORE 0x10 +#define DEVICEFAMILYINFOENUM_WINDOWS_CORE_HEADLESS 0x11 +#define DEVICEFAMILYINFOENUM_MAX 0x11 + +#define DEVICEFAMILYDEVICEFORM_UNKNOWN 0x00 +#define DEVICEFAMILYDEVICEFORM_PHONE 0x01 +#define DEVICEFAMILYDEVICEFORM_TABLET 0x02 +#define DEVICEFAMILYDEVICEFORM_DESKTOP 0x03 +#define DEVICEFAMILYDEVICEFORM_NOTEBOOK 0x04 +#define DEVICEFAMILYDEVICEFORM_CONVERTIBLE 0x05 +#define DEVICEFAMILYDEVICEFORM_DETACHABLE 0x06 +#define DEVICEFAMILYDEVICEFORM_ALLINONE 0x07 +#define DEVICEFAMILYDEVICEFORM_STICKPC 0x08 +#define DEVICEFAMILYDEVICEFORM_PUCK 0x09 +#define DEVICEFAMILYDEVICEFORM_LARGESCREEN 0x0A +#define DEVICEFAMILYDEVICEFORM_HMD 0x0B +#define DEVICEFAMILYDEVICEFORM_INDUSTRY_HANDHELD 0x0C +#define DEVICEFAMILYDEVICEFORM_INDUSTRY_TABLET 0x0D +#define DEVICEFAMILYDEVICEFORM_BANKING 0x0E +#define DEVICEFAMILYDEVICEFORM_BUILDING_AUTOMATION 0x0F +#define DEVICEFAMILYDEVICEFORM_DIGITAL_SIGNAGE 0x10 +#define DEVICEFAMILYDEVICEFORM_GAMING 0x11 +#define DEVICEFAMILYDEVICEFORM_HOME_AUTOMATION 0x12 +#define DEVICEFAMILYDEVICEFORM_INDUSTRIAL_AUTOMATION 0x13 +#define DEVICEFAMILYDEVICEFORM_KIOSK 0x14 +#define DEVICEFAMILYDEVICEFORM_MAKER_BOARD 0x15 +#define DEVICEFAMILYDEVICEFORM_MEDICAL 0x16 +#define DEVICEFAMILYDEVICEFORM_NETWORKING 0x17 +#define DEVICEFAMILYDEVICEFORM_POINT_OF_SERVICE 0x18 +#define DEVICEFAMILYDEVICEFORM_PRINTING 0x19 +#define DEVICEFAMILYDEVICEFORM_THIN_CLIENT 0x1A +#define DEVICEFAMILYDEVICEFORM_TOY 0x1B +#define DEVICEFAMILYDEVICEFORM_VENDING 0x1C +#define DEVICEFAMILYDEVICEFORM_INDUSTRY_OTHER 0x1D +#define DEVICEFAMILYDEVICEFORM_XBOX_ONE 0x1E +#define DEVICEFAMILYDEVICEFORM_XBOX_ONE_S 0x1F +#define DEVICEFAMILYDEVICEFORM_XBOX_ONE_X 0x20 +#define DEVICEFAMILYDEVICEFORM_XBOX_ONE_X_DEVKIT 0x21 +#define DEVICEFAMILYDEVICEFORM_MAX 0x21 + +NTSYSAPI void WINAPI RtlGetDeviceFamilyInfoEnum(ULONGLONG*,DWORD*,DWORD*); #define EVENTLOG_SUCCESS 0x0000 #define EVENTLOG_ERROR_TYPE 0x0001

1 0

Arkadiusz Hiler : winebus.sys: Use 4 bits for hat switches.
by Alexandre Julliard Jan. 30, 2024

Jan. 30, 2024

Module: wine Branch: master Commit: e3431a02e1d23ad506512b906f244eae1db05035 URL: https://gitlab.winehq.org/wine/wine/-/commit/e3431a02e1d23ad506512b906f244e… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Tue Jan 30 00:20:55 2024 +0200 winebus.sys: Use 4 bits for hat switches. Declaring them as 8 bits crashes game due to how Unity's native hid support parses the data. --- dlls/winebus.sys/hid.c | 74 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 50 insertions(+), 24 deletions(-) diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index 733f9a51f96..d31718c6293 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -209,13 +209,14 @@ static BOOL hid_device_add_hatswitch_count(struct unix_device *iface, BYTE count ERR("hatswitches should be added before buttons!\n"); else if ((iface->hid_device_state.bit_size % 8)) ERR("hatswitches should be byte aligned, missing padding!\n"); - else if (iface->hid_device_state.bit_size + 8 * count > 0x80000) + else if (iface->hid_device_state.bit_size + 4 * (count + 1) > 0x80000) ERR("report size overflow, too many elements!\n"); else { if (!iface->hid_device_state.hatswitch_count) iface->hid_device_state.hatswitch_start = offset; iface->hid_device_state.hatswitch_count += count; - iface->hid_device_state.bit_size += 8 * count; + iface->hid_device_state.bit_size += 4 * count; + if (count % 2) iface->hid_device_state.bit_size += 4; return TRUE; } @@ -231,16 +232,28 @@ BOOL hid_device_add_hatswitch(struct unix_device *iface, INT count) USAGE(1, HID_USAGE_GENERIC_HATSWITCH), LOGICAL_MINIMUM(1, 1), LOGICAL_MAXIMUM(1, 8), - REPORT_SIZE(1, 8), + REPORT_SIZE(1, 4), REPORT_COUNT(4, count), UNIT(1, 0x0), /* None */ INPUT(1, Data|Var|Abs|Null), }; + const BYTE template_pad[] = + { + REPORT_COUNT(1, 4), + REPORT_SIZE(1, 1), + INPUT(1, Cnst|Ary|Abs), + }; if (!hid_device_add_hatswitch_count(iface, count)) return FALSE; - return hid_report_descriptor_append(desc, template, sizeof(template)); + if (!hid_report_descriptor_append(desc, template, sizeof(template))) + return FALSE; + + if ((count % 2) && !hid_report_descriptor_append(desc, template_pad, sizeof(template_pad))) + return FALSE; + + return TRUE; } static BOOL hid_device_add_axis_count(struct unix_device *iface, BOOL rel, BYTE count, @@ -1409,8 +1422,9 @@ BOOL hid_device_set_button(struct unix_device *iface, ULONG index, BOOL is_set) * +1 | 6 5 4 * v */ -static void hatswitch_decompose(BYTE value, LONG *x, LONG *y) +static void hatswitch_decompose(BYTE value, ULONG index, LONG *x, LONG *y) { + value = (index % 2) ? (value >> 4) : (value & 0x0f); *x = *y = 0; if (value == 8 || value == 1 || value == 2) *y = -1; if (value == 6 || value == 5 || value == 4) *y = +1; @@ -1418,49 +1432,61 @@ static void hatswitch_decompose(BYTE value, LONG *x, LONG *y) if (value == 2 || value == 3 || value == 4) *x = +1; } -static void hatswitch_compose(LONG x, LONG y, BYTE *value) +static void hatswitch_compose(LONG x, LONG y, BYTE *value, ULONG index) { - if (x == 0 && y == 0) *value = 0; - else if (x == 0 && y < 0) *value = 1; - else if (x > 0 && y < 0) *value = 2; - else if (x > 0 && y == 0) *value = 3; - else if (x > 0 && y > 0) *value = 4; - else if (x == 0 && y > 0) *value = 5; - else if (x < 0 && y > 0) *value = 6; - else if (x < 0 && y == 0) *value = 7; - else if (x < 0 && y < 0) *value = 8; + BYTE new_value = 0; + if (x == 0 && y == 0) new_value = 0; + else if (x == 0 && y < 0) new_value = 1; + else if (x > 0 && y < 0) new_value = 2; + else if (x > 0 && y == 0) new_value = 3; + else if (x > 0 && y > 0) new_value = 4; + else if (x == 0 && y > 0) new_value = 5; + else if (x < 0 && y > 0) new_value = 6; + else if (x < 0 && y == 0) new_value = 7; + else if (x < 0 && y < 0) new_value = 8; + + if (index % 2) + { + *value &= 0xf; + *value |= new_value << 4; + } + else + { + *value &= 0xf0; + *value |= new_value; + } } BOOL hid_device_set_hatswitch_x(struct unix_device *iface, ULONG index, LONG new_x) { struct hid_device_state *state = &iface->hid_device_state; - ULONG offset = state->hatswitch_start + index; + ULONG offset = state->hatswitch_start + index / 2; LONG x, y; if (index > state->hatswitch_count) return FALSE; - hatswitch_decompose(state->report_buf[offset], &x, &y); - hatswitch_compose(new_x, y, &state->report_buf[offset]); + hatswitch_decompose(state->report_buf[offset], index, &x, &y); + hatswitch_compose(new_x, y, &state->report_buf[offset], index); return TRUE; } BOOL hid_device_set_hatswitch_y(struct unix_device *iface, ULONG index, LONG new_y) { struct hid_device_state *state = &iface->hid_device_state; - ULONG offset = state->hatswitch_start + index; + ULONG offset = state->hatswitch_start + index / 2; LONG x, y; if (index > state->hatswitch_count) return FALSE; - hatswitch_decompose(state->report_buf[offset], &x, &y); - hatswitch_compose(x, new_y, &state->report_buf[offset]); + hatswitch_decompose(state->report_buf[offset], index, &x, &y); + hatswitch_compose(x, new_y, &state->report_buf[offset], index); return TRUE; } BOOL hid_device_move_hatswitch(struct unix_device *iface, ULONG index, LONG x, LONG y) { struct hid_device_state *state = &iface->hid_device_state; - ULONG offset = state->hatswitch_start + index; + ULONG offset = state->hatswitch_start + index / 2; LONG old_x, old_y; if (index > state->hatswitch_count) return FALSE; - hatswitch_decompose(state->report_buf[offset], &old_x, &old_y); - hatswitch_compose(old_x + x, old_y + y, &state->report_buf[offset]); + hatswitch_decompose(state->report_buf[offset], index, &old_x, &old_y); + hatswitch_compose(old_x + x, old_y + y, &state->report_buf[offset], index); return TRUE; }

1 0

Daniel Lehman : glu32: Return GLU_INVALID_ENUM for illegal pixel types.
by Alexandre Julliard Jan. 30, 2024

Jan. 30, 2024

Module: wine Branch: master Commit: ee1e15ac9d209a48f57daab942277a28d6a4ac21 URL: https://gitlab.winehq.org/wine/wine/-/commit/ee1e15ac9d209a48f57daab942277a… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sun Jan 28 08:05:20 2024 -0800 glu32: Return GLU_INVALID_ENUM for illegal pixel types. --- dlls/glu32/mipmap.c | 4 ++-- dlls/glu32/tests/glu.c | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/glu32/mipmap.c b/dlls/glu32/mipmap.c index 4a324f45e70..b0854f2fca8 100644 --- a/dlls/glu32/mipmap.c +++ b/dlls/glu32/mipmap.c @@ -3448,10 +3448,10 @@ GLint WINAPI gluScaleImage( GLenum format, GLint widthin, GLint heightin, GLenum return GLU_INVALID_ENUM; } if (!isLegalFormatForPackedPixelType(format, typein)) { - return GLU_INVALID_OPERATION; + return GLU_INVALID_ENUM; } if (!isLegalFormatForPackedPixelType(format, typeout)) { - return GLU_INVALID_OPERATION; + return GLU_INVALID_ENUM; } if (!wglGetCurrentContext()) { return GL_OUT_OF_MEMORY; /* windows returns this if no gl context (not glu error) */ diff --git a/dlls/glu32/tests/glu.c b/dlls/glu32/tests/glu.c index 4e9931141fb..16607a96e51 100644 --- a/dlls/glu32/tests/glu.c +++ b/dlls/glu32/tests/glu.c @@ -72,14 +72,12 @@ static void test_gluScaleImage(HDC hdc, HGLRC hglrc) DIMOUT, DIMOUT, ~0, bufout); ok(err == GLU_INVALID_ENUM, "got %x\n", err); - todo_wine { err = gluScaleImage(GL_RGBA, DIMIN, DIMIN, GL_UNSIGNED_BYTE_3_3_2, bufin, DIMOUT, DIMOUT, GL_UNSIGNED_BYTE, bufout); ok(err == GLU_INVALID_ENUM, "got %x\n", err); err = gluScaleImage(GL_RGBA, DIMIN, DIMIN, GL_UNSIGNED_BYTE, bufin, DIMOUT, DIMOUT, GL_UNSIGNED_BYTE_3_3_2, bufout); ok(err == GLU_INVALID_ENUM, "got %x\n", err); - } /* valid arguments */ memset(bufout, 0, SIZEOUT);

1 0

Zhiyi Zhang : winex11.drv: Translate whole_rect to x11 root coordinates in set_size_hints().
by Alexandre Julliard Jan. 30, 2024

Jan. 30, 2024

Module: wine Branch: master Commit: a128ad5c5b69e59f5da35500cf9facc6699fd460 URL: https://gitlab.winehq.org/wine/wine/-/commit/a128ad5c5b69e59f5da35500cf9fac… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jan 3 16:11:17 2024 +0800 winex11.drv: Translate whole_rect to x11 root coordinates in set_size_hints(). whole_rect is in win32 virtual screen coordinates. It needs to be converted to x11 root coordinates for XSetWMNormalHints(). --- dlls/winex11.drv/window.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index a9d6dbf1121..8ab694450ef 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -716,8 +716,9 @@ static void set_size_hints( struct x11drv_win_data *data, DWORD style ) { if (data->hwnd != NtUserGetDesktopWindow()) /* don't force position of desktop */ { - size_hints->x = data->whole_rect.left; - size_hints->y = data->whole_rect.top; + POINT pt = virtual_screen_to_root( data->whole_rect.left, data->whole_rect.top ); + size_hints->x = pt.x; + size_hints->y = pt.y; size_hints->flags |= PPosition; } else size_hints->win_gravity = NorthWestGravity;

1 0

Rémi Bernon : winegstreamer: Ask GStreamer to stop messing with signal handlers.
by Alexandre Julliard Jan. 30, 2024

Jan. 30, 2024

Module: wine Branch: master Commit: 02921e4900b5b377a4b4b0cddbb7c2b7419cee9e URL: https://gitlab.winehq.org/wine/wine/-/commit/02921e4900b5b377a4b4b0cddbb7c2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 24 19:29:15 2024 +0100 winegstreamer: Ask GStreamer to stop messing with signal handlers. --- dlls/winegstreamer/unixlib.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/winegstreamer/unixlib.c b/dlls/winegstreamer/unixlib.c index db9d1eb114f..a2ec66e1990 100644 --- a/dlls/winegstreamer/unixlib.c +++ b/dlls/winegstreamer/unixlib.c @@ -253,6 +253,13 @@ NTSTATUS wg_init_gstreamer(void *arg) char **argv = args; GError *err; + /* GStreamer installs a temporary SEGV handler when it loads plugins + * to initialize its registry calling exit(-1) when any fault is caught. + * We need to make sure any signal reaches our signal handlers to catch + * and handle them, or eventually propagate the exceptions to the user. + */ + gst_segtrap_set_enabled(false); + if (!gst_init_check(&argc, &argv, &err)) { fprintf(stderr, "winegstreamer: failed to initialize GStreamer: %s\n", err->message);

1 0

Daniel Lehman : glu32: Return GL_OUT_OF_MEMORY from gluScaleImage if no context.
by Alexandre Julliard Jan. 30, 2024

Jan. 30, 2024

Module: wine Branch: master Commit: 3b61019b8cdb64853fe1cb8f5e4c9381dcdaec02 URL: https://gitlab.winehq.org/wine/wine/-/commit/3b61019b8cdb64853fe1cb8f5e4c93… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sun Jan 28 08:05:20 2024 -0800 glu32: Return GL_OUT_OF_MEMORY from gluScaleImage if no context. --- dlls/glu32/mipmap.c | 5 +++++ dlls/glu32/tests/glu.c | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/glu32/mipmap.c b/dlls/glu32/mipmap.c index 6877e2f342c..4a324f45e70 100644 --- a/dlls/glu32/mipmap.c +++ b/dlls/glu32/mipmap.c @@ -37,6 +37,7 @@ #include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "wine/wgl.h" #include "wine/glu.h" @@ -3452,6 +3453,10 @@ GLint WINAPI gluScaleImage( GLenum format, GLint widthin, GLint heightin, GLenum if (!isLegalFormatForPackedPixelType(format, typeout)) { return GLU_INVALID_OPERATION; } + if (!wglGetCurrentContext()) { + return GL_OUT_OF_MEMORY; /* windows returns this if no gl context (not glu error) */ + } + beforeImage = HeapAlloc(GetProcessHeap(), 0, image_size(widthin, heightin, format, GL_UNSIGNED_SHORT)); afterImage = diff --git a/dlls/glu32/tests/glu.c b/dlls/glu32/tests/glu.c index 698976d3bd0..4e9931141fb 100644 --- a/dlls/glu32/tests/glu.c +++ b/dlls/glu32/tests/glu.c @@ -40,12 +40,9 @@ static void test_gluScaleImage(HDC hdc, HGLRC hglrc) /* test without any context */ wglMakeCurrent(hdc, 0); - /* test crashes on Wine */ - if (!winetest_platform_is_wine) { err = gluScaleImage(GL_RGBA, DIMIN, DIMIN, GL_UNSIGNED_BYTE, bufin, DIMOUT, DIMOUT, GL_UNSIGNED_BYTE, bufout); ok(err == GL_OUT_OF_MEMORY, "got %x\n", err); - } /* test with context */ wglMakeCurrent(hdc, hglrc);

1 0

Arkadiusz Hiler : winebus.sys: Fix units used for hat switches.
by Alexandre Julliard Jan. 30, 2024

Jan. 30, 2024

Module: wine Branch: master Commit: 94a7b32a55fa46d7156907b8ea6b68b545cb3122 URL: https://gitlab.winehq.org/wine/wine/-/commit/94a7b32a55fa46d7156907b8ea6b68… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Tue Jan 30 00:18:58 2024 +0200 winebus.sys: Fix units used for hat switches. The 0xe nibble value is reserved and makes hid-decode from hid-tools crash while tryign to parse the descriptor. 0x0 is the correct way of expressing no special units are used. --- dlls/winebus.sys/hid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index 6d2b484ccca..733f9a51f96 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -233,7 +233,7 @@ BOOL hid_device_add_hatswitch(struct unix_device *iface, INT count) LOGICAL_MAXIMUM(1, 8), REPORT_SIZE(1, 8), REPORT_COUNT(4, count), - UNIT(1, 0x0e /* none */), + UNIT(1, 0x0), /* None */ INPUT(1, Data|Var|Abs|Null), };

1 0

Piotr Caban : winedump: Sync demangling code with msvcrt.
by Alexandre Julliard Jan. 30, 2024

Jan. 30, 2024

Module: wine Branch: master Commit: 268f3adce9088ae1d38e844c40b70a7d37d6feef URL: https://gitlab.winehq.org/wine/wine/-/commit/268f3adce9088ae1d38e844c40b70a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 30 17:07:44 2024 +0100 winedump: Sync demangling code with msvcrt. --- tools/winedump/msmangle.c | 92 ++++++++++++++++++++++------------------------- 1 file changed, 42 insertions(+), 50 deletions(-)

1 0