March 2007 - Wine-commits - list.winehq.org

Mikołaj Zalewski : comctl32: rebar: WM_SETFONT should send a RBN_HEIGHTCHANGE if necessary.
by Alexandre Julliard 01 Mar '07

01 Mar '07

Module: wine Branch: master Commit: 95d0e586595f6ebf76454ac00633fcc27c15a0d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95d0e586595f6ebf76454ac00… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Feb 28 13:41:14 2007 +0100 comctl32: rebar: WM_SETFONT should send a RBN_HEIGHTCHANGE if necessary. --- dlls/comctl32/rebar.c | 28 +++++++++++----------------- 1 files changed, 11 insertions(+), 17 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 7db49f2..1fe16da 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -1299,7 +1299,7 @@ static void REBAR_LayoutRow(REBAR_INFO *infoPtr, int iBeginBand, int iEndBand, i } static VOID -REBAR_Layout(REBAR_INFO *infoPtr, LPRECT lpRect, BOOL notify) +REBAR_Layout(REBAR_INFO *infoPtr, LPRECT lpRect) { REBAR_BAND *lpBand; RECT rcAdj; @@ -1378,7 +1378,7 @@ REBAR_Layout(REBAR_INFO *infoPtr, LPRECT lpRect, BOOL notify) infoPtr->calcSize.cx = adjcx; infoPtr->calcSize.cy = yPos; - TRACE("calcsize notify=%d, size=(%d, %d), origheight=(%d,%d)\n", notify, + TRACE("calcsize size=(%d, %d), origheight=(%d,%d)\n", infoPtr->calcSize.cx, infoPtr->calcSize.cy, oldSize.cx, oldSize.cy); @@ -1388,7 +1388,7 @@ REBAR_Layout(REBAR_INFO *infoPtr, LPRECT lpRect, BOOL notify) /* note: after a RBN_HEIGHTCHANGE native sends once again all the RBN_CHILDSIZE * and does another ForceResize */ - if (notify && (oldSize.cy != infoPtr->calcSize.cy)) + if (oldSize.cy != infoPtr->calcSize.cy) { NMHDR heightchange; REBAR_Notify(&heightchange, infoPtr, RBN_HEIGHTCHANGE); @@ -1942,7 +1942,7 @@ REBAR_DeleteBand (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) TRACE("setting NEEDS_LAYOUT\n"); infoPtr->fStatus |= BAND_NEEDS_LAYOUT; - REBAR_Layout(infoPtr, NULL, TRUE); + REBAR_Layout(infoPtr, NULL); return TRUE; } @@ -2316,7 +2316,7 @@ REBAR_InsertBandT(REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam, BOOL bUnico REBAR_DumpBand (infoPtr); - REBAR_Layout(infoPtr, NULL, TRUE); + REBAR_Layout(infoPtr, NULL); InvalidateRect(infoPtr->hwndSelf, 0, TRUE); return TRUE; @@ -2538,7 +2538,7 @@ REBAR_SetBandInfoT(REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam, BOOL bUnic REBAR_DumpBand (infoPtr); if (bChanged && (lprbbi->fMask & (RBBIM_CHILDSIZE | RBBIM_SIZE | RBBIM_STYLE))) { - REBAR_Layout(infoPtr, NULL, TRUE); + REBAR_Layout(infoPtr, NULL); InvalidateRect(infoPtr->hwndSelf, 0, 1); } @@ -2688,7 +2688,7 @@ REBAR_ShowBand (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) } infoPtr->fStatus |= BAND_NEEDS_LAYOUT; - REBAR_Layout(infoPtr, NULL, TRUE); + REBAR_Layout(infoPtr, NULL); InvalidateRect(infoPtr->hwndSelf, 0, 1); return TRUE; @@ -2718,7 +2718,7 @@ REBAR_SizeToRect (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) /* force full _Layout processing */ TRACE("setting NEEDS_LAYOUT\n"); infoPtr->fStatus |= BAND_NEEDS_LAYOUT; - REBAR_Layout(infoPtr, lpRect, TRUE); + REBAR_Layout(infoPtr, lpRect); InvalidateRect (infoPtr->hwndSelf, NULL, TRUE); return TRUE; } @@ -3286,7 +3286,6 @@ REBAR_SetCursor (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) static LRESULT REBAR_SetFont (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { - RECT rcClient; REBAR_BAND *lpBand; UINT i; @@ -3298,12 +3297,7 @@ REBAR_SetFont (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) REBAR_ValidateBand (infoPtr, lpBand); } - - if (LOWORD(lParam)) { - GetClientRect (infoPtr->hwndSelf, &rcClient); - REBAR_Layout(infoPtr, &rcClient, FALSE); - } - + REBAR_Layout(infoPtr, NULL); return 0; } @@ -3365,7 +3359,7 @@ REBAR_Size (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) } infoPtr->fStatus |= BAND_NEEDS_LAYOUT; - REBAR_Layout(infoPtr, NULL, TRUE); + REBAR_Layout(infoPtr, NULL); return 0; } @@ -3385,7 +3379,7 @@ REBAR_StyleChanged (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) if ((ss->styleNew ^ ss->styleOld) & CCS_VERT) { infoPtr->fStatus |= BAND_NEEDS_LAYOUT; - REBAR_Layout(infoPtr, NULL, TRUE); + REBAR_Layout(infoPtr, NULL); } return FALSE;

