October 2009 - Wine-commits

Andrew Eikum : ole32/tests: Add tests for IStorage::CopyTo.
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: wine Branch: master Commit: 60d8547e6162f627cecbdbde381fa2501420f10b URL: http://source.winehq.org/git/wine.git/?a=commit;h=60d8547e6162f627cecbdbde3… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Oct 5 16:13:52 2009 -0500 ole32/tests: Add tests for IStorage::CopyTo. --- dlls/ole32/tests/storage32.c | 179 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 179 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 22c044d..e115874 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -36,6 +36,14 @@ DEFINE_GUID( test_stg_cls, 0x88888888, 0x0425, 0x0000, 0,0,0,0,0,0,0,0); static CHAR filenameA[MAX_PATH]; static WCHAR filename[MAX_PATH]; +static const WCHAR file1_name[] = {'c','o','p','y','t','e','s','t','A',0}; +static const WCHAR file2_name[] = {'c','o','p','y','t','e','s','t','B',0}; +static const WCHAR stgA_name[] = {'S','t','o','r','a','g','e','A',0}; +static const WCHAR stgB_name[] = {'S','t','o','r','a','g','e','B',0}; +static const WCHAR strmA_name[] = {'S','t','r','e','a','m','A',0}; +static const WCHAR strmB_name[] = {'S','t','r','e','a','m','B',0}; +static const WCHAR strmC_name[] = {'S','t','r','e','a','m','C',0}; + static void test_hglobal_storage_stat(void) { ILockBytes *ilb = NULL; @@ -1820,6 +1828,176 @@ static void test_references(void) } } +/* dest + * |-StorageA + * | `StreamA: "StreamA" + * |-StorageB + * | `StreamB: "StreamB" + * `StreamC: "StreamC" + */ +static HRESULT create_test_file(IStorage *dest) +{ + IStorage *stgA = NULL, *stgB = NULL; + IStream *strmA = NULL, *strmB = NULL, *strmC = NULL; + const ULONG strmA_name_size = lstrlenW(strmA_name) * sizeof(WCHAR); + const ULONG strmB_name_size = lstrlenW(strmB_name) * sizeof(WCHAR); + const ULONG strmC_name_size = lstrlenW(strmC_name) * sizeof(WCHAR); + ULONG bytes; + HRESULT hr; + + hr = IStorage_CreateStorage(dest, stgA_name, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stgA); + ok(hr == S_OK, "IStorage_CreateStorage failed: 0x%08x\n", hr); + if(FAILED(hr)) + goto cleanup; + + hr = IStorage_CreateStream(stgA, strmA_name, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &strmA); + ok(hr == S_OK, "IStorage_CreateStream failed: 0x%08x\n", hr); + if(FAILED(hr)) + goto cleanup; + + hr = IStream_Write(strmA, strmA_name, strmA_name_size, &bytes); + ok(hr == S_OK && bytes == strmA_name_size, "IStream_Write failed: 0x%08x, %d of %d bytes written\n", hr, bytes, strmA_name_size); + + hr = IStorage_CreateStorage(dest, stgB_name, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stgB); + ok(hr == S_OK, "IStorage_CreateStorage failed: 0x%08x\n", hr); + if(FAILED(hr)) + goto cleanup; + + hr = IStorage_CreateStream(stgB, strmB_name, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &strmB); + ok(hr == S_OK, "IStorage_CreateStream failed: 0x%08x\n", hr); + if(FAILED(hr)) + goto cleanup; + + hr = IStream_Write(strmB, strmB_name, strmB_name_size, &bytes); + ok(hr == S_OK && bytes == strmB_name_size, "IStream_Write failed: 0x%08x, %d of %d bytes written\n", hr, bytes, strmB_name_size); + + hr = IStorage_CreateStream(dest, strmC_name, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &strmC); + ok(hr == S_OK, "IStorage_CreateStream failed: 0x%08x\n", hr); + if(FAILED(hr)) + goto cleanup; + + hr = IStream_Write(strmC, strmC_name, strmC_name_size, &bytes); + ok(hr == S_OK && bytes == strmC_name_size, "IStream_Write failed: 0x%08x, %d of %d bytes written\n", hr, bytes, strmC_name_size); + +cleanup: + if(strmC) + IStream_Release(strmC); + if(strmB) + IStream_Release(strmB); + if(stgB) + IStorage_Release(stgB); + if(strmA) + IStream_Release(strmA); + if(stgA) + IStorage_Release(stgA); + + return hr; +} + +static void test_copyto(void) +{ + IStorage *file1 = NULL, *file2 = NULL, *stg_tmp; + IStream *strm_tmp; + WCHAR buf[64]; + HRESULT hr; + + /* create & populate file1 */ + hr = StgCreateDocfile(file1_name, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, &file1); + ok(hr == S_OK, "StgCreateDocfile failed: 0x%08x\n", hr); + if(FAILED(hr)) + goto cleanup; + + hr = create_test_file(file1); + if(FAILED(hr)) + goto cleanup; + + /* create file2 */ + hr = StgCreateDocfile(file2_name, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, &file2); + ok(hr == S_OK, "StgCreateDocfile failed: 0x%08x\n", hr); + if(FAILED(hr)) + goto cleanup; + + /* copy file1 into file2 */ + hr = IStorage_CopyTo(file1, 0, NULL, NULL, NULL); + ok(hr == STG_E_INVALIDPOINTER, "CopyTo should give STG_E_INVALIDPONITER, gave: 0x%08x\n", hr); + + hr = IStorage_CopyTo(file1, 0, NULL, NULL, file2); + ok(hr == S_OK, "CopyTo failed: 0x%08x\n", hr); + if(FAILED(hr)) + goto cleanup; + + /* verify that all of file1 was copied */ + hr = IStorage_OpenStorage(file2, stgA_name, NULL, + STGM_READWRITE | STGM_SHARE_EXCLUSIVE, NULL, 0, &stg_tmp); + ok(hr == S_OK, "OpenStorage failed: 0x%08x\n", hr); + + if(SUCCEEDED(hr)){ + hr = IStorage_OpenStream(stg_tmp, strmA_name, NULL, + STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &strm_tmp); + ok(hr == S_OK, "OpenStream failed: 0x%08x\n", hr); + + if(SUCCEEDED(hr)){ + memset(buf, 0, sizeof(buf)); + hr = IStream_Read(strm_tmp, buf, sizeof(buf), NULL); + ok(hr == S_OK, "Read failed: 0x%08x\n", hr); + if(SUCCEEDED(hr)) + ok(lstrcmpW(buf, strmA_name) == 0, + "Expected %s to be read, got %s\n", wine_dbgstr_w(strmA_name), wine_dbgstr_w(buf)); + + IStream_Release(strm_tmp); + } + + IStorage_Release(stg_tmp); + } + + hr = IStorage_OpenStorage(file2, stgB_name, NULL, + STGM_READWRITE | STGM_SHARE_EXCLUSIVE, NULL, 0, &stg_tmp); + ok(hr == S_OK, "OpenStorage failed: 0x%08x\n", hr); + + if(SUCCEEDED(hr)){ + hr = IStorage_OpenStream(stg_tmp, strmB_name, NULL, + STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &strm_tmp); + ok(hr == S_OK, "OpenStream failed: 0x%08x\n", hr); + + if(SUCCEEDED(hr)){ + memset(buf, 0, sizeof(buf)); + hr = IStream_Read(strm_tmp, buf, sizeof(buf), NULL); + ok(hr == S_OK, "Read failed: 0x%08x\n", hr); + if(SUCCEEDED(hr)) + ok(lstrcmpW(buf, strmB_name) == 0, + "Expected %s to be read, got %s\n", wine_dbgstr_w(strmB_name), wine_dbgstr_w(buf)); + + IStream_Release(strm_tmp); + } + + IStorage_Release(stg_tmp); + } + + hr = IStorage_OpenStream(file2, strmC_name, NULL, + STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &strm_tmp); + ok(hr == S_OK, "OpenStream failed: 0x%08x\n", hr); + + if(SUCCEEDED(hr)){ + memset(buf, 0, sizeof(buf)); + hr = IStream_Read(strm_tmp, buf, sizeof(buf), NULL); + ok(hr == S_OK, "Read failed: 0x%08x\n", hr); + if(SUCCEEDED(hr)) + ok(lstrcmpW(buf, strmC_name) == 0, + "Expected %s to be read, got %s\n", wine_dbgstr_w(strmC_name), wine_dbgstr_w(buf)); + + IStream_Release(strm_tmp); + } + +cleanup: + if(file1) + IStorage_Release(file1); + if(file2) + IStorage_Release(file2); + + DeleteFileW(file1_name); + DeleteFileW(file2_name); +} + START_TEST(storage32) { CHAR temp[MAX_PATH]; @@ -1850,4 +2028,5 @@ START_TEST(storage32) test_simple(); test_fmtusertypestg(); test_references(); + test_copyto(); }

