.gitignore

@@ -1,3 +1,3 @@
-/wine-*.tar.xz
-/wine-*.tar.xz.sign
-/wine-staging-*.tar.gz
+/wine-6.3.tar.xz
+/wine-6.3.tar.xz.sign
+/wine-staging-6.3.tar.gz

sources

@@ -1,3 +1,3 @@
-SHA512 (wine-11.0.tar.xz) = a2c3db14f8cf0d19927466805c8f17c68ee7e93d1196d1162dd2279af497c21ec611a63f7a9de59953bbdfdb44c87d7bf55373c6533224a5d54e434c29428d1b
-SHA512 (wine-11.0.tar.xz.sign) = b37064b787e4cff05b01f0d04fe2af8ff341e274a41a0238b5e58e392223bcd3574eb593f78ba7de8fb8caea7c27abf2a1259527807a2bec2413aa9ce027e183
-SHA512 (wine-staging-11.0.tar.gz) = 27eecce0cc1974e97d2aaffc0bf5a5d114f5fd8d3d6a349d9f984058a316b6654dd07bc2223c38df16fd2862f59aa79518d2d109ea0ac41c957144377ddd39a7
+SHA512 (wine-6.3.tar.xz) = 20108ea5036d612e8dd61fe9254d67cad02d757ede87174ed27774e4e3537e0d1f4d67156fd430f1d01d5c68b899cb0c7b4be298d897a1ce823913efef822242
+SHA512 (wine-6.3.tar.xz.sign) = c7215c43eff6ff7cf7bab3bf598b95fcab87a8d4ac58d94056c7ffa368c66a71e3a1943902038878d063208c25b910335be6389ac263e04bf9abd57a298a58c1
+SHA512 (wine-staging-6.3.tar.gz) = ed9b3b03c466de03941d7fec00c73ff77df863c3f4ba201e7f920810675ff416995557cb62b6701dcec6928f2ab9e4d608f17b79eda0267094e506a5e66f47f2

wine-32.conf

@@ -0,0 +1 @@
+/usr/lib/wine/

wine-6.0-vulkan-child-window.patch

@@ -0,0 +1,146 @@
+From 4cc738f609faff68bf4c67d5618174fa87ab3cdb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Felix=20H=C3=A4dicke?= <felixhaedicke@web.de>
+Date: Wed, 10 Jul 2019 22:19:31 +0200
+Subject: [PATCH] winex11.drv: Support child window rendering for Vulkan via
+ XComposite
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45277
+Signed-off-by: Felix Hädicke <felixhaedicke@web.de>
+---
+ dlls/winex11.drv/vulkan.c | 56 ++++++++++++++++++++++++++++++++-------
+ 1 file changed, 47 insertions(+), 9 deletions(-)
+
+diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c
+index 28ae1a9e0e8..3b0bf58c107 100644
+--- a/dlls/winex11.drv/vulkan.c
++++ b/dlls/winex11.drv/vulkan.c
+@@ -33,6 +33,7 @@
+ #include "wine/debug.h"
+ #include "wine/heap.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 */
+ };
+ 
+@@ -135,6 +138,7 @@ static BOOL WINAPI wine_vk_init(INIT_ONCE *once, void *param, void **context)
+ #undef LOAD_OPTIONAL_FUNCPTR
+ 
+     vulkan_hwnd_context = XUniqueContext();
++    vulkan_swapchain_surface_context = XUniqueContext();
+ 
+     return TRUE;
+ 
+@@ -252,16 +256,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 +289,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 +305,23 @@ 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
++#endif
++        {
++            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 +391,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 +564,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;
+ }
+ 

wine-64.conf

@@ -0,0 +1 @@
+/usr/lib64/wine/

wine-ntsync.conf

@@ -1 +0,0 @@
-ntsync

wine.init

@@ -0,0 +1,89 @@
+#!/bin/sh
+#
+# wine	Allow users to run Windows(tm) applications by just clicking on them
+#	(or typing ./file.exe)
+#
+# chkconfig: 35 98 10
+# description: Allow users to run Windows(tm) applications by just clicking \
+#	       on them (or typing ./file.exe)
+### BEGIN INIT INFO
+# Provides: wine-binfmt
+# Required-Start:
+# Required-Stop:
+# Default-Start:  2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: Add and remove wine binary handler
+# Description: Allow users to run Windows(tm) applications by just clicking
+#              on them (or typing ./file.exe)
+### END INIT INFO
+
+
+. /etc/rc.d/init.d/functions
+RETVAL=0
+
+start() {
+# fix bug on changing runlevels #213230
+	if [ -e /proc/sys/fs/binfmt_misc/windows ]; then
+	    echo -n $"Binary handler for Windows applications already registered"
+	else	
+	    echo -n $"Registering binary handler for Windows applications: "
+	    /sbin/modprobe binfmt_misc &>/dev/null
+	    echo ':windows:M::MZ::/usr/bin/wine:' >/proc/sys/fs/binfmt_misc/register || :
+	    echo ':windowsPE:M::PE::/usr/bin/wine:' >/proc/sys/fs/binfmt_misc/register || :
+	    RETVAL=$?
+	    [ $RETVAL -eq 0 ] && success || failure
+	fi
+	echo
+}
+
+stop() {
+	echo -n $"Unregistering binary handler for Windows applications: "
+	echo "-1" >/proc/sys/fs/binfmt_misc/windows || :
+	echo "-1" >/proc/sys/fs/binfmt_misc/windowsPE || :
+	RETVAL=$?
+	[ $RETVAL -eq 0 ] && success || failure
+	echo
+}
+
+wine_status() {
+	if [ -e /proc/sys/fs/binfmt_misc/windows ]; then
+		echo $"Wine binary format handlers are registered."
+		return 0
+	else
+		echo $"Wine binary format handlers are not registered."
+		return 3
+	fi
+}
+
+case "$1" in
+	start)
+		start
+		;;
+	stop)
+		stop
+		;;
+	status)
+		wine_status
+		RETVAL=$?
+		;;
+	restart)
+		stop
+		start
+		;;
+	reload)
+		stop
+		start
+		;;
+	condrestart|try-restart)
+	
+		if [ -e /proc/sys/fs/binfmt_misc/windows ]; then
+			stop
+			start
+		fi
+		;;
+	*)
+		echo $"Usage: $prog {start|stop|status|restart|reload|try-restart}"
+		exit 1
+esac
+exit $RETVAL
+