January 2018 - Wine-commits

Nikolay Sivov : comctl32/tests: Add EM_GETLINE test.
by Alexandre Julliard 12 Jan '18

12 Jan '18

Module: wine Branch: master Commit: 258dc94c99620db481fdf4f37d224e298c85c936 URL: https://source.winehq.org/git/wine.git/?a=commit;h=258dc94c99620db481fdf4f3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 12 14:27:22 2018 +0300 comctl32/tests: Add EM_GETLINE test. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/edit.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index 9feb9b4..7711683 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -558,6 +558,17 @@ static HWND create_editcontrol (DWORD style, DWORD exstyle) return handle; } +static HWND create_editcontrolW(DWORD style, DWORD exstyle) +{ + static const WCHAR testtextW[] = {'T','e','s','t',' ','t','e','x','t',0}; + HWND handle; + + handle = CreateWindowExW(exstyle, WC_EDITW, testtextW, style, 10, 10, 300, 300, + NULL, NULL, hinst, NULL); + ok(handle != NULL, "Failed to create Edit control.\n"); + return handle; +} + static HWND create_child_editcontrol (DWORD style, DWORD exstyle) { HWND parentWnd; @@ -2922,6 +2933,55 @@ static void test_paste(void) DestroyWindow(hMultilineEdit); } +static void test_EM_GETLINE(void) +{ + HWND hwnd[2]; + int i; + + hwnd[0] = create_editcontrol(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + hwnd[1] = create_editcontrolW(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + + for (i = 0; i < sizeof(hwnd)/sizeof(hwnd[0]); i++) + { + static const WCHAR strW[] = {'t','e','x','t',0}; + static const char *str = "text"; + WCHAR buffW[16]; + char buff[16]; + int r; + + todo_wine_if(i == 0) + ok(IsWindowUnicode(hwnd[i]), "Expected unicode window.\n"); + + SendMessageA(hwnd[i], WM_SETTEXT, 0, (LPARAM)str); + + memset(buff, 0, sizeof(buff)); + *(WORD *)buff = sizeof(buff); + r = SendMessageA(hwnd[i], EM_GETLINE, 0, (LPARAM)buff); + ok(r == strlen(str), "Failed to get a line %d.\n", r); + ok(!strcmp(buff, str), "Unexpected line data %s.\n", buff); + + memset(buff, 0, sizeof(buff)); + *(WORD *)buff = sizeof(buff); + r = SendMessageA(hwnd[i], EM_GETLINE, 1, (LPARAM)buff); + ok(r == strlen(str), "Failed to get a line %d.\n", r); + ok(!strcmp(buff, str), "Unexpected line data %s.\n", buff); + + memset(buffW, 0, sizeof(buffW)); + *(WORD *)buffW = sizeof(buffW)/sizeof(buffW[0]); + r = SendMessageW(hwnd[i], EM_GETLINE, 0, (LPARAM)buffW); + ok(r == lstrlenW(strW), "Failed to get a line %d.\n", r); + ok(!lstrcmpW(buffW, strW), "Unexpected line data %s.\n", wine_dbgstr_w(buffW)); + + memset(buffW, 0, sizeof(buffW)); + *(WORD *)buffW = sizeof(buffW)/sizeof(buffW[0]); + r = SendMessageW(hwnd[i], EM_GETLINE, 1, (LPARAM)buffW); + ok(r == lstrlenW(strW), "Failed to get a line %d.\n", r); + ok(!lstrcmpW(buffW, strW), "Unexpected line data %s.\n", wine_dbgstr_w(buffW)); + + DestroyWindow(hwnd[i]); + } +} + START_TEST(edit) { ULONG_PTR ctx_cookie; @@ -2961,6 +3021,7 @@ START_TEST(edit) test_contextmenu(); test_EM_GETHANDLE(); test_paste(); + test_EM_GETLINE(); UnregisterWindowClasses();

1 0

Alex Henrie : shell32/tests: Drop shell folder test dynamic imports for Windows <= 2000.
by Alexandre Julliard 12 Jan '18

12 Jan '18

Module: wine Branch: master Commit: dca38ea895822e4c9f5485bc44ce28e112ce085d URL: https://source.winehq.org/git/wine.git/?a=commit;h=dca38ea895822e4c9f5485bc… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Jan 12 00:15:45 2018 -0700 shell32/tests: Drop shell folder test dynamic imports for Windows <= 2000. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlfolder.c | 672 +++++++++++++++-------------------------- 1 file changed, 238 insertions(+), 434 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dca38ea895822e4c9f54…

1 0

