January 2018 - Wine-commits

Julian Rüger : po: Update German translation.
by Alexandre Julliard 18 Jan '18

18 Jan '18

Module: wine Branch: master Commit: 43c74758fdf07ff8b238b4c90ce21f09d015368b URL: https://source.winehq.org/git/wine.git/?a=commit;h=43c74758fdf07ff8b238b4c9… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Jan 17 16:21:29 2018 +0100 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index d1f6215..72a98f8 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-12-15 16:04+0100\n" +"PO-Revision-Date: 2018-01-17 16:21+0100\n" "Last-Translator: Julian Rüger\n" "Language-Team: German\n" "Language: de\n" @@ -7112,7 +7112,7 @@ msgstr "Deregistrierung von Klassenservern" #: msi.rc:146 msgid "Unregistering COM+ Applications and Components" -msgstr "Deregistrieung von COM+ Anwendungen und Komponenten" +msgstr "Deregistrierung von COM+ Anwendungen und Komponenten" #: msi.rc:147 msgid "Unregistering extension servers"

1 0

Alexandre Julliard : Release 3.0.
by Alexandre Julliard 18 Jan '18

18 Jan '18

Module: wine Branch: master Commit: f6b5a7cf9056c1e2bd2d1baf6f212782eaf2c80e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6b5a7cf9056c1e2bd2d1baf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 18 16:38:28 2018 +0100 Release 3.0. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 465 ++++++++++++++++++++++++++++++++++++++++++++++---------------- VERSION | 2 +- configure | 18 +-- 3 files changed, 355 insertions(+), 130 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f6b5a7cf9056c1e2bd2d…

1 0

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

18 Jan '18

Module: wine Branch: refs/tags/wine-3.0 Tag: 7181a747f03ecf7e2901919b3fba0e75babd0f59 URL: https://source.winehq.org/git/wine.git/?a=tag;h=7181a747f03ecf7e2901919b3fb… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 18 16:38:28 2018 +0100 Release 3.0

1 0

Francois Gouget : testbot: Require that a Job' s Submitted field always be set.
by Alexandre Julliard 18 Jan '18

18 Jan '18

Module: tools Branch: master Commit: 5ddc51c384124f7c5b3db06e5da02d55c6add7bc URL: https://source.winehq.org/git/tools.git/?a=commit;h=5ddc51c384124f7c5b3db06… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jan 18 03:58:23 2018 +0100 testbot: Require that a Job's Submitted field always be set. This guarantees we have at least one field to purge old jobs. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/ddl/update30.sql | 4 ++++ testbot/ddl/winetestbot.sql | 2 +- testbot/doc/winetestbot-schema.dia | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/testbot/ddl/update30.sql b/testbot/ddl/update30.sql new file mode 100644 index 0000000..892d8d1 --- /dev/null +++ b/testbot/ddl/update30.sql @@ -0,0 +1,4 @@ +USE winetestbot; + +ALTER TABLE Jobs + MODIFY Submitted DATETIME NOT NULL; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index ad8d1a9..cebc265 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -114,7 +114,7 @@ CREATE TABLE Jobs Priority INT(1) NOT NULL, Status ENUM('queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled') NOT NULL, Remarks VARCHAR(128) NULL, - Submitted DATETIME NULL, + Submitted DATETIME NOT NULL, Ended DATETIME NULL, PatchId INT(7) NULL, FOREIGN KEY (BranchName) REFERENCES Branches(Name), diff --git a/testbot/doc/winetestbot-schema.dia b/testbot/doc/winetestbot-schema.dia index ef7c3ca..7a94834 100644 --- a/testbot/doc/winetestbot-schema.dia +++ b/testbot/doc/winetestbot-schema.dia @@ -1450,7 +1450,7 @@ <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="nullable"> - <dia:boolean val="true"/> + <dia:boolean val="false"/> </dia:attribute> <dia:attribute name="unique"> <dia:boolean val="false"/>

1 0

Francois Gouget : testbot: Purge old jobs based on their Submitted timestamp.
by Alexandre Julliard 18 Jan '18

