March 2018 - Wine-Commits - list.winehq.org

Matteo Bruni : wined3d: Do not apply fixed-function state in context_apply_blit_state().
by Alexandre Julliard March 13, 2018

March 13, 2018

Module: wine Branch: master Commit: c0e49b0e2c620ea540cce05da46e8aa77b9bce1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0e49b0e2c620ea540cce05d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 13 14:11:06 2018 +0330 wined3d: Do not apply fixed-function state in context_apply_blit_state(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/context.c | 415 +++++++++++++++++--------------------- dlls/wined3d/surface.c | 6 +- dlls/wined3d/wined3d_private.h | 6 +- 4 files changed, 197 insertions(+), 232 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c0e49b0e2c620ea540cc…

1 0

Zebediah Figura : ntdll: Fix exception parameters on x86-64.
by Alexandre Julliard March 13, 2018

March 13, 2018

Module: wine Branch: master Commit: a462735270caf1503735a20b86e97ccead428cca URL: https://source.winehq.org/git/wine.git/?a=commit;h=a462735270caf1503735a20b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Mar 12 23:03:08 2018 -0500 ntdll: Fix exception parameters on x86-64. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 3 +++ dlls/ntdll/tests/exception.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index ee3d1f9..efbcc6e 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2876,6 +2876,9 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) if (!err && (rec->ExceptionCode = is_privileged_instr( win_context ))) break; if ((err & 7) == 2 && handle_interrupt( err >> 3, rec, win_context )) break; rec->ExceptionCode = EXCEPTION_ACCESS_VIOLATION; + rec->NumberParameters = 2; + rec->ExceptionInformation[0] = 0; + rec->ExceptionInformation[1] = 0xffffffffffffffff; } break; case TRAP_x86_PAGEFLT: /* Page fault */ diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 320aa77..46e2a30 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -2370,7 +2370,6 @@ static DWORD WINAPI handler( EXCEPTION_RECORD *rec, ULONG64 frame, else parameter_count = except->alt_nb_params; -todo_wine_if( rec->NumberParameters != parameter_count ) ok( rec->NumberParameters == parameter_count, "%u: Unexpected parameter count %u/%u\n", entry, rec->NumberParameters, parameter_count );

1 0

Sergio Gómez Del Real : kernel32: Implement FindNLSStringEx.
by Alexandre Julliard March 13, 2018

March 13, 2018

Module: wine Branch: master Commit: 2d74a4ff43284c35447ed2a915b0b5b3e40748f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d74a4ff43284c35447ed2a9… Author: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Date: Tue Mar 13 09:09:45 2018 -0500 kernel32: Implement FindNLSStringEx. Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-localization-l1-1-0.spec | 2 +- .../api-ms-win-core-localization-l1-2-0.spec | 2 +- .../api-ms-win-core-localization-l1-2-1.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/locale.c | 51 +++++++++ dlls/kernel32/tests/locale.c | 115 +++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- include/winnls.h | 5 + 8 files changed, 176 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2d74a4ff43284c35447e…

1 0

Andrey Gusev : ext-ms-win-rtcore-ntuser-rawinput-l1-1-0: Add dll.
by Alexandre Julliard March 13, 2018

March 13, 2018

Module: wine Branch: master Commit: aabeb19cfc81817a72499c7ca2255b9b9d96b4ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=aabeb19cfc81817a72499c7c… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Mar 13 15:45:52 2018 +0200 ext-ms-win-rtcore-ntuser-rawinput-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-rtcore-ntuser-rawinput-l1-1-0/Makefile.in | 1 + .../ext-ms-win-rtcore-ntuser-rawinput-l1-1-0.spec | 1 + tools/make_specfiles | 1 + 5 files changed, 6 insertions(+) diff --git a/configure b/configure index 4e545f9..208744b 100755 --- a/configure +++ b/configure @@ -1272,6 +1272,7 @@ enable_ext_ms_win_rtcore_ntuser_cursor_l1_1_0 enable_ext_ms_win_rtcore_ntuser_dc_access_l1_1_0 enable_ext_ms_win_rtcore_ntuser_dpi_l1_1_0 enable_ext_ms_win_rtcore_ntuser_dpi_l1_2_0 +enable_ext_ms_win_rtcore_ntuser_rawinput_l1_1_0 enable_ext_ms_win_rtcore_ntuser_syscolors_l1_1_0 enable_ext_ms_win_rtcore_ntuser_sysparams_l1_1_0 enable_ext_ms_win_security_credui_l1_1_0 @@ -18638,6 +18639,7 @@ wine_fn_config_makefile dlls/ext-ms-win-rtcore-ntuser-cursor-l1-1-0 enable_ext_m wine_fn_config_makefile dlls/ext-ms-win-rtcore-ntuser-dc-access-l1-1-0 enable_ext_ms_win_rtcore_ntuser_dc_access_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-rtcore-ntuser-dpi-l1-1-0 enable_ext_ms_win_rtcore_ntuser_dpi_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-rtcore-ntuser-dpi-l1-2-0 enable_ext_ms_win_rtcore_ntuser_dpi_l1_2_0 +wine_fn_config_makefile dlls/ext-ms-win-rtcore-ntuser-rawinput-l1-1-0 enable_ext_ms_win_rtcore_ntuser_rawinput_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0 enable_ext_ms_win_rtcore_ntuser_syscolors_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0 enable_ext_ms_win_rtcore_ntuser_sysparams_l1_1_0 wine_fn_config_makefile dlls/ext-ms-win-security-credui-l1-1-0 enable_ext_ms_win_security_credui_l1_1_0 diff --git a/configure.ac b/configure.ac index d4cc5b0..4c79187 100644 --- a/configure.ac +++ b/configure.ac @@ -3269,6 +3269,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-cursor-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-dc-access-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-dpi-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-dpi-l1-2-0) +WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-rawinput-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-security-credui-l1-1-0) diff --git a/dlls/ext-ms-win-rtcore-ntuser-rawinput-l1-1-0/Makefile.in b/dlls/ext-ms-win-rtcore-ntuser-rawinput-l1-1-0/Makefile.in new file mode 100644 index 0000000..3af02b3 --- /dev/null +++ b/dlls/ext-ms-win-rtcore-ntuser-rawinput-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-rtcore-ntuser-rawinput-l1-1-0.dll diff --git a/dlls/ext-ms-win-rtcore-ntuser-rawinput-l1-1-0/ext-ms-win-rtcore-ntuser-rawinput-l1-1-0.spec b/dlls/ext-ms-win-rtcore-ntuser-rawinput-l1-1-0/ext-ms-win-rtcore-ntuser-rawinput-l1-1-0.spec new file mode 100644 index 0000000..417ee3f --- /dev/null +++ b/dlls/ext-ms-win-rtcore-ntuser-rawinput-l1-1-0/ext-ms-win-rtcore-ntuser-rawinput-l1-1-0.spec @@ -0,0 +1 @@ +@ stdcall GetKeyboardState(ptr) user32.GetKeyboardState diff --git a/tools/make_specfiles b/tools/make_specfiles index e02d493..8df802f 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -377,6 +377,7 @@ my @dll_groups = "ext-ms-win-rtcore-ntuser-dc-access-l1-1-0", "ext-ms-win-rtcore-ntuser-dpi-l1-1-0", "ext-ms-win-rtcore-ntuser-dpi-l1-2-0", + "ext-ms-win-rtcore-ntuser-rawinput-l1-1-0", "ext-ms-win-rtcore-ntuser-syscolors-l1-1-0", "ext-ms-win-rtcore-ntuser-sysparams-l1-1-0", ],

