September 2011 - Wine-commits

Tag wine-1.3.29 : Alexandre Julliard : Release 1.3.29
by Alexandre Julliard 23 Sep '11

23 Sep '11

Module: wine Branch: refs/tags/wine-1.3.29 Tag: 8a300116c62efa674318f9650975d44660921ef1 URL: http://source.winehq.org/git/wine.git/?a=tag;h=8a300116c62efa674318f9650975… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 23 19:46:51 2011 +0200 Release 1.3.29

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

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

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

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

Bernhard Loos : server: ReleaseMutex doesn't need any access rights.
by Alexandre Julliard 23 Sep '11

23 Sep '11

Module: wine Branch: master Commit: 0d36c27e3ba2019b6c660cae49bc8e207c033984 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d36c27e3ba2019b6c660cae4… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Wed Sep 14 14:49:03 2011 +0200 server: ReleaseMutex doesn't need any access rights. --- dlls/kernel32/tests/sync.c | 4 +++- server/mutex.c | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index dd87f3e..1695713 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -158,13 +158,15 @@ static void test_mutex(void) for (i = 0; i < 32; i++) { hOpened = OpenMutex(0x1 << i, FALSE, "WineTestMutex"); - ReleaseMutex(hCreated); if(hOpened != NULL) { + ret = ReleaseMutex(hOpened); + ok(ret, "ReleaseMutex failed with error %d, access %x\n", GetLastError(), 1 << i); CloseHandle(hOpened); } else { + ReleaseMutex(hCreated); failed |=0x1 << i; } } diff --git a/server/mutex.c b/server/mutex.c index faedcf3..d21f341 100644 --- a/server/mutex.c +++ b/server/mutex.c @@ -175,7 +175,7 @@ static int mutex_signal( struct object *obj, unsigned int access ) struct mutex *mutex = (struct mutex *)obj; assert( obj->ops == &mutex_ops ); - if (!(access & SYNCHRONIZE)) /* FIXME: MUTEX_MODIFY_STATE? */ + if (!(access & SYNCHRONIZE)) { set_error( STATUS_ACCESS_DENIED ); return 0; @@ -265,7 +265,7 @@ DECL_HANDLER(release_mutex) struct mutex *mutex; if ((mutex = (struct mutex *)get_handle_obj( current->process, req->handle, - MUTEX_MODIFY_STATE, &mutex_ops ))) + 0, &mutex_ops ))) { if (!mutex->count || (mutex->owner != current)) set_error( STATUS_MUTANT_NOT_OWNED ); else

1 0

Bernhard Loos : server: Correct mapping of mutex access rights.
by Alexandre Julliard 23 Sep '11

23 Sep '11

Module: wine Branch: master Commit: 527a985a3d7154dac549ce5170f5d0a099163362 URL: http://source.winehq.org/git/wine.git/?a=commit;h=527a985a3d7154dac549ce517… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Wed Sep 14 14:49:09 2011 +0200 server: Correct mapping of mutex access rights. --- dlls/kernel32/tests/sync.c | 4 ++-- server/mutex.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 1695713..98d996f 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -140,7 +140,7 @@ static void test_mutex(void) hOpened = OpenMutex(GENERIC_EXECUTE, FALSE, "WineTestMutex"); ok(hOpened != NULL, "OpenMutex failed with error %d\n", GetLastError()); wait_ret = WaitForSingleObject(hOpened, INFINITE); - todo_wine ok(wait_ret == WAIT_OBJECT_0, "WaitForSingleObject failed with error %d\n", GetLastError()); + ok(wait_ret == WAIT_OBJECT_0, "WaitForSingleObject failed with error %d\n", GetLastError()); CloseHandle(hOpened); for(i=0; i < 31; i++) @@ -152,7 +152,7 @@ static void test_mutex(void) hOpened = OpenMutex(GENERIC_READ | GENERIC_WRITE, FALSE, "WineTestMutex"); ok(hOpened != NULL, "OpenMutex failed with error %d\n", GetLastError()); wait_ret = WaitForSingleObject(hOpened, INFINITE); - todo_wine ok(wait_ret == WAIT_FAILED, "WaitForSingleObject succeeded\n"); + ok(wait_ret == WAIT_FAILED, "WaitForSingleObject succeeded\n"); CloseHandle(hOpened); for (i = 0; i < 32; i++) diff --git a/server/mutex.c b/server/mutex.c index d21f341..7c9700d 100644 --- a/server/mutex.c +++ b/server/mutex.c @@ -163,9 +163,9 @@ static int mutex_satisfied( struct object *obj, struct thread *thread ) static unsigned int mutex_map_access( struct object *obj, unsigned int access ) { - if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ | SYNCHRONIZE; - if (access & GENERIC_WRITE) access |= STANDARD_RIGHTS_WRITE | MUTEX_MODIFY_STATE; - if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE; + if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ; + if (access & GENERIC_WRITE) access |= STANDARD_RIGHTS_WRITE; + if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE; if (access & GENERIC_ALL) access |= STANDARD_RIGHTS_ALL | MUTEX_ALL_ACCESS; return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); }

