[PATCH 1/2] comctl32/tests: Enable IP address control tests on version 6

[Nikolay Sivov]

Signed-off-by: Nikolay Sivov 
---
 dlls/comctl32/tests/ipaddress.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/dlls/comctl32/tests/ipaddress.c b/dlls/comctl32/tests/ipaddress.c
index 6d8e9ccf4b..52581899a7 100644
--- a/dlls/comctl32/tests/ipaddress.c
+++ b/dlls/comctl32/tests/ipaddress.c
@@ -22,6 +22,7 @@
 #include <commctrl.h>

#include "wine/test.h"
+#include "v6util.h"

#define expect(expected, got) ok(expected == got, "expected %d, got %d\n", expected,got)

@@ -63,5 +64,15 @@ static void test_get_set_text(void)

START_TEST(ipaddress)
 {
+    ULONG_PTR cookie;
+    HANDLE ctxt;
+
+    test_get_set_text();
+
+    if (!load_v6_module(&cookie, &ctxt))
+        return;
+
     test_get_set_text();
+
+    unload_v6_module(cookie, ctxt);
 }

[PATCH 2/2] comctl32/tests: Enable Trackbar tests on version 6

[Nikolay Sivov]

Signed-off-by: Nikolay Sivov 
---
 dlls/comctl32/tests/trackbar.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c
index 31845d10e0..7b601b85b7 100644
--- a/dlls/comctl32/tests/trackbar.c
+++ b/dlls/comctl32/tests/trackbar.c
@@ -23,6 +23,7 @@

#include "wine/test.h"
 #include "msg.h"
+#include "v6util.h"

#define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got)
 #define NUM_MSG_SEQUENCE 2
@@ -1296,6 +1297,9 @@ static void test_create(void)

START_TEST(trackbar)
 {
+    ULONG_PTR cookie;
+    HANDLE ctxt;
+
     LoadLibraryA("comctl32.dll");

init_msg_sequences(sequences, NUM_MSG_SEQUENCE);
@@ -1325,5 +1329,25 @@ START_TEST(trackbar)
     test_ignore_selection();
     test_initial_state();

+    if (!load_v6_module(&cookie, &ctxt))
+        return;
+
+    test_trackbar_buddy();
+    test_line_size();
+    test_page_size();
+    test_position();
+    test_range();
+    test_selection();
+    test_thumb_length();
+    test_tic_settings();
+    test_tic_placement();
+    test_tool_tips();
+    test_unicode();
+    test_TBS_AUTOTICKS();
+    test_ignore_selection();
+    test_initial_state();
+
+    unload_v6_module(cookie, ctxt);
+
     DestroyWindow(hWndParent);
 }