18 Jan '18

Module: tools Branch: master Commit: d6e6621472da2d80520fc4f9592a7d87934a141e URL: https://source.winehq.org/git/tools.git/?a=commit;h=d6e6621472da2d80520fc4f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jan 18 03:58:32 2018 +0100 testbot: Purge old jobs based on their Submitted timestamp. Although it would only happen in case of a major TestBot malfunction, a Job could end up in a state where it will never complete and thus where its Ended field never gets set. So deleting old jobs based on their Ended field could leave us with zombies. This cannot happen with the Submitted timestamp since that field is not nullable. Also, a Job run time is normally very small compared to the expiration time (under a couple of hours compared to several days) so this does not make a significant difference in when a job actually gets deleted. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 6ac22de..0f126e8 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -61,7 +61,7 @@ if ($JobPurgeDays != 0) my $Jobs = CreateJobs(); foreach my $Job (@{$Jobs->GetItems()}) { - if (defined($Job->Ended) && $Job->Ended < $DeleteBefore) + if ($Job->Submitted < $DeleteBefore) { LogMsg "Deleting job ", $Job->Id, "\n"; $Job->RmTree();

1 0

Józef Kucia : libs/vkd3d: Add simple format support restrictions.
by Alexandre Julliard 18 Jan '18

18 Jan '18

Module: vkd3d Branch: master Commit: b0aa4ed434d9cbcb8b4bf1fce96e48914603d186 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b0aa4ed434d9cbcb8b4bf1f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jan 17 12:48:08 2018 +0100 libs/vkd3d: Add simple format support restrictions. In the long term, we may need more complex format support filtering. 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 | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 5cf2ecf..d84c579 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1230,6 +1230,30 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommandList(ID3D12Device *if &IID_ID3D12GraphicsCommandList, riid, command_list); } +/* Direct3D feature levels restrict which formats can be optionally supported. */ +static void vkd3d_restrict_format_support_for_feature_level( + D3D12_FEATURE_DATA_FORMAT_SUPPORT *format_support, const struct vkd3d_format *format) +{ + static const D3D12_FEATURE_DATA_FORMAT_SUPPORT blacklisted_format_features[] = + { + {DXGI_FORMAT_B8G8R8A8_TYPELESS, D3D12_FORMAT_SUPPORT1_TYPED_UNORDERED_ACCESS_VIEW, + D3D12_FORMAT_SUPPORT2_UAV_TYPED_LOAD | D3D12_FORMAT_SUPPORT2_UAV_TYPED_STORE}, + {DXGI_FORMAT_B8G8R8A8_UNORM, D3D12_FORMAT_SUPPORT1_TYPED_UNORDERED_ACCESS_VIEW, + D3D12_FORMAT_SUPPORT2_UAV_TYPED_LOAD | D3D12_FORMAT_SUPPORT2_UAV_TYPED_STORE}, + }; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(blacklisted_format_features); ++i) + { + if (blacklisted_format_features[i].Format == format->dxgi_format) + { + format_support->Support1 &= ~blacklisted_format_features[i].Support1; + format_support->Support2 &= ~blacklisted_format_features[i].Support2; + break; + } + } +} + static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device *iface, D3D12_FEATURE feature, void *feature_data, UINT feature_data_size) { @@ -1378,6 +1402,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * | D3D12_FORMAT_SUPPORT2_UAV_ATOMIC_SIGNED_MIN_OR_MAX | D3D12_FORMAT_SUPPORT2_UAV_ATOMIC_UNSIGNED_MIN_OR_MAX; + vkd3d_restrict_format_support_for_feature_level(data, format); + return S_OK; }

1 0

Józef Kucia : libs/vkd3d: Introduce function to get Vulkan instance from vkd3d instance.
by Alexandre Julliard 18 Jan '18

18 Jan '18