1 0

Mikołaj Zalewski : comctl32: rebar: Remove the not needed BANDS_NEED_LAYOUT flag.
by Alexandre Julliard 01 Mar '07

01 Mar '07

Module: wine Branch: master Commit: 9b4191eaf8521544f5e359ef6c62c7b20f604431 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b4191eaf8521544f5e359ef6… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Feb 19 20:49:00 2007 +0100 comctl32: rebar: Remove the not needed BANDS_NEED_LAYOUT flag. --- dlls/comctl32/rebar.c | 27 +++------------------------ 1 files changed, 3 insertions(+), 24 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 1fe16da..a1e0a41 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -187,7 +187,6 @@ typedef struct /* fStatus flags */ #define BEGIN_DRAG_ISSUED 0x00000001 #define AUTO_RESIZE 0x00000002 -#define BAND_NEEDS_LAYOUT 0x00000010 #define BAND_NEEDS_REDRAW 0x00000020 /* used by Windows to mark that the header size has been set by the user and shouldn't be changed */ @@ -1311,15 +1310,6 @@ REBAR_Layout(REBAR_INFO *infoPtr, LPRECT lpRect) INT cyTarget; const INT yInit = 0; - if (!(infoPtr->fStatus & BAND_NEEDS_LAYOUT)) { - TRACE("no layout done. No band changed.\n"); - REBAR_DumpBand (infoPtr); - return; - } - - infoPtr->fStatus &= ~BAND_NEEDS_LAYOUT; - if (!infoPtr->DoRedraw) infoPtr->fStatus |= BAND_NEEDS_REDRAW; - cyTarget = 0; if (lpRect) { rcAdj = *lpRect; @@ -1429,10 +1419,9 @@ REBAR_ValidateBand (REBAR_INFO *infoPtr, REBAR_BAND *lpBand) if (lpBand->cxIdeal > 65535) lpBand->cxIdeal = 0; if (lpBand->cxHeader > 65535) lpBand->cxHeader = 0; - /* FIXME: probably should only set NEEDS_LAYOUT flag when */ - /* values change. Till then always set it. */ - TRACE("setting NEEDS_LAYOUT\n"); - infoPtr->fStatus |= BAND_NEEDS_LAYOUT; + /* TODO : we could try return to the caller if a value changed so that */ + /* a REBAR_Layout is needed. Till now the caller should call it */ + /* it always (we should also check what native does) */ /* Header is where the image, text and gripper exist */ /* in the band and precede the child window. */ @@ -1940,8 +1929,6 @@ REBAR_DeleteBand (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) if (infoPtr->uNumBands == 1) REBAR_ValidateBand (infoPtr, &infoPtr->bands[0]); - TRACE("setting NEEDS_LAYOUT\n"); - infoPtr->fStatus |= BAND_NEEDS_LAYOUT; REBAR_Layout(infoPtr, NULL); return TRUE; @@ -2475,7 +2462,6 @@ REBAR_MoveBand (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) TRACE("moved band %d to index %d\n", uFrom, uTo); REBAR_DumpBand (infoPtr); - infoPtr->fStatus |= BAND_NEEDS_LAYOUT; /* **************************************************** */ /* */ /* We do not do a REBAR_Layout here because the native */ @@ -2687,7 +2673,6 @@ REBAR_ShowBand (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) ShowWindow (lpBand->hwndChild, SW_HIDE); } - infoPtr->fStatus |= BAND_NEEDS_LAYOUT; REBAR_Layout(infoPtr, NULL); InvalidateRect(infoPtr->hwndSelf, 0, 1); @@ -2716,8 +2701,6 @@ REBAR_SizeToRect (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) t1.left, t1.top, t1.right, t1.bottom); /* force full _Layout processing */ - TRACE("setting NEEDS_LAYOUT\n"); - infoPtr->fStatus |= BAND_NEEDS_LAYOUT; REBAR_Layout(infoPtr, lpRect); InvalidateRect (infoPtr->hwndSelf, NULL, TRUE); return TRUE; @@ -3358,7 +3341,6 @@ REBAR_Size (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) autosize.rcTarget.right, autosize.rcTarget.bottom, lParam); } - infoPtr->fStatus |= BAND_NEEDS_LAYOUT; REBAR_Layout(infoPtr, NULL); return 0; @@ -3377,10 +3359,7 @@ REBAR_StyleChanged (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) infoPtr->dwStyle &= ~WS_BORDER; /* maybe it should be COMMON_STYLES like in toolbar */ if ((ss->styleNew ^ ss->styleOld) & CCS_VERT) - { - infoPtr->fStatus |= BAND_NEEDS_LAYOUT; REBAR_Layout(infoPtr, NULL); - } return FALSE; }

