ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add workarounds for null strings in TOOLBAR_InsertButtonA and calling 

TOOLBAR_SetButtonSize after button added to the toolbar (latter for
WINZIP32.EXE)
This commit is contained in:
Mike McCormack 2000-06-25 12:48:41 +00:00 committed by Alexandre Julliard
parent d292234835
commit 4b4e978106
1 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
dlls/comctl32/toolbar.c
View File

@ -2272,14 +2272,22 @@ TOOLBAR_InsertButtonA (HWND hwnd, WPARAM wParam, LPARAM lParam)
* I only see this happen with nIndex == -1, but it could have a special * I only see this happen with nIndex == -1, but it could have a special
* meaning (like -nIndex (or ~nIndex) to get the real position of insertion). * meaning (like -nIndex (or ~nIndex) to get the real position of insertion).
*/ */
int len = lstrlenA((char*)lpTbb->iString) + 2; int len;
LPSTR ptr = COMCTL32_Alloc(len); LPSTR ptr;
nIndex = infoPtr->nNumButtons; if(lpTbb->iString) {
strcpy(ptr, (char*)lpTbb->iString); len = lstrlenA((char*)lpTbb->iString) + 2;
ptr[len - 1] = 0; /* ended by two '\0' */ ptr = COMCTL32_Alloc(len);
lpTbb->iString = TOOLBAR_AddStringA(hwnd, 0, (LPARAM)ptr); nIndex = infoPtr->nNumButtons;
COMCTL32_Free(ptr); strcpy(ptr, (char*)lpTbb->iString);
ptr[len - 1] = 0; /* ended by two '\0' */
lpTbb->iString = TOOLBAR_AddStringA(hwnd, 0, (LPARAM)ptr);
COMCTL32_Free(ptr);
}
else {
ERR("lpTbb->iString is NULL\n");
return FALSE;
}
} else if (nIndex < 0) } else if (nIndex < 0)
return FALSE; return FALSE;
@ -2721,12 +2729,21 @@ TOOLBAR_SetButtonSize (HWND hwnd, WPARAM wParam, LPARAM lParam)
TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd); TOOLBAR_INFO *infoPtr = TOOLBAR_GetInfoPtr (hwnd);
if ((LOWORD(lParam) <= 0) || (HIWORD(lParam)<=0)) if ((LOWORD(lParam) <= 0) || (HIWORD(lParam)<=0))
{
ERR("invalid parameter\n");
return FALSE; return FALSE;
}
/* Button size can only be set before adding any button to the toolbar /* Button size can only be set before adding any button to the toolbar
according to the documentation. */ according to the documentation. */
/* this appears to be wrong. WINZIP32.EXE (ver 8) calls this on
one of its buttons after adding it to the toolbar, and it
checks that the return value is nonzero - mjm */
if( infoPtr->nNumButtons != 0 ) if( infoPtr->nNumButtons != 0 )
return FALSE; {
FIXME("Button size set after button in toolbar\n");
return TRUE;
}
infoPtr->nButtonWidth = (INT)LOWORD(lParam); infoPtr->nButtonWidth = (INT)LOWORD(lParam);
infoPtr->nButtonHeight = (INT)HIWORD(lParam); infoPtr->nButtonHeight = (INT)HIWORD(lParam);