wine-commits September 2011

wine-commits@winehq.org

2 participants
996 discussions

Alexandre Julliard : Release 1.3.29.
by Alexandre Julliard 23 Sep '11

23 Sep '11

Module: wine Branch: master Commit: e5ba60174ef931d299894bc1e8961c822f4809c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5ba60174ef931d299894bc1e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 23 19:46:51 2011 +0200 Release 1.3.29. --- ANNOUNCE | 1314 +++++++++++++++++++++++++++++++------------------------------ VERSION | 2 +- configure | 18 +- 3 files changed, 681 insertions(+), 653 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e5ba60174ef931d299894…

1 0

Aric Stewart : usp10: ScriptShape needs a number of SCRIPT_VISATTR equal to glyphs not chars.
by Alexandre Julliard 23 Sep '11

23 Sep '11

Module: wine Branch: master Commit: b8f1b5adfea6e307390808eaf935019f7dd3c785 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8f1b5adfea6e307390808eaf… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Sep 23 09:42:46 2011 -0500 usp10: ScriptShape needs a number of SCRIPT_VISATTR equal to glyphs not chars. --- dlls/usp10/usp10.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index fe8f6a8..b8eee22 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -991,7 +991,7 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, WORD *glyphs = heap_alloc_zero(sizeof(WORD) * numGlyphs); WORD *pwLogClust = heap_alloc_zero(sizeof(WORD) * cChar); int *piAdvance = heap_alloc_zero(sizeof(int) * numGlyphs); - SCRIPT_VISATTR *psva = heap_alloc_zero(sizeof(SCRIPT_VISATTR) * cChar); + SCRIPT_VISATTR *psva = heap_alloc_zero(sizeof(SCRIPT_VISATTR) * numGlyphs); GOFFSET *pGoffset = heap_alloc_zero(sizeof(GOFFSET) * numGlyphs); ABC *abc = heap_alloc_zero(sizeof(ABC)); int numGlyphsReturned;

1 0

Michael Stefaniuc : dsound/tests: Remove some explicit casts that happen implicitly.
by Alexandre Julliard 23 Sep '11

23 Sep '11

