wine-commits April 2010

wine-commits@winehq.org

2 participants
898 discussions

Christian Costa : d3dx9_36: Add support for 32-bit BGRA in D3DXGetImageInfoFromFileInMemory.
by Alexandre Julliard 12 Apr '10

12 Apr '10

Module: wine Branch: master Commit: 9e67f954f1e6c4c0f2cdeb9e2d83cfc0b3492af0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e67f954f1e6c4c0f2cdeb9e2… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Apr 12 11:21:14 2010 +0200 d3dx9_36: Add support for 32-bit BGRA in D3DXGetImageInfoFromFileInMemory. --- dlls/d3dx9_36/surface.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 0a882b5..7504811 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -129,6 +129,8 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(LPCVOID data, UINT datasize, D3D info->Format = D3DFMT_R8G8B8; else if (IsEqualGUID(&pixel_format, &GUID_WICPixelFormat32bppBGR)) info->Format = D3DFMT_X8R8G8B8; + else if (IsEqualGUID(&pixel_format, &GUID_WICPixelFormat32bppBGRA)) + info->Format = D3DFMT_A8R8G8B8; else { WARN("Unsupported pixel format %s\n", debugstr_guid(&pixel_format)); hr = D3DXERR_INVALIDDATA;

1 0

Alexandre Julliard : winmm/tests: Fix a pointer conversion warning on 64-bit.
by Alexandre Julliard 12 Apr '10

12 Apr '10

Module: wine Branch: master Commit: 36822bbd7d383474a0f1c65f947671ff0b88b549 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36822bbd7d383474a0f1c65f9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 12 15:39:32 2010 +0200 winmm/tests: Fix a pointer conversion warning on 64-bit. --- dlls/winmm/tests/midi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index 3abdb1d..4ceec33 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -233,7 +233,7 @@ static void test_midiOut_device(UINT udev, HWND hwnd) /* The W95 ESFM Synthesis device reports NOTENABLED although * GetVolume by handle works and music plays. */ - rc = midiOutGetVolume((HMIDIOUT)udev, &ovolume); + rc = midiOutGetVolume(UlongToHandle(udev), &ovolume); ok((capsA.dwSupport & MIDICAPS_VOLUME) ? rc==MMSYSERR_NOERROR || broken(rc==MMSYSERR_NOTENABLED) : rc==MMSYSERR_NOTSUPPORTED, "midiOutGetVolume(dev=%d) rc=%s\n", udev, mmsys_error(rc)); /* Tests with midiOutSetvolume show that the midi mapper forwards

1 0

Maarten Lankhorst : winmm: Remove timeGetTime.
by Alexandre Julliard 12 Apr '10

12 Apr '10

Module: wine Branch: master Commit: 137469479c9645d3ce192638ac00fb522f864949 URL: http://source.winehq.org/git/wine.git/?a=commit;h=137469479c9645d3ce192638a… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Apr 7 18:57:06 2010 +0200 winmm: Remove timeGetTime. --- dlls/winmm/time.c | 18 ------------------ dlls/winmm/winmm.spec | 2 +- 2 files changed, 1 insertions(+), 19 deletions(-) diff --git a/dlls/winmm/time.c b/dlls/winmm/time.c index 85577c2..ee835c7 100644 --- a/dlls/winmm/time.c +++ b/dlls/winmm/time.c @@ -436,21 +436,3 @@ MMRESULT WINAPI timeEndPeriod(UINT wPeriod) } return 0; } - -/************************************************************************** - * timeGetTime [WINMM.@] - */ -DWORD WINAPI timeGetTime(void) -{ -#if defined(COMMENTOUTPRIORTODELETING) - DWORD count; - - /* FIXME: releasing the win16 lock here is a temporary hack (I hope) - * that lets mciavi32.dll run correctly - */ - if (pFnReleaseThunkLock) pFnReleaseThunkLock(&count); - if (pFnRestoreThunkLock) pFnRestoreThunkLock(count); -#endif - - return GetTickCount(); -} diff --git a/dlls/winmm/winmm.spec b/dlls/winmm/winmm.spec index 870b775..a1eaf81 100644 --- a/dlls/winmm/winmm.spec +++ b/dlls/winmm/winmm.spec @@ -147,7 +147,7 @@ @ stdcall timeEndPeriod(long) @ stdcall timeGetDevCaps(ptr long) @ stdcall timeGetSystemTime(ptr long) -@ stdcall timeGetTime() +@ stdcall timeGetTime() kernel32.GetTickCount @ stdcall timeKillEvent(long) @ stdcall timeSetEvent(long long ptr long long) @ stdcall waveInAddBuffer(long ptr long)

1 0

Paul Vriens : ntdll/tests: Prevent test failures on Windows.
by Alexandre Julliard 12 Apr '10

12 Apr '10

Module: wine Branch: master Commit: 42094d259875956083f12e4fc2f82d9394974d8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=42094d259875956083f12e4fc… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Apr 12 15:10:24 2010 +0200 ntdll/tests: Prevent test failures on Windows. --- dlls/ntdll/tests/file.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 4e0512e..c483045 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -332,17 +332,20 @@ static void open_file_test(void) nameW.Length = sizeof(info->FileId); info->FileName[info->FileNameLength/sizeof(WCHAR)] = 0; attr.RootDirectory = dir; + /* We skip 'open' files by not specifying FILE_SHARE_WRITE */ status = pNtOpenFile( &handle, GENERIC_READ, &attr, &io, - FILE_SHARE_READ|FILE_SHARE_WRITE, + FILE_SHARE_READ, FILE_OPEN_BY_FILE_ID | ((info->FileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? FILE_DIRECTORY_FILE : 0) ); - ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED || status == STATUS_NOT_IMPLEMENTED, + ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED || status == STATUS_NOT_IMPLEMENTED || status == STATUS_SHARING_VIOLATION, "open %s failed %x\n", wine_dbgstr_w(info->FileName), status ); if (status == STATUS_NOT_IMPLEMENTED) { win_skip( "FILE_OPEN_BY_FILE_ID not supported\n" ); break; } + if (status == STATUS_SHARING_VIOLATION) + trace( "%s is currently open\n", wine_dbgstr_w(info->FileName) ); if (!status) { BYTE buf[sizeof(FILE_ALL_INFORMATION) + MAX_PATH * sizeof(WCHAR)]; @@ -351,11 +354,15 @@ static void open_file_test(void) { FILE_ALL_INFORMATION *fai = (FILE_ALL_INFORMATION *)buf; - /* check that it's the same file */ - ok( info->EndOfFile.QuadPart == fai->StandardInformation.EndOfFile.QuadPart, - "mismatched file size for %s\n", wine_dbgstr_w(info->FileName)); - ok( info->LastWriteTime.QuadPart == fai->BasicInformation.LastWriteTime.QuadPart, - "mismatched write time for %s\n", wine_dbgstr_w(info->FileName)); + /* check that it's the same file/directory */ + + /* don't check the size for directories */ + if (!(info->FileAttributes & FILE_ATTRIBUTE_DIRECTORY)) + ok( info->EndOfFile.QuadPart == fai->StandardInformation.EndOfFile.QuadPart, + "mismatched file size for %s\n", wine_dbgstr_w(info->FileName)); + + ok( info->CreationTime.QuadPart == fai->BasicInformation.CreationTime.QuadPart, + "mismatched creation time for %s\n", wine_dbgstr_w(info->FileName)); } CloseHandle( handle );

1 0

Paul Vriens : ntdll/tests: We need a bigger buffer for NtQueryInformationFile.
by Alexandre Julliard 12 Apr '10

12 Apr '10

Module: wine Branch: master Commit: a155cf5f35cda968d5c695a3a1bd45d5e84888e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a155cf5f35cda968d5c695a3a… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Apr 12 14:59:58 2010 +0200 ntdll/tests: We need a bigger buffer for NtQueryInformationFile. --- dlls/ntdll/tests/file.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 08f8139..4e0512e 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -345,14 +345,16 @@ static void open_file_test(void) } if (!status) { - FILE_ALL_INFORMATION all_info; + BYTE buf[sizeof(FILE_ALL_INFORMATION) + MAX_PATH * sizeof(WCHAR)]; - if (!pNtQueryInformationFile( handle, &io, &all_info, sizeof(all_info), FileAllInformation )) + if (!pNtQueryInformationFile( handle, &io, buf, sizeof(buf), FileAllInformation )) { + FILE_ALL_INFORMATION *fai = (FILE_ALL_INFORMATION *)buf; + /* check that it's the same file */ - ok( info->EndOfFile.QuadPart == all_info.StandardInformation.EndOfFile.QuadPart, + ok( info->EndOfFile.QuadPart == fai->StandardInformation.EndOfFile.QuadPart, "mismatched file size for %s\n", wine_dbgstr_w(info->FileName)); - ok( info->LastWriteTime.QuadPart == all_info.BasicInformation.LastWriteTime.QuadPart, + ok( info->LastWriteTime.QuadPart == fai->BasicInformation.LastWriteTime.QuadPart, "mismatched write time for %s\n", wine_dbgstr_w(info->FileName)); } CloseHandle( handle );

1 0

Paul Vriens : ntdll/tests: Enumerate one by one.
by Alexandre Julliard 12 Apr '10

12 Apr '10

Module: wine Branch: master Commit: 35367700839ffe28ebe5dca9bd222cd4250ec90d URL: http://source.winehq.org/git/wine.git/?a=commit;h=35367700839ffe28ebe5dca9b… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Apr 12 14:52:50 2010 +0200 ntdll/tests: Enumerate one by one. --- dlls/ntdll/tests/file.c | 78 ++++++++++++++++++++++------------------------ 1 files changed, 37 insertions(+), 41 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index af5747a..08f8139 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -254,7 +254,7 @@ static void open_file_test(void) NTSTATUS status; HANDLE dir, root, handle; WCHAR path[MAX_PATH]; - BYTE data[8192]; + BYTE data[1024]; OBJECT_ATTRIBUTES attr; IO_STATUS_BLOCK io; UNICODE_STRING nameW; @@ -320,56 +320,52 @@ static void open_file_test(void) /* try open by file id */ while (!pNtQueryDirectoryFile( dir, NULL, NULL, NULL, &io, data, sizeof(data), - FileIdBothDirectoryInformation, FALSE, NULL, restart )) + FileIdBothDirectoryInformation, TRUE, NULL, restart )) { FILE_ID_BOTH_DIRECTORY_INFORMATION *info = (FILE_ID_BOTH_DIRECTORY_INFORMATION *)data; restart = FALSE; - for (;;) + + if (!info->FileId.QuadPart) continue; + + nameW.Buffer = (WCHAR *)&info->FileId; + nameW.Length = sizeof(info->FileId); + info->FileName[info->FileNameLength/sizeof(WCHAR)] = 0; + attr.RootDirectory = dir; + status = pNtOpenFile( &handle, GENERIC_READ, &attr, &io, + FILE_SHARE_READ|FILE_SHARE_WRITE, + FILE_OPEN_BY_FILE_ID | + ((info->FileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? FILE_DIRECTORY_FILE : 0) ); + ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED || status == STATUS_NOT_IMPLEMENTED, + "open %s failed %x\n", wine_dbgstr_w(info->FileName), status ); + if (status == STATUS_NOT_IMPLEMENTED) + { + win_skip( "FILE_OPEN_BY_FILE_ID not supported\n" ); + break; + } + if (!status) { - if (!info->FileId.QuadPart) goto next; - nameW.Buffer = (WCHAR *)&info->FileId; - nameW.Length = sizeof(info->FileId); - info->FileName[info->FileNameLength/sizeof(WCHAR)] = 0; - attr.RootDirectory = dir; + FILE_ALL_INFORMATION all_info; + + if (!pNtQueryInformationFile( handle, &io, &all_info, sizeof(all_info), FileAllInformation )) + { + /* check that it's the same file */ + ok( info->EndOfFile.QuadPart == all_info.StandardInformation.EndOfFile.QuadPart, + "mismatched file size for %s\n", wine_dbgstr_w(info->FileName)); + ok( info->LastWriteTime.QuadPart == all_info.BasicInformation.LastWriteTime.QuadPart, + "mismatched write time for %s\n", wine_dbgstr_w(info->FileName)); + } + CloseHandle( handle ); + + /* try same thing from drive root */ + attr.RootDirectory = root; status = pNtOpenFile( &handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN_BY_FILE_ID | ((info->FileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? FILE_DIRECTORY_FILE : 0) ); - ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED || status == STATUS_NOT_IMPLEMENTED, + ok( status == STATUS_SUCCESS || status == STATUS_NOT_IMPLEMENTED, "open %s failed %x\n", wine_dbgstr_w(info->FileName), status ); - if (status == STATUS_NOT_IMPLEMENTED) - { - win_skip( "FILE_OPEN_BY_FILE_ID not supported\n" ); - break; - } - if (!status) - { - FILE_ALL_INFORMATION all_info; - - if (!pNtQueryInformationFile( handle, &io, &all_info, sizeof(all_info), FileAllInformation )) - { - /* check that it's the same file */ - ok( info->EndOfFile.QuadPart == all_info.StandardInformation.EndOfFile.QuadPart, - "mismatched file size for %s\n", wine_dbgstr_w(info->FileName)); - ok( info->LastWriteTime.QuadPart == all_info.BasicInformation.LastWriteTime.QuadPart, - "mismatched write time for %s\n", wine_dbgstr_w(info->FileName)); - } - CloseHandle( handle ); - - /* try same thing from drive root */ - attr.RootDirectory = root; - status = pNtOpenFile( &handle, GENERIC_READ, &attr, &io, - FILE_SHARE_READ|FILE_SHARE_WRITE, - FILE_OPEN_BY_FILE_ID | - ((info->FileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? FILE_DIRECTORY_FILE : 0) ); - ok( status == STATUS_SUCCESS || status == STATUS_NOT_IMPLEMENTED, - "open %s failed %x\n", wine_dbgstr_w(info->FileName), status ); - if (!status) CloseHandle( handle ); - } - next: - if (!info->NextEntryOffset) break; - info = (FILE_ID_BOTH_DIRECTORY_INFORMATION *)((char *)info + info->NextEntryOffset); + if (!status) CloseHandle( handle ); } }

1 0

Paul Vriens : ntdll/tests: Make sure we can enumerate the directory.
by Alexandre Julliard 12 Apr '10

12 Apr '10

Module: wine Branch: master Commit: 8b8d2038fbefd87d28d6fd0c20536ccd521d1c44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b8d2038fbefd87d28d6fd0c2… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Apr 12 14:44:30 2010 +0200 ntdll/tests: Make sure we can enumerate the directory. --- dlls/ntdll/tests/file.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 7540d78..af5747a 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -269,8 +269,8 @@ static void open_file_test(void) attr.Attributes = OBJ_CASE_INSENSITIVE; attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - status = pNtOpenFile( &dir, GENERIC_READ, &attr, &io, - FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE ); + status = pNtOpenFile( &dir, SYNCHRONIZE|FILE_LIST_DIRECTORY, &attr, &io, + FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE|FILE_SYNCHRONOUS_IO_NONALERT ); ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); pRtlFreeUnicodeString( &nameW );

1 0

Jörg Höhle : winmm: Improve MCI A/W mapping.
by Alexandre Julliard 12 Apr '10

12 Apr '10

Module: wine Branch: master Commit: db0df4c067fd6b701905aaef735c4729fca9d73f URL: http://source.winehq.org/git/wine.git/?a=commit;h=db0df4c067fd6b701905aaef7… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Mar 28 20:01:15 2010 +0200 winmm: Improve MCI A/W mapping. --- dlls/winmm/mci.c | 117 +++++++++++++++++++++++++---------------------------- 1 files changed, 55 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=db0df4c067fd6b701905a…

1 0

Jörg Höhle : winmm: MCI system commands are not eligible for auto-open.
by Alexandre Julliard 12 Apr '10

12 Apr '10

Module: wine Branch: master Commit: b84576fcefc7952798ae977aa9c49ec3a3c0d035 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b84576fcefc7952798ae977aa… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Mar 28 20:34:03 2010 +0200 winmm: MCI system commands are not eligible for auto-open. --- dlls/winmm/mci.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index cde8c88..cef3872 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1232,8 +1232,10 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, LPCWSTR lpCmd = 0; static const WCHAR wszNew[] = {'n','e','w',0}; static const WCHAR wszSAliasS[] = {' ','a','l','i','a','s',' ',0}; - static const WCHAR wszTypeS[] = {'t','y','p','e',' ',0}; + static const WCHAR wszTypeS[] = {'t','y','p','e',' ',0}; static const WCHAR wszSysinfo[] = {'s','y','s','i','n','f','o',0}; + static const WCHAR wszSound[] = {'s','o','u','n','d',0}; + static const WCHAR wszBreak[] = {'b','r','e','a','k',0}; TRACE("(%s, %p, %d, %p)\n", debugstr_w(lpstrCommand), lpstrRet, uRetLen, hwndCallback); @@ -1341,6 +1343,8 @@ DWORD WINAPI mciSendStringW(LPCWSTR lpstrCommand, LPWSTR lpstrRet, if (wmd) data[4] = wmd->wType; } + } else if (!strcmpW(verb, wszSound) || !strcmpW(verb, wszBreak)) { + /* Prevent auto-open for system commands. */ } else if ((MCI_ALL_DEVICE_ID != uDevID) && !(wmd = MCI_GetDriver(mciGetDeviceIDW(dev)))) { /* auto open */ static const WCHAR wszOpenWait[] = {'o','p','e','n',' ','%','s',' ','w','a','i','t',0}; @@ -1882,11 +1886,10 @@ static DWORD MCI_Break(UINT wDevID, DWORD dwFlags, LPMCI_BREAK_PARMS lpParms) DWORD dwRet = 0; if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; + FIXME("(%04x) vkey %04X stub\n", dwFlags, lpParms->nVirtKey); - if (dwFlags & MCI_NOTIFY) - mciDriverNotify((HWND)lpParms->dwCallback, wDevID, - (dwRet == 0) ? MCI_NOTIFY_SUCCESSFUL : MCI_NOTIFY_FAILURE); - + if (MMSYSERR_NOERROR==dwRet && (dwFlags & MCI_NOTIFY)) + mciDriverNotify((HWND)lpParms->dwCallback, wDevID, MCI_NOTIFY_SUCCESSFUL); return dwRet; } @@ -1903,10 +1906,9 @@ static DWORD MCI_Sound(UINT wDevID, DWORD dwFlags, LPMCI_SOUND_PARMSW lpParms) dwRet = sndPlaySoundW(lpParms->lpstrSoundName, SND_SYNC) ? MMSYSERR_NOERROR : MMSYSERR_ERROR; else dwRet = MMSYSERR_ERROR; /* what should be done ??? */ - if (dwFlags & MCI_NOTIFY) - mciDriverNotify((HWND)lpParms->dwCallback, wDevID, - (dwRet == 0) ? MCI_NOTIFY_SUCCESSFUL : MCI_NOTIFY_FAILURE); + if (MMSYSERR_NOERROR==dwRet && (dwFlags & MCI_NOTIFY)) + mciDriverNotify((HWND)lpParms->dwCallback, wDevID, MCI_NOTIFY_SUCCESSFUL); return dwRet; }

1 0

Maarten Lankhorst : mmdevapi: Blacklist alsa hw devices.
by Alexandre Julliard 12 Apr '10

12 Apr '10

Module: wine Branch: master Commit: e9f520467d089becc7e5f30230b397c0b2e4c49d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9f520467d089becc7e5f3023… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Apr 12 11:59:59 2010 +0200 mmdevapi: Blacklist alsa hw devices. --- dlls/mmdevapi/devenum.c | 35 ++++++++++++++++++++++++++++------- 1 files changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index b593eb6..9619aa6 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -732,11 +732,18 @@ static void openal_setformat(MMDevice *This, DWORD freq) } } +static int blacklist(const char *dev) { + if (strstr(dev, "ALSA") && strstr(dev, "hw:")) + return 1; + return 0; +} + static void openal_scanrender(void) { WCHAR name[MAX_PATH]; ALCdevice *dev; const ALCchar *devstr, *defaultstr; + int defblacklisted; EnterCriticalSection(&openal_crst); if (palcIsExtensionPresent(NULL, "ALC_ENUMERATE_ALL_EXT")) { defaultstr = palcGetString(NULL, ALC_DEFAULT_ALL_DEVICES_SPECIFIER); @@ -745,12 +752,20 @@ static void openal_scanrender(void) defaultstr = palcGetString(NULL, ALC_DEFAULT_DEVICE_SPECIFIER); devstr = palcGetString(NULL, ALC_DEVICE_SPECIFIER); } - if (devstr && *devstr) - do { + defblacklisted = blacklist(defaultstr); + if (defblacklisted) + WARN("Disabling blacklist because %s is blacklisted\n", defaultstr); + if (devstr) + for (; *devstr; devstr += strlen(devstr)+1) { MMDevice *mmdev; MultiByteToWideChar( CP_UNIXCP, 0, devstr, -1, name, sizeof(name)/sizeof(*name)-1 ); name[sizeof(name)/sizeof(*name)-1] = 0; + /* Only enable blacklist if the default device isn't blacklisted */ + if (!defblacklisted && blacklist(devstr)) { + WARN("Not adding %s: device is blacklisted\n", devstr); + continue; + } TRACE("Adding %s\n", devstr); dev = palcOpenDevice(devstr); MMDevice_Create(&mmdev, name, NULL, eRender, dev ? DEVICE_STATE_ACTIVE : DEVICE_STATE_NOTPRESENT, !strcmp(devstr, defaultstr)); @@ -763,8 +778,7 @@ static void openal_scanrender(void) } else WARN("Could not open device: %04x\n", palcGetError(NULL)); - devstr += strlen(devstr)+1; - } while (*devstr); + } LeaveCriticalSection(&openal_crst); } @@ -773,16 +787,24 @@ static void openal_scancapture(void) WCHAR name[MAX_PATH]; ALCdevice *dev; const ALCchar *devstr, *defaultstr; + int defblacklisted; EnterCriticalSection(&openal_crst); devstr = palcGetString(NULL, ALC_CAPTURE_DEVICE_SPECIFIER); defaultstr = palcGetString(NULL, ALC_CAPTURE_DEFAULT_DEVICE_SPECIFIER); + defblacklisted = blacklist(defaultstr); + if (defblacklisted) + WARN("Disabling blacklist because %s is blacklisted\n", defaultstr); if (devstr && *devstr) - do { + for (; *devstr; devstr += strlen(devstr)+1) { ALint freq = 44100; MultiByteToWideChar( CP_UNIXCP, 0, devstr, -1, name, sizeof(name)/sizeof(*name)-1 ); name[sizeof(name)/sizeof(*name)-1] = 0; + if (!defblacklisted && blacklist(devstr)) { + WARN("Not adding %s: device is blacklisted\n", devstr); + continue; + } TRACE("Adding %s\n", devstr); dev = palcCaptureOpenDevice(devstr, freq, AL_FORMAT_MONO16, 65536); MMDevice_Create(NULL, name, NULL, eCapture, dev ? DEVICE_STATE_ACTIVE : DEVICE_STATE_NOTPRESENT, !strcmp(devstr, defaultstr)); @@ -790,8 +812,7 @@ static void openal_scancapture(void) palcCaptureCloseDevice(dev); else WARN("Could not open device: %04x\n", palcGetError(NULL)); - devstr += strlen(devstr)+1; - } while (*devstr); + } LeaveCriticalSection(&openal_crst); } #endif /*HAVE_OPENAL*/

1 0

← Newer
1
...
57
58
59
60
61
62
63
...
90
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2010