wine-commits March 2022

wine-commits@winehq.org

2 participants
1138 discussions

Eric Pouech : prntvpt/tests: Enable compilation with long types.
by Alexandre Julliard 03 Mar '22

03 Mar '22

Module: wine Branch: master Commit: 2a64ee2aac9c1df6ec4891c758301b2cdbf34839 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a64ee2aac9c1df6ec4891c7… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Mar 3 08:21:51 2022 +0100 prntvpt/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/prntvpt/tests/Makefile.in | 1 - dlls/prntvpt/tests/prntvpt.c | 30 +++++++++++++++--------------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/prntvpt/tests/Makefile.in b/dlls/prntvpt/tests/Makefile.in index 659a25a064c..692a134d016 100644 --- a/dlls/prntvpt/tests/Makefile.in +++ b/dlls/prntvpt/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = prntvpt.dll IMPORTS = prntvpt winspool ole32 diff --git a/dlls/prntvpt/tests/prntvpt.c b/dlls/prntvpt/tests/prntvpt.c index 55b6f3fdef1..8d955cd866b 100644 --- a/dlls/prntvpt/tests/prntvpt.c +++ b/dlls/prntvpt/tests/prntvpt.c @@ -55,27 +55,27 @@ static void test_PTOpenProvider(void) struct hprov_data data; hr = PTOpenProvider(default_name, 1, &hprov); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); data.hprov = hprov; hthread = CreateThread(NULL, 0, CloseProvider_proc, &data, 0, &tid); WaitForSingleObject(hthread, INFINITE); CloseHandle(hthread); - ok(data.hr == E_HANDLE || data.hr == E_INVALIDARG /* XP */ || broken(data.hr == S_OK) /* Win8 */, "got %#x\n", data.hr); + ok(data.hr == E_HANDLE || data.hr == E_INVALIDARG /* XP */ || broken(data.hr == S_OK) /* Win8 */, "got %#lx\n", data.hr); if (data.hr != S_OK) { hr = PTCloseProvider(hprov); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); } hr = PTOpenProvider(default_name, 0, &hprov); - ok(hr == E_INVALIDARG, "got %#x\n", hr); + ok(hr == E_INVALIDARG, "got %#lx\n", hr); for (i = 2; i < 20; i++) { hr = PTOpenProvider(default_name, i, &hprov); - ok(hr == 0x80040001 || hr == E_INVALIDARG /* Wine */, "%u: got %#x\n", i, hr); + ok(hr == 0x80040001 || hr == E_INVALIDARG /* Wine */, "%lu: got %#lx\n", i, hr); } } @@ -88,40 +88,40 @@ static void test_PTOpenProviderEx(void) struct hprov_data data; hr = PTOpenProviderEx(default_name, 1, 1, &hprov, NULL); - ok(hr == E_INVALIDARG, "got %#x\n", hr); + ok(hr == E_INVALIDARG, "got %#lx\n", hr); ver = 0xdeadbeef; hr = PTOpenProviderEx(default_name, 1, 1, &hprov, &ver); - ok(hr == S_OK, "got %#x\n", hr); - ok(ver == 1, "got %#x\n", ver); + ok(hr == S_OK, "got %#lx\n", hr); + ok(ver == 1, "got %#lx\n", ver); data.hprov = hprov; hthread = CreateThread(NULL, 0, CloseProvider_proc, &data, 0, &tid); WaitForSingleObject(hthread, INFINITE); CloseHandle(hthread); - ok(data.hr == E_HANDLE || data.hr == E_INVALIDARG /* XP */ || broken(data.hr == S_OK) /* Win8 */, "got %#x\n", data.hr); + ok(data.hr == E_HANDLE || data.hr == E_INVALIDARG /* XP */ || broken(data.hr == S_OK) /* Win8 */, "got %#lx\n", data.hr); if (data.hr != S_OK) { hr = PTCloseProvider(hprov); - ok(hr == S_OK, "got %#x\n", hr); + ok(hr == S_OK, "got %#lx\n", hr); } for (i = 1; i < 20; i++) { hr = PTOpenProviderEx(default_name, 0, i, &hprov, &ver); - ok(hr == E_INVALIDARG, "%u: got %#x\n", i, hr); + ok(hr == E_INVALIDARG, "%lu: got %#lx\n", i, hr); ver = 0xdeadbeef; hr = PTOpenProviderEx(default_name, 1, i, &hprov, &ver); - ok(hr == S_OK, "%u: got %#x\n", i, hr); - ok(ver == 1, "%u: got %#x\n", i, ver); + ok(hr == S_OK, "%lu: got %#lx\n", i, hr); + ok(ver == 1, "%lu: got %#lx\n", i, ver); PTCloseProvider(hprov); ver = 0xdeadbeef; hr = PTOpenProviderEx(default_name, i, i, &hprov, &ver); - ok(hr == S_OK, "%u: got %#x\n", i, hr); - ok(ver == 1, "%u: got %#x\n", i, ver); + ok(hr == S_OK, "%lu: got %#lx\n", i, hr); + ok(ver == 1, "%lu: got %#lx\n", i, ver); PTCloseProvider(hprov); } }