1 0

Lei Zhang : regedit: Correctly parse key name containing ']'.
by Alexandre Julliard 01 Mar '07

01 Mar '07

Module: wine Branch: master Commit: d113419682a1a723336dafa53f2d81c223fad395 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d113419682a1a723336dafa53… Author: Lei Zhang <thestig(a)google.com> Date: Wed Feb 28 17:41:45 2007 -0800 regedit: Correctly parse key name containing ']'. --- programs/regedit/regproc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index e93d4ff..2cd187b 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -503,7 +503,7 @@ LPSTR getRegKeyName(LPSTR lpLine) LPSTR keyNameEnd; keyNameBeg++; /* is not part of the name */ - keyNameEnd = strchr(lpLineCopy, ']'); + keyNameEnd = strrchr(lpLineCopy, ']'); if (keyNameEnd) { *keyNameEnd = '\0'; /* remove ']' from the key name */ }

1 0

Jan Zerebecki : winex11.drv: Change virtual desktop refresh rate from 0 to 60.
by Alexandre Julliard 01 Mar '07

01 Mar '07

Module: wine Branch: master Commit: fbaf31c50fec4d9c5f476178bf832bf8a65ed111 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbaf31c50fec4d9c5f476178b… Author: Jan Zerebecki <jan.wine(a)zerebecki.de> Date: Thu Mar 1 07:57:41 2007 +0100 winex11.drv: Change virtual desktop refresh rate from 0 to 60. --- dlls/winex11.drv/desktop.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 9bcb334..c9e7a61 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -46,7 +46,7 @@ static void make_modes(void) { int i; /* original specified desktop size */ - X11DRV_Settings_AddOneMode(screen_width, screen_height, 0, 0); + X11DRV_Settings_AddOneMode(screen_width, screen_height, 0, 60); for (i=0; i<NUM_DESKTOP_MODES; i++) { if ( (widths[i] <= max_width) && (heights[i] <= max_height) ) @@ -55,14 +55,14 @@ static void make_modes(void) ( (widths[i] != screen_width) || (heights[i] != screen_height) ) ) { /* only add them if they are smaller than the root window and unique */ - X11DRV_Settings_AddOneMode(widths[i], heights[i], 0, 0); + X11DRV_Settings_AddOneMode(widths[i], heights[i], 0, 60); } } } if ((max_width != screen_width) && (max_height != screen_height)) { /* root window size (if different from desktop window) */ - X11DRV_Settings_AddOneMode(max_width, max_height, 0, 0); + X11DRV_Settings_AddOneMode(max_width, max_height, 0, 60); } }

1 0