Module: wine Branch: master Commit: e2c0ea01ac2f7e4f5fc13e83c76119599b30aa4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2c0ea01ac2f7e4f5fc13e83c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Sep 23 16:05:37 2011 +0200 dsound/tests: Remove some explicit casts that happen implicitly. --- dlls/dsound/tests/ds3d.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index e8c2e32..3e56c8a 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -54,12 +54,12 @@ char* wave_generate_la(WAVEFORMATEX* wfx, double duration, DWORD* size, BOOL iee for (i=0;i<nb_samples;i++) { double y=sin(440.0*2*PI*i/wfx->nSamplesPerSec); if (wfx->wBitsPerSample==8) { - unsigned char sample=(unsigned char)((double)127.5*(y+1.0)); + unsigned char sample=127.5*(y+1.0); *b++=sample; if (wfx->nChannels==2) *b++=sample; } else if (wfx->wBitsPerSample == 16) { - signed short sample=(signed short)((double)32767.5*y-0.5); + signed short sample=32767.5*y-0.5; b[0]=sample & 0xff; b[1]=sample >> 8; b+=2; @@ -69,7 +69,7 @@ char* wave_generate_la(WAVEFORMATEX* wfx, double duration, DWORD* size, BOOL iee b+=2; } } else if (wfx->wBitsPerSample == 24) { - signed int sample=(signed int)((double)8388607.5*y-0.5); + signed int sample=8388607.5*y-0.5; b[0]=sample & 0xff; b[1]=(sample >> 8)&0xff; b[2]=sample >> 16; @@ -93,7 +93,7 @@ char* wave_generate_la(WAVEFORMATEX* wfx, double duration, DWORD* size, BOOL iee b+=4; } } else { - signed int sample=(signed int)((double)2147483647.5*y-0.5); + signed int sample=2147483647.5*y-0.5; b[0]=sample & 0xff; b[1]=(sample >> 8)&0xff; b[2]=(sample >> 16)&0xff;

1 0

Michael Stefaniuc : msi: Remove casts to the type of the casted variable.
by Alexandre Julliard 23 Sep '11

23 Sep '11

Module: wine Branch: master Commit: 6074bd51cc5a252218b9be44311558ab981c5102 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6074bd51cc5a252218b9be443… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Sep 23 16:03:23 2011 +0200 msi: Remove casts to the type of the casted variable. --- dlls/msi/action.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index d81c9b7..80bcfc8 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3386,7 +3386,7 @@ static UINT ITERATE_RegisterTypeLibraries(MSIRECORD *row, LPVOID param) { LPCWSTR guid; guid = MSI_RecordGetString(row,1); - CLSIDFromString((LPCWSTR)guid, &tl_struct.clsid); + CLSIDFromString( guid, &tl_struct.clsid); tl_struct.source = strdupW( file->TargetPath ); tl_struct.path = NULL; @@ -3473,7 +3473,7 @@ static UINT ITERATE_UnregisterTypeLibraries( MSIRECORD *row, LPVOID param ) msi_ui_actiondata( package, szUnregisterTypeLibraries, row ); guid = MSI_RecordGetString( row, 1 ); - CLSIDFromString( (LPCWSTR)guid, &libid ); + CLSIDFromString( guid, &libid ); version = MSI_RecordGetInteger( row, 4 ); language = MSI_RecordGetInteger( row, 2 );

1 0

Alistair Leslie-Hughes : mshtml: Add IHTMLCurrentStyle2/3/4 support.
by Alexandre Julliard 23 Sep '11

23 Sep '11

Module: wine Branch: master Commit: 9477521fb83047a2f466fba2a12118e4cc70e2b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9477521fb83047a2f466fba2a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 23 21:10:51 2011 +1000 mshtml: Add IHTMLCurrentStyle2/3/4 support. --- dlls/mshtml/htmlcurstyle.c | 425 +++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/tests/dom.c | 3 + 2 files changed, 426 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9477521fb83047a2f466f…

1 0

Nikolay Sivov : comctl32/monthcal: Fix jump to today date.
by Alexandre Julliard 23 Sep '11

23 Sep '11

Module: wine Branch: master Commit: 6766535408378bdefb0210aea1e251d868dbe7ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=6766535408378bdefb0210aea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 23 14:53:47 2011 +0400 comctl32/monthcal: Fix jump to today date. --- dlls/comctl32/monthcal.c | 36 +++++++++++++++++++++++++++--------- 1 files changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index d230f34..e73b40a 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1491,7 +1491,11 @@ MONTHCAL_SetCurSel(MONTHCAL_INFO *infoPtr, SYSTEMTIME *curSel) /* exit earlier if selection equals current */ if (MONTHCAL_IsDateEqual(&infoPtr->minSel, curSel)) return TRUE; - if(!MONTHCAL_IsDateInValidRange(infoPtr, curSel, FALSE)) return FALSE; + selection = *curSel; + selection.wHour = selection.wMinute = selection.wSecond = selection.wMilliseconds = 0; + MONTHCAL_CalculateDayOfWeek(&selection, TRUE); + + if(!MONTHCAL_IsDateInValidRange(infoPtr, &selection, FALSE)) return FALSE; /* scroll calendars only if we have to */ diff = MONTHCAL_MonthDiff(&infoPtr->calendars[MONTHCAL_GetCalCount(infoPtr)-1].month, curSel); @@ -1509,6 +1513,7 @@ MONTHCAL_SetCurSel(MONTHCAL_INFO *infoPtr, SYSTEMTIME *curSel) MONTHCAL_GetMonth(&infoPtr->calendars[i].month, diff); } + /* we need to store time part as it is */ selection = *curSel; MONTHCAL_CalculateDayOfWeek(&selection, TRUE); infoPtr->minSel = infoPtr->maxSel = selection; @@ -1977,10 +1982,18 @@ MONTHCAL_RButtonUp(MONTHCAL_INFO *infoPtr, LPARAM lParam) if( TrackPopupMenu(hMenu, TPM_RIGHTBUTTON | TPM_NONOTIFY | TPM_RETURNCMD, menupoint.x, menupoint.y, 0, infoPtr->hwndSelf, NULL)) { - infoPtr->calendars[0].month = infoPtr->todaysDate; - infoPtr->minSel = infoPtr->todaysDate; - infoPtr->maxSel = infoPtr->todaysDate; - InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); + if (infoPtr->dwStyle & MCS_MULTISELECT) + { + SYSTEMTIME range[2]; + + range[0] = range[1] = infoPtr->todaysDate; + MONTHCAL_SetSelRange(infoPtr, range); + } + else + MONTHCAL_SetCurSel(infoPtr, &infoPtr->todaysDate); + + MONTHCAL_NotifySelectionChange(infoPtr); + MONTHCAL_NotifySelect(infoPtr); } return 0; @@ -2153,10 +2166,15 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) } case MCHT_TODAYLINK: { - infoPtr->calendars[0].month = infoPtr->todaysDate; - infoPtr->minSel = infoPtr->todaysDate; - infoPtr->maxSel = infoPtr->todaysDate; - InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); + if (infoPtr->dwStyle & MCS_MULTISELECT) + { + SYSTEMTIME range[2]; + + range[0] = range[1] = infoPtr->todaysDate; + MONTHCAL_SetSelRange(infoPtr, range); + } + else + MONTHCAL_SetCurSel(infoPtr, &infoPtr->todaysDate); MONTHCAL_NotifySelectionChange(infoPtr); MONTHCAL_NotifySelect(infoPtr);

