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

Józef Kucia : wined3d: Add support for Vulkan instance extensions.
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: cc9b2dba4a63b4ca8cd0bcb9445fc55f21168a50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc9b2dba4a63b4ca8cd0bcb9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Apr 6 11:37:35 2019 +0200 wined3d: Add support for Vulkan instance extensions. Use VK_KHR_get_physical_device_properties2 if Vulkan 1.1 is not available. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 91 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 89 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 2c6ea25..d8937c2 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -230,8 +230,85 @@ static unsigned int wined3d_get_wine_vk_version(void) return VK_MAKE_VERSION(major, minor, 0); } +static const struct +{ + const char *name; + unsigned int core_since_version; + BOOL required; +} +vulkan_instance_extensions[] = +{ + {VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME, VK_API_VERSION_1_1, FALSE}, +}; + +static BOOL enable_vulkan_instance_extensions(uint32_t *extension_count, + const char *enabled_extensions[], const struct wined3d_vk_info *vk_info) +{ + PFN_vkEnumerateInstanceExtensionProperties pfn_vkEnumerateInstanceExtensionProperties; + VkExtensionProperties *extensions = NULL; + BOOL success = FALSE, found; + unsigned int i, j, count; + VkResult vr; + + *extension_count = 0; + + if (!(pfn_vkEnumerateInstanceExtensionProperties + = (void *)VK_CALL(vkGetInstanceProcAddr(NULL, "vkEnumerateInstanceExtensionProperties")))) + { + WARN("Failed to get 'vkEnumerateInstanceExtensionProperties'.\n"); + goto done; + } + + if ((vr = pfn_vkEnumerateInstanceExtensionProperties(NULL, &count, NULL)) < 0) + { + WARN("Failed to count instance extensions, vr %d.\n", vr); + goto done; + } + if (!(extensions = heap_calloc(count, sizeof(*extensions)))) + { + WARN("Out of memory.\n"); + goto done; + } + if ((vr = pfn_vkEnumerateInstanceExtensionProperties(NULL, &count, extensions)) < 0) + { + WARN("Failed to enumerate extensions, vr %d.\n", vr); + goto done; + } + + for (i = 0; i < ARRAY_SIZE(vulkan_instance_extensions); ++i) + { + if (vulkan_instance_extensions[i].core_since_version <= vk_info->api_version) + continue; + + for (j = 0, found = FALSE; j < count; ++j) + { + if (!strcmp(extensions[j].extensionName, vulkan_instance_extensions[i].name)) + { + found = TRUE; + break; + } + } + if (found) + { + TRACE("Enabling instance extension '%s'.\n", vulkan_instance_extensions[i].name); + enabled_extensions[(*extension_count)++] = vulkan_instance_extensions[i].name; + } + else if (!found && vulkan_instance_extensions[i].required) + { + WARN("Required extension '%s' is not available.\n", vulkan_instance_extensions[i].name); + goto done; + } + } + success = TRUE; + +done: + heap_free(extensions); + return success; +} + static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) { + const char *enabled_instance_extensions[ARRAY_SIZE(vulkan_instance_extensions)]; PFN_vkEnumerateInstanceVersion pfn_vkEnumerateInstanceVersion; struct vulkan_ops *vk_ops = &vk_info->vk_ops; VkInstance instance = VK_NULL_HANDLE; @@ -246,7 +323,7 @@ static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) if (!(vk_ops->vkCreateInstance = (void *)VK_CALL(vkGetInstanceProcAddr(NULL, "vkCreateInstance")))) { - ERR("Could not get 'vkCreateInstance'.\n"); + ERR("Failed to get 'vkCreateInstance'.\n"); goto fail; } @@ -271,6 +348,10 @@ static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) memset(&instance_info, 0, sizeof(instance_info)); instance_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; instance_info.pApplicationInfo = &app_info; + instance_info.ppEnabledExtensionNames = enabled_instance_extensions; + if (!enable_vulkan_instance_extensions(&instance_info.enabledExtensionCount, enabled_instance_extensions, vk_info)) + goto fail; + if ((vr = VK_CALL(vkCreateInstance(&instance_info, NULL, &instance))) < 0) { WARN("Failed to create Vulkan instance, vr %d.\n", vr); @@ -296,6 +377,12 @@ static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) #undef VK_INSTANCE_EXT_PFN #undef VK_DEVICE_PFN +#define MAP_INSTANCE_FUNCTION(core_pfn, ext_pfn) \ + if (!vk_ops->core_pfn) \ + vk_ops->core_pfn = (void *)VK_CALL(vkGetInstanceProcAddr(instance, #ext_pfn)); + MAP_INSTANCE_FUNCTION(vkGetPhysicalDeviceProperties2, vkGetPhysicalDeviceProperties2KHR) +#undef MAP_INSTANCE_FUNCTION + vk_info->instance = instance; return TRUE; @@ -386,7 +473,7 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; properties2.pNext = &id_properties; - if (vk_info->api_version >= VK_API_VERSION_1_1) + if (vk_info->vk_ops.vkGetPhysicalDeviceProperties2) VK_CALL(vkGetPhysicalDeviceProperties2(adapter_vk->physical_device, &properties2)); else VK_CALL(vkGetPhysicalDeviceProperties(adapter_vk->physical_device, &properties2.properties));

