Nikolay Sivov : comctl32/tests: Run DPA tests on version 6.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d01306d1ee85b978afffe45879933af5aa122e09
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=d01306d1ee85b978afffe4587...

Author: Nikolay Sivov <nsivov(a)codeweavers.com>
Date:   Mon Jan 29 14:20:42 2018 +0300

comctl32/tests: Run DPA tests on version 6.

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/comctl32/tests/dpa.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/dlls/comctl32/tests/dpa.c b/dlls/comctl32/tests/dpa.c
index c795c14..39f6b46 100644
--- a/dlls/comctl32/tests/dpa.c
+++ b/dlls/comctl32/tests/dpa.c
@@ -30,6 +30,7 @@
 #include "objidl.h"
 
 #include "wine/test.h"
+#include "v6util.h"
 
 #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got)
 
@@ -737,6 +738,9 @@ if (0) {
 
 START_TEST(dpa)
 {
+    ULONG_PTR cookie;
+    HANDLE ctxt;
+
     init_functions();
 
     test_dpa();
@@ -745,4 +749,18 @@ START_TEST(dpa)
     test_DPA_DestroyCallback();
     test_DPA_LoadStream();
     test_DPA_SaveStream();
+
+    if (!load_v6_module(&cookie, &ctxt))
+        return;
+
+    init_functions();
+
+    test_dpa();
+    test_DPA_Merge();
+    test_DPA_EnumCallback();
+    test_DPA_DestroyCallback();
+    test_DPA_LoadStream();
+    test_DPA_SaveStream();
+
+    unload_v6_module(cookie, ctxt);
 }