wine-commits December 2012

wine-commits@winehq.org

2 participants
549 discussions

Michael Stefaniuc : msxml3: Remove superfluous function pointer casts.
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: 0432f6f86eda1c9adaf6c7f24f814385959fa7d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0432f6f86eda1c9adaf6c7f24… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 4 09:40:51 2012 +0100 msxml3: Remove superfluous function pointer casts. --- dlls/msxml3/schema.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 5626464..1c11349 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -838,7 +838,7 @@ static BOOL link_datatypes(xmlDocPtr schema) xmlNodePtr root, next, child; xmlNsPtr ns; - assert((void*)xmlGetExternalEntityLoader() == (void*)external_entity_loader); + assert(xmlGetExternalEntityLoader() == external_entity_loader); root = xmlDocGetRootElement(schema); if (!root) return FALSE;

1 0

Michael Stefaniuc : winex11.drv: Remove superfluous function pointer casts.
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: 563ed3abde5f74a9af79c905ffe1fe0b869e96e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=563ed3abde5f74a9af79c905f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 4 09:44:06 2012 +0100 winex11.drv: Remove superfluous function pointer casts. --- dlls/winex11.drv/xim.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index a39779f..e0548b8 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -478,7 +478,7 @@ XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) XVaNestedList preedit = NULL; XVaNestedList status = NULL; XIC xic; - XICCallback destroy = {(XPointer)data, (XICProc)X11DRV_DestroyIC}; + XICCallback destroy = {(XPointer)data, X11DRV_DestroyIC}; XICCallback P_StateNotifyCB, P_StartCB, P_DoneCB, P_DrawCB, P_CaretCB; LANGID langid = PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())); Window win = data->whole_window; @@ -507,8 +507,8 @@ XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) P_DoneCB.client_data = NULL; P_DrawCB.client_data = NULL; P_CaretCB.client_data = NULL; - P_StateNotifyCB.callback = (XICProc)XIMPreEditStateNotifyCallback; - P_StartCB.callback = (XICProc)XIMPreEditStartCallback; + P_StateNotifyCB.callback = XIMPreEditStateNotifyCallback; + P_StartCB.callback = XIMPreEditStartCallback; P_DoneCB.callback = (XICProc)XIMPreEditDoneCallback; P_DrawCB.callback = (XICProc)XIMPreEditDrawCallback; P_CaretCB.callback = (XICProc)XIMPreEditCaretCallback;

1 0

