- 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:
parent
e656fc1cd6
commit
bbee7ec711
|
@ -426,6 +426,10 @@ STATUSBAR_GetTextLength (STATUSWINDOWINFO *infoPtr, INT nPart)
|
||||||
DWORD result;
|
DWORD result;
|
||||||
|
|
||||||
TRACE("part %d\n", nPart);
|
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)
|
if (infoPtr->simple)
|
||||||
part = &infoPtr->part0;
|
part = &infoPtr->part0;
|
||||||
else
|
else
|
||||||
|
@ -627,7 +631,10 @@ STATUSBAR_SetTextT (STATUSWINDOWINFO *infoPtr, INT nPart, WORD style,
|
||||||
STATUSWINDOWPART *part=NULL;
|
STATUSWINDOWPART *part=NULL;
|
||||||
BOOL changed = FALSE;
|
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
|
/* MSDN says: "If the parameter is set to SB_SIMPLEID (255), the status
|
||||||
* window is assumed to be a simple window */
|
* window is assumed to be a simple window */
|
||||||
|
|
Loading…
Reference in New Issue