Changeset 19075

Timestamp:

May 29, 2002, 6:05:40 PM (23 years ago)

Author:

sandervl

Message:

Updated status control to latest Wine & applied two bugfixes

File:

• tags/trunk/src/comctl32/status.c (modified) (61 diffs)

tags/trunk/src/comctl32/status.c ¶

@@ -4 +4 @@
  * Copyright 1996 Bruce Milner
  * Copyright 1998, 1999 Eric Kohl
+ * Copyright 2002 Dimitrie O. Paun
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * FIXME:
+ * 1) Implement all CCS_* styles.
+ * 2) Should we hide grip if the parent window is maximized?
  */
-/*
- * FIXME/TODO
- * 1) Don't hard code bar to bottom of window, allow CCS_TOP also.
- * 2) Tooltip support (almost done).
- * 3) where else should we use infoPtr->hwndParent instead of GetParent() ?
- * 4) send WM_QUERYFORMAT
- */
 
 #include <string.h>
+
 #include "winbase.h"
 #include "wine/unicode.h"
 #include "commctrl.h"
-#include "debugtools.h"
-#ifdef __WIN32OS2__
-#include "ccbase.h"
-#endif
-
-DEFAULT_DEBUG_CHANNEL(statusbar);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(statusbar);
 
 typedef struct
 {
-    INT x;
-    INT style;
+    INT         x;
+    INT         style;
     RECT        bound;
     LPWSTR      text;
-    HICON     hIcon;
+    HICON       hIcon;
 } STATUSWINDOWPART;
 
 typedef struct
 {
-#ifdef __WIN32OS2__
-    COMCTL32_HEADER   header;
-#endif
-    HWND              hwndParent;
+    HWND              Self;
     WORD              numParts;
-    WORD              textHeight;
     UINT              height;
     BOOL              simple;
@@ -46 +52 @@
     HFONT             hFont;
     HFONT             hDefaultFont;
-    COLORREF            clrBk;     /* background color */
-    BOOL              bUnicode;  /* unicode flag */
-    STATUSWINDOWPART    part0;     /* simple window */
-    STATUSWINDOWPART   *parts;
+    COLORREF          clrBk;            /* background color */
+    BOOL              bUnicode;         /* unicode flag */
+    BOOL              NtfUnicode;       /* notify format */
+    STATUSWINDOWPART  part0;            /* simple window */
+    STATUSWINDOWPART* parts;
 } STATUSWINDOWINFO;
 
@@ -58 +65 @@
  */
 
-
-#define _MAX(a,b) (((a)>(b))?(a):(b))
-#define _MIN(a,b) (((a)>(b))?(b):(a))
-
 #define HORZ_BORDER 0
 #define VERT_BORDER 2
 #define HORZ_GAP    2
 
-#define STATUSBAR_GetInfoPtr(hwnd) ((STATUSWINDOWINFO *)GetWindowLongA (hwnd, 0))
+#define STATUSBAR_GetInfoPtr(hwnd) ((STATUSWINDOWINFO *)GetWindowLongW (hwnd, 0))
 
 /* prototype */
 static void
-STATUSBAR_SetPartBounds (STATUSWINDOWINFO *infoPtr, HWND hwnd);
+STATUSBAR_SetPartBounds (STATUSWINDOWINFO *infoPtr);
+
+static inline LPCSTR debugstr_t(LPCWSTR text, BOOL isW)
+{
+  return isW ? debugstr_w(text) : debugstr_a((LPCSTR)text);
+}
 
 static void
 STATUSBAR_DrawSizeGrip (HDC hdc, LPRECT lpRect)
 {
-    HPEN hOldPen;
+    HPEN hPenFace, hPenShadow, hPenHighlight, hOldPen;
     POINT pt;
     INT i;
 
     TRACE("draw size grip %d,%d - %d,%d\n", lpRect->left, lpRect->top, lpRect->right, lpRect->bottom);
+
     pt.x = lpRect->right - 1;
     pt.y = lpRect->bottom - 1;
 
-    hOldPen = SelectObject (hdc, GetSysColorPen (COLOR_3DFACE));
+    hPenFace = CreatePen( PS_SOLID, 1, GetSysColor( COLOR_3DFACE ));
+    hOldPen = SelectObject( hdc, hPenFace );
     MoveToEx (hdc, pt.x - 12, pt.y, NULL);
     LineTo (hdc, pt.x, pt.y);
-    LineTo (hdc, pt.x, pt.y - 12);
+    LineTo (hdc, pt.x, pt.y - 13);
 
     pt.x--;
     pt.y--;
 
-    SelectObject (hdc, GetSysColorPen (COLOR_3DSHADOW));
+    hPenShadow = CreatePen( PS_SOLID, 1, GetSysColor( COLOR_3DSHADOW ));
+    SelectObject( hdc, hPenShadow );
     for (i = 1; i < 11; i += 4) {
         MoveToEx (hdc, pt.x - i, pt.y, NULL);
-        LineTo (hdc, pt.x, pt.y - i);
-
-        MoveToEx (hdc, pt.x - i-1, pt.y, NULL);
-        LineTo (hdc, pt.x, pt.y - i-1);
-    }
-
-    SelectObject (hdc, GetSysColorPen (COLOR_3DHIGHLIGHT));
+        LineTo (hdc, pt.x + 1, pt.y - i - 1);
+
+        MoveToEx (hdc, pt.x - i - 1, pt.y, NULL);
+        LineTo (hdc, pt.x + 1, pt.y - i - 2);
+    }
+
+    hPenHighlight = CreatePen( PS_SOLID, 1, GetSysColor( COLOR_3DHIGHLIGHT ));
+    SelectObject( hdc, hPenHighlight );
     for (i = 3; i < 13; i += 4) {
         MoveToEx (hdc, pt.x - i, pt.y, NULL);
-        LineTo (hdc, pt.x, pt.y - i);
+        LineTo (hdc, pt.x + 1, pt.y - i - 1);
     }
 
     SelectObject (hdc, hOldPen);
+    DeleteObject( hPenFace );
+    DeleteObject( hPenShadow );
+    DeleteObject( hPenHighlight );
 }
 
 
 static void 
