- Wine-Commits - list.winehq.org

Alex Henrie : ole32/tests: Free what get_stgdef returns in test_OleCreateStaticFromData.
by Alexandre Julliard Dec. 4, 2023

Dec. 4, 2023

Module: wine Branch: master Commit: 3bda0653743928f051a17703a010d2d59d955de3 URL: https://gitlab.winehq.org/wine/wine/-/commit/3bda0653743928f051a17703a010d2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 4 00:03:18 2023 -0700 ole32/tests: Free what get_stgdef returns in test_OleCreateStaticFromData. --- dlls/ole32/tests/ole2.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 5c32ee6c142..61bca7682f6 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -4549,6 +4549,7 @@ static void test_OleCreateStaticFromData(void) IPersist_Release(persist); IStorage_Release(storage); IOleObject_Release(ole_obj); + HeapFree(GetProcessHeap(), 0, (void *)stg_def_dib.stream[2].data); /* CF_ENHMETAFILE */ hr = CreateILockBytesOnHGlobal(NULL, TRUE, &ilb); @@ -4582,6 +4583,7 @@ static void test_OleCreateStaticFromData(void) IPersist_Release(persist); IStorage_Release(storage); IOleObject_Release(ole_obj); + HeapFree(GetProcessHeap(), 0, (void *)stg_def_emf.stream[2].data); /* CF_TEXT */ hr = CreateILockBytesOnHGlobal(NULL, TRUE, &ilb);

1 0

Zhiyi Zhang : winegstreamer: Fix wg_transform_get_status() result check (Coverity).
by Alexandre Julliard Dec. 4, 2023

Dec. 4, 2023

