July 2019 - Wine-Devel - list.winehq.org

Re: [PATCH 1/2] user32/edit: In EM_POSFROMCHAR return correct position for empty lines

by Nikolay Sivov

On Thu, Jul 4, 2019 at 10:02 PM Fabian Maurer <dark.shadow4(a)web.de> wrote: > > How to trigger this alternate path which is !ssa && lw > 0? In other > > words, do we have tests for both cases of that else branch. > > Now that you mention it, we don't have a test for the already existing > behavior. It got introduced in b83c587f6e68c77d15a9b9335044a643172bc975, > but I > don't know why it is the way it is. I tried to leave the original behavior, > but I'm not sure if it's even used. > > How should I deal with that? > I can't tell right away if it's a redundant path we currently have. Best way to deal with it is to add new test for existing code, making sure it triggers this path. > > Regards, > Fabian Maurer > > >

July 11, 2019

Staging of patches

by Alistair Leslie-Hughes

Hi All, Since AJ is away I have started adding patches from the mailing list to wine-staging. Usually I would do a mid release of staging with the extra patches but due to the recent release of Debian 10, wine OBS needs some updates, which aren't expected to be completed until the next wine release. Currently patches from the mailing list. gdi32: Use the correct type for the final parameter of FSOpenResourceFile(). Define AT_NO_AUTOMOUNT if needed. winebus.sys: Report the native product string for some Xbox gamepads shell32: add SHMultiFileProperties stub d3drm: Correct paramater count of several interface defines. user32: Also scan for mouse devices in GetRawInputDeviceList(). evr: Share source with strmbase. evr: Build with msvcrt. qedit: Share source with strmbase. qedit: Build with msvcrt. strmbase: Remove unused wine/unicode.h import. d3drm: Return error if setting viewport field-of-view to zero or negative value. d3drm: Check for NULL pointer in d3drm_viewport2_GetDirect3DViewport(). d3drm: Check for NULL pointer in d3drm_viewport2_GetDevice(). dxgi: Fix possible null output from d3d11_swapchain_GetFullscreenState. dxgi/tests: Test output after using Alt+Enter to switch fullscreen. cryptext: Implement CryptExtOpenCER. ntoskrnl.exe: IoInvalidateDeviceRelations() receives the parent PDO. winebus.sys: Initialize and teardown the HID backends while the bus FDO is still extant. wineboot: Create a root-enumerated device object for winebus. winebus.sys: Implement AddDevice(). winebus.inf: Add new INF file and copy it to the INF directory. Grab the latest wine-staging repository, then you can apply them on top of plain wine. ./patchinstall.sh --backend=git-am DESTDIR=<wine src dir> mailing-list-patches Any testing of these patches would be great. I'll continue to update the list of patches every few days as they are submitted. Regards Alistair.

July 11, 2019

[PATCH] winex11.drv: Support child window rendering for Vulkan via XComposite

by Felix Hädicke

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45277 Signed-off-by: Felix Hädicke <felixhaedicke(a)web.de> --- dlls/winex11.drv/vulkan.c | 59 +++++++++++++++++++++++++++++++++------ 1 file changed, 50 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 28ae1a9e0e..0d76fc7fb0 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -33,6 +33,7 @@ #include "wine/heap.h" #include "wine/library.h" #include "x11drv.h" +#include "xcomposite.h" #define VK_NO_PROTOTYPES #define WINE_VK_HOST @@ -55,6 +56,7 @@ static CRITICAL_SECTION_DEBUG critsect_debug = static CRITICAL_SECTION context_section = { &critsect_debug, -1, 0, 0, 0, 0 }; static XContext vulkan_hwnd_context; +static XContext vulkan_swapchain_surface_context; #define VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR 1000004000 @@ -62,6 +64,7 @@ struct wine_vk_surface { LONG ref; Window window; + HDC child_window_dc; VkSurfaceKHR surface; /* native surface */ }; @@ -252,16 +255,24 @@ static VkResult X11DRV_vkCreateSwapchainKHR(VkDevice device, const VkSwapchainCreateInfoKHR *create_info, const VkAllocationCallbacks *allocator, VkSwapchainKHR *swapchain) { + VkResult res; VkSwapchainCreateInfoKHR create_info_host; + struct wine_vk_surface *x11_surface = surface_from_handle(create_info->surface); + TRACE("%p %p %p %p\n", device, create_info, allocator, swapchain); if (allocator) FIXME("Support for allocation callbacks not implemented yet\n"); create_info_host = *create_info; - create_info_host.surface = surface_from_handle(create_info->surface)->surface; + create_info_host.surface = x11_surface->surface; - return pvkCreateSwapchainKHR(device, &create_info_host, NULL /* allocator */, swapchain); + res = pvkCreateSwapchainKHR(device, &create_info_host, NULL /* allocator */, swapchain); + if (res == VK_SUCCESS) + { + XSaveContext(gdi_display, (XID)(*swapchain), vulkan_swapchain_surface_context, (char *)x11_surface); + } + return res; } static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance, @@ -277,13 +288,6 @@ static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance, 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; @@ -300,6 +304,27 @@ static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance, goto err; } + /* child window rendering. */ + if (GetAncestor(create_info->hwnd, GA_PARENT) != GetDesktopWindow()) + { +#ifdef SONAME_LIBXCOMPOSITE + if (usexcomposite) + { + pXCompositeRedirectWindow(gdi_display, x11_surface->window, CompositeRedirectManual); + x11_surface->child_window_dc = GetDC(create_info->hwnd); + } +#else + if (0) + { + } +#endif + else + { + FIXME("Child window rendering is not supported without X Composite Extension!\n"); + return VK_ERROR_INCOMPATIBLE_DRIVER; + } + } + create_info_host.sType = VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR; create_info_host.pNext = NULL; create_info_host.flags = 0; /* reserved */ @@ -369,6 +394,7 @@ static void X11DRV_vkDestroySwapchainKHR(VkDevice device, VkSwapchainKHR swapcha FIXME("Support for allocation callbacks not implemented yet\n"); pvkDestroySwapchainKHR(device, swapchain, NULL /* allocator */); + XDeleteContext(gdi_display, (XID)swapchain, vulkan_swapchain_surface_context); } static VkResult X11DRV_vkEnumerateInstanceExtensionProperties(const char *layer_name, @@ -541,6 +567,21 @@ static VkResult X11DRV_vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR * } } + for (uint32_t i = 0 ; i < present_info->swapchainCount; ++i) + { + struct wine_vk_surface *x11_surface; + if (!XFindContext(gdi_display, (XID)present_info->pSwapchains[i], + vulkan_swapchain_surface_context, (char **)&x11_surface) && + x11_surface->child_window_dc) + { + struct x11drv_escape_flush_gl_drawable escape; + escape.code = X11DRV_FLUSH_GL_DRAWABLE; + escape.gl_drawable = x11_surface->window; + escape.flush = TRUE; + ExtEscape(x11_surface->child_window_dc, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL); + } + } + return res; } -- 2.20.1

July 10, 2019