Michael Stefaniuc : qmgr: Parameter cleanup for a helper function.
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: 022e3f5333e690945be70cc306e3baa22aa417bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=022e3f5333e690945be70cc30… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 4 00:59:02 2012 +0100 qmgr: Parameter cleanup for a helper function. --- dlls/qmgr/enum_jobs.c | 8 +++----- dlls/qmgr/qmgr.c | 2 +- dlls/qmgr/qmgr.h | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/qmgr/enum_jobs.c b/dlls/qmgr/enum_jobs.c index 85aca47..1805a6a 100644 --- a/dlls/qmgr/enum_jobs.c +++ b/dlls/qmgr/enum_jobs.c @@ -163,15 +163,13 @@ static const IEnumBackgroundCopyJobsVtbl BITS_IEnumBackgroundCopyJobs_Vtbl = BITS_IEnumBackgroundCopyJobs_GetCount }; -HRESULT EnumBackgroundCopyJobsConstructor(LPVOID *ppObj, - IBackgroundCopyManager* copyManager) +HRESULT enum_copy_job_create(BackgroundCopyManagerImpl *qmgr, IEnumBackgroundCopyJobs **enumjob) { - BackgroundCopyManagerImpl *qmgr = (BackgroundCopyManagerImpl *) copyManager; EnumBackgroundCopyJobsImpl *This; BackgroundCopyJobImpl *job; ULONG i; - TRACE("%p, %p)\n", ppObj, copyManager); + TRACE("%p, %p)\n", qmgr, enumjob); This = HeapAlloc(GetProcessHeap(), 0, sizeof *This); if (!This) @@ -208,6 +206,6 @@ HRESULT EnumBackgroundCopyJobsConstructor(LPVOID *ppObj, } LeaveCriticalSection(&qmgr->cs); - *ppObj = &This->lpVtbl; + *enumjob = (IEnumBackgroundCopyJobs *)&This->lpVtbl; return S_OK; } diff --git a/dlls/qmgr/qmgr.c b/dlls/qmgr/qmgr.c index 55a01e6..7b11b66 100644 --- a/dlls/qmgr/qmgr.c +++ b/dlls/qmgr/qmgr.c @@ -85,7 +85,7 @@ static HRESULT WINAPI BITS_IBackgroundCopyManager_EnumJobs(IBackgroundCopyManage DWORD dwFlags, IEnumBackgroundCopyJobs **ppEnum) { TRACE("\n"); - return EnumBackgroundCopyJobsConstructor((LPVOID *) ppEnum, iface); + return enum_copy_job_create(&globalMgr, ppEnum); } static HRESULT WINAPI BITS_IBackgroundCopyManager_GetErrorDescription(IBackgroundCopyManager *iface, diff --git a/dlls/qmgr/qmgr.h b/dlls/qmgr/qmgr.h index 1057880..d591d20 100644 --- a/dlls/qmgr/qmgr.h +++ b/dlls/qmgr/qmgr.h @@ -100,8 +100,8 @@ extern BackgroundCopyManagerImpl globalMgr DECLSPEC_HIDDEN; HRESULT BackgroundCopyManagerConstructor(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, GUID *pJobId, LPVOID *ppObj) DECLSPEC_HIDDEN; -HRESULT EnumBackgroundCopyJobsConstructor(LPVOID *ppObj, - IBackgroundCopyManager* copyManager) DECLSPEC_HIDDEN; +HRESULT enum_copy_job_create(BackgroundCopyManagerImpl *qmgr, + IEnumBackgroundCopyJobs **enumjob) DECLSPEC_HIDDEN; HRESULT BackgroundCopyFileConstructor(BackgroundCopyJobImpl *owner, LPCWSTR remoteName, LPCWSTR localName, LPVOID *ppObj) DECLSPEC_HIDDEN;

1 0

Michael Stefaniuc : qmgr: COM cleanup for the IBackgroundCopyManager iface.
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: a3fdfa22ffaf5093bbf5b8a90c4b6544345fba26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3fdfa22ffaf5093bbf5b8a90… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Dec 4 00:57:09 2012 +0100 qmgr: COM cleanup for the IBackgroundCopyManager iface. --- dlls/qmgr/qmgr.c | 72 +++++++++++++++++++---------------------------------- dlls/qmgr/qmgr.h | 2 +- 2 files changed, 27 insertions(+), 47 deletions(-) diff --git a/dlls/qmgr/qmgr.c b/dlls/qmgr/qmgr.c index 1ff6050..55a01e6 100644 --- a/dlls/qmgr/qmgr.c +++ b/dlls/qmgr/qmgr.c @@ -23,52 +23,39 @@ WINE_DEFAULT_DEBUG_CHANNEL(qmgr); -/* Add a reference to the iface pointer */ -static ULONG WINAPI BITS_IBackgroundCopyManager_AddRef( - IBackgroundCopyManager* iface) -{ - return 2; -} +BackgroundCopyManagerImpl globalMgr; -/* Attempt to provide a new interface to interact with iface */ -static HRESULT WINAPI BITS_IBackgroundCopyManager_QueryInterface( - IBackgroundCopyManager* iface, - REFIID riid, - LPVOID *ppvObject) +static HRESULT WINAPI BITS_IBackgroundCopyManager_QueryInterface(IBackgroundCopyManager *iface, + REFIID riid, void **ppv) { - BackgroundCopyManagerImpl * This = (BackgroundCopyManagerImpl *)iface; - - TRACE("IID: %s\n", debugstr_guid(riid)); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(riid), ppv); - if (IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IBackgroundCopyManager)) + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IBackgroundCopyManager)) { - *ppvObject = &This->lpVtbl; - BITS_IBackgroundCopyManager_AddRef(iface); + *ppv = iface; + IBackgroundCopyManager_AddRef(iface); return S_OK; } - *ppvObject = NULL; + *ppv = NULL; return E_NOINTERFACE; } -/* Release an interface to iface */ -static ULONG WINAPI BITS_IBackgroundCopyManager_Release( - IBackgroundCopyManager* iface) +static ULONG WINAPI BITS_IBackgroundCopyManager_AddRef(IBackgroundCopyManager *iface) +{ + return 2; +} + +static ULONG WINAPI BITS_IBackgroundCopyManager_Release(IBackgroundCopyManager *iface) { return 1; } /*** IBackgroundCopyManager interface methods ***/ -static HRESULT WINAPI BITS_IBackgroundCopyManager_CreateJob( - IBackgroundCopyManager* iface, - LPCWSTR DisplayName, - BG_JOB_TYPE Type, - GUID *pJobId, - IBackgroundCopyJob **ppJob) +static HRESULT WINAPI BITS_IBackgroundCopyManager_CreateJob(IBackgroundCopyManager *iface, + LPCWSTR DisplayName, BG_JOB_TYPE Type, GUID *pJobId, IBackgroundCopyJob **ppJob) { - BackgroundCopyManagerImpl * This = (BackgroundCopyManagerImpl *) iface; BackgroundCopyJobImpl *job; HRESULT hres; TRACE("\n"); @@ -81,35 +68,28 @@ static HRESULT WINAPI BITS_IBackgroundCopyManager_CreateJob( /* Add a reference to the job to job list */ IBackgroundCopyJob_AddRef(*ppJob); job = (BackgroundCopyJobImpl *) *ppJob; - EnterCriticalSection(&This->cs); - list_add_head(&This->jobs, &job->entryFromQmgr); - LeaveCriticalSection(&This->cs); + EnterCriticalSection(&globalMgr.cs); + list_add_head(&globalMgr.jobs, &job->entryFromQmgr); + LeaveCriticalSection(&globalMgr.cs); return S_OK; } -static HRESULT WINAPI BITS_IBackgroundCopyManager_GetJob( - IBackgroundCopyManager* iface, - REFGUID jobID, - IBackgroundCopyJob **ppJob) +static HRESULT WINAPI BITS_IBackgroundCopyManager_GetJob(IBackgroundCopyManager *iface, + REFGUID jobID, IBackgroundCopyJob **ppJob) { FIXME("Not implemented\n"); return E_NOTIMPL; } -static HRESULT WINAPI BITS_IBackgroundCopyManager_EnumJobs( - IBackgroundCopyManager* iface, - DWORD dwFlags, - IEnumBackgroundCopyJobs **ppEnum) +static HRESULT WINAPI BITS_IBackgroundCopyManager_EnumJobs(IBackgroundCopyManager *iface, + DWORD dwFlags, IEnumBackgroundCopyJobs **ppEnum) { TRACE("\n"); return EnumBackgroundCopyJobsConstructor((LPVOID *) ppEnum, iface); } -static HRESULT WINAPI BITS_IBackgroundCopyManager_GetErrorDescription( - IBackgroundCopyManager* iface, - HRESULT hResult, - DWORD LanguageId, - LPWSTR *pErrorDescription) +static HRESULT WINAPI BITS_IBackgroundCopyManager_GetErrorDescription(IBackgroundCopyManager *iface, + HRESULT hResult, DWORD LanguageId, LPWSTR *pErrorDescription) { FIXME("Not implemented\n"); return E_NOTIMPL; @@ -128,7 +108,7 @@ static const IBackgroundCopyManagerVtbl BITS_IBackgroundCopyManager_Vtbl = }; BackgroundCopyManagerImpl globalMgr = { - &BITS_IBackgroundCopyManager_Vtbl, + { &BITS_IBackgroundCopyManager_Vtbl }, { NULL, -1, 0, 0, 0, 0 }, NULL, LIST_INIT(globalMgr.jobs) diff --git a/dlls/qmgr/qmgr.h b/dlls/qmgr/qmgr.h index c504396..1057880 100644 --- a/dlls/qmgr/qmgr.h +++ b/dlls/qmgr/qmgr.h @@ -81,7 +81,7 @@ typedef struct /* Background copy manager vtbl and related data */ typedef struct { - const IBackgroundCopyManagerVtbl *lpVtbl; + IBackgroundCopyManager IBackgroundCopyManager_iface; /* Protects job list, job states, and jobEvent */ CRITICAL_SECTION cs; HANDLE jobEvent;

1 0

André Hentschel : psapi/tests: Fix test on win8.
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: cd465edb0002aa1f2829760a9cc296330f929ef9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd465edb0002aa1f2829760a9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 3 22:55:35 2012 +0100 psapi/tests: Fix test on win8. --- dlls/psapi/tests/psapi_main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 312d544..130c33e 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -317,7 +317,8 @@ todo_wine ret = pGetMappedFileNameA(GetCurrentProcess(), base, map_name, 0); ok(!ret, "GetMappedFileName should fail\n"); todo_wine - ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "wrong error %d\n", GetLastError()); SetLastError(0xdeadbeef); ret = pGetMappedFileNameA(GetCurrentProcess(), base, 0, sizeof(map_name));

1 0

André Hentschel : winemaker: Output UTF-8 Makefiles.
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: 6541a19907bf2b0f14ad4b3dbb03a0758fd902b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6541a19907bf2b0f14ad4b3db… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Dec 3 19:46:44 2012 +0100 winemaker: Output UTF-8 Makefiles. --- tools/winemaker | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/winemaker b/tools/winemaker index 4e32fc1..9c5c6a0 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -1,4 +1,5 @@ #!/usr/bin/perl -w +use utf8; use strict; # Copyright 2000-2004 Francois Gouget for CodeWeavers @@ -2387,6 +2388,7 @@ sub generate_project_files($) print STDERR " $!\n"; return; } + binmode( FILEO, ':utf8' ); my $cpp_to_object; if (@$project_settings[$T_FLAGS] & $TF_HASCXX) {

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: a769e4aeb07a9609ae435f542d4044801e19a920 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a769e4aeb07a9609ae435f542… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Mon Dec 3 22:11:47 2012 +0200 po: Update Lithuanian translation. --- po/lt.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index 2434660..3607e91 100644 --- a/po/lt.po +++ b/po/lt.po @@ -641,11 +641,11 @@ msgstr "Kryptis" #: comdlg32.rc:318 view.rc:39 msgid "&Up" -msgstr "&Žemyn" +msgstr "&Aukštyn" #: comdlg32.rc:319 view.rc:40 msgid "&Down" -msgstr "&Aukštyn" +msgstr "&Žemyn" #: comdlg32.rc:321 comdlg32.rc:339 msgid "&Find Next" @@ -12424,11 +12424,11 @@ msgstr "&Sutalpinti į langą" #: view.rc:37 msgid "&Left" -msgstr "&Dešinėn" +msgstr "&Kairėn" #: view.rc:38 msgid "&Right" -msgstr "&Kairėn" +msgstr "&Dešinėn" #: view.rc:46 msgid "Regular Metafile Viewer"

1 0

Andrew Eikum : wineoss.drv: Improve IsFormatSupported handling.
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: dc0cef3d3b68ae10c80c13846265a9317eecdfd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc0cef3d3b68ae10c80c13846… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Dec 3 10:28:11 2012 -0600 wineoss.drv: Improve IsFormatSupported handling. --- dlls/wineoss.drv/mmdevdrv.c | 37 ++++++++++++++++++++++++++----------- 1 files changed, 26 insertions(+), 11 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 62ae7ca..9fc6f02 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -837,13 +837,12 @@ static WAVEFORMATEX *clone_format(const WAVEFORMATEX *fmt) return ret; } -static HRESULT setup_oss_device(int fd, const WAVEFORMATEX *fmt, - WAVEFORMATEX **out, BOOL query) +static HRESULT setup_oss_device(AUDCLNT_SHAREMODE mode, int fd, + const WAVEFORMATEX *fmt, WAVEFORMATEX **out) { int tmp, oss_format; double tenth; HRESULT ret = S_OK; - WAVEFORMATEXTENSIBLE *fmtex = (void*)fmt; WAVEFORMATEX *closest = NULL; tmp = oss_format = get_oss_format(fmt); @@ -858,6 +857,15 @@ static HRESULT setup_oss_device(int fd, const WAVEFORMATEX *fmt, return AUDCLNT_E_UNSUPPORTED_FORMAT; } + if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + (fmt->nAvgBytesPerSec == 0 || + fmt->nBlockAlign == 0 || + ((WAVEFORMATEXTENSIBLE*)fmt)->Samples.wValidBitsPerSample > fmt->wBitsPerSample)) + return E_INVALIDARG; + + if(fmt->nChannels == 0) + return AUDCLNT_E_UNSUPPORTED_FORMAT; + closest = clone_format(fmt); if(!closest) return E_OUTOFMEMORY; @@ -885,14 +893,19 @@ static HRESULT setup_oss_device(int fd, const WAVEFORMATEX *fmt, closest->nChannels = tmp; } - if(closest->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ - DWORD mask = get_channel_mask(closest->nChannels); + if(closest->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + ((WAVEFORMATEXTENSIBLE*)closest)->dwChannelMask = get_channel_mask(closest->nChannels); - ((WAVEFORMATEXTENSIBLE*)closest)->dwChannelMask = mask; + if(fmt->nBlockAlign != fmt->nChannels * fmt->wBitsPerSample / 8 || + fmt->nAvgBytesPerSec != fmt->nBlockAlign * fmt->nSamplesPerSec || + (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + ((WAVEFORMATEXTENSIBLE*)fmt)->Samples.wValidBitsPerSample < fmt->wBitsPerSample)) + ret = S_FALSE; - if(query && fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - fmtex->dwChannelMask != 0 && - fmtex->dwChannelMask != mask) + if(mode == AUDCLNT_SHAREMODE_EXCLUSIVE && + fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ + if(((WAVEFORMATEXTENSIBLE*)fmt)->dwChannelMask == 0 || + ((WAVEFORMATEXTENSIBLE*)fmt)->dwChannelMask & SPEAKER_RESERVED) ret = S_FALSE; } @@ -904,6 +917,8 @@ static HRESULT setup_oss_device(int fd, const WAVEFORMATEX *fmt, closest->nChannels * closest->wBitsPerSample / 8; closest->nAvgBytesPerSec = closest->nBlockAlign * closest->nSamplesPerSec; + if(closest->wFormatTag == WAVE_FORMAT_EXTENSIBLE) + ((WAVEFORMATEXTENSIBLE*)closest)->Samples.wValidBitsPerSample = closest->wBitsPerSample; *out = closest; } else CoTaskMemFree(closest); @@ -1055,7 +1070,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, return AUDCLNT_E_ALREADY_INITIALIZED; } - hr = setup_oss_device(This->fd, fmt, NULL, FALSE); + hr = setup_oss_device(mode, This->fd, fmt, NULL); if(FAILED(hr)){ LeaveCriticalSection(&This->lock); return hr; @@ -1237,7 +1252,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, return AUDCLNT_E_DEVICE_INVALIDATED; } - ret = setup_oss_device(fd, pwfx, outpwfx, TRUE); + ret = setup_oss_device(mode, fd, pwfx, outpwfx); close(fd);

1 0

Andrew Eikum : winecoreaudio.drv: Improve IsFormatSupported handling.
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: af20740d07a3f29e3e6bb7d5175b45b75059eb3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=af20740d07a3f29e3e6bb7d51… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Dec 3 10:28:07 2012 -0600 winecoreaudio.drv: Improve IsFormatSupported handling. --- dlls/winecoreaudio.drv/mmdevdrv.c | 47 ++++++++++++++++++++++++++++++++---- 1 files changed, 41 insertions(+), 6 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 06f46f7..8ee0dec 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1131,6 +1131,12 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, if( duration < 3 * period) duration = 3 * period; }else{ + if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ + if(((WAVEFORMATEXTENSIBLE*)fmt)->dwChannelMask == 0 || + ((WAVEFORMATEXTENSIBLE*)fmt)->dwChannelMask & SPEAKER_RESERVED) + return AUDCLNT_E_UNSUPPORTED_FORMAT; + } + if(!period) period = DefaultPeriod; /* not minimum */ if(period < MinimumPeriod || period > 5000000) @@ -1445,12 +1451,31 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, dump_fmt(pwfx); - if(outpwfx) + if(outpwfx){ *outpwfx = NULL; + if(mode != AUDCLNT_SHAREMODE_SHARED) + outpwfx = NULL; + } + + if(pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ + if(pwfx->nAvgBytesPerSec == 0 || + pwfx->nBlockAlign == 0 || + fmtex->Samples.wValidBitsPerSample > pwfx->wBitsPerSample) + return E_INVALIDARG; + if(fmtex->Samples.wValidBitsPerSample < pwfx->wBitsPerSample) + goto unsupported; + if(mode == AUDCLNT_SHAREMODE_EXCLUSIVE){ + if(fmtex->dwChannelMask == 0 || + fmtex->dwChannelMask & SPEAKER_RESERVED) + goto unsupported; + } + } - if(pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE && - fmtex->dwChannelMask != 0 && - fmtex->dwChannelMask != get_channel_mask(pwfx->nChannels)) + if(pwfx->nBlockAlign != pwfx->nChannels * pwfx->wBitsPerSample / 8 || + pwfx->nAvgBytesPerSec != pwfx->nBlockAlign * pwfx->nSamplesPerSec) + goto unsupported; + + if(pwfx->nChannels == 0) return AUDCLNT_E_UNSUPPORTED_FORMAT; OSSpinLockLock(&This->lock); @@ -1462,10 +1487,20 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, TRACE("returning %08x\n", S_OK); return S_OK; } - OSSpinLockUnlock(&This->lock); + if(hr != AUDCLNT_E_UNSUPPORTED_FORMAT){ + TRACE("returning %08x\n", hr); + return hr; + } + +unsupported: + if(outpwfx){ + hr = IAudioClient_GetMixFormat(&This->IAudioClient_iface, outpwfx); + if(FAILED(hr)) + return hr; + return S_FALSE; + } - TRACE("returning %08x\n", AUDCLNT_E_UNSUPPORTED_FORMAT); return AUDCLNT_E_UNSUPPORTED_FORMAT; }

