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

[PATCH v2 1/6] wtsapi32: Create struct to track window registrations.
by Patrick Hibbs 14 Jul '19

14 Jul '19

From: Patrick Hibbs <hibbsncc1701(a)yahoo.com> Keeping track of window notification registrations is part of the defined API. A struct is required to do that. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47433 Signed-off-by: Patrick Hibbs <hibbsncc1701(a)yahoo.com> --- dlls/wtsapi32/wtsapi32.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index 2f5e73d05a..3d944943b4 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -22,9 +22,24 @@ #include "wtsapi32.h" #include "wine/debug.h" #include "wine/heap.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(wtsapi); +/* This linked list is an internal management structure + * mostly used to keep track of window event notification + * registrations so we can give proper return codes to + * callers. + */ +typedef struct tagWTSAPI32InternalRegMNGTStr +{ + struct list entry; + HANDLE hServer; /* The server we're monitoring. */ + HWND hWnd; /* The window to recieve notifications. */ + DWORD dwFlags; /* Types of notifications the window should get. */ +} WTSAPI32InternalRegMNGTStr; + +static struct list RegisteredWindowsToNotifiy = LIST_INIT( RegisteredWindowsToNotifiy ); /************************************************************ * WTSCloseServer (WTSAPI32.@) -- 2.22.0

2 7

[PATCH 1/6] wtsapi32: Create struct to track window registrations.
by Patrick Hibbs 13 Jul '19

13 Jul '19

Keeping track of window notification registrations is part of the defined API. A struct is required to do that. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47433 Signed-off-by: Patrick Hibbs <hibbsncc1701(a)yahoo.com> --- dlls/wtsapi32/wtsapi32.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/wtsapi32/wtsapi32.c b/dlls/wtsapi32/wtsapi32.c index 2f5e73d05a..3d944943b4 100644 --- a/dlls/wtsapi32/wtsapi32.c +++ b/dlls/wtsapi32/wtsapi32.c @@ -22,9 +22,24 @@ #include "wtsapi32.h" #include "wine/debug.h" #include "wine/heap.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(wtsapi); +/* This linked list is an internal management structure + * mostly used to keep track of window event notification + * registrations so we can give proper return codes to + * callers. + */ +typedef struct tagWTSAPI32InternalRegMNGTStr +{ + struct list entry; + HANDLE hServer; /* The server we're monitoring. */ + HWND hWnd; /* The window to recieve notifications. */ + DWORD dwFlags; /* Types of notifications the window should get. */ +} WTSAPI32InternalRegMNGTStr; + +static struct list RegisteredWindowsToNotifiy = LIST_INIT( RegisteredWindowsToNotifiy ); /************************************************************ * WTSCloseServer (WTSAPI32.@) -- 2.22.0

2 6

[PATCH] mfplat: Implement CreatePropertyStore().
by Zebediah Figura 12 Jul '19

12 Jul '19

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- This allows Mary Skelter: Nightmares to launch. dlls/mfplat/main.c | 9 +++++++++ dlls/mfplat/mfplat.spec | 2 +- include/mfidl.idl | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index eec54ae3f6a..cee50acfde7 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -7415,3 +7415,12 @@ failed: return hr; } + +/*********************************************************************** + * CreatePropertyStore (mfplat.@) + */ +HRESULT WINAPI CreatePropertyStore(IPropertyStore **store) +{ + TRACE("%p.\n", store); + return PSCreateMemoryPropertyStore(&IID_IPropertyStore, (void **)store); +} diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 1ae0927f513..2f16bbd1973 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -10,7 +10,7 @@ @ stub ValidateWaveFormat @ stub CopyPropVariant @ stub CreatePropVariant -@ stub CreatePropertyStore +@ stdcall CreatePropertyStore(ptr) @ stub DestroyPropVariant @ stub GetAMSubtypeFromD3DFormat @ stub GetD3DFormatFromMFSubtype diff --git a/include/mfidl.idl b/include/mfidl.idl index 1ed63bea126..5f8913384cc 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -566,6 +566,7 @@ interface IMFSampleGrabberSinkCallback2 : IMFSampleGrabberSinkCallback [in] IMFAttributes *attributes); } +cpp_quote("HRESULT WINAPI CreatePropertyStore(IPropertyStore **store);") cpp_quote("HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **session);") cpp_quote("HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **bytestream);" ) cpp_quote("HRESULT WINAPI MFCreateMFByteStreamOnStreamEx(IUnknown *stream, IMFByteStream **bytestream);") -- 2.20.1

2 2

[PATCH 1/4] mscorwks: New DLL.
by Zebediah Figura 12 Jul '19