1 0

Alexandre Julliard : d3dxof: Avoid using DPRINTF().
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: 776fae4c60def4dfbd60faa285671cefe9f03e1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=776fae4c60def4dfbd60faa2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 8 19:33:30 2019 +0200 d3dxof: Avoid using DPRINTF(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dxof/d3dxof.c | 4 ++-- dlls/d3dxof/parsing.c | 30 +++++++++++++++--------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 5499551..90c9192 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -264,7 +264,7 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV ULONG i; TRACE("Registered templates (%d):\n", This->nb_xtemplates); for (i = 1; i < This->nb_xtemplates; i++) - DPRINTF("%s - %s\n", This->xtemplates[i].name, debugstr_guid(&This->xtemplates[i].class_id)); + TRACE("%s - %s\n", This->xtemplates[i].name, debugstr_guid(&This->xtemplates[i].class_id)); } *ppEnumObj = &object->IDirectXFileEnumObject_iface; @@ -343,7 +343,7 @@ static HRESULT WINAPI IDirectXFileImpl_RegisterTemplates(IDirectXFile* iface, LP ULONG i; TRACE("Registered templates (%d):\n", This->nb_xtemplates); for (i = 1; i < This->nb_xtemplates; i++) - DPRINTF("%s - %s\n", This->xtemplates[i].name, debugstr_guid(&This->xtemplates[i].class_id)); + TRACE("%s - %s\n", This->xtemplates[i].name, debugstr_guid(&This->xtemplates[i].class_id)); } hr = DXFILE_OK; diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 82cb186..f1e0982 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -133,38 +133,38 @@ static void dump_template(xtemplate* templates_array, xtemplate* ptemplate) clsid = &ptemplate->class_id; - DPRINTF("template %s\n", ptemplate->name); - DPRINTF("{\n"); - DPRINTF(CLSIDFMT "\n", clsid->Data1, clsid->Data2, clsid->Data3, clsid->Data4[0], + wine_dbg_printf("template %s\n", ptemplate->name); + wine_dbg_printf("{\n"); + wine_dbg_printf(CLSIDFMT "\n", clsid->Data1, clsid->Data2, clsid->Data3, clsid->Data4[0], clsid->Data4[1], clsid->Data4[2], clsid->Data4[3], clsid->Data4[4], clsid->Data4[5], clsid->Data4[6], clsid->Data4[7]); for (j = 0; j < ptemplate->nb_members; j++) { if (ptemplate->members[j].nb_dims) - DPRINTF("array "); + wine_dbg_printf("array "); if (ptemplate->members[j].type == TOKEN_NAME) - DPRINTF("%s ", templates_array[ptemplate->members[j].idx_template].name); + wine_dbg_printf("%s ", templates_array[ptemplate->members[j].idx_template].name); else - DPRINTF("%s ", get_primitive_string(ptemplate->members[j].type)); - DPRINTF("%s", ptemplate->members[j].name); + wine_dbg_printf("%s ", get_primitive_string(ptemplate->members[j].type)); + wine_dbg_printf("%s", ptemplate->members[j].name); for (k = 0; k < ptemplate->members[j].nb_dims; k++) { if (ptemplate->members[j].dim_fixed[k]) - DPRINTF("[%d]", ptemplate->members[j].dim_value[k]); + wine_dbg_printf("[%d]", ptemplate->members[j].dim_value[k]); else - DPRINTF("[%s]", ptemplate->members[ptemplate->members[j].dim_value[k]].name); + wine_dbg_printf("[%s]", ptemplate->members[ptemplate->members[j].dim_value[k]].name); } - DPRINTF(";\n"); + wine_dbg_printf(";\n"); } if (ptemplate->open) - DPRINTF("[...]\n"); + wine_dbg_printf("[...]\n"); else if (ptemplate->nb_children) { - DPRINTF("[%s", ptemplate->children[0]); + wine_dbg_printf("[%s", ptemplate->children[0]); for (j = 1; j < ptemplate->nb_children; j++) - DPRINTF(",%s", ptemplate->children[j]); - DPRINTF("]\n"); + wine_dbg_printf(",%s", ptemplate->children[j]); + wine_dbg_printf("]\n"); } - DPRINTF("}\n"); + wine_dbg_printf("}\n"); } static BOOL read_bytes(parse_buffer * buf, LPVOID data, DWORD size)