1 0

Roderick Colenbrander : winex11: Implement support for vkGetPhysicalDeviceSurface*KHR APIs.
by Alexandre Julliard March 13, 2018

March 13, 2018

Module: wine Branch: master Commit: bd13129a9b7b35bb6d8db89628abda3fda19a447 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd13129a9b7b35bb6d8db896… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Mar 12 23:32:06 2018 -0700 winex11: Implement support for vkGetPhysicalDeviceSurface*KHR APIs. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/vulkan.c | 40 ++++++++++++++++++++++++++++++++-------- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 3828f79..3c122fb 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -68,6 +68,10 @@ static void (*pvkDestroyInstance)(VkInstance, const VkAllocationCallbacks *); static void (*pvkDestroySurfaceKHR)(VkInstance, VkSurfaceKHR, const VkAllocationCallbacks *); static void * (*pvkGetDeviceProcAddr)(VkDevice, const char *); static void * (*pvkGetInstanceProcAddr)(VkInstance, const char *); +static VkResult (*pvkGetPhysicalDeviceSurfaceCapabilitiesKHR)(VkPhysicalDevice, VkSurfaceKHR, VkSurfaceCapabilitiesKHR *); +static VkResult (*pvkGetPhysicalDeviceSurfaceFormatsKHR)(VkPhysicalDevice, VkSurfaceKHR, uint32_t *, VkSurfaceFormatKHR *); +static VkResult (*pvkGetPhysicalDeviceSurfacePresentModesKHR)(VkPhysicalDevice, VkSurfaceKHR, uint32_t *, VkPresentModeKHR *); +static VkResult (*pvkGetPhysicalDeviceSurfaceSupportKHR)(VkPhysicalDevice, uint32_t, VkSurfaceKHR, VkBool32 *); static VkBool32 (*pvkGetPhysicalDeviceXlibPresentationSupportKHR)(VkPhysicalDevice, uint32_t, Display *, VisualID); /* TODO: dynamically generate based on host driver capabilities. */ @@ -100,6 +104,10 @@ LOAD_FUNCPTR(vkDestroyInstance) LOAD_FUNCPTR(vkDestroySurfaceKHR) LOAD_FUNCPTR(vkGetDeviceProcAddr) LOAD_FUNCPTR(vkGetInstanceProcAddr) +LOAD_FUNCPTR(vkGetPhysicalDeviceSurfaceCapabilitiesKHR) +LOAD_FUNCPTR(vkGetPhysicalDeviceSurfaceFormatsKHR) +LOAD_FUNCPTR(vkGetPhysicalDeviceSurfacePresentModesKHR) +LOAD_FUNCPTR(vkGetPhysicalDeviceSurfaceSupportKHR) LOAD_FUNCPTR(vkGetPhysicalDeviceXlibPresentationSupportKHR) #undef LOAD_FUNCPTR @@ -364,29 +372,45 @@ static void * X11DRV_vkGetInstanceProcAddr(VkInstance instance, const char *name static VkResult X11DRV_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice phys_dev, VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR *capabilities) { - FIXME("stub: %p, 0x%s, %p\n", phys_dev, wine_dbgstr_longlong(surface), capabilities); - return VK_ERROR_OUT_OF_HOST_MEMORY; + struct wine_vk_surface *x11_surface = surface_from_handle(surface); + + TRACE("%p, 0x%s, %p\n", phys_dev, wine_dbgstr_longlong(surface), capabilities); + + return pvkGetPhysicalDeviceSurfaceCapabilitiesKHR(phys_dev, x11_surface->surface, + capabilities); } static VkResult X11DRV_vkGetPhysicalDeviceSurfaceFormatsKHR(VkPhysicalDevice phys_dev, VkSurfaceKHR surface, uint32_t *count, VkSurfaceFormatKHR *formats) { - FIXME("stub: %p, 0x%s, %p, %p\n", phys_dev, wine_dbgstr_longlong(surface), count, formats); - return VK_ERROR_OUT_OF_HOST_MEMORY; + struct wine_vk_surface *x11_surface = surface_from_handle(surface); + + TRACE("%p, 0x%s, %p, %p\n", phys_dev, wine_dbgstr_longlong(surface), count, formats); + + return pvkGetPhysicalDeviceSurfaceFormatsKHR(phys_dev, x11_surface->surface, + count, formats); } static VkResult X11DRV_vkGetPhysicalDeviceSurfacePresentModesKHR(VkPhysicalDevice phys_dev, VkSurfaceKHR surface, uint32_t *count, VkPresentModeKHR *modes) { - FIXME("stub: %p, 0x%s, %p, %p\n", phys_dev, wine_dbgstr_longlong(surface), count, modes); - return VK_ERROR_OUT_OF_HOST_MEMORY; + struct wine_vk_surface *x11_surface = surface_from_handle(surface); + + TRACE("%p, 0x%s, %p, %p\n", phys_dev, wine_dbgstr_longlong(surface), count, modes); + + return pvkGetPhysicalDeviceSurfacePresentModesKHR(phys_dev, x11_surface->surface, count, + modes); } static VkResult X11DRV_vkGetPhysicalDeviceSurfaceSupportKHR(VkPhysicalDevice phys_dev, uint32_t index, VkSurfaceKHR surface, VkBool32 *supported) { - FIXME("stub: %p, %u, 0x%s, %p\n", phys_dev, index, wine_dbgstr_longlong(surface), supported); - return VK_ERROR_OUT_OF_HOST_MEMORY; + struct wine_vk_surface *x11_surface = surface_from_handle(surface); + + TRACE("%p, %u, 0x%s, %p\n", phys_dev, index, wine_dbgstr_longlong(surface), supported); + + return pvkGetPhysicalDeviceSurfaceSupportKHR(phys_dev, index, x11_surface->surface, + supported); } static VkBool32 X11DRV_vkGetPhysicalDeviceWin32PresentationSupportKHR(VkPhysicalDevice phys_dev,

