Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-05 21:21:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Sync to Wine-20050310:

Browse source 
Martijn Vernooij <yuxdwa702@sneakemail.com>
- Scroll instead of repainting when expanding/collapsing trees.
- Don't repaint on hover if 'hot tracking' isn't on.
Francois Gouget <fgouget@free.fr>
- Add the -noname flag to match the Platform SDK.
- Assorted spelling fixes.
Maxime Bellenge <maxime.bellenge@laposte.net>
- Take into account the new size of a column when the header size
  change.
- Correctly displays the text with ellipsis when there is not enough
  room in a header item and an image from an imagelist is displayed on
  the right of the text.
- Fix SetItem so that items don't get wrongly re-ordered.
Dmitry Timoshkov <dmitry@codeweavers.com>
- Fix prototypes of GetClassLongA/W, GetClassLongPtrA/W and
  SetClassLongA/W according to SDK definitions.
- Add prototypes for SetClassLongPtrA/W, protect some GWL_ and GCL_
  constants from using in Wine or in _WIN64 mode.
- Fix all places in Wine affected by the above changes.
Jon Griffiths <jon_p_griffiths@yahoo.com>
- Documentation spelling fixes.
- Remove unneeded calls to TAB_GetInfoPtr(), const fixes, inline small
  funcs & remove unused parameters.
Dimitrie O. Paun <dpaun@rogers.com>
- Fix indentation for consistency with the rest of the file.
- Unicodification. Small cleanups.
Filip Navara <navaraf@reactos.com>
- Implement SB_SETBORDERS.
Alex Villacis Lasso <a_villacis@palosanto.com>
- Change SUBLANG_DEFAULT to SUBLANG_NEUTRAL for LANG_SPANISH in all
  resources, so that Spanish locales other than Spain also use Spanish
  resources.
Robert Shearman <rob@codeweavers.com>
- Fix one more place where the code assumes row indices are
  zero-based.
- Document a known bug in the layout code.
- Make row number be zero-based.
- Improvements to dumping functions to not dump out fields that may
  not have been filled in.
Michael Stefaniuc <mstefani@redhat.de>
- ImageList_LoadImage{A,W} were basicaly a cut'n'paste of each
  other. Removed the A variant and did a A->W translation.
- ImageList_LoadImageW: get the bitmap size from the image itself and
  not from the mask (ImageList_LoadImageA did that).

svn path=/trunk/; revision=14057
This commit is contained in:
Gé van Geldorp 2005-03-14 11:34:02 +00:00
parent 11039e6faf
commit 61c807a7ec
14 changed files with 521 additions and 551 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
reactos/include/wine/commctrl.h
View file

@ -1,5 +1,4 @@
/* $Id $ /*
*
* Compatibility header * Compatibility header
* *
* This header is wrapper to allow compilation of Wine DLLs under ReactOS * This header is wrapper to allow compilation of Wine DLLs under ReactOS
@ -59,6 +58,18 @@ typedef LPFINDINFOW LPLVFINDINFOW;
#define HDM_SETBITMAPMARGIN (HDM_FIRST+20) #define HDM_SETBITMAPMARGIN (HDM_FIRST+20)
#define HDM_GETBITMAPMARGIN (HDM_FIRST+21) #define HDM_GETBITMAPMARGIN (HDM_FIRST+21)
#define FLATSB_CLASSA "flatsb_class32" #define SB_SETBORDERS (WM_USER+5)
#define FLATSB_CLASSA "flatsb_class32"
#define DRAGLISTMSGSTRINGA "commctrl_DragListMsg"
#if defined(__GNUC__)
# define DRAGLISTMSGSTRINGW (const WCHAR []){ 'c','o','m','m','c','t','r','l', \
'_','D','r','a','g','L','i','s','t','M','s','g',0 }
#elif defined(_MSC_VER)
# define DRAGLISTMSGSTRINGW L"commctrl_DragListMsg"
#else
static const WCHAR DRAGLISTMSGSTRINGW[] = { 'c','o','m','m','c','t','r','l', \
'_','D','r','a','g','L','i','s','t','M','s','g',0 };
#endif
#endif /* __WINE_COMMCTRL_H */ #endif /* __WINE_COMMCTRL_H */

8
reactos/lib/comctl32/comctl32.spec
View file

@ -101,10 +101,10 @@
402 stdcall -noname FindMRUStringW(long wstr ptr) 402 stdcall -noname FindMRUStringW(long wstr ptr)
403 stdcall -noname EnumMRUListW(long long ptr long) 403 stdcall -noname EnumMRUListW(long long ptr long)
404 stdcall -noname CreateMRUListLazyW(ptr long long long) 404 stdcall -noname CreateMRUListLazyW(ptr long long long)
410 stdcall SetWindowSubclass(long ptr long long) 410 stdcall -noname SetWindowSubclass(long ptr long long)
411 stdcall GetWindowSubclass(long ptr long ptr) 411 stdcall -noname GetWindowSubclass(long ptr long ptr)
412 stdcall RemoveWindowSubclass(long ptr long) 412 stdcall -noname RemoveWindowSubclass(long ptr long)
413 stdcall DefSubclassProc(long long long long) 413 stdcall -noname DefSubclassProc(long long long long)
414 stdcall -noname MirrorIcon(ptr ptr) 414 stdcall -noname MirrorIcon(ptr ptr)
415 stdcall DrawTextWrap(long wstr long ptr long) user32.DrawTextW 415 stdcall DrawTextWrap(long wstr long ptr long) user32.DrawTextW
416 stdcall DrawTextExPrivWrap(long wstr long ptr long ptr) user32.DrawTextExW 416 stdcall DrawTextExPrivWrap(long wstr long ptr long ptr) user32.DrawTextExW

2
reactos/lib/comctl32/comctl_Es.rc
View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE

16
reactos/lib/comctl32/draglist.c
View file

