October 2009 - Wine-commits

Nikolay Sivov : comctl32/monthcal: Fix a test skip condition - zero is a valid day of week.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: 22dddce999629c5e61d801ae0edcab2e6dcbfb5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=22dddce999629c5e61d801ae0… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Oct 11 00:32:59 2009 +0400 comctl32/monthcal: Fix a test skip condition - zero is a valid day of week. --- dlls/comctl32/tests/monthcal.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 3ead3ed..8d59e72 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -1584,18 +1584,18 @@ static void test_monthcal_selrange(void) expect(st.wYear, range[0].wYear); expect(st.wMonth, range[0].wMonth); expect(st.wDay, range[0].wDay); - if (range[0].wDayOfWeek == 0) + if (range[0].wDayOfWeek != st.wDayOfWeek) { win_skip("comctl32 <= 4.70 doesn't set some values\n"); old_comctl32 = TRUE; } else { - expect(st.wDayOfWeek, range[0].wDayOfWeek); - expect(st.wHour, range[0].wHour); - expect(st.wMinute, range[0].wMinute); - expect(st.wSecond, range[0].wSecond); - expect(st.wMilliseconds, range[0].wMilliseconds); + expect(st.wDayOfWeek, range[0].wDayOfWeek); + expect(st.wHour, range[0].wHour); + expect(st.wMinute, range[0].wMinute); + expect(st.wSecond, range[0].wSecond); + expect(st.wMilliseconds, range[0].wMilliseconds); } expect(st.wYear, range[1].wYear);

1 0