1 0

Eric Pouech : pdh/tests: Enable compilation with long types.
by Alexandre Julliard 03 Mar '22

03 Mar '22

Module: wine Branch: master Commit: 4705f8fe94566d491675c3e92cdb1ca23a668f22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4705f8fe94566d491675c3e9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Mar 3 08:21:45 2022 +0100 pdh/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/pdh/tests/Makefile.in | 1 - dlls/pdh/tests/pdh.c | 442 ++++++++++++++++++++++----------------------- 2 files changed, 221 insertions(+), 222 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4705f8fe94566d491675…

1 0

Eric Pouech : packager/tests: Enable compilation with long types.
by Alexandre Julliard 03 Mar '22

03 Mar '22

Module: wine Branch: master Commit: c10dc03e79c90ed990b3f2f8a15d9b3ff625223a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c10dc03e79c90ed990b3f2f8… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Mar 3 08:21:39 2022 +0100 packager/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/packager/tests/Makefile.in | 1 - dlls/packager/tests/oleobj.c | 24 ++++++++++++------------ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/packager/tests/Makefile.in b/dlls/packager/tests/Makefile.in index afab992cdb2..9988caad906 100644 --- a/dlls/packager/tests/Makefile.in +++ b/dlls/packager/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = packager.dll IMPORTS = ole32 diff --git a/dlls/packager/tests/oleobj.c b/dlls/packager/tests/oleobj.c index 62875584931..108882612db 100644 --- a/dlls/packager/tests/oleobj.c +++ b/dlls/packager/tests/oleobj.c @@ -418,7 +418,7 @@ static void test_packager(void) hr = CoCreateInstance(&CLSID_Package, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, &IID_IOleObject, (void**)&oleobj); ok(hr == S_OK || - hr == REGDB_E_CLASSNOTREG, "CoCreateInstance(CLSID_Package) failed: %08x\n", hr); + hr == REGDB_E_CLASSNOTREG, "CoCreateInstance(CLSID_Package) failed: %08lx\n", hr); if(hr == S_OK){ IOleObject_Release(oleobj); /* older OSes store temporary files in obscure locations, so don't run @@ -429,28 +429,28 @@ static void test_packager(void) hr = CoCreateInstance(&CLSID_Package_Alt, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, &IID_IOleObject, (void**)&oleobj); - ok(hr == S_OK, "CoCreateInstance(CLSID_Package_Alt) failed: %08x\n", hr); + ok(hr == S_OK, "CoCreateInstance(CLSID_Package_Alt) failed: %08lx\n", hr); hr = IOleObject_SetClientSite(oleobj, NULL); - ok(hr == S_OK, "SetClientSite failed: %08x\n", hr); + ok(hr == S_OK, "SetClientSite failed: %08lx\n", hr); hr = IOleObject_SetClientSite(oleobj, &clientsite); - ok(hr == S_OK, "SetClientSite failed: %08x\n", hr); + ok(hr == S_OK, "SetClientSite failed: %08lx\n", hr); hr = IOleObject_GetMiscStatus(oleobj, DVASPECT_CONTENT, NULL); - ok(hr == E_INVALIDARG, "GetMiscStatus failed: %08x\n", hr); + ok(hr == E_INVALIDARG, "GetMiscStatus failed: %08lx\n", hr); hr = IOleObject_GetMiscStatus(oleobj, DVASPECT_CONTENT, &status); - ok(hr == S_OK, "GetMiscStatus failed: %08x\n", hr); + ok(hr == S_OK, "GetMiscStatus failed: %08lx\n", hr); ok(status == OLEMISC_ONLYICONIC || status == OLEMISC_CANTLINKINSIDE /* winxp */, - "Got wrong DVASPECT_CONTENT status: 0x%x\n", status); + "Got wrong DVASPECT_CONTENT status: 0x%lx\n", status); hr = IOleObject_QueryInterface(oleobj, &IID_IPersistStorage, (void**)&persist); - ok(hr == S_OK, "QueryInterface(IPersistStorage) failed: %08x\n", hr); + ok(hr == S_OK, "QueryInterface(IPersistStorage) failed: %08lx\n", hr); hr = IPersistStorage_Load(persist, &stg); - ok(hr == S_OK, "Load failed: %08x\n", hr); + ok(hr == S_OK, "Load failed: %08lx\n", hr); if(extended){ len = GetTempPathW(ARRAY_SIZE(filename), filename); @@ -458,19 +458,19 @@ static void test_packager(void) file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - ok(file != INVALID_HANDLE_VALUE, "Couldn't find temporary file %s: %u\n", + ok(file != INVALID_HANDLE_VALUE, "Couldn't find temporary file %s: %lu\n", wine_dbgstr_w(filename), GetLastError()); br = ReadFile(file, contents, sizeof(contents), &bytes_read, NULL); ok(br == TRUE, "ReadFile failed\n"); - ok(bytes_read == 10, "Got wrong file size: %u\n", bytes_read); + ok(bytes_read == 10, "Got wrong file size: %lu\n", bytes_read); ok(!memcmp(contents, "some text\n", 10), "Got wrong file contents\n"); CloseHandle(file); } hr = IOleObject_Close(oleobj, OLECLOSE_NOSAVE); - ok(hr == S_OK, "Close failed: %08x\n", hr); + ok(hr == S_OK, "Close failed: %08lx\n", hr); if(extended){ file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING,

1 0

Eric Pouech : kernel32/tests/format_msg: Enable compilation with long types.
by Alexandre Julliard 03 Mar '22

03 Mar '22

Module: wine Branch: master Commit: d3735faacf3a9f9f0d1223eee42cec00dc011c83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3735faacf3a9f9f0d1223ee… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Mar 3 08:21:21 2022 +0100 kernel32/tests/format_msg: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/format_msg.c | 547 ++++++++++++++++++++------------------- 1 file changed, 274 insertions(+), 273 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d3735faacf3a9f9f0d12…

1 0

Eric Pouech : kernel32/tests/file: Enable compilation with long types.
by Alexandre Julliard 03 Mar '22

03 Mar '22

Module: wine Branch: master Commit: 2fa9f891b1075b88ac8c5655d829e316d6d3d2e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fa9f891b1075b88ac8c5655… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Mar 3 08:21:14 2022 +0100 kernel32/tests/file: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 1549 ++++++++++++++++++++++---------------------- 1 file changed, 775 insertions(+), 774 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2fa9f891b1075b88ac8c…

1 0

Eric Pouech : kernel32/tests/environ: Enable compilation with long types.
by Alexandre Julliard 03 Mar '22

03 Mar '22

Module: wine Branch: master Commit: edbfa7dd7c015b031b3b25bc5dd33dc3cb2f2a8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=edbfa7dd7c015b031b3b25bc… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Mar 3 08:21:08 2022 +0100 kernel32/tests/environ: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/environ.c | 213 +++++++++++++++++++++--------------------- 1 file changed, 107 insertions(+), 106 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=edbfa7dd7c015b031b3b…

1 0

Eric Pouech : kernel32/tests/debugger: Enable compilation with long types.
by Alexandre Julliard 03 Mar '22

03 Mar '22

Module: wine Branch: master Commit: 2bbae2cea3e8c452969f64a1338196c92f13e63b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bbae2cea3e8c452969f64a1… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Mar 3 08:21:02 2022 +0100 kernel32/tests/debugger: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 511 +++++++++++++++++++++-------------------- 1 file changed, 256 insertions(+), 255 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2bbae2cea3e8c452969f…

1 0

Alexandre Julliard : configure: Remove some no longer needed checks.
by Alexandre Julliard 03 Mar '22

03 Mar '22

Module: wine Branch: master Commit: 9d56ca72feb721034b79ca3a2fae4eceead88234 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d56ca72feb721034b79ca3a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 3 10:51:02 2022 +0100 configure: Remove some no longer needed checks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 310 ---------------------------------------------------- configure.ac | 40 ------- include/config.h.in | 18 --- 3 files changed, 368 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9d56ca72feb721034b79…

1 0

Alexandre Julliard : dxgi: Build with msvcrt.
by Alexandre Julliard 03 Mar '22

03 Mar '22

Module: wine Branch: master Commit: 6b8cbfe3fdc1ab8c6efd55dc51df7c3d738c4a47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b8cbfe3fdc1ab8c6efd55dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 3 10:23:26 2022 +0100 dxgi: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/Makefile.in | 4 +- dlls/dxgi/adapter.c | 2 - dlls/dxgi/device.c | 2 - dlls/dxgi/dxgi_main.c | 2 - dlls/dxgi/factory.c | 2 - dlls/dxgi/output.c | 2 - dlls/dxgi/surface.c | 2 - dlls/dxgi/swapchain.c | 163 ++------------------------------------------------ dlls/dxgi/utils.c | 2 - 9 files changed, 6 insertions(+), 175 deletions(-) diff --git a/dlls/dxgi/Makefile.in b/dlls/dxgi/Makefile.in index 111d756b635..d4398008dad 100644 --- a/dlls/dxgi/Makefile.in +++ b/dlls/dxgi/Makefile.in @@ -2,9 +2,7 @@ EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = dxgi.dll IMPORTLIB = dxgi IMPORTS = gdi32 dxguid uuid wined3d user32 win32u -EXTRAINCL = $(VKD3D_CFLAGS) - -EXTRADLLFLAGS = -mcygwin +EXTRAINCL = $(VKD3D_PE_CFLAGS) C_SRCS = \ adapter.c \ diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index e38fef5fa4f..644f7e889ec 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -17,8 +17,6 @@ * */ -#include "config.h" - #include "dxgi_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dxgi); diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index b2635c3f582..7dcc081ee0a 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -17,8 +17,6 @@ * */ -#include "config.h" - #include "dxgi_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dxgi); diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c index 3ac62f6b65c..3a69e1d55c2 100644 --- a/dlls/dxgi/dxgi_main.c +++ b/dlls/dxgi/dxgi_main.c @@ -17,8 +17,6 @@ * */ -#include "config.h" - #define DXGI_INIT_GUID #include "dxgi_private.h" diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index f57ed7df48f..97f71bc8fc1 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -17,8 +17,6 @@ * */ -#include "config.h" - #include "dxgi_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dxgi); diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index bbe394b6556..585f5ae5b82 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include "dxgi_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dxgi); diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c index 663ae30af94..dd069524fbc 100644 --- a/dlls/dxgi/surface.c +++ b/dlls/dxgi/surface.c @@ -17,8 +17,6 @@ * */ -#include "config.h" - #include "dxgi_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dxgi); diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 0bc1ba4f493..aaf4fe101de 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -17,23 +17,8 @@ * */ -#include "config.h" - #include "dxgi_private.h" - -#ifdef SONAME_LIBVKD3D -#define VK_NO_PROTOTYPES -#define VKD3D_NO_PROTOTYPES -#define VKD3D_NO_VULKAN_H -#define VKD3D_NO_WIN32_TYPES -#ifndef USE_WIN32_VULKAN -#define WINE_VK_HOST -#include <dlfcn.h> -#endif -#include "wine/vulkan.h" -#include "wine/vulkan_driver.h" #include <vkd3d.h> -#endif WINE_DEFAULT_DEBUG_CHANNEL(dxgi); WINE_DECLARE_DEBUG_CHANNEL(winediag); @@ -928,78 +913,6 @@ cleanup: return hr; } -#ifdef SONAME_LIBVKD3D - -#ifdef USE_WIN32_VULKAN - -static void *load_library(const char *name) -{ - return LoadLibraryA(name); -} - -static void *get_library_proc(void *handle, const char *name) -{ - return (void *)GetProcAddress(handle, name); -} - -static void close_library(void *handle) -{ - if (handle) - FreeLibrary(handle); -} - -static PFN_vkGetInstanceProcAddr load_vulkan(void **vulkan_handle) -{ - *vulkan_handle = LoadLibraryA("vulkan-1.dll"); - return (void *)GetProcAddress(*vulkan_handle, "vkGetInstanceProcAddr"); -} - -#else - -static void *load_library(const char *name) -{ - return dlopen(name, RTLD_NOW); -} - -static void *get_library_proc(void *handle, const char *name) -{ - return dlsym(handle, name); -} - -static void close_library(void *handle) -{ - if (handle) - dlclose(handle); -} - -static PFN_vkGetInstanceProcAddr load_vulkan(void **vulkan_handle) -{ - const struct vulkan_funcs *vk_funcs; - - *vulkan_handle = NULL; - - vk_funcs = __wine_get_vulkan_driver(WINE_VULKAN_DRIVER_VERSION); - if (vk_funcs) - return (PFN_vkGetInstanceProcAddr)vk_funcs->p_vkGetInstanceProcAddr; - - return NULL; -} - -#endif /* USE_WIN32_VULKAN */ - -static PFN_vkd3d_acquire_vk_queue vkd3d_acquire_vk_queue; -static PFN_vkd3d_create_image_resource vkd3d_create_image_resource; -static PFN_vkd3d_get_device_parent vkd3d_get_device_parent; -static PFN_vkd3d_get_vk_device vkd3d_get_vk_device; -static PFN_vkd3d_get_vk_format vkd3d_get_vk_format; -static PFN_vkd3d_get_vk_physical_device vkd3d_get_vk_physical_device; -static PFN_vkd3d_get_vk_queue_family_index vkd3d_get_vk_queue_family_index; -static PFN_vkd3d_instance_from_device vkd3d_instance_from_device; -static PFN_vkd3d_instance_get_vk_instance vkd3d_instance_get_vk_instance; -static PFN_vkd3d_release_vk_queue vkd3d_release_vk_queue; -static PFN_vkd3d_resource_decref vkd3d_resource_decref; -static PFN_vkd3d_resource_incref vkd3d_resource_incref; - struct dxgi_vk_funcs { PFN_vkAcquireNextImageKHR p_vkAcquireNextImageKHR; @@ -1938,7 +1851,7 @@ static void d3d12_swapchain_destroy(struct d3d12_swapchain *swapchain) if (swapchain->factory) IWineDXGIFactory_Release(swapchain->factory); - close_library(vulkan_module); + FreeLibrary(vulkan_module); wined3d_swapchain_state_destroy(swapchain->state); } @@ -2861,61 +2774,13 @@ static const struct IDXGISwapChain4Vtbl d3d12_swapchain_vtbl = d3d12_swapchain_SetHDRMetaData, }; -static BOOL load_vkd3d_functions(void *vkd3d_handle) -{ -#define LOAD_FUNCPTR(f) if (!(f = get_library_proc(vkd3d_handle, #f))) return FALSE; - LOAD_FUNCPTR(vkd3d_acquire_vk_queue) - LOAD_FUNCPTR(vkd3d_create_image_resource) - LOAD_FUNCPTR(vkd3d_get_device_parent) - LOAD_FUNCPTR(vkd3d_get_vk_device) - LOAD_FUNCPTR(vkd3d_get_vk_format) - LOAD_FUNCPTR(vkd3d_get_vk_physical_device) - LOAD_FUNCPTR(vkd3d_get_vk_queue_family_index) - LOAD_FUNCPTR(vkd3d_instance_from_device) - LOAD_FUNCPTR(vkd3d_instance_get_vk_instance) - LOAD_FUNCPTR(vkd3d_release_vk_queue) - LOAD_FUNCPTR(vkd3d_resource_decref) - LOAD_FUNCPTR(vkd3d_resource_incref) -#undef LOAD_FUNCPTR - - return TRUE; -} - -static void *vkd3d_handle; - -static BOOL WINAPI init_vkd3d_once(INIT_ONCE *once, void *param, void **context) -{ - TRACE("Loading vkd3d %s.\n", SONAME_LIBVKD3D); - - if (!(vkd3d_handle = load_library(SONAME_LIBVKD3D))) - return FALSE; - - if (!load_vkd3d_functions(vkd3d_handle)) - { - ERR("Failed to load vkd3d functions.\n"); - close_library(vkd3d_handle); - vkd3d_handle = NULL; - return FALSE; - } - - return TRUE; -} - -static BOOL init_vkd3d(void) -{ - static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; - InitOnceExecuteOnce(&init_once, init_vkd3d_once, NULL, NULL); - return !!vkd3d_handle; -} - static BOOL init_vk_funcs(struct dxgi_vk_funcs *dxgi, VkInstance vk_instance, VkDevice vk_device) { PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr; PFN_vkGetDeviceProcAddr vkGetDeviceProcAddr; - dxgi->vulkan_module = NULL; - - if (!(vkGetInstanceProcAddr = load_vulkan(&dxgi->vulkan_module))) + dxgi->vulkan_module = LoadLibraryA("vulkan-1.dll"); + if (!(vkGetInstanceProcAddr = (void *)GetProcAddress(dxgi->vulkan_module, "vkGetInstanceProcAddr"))) { ERR_(winediag)("Failed to load Vulkan.\n"); return FALSE; @@ -2927,7 +2792,7 @@ static BOOL init_vk_funcs(struct dxgi_vk_funcs *dxgi, VkInstance vk_instance, Vk if (!(dxgi->p_##name = (void *)vkGetInstanceProcAddr(vk_instance, #name))) \ { \ ERR("Failed to get instance proc "#name".\n"); \ - close_library(dxgi->vulkan_module); \ + FreeLibrary(dxgi->vulkan_module); \ return FALSE; \ } LOAD_INSTANCE_PFN(vkCreateWin32SurfaceKHR) @@ -2944,7 +2809,7 @@ static BOOL init_vk_funcs(struct dxgi_vk_funcs *dxgi, VkInstance vk_instance, Vk if (!(dxgi->p_##name = (void *)vkGetDeviceProcAddr(vk_device, #name))) \ { \ ERR("Failed to get device proc "#name".\n"); \ - close_library(dxgi->vulkan_module); \ + FreeLibrary(dxgi->vulkan_module); \ return FALSE; \ } LOAD_DEVICE_PFN(vkAcquireNextImageKHR) @@ -3050,12 +2915,6 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI return DXGI_ERROR_INVALID_CALL; } - if (!init_vkd3d()) - { - ERR_(winediag)("libvkd3d could not be loaded.\n"); - return DXGI_ERROR_UNSUPPORTED; - } - if (FAILED(hr = dxgi_get_output_from_window(factory, window, &output))) { WARN("Failed to get output from window %p, hr %#x.\n", window, hr); @@ -3246,15 +3105,3 @@ HRESULT d3d12_swapchain_create(IWineDXGIFactory *factory, ID3D12CommandQueue *qu return S_OK; } - -#else - -HRESULT d3d12_swapchain_create(IWineDXGIFactory *factory, ID3D12CommandQueue *queue, HWND window, - const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc, - IDXGISwapChain1 **swapchain) -{ - ERR_(winediag)("Wine was built without Direct3D 12 support.\n"); - return DXGI_ERROR_UNSUPPORTED; -} - -#endif /* SONAME_LIBVKD3D */ diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index ee891e70b10..d701725afa9 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -17,8 +17,6 @@ * */ -#include "config.h" - #include "dxgi_private.h" WINE_DEFAULT_DEBUG_CHANNEL(dxgi);

1 0

Alexandre Julliard : d3d12: Build with msvcrt.
by Alexandre Julliard 03 Mar '22

03 Mar '22

Module: wine Branch: master Commit: b53d4dacca3badd10b2fd7c01d33f81f624c1b45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b53d4dacca3badd10b2fd7c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 3 10:16:01 2022 +0100 d3d12: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d12/Makefile.in | 7 ++-- dlls/d3d12/d3d12_main.c | 93 +++++-------------------------------------------- 2 files changed, 10 insertions(+), 90 deletions(-) diff --git a/dlls/d3d12/Makefile.in b/dlls/d3d12/Makefile.in index 50f292c0c9b..e5fb77be025 100644 --- a/dlls/d3d12/Makefile.in +++ b/dlls/d3d12/Makefile.in @@ -1,11 +1,8 @@ EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = d3d12.dll IMPORTLIB = d3d12 -IMPORTS = dxgi dxguid gdi32 user32 uuid win32u -EXTRALIBS = $(VKD3D_LIBS) -EXTRAINCL = $(VKD3D_CFLAGS) - -EXTRADLLFLAGS = -mcygwin +IMPORTS = dxgi dxguid wined3d gdi32 user32 uuid win32u +EXTRAINCL = $(VKD3D_PE_CFLAGS) C_SRCS = \ d3d12_main.c diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index f7f05b42123..1c2cea6a6f3 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -17,35 +17,19 @@ * */ -#include "config.h" - #define COBJMACROS -#define VK_NO_PROTOTYPES -#define VKD3D_NO_VULKAN_H -#define VKD3D_NO_WIN32_TYPES -#ifndef USE_WIN32_VULKAN -#define WINE_VK_HOST -#endif - -#include "wine/debug.h" -#include "wine/heap.h" -#include "wine/vulkan.h" -#include "wine/vulkan_driver.h" - -#include "dxgi1_6.h" -#include "d3d12.h" #include <vkd3d.h> +#include "dxgi1_6.h" #include "initguid.h" #include "wine/wined3d.h" #include "wine/winedxgi.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d12); WINE_DECLARE_DEBUG_CHANNEL(winediag); -#ifdef USE_WIN32_VULKAN - static HMODULE vulkan_module; /* FIXME: We should unload vulkan-1.dll. */ @@ -67,21 +51,6 @@ static PFN_vkGetInstanceProcAddr load_vulkan(void) return NULL; } -#else - -static PFN_vkGetInstanceProcAddr load_vulkan(void) -{ - const struct vulkan_funcs *vk_funcs; - - vk_funcs = __wine_get_vulkan_driver(WINE_VULKAN_DRIVER_VERSION); - if (vk_funcs) - return (PFN_vkGetInstanceProcAddr)vk_funcs->p_vkGetInstanceProcAddr; - - return NULL; -} - -#endif /* USE_WIN32_VULKAN */ - HRESULT WINAPI D3D12GetDebugInterface(REFIID iid, void **debug) { TRACE("iid %s, debug %p.\n", debugstr_guid(iid), debug); @@ -104,52 +73,6 @@ static HRESULT d3d12_signal_event(HANDLE event) return SetEvent(event) ? S_OK : E_FAIL; } -struct d3d12_thread_data -{ - PFN_vkd3d_thread main_pfn; - void *data; -}; - -static DWORD WINAPI d3d12_thread_main(void *data) -{ - struct d3d12_thread_data *thread_data = data; - - thread_data->main_pfn(thread_data->data); - heap_free(thread_data); - return 0; -} - -static void *d3d12_create_thread(PFN_vkd3d_thread main_pfn, void *data) -{ - struct d3d12_thread_data *thread_data; - HANDLE thread; - - if (!(thread_data = heap_alloc(sizeof(*thread_data)))) - { - ERR("Failed to allocate thread data.\n"); - return NULL; - } - - thread_data->main_pfn = main_pfn; - thread_data->data = data; - - if (!(thread = CreateThread(NULL, 0, d3d12_thread_main, thread_data, 0, NULL))) - heap_free(thread_data); - - return thread; -} - -static HRESULT d3d12_join_thread(void *handle) -{ - HANDLE thread = handle; - DWORD ret; - - if ((ret = WaitForSingleObject(thread, INFINITE)) != WAIT_OBJECT_0) - ERR("Failed to wait for thread, ret %#x.\n", ret); - CloseHandle(thread); - return ret == WAIT_OBJECT_0 ? S_OK : E_FAIL; -} - static HRESULT d3d12_get_adapter(IWineDXGIAdapter **wine_adapter, IUnknown *adapter) { IDXGIAdapter *dxgi_adapter = NULL; @@ -200,7 +123,7 @@ static BOOL check_vk_instance_extension(VkInstance vk_instance, if (pfn_vkEnumerateInstanceExtensionProperties(NULL, &count, NULL) < 0) return FALSE; - if (!(properties = heap_calloc(count, sizeof(*properties)))) + if (!(properties = calloc(count, sizeof(*properties)))) return FALSE; if (pfn_vkEnumerateInstanceExtensionProperties(NULL, &count, properties) >= 0) @@ -215,7 +138,7 @@ static BOOL check_vk_instance_extension(VkInstance vk_instance, } } - heap_free(properties); + free(properties); return ret; } @@ -254,7 +177,7 @@ static VkPhysicalDevice d3d12_get_vk_physical_device(struct vkd3d_instance *inst return VK_NULL_HANDLE; } - if (!(vk_physical_devices = heap_calloc(count, sizeof(*vk_physical_devices)))) + if (!(vk_physical_devices = calloc(count, sizeof(*vk_physical_devices)))) return VK_NULL_HANDLE; if ((vr = pfn_vkEnumeratePhysicalDevices(vk_instance, &count, vk_physical_devices)) < 0) @@ -305,7 +228,7 @@ static VkPhysicalDevice d3d12_get_vk_physical_device(struct vkd3d_instance *inst FIXME("Could not find Vulkan physical device for DXGI adapter.\n"); done: - heap_free(vk_physical_devices); + free(vk_physical_devices); return vk_physical_device; } @@ -367,8 +290,8 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_fe instance_create_info.type = VKD3D_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; instance_create_info.next = &optional_extensions_info; instance_create_info.pfn_signal_event = d3d12_signal_event; - instance_create_info.pfn_create_thread = d3d12_create_thread; - instance_create_info.pfn_join_thread = d3d12_join_thread; + instance_create_info.pfn_create_thread = NULL; + instance_create_info.pfn_join_thread = NULL; instance_create_info.wchar_size = sizeof(WCHAR); instance_create_info.pfn_vkGetInstanceProcAddr = pfn_vkGetInstanceProcAddr; instance_create_info.instance_extensions = instance_extensions;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2022