September 2009 - Wine-commits

Nikolay Sivov : comctl32/monthcal: Make tests not depend on each other.
by Alexandre Julliard 28 Sep '09

28 Sep '09

Module: wine Branch: master Commit: 0617baf2c3e3b53e9a47a55c899a2199b282e430 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0617baf2c3e3b53e9a47a55c8… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Sep 26 00:51:04 2009 +0400 comctl32/monthcal: Make tests not depend on each other. --- dlls/comctl32/tests/monthcal.c | 189 +++++++++++++++++++++++++++++----------- 1 files changed, 138 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0617baf2c3e3b53e9a47a…

1 0

Nikolay Sivov : comctl32/monthcal: Store full date info for selection at creation time.
by Alexandre Julliard 28 Sep '09

28 Sep '09

Module: wine Branch: master Commit: d66dcb4ff8f1332c102d97178d36ada54db52576 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d66dcb4ff8f1332c102d97178… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Sep 26 01:20:33 2009 +0400 comctl32/monthcal: Store full date info for selection at creation time. --- dlls/comctl32/monthcal.c | 32 +++++++++++++++----------------- dlls/comctl32/tests/monthcal.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 17 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index b23a990..0d4c96b 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1872,25 +1872,23 @@ MONTHCAL_Create(HWND hwnd, LPCREATESTRUCTW lpcs) infoPtr->firstDayHighWord = FALSE; MONTHCAL_SetFirstDayOfWeek(infoPtr, -1); infoPtr->currentMonth = infoPtr->todaysDate.wMonth; - infoPtr->currentYear = infoPtr->todaysDate.wYear; + infoPtr->currentYear = infoPtr->todaysDate.wYear; infoPtr->minDate = infoPtr->todaysDate; infoPtr->maxDate = infoPtr->todaysDate; - infoPtr->maxDate.wYear=2050; - infoPtr->minDate.wYear=1950; - infoPtr->maxSelCount = 7; - infoPtr->monthRange = 3; - infoPtr->monthdayState = Alloc - (infoPtr->monthRange * sizeof(MONTHDAYSTATE)); - infoPtr->titlebk = comctl32_color.clrActiveCaption; - infoPtr->titletxt = comctl32_color.clrWindow; - infoPtr->monthbk = comctl32_color.clrWindow; - infoPtr->trailingtxt = comctl32_color.clrGrayText; - infoPtr->bk = comctl32_color.clrWindow; - infoPtr->txt = comctl32_color.clrWindowText; - - /* set the current day for highlighing */ - infoPtr->minSel.wDay = infoPtr->todaysDate.wDay; - infoPtr->maxSel.wDay = infoPtr->todaysDate.wDay; + infoPtr->maxDate.wYear = 2050; + infoPtr->minDate.wYear = 1950; + infoPtr->maxSelCount = 7; + infoPtr->monthRange = 3; + infoPtr->monthdayState = Alloc(infoPtr->monthRange * sizeof(MONTHDAYSTATE)); + infoPtr->titlebk = comctl32_color.clrActiveCaption; + infoPtr->titletxt = comctl32_color.clrWindow; + infoPtr->monthbk = comctl32_color.clrWindow; + infoPtr->trailingtxt = comctl32_color.clrGrayText; + infoPtr->bk = comctl32_color.clrWindow; + infoPtr->txt = comctl32_color.clrWindowText; + + infoPtr->minSel = infoPtr->todaysDate; + infoPtr->maxSel = infoPtr->todaysDate; /* call MONTHCAL_UpdateSize to set all of the dimensions */ /* of the control */ diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 32b4d14..8cd3494 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -1237,6 +1237,41 @@ static void test_monthcal_destroy(void) ok_sequence(sequences, MONTHCAL_SEQ_INDEX, destroy_monthcal_multi_sel_style_seq, "Destroy monthcal (multi sel style)", FALSE); } +static void test_monthcal_getselrange(void) +{ + HWND hwnd; + SYSTEMTIME st, range[2]; + BOOL ret; + + hwnd = create_monthcal_control(MCS_MULTISELECT); + + /* just after creation selection should start and end today */ + ret = SendMessage(hwnd, MCM_GETTODAY, 0, (LPARAM)&st); + expect(TRUE, ret); + + ret = SendMessage(hwnd, MCM_GETSELRANGE, 0, (LPARAM)range); + expect(TRUE, ret); + expect(st.wYear, range[0].wYear); + expect(st.wMonth, range[0].wMonth); + expect(st.wDay, range[0].wDay); + 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); + expect(st.wMonth, range[1].wMonth); + expect(st.wDay, range[1].wDay); + expect(st.wDayOfWeek, range[1].wDayOfWeek); + expect(st.wHour, range[1].wHour); + expect(st.wMinute, range[1].wMinute); + expect(st.wSecond, range[1].wSecond); + expect(st.wMilliseconds, range[1].wMilliseconds); + + DestroyWindow(hwnd); +} + START_TEST(monthcal) { HMODULE hComctl32; @@ -1273,6 +1308,7 @@ START_TEST(monthcal) test_monthcal_todaylink(); test_monthcal_size(); test_monthcal_maxselday(); + test_monthcal_getselrange(); flush_sequences(sequences, NUM_MSG_SEQUENCES); DestroyWindow(parent_wnd);

1 0

Nikolay Sivov : comctl32/monthcal: Fix some bugs with date range.
by Alexandre Julliard 28 Sep '09

28 Sep '09

Module: wine Branch: master Commit: a44f03518e9daa04eabcbf4f965204d6171aae4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a44f03518e9daa04eabcbf4f9… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Sep 26 03:09:06 2009 +0400 comctl32/monthcal: Fix some bugs with date range. --- dlls/comctl32/monthcal.c | 18 ++++------ dlls/comctl32/tests/monthcal.c | 77 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 0d4c96b..77e58b7 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -36,9 +36,6 @@ * -- handle resources better (doesn't work now); * -- take care of internationalization. * -- keyboard handling. - * -- GetRange: At the moment, we copy ranges anyway, regardless of - * infoPtr->rangeValid; an invalid range is simply filled - * with zeros in SetRange. Is this the right behavior? * -- search for FIXME */ @@ -931,11 +928,11 @@ MONTHCAL_SetRange(MONTHCAL_INFO *infoPtr, SHORT limits, SYSTEMTIME *range) /* Only one limit set - we are done */ if ((infoPtr->rangeValid & (GDTR_MIN | GDTR_MAX)) != (GDTR_MIN | GDTR_MAX)) return TRUE; - + SystemTimeToFileTime(&infoPtr->maxDate, &ft_max); SystemTimeToFileTime(&infoPtr->minDate, &ft_min); - if (CompareFileTime(&ft_min, &ft_max) > 0) + if (CompareFileTime(&ft_min, &ft_max) >= 0) { if ((limits & (GDTR_MIN | GDTR_MAX)) == (GDTR_MIN | GDTR_MAX)) { @@ -946,8 +943,11 @@ MONTHCAL_SetRange(MONTHCAL_INFO *infoPtr, SHORT limits, SYSTEMTIME *range) } else { - /* Reset the other limit. */ - /* FIXME: native sets date&time to 0. Should we do this too? */ + static const SYSTEMTIME zero; + + /* reset the other limit */ + if (limits & GDTR_MIN) infoPtr->maxDate = zero; + if (limits & GDTR_MAX) infoPtr->minDate = zero; infoPtr->rangeValid &= limits & GDTR_MIN ? ~GDTR_MAX : ~GDTR_MIN ; } } @@ -1873,10 +1873,6 @@ MONTHCAL_Create(HWND hwnd, LPCREATESTRUCTW lpcs) MONTHCAL_SetFirstDayOfWeek(infoPtr, -1); infoPtr->currentMonth = infoPtr->todaysDate.wMonth; infoPtr->currentYear = infoPtr->todaysDate.wYear; - infoPtr->minDate = infoPtr->todaysDate; - infoPtr->maxDate = infoPtr->todaysDate; - infoPtr->maxDate.wYear = 2050; - infoPtr->minDate.wYear = 1950; infoPtr->maxSelCount = 7; infoPtr->monthRange = 3; infoPtr->monthdayState = Alloc(infoPtr->monthRange * sizeof(MONTHDAYSTATE)); diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 8cd3494..e5282ff 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -328,6 +328,29 @@ static void test_monthcal(void) hwnd = CreateWindowA(MONTHCAL_CLASSA, "MonthCal", WS_POPUP | WS_VISIBLE, CW_USEDEFAULT, 0, 300, 300, 0, 0, NULL, NULL); ok(hwnd != NULL, "Failed to create MonthCal\n"); + + /* test range just after creation */ + memset(&st, 0xcc, sizeof(st)); + ok(SendMessage(hwnd, MCM_GETRANGE, 0, (LPARAM)st) == 0, "No limits should be set\n"); + + expect(0, st[0].wYear); + expect(0, st[0].wMonth); + expect(0, st[0].wDay); + expect(0, st[0].wDayOfWeek); + expect(0, st[0].wHour); + expect(0, st[0].wMinute); + expect(0, st[0].wSecond); + expect(0, st[0].wMilliseconds); + + expect(0, st[1].wYear); + expect(0, st[1].wMonth); + expect(0, st[1].wDay); + expect(0, st[1].wDayOfWeek); + expect(0, st[1].wHour); + expect(0, st[1].wMinute); + expect(0, st[1].wSecond); + expect(0, st[1].wMilliseconds); + GetSystemTime(&st[0]); st[1] = st[0]; @@ -380,6 +403,60 @@ static void test_monthcal(void) ok(SendMessage(hwnd, MCM_SETRANGE, GDTR_MAX, (LPARAM)st), "Failed to set max limit\n"); ok(SendMessage(hwnd, MCM_GETRANGE, 0, (LPARAM)st1) == GDTR_MAX, "Only MAX limit should be set\n"); + /* set both limits, then set max < min */ + GetSystemTime(&st[0]); + st[1] = st[0]; + st[1].wYear++; + ok(SendMessage(hwnd, MCM_SETRANGE, GDTR_MIN|GDTR_MAX, (LPARAM)st), "Failed to set limits\n"); + ok(SendMessage(hwnd, MCM_GETRANGE, 0, (LPARAM)st1) == (GDTR_MIN|GDTR_MAX), "Min limit expected\n"); + st[1].wYear -= 2; + ok(SendMessage(hwnd, MCM_SETRANGE, GDTR_MAX, (LPARAM)st), "Failed to set limits\n"); + ok(SendMessage(hwnd, MCM_GETRANGE, 0, (LPARAM)st1) == GDTR_MAX, "Max limit expected\n"); + + expect(0, st1[0].wYear); + expect(0, st1[0].wMonth); + expect(0, st1[0].wDay); + expect(0, st1[0].wDayOfWeek); + expect(0, st1[0].wHour); + expect(0, st1[0].wMinute); + expect(0, st1[0].wSecond); + expect(0, st1[0].wMilliseconds); + + expect(st[1].wYear, st1[1].wYear); + expect(st[1].wMonth, st1[1].wMonth); + expect(st[1].wDay, st1[1].wDay); + expect(st[1].wDayOfWeek, st1[1].wDayOfWeek); + expect(st[1].wHour, st1[1].wHour); + expect(st[1].wMinute, st1[1].wMinute); + expect(st[1].wSecond, st1[1].wSecond); + expect(st[1].wMilliseconds, st1[1].wMilliseconds); + + st[1] = st[0]; + st[1].wYear++; + ok(SendMessage(hwnd, MCM_SETRANGE, GDTR_MIN|GDTR_MAX, (LPARAM)st), "Failed to set limits\n"); + ok(SendMessage(hwnd, MCM_GETRANGE, 0, (LPARAM)st1) == (GDTR_MIN|GDTR_MAX), "Min limit expected\n"); + st[0].wYear++; /* start == end now */ + ok(SendMessage(hwnd, MCM_SETRANGE, GDTR_MIN, (LPARAM)st), "Failed to set limits\n"); + ok(SendMessage(hwnd, MCM_GETRANGE, 0, (LPARAM)st1) == GDTR_MIN, "Min limit expected\n"); + + expect(st[0].wYear, st1[0].wYear); + expect(st[0].wMonth, st1[0].wMonth); + expect(st[0].wDay, st1[0].wDay); + expect(st[0].wDayOfWeek, st1[0].wDayOfWeek); + expect(st[0].wHour, st1[0].wHour); + expect(st[0].wMinute, st1[0].wMinute); + expect(st[0].wSecond, st1[0].wSecond); + expect(st[0].wMilliseconds, st1[0].wMilliseconds); + + expect(0, st1[1].wYear); + expect(0, st1[1].wMonth); + expect(0, st1[1].wDay); + expect(0, st1[1].wDayOfWeek); + expect(0, st1[1].wHour); + expect(0, st1[1].wMinute); + expect(0, st1[1].wSecond); + expect(0, st1[1].wMilliseconds); + DestroyWindow(hwnd); }

1 0

Nikolay Sivov : comctl32/monthcal: Make year edit box readonly, cleanup LButton handler to be more readable.
by Alexandre Julliard 28 Sep '09

28 Sep '09

Module: wine Branch: master Commit: 962339d4d6dc51907f45388af93e63df77b35b60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=962339d4d6dc51907f45388af… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Sep 26 03:50:22 2009 +0400 comctl32/monthcal: Make year edit box readonly, cleanup LButton handler to be more readable. --- dlls/comctl32/monthcal.c | 148 +++++++++++++++++++++++---------------------- 1 files changed, 76 insertions(+), 72 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 77e58b7..e8f16f0 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1318,110 +1318,112 @@ MONTHCAL_RButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) return 0; } +/* creates updown control and edit box */ +static void MONTHCAL_EditYear(MONTHCAL_INFO *infoPtr) +{ + static const WCHAR EditW[] = { 'E','D','I','T',0 }; + + infoPtr->hWndYearEdit = + CreateWindowExW(0, EditW, 0, WS_VISIBLE | WS_CHILD | ES_READONLY, + infoPtr->titleyear.left + 3, infoPtr->titlebtnnext.top, + infoPtr->titleyear.right - infoPtr->titleyear.left + 4, + infoPtr->textHeight, infoPtr->hwndSelf, + NULL, NULL, NULL); + + SendMessageW(infoPtr->hWndYearEdit, WM_SETFONT, (WPARAM)infoPtr->hBoldFont, TRUE); + + infoPtr->hWndYearUpDown = + CreateWindowExW(0, UPDOWN_CLASSW, 0, + WS_VISIBLE | WS_CHILD | UDS_SETBUDDYINT | UDS_NOTHOUSANDS | UDS_ARROWKEYS, + infoPtr->titleyear.right + 7, infoPtr->titlebtnnext.top, + 18, infoPtr->textHeight, infoPtr->hwndSelf, + NULL, NULL, NULL); + + /* attach edit box */ + SendMessageW(infoPtr->hWndYearUpDown, UDM_SETRANGE, 0, MAKELONG(9999, 1753)); + SendMessageW(infoPtr->hWndYearUpDown, UDM_SETBUDDY, (WPARAM)infoPtr->hWndYearEdit, 0); + SendMessageW(infoPtr->hWndYearUpDown, UDM_SETPOS, 0, infoPtr->currentYear); +} + static LRESULT MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) { - static const WCHAR EditW[] = { 'E','D','I','T',0 }; MCHITTESTINFO ht; DWORD hit; - HMENU hMenu; - RECT rcDay; /* used in determining area to invalidate */ - WCHAR buf[32]; - int i; - POINT menupoint; - - TRACE("%lx\n", lParam); if (infoPtr->hWndYearUpDown) - { - infoPtr->currentYear=SendMessageW(infoPtr->hWndYearUpDown, UDM_SETPOS, 0, 0); + { + infoPtr->currentYear = SendMessageW(infoPtr->hWndYearUpDown, UDM_SETPOS, 0, 0); if(!DestroyWindow(infoPtr->hWndYearUpDown)) - { - FIXME("Can't destroy Updown Control\n"); - } + { + FIXME("Can't destroy Updown Control\n"); + } else - infoPtr->hWndYearUpDown=0; + infoPtr->hWndYearUpDown = 0; + if(!DestroyWindow(infoPtr->hWndYearEdit)) - { - FIXME("Can't destroy Updown Control\n"); - } + { + FIXME("Can't destroy Updown Control\n"); + } else - infoPtr->hWndYearEdit=0; + infoPtr->hWndYearEdit = 0; + InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); - } + } ht.pt.x = (short)LOWORD(lParam); ht.pt.y = (short)HIWORD(lParam); + TRACE("(%d, %d)\n", ht.pt.x, ht.pt.y); + hit = MONTHCAL_HitTest(infoPtr, &ht); - /* FIXME: these flags should be checked by */ - /*((hit & MCHT_XXX) == MCHT_XXX) b/c some of the flags are */ - /* multi-bit */ - if(hit ==MCHT_TITLEBTNNEXT) { + switch(hit) + { + case MCHT_TITLEBTNNEXT: MONTHCAL_GoToNextMonth(infoPtr); infoPtr->status = MC_NEXTPRESSED; SetTimer(infoPtr->hwndSelf, MC_NEXTMONTHTIMER, MC_NEXTMONTHDELAY, 0); InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); return 0; - } - if(hit == MCHT_TITLEBTNPREV){ + + case MCHT_TITLEBTNPREV: MONTHCAL_GoToPrevMonth(infoPtr); infoPtr->status = MC_PREVPRESSED; SetTimer(infoPtr->hwndSelf, MC_PREVMONTHTIMER, MC_NEXTMONTHDELAY, 0); InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); return 0; - } - if(hit == MCHT_TITLEMONTH) { - hMenu = CreatePopupMenu(); + case MCHT_TITLEMONTH: + { + HMENU hMenu = CreatePopupMenu(); + WCHAR buf[32]; + POINT menupoint; + INT i; - for (i=0; i<12;i++) - { - GetLocaleInfoW(LOCALE_USER_DEFAULT,LOCALE_SMONTHNAME1+i, buf,countof(buf)); - AppendMenuW(hMenu, MF_STRING|MF_ENABLED,i+1, buf); - } - menupoint.x=infoPtr->titlemonth.right; - menupoint.y=infoPtr->titlemonth.bottom; + for (i = 0; i < 12; i++) + { + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONTHNAME1+i, buf, countof(buf)); + AppendMenuW(hMenu, MF_STRING|MF_ENABLED, i + 1, buf); + } + menupoint.x = infoPtr->titlemonth.right; + menupoint.y = infoPtr->titlemonth.bottom; ClientToScreen(infoPtr->hwndSelf, &menupoint); - i= TrackPopupMenu(hMenu,TPM_LEFTALIGN | TPM_NONOTIFY | TPM_RIGHTBUTTON | TPM_RETURNCMD, - menupoint.x, menupoint.y, 0, infoPtr->hwndSelf, NULL); - if ((i>0) && (i<13)) - { - infoPtr->currentMonth=i; + i = TrackPopupMenu(hMenu,TPM_LEFTALIGN | TPM_NONOTIFY | TPM_RIGHTBUTTON | TPM_RETURNCMD, + menupoint.x, menupoint.y, 0, infoPtr->hwndSelf, NULL); + + if ((i > 0) && (i < 13)) + { + infoPtr->currentMonth = i; InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); - } + } } - if(hit == MCHT_TITLEYEAR) { - infoPtr->hWndYearEdit=CreateWindowExW(0, - EditW, - 0, - WS_VISIBLE | WS_CHILD |UDS_SETBUDDYINT, - infoPtr->titleyear.left+3,infoPtr->titlebtnnext.top, - infoPtr->titleyear.right-infoPtr->titleyear.left+4, - infoPtr->textHeight, - infoPtr->hwndSelf, - NULL, - NULL, - NULL); - SendMessageW( infoPtr->hWndYearEdit, WM_SETFONT, (WPARAM) infoPtr->hBoldFont, (LPARAM)TRUE); - infoPtr->hWndYearUpDown=CreateWindowExW(0, - UPDOWN_CLASSW, - 0, - WS_VISIBLE | WS_CHILD |UDS_SETBUDDYINT|UDS_NOTHOUSANDS|UDS_ARROWKEYS, - infoPtr->titleyear.right+7,infoPtr->titlebtnnext.top, - 18, - infoPtr->textHeight, - infoPtr->hwndSelf, - NULL, - NULL, - NULL); - SendMessageW(infoPtr->hWndYearUpDown, UDM_SETRANGE, 0, MAKELONG (9999, 1753)); - SendMessageW(infoPtr->hWndYearUpDown, UDM_SETBUDDY, (WPARAM) infoPtr->hWndYearEdit, 0); - SendMessageW(infoPtr->hWndYearUpDown, UDM_SETPOS, 0, infoPtr->currentYear); + case MCHT_TITLEYEAR: + { + MONTHCAL_EditYear(infoPtr); return 0; - } - if(hit == MCHT_TODAYLINK) { + case MCHT_TODAYLINK: + { NMSELCHANGE nmsc; infoPtr->curSelDay = infoPtr->todaysDate.wDay; @@ -1443,7 +1445,9 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmsc.nmhdr.idFrom, (LPARAM)&nmsc); return 0; } - if(hit == MCHT_CALENDARDATE) { + case MCHT_CALENDARDATE: + { + RECT rcDay; /* used in determining area to invalidate */ SYSTEMTIME selArray[2]; NMSELCHANGE nmsc; @@ -1460,7 +1464,6 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmsc.nmhdr.idFrom, (LPARAM)&nmsc); - /* redraw both old and new days if the selected day changed */ if(infoPtr->curSelDay != ht.st.wDay) { MONTHCAL_CalcPosFromDay(infoPtr, ht.st.wDay, ht.st.wMonth, &rcDay); @@ -1475,6 +1478,7 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) infoPtr->status = MC_SEL_LBUTDOWN; return 0; } + } return 1; }