Module: vkd3d Branch: master Commit: 88835021219b6363d516bb59cd3230d9ead0fe52 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=88835021219b6363d516bb5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jan 17 12:48:09 2018 +0100 libs/vkd3d: Introduce function to get Vulkan instance from vkd3d instance. 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> --- demos/demo_xcb.h | 2 +- include/vkd3d.h | 3 ++- libs/vkd3d/device.c | 14 +++++++++----- libs/vkd3d/vkd3d.map | 1 + 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/demos/demo_xcb.h b/demos/demo_xcb.h index a683dca..ca0887c 100644 --- a/demos/demo_xcb.h +++ b/demos/demo_xcb.h @@ -344,7 +344,7 @@ static inline struct demo_swapchain *demo_swapchain_create(ID3D12CommandQueue *c if (FAILED(ID3D12CommandQueue_GetDevice(command_queue, &IID_ID3D12Device, (void **)&d3d12_device))) return NULL; - vk_instance = vkd3d_get_vk_instance(d3d12_device); + vk_instance = vkd3d_get_vk_instance(vkd3d_instance_from_device(d3d12_device)); vk_physical_device = vkd3d_get_vk_physical_device(d3d12_device); vk_device = vkd3d_get_vk_device(d3d12_device); diff --git a/include/vkd3d.h b/include/vkd3d.h index 78d5e2e..6017e1a 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -67,6 +67,7 @@ struct vkd3d_device_create_info HRESULT vkd3d_create_instance(const struct vkd3d_instance_create_info *create_info, struct vkd3d_instance **instance); +VkInstance vkd3d_get_vk_instance(struct vkd3d_instance *instance); ULONG vkd3d_instance_decref(struct vkd3d_instance *instance); ULONG vkd3d_instance_incref(struct vkd3d_instance *instance); @@ -75,8 +76,8 @@ HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info, HRESULT vkd3d_create_image_resource(ID3D12Device *device, const D3D12_RESOURCE_DESC *desc, VkImage vk_image, unsigned int resource_flags, ID3D12Resource **resource); VkDevice vkd3d_get_vk_device(ID3D12Device *device); -VkInstance vkd3d_get_vk_instance(ID3D12Device *device); VkPhysicalDevice vkd3d_get_vk_physical_device(ID3D12Device *device); +struct vkd3d_instance *vkd3d_instance_from_device(ID3D12Device *device); uint32_t vkd3d_get_vk_queue_family_index(ID3D12CommandQueue *queue); VkQueue vkd3d_acquire_vk_queue(ID3D12CommandQueue *queue); diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index d84c579..3255dd6 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -289,6 +289,11 @@ ULONG vkd3d_instance_decref(struct vkd3d_instance *instance) return refcount; } +VkInstance vkd3d_get_vk_instance(struct vkd3d_instance *instance) +{ + return instance->vk_instance; +} + static void vkd3d_trace_physical_device(VkPhysicalDevice device, const struct vkd3d_vk_instance_procs *vk_procs) { @@ -2076,17 +2081,16 @@ VkDevice vkd3d_get_vk_device(ID3D12Device *device) return d3d12_device->vk_device; } -VkInstance vkd3d_get_vk_instance(ID3D12Device *device) +VkPhysicalDevice vkd3d_get_vk_physical_device(ID3D12Device *device) { struct d3d12_device *d3d12_device = impl_from_ID3D12Device(device); - struct vkd3d_instance *instance = d3d12_device->vkd3d_instance; - return instance->vk_instance; + return d3d12_device->vk_physical_device; } -VkPhysicalDevice vkd3d_get_vk_physical_device(ID3D12Device *device) +struct vkd3d_instance *vkd3d_instance_from_device(ID3D12Device *device) { struct d3d12_device *d3d12_device = impl_from_ID3D12Device(device); - return d3d12_device->vk_physical_device; + return d3d12_device->vkd3d_instance; } diff --git a/libs/vkd3d/vkd3d.map b/libs/vkd3d/vkd3d.map index 6f40841..c5157c6 100644 --- a/libs/vkd3d/vkd3d.map +++ b/libs/vkd3d/vkd3d.map @@ -12,6 +12,7 @@ global: vkd3d_get_vk_physical_device; vkd3d_get_vk_queue_family_index; vkd3d_instance_decref; + vkd3d_instance_from_device; vkd3d_instance_incref; vkd3d_release_vk_queue; vkd3d_serialize_root_signature;