12 Jul '19

Game Maker Studio 2 Desktop needs this to launch. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/mscorwks/Makefile.in | 1 + dlls/mscorwks/mscorwks.spec | 110 ++++++++++++++++++++++++++++++++++++ loader/wine.inf.in | 2 + tools/make_specfiles | 4 ++ 4 files changed, 117 insertions(+) create mode 100644 dlls/mscorwks/Makefile.in create mode 100644 dlls/mscorwks/mscorwks.spec diff --git a/dlls/mscorwks/Makefile.in b/dlls/mscorwks/Makefile.in new file mode 100644 index 00000000000..4527266171c --- /dev/null +++ b/dlls/mscorwks/Makefile.in @@ -0,0 +1 @@ +MODULE = mscorwks.dll diff --git a/dlls/mscorwks/mscorwks.spec b/dlls/mscorwks/mscorwks.spec new file mode 100644 index 00000000000..617cde3173d --- /dev/null +++ b/dlls/mscorwks/mscorwks.spec @@ -0,0 +1,110 @@ +@ stdcall LoadStringRC(long ptr long long) mscoree.LoadStringRC +@ stub ReOpenMetaDataWithMemory +@ stub CorDllMainForThunk +@ stub CreateActContextInternal +@ stub CreateCMSFromXmlInternal +@ stub GetAddrOfContractShutoffFlag +@ stub GetCLRFunction +@ stub GetUserStateManagerInternal +@ stub GetUserStoreInternal +@ stub ParseManifestInternal +@ stub _AxlGetIssuerPublicKeyHash +@ stub _AxlPublicKeyBlobToPublicKeyToken +@ stub _AxlRSAKeyValueToPublicKeyToken +@ stub CertCreateAuthenticodeLicense +@ stub CertFreeAuthenticodeSignerInfo +@ stub CertFreeAuthenticodeTimestamperInfo +@ stub CertTimestampAuthenticodeLicense +@ stub CertVerifyAuthenticodeLicense +@ stub ClearDownloadCache +@ stdcall ClrCreateManagedInstance(wstr ptr ptr) mscoree.ClrCreateManagedInstance +@ stdcall CoEEShutDownCOM() mscoree.CoEEShutDownCOM +@ stdcall CoInitializeCor(long) mscoree.CoInitializeCor +@ stub CoInitializeEE +@ stub CoUninitializeCor +@ stub CoUninitializeEE +@ stub CompareAssemblyIdentity +@ stub CopyPDBs +@ stdcall CorExitProcess(long) mscoree.CorExitProcess +@ stub CorLaunchApplication +@ stub CorMarkThreadInThreadPool +@ stub CreateActContext +@ stub CreateApplicationContext +@ stub CreateAssemblyCache +@ stub CreateAssemblyEnum +@ stub CreateAssemblyNameObject +@ stub CreateCMSFromXml +@ stub CreateHistoryReader +@ stub CreateInstallReferenceEnum +@ stub DeleteShadowCache +@ stub DllCanUnloadNowInternal +@ stub DllGetClassObjectInternal +@ stub DllRegisterServerInternal +@ stub DllUnregisterServerInternal +@ stub EEDllRegisterServer +@ stub EEDllUnregisterServer +@ stub GetAppIdAuthority +@ stub GetAssemblyIdentityFromFile +@ stdcall GetAssemblyMDImport(wstr ptr ptr) mscoree.GetAssemblyMDImport +@ stub GetCLRIdentityManager +@ stub GetCachePath +@ stub GetHashFromAssemblyFile +@ stub GetHashFromAssemblyFileW +@ stub GetHashFromBlob +@ stub GetHashFromFile +@ stub GetHashFromFileW +@ stub GetHashFromHandle +@ stub GetHistoryFileDirectory +@ stub GetIdentityAuthority +@ stub GetMetaDataInternalInterface +@ stub GetMetaDataInternalInterfaceFromPublic +@ stub GetMetaDataPublicInterfaceFromInternal +@ stub GetPermissionRequests +@ stub GetPrivateContextsPerfCounters +@ stub GetUserStateManager +@ stub GetUserStore +@ stub IEE +@ stub InitializeFusion +@ stub InstallCustomAssembly +@ stub InstallCustomModule +@ stub LegacyNGenCompile +@ stub LegacyNGenCreateZapper +@ stub LegacyNGenFreeZapper +@ stub LegacyNGenTryEnumerateFusionCache +@ stdcall LoadStringRCEx(long long ptr long long ptr) mscoree.LoadStringRCEx +@ stub LogHelp_LogAssert +@ stub LogHelp_NoGuiOnAssert +@ stub LogHelp_TerminateOnAssert +@ stub LookupHistoryAssembly +@ stub MetaDataGetDispenser +@ stub NGenCreateNGenWorker +@ stub NukeDownloadedCache +@ stub ParseManifest +@ stub PostErrorVA +@ stub PreBindAssembly +@ stub PreBindAssemblyEx +@ stub ReOpenMetaDataWithMemoryEx +@ stub StrongNameCompareAssemblies +@ stub StrongNameErrorInfo +@ stub StrongNameFreeBuffer +@ stub StrongNameGetBlob +@ stub StrongNameGetBlobFromImage +@ stub StrongNameGetPublicKey +@ stub StrongNameHashSize +@ stub StrongNameKeyDelete +@ stub StrongNameKeyGen +@ stub StrongNameKeyGenEx +@ stub StrongNameKeyInstall +@ stub StrongNameSignatureGeneration +@ stub StrongNameSignatureGenerationEx +@ stub StrongNameSignatureSize +@ stdcall StrongNameSignatureVerification(wstr long ptr) mscoree.StrongNameSignatureVerification +@ stdcall StrongNameSignatureVerificationEx(wstr long ptr) mscoree.StrongNameSignatureVerificationEx +@ stub StrongNameSignatureVerificationFromImage +@ stub StrongNameTokenFromAssembly +@ stub StrongNameTokenFromAssemblyEx +@ stub StrongNameTokenFromPublicKey +@ stub TranslateSecurityAttributes +@ stdcall _CorDllMain(long long ptr) mscoree._CorDllMain +@ stdcall _CorExeMain2(ptr long ptr ptr ptr) mscoree._CorExeMain2 +@ stdcall _CorExeMain() mscoree._CorExeMain diff --git a/loader/wine.inf.in b/loader/wine.inf.in index c3d3b770b5c..2ac524afdb6 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2554,6 +2554,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,aspnet_regiis.exe,- 11,,ngen.exe,- 11,,fusion.dll,- +11,,mscorwks.dll,- 11,,regsvcs.exe,- 11,,regasm.exe,- 11,,servicemodelreg.exe,- @@ -2603,6 +2604,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,aspnet_regiis.exe,- 11,,ngen.exe,- 11,,fusion.dll,- +11,,mscorwks.dll,- 11,,regsvcs.exe,- 11,,regasm.exe,- 11,,servicemodelreg.exe,- diff --git a/tools/make_specfiles b/tools/make_specfiles index 64c25d12593..5c30ce50038 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -483,6 +483,10 @@ my @dll_groups = "ntoskrnl.exe", "hal", ], + [ + "mscoree", + "mscorwks", + ], ); my $update_flags = 0; -- 2.20.1