1 0

Andrew Eikum : winecoreaudio.drv: Convert some OSStatus errors to HRESULT.
by Alexandre Julliard 04 Dec '12

04 Dec '12

Module: wine Branch: master Commit: e84f05bcbcbf2092b8c09f6440cc951b66285af1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e84f05bcbcbf2092b8c09f644… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Dec 3 10:28:02 2012 -0600 winecoreaudio.drv: Convert some OSStatus errors to HRESULT. --- dlls/winecoreaudio.drv/mmdevdrv.c | 45 ++++++++++++++++++++++++------------ 1 files changed, 30 insertions(+), 15 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index da0123b..06f46f7 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -55,6 +55,7 @@ #include <libkern/OSAtomic.h> #include <CoreAudio/CoreAudio.h> #include <AudioToolbox/AudioQueue.h> +#include <AudioToolbox/AudioFormat.h> WINE_DEFAULT_DEBUG_CHANNEL(coreaudio); @@ -281,6 +282,19 @@ int WINAPI AUDDRV_GetPriority(void) return Priority_Neutral; } +static HRESULT osstatus_to_hresult(OSStatus sc) +{ + switch(sc){ + case kAudioFormatUnsupportedDataFormatError: + case kAudioFormatUnknownFormatError: + case kAudioDeviceUnsupportedFormatError: + return AUDCLNT_E_UNSUPPORTED_FORMAT; + case kAudioHardwareBadDeviceError: + return AUDCLNT_E_DEVICE_INVALIDATED; + } + return E_FAIL; +} + static void set_device_guid(EDataFlow flow, HKEY drv_key, const WCHAR *key_name, GUID *guid) { @@ -390,7 +404,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, NULL, &devsize); if(sc != noErr){ WARN("Getting _Devices property size failed: %lx\n", sc); - return E_FAIL; + return osstatus_to_hresult(sc); } devices = HeapAlloc(GetProcessHeap(), 0, devsize); @@ -402,7 +416,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, if(sc != noErr){ WARN("Getting _Devices property failed: %lx\n", sc); HeapFree(GetProcessHeap(), 0, devices); - return E_FAIL; + return osstatus_to_hresult(sc); } ndevices = devsize / sizeof(AudioDeviceID); @@ -959,7 +973,7 @@ static HRESULT ca_setup_aqueue(AudioDeviceID did, EDataFlow flow, sc = AudioObjectGetPropertyData(did, &addr, 0, NULL, &size, &uid); if(sc != noErr){ WARN("Unable to get _DeviceUID property: %lx\n", sc); - return E_FAIL; + return osstatus_to_hresult(sc); } hr = ca_get_audiodesc(&desc, fmt); @@ -981,14 +995,15 @@ static HRESULT ca_setup_aqueue(AudioDeviceID did, EDataFlow flow, if(sc != noErr){ WARN("Unable to create AudioQueue: %lx\n", sc); CFRelease(uid); - return E_FAIL; + return osstatus_to_hresult(sc); } sc = AudioQueueSetProperty(*aqueue, kAudioQueueProperty_CurrentDevice, &uid, sizeof(uid)); if(sc != noErr){ + WARN("Unable to change AQueue device: %lx\n", sc); CFRelease(uid); - return E_FAIL; + return osstatus_to_hresult(sc); } CFRelease(uid); @@ -1183,7 +1198,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, This->fmt = NULL; OSSpinLockUnlock(&This->lock); WARN("Couldn't allocate buffer: %lx\n", sc); - return E_FAIL; + return osstatus_to_hresult(sc); } buf->buf->mUserData = buf; @@ -1280,7 +1295,7 @@ static HRESULT ca_get_max_stream_latency(ACImpl *This, UInt32 *max) &size); if(sc != noErr){ WARN("Unable to get size for _Streams property: %lx\n", sc); - return E_FAIL; + return osstatus_to_hresult(sc); } ids = HeapAlloc(GetProcessHeap(), 0, size); @@ -1291,7 +1306,7 @@ static HRESULT ca_get_max_stream_latency(ACImpl *This, UInt32 *max) if(sc != noErr){ WARN("Unable to get _Streams property: %lx\n", sc); HeapFree(GetProcessHeap(), 0, ids); - return E_FAIL; + return osstatus_to_hresult(sc); } nstreams = size / sizeof(AudioStreamID); @@ -1349,7 +1364,7 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient *iface, if(sc != noErr){ WARN("Couldn't get _Latency property: %lx\n", sc); OSSpinLockUnlock(&This->lock); - return E_FAIL; + return osstatus_to_hresult(sc); } hr = ca_get_max_stream_latency(This, &stream_latency); @@ -1486,7 +1501,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, if(sc != noErr){ CoTaskMemFree(fmt); WARN("Unable to get size for _StreamConfiguration property: %lx\n", sc); - return E_FAIL; + return osstatus_to_hresult(sc); } buffers = HeapAlloc(GetProcessHeap(), 0, size); @@ -1501,7 +1516,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, CoTaskMemFree(fmt); HeapFree(GetProcessHeap(), 0, buffers); WARN("Unable to get _StreamConfiguration property: %lx\n", sc); - return E_FAIL; + return osstatus_to_hresult(sc); } fmt->Format.nChannels = 0; @@ -1518,7 +1533,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, if(sc != noErr){ CoTaskMemFree(fmt); WARN("Unable to get _NominalSampleRate property: %lx\n", sc); - return E_FAIL; + return osstatus_to_hresult(sc); } fmt->Format.nSamplesPerSec = rate; @@ -1609,7 +1624,7 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient *iface) if(sc != noErr){ OSSpinLockUnlock(&This->lock); WARN("Unable to start audio queue: %lx\n", sc); - return E_FAIL; + return osstatus_to_hresult(sc); } This->playing = StatePlaying; @@ -1672,7 +1687,7 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient *iface) if(sc != noErr){ OSSpinLockUnlock(&This->lock); WARN("Unable to pause audio queue: %lx\n", sc); - return E_FAIL; + return osstatus_to_hresult(sc); } This->playing = StateStopped; @@ -1724,7 +1739,7 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface) if(sc != noErr){ OSSpinLockUnlock(&This->lock); WARN("Unable to reset audio queue: %lx\n", sc); - return E_FAIL; + return osstatus_to_hresult(sc); } /* AQReset is synchronous */

1 0

← Newer
1
...
48
49
50
51
52
53
54
55
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 December 2012