1 0

Józef Kucia : tests: Add tests for selecting physical devices.
by Alexandre Julliard 18 Jan '18

18 Jan '18

Module: vkd3d Branch: master Commit: cd2c636bf55eb090e0efa7b7c1e80d84b176c2bf URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=cd2c636bf55eb090e0efa7b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jan 17 12:48:10 2018 +0100 tests: Add tests for selecting physical 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> --- Makefile.am | 1 + tests/vkd3d_api.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 60 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index a99fa56..f796bef 100644 --- a/Makefile.am +++ b/Makefile.am @@ -120,6 +120,7 @@ check_PROGRAMS = $(vkd3d_tests) $(vkd3d_cross_tests) AM_DEFAULT_SOURCE_EXT = .c TESTS = $(vkd3d_tests) $(vkd3d_cross_tests) tests_d3d12_LDADD = $(LDADD) @PTHREAD_LIBS@ +tests_vkd3d_api_LDADD = libvkd3d.la @VULKAN_LIBS@ DEMOS_LDADD = $(LDADD) libvkd3d-shader.la @XCB_LIBS@ @VULKAN_LIBS@ DEMOS_CFLAGS = @XCB_CFLAGS@ diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index 7ca5d26..bda0c4e 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -94,8 +94,8 @@ static void test_create_instance(void) static void test_create_device(void) { + struct vkd3d_instance *instance, *tmp_instance; struct vkd3d_device_create_info create_info; - struct vkd3d_instance *instance; ID3D12Device *device; ULONG refcount; HRESULT hr; @@ -125,6 +125,8 @@ static void test_create_device(void) refcount = vkd3d_instance_incref(instance); ok(refcount >= 3, "Got unexpected refcount %u.\n", refcount); vkd3d_instance_decref(instance); + tmp_instance = vkd3d_instance_from_device(device); + ok(tmp_instance == instance, "Got instance %p, expected %p.\n", tmp_instance, instance); refcount = ID3D12Device_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); @@ -137,6 +139,61 @@ static void test_create_device(void) ok(!refcount, "Instance has %u references left.\n", refcount); } +static void test_physical_device(void) +{ + struct vkd3d_device_create_info create_info; + VkPhysicalDevice *vk_physical_devices; + VkPhysicalDevice vk_physical_device; + struct vkd3d_instance *instance; + VkInstance vk_instance; + ID3D12Device *device; + uint32_t i, count; + ULONG refcount; + VkResult vr; + HRESULT hr; + + hr = vkd3d_create_instance(&instance_default_create_info, &instance); + ok(hr == S_OK, "Failed to create instance, hr %#x.\n", hr); + vk_instance = vkd3d_get_vk_instance(instance); + ok(vk_instance != VK_NULL_HANDLE, "Failed to get Vulkan instance.\n"); + + create_info = device_default_create_info; + create_info.instance = instance; + create_info.instance_create_info = NULL; + create_info.vk_physical_device = VK_NULL_HANDLE; + hr = vkd3d_create_device(&create_info, &IID_ID3D12Device, (void **)&device); + ok(hr == S_OK, "Failed to create device, hr %#x.\n", hr); + vk_physical_device = vkd3d_get_vk_physical_device(device); + trace("Default Vulkan physical device %p.\n", vk_physical_device); + refcount = ID3D12Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + + vr = vkEnumeratePhysicalDevices(vk_instance, &count, NULL); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + vk_physical_devices = calloc(count, sizeof(*vk_physical_devices)); + ok(vk_physical_devices, "Failed to allocate memory.\n"); + vr = vkEnumeratePhysicalDevices(vk_instance, &count, vk_physical_devices); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + + for (i = 0; i < count; ++i) + { + trace("Creating device for Vulkan physical device %p.\n", vk_physical_devices[i]); + + create_info.vk_physical_device = vk_physical_devices[i]; + hr = vkd3d_create_device(&create_info, &IID_ID3D12Device, (void **)&device); + ok(hr == S_OK, "Failed to create device, hr %#x.\n", hr); + vk_physical_device = vkd3d_get_vk_physical_device(device); + ok(vk_physical_device == vk_physical_devices[i], + "Got unexpected Vulkan physical device %p.\n", vk_physical_device); + refcount = ID3D12Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + } + + free(vk_physical_devices); + refcount = vkd3d_instance_decref(instance); + ok(!refcount, "Instance has %u references left.\n", refcount); +} + static void test_vkd3d_queue(void) { ID3D12CommandQueue *direct_queue, *compute_queue, *copy_queue; @@ -198,5 +255,6 @@ START_TEST(vkd3d_api) run_test(test_create_instance); run_test(test_create_device); + run_test(test_physical_device); run_test(test_vkd3d_queue); }

