- Check for valid part nr in STATUSBAR_GetTextLength.

- TRACE fix in STATUSBAR_SetTextT; SBT_OWNERDRAW pointer isn't always
  a string pointer.
This commit is contained in:
Sander van Leeuwen 2002-05-29 19:08:18 +00:00 committed by Alexandre Julliard
parent e656fc1cd6
commit bbee7ec711
1 changed files with 8 additions and 1 deletions

View File

@ -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 */