July 2007 - Wine-commits - list.winehq.org

Tag wine-0.9.41 : Alexandre Julliard : Release 0.9.41
by Alexandre Julliard 13 Jul '07

13 Jul '07

Module: wine Branch: refs/tags/wine-0.9.41 Tag: 126f76f2a4badf8fb53228204b6675dff79daac4 URL: http://source.winehq.org/git/wine.git/?a=tag;h=126f76f2a4badf8fb53228204b66… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 13 19:46:17 2007 +0200 Release 0.9.41

1 0

Paul Vriens : mscms/tests: Skip tests if we don't have enough rights.
by Alexandre Julliard 13 Jul '07

13 Jul '07

Module: wine Branch: master Commit: 35a10f05bc663f8b743cc42626b3aa7c040e0971 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35a10f05bc663f8b743cc4262… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Jul 13 14:46:55 2007 +0200 mscms/tests: Skip tests if we don't have enough rights. --- dlls/mscms/tests/profile.c | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index a412c44..e5a7e81 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -653,7 +653,13 @@ static void test_GetStandardColorSpaceProfileA(void) ret = pGetStandardColorSpaceProfileA( NULL, SPACE_RGB, oldprofile, &size ); ok( ret, "GetStandardColorSpaceProfileA() failed (%d)\n", GetLastError() ); + SetLastError(0xdeadbeef); ret = pSetStandardColorSpaceProfileA( NULL, SPACE_RGB, standardprofile ); + if (!ret && (GetLastError() == ERROR_ACCESS_DENIED)) + { + skip("Not enough rights for SetStandardColorSpaceProfileA\n"); + return; + } ok( ret, "SetStandardColorSpaceProfileA() failed (%d)\n", GetLastError() ); size = sizeof(newprofile); @@ -730,7 +736,13 @@ static void test_GetStandardColorSpaceProfileW(void) ret = pGetStandardColorSpaceProfileW( NULL, SPACE_RGB, oldprofile, &size ); ok( ret, "GetStandardColorSpaceProfileW() failed (%d)\n", GetLastError() ); + SetLastError(0xdeadbeef); ret = pSetStandardColorSpaceProfileW( NULL, SPACE_RGB, standardprofileW ); + if (!ret && (GetLastError() == ERROR_ACCESS_DENIED)) + { + skip("Not enough rights for SetStandardColorSpaceProfileW\n"); + return; + } ok( ret, "SetStandardColorSpaceProfileW() failed (%d)\n", GetLastError() ); size = sizeof(newprofile); @@ -871,7 +883,13 @@ static void test_InstallColorProfileA(void) CHAR slash[] = "\\"; HANDLE handle; + SetLastError(0xdeadbeef); ret = pInstallColorProfileA( NULL, testprofile ); + if (!ret && (GetLastError() == ERROR_ACCESS_DENIED)) + { + skip("Not enough rights for InstallColorProfileA\n"); + return; + } ok( ret, "InstallColorProfileA() failed (%d)\n", GetLastError() ); ret = pGetColorDirectoryA( NULL, dest, &size ); @@ -922,7 +940,13 @@ static void test_InstallColorProfileW(void) WCHAR slash[] = { '\\', 0 }; HANDLE handle; + SetLastError(0xdeadbeef); ret = pInstallColorProfileW( NULL, testprofileW ); + if (!ret && (GetLastError() == ERROR_ACCESS_DENIED)) + { + skip("Not enough rights for InstallColorProfileW\n"); + return; + } ok( ret, "InstallColorProfileW() failed (%d)\n", GetLastError() ); ret = pGetColorDirectoryW( NULL, dest, &size ); @@ -1237,7 +1261,13 @@ static void test_UninstallColorProfileA(void) CHAR slash[] = "\\"; HANDLE handle; + SetLastError(0xdeadbeef); ret = pInstallColorProfileA( NULL, testprofile ); + if (!ret && (GetLastError() == ERROR_ACCESS_DENIED)) + { + skip("Not enough rights for InstallColorProfileA\n"); + return; + } ok( ret, "InstallColorProfileA() failed (%d)\n", GetLastError() ); ret = pGetColorDirectoryA( NULL, dest, &size ); @@ -1281,7 +1311,13 @@ static void test_UninstallColorProfileW(void) HANDLE handle; int bytes_copied; + SetLastError(0xdeadbeef); ret = pInstallColorProfileW( NULL, testprofileW ); + if (!ret && (GetLastError() == ERROR_ACCESS_DENIED)) + { + skip("Not enough rights for InstallColorProfileW\n"); + return; + } ok( ret, "InstallColorProfileW() failed (%d)\n", GetLastError() ); ret = pGetColorDirectoryW( NULL, dest, &size );