Nikolay Sivov : comctl32/monthcal: Fix column/ row calculation for previous and next month.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: 7d2ef4f23da2651b97867a085283cac3518ae2fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d2ef4f23da2651b97867a085… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Oct 11 03:54:11 2009 +0400 comctl32/monthcal: Fix column/row calculation for previous and next month. --- dlls/comctl32/monthcal.c | 166 +++++++++++++++++++++++++-------------------- 1 files changed, 92 insertions(+), 74 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 87ce751..72d102a 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -217,6 +217,35 @@ static BOOL MONTHCAL_ValidateDate(const SYSTEMTIME *time) return TRUE; } +/* Copies timestamp part only. + * + * PARAMETERS + * + * [I] from : source date + * [O] to : dest date + */ +static void MONTHCAL_CopyTime(const SYSTEMTIME *from, SYSTEMTIME *to) +{ + to->wHour = from->wHour; + to->wMinute = from->wMinute; + to->wSecond = from->wSecond; +} + +/* Copies date part only. + * + * PARAMETERS + * + * [I] from : source date + * [O] to : dest date + */ +static void MONTHCAL_CopyDate(const SYSTEMTIME *from, SYSTEMTIME *to) +{ + to->wYear = from->wYear; + to->wMonth = from->wMonth; + to->wDay = from->wDay; + to->wDayOfWeek = from->wDayOfWeek; +} + /* Compares two dates in SYSTEMTIME format * * PARAMETERS @@ -242,6 +271,18 @@ static LONG MONTHCAL_CompareSystemTime(const SYSTEMTIME *first, const SYSTEMTIME return CompareFileTime(&ft_first, &ft_second); } +static LONG MONTHCAL_CompareMonths(const SYSTEMTIME *first, const SYSTEMTIME *second) +{ + SYSTEMTIME st_first, st_second; + + st_first = st_second = st_null; + MONTHCAL_CopyDate(first, &st_first); + MONTHCAL_CopyDate(second, &st_second); + st_first.wDay = st_second.wDay = 1; + + return MONTHCAL_CompareSystemTime(&st_first, &st_second); +} + /* Checks largest possible date range and configured one * * PARAMETERS @@ -355,35 +396,6 @@ static BOOL MONTHCAL_ValidateTime(const SYSTEMTIME *time) return TRUE; } -/* Copies timestamp part only. - * - * PARAMETERS - * - * [I] from : source date - * [O] to : dest date - */ -static void MONTHCAL_CopyTime(const SYSTEMTIME *from, SYSTEMTIME *to) -{ - to->wHour = from->wHour; - to->wMinute = from->wMinute; - to->wSecond = from->wSecond; -} - -/* Copies date part only. - * - * PARAMETERS - * - * [I] from : source date - * [O] to : dest date - */ -static void MONTHCAL_CopyDate(const SYSTEMTIME *from, SYSTEMTIME *to) -{ - to->wYear = from->wYear; - to->wMonth = from->wMonth; - to->wDay = from->wDay; - to->wDayOfWeek = from->wDayOfWeek; -} - /* Note:Depending on DST, this may be offset by a day. Need to find out if we're on a DST place & adjust the clock accordingly. Above function assumes we have a valid data. @@ -505,39 +517,45 @@ static int MONTHCAL_CalcDayFromPos(const MONTHCAL_INFO *infoPtr, int x, int y, return retval; } -/* day is the day of the month, 1 == 1st day of the month */ -/* sets x and y to be the position of the day */ -/* x == day, y == week where(0,0) == firstDay, 1st week */ -static void MONTHCAL_CalcDayXY(const MONTHCAL_INFO *infoPtr, int day, int month, - int *x, int *y) +/* Sets the RECT struct r to the rectangle around the date + * + * PARAMETERS + * + * [I] infoPtr : pointer to control data + * [I] date : date value + * [O] x : day column (zero based) + * [O] y : week column (zero based) + */ +static void MONTHCAL_CalcDayXY(const MONTHCAL_INFO *infoPtr, + const SYSTEMTIME *date, int *x, int *y) { - int firstDay, prevMonth; + LONG cmp; + int first; - firstDay = (MONTHCAL_CalculateDayOfWeek(1, infoPtr->curSel.wMonth, infoPtr->curSel.wYear) +6 - infoPtr->firstDay)%7; + first = (MONTHCAL_CalculateDayOfWeek(1, infoPtr->curSel.wMonth, infoPtr->curSel.wYear) +6 - infoPtr->firstDay)%7; - if(month==infoPtr->curSel.wMonth) { - *x = (day + firstDay) % 7; - *y = (day + firstDay - *x) / 7; - return; - } - if(month < infoPtr->curSel.wMonth) { - prevMonth = month - 1; - if(prevMonth==0) - prevMonth = 12; + cmp = MONTHCAL_CompareMonths(date, &infoPtr->curSel); - *x = (MONTHCAL_MonthLength(prevMonth, infoPtr->curSel.wYear) - firstDay) % 7; + /* previous month */ + if(cmp == -1) { + *x = (first - MONTHCAL_MonthLength(date->wMonth, infoPtr->curSel.wYear) + date->wDay) % 7; *y = 0; return; } - *y = MONTHCAL_MonthLength(month, infoPtr->curSel.wYear - 1) / 7; - *x = (day + firstDay + MONTHCAL_MonthLength(month, - infoPtr->curSel.wYear)) % 7; + /* next month calculation is same as for current, + just add current month length */ + if(cmp == 1) { + first += MONTHCAL_MonthLength(infoPtr->curSel.wMonth, infoPtr->curSel.wYear); + } + + *x = (date->wDay + first) % 7; + *y = (date->wDay + first - *x) / 7; } /* x: column(day), y: row(week) */ -static void MONTHCAL_CalcDayRect(const MONTHCAL_INFO *infoPtr, RECT *r, int x, int y) +static inline void MONTHCAL_CalcDayRect(const MONTHCAL_INFO *infoPtr, RECT *r, int x, int y) { r->left = infoPtr->days.left + x * infoPtr->width_increment; r->right = r->left + infoPtr->width_increment; @@ -546,15 +564,13 @@ static void MONTHCAL_CalcDayRect(const MONTHCAL_INFO *infoPtr, RECT *r, int x, i } -/* sets the RECT struct r to the rectangle around the day and month */ -/* day is the day value of the month(1 == 1st), month is the month */ -/* value(january == 1, december == 12) */ +/* Sets the RECT struct r to the rectangle around the date */ static inline void MONTHCAL_CalcPosFromDay(const MONTHCAL_INFO *infoPtr, - int day, int month, RECT *r) + const SYSTEMTIME *date, RECT *r) { int x, y; - MONTHCAL_CalcDayXY(infoPtr, day, month, &x, &y); + MONTHCAL_CalcDayXY(infoPtr, date, &x, &y); MONTHCAL_CalcDayRect(infoPtr, r, x, y); } @@ -577,15 +593,13 @@ static BOOL MONTHCAL_SetDayFocus(MONTHCAL_INFO *infoPtr, const SYSTEMTIME *st) if(MONTHCAL_IsDateEqual(&infoPtr->focusedSel, st)) return FALSE; /* invalidate old focused day */ - MONTHCAL_CalcPosFromDay(infoPtr, infoPtr->focusedSel.wDay, - infoPtr->focusedSel.wMonth, &r); + MONTHCAL_CalcPosFromDay(infoPtr, &infoPtr->focusedSel, &r); InvalidateRect(infoPtr->hwndSelf, &r, FALSE); infoPtr->focusedSel = *st; } - MONTHCAL_CalcPosFromDay(infoPtr, infoPtr->focusedSel.wDay, - infoPtr->focusedSel.wMonth, &r); + MONTHCAL_CalcPosFromDay(infoPtr, &infoPtr->focusedSel, &r); if(!st && MONTHCAL_ValidateDate(&infoPtr->focusedSel)) infoPtr->focusedSel = st_null; @@ -596,16 +610,21 @@ static BOOL MONTHCAL_SetDayFocus(MONTHCAL_INFO *infoPtr, const SYSTEMTIME *st) return TRUE; } -/* day is the day in the month(1 == 1st of the month) */ -/* month is the month value(1 == january, 12 == december) */ -static void MONTHCAL_CircleDay(const MONTHCAL_INFO *infoPtr, HDC hdc, int day, int month) +/* Draw today day mark rectangle + * + * [I] hdc : context to draw in + * [I] day : day to mark with rectangle + * + */ +static void MONTHCAL_CircleDay(const MONTHCAL_INFO *infoPtr, HDC hdc, + const SYSTEMTIME *date) { HPEN hRedPen = CreatePen(PS_SOLID, 1, RGB(255, 0, 0)); HPEN hOldPen2 = SelectObject(hdc, hRedPen); HBRUSH hOldBrush; RECT day_rect; - MONTHCAL_CalcPosFromDay(infoPtr, day, month, &day_rect); + MONTHCAL_CalcPosFromDay(infoPtr, date, &day_rect); hOldBrush = SelectObject(hdc, GetStockObject(NULL_BRUSH)); Rectangle(hdc, day_rect.left, day_rect.top, day_rect.right, day_rect.bottom); @@ -918,14 +937,13 @@ static void MONTHCAL_Refresh(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT (infoPtr->curSel.wYear == infoPtr->todaysDate.wYear) && !(infoPtr->dwStyle & MCS_NOTODAYCIRCLE)) { - MONTHCAL_CircleDay(infoPtr, hdc, infoPtr->todaysDate.wDay, infoPtr->todaysDate.wMonth); + MONTHCAL_CircleDay(infoPtr, hdc, &infoPtr->todaysDate); } /* draw focused day */ if(!MONTHCAL_IsDateEqual(&infoPtr->focusedSel, &st_null)) { - MONTHCAL_CalcPosFromDay(infoPtr, infoPtr->focusedSel.wDay, - infoPtr->focusedSel.wMonth, &rcDay); + MONTHCAL_CalcPosFromDay(infoPtr, &infoPtr->focusedSel, &rcDay); DrawFocusRect(hdc, &rcDay); } @@ -937,11 +955,12 @@ static void MONTHCAL_Refresh(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT static const WCHAR fmt_todayW[] = { '%','s',' ','%','s',0 }; RECT rtoday; - if(!(infoPtr->dwStyle & MCS_NOTODAYCIRCLE)) { + if(!(infoPtr->dwStyle & MCS_NOTODAYCIRCLE)) { + SYSTEMTIME fake_st = infoPtr->curSel; + /*day is the number of days from nextmonth we put on the calendar */ - MONTHCAL_CircleDay(infoPtr, hdc, - day+MONTHCAL_MonthLength(infoPtr->curSel.wMonth, infoPtr->curSel.wYear), - infoPtr->curSel.wMonth); + fake_st.wDay = day + MONTHCAL_MonthLength(infoPtr->curSel.wMonth, infoPtr->curSel.wYear); + MONTHCAL_CircleDay(infoPtr, hdc, &fake_st); } if (!LoadStringW(COMCTL32_hModule, IDM_TODAY, buf1, countof(buf1))) { @@ -1531,9 +1550,8 @@ MONTHCAL_UpdateToday(MONTHCAL_INFO *infoPtr, const SYSTEMTIME *today) if(MONTHCAL_IsDateEqual(today, &infoPtr->todaysDate)) return FALSE; - MONTHCAL_CalcPosFromDay(infoPtr, infoPtr->todaysDate.wDay, - infoPtr->todaysDate.wMonth, &old_r); - MONTHCAL_CalcPosFromDay(infoPtr, today->wDay, today->wMonth, &new_r); + MONTHCAL_CalcPosFromDay(infoPtr, &infoPtr->todaysDate, &old_r); + MONTHCAL_CalcPosFromDay(infoPtr, today, &new_r); infoPtr->todaysDate = *today; @@ -2069,7 +2087,7 @@ MONTHCAL_MouseMove(MONTHCAL_INFO *infoPtr, LPARAM lParam) /* if pointer is over focused day still there's nothing to do */ if(!MONTHCAL_SetDayFocus(infoPtr, &ht.st)) return 0; - MONTHCAL_CalcPosFromDay(infoPtr, ht.st.wDay, ht.st.wMonth, &r); + MONTHCAL_CalcPosFromDay(infoPtr, &ht.st, &r); if(infoPtr->dwStyle & MCS_MULTISELECT) { SYSTEMTIME st[2];

1 0

Nikolay Sivov : comctl32/monthcal: Simplify parameter set of day of week calculation helper.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: 4651624d350e887398bc83eb7f8ae77e58a5f369 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4651624d350e887398bc83eb7… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Oct 11 04:28:09 2009 +0400 comctl32/monthcal: Simplify parameter set of day of week calculation helper. --- dlls/comctl32/comctl32.h | 2 +- dlls/comctl32/datetime.c | 6 +-- dlls/comctl32/monthcal.c | 70 ++++++++++++++++++++++----------------------- 3 files changed, 37 insertions(+), 41 deletions(-) diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h index 4cad907..3d172ae 100644 --- a/dlls/comctl32/comctl32.h +++ b/dlls/comctl32/comctl32.h @@ -231,7 +231,7 @@ extern void UPDOWN_Unregister(void); int MONTHCAL_MonthLength(int month, int year); -int MONTHCAL_CalculateDayOfWeek(WORD day, WORD month, WORD year); +int MONTHCAL_CalculateDayOfWeek(SYSTEMTIME *date, BOOL inplace); extern void THEMING_Initialize(void); extern void THEMING_Uninitialize(void); diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 0165166..f00b588 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -88,7 +88,7 @@ typedef struct /* in monthcal.c */ extern int MONTHCAL_MonthLength(int month, int year); -extern int MONTHCAL_CalculateDayOfWeek(WORD day, WORD month, WORD year); +extern int MONTHCAL_CalculateDayOfWeek(SYSTEMTIME *date, BOOL inplace); /* this list of defines is closely related to `allowedformatchars' defined * in datetime.c; the high nibble indicates the `base type' of the format @@ -177,9 +177,7 @@ DATETIME_SetSystemTime (DATETIME_INFO *infoPtr, DWORD flag, const SYSTEMTIME *sy infoPtr->dateValid = TRUE; infoPtr->date = *systime; /* always store a valid day of week */ - infoPtr->date.wDayOfWeek = - MONTHCAL_CalculateDayOfWeek(infoPtr->date.wDay, infoPtr->date.wMonth, - infoPtr->date.wYear); + MONTHCAL_CalculateDayOfWeek(&infoPtr->date, TRUE); SendMessageW (infoPtr->hMonthCal, MCM_SETCURSEL, 0, (LPARAM)(&infoPtr->date)); SendMessageW (infoPtr->hwndCheckbut, BM_SETCHECK, BST_CHECKED, 0); diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 72d102a..a0fa58f 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -406,26 +406,24 @@ static BOOL MONTHCAL_ValidateTime(const SYSTEMTIME *time) /* Returns the day in the week * * PARAMETERS - * [i] day : day of month [1, 31] - * [I] month : month number [1, 12] - * [I] year : year value + * [i] date : input date + * [I] inplace : set calculated value back to date structure * * RETURN VALUE * day of week in SYSTEMTIME format: (0 == sunday,..., 6 == saturday) */ -int MONTHCAL_CalculateDayOfWeek(WORD day, WORD month, WORD year) +int MONTHCAL_CalculateDayOfWeek(SYSTEMTIME *date, BOOL inplace) { + SYSTEMTIME st = st_null; FILETIME ft; - SYSTEMTIME st; - st.wYear = year; - st.wMonth = month; - st.wDay = day; - st.wHour = st.wMinute = st.wSecond = st.wMilliseconds = 0; + MONTHCAL_CopyDate(date, &st); SystemTimeToFileTime(&st, &ft); FileTimeToSystemTime(&ft, &st); + if (inplace) date->wDayOfWeek = st.wDayOfWeek; + return st.wDayOfWeek; } @@ -437,8 +435,7 @@ static inline void MONTHCAL_GetNextMonth(SYSTEMTIME *date) date->wMonth = 1; date->wYear++; } - date->wDayOfWeek = MONTHCAL_CalculateDayOfWeek(date->wDay, date->wMonth, - date->wYear); + MONTHCAL_CalculateDayOfWeek(date, TRUE); } /* properly updates date to point on prev month */ @@ -449,16 +446,17 @@ static inline void MONTHCAL_GetPrevMonth(SYSTEMTIME *date) date->wMonth = 12; date->wYear--; } - date->wDayOfWeek = MONTHCAL_CalculateDayOfWeek(date->wDay, date->wMonth, - date->wYear); + MONTHCAL_CalculateDayOfWeek(date, TRUE); } /* Returns full date for a first currently visible day */ static void MONTHCAL_GetMinDate(const MONTHCAL_INFO *infoPtr, SYSTEMTIME *date) { + SYSTEMTIME st_first = infoPtr->curSel; int firstDay; - firstDay = MONTHCAL_CalculateDayOfWeek(1, infoPtr->curSel.wMonth, infoPtr->curSel.wYear); + st_first.wDay = 1; + firstDay = MONTHCAL_CalculateDayOfWeek(&st_first, FALSE); *date = infoPtr->curSel; MONTHCAL_GetPrevMonth(date); @@ -470,8 +468,7 @@ static void MONTHCAL_GetMinDate(const MONTHCAL_INFO *infoPtr, SYSTEMTIME *date) date->wDay -= 7; /* fix day of week */ - date->wDayOfWeek = MONTHCAL_CalculateDayOfWeek(date->wDay, date->wMonth, - date->wYear); + MONTHCAL_CalculateDayOfWeek(date, TRUE); } /* Returns full date for a last currently visible day */ @@ -488,8 +485,7 @@ static void MONTHCAL_GetMaxDate(const MONTHCAL_INFO *infoPtr, SYSTEMTIME *date) MONTHCAL_MonthLength(infoPtr->curSel.wMonth, infoPtr->curSel.wYear); /* fix day of week */ - date->wDayOfWeek = MONTHCAL_CalculateDayOfWeek(date->wDay, date->wMonth, - date->wYear); + MONTHCAL_CalculateDayOfWeek(date, TRUE); } /* From a given point, calculate the row (weekpos), column(daypos) @@ -500,6 +496,7 @@ static int MONTHCAL_CalcDayFromPos(const MONTHCAL_INFO *infoPtr, int x, int y, { int retval, firstDay; RECT rcClient; + SYSTEMTIME st = infoPtr->curSel; GetClientRect(infoPtr->hwndSelf, &rcClient); @@ -512,7 +509,8 @@ static int MONTHCAL_CalcDayFromPos(const MONTHCAL_INFO *infoPtr, int x, int y, *daypos = (x - infoPtr->days.left ) / infoPtr->width_increment; *weekpos = (y - infoPtr->days.top ) / infoPtr->height_increment; - firstDay = (MONTHCAL_CalculateDayOfWeek(1, infoPtr->curSel.wMonth, infoPtr->curSel.wYear)+6 - infoPtr->firstDay)%7; + st.wDay = 1; + firstDay = (MONTHCAL_CalculateDayOfWeek(&st, FALSE) + 6 - infoPtr->firstDay) % 7; retval = *daypos + (7 * *weekpos) - firstDay; return retval; } @@ -529,10 +527,12 @@ static int MONTHCAL_CalcDayFromPos(const MONTHCAL_INFO *infoPtr, int x, int y, static void MONTHCAL_CalcDayXY(const MONTHCAL_INFO *infoPtr, const SYSTEMTIME *date, int *x, int *y) { + SYSTEMTIME st = infoPtr->curSel; LONG cmp; int first; - first = (MONTHCAL_CalculateDayOfWeek(1, infoPtr->curSel.wMonth, infoPtr->curSel.wYear) +6 - infoPtr->firstDay)%7; + st.wDay = 1; + first = (MONTHCAL_CalculateDayOfWeek(&st, FALSE) + 6 - infoPtr->firstDay) % 7; cmp = MONTHCAL_CompareMonths(date, &infoPtr->curSel); @@ -985,6 +985,7 @@ static void MONTHCAL_Refresh(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT if(infoPtr->dwStyle & MCS_WEEKNUMBERS) { static const WCHAR fmt_weekW[] = { '%','d',0 }; /* week numbers format */ int mindays, weeknum, weeknum1; + SYSTEMTIME st = infoPtr->curSel; /* Rules what week to call the first week of a new year: LOCALE_IFIRSTWEEKOFYEAR == 0 (e.g US?): @@ -1009,7 +1010,8 @@ static void MONTHCAL_Refresh(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT if (infoPtr->curSel.wMonth < 2) { /* calculate all those exceptions for january */ - weeknum1 = MONTHCAL_CalculateDayOfWeek(1, 1, infoPtr->curSel.wYear); + st.wDay = st.wMonth = 1; + weeknum1 = MONTHCAL_CalculateDayOfWeek(&st, FALSE); if ((infoPtr->firstDay - weeknum1) % 7 > mindays) weeknum = 1; else @@ -1018,9 +1020,10 @@ static void MONTHCAL_Refresh(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT for(i = 0; i < 11; i++) weeknum += MONTHCAL_MonthLength(i+1, infoPtr->curSel.wYear - 1); - weeknum += startofprescal + 7; - weeknum /= 7; - weeknum1 = MONTHCAL_CalculateDayOfWeek(1, 1, infoPtr->curSel.wYear - 1); + weeknum += startofprescal + 7; + weeknum /= 7; + st.wYear -= 1; + weeknum1 = MONTHCAL_CalculateDayOfWeek(&st, FALSE); if ((infoPtr->firstDay - weeknum1) % 7 > mindays) weeknum++; } } @@ -1032,7 +1035,8 @@ static void MONTHCAL_Refresh(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT weeknum += startofprescal + 7; weeknum /= 7; - weeknum1 = MONTHCAL_CalculateDayOfWeek(1, 1, infoPtr->curSel.wYear); + st.wDay = st.wMonth = 1; + weeknum1 = MONTHCAL_CalculateDayOfWeek(&st, FALSE); if ((infoPtr->firstDay - weeknum1) % 7 > mindays) weeknum++; } @@ -1272,11 +1276,10 @@ MONTHCAL_GetMonthRange(const MONTHCAL_INFO *infoPtr, DWORD flag, SYSTEMTIME *st) } else st[0].wDay = 1; - st[0].wDayOfWeek = MONTHCAL_CalculateDayOfWeek(1, st[0].wMonth, st[0].wYear); + MONTHCAL_CalculateDayOfWeek(&st[0], TRUE); st[1].wDay = MONTHCAL_MonthLength(st[1].wMonth, st[1].wYear); - st[1].wDayOfWeek = MONTHCAL_CalculateDayOfWeek(st[1].wDay, st[1].wMonth, - st[1].wYear); + MONTHCAL_CalculateDayOfWeek(&st[1], TRUE); /* a single current month used */ return 1; } @@ -1503,12 +1506,8 @@ MONTHCAL_SetSelRange(MONTHCAL_INFO *infoPtr, SYSTEMTIME *range) } /* update day of week */ - infoPtr->minSel.wDayOfWeek = - MONTHCAL_CalculateDayOfWeek(infoPtr->minSel.wDay, infoPtr->minSel.wMonth, - infoPtr->minSel.wYear); - infoPtr->maxSel.wDayOfWeek = - MONTHCAL_CalculateDayOfWeek(infoPtr->maxSel.wDay, infoPtr->maxSel.wMonth, - infoPtr->maxSel.wYear); + MONTHCAL_CalculateDayOfWeek(&infoPtr->minSel, TRUE); + MONTHCAL_CalculateDayOfWeek(&infoPtr->maxSel, TRUE); /* redraw if bounds changed */ /* FIXME: no actual need to redraw everything */ @@ -1667,8 +1666,7 @@ MONTHCAL_HitTest(const MONTHCAL_INFO *infoPtr, MCHITTESTINFO *lpht) lpht->st.wDay = day; } /* always update day of week */ - lpht->st.wDayOfWeek = MONTHCAL_CalculateDayOfWeek(lpht->st.wDay, lpht->st.wMonth, - lpht->st.wYear); + MONTHCAL_CalculateDayOfWeek(&lpht->st, TRUE); goto done; } if(PtInRect(&infoPtr->todayrect, lpht->pt)) {

1 0

Nikolay Sivov : comctl32/monthcal: Fix multiselection days painting, including intersections with prev/next months.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: c9e3e3bc8e592dc717fd0ba2779690d5ddcc9878 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9e3e3bc8e592dc717fd0ba27… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Oct 11 05:03:59 2009 +0400 comctl32/monthcal: Fix multiselection days painting, including intersections with prev/next months. --- dlls/comctl32/monthcal.c | 50 ++++++++++++++++++++++++++++++--------------- 1 files changed, 33 insertions(+), 17 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index a0fa58f..cdb21c6 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -283,6 +283,17 @@ static LONG MONTHCAL_CompareMonths(const SYSTEMTIME *first, const SYSTEMTIME *se return MONTHCAL_CompareSystemTime(&st_first, &st_second); } +static LONG MONTHCAL_CompareDate(const SYSTEMTIME *first, const SYSTEMTIME *second) +{ + SYSTEMTIME st_first, st_second; + + st_first = st_second = st_null; + MONTHCAL_CopyDate(first, &st_first); + MONTHCAL_CopyDate(second, &st_second); + + return MONTHCAL_CompareSystemTime(&st_first, &st_second); +} + /* Checks largest possible date range and configured one * * PARAMETERS @@ -634,7 +645,7 @@ static void MONTHCAL_CircleDay(const MONTHCAL_INFO *infoPtr, HDC hdc, SelectObject(hdc, hOldPen2); } -static void MONTHCAL_DrawDay(const MONTHCAL_INFO *infoPtr, HDC hdc, int day, int month, +static void MONTHCAL_DrawDay(const MONTHCAL_INFO *infoPtr, HDC hdc, const SYSTEMTIME *st, int x, int y, int bold) { static const WCHAR fmtW[] = { '%','d',0 }; @@ -645,7 +656,7 @@ static void MONTHCAL_DrawDay(const MONTHCAL_INFO *infoPtr, HDC hdc, int day, int COLORREF oldCol = 0; COLORREF oldBk = 0; - wsprintfW(buf, fmtW, day); + wsprintfW(buf, fmtW, st->wDay); /* No need to check styles: when selection is not valid, it is set to zero. * 1<day<31, so everything is OK. @@ -653,11 +664,11 @@ static void MONTHCAL_DrawDay(const MONTHCAL_INFO *infoPtr, HDC hdc, int day, int MONTHCAL_CalcDayRect(infoPtr, &r, x, y); - if((day>=infoPtr->minSel.wDay) && (day<=infoPtr->maxSel.wDay) - && (month == infoPtr->curSel.wMonth)) { + if ((MONTHCAL_CompareDate(st, &infoPtr->minSel) >= 0) && + (MONTHCAL_CompareDate(st, &infoPtr->maxSel) <= 0)) { RECT r2; - TRACE("%d %d %d\n",day, infoPtr->minSel.wDay, infoPtr->maxSel.wDay); + TRACE("%d %d %d\n", st->wDay, infoPtr->minSel.wDay, infoPtr->maxSel.wDay); TRACE("%s\n", wine_dbgstr_rect(&r)); oldCol = SetTextColor(hdc, infoPtr->monthbk); oldBk = SetBkColor(hdc, infoPtr->trailingtxt); @@ -853,53 +864,54 @@ static void MONTHCAL_Refresh(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT i = 0; m = 0; - while(day <= MONTHCAL_MonthLength(prevMonth, infoPtr->curSel.wYear)) { + while(st.wDay <= MONTHCAL_MonthLength(prevMonth, infoPtr->curSel.wYear)) { MONTHCAL_CalcDayRect(infoPtr, &rcDay, i, 0); if(IntersectRect(&rcTemp, &(ps->rcPaint), &rcDay)) { - MONTHCAL_DrawDay(infoPtr, hdc, day, prevMonth, i, 0, + MONTHCAL_DrawDay(infoPtr, hdc, &st, i, 0, infoPtr->monthdayState[m] & mask); } - mask<<=1; - day++; + mask <<= 1; + st.wDay++; i++; } /* draw `current' month */ day = 1; /* start at the beginning of the current month */ - + st = infoPtr->curSel; + st.wDay = 1; infoPtr->firstDayplace = i; SetTextColor(hdc, infoPtr->txt); m++; mask = 1; /* draw the first week of the current month */ - while(i<7) { + while(i < 7) { MONTHCAL_CalcDayRect(infoPtr, &rcDay, i, 0); if(IntersectRect(&rcTemp, &(ps->rcPaint), &rcDay)) { - MONTHCAL_DrawDay(infoPtr, hdc, day, infoPtr->curSel.wMonth, i, 0, + MONTHCAL_DrawDay(infoPtr, hdc, &st, i, 0, infoPtr->monthdayState[m] & mask); } mask<<=1; - day++; + st.wDay++; i++; } j = 1; /* move to the 2nd week of the current month */ i = 0; /* move back to sunday */ - while(day <= MONTHCAL_MonthLength(infoPtr->curSel.wMonth, infoPtr->curSel.wYear)) { + while(st.wDay <= MONTHCAL_MonthLength(infoPtr->curSel.wMonth, infoPtr->curSel.wYear)) { MONTHCAL_CalcDayRect(infoPtr, &rcDay, i, j); if(IntersectRect(&rcTemp, &(ps->rcPaint), &rcDay)) { - MONTHCAL_DrawDay(infoPtr, hdc, day, infoPtr->curSel.wMonth, i, j, + MONTHCAL_DrawDay(infoPtr, hdc, &st, i, j, infoPtr->monthdayState[m] & mask); } mask<<=1; - day++; + st.wDay++; i++; if(i>6) { /* past saturday, goto the next weeks sunday */ i = 0; @@ -910,6 +922,9 @@ static void MONTHCAL_Refresh(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT /* draw `next' month */ day = 1; /* start at the first day of the next month */ + st = infoPtr->curSel; + st.wDay = 1; + MONTHCAL_GetNextMonth(&st); m++; mask = 1; @@ -918,11 +933,12 @@ static void MONTHCAL_Refresh(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT MONTHCAL_CalcDayRect(infoPtr, &rcDay, i, j); if(IntersectRect(&rcTemp, &(ps->rcPaint), &rcDay)) { - MONTHCAL_DrawDay(infoPtr, hdc, day, infoPtr->curSel.wMonth + 1, i, j, + MONTHCAL_DrawDay(infoPtr, hdc, &st, i, j, infoPtr->monthdayState[m] & mask); } mask<<=1; + st.wDay++; day++; i++; if(i==7) { /* past saturday, go to next week's sunday */

1 0

Nikolay Sivov : comctl32/monthcal: Fix selection during navigation with prev/next buttons.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: ecf89c7e3d1e21434e73a25eadfc77bca9dbff71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecf89c7e3d1e21434e73a25ea… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Oct 11 15:33:02 2009 +0400 comctl32/monthcal: Fix selection during navigation with prev/next buttons. --- dlls/comctl32/monthcal.c | 80 ++++++++++++++++++++++----------------------- 1 files changed, 39 insertions(+), 41 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index cdb21c6..b46bac6 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1520,10 +1520,12 @@ MONTHCAL_SetSelRange(MONTHCAL_INFO *infoPtr, SYSTEMTIME *range) infoPtr->minSel = range[1]; infoPtr->maxSel = range[0]; } + infoPtr->curSel = infoPtr->minSel; /* update day of week */ MONTHCAL_CalculateDayOfWeek(&infoPtr->minSel, TRUE); MONTHCAL_CalculateDayOfWeek(&infoPtr->maxSel, TRUE); + MONTHCAL_CalculateDayOfWeek(&infoPtr->curSel, TRUE); /* redraw if bounds changed */ /* FIXME: no actual need to redraw everything */ @@ -1725,35 +1727,42 @@ static void MONTHCAL_NotifyDayState(MONTHCAL_INFO *infoPtr) } } -static void MONTHCAL_GoToNextMonth(MONTHCAL_INFO *infoPtr) +static void MONTHCAL_GoToPrevNextMonth(MONTHCAL_INFO *infoPtr, BOOL prev) { - SYSTEMTIME next = infoPtr->curSel; - - TRACE("\n"); - - MONTHCAL_GetNextMonth(&next); - - if(!MONTHCAL_IsDateInValidRange(infoPtr, &next, FALSE)) return; - - infoPtr->curSel = next; + SYSTEMTIME st = infoPtr->curSel; - MONTHCAL_NotifyDayState(infoPtr); -} + TRACE("%s\n", prev ? "prev" : "next"); + if(prev) MONTHCAL_GetPrevMonth(&st); else MONTHCAL_GetNextMonth(&st); -static void MONTHCAL_GoToPrevMonth(MONTHCAL_INFO *infoPtr) -{ - SYSTEMTIME prev = infoPtr->curSel; + if(!MONTHCAL_IsDateInValidRange(infoPtr, &st, FALSE)) return; - TRACE("\n"); + if(infoPtr->dwStyle & MCS_MULTISELECT) + { + SYSTEMTIME range[2]; - MONTHCAL_GetPrevMonth(&prev); + range[0] = infoPtr->minSel; + range[1] = infoPtr->maxSel; - if(!MONTHCAL_IsDateInValidRange(infoPtr, &prev, FALSE)) return; + if(prev) + { + MONTHCAL_GetPrevMonth(&range[0]); + MONTHCAL_GetPrevMonth(&range[1]); + } + else + { + MONTHCAL_GetNextMonth(&range[0]); + MONTHCAL_GetNextMonth(&range[1]); + } - infoPtr->curSel = prev; + MONTHCAL_SetSelRange(infoPtr, range); + } + else + MONTHCAL_SetCurSel(infoPtr, &st); MONTHCAL_NotifyDayState(infoPtr); + + MONTHCAL_NotifySelectionChange(infoPtr); } static LRESULT @@ -1892,14 +1901,14 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) switch(hit) { case MCHT_TITLEBTNNEXT: - MONTHCAL_GoToNextMonth(infoPtr); + MONTHCAL_GoToPrevNextMonth(infoPtr, FALSE); infoPtr->status = MC_NEXTPRESSED; SetTimer(infoPtr->hwndSelf, MC_PREVNEXTMONTHTIMER, MC_PREVNEXTMONTHDELAY, 0); InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); return 0; case MCHT_TITLEBTNPREV: - MONTHCAL_GoToPrevMonth(infoPtr); + MONTHCAL_GoToPrevNextMonth(infoPtr, TRUE); infoPtr->status = MC_PREVPRESSED; SetTimer(infoPtr->hwndSelf, MC_PREVNEXTMONTHTIMER, MC_PREVNEXTMONTHDELAY, 0); InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); @@ -1951,17 +1960,13 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) case MCHT_CALENDARDATEPREV: case MCHT_CALENDARDATE: { - MONTHCAL_CopyDate(&ht.st, &infoPtr->firstSel); - - if(infoPtr->dwStyle & MCS_MULTISELECT) - { - SYSTEMTIME st[2]; + SYSTEMTIME st[2]; - st[0] = st[1] = ht.st; + MONTHCAL_CopyDate(&ht.st, &infoPtr->firstSel); - /* clear selection range */ - MONTHCAL_SetSelRange(infoPtr, st); - } + st[0] = st[1] = ht.st; + /* clear selection range */ + MONTHCAL_SetSelRange(infoPtr, st); infoPtr->status = MC_SEL_LBUTDOWN; MONTHCAL_SetDayFocus(infoPtr, &ht.st); @@ -2016,15 +2021,8 @@ MONTHCAL_LButtonUp(MONTHCAL_INFO *infoPtr, LPARAM lParam) { SYSTEMTIME sel = infoPtr->curSel; - if(!(infoPtr->dwStyle & MCS_MULTISELECT)) - { - SYSTEMTIME st[2]; - - st[0] = st[1] = ht.st; - MONTHCAL_SetSelRange(infoPtr, st); - /* will be invalidated here */ - MONTHCAL_SetCurSel(infoPtr, &st[0]); - } + /* will be invalidated here */ + MONTHCAL_SetCurSel(infoPtr, &ht.st); /* send MCN_SELCHANGE only if new date selected */ if (!MONTHCAL_IsDateEqual(&sel, &ht.st)) @@ -2044,8 +2042,8 @@ MONTHCAL_Timer(MONTHCAL_INFO *infoPtr, WPARAM id) switch(id) { case MC_PREVNEXTMONTHTIMER: - if(infoPtr->status & MC_NEXTPRESSED) MONTHCAL_GoToNextMonth(infoPtr); - if(infoPtr->status & MC_PREVPRESSED) MONTHCAL_GoToPrevMonth(infoPtr); + if(infoPtr->status & MC_NEXTPRESSED) MONTHCAL_GoToPrevNextMonth(infoPtr, FALSE); + if(infoPtr->status & MC_PREVPRESSED) MONTHCAL_GoToPrevNextMonth(infoPtr, TRUE); InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); break; case MC_TODAYUPDATETIMER:

1 0

Henri Verbeet : d3d9: Cleanup the stateblock test callbacks a bit.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: 803eab27c7d69451251eeb6a77623cf377852c23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=803eab27c7d69451251eeb6a7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 12 10:10:25 2009 +0200 d3d9: Cleanup the stateblock test callbacks a bit. --- dlls/d3d9/tests/stateblock.c | 118 +++++++++++++++++++----------------------- 1 files changed, 53 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=803eab27c7d69451251ee…

1 0

Henri Verbeet : d3d10: Explicitly handle D3D10_SVC_STRUCT in set_variable_vtbl().
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: b8668a9ce58c14f7531bfe3d4e55b57416428fe7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8668a9ce58c14f7531bfe3d4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 12 10:10:26 2009 +0200 d3d10: Explicitly handle D3D10_SVC_STRUCT in set_variable_vtbl(). --- dlls/d3d10/effect.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index b41daeb..e567bd8 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -483,6 +483,10 @@ static void set_variable_vtbl(struct d3d10_effect_variable *v) v->vtbl = (ID3D10EffectVariableVtbl *)&d3d10_effect_matrix_variable_vtbl; break; + case D3D10_SVC_STRUCT: + v->vtbl = &d3d10_effect_variable_vtbl; + break; + default: FIXME("Unhandled type class %s.\n", debug_d3d10_shader_variable_class(v->type->type_class)); v->vtbl = &d3d10_effect_variable_vtbl;

1 0

Paul Vriens : user32/tests: Fix an intermittent test failure.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: 42f7e4a4d9b9ebc9a0364647a34910038562fe64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42f7e4a4d9b9ebc9a0364647a… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Oct 12 09:21:25 2009 +0200 user32/tests: Fix an intermittent test failure. --- dlls/user32/tests/listbox.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 0aef698..942c780 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -303,6 +303,7 @@ static void test_ownerdraw(void) hLB = create_listbox(LBS_OWNERDRAWFIXED | WS_CHILD | WS_VISIBLE, parent); assert(hLB); + SetForegroundWindow(hLB); UpdateWindow(hLB); /* make height short enough */

1 0

Dmitry Timoshkov : kernel32: Implement HeapQueryInformation, add some basic tests for it.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: 27ebfdb879ad4ddccbef5a864ea6928c7b80ccc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27ebfdb879ad4ddccbef5a864… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Oct 12 17:20:57 2009 +0900 kernel32: Implement HeapQueryInformation, add some basic tests for it. --- dlls/kernel32/heap.c | 8 ++++++ dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/tests/heap.c | 55 +++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/heap.c | 23 ++++++++++++++++++ dlls/ntdll/ntdll.spec | 2 +- include/winternl.h | 1 + 6 files changed, 89 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 93cf545..e85ccc3 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -291,6 +291,14 @@ SIZE_T WINAPI HeapSize( HANDLE heap, DWORD flags, LPCVOID ptr ) return RtlSizeHeap( heap, flags, ptr ); } +BOOL WINAPI HeapQueryInformation( HANDLE heap, HEAP_INFORMATION_CLASS info_class, + PVOID info, SIZE_T size_in, PSIZE_T size_out) +{ + NTSTATUS ret = RtlQueryHeapInformation( heap, info_class, info, size_in, size_out ); + if (ret) SetLastError( RtlNtStatusToDosError(ret) ); + return !ret; +} + BOOL WINAPI HeapSetInformation( HANDLE heap, HEAP_INFORMATION_CLASS infoclass, PVOID info, SIZE_T size) { FIXME("%p %d %p %ld\n", heap, infoclass, info, size ); diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index c97aa28..f5df031 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -707,7 +707,7 @@ @ stub HeapExtend @ stdcall HeapFree(long long long) ntdll.RtlFreeHeap @ stdcall HeapLock(long) -# @ stub HeapQueryInformation +@ stdcall HeapQueryInformation(long long ptr long ptr) @ stub HeapQueryTagW @ stdcall HeapReAlloc(long long ptr long) ntdll.RtlReAllocateHeap @ stub HeapSetFlags diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 19b4106..c59d304 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -28,6 +28,8 @@ #define MAGIC_DEAD 0xdeadbeef +static BOOL (WINAPI *pHeapQueryInformation)(HANDLE, HEAP_INFORMATION_CLASS, PVOID, SIZE_T, PSIZE_T); + static SIZE_T resize_9x(SIZE_T size) { DWORD dwSizeAligned = (size + 3) & ~3; @@ -410,6 +412,58 @@ static void test_obsolete_flags(void) } } +static void test_HeapQueryInformation(void) +{ + ULONG info; + SIZE_T size; + BOOL ret; + + pHeapQueryInformation = (void *)GetProcAddress(GetModuleHandle("kernel32.dll"), "HeapQueryInformation"); + if (!pHeapQueryInformation) + { + win_skip("HeapQueryInformation is not available\n"); + return; + } + + if (0) /* crashes under XP */ + { + size = 0; + ret = pHeapQueryInformation(0, + HeapCompatibilityInformation, + &info, sizeof(info), &size); + size = 0; + ret = pHeapQueryInformation(GetProcessHeap(), + HeapCompatibilityInformation, + NULL, sizeof(info), &size); + } + + size = 0; + SetLastError(0xdeadbeef); + ret = pHeapQueryInformation(GetProcessHeap(), + HeapCompatibilityInformation, + NULL, 0, &size); + ok(!ret, "HeapQueryInformation should fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "expected ERROR_INSUFFICIENT_BUFFER got %u\n", GetLastError()); + ok(size == sizeof(ULONG), "expected 4, got %lu\n", size); + + SetLastError(0xdeadbeef); + ret = pHeapQueryInformation(GetProcessHeap(), + HeapCompatibilityInformation, + NULL, 0, NULL); + ok(!ret, "HeapQueryInformation should fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "expected ERROR_INSUFFICIENT_BUFFER got %u\n", GetLastError()); + + info = 0xdeadbeaf; + SetLastError(0xdeadbeef); + ret = pHeapQueryInformation(GetProcessHeap(), + HeapCompatibilityInformation, + &info, sizeof(info) + 1, NULL); + ok(ret, "HeapQueryInformation error %u\n", GetLastError()); + ok(info == 0 || info == 1 || info == 2, "expected 0, 1 or 2, got %u\n", info); +} + START_TEST(heap) { test_heap(); @@ -422,4 +476,5 @@ START_TEST(heap) test_sized_HeapReAlloc(1, (1 << 20)); test_sized_HeapReAlloc((1 << 20), (2 << 20)); test_sized_HeapReAlloc((1 << 20), 1); + test_HeapQueryInformation(); } diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 14cac32..adaf693 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1961,3 +1961,26 @@ ULONG WINAPI RtlGetProcessHeaps( ULONG count, HANDLE *heaps ) RtlLeaveCriticalSection( &processHeap->critSection ); return total; } + +/*********************************************************************** + * RtlQueryHeapInformation (NTDLL.@) + */ +NTSTATUS WINAPI RtlQueryHeapInformation( HANDLE heap, HEAP_INFORMATION_CLASS info_class, + PVOID info, SIZE_T size_in, PSIZE_T size_out) +{ + switch (info_class) + { + case HeapCompatibilityInformation: + if (size_out) *size_out = sizeof(ULONG); + + if (size_in < sizeof(ULONG)) + return STATUS_BUFFER_TOO_SMALL; + + *(ULONG *)info = 0; /* standard heap */ + return STATUS_SUCCESS; + + default: + FIXME("Unknown heap information class %u\n", info_class); + return STATUS_INVALID_INFO_CLASS; + } +} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 8787611..70647d2 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -768,7 +768,7 @@ @ stdcall RtlQueryAtomInAtomTable(ptr long ptr ptr ptr ptr) @ stdcall RtlQueryDepthSList(ptr) @ stdcall RtlQueryEnvironmentVariable_U(ptr ptr ptr) -@ stub RtlQueryHeapInformation +@ stdcall RtlQueryHeapInformation(long long ptr long ptr) @ stdcall RtlQueryInformationAcl(ptr ptr long long) @ stdcall RtlQueryInformationActivationContext(long long ptr long ptr long ptr) @ stub RtlQueryInformationActiveActivationContext diff --git a/include/winternl.h b/include/winternl.h index a6fea7d..a78e9e5 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2412,6 +2412,7 @@ NTSYSAPI BOOLEAN WINAPI RtlPrefixString(const STRING*,const STRING*,BOOLEAN); NTSYSAPI BOOLEAN WINAPI RtlPrefixUnicodeString(const UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlQueryAtomInAtomTable(RTL_ATOM_TABLE,RTL_ATOM,ULONG*,ULONG*,WCHAR*,ULONG*); NTSYSAPI NTSTATUS WINAPI RtlQueryEnvironmentVariable_U(PWSTR,PUNICODE_STRING,PUNICODE_STRING); +NTSYSAPI NTSTATUS WINAPI RtlQueryHeapInformation(HANDLE,HEAP_INFORMATION_CLASS,PVOID,SIZE_T,PSIZE_T); NTSYSAPI NTSTATUS WINAPI RtlQueryInformationAcl(PACL,LPVOID,DWORD,ACL_INFORMATION_CLASS); NTSYSAPI NTSTATUS WINAPI RtlQueryInformationActivationContext(ULONG,HANDLE,PVOID,ULONG,PVOID,SIZE_T,SIZE_T*); NTSYSAPI NTSTATUS WINAPI RtlQueryProcessDebugInformation(ULONG,ULONG,PDEBUG_BUFFER);

1 0

Nikolay Sivov : comctl32/tab: Cache window GWL_STYLE style.
by Alexandre Julliard 12 Oct '09

12 Oct '09

Module: wine Branch: master Commit: 9b06ec73fcd470367751f052718ab47aafd35d1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b06ec73fcd470367751f0527… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Oct 9 22:27:32 2009 +0400 comctl32/tab: Cache window GWL_STYLE style. --- dlls/comctl32/tab.c | 231 +++++++++++++++++++++++++++------------------------ 1 files changed, 123 insertions(+), 108 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b06ec73fcd470367751f…

1 0