1 0

Matteo Bruni : d3dx9/tests: Disable a test crashing on Win10.
by Alexandre Julliard March 13, 2018

March 13, 2018

Module: wine Branch: master Commit: e8bef37c574ef08bf252a80c6ad8703d503ce40b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8bef37c574ef08bf252a80c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 13 19:17:39 2018 +0100 d3dx9/tests: Disable a test crashing on Win10. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/surface.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index f2855e8..324e2af 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -944,17 +944,22 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); /* Test D3DXLoadSurfaceFromMemory with indexed color image */ + if (0) + { + /* Crashes on Nvidia Win10. */ palette.peRed = bmp_1bpp[56]; palette.peGreen = bmp_1bpp[55]; palette.peBlue = bmp_1bpp[54]; palette.peFlags = bmp_1bpp[57]; /* peFlags is the alpha component in DX8 and higher */ - hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, &bmp_1bpp[62], D3DFMT_P8, 4, (const PALETTEENTRY*)&palette, &rect, D3DX_FILTER_NONE, 0); + hr = D3DXLoadSurfaceFromMemory(surf, NULL, NULL, &bmp_1bpp[62], + D3DFMT_P8, 1, (const PALETTEENTRY *)&palette, &rect, D3DX_FILTER_NONE, 0); ok(hr == D3D_OK, "D3DXLoadSurfaceFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK); hr = IDirect3DSurface9_LockRect(surf, &lockrect, NULL, D3DLOCK_READONLY); ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x\n", hr); ok(*(DWORD*)lockrect.pBits == 0x80f3f2f1, "Pixel color mismatch: got %#x, expected 0x80f3f2f1\n", *(DWORD*)lockrect.pBits); hr = IDirect3DSurface9_UnlockRect(surf); ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x\n", hr); + } /* Test D3DXLoadSurfaceFromFileInMemory with indexed color image (alpha is not taken into account for bmp file) */ hr = D3DXLoadSurfaceFromFileInMemory(surf, NULL, NULL, bmp_1bpp, sizeof(bmp_1bpp), NULL, D3DX_FILTER_NONE, 0, NULL);