Alex Henrie : shell32/tests: Drop shell folder test workarounds for Windows <= 2000.
by Alexandre Julliard 12 Jan '18

12 Jan '18

Module: wine Branch: master Commit: 332898eacdb7db99cbd26aa638120ba0876ec3c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=332898eacdb7db99cbd26aa6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Jan 12 00:15:46 2018 -0700 shell32/tests: Drop shell folder test workarounds for Windows <= 2000. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlfolder.c | 245 +++++++++++------------------------------ 1 file changed, 65 insertions(+), 180 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=332898eacdb7db99cbd2…

1 0

Alexandre Julliard : Release 3.0-rc6.
by Alexandre Julliard 12 Jan '18

12 Jan '18

Module: wine Branch: master Commit: 320152b06de1d08f6f13b9edeca467f66a8b6281 URL: https://source.winehq.org/git/wine.git/?a=commit;h=320152b06de1d08f6f13b9ed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 12 20:31:50 2018 +0100 Release 3.0-rc6. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 255 ++++++++++++++++++++++++++++---------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 ++--- 4 files changed, 126 insertions(+), 150 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=320152b06de1d08f6f13…

1 0

Tag wine-3.0-rc6 : Alexandre Julliard : Release 3.0-rc6
by Alexandre Julliard 12 Jan '18

12 Jan '18

Module: wine Branch: refs/tags/wine-3.0-rc6 Tag: accc232e4109bbc2b7322c8a32775700988a7d9a URL: https://source.winehq.org/git/wine.git/?a=tag;h=accc232e4109bbc2b7322c8a327… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 12 20:31:50 2018 +0100 Release 3.0-rc6

1 0

Józef Kucia : libs/vkd3d: Allow library user to create internal threads.
by Alexandre Julliard 12 Jan '18

12 Jan '18