1 0

Nikolay Sivov : comctl32/monthcal: Gather currently selected year and month into a single structure.
by Alexandre Julliard 28 Sep '09

28 Sep '09

Module: wine Branch: master Commit: 6a11d779e6f0430409d46891758300334ea8432d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a11d779e6f0430409d468917… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Sep 26 15:17:59 2009 +0400 comctl32/monthcal: Gather currently selected year and month into a single structure. --- dlls/comctl32/monthcal.c | 169 ++++++++++++++++++++++------------------------ 1 files changed, 82 insertions(+), 87 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6a11d779e6f0430409d46…

1 0

Andrey Turkin : user32: Accept SPI_GET/ SETMOUSEVANISH parameters in SystemParametersInfo.
by Alexandre Julliard 28 Sep '09

28 Sep '09

Module: wine Branch: master Commit: aa347e07211ecd6e5499dc60822a7d6f75603b2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa347e07211ecd6e5499dc608… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Sun Sep 27 21:28:23 2009 +0400 user32: Accept SPI_GET/SETMOUSEVANISH parameters in SystemParametersInfo. --- dlls/user32/sysparams.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 59276df..8d81404 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2317,8 +2317,15 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, WINE_SPI_FIXME(SPI_SETMOUSESONAR); /* 0x101D _WIN32_WINNT >= 0x510 || _WIN32_WINDOW >= 0x490*/ WINE_SPI_FIXME(SPI_GETMOUSECLICKLOCK); /* 0x101E _WIN32_WINNT >= 0x510 || _WIN32_WINDOW >= 0x490*/ WINE_SPI_FIXME(SPI_SETMOUSECLICKLOCK); /* 0x101F _WIN32_WINNT >= 0x510 || _WIN32_WINDOW >= 0x490*/ - WINE_SPI_FIXME(SPI_GETMOUSEVANISH); /* 0x1020 _WIN32_WINNT >= 0x510 || _WIN32_WINDOW >= 0x490*/ - WINE_SPI_FIXME(SPI_SETMOUSEVANISH); /* 0x1021 _WIN32_WINNT >= 0x510 || _WIN32_WINDOW >= 0x490*/ + + case SPI_GETMOUSEVANISH: + ret = get_user_pref_param( 2, 0x01, pvParam ); + break; + + case SPI_SETMOUSEVANISH: + ret = set_user_pref_param( 2, 0x01, PtrToUlong(pvParam), fWinIni ); + break; + case SPI_GETFLATMENU: ret = get_user_pref_param( 2, 0x02, pvParam ); break;