1 0

Andrew Eikum : ole32: Use snbExclude in StorageImpl::CopyTo.
by Alexandre Julliard 06 Oct '09

06 Oct '09

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

Andrew Nguyen : cmd: Fix copy option handling in batch mode.
by Alexandre Julliard 06 Oct '09

06 Oct '09

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

Jörg Höhle : dsound: Get rid of redundant NULL check.
by Alexandre Julliard 06 Oct '09

06 Oct '09

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

Owen Rudge : comctl32: Ensure coordinates are valid during listview marquee selection.
by Alexandre Julliard 06 Oct '09

06 Oct '09

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

Damjan Jovanovic : wine.inf: Add the still image class key.
by Alexandre Julliard 05 Oct '09

05 Oct '09

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

Andrey Turkin : kernel32: Catch invalid memory accesses in resource enumeration handlers.
by Alexandre Julliard 05 Oct '09

05 Oct '09

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

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

05 Oct '09

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

Jörg Höhle : wineoss: Fix the buffer size check for more than 2 channels.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 55fca7778bf593e4ddde583868ea514ae93edb11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55fca7778bf593e4ddde58386… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Oct 3 22:42:30 2009 +0200 wineoss: Fix the buffer size check for more than 2 channels. --- dlls/wineoss.drv/audio.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wineoss.drv/audio.c b/dlls/wineoss.drv/audio.c index ddf973f..98575f1 100644 --- a/dlls/wineoss.drv/audio.c +++ b/dlls/wineoss.drv/audio.c @@ -2169,6 +2169,7 @@ static DWORD wodClose(WORD wDevID) */ static DWORD wodWrite(WORD wDevID, LPWAVEHDR lpWaveHdr, DWORD dwSize) { + WORD delta; TRACE("(%u, %p, %08X);\n", wDevID, lpWaveHdr, dwSize); /* first, do the sanity checks... */ @@ -2187,10 +2188,11 @@ static DWORD wodWrite(WORD wDevID, LPWAVEHDR lpWaveHdr, DWORD dwSize) lpWaveHdr->dwFlags |= WHDR_INQUEUE; lpWaveHdr->lpNext = 0; - if ((lpWaveHdr->dwBufferLength & (WOutDev[wDevID].waveFormat.Format.nBlockAlign - 1)) != 0) + delta = lpWaveHdr->dwBufferLength % WOutDev[wDevID].waveFormat.Format.nBlockAlign; + if (delta != 0) { WARN("WaveHdr length isn't a multiple of the PCM block size: %d %% %d\n",lpWaveHdr->dwBufferLength,WOutDev[wDevID].waveFormat.Format.nBlockAlign); - lpWaveHdr->dwBufferLength &= ~(WOutDev[wDevID].waveFormat.Format.nBlockAlign - 1); + lpWaveHdr->dwBufferLength -= delta; } OSS_AddRingMessage(&WOutDev[wDevID].msgRing, WINE_WM_HEADER, (DWORD_PTR)lpWaveHdr, FALSE);

1 0

Jörg Höhle : winecoreaudio: Accept up to 8 channels.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: b16fc0e163dd970665f6d37503c18e1b01f0452f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b16fc0e163dd970665f6d3750… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Mon Oct 5 10:34:24 2009 +0200 winecoreaudio: Accept up to 8 channels. --- dlls/winecoreaudio.drv/audio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index 7f7c1ee..72e523e 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -449,7 +449,7 @@ static BOOL supportedFormat(LPWAVEFORMATEX wf) WAVEFORMATEXTENSIBLE * wfex = (WAVEFORMATEXTENSIBLE *)wf; if (wf->cbSize == 22 && IsEqualGUID(&wfex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM)) { - if (wf->nChannels >=1 && wf->nChannels <= 2) { + if (wf->nChannels >=1 && wf->nChannels <= 8) { if (wf->wBitsPerSample==wfex->Samples.wValidBitsPerSample) { if (wf->wBitsPerSample==8||wf->wBitsPerSample==16) return TRUE;

1 0