@ -42,10 +42,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(commctrl); WINE_DEFAULT_DEBUG_CHANNEL(commctrl);
/* for compiler compatibility we only accept literal ASCII strings */
#undef TEXT
#define TEXT(string) string
#define DRAGLIST_SUBCLASSID 0 #define DRAGLIST_SUBCLASSID 0
#define DRAGLIST_SCROLLPERIOD 200 #define DRAGLIST_SCROLLPERIOD 200
#define DRAGLIST_TIMERID 666 #define DRAGLIST_TIMERID 666
@ -95,7 +91,7 @@ static LRESULT DragList_Notify(HWND hwndLB, UINT uNotification)
} }
/* cleans up after dragging */ /* cleans up after dragging */
static inline void DragList_EndDrag(HWND hwnd, DRAGLISTDATA * data) static void DragList_EndDrag(HWND hwnd, DRAGLISTDATA * data)
{ {
KillTimer(hwnd, DRAGLIST_TIMERID); KillTimer(hwnd, DRAGLIST_TIMERID);
ReleaseCapture(); ReleaseCapture();
@ -207,12 +203,12 @@ DragList_SubclassWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam,
*/ */
BOOL WINAPI MakeDragList (HWND hwndLB) BOOL WINAPI MakeDragList (HWND hwndLB)
{ {
DRAGLISTDATA * data = Alloc(sizeof(DRAGLISTDATA)); DRAGLISTDATA *data = Alloc(sizeof(DRAGLISTDATA));
TRACE("(%p)\n", hwndLB); TRACE("(%p)\n", hwndLB);
if (!uDragListMessage) if (!uDragListMessage)
uDragListMessage = RegisterWindowMessageA(DRAGLISTMSGSTRING); uDragListMessage = RegisterWindowMessageW(DRAGLISTMSGSTRINGW);
return SetWindowSubclass(hwndLB, DragList_SubclassWindowProc, DRAGLIST_SUBCLASSID, (DWORD_PTR)data); return SetWindowSubclass(hwndLB, DragList_SubclassWindowProc, DRAGLIST_SUBCLASSID, (DWORD_PTR)data);
} }
@ -301,14 +297,14 @@ INT WINAPI LBItemFromPt (HWND hwndLB, POINT pt, BOOL bAutoScroll)
ScreenToClient (hwndLB, &pt); ScreenToClient (hwndLB, &pt);
GetClientRect (hwndLB, &rcClient); GetClientRect (hwndLB, &rcClient);
nIndex = (INT)SendMessageA (hwndLB, LB_GETTOPINDEX, 0, 0); nIndex = (INT)SendMessageW (hwndLB, LB_GETTOPINDEX, 0, 0);
if (PtInRect (&rcClient, pt)) if (PtInRect (&rcClient, pt))
{ {
/* point is inside -- get the item index */ /* point is inside -- get the item index */
while (TRUE) while (TRUE)
{ {
if (SendMessageA (hwndLB, LB_GETITEMRECT, nIndex, (LPARAM)&rcClient) == LB_ERR) if (SendMessageW (hwndLB, LB_GETITEMRECT, nIndex, (LPARAM)&rcClient) == LB_ERR)
return -1; return -1;
if (PtInRect (&rcClient, pt)) if (PtInRect (&rcClient, pt))
@ -338,7 +334,7 @@ INT WINAPI LBItemFromPt (HWND hwndLB, POINT pt, BOOL bAutoScroll)
dwLastScrollTime = dwScrollTime; dwLastScrollTime = dwScrollTime;
SendMessageA (hwndLB, LB_SETTOPINDEX, (WPARAM)nIndex, 0); SendMessageW (hwndLB, LB_SETTOPINDEX, (WPARAM)nIndex, 0);
} }
return -1; return -1;

24
reactos/lib/comctl32/header.c
View file

@ -324,9 +324,19 @@ HEADER_DrawItem (HWND hwnd, HDC hdc, INT iItem, BOOL bHotTrack)
} }
else else
tx = 0; tx = 0;
ImageList_DrawEx(infoPtr->himl, phdi->iImage, hdc, r.left + tx + 2*infoPtr->iMargin,
r.top + (r.bottom-r.top-infoPtr->himl->cy)/2, infoPtr->himl->cx, r.bottom-r.top, if (tx < (r.right-r.left - infoPtr->himl->cx - GetSystemMetrics(SM_CXEDGE)))
CLR_DEFAULT, CLR_DEFAULT, 0); ImageList_DrawEx(infoPtr->himl, phdi->iImage, hdc, r.left + tx + 2*infoPtr->iMargin,
r.top + (r.bottom-r.top-infoPtr->himl->cy)/2, infoPtr->himl->cx, r.bottom-r.top,
CLR_DEFAULT, CLR_DEFAULT, 0);
else {
INT x = max(r.right - infoPtr->iMargin - infoPtr->himl->cx, r.left);
INT cx = min(infoPtr->himl->cx, r.right-r.left - GetSystemMetrics(SM_CXEDGE));
ImageList_DrawEx(infoPtr->himl, phdi->iImage, hdc, x ,
r.top + (r.bottom-r.top-infoPtr->himl->cy)/2, cx, r.bottom-r.top,
CLR_DEFAULT, CLR_DEFAULT, 0);
r.right -= infoPtr->himl->cx - infoPtr->iMargin;
}
} }
if (((phdi->fmt & HDF_STRING) if (((phdi->fmt & HDF_STRING)
@ -1203,10 +1213,8 @@ HEADER_SetItemA (HWND hwnd, WPARAM wParam, LPARAM lParam)
{ {
lpItem->iOrder = phdi->iOrder; lpItem->iOrder = phdi->iOrder;
} }
else
lpItem->iOrder = nItem;
HEADER_SendHeaderNotify (hwnd, HDN_ITEMCHANGEDA, nItem, phdi->mask); HEADER_SendHeaderNotify (hwnd, HDN_ITEMCHANGEDA, nItem, phdi->mask);
HEADER_SetItemBounds (hwnd); HEADER_SetItemBounds (hwnd);
@ -1270,10 +1278,8 @@ HEADER_SetItemW (HWND hwnd, WPARAM wParam, LPARAM lParam)
{ {
lpItem->iOrder = phdi->iOrder; lpItem->iOrder = phdi->iOrder;
} }
else
lpItem->iOrder = nItem;
HEADER_SendHeaderNotify(hwnd, HDN_ITEMCHANGEDW, nItem, phdi->mask); HEADER_SendHeaderNotify(hwnd, HDN_ITEMCHANGEDW, nItem, phdi->mask);
HEADER_SetItemBounds (hwnd); HEADER_SetItemBounds (hwnd);

84
reactos/lib/comctl32/imagelist.c
View file

@ -1577,84 +1577,28 @@ ImageList_GetImageRect (HIMAGELIST himl, INT i, LPRECT lpRect)
* *
* Creates an image list from a bitmap, icon or cursor. * Creates an image list from a bitmap, icon or cursor.
* *
* PARAMS
* hi [I] instance handle
* lpbmp [I] name or id of the image
* cx [I] width of each image
* cGrow [I] number of images to expand
* clrMask [I] mask color
* uType [I] type of image to load
* uFlags [I] loading flags
*
* RETURNS
* Success: handle to the loaded image list
* Failure: NULL
*
* SEE * SEE
* LoadImage () * ImageList_LoadImageW ()
*/ */
HIMAGELIST WINAPI HIMAGELIST WINAPI
ImageList_LoadImageA (HINSTANCE hi, LPCSTR lpbmp, INT cx, INT cGrow, ImageList_LoadImageA (HINSTANCE hi, LPCSTR lpbmp, INT cx, INT cGrow,
COLORREF clrMask, UINT uType, UINT uFlags) COLORREF clrMask, UINT uType, UINT uFlags)
{ {
HIMAGELIST himl = NULL; HIMAGELIST himl;
HANDLE handle; LPWSTR lpbmpW;
INT nImageCount; DWORD len;
handle = LoadImageA (hi, lpbmp, uType, 0, 0, uFlags); if (!HIWORD(lpbmp))
if (!handle) { return ImageList_LoadImageW(hi, (LPCWSTR)lpbmp, cx, cGrow, clrMask,
ERR("Error loading image!\n"); uType, uFlags);
return NULL;
}
if (uType == IMAGE_BITMAP) { len = MultiByteToWideChar(CP_ACP, 0, lpbmp, -1, NULL, 0);
BITMAP bmp; lpbmpW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));
GetObjectA (handle, sizeof(BITMAP), &bmp); MultiByteToWideChar(CP_ACP, 0, lpbmp, -1, lpbmpW, len);
/* To match windows behavior, if cx is set to zero and
the flag DI_DEFAULTSIZE is specified, cx becomes the
system metric value for icons. If the flag is not specified
the function sets the size to the height of the bitmap */
if (cx == 0)
{
if (uFlags & DI_DEFAULTSIZE)
cx = GetSystemMetrics (SM_CXICON);
else
cx = bmp.bmHeight;
}
nImageCount = bmp.bmWidth / cx;
himl = ImageList_Create (cx, bmp.bmHeight, ILC_MASK | ILC_COLOR,
nImageCount, cGrow);
if (!himl) {
DeleteObject (handle);
return NULL;
}
ImageList_AddMasked (himl, (HBITMAP)handle, clrMask);
}
else if ((uType == IMAGE_ICON) || (uType == IMAGE_CURSOR)) {
ICONINFO ii;
BITMAP bmp;
GetIconInfo (handle, &ii);
GetObjectA (ii.hbmColor, sizeof(BITMAP), (LPVOID)&bmp);
himl = ImageList_Create (bmp.bmWidth, bmp.bmHeight,
ILC_MASK | ILC_COLOR, 1, cGrow);
if (!himl) {
DeleteObject (ii.hbmColor);
DeleteObject (ii.hbmMask);
DeleteObject (handle);
return NULL;
}
ImageList_Add (himl, ii.hbmColor, ii.hbmMask);
DeleteObject (ii.hbmColor);
DeleteObject (ii.hbmMask);
}
DeleteObject (handle);
himl = ImageList_LoadImageW(hi, lpbmpW, cx, cGrow, clrMask, uType, uFlags);
HeapFree(GetProcessHeap(), 0, lpbmpW);
return himl; return himl;
} }
@ -1683,7 +1627,7 @@ ImageList_LoadImageA (HINSTANCE hi, LPCSTR lpbmp, INT cx, INT cGrow,
HIMAGELIST WINAPI HIMAGELIST WINAPI
ImageList_LoadImageW (HINSTANCE hi, LPCWSTR lpbmp, INT cx, INT cGrow, ImageList_LoadImageW (HINSTANCE hi, LPCWSTR lpbmp, INT cx, INT cGrow,
COLORREF clrMask, UINT uType, UINT uFlags) COLORREF clrMask, UINT uType, UINT uFlags)
{ {
HIMAGELIST himl = NULL; HIMAGELIST himl = NULL;
HANDLE handle; HANDLE handle;
@ -1726,7 +1670,7 @@ ImageList_LoadImageW (HINSTANCE hi, LPCWSTR lpbmp, INT cx, INT cGrow,
BITMAP bmp; BITMAP bmp;
GetIconInfo (handle, &ii); GetIconInfo (handle, &ii);
GetObjectW (ii.hbmMask, sizeof(BITMAP), (LPVOID)&bmp); GetObjectW (ii.hbmColor, sizeof(BITMAP), (LPVOID)&bmp);
himl = ImageList_Create (bmp.bmWidth, bmp.bmHeight, himl = ImageList_Create (bmp.bmWidth, bmp.bmHeight,
ILC_MASK | ILC_COLOR, 1, cGrow); ILC_MASK | ILC_COLOR, 1, cGrow);
if (!himl) { if (!himl) {

3
reactos/lib/comctl32/listview.c
View file

@ -6276,7 +6276,7 @@ static BOOL LISTVIEW_SetBkColor(LISTVIEW_INFO *infoPtr, COLORREF clrBk)
if (infoPtr->clrBk != CLR_NONE) DeleteObject(infoPtr->hBkBrush); if (infoPtr->clrBk != CLR_NONE) DeleteObject(infoPtr->hBkBrush);
infoPtr->clrBk = clrBk; infoPtr->clrBk = clrBk;
if (clrBk == CLR_NONE) if (clrBk == CLR_NONE)
infoPtr->hBkBrush = (HBRUSH)GetClassLongW(infoPtr->hwndSelf, GCL_HBRBACKGROUND); infoPtr->hBkBrush = (HBRUSH)GetClassLongPtrW(infoPtr->hwndSelf, GCLP_HBRBACKGROUND);
else else
infoPtr->hBkBrush = CreateSolidBrush(clrBk); infoPtr->hBkBrush = CreateSolidBrush(clrBk);
LISTVIEW_InvalidateList(infoPtr); LISTVIEW_InvalidateList(infoPtr);
@ -8253,6 +8253,7 @@ static LRESULT LISTVIEW_HeaderNotification(LISTVIEW_INFO *infoPtr, const NMHEADE
lpColumnInfo->rcHeader.right += dx; lpColumnInfo->rcHeader.right += dx;
LISTVIEW_ScrollColumns(infoPtr, lpnmh->iItem + 1, dx); LISTVIEW_ScrollColumns(infoPtr, lpnmh->iItem + 1, dx);
LISTVIEW_UpdateItemSize(infoPtr);
if (uView == LVS_REPORT && is_redrawing(infoPtr)) if (uView == LVS_REPORT && is_redrawing(infoPtr))
{ {
/* this trick works for left aligned columns only */ /* this trick works for left aligned columns only */

31
reactos/lib/comctl32/rebar.c
View file

@ -134,7 +134,7 @@ typedef struct
SIZE offChild; /* x,y offset if child is not FIXEDSIZE */ SIZE offChild; /* x,y offset if child is not FIXEDSIZE */
UINT uMinHeight; UINT uMinHeight;
INT iRow; /* row this band assigned to */ INT iRow; /* zero-based index of the row this band assigned to */
UINT fStatus; /* status flags, reset only by _Validate */ UINT fStatus; /* status flags, reset only by _Validate */
UINT fDraw; /* drawing flags, reset only by _Layout */ UINT fDraw; /* drawing flags, reset only by _Layout */
UINT uCDret; /* last return from NM_CUSTOMDRAW */ UINT uCDret; /* last return from NM_CUSTOMDRAW */
@ -360,8 +360,14 @@ static VOID
REBAR_DumpBandInfo( LPREBARBANDINFOA pB) REBAR_DumpBandInfo( LPREBARBANDINFOA pB)
{ {
if( !TRACE_ON(rebar) ) return; if( !TRACE_ON(rebar) ) return;
TRACE("band info: ID=%u, size=%u, child=%p, clrF=0x%06lx, clrB=0x%06lx\n", TRACE("band info: ");
pB->wID, pB->cbSize, pB->hwndChild, pB->clrFore, pB->clrBack); if (pB->fMask & RBBIM_ID);
TRACE("ID=%u, ", pB->wID);
TRACE("size=%u, child=%p", pB->cbSize, pB->hwndChild);
if (pB->fMask & RBBIM_COLORS)
TRACE(", clrF=0x%06lx, clrB=0x%06lx", pB->clrFore, pB->clrBack);
TRACE("\n");
TRACE("band info: mask=0x%08x (%s)\n", pB->fMask, REBAR_FmtMask(pB->fMask)); TRACE("band info: mask=0x%08x (%s)\n", pB->fMask, REBAR_FmtMask(pB->fMask));
if (pB->fMask & RBBIM_STYLE) if (pB->fMask & RBBIM_STYLE)
TRACE("band info: style=0x%08x (%s)\n", pB->fStyle, REBAR_FmtStyle(pB->fStyle)); TRACE("band info: style=0x%08x (%s)\n", pB->fStyle, REBAR_FmtStyle(pB->fStyle));
@ -403,8 +409,14 @@ REBAR_DumpBand (REBAR_INFO *iP)
(iP->NtfUnicode)?"TRUE":"FALSE", (iP->DoRedraw)?"TRUE":"FALSE"); (iP->NtfUnicode)?"TRUE":"FALSE", (iP->DoRedraw)?"TRUE":"FALSE");
for (i = 0; i < iP->uNumBands; i++) { for (i = 0; i < iP->uNumBands; i++) {
pB = &iP->bands[i]; pB = &iP->bands[i];
TRACE("band # %u: ID=%u, child=%p, row=%u, clrF=0x%06lx, clrB=0x%06lx\n", TRACE("band # %u:", i);
i, pB->wID, pB->hwndChild, pB->iRow, pB->clrFore, pB->clrBack); if (pB->fMask & RBBIM_ID);
TRACE(" ID=%u", pB->wID);
if (pB->fMask & RBBIM_CHILD)
TRACE(" child=%p", pB->hwndChild);
if (pB->fMask & RBBIM_COLORS)
TRACE(" clrF=0x%06lx clrB=0x%06lx", pB->clrFore, pB->clrBack);
TRACE("\n");
TRACE("band # %u: mask=0x%08x (%s)\n", i, pB->fMask, REBAR_FmtMask(pB->fMask)); TRACE("band # %u: mask=0x%08x (%s)\n", i, pB->fMask, REBAR_FmtMask(pB->fMask));
if (pB->fMask & RBBIM_STYLE) if (pB->fMask & RBBIM_STYLE)
TRACE("band # %u: style=0x%08x (%s)\n", TRACE("band # %u: style=0x%08x (%s)\n",
@ -1419,7 +1431,7 @@ REBAR_Layout (REBAR_INFO *infoPtr, LPRECT lpRect, BOOL notify, BOOL resetclient)
clientcx, clientcy, adjcx, adjcy); clientcx, clientcy, adjcx, adjcy);
x = initx; x = initx;
y = inity; y = inity;
row = 1; row = 0;
cx = 0; cx = 0;
mcy = 0; mcy = 0;
rowstart = 0; rowstart = 0;
@ -1560,7 +1572,7 @@ REBAR_Layout (REBAR_INFO *infoPtr, LPRECT lpRect, BOOL notify, BOOL resetclient)
} }
if (infoPtr->uNumBands) if (infoPtr->uNumBands)
infoPtr->uNumRows = row; infoPtr->uNumRows = row + 1;
/* ******* End Phase 1 - all bands on row at minimum size ******* */ /* ******* End Phase 1 - all bands on row at minimum size ******* */
@ -1583,7 +1595,7 @@ REBAR_Layout (REBAR_INFO *infoPtr, LPRECT lpRect, BOOL notify, BOOL resetclient)
/* now adjust all rectangles by using the height found above */ /* now adjust all rectangles by using the height found above */
xy = 0; xy = 0;
row = 1; row = 0;
for (i=0; i<infoPtr->uNumBands; i++) { for (i=0; i<infoPtr->uNumBands; i++) {
lpBand = &infoPtr->bands[i]; lpBand = &infoPtr->bands[i];
if (HIDDENBAND(lpBand)) continue; if (HIDDENBAND(lpBand)) continue;
@ -1759,6 +1771,7 @@ REBAR_Layout (REBAR_INFO *infoPtr, LPRECT lpRect, BOOL notify, BOOL resetclient)
if( !(lpBand->fDraw&DRAW_LAST_IN_ROW) ) if( !(lpBand->fDraw&DRAW_LAST_IN_ROW) )
continue; continue;
/* FIXME: this next line is wrong, but fixing it to be inverted causes IE's sidebars to be the wrong size */
if (lpBand->fMask & RBBS_VARIABLEHEIGHT) continue; if (lpBand->fMask & RBBS_VARIABLEHEIGHT) continue;
if (((INT)lpBand->cyMaxChild < 1) || if (((INT)lpBand->cyMaxChild < 1) ||
((INT)lpBand->cyIntegral < 1)) { ((INT)lpBand->cyIntegral < 1)) {
@ -1943,7 +1956,7 @@ REBAR_ValidateBand (REBAR_INFO *infoPtr, REBAR_BAND *lpBand)
infoPtr->fStatus |= BAND_NEEDS_LAYOUT; infoPtr->fStatus |= BAND_NEEDS_LAYOUT;
/* Header is where the image, text and gripper exist */ /* Header is where the image, text and gripper exist */
/* in the band and preceed the child window. */ /* in the band and precede the child window. */
/* count number of non-FIXEDSIZE and non-Hidden bands */ /* count number of non-FIXEDSIZE and non-Hidden bands */
nonfixed = 0; nonfixed = 0;

111
reactos/lib/comctl32/status.c
View file

@ -79,6 +79,9 @@ typedef struct
BOOL NtfUnicode; /* notify format */ BOOL NtfUnicode; /* notify format */
STATUSWINDOWPART part0; /* simple window */ STATUSWINDOWPART part0; /* simple window */
STATUSWINDOWPART* parts; STATUSWINDOWPART* parts;
INT horizontalBorder;
INT verticalBorder;
INT horizontalGap;
} STATUS_INFO; } STATUS_INFO;
/* /*
@ -159,28 +162,24 @@ STATUSBAR_DrawPart (STATUS_INFO *infoPtr, HDC hdc, STATUSWINDOWPART *part, int i
DrawEdge(hdc, &r, border, BF_RECT|BF_ADJUST); DrawEdge(hdc, &r, border, BF_RECT|BF_ADJUST);
if (part->style & SBT_OWNERDRAW) if (part->style & SBT_OWNERDRAW) {
{ DRAWITEMSTRUCT dis;
DRAWITEMSTRUCT dis;
dis.CtlID = GetWindowLongPtrW (infoPtr->Self, GWLP_ID); dis.CtlID = GetWindowLongPtrW (infoPtr->Self, GWLP_ID);
dis.itemID = itemID; dis.itemID = itemID;
dis.hwndItem = infoPtr->Self; dis.hwndItem = infoPtr->Self;
dis.hDC = hdc; dis.hDC = hdc;
dis.rcItem = r; dis.rcItem = r;
dis.itemData = (INT)part->text; dis.itemData = (INT)part->text;
SendMessageW (infoPtr->Notify, WM_DRAWITEM, (WPARAM)dis.CtlID, (LPARAM)&dis); SendMessageW (infoPtr->Notify, WM_DRAWITEM, (WPARAM)dis.CtlID, (LPARAM)&dis);
} } else {
else if (part->hIcon) {
{ INT cy = r.bottom - r.top;
if (part->hIcon)
{
INT cy = r.bottom - r.top;
r.left += 2; r.left += 2;
DrawIconEx (hdc, r.left, r.top, part->hIcon, cy, cy, 0, 0, DI_NORMAL); DrawIconEx (hdc, r.left, r.top, part->hIcon, cy, cy, 0, 0, DI_NORMAL);
r.left += cy; r.left += cy;
} }
DrawStatusTextW (hdc, &r, part->text, SBT_NOBORDERS); DrawStatusTextW (hdc, &r, part->text, SBT_NOBORDERS);
} }
} }
@ -213,12 +212,11 @@ STATUSBAR_RefreshPart (STATUS_INFO *infoPtr, HDC hdc, STATUSWINDOWPART *part, in
if (infoPtr->clrBk != CLR_DEFAULT) if (infoPtr->clrBk != CLR_DEFAULT)
DeleteObject (hbrBk); DeleteObject (hbrBk);
if (GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP) if (GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP) {
{ RECT rect;
RECT rect;
GetClientRect (infoPtr->Self, &rect); GetClientRect (infoPtr->Self, &rect);
STATUSBAR_DrawSizeGrip (hdc, &rect); STATUSBAR_DrawSizeGrip (hdc, &rect);
} }
} }
@ -240,19 +238,19 @@ STATUSBAR_Refresh (STATUS_INFO *infoPtr, HDC hdc)
GetClientRect (infoPtr->Self, &rect); GetClientRect (infoPtr->Self, &rect);
if (infoPtr->clrBk != CLR_DEFAULT) if (infoPtr->clrBk != CLR_DEFAULT)
hbrBk = CreateSolidBrush (infoPtr->clrBk); hbrBk = CreateSolidBrush (infoPtr->clrBk);
else else
hbrBk = GetSysColorBrush (COLOR_3DFACE); hbrBk = GetSysColorBrush (COLOR_3DFACE);
FillRect(hdc, &rect, hbrBk); FillRect(hdc, &rect, hbrBk);
hOldFont = SelectObject (hdc, infoPtr->hFont ? infoPtr->hFont : infoPtr->hDefaultFont); hOldFont = SelectObject (hdc, infoPtr->hFont ? infoPtr->hFont : infoPtr->hDefaultFont);
if (infoPtr->simple) { if (infoPtr->simple) {
STATUSBAR_RefreshPart (infoPtr, hdc, &infoPtr->part0, 0); STATUSBAR_RefreshPart (infoPtr, hdc, &infoPtr->part0, 0);
} else { } else {
for (i = 0; i < infoPtr->numParts; i++) { for (i = 0; i < infoPtr->numParts; i++) {
STATUSBAR_RefreshPart (infoPtr, hdc, &infoPtr->parts[i], i); STATUSBAR_RefreshPart (infoPtr, hdc, &infoPtr->parts[i], i);
} }
} }
SelectObject (hdc, hOldFont); SelectObject (hdc, hOldFont);
@ -278,7 +276,8 @@ STATUSBAR_SetPartBounds (STATUS_INFO *infoPtr)
GetClientRect (infoPtr->Self, &rect); GetClientRect (infoPtr->Self, &rect);
TRACE("client wnd size is %ld,%ld - %ld,%ld\n", rect.left, rect.top, rect.right, rect.bottom); TRACE("client wnd size is %ld,%ld - %ld,%ld\n", rect.left, rect.top, rect.right, rect.bottom);
rect.top += VERT_BORDER; rect.left += infoPtr->horizontalBorder;
rect.top += infoPtr->verticalBorder;
/* set bounds for simple rectangle */ /* set bounds for simple rectangle */
infoPtr->part0.bound = rect; infoPtr->part0.bound = rect;
@ -292,7 +291,7 @@ STATUSBAR_SetPartBounds (STATUS_INFO *infoPtr)
if (i == 0) if (i == 0)
r->left = 0; r->left = 0;
else else
r->left = infoPtr->parts[i-1].bound.right + HORZ_GAP; r->left = infoPtr->parts[i-1].bound.right + infoPtr->horizontalGap;
if (part->x == -1) if (part->x == -1)
r->right = rect.right; r->right = rect.right;
else else
@ -331,12 +330,25 @@ STATUSBAR_Relay2Tip (STATUS_INFO *infoPtr, UINT uMsg,
static BOOL static BOOL
STATUSBAR_GetBorders (INT out[]) STATUSBAR_GetBorders (STATUS_INFO *infoPtr, INT out[])
{ {
TRACE("\n"); TRACE("\n");
out[0] = HORZ_BORDER; /* horizontal border width */ out[0] = infoPtr->horizontalBorder;
out[1] = VERT_BORDER; /* vertical border width */ out[1] = infoPtr->verticalBorder;
out[2] = HORZ_GAP; /* width of border between rectangles */ out[2] = infoPtr->horizontalGap;
return TRUE;
}
static BOOL
STATUSBAR_SetBorders (STATUS_INFO *infoPtr, INT in[])
{
TRACE("\n");
infoPtr->horizontalBorder = in[0];
infoPtr->verticalBorder = in[1];
infoPtr->horizontalGap = in[2];
InvalidateRect(infoPtr->Self, NULL, FALSE);
return TRUE; return TRUE;
} }
@ -560,13 +572,13 @@ STATUSBAR_SetMinHeight (STATUS_INFO *infoPtr, INT height)
RECT parent_rect; RECT parent_rect;
GetClientRect (infoPtr->Notify, &parent_rect); GetClientRect (infoPtr->Notify, &parent_rect);
infoPtr->height = height + VERT_BORDER; infoPtr->height = height + infoPtr->verticalBorder;
width = parent_rect.right - parent_rect.left; width = parent_rect.right - parent_rect.left;
x = parent_rect.left; x = parent_rect.left;
y = parent_rect.bottom - infoPtr->height; y = parent_rect.bottom - infoPtr->height;
MoveWindow (infoPtr->Self, parent_rect.left, MoveWindow (infoPtr->Self, parent_rect.left,
parent_rect.bottom - infoPtr->height, parent_rect.bottom - infoPtr->height,
width, infoPtr->height, TRUE); width, infoPtr->height, TRUE);
STATUSBAR_SetPartBounds (infoPtr); STATUSBAR_SetPartBounds (infoPtr);
} }
@ -728,8 +740,7 @@ STATUSBAR_SetTipTextA (STATUS_INFO *infoPtr, INT id, LPSTR text)
ti.uId = id; ti.uId = id;
ti.hinst = 0; ti.hinst = 0;
ti.lpszText = text; ti.lpszText = text;
SendMessageA (infoPtr->hwndToolTip, TTM_UPDATETIPTEXTA, SendMessageA (infoPtr->hwndToolTip, TTM_UPDATETIPTEXTA, 0, (LPARAM)&ti);
0, (LPARAM)&ti);
} }
return 0; return 0;
@ -747,8 +758,7 @@ STATUSBAR_SetTipTextW (STATUS_INFO *infoPtr, INT id, LPWSTR text)
ti.uId = id; ti.uId = id;
ti.hinst = 0; ti.hinst = 0;
ti.lpszText = text; ti.lpszText = text;
SendMessageW (infoPtr->hwndToolTip, TTM_UPDATETIPTEXTW, SendMessageW (infoPtr->hwndToolTip, TTM_UPDATETIPTEXTW, 0, (LPARAM)&ti);
0, (LPARAM)&ti);
} }
return 0; return 0;
@ -838,6 +848,9 @@ STATUSBAR_WMCreate (HWND hwnd, LPCREATESTRUCTA lpCreate)
infoPtr->simple = FALSE; infoPtr->simple = FALSE;
infoPtr->clrBk = CLR_DEFAULT; infoPtr->clrBk = CLR_DEFAULT;
infoPtr->hFont = 0; infoPtr->hFont = 0;
infoPtr->horizontalBorder = HORZ_BORDER;
infoPtr->verticalBorder = VERT_BORDER;
infoPtr->horizontalGap = HORZ_GAP;
i = SendMessageW(infoPtr->Notify, WM_NOTIFYFORMAT, (WPARAM)hwnd, NF_QUERY); i = SendMessageW(infoPtr->Notify, WM_NOTIFYFORMAT, (WPARAM)hwnd, NF_QUERY);
infoPtr->NtfUnicode = (i == NFR_UNICODE); infoPtr->NtfUnicode = (i == NFR_UNICODE);
@ -929,7 +942,7 @@ STATUSBAR_WMCreate (HWND hwnd, LPCREATESTRUCTA lpCreate)
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 (infoPtr->Notify, &rect); GetClientRect (infoPtr->Notify, &rect);
width = rect.right - rect.left; width = rect.right - rect.left;
infoPtr->height = textHeight + 4 + VERT_BORDER; infoPtr->height = textHeight + 4 + infoPtr->verticalBorder;
SetWindowPos(hwnd, 0, lpCreate->x, lpCreate->y - 1, SetWindowPos(hwnd, 0, lpCreate->x, lpCreate->y - 1,
width, infoPtr->height, SWP_NOZORDER); width, infoPtr->height, SWP_NOZORDER);
STATUSBAR_SetPartBounds (infoPtr); STATUSBAR_SetPartBounds (infoPtr);
@ -1069,8 +1082,7 @@ STATUSBAR_WMSize (STATUS_INFO *infoPtr, WORD flags)
/* Need to resize width to match parent */ /* Need to resize width to match parent */
TRACE("flags %04x\n", flags); TRACE("flags %04x\n", flags);
if (flags != SIZE_RESTORED && flags != SIZE_MAXIMIZED) if (flags != SIZE_RESTORED && flags != SIZE_MAXIMIZED) {
{
WARN("flags MUST be SIZE_RESTORED or SIZE_MAXIMIZED\n"); WARN("flags MUST be SIZE_RESTORED or SIZE_MAXIMIZED\n");
return FALSE; return FALSE;
} }
@ -1129,7 +1141,7 @@ StatusWindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
switch (msg) { switch (msg) {
case SB_GETBORDERS: case SB_GETBORDERS:
return STATUSBAR_GetBorders ((INT *)lParam); return STATUSBAR_GetBorders (infoPtr, (INT *)lParam);
case SB_GETICON: case SB_GETICON:
return (LRESULT)STATUSBAR_GetIcon (infoPtr, nPart); return (LRESULT)STATUSBAR_GetIcon (infoPtr, nPart);
@ -1162,6 +1174,9 @@ StatusWindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
case SB_ISSIMPLE: case SB_ISSIMPLE:
return infoPtr->simple; return infoPtr->simple;
case SB_SETBORDERS:
return STATUSBAR_SetBorders (infoPtr, (INT *)lParam);
case SB_SETBKCOLOR: case SB_SETBKCOLOR:
return STATUSBAR_SetBkColor (infoPtr, (COLORREF)lParam); return STATUSBAR_SetBkColor (infoPtr, (COLORREF)lParam);

8
reactos/lib/comctl32/string.c
View file

@ -421,7 +421,7 @@ INT WINAPI StrCmpNW(LPCWSTR lpszStr, LPCWSTR lpszComp, INT iLen)
/************************************************************************** /**************************************************************************
* StrRChrA [COMCTL32.351] * StrRChrA [COMCTL32.351]
* *
* Find the last occurence of a character in string. * Find the last occurrence of a character in string.
* *
* PARAMS * PARAMS
* lpszStr [I] String to search in * lpszStr [I] String to search in
@ -572,7 +572,7 @@ LPWSTR WINAPI StrChrIW(LPCWSTR lpszStr, WCHAR ch)
/************************************************************************* /*************************************************************************
* StrRStrIA [COMCTL32.372] * StrRStrIA [COMCTL32.372]
* *
* Find the last occurence of a substring within a string. * Find the last occurrence of a substring within a string.
* *
* PARAMS * PARAMS
* lpszStr [I] String to search in * lpszStr [I] String to search in
@ -580,7 +580,7 @@ LPWSTR WINAPI StrChrIW(LPCWSTR lpszStr, WCHAR ch)
* lpszSearch [I] String to look for * lpszSearch [I] String to look for
* *
* RETURNS * RETURNS
* The last occurence lpszSearch within lpszStr, or NULL if not found. * The last occurrence lpszSearch within lpszStr, or NULL if not found.
*/ */
LPSTR WINAPI StrRStrIA(LPCSTR lpszStr, LPCSTR lpszEnd, LPCSTR lpszSearch) LPSTR WINAPI StrRStrIA(LPCSTR lpszStr, LPCSTR lpszEnd, LPCSTR lpszSearch)
{ {
@ -709,7 +709,7 @@ int WINAPI StrCSpnIW(LPCWSTR lpszStr, LPCWSTR lpszMatch)
/************************************************************************** /**************************************************************************
* StrRChrIA [COMCTL32.368] * StrRChrIA [COMCTL32.368]
* *
* Find the last occurence of a character in string, ignoring case. * Find the last occurrence of a character in string, ignoring case.
* *
* PARAMS * PARAMS
* lpszStr [I] String to search in * lpszStr [I] String to search in

4
reactos/lib/comctl32/syslink.c
View file

@ -513,7 +513,7 @@ static VOID SYSLINK_RepaintLink (SYSLINK_INFO *infoPtr, PDOC_ITEM DocItem)
/*********************************************************************** /***********************************************************************
* SYSLINK_GetLinkItemByIndex * SYSLINK_GetLinkItemByIndex
* Retreives a document link by it's index * Retrieves a document link by its index
*/ */
static PDOC_ITEM SYSLINK_GetLinkItemByIndex (SYSLINK_INFO *infoPtr, int iLink) static PDOC_ITEM SYSLINK_GetLinkItemByIndex (SYSLINK_INFO *infoPtr, int iLink)
{ {
@ -532,7 +532,7 @@ static PDOC_ITEM SYSLINK_GetLinkItemByIndex (SYSLINK_INFO *infoPtr, int iLink)
/*********************************************************************** /***********************************************************************
* SYSLINK_GetFocusLink * SYSLINK_GetFocusLink
* Retreives the link that has the LIS_FOCUSED bit * Retrieves the link that has the LIS_FOCUSED bit
*/ */
static PDOC_ITEM SYSLINK_GetFocusLink (SYSLINK_INFO *infoPtr, int *LinkId) static PDOC_ITEM SYSLINK_GetFocusLink (SYSLINK_INFO *infoPtr, int *LinkId)
{ {

658
reactos/lib/comctl32/tab.c
View file

File diff suppressed because it is too large Load diff

92
reactos/lib/comctl32/treeview.c
View file

@ -2386,7 +2386,9 @@ TREEVIEW_DrawItem(TREEVIEW_INFO *infoPtr, HDC hdc, TREEVIEW_ITEM *wineItem)
/* The custom draw handler can query the text rectangle, /* The custom draw handler can query the text rectangle,
* so get ready. */ * so get ready. */
TREEVIEW_ComputeTextWidth(infoPtr, wineItem, hdc); /* should already be known, set to 0 when changed */
if (!wineItem->textWidth)
TREEVIEW_ComputeTextWidth(infoPtr, wineItem, hdc);
cditem = 0; cditem = 0;
@ -3084,6 +3086,9 @@ TREEVIEW_Collapse(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem,
{ {
UINT action = TVE_COLLAPSE | (bRemoveChildren ? TVE_COLLAPSERESET : 0); UINT action = TVE_COLLAPSE | (bRemoveChildren ? TVE_COLLAPSERESET : 0);
BOOL bSetSelection, bSetFirstVisible; BOOL bSetSelection, bSetFirstVisible;
RECT scrollRect;
LONG scrollDist = 0;
TREEVIEW_ITEM *nextItem = NULL, *tmpItem;
TRACE("TVE_COLLAPSE %p %s\n", wineItem, TREEVIEW_ItemName(wineItem)); TRACE("TVE_COLLAPSE %p %s\n", wineItem, TREEVIEW_ItemName(wineItem));
@ -3107,6 +3112,20 @@ TREEVIEW_Collapse(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem,
bSetFirstVisible = (infoPtr->firstVisible != NULL bSetFirstVisible = (infoPtr->firstVisible != NULL
&& TREEVIEW_IsChildOf(wineItem, infoPtr->firstVisible)); && TREEVIEW_IsChildOf(wineItem, infoPtr->firstVisible));
tmpItem = wineItem;
while (tmpItem)
{
if (tmpItem->nextSibling)
{
nextItem = tmpItem->nextSibling;
break;
}
tmpItem = tmpItem->parent;
}
if (nextItem)
scrollDist = nextItem->rect.top;
if (bRemoveChildren) if (bRemoveChildren)
{ {
INT old_cChildren = wineItem->cChildren; INT old_cChildren = wineItem->cChildren;
@ -3131,8 +3150,8 @@ TREEVIEW_Collapse(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem,
TREEVIEW_RecalculateVisibleOrder(infoPtr, wineItem); TREEVIEW_RecalculateVisibleOrder(infoPtr, wineItem);
TREEVIEW_SetFirstVisible(infoPtr, bSetFirstVisible ? wineItem if (nextItem)
: infoPtr->firstVisible, TRUE); scrollDist = -(scrollDist - nextItem->rect.top);
if (bSetSelection) if (bSetSelection)
{ {
@ -3141,12 +3160,29 @@ TREEVIEW_Collapse(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem,
infoPtr->selectedItem->state &= ~TVIS_SELECTED; infoPtr->selectedItem->state &= ~TVIS_SELECTED;
wineItem->state |= TVIS_SELECTED; wineItem->state |= TVIS_SELECTED;
infoPtr->selectedItem = wineItem; infoPtr->selectedItem = wineItem;
TREEVIEW_EnsureVisible(infoPtr, wineItem, FALSE);
} }
TREEVIEW_UpdateScrollBars(infoPtr); TREEVIEW_UpdateScrollBars(infoPtr);
TREEVIEW_Invalidate(infoPtr, NULL);
scrollRect.left = 0;
scrollRect.right = infoPtr->clientWidth;
scrollRect.bottom = infoPtr->clientHeight;
if (nextItem)
{
scrollRect.top = nextItem->rect.top;
ScrollWindowEx (infoPtr->hwnd, 0, scrollDist, &scrollRect, NULL,
NULL, NULL, SW_ERASE | SW_INVALIDATE);
TREEVIEW_Invalidate(infoPtr, wineItem);
} else {
scrollRect.top = wineItem->rect.top;
InvalidateRect(infoPtr->hwnd, &scrollRect, TRUE);
}
TREEVIEW_SetFirstVisible(infoPtr,
bSetFirstVisible ? wineItem : infoPtr->firstVisible,
TRUE);
return TRUE; return TRUE;
} }
@ -3155,11 +3191,30 @@ static BOOL
TREEVIEW_Expand(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem, TREEVIEW_Expand(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem,
BOOL bExpandPartial, BOOL bUser) BOOL bExpandPartial, BOOL bUser)
{ {
LONG scrollDist;
LONG orgNextTop = 0;
RECT scrollRect;
TREEVIEW_ITEM *nextItem, *tmpItem;
TRACE("\n"); TRACE("\n");
if (wineItem->state & TVIS_EXPANDED) if (wineItem->state & TVIS_EXPANDED)
return TRUE; return TRUE;
tmpItem = wineItem; nextItem = NULL;
while (tmpItem)
{
if (tmpItem->nextSibling)
{
nextItem = tmpItem->nextSibling;
break;
}
tmpItem = tmpItem->parent;
}
if (nextItem)
orgNextTop = nextItem->rect.top;
TRACE("TVE_EXPAND %p %s\n", wineItem, TREEVIEW_ItemName(wineItem)); TRACE("TVE_EXPAND %p %s\n", wineItem, TREEVIEW_ItemName(wineItem));
if (bUser || ((wineItem->cChildren != 0) && if (bUser || ((wineItem->cChildren != 0) &&
@ -3194,6 +3249,22 @@ TREEVIEW_Expand(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem,
TREEVIEW_UpdateSubTree(infoPtr, wineItem); TREEVIEW_UpdateSubTree(infoPtr, wineItem);
TREEVIEW_UpdateScrollBars(infoPtr); TREEVIEW_UpdateScrollBars(infoPtr);
scrollRect.left = 0;
scrollRect.bottom = infoPtr->treeHeight;
scrollRect.right = infoPtr->clientWidth;
if (nextItem)
{
scrollDist = nextItem->rect.top - orgNextTop;
scrollRect.top = orgNextTop;
ScrollWindowEx (infoPtr->hwnd, 0, scrollDist, &scrollRect, NULL,
NULL, NULL, SW_ERASE | SW_INVALIDATE);
TREEVIEW_Invalidate (infoPtr, wineItem);
} else {
scrollRect.top = wineItem->rect.top;
InvalidateRect(infoPtr->hwnd, &scrollRect, FALSE);
}
/* Scroll up so that as many children as possible are visible. /* Scroll up so that as many children as possible are visible.
* This fails when expanding causes an HScroll bar to appear, but we * This fails when expanding causes an HScroll bar to appear, but we
* don't know that yet, so the last item is obscured. */ * don't know that yet, so the last item is obscured. */
@ -3226,8 +3297,6 @@ TREEVIEW_Expand(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *wineItem,
} }
} }
TREEVIEW_Invalidate(infoPtr, NULL);
return TRUE; return TRUE;
} }
@ -4735,7 +4804,7 @@ TREEVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs)
infoPtr->uIndent = MINIMUM_INDENT; infoPtr->uIndent = MINIMUM_INDENT;
infoPtr->selectedItem = 0; infoPtr->selectedItem = 0;
infoPtr->focusedItem = 0; infoPtr->focusedItem = 0;
/* hotItem? */ infoPtr->hotItem = 0;
infoPtr->firstVisible = 0; infoPtr->firstVisible = 0;
infoPtr->maxVisibleOrder = 0; infoPtr->maxVisibleOrder = 0;
infoPtr->dropItem = 0; infoPtr->dropItem = 0;
@ -5435,7 +5504,10 @@ TREEVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
return TREEVIEW_MouseLeave(infoPtr); return TREEVIEW_MouseLeave(infoPtr);
case WM_MOUSEMOVE: case WM_MOUSEMOVE:
return TREEVIEW_MouseMove(infoPtr, wParam, lParam); if (infoPtr->dwStyle & TVS_TRACKSELECT)
return TREEVIEW_MouseMove(infoPtr, wParam, lParam);
else
return 0;
case WM_NOTIFY: case WM_NOTIFY:
return TREEVIEW_Notify(infoPtr, wParam, lParam); return TREEVIEW_Notify(infoPtr, wParam, lParam);

14
reactos/w32api/include/winuser.h
View file

@ -605,6 +605,13 @@ extern "C" {
#define GCL_MENUNAME (-8) #define GCL_MENUNAME (-8)
#define GCL_STYLE (-26) #define GCL_STYLE (-26)
#define GCL_WNDPROC (-24) #define GCL_WNDPROC (-24)
#define GCLP_HBRBACKGROUND (-10)
#define GCLP_HCURSOR (-12)
#define GCLP_HICON (-14)
#define GCLP_HICONSM (-34)
#define GCLP_HMODULE (-16)
#define GCLP_MENUNAME (-8)
#define GCLP_WNDPROC (-24)
#if 0 #if 0
/* This is supposed to be defined by the program using it not defined /* This is supposed to be defined by the program using it not defined
in the w32api headers. I've left it here for documentation purposes. in the w32api headers. I've left it here for documentation purposes.
@ -3420,6 +3427,13 @@ BOOL WINAPI GetClassInfoW(HINSTANCE,LPCWSTR,LPWNDCLASSW);
BOOL WINAPI GetClassInfoExW(HINSTANCE,LPCWSTR,LPWNDCLASSEXW); BOOL WINAPI GetClassInfoExW(HINSTANCE,LPCWSTR,LPWNDCLASSEXW);
DWORD WINAPI GetClassLongA(HWND,int); DWORD WINAPI GetClassLongA(HWND,int);
DWORD WINAPI GetClassLongW(HWND,int); DWORD WINAPI GetClassLongW(HWND,int);
#ifdef _WIN64
LONG_PTR WINAPI GetClassLongPtrA(HWND,int);
LONG_PTR WINAPI GetClassLongPtrW(HWND,int);
#else
#define GetClassLongPtrA GetClassLongA
#define GetClassLongPtrW GetClassLongW
#endif
int WINAPI GetClassNameA(HWND,LPSTR,int); int WINAPI GetClassNameA(HWND,LPSTR,int);
int WINAPI GetClassNameW(HWND,LPWSTR,int); int WINAPI GetClassNameW(HWND,LPWSTR,int);
WORD WINAPI GetClassWord(HWND,int); WORD WINAPI GetClassWord(HWND,int);