1 0

Sebastian Lackner : dinput: Avoid deadlock when CS are acquired in different order.
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: 02f0342833f6a6affced820519003d954681a7b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02f0342833f6a6affced8205… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Apr 8 03:48:16 2019 +0000 dinput: Avoid deadlock when CS are acquired in different order. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43356 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 8 ++++---- dlls/dinput/dinput_main.c | 4 ++-- dlls/dinput/dinput_private.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 322c8ac..6c44616 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -994,9 +994,9 @@ HRESULT WINAPI IDirectInputDevice2WImpl_Acquire(LPDIRECTINPUTDEVICE8W iface) EnterCriticalSection(&This->crit); res = This->acquired ? S_FALSE : DI_OK; This->acquired = 1; - if (res == DI_OK) - check_dinput_hooks(iface); LeaveCriticalSection(&This->crit); + if (res == DI_OK) + check_dinput_hooks(iface, TRUE); return res; } @@ -1022,9 +1022,9 @@ HRESULT WINAPI IDirectInputDevice2WImpl_Unacquire(LPDIRECTINPUTDEVICE8W iface) EnterCriticalSection(&This->crit); res = !This->acquired ? DI_NOEFFECT : DI_OK; This->acquired = 0; - if (res == DI_OK) - check_dinput_hooks(iface); LeaveCriticalSection(&This->crit); + if (res == DI_OK) + check_dinput_hooks(iface, FALSE); return res; } diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 66dc6e3..65aaf92 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1834,7 +1834,7 @@ static BOOL check_hook_thread(void) return hook_thread_id != 0; } -void check_dinput_hooks(LPDIRECTINPUTDEVICE8W iface) +void check_dinput_hooks(LPDIRECTINPUTDEVICE8W iface, BOOL acquired) { static HHOOK callwndproc_hook; static ULONG foreground_cnt; @@ -1844,7 +1844,7 @@ void check_dinput_hooks(LPDIRECTINPUTDEVICE8W iface) if (dev->dwCoopLevel & DISCL_FOREGROUND) { - if (dev->acquired) + if (acquired) foreground_cnt++; else foreground_cnt--; diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index abdfbeb..acda6c8 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -71,7 +71,7 @@ extern const struct dinput_device joystick_linux_device DECLSPEC_HIDDEN; extern const struct dinput_device joystick_linuxinput_device DECLSPEC_HIDDEN; extern const struct dinput_device joystick_osx_device DECLSPEC_HIDDEN; -extern void check_dinput_hooks(LPDIRECTINPUTDEVICE8W) DECLSPEC_HIDDEN; +extern void check_dinput_hooks(LPDIRECTINPUTDEVICE8W, BOOL) DECLSPEC_HIDDEN; extern void check_dinput_events(void) DECLSPEC_HIDDEN; typedef int (*DI_EVENT_PROC)(LPDIRECTINPUTDEVICE8A, WPARAM, LPARAM);

1 0

Zebediah Figura : hid: Implement HidD_GetIndexedString().
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: 5ae3910e93390d73105abc1171ab084a19ac02be URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ae3910e93390d73105abc11… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 6 22:20:17 2019 -0500 hid: Implement HidD_GetIndexedString(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46711 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hid.spec | 2 +- dlls/hid/hidd.c | 6 ++++++ include/ddk/hidsdi.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index e4d4202..5bf3913 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -4,7 +4,7 @@ @ stub HidD_GetConfiguration @ stdcall HidD_GetFeature(long ptr long) @ stdcall HidD_GetHidGuid(ptr) -@ stub HidD_GetIndexedString +@ stdcall HidD_GetIndexedString(ptr long ptr long) @ stdcall HidD_GetInputReport(long ptr long) @ stdcall HidD_GetManufacturerString(long ptr long) @ stub HidD_GetMsGenreDescriptor diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c index ca14c4f..e313ccb 100644 --- a/dlls/hid/hidd.c +++ b/dlls/hid/hidd.c @@ -157,3 +157,9 @@ BOOLEAN WINAPI HidD_SetOutputReport(HANDLE HidDeviceObject, void *ReportBuffer, TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); return sync_ioctl(HidDeviceObject, IOCTL_HID_SET_OUTPUT_REPORT, ReportBuffer, ReportBufferLength, NULL, 0); } + +BOOLEAN WINAPI HidD_GetIndexedString(HANDLE file, ULONG index, void *buffer, ULONG length) +{ + TRACE("file %p, index %u, buffer %p, length %u.\n", file, index, buffer, length); + return sync_ioctl(file, IOCTL_HID_GET_INDEXED_STRING, &index, sizeof(index), buffer, length); +} diff --git a/include/ddk/hidsdi.h b/include/ddk/hidsdi.h index 71e50a9..e57a968 100644 --- a/include/ddk/hidsdi.h +++ b/include/ddk/hidsdi.h @@ -36,6 +36,7 @@ typedef struct _HIDD_ATTRIBUTES { BOOLEAN WINAPI HidD_GetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength); void WINAPI HidD_GetHidGuid(LPGUID guid); +BOOLEAN WINAPI HidD_GetIndexedString(HANDLE file, ULONG index, void *buffer, ULONG length); BOOLEAN WINAPI HidD_GetInputReport(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength); BOOLEAN WINAPI HidD_GetManufacturerString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_GetNumInputBuffers(HANDLE HidDeviceObject, ULONG *NumberBuffers);

1 0

Nikolay Sivov : dbgeng: Add IDebugSymbols3 definition.
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: b562484d9cb96ad0290e036890cbf00d29ed3604 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b562484d9cb96ad0290e0368… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 8 09:35:40 2019 +0300 dbgeng: Add IDebugSymbols3 definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 12 +- include/dbgeng.h | 358 ++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 367 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b562484d9cb96ad0290e…

1 0

Nikolay Sivov : dbgeng: Implement engine options access methods.
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: a346e44c7fe931b795eb0a3aa706941f7b894e4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a346e44c7fe931b795eb0a3a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 8 09:35:39 2019 +0300 dbgeng: Implement engine options access methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/dbgeng/dbgeng.c | 41 +++++++++++++---- dlls/dbgeng/tests/Makefile.in | 5 ++ dlls/dbgeng/tests/dbgeng.c | 105 ++++++++++++++++++++++++++++++++++++++++++ include/dbgeng.h | 27 +++++++++++ 6 files changed, 171 insertions(+), 9 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a346e44c7fe931b795eb…

1 0

Nikolay Sivov : include: Add more audio format tags.
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: e327a12d6da4bb7acfec88f01c9404bc9a449a41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e327a12d6da4bb7acfec88f0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 8 09:26:51 2019 +0300 include: Add more audio format tags. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mmreg.h | 216 +++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 206 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e327a12d6da4bb7acfec…

1 0

Józef Kucia : wined3d: Map GL_EXT_texture_swizzle to GL_ARB_texture_swizzle.
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: a8f37cf684f9d7184597535041817cdff277b0b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8f37cf684f9d71845975350… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Apr 6 11:37:31 2019 +0200 wined3d: Map GL_EXT_texture_swizzle to GL_ARB_texture_swizzle. Signed-off-by: Józef Kucia <jkucia(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 | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 3157c49..3ffbbaf 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -204,6 +204,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_EXT_texture_snorm", EXT_TEXTURE_SNORM }, {"GL_EXT_texture_sRGB", EXT_TEXTURE_SRGB }, {"GL_EXT_texture_sRGB_decode", EXT_TEXTURE_SRGB_DECODE }, + {"GL_EXT_texture_swizzle", ARB_TEXTURE_SWIZZLE }, {"GL_EXT_vertex_array_bgra", EXT_VERTEX_ARRAY_BGRA }, /* NV */

1 0

Alistair Leslie-Hughes : hid: Implement HidD_FlushQueue().
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: 718b1bc54207a1fe44554041d1d02a41ebd3b365 URL: https://source.winehq.org/git/wine.git/?a=commit;h=718b1bc54207a1fe44554041… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Apr 6 22:20:18 2019 -0500 hid: Implement HidD_FlushQueue(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45878 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hid.spec | 2 +- dlls/hid/hidd.c | 6 ++++++ include/ddk/hidsdi.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index 5bf3913..5714d6c 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -1,4 +1,4 @@ -@ stub HidD_FlushQueue +@ stdcall HidD_FlushQueue(ptr) @ stdcall HidD_FreePreparsedData(ptr) @ stdcall HidD_GetAttributes(long ptr) @ stub HidD_GetConfiguration diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c index e313ccb..711aff2 100644 --- a/dlls/hid/hidd.c +++ b/dlls/hid/hidd.c @@ -163,3 +163,9 @@ BOOLEAN WINAPI HidD_GetIndexedString(HANDLE file, ULONG index, void *buffer, ULO TRACE("file %p, index %u, buffer %p, length %u.\n", file, index, buffer, length); return sync_ioctl(file, IOCTL_HID_GET_INDEXED_STRING, &index, sizeof(index), buffer, length); } + +BOOLEAN WINAPI HidD_FlushQueue(HANDLE file) +{ + TRACE("file %p.\n", file); + return sync_ioctl(file, IOCTL_HID_FLUSH_QUEUE, NULL, 0, NULL, 0); +} diff --git a/include/ddk/hidsdi.h b/include/ddk/hidsdi.h index e57a968..22f64e6 100644 --- a/include/ddk/hidsdi.h +++ b/include/ddk/hidsdi.h @@ -34,6 +34,7 @@ typedef struct _HIDD_ATTRIBUTES { USHORT VersionNumber; } HIDD_ATTRIBUTES, *PHIDD_ATTRIBUTES; +BOOLEAN WINAPI HidD_FlushQueue(HANDLE file); BOOLEAN WINAPI HidD_GetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength); void WINAPI HidD_GetHidGuid(LPGUID guid); BOOLEAN WINAPI HidD_GetIndexedString(HANDLE file, ULONG index, void *buffer, ULONG length);

1 0

Józef Kucia : wined3d: Handle GL_EXT_vertex_array_bgra directly in gl_extension_map.
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: 61937c310306cb2e3c64a3eb5feb8c3c0ea0505a URL: https://source.winehq.org/git/wine.git/?a=commit;h=61937c310306cb2e3c64a3eb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Apr 6 11:37:32 2019 +0200 wined3d: Handle GL_EXT_vertex_array_bgra directly in gl_extension_map. Signed-off-by: Józef Kucia <jkucia(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 | 7 +------ dlls/wined3d/wined3d_gl.h | 1 - 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 3ffbbaf..c195bf4 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -205,7 +205,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_EXT_texture_sRGB", EXT_TEXTURE_SRGB }, {"GL_EXT_texture_sRGB_decode", EXT_TEXTURE_SRGB_DECODE }, {"GL_EXT_texture_swizzle", ARB_TEXTURE_SWIZZLE }, - {"GL_EXT_vertex_array_bgra", EXT_VERTEX_ARRAY_BGRA }, + {"GL_EXT_vertex_array_bgra", ARB_VERTEX_ARRAY_BGRA }, /* NV */ {"GL_NV_fence", NV_FENCE }, @@ -3530,11 +3530,6 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, TRACE(" IMPLIED: NVIDIA (NV) Texture Gen Reflection support.\n"); gl_info->supported[NV_TEXGEN_REFLECTION] = TRUE; } - if (!gl_info->supported[ARB_VERTEX_ARRAY_BGRA] && gl_info->supported[EXT_VERTEX_ARRAY_BGRA]) - { - TRACE(" IMPLIED: ARB_vertex_array_bgra support (by EXT_vertex_array_bgra).\n"); - gl_info->supported[ARB_VERTEX_ARRAY_BGRA] = TRUE; - } if (!gl_info->supported[EXT_TEXTURE_COMPRESSION_RGTC] && gl_info->supported[ARB_TEXTURE_COMPRESSION_RGTC]) { TRACE(" IMPLIED: EXT_texture_compression_rgtc support (by ARB_texture_compression_rgtc).\n"); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index ae067e6..5241b6c 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -186,7 +186,6 @@ enum wined3d_gl_extension EXT_TEXTURE_SNORM, EXT_TEXTURE_SRGB, EXT_TEXTURE_SRGB_DECODE, - EXT_VERTEX_ARRAY_BGRA, /* NVIDIA */ NV_FENCE, NV_FOG_DISTANCE,

1 0