Henri Verbeet : wined3d: Unhook swapchains in swapchain_cleanup().
Alexandre Julliard
julliard at winehq.org
Tue Jul 2 15:32:01 CDT 2019
Module: wine
Branch: master
Commit: 1ba7247a4feeab519fb9f0c53b8d3572c47c7660
URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ba7247a4feeab519fb9f0c53b8d3572c47c7660
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Tue Jul 2 02:28:35 2019 +0430
wined3d: Unhook swapchains in swapchain_cleanup().
So that the hook is properly removed on failure in wined3d_swapchain_create().
This is a somewhat theoretical though, since in practice
WINED3D_SWAPCHAIN_HOOK and WINED3D_SWAPCHAIN_IMPLICIT are never used together.
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wined3d/swapchain.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c
index b75aead..9be6658 100644
--- a/dlls/wined3d/swapchain.c
+++ b/dlls/wined3d/swapchain.c
@@ -39,6 +39,7 @@ static void swapchain_cleanup(struct wined3d_swapchain *swapchain)
TRACE("Destroying swapchain %p.\n", swapchain);
+ wined3d_unhook_swapchain(swapchain);
wined3d_swapchain_set_gamma_ramp(swapchain, 0, &swapchain->orig_gamma);
/* Release the swapchain's draw buffers. Make sure swapchain->back_buffers[0]
@@ -121,7 +122,6 @@ ULONG CDECL wined3d_swapchain_decref(struct wined3d_swapchain *swapchain)
device = swapchain->device;
if (device->swapchain_count && device->swapchains[0] == swapchain)
wined3d_device_uninit_3d(device);
- wined3d_unhook_swapchain(swapchain);
wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT);
swapchain_cleanup(swapchain);
More information about the wine-cvs
mailing list