February 2021 - Wine-Commits

Alexandre Julliard : authz: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 22, 2021

Feb. 22, 2021

Module: wine Branch: master Commit: 1c5a00d26592037d11b91fa15d537a0eb3cc3fbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c5a00d26592037d11b91fa1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 22 09:24:04 2021 +0100 authz: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/authz/Makefile.in | 2 +- dlls/authz/authz.c | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/dlls/authz/Makefile.in b/dlls/authz/Makefile.in index 91a070485bb..33244b45b06 100644 --- a/dlls/authz/Makefile.in +++ b/dlls/authz/Makefile.in @@ -1,6 +1,6 @@ MODULE = authz.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ authz.c diff --git a/dlls/authz/authz.c b/dlls/authz/authz.c index 72d462d3bb8..879207dd9b6 100644 --- a/dlls/authz/authz.c +++ b/dlls/authz/authz.c @@ -27,24 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(authz); -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - default: - break; - } - - return TRUE; -} - /*********************************************************************** * AuthzInitializeResourceManager (AUTHZ.@) */

1 0

Alexandre Julliard : activeds: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 22, 2021

Feb. 22, 2021

Module: wine Branch: master Commit: 93c551abd6c206b68119113b8adf0db66fd96179 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93c551abd6c206b68119113b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 22 09:23:49 2021 +0100 activeds: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/activeds/Makefile.in | 2 +- dlls/activeds/activeds_main.c | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/dlls/activeds/Makefile.in b/dlls/activeds/Makefile.in index e76db4f7bcd..6a64ec541b9 100644 --- a/dlls/activeds/Makefile.in +++ b/dlls/activeds/Makefile.in @@ -2,7 +2,7 @@ MODULE = activeds.dll IMPORTLIB = activeds IMPORTS = advapi32 ole32 oleaut32 uuid -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ activeds_main.c \ diff --git a/dlls/activeds/activeds_main.c b/dlls/activeds/activeds_main.c index 1b22da67653..9a8bb3b0e73 100644 --- a/dlls/activeds/activeds_main.c +++ b/dlls/activeds/activeds_main.c @@ -40,24 +40,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(activeds); -/***************************************************** - * DllMain - */ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(%p, %d, %p)\n",hinstDLL, fdwReason, lpvReserved); - - switch(fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( hinstDLL ); - break; - } - return TRUE; -} - /***************************************************** * ADsGetObject [ACTIVEDS.3] */

1 0

Alexandre Julliard : compstui: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 22, 2021

Feb. 22, 2021

Module: wine Branch: master Commit: 3d154c7e2d3a1eba093cc99e79b69a2604197b66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d154c7e2d3a1eba093cc99e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 22 09:24:16 2021 +0100 compstui: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/compstui/Makefile.in | 2 +- dlls/compstui/compstui_main.c | 19 ------------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/compstui/Makefile.in b/dlls/compstui/Makefile.in index 2cbc2ed6729..124d9f16270 100644 --- a/dlls/compstui/Makefile.in +++ b/dlls/compstui/Makefile.in @@ -1,7 +1,7 @@ MODULE = compstui.dll IMPORTLIB = compstui -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ compstui_main.c diff --git a/dlls/compstui/compstui_main.c b/dlls/compstui/compstui_main.c index e05acdc0fad..8dc715666c4 100644 --- a/dlls/compstui/compstui_main.c +++ b/dlls/compstui/compstui_main.c @@ -31,25 +31,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(compstui); -/***************************************************** - * DllMain - */ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(%p, %d, %p)\n",hinstDLL, fdwReason, lpvReserved); - - switch(fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( hinstDLL ); - break; - } - return TRUE; -} - /****************************************************************** * CommonPropertySheetUIA (COMPSTUI.@) *

1 0

Alexandre Julliard : connect: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 22, 2021

Feb. 22, 2021

