[PATCH 2/6] comctl32/toolbar: Don't change Unicode format when handling CCM_SETVERSION.

[Zhiyi Zhang]

From: Zhiyi Zhang

---
 dlls/comctl32/tests/misc.c | 1 -
 dlls/comctl32/toolbar.c    | 4 ----
 2 files changed, 5 deletions(-)

diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c
index f281751566d..2b6bdf81435 100644
--- a/dlls/comctl32/tests/misc.c
+++ b/dlls/comctl32/tests/misc.c
@@ -1409,7 +1409,6 @@ static void test_CCM_SETVERSION(BOOL v6)
             if (!strcmp(class_names[i], TOOLBARCLASSNAMEA))
             {
                 lr = SendMessageA(hwnd, TB_GETUNICODEFORMAT, 0, 0);
-                todo_wine_if(j >= 5)
                 ok(lr == 0, "Got unexpected %Id.\n", lr);
             }

diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c
index da66d3972c3..5922afd729a 100644
--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -5120,10 +5120,6 @@ TOOLBAR_SetVersion (TOOLBAR_INFO *infoPtr, INT iVersion)
     INT iOldVersion = infoPtr->iVersion;

infoPtr->iVersion = iVersion;
-
-    if (infoPtr->iVersion >= 5)
-        TOOLBAR_SetUnicodeFormat(infoPtr, TRUE);
-
     return iOldVersion;
 }