1 0

Paul Vriens : advapi32/tests: Use skip instead of trace.
by Alexandre Julliard 13 Jul '07

13 Jul '07

Module: wine Branch: master Commit: cf111099fc81ddbb6042c5decb70e194d7b064a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf111099fc81ddbb6042c5dec… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Jul 13 14:01:49 2007 +0200 advapi32/tests: Use skip instead of trace. --- dlls/advapi32/tests/crypt.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index def6c82..fd827d3 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -398,13 +398,13 @@ static void test_enum_providers(void) if(!pCryptEnumProvidersA) { - trace("skipping CryptEnumProviders tests\n"); + skip("CryptEnumProvidersA is not available\n"); return; } if (!FindProvRegVals(dwIndex, &dwType, &pszProvName, &cbName, &provCount)) { - trace("could not find providers in registry, skipping the test\n"); + skip("Could not find providers in registry\n"); return; } @@ -526,13 +526,13 @@ static void test_enum_provider_types(void) if(!pCryptEnumProviderTypesA) { - trace("skipping CryptEnumProviderTypes tests\n"); + skip("CryptEnumProviderTypesA is not available\n"); return; } if (!FindProvTypesRegVals(index, &dwProvType, &pszTypeName, &cbTypeName, &dwTypeCount)) { - trace("could not find provider types in registry, skipping the test\n"); + skip("Could not find provider types in registry\n"); return; } @@ -664,13 +664,13 @@ static void test_get_default_provider(void) if(!pCryptGetDefaultProviderA) { - trace("skipping CryptGetDefaultProvider tests\n"); + skip("CryptGetDefaultProviderA is not available\n"); return; } if(!FindDfltProvRegVals(dwProvType, dwFlags, &pszProvName, &cbProvName)) { - trace("could not find default provider in registry, skipping the test\n"); + skip("Could not find default provider in registry\n"); return; } @@ -738,7 +738,7 @@ static void test_set_provider_ex(void) if(!pCryptGetDefaultProviderA || !pCryptSetProviderExA) { - trace("skipping CryptSetProviderEx tests\n"); + skip("CryptGetDefaultProviderA and/or CryptSetProviderExA are not available\n"); return; }

1 0

Paul Vriens : crypt32/tests: Skip test if we don't have enough rights.
by Alexandre Julliard 13 Jul '07

13 Jul '07

Module: wine Branch: master Commit: 0653b95017a732dbdb41758b6683ea2bc6bd6c0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0653b95017a732dbdb41758b6… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Jul 13 14:27:25 2007 +0200 crypt32/tests: Skip test if we don't have enough rights. --- dlls/crypt32/tests/sip.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/tests/sip.c b/dlls/crypt32/tests/sip.c index 0496370..5e33655 100644 --- a/dlls/crypt32/tests/sip.c +++ b/dlls/crypt32/tests/sip.c @@ -66,9 +66,17 @@ static void test_AddRemoveProvider(void) /* nonexistent provider should result in a registry error */ SetLastError(0xdeadbeef); ret = CryptSIPRemoveProvider(&actionid); - ok (!ret, "Expected CryptSIPRemoveProvider to fail.\n"); - ok (GetLastError() == ERROR_FILE_NOT_FOUND, - "Expected ERROR_FILE_NOT_FOUND, got %d.\n", GetLastError()); + if (!ret && GetLastError() == ERROR_ACCESS_DENIED) + { + /* Apparently the needed rights are checked before the existence of the provider */ + skip("Need admin rights\n"); + } + else + { + ok (!ret, "Expected CryptSIPRemoveProvider to fail.\n"); + ok (GetLastError() == ERROR_FILE_NOT_FOUND, + "Expected ERROR_FILE_NOT_FOUND, got %d.\n", GetLastError()); + } /* Everything OK, pwszIsFunctionName and pwszIsFunctionNameFmt2 are left NULL * as allowed */