1 0

Józef Kucia : tests: Fix and simplify checks for error codes.
by Alexandre Julliard 18 Jan '18

18 Jan '18

Module: vkd3d Branch: master Commit: 05cb9de9a3097e0b21fa33c7a74684828ee07781 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=05cb9de9a3097e0b21fa33c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jan 17 12:48:11 2018 +0100 tests: Fix and simplify checks for error codes. 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/d3d12.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index b8b4d95..58939d2 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -330,7 +330,7 @@ static HANDLE create_thread(thread_main_pfn main_pfn, void *user_data) static bool join_thread(HANDLE thread) { - int ret; + unsigned int ret; ret = WaitForSingleObject(thread, INFINITE); CloseHandle(thread); @@ -402,8 +402,7 @@ static HRESULT wait_for_fence(ID3D12Fence *fence, UINT64 value) ret = wait_event(event, INFINITE); destroy_event(event); - - return ret == WAIT_OBJECT_0; + return ret == WAIT_OBJECT_0 ? S_OK : E_FAIL; } #define wait_queue_idle(a, b) wait_queue_idle_(__LINE__, a, b) @@ -414,12 +413,12 @@ static void wait_queue_idle_(unsigned int line, ID3D12Device *device, ID3D12Comm hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, &IID_ID3D12Fence, (void **)&fence); - ok_(line)(SUCCEEDED(hr), "Failed to create fence, hr %#x.\n", hr); + ok_(line)(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); hr = ID3D12CommandQueue_Signal(queue, fence, 1); - ok_(line)(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr); + ok_(line)(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); hr = wait_for_fence(fence, 1); - ok_(line)(SUCCEEDED(hr), "Failed to wait for fence, hr %#x.\n", hr); + ok_(line)(hr == S_OK, "Failed to wait for fence, hr %#x.\n", hr); ID3D12Fence_Release(fence); } @@ -3022,7 +3021,7 @@ static void test_cpu_signal_fence(void) /* Basic tests with single event. */ event1 = create_event(); - ok(!!event1, "Failed to create event.\n"); + ok(event1, "Failed to create event.\n"); ret = wait_event(event1, 0); ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); @@ -3114,7 +3113,7 @@ static void test_cpu_signal_fence(void) ok(value == 0, "Got unexpected value %"PRIu64".\n", value); event2 = create_event(); - ok(!!event2, "Failed to create event.\n"); + ok(event2, "Failed to create event.\n"); ret = wait_event(event1, 0); ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); @@ -3297,7 +3296,7 @@ static void test_gpu_signal_fence(void) /* Basic tests with single event. */ event1 = create_event(); - ok(!!event1, "Failed to create event.\n"); + ok(event1, "Failed to create event.\n"); ret = wait_event(event1, 0); ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); @@ -3372,7 +3371,7 @@ static void test_gpu_signal_fence(void) ok(value == 0, "Got unexpected value %"PRIu64".\n", value); event2 = create_event(); - ok(!!event2, "Failed to create event.\n"); + ok(event2, "Failed to create event.\n"); ret = wait_event(event1, 0); ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); @@ -3508,12 +3507,12 @@ struct multithread_fence_wait_data static void fence_event_wait_main(void *untyped_data) { struct multithread_fence_wait_data *data = untyped_data; + unsigned int ret; HANDLE event; HRESULT hr; - int ret; event = create_event(); - ok(!!event, "Failed to create event.\n"); + ok(event, "Failed to create event.\n"); hr = ID3D12Fence_SetEventOnCompletion(data->fence, data->value, event); ok(SUCCEEDED(hr), "Failed to set event on completion, hr %#x.\n", hr); @@ -3563,7 +3562,7 @@ static void test_multithread_fence_wait(void) thread_data.event = create_event(); thread_data.value = 0; - ok(!!thread_data.event, "Failed to create event.\n"); + ok(thread_data.event, "Failed to create event.\n"); hr = ID3D12Device_CreateFence(device, thread_data.value, D3D12_FENCE_FLAG_NONE, &IID_ID3D12Fence, (void **)&thread_data.fence); ok(SUCCEEDED(hr), "Failed to create fence, hr %#x.\n", hr); @@ -3571,7 +3570,7 @@ static void test_multithread_fence_wait(void) /* Signal fence on host. */ ++thread_data.value; thread = create_thread(fence_event_wait_main, &thread_data); - ok(!!thread, "Failed to create thread.\n"); + ok(thread, "Failed to create thread.\n"); ret = wait_event(thread_data.event, INFINITE); ok(ret == WAIT_OBJECT_0, "Failed to wait for thread start, return value %#x.\n", ret); @@ -3582,7 +3581,7 @@ static void test_multithread_fence_wait(void) ++thread_data.value; thread = create_thread(fence_busy_wait_main, &thread_data); - ok(!!thread, "Failed to create thread.\n"); + ok(thread, "Failed to create thread.\n"); ret = wait_event(thread_data.event, INFINITE); ok(ret == WAIT_OBJECT_0, "Failed to wait for thread start, return value %#x.\n", ret); @@ -3594,7 +3593,7 @@ static void test_multithread_fence_wait(void) /* Signal fence on device. */ ++thread_data.value; thread = create_thread(fence_event_wait_main, &thread_data); - ok(!!thread, "Failed to create thread.\n"); + ok(thread, "Failed to create thread.\n"); ret = wait_event(thread_data.event, INFINITE); ok(ret == WAIT_OBJECT_0, "Failed to wait for thread start, return value %#x.\n", ret); @@ -3605,7 +3604,7 @@ static void test_multithread_fence_wait(void) ++thread_data.value; thread = create_thread(fence_busy_wait_main, &thread_data); - ok(!!thread, "Failed to create thread.\n"); + ok(thread, "Failed to create thread.\n"); ret = wait_event(thread_data.event, INFINITE); ok(ret == WAIT_OBJECT_0, "Failed to wait for thread start, return value %#x.\n", ret);

1 0

Józef Kucia : tests: Fix clang warning.
by Alexandre Julliard 18 Jan '18

18 Jan '18

Module: vkd3d Branch: master Commit: 4ee7b3428daacd32d75def8d780970a38d0ce93c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4ee7b3428daacd32d75def8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jan 17 12:48:12 2018 +0100 tests: Fix clang warning. include/private/vkd3d_test.h:276:22: warning: format string is not a string literal (potentially insecure) [-Wformat-security] vkd3d_test_debug(name); 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/private/vkd3d_test.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/private/vkd3d_test.h b/include/private/vkd3d_test.h index 888436a..8e657ac 100644 --- a/include/private/vkd3d_test.h +++ b/include/private/vkd3d_test.h @@ -273,7 +273,7 @@ typedef void (*vkd3d_test_pfn)(void); static inline void vkd3d_run_test(const char *name, vkd3d_test_pfn test_pfn) { - vkd3d_test_debug(name); + vkd3d_test_debug("%s", name); test_pfn(); }

1 0