Module: vkd3d Branch: master Commit: 604056daf4cad525ce3a1166a0598f4a9b788ebc URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=604056daf4cad525ce3a116… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 11 17:03:46 2018 +0100 libs/vkd3d: Allow library user to create internal threads. We want to create Win32 threads when running under Wine. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d.h | 7 +++++++ libs/vkd3d-utils/vkd3d_utils_main.c | 2 ++ libs/vkd3d/command.c | 35 ++++++++++++++++++++++++++++++----- libs/vkd3d/device.c | 10 +++++++++- libs/vkd3d/vkd3d_private.h | 12 ++++++++++-- 5 files changed, 58 insertions(+), 8 deletions(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index f6872c3..c4d1a2a 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -33,10 +33,17 @@ extern "C" { typedef bool (*vkd3d_signal_event_pfn)(HANDLE event); +typedef void * (*vkd3d_thread_pfn)(void *data); + +typedef void * (*vkd3d_create_thread_pfn)(vkd3d_thread_pfn thread_main, void *data); +typedef bool (*vkd3d_join_thread_pfn)(void *thread); + struct vkd3d_device_create_info { D3D_FEATURE_LEVEL minimum_feature_level; vkd3d_signal_event_pfn signal_event_pfn; + vkd3d_create_thread_pfn create_thread_pfn; + vkd3d_join_thread_pfn join_thread_pfn; size_t wchar_size; }; diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index 1d0bde1..1964df1 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -38,6 +38,8 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, create_info.minimum_feature_level = minimum_feature_level; create_info.signal_event_pfn = vkd3d_signal_event; + create_info.create_thread_pfn = NULL; + create_info.join_thread_pfn = NULL; create_info.wchar_size = sizeof(WCHAR); return vkd3d_create_device(&create_info, riid, device); diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index cda3c1f..f7d1699 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -204,7 +204,20 @@ HRESULT vkd3d_fence_worker_start(struct vkd3d_fence_worker *worker, return E_FAIL; } - if ((rc = pthread_create(&worker->thread, NULL, vkd3d_fence_worker_main, worker))) + if (device->create_thread) + { + if (!(worker->u.handle = device->create_thread(vkd3d_fence_worker_main, worker))) + { + ERR("Failed to create fence worker thread.\n"); + pthread_mutex_destroy(&worker->mutex); + pthread_cond_destroy(&worker->cond); + return E_FAIL; + } + + return S_OK; + } + + if ((rc = pthread_create(&worker->u.thread, NULL, vkd3d_fence_worker_main, worker))) { ERR("Failed to create fence worker thread, error %d.\n", rc); pthread_mutex_destroy(&worker->mutex); @@ -215,7 +228,8 @@ HRESULT vkd3d_fence_worker_start(struct vkd3d_fence_worker *worker, return S_OK; } -HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker) +HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker, + struct d3d12_device *device) { int rc; @@ -232,10 +246,21 @@ HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker) pthread_mutex_unlock(&worker->mutex); - if ((rc = pthread_join(worker->thread, NULL))) + if (device->join_thread) { - ERR("Failed to join fence worker thread, error %d.\n", rc); - return E_FAIL; + if (!device->join_thread(worker->u.handle)) + { + ERR("Failed to join fence worker thread.\n"); + return E_FAIL; + } + } + else + { + if ((rc = pthread_join(worker->u.thread, NULL))) + { + ERR("Failed to join fence worker thread, error %d.\n", rc); + return E_FAIL; + } } pthread_mutex_destroy(&worker->mutex); diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index bbc87ba..51edd36 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -919,7 +919,7 @@ static ULONG STDMETHODCALLTYPE d3d12_device_Release(ID3D12Device *iface) const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; vkd3d_gpu_va_allocator_cleanup(&device->gpu_va_allocator); - vkd3d_fence_worker_stop(&device->fence_worker); + vkd3d_fence_worker_stop(&device->fence_worker, device); VK_CALL(vkDestroySampler(device->vk_device, device->vk_default_sampler, NULL)); if (device->vk_pipeline_cache) VK_CALL(vkDestroyPipelineCache(device->vk_device, device->vk_pipeline_cache, NULL)); @@ -1813,6 +1813,12 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, { HRESULT hr; + if (!create_info->create_thread_pfn != !create_info->join_thread_pfn) + { + ERR("Invalid create/join thread function pointers.\n"); + return E_INVALIDARG; + } + device->ID3D12Device_iface.lpVtbl = &d3d12_device_vtbl; device->refcount = 1; @@ -1828,6 +1834,8 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, } device->signal_event = create_info->signal_event_pfn; + device->create_thread = create_info->create_thread_pfn; + device->join_thread = create_info->join_thread_pfn; device->wchar_size = create_info->wchar_size; if (FAILED(hr = d3d12_device_create_default_sampler(device))) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 9e0d6ae..ed636b5 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -73,7 +73,11 @@ struct vkd3d_instance struct vkd3d_fence_worker { - pthread_t thread; + union + { + pthread_t thread; + void *handle; + } u; pthread_mutex_t mutex; pthread_cond_t cond; bool should_exit; @@ -93,7 +97,8 @@ struct vkd3d_fence_worker HRESULT vkd3d_fence_worker_start(struct vkd3d_fence_worker *worker, struct d3d12_device *device) DECLSPEC_HIDDEN; -HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker) DECLSPEC_HIDDEN; +HRESULT vkd3d_fence_worker_stop(struct vkd3d_fence_worker *worker, + struct d3d12_device *device) DECLSPEC_HIDDEN; struct vkd3d_gpu_va_allocator { @@ -628,6 +633,9 @@ struct d3d12_device struct vkd3d_vulkan_info vk_info; struct vkd3d_instance vkd3d_instance; + + vkd3d_create_thread_pfn create_thread; + vkd3d_join_thread_pfn join_thread; }; HRESULT d3d12_device_create(const struct vkd3d_device_create_info *create_info,

1 0

Józef Kucia : libs/vkd3d: Add API for creating vkd3d instances.
by Alexandre Julliard 12 Jan '18

12 Jan '18

Module: vkd3d Branch: master Commit: 0f46ae3e55e0132d640cad974ffa065d595198b3 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0f46ae3e55e0132d640cad9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 11 17:03:47 2018 +0100 libs/vkd3d: Add API for creating vkd3d instances. Makes possible to share a Vulkan instance between multiple devices. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d.h | 22 ++++++- libs/vkd3d-utils/vkd3d_utils_main.c | 18 +++--- libs/vkd3d/device.c | 114 +++++++++++++++++++++++++----------- libs/vkd3d/vkd3d_main.c | 28 ++++++++- libs/vkd3d/vkd3d_private.h | 34 +++++++---- 5 files changed, 158 insertions(+), 58 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=0f46ae3e55e0132d640…

1 0

Józef Kucia : tests: Add test for creating vkd3d instances.
by Alexandre Julliard 12 Jan '18

12 Jan '18

Module: vkd3d Branch: master Commit: 0aef5f927e9a023b0663776a978ae55cd2da7d10 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0aef5f927e9a023b0663776… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 11 17:03:48 2018 +0100 tests: Add test for creating vkd3d instances. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 11 +++++--- tests/vkd3d_api.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 4d32b2f..2876f64 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,6 +33,9 @@ vkd3d_demos_shaders = \ demos/triangle_vs.h vkd3d_tests = \ + tests/vkd3d_api + +vkd3d_cross_tests = \ tests/d3d12 vkd3d_demos = \ @@ -101,9 +104,9 @@ vkd3d_compiler_SOURCES = programs/vkd3d-compiler/main.c vkd3d_compiler_LDADD = libvkd3d-shader.la LDADD = libvkd3d.la libvkd3d-utils.la -check_PROGRAMS = $(vkd3d_tests) +check_PROGRAMS = $(vkd3d_tests) $(vkd3d_cross_tests) AM_DEFAULT_SOURCE_EXT = .c -TESTS = $(vkd3d_tests) +TESTS = $(vkd3d_tests) $(vkd3d_cross_tests) tests_d3d12_LDADD = $(LDADD) @PTHREAD_LIBS@ DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @XCB_LIBS@ @VULKAN_LIBS@ @@ -154,7 +157,7 @@ if HAS_CROSSTARGET32 CROSS32_CC = @CROSSCC32@ CROSS32_DLLTOOL = @CROSSTARGET32(a)-dlltool CROSS32_IMPLIBS = $(cross_implibs:=.cross32.a) -CROSS32_EXEFILES = $(vkd3d_tests:=.cross32.exe) $(vkd3d_demos:=.cross32.exe) +CROSS32_EXEFILES = $(vkd3d_cross_tests:=.cross32.exe) $(vkd3d_demos:=.cross32.exe) CROSS32_FILES = $(CROSS32_IMPLIBS) $(CROSS32_EXEFILES) CLEANFILES += $(CROSS32_FILES) @@ -179,7 +182,7 @@ if HAS_CROSSTARGET64 CROSS64_CC = @CROSSCC64@ CROSS64_DLLTOOL = @CROSSTARGET64(a)-dlltool CROSS64_IMPLIBS = $(cross_implibs:=.cross64.a) -CROSS64_EXEFILES = $(vkd3d_tests:=.cross64.exe) $(vkd3d_demos:=.cross64.exe) +CROSS64_EXEFILES = $(vkd3d_cross_tests:=.cross64.exe) $(vkd3d_demos:=.cross64.exe) CROSS64_FILES = $(CROSS64_IMPLIBS) $(CROSS64_EXEFILES) CLEANFILES += $(CROSS64_FILES) diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c new file mode 100644 index 0000000..871dbe2 --- /dev/null +++ b/tests/vkd3d_api.c @@ -0,0 +1,84 @@ +/* + * Copyright 2018 Józef Kucia for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS +#define INITGUID +#define WIDL_C_INLINE_WRAPPERS +#include "vkd3d_test.h" +#include <vkd3d.h> + +static bool signal_event(HANDLE event) +{ + trace("Signal event %p.\n", event); + return true; +} + +static void test_create_instance(void) +{ + struct vkd3d_instance_create_info create_info; + struct vkd3d_instance *instance; + ULONG refcount; + HRESULT hr; + + memset(&create_info, 0, sizeof(create_info)); + create_info.wchar_size = sizeof(WCHAR); + + hr = vkd3d_create_instance(&create_info, &instance); + ok(hr == S_OK, "Failed to create instance, hr %#x.\n", hr); + refcount = vkd3d_instance_incref(instance); + ok(refcount == 2, "Got unexpected refcount %u.\n", refcount); + vkd3d_instance_decref(instance); + refcount = vkd3d_instance_decref(instance); + ok(!refcount, "Instance has %u references left.\n", refcount); + + create_info.signal_event_pfn = signal_event; + hr = vkd3d_create_instance(&create_info, &instance); + ok(hr == S_OK, "Failed to create instance, hr %#x.\n", hr); + refcount = vkd3d_instance_decref(instance); + ok(!refcount, "Instance has %u references left.\n", refcount); +} + +static bool have_d3d12_device(void) +{ + struct vkd3d_instance_create_info instance_create_info = + { + .wchar_size = sizeof(WCHAR), + }; + struct vkd3d_device_create_info device_create_info = + { + .minimum_feature_level = D3D_FEATURE_LEVEL_11_0, + .instance_create_info = &instance_create_info, + }; + ID3D12Device *device; + HRESULT hr; + + if (SUCCEEDED(hr = vkd3d_create_device(&device_create_info, &IID_ID3D12Device, (void **)&device))) + ID3D12Device_Release(device); + return hr == S_OK; +} + +START_TEST(vkd3d_api) +{ + if (!have_d3d12_device()) + { + skip("D3D12 device cannot be created.\n"); + return; + } + + run_test(test_create_instance); +}

1 0

Józef Kucia : tests: Add test for vkd3d_create_device ().
by Alexandre Julliard 12 Jan '18

12 Jan '18

Module: vkd3d Branch: master Commit: 709b86600117b61166d41a9c2586643e9beb5d30 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=709b86600117b61166d41a9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 11 17:03:49 2018 +0100 tests: Add test for vkd3d_create_device(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/vkd3d_api.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 60 insertions(+), 10 deletions(-) diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index 871dbe2..79d51cc 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -28,6 +28,18 @@ static bool signal_event(HANDLE event) return true; } +static const struct vkd3d_instance_create_info instance_default_create_info = +{ + .wchar_size = sizeof(WCHAR), + .signal_event_pfn = signal_event, +}; + +static const struct vkd3d_device_create_info device_default_create_info = +{ + .minimum_feature_level = D3D_FEATURE_LEVEL_11_0, + .instance_create_info = &instance_default_create_info, +}; + static void test_create_instance(void) { struct vkd3d_instance_create_info create_info; @@ -53,21 +65,58 @@ static void test_create_instance(void) ok(!refcount, "Instance has %u references left.\n", refcount); } +static void test_create_device(void) +{ + struct vkd3d_device_create_info create_info; + struct vkd3d_instance *instance; + ID3D12Device *device; + ULONG refcount; + HRESULT hr; + + hr = vkd3d_create_device(NULL, &IID_ID3D12Device, (void **)&device); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + create_info = device_default_create_info; + create_info.instance = NULL; + create_info.instance_create_info = NULL; + hr = vkd3d_create_device(&create_info, &IID_ID3D12Device, (void **)&device); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + create_info.instance_create_info = &instance_default_create_info; + hr = vkd3d_create_device(&create_info, &IID_ID3D12Device, (void **)&device); + ok(hr == S_OK, "Failed to create device, hr %#x.\n", hr); + refcount = ID3D12Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + + hr = vkd3d_create_instance(&instance_default_create_info, &instance); + ok(hr == S_OK, "Failed to create instance, hr %#x.\n", hr); + + create_info.instance = instance; + create_info.instance_create_info = NULL; + hr = vkd3d_create_device(&create_info, &IID_ID3D12Device, (void **)&device); + ok(hr == S_OK, "Failed to create device, hr %#x.\n", hr); + refcount = vkd3d_instance_incref(instance); + ok(refcount >= 3, "Got unexpected refcount %u.\n", refcount); + vkd3d_instance_decref(instance); + refcount = ID3D12Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + + create_info.instance = instance; + create_info.instance_create_info = &instance_default_create_info; + hr = vkd3d_create_device(&create_info, &IID_ID3D12Device, (void **)&device); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + refcount = vkd3d_instance_decref(instance); + ok(!refcount, "Instance has %u references left.\n", refcount); +} + static bool have_d3d12_device(void) { - struct vkd3d_instance_create_info instance_create_info = - { - .wchar_size = sizeof(WCHAR), - }; - struct vkd3d_device_create_info device_create_info = - { - .minimum_feature_level = D3D_FEATURE_LEVEL_11_0, - .instance_create_info = &instance_create_info, - }; ID3D12Device *device; HRESULT hr; - if (SUCCEEDED(hr = vkd3d_create_device(&device_create_info, &IID_ID3D12Device, (void **)&device))) + if (SUCCEEDED(hr = vkd3d_create_device(&device_default_create_info, + &IID_ID3D12Device, (void **)&device))) ID3D12Device_Release(device); return hr == S_OK; } @@ -81,4 +130,5 @@ START_TEST(vkd3d_api) } run_test(test_create_instance); + run_test(test_create_device); }

1 0

Józef Kucia : libs/vkd3d: Validate WCHAR size.
by Alexandre Julliard 12 Jan '18

12 Jan '18

Module: vkd3d Branch: master Commit: 4605d1275cf09d4384f75c2f264b26dfde1af07f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4605d1275cf09d4384f75c2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 11 17:03:50 2018 +0100 libs/vkd3d: Validate WCHAR size. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 9819ea0..198971a 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -184,6 +184,11 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, ERR("Invalid create/join thread function pointers.\n"); return E_INVALIDARG; } + if (create_info->wchar_size != 2 && create_info->wchar_size != 4) + { + ERR("Unexpected WCHAR size %zu.\n", create_info->wchar_size); + return E_INVALIDARG; + } instance->signal_event = create_info->signal_event_pfn; instance->create_thread = create_info->create_thread_pfn;

1 0