-STATUSBAR_DrawPart (HDC hdc, STATUSWINDOWPART *part)
+STATUSBAR_DrawPart (HDC hdc, const STATUSWINDOWPART *part, const STATUSWINDOWINFO *infoPtr, int itemID)
 {
     RECT r = part->bound;
@@ -118 +133 @@
     TRACE("part bound %d,%d - %d,%d\n", r.left, r.top, r.right, r.bottom);
     if (part->style & SBT_POPOUT)
-      border = BDR_RAISEDOUTER;
+        border = BDR_RAISEDOUTER;
     else if (part->style & SBT_NOBORDERS)
-      border = 0;
+        border = 0;
 
     DrawEdge(hdc, &r, border, BF_RECT|BF_ADJUST);
-
-    /* draw the icon */
-    if (part->hIcon) {
-        INT cy = r.bottom - r.top;
-
-        r.left += 2;
-        DrawIconEx (hdc, r.left, r.top, part->hIcon, cy, cy, 0, 0, DI_NORMAL);
-        r.left += cy;
-    }
-
-    /* now draw text */
-    if (part->text) {
-      int oldbkmode = SetBkMode(hdc, TRANSPARENT);
-      LPWSTR p = (LPWSTR)part->text;
-      UINT align = DT_LEFT;
-      if (*p == L'\t') {
-        p++;
-        align = DT_CENTER;
-
-        if (*p == L'\t') {
-          p++;
-          align = DT_RIGHT;
-        }
-      }
-      r.left += 3;
-      TRACE("%s at %d,%d - %d,%d\n", debugstr_w(p), r.left, r.top, r.right, r.bottom);
-      DrawTextW (hdc, p, -1, &r, align|DT_VCENTER|DT_SINGLELINE);
-      if (oldbkmode != TRANSPARENT)
-        SetBkMode(hdc, oldbkmode);
-    }
-}
-
-
-static VOID
-STATUSBAR_RefreshPart (STATUSWINDOWINFO *infoPtr, HWND hwnd, STATUSWINDOWPART *part, HDC hdc, int itemID)
+        
+    if (part->style & SBT_OWNERDRAW)
+        {
+            DRAWITEMSTRUCT dis;
+
+            dis.CtlID = GetWindowLongW (infoPtr->Self, GWL_ID);
+            dis.itemID = itemID;
+            dis.hwndItem = infoPtr->Self;
+            dis.hDC = hdc;
+            dis.rcItem = r;
+            dis.itemData = (INT)part->text;
+            SendMessageW (GetParent (infoPtr->Self), WM_DRAWITEM,
+                    (WPARAM)dis.CtlID, (LPARAM)&dis);
+    } 
+    else
+        {
+            if (part->hIcon)
+                {
+                INT cy = r.bottom - r.top;
+
+                r.left += 2; 
+                DrawIconEx (hdc, r.left, r.top, part->hIcon, cy, cy, 0, 0, DI_NORMAL);
+                r.left += cy;
+                }
+        DrawStatusTextW (hdc, &r, part->text, SBT_NOBORDERS);
+    }
+}
+
+
+static void
+STATUSBAR_RefreshPart (const STATUSWINDOWINFO *infoPtr, const STATUSWINDOWPART *part, HDC hdc, int itemID)
 {
     HBRUSH hbrBk;
@@ -163 +174 @@
 
     TRACE("item %d\n", itemID);
-    if (!IsWindowVisible (hwnd))
+    if (!IsWindowVisible (infoPtr->Self))
         return;
 
@@ -169 +180 @@
 
     if (infoPtr->clrBk != CLR_DEFAULT)
-        hbrBk = CreateSolidBrush (infoPtr->clrBk);
+            hbrBk = CreateSolidBrush (infoPtr->clrBk);
     else
-        hbrBk = GetSysColorBrush (COLOR_3DFACE);
+            hbrBk = GetSysColorBrush (COLOR_3DFACE);
     FillRect(hdc, &part->bound, hbrBk);
 
     hOldFont = SelectObject (hdc, infoPtr->hFont ? infoPtr->hFont : infoPtr->hDefaultFont);
 
-    if (part->style & SBT_OWNERDRAW) {
-        DRAWITEMSTRUCT dis;
-
-        dis.CtlID = GetWindowLongA (hwnd, GWL_ID);
-        dis.itemID = itemID;
-        dis.hwndItem = hwnd;
-        dis.hDC = hdc;
-        dis.rcItem = part->bound;
-        dis.itemData = (INT)part->text;
-        SendMessageA (GetParent (hwnd), WM_DRAWITEM,
-                (WPARAM)dis.CtlID, (LPARAM)&dis);
-    } else
-        STATUSBAR_DrawPart (hdc, part);
+        STATUSBAR_DrawPart (hdc, part, infoPtr, itemID);
 
     SelectObject (hdc, hOldFont);
 
     if (infoPtr->clrBk != CLR_DEFAULT)
-        DeleteObject (hbrBk);
-
-    if (GetWindowLongA (hwnd, GWL_STYLE) & SBARS_SIZEGRIP) {
-        RECT rect;
-
-        GetClientRect (hwnd, &rect);
-        STATUSBAR_DrawSizeGrip (hdc, &rect);
-    }
-}
-
-
-static BOOL
-STATUSBAR_Refresh (STATUSWINDOWINFO *infoPtr, HWND hwnd, HDC hdc)
+            DeleteObject (hbrBk);
+
+    if (GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP)
+        {
+            RECT rect;
+
+            GetClientRect (infoPtr->Self, &rect);
+            STATUSBAR_DrawSizeGrip (hdc, &rect);
+    }
+}
+
+
+static LRESULT
+STATUSBAR_Refresh (STATUSWINDOWINFO *infoPtr, HDC hdc)
 {
     int      i;
@@ -213 +213 @@
 
     TRACE("\n");
-    if (!IsWindowVisible(hwnd))
-        return (TRUE);
-
-    STATUSBAR_SetPartBounds(infoPtr, hwnd);
-
-    GetClientRect (hwnd, &rect);
+    if (!IsWindowVisible(infoPtr->Self))
+        return 0;
+
+    STATUSBAR_SetPartBounds(infoPtr);
+
+    GetClientRect (infoPtr->Self, &rect);
 
     if (infoPtr->clrBk != CLR_DEFAULT)
-        hbrBk = CreateSolidBrush (infoPtr->clrBk);
+            hbrBk = CreateSolidBrush (infoPtr->clrBk);
     else
-        hbrBk = GetSysColorBrush (COLOR_3DFACE);
+            hbrBk = GetSysColorBrush (COLOR_3DFACE);
     FillRect(hdc, &rect, hbrBk);
 
@@ -229 +229 @@
 
     if (infoPtr->simple) {
-        STATUSBAR_RefreshPart (infoPtr, hwnd, &infoPtr->part0, hdc, 0);
+            STATUSBAR_RefreshPart (infoPtr, &infoPtr->part0, hdc, 0);
     } else {
-        for (i = 0; i < infoPtr->numParts; i++) {
-            if (infoPtr->parts[i].style & SBT_OWNERDRAW) {
-                DRAWITEMSTRUCT dis;
-
-                dis.CtlID = GetWindowLongA (hwnd, GWL_ID);
-                dis.itemID = i;
-                dis.hwndItem = hwnd;
-                dis.hDC = hdc;
-                dis.rcItem = infoPtr->parts[i].bound;
-                dis.itemData = (INT)infoPtr->parts[i].text;
-                SendMessageA (GetParent (hwnd), WM_DRAWITEM,
-                        (WPARAM)dis.CtlID, (LPARAM)&dis);
-            } else
-                STATUSBAR_RefreshPart (infoPtr, hwnd, &infoPtr->parts[i], hdc, i);
-        }
+            for (i = 0; i < infoPtr->numParts; i++) {
+                    STATUSBAR_RefreshPart (infoPtr, &infoPtr->parts[i], hdc, i);
+            }
     }
 
@@ -251 +239 @@
 
     if (infoPtr->clrBk != CLR_DEFAULT)
-        DeleteObject (hbrBk);
-
-    if (GetWindowLongA(hwnd, GWL_STYLE) & SBARS_SIZEGRIP)
-        STATUSBAR_DrawSizeGrip (hdc, &rect);
-
-    return TRUE;
+            DeleteObject (hbrBk);
+
+    if (GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP)
+            STATUSBAR_DrawSizeGrip (hdc, &rect);
+
+    return 0;
 }
 
 
 static void