1 0

Nikolay Sivov : comctl32/monthcal: Properly adjust day of week in MCM_SETCURSEL.
by Alexandre Julliard 23 Sep '11

23 Sep '11

Module: wine Branch: master Commit: d3758e02b84d33a058a942f2799a203e0a127ae4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3758e02b84d33a058a942f27… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 23 14:17:14 2011 +0400 comctl32/monthcal: Properly adjust day of week in MCM_SETCURSEL. --- dlls/comctl32/monthcal.c | 11 +++++------ dlls/comctl32/tests/monthcal.c | 6 +++--- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 652bee8..d230f34 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -247,9 +247,7 @@ static inline BOOL MONTHCAL_IsDateEqual(const SYSTEMTIME *first, const SYSTEMTIM static BOOL MONTHCAL_ValidateDate(const SYSTEMTIME *time) { if(time->wMonth < 1 || time->wMonth > 12 ) return FALSE; - if(time->wDayOfWeek > 6) return FALSE; - if(time->wDay > MONTHCAL_MonthLength(time->wMonth, time->wYear)) - return FALSE; + if(time->wDay > MONTHCAL_MonthLength(time->wMonth, time->wYear)) return FALSE; return TRUE; } @@ -1481,7 +1479,7 @@ MONTHCAL_GetCurSel(const MONTHCAL_INFO *infoPtr, SYSTEMTIME *curSel) static LRESULT MONTHCAL_SetCurSel(MONTHCAL_INFO *infoPtr, SYSTEMTIME *curSel) { - SYSTEMTIME prev = infoPtr->minSel; + SYSTEMTIME prev = infoPtr->minSel, selection; INT diff; WORD day; @@ -1511,8 +1509,9 @@ MONTHCAL_SetCurSel(MONTHCAL_INFO *infoPtr, SYSTEMTIME *curSel) MONTHCAL_GetMonth(&infoPtr->calendars[i].month, diff); } - infoPtr->minSel = *curSel; - infoPtr->maxSel = *curSel; + selection = *curSel; + MONTHCAL_CalculateDayOfWeek(&selection, TRUE); + infoPtr->minSel = infoPtr->maxSel = selection; /* if selection is still in current month, reduce rectangle */ day = prev.wDay; diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 454ea89..2686fb7 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -782,15 +782,15 @@ static void test_currdate(void) st_test.wMonth = 10; st_test.wDayOfWeek = 100; res = SendMessage(hwnd, MCM_SETCURSEL, 0, (LPARAM)&st_test); - todo_wine expect(1, res); + expect(1, res); memset(&st_test, 0, sizeof(st_test)); res = SendMessage(hwnd, MCM_GETCURSEL, 0, (LPARAM)&st_test); expect(1, res); expect(2009, st_test.wYear); - todo_wine expect(7, st_test.wDay); + expect(7, st_test.wDay); expect(10, st_test.wMonth); - todo_wine expect(3, st_test.wDayOfWeek); + expect(3, st_test.wDayOfWeek); DestroyWindow(hwnd); }

1 0

Nikolay Sivov : comctl32/monthcal: Correct MCM_SETTODAY handler return value.
by Alexandre Julliard 23 Sep '11

23 Sep '11