1 0

Emmanuel Maillard : winecoreaudio: MIDIIn_MessageHandler: Fix non-SysEx messages parsing.
by Alexandre Julliard 13 Jul '07

13 Jul '07

Module: wine Branch: master Commit: 6ccb6639535da6acd948eeba776b7f2b9753dca5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ccb6639535da6acd948eeba7… Author: Emmanuel Maillard <mahanuu(a)free.fr> Date: Fri Jul 13 12:02:53 2007 +0200 winecoreaudio: MIDIIn_MessageHandler: Fix non-SysEx messages parsing. --- dlls/winecoreaudio.drv/midi.c | 35 ++++++++++++++++++++++++++--------- 1 files changed, 26 insertions(+), 9 deletions(-) diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index d5d82b7..9198460 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -851,6 +851,8 @@ static CFDataRef MIDIIn_MessageHandler(CFMessagePortRef local, SInt32 msgid, CFD int i = 0; MIDISource *src = NULL; DWORD sendData = 0; + int pos = 0; + DWORD currentTime; switch (msgid) { @@ -886,17 +888,32 @@ static CFDataRef MIDIIn_MessageHandler(CFMessagePortRef local, SInt32 msgid, CFD goto done; } EnterCriticalSection(&midiInLock); - if (msg->length == 3) - { - sendData = (msg->data[2] << 16) | - (msg->data[1] << 8) | - (msg->data[0] << 0); - } - if (msg->length == 2) + currentTime = GetTickCount() - src->startTime; + + while (pos < msg->length) { - sendData = (msg->data[1] << 8) | (msg->data[0] << 0); + sendData = 0; + switch (msg->data[pos] & 0xF0) + { + case 0xF0: + sendData = (msg->data[pos] << 0); + pos++; + break; + + case 0xC0: + case 0xD0: + sendData = (msg->data[pos + 1] << 8) | (msg->data[pos] << 0); + pos += 2; + break; + default: + sendData = (msg->data[pos + 2] << 16) | + (msg->data[pos + 1] << 8) | + (msg->data[pos] << 0); + pos += 3; + break; + } + MIDI_NotifyClient(msg->devID, MIM_DATA, sendData, currentTime); } - MIDI_NotifyClient(msg->devID, MIM_DATA, sendData, GetTickCount() - src->startTime); LeaveCriticalSection(&midiInLock); break; default:

1 0

Ken Thomases : winecoreaudio: Report format error on sample rate mismatch when opening wave-in device.
by Alexandre Julliard 13 Jul '07

13 Jul '07

Module: wine Branch: master Commit: f203ed946b56ccce39a979f978b1781d5e9ecc7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f203ed946b56ccce39a979f97… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jul 13 07:21:49 2007 -0500 winecoreaudio: Report format error on sample rate mismatch when opening wave-in device. --- dlls/winecoreaudio.drv/audio.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index 7f5f66a..959de8b 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -1805,7 +1805,8 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) if (lpDesc->lpFormat->wFormatTag != WAVE_FORMAT_PCM || lpDesc->lpFormat->nChannels == 0 || - lpDesc->lpFormat->nSamplesPerSec == 0 + lpDesc->lpFormat->nSamplesPerSec == 0 || + lpDesc->lpFormat->nSamplesPerSec != AudioUnit_GetInputDeviceSampleRate() ) { WARN("Bad format: tag=%04X nChannels=%d nSamplesPerSec=%d wBitsPerSample=%d !\n",

1 0

James Hawkins : msi: Add a test for running an ADMIN install.
by Alexandre Julliard 13 Jul '07

13 Jul '07

Module: wine Branch: master Commit: 6805bf8acee22af3d3e7260229b3309d812b7d7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6805bf8acee22af3d3e726022… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Jul 12 20:08:30 2007 -0700 msi: Add a test for running an ADMIN install. --- dlls/msi/tests/install.c | 101 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 100 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index f28e4fd..5cc1c7e 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -133,7 +133,8 @@ static const CHAR property_dat[] = "Property\tValue\n" "ProductVersion\t1.1.1\n" "PROMPTROLLBACKCOST\tP\n" "Setup\tSetup\n" - "UpgradeCode\t{4C0EAA15-0264-4E5A-8758-609EF142B92D}"; + "UpgradeCode\t{4C0EAA15-0264-4E5A-8758-609EF142B92D}\n" + "AdminProperties\tPOSTADMIN\n"; static const CHAR registry_dat[] = "Registry\tRoot\tKey\tName\tValue\tComponent_\n" "s72\ti2\tl255\tL255\tL0\ts72\n" @@ -419,6 +420,29 @@ static const CHAR cwd_component_dat[] = "Component\tComponentId\tDirectory_\tAtt "Component\tComponent\n" "augustus\t\tMSITESTDIR\t0\t\taugustus\n"; +static const CHAR adm_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "augustus\t\tMSITESTDIR\t0\tPOSTADMIN=1\taugustus"; + +static const CHAR adm_custom_action_dat[] = "Action\tType\tSource\tTarget\tISComments\n" + "s72\ti2\tS64\tS0\tS255\n" + "CustomAction\tAction\n" + "SetPOSTADMIN\t51\tPOSTADMIN\t1\t"; + +static const CHAR adm_admin_exec_seq_dat[] = "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "AdminExecuteSequence\tAction\n" + "CostFinalize\t\t1000\n" + "CostInitialize\t\t800\n" + "FileCost\t\t900\n" + "SetPOSTADMIN\t\t950\n" + "InstallFiles\t\t4000\n" + "InstallFinalize\t\t6600\n" + "InstallInitialize\t\t1500\n" + "InstallValidate\t\t1400\n" + "LaunchConditions\t\t100"; + typedef struct _msi_table { const CHAR *filename; @@ -629,6 +653,20 @@ static const msi_table cwd_tables[] = ADD_TABLE(property), }; +static const msi_table adm_tables[] = +{ + ADD_TABLE(adm_component), + ADD_TABLE(directory), + ADD_TABLE(rof_feature), + ADD_TABLE(ci2_feature_comp), + ADD_TABLE(ci2_file), + ADD_TABLE(install_exec_seq), + ADD_TABLE(rof_media), + ADD_TABLE(property), + ADD_TABLE(adm_custom_action), + ADD_TABLE(adm_admin_exec_seq), +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -2538,6 +2576,66 @@ static void test_currentworkingdir(void) RemoveDirectory("diffdir"); } +static void set_admin_summary_info(const CHAR *name) +{ + MSIHANDLE db, summary; + UINT r; + + r = MsiOpenDatabaseA(name, MSIDBOPEN_DIRECT, &db); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + r = MsiGetSummaryInformationA(db, NULL, 1, &summary); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + r = MsiSummaryInfoSetPropertyA(summary, PID_WORDCOUNT, VT_I4, 5, NULL, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + /* write the summary changes back to the stream */ + r = MsiSummaryInfoPersist(summary); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + MsiCloseHandle(summary); + + r = MsiDatabaseCommit(db); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + MsiCloseHandle(db); +} + +static void test_admin(void) +{ + UINT r; + + CreateDirectoryA("msitest", NULL); + create_file("msitest\\augustus", 500); + + create_database(msifile, adm_tables, sizeof(adm_tables) / sizeof(msi_table)); + set_admin_summary_info(msifile); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(!delete_pf("msitest\\augustus", TRUE), "File installed\n"); + ok(!delete_pf("msitest", FALSE), "File installed\n"); + ok(!DeleteFile("c:\\msitest\\augustus"), "File installed\n"); + ok(!RemoveDirectory("c:\\msitest"), "File installed\n"); + + r = MsiInstallProductA(msifile, "ACTION=ADMIN"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(!delete_pf("msitest\\augustus", TRUE), "File installed\n"); + ok(!delete_pf("msitest", FALSE), "File installed\n"); + todo_wine + { + ok(DeleteFile("c:\\msitest\\augustus"), "File not installed\n"); + ok(RemoveDirectory("c:\\msitest"), "File not installed\n"); + } + + DeleteFile(msifile); + DeleteFile("msitest\\augustus"); + RemoveDirectory("msitest"); +} + START_TEST(install) { DWORD len; @@ -2572,6 +2670,7 @@ START_TEST(install) test_publishsourcelist(); test_transformprop(); test_currentworkingdir(); + test_admin(); SetCurrentDirectoryA(prev_path); }

1 0

Ken Thomases : winecoreaudio: Correct the AudioBufferList allocated for input.
by Alexandre Julliard 13 Jul '07

13 Jul '07

Module: wine Branch: master Commit: 2fc548ae65e075fb1ceb7fe7f8c77d49a0dc8666 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fc548ae65e075fb1ceb7fe7f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jul 13 07:21:29 2007 -0500 winecoreaudio: Correct the AudioBufferList allocated for input. --- dlls/winecoreaudio.drv/audio.c | 39 ++++++++++++++++++++++++++++----------- 1 files changed, 28 insertions(+), 11 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index 26a8c8a..1c9c770 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -1732,21 +1732,40 @@ static void widHelper_DestroyAudioBufferList(AudioBufferList* list) * widHelper_AllocateAudioBufferList [internal] * Convenience function to allocate our audio buffers */ -static AudioBufferList* widHelper_AllocateAudioBufferList(UInt32 numChannels, UInt32 size) +static AudioBufferList* widHelper_AllocateAudioBufferList(UInt32 numChannels, UInt32 bitsPerChannel, UInt32 bufferFrames, BOOL interleaved) { + UInt32 numBuffers; + UInt32 channelsPerFrame; + UInt32 bytesPerFrame; + UInt32 bytesPerBuffer; AudioBufferList* list; UInt32 i; - list = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(AudioBufferList) + numChannels * sizeof(AudioBuffer)); + if (interleaved) + { + /* For interleaved audio, we allocate one buffer for all channels. */ + numBuffers = 1; + channelsPerFrame = numChannels; + } + else + { + numBuffers = numChannels; + channelsPerFrame = 1; + } + + bytesPerFrame = bitsPerChannel * channelsPerFrame / 8; + bytesPerBuffer = bytesPerFrame * bufferFrames; + + list = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, offsetof(AudioBufferList, mBuffers) + numBuffers * sizeof(AudioBuffer)); if (list == NULL) return NULL; - list->mNumberBuffers = numChannels; - for (i = 0; i < numChannels; ++i) + list->mNumberBuffers = numBuffers; + for (i = 0; i < numBuffers; ++i) { - list->mBuffers[i].mNumberChannels = 1; - list->mBuffers[i].mDataByteSize = size; - list->mBuffers[i].mData = HeapAlloc(GetProcessHeap(), 0, size); + list->mBuffers[i].mNumberChannels = channelsPerFrame; + list->mBuffers[i].mDataByteSize = bytesPerBuffer; + list->mBuffers[i].mData = HeapAlloc(GetProcessHeap(), 0, bytesPerBuffer); if (list->mBuffers[i].mData == NULL) { widHelper_DestroyAudioBufferList(list); @@ -1764,7 +1783,6 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) { WINE_WAVEIN* wwi; UInt32 frameCount; - UInt32 bytesPerFrame; TRACE("(%u, %p, %08X);\n", wDevID, lpDesc, dwFlags); if (lpDesc == NULL) @@ -1842,9 +1860,8 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) } /* Allocate our audio buffers */ - /* For interleaved audio, we allocate one buffer for all channels. */ - bytesPerFrame = wwi->format.wBitsPerSample * wwi->format.wf.nChannels / 8; - wwi->bufferList = widHelper_AllocateAudioBufferList(1, wwi->format.wf.nChannels * frameCount * bytesPerFrame); + wwi->bufferList = widHelper_AllocateAudioBufferList(wwi->format.wf.nChannels, + wwi->format.wBitsPerSample, frameCount, TRUE); if (wwi->bufferList == NULL) { ERR("Failed to allocate buffer list\n");

1 0

Ken Thomases : winecoreaudio: Protect against AudioUnitRender clobbering our buffer list.
by Alexandre Julliard 13 Jul '07

13 Jul '07

Module: wine Branch: master Commit: 41303fbd6a0283fa7451eda5809ebb9eff7e5856 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41303fbd6a0283fa7451eda58… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jul 13 07:21:36 2007 -0500 winecoreaudio: Protect against AudioUnitRender clobbering our buffer list. --- dlls/winecoreaudio.drv/audio.c | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index 1c9c770..7f5f66a 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -189,6 +189,7 @@ typedef struct { AudioUnit audioUnit; AudioBufferList*bufferList; + AudioBufferList*bufferListCopy; /* Record state of debug channels at open. Used to control fprintf's since * we can't use Wine debug channel calls in non-Wine AudioUnit threads. */ @@ -1728,6 +1729,8 @@ static void widHelper_DestroyAudioBufferList(AudioBufferList* list) } +#define AUDIOBUFFERLISTSIZE(numBuffers) (offsetof(AudioBufferList, mBuffers) + (numBuffers) * sizeof(AudioBuffer)) + /************************************************************************** * widHelper_AllocateAudioBufferList [internal] * Convenience function to allocate our audio buffers @@ -1756,7 +1759,7 @@ static AudioBufferList* widHelper_AllocateAudioBufferList(UInt32 numChannels, UI bytesPerFrame = bitsPerChannel * channelsPerFrame / 8; bytesPerBuffer = bytesPerFrame * bufferFrames; - list = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, offsetof(AudioBufferList, mBuffers) + numBuffers * sizeof(AudioBuffer)); + list = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, AUDIOBUFFERLISTSIZE(numBuffers)); if (list == NULL) return NULL; @@ -1871,6 +1874,20 @@ static DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) return MMSYSERR_NOMEM; } + /* Keep a copy of the buffer list structure (but not the buffers themselves) + * in case AudioUnitRender clobbers the original, as it is wont to do. */ + wwi->bufferListCopy = HeapAlloc(GetProcessHeap(), 0, AUDIOBUFFERLISTSIZE(wwi->bufferList->mNumberBuffers)); + if (wwi->bufferListCopy == NULL) + { + ERR("Failed to allocate buffer list copy\n"); + widHelper_DestroyAudioBufferList(wwi->bufferList); + AudioUnitUninitialize(wwi->audioUnit); + AudioUnit_CloseAudioUnit(wwi->audioUnit); + OSSpinLockUnlock(&wwi->lock); + return MMSYSERR_NOMEM; + } + memcpy(wwi->bufferListCopy, wwi->bufferList, AUDIOBUFFERLISTSIZE(wwi->bufferList->mNumberBuffers)); + OSSpinLockUnlock(&wwi->lock); return widNotifyClient(wwi, WIM_OPEN, 0L, 0L); @@ -1931,6 +1948,8 @@ static DWORD widClose(WORD wDevID) /* Dellocate our audio buffers */ widHelper_DestroyAudioBufferList(wwi->bufferList); wwi->bufferList = NULL; + HeapFree(GetProcessHeap(), 0, wwi->bufferListCopy); + wwi->bufferListCopy = NULL; ret = widNotifyClient(wwi, WIM_CLOSE, 0L, 0L); } @@ -2350,6 +2369,11 @@ OSStatus CoreAudio_wiAudioUnitIOProc(void *inRefCon, OSSpinLockUnlock(&wwi->lock); + /* Restore the audio buffer list structure from backup, in case + * AudioUnitRender clobbered it. (It modifies mDataByteSize and may even + * give us a different mData buffer to avoid a copy.) */ + memcpy(wwi->bufferList, wwi->bufferListCopy, AUDIOBUFFERLISTSIZE(wwi->bufferList->mNumberBuffers)); + if (needNotify) wodSendNotifyInputCompletionsMessage(wwi); return err; }

1 0

James Hawkins : msi: Fix three tests that were failing in Windows.
by Alexandre Julliard 13 Jul '07

13 Jul '07

Module: wine Branch: master Commit: ed281b725aeaab3df51e8f6b438758878248b6f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed281b725aeaab3df51e8f6b4… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Jul 12 20:05:02 2007 -0700 msi: Fix three tests that were failing in Windows. --- dlls/msi/tests/install.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 341f02d..19cf266 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1879,7 +1879,7 @@ static void test_publish(void) state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "montecristo"); todo_wine { - ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); + ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); } r = MsiQueryComponentStateA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, @@ -1937,7 +1937,7 @@ static void test_publish(void) state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "montecristo"); todo_wine { - ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); + ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); } r = MsiQueryComponentStateA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, @@ -1995,7 +1995,7 @@ static void test_publish(void) state = MsiQueryFeatureState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}", "montecristo"); todo_wine { - ok(state == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", state); + ok(state == INSTALLSTATE_LOCAL, "Expected INSTALLSTATE_LOCAL, got %d\n", state); } r = MsiQueryComponentStateA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED,

1 0