August 2010 - Wine-Commits - list.winehq.org

Jacek Caban : jscript: Use generic properties for NaN and Infinity implementation.
by Alexandre Julliard Aug. 2, 2010

Aug. 2, 2010

Module: wine Branch: master Commit: f824a1656d1830267b03aacc8484ee24eba5afcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=f824a1656d1830267b03aacc8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 2 11:08:57 2010 +0200 jscript: Use generic properties for NaN and Infinity implementation. --- dlls/jscript/global.c | 56 ++++++++++--------------------------------- dlls/jscript/tests/lang.js | 9 +++++++ 2 files changed, 22 insertions(+), 43 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 92a0cbe..2acd92b 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -118,42 +118,6 @@ static HRESULT constructor_call(DispatchEx *constr, WORD flags, DISPPARAMS *dp, return S_OK; } -static HRESULT JSGlobal_NaN(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) -{ - TRACE("\n"); - - switch(flags) { - case DISPATCH_PROPERTYGET: - num_set_nan(retv); - break; - - default: - FIXME("unimplemented flags %x\n", flags); - return E_NOTIMPL; - } - - return S_OK; -} - -static HRESULT JSGlobal_Infinity(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) -{ - TRACE("\n"); - - switch(flags) { - case DISPATCH_PROPERTYGET: - num_set_inf(retv, TRUE); - break; - - default: - FIXME("unimplemented flags %x\n", flags); - return E_NOTIMPL; - } - - return S_OK; -} - static HRESULT JSGlobal_Array(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { @@ -1063,9 +1027,6 @@ static const builtin_prop_t JSGlobal_props[] = { {EvalErrorW, JSGlobal_EvalError, PROPF_CONSTR|1}, {FunctionW, JSGlobal_Function, PROPF_CONSTR|1}, {_GetObjectW, JSGlobal_GetObject, PROPF_METHOD|2}, - {InfinityW, JSGlobal_Infinity, 0}, -/* {MathW, JSGlobal_Math, 0}, */ - {NaNW, JSGlobal_NaN, 0}, {NumberW, JSGlobal_Number, PROPF_CONSTR|1}, {ObjectW, JSGlobal_Object, PROPF_CONSTR|1}, {RangeErrorW, JSGlobal_RangeError, PROPF_CONSTR|1}, @@ -1175,15 +1136,24 @@ HRESULT init_global(script_ctx_t *ctx) if(FAILED(hres)) return hres; + V_VT(&var) = VT_DISPATCH; + V_DISPATCH(&var) = (IDispatch*)_IDispatchEx_(math); + hres = jsdisp_propput_name(ctx->global, MathW, &var, NULL/*FIXME*/, NULL/*FIXME*/); + jsdisp_release(math); + if(FAILED(hres)) + return hres; + V_VT(&var) = VT_EMPTY; hres = jsdisp_propput_name(ctx->global, undefinedW, &var, NULL/*FIXME*/, NULL/*FIXME*/); if(FAILED(hres)) return hres; - V_VT(&var) = VT_DISPATCH; - V_DISPATCH(&var) = (IDispatch*)_IDispatchEx_(math); - hres = jsdisp_propput_name(ctx->global, MathW, &var, NULL/*FIXME*/, NULL/*FIXME*/); - jsdisp_release(math); + num_set_nan(&var); + hres = jsdisp_propput_name(ctx->global, NaNW, &var, NULL/*FIXME*/, NULL/*FIXME*/); + if(FAILED(hres)) + return hres; + num_set_inf(&var, TRUE); + hres = jsdisp_propput_name(ctx->global, InfinityW, &var, NULL/*FIXME*/, NULL/*FIXME*/); return hres; } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index c3059be..bdf039a 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -1044,4 +1044,13 @@ obj = {undefined: 3}; undefined = 6; ok(undefined === 6, "undefined = " + undefined); +NaN = 6; +ok(NaN === 6, "NaN !== 6"); + +Infinity = 6; +ok(Infinity === 6, "Infinity !== 6"); + +Math = 6; +ok(Math === 6, "NaN !== 6"); + reportSuccess();

1 0

Jacek Caban : mshtml: Get rid of useless nsQIResult type.
by Alexandre Julliard Aug. 2, 2010

Aug. 2, 2010

Module: wine Branch: master Commit: 9ca80347e371c168d6cb24f7268362c455c4c58e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ca80347e371c168d6cb24f72… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 2 11:08:26 2010 +0200 mshtml: Get rid of useless nsQIResult type. --- dlls/mshtml/mutation.c | 4 ++-- dlls/mshtml/navigate.c | 2 +- dlls/mshtml/nsembed.c | 18 +++++++++--------- dlls/mshtml/nsevents.c | 2 +- dlls/mshtml/nsiface.idl | 11 +++++------ dlls/mshtml/nsio.c | 18 +++++++++--------- dlls/mshtml/nsservice.c | 8 ++++---- 7 files changed, 31 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9ca80347e371c168d6cb2…

1 0

Nikolay Sivov : comctl32/monthcal: No need to calculate month length on every iteration.
by Alexandre Julliard Aug. 2, 2010

Aug. 2, 2010

Module: wine Branch: master Commit: 49949cbbc2cd83d4f0ff1a6c045d94e56336daa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49949cbbc2cd83d4f0ff1a6c0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 2 09:42:36 2010 +0400 comctl32/monthcal: No need to calculate month length on every iteration. --- dlls/comctl32/monthcal.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 677db91..9fe7f5c 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -949,7 +949,7 @@ static void MONTHCAL_PaintFocusAndCircle(const MONTHCAL_INFO *infoPtr, HDC hdc, static void MONTHCAL_PaintCalendar(const MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT *ps, INT calIdx) { const SYSTEMTIME *date = &infoPtr->calendars[calIdx].month; - INT prev_month, i, j; + INT prev_month, i, j, length; RECT r, fill_bk_rect; SYSTEMTIME st; WCHAR buf[80]; @@ -1004,8 +1004,9 @@ static void MONTHCAL_PaintCalendar(const MONTHCAL_INFO *infoPtr, HDC hdc, const { MONTHCAL_GetMinDate(infoPtr, &st); mask = 1 << (st.wDay-1); + length = MONTHCAL_MonthLength(prev_month, date->wYear); - while(st.wDay <= MONTHCAL_MonthLength(prev_month, date->wYear)) + while(st.wDay <= length) { MONTHCAL_DrawDay(infoPtr, hdc, &st, infoPtr->monthdayState[0] & mask, ps); mask <<= 1; @@ -1036,7 +1037,8 @@ static void MONTHCAL_PaintCalendar(const MONTHCAL_INFO *infoPtr, HDC hdc, const st = *date; st.wDay = 1; mask = 1; - while(st.wDay <= MONTHCAL_MonthLength(date->wMonth, date->wYear)) + length = MONTHCAL_MonthLength(date->wMonth, date->wYear); + while(st.wDay <= length) { MONTHCAL_DrawDay(infoPtr, hdc, &st, infoPtr->monthdayState[1] & mask, ps); mask <<= 1;

1 0

Nikolay Sivov : comctl32/monthcal: Get rid of stored current selection date , it's always synced with lower bound.
by Alexandre Julliard Aug. 2, 2010

Aug. 2, 2010

Module: wine Branch: master Commit: db10fb8301803f85a1b1ade00f1cf728950f3315 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db10fb8301803f85a1b1ade00… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 2 09:36:12 2010 +0400 comctl32/monthcal: Get rid of stored current selection date, it's always synced with lower bound. --- dlls/comctl32/monthcal.c | 94 ++++++++++++++++++++++----------------------- 1 files changed, 46 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=db10fb8301803f85a1b1a…

1 0

Andrew Eikum : regedit: Process reg files which use \r line endings.
by Alexandre Julliard Aug. 2, 2010

Aug. 2, 2010

Module: wine Branch: master Commit: 8851a4eb1f51fa56e5ac55d4a1d4a762abb21e3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8851a4eb1f51fa56e5ac55d4a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jul 30 16:02:36 2010 -0500 regedit: Process reg files which use \r line endings. --- programs/regedit/regproc.c | 94 ++++++++++++++++++++++---------------- programs/regedit/tests/regedit.c | 18 +++++++ 2 files changed, 72 insertions(+), 40 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index f210879..122d678 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -623,7 +623,6 @@ static void processRegLinesA(FILE *in, char* first_chars) while (!feof(in)) { LPSTR s; /* The pointer into line for where the current fgets should read */ - LPSTR check; WCHAR* lineW; s = line; @@ -635,7 +634,7 @@ static void processRegLinesA(FILE *in, char* first_chars) for (;;) { size_t size_remaining; - int size_to_get; + int size_to_get, i; char *s_eol; /* various local uses */ /* Do we need to expand the buffer ? */ @@ -661,27 +660,46 @@ static void processRegLinesA(FILE *in, char* first_chars) */ size_to_get = (size_remaining > INT_MAX ? INT_MAX : size_remaining); - check = fgets (s, size_to_get, in); - - if (check == NULL) { - if (ferror(in)) { - perror ("While reading input"); - exit (IO_ERROR); - } else { - assert (feof(in)); - *s = '\0'; - /* It is not clear to me from the definition that the - * contents of the buffer are well defined on detecting - * an eof without managing to read anything. - */ + /* get a single line. note that `i' must be one past the last + * meaningful character in `s' when this loop exits */ + for(i = 0; i < size_to_get-1; ++i){ + s[i] = fgetc(in); + if(s[i] == EOF){ + if(ferror(in)){ + perror("While reading input"); + exit(IO_ERROR); + }else + assert(feof(in)); + break; + } + if(s[i] == '\r'){ + /* read the next character iff it's \n */ + s[i+1] = fgetc(in); + if(s[i+1] != '\n'){ + ungetc(s[i+1], in); + i = i+1; + }else{ + if(i+2 >= size_to_get){ + /* buffer too short, so put back the EOL chars to + * read next cycle */ + ungetc('\n', in); + ungetc('\r', in); + }else + i = i+2; + } + break; + } + if(s[i] == '\n'){ + i = i+1; + break; } } + s[i] = '\0'; /* If we didn't read the eol nor the eof go around for the rest */ - s_eol = strchr (s, '\n'); + s_eol = strpbrk (s, "\r\n"); if (!feof (in) && !s_eol) { s = strchr (s, '\0'); - /* It should be s + size_to_get - 1 but this is safer */ continue; } @@ -691,11 +709,11 @@ static void processRegLinesA(FILE *in, char* first_chars) continue; } - /* Remove any line feed. Leave s_eol on the \0 */ + /* Remove any line feed. Leave s_eol on the first \0 */ if (s_eol) { - *s_eol = '\0'; - if (s_eol > line && *(s_eol-1) == '\r') - *--s_eol = '\0'; + if (*s_eol == '\r' && *(s_eol+1) == '\n') + *(s_eol+1) = '\0'; + *s_eol = '\0'; } else s_eol = strchr (s, '\0'); @@ -799,7 +817,8 @@ static void processRegLinesW(FILE *in) /* If we didn't read the eol nor the eof go around for the rest */ while(1) { - s_eol = strchrW(line, '\n'); + const WCHAR line_endings[] = {'\r','\n',0}; + s_eol = strpbrkW(line, line_endings); if(!s_eol) { /* Move the stub of the line to the start of the buffer so @@ -813,22 +832,22 @@ static void processRegLinesW(FILE *in) /* If it is a comment line then discard it and go around again */ if (*line == '#') { - line = s_eol + 1; + if (*s_eol == '\r' && *(s_eol+1) == '\n') + line = s_eol + 2; + else + line = s_eol + 1; continue; } /* If there is a concatenating \\ then go around again */ - if ((*(s_eol-1) == '\\') || - (*(s_eol-1) == '\r' && *(s_eol-2) == '\\')) { - WCHAR* NextLine = s_eol; + if (*(s_eol-1) == '\\') { + WCHAR* NextLine = s_eol + 1; - while(*(NextLine+1) == ' ' || *(NextLine+1) == '\t') + if(*s_eol == '\r' && *(s_eol+1) == '\n') NextLine++; - NextLine++; - - if(*(s_eol-1) == '\r') - s_eol--; + while(*(NextLine+1) == ' ' || *(NextLine+1) == '\t') + NextLine++; MoveMemory(s_eol - 1, NextLine, (CharsInBuf - (NextLine - s) + 1)*sizeof(WCHAR)); CharsInBuf -= NextLine - s_eol + 1; @@ -836,15 +855,10 @@ static void processRegLinesW(FILE *in) continue; } - /* Remove any line feed. Leave s_eol on the \0 */ - if (s_eol) { - *s_eol = '\0'; - if (s_eol > buf && *(s_eol-1) == '\r') - *(s_eol-1) = '\0'; - } - - if(!s_eol) - break; + /* Remove any line feed. Leave s_eol on the last \0 */ + if (*s_eol == '\r' && *(s_eol + 1) == '\n') + *s_eol++ = '\0'; + *s_eol = '\0'; processRegEntry(line, TRUE); line = s_eol + 1; diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 43be689..6fc1305 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -230,6 +230,14 @@ static void test_basic_import(void) 'r','e','g','e','d','i','t','_','t','e','s','t',']','\n', '"','T','e','s','t','V','a','l','u','e','3','"','=','"',0x3041,'V','a', 'l','u','e','"','\n',0}; + WCHAR wide_test_r[] = {0xFEFF,'W','i','n','d','o','w','s',' ','R','e','g', + 'i','s','t','r','y',' ','E','d','i','t','o','r',' ','V','e','r','s', + 'i','o','n',' ','5','.','0','0','\r','\r', + '[','H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E', + 'R','\\','S','o','f','t','w','a','r','e','\\','W','i','n','e','\\', + 'r','e','g','e','d','i','t','_','t','e','s','t',']','\r', + '"','T','e','s','t','V','a','l','u','e','5','"','=','"',0x3041,'V','a', + 'l','u','e','"','\r',0}; WCHAR wide_exp[] = {0x3041,'V','a','l','u','e',0}; LONG lr; @@ -253,9 +261,19 @@ static void test_basic_import(void) exec_import_wstr(wide_test); verify_reg_wsz(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test", "TestValue3", wide_exp); + + exec_import_wstr(wide_test_r); + verify_reg_wsz(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test", + "TestValue5", wide_exp); }else win_skip("Some WCHAR tests skipped\n"); + exec_import_str("REGEDIT4\r\r" + "[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\r" + "\"TestValue4\"=\"DValue\"\r"); + verify_reg_sz(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test", + "TestValue4", "DValue"); + exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\n" "\"TestDword\"=dword:00000017\n");

1 0

Nikolay Sivov : comctl32/monthcal: Erase week numbers rectangle before drawing new text.
by Alexandre Julliard Aug. 2, 2010

Aug. 2, 2010

Module: wine Branch: master Commit: 7fb6031731f3e09704e9757ff66562a5ee9e2263 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fb6031731f3e09704e9757ff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 2 09:48:07 2010 +0400 comctl32/monthcal: Erase week numbers rectangle before drawing new text. --- dlls/comctl32/monthcal.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 9fe7f5c..c1c105c 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -799,6 +799,7 @@ static void MONTHCAL_PaintWeeknumbers(const MONTHCAL_INFO *infoPtr, HDC hdc, con INT i, prev_month; SYSTEMTIME st; WCHAR buf[80]; + HBRUSH hbr; RECT r; if (!(infoPtr->dwStyle & MCS_WEEKNUMBERS)) return; @@ -868,6 +869,13 @@ static void MONTHCAL_PaintWeeknumbers(const MONTHCAL_INFO *infoPtr, HDC hdc, con } r = infoPtr->calendars[calIdx].weeknums; + + /* erase whole week numbers area */ + hbr = CreateSolidBrush(infoPtr->monthbk); + FillRect(hdc, &r, hbr); + DeleteObject(hbr); + + /* reduce rectangle to one week number */ r.bottom = r.top + infoPtr->height_increment; for(i = 0; i < 6; i++) {

1 0

Nikolay Sivov : comctl32/monthcal: Add helper to jump to specified number of months.
by Alexandre Julliard Aug. 2, 2010

Aug. 2, 2010

Module: wine Branch: master Commit: b83d11ace4d5dbdef07a8e777529b8b12f2734a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b83d11ace4d5dbdef07a8e777… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 1 10:25:00 2010 +0400 comctl32/monthcal: Add helper to jump to specified number of months. --- dlls/comctl32/monthcal.c | 30 ++++++++++++------------------ 1 files changed, 12 insertions(+), 18 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 5f5c7c2..91cd4cb 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -455,36 +455,30 @@ int MONTHCAL_CalculateDayOfWeek(SYSTEMTIME *date, BOOL inplace) return st.wDayOfWeek; } -/* properly updates date to point on next month */ -static inline void MONTHCAL_GetNextMonth(SYSTEMTIME *date) +/* add/substract 'months' from date */ +static inline void MONTHCAL_GetMonth(SYSTEMTIME *date, INT months) { INT length; - if(++date->wMonth > 12) - { - date->wMonth = 1; - date->wYear++; - } + date->wMonth += months; + date->wYear += date->wMonth > 0 ? (date->wMonth - 1) / 12 : date->wMonth / 12 - 1; + date->wMonth = date->wMonth > 0 ? (date->wMonth - 1) % 12 + 1 : 12 + date->wMonth % 12; /* fix moving from last day in a month */ length = MONTHCAL_MonthLength(date->wMonth, date->wYear); if(date->wDay > length) date->wDay = length; MONTHCAL_CalculateDayOfWeek(date, TRUE); } +/* properly updates date to point on next month */ +static inline void MONTHCAL_GetNextMonth(SYSTEMTIME *date) +{ + return MONTHCAL_GetMonth(date, 1); +} + /* properly updates date to point on prev month */ static inline void MONTHCAL_GetPrevMonth(SYSTEMTIME *date) { - INT length; - - if(--date->wMonth < 1) - { - date->wMonth = 12; - date->wYear--; - } - /* fix moving from last day in a month */ - length = MONTHCAL_MonthLength(date->wMonth, date->wYear); - if(date->wDay > length) date->wDay = length; - MONTHCAL_CalculateDayOfWeek(date, TRUE); + return MONTHCAL_GetMonth(date, -1); } /* Returns full date for a first currently visible day */

1 0

Nikolay Sivov : comctl32/monthcal: Fix navigation from last day in a month.
by Alexandre Julliard Aug. 2, 2010

Aug. 2, 2010

Module: wine Branch: master Commit: 23e9866be846657e95bcb69bde1e9baa58587b9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=23e9866be846657e95bcb69bd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jul 31 13:36:37 2010 +0400 comctl32/monthcal: Fix navigation from last day in a month. --- dlls/comctl32/monthcal.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 2ae3f46..5f5c7c2 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -458,22 +458,32 @@ int MONTHCAL_CalculateDayOfWeek(SYSTEMTIME *date, BOOL inplace) /* properly updates date to point on next month */ static inline void MONTHCAL_GetNextMonth(SYSTEMTIME *date) { + INT length; + if(++date->wMonth > 12) { date->wMonth = 1; date->wYear++; } + /* fix moving from last day in a month */ + length = MONTHCAL_MonthLength(date->wMonth, date->wYear); + if(date->wDay > length) date->wDay = length; MONTHCAL_CalculateDayOfWeek(date, TRUE); } /* properly updates date to point on prev month */ static inline void MONTHCAL_GetPrevMonth(SYSTEMTIME *date) { + INT length; + if(--date->wMonth < 1) { date->wMonth = 12; date->wYear--; } + /* fix moving from last day in a month */ + length = MONTHCAL_MonthLength(date->wMonth, date->wYear); + if(date->wDay > length) date->wDay = length; MONTHCAL_CalculateDayOfWeek(date, TRUE); }

1 0

Nikolay Sivov : comctl32/monthcal: Rename button navigation helper to better reflect its purpose.
by Alexandre Julliard Aug. 2, 2010

Aug. 2, 2010

Module: wine Branch: master Commit: a35085457e198bda43d2eebcf27d1eaf9437a33a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a35085457e198bda43d2eebcf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jul 31 13:25:47 2010 +0400 comctl32/monthcal: Rename button navigation helper to better reflect its purpose. --- dlls/comctl32/monthcal.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index ded407e..2ae3f46 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -150,6 +150,12 @@ static const SYSTEMTIME st_null; static const SYSTEMTIME max_allowed_date = { .wYear = 9999, .wMonth = 12, .wDay = 31 }; static const SYSTEMTIME min_allowed_date = { .wYear = 1752, .wMonth = 9, .wDay = 14 }; +/* Prev/Next buttons */ +enum nav_direction +{ + DIRECTION_BACKWARD, + DIRECTION_FORWARD +}; #define MONTHCAL_GetInfoPtr(hwnd) ((MONTHCAL_INFO *)GetWindowLongPtrW(hwnd, 0)) @@ -1764,13 +1770,13 @@ static void MONTHCAL_NotifyDayState(MONTHCAL_INFO *infoPtr) } } -static void MONTHCAL_GoToPrevNextMonth(MONTHCAL_INFO *infoPtr, BOOL prev) +static void MONTHCAL_GoToMonth(MONTHCAL_INFO *infoPtr, enum nav_direction direction) { SYSTEMTIME st = infoPtr->curSel; - TRACE("%s\n", prev ? "prev" : "next"); + TRACE("%s\n", direction == DIRECTION_BACKWARD ? "back" : "fwd"); - if(prev) MONTHCAL_GetPrevMonth(&st); else MONTHCAL_GetNextMonth(&st); + if(direction == DIRECTION_BACKWARD) MONTHCAL_GetPrevMonth(&st); else MONTHCAL_GetNextMonth(&st); if(!MONTHCAL_IsDateInValidRange(infoPtr, &st, FALSE)) return; @@ -1781,7 +1787,7 @@ static void MONTHCAL_GoToPrevNextMonth(MONTHCAL_INFO *infoPtr, BOOL prev) range[0] = infoPtr->minSel; range[1] = infoPtr->maxSel; - if(prev) + if(direction == DIRECTION_BACKWARD) { MONTHCAL_GetPrevMonth(&range[0]); MONTHCAL_GetPrevMonth(&range[1]); @@ -1939,14 +1945,14 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) switch(hit) { case MCHT_TITLEBTNNEXT: - MONTHCAL_GoToPrevNextMonth(infoPtr, FALSE); + MONTHCAL_GoToMonth(infoPtr, DIRECTION_FORWARD); infoPtr->status = MC_NEXTPRESSED; SetTimer(infoPtr->hwndSelf, MC_PREVNEXTMONTHTIMER, MC_PREVNEXTMONTHDELAY, 0); InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); return 0; case MCHT_TITLEBTNPREV: - MONTHCAL_GoToPrevNextMonth(infoPtr, TRUE); + MONTHCAL_GoToMonth(infoPtr, DIRECTION_BACKWARD); infoPtr->status = MC_PREVPRESSED; SetTimer(infoPtr->hwndSelf, MC_PREVNEXTMONTHTIMER, MC_PREVNEXTMONTHDELAY, 0); InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); @@ -2081,8 +2087,8 @@ MONTHCAL_Timer(MONTHCAL_INFO *infoPtr, WPARAM id) switch(id) { case MC_PREVNEXTMONTHTIMER: - if(infoPtr->status & MC_NEXTPRESSED) MONTHCAL_GoToPrevNextMonth(infoPtr, FALSE); - if(infoPtr->status & MC_PREVPRESSED) MONTHCAL_GoToPrevNextMonth(infoPtr, TRUE); + if(infoPtr->status & MC_NEXTPRESSED) MONTHCAL_GoToMonth(infoPtr, DIRECTION_FORWARD); + if(infoPtr->status & MC_PREVPRESSED) MONTHCAL_GoToMonth(infoPtr, DIRECTION_BACKWARD); InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); break; case MC_TODAYUPDATETIMER:

1 0

Nikolay Sivov : comctl32/monthcal: Add support for month delta in button navigation.
by Alexandre Julliard Aug. 2, 2010

Aug. 2, 2010

Module: wine Branch: master Commit: 516c322eccddf045fb1128bde9cae30f8329f2cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=516c322eccddf045fb1128bde… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 1 14:38:40 2010 +0400 comctl32/monthcal: Add support for month delta in button navigation. --- dlls/comctl32/monthcal.c | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 91cd4cb..23900cf 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1776,11 +1776,22 @@ static void MONTHCAL_NotifyDayState(MONTHCAL_INFO *infoPtr) static void MONTHCAL_GoToMonth(MONTHCAL_INFO *infoPtr, enum nav_direction direction) { - SYSTEMTIME st = infoPtr->curSel; + INT delta = infoPtr->delta ? infoPtr->delta : infoPtr->cal_num; + SYSTEMTIME st; TRACE("%s\n", direction == DIRECTION_BACKWARD ? "back" : "fwd"); - if(direction == DIRECTION_BACKWARD) MONTHCAL_GetPrevMonth(&st); else MONTHCAL_GetNextMonth(&st); + /* check if change allowed by range set */ + if(direction == DIRECTION_BACKWARD) + { + st = infoPtr->calendars[0].month; + MONTHCAL_GetMonth(&st, -delta); + } + else + { + st = infoPtr->calendars[infoPtr->cal_num-1].month; + MONTHCAL_GetMonth(&st, delta); + } if(!MONTHCAL_IsDateInValidRange(infoPtr, &st, FALSE)) return; @@ -1793,13 +1804,13 @@ static void MONTHCAL_GoToMonth(MONTHCAL_INFO *infoPtr, enum nav_direction direct if(direction == DIRECTION_BACKWARD) { - MONTHCAL_GetPrevMonth(&range[0]); - MONTHCAL_GetPrevMonth(&range[1]); + MONTHCAL_GetMonth(&range[0], -delta); + MONTHCAL_GetMonth(&range[1], -delta); } else { - MONTHCAL_GetNextMonth(&range[0]); - MONTHCAL_GetNextMonth(&range[1]); + MONTHCAL_GetMonth(&range[0], delta); + MONTHCAL_GetMonth(&range[1], delta); } MONTHCAL_SetSelRange(infoPtr, range); @@ -1808,7 +1819,6 @@ static void MONTHCAL_GoToMonth(MONTHCAL_INFO *infoPtr, enum nav_direction direct MONTHCAL_SetCurSel(infoPtr, &st); MONTHCAL_NotifyDayState(infoPtr); - MONTHCAL_NotifySelectionChange(infoPtr); }

1 0