- Check for valid part nr in STATUSBAR_GetTextLength.

- TRACE fix in STATUSBAR_SetTextT; SBT_OWNERDRAW pointer isn't always a string pointer.

- Check for valid part nr in STATUSBAR_GetTextLength.
bbee7ec7 · Sander van Leeuwen · Alexandre Julliard · e656fc1c · bbee7ec7
Commit bbee7ec7 authored May 29, 2002 by Sander van Leeuwen Committed by Alexandre Julliard May 29, 2002
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

status.c dlls/comctl32/status.c +8 -1

No files found.
--- a/dlls/comctl32/status.c
+++ b/dlls/comctl32/status.c
@@ -426,6 +426,10 @@ STATUSBAR_GetTextLength (STATUSWINDOWINFO *infoPtr, INT nPart)
    DWORD result;

    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
@@ -627,7 +631,10 @@ STATUSBAR_SetTextT (STATUSWINDOWINFO *infoPtr, INT nPart, WORD style,
    STATUSWINDOWPART *part=NULL;
    BOOL changed = FALSE;

-    TRACE("part %d, text %s\n", nPart, debugstr_t(text, isW));
+    if (style & SBT_OWNERDRAW) {    
+         TRACE("part %d, text %x\n",nPart,text);
+    }
+    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 */