1 0

Jacek Caban : jscript: Use host global object as default 'this' if available and global object otherwise.
by Alexandre Julliard 28 Sep '09

28 Sep '09

Module: wine Branch: master Commit: d833314c7008afcf5d90ab038d18935196591e5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d833314c7008afcf5d90ab038… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 27 20:59:28 2009 +0200 jscript: Use host global object as default 'this' if available and global object otherwise. --- dlls/jscript/engine.c | 22 +++++----- dlls/jscript/engine.h | 2 +- dlls/jscript/function.c | 47 +++++------------------ dlls/jscript/jscript.c | 27 ++++++------- dlls/jscript/jscript.h | 3 +- dlls/jscript/tests/jscript.c | 19 +++++++++ dlls/jscript/tests/run.c | 85 +++++++++++++++++++++++++++++++++++++++--- 7 files changed, 136 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d833314c7008afcf5d90a…

1 0

Jacek Caban : mshtml: Added IHTMLDocument3::attachEvent implementation.
by Alexandre Julliard 28 Sep '09

28 Sep '09

Module: wine Branch: master Commit: 73aec9bd001e513389fafbfe441c92748107c486 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73aec9bd001e513389fafbfe4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 27 20:59:52 2009 +0200 mshtml: Added IHTMLDocument3::attachEvent implementation. --- dlls/mshtml/htmldoc3.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc3.c b/dlls/mshtml/htmldoc3.c index 4b249e6..f4f923f 100644 --- a/dlls/mshtml/htmldoc3.c +++ b/dlls/mshtml/htmldoc3.c @@ -31,6 +31,7 @@ #include "wine/debug.h" #include "mshtml_private.h" +#include "htmlevent.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -173,8 +174,10 @@ static HRESULT WINAPI HTMLDocument3_attachEvent(IHTMLDocument3 *iface, BSTR even IDispatch* pDisp, VARIANT_BOOL *pfResult) { HTMLDocument *This = HTMLDOC3_THIS(iface); - FIXME("(%p)->(%s %p %p)\n", This, debugstr_w(event), pDisp, pfResult); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p %p)\n", This, debugstr_w(event), pDisp, pfResult); + + return attach_event(&This->doc_node->node.event_target, This, event, pDisp, pfResult); } static HRESULT WINAPI HTMLDocument3_detachEvent(IHTMLDocument3 *iface, BSTR event,