Module: wine Branch: master Commit: d6349844e653f86ed448c6fbf38f54827270366d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6349844e653f86ed448c6fbf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 23 13:34:37 2011 +0400 comctl32/monthcal: Correct MCM_SETTODAY handler return value. --- dlls/comctl32/monthcal.c | 11 ++++++----- dlls/comctl32/tests/monthcal.c | 26 +++++++++++++++++++++++--- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 9e4284c..652bee8 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1680,12 +1680,13 @@ MONTHCAL_SetToday(MONTHCAL_INFO *infoPtr, const SYSTEMTIME *today) { TRACE("%p\n", today); - if(!today) return FALSE; - - /* remember if date was set successfully */ - if(MONTHCAL_UpdateToday(infoPtr, today)) infoPtr->todaySet = TRUE; + if (today) + { + /* remember if date was set successfully */ + if (MONTHCAL_UpdateToday(infoPtr, today)) infoPtr->todaySet = TRUE; + } - return TRUE; + return 0; } /* returns calendar index containing specified point, or -1 if it's background */ diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index f661242..454ea89 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -775,6 +775,23 @@ static void test_currdate(void) res = SendMessage(hwnd, MCM_SETCURSEL, 0, (LPARAM)&st_new); expect(1, res); + /* set with invalid day of week */ + memset(&st_test, 0, sizeof(st_test)); + st_test.wYear = 2009; + st_test.wDay = 7; + st_test.wMonth = 10; + st_test.wDayOfWeek = 100; + res = SendMessage(hwnd, MCM_SETCURSEL, 0, (LPARAM)&st_test); + todo_wine expect(1, res); + + memset(&st_test, 0, sizeof(st_test)); + res = SendMessage(hwnd, MCM_GETCURSEL, 0, (LPARAM)&st_test); + expect(1, res); + expect(2009, st_test.wYear); + todo_wine expect(7, st_test.wDay); + expect(10, st_test.wMonth); + todo_wine expect(3, st_test.wDayOfWeek); + DestroyWindow(hwnd); } @@ -1162,7 +1179,8 @@ static void test_todaylink(void) st_test.wMonth = 1; st_test.wYear = 2005; - SendMessage(hwnd, MCM_SETTODAY, 0, (LPARAM)&st_test); + res = SendMessage(hwnd, MCM_SETTODAY, 0, (LPARAM)&st_test); + expect(0, res); memset(&st_new, 0, sizeof(st_new)); res = SendMessage(hwnd, MCM_GETTODAY, 0, (LPARAM)&st_new); @@ -1206,7 +1224,8 @@ static void test_today(void) st_new.wDay = 27; st_new.wMonth = 27; - SendMessage(hwnd, MCM_SETTODAY, 0, (LPARAM)&st_test); + res = SendMessage(hwnd, MCM_SETTODAY, 0, (LPARAM)&st_test); + expect(0, res); res = SendMessage(hwnd, MCM_GETTODAY, 0, (LPARAM)&st_new); expect(1, res); @@ -1223,7 +1242,8 @@ static void test_today(void) st_test.wDay = 0; st_test.wMonth = 0; - SendMessage(hwnd, MCM_SETTODAY, 0, (LPARAM)&st_test); + res = SendMessage(hwnd, MCM_SETTODAY, 0, (LPARAM)&st_test); + expect(0, res); res = SendMessage(hwnd, MCM_GETTODAY, 0, (LPARAM)&st_new); expect(1, res);

1 0

Nikolay Sivov : comctl32/monthcal: Fix some day state problems.
by Alexandre Julliard 23 Sep '11

23 Sep '11

Module: wine Branch: master Commit: efbb419621f51dac269ae2a4d0b4dd6594f077e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efbb419621f51dac269ae2a4d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 23 12:25:35 2011 +0400 comctl32/monthcal: Fix some day state problems. --- dlls/comctl32/monthcal.c | 165 +++++++++++++++++++++------------------- dlls/comctl32/tests/monthcal.c | 52 +++++++++++++ 2 files changed, 140 insertions(+), 77 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=efbb419621f51dac269ae…

1 0

Nikolay Sivov : comctl32/monthcal: Fix MCM_GETMONTHRANGE with regard to multiple calendars and parameter handling .
by Alexandre Julliard 23 Sep '11

23 Sep '11