1 0

Alexandre Julliard : gdi32: Avoid rounding errors with visible rectangles in mirroring blits.
by Alexandre Julliard 23 Sep '11

23 Sep '11

Module: wine Branch: master Commit: 7029559ed6f4f4282a5204082120df482cea3fcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7029559ed6f4f4282a5204082… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 23 14:17:05 2011 +0200 gdi32: Avoid rounding errors with visible rectangles in mirroring blits. --- dlls/gdi32/bitblt.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 294901d..d58cd64 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -120,10 +120,13 @@ static BOOL get_vis_rectangles( DC *dc_dst, struct bitblt_coords *dst, else /* stretching */ { /* map source rectangle into destination coordinates */ - rect.left = dst->x + (src->visrect.left - src->x)*dst->width/src->width; - rect.top = dst->y + (src->visrect.top - src->y)*dst->height/src->height; - rect.right = dst->x + (src->visrect.right - src->x)*dst->width/src->width; - rect.bottom = dst->y + (src->visrect.bottom - src->y)*dst->height/src->height; + rect = src->visrect; + offset_rect( &rect, -min( src->x, src->x + src->width + 1), + -min( src->y, src->y + src->height + 1) ); + rect.left = dst->x + rect.left * dst->width / abs(src->width); + rect.top = dst->y + rect.top * dst->height / abs(src->height); + rect.right = dst->x + rect.right * dst->width / abs(src->width); + rect.bottom = dst->y + rect.bottom * dst->height / abs(src->height); if (rect.left > rect.right) swap_ints( &rect.left, &rect.right ); if (rect.top > rect.bottom) swap_ints( &rect.top, &rect.bottom ); @@ -135,10 +138,13 @@ static BOOL get_vis_rectangles( DC *dc_dst, struct bitblt_coords *dst, if (!intersect_rect( &dst->visrect, &rect, &dst->visrect )) return FALSE; /* map destination rectangle back to source coordinates */ - rect.left = src->x + (dst->visrect.left - dst->x)*src->width/dst->width; - rect.top = src->y + (dst->visrect.top - dst->y)*src->height/dst->height; - rect.right = src->x + (dst->visrect.right - dst->x)*src->width/dst->width; - rect.bottom = src->y + (dst->visrect.bottom - dst->y)*src->height/dst->height; + rect = dst->visrect; + offset_rect( &rect, -min( dst->x, dst->x + dst->width + 1), + -min( dst->y, dst->y + dst->height + 1) ); + rect.left = src->x + rect.left * src->width / abs(dst->width); + rect.top = src->y + rect.top * src->height / abs(dst->height); + rect.right = src->x + rect.right * src->width / abs(dst->width); + rect.bottom = src->y + rect.bottom * src->height / abs(dst->height); if (rect.left > rect.right) swap_ints( &rect.left, &rect.right ); if (rect.top > rect.bottom) swap_ints( &rect.top, &rect.bottom );

1 0

Louis Lenders : dpnet: Return a TCP/ IP provider in IDirectPlay8PeerImpl_EnumServiceProviders.
by Alexandre Julliard 23 Sep '11

23 Sep '11

Module: wine Branch: master Commit: 4a4678ca70321b74b9f0538138b73e882f552e95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a4678ca70321b74b9f053813… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Sun Sep 18 22:26:49 2011 +0200 dpnet: Return a TCP/IP provider in IDirectPlay8PeerImpl_EnumServiceProviders. --- dlls/dpnet/peer.c | 49 +++++++++++++++++++++++++++++++++++++++++++++- dlls/dpnet/tests/peer.c | 17 ++++++++------- 2 files changed, 56 insertions(+), 10 deletions(-) diff --git a/dlls/dpnet/peer.c b/dlls/dpnet/peer.c index f4d238a..307b306 100644 --- a/dlls/dpnet/peer.c +++ b/dlls/dpnet/peer.c @@ -95,8 +95,53 @@ static HRESULT WINAPI IDirectPlay8PeerImpl_EnumServiceProviders(IDirectPlay8Peer DPN_SERVICE_PROVIDER_INFO * const pSPInfoBuffer, DWORD * const pcbEnumData, DWORD * const pcReturned, const DWORD dwFlags) { - FIXME("(%p)->(%p,%p,%p,%p,%p,%x): stub\n", iface, pguidServiceProvider, pguidApplication, pSPInfoBuffer, pcbEnumData, pcReturned, dwFlags); - return DPNERR_GENERIC; + static const WCHAR dp_providerW[] = {'D','i','r','e','c','t','P','l','a','y','8',' ','T','C','P','/','I','P',' ', + 'S','e','r','v','i','c','e',' ','P','r','o','v','i','d','e','r','\0'}; + static const WCHAR dp_adapterW[] = {'L','o','c','a','l',' ','A','r','e','a',' ','C','o','n','n','e','c','t','i','o','n', + ' ','-',' ','I','P','v','4','\0'}; + + static const GUID adapter_guid = {0x4ce725f6, 0xd3c0, 0xdade, {0xba, 0x6f, 0x11, 0xf9, 0x65, 0xbc, 0x42, 0x99}}; + DWORD req_size; + + TRACE("(%p)->(%p,%p,%p,%p,%p,%x): stub\n", iface, pguidServiceProvider, pguidApplication, pSPInfoBuffer, + pcbEnumData, pcReturned, dwFlags); + + if(!pguidServiceProvider) + { + req_size = sizeof(DPN_SERVICE_PROVIDER_INFO) + sizeof(dp_providerW); + } + else if(IsEqualGUID(pguidServiceProvider, &CLSID_DP8SP_TCPIP)) + { + req_size = sizeof(DPN_SERVICE_PROVIDER_INFO) + sizeof(dp_adapterW); + } + else + { + FIXME("Application requested a provider we don't handle (yet)\n"); + *pcReturned = 0; + return DPNERR_DOESNOTEXIST; + } + + if(*pcbEnumData < req_size) + { + *pcbEnumData = req_size; + return DPNERR_BUFFERTOOSMALL; + } + + pSPInfoBuffer->pwszName = (LPWSTR)(pSPInfoBuffer + sizeof(DPN_SERVICE_PROVIDER_INFO)); + + if(!pguidServiceProvider) + { + lstrcpyW(pSPInfoBuffer->pwszName, dp_providerW); + pSPInfoBuffer->guid = CLSID_DP8SP_TCPIP; + } + else + { + lstrcpyW(pSPInfoBuffer->pwszName, dp_adapterW); + pSPInfoBuffer->guid = adapter_guid; + } + + *pcReturned = 1; + return DPN_OK; } static HRESULT WINAPI IDirectPlay8PeerImpl_CancelAsyncOperation(IDirectPlay8Peer *iface, diff --git a/dlls/dpnet/tests/peer.c b/dlls/dpnet/tests/peer.c index 1d6dfc9..67e0ace 100644 --- a/dlls/dpnet/tests/peer.c +++ b/dlls/dpnet/tests/peer.c @@ -67,14 +67,14 @@ static void test_enum_service_providers(void) items = 0; hr = IDirectPlay8Peer_EnumServiceProviders(peer, NULL, NULL, NULL, &size, &items, 0); - todo_wine ok(hr == DPNERR_BUFFERTOOSMALL, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr); - todo_wine ok(size != 0, "size is unexpectedly 0\n"); + ok(hr == DPNERR_BUFFERTOOSMALL, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr); + ok(size != 0, "size is unexpectedly 0\n"); serv_prov_info = (DPN_SERVICE_PROVIDER_INFO*) HeapAlloc(GetProcessHeap(), 0, size); hr = IDirectPlay8Peer_EnumServiceProviders(peer, NULL, NULL, serv_prov_info, &size, &items, 0); - todo_wine ok(hr == S_OK, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr); - todo_wine ok(items != 0, "Found unexpectedly no service providers\n"); + ok(hr == S_OK, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr); + ok(items != 0, "Found unexpectedly no service providers\n"); trace("number of items found: %d\n", items); @@ -93,14 +93,15 @@ static void test_enum_service_providers(void) items = 0; hr = IDirectPlay8Peer_EnumServiceProviders(peer, &CLSID_DP8SP_TCPIP, NULL, NULL, &size, &items, 0); - todo_wine ok(hr == DPNERR_BUFFERTOOSMALL, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr); - todo_wine ok(size != 0, "size is unexpectedly 0\n"); + ok(hr == DPNERR_BUFFERTOOSMALL, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr); + ok(size != 0, "size is unexpectedly 0\n"); serv_prov_info = (DPN_SERVICE_PROVIDER_INFO*) HeapAlloc(GetProcessHeap(), 0, size); hr = IDirectPlay8Peer_EnumServiceProviders(peer, &CLSID_DP8SP_TCPIP, NULL, serv_prov_info, &size, &items, 0); - todo_wine ok(hr == S_OK, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr); - todo_wine ok(items != 0, "Found unexpectedly no adapter\n"); + ok(hr == S_OK, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr); + ok(items != 0, "Found unexpectedly no adapter\n"); + for (i=0;i<items;i++) {

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