1 0

Roderick Colenbrander : winex11: Implement vkDestroySurfaceKHR.
by Alexandre Julliard March 13, 2018

March 13, 2018

Module: wine Branch: master Commit: 53df81c4570d640dfd5ae78365fbc90d73486f4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=53df81c4570d640dfd5ae783… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Mar 12 23:32:05 2018 -0700 winex11: Implement vkDestroySurfaceKHR. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/vulkan.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index cdcf741..3828f79 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -77,6 +77,12 @@ static const struct VkExtensionProperties winex11_vk_instance_extensions[] = { "VK_KHR_win32_surface", 1}, }; +/* Helper function to convert VkSurfaceKHR (uint64_t) to a surface pointer. */ +static inline struct wine_vk_surface * surface_from_handle(VkSurfaceKHR handle) +{ + return ((struct wine_vk_surface *)(uintptr_t)handle); +} + static BOOL wine_vk_init(void) { static BOOL init_done = FALSE; @@ -277,7 +283,14 @@ static void X11DRV_vkDestroyInstance(VkInstance instance, const VkAllocationCall static void X11DRV_vkDestroySurfaceKHR(VkInstance instance, VkSurfaceKHR surface, const VkAllocationCallbacks *allocator) { - FIXME("stub: %p 0x%s %p\n", instance, wine_dbgstr_longlong(surface), allocator); + struct wine_vk_surface *x11_surface = surface_from_handle(surface); + + TRACE("%p 0x%s %p\n", instance, wine_dbgstr_longlong(surface), allocator); + + if (allocator) + FIXME("Support for allocation callbacks not implemented yet\n"); + + wine_vk_surface_destroy(instance, x11_surface); } static void X11DRV_vkDestroySwapchainKHR(VkDevice device, VkSwapchainKHR swapchain,

1 0

Roderick Colenbrander : winex11: Implement vkGetPhysicalDeviceWin32PresentationSupportKHR.
by Alexandre Julliard March 13, 2018

March 13, 2018

Module: wine Branch: master Commit: 2d09b4930fc559d0148d28c0d8362880d9ede7a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d09b4930fc559d0148d28c0… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Mar 12 23:32:04 2018 -0700 winex11: Implement vkGetPhysicalDeviceWin32PresentationSupportKHR. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/vulkan.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 4b20b46..cdcf741 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -68,6 +68,7 @@ static void (*pvkDestroyInstance)(VkInstance, const VkAllocationCallbacks *); static void (*pvkDestroySurfaceKHR)(VkInstance, VkSurfaceKHR, const VkAllocationCallbacks *); static void * (*pvkGetDeviceProcAddr)(VkDevice, const char *); static void * (*pvkGetInstanceProcAddr)(VkInstance, const char *); +static VkBool32 (*pvkGetPhysicalDeviceXlibPresentationSupportKHR)(VkPhysicalDevice, uint32_t, Display *, VisualID); /* TODO: dynamically generate based on host driver capabilities. */ static const struct VkExtensionProperties winex11_vk_instance_extensions[] = @@ -93,6 +94,7 @@ LOAD_FUNCPTR(vkDestroyInstance) LOAD_FUNCPTR(vkDestroySurfaceKHR) LOAD_FUNCPTR(vkGetDeviceProcAddr) LOAD_FUNCPTR(vkGetInstanceProcAddr) +LOAD_FUNCPTR(vkGetPhysicalDeviceXlibPresentationSupportKHR) #undef LOAD_FUNCPTR return TRUE; @@ -377,8 +379,10 @@ static VkResult X11DRV_vkGetPhysicalDeviceSurfaceSupportKHR(VkPhysicalDevice phy static VkBool32 X11DRV_vkGetPhysicalDeviceWin32PresentationSupportKHR(VkPhysicalDevice phys_dev, uint32_t index) { - FIXME("stub %p %u\n", phys_dev, index); - return VK_FALSE; + TRACE("%p %u\n", phys_dev, index); + + return pvkGetPhysicalDeviceXlibPresentationSupportKHR(phys_dev, index, gdi_display, + default_visual.visual->visualid); } static VkResult X11DRV_vkGetSwapchainImagesKHR(VkDevice device,

1 0

Roderick Colenbrander : winex11: Add initial vkCreateWin32SurfaceKHR implementation.
by Alexandre Julliard March 13, 2018

March 13, 2018

Module: wine Branch: master Commit: 211de3aa0bfe1907533ab3822b0919844b66dac2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=211de3aa0bfe1907533ab382… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Mar 12 23:32:03 2018 -0700 winex11: Add initial vkCreateWin32SurfaceKHR implementation. Implement surface creation for top-level windows. Child window rendering is not yet supported. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/vulkan.c | 90 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 88 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 11d9f61..4b20b46 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -28,6 +28,7 @@ #include "wine/debug.h" #include "wine/heap.h" #include "wine/library.h" +#include "x11drv.h" /* We only want host compatible structures and don't need alignment. */ #define WINE_VK_ALIGN(x) @@ -43,8 +44,28 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan); #define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) #endif +typedef VkFlags VkXlibSurfaceCreateFlagsKHR; +#define VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR 1000004000 + +struct wine_vk_surface +{ + Window window; + VkSurfaceKHR surface; /* native surface */ +}; + +typedef struct VkXlibSurfaceCreateInfoKHR +{ + VkStructureType sType; + const void *pNext; + VkXlibSurfaceCreateFlagsKHR flags; + Display *dpy; + Window window; +} VkXlibSurfaceCreateInfoKHR; + static VkResult (*pvkCreateInstance)(const VkInstanceCreateInfo *, const VkAllocationCallbacks *, VkInstance *); +static VkResult (*pvkCreateXlibSurfaceKHR)(VkInstance, const VkXlibSurfaceCreateInfoKHR *, const VkAllocationCallbacks *, VkSurfaceKHR *); static void (*pvkDestroyInstance)(VkInstance, const VkAllocationCallbacks *); +static void (*pvkDestroySurfaceKHR)(VkInstance, VkSurfaceKHR, const VkAllocationCallbacks *); static void * (*pvkGetDeviceProcAddr)(VkDevice, const char *); static void * (*pvkGetInstanceProcAddr)(VkInstance, const char *); @@ -67,7 +88,9 @@ static BOOL wine_vk_init(void) #define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(vulkan_handle, #f, NULL, 0)) == NULL) return FALSE; LOAD_FUNCPTR(vkCreateInstance) +LOAD_FUNCPTR(vkCreateXlibSurfaceKHR) LOAD_FUNCPTR(vkDestroyInstance) +LOAD_FUNCPTR(vkDestroySurfaceKHR) LOAD_FUNCPTR(vkGetDeviceProcAddr) LOAD_FUNCPTR(vkGetInstanceProcAddr) #undef LOAD_FUNCPTR @@ -123,6 +146,20 @@ static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo return VK_SUCCESS; } +static void wine_vk_surface_destroy(VkInstance instance, struct wine_vk_surface *surface) +{ + if (!surface) + return; + + /* vkDestroySurfaceKHR must handle VK_NULL_HANDLE (0) for surface. */ + pvkDestroySurfaceKHR(instance, surface->surface, NULL /* allocator */); + + if (surface->window) + XDestroyWindow(gdi_display, surface->window); + + heap_free(surface); +} + static VkResult X11DRV_vkAcquireNextImageKHR(VkDevice device, VkSwapchainKHR swapchain, uint64_t timeout, VkSemaphore semaphore, VkFence fence, uint32_t *index) { @@ -172,8 +209,57 @@ static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance, const VkWin32SurfaceCreateInfoKHR *create_info, const VkAllocationCallbacks *allocator, VkSurfaceKHR *surface) { - FIXME("stub: %p %p %p %p\n", instance, create_info, allocator, surface); - return VK_ERROR_OUT_OF_HOST_MEMORY; + VkResult res; + VkXlibSurfaceCreateInfoKHR create_info_host; + struct wine_vk_surface *x11_surface; + + TRACE("%p %p %p %p\n", instance, create_info, allocator, surface); + + if (allocator) + FIXME("Support for allocation callbacks not implemented yet\n"); + + /* TODO: support child window rendering. */ + if (GetAncestor(create_info->hwnd, GA_PARENT) != GetDesktopWindow()) + { + FIXME("Application requires child window rendering, which is not implemented yet!\n"); + return VK_ERROR_INCOMPATIBLE_DRIVER; + } + + x11_surface = heap_alloc_zero(sizeof(*x11_surface)); + if (!x11_surface) + return VK_ERROR_OUT_OF_HOST_MEMORY; + + x11_surface->window = create_client_window(create_info->hwnd, &default_visual); + if (!x11_surface->window) + { + ERR("Failed to allocate client window for hwnd=%p\n", create_info->hwnd); + + /* VK_KHR_win32_surface only allows out of host and device memory as errors. */ + res = VK_ERROR_OUT_OF_HOST_MEMORY; + goto err; + } + + create_info_host.sType = VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR; + create_info_host.pNext = NULL; + create_info_host.flags = 0; /* reserved */ + create_info_host.dpy = gdi_display; + create_info_host.window = x11_surface->window; + + res = pvkCreateXlibSurfaceKHR(instance, &create_info_host, NULL /* allocator */, &x11_surface->surface); + if (res != VK_SUCCESS) + { + ERR("Failed to create Xlib surface, res=%d\n", res); + goto err; + } + + *surface = (uintptr_t)x11_surface; + + TRACE("Created surface=0x%s\n", wine_dbgstr_longlong(*surface)); + return VK_SUCCESS; + +err: + wine_vk_surface_destroy(instance, x11_surface); + return res; } static void X11DRV_vkDestroyInstance(VkInstance instance, const VkAllocationCallbacks *allocator)

1 0

Kai Krakow : winebus.sys: Map more SDL Xbox controllers.
by Alexandre Julliard March 13, 2018

March 13, 2018

Module: wine Branch: master Commit: 1333206e083b6d7837ca88e7ab71a66cf7db6bd6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1333206e083b6d7837ca88e7… Author: Kai Krakow <kai(a)kaishome.de> Date: Sun Mar 11 09:40:39 2018 +0100 winebus.sys: Map more SDL Xbox controllers. These device ids are usually returned by newer firmware versions. Especially, the Android mode of the controller (when paired by bluetooth to a Linux system) changes the input mapping of the controller. The current kernel drivers do not correct this, xpadneo[1] is needed as the driver to get correct mapping. [1]: https://github.com/atar-axis/xpadneo Signed-off-by: Kai Krakow <kai(a)kaishome.de> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 3a98fa7..e666d04 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -69,9 +69,11 @@ static const WORD PID_XBOX_CONTROLLERS[] = { 0x028f, /* Xbox360 Wireless Controller */ 0x02d1, /* Xbox One Controller */ 0x02dd, /* Xbox One Controller (Covert Forces/Firmware 2015) */ + 0x02e0, /* Xbox One X Controller */ 0x02e3, /* Xbox One Elite Controller */ 0x02e6, /* Wireless XBox Controller Dongle */ 0x02ea, /* Xbox One S Controller */ + 0x02fd, /* Xbox One S Controller (Firmware 2017) */ 0x0719, /* Xbox 360 Wireless Adapter */ };

1 0