1 0

Henri Verbeet : wined3d: Properly keep texture references in the stateblock .
by Alexandre Julliard 28 Sep '09

28 Sep '09

Module: wine Branch: master Commit: 709aedf5f9bdfd0cdeab3d2189f6382680356922 URL: http://source.winehq.org/git/wine.git/?a=commit;h=709aedf5f9bdfd0cdeab3d218… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 28 10:04:59 2009 +0200 wined3d: Properly keep texture references in the stateblock. --- dlls/wined3d/device.c | 4 ++++ dlls/wined3d/stateblock.c | 29 ++++++++++++++++------------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 70656b7..42d78ac 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4460,6 +4460,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetTexture(IWineD3DDevice *iface, DWORD /* Handle recording of state blocks */ if (This->isRecordingState) { TRACE("Recording... not performing anything\n"); + + if (pTexture) IWineD3DBaseTexture_AddRef(pTexture); + if (oldTexture) IWineD3DBaseTexture_Release(oldTexture); + return WINED3D_OK; } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index feb9808..0e097aa 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -5,6 +5,7 @@ * Copyright 2004 Jason Edmeades * Copyright 2005 Oliver Stieber * Copyright 2007 Stefan Dösinger for CodeWeavers + * Copyright 2009 Henri Verbeet for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -278,17 +279,9 @@ static ULONG WINAPI IWineD3DStateBlockImpl_Release(IWineD3DStateBlock *iface) { if (!refCount) { int counter; - /* type 0 represents the primary stateblock, so free all the resources */ - if (This->blockType == WINED3DSBT_INIT) { - /* NOTE: according to MSDN: The application is responsible for making sure the texture references are cleared down */ - for (counter = 0; counter < MAX_COMBINED_SAMPLERS; counter++) { - if (This->textures[counter]) { - /* release our 'internal' hold on the texture */ - if(0 != IWineD3DBaseTexture_Release(This->textures[counter])) { - TRACE("Texture still referenced by stateblock, applications has leaked Stage = %u Texture = %p\n", counter, This->textures[counter]); - } - } - } + for (counter = 0; counter < MAX_COMBINED_SAMPLERS; counter++) + { + if (This->textures[counter]) IWineD3DBaseTexture_Release(This->textures[counter]); } for (counter = 0; counter < MAX_STREAMS; counter++) { @@ -605,13 +598,14 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) } /* Samplers */ - /* TODO: move over to using memcpy */ map = This->changed.textures; for (i = 0; map; map >>= 1, ++i) { if (!(map & 1)) continue; TRACE("Updating texture %u to %p (was %p)\n", i, targetStateBlock->textures[i], This->textures[i]); + if (targetStateBlock->textures[i]) IWineD3DBaseTexture_AddRef(targetStateBlock->textures[i]); + if (This->textures[i]) IWineD3DBaseTexture_Release(This->textures[i]); This->textures[i] = targetStateBlock->textures[i]; } @@ -650,11 +644,20 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) memcpy(This->pixelShaderConstantI, targetStateBlock->pixelShaderConstantI, sizeof(This->pixelShaderConstantF)); memcpy(This->pixelShaderConstantF, targetStateBlock->pixelShaderConstantF, sizeof(float) * GL_LIMITS(pshader_constantsF) * 4); memcpy(This->renderState, targetStateBlock->renderState, sizeof(This->renderState)); - memcpy(This->textures, targetStateBlock->textures, sizeof(This->textures)); memcpy(This->textureState, targetStateBlock->textureState, sizeof(This->textureState)); memcpy(This->samplerState, targetStateBlock->samplerState, sizeof(This->samplerState)); This->scissorRect = targetStateBlock->scissorRect; + for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) + { + if (targetStateBlock->textures[i] != This->textures[i]) + { + if (targetStateBlock->textures[i]) IWineD3DBaseTexture_AddRef(targetStateBlock->textures[i]); + if (This->textures[i]) IWineD3DBaseTexture_Release(This->textures[i]); + This->textures[i] = targetStateBlock->textures[i]; + } + } + if(targetStateBlock->pIndexData != This->pIndexData || targetStateBlock->IndexFmt != This->IndexFmt) { if (targetStateBlock->pIndexData) IWineD3DBuffer_AddRef(targetStateBlock->pIndexData);