Module: wine Branch: master Commit: b11208e5f8823acc125535da0c9f91e4bef38d31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b11208e5f8823acc125535da0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 23 10:27:14 2011 +0400 comctl32/monthcal: Fix MCM_GETMONTHRANGE with regard to multiple calendars and parameter handling. --- dlls/comctl32/monthcal.c | 65 ++++++++++++++++++++++----------------- dlls/comctl32/tests/monthcal.c | 12 +++++-- 2 files changed, 45 insertions(+), 32 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 5f8a36c..a6602f9 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1330,42 +1330,51 @@ MONTHCAL_SetFirstDayOfWeek(MONTHCAL_INFO *infoPtr, INT day) static LRESULT MONTHCAL_GetMonthRange(const MONTHCAL_INFO *infoPtr, DWORD flag, SYSTEMTIME *st) { + INT range; + TRACE("flag=%d, st=%p\n", flag, st); - if(st) + switch (flag) { + case GMR_VISIBLE: { - switch (flag) { - case GMR_VISIBLE: - { - st[0] = infoPtr->calendars[0].month; - st[1] = infoPtr->calendars[MONTHCAL_GetCalCount(infoPtr)-1].month; + if (st) + { + st[0] = infoPtr->calendars[0].month; + st[1] = infoPtr->calendars[MONTHCAL_GetCalCount(infoPtr)-1].month; - if (st[0].wMonth == min_allowed_date.wMonth && - st[0].wYear == min_allowed_date.wYear) - { - st[0].wDay = min_allowed_date.wDay; - } - else - st[0].wDay = 1; - MONTHCAL_CalculateDayOfWeek(&st[0], TRUE); + if (st[0].wMonth == min_allowed_date.wMonth && + st[0].wYear == min_allowed_date.wYear) + { + st[0].wDay = min_allowed_date.wDay; + } + else + st[0].wDay = 1; + MONTHCAL_CalculateDayOfWeek(&st[0], TRUE); - st[1].wDay = MONTHCAL_MonthLength(st[1].wMonth, st[1].wYear); - MONTHCAL_CalculateDayOfWeek(&st[1], TRUE); + st[1].wDay = MONTHCAL_MonthLength(st[1].wMonth, st[1].wYear); + MONTHCAL_CalculateDayOfWeek(&st[1], TRUE); + } - return MONTHCAL_GetCalCount(infoPtr); - } - case GMR_DAYSTATE: - { - MONTHCAL_GetMinDate(infoPtr, &st[0]); - MONTHCAL_GetMaxDate(infoPtr, &st[1]); - break; - } - default: - WARN("Unknown flag value, got %d\n", flag); - } + range = MONTHCAL_GetCalCount(infoPtr); + break; + } + case GMR_DAYSTATE: + { + if (st) + { + MONTHCAL_GetMinDate(infoPtr, &st[0]); + MONTHCAL_GetMaxDate(infoPtr, &st[1]); + } + /* include two partially visible months */ + range = MONTHCAL_GetCalCount(infoPtr) + 2; + break; + } + default: + WARN("Unknown flag value, got %d\n", flag); + range = 0; } - return infoPtr->monthRange; + return range; } diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index ccf8881..766732b 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -1317,7 +1317,6 @@ static void test_monthrange(void) res = SendMessage(hwnd, MCM_GETMONTHRANGE, GMR_VISIBLE, (LPARAM)st_visible); expect(2, res); - expect(2000, st_visible[0].wYear); expect(11, st_visible[0].wMonth); expect(1, st_visible[0].wDay); @@ -1326,9 +1325,7 @@ static void test_monthrange(void) expect(31, st_visible[1].wDay); res = SendMessage(hwnd, MCM_GETMONTHRANGE, GMR_DAYSTATE, (LPARAM)st_daystate); - todo_wine { - expect(4, res); - } + expect(4, res); expect(2000, st_daystate[0].wYear); expect(10, st_daystate[0].wMonth); expect(29, st_daystate[0].wDay); @@ -1338,6 +1335,13 @@ static void test_monthrange(void) ok_sequence(sequences, MONTHCAL_SEQ_INDEX, monthcal_monthrange_seq, "monthcal monthrange", FALSE); + /* with null date array parameter */ + res = SendMessage(hwnd, MCM_GETMONTHRANGE, GMR_VISIBLE, 0); + expect(2, res); + + res = SendMessage(hwnd, MCM_GETMONTHRANGE, GMR_DAYSTATE, 0); + expect(4, res); + /* resize control to display single Calendar */ MoveWindow(hwnd, 0, 0, r.right, r.bottom, FALSE);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2011