-STATUSBAR_SetPartBounds (STATUSWINDOWINFO *infoPtr, HWND hwnd)
+STATUSBAR_SetPartBounds (STATUSWINDOWINFO *infoPtr)
 {
     STATUSWINDOWPART *part;
@@ -268 +256 @@
 
     /* get our window size */
-    GetClientRect (hwnd, &rect);
+    GetClientRect (infoPtr->Self, &rect);
     TRACE("client wnd size is %d,%d - %d,%d\n", rect.left, rect.top, rect.right, rect.bottom);
 
@@ -292 +280 @@
 
         if (infoPtr->hwndToolTip) {
-            TTTOOLINFOA ti;
-
-            ti.cbSize = sizeof(TTTOOLINFOA);
-            ti.hwnd = hwnd;
+            TTTOOLINFOW ti;
+
+            ti.cbSize = sizeof(TTTOOLINFOW);
+            ti.hwnd = infoPtr->Self;
             ti.uId = i;
             ti.rect = *r;
-            SendMessageA (infoPtr->hwndToolTip, TTM_NEWTOOLRECTA,
+            SendMessageW (infoPtr->hwndToolTip, TTM_NEWTOOLRECTW,
                             0, (LPARAM)&ti);
         }
@@ -305 +293 @@
 
 
-static VOID
-STATUSBAR_RelayEvent (HWND hwndTip, HWND hwndMsg, UINT uMsg,
-                      WPARAM wParam, LPARAM lParam)
+static LRESULT
+STATUSBAR_Relay2Tip (STATUSWINDOWINFO *infoPtr, UINT uMsg,
+                     WPARAM wParam, LPARAM lParam)
 {
     MSG msg;
 
-    msg.hwnd = hwndMsg;
+    msg.hwnd = infoPtr->Self;
     msg.message = uMsg;
     msg.wParam = wParam;
@@ -319 +307 @@
     msg.pt.y = HIWORD(GetMessagePos ());
 
-    SendMessageA (hwndTip, TTM_RELAYEVENT, 0, (LPARAM)&msg);
-}
-
-
-inline static LRESULT
-STATUSBAR_GetBorders (LPARAM lParam)
-{
-    LPINT out = (LPINT) lParam;
-
+    return SendMessageW (infoPtr->hwndToolTip, TTM_RELAYEVENT, 0, (LPARAM)&msg);
+}
+
+
+static BOOL
+STATUSBAR_GetBorders (INT out[])
+{
     TRACE("\n");
     out[0] = HORZ_BORDER; /* horizontal border width */
@@ -337 +323 @@
 
 
-static LRESULT
-STATUSBAR_GetIcon (STATUSWINDOWINFO *infoPtr, HWND hwnd, WPARAM wParam)
-{
-    INT nPart;
-
-    nPart = (INT)wParam & 0x00ff;
+static HICON
+STATUSBAR_GetIcon (STATUSWINDOWINFO *infoPtr, INT nPart)
+{
     TRACE("%d\n", nPart);
+    /* MSDN says: "simple parts are indexed with -1" */
     if ((nPart < -1) || (nPart >= infoPtr->numParts))
         return 0;
@@ -354 +338 @@
 
 
-static LRESULT
-STATUSBAR_GetParts (STATUSWINDOWINFO *infoPtr, HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    LPINT parts;
-    INT   num_parts;
+static INT
+STATUSBAR_GetParts (STATUSWINDOWINFO *infoPtr, INT num_parts, INT parts[])
+{
     INT   i;
 
-    num_parts = (INT) wParam;
     TRACE("(%d)\n", num_parts);
-    parts = (LPINT) lParam;
     if (parts) {
         for (i = 0; i < num_parts; i++) {
@@ -369 +349 @@
         }
     }
-    return (infoPtr->numParts);
-}
-
-
-static LRESULT
-STATUSBAR_GetRect (STATUSWINDOWINFO *infoPtr, HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    int nPart;
-    LPRECT  rect;
-
-    nPart = ((INT) wParam) & 0x00ff;
+    return infoPtr->numParts;
+}
+
+
+static BOOL
+STATUSBAR_GetRect (STATUSWINDOWINFO *infoPtr, INT nPart, LPRECT rect)
+{
     TRACE("part %d\n", nPart);
-    rect = (LPRECT) lParam;
     if (infoPtr->simple)
         *rect = infoPtr->part0.bound;
@@ -391 +366 @@
 
 static LRESULT
-STATUSBAR_GetTextA (STATUSWINDOWINFO *infoPtr, HWND hwnd, WPARAM wParam, LPARAM lParam)
+STATUSBAR_GetTextA (STATUSWINDOWINFO *infoPtr, INT nPart, LPSTR buf)
 {
     STATUSWINDOWPART *part;
-    INT   nPart;
     LRESULT result;
 
-    nPart = ((INT) wParam) & 0x00ff;
     TRACE("part %d\n", nPart);
+
+    /* MSDN says: "simple parts use index of 0", so this check is ok. */
+    if (nPart < 0 || nPart >= infoPtr->numParts) return 0;
+
     if (infoPtr->simple)
         part = &infoPtr->part0;
     else
-#ifdef __WIN32OS2__
-    {
-        if (nPart >= infoPtr->numParts)
-            return FALSE;
         part = &infoPtr->parts[nPart];
-    }
-#else
-        part = &infoPtr->parts[nPart];
-#endif
 
     if (part->style & SBT_OWNERDRAW)
@@ -418 +387 @@
                                                       NULL, 0, NULL, NULL ) - 1 : 0;
         result = MAKELONG( len, part->style );
-        if (lParam && len)
-            WideCharToMultiByte( CP_ACP, 0, part->text, -1, (LPSTR)lParam, len+1, NULL, NULL );
+        if (part->text && buf)
+            WideCharToMultiByte( CP_ACP, 0, part->text, -1, buf, len+1, NULL, NULL );
     }
     return result;
@@ -426 +395 @@
 
 static LRESULT
-STATUSBAR_GetTextW (STATUSWINDOWINFO *infoPtr, HWND hwnd, WPARAM wParam, LPARAM lParam)
+STATUSBAR_GetTextW (STATUSWINDOWINFO *infoPtr, INT nPart, LPWSTR buf)
 {
     STATUSWINDOWPART *part;
-    INT   nPart;
     LRESULT result;
 
-    nPart = ((INT)wParam) & 0x00ff;
     TRACE("part %d\n", nPart);
+    if (nPart < 0 || nPart >= infoPtr->numParts) return 0;
+
     if (infoPtr->simple)
         part = &infoPtr->part0;
     else
-#ifdef __WIN32OS2__
-    {
-        if (nPart >= infoPtr->numParts)
-            return FALSE;
         part = &infoPtr->parts[nPart];
-    }
-#else
-        part = &infoPtr->parts[nPart];
-#endif
 
     if (part->style & SBT_OWNERDRAW)
@@ -452 +413 @@
         result = part->text ? strlenW (part->text) : 0;
         result |= (part->style << 16);
-        if (part->text && lParam)
-            strcpyW ((LPWSTR)lParam, part->text);
+        if (part->text && buf)
+            strcpyW (buf, part->text);
     }
     return result;
@@ -460 +421 @@
 
 static LRESULT
-STATUSBAR_GetTextLength (STATUSWINDOWINFO *infoPtr, HWND hwnd, WPARAM wParam)
+STATUSBAR_GetTextLength (STATUSWINDOWINFO *infoPtr, INT nPart)
 {
     STATUSWINDOWPART *part;
-    INT nPart;
     DWORD result;
 
-    nPart = ((INT) wParam) & 0x00ff;
-
     TRACE("part %d\n", nPart);
+
+    /* MSDN says: "simple parts use index of 0", so this check is ok. */
+    if (nPart < 0 || nPart >= infoPtr->numParts) return 0;
 
     if (infoPtr->simple)
         part = &infoPtr->part0;
     else
-#ifdef __WIN32OS2__
-    {
-        if (nPart >= infoPtr->numParts)
-            return FALSE;
-        if (infoPtr->simple)
-        part = &infoPtr->part0;
-        else
-        part = &infoPtr->parts[nPart];
-    }
-#else
-        if (infoPtr->simple)
-        part = &infoPtr->part0;
-        else
-        part = &infoPtr->parts[nPart];
-#endif
+        part = &infoPtr->parts[nPart];
 
     if (part->text)
@@ -498 +445 @@
 }
 
-
-static LRESULT
-STATUSBAR_GetTipTextA (STATUSWINDOWINFO *infoPtr, HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    LPSTR tip = (LPSTR)lParam;
-
+static LRESULT
+STATUSBAR_GetTipTextA (STATUSWINDOWINFO *infoPtr, INT id, LPSTR tip, INT size)
+{
+    TRACE("\n");
     if (tip) {
         CHAR buf[INFOTIPSIZE];
@@ -511 +456 @@
             TTTOOLINFOA ti;
             ti.cbSize = sizeof(TTTOOLINFOA);
-            ti.hwnd = hwnd;
-            ti.uId = LOWORD(wParam);
+            ti.hwnd = infoPtr->Self;
+            ti.uId = id;
             ti.lpszText = buf;
-            SendMessageA(infoPtr->hwndToolTip, TTM_GETTEXTA, 0, (LPARAM)&ti);
+            SendMessageA (infoPtr->hwndToolTip, TTM_GETTEXTA, 0, (LPARAM)&ti);
         }
-        lstrcpynA(tip, buf, HIWORD(wParam));
+        lstrcpynA (tip, buf, size);
     }
     return 0;
@@ -523 +468 @@
 
 static LRESULT
-STATUSBAR_GetTipTextW (STATUSWINDOWINFO *infoPtr, HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    LPWSTR tip = (LPWSTR)lParam;
-
+STATUSBAR_GetTipTextW (STATUSWINDOWINFO *infoPtr, INT id, LPWSTR tip, INT size)
+{
     TRACE("\n");
     if (tip) {
@@ -535 +478 @@
             TTTOOLINFOW ti;
             ti.cbSize = sizeof(TTTOOLINFOW);
-            ti.hwnd = hwnd;
-            ti.uId = LOWORD(wParam);
+            ti.hwnd = infoPtr->Self;
+            ti.uId = id;
             ti.lpszText = buf;
             SendMessageW(infoPtr->hwndToolTip, TTM_GETTEXTW, 0, (LPARAM)&ti);
         }
-        lstrcpynW(tip, buf, HIWORD(wParam));
+        lstrcpynW(tip, buf, size);
     }
 
@@ -547 +490 @@
 
 
-inline static LRESULT
-STATUSBAR_GetUnicodeFormat (STATUSWINDOWINFO *infoPtr, HWND hwnd)
-{
-    return infoPtr->bUnicode;
-}
-
-
-inline static LRESULT
-STATUSBAR_IsSimple (STATUSWINDOWINFO *infoPtr, HWND hwnd)
-{
-    return infoPtr->simple;
-}
-
-
-static LRESULT
-STATUSBAR_SetBkColor (STATUSWINDOWINFO *infoPtr, HWND hwnd, WPARAM wParam, LPARAM lParam)
+static COLORREF
+STATUSBAR_SetBkColor (STATUSWINDOWINFO *infoPtr, COLORREF color)
 {
     COLORREF oldBkColor;
 
     oldBkColor = infoPtr->clrBk;
-    infoPtr->clrBk = (COLORREF)lParam;
-    InvalidateRect(hwnd, NULL, FALSE);
+    infoPtr->clrBk = color;
+    InvalidateRect(infoPtr->Self, NULL, FALSE);
 
     TRACE("CREF: %08lx -> %08lx\n", oldBkColor, infoPtr->clrBk);
@@ -575 +504 @@
 
 
-static LRESULT
-STATUSBAR_SetIcon (STATUSWINDOWINFO *infoPtr, HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    INT nPart = (INT)wParam & 0x00ff;
-
+static BOOL
+STATUSBAR_SetIcon (STATUSWINDOWINFO *infoPtr, INT nPart, HICON hIcon)
+{
     if ((nPart < -1) || (nPart >= infoPtr->numParts))
         return FALSE;
 
-    TRACE("setting part %d, icon %lx\n",nPart,lParam);
-
+    TRACE("setting part %d\n", nPart);
+
+    /* FIXME: MSDN says "if nPart is -1, the status bar is assumed simple" */
     if (nPart == -1) {
-        if (infoPtr->part0.hIcon == (HICON)lParam) /* same as - no redraw */
+        if (infoPtr->part0.hIcon == hIcon) /* same as - no redraw */
             return TRUE;
-        infoPtr->part0.hIcon = (HICON)lParam;
+        infoPtr->part0.hIcon = hIcon;
         if (infoPtr->simple)
-            InvalidateRect(hwnd, &infoPtr->part0.bound, FALSE);
+            InvalidateRect(infoPtr->Self, &infoPtr->part0.bound, FALSE);
     } else {
-        if (infoPtr->parts[nPart].hIcon == (HICON)lParam) /* same as - no redraw */
+        if (infoPtr->parts[nPart].hIcon == hIcon) /* same as - no redraw */
             return TRUE;
 
-        infoPtr->parts[nPart].hIcon = (HICON)lParam;
+        infoPtr->parts[nPart].hIcon = hIcon;
         if (!(infoPtr->simple))
-            InvalidateRect(hwnd, &infoPtr->parts[nPart].bound, FALSE);
+            InvalidateRect(infoPtr->Self, &infoPtr->parts[nPart].bound, FALSE);
     }
     return TRUE;
@@ -603 +531 @@
 
 
-static LRESULT
-STATUSBAR_SetMinHeight (STATUSWINDOWINFO *infoPtr, HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-
-    TRACE("\n");
-    if (IsWindowVisible (hwnd)) {
-        HWND parent = GetParent (hwnd);
+static BOOL
+STATUSBAR_SetMinHeight (STATUSWINDOWINFO *infoPtr, INT height)
+{
+
+    TRACE("(height=%d)\n", height);
+    if (IsWindowVisible (infoPtr->Self)) {
         INT  width, x, y;
         RECT parent_rect;
 
-        GetClientRect (parent, &parent_rect);
-        infoPtr->height = (INT)wParam + VERT_BORDER;
+        GetClientRect (GetParent (infoPtr->Self), &parent_rect);
+        infoPtr->height = height + VERT_BORDER;
         width = parent_rect.right - parent_rect.left;
         x = parent_rect.left;
         y = parent_rect.bottom - infoPtr->height;
-        MoveWindow (hwnd, parent_rect.left,
+        MoveWindow (infoPtr->Self, parent_rect.left,
                       parent_rect.bottom - infoPtr->height,
                       width, infoPtr->height, TRUE);
-        STATUSBAR_SetPartBounds (infoPtr, hwnd);
+        STATUSBAR_SetPartBounds (infoPtr);
     }
 
@@ -628 +555 @@
 
 
-static LRESULT
-STATUSBAR_SetParts (STATUSWINDOWINFO *infoPtr, HWND hwnd, WPARAM wParam, LPARAM lParam)
+static BOOL
+STATUSBAR_SetParts (STATUSWINDOWINFO *infoPtr, INT count, LPINT parts)
 {
     STATUSWINDOWPART *tmp;
-    LPINT parts;
-    int i;
-    int oldNumParts;
-
-    TRACE("(%d,%p)\n",wParam,(LPVOID)lParam);
-
-    /* FIXME: should return FALSE sometimes (maybe when wParam == 0 ?) */
-    if (infoPtr->simple)
-        infoPtr->simple = FALSE;
+    int i, oldNumParts;
+
+    TRACE("(%d,%p)\n", count, parts);
 
     oldNumParts = infoPtr->numParts;
-    infoPtr->numParts = (INT) wParam;
-    parts = (LPINT) lParam;
+    infoPtr->numParts = count;
     if (oldNumParts > infoPtr->numParts) {
         for (i = infoPtr->numParts ; i < oldNumParts; i++) {
@@ -650 +570 @@
                 COMCTL32_Free (infoPtr->parts[i].text);
         }
-    }
-    if (oldNumParts < infoPtr->numParts) {
+    } else if (oldNumParts < infoPtr->numParts) {
         tmp = COMCTL32_Alloc (sizeof(STATUSWINDOWPART) * infoPtr->numParts);
+        if (!tmp) return FALSE;
         for (i = 0; i < oldNumParts; i++) {
             tmp[i] = infoPtr->parts[i];
@@ -661 +581 @@
     }
     if (oldNumParts == infoPtr->numParts) {
-        for (i=0;i<oldNumParts;i++)
+        for (i=0; i < oldNumParts; i++)
             if (infoPtr->parts[i].x != parts[i])
                 break;
@@ -672 +592 @@
 
     if (infoPtr->hwndToolTip) {
-        INT nTipCount =
-            SendMessageA (infoPtr->hwndToolTip, TTM_GETTOOLCOUNT, 0, 0);
-
+        INT nTipCount, i;
+        TTTOOLINFOW ti;
+
+        ZeroMemory (&ti, sizeof(TTTOOLINFOW));
+        ti.cbSize = sizeof(TTTOOLINFOW);
+        ti.hwnd = infoPtr->Self;
+
+        nTipCount = SendMessageW (infoPtr->hwndToolTip, TTM_GETTOOLCOUNT, 0, 0);
         if (nTipCount < infoPtr->numParts) {
             /* add tools */
-            TTTOOLINFOA ti;
-            INT i;
-
-            ZeroMemory (&ti, sizeof(TTTOOLINFOA));
-            ti.cbSize = sizeof(TTTOOLINFOA);
-            ti.hwnd = hwnd;
             for (i = nTipCount; i < infoPtr->numParts; i++) {
                 TRACE("add tool %d\n", i);
                 ti.uId = i;
-                SendMessageA (infoPtr->hwndToolTip, TTM_ADDTOOLA,
+                SendMessageW (infoPtr->hwndToolTip, TTM_ADDTOOLW,
                                 0, (LPARAM)&ti);
             }
@@ -692 +611 @@
         else if (nTipCount > infoPtr->numParts) {
             /* delete tools */
-            INT i;
-
             for (i = nTipCount - 1; i >= infoPtr->numParts; i--) {
-                FIXME("delete tool %d\n", i);
+                TRACE("delete tool %d\n", i);
+                ti.uId = i;
+                SendMessageW (infoPtr->hwndToolTip, TTM_DELTOOLW,
+                                0, (LPARAM)&ti);
             }
         }
     }
-    STATUSBAR_SetPartBounds (infoPtr, hwnd);
-    InvalidateRect(hwnd, NULL, FALSE);
+    STATUSBAR_SetPartBounds (infoPtr);
+    InvalidateRect(infoPtr->Self, NULL, FALSE);
     return TRUE;
 }
 
 
-static LRESULT
-STATUSBAR_SetTextA (STATUSWINDOWINFO *infoPtr, HWND hwnd, WPARAM wParam, LPARAM lParam)
+static BOOL
+STATUSBAR_SetTextT (STATUSWINDOWINFO *infoPtr, INT nPart, WORD style, 
+                    LPCWSTR text, BOOL isW)
 {
     STATUSWINDOWPART *part=NULL;
-    int nPart;
-    int style;
-    LPSTR text;
-    BOOL        changed = FALSE;
-
-    text = (LPSTR) lParam;
-    nPart = ((INT) wParam) & 0x00ff;
-    style = ((INT) wParam) & 0xff00;
-
-#ifdef __WIN32OS2__
+    BOOL changed = FALSE;
+
     if (style & SBT_OWNERDRAW) {    
          TRACE("part %d, text %x\n",nPart,text);
     }
-    else TRACE("part %d, text %s\n",nPart,debugstr_a(text));
-#else
-    TRACE("part %d, text %s\n",nPart,debugstr_a(text));
-#endif
-
-    if (nPart==255)
+    else TRACE("part %d, text %s\n", nPart, debugstr_t(text, isW));
+
+    /* MSDN says: "If the parameter is set to SB_SIMPLEID (255), the status
+     * window is assumed to be a simple window */
+
+    if (nPart == 0x00ff) {
         part = &infoPtr->part0;
-    else if (!infoPtr->simple && infoPtr->parts!=NULL)
-#ifdef __WIN32OS2__
-    {
-        if (nPart >= infoPtr->numParts)
-            return FALSE;
-        part = &infoPtr->parts[nPart];
-    }
-#else
-        part = &infoPtr->parts[nPart];
-#endif
+    } else {
+        if (infoPtr->parts && nPart >= 0 && nPart < infoPtr->numParts) {
+            part = &infoPtr->parts[nPart];
+        }
+    }
     if (!part) return FALSE;
 
@@ -746 +654 @@
     part->style = style;
     if (style & SBT_OWNERDRAW) {
-        if (part->text == (LPWSTR)text)
+        if (part->text == text)
             return TRUE;
         part->text = (LPWSTR)text;
@@ -752 +660 @@
         LPWSTR ntext;
 
+        if (text && !isW) {
+            LPCSTR atxt = (LPCSTR)text;
+            DWORD len = MultiByteToWideChar( CP_ACP, 0, atxt, -1, NULL, 0 );
+            ntext = COMCTL32_Alloc( (len + 1)*sizeof(WCHAR) );
+            if (!ntext) return FALSE;
+            MultiByteToWideChar( CP_ACP, 0, atxt, -1, ntext, len );
+        } else if (text) {
+            ntext = COMCTL32_Alloc( (strlenW(text) + 1)*sizeof(WCHAR) );
+            if (!ntext) return FALSE;
+            strcpyW (ntext, text);
+        } else ntext = 0;
+
         /* check if text is unchanged -> no need to redraw */
         if (text) {
-            DWORD len = MultiByteToWideChar( CP_ACP, 0, text, -1, NULL, 0 );
-            LPWSTR tmptext = COMCTL32_Alloc(len*sizeof(WCHAR));
-            MultiByteToWideChar( CP_ACP, 0, text, -1, tmptext, len );
-
-            if (!changed && part->text && !lstrcmpW(tmptext,part->text)) {
-                COMCTL32_Free(tmptext);
+            if (!changed && part->text && !lstrcmpW(ntext, part->text)) {
+                if (!isW) COMCTL32_Free(ntext);
                 return TRUE;
             }
-            ntext = tmptext;
         } else {
             if (!changed && !part->text) 
                 return TRUE;
-            ntext = 0;
         }
 
@@ -773 +687 @@
         part->text = ntext;
     }
-    InvalidateRect(hwnd, &part->bound, FALSE);
+    InvalidateRect(infoPtr->Self, &part->bound, FALSE);
 
     return TRUE;
@@ -780 +694 @@
 
 static LRESULT
-STATUSBAR_SetTextW (STATUSWINDOWINFO *infoPtr, HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    STATUSWINDOWPART *part;
-    INT  nPart, style, len;
-    LPWSTR text;
-    BOOL bRedraw = FALSE;
-
-    text = (LPWSTR) lParam;
-    nPart = ((INT) wParam) & 0x00ff;
-    style = ((INT) wParam) & 0xff00;
-
-    TRACE("part %d -> '%s' with style %04x\n", nPart, debugstr_w(text), style);
-    if ((infoPtr->simple) || (infoPtr->parts==NULL) || (nPart==255))
-        part = &infoPtr->part0;
-    else
-#ifdef __WIN32OS2__
-    {
-        if (nPart >= infoPtr->numParts)
-            return FALSE;
-        part = &infoPtr->parts[nPart];
-    }
-#else
-        part = &infoPtr->parts[nPart];
-#endif
-    if (!part) return FALSE;
-
-    if(part->style != style)
-        bRedraw = TRUE;
-
-    part->style = style;
-
-    /* FIXME: not sure how/if we can check for change in string with ownerdraw(remove this if we can't)... */
-    if (style & SBT_OWNERDRAW)
-    {
-        part->text = text;
-        bRedraw = TRUE;
-    } else if(!text)
-    {
-        if(part->text)
-        {
-            COMCTL32_Free(part->text);
-            bRedraw = TRUE;
-        }
-        part->text = 0;
-    } else if(!part->text || strcmpW(part->text, text)) /* see if the new string differs from the existing string */
-    {
-        if(part->text) COMCTL32_Free(part->text);
-
-        len = strlenW(text);
-        part->text = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
-        strcpyW(part->text, text);
-        bRedraw = TRUE;
-    }
-
-    if(bRedraw)
-        InvalidateRect(hwnd, &part->bound, FALSE);
-
-    return TRUE;
-}
-
-
-static LRESULT
-STATUSBAR_SetTipTextA (STATUSWINDOWINFO *infoPtr, HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    TRACE("part %d: \"%s\"\n", (INT)wParam, (LPSTR)lParam);
+STATUSBAR_SetTipTextA (STATUSWINDOWINFO *infoPtr, INT id, LPSTR text)
+{
+    TRACE("part %d: \"%s\"\n", id, text);
     if (infoPtr->hwndToolTip) {
         TTTOOLINFOA ti;
         ti.cbSize = sizeof(TTTOOLINFOA);
-        ti.hwnd = hwnd;
-        ti.uId = (INT)wParam;
+        ti.hwnd = infoPtr->Self;
+        ti.uId = id;
         ti.hinst = 0;
-        ti.lpszText = (LPSTR)lParam;
+        ti.lpszText = text;
         SendMessageA (infoPtr->hwndToolTip, TTM_UPDATETIPTEXTA,
                         0, (LPARAM)&ti);
@@ -861 +713 @@
 
 static LRESULT
-STATUSBAR_SetTipTextW (STATUSWINDOWINFO *infoPtr, HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    TRACE("part %d: \"%s\"\n", (INT)wParam, (LPSTR)lParam);
+STATUSBAR_SetTipTextW (STATUSWINDOWINFO *infoPtr, INT id, LPWSTR text)
+{
+    TRACE("part %d: \"%s\"\n", id, debugstr_w(text));
     if (infoPtr->hwndToolTip) {
         TTTOOLINFOW ti;
         ti.cbSize = sizeof(TTTOOLINFOW);
-        ti.hwnd = hwnd;
-        ti.uId = (INT)wParam;
+        ti.hwnd = infoPtr->Self;
+        ti.uId = id;
         ti.hinst = 0;
-        ti.lpszText = (LPWSTR)lParam;
+        ti.lpszText = text;
         SendMessageW (infoPtr->hwndToolTip, TTM_UPDATETIPTEXTW,
                         0, (LPARAM)&ti);
@@ -880 +732 @@
 
 inline static LRESULT
-STATUSBAR_SetUnicodeFormat (STATUSWINDOWINFO *infoPtr, HWND hwnd, WPARAM wParam)
+STATUSBAR_SetUnicodeFormat (STATUSWINDOWINFO *infoPtr, BOOL bUnicode)
 {
     BOOL bOld = infoPtr->bUnicode;
 
-    TRACE("(0x%x)\n", (BOOL)wParam);
-    infoPtr->bUnicode = (BOOL)wParam;
+    TRACE("(0x%x)\n", bUnicode);
+    infoPtr->bUnicode = bUnicode;
 
     return bOld;
@@ -891 +743 @@
 
 
-static LRESULT
-STATUSBAR_Simple (STATUSWINDOWINFO *infoPtr, HWND hwnd, WPARAM wParam, LPARAM lParam)
+static BOOL
+STATUSBAR_Simple (STATUSWINDOWINFO *infoPtr, BOOL simple)
 {
     NMHDR  nmhdr;
 
-    TRACE("(is simple: %d)\n", wParam);
-    if (infoPtr->simple == wParam) /* no need to change */
+    TRACE("(simple=%d)\n", simple);
+    if (infoPtr->simple == simple) /* no need to change */
         return TRUE;
 
-    infoPtr->simple = (BOOL)wParam;
+    infoPtr->simple = simple;
 
     /* send notification */
-    nmhdr.hwndFrom = hwnd;
-    nmhdr.idFrom = GetWindowLongA (hwnd, GWL_ID);
+    nmhdr.hwndFrom = infoPtr->Self;
+    nmhdr.idFrom = GetWindowLongW (infoPtr->Self, GWL_ID);
     nmhdr.code = SBN_SIMPLEMODECHANGE;
-    SendMessageA (GetParent (hwnd), WM_NOTIFY, 0, (LPARAM)&nmhdr);
-    InvalidateRect(hwnd, NULL, FALSE);
+    SendMessageW (GetParent (infoPtr->Self), WM_NOTIFY, 0, (LPARAM)&nmhdr);
+    InvalidateRect(infoPtr->Self, NULL, FALSE);
     return TRUE;
 }
@@ -913 +765 @@
 
 static LRESULT
-STATUSBAR_WMCreate (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    LPCREATESTRUCTA lpCreate = (LPCREATESTRUCTA)lParam;
-    NONCLIENTMETRICSA nclm;
+STATUSBAR_WMDestroy (STATUSWINDOWINFO *infoPtr)
+{
+    int i;
+
+    TRACE("\n");
+    for (i = 0; i < infoPtr->numParts; i++) {
+        if (infoPtr->parts[i].text && !(infoPtr->parts[i].style & SBT_OWNERDRAW))
+            COMCTL32_Free (infoPtr->parts[i].text);
+    }
+    if (infoPtr->part0.text && !(infoPtr->part0.style & SBT_OWNERDRAW))
+        COMCTL32_Free (infoPtr->part0.text);
+    COMCTL32_Free (infoPtr->parts);
+
+    /* delete default font */
+    if (infoPtr->hDefaultFont)
+        DeleteObject (infoPtr->hDefaultFont);
+
+    /* delete tool tip control */
+    if (infoPtr->hwndToolTip)
+        DestroyWindow (infoPtr->hwndToolTip);
+
+    COMCTL32_Free (infoPtr);
+    SetWindowLongW(infoPtr->Self, 0, 0);
+    return 0;
+}
+
+
+static LRESULT
+STATUSBAR_WMCreate (HWND hwnd, LPCREATESTRUCTA lpCreate)
+{
+    STATUSWINDOWINFO *infoPtr;
+    NONCLIENTMETRICSW nclm;
     DWORD dwStyle;
-    RECT        rect;
-    int         width, len;
+    RECT rect;
+    int i, width, len, textHeight = 0;
     HDC hdc;
-    STATUSWINDOWINFO *infoPtr;
 
     TRACE("\n");
-#ifdef __WIN32OS2__
-    infoPtr = (STATUSWINDOWINFO*)initControl(hwnd,sizeof(STATUSWINDOWINFO));
-#else
     infoPtr = (STATUSWINDOWINFO*)COMCTL32_Alloc (sizeof(STATUSWINDOWINFO));
-#endif
-    SetWindowLongA (hwnd, 0, (DWORD)infoPtr);
-
-    infoPtr->hwndParent = lpCreate->hwndParent;
+    if (!infoPtr) goto create_fail;
+    SetWindowLongW (hwnd, 0, (DWORD)infoPtr);
+
+    infoPtr->Self = hwnd;
     infoPtr->numParts = 1;
     infoPtr->parts = 0;
@@ -938 +814 @@
     infoPtr->hFont = 0;
 
-    /* TODO: send unicode parent notification query (WM_QUERYFORMAT) here */
+    i = SendMessageW(GetParent (hwnd), WM_NOTIFYFORMAT, hwnd, NF_QUERY);
+    infoPtr->NtfUnicode = (i == NFR_UNICODE);
 
     GetClientRect (hwnd, &rect);
@@ -944 +821 @@
     UpdateWindow(hwnd);
 
-    nclm.cbSize = sizeof(NONCLIENTMETRICSA);
-    SystemParametersInfoA (SPI_GETNONCLIENTMETRICS, nclm.cbSize, &nclm, 0);
-    infoPtr->hDefaultFont = CreateFontIndirectA (&nclm.lfStatusFont);
+    ZeroMemory (&nclm, sizeof(nclm));
+    nclm.cbSize = sizeof(nclm);
+    SystemParametersInfoW (SPI_GETNONCLIENTMETRICS, nclm.cbSize, &nclm, 0);
+    infoPtr->hDefaultFont = CreateFontIndirectW (&nclm.lfStatusFont);
 
     /* initialize simple case */
@@ -957 +835 @@
     /* initialize first part */
     infoPtr->parts = COMCTL32_Alloc (sizeof(STATUSWINDOWPART));
+    if (!infoPtr->parts) goto create_fail;
     infoPtr->parts[0].bound = rect;
     infoPtr->parts[0].text = 0;
@@ -968 +847 @@
             (len = strlenW ((LPCWSTR)lpCreate->lpszName))) {
             infoPtr->parts[0].text = COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
+            if (!infoPtr->parts[0].text) goto create_fail;
             strcpyW (infoPtr->parts[0].text, (LPCWSTR)lpCreate->lpszName);
         }
@@ -976 +856 @@
             DWORD lenW = MultiByteToWideChar( CP_ACP, 0, (LPCSTR)lpCreate->lpszName, -1, NULL, 0 );
             infoPtr->parts[0].text = COMCTL32_Alloc (lenW*sizeof(WCHAR));
+            if (!infoPtr->parts[0].text) goto create_fail;
             MultiByteToWideChar( CP_ACP, 0, (LPCSTR)lpCreate->lpszName, -1,
                                  infoPtr->parts[0].text, lenW );
@@ -981 +862 @@
     }
 
-    dwStyle = GetWindowLongA(hwnd, GWL_STYLE);
+    dwStyle = GetWindowLongW (hwnd, GWL_STYLE);
 
 #ifndef __WIN32OS2__
     /* statusbars on managed windows should not have SIZEGRIP style */
     if ((dwStyle & SBARS_SIZEGRIP) && lpCreate->hwndParent)
-        if (GetWindowLongA(lpCreate->hwndParent, GWL_EXSTYLE) & WS_EX_MANAGED)
-            SetWindowLongA (hwnd, GWL_STYLE, dwStyle & ~SBARS_SIZEGRIP);
+        if (GetWindowLongW (lpCreate->hwndParent, GWL_EXSTYLE) & WS_EX_MANAGED)
+            SetWindowLongW (hwnd, GWL_STYLE, dwStyle & ~SBARS_SIZEGRIP);
 #endif
+
     if ((hdc = GetDC (0))) {
-        TEXTMETRICA tm;
+        TEXTMETRICW tm;
         HFONT hOldFont;
 
-        hOldFont = SelectObject (hdc,infoPtr->hDefaultFont);
-        GetTextMetricsA(hdc, &tm);
-        infoPtr->textHeight = tm.tmHeight;
+        hOldFont = SelectObject (hdc, infoPtr->hDefaultFont);
+        GetTextMetricsW (hdc, &tm);
+        textHeight = tm.tmHeight;
         SelectObject (hdc, hOldFont);
-        ReleaseDC(0, hdc);
-    }
+        ReleaseDC (0, hdc);
+    }
+    TRACE("    textHeight=%d\n", textHeight);
 
     if (dwStyle & SBT_TOOLTIPS) {
         infoPtr->hwndToolTip =
-            CreateWindowExA (0, TOOLTIPS_CLASSA, NULL, 0,
+            CreateWindowExW (0, TOOLTIPS_CLASSW, NULL, 0,
                                CW_USEDEFAULT, CW_USEDEFAULT,
                                CW_USEDEFAULT, CW_USEDEFAULT,
                              hwnd, 0,
-                             GetWindowLongA (hwnd, GWL_HINSTANCE), NULL);
+                             GetWindowLongW (hwnd, GWL_HINSTANCE), NULL);
 
         if (infoPtr->hwndToolTip) {
@@ -1012 +895 @@
 
             nmttc.hdr.hwndFrom = hwnd;
-            nmttc.hdr.idFrom = GetWindowLongA (hwnd, GWL_ID);
+            nmttc.hdr.idFrom = GetWindowLongW (hwnd, GWL_ID);
             nmttc.hdr.code = NM_TOOLTIPSCREATED;
             nmttc.hwndToolTips = infoPtr->hwndToolTip;
 
-            SendMessageA (lpCreate->hwndParent, WM_NOTIFY,
+            SendMessageW (lpCreate->hwndParent, WM_NOTIFY,
                             (WPARAM)nmttc.hdr.idFrom, (LPARAM)&nmttc);
-        }
-    }
-
-    if (!dwStyle & CCS_NORESIZE) /* don't resize wnd if it doesn't want it ! */
-    {
+        } 
+    }
+
+    if (!(dwStyle & CCS_NORESIZE)) { /* don't resize wnd if it doesn't want it ! */
         GetClientRect (GetParent (hwnd), &rect);
         width = rect.right - rect.left;
-        infoPtr->height = infoPtr->textHeight + 4 + VERT_BORDER;
+        infoPtr->height = textHeight + 4 + VERT_BORDER;
         SetWindowPos(hwnd, 0, lpCreate->x, lpCreate->y - 1,
                         width, infoPtr->height, SWP_NOZORDER);
-        STATUSBAR_SetPartBounds (infoPtr, hwnd);
+        STATUSBAR_SetPartBounds (infoPtr);
     }
 
     return 0;
-}
-
-
-static LRESULT
-STATUSBAR_WMDestroy (STATUSWINDOWINFO *infoPtr, HWND hwnd)
-{
-    int i;
-
-    TRACE("\n");
-    for (i = 0; i < infoPtr->numParts; i++) {
-        if (infoPtr->parts[i].text && !(infoPtr->parts[i].style & SBT_OWNERDRAW))
-            COMCTL32_Free (infoPtr->parts[i].text);
-    }
-    if (infoPtr->part0.text && !(infoPtr->part0.style & SBT_OWNERDRAW))
-        COMCTL32_Free (infoPtr->part0.text);
-    COMCTL32_Free (infoPtr->parts);
-
-    /* delete default font */
-    if (infoPtr->hDefaultFont)
-        DeleteObject (infoPtr->hDefaultFont);
-
-    /* delete tool tip control */
-    if (infoPtr->hwndToolTip)
-        DestroyWindow (infoPtr->hwndToolTip);
-
-    COMCTL32_Free (infoPtr);
-    SetWindowLongA(hwnd, 0, 0);
-    return 0;
-}
-
-
-static inline LRESULT
-STATUSBAR_WMGetFont (STATUSWINDOWINFO *infoPtr, HWND hwnd)
-{
-    TRACE("\n");
-    return infoPtr->hFont? infoPtr->hFont : infoPtr->hDefaultFont;
+    
+create_fail:
+    TRACE("    failed!\n");
+    if (infoPtr) STATUSBAR_WMDestroy(infoPtr);
+    return -1;
 }
 
@@ -1073 +924 @@
 /* in contrast to SB_GETTEXT*, WM_GETTEXT handles the text
  * of the first part only (usual behaviour) */
-static LRESULT
-STATUSBAR_WMGetText (STATUSWINDOWINFO *infoPtr, HWND hwnd, WPARAM wParam, LPARAM lParam)
+static INT
+STATUSBAR_WMGetText (STATUSWINDOWINFO *infoPtr, INT size, LPWSTR buf)
 {
     INT len;
@@ -1086 +937 @@
         len = WideCharToMultiByte( CP_ACP, 0, infoPtr->parts[0].text, -1, NULL, 0, NULL, NULL )-1;
 
-    if (wParam > len) {
+    if (size > len) {
         if (infoPtr->bUnicode)
-            strcpyW ((LPWSTR)lParam, infoPtr->parts[0].text);
+            strcpyW (buf, infoPtr->parts[0].text);
         else
             WideCharToMultiByte( CP_ACP, 0, infoPtr->parts[0].text, -1,
-                                 (LPSTR)lParam, len+1, NULL, NULL );
+                                 (LPSTR)buf, len+1, NULL, NULL );
         return len;
     }
@@ -1099 +950 @@
 
 
-inline static LRESULT
-STATUSBAR_WMMouseMove (STATUSWINDOWINFO *infoPtr, HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    if (infoPtr->hwndToolTip)
-        STATUSBAR_RelayEvent (infoPtr->hwndToolTip, hwnd,
-                              WM_MOUSEMOVE, wParam, lParam);
-    return 0;
-}
-
-
-static LRESULT
-STATUSBAR_WMNCHitTest (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    if (GetWindowLongA (hwnd, GWL_STYLE) & SBARS_SIZEGRIP) {
+static BOOL
+STATUSBAR_WMNCHitTest (STATUSWINDOWINFO *infoPtr, INT x, INT y)
+{
+    if (GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP) {
         RECT  rect;
         POINT pt;
 
-        GetClientRect (hwnd, &rect);
-
-        pt.x = (INT)LOWORD(lParam);
-        pt.y = (INT)HIWORD(lParam);
-        ScreenToClient (hwnd, &pt);
+        GetClientRect (infoPtr->Self, &rect);
+
+        pt.x = x;
+        pt.y = y;
+        ScreenToClient (infoPtr->Self, &pt);
 
         rect.left = rect.right - 13;
@@ -1129 +970 @@
     }
 
-    /* FIXME: instead check result in StatusWindowProc and call if needed ? */
-    return DefWindowProcA (hwnd, WM_NCHITTEST, wParam, lParam);
-}
-
-
-static inline LRESULT
-STATUSBAR_WMNCLButtonDown (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
+    return HTERROR;
+}
+
+
+static LRESULT
+STATUSBAR_WMPaint (STATUSWINDOWINFO *infoPtr, HDC hdc)
+{
+    PAINTSTRUCT ps;
+
     TRACE("\n");
-    PostMessageA (GetParent (hwnd), WM_NCLBUTTONDOWN, wParam, lParam);
+    if (hdc) return STATUSBAR_Refresh (infoPtr, hdc);
+    hdc = BeginPaint (infoPtr->Self, &ps);
+    STATUSBAR_Refresh (infoPtr, hdc);
+    EndPaint (infoPtr->Self, &ps);
+
     return 0;
 }
 
 
-static inline LRESULT
-STATUSBAR_WMNCLButtonUp (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    TRACE("\n");
-    PostMessageA (GetParent (hwnd), WM_NCLBUTTONUP, wParam, lParam);
+static LRESULT
+STATUSBAR_WMSetFont (STATUSWINDOWINFO *infoPtr, HFONT font, BOOL redraw)
+{
+    infoPtr->hFont = font;
+    TRACE("%04x\n", infoPtr->hFont);
+    if (redraw)
+        InvalidateRect(infoPtr->Self, NULL, FALSE);
+
     return 0;
 }
 
 
-static LRESULT
-STATUSBAR_WMPaint (STATUSWINDOWINFO *infoPtr, HWND hwnd, WPARAM wParam)
-{
-    HDC hdc;
-    PAINTSTRUCT ps;
-
-    TRACE("\n");
-    hdc = wParam==0 ? BeginPaint (hwnd, &ps) : (HDC)wParam;
-    STATUSBAR_Refresh (infoPtr, hwnd, hdc);
-    if (!wParam)
-        EndPaint (hwnd, &ps);
-
-    return 0;
-}
-
-
-static LRESULT
-STATUSBAR_WMSetFont (STATUSWINDOWINFO *infoPtr, HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    infoPtr->hFont = (HFONT)wParam;
-    TRACE("%04x\n", infoPtr->hFont);
-#ifdef __WIN32OS2__
-    if (LOWORD(lParam) == TRUE)
-    {
-      HDC hdc = GetDC (hwnd);
-      TEXTMETRICA tm;
-      HFONT hOldFont;
-
-      hOldFont = SelectObject(hdc,infoPtr->hFont);
-      GetTextMetricsA(hdc,&tm);
-      infoPtr->textHeight = tm.tmHeight+tm.tmExternalLeading;
-      SelectObject(hdc,hOldFont);
-
-      //CB: todo: move window
-
-      STATUSBAR_Refresh (infoPtr, hwnd, hdc);
-      ReleaseDC (hwnd, hdc);
-    }
-#else
-    if (LOWORD(lParam) == TRUE)
-        InvalidateRect(hwnd, NULL, FALSE);
-#endif
-
-    return 0;
-}
-
-
-static LRESULT
-STATUSBAR_WMSetText (STATUSWINDOWINFO *infoPtr, HWND hwnd, WPARAM wParam, LPARAM lParam)
+static BOOL
+STATUSBAR_WMSetText (STATUSWINDOWINFO *infoPtr, LPCSTR text)
 {
     STATUSWINDOWPART *part;
@@ -1215 +1017 @@
     part->text = 0;
     if (infoPtr->bUnicode) {
-        if (lParam && (len = strlenW((LPCWSTR)lParam))) {
+        if (text && (len = strlenW((LPCWSTR)text))) {
             part->text = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
-            strcpyW (part->text, (LPCWSTR)lParam);
+            if (!part->text) return FALSE;
+            strcpyW (part->text, (LPCWSTR)text);
         }
     }
     else {
-        if (lParam && (len = lstrlenA((LPCSTR)lParam))) {
-            DWORD lenW = MultiByteToWideChar( CP_ACP, 0, (LPCSTR)lParam, -1, NULL, 0 );
+        if (text && (len = lstrlenA(text))) {
+            DWORD lenW = MultiByteToWideChar( CP_ACP, 0, text, -1, NULL, 0 );
             part->text = COMCTL32_Alloc (lenW*sizeof(WCHAR));
-            MultiByteToWideChar( CP_ACP, 0, (LPCSTR)lParam, -1, part->text, lenW );
+            if (!part->text) return FALSE;
+            MultiByteToWideChar( CP_ACP, 0, text, -1, part->text, lenW );
         }
     }
 
-    InvalidateRect(hwnd, &part->bound, FALSE);
+    InvalidateRect(infoPtr->Self, &part->bound, FALSE);
 
     return TRUE;
@@ -1234 +1038 @@
 
 
-static LRESULT
-STATUSBAR_WMSize (STATUSWINDOWINFO *infoPtr, HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    INT  width, x, y, flags;
+static BOOL
+STATUSBAR_WMSize (STATUSWINDOWINFO *infoPtr, WORD flags)
+{
+    INT  width, x, y;
     RECT parent_rect;
-    DWORD dwStyle;
 
     /* Need to resize width to match parent */
-    flags = (INT) wParam;
-
     TRACE("flags %04x\n", flags);
-    /* FIXME for flags =
-     * SIZE_MAXIMIZED, SIZE_MAXSHOW, SIZE_MINIMIZED, SIZE_RESTORED
-     */
-
-    dwStyle = GetWindowLongA(hwnd, GWL_STYLE);
-    if (!dwStyle & CCS_NORESIZE) /* don't resize wnd if it doesn't want it ! */
-    {
-        if (flags == SIZE_RESTORED) {
-            /* width and height don't apply */
-            GetClientRect (infoPtr->hwndParent, &parent_rect);
-            width = parent_rect.right - parent_rect.left;
-            x = parent_rect.left;
-            y = parent_rect.bottom - infoPtr->height;
-            MoveWindow (hwnd, parent_rect.left, 
-                      parent_rect.bottom - infoPtr->height,
-                      width, infoPtr->height, TRUE);
-            STATUSBAR_SetPartBounds (infoPtr, hwnd);
-        }
-        return 0; /* FIXME: ok to return here ? */
-    }
-
-    /* FIXME: instead check result in StatusWindowProc and call if needed ? */
-    return DefWindowProcA (hwnd, WM_SIZE, wParam, lParam);
+
+    if (flags != SIZE_RESTORED) {
+        WARN("flags MUST be SIZE_RESTORED\n");
+        return FALSE;
+    }
+    if (GetWindowLongW(infoPtr->Self, GWL_STYLE) & CCS_NORESIZE) return FALSE;
+    
+    /* width and height don't apply */
+    GetClientRect (GetParent(infoPtr->Self), &parent_rect);
+    width = parent_rect.right - parent_rect.left;
+    x = parent_rect.left;
+    y = parent_rect.bottom - infoPtr->height;
+    MoveWindow (infoPtr->Self, parent_rect.left, 
+                parent_rect.bottom - infoPtr->height,
+                width, infoPtr->height, TRUE);
+    STATUSBAR_SetPartBounds (infoPtr);
+    return TRUE;
+}
+
+
+static LRESULT 
+STATUSBAR_NotifyFormat (STATUSWINDOWINFO *infoPtr, HWND from, INT cmd)
+{
+    if (cmd == NF_REQUERY) {
+        INT i = SendMessageW(from, WM_NOTIFYFORMAT, infoPtr->Self, NF_QUERY);
+        infoPtr->NtfUnicode = (i == NFR_UNICODE);
+    }
+    return infoPtr->NtfUnicode ? NFR_UNICODE : NFR_ANSI;
 }
 
@@ -1278 +1084 @@
     TRACE("code %04x\n", code);
     nmhdr.hwndFrom = hwnd;
-    nmhdr.idFrom = GetWindowLongA (hwnd, GWL_ID);
+    nmhdr.idFrom = GetWindowLongW (hwnd, GWL_ID);
     nmhdr.code = code;
-    SendMessageA (GetParent (hwnd), WM_NOTIFY, 0, (LPARAM)&nmhdr);
+    SendMessageW (GetParent (hwnd), WM_NOTIFY, 0, (LPARAM)&nmhdr);
     return 0;
 }
@@ -1290 +1096 @@
 {
     STATUSWINDOWINFO *infoPtr = STATUSBAR_GetInfoPtr(hwnd);
+    INT nPart = ((INT) wParam) & 0x00ff;
+    LRESULT res;
 
     TRACE("hwnd=%x msg=%x wparam=%x lparam=%lx\n", hwnd, msg, wParam, lParam);
-    if (!(infoPtr) && (msg != WM_CREATE))
-        return DefWindowProcA (hwnd, msg, wParam, lParam);
+    if (!infoPtr && msg != WM_CREATE)
+        return DefWindowProcW (hwnd, msg, wParam, lParam);
 
     switch (msg) {
         case SB_GETBORDERS:
-            return STATUSBAR_GetBorders (lParam);
+            return STATUSBAR_GetBorders ((INT *)lParam);
 
         case SB_GETICON:
-            return STATUSBAR_GetIcon (infoPtr, hwnd, wParam);
+            return STATUSBAR_GetIcon (infoPtr, nPart);
 
         case SB_GETPARTS:
-            return STATUSBAR_GetParts (infoPtr, hwnd, wParam, lParam);
+            return STATUSBAR_GetParts (infoPtr, (INT)wParam, (INT *)lParam);
 
         case SB_GETRECT:
-            return STATUSBAR_GetRect (infoPtr, hwnd, wParam, lParam);
+            return STATUSBAR_GetRect (infoPtr, nPart, (LPRECT)lParam);
 
         case SB_GETTEXTA:
-            return STATUSBAR_GetTextA (infoPtr, hwnd, wParam, lParam);
+            return STATUSBAR_GetTextA (infoPtr, nPart, (LPSTR)lParam);
 
         case SB_GETTEXTW:
-            return STATUSBAR_GetTextW (infoPtr, hwnd, wParam, lParam);
+            return STATUSBAR_GetTextW (infoPtr, nPart, (LPWSTR)lParam);
 
         case SB_GETTEXTLENGTHA:
         case SB_GETTEXTLENGTHW:
-            return STATUSBAR_GetTextLength (infoPtr, hwnd, wParam);
+            return STATUSBAR_GetTextLength (infoPtr, nPart);
 
         case SB_GETTIPTEXTA:
-            return STATUSBAR_GetTipTextA (infoPtr, hwnd, wParam, lParam);
+            return STATUSBAR_GetTipTextA (infoPtr,  LOWORD(wParam), (LPSTR)lParam,  HIWORD(wParam));
 
         case SB_GETTIPTEXTW:
-            return STATUSBAR_GetTipTextW (infoPtr, hwnd, wParam, lParam);
+            return STATUSBAR_GetTipTextW (infoPtr,  LOWORD(wParam), (LPWSTR)lParam,  HIWORD(wParam));
 
         case SB_GETUNICODEFORMAT:
-            return STATUSBAR_GetUnicodeFormat (infoPtr, hwnd);
+            return infoPtr->bUnicode;
 
         case SB_ISSIMPLE:
-            return STATUSBAR_IsSimple (infoPtr, hwnd);
+            return infoPtr->simple;
 
         case SB_SETBKCOLOR:
-            return STATUSBAR_SetBkColor (infoPtr, hwnd, wParam, lParam);
+            return STATUSBAR_SetBkColor (infoPtr, (COLORREF)lParam);
 
         case SB_SETICON:
-            return STATUSBAR_SetIcon (infoPtr, hwnd, wParam, lParam);
+            return STATUSBAR_SetIcon (infoPtr, nPart, (HICON)lParam);
 
         case SB_SETMINHEIGHT:
-            return STATUSBAR_SetMinHeight (infoPtr, hwnd, wParam, lParam);
+            return STATUSBAR_SetMinHeight (infoPtr, (INT)wParam);
 
         case SB_SETPARTS:       
-            return STATUSBAR_SetParts (infoPtr, hwnd, wParam, lParam);
+            return STATUSBAR_SetParts (infoPtr, (INT)wParam, (LPINT)lParam);
 
         case SB_SETTEXTA:
-            return STATUSBAR_SetTextA (infoPtr, hwnd, wParam, lParam);
+            return STATUSBAR_SetTextT (infoPtr, nPart, wParam & 0xff00, (LPCWSTR)lParam, FALSE);
 
         case SB_SETTEXTW:
-            return STATUSBAR_SetTextW (infoPtr, hwnd, wParam, lParam);
+            return STATUSBAR_SetTextT (infoPtr, nPart, wParam & 0xff00, (LPCWSTR)lParam, TRUE);
 
         case SB_SETTIPTEXTA:
-            return STATUSBAR_SetTipTextA (infoPtr, hwnd, wParam, lParam);
+            return STATUSBAR_SetTipTextA (infoPtr, (INT)wParam, (LPSTR)lParam);
 
         case SB_SETTIPTEXTW:
-            return STATUSBAR_SetTipTextW (infoPtr, hwnd, wParam, lParam);
+            return STATUSBAR_SetTipTextW (infoPtr, (INT)wParam, (LPWSTR)lParam);
 
         case SB_SETUNICODEFORMAT:
-            return STATUSBAR_SetUnicodeFormat (infoPtr, hwnd, wParam);
+            return STATUSBAR_SetUnicodeFormat (infoPtr, (BOOL)wParam);
 
         case SB_SIMPLE:
-            return STATUSBAR_Simple (infoPtr, hwnd, wParam, lParam);
-
+            return STATUSBAR_Simple (infoPtr, (BOOL)wParam);
 
         case WM_CREATE:
-            return STATUSBAR_WMCreate (hwnd, wParam, lParam);
+            return STATUSBAR_WMCreate (hwnd, (LPCREATESTRUCTA)lParam);
 
         case WM_DESTROY:
-            return STATUSBAR_WMDestroy (infoPtr, hwnd);
+            return STATUSBAR_WMDestroy (infoPtr);
 
         case WM_GETFONT:
-            return STATUSBAR_WMGetFont (infoPtr, hwnd);
+            return infoPtr->hFont? infoPtr->hFont : infoPtr->hDefaultFont;
 
         case WM_GETTEXT:
-            return STATUSBAR_WMGetText (infoPtr, hwnd, wParam, lParam);
+            return STATUSBAR_WMGetText (infoPtr, (INT)wParam, (LPWSTR)lParam);
 
         case WM_GETTEXTLENGTH:
-            return STATUSBAR_GetTextLength (infoPtr, hwnd, 0);
+            return STATUSBAR_GetTextLength (infoPtr, 0);
 
         case WM_LBUTTONDBLCLK:
@@ -1383 +1190 @@
 
         case WM_MOUSEMOVE:
-            return STATUSBAR_WMMouseMove (infoPtr, hwnd, wParam, lParam);
+            return STATUSBAR_Relay2Tip (infoPtr, msg, wParam, lParam);
 
         case WM_NCHITTEST:
-            return STATUSBAR_WMNCHitTest (hwnd, wParam, lParam);
-
+            res = STATUSBAR_WMNCHitTest(infoPtr, (INT)LOWORD(lParam),
+                                        (INT)HIWORD(lParam));
+            if (res != HTERROR) return res;
+            return DefWindowProcW (hwnd, msg, wParam, lParam);
+
+        case WM_NCLBUTTONUP:
         case WM_NCLBUTTONDOWN:
-            return STATUSBAR_WMNCLButtonDown (hwnd, wParam, lParam);
-
-        case WM_NCLBUTTONUP:
-            return STATUSBAR_WMNCLButtonUp (hwnd, wParam, lParam);
-
+            PostMessageW (GetParent (hwnd), msg, wParam, lParam);
+            return 0;
+
+        case WM_NOTIFYFORMAT:
+            return STATUSBAR_NotifyFormat(infoPtr, (HWND)wParam, (INT)lParam);
+            
         case WM_PAINT:
-            return STATUSBAR_WMPaint (infoPtr, hwnd, wParam);
+            return STATUSBAR_WMPaint (infoPtr, (HDC)wParam);
 
         case WM_RBUTTONDBLCLK:
@@ -1404 +1216 @@
 
         case WM_SETFONT:
-            return STATUSBAR_WMSetFont (infoPtr, hwnd, wParam, lParam);
+            return STATUSBAR_WMSetFont (infoPtr, (HFONT)wParam, LOWORD(lParam));
 
         case WM_SETTEXT:
-            return STATUSBAR_WMSetText (infoPtr, hwnd, wParam, lParam);
+            return STATUSBAR_WMSetText (infoPtr, (LPCSTR)lParam);
 
         case WM_SIZE:
-            return STATUSBAR_WMSize (infoPtr, hwnd, wParam, lParam);
+            if (STATUSBAR_WMSize (infoPtr, (WORD)wParam)) return 0;
+            return DefWindowProcW (hwnd, msg, wParam, lParam);
 
         default:
@@ -1416 +1229 @@
                 ERR("unknown msg %04x wp=%04x lp=%08lx\n",
                      msg, wParam, lParam);
-#ifdef __WIN32OS2__
-            return defComCtl32ProcA (hwnd, msg, wParam, lParam);
-#else
-            return DefWindowProcA (hwnd, msg, wParam, lParam);
-#endif
+            return DefWindowProcW (hwnd, msg, wParam, lParam);
     }
     return 0;
@@ -1432 +1241 @@
  */
 
-VOID
+void
 STATUS_Register (void)
 {
-    WNDCLASSA wndClass;
-
-    ZeroMemory (&wndClass, sizeof(WNDCLASSA));
+    WNDCLASSW wndClass;
+
+    ZeroMemory (&wndClass, sizeof(WNDCLASSW));
     wndClass.style         = CS_GLOBALCLASS | CS_DBLCLKS | CS_VREDRAW;
     wndClass.lpfnWndProc   = (WNDPROC)StatusWindowProc;
     wndClass.cbClsExtra    = 0;
     wndClass.cbWndExtra    = sizeof(STATUSWINDOWINFO *);
-    wndClass.hCursor       = LoadCursorA (0, IDC_ARROWA);
+    wndClass.hCursor       = LoadCursorW (0, IDC_ARROWW);
     wndClass.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1);
-    wndClass.lpszClassName = STATUSCLASSNAMEA;
+    wndClass.lpszClassName = STATUSCLASSNAMEW;
  
-    RegisterClassA (&wndClass);
+    RegisterClassW (&wndClass);
 }
 
@@ -1456 +1265 @@
  */
 
-VOID
+void
 STATUS_Unregister (void)
 {
-    UnregisterClassA (STATUSCLASSNAMEA, (HINSTANCE)NULL);
-}
-
+    UnregisterClassW (STATUSCLASSNAMEW, (HINSTANCE)NULL);
+}
+