[PATCH 4/6] comctl32/rebar: Fix CCM_{GET,SET}VERSION handling.

[Zhiyi Zhang]

From: Zhiyi Zhang

---
 dlls/comctl32/rebar.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c
index 7bb8f33ae06..51f13db3aa9 100644
--- a/dlls/comctl32/rebar.c
+++ b/dlls/comctl32/rebar.c
@@ -2862,9 +2862,12 @@ REBAR_SetUnicodeFormat (REBAR_INFO *infoPtr, BOOL unicode)
 static LRESULT
 REBAR_SetVersion (REBAR_INFO *infoPtr, INT iVersion)
 {
+#if __WINE_COMCTL32_VERSION == 6
+    return infoPtr->iVersion;
+#else
     INT iOldVersion = infoPtr->iVersion;

-    if (iVersion > COMCTL32_VERSION)
+    if (iVersion > 5)
    return -1;

infoPtr->iVersion = iVersion;
@@ -2872,6 +2875,7 @@ REBAR_SetVersion (REBAR_INFO *infoPtr, INT iVersion)
     TRACE("new version %d\n", iVersion);

return iOldVersion;
+#endif
 }

@@ -3256,6 +3260,11 @@ REBAR_NCCreate (HWND hwnd, const CREATESTRUCTW *cs)
     infoPtr->fStatus = 0;
     infoPtr->hFont = GetStockObject (SYSTEM_FONT);
     infoPtr->bands = DPA_Create(8);
+#if __WINE_COMCTL32_VERSION == 6
+    infoPtr->iVersion = 6;
+#else
+    infoPtr->iVersion = 0;
+#endif

/* issue WM_NOTIFYFORMAT to get unicode status of parent */
     REBAR_NotifyFormat(infoPtr, NF_REQUERY);