2 7

how to change Wine operating system emulation with no need to use winecfg
by Mgr. Janusz Chmiel 11 Jul '19

11 Jul '19

Because Winecfg run by using Wine, it is impossible to work with it without OCR function, because screen reader compatible with Wine do not exist. So please, which registry keys or other values should I change to set Wine emulation to Windows XP from default Windows 7? I need to test some screen readers which work differently in XP mode than in Windows 7 mode. Including Windows light translingual. it is written in C++ with not many depednecies. So I need to try it. NVDA will never work, because it depend on many Microsoft visual C redistributable and on their registry values. And on UI automation when Windows is Vista or newer. Sure, NVDA can also work differently when operating system is Windows XP. But also in those cases, there are issues with missing oleacc.dll MSAA specific functions.

2 1

[PATCH v2] winex11.drv: Support child window rendering for Vulkan via XComposite
by Felix Hädicke 11 Jul '19

11 Jul '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45277 Signed-off-by: Felix Hädicke <felixhaedicke(a)web.de> --- Changes in v2: - add missing XUniqueContext() initialisation for vulkan_swapchain_surface_context dlls/winex11.drv/vulkan.c | 60 +++++++++++++++++++++++++++++++++------ 1 file changed, 51 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 28ae1a9e0e..a482109408 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 */ }; @@ -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,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 +395,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 +568,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.22.0

1 0

Re: [PATCH 1/2] user32/edit: In EM_POSFROMCHAR return correct position for empty lines
by Nikolay Sivov 11 Jul '19

11 Jul '19

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 > > >

1 0

Staging of patches
by Alistair Leslie-Hughes 11 Jul '19

11 Jul '19

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.

1 0

[PATCH] winex11.drv: Support child window rendering for Vulkan via XComposite
by Felix Hädicke 10 Jul '19

10 Jul '19

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

1 0