1 0

Henri Verbeet : wined3d: Keep vertex declaration references in the stateblock.
by Alexandre Julliard 28 Sep '09

28 Sep '09

Module: wine Branch: master Commit: dca3c6e7c6d3f7fabcf6f6794f6f07f1aa2f894d URL: http://source.winehq.org/git/wine.git/?a=commit;h=dca3c6e7c6d3f7fabcf6f6794… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 28 10:05:00 2009 +0200 wined3d: Keep vertex declaration references in the stateblock. --- dlls/wined3d/device.c | 3 +++ dlls/wined3d/stateblock.c | 12 +++++++++++- dlls/wined3d/vertexdeclaration.c | 3 ++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 42d78ac..11d55a2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3328,6 +3328,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetVertexDeclaration(IWineD3DDevice* if TRACE("(%p) : pDecl=%p\n", This, pDecl); + if (pDecl) IWineD3DVertexDeclaration_AddRef(pDecl); + if (oldDecl) IWineD3DVertexDeclaration_Release(oldDecl); + This->updateStateBlock->vertexDecl = pDecl; This->updateStateBlock->changed.vertexDecl = TRUE; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 0e097aa..d626bf9 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -279,6 +279,8 @@ static ULONG WINAPI IWineD3DStateBlockImpl_Release(IWineD3DStateBlock *iface) { if (!refCount) { int counter; + if (This->vertexDecl) IWineD3DVertexDeclaration_Release(This->vertexDecl); + for (counter = 0; counter < MAX_COMBINED_SAMPLERS; counter++) { if (This->textures[counter]) IWineD3DBaseTexture_Release(This->textures[counter]); @@ -511,6 +513,8 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) if(This->changed.vertexDecl && This->vertexDecl != targetStateBlock->vertexDecl){ TRACE("Updating vertex declaration from %p to %p\n", This->vertexDecl, targetStateBlock->vertexDecl); + if (targetStateBlock->vertexDecl) IWineD3DVertexDeclaration_AddRef(targetStateBlock->vertexDecl); + if (This->vertexDecl) IWineD3DVertexDeclaration_Release(This->vertexDecl); This->vertexDecl = targetStateBlock->vertexDecl; } @@ -624,7 +628,6 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) record_lights(This, targetStateBlock); } else if(This->blockType == WINED3DSBT_ALL) { - This->vertexDecl = targetStateBlock->vertexDecl; memcpy(This->vertexShaderConstantB, targetStateBlock->vertexShaderConstantB, sizeof(This->vertexShaderConstantI)); memcpy(This->vertexShaderConstantI, targetStateBlock->vertexShaderConstantI, sizeof(This->vertexShaderConstantF)); memcpy(This->vertexShaderConstantF, targetStateBlock->vertexShaderConstantF, sizeof(float) * GL_LIMITS(vshader_constantsF) * 4); @@ -648,6 +651,13 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) memcpy(This->samplerState, targetStateBlock->samplerState, sizeof(This->samplerState)); This->scissorRect = targetStateBlock->scissorRect; + if (This->vertexDecl != targetStateBlock->vertexDecl) + { + if (targetStateBlock->vertexDecl) IWineD3DVertexDeclaration_AddRef(targetStateBlock->vertexDecl); + if (This->vertexDecl) IWineD3DVertexDeclaration_Release(This->vertexDecl); + This->vertexDecl = targetStateBlock->vertexDecl; + } + for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) { if (targetStateBlock->textures[i] != This->textures[i]) diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index db595be..18ea03a 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -69,7 +69,8 @@ static ULONG WINAPI IWineD3DVertexDeclarationImpl_Release(IWineD3DVertexDeclarat TRACE("(%p) : Releasing from %d\n", This, This->ref); ref = InterlockedDecrement(&This->ref); if (ref == 0) { - if(iface == This->wineD3DDevice->stateBlock->vertexDecl) { + if (This->wineD3DDevice->stateBlock && iface == This->wineD3DDevice->stateBlock->vertexDecl) + { /* See comment in PixelShader::Release */ IWineD3DDeviceImpl_MarkStateDirty(This->wineD3DDevice, STATE_VDECL); }

1 0