Module: wine Branch: master Commit: c2d56a7e993738c3772411561022d41c22cfb7b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/c2d56a7e993738c3772411561022d4… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat Dec 2 23:44:00 2023 +0800 winegstreamer: Fix wg_transform_get_status() result check (Coverity). wg_transform_get_status() returns bool, not HRESULT. --- dlls/winegstreamer/aac_decoder.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/aac_decoder.c b/dlls/winegstreamer/aac_decoder.c index 3eb96d0106a..dfab7a8b0c0 100644 --- a/dlls/winegstreamer/aac_decoder.c +++ b/dlls/winegstreamer/aac_decoder.c @@ -535,15 +535,14 @@ static HRESULT WINAPI transform_GetInputStatus(IMFTransform *iface, DWORD id, DW { struct aac_decoder *decoder = impl_from_IMFTransform(iface); bool accepts_input; - HRESULT hr; TRACE("iface %p, id %#lx, flags %p.\n", iface, id, flags); if (!decoder->wg_transform) return MF_E_TRANSFORM_TYPE_NOT_SET; - if (FAILED(hr = wg_transform_get_status(decoder->wg_transform, &accepts_input))) - return hr; + if (!wg_transform_get_status(decoder->wg_transform, &accepts_input)) + return E_FAIL; *flags = accepts_input ? MFT_INPUT_STATUS_ACCEPT_DATA : 0; return S_OK;

1 0

Alex Henrie : ole32/tests: Use CRT allocation functions.
by Alexandre Julliard Dec. 4, 2023

Dec. 4, 2023

Module: wine Branch: master Commit: 93db373c286157b2d2c6dd478877528a9fb1265d URL: https://gitlab.winehq.org/wine/wine/-/commit/93db373c286157b2d2c6dd47887752… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 4 00:03:18 2023 -0700 ole32/tests: Use CRT allocation functions. --- dlls/ole32/tests/clipboard.c | 28 +++++------ dlls/ole32/tests/compobj.c | 4 +- dlls/ole32/tests/marshal.c | 13 +++--- dlls/ole32/tests/moniker.c | 11 ++--- dlls/ole32/tests/ole2.c | 34 +++++++------- dlls/ole32/tests/ole_server.c | 4 +- dlls/ole32/tests/propvariant.c | 6 +-- dlls/ole32/tests/storage32.c | 12 ++--- dlls/ole32/tests/usrmarshal.c | 104 ++++++++++++++++++++--------------------- 9 files changed, 107 insertions(+), 109 deletions(-)

1 0

Gabriel Ivăncescu : mshtml/tests: Fix XHR leak in test_window_refs.
by Alexandre Julliard Dec. 4, 2023

Dec. 4, 2023

Module: wine Branch: master Commit: 47eec813a3640521b989ea8709ace0964dd57806 URL: https://gitlab.winehq.org/wine/wine/-/commit/47eec813a3640521b989ea8709ace0… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Dec 4 17:27:58 2023 +0200 mshtml/tests: Fix XHR leak in test_window_refs. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/tests/events.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 4b775ceb8b8..4732236c52c 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -3320,6 +3320,7 @@ static void test_window_refs(IHTMLDocument2 *doc) hres = IHTMLXMLHttpRequestFactory_create(xhr_factory, &xhr); ok(hres == S_OK, "create failed: %08lx\n", hres); IHTMLXMLHttpRequestFactory_Release(xhr_factory); + IHTMLXMLHttpRequest_Release(xhr); hres = IHTMLImageElementFactory_create(image_factory, vempty, vempty, &img_elem); ok(hres == S_OK, "create failed: %08lx\n", hres);

1 0

Zhiyi Zhang : gdiplus: Fix a memory leak (Coverity).
by Alexandre Julliard Dec. 4, 2023

Dec. 4, 2023

Module: wine Branch: master Commit: 41d923a49f9e092aafd0771e80d47ea63ac5dec7 URL: https://gitlab.winehq.org/wine/wine/-/commit/41d923a49f9e092aafd0771e80d47e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sun Dec 3 00:14:48 2023 +0800 gdiplus: Fix a memory leak (Coverity). --- dlls/gdiplus/graphicspath.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 1804efdba54..24c2888cfe8 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -2236,6 +2236,7 @@ static void add_anchor(const GpPointF *endpoint, const GpPointF *nextpoint, widen_closed_figure(tmp_points, 0, custom->pathdata.Count - 1, pen, pen_width, last_point); else widen_open_figure(tmp_points, 0, custom->pathdata.Count - 1, pen, pen_width, custom->strokeEndCap, NULL, custom->strokeStartCap, NULL, last_point); + free(tmp_points); } else {

1 0

Gabriel Ivăncescu : mshtml: Don't check for NULL outer_window from within HTMLWindow* methods.
by Alexandre Julliard Dec. 4, 2023

Dec. 4, 2023

Module: wine Branch: master Commit: 9bdfe8ee25e2574d8fefe591fe48784aba67d4f9 URL: https://gitlab.winehq.org/wine/wine/-/commit/9bdfe8ee25e2574d8fefe591fe4878… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Dec 4 17:27:58 2023 +0200 mshtml: Don't check for NULL outer_window from within HTMLWindow* methods. These methods are not called from any of our objects that hold ref to the inner window only, and since we return outer windows to external callers now, they *must* have a ref to the outer window, which effectively means these cannot be NULL. And some other places didn't check for NULL either (e.g. get_parent). Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlwindow.c | 68 +++++++++++++++++++----------------------------- 1 file changed, 27 insertions(+), 41 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index fc0a03e3bf8..fa99c453989 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -584,7 +584,7 @@ static HRESULT WINAPI HTMLWindow2_alert(IHTMLWindow2 *iface, BSTR message) TRACE("(%p)->(%s)\n", This, debugstr_w(message)); - if(!This->outer_window || !This->outer_window->browser) + if(!This->outer_window->browser) return E_UNEXPECTED; if(!LoadStringW(get_shdoclc(), IDS_MESSAGE_BOX_TITLE, title, ARRAY_SIZE(title))) { @@ -617,7 +617,7 @@ static HRESULT WINAPI HTMLWindow2_confirm(IHTMLWindow2 *iface, BSTR message, if(!confirmed) return E_INVALIDARG; - if(!This->outer_window || !This->outer_window->browser) + if(!This->outer_window->browser) return E_UNEXPECTED; if(!LoadStringW(get_shdoclc(), IDS_MESSAGE_BOX_TITLE, wszTitle, ARRAY_SIZE(wszTitle))) { @@ -711,7 +711,7 @@ static HRESULT WINAPI HTMLWindow2_prompt(IHTMLWindow2 *iface, BSTR message, TRACE("(%p)->(%s %s %p)\n", This, debugstr_w(message), debugstr_w(dststr), textdata); - if(!This->outer_window || !This->outer_window->browser) + if(!This->outer_window->browser) return E_UNEXPECTED; if(textdata) V_VT(textdata) = VT_NULL; @@ -846,7 +846,7 @@ static HRESULT WINAPI HTMLWindow2_close(IHTMLWindow2 *iface) TRACE("(%p)\n", This); - if(!window || !window->browser) { + if(!window->browser) { FIXME("No document object\n"); return E_FAIL; } @@ -953,7 +953,7 @@ static HRESULT WINAPI HTMLWindow2_open(IHTMLWindow2 *iface, BSTR url, BSTR name, if(replace) FIXME("unsupported relace argument\n"); - if(!window || !window->browser || !window->uri_nofrag) + if(!window->browser || !window->uri_nofrag) return E_UNEXPECTED; if(name && *name == '_') { @@ -1310,7 +1310,7 @@ static HRESULT WINAPI HTMLWindow2_focus(IHTMLWindow2 *iface) TRACE("(%p)->()\n", This); - if(!This->outer_window || !This->outer_window->browser) + if(!This->outer_window->browser) return E_UNEXPECTED; SetFocus(This->outer_window->browser->doc->hwnd); @@ -1477,7 +1477,7 @@ static HRESULT WINAPI HTMLWindow2_get_external(IHTMLWindow2 *iface, IDispatch ** TRACE("(%p)->(%p)\n", This, p); - if(!This->outer_window || !This->outer_window->browser) + if(!This->outer_window->browser) return E_UNEXPECTED; *p = NULL; @@ -2396,9 +2396,6 @@ static HRESULT WINAPI HTMLWindow7_getComputedStyle(IHTMLWindow7 *iface, IHTMLDOM TRACE("(%p)->(%p %s %p)\n", This, node, debugstr_w(pseudo_elt), p); - if(!This->outer_window || !This->inner_window) - return E_UNEXPECTED; - hres = IHTMLDOMNode_QueryInterface(node, &IID_IHTMLElement, (void**)&elem); if(FAILED(hres)) return hres; @@ -2832,7 +2829,7 @@ static HRESULT WINAPI HTMLPrivateWindow_SuperNavigate(IHTMLPrivateWindow *iface, if(flags & ~2) FIXME("unimplemented flags %lx\n", flags & ~2); - if(!window || !window->browser) + if(!window->browser) return E_FAIL; if(window->browser->doc->hostui) { @@ -3641,6 +3638,9 @@ static HRESULT WINAPI WindowDispEx_GetDispID(IDispatchEx *iface, BSTR bstrName, { HTMLWindow *This = impl_from_IDispatchEx(iface); HTMLInnerWindow *window = This->inner_window; + HTMLOuterWindow *frame; + global_prop_t *prop; + IHTMLElement *elem; HRESULT hres; TRACE("(%p)->(%s %lx %p)\n", This, debugstr_w(bstrName), grfdex, pid); @@ -3653,38 +3653,27 @@ static HRESULT WINAPI WindowDispEx_GetDispID(IDispatchEx *iface, BSTR bstrName, if(hres != DISP_E_UNKNOWNNAME) return hres; - if(This->outer_window) { - HTMLOuterWindow *frame; - - hres = get_frame_by_name(This->outer_window, bstrName, FALSE, &frame); - if(SUCCEEDED(hres) && frame) { - global_prop_t *prop; - - prop = alloc_global_prop(window, GLOBAL_FRAMEVAR, bstrName); - if(!prop) - return E_OUTOFMEMORY; + hres = get_frame_by_name(This->outer_window, bstrName, FALSE, &frame); + if(SUCCEEDED(hres) && frame) { + prop = alloc_global_prop(window, GLOBAL_FRAMEVAR, bstrName); + if(!prop) + return E_OUTOFMEMORY; - *pid = prop_to_dispid(window, prop); - return S_OK; - } + *pid = prop_to_dispid(window, prop); + return S_OK; } - if(window->doc) { - global_prop_t *prop; - IHTMLElement *elem; - - hres = IHTMLDocument3_getElementById(&window->base.inner_window->doc->IHTMLDocument3_iface, - bstrName, &elem); - if(SUCCEEDED(hres) && elem) { - IHTMLElement_Release(elem); + hres = IHTMLDocument3_getElementById(&window->base.inner_window->doc->IHTMLDocument3_iface, + bstrName, &elem); + if(SUCCEEDED(hres) && elem) { + IHTMLElement_Release(elem); - prop = alloc_global_prop(window, GLOBAL_ELEMENTVAR, bstrName); - if(!prop) - return E_OUTOFMEMORY; + prop = alloc_global_prop(window, GLOBAL_ELEMENTVAR, bstrName); + if(!prop) + return E_OUTOFMEMORY; - *pid = prop_to_dispid(window, prop); - return S_OK; - } + *pid = prop_to_dispid(window, prop); + return S_OK; } return DISP_E_UNKNOWNNAME; @@ -4120,9 +4109,6 @@ static HRESULT HTMLWindow_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD return E_NOTIMPL; } case GLOBAL_FRAMEVAR: - if(!This->base.outer_window) - return E_UNEXPECTED; - switch(flags) { case DISPATCH_PROPERTYGET: { HTMLOuterWindow *frame;

1 0

Gabriel Ivăncescu : mshtml: Don't attempt to send storage events after outer window is detached.
by Alexandre Julliard Dec. 4, 2023

Dec. 4, 2023

Module: wine Branch: master Commit: 0dc3784b68b7dbc314cee8bea504bbf22da59a4f URL: https://gitlab.winehq.org/wine/wine/-/commit/0dc3784b68b7dbc314cee8bea504bb… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Dec 4 17:27:58 2023 +0200 mshtml: Don't attempt to send storage events after outer window is detached. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlstorage.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index efd4b2d88ae..06d16e4e4aa 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -322,6 +322,11 @@ static HRESULT send_storage_event(HTMLStorage *storage, BSTR key, BSTR old_value HRESULT hres = S_OK; ctx.url = NULL; + + /* FIXME: Events are actually sent to the current window on native, even if we're detached. */ + if(!window->base.outer_window) + goto done; + if(window->base.outer_window->uri_nofrag) { hres = IUri_GetDisplayUri(window->base.outer_window->uri_nofrag, &ctx.url); if(hres != S_OK)

1 0

Gabriel Ivăncescu : mshtml: Don't rely on the outer_window in document.mimeType.
by Alexandre Julliard Dec. 4, 2023

Dec. 4, 2023

Module: wine Branch: master Commit: a5028f1e26c2ab6ef8c947b5d8ba75f76bb7bd92 URL: https://gitlab.winehq.org/wine/wine/-/commit/a5028f1e26c2ab6ef8c947b5d8ba75… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Dec 4 17:27:57 2023 +0200 mshtml: Don't rely on the outer_window in document.mimeType. This would have crashed on detached windows, and checking the navigation_start time has the same effect except it's decoupled from the outer window. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 002d2553e4f..e37f04fee0b 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1296,7 +1296,7 @@ static HRESULT WINAPI HTMLDocument_get_mimeType(IHTMLDocument2 *iface, BSTR *p) *p = NULL; - if(This->window && This->window->base.outer_window->readystate == READYSTATE_UNINITIALIZED) + if(This->window && !This->window->navigation_start_time) return (*p = SysAllocString(L"")) ? S_OK : E_FAIL; nsAString_InitDepend(&nsstr, NULL);

1 0

Rémi Bernon : winevulkan: Use "host" more consistently instead of "native".
by Alexandre Julliard Dec. 4, 2023

Dec. 4, 2023

Module: wine Branch: master Commit: 288d2c2ef658b4041216fde295ba6d7e399dacb7 URL: https://gitlab.winehq.org/wine/wine/-/commit/288d2c2ef658b4041216fde295ba6d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 27 17:08:37 2023 +0100 winevulkan: Use "host" more consistently instead of "native". We often use "native" to talk about Windows "native" code, which is confusing here. --- dlls/winevulkan/make_vulkan | 42 +- dlls/winevulkan/vulkan.c | 203 ++-- dlls/winevulkan/vulkan_private.h | 28 +- dlls/winevulkan/vulkan_thunks.c | 2114 +++++++++++++++++++------------------- dlls/winewayland.drv/vulkan.c | 2 +- include/wine/vulkan_driver.h | 2 +- 6 files changed, 1196 insertions(+), 1195 deletions(-)

1 0

Rémi Bernon : winex11: Use "host" instead of "native" in vulkan wrappers.
by Alexandre Julliard Dec. 4, 2023

Dec. 4, 2023

Module: wine Branch: master Commit: c0042af5cc2f6d03e3875f4cd4a7c97315dd0ab2 URL: https://gitlab.winehq.org/wine/wine/-/commit/c0042af5cc2f6d03e3875f4cd4a7c9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 24 21:31:38 2023 +0100 winex11: Use "host" instead of "native" in vulkan wrappers. --- dlls/winex11.drv/vulkan.c | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 101504a7887..8d1da4d0ddc 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -60,7 +60,7 @@ struct wine_vk_surface LONG ref; struct list entry; Window window; - VkSurfaceKHR surface; /* native surface */ + VkSurfaceKHR host_surface; HWND hwnd; DWORD hwnd_thread_id; }; @@ -295,7 +295,7 @@ static VkResult X11DRV_vkCreateSwapchainKHR(VkDevice device, return VK_ERROR_SURFACE_LOST_KHR; create_info_host = *create_info; - create_info_host.surface = x11_surface->surface; + create_info_host.surface = x11_surface->host_surface; return pvkCreateSwapchainKHR(device, &create_info_host, NULL /* allocator */, swapchain); } @@ -351,7 +351,7 @@ static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance, create_info_host.dpy = gdi_display; create_info_host.window = x11_surface->window; - res = pvkCreateXlibSurfaceKHR(instance, &create_info_host, NULL /* allocator */, &x11_surface->surface); + res = pvkCreateXlibSurfaceKHR( instance, &create_info_host, NULL /* allocator */, &x11_surface->host_surface ); if (res != VK_SUCCESS) { ERR("Failed to create Xlib surface, res=%d\n", res); @@ -400,7 +400,7 @@ static void X11DRV_vkDestroySurfaceKHR(VkInstance instance, VkSurfaceKHR surface /* vkDestroySurfaceKHR must handle VK_NULL_HANDLE (0) for surface. */ if (x11_surface) { - pvkDestroySurfaceKHR(instance, x11_surface->surface, NULL /* allocator */); + pvkDestroySurfaceKHR( instance, x11_surface->host_surface, NULL /* allocator */ ); wine_vk_surface_release(x11_surface); } @@ -465,10 +465,10 @@ static VkResult X11DRV_vkGetDeviceGroupSurfacePresentModesKHR(VkDevice device, TRACE("%p, 0x%s, %p\n", device, wine_dbgstr_longlong(surface), flags); - return pvkGetDeviceGroupSurfacePresentModesKHR(device, x11_surface->surface, flags); + return pvkGetDeviceGroupSurfacePresentModesKHR( device, x11_surface->host_surface, flags ); } -static const char *wine_vk_native_fn_name(const char *name) +static const char *wine_vk_host_fn_name( const char *name ) { if (!strcmp(name, "vkCreateWin32SurfaceKHR")) return "vkCreateXlibSurfaceKHR"; @@ -484,8 +484,7 @@ static void *X11DRV_vkGetDeviceProcAddr(VkDevice device, const char *name) TRACE("%p, %s\n", device, debugstr_a(name)); - if (!pvkGetDeviceProcAddr(device, wine_vk_native_fn_name(name))) - return NULL; + if (!pvkGetDeviceProcAddr( device, wine_vk_host_fn_name( name ) )) return NULL; if ((proc_addr = X11DRV_get_vk_device_proc_addr(name))) return proc_addr; @@ -499,8 +498,7 @@ static void *X11DRV_vkGetInstanceProcAddr(VkInstance instance, const char *name) TRACE("%p, %s\n", instance, debugstr_a(name)); - if (!pvkGetInstanceProcAddr(instance, wine_vk_native_fn_name(name))) - return NULL; + if (!pvkGetInstanceProcAddr( instance, wine_vk_host_fn_name( name ) )) return NULL; if ((proc_addr = X11DRV_get_vk_instance_proc_addr(instance, name))) return proc_addr; @@ -524,7 +522,7 @@ static VkResult X11DRV_vkGetPhysicalDevicePresentRectanglesKHR(VkPhysicalDevice return VK_SUCCESS; } - return pvkGetPhysicalDevicePresentRectanglesKHR(phys_dev, x11_surface->surface, count, rects); + return pvkGetPhysicalDevicePresentRectanglesKHR( phys_dev, x11_surface->host_surface, count, rects ); } static VkResult X11DRV_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice phys_dev, @@ -534,7 +532,7 @@ static VkResult X11DRV_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevi TRACE("%p, %p, %p\n", phys_dev, surface_info, capabilities); surface_info_host = *surface_info; - surface_info_host.surface = surface_from_handle(surface_info->surface)->surface; + surface_info_host.surface = surface_from_handle( surface_info->surface )->host_surface; if (pvkGetPhysicalDeviceSurfaceCapabilities2KHR) return pvkGetPhysicalDeviceSurfaceCapabilities2KHR(phys_dev, &surface_info_host, capabilities); @@ -556,7 +554,7 @@ static VkResult X11DRV_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevic if (!x11_surface->hwnd) return VK_ERROR_SURFACE_LOST_KHR; - return pvkGetPhysicalDeviceSurfaceCapabilitiesKHR(phys_dev, x11_surface->surface, capabilities); + return pvkGetPhysicalDeviceSurfaceCapabilitiesKHR( phys_dev, x11_surface->host_surface, capabilities ); } static VkResult X11DRV_vkGetPhysicalDeviceSurfaceFormats2KHR(VkPhysicalDevice phys_dev, @@ -569,7 +567,7 @@ static VkResult X11DRV_vkGetPhysicalDeviceSurfaceFormats2KHR(VkPhysicalDevice ph TRACE("%p, %p, %p, %p\n", phys_dev, surface_info, count, formats); surface_info_host = *surface_info; - surface_info_host.surface = surface_from_handle(surface_info->surface)->surface; + surface_info_host.surface = surface_from_handle( surface_info->surface )->host_surface; if (pvkGetPhysicalDeviceSurfaceFormats2KHR) return pvkGetPhysicalDeviceSurfaceFormats2KHR(phys_dev, &surface_info_host, count, formats); @@ -601,7 +599,7 @@ static VkResult X11DRV_vkGetPhysicalDeviceSurfaceFormatsKHR(VkPhysicalDevice phy TRACE("%p, 0x%s, %p, %p\n", phys_dev, wine_dbgstr_longlong(surface), count, formats); - return pvkGetPhysicalDeviceSurfaceFormatsKHR(phys_dev, x11_surface->surface, count, formats); + return pvkGetPhysicalDeviceSurfaceFormatsKHR( phys_dev, x11_surface->host_surface, count, formats ); } static VkResult X11DRV_vkGetPhysicalDeviceSurfacePresentModesKHR(VkPhysicalDevice phys_dev, @@ -611,7 +609,7 @@ static VkResult X11DRV_vkGetPhysicalDeviceSurfacePresentModesKHR(VkPhysicalDevic TRACE("%p, 0x%s, %p, %p\n", phys_dev, wine_dbgstr_longlong(surface), count, modes); - return pvkGetPhysicalDeviceSurfacePresentModesKHR(phys_dev, x11_surface->surface, count, modes); + return pvkGetPhysicalDeviceSurfacePresentModesKHR( phys_dev, x11_surface->host_surface, count, modes ); } static VkResult X11DRV_vkGetPhysicalDeviceSurfaceSupportKHR(VkPhysicalDevice phys_dev, @@ -621,7 +619,7 @@ static VkResult X11DRV_vkGetPhysicalDeviceSurfaceSupportKHR(VkPhysicalDevice phy TRACE("%p, %u, 0x%s, %p\n", phys_dev, index, wine_dbgstr_longlong(surface), supported); - return pvkGetPhysicalDeviceSurfaceSupportKHR(phys_dev, index, x11_surface->surface, supported); + return pvkGetPhysicalDeviceSurfaceSupportKHR( phys_dev, index, x11_surface->host_surface, supported ); } static VkBool32 X11DRV_vkGetPhysicalDeviceWin32PresentationSupportKHR(VkPhysicalDevice phys_dev, @@ -672,13 +670,13 @@ static VkResult X11DRV_vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR * return res; } -static VkSurfaceKHR X11DRV_wine_get_native_surface(VkSurfaceKHR surface) +static VkSurfaceKHR X11DRV_wine_get_host_surface( VkSurfaceKHR surface ) { struct wine_vk_surface *x11_surface = surface_from_handle(surface); TRACE("0x%s\n", wine_dbgstr_longlong(surface)); - return x11_surface->surface; + return x11_surface->host_surface; } static const struct vulkan_funcs vulkan_funcs = @@ -704,7 +702,7 @@ static const struct vulkan_funcs vulkan_funcs = X11DRV_vkGetSwapchainImagesKHR, X11DRV_vkQueuePresentKHR, - X11DRV_wine_get_native_surface, + X11DRV_wine_get_host_surface, }; static void *X11DRV_get_vk_device_proc_addr(const char *name)

1 0