[PATCH] d3drm: Correct paramater count of several interface defines.
by Jeff Smith 10 Jul '19

10 Jul '19

--- include/d3drm.h | 16 ++++++++-------- include/d3drmobj.h | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/d3drm.h b/include/d3drm.h index 126695cea1..c10b9ed18c 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -322,7 +322,7 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown) #define IDirect3DRM2_EnumerateObjects(p,a,b) (p)->EnumerateObjects(a,b) #define IDirect3DRM2_Load(p,a,b,c,d,e,f,g,h,i,j) (p)->Load(a,b,c,d,e,f,g,h,i,j) #define IDirect3DRM2_Tick(p,a) (p)->Tick(a) -#define IDirect3DRM2_CreateProgressiveMesh(p,a) (p)->CreateProgressiveMesh(p,a) +#define IDirect3DRM2_CreateProgressiveMesh(p,a) (p)->CreateProgressiveMesh(a) #endif /***************************************************************************** @@ -434,7 +434,7 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown) #define IDirect3DRM3_CreateProgressiveMesh(p,a) (p)->lpVtbl->CreateProgressiveMesh(p,a) #define IDirect3DRM3_RegisterClient(p,a,b) (p)->lpVtbl->RegisterClient(p,a,b) #define IDirect3DRM3_UnregisterClient(p,a) (p)->lpVtbl->UnregisterClient(p,a) -#define IDirect3DRM3_CreateClippedVisual(p,ab) (p)->lpVtbl->CreateClippedVisual(p,a,b) +#define IDirect3DRM3_CreateClippedVisual(p,a,b) (p)->lpVtbl->CreateClippedVisual(p,a,b) #define IDirect3DRM3_SetOptions(p,a) (p)->lpVtbl->SetOptions(p,a) #define IDirect3DRM3_GetOptions(p,a) (p)->lpVtbl->GetOptions(p,a) #else @@ -475,12 +475,12 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown) #define IDirect3DRM3_EnumerateObjects(p,a,b) (p)->EnumerateObjects(a,b) #define IDirect3DRM3_Load(p,a,b,c,d,e,f,g,h,i,j) (p)->Load(a,b,c,d,e,f,g,h,i,j) #define IDirect3DRM3_Tick(p,a) (p)->Tick(a) -#define IDirect3DRM3_CreateProgressiveMesh(p,a) (p)->CreateProgressiveMesh(p,a) -#define IDirect3DRM3_RegisterClient(p,a,b) (p)->RegisterClient(p,a,b) -#define IDirect3DRM3_UnregisterClient(p,a) (p)->UnregisterClient(p,a) -#define IDirect3DRM3_CreateClippedVisual(p,ab) (p)->CreateClippedVisual(p,a,b) -#define IDirect3DRM3_SetOptions(p,a) (p)->SetOptions(p,a) -#define IDirect3DRM3_GetOptions(p,a) (p)->GetOptions(p,a) +#define IDirect3DRM3_CreateProgressiveMesh(p,a) (p)->CreateProgressiveMesh(a) +#define IDirect3DRM3_RegisterClient(p,a,b) (p)->RegisterClient(a,b) +#define IDirect3DRM3_UnregisterClient(p,a) (p)->UnregisterClient(a) +#define IDirect3DRM3_CreateClippedVisual(p,a,b) (p)->CreateClippedVisual(a,b) +#define IDirect3DRM3_SetOptions(p,a) (p)->SetOptions(a) +#define IDirect3DRM3_GetOptions(p,a) (p)->GetOptions(a) #endif #define D3DRM_OK DD_OK diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 5ff33fea01..7e48d9891d 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -3616,9 +3616,9 @@ DECLARE_INTERFACE_(IDirect3DRMWrap, IDirect3DRMObject) #define IDirect3DRMWrap_GetName(p,a,b) (p)->GetName(a,b) #define IDirect3DRMWrap_GetClassName(p,a,b) (p)->GetClassName(a,b) /*** IDirect3DRMWrap methods ***/ -#define IDirect3DRMWrap_Init(p,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o) (p)->Init(p,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o) -#define IDirect3DRMWrap_Apply(p,a) (p)->Apply(p,a) -#define IDirect3DRMWrap_ApplyRelative(p,a,b) (p)->ApplyRelative(p,a,b) +#define IDirect3DRMWrap_Init(p,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o) (p)->Init(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o) +#define IDirect3DRMWrap_Apply(p,a) (p)->Apply(a) +#define IDirect3DRMWrap_ApplyRelative(p,a,b) (p)->ApplyRelative(a,b) #endif /***************************************************************************** -- 2.14.3

2 1