Module: wine Branch: master Commit: 666ffbef54611a2435d6333aa7106418f1282f94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=666ffbef54611a2435d6333a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 22 09:24:20 2021 +0100 connect: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/connect/Makefile.in | 2 +- dlls/connect/main.c | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/connect/Makefile.in b/dlls/connect/Makefile.in index f2396138b68..97c6e8ea0a4 100644 --- a/dlls/connect/Makefile.in +++ b/dlls/connect/Makefile.in @@ -1,6 +1,6 @@ MODULE = connect.dll -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/connect/main.c b/dlls/connect/main.c index 95dca3db324..fb84e8cc876 100644 --- a/dlls/connect/main.c +++ b/dlls/connect/main.c @@ -25,20 +25,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(connect); -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) -{ - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instance); - break; - } - - return TRUE; -} - HRESULT WINAPI IsInternetConnected(void) { FIXME("stub, faking success!\n");

1 0

Alexandre Julliard : d3dx10: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 22, 2021

Feb. 22, 2021

Module: wine Branch: master Commit: 174bfbc1c13118a983ce1142fa9ea6c74ea4b936 URL: https://source.winehq.org/git/wine.git/?a=commit;h=174bfbc1c13118a983ce1142… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 22 09:24:32 2021 +0100 d3dx10: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_33/Makefile.in | 2 +- dlls/d3dx10_33/d3dx10_33_main.c | 14 -------------- dlls/d3dx10_34/Makefile.in | 2 +- dlls/d3dx10_34/d3dx10_34_main.c | 14 -------------- dlls/d3dx10_35/Makefile.in | 2 +- dlls/d3dx10_35/d3dx10_35_main.c | 14 -------------- dlls/d3dx10_36/Makefile.in | 2 +- dlls/d3dx10_36/d3dx10_36_main.c | 14 -------------- dlls/d3dx10_37/Makefile.in | 2 +- dlls/d3dx10_37/d3dx10_37_main.c | 14 -------------- dlls/d3dx10_38/Makefile.in | 2 +- dlls/d3dx10_38/d3dx10_38_main.c | 14 -------------- dlls/d3dx10_39/Makefile.in | 2 +- dlls/d3dx10_39/d3dx10_39_main.c | 14 -------------- dlls/d3dx10_40/Makefile.in | 2 +- dlls/d3dx10_40/d3dx10_40_main.c | 14 -------------- dlls/d3dx10_41/Makefile.in | 2 +- dlls/d3dx10_41/d3dx10_41_main.c | 14 -------------- dlls/d3dx10_42/Makefile.in | 2 +- dlls/d3dx10_42/d3dx10_42_main.c | 14 -------------- dlls/d3dx10_43/Makefile.in | 2 +- dlls/d3dx10_43/d3dx10_43_main.c | 14 -------------- 22 files changed, 11 insertions(+), 165 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=174bfbc1c13118a983ce…

1 0

Alexandre Julliard : d3dx11: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 22, 2021

Feb. 22, 2021

Module: wine Branch: master Commit: 0fee3fc46fe684f451952d2d775aab117ba64f25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fee3fc46fe684f451952d2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 22 09:24:37 2021 +0100 d3dx11: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx11_42/Makefile.in | 2 +- dlls/d3dx11_43/Makefile.in | 2 +- dlls/d3dx11_43/main.c | 13 ------------- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/dlls/d3dx11_42/Makefile.in b/dlls/d3dx11_42/Makefile.in index 41792c9fd0a..dbc31e2407d 100644 --- a/dlls/d3dx11_42/Makefile.in +++ b/dlls/d3dx11_42/Makefile.in @@ -3,7 +3,7 @@ MODULE = d3dx11_42.dll IMPORTS = d3dcompiler PARENTSRC = ../d3dx11_43 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ async.c \ diff --git a/dlls/d3dx11_43/Makefile.in b/dlls/d3dx11_43/Makefile.in index bf5a263b284..b69f3f1ce02 100644 --- a/dlls/d3dx11_43/Makefile.in +++ b/dlls/d3dx11_43/Makefile.in @@ -3,7 +3,7 @@ MODULE = d3dx11_43.dll IMPORTLIB = d3dx11 IMPORTS = d3dcompiler -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ async.c \ diff --git a/dlls/d3dx11_43/main.c b/dlls/d3dx11_43/main.c index e8eac58cbbe..950f6d76f5c 100644 --- a/dlls/d3dx11_43/main.c +++ b/dlls/d3dx11_43/main.c @@ -33,19 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); -BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) -{ - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hdll); - } - - return TRUE; -} - BOOL WINAPI D3DX11CheckVersion(UINT d3d_sdk_ver, UINT d3dx_sdk_ver) { return d3d_sdk_ver == D3D11_SDK_VERSION && d3dx_sdk_ver == D3DX11_SDK_VERSION;

1 0

Alexandre Julliard : dhcpcsvc: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 22, 2021

Feb. 22, 2021

Module: wine Branch: master Commit: a688df4d47eabc3dad0046a10a13c3fe9a430026 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a688df4d47eabc3dad0046a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 22 09:24:50 2021 +0100 dhcpcsvc: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dhcpcsvc/Makefile.in | 2 +- dlls/dhcpcsvc/dhcpcsvc.c | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/dhcpcsvc/Makefile.in b/dlls/dhcpcsvc/Makefile.in index 47ab04c690c..d2d46a24f8a 100644 --- a/dlls/dhcpcsvc/Makefile.in +++ b/dlls/dhcpcsvc/Makefile.in @@ -1,6 +1,6 @@ MODULE = dhcpcsvc.dll IMPORTLIB = dhcpcsvc -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = dhcpcsvc.c diff --git a/dlls/dhcpcsvc/dhcpcsvc.c b/dlls/dhcpcsvc/dhcpcsvc.c index d5df635012b..59883bbc72e 100644 --- a/dlls/dhcpcsvc/dhcpcsvc.c +++ b/dlls/dhcpcsvc/dhcpcsvc.c @@ -30,21 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dhcpcsvc); -BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) -{ - TRACE("%p, %u, %p\n", hinst, reason, reserved); - - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( hinst ); - break; - } - return TRUE; -} - void WINAPI DhcpCApiCleanup(void) { FIXME(": stub\n");

1 0

Alexandre Julliard : dpwsockx: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard Feb. 22, 2021

Feb. 22, 2021

Module: wine Branch: master Commit: f13dfc38f62b436f699f0563e908f2c82dd7a85a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f13dfc38f62b436f699f0563… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 22 09:24:54 2021 +0100 dpwsockx: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpwsockx/Makefile.in | 2 +- dlls/dpwsockx/dpwsockx_main.c | 19 ------------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/dpwsockx/Makefile.in b/dlls/dpwsockx/Makefile.in index 5a386a7ac88..1fecc3cbbc0 100644 --- a/dlls/dpwsockx/Makefile.in +++ b/dlls/dpwsockx/Makefile.in @@ -1,7 +1,7 @@ MODULE = dpwsockx.dll IMPORTS = dxguid ws2_32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ dpwsockx_main.c diff --git a/dlls/dpwsockx/dpwsockx_main.c b/dlls/dpwsockx/dpwsockx_main.c index dec3d9e0300..2c73c17be21 100644 --- a/dlls/dpwsockx/dpwsockx_main.c +++ b/dlls/dpwsockx/dpwsockx_main.c @@ -30,25 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dplay); - -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - /* TODO: Initialization */ - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -} - - static HRESULT WINAPI DPWSCB_EnumSessions( LPDPSP_ENUMSESSIONSDATA data ) { FIXME( "(%p,%d,%p,%u) stub\n",

1 0

Hugh McMaster : reg/tests: Add additional tests with embedded NUL characters.
by Alexandre Julliard Feb. 22, 2021

Feb. 22, 2021

Module: wine Branch: master Commit: 6c62ffeca7f381199bef1969452fcef46b979f0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c62ffeca7f381199bef1969… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Feb 22 17:30:03 2021 +1100 reg/tests: Add additional tests with embedded NUL characters. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 471c6ad8d46..db02fc770e2 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -2360,7 +2360,7 @@ static void test_import(void) "\"Wine69c\"=\"Value1\\0\n" "\"Wine69d\"=\"Value2\\0\\0\\0\\0\n" "\"Wine69e\"=\"Value3\\0Value4\n" - "\"Wine69f\"=\"\\0Value4\n\n", &r); + "\"Wine69f\"=\"\\0Value5\n\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_reg_nonexist(hkey, "Wine69a"); verify_reg_nonexist(hkey, "Wine69b"); @@ -2369,6 +2369,22 @@ static void test_import(void) verify_reg_nonexist(hkey, "Wine69e"); verify_reg_nonexist(hkey, "Wine69f"); + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine70a\"=\"\\0\"\n" + "\"Wine70b\"=\"\\0\\0\"\n" + "\"Wine70c\"=\"Value1\\0\"\n" + "\"Wine70d\"=\"Value2\\0\\0\\0\\0\"\n" + "\"Wine70e\"=\"Value3\\0Value4\"\n" + "\"Wine70f\"=\"\\0Value5\"\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine70a"); + todo_wine verify_reg_nonexist(hkey, "Wine70b"); + todo_wine verify_reg_nonexist(hkey, "Wine70c"); + todo_wine verify_reg_nonexist(hkey, "Wine70d"); + todo_wine verify_reg_nonexist(hkey, "Wine70e"); + todo_wine verify_reg_nonexist(hkey, "Wine70f"); + close_key(hkey); delete_key(HKEY_CURRENT_USER, KEY_BASE); @@ -3882,7 +3898,7 @@ static void test_unicode_import(void) "\"Wine69c\"=\"Value1\\0\n" "\"Wine69d\"=\"Value2\\0\\0\\0\\0\n" "\"Wine69e\"=\"Value3\\0Value4\n" - "\"Wine69f\"=\"\\0Value4\n\n", &r); + "\"Wine69f\"=\"\\0Value5\n\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_reg_nonexist(hkey, "Wine69a"); verify_reg_nonexist(hkey, "Wine69b"); @@ -3891,6 +3907,22 @@ static void test_unicode_import(void) verify_reg_nonexist(hkey, "Wine69e"); verify_reg_nonexist(hkey, "Wine69f"); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine70a\"=\"\\0\"\n" + "\"Wine70b\"=\"\\0\\0\"\n" + "\"Wine70c\"=\"Value1\\0\"\n" + "\"Wine70d\"=\"Value2\\0\\0\\0\\0\"\n" + "\"Wine70e\"=\"Value3\\0Value4\"\n" + "\"Wine70f\"=\"\\0Value5\"\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine70a"); + todo_wine verify_reg_nonexist(hkey, "Wine70b"); + todo_wine verify_reg_nonexist(hkey, "Wine70c"); + todo_wine verify_reg_nonexist(hkey, "Wine70d"); + todo_wine verify_reg_nonexist(hkey, "Wine70e"); + todo_wine verify_reg_nonexist(hkey, "Wine70f"); + close_key(hkey); delete_key(HKEY_CURRENT_USER, KEY_BASE);

1 0

Henri Verbeet : wined3d: Do not fail swapchain creation in wined3d_swapchain_vk_init() if a Vulkan swapchain could not be created.
by Alexandre Julliard Feb. 22, 2021

Feb. 22, 2021

Module: wine Branch: master Commit: 2ff9a8f08a2cf66241df03304f40e19608beca11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ff9a8f08a2cf66241df0330… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 19 21:31:12 2021 +0100 wined3d: Do not fail swapchain creation in wined3d_swapchain_vk_init() if a Vulkan swapchain could not be created. While far from ideal, we can still use swapchain_blit_gdi() to get back-buffers to the screen. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index a027a7cffb1..72e17a6f833 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1710,12 +1710,9 @@ HRESULT wined3d_swapchain_vk_init(struct wined3d_swapchain_vk *swapchain_vk, str } if (FAILED(hr = wined3d_swapchain_vk_create_vulkan_swapchain(swapchain_vk))) - { - wined3d_swapchain_cleanup(&swapchain_vk->s); - return hr; - } + WARN("Failed to create a Vulkan swapchain, hr %#x.\n", hr); - return hr; + return WINED3D_OK; } HRESULT CDECL wined3d_swapchain_create(struct wined3d_device *device,

1 0