October 2009 - Wine-Commits

Andrew Eikum : ole32: Use snbExclude in StorageImpl::CopyTo.
by Alexandre Julliard Oct. 6, 2009

Oct. 6, 2009

Module: wine Branch: master Commit: 8672289c6e36ed88ae992d7616360e8ae1ce5158 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8672289c6e36ed88ae992d761… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Oct 5 16:13:55 2009 -0500 ole32: Use snbExclude in StorageImpl::CopyTo. --- dlls/ole32/storage32.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 646c8b8..9c38a65 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -1462,8 +1462,9 @@ static HRESULT WINAPI StorageImpl_CopyTo( HRESULT hr; IStorage *pstgTmp, *pstgChild; IStream *pstrTmp, *pstrChild; + BOOL skip = FALSE; - if ((ciidExclude != 0) || (rgiidExclude != NULL) || (snbExclude != NULL)) + if ((ciidExclude != 0) || (rgiidExclude != NULL)) FIXME("Exclude option not implemented\n"); TRACE("(%p, %d, %p, %p, %p)\n", @@ -1500,6 +1501,21 @@ static HRESULT WINAPI StorageImpl_CopyTo( break; } + if ( snbExclude ) + { + WCHAR **snb = snbExclude; + skip = FALSE; + while ( *snb != NULL && !skip ) + { + if ( lstrcmpW(curElement.pwcsName, *snb) == 0 ) + skip = TRUE; + ++snb; + } + } + + if ( skip ) + continue; + if (curElement.type == STGTY_STORAGE) { /* @@ -1548,7 +1564,7 @@ static HRESULT WINAPI StorageImpl_CopyTo( * do the copy recursively */ hr = IStorage_CopyTo( pstgChild, ciidExclude, rgiidExclude, - snbExclude, pstgTmp ); + NULL, pstgTmp ); IStorage_Release( pstgTmp ); IStorage_Release( pstgChild );

1 0

Nikolay Sivov : comctl32/monthcal: Check date limits on prev/ next month buttons and year UpDown control.
by Alexandre Julliard Oct. 6, 2009

Oct. 6, 2009

Module: wine Branch: master Commit: 42733f980b3652730364fed94b891d8529ff3255 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42733f980b3652730364fed94… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Oct 5 22:37:04 2009 +0400 comctl32/monthcal: Check date limits on prev/next month buttons and year UpDown control. --- dlls/comctl32/monthcal.c | 44 +++++++++++++------------------------------- 1 files changed, 13 insertions(+), 31 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index a7fb406..ad54074 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -132,6 +132,10 @@ static const WCHAR themeClass[] = { 'S','c','r','o','l','l','b','a','r',0 }; /* empty SYSTEMTIME const */ static const SYSTEMTIME st_null; +/* valid date limits */ +static const SYSTEMTIME max_allowed_date = { .wYear = 9999, .wMonth = 12, .wDay = 31 }; +static const SYSTEMTIME min_allowed_date = { .wYear = 1752, .wMonth = 9, .wDay = 14 }; + #define MONTHCAL_GetInfoPtr(hwnd) ((MONTHCAL_INFO *)GetWindowLongPtrW(hwnd, 0)) @@ -244,11 +248,8 @@ static LONG MONTHCAL_CompareSystemTime(const SYSTEMTIME *first, const SYSTEMTIME */ static BOOL MONTHCAL_IsDateInValidRange(const MONTHCAL_INFO *infoPtr, const SYSTEMTIME *date) { - static const SYSTEMTIME max_date = { .wYear = 9999, .wMonth = 12, .wDay = 31 }; - static const SYSTEMTIME min_date = { .wYear = 1752, .wMonth = 9, .wDay = 14 }; - - if((MONTHCAL_CompareSystemTime(date, &max_date) == 1) || - (MONTHCAL_CompareSystemTime(date, &min_date) == -1)) return FALSE; + if((MONTHCAL_CompareSystemTime(date, &max_allowed_date) == 1) || + (MONTHCAL_CompareSystemTime(date, &min_allowed_date) == -1)) return FALSE; if(infoPtr->rangeValid & GDTR_MAX) { if((MONTHCAL_CompareSystemTime(date, &infoPtr->maxSel) == 1)) return FALSE; @@ -1194,12 +1195,10 @@ MONTHCAL_SetRange(MONTHCAL_INFO *infoPtr, SHORT limits, SYSTEMTIME *range) } else { - 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 ; + if (limits & GDTR_MIN) infoPtr->maxDate = st_null; + if (limits & GDTR_MAX) infoPtr->minDate = st_null; + infoPtr->rangeValid &= limits & GDTR_MIN ? ~GDTR_MAX : ~GDTR_MIN; } } @@ -1554,16 +1553,7 @@ static void MONTHCAL_GoToNextMonth(MONTHCAL_INFO *infoPtr) next.wMonth = 1; } - /* prevent max range exceeding */ - if(infoPtr->rangeValid & GDTR_MAX) - { - FILETIME ft_next, ft_max; - - SystemTimeToFileTime(&infoPtr->maxDate, &ft_max); - SystemTimeToFileTime(&next, &ft_next); - - if (CompareFileTime(&ft_next, &ft_max) > 0) return; - } + if(!MONTHCAL_IsDateInValidRange(infoPtr, &next)) return; infoPtr->curSel = next; @@ -1583,16 +1573,7 @@ static void MONTHCAL_GoToPrevMonth(MONTHCAL_INFO *infoPtr) prev.wMonth = 12; } - /* prevent min range exceeding */ - if(infoPtr->rangeValid & GDTR_MIN) - { - FILETIME ft_prev, ft_min; - - SystemTimeToFileTime(&infoPtr->minDate, &ft_min); - SystemTimeToFileTime(&prev, &ft_prev); - - if (CompareFileTime(&ft_prev, &ft_min) < 0) return; - } + if(!MONTHCAL_IsDateInValidRange(infoPtr, &prev)) return; infoPtr->curSel = prev; @@ -1651,7 +1632,8 @@ static void MONTHCAL_EditYear(MONTHCAL_INFO *infoPtr) NULL, NULL, NULL); /* attach edit box */ - SendMessageW(infoPtr->hWndYearUpDown, UDM_SETRANGE, 0, MAKELONG(9999, 1753)); + SendMessageW(infoPtr->hWndYearUpDown, UDM_SETRANGE, 0, + MAKELONG(max_allowed_date.wYear, min_allowed_date.wYear)); SendMessageW(infoPtr->hWndYearUpDown, UDM_SETBUDDY, (WPARAM)infoPtr->hWndYearEdit, 0); SendMessageW(infoPtr->hWndYearUpDown, UDM_SETPOS, 0, infoPtr->curSel.wYear); }

1 0

Jörg Höhle : dsound: Get rid of redundant NULL check.
by Alexandre Julliard Oct. 6, 2009

Oct. 6, 2009

Module: wine Branch: master Commit: 6aac7cfafac114cc5aec84a27860802198dc90a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6aac7cfafac114cc5aec84a27… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Oct 4 14:30:50 2009 +0200 dsound: Get rid of redundant NULL check. --- dlls/dsound/capture.c | 32 +++++++++++++------------------- 1 files changed, 13 insertions(+), 19 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 312c90f..0e75dd7 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -1351,7 +1351,7 @@ HRESULT IDirectSoundCaptureBufferImpl_Create( if ( ((lpcDSCBufferDesc->dwSize != sizeof(DSCBUFFERDESC)) && (lpcDSCBufferDesc->dwSize != sizeof(DSCBUFFERDESC1))) || (lpcDSCBufferDesc->dwBufferBytes == 0) || - (lpcDSCBufferDesc->lpwfxFormat == NULL) ) { + (lpcDSCBufferDesc->lpwfxFormat == NULL) ) { /* FIXME: DSERR_BADFORMAT ? */ WARN("invalid lpcDSCBufferDesc\n"); *ppobj = NULL; return DSERR_INVALIDPARAM; @@ -1359,25 +1359,19 @@ HRESULT IDirectSoundCaptureBufferImpl_Create( wfex = lpcDSCBufferDesc->lpwfxFormat; - if (wfex) { - TRACE("(formattag=0x%04x,chans=%d,samplerate=%d," - "bytespersec=%d,blockalign=%d,bitspersamp=%d,cbSize=%d)\n", - wfex->wFormatTag, wfex->nChannels, wfex->nSamplesPerSec, - wfex->nAvgBytesPerSec, wfex->nBlockAlign, - wfex->wBitsPerSample, wfex->cbSize); - - if (wfex->wFormatTag == WAVE_FORMAT_PCM) { - device->pwfx = HeapAlloc(GetProcessHeap(),0,sizeof(WAVEFORMATEX)); - *device->pwfx = *wfex; - device->pwfx->cbSize = 0; - } else { - device->pwfx = HeapAlloc(GetProcessHeap(),0,sizeof(WAVEFORMATEX)+wfex->cbSize); - CopyMemory(device->pwfx, wfex, sizeof(WAVEFORMATEX)+wfex->cbSize); - } + TRACE("(formattag=0x%04x,chans=%d,samplerate=%d," + "bytespersec=%d,blockalign=%d,bitspersamp=%d,cbSize=%d)\n", + wfex->wFormatTag, wfex->nChannels, wfex->nSamplesPerSec, + wfex->nAvgBytesPerSec, wfex->nBlockAlign, + wfex->wBitsPerSample, wfex->cbSize); + + if (wfex->wFormatTag == WAVE_FORMAT_PCM) { + device->pwfx = HeapAlloc(GetProcessHeap(),0,sizeof(WAVEFORMATEX)); + CopyMemory(device->pwfx, wfex, sizeof(PCMWAVEFORMAT)); + device->pwfx->cbSize = 0; } else { - WARN("lpcDSCBufferDesc->lpwfxFormat == 0\n"); - *ppobj = NULL; - return DSERR_INVALIDPARAM; /* FIXME: DSERR_BADFORMAT ? */ + device->pwfx = HeapAlloc(GetProcessHeap(),0,sizeof(WAVEFORMATEX)+wfex->cbSize); + CopyMemory(device->pwfx, wfex, sizeof(WAVEFORMATEX)+wfex->cbSize); } *ppobj = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,

1 0

Andrew Nguyen : cmd: Fix copy option handling in batch mode.
by Alexandre Julliard Oct. 6, 2009

Oct. 6, 2009

Module: wine Branch: master Commit: 203c538aaa2ca940822791e4af42822bfdb59f53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=203c538aaa2ca940822791e4a… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Sat Oct 3 17:00:59 2009 -0500 cmd: Fix copy option handling in batch mode. --- programs/cmd/builtins.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index f5dfbf0..bccba85 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -171,7 +171,7 @@ void WCMD_copy (void) { WIN32_FIND_DATA fd; HANDLE hff; BOOL force, status; - WCHAR outpath[MAX_PATH], srcpath[MAX_PATH], copycmd[3]; + WCHAR outpath[MAX_PATH], srcpath[MAX_PATH], copycmd[4]; DWORD len; static const WCHAR copyCmdW[] = {'C','O','P','Y','C','M','D','\0'}; BOOL copyToDir = FALSE; @@ -238,8 +238,20 @@ void WCMD_copy (void) { else if (strstrW (quals, parmY)) force = TRUE; else { + /* By default, we will force the overwrite in batch mode and ask for + * confirmation in interactive mode. */ + force = !!context; + + /* If COPYCMD is set, then we force the overwrite with /Y and ask for + * confirmation with /-Y. If COPYCMD is neither of those, then we use the + * default behavior. */ len = GetEnvironmentVariable (copyCmdW, copycmd, sizeof(copycmd)/sizeof(WCHAR)); - force = (len && len < (sizeof(copycmd)/sizeof(WCHAR)) && ! lstrcmpiW (copycmd, parmY)); + if (len && len < (sizeof(copycmd)/sizeof(WCHAR))) { + if (!lstrcmpiW (copycmd, parmY)) + force = TRUE; + else if (!lstrcmpiW (copycmd, parmNoY)) + force = FALSE; + } } /* Loop through all source files */

1 0

Owen Rudge : comctl32: Ensure coordinates are valid during listview marquee selection.
by Alexandre Julliard Oct. 6, 2009

Oct. 6, 2009

Module: wine Branch: master Commit: 2a869d039ad38bb2c2f103fd1840f4abd8404dad URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a869d039ad38bb2c2f103fd1… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Oct 5 18:07:45 2009 +0100 comctl32: Ensure coordinates are valid during listview marquee selection. --- dlls/comctl32/listview.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index e1e51e7..2f30e9a 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3607,6 +3607,19 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN WORD wDragWidth = GetSystemMetrics(SM_CXDRAG); WORD wDragHeight= GetSystemMetrics(SM_CYDRAG); + /* Ensure coordinates are within client bounds */ + if (x < 0) + x = 0; + + if (y < 0) + y = 0; + + if (x > infoPtr->rcList.right) + x = infoPtr->rcList.right; + + if (y > infoPtr->rcList.bottom) + y = infoPtr->rcList.bottom; + tmp.x = x; tmp.y = y;

1 0

Andrey Turkin : kernel32: Catch invalid memory accesses in resource enumeration handlers.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

Module: wine Branch: master Commit: 95eb435a33826ee46f87cc687c1ea16c6fc10c8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=95eb435a33826ee46f87cc687… Author: Andrey Turkin <andrey.turkin(a)gmail.com> Date: Mon Oct 5 16:17:56 2009 +0400 kernel32: Catch invalid memory accesses in resource enumeration handlers. --- dlls/kernel32/resource.c | 119 ++++++++++++++++++++++++++++++---------------- 1 files changed, 78 insertions(+), 41 deletions(-) diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c index 9feb672..d405b95 100644 --- a/dlls/kernel32/resource.c +++ b/dlls/kernel32/resource.c @@ -378,32 +378,42 @@ BOOL WINAPI EnumResourceNamesA( HMODULE hmod, LPCSTR type, ENUMRESNAMEPROCA lpfu goto done; et = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(resdir + 1); - for (i = 0; i < resdir->NumberOfNamedEntries+resdir->NumberOfIdEntries; i++) + __TRY { - if (et[i].u1.s1.NameIsString) + for (i = 0; i < resdir->NumberOfNamedEntries+resdir->NumberOfIdEntries; i++) { - str = (const IMAGE_RESOURCE_DIR_STRING_U *)((const BYTE *)basedir + et[i].u1.s1.NameOffset); - newlen = WideCharToMultiByte(CP_ACP, 0, str->NameString, str->Length, NULL, 0, NULL, NULL); - if (newlen + 1 > len) + if (et[i].u1.s1.NameIsString) { - len = newlen + 1; - HeapFree( GetProcessHeap(), 0, name ); - if (!(name = HeapAlloc(GetProcessHeap(), 0, len + 1 ))) + str = (const IMAGE_RESOURCE_DIR_STRING_U *)((const BYTE *)basedir + et[i].u1.s1.NameOffset); + newlen = WideCharToMultiByte(CP_ACP, 0, str->NameString, str->Length, NULL, 0, NULL, NULL); + if (newlen + 1 > len) { - ret = FALSE; - break; + len = newlen + 1; + HeapFree( GetProcessHeap(), 0, name ); + if (!(name = HeapAlloc(GetProcessHeap(), 0, len + 1 ))) + { + ret = FALSE; + break; + } } + WideCharToMultiByte( CP_ACP, 0, str->NameString, str->Length, name, len, NULL, NULL ); + name[newlen] = 0; + ret = lpfun(hmod,type,name,lparam); } - WideCharToMultiByte( CP_ACP, 0, str->NameString, str->Length, name, len, NULL, NULL ); - name[newlen] = 0; - ret = lpfun(hmod,type,name,lparam); - } - else - { - ret = lpfun( hmod, type, UIntToPtr(et[i].u1.s2.Id), lparam ); + else + { + ret = lpfun( hmod, type, UIntToPtr(et[i].u1.s2.Id), lparam ); + } + if (!ret) break; } - if (!ret) break; } + __EXCEPT_PAGE_FAULT + { + ret = FALSE; + status = STATUS_ACCESS_VIOLATION; + } + __ENDTRY + done: HeapFree( GetProcessHeap(), 0, name ); if (HIWORD(typeW.Buffer)) HeapFree( GetProcessHeap(), 0, typeW.Buffer ); @@ -440,31 +450,40 @@ BOOL WINAPI EnumResourceNamesW( HMODULE hmod, LPCWSTR type, ENUMRESNAMEPROCW lpf goto done; et = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(resdir + 1); - for (i = 0; i < resdir->NumberOfNamedEntries+resdir->NumberOfIdEntries; i++) + __TRY { - if (et[i].u1.s1.NameIsString) + for (i = 0; i < resdir->NumberOfNamedEntries+resdir->NumberOfIdEntries; i++) { - str = (const IMAGE_RESOURCE_DIR_STRING_U *)((const BYTE *)basedir + et[i].u1.s1.NameOffset); - if (str->Length + 1 > len) + if (et[i].u1.s1.NameIsString) { - len = str->Length + 1; - HeapFree( GetProcessHeap(), 0, name ); - if (!(name = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + str = (const IMAGE_RESOURCE_DIR_STRING_U *)((const BYTE *)basedir + et[i].u1.s1.NameOffset); + if (str->Length + 1 > len) { - ret = FALSE; - break; + len = str->Length + 1; + HeapFree( GetProcessHeap(), 0, name ); + if (!(name = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) + { + ret = FALSE; + break; + } } + memcpy(name, str->NameString, str->Length * sizeof (WCHAR)); + name[str->Length] = 0; + ret = lpfun(hmod,type,name,lparam); } - memcpy(name, str->NameString, str->Length * sizeof (WCHAR)); - name[str->Length] = 0; - ret = lpfun(hmod,type,name,lparam); - } - else - { - ret = lpfun( hmod, type, UIntToPtr(et[i].u1.s2.Id), lparam ); + else + { + ret = lpfun( hmod, type, UIntToPtr(et[i].u1.s2.Id), lparam ); + } + if (!ret) break; } - if (!ret) break; } + __EXCEPT_PAGE_FAULT + { + ret = FALSE; + status = STATUS_ACCESS_VIOLATION; + } + __ENDTRY done: HeapFree( GetProcessHeap(), 0, name ); if (HIWORD(typeW.Buffer)) HeapFree( GetProcessHeap(), 0, typeW.Buffer ); @@ -503,11 +522,20 @@ BOOL WINAPI EnumResourceLanguagesA( HMODULE hmod, LPCSTR type, LPCSTR name, goto done; et = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(resdir + 1); - for (i = 0; i < resdir->NumberOfNamedEntries + resdir->NumberOfIdEntries; i++) + __TRY { - ret = lpfun( hmod, type, name, et[i].u1.s2.Id, lparam ); - if (!ret) break; + for (i = 0; i < resdir->NumberOfNamedEntries + resdir->NumberOfIdEntries; i++) + { + ret = lpfun( hmod, type, name, et[i].u1.s2.Id, lparam ); + if (!ret) break; + } } + __EXCEPT_PAGE_FAULT + { + ret = FALSE; + status = STATUS_ACCESS_VIOLATION; + } + __ENDTRY done: if (HIWORD(typeW.Buffer)) HeapFree( GetProcessHeap(), 0, typeW.Buffer ); if (HIWORD(nameW.Buffer)) HeapFree( GetProcessHeap(), 0, nameW.Buffer ); @@ -546,11 +574,20 @@ BOOL WINAPI EnumResourceLanguagesW( HMODULE hmod, LPCWSTR type, LPCWSTR name, goto done; et = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(resdir + 1); - for (i = 0; i < resdir->NumberOfNamedEntries + resdir->NumberOfIdEntries; i++) + __TRY { - ret = lpfun( hmod, type, name, et[i].u1.s2.Id, lparam ); - if (!ret) break; + for (i = 0; i < resdir->NumberOfNamedEntries + resdir->NumberOfIdEntries; i++) + { + ret = lpfun( hmod, type, name, et[i].u1.s2.Id, lparam ); + if (!ret) break; + } + } + __EXCEPT_PAGE_FAULT + { + ret = FALSE; + status = STATUS_ACCESS_VIOLATION; } + __ENDTRY done: if (HIWORD(typeW.Buffer)) HeapFree( GetProcessHeap(), 0, typeW.Buffer ); if (HIWORD(nameW.Buffer)) HeapFree( GetProcessHeap(), 0, nameW.Buffer );

1 0

Damjan Jovanovic : wine.inf: Add the still image class key.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

Module: wine Branch: master Commit: a186fd7767516f0844c2bf5a9dee316727f501d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a186fd7767516f0844c2bf5a9… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Oct 4 11:21:39 2009 +0200 wine.inf: Add the still image class key. --- tools/wine.inf.in | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 633d807..6b6acf9 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -386,6 +386,8 @@ HKLM,System\CurrentControlSet\Control\ContentIndex\Language\Neutral,"Locale",0x1 [ControlClass] HKLM,System\CurrentControlSet\Control\Class\{4d36e978-e325-11ce-bfc1-08002be10318},,,"Ports (COM & LPT)" HKLM,System\CurrentControlSet\Control\Class\{4d36e978-e325-11ce-bfc1-08002be10318},"Class",,"Ports" +HKLM,System\CurrentControlSet\Control\Class\{6bdd1fc6-810f-11d0-bec7-08002be2092f},,,"Imaging devices" +HKLM,System\CurrentControlSet\Control\Class\{6bdd1fc6-810f-11d0-bec7-08002be2092f},"Class",,"Image" [CurrentVersion] HKLM,%CurrentVersion%,"CommonFilesDir",,"%16427%"

1 0

Jörg Höhle : winmm: Require at least 16 bytes in the WAVE fmt header for PlaySound.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

Module: wine Branch: master Commit: 376f74b452c2b8dff15b62f6225a27e29814accc URL: http://source.winehq.org/git/wine.git/?a=commit;h=376f74b452c2b8dff15b62f62… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Oct 3 11:42:37 2009 +0200 winmm: Require at least 16 bytes in the WAVE fmt header for PlaySound. --- dlls/winmm/playsound.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index e1badec..54db68f 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -376,7 +376,7 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) (LPSTR)&mmckInfo.ckid, mmckInfo.fccType, mmckInfo.cksize); lpWaveFormat = HeapAlloc(GetProcessHeap(), 0, mmckInfo.cksize); - if (mmioRead(hmmio, (HPSTR)lpWaveFormat, mmckInfo.cksize) < sizeof(WAVEFORMAT)) + if (mmioRead(hmmio, (HPSTR)lpWaveFormat, mmckInfo.cksize) < sizeof(PCMWAVEFORMAT)) goto errCleanUp; TRACE("wFormatTag=%04X !\n", lpWaveFormat->wFormatTag);

1 0

Eric Pouech : winmm: Correctly fill the yield-data parameter in mciGetYieldProc.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

Module: wine Branch: master Commit: dd6b7b7f367782a4f8b8753601bdffff772ff080 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd6b7b7f367782a4f8b875360… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sun Oct 4 14:31:04 2009 +0200 winmm: Correctly fill the yield-data parameter in mciGetYieldProc. --- dlls/winmm/mci.c | 1 + dlls/winmm/mmsystem.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 6fca013..216fb2a 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -2393,6 +2393,7 @@ YIELDPROC WINAPI mciGetYieldProc(MCIDEVICEID uDeviceID, DWORD* lpdwYieldData) WARN("Proc is 32 bit\n"); return NULL; } + if (lpdwYieldData) *lpdwYieldData = wmd->dwYieldData; return wmd->lpfnYieldProc; } diff --git a/dlls/winmm/mmsystem.c b/dlls/winmm/mmsystem.c index 4f320f7..fd065d0 100644 --- a/dlls/winmm/mmsystem.c +++ b/dlls/winmm/mmsystem.c @@ -647,6 +647,7 @@ YIELDPROC16 WINAPI mciGetYieldProc16(UINT16 uDeviceID, DWORD* lpdwYieldData) WARN("Proc is 32 bit\n"); return NULL; } + if (lpdwYieldData) *lpdwYieldData = wmd->dwYieldData; return (YIELDPROC16)wmd->lpfnYieldProc; }

1 0

Joel Holdsworth : user32: Fixed CURSORICON_CreateIconFromBMI to preserve the alpha channel.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

Module: wine Branch: master Commit: c2202929ab4b6d1ce379865dfd8904186814f265 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2202929ab4b6d1ce379865df… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Mon Jun 29 19:10:36 2009 +0100 user32: Fixed CURSORICON_CreateIconFromBMI to preserve the alpha channel. --- dlls/user32/cursoricon.c | 147 +++++++++++++++++++++++++++------------------- 1 files changed, 87 insertions(+), 60 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 23de6a5..a74b79d 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -659,6 +659,39 @@ static CURSORICONFILEDIRENTRY *CURSORICON_FindBestIconFile( CURSORICONFILEDIR *d return &dir->idEntries[n]; } +/*********************************************************************** + * stretch_blt_icon + * + * A helper function that stretches a bitmap buffer into an HBITMAP. + * + * PARAMS + * hDest [I] The handle of the destination bitmap. + * pDestInfo [I] The BITMAPINFO of the destination bitmap. + * pSrcInfo [I] The BITMAPINFO of the source bitmap. + * pSrcBits [I] A pointer to the source bitmap buffer. + **/ +static BOOL stretch_blt_icon(HBITMAP hDest, BITMAPINFO *pDestInfo, BITMAPINFO *pSrcInfo, char *pSrcBits) +{ + HBITMAP hOld; + BOOL res = FALSE; + static HDC hdcMem = NULL; + + if (!hdcMem) + hdcMem = CreateCompatibleDC(screen_dc); + + if (hdcMem) + { + hOld = SelectObject(hdcMem, hDest); + res = StretchDIBits(hdcMem, + 0, 0, pDestInfo->bmiHeader.biWidth, pDestInfo->bmiHeader.biHeight, + 0, 0, pSrcInfo->bmiHeader.biWidth, pSrcInfo->bmiHeader.biHeight, + pSrcBits, pSrcInfo, DIB_RGB_COLORS, SRCCOPY); + SelectObject(hdcMem, hOld); + } + + return res; +} + static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, POINT16 hotspot, BOOL bIcon, DWORD dwVersion, @@ -666,12 +699,11 @@ static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, UINT cFlag ) { HGLOBAL16 hObj; - static HDC hdcMem; int sizeAnd, sizeXor; HBITMAP hAndBits = 0, hXorBits = 0; /* error condition for later */ BITMAP bmpXor, bmpAnd; - BOOL DoStretch; INT size; + BITMAPINFO *pSrcInfo, *pDestInfo; if (dwVersion == 0x00020000) { @@ -693,11 +725,10 @@ static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, if (!width) width = bmi->bmiHeader.biWidth; if (!height) height = bmi->bmiHeader.biHeight/2; - DoStretch = (bmi->bmiHeader.biHeight/2 != height) || - (bmi->bmiHeader.biWidth != width); /* Scale the hotspot */ - if (DoStretch && hotspot.x != ICON_HOTSPOT && hotspot.y != ICON_HOTSPOT) + if (((bmi->bmiHeader.biHeight/2 != height) || (bmi->bmiHeader.biWidth != width)) && + hotspot.x != ICON_HOTSPOT && hotspot.y != ICON_HOTSPOT) { hotspot.x = (hotspot.x * width) / bmi->bmiHeader.biWidth; hotspot.y = (hotspot.y * height) / (bmi->bmiHeader.biHeight / 2); @@ -706,8 +737,6 @@ static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, if (!screen_dc) screen_dc = CreateDCW( DISPLAYW, NULL, NULL, NULL ); if (screen_dc) { - BITMAPINFO* pInfo; - /* Make sure we have room for the monochrome bitmap later on. * Note that BITMAPINFOINFO and BITMAPCOREHEADER are the same * up to and including the biBitCount. In-memory icon resource @@ -719,40 +748,47 @@ static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, * BYTE icAND[] // DIB bits for AND mask */ - if ((pInfo = HeapAlloc( GetProcessHeap(), 0, - max(size, sizeof(BITMAPINFOHEADER) + 2*sizeof(RGBQUAD))))) + pSrcInfo = HeapAlloc( GetProcessHeap(), 0, + max(size, sizeof(BITMAPINFOHEADER) + 2*sizeof(RGBQUAD))); + pDestInfo = HeapAlloc( GetProcessHeap(), 0, + max(size, sizeof(BITMAPINFOHEADER) + 2*sizeof(RGBQUAD))); + if (pSrcInfo && pDestInfo) { - memcpy( pInfo, bmi, size ); - pInfo->bmiHeader.biHeight /= 2; + memcpy( pSrcInfo, bmi, size ); + pSrcInfo->bmiHeader.biHeight /= 2; + + memcpy( pDestInfo, bmi, size ); + pDestInfo->bmiHeader.biWidth = width; + pDestInfo->bmiHeader.biHeight = height; + pDestInfo->bmiHeader.biSizeImage = 0; /* Create the XOR bitmap */ + if(pSrcInfo->bmiHeader.biBitCount == 32) + { + void *pDIBBuffer = NULL; + hXorBits = CreateDIBSection(screen_dc, pDestInfo, DIB_RGB_COLORS, &pDIBBuffer, NULL, 0); - if (DoStretch) { + if(hXorBits) + { + if (!stretch_blt_icon(hXorBits, pDestInfo, pSrcInfo, (char*)bmi + size)) + { + DeleteObject(hXorBits); + hXorBits = 0; + } + } + } + else + { hXorBits = CreateCompatibleBitmap(screen_dc, width, height); + if(hXorBits) { - HBITMAP hOld; - BOOL res = FALSE; - - if (!hdcMem) hdcMem = CreateCompatibleDC(screen_dc); - if (hdcMem) { - hOld = SelectObject(hdcMem, hXorBits); - res = StretchDIBits(hdcMem, 0, 0, width, height, 0, 0, - bmi->bmiHeader.biWidth, bmi->bmiHeader.biHeight/2, - (char*)bmi + size, pInfo, DIB_RGB_COLORS, SRCCOPY); - SelectObject(hdcMem, hOld); + if(!stretch_blt_icon(hXorBits, pDestInfo, pSrcInfo, (char*)bmi + size)) + { + DeleteObject(hXorBits); + hXorBits = 0; + } } - if (!res) { DeleteObject(hXorBits); hXorBits = 0; } - } - } else { - if (is_dib_monochrome(bmi)) { - hXorBits = CreateBitmap(width, height, 1, 1, NULL); - SetDIBits(screen_dc, hXorBits, 0, height, - (char*)bmi + size, pInfo, DIB_RGB_COLORS); - } - else - hXorBits = CreateDIBitmap(screen_dc, &pInfo->bmiHeader, - CBM_INIT, (char*)bmi + size, pInfo, DIB_RGB_COLORS); } if( hXorBits ) @@ -761,51 +797,42 @@ static HICON CURSORICON_CreateIconFromBMI( BITMAPINFO *bmi, get_dib_width_bytes( bmi->bmiHeader.biWidth, bmi->bmiHeader.biBitCount ) * abs( bmi->bmiHeader.biHeight ) / 2; - pInfo->bmiHeader.biBitCount = 1; - if (pInfo->bmiHeader.biSize != sizeof(BITMAPCOREHEADER)) + pSrcInfo->bmiHeader.biBitCount = 1; + if (pSrcInfo->bmiHeader.biSize != sizeof(BITMAPCOREHEADER)) { - RGBQUAD *rgb = pInfo->bmiColors; + RGBQUAD *rgb = pSrcInfo->bmiColors; - pInfo->bmiHeader.biClrUsed = pInfo->bmiHeader.biClrImportant = 2; + pSrcInfo->bmiHeader.biClrUsed = pSrcInfo->bmiHeader.biClrImportant = 2; rgb[0].rgbBlue = rgb[0].rgbGreen = rgb[0].rgbRed = 0x00; rgb[1].rgbBlue = rgb[1].rgbGreen = rgb[1].rgbRed = 0xff; rgb[0].rgbReserved = rgb[1].rgbReserved = 0; } else { - RGBTRIPLE *rgb = (RGBTRIPLE *)(((BITMAPCOREHEADER *)pInfo) + 1); + RGBTRIPLE *rgb = (RGBTRIPLE *)(((BITMAPCOREHEADER *)pSrcInfo) + 1); rgb[0].rgbtBlue = rgb[0].rgbtGreen = rgb[0].rgbtRed = 0x00; rgb[1].rgbtBlue = rgb[1].rgbtGreen = rgb[1].rgbtRed = 0xff; } /* Create the AND bitmap */ + hAndBits = CreateBitmap(width, height, 1, 1, NULL); - if (DoStretch) { - if ((hAndBits = CreateBitmap(width, height, 1, 1, NULL))) { - HBITMAP hOld; - BOOL res = FALSE; - - if (!hdcMem) hdcMem = CreateCompatibleDC(screen_dc); - if (hdcMem) { - hOld = SelectObject(hdcMem, hAndBits); - res = StretchDIBits(hdcMem, 0, 0, width, height, 0, 0, - pInfo->bmiHeader.biWidth, pInfo->bmiHeader.biHeight, - xbits, pInfo, DIB_RGB_COLORS, SRCCOPY); - SelectObject(hdcMem, hOld); + if(!stretch_blt_icon(hAndBits, pDestInfo, pSrcInfo, xbits)) + { + DeleteObject(hAndBits); + hAndBits = 0; } - if (!res) { DeleteObject(hAndBits); hAndBits = 0; } - } - } else { - hAndBits = CreateBitmap(width, height, 1, 1, NULL); - - if (hAndBits) SetDIBits(screen_dc, hAndBits, 0, height, - xbits, pInfo, DIB_RGB_COLORS); + if( !hAndBits ) + { + DeleteObject( hXorBits ); + hXorBits = 0; + } } - if( !hAndBits ) DeleteObject( hXorBits ); - } - HeapFree( GetProcessHeap(), 0, pInfo ); + + HeapFree( GetProcessHeap(), 0, pSrcInfo ); + HeapFree( GetProcessHeap(), 0, pDestInfo ); } }

1 0