Józef Kucia : libs/vkd3d: Validate signal_event_pfn.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: ebca1d33960d037d2839fd9f9d377f94b5b434cf
URL:    https://source.winehq.org/git/vkd3d.git/?a=commit;h=ebca1d33960d037d2839fd9f...

Author: Józef Kucia 
Date:   Fri Jan 19 17:17:23 2018 +0100

libs/vkd3d: Validate signal_event_pfn.

Signed-off-by: Józef Kucia 
Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

libs/vkd3d/device.c |  5 +++++
 tests/vkd3d_api.c   | 16 +++++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c
index af3f053..7a99511 100644
--- a/libs/vkd3d/device.c
+++ b/libs/vkd3d/device.c
@@ -221,6 +221,11 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance,
     VkResult vr;
     HRESULT hr;

+    if (!create_info->signal_event_pfn)
+    {
+        ERR("Invalid signal event function pointer.\n");
+        return E_INVALIDARG;
+    }
     if (!create_info->create_thread_pfn != !create_info->join_thread_pfn)
     {
         ERR("Invalid create/join thread function pointers.\n");
diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c
index 41b09fb..c387abe 100644
--- a/tests/vkd3d_api.c
+++ b/tests/vkd3d_api.c
@@ -74,9 +74,7 @@ static void test_create_instance(void)
     ULONG refcount;
     HRESULT hr;

-    memset(&create_info, 0, sizeof(create_info));
-    create_info.wchar_size = sizeof(WCHAR);
-
+    create_info = instance_default_create_info;
     hr = vkd3d_create_instance(&create_info, &instance);
     ok(hr == S_OK, "Failed to create instance, hr %#x.\n", hr);
     refcount = vkd3d_instance_incref(instance);
@@ -85,11 +83,15 @@ static void test_create_instance(void)
     refcount = vkd3d_instance_decref(instance);
     ok(!refcount, "Instance has %u references left.\n", refcount);

-    create_info.signal_event_pfn = signal_event;
+    create_info = instance_default_create_info;
+    create_info.wchar_size = 1;
     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);
+    ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
+
+    create_info = instance_default_create_info;
+    create_info.signal_event_pfn = NULL;
+    hr = vkd3d_create_instance(&create_info, &instance);
+    ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr);
 }

static void test_create_device(void)