April 2011 - Wine-commits - list.winehq.org

Dylan Smith : d3dx9: D3DXCreateMesh rejects declarations with non-zero streams.
by Alexandre Julliard 28 Apr '11

28 Apr '11

Module: wine Branch: master Commit: 96d5d06f2bbe39e189a183f22298ec6c0474ff35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96d5d06f2bbe39e189a183f22… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Apr 27 18:11:48 2011 -0400 d3dx9: D3DXCreateMesh rejects declarations with non-zero streams. --- dlls/d3dx9_36/mesh.c | 4 ++++ dlls/d3dx9_36/tests/mesh.c | 10 ++++++++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index abcdcc8..432db1d 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -1132,6 +1132,7 @@ HRESULT WINAPI D3DXCreateMesh(DWORD numfaces, DWORD numvertices, DWORD options, D3DFORMAT index_format = D3DFMT_INDEX16; DWORD vertex_usage = 0; D3DPOOL vertex_pool = D3DPOOL_DEFAULT; + int i; TRACE("(%d, %d, %x, %p, %p, %p)\n", numfaces, numvertices, options, declaration, device, mesh); @@ -1141,6 +1142,9 @@ HRESULT WINAPI D3DXCreateMesh(DWORD numfaces, DWORD numvertices, DWORD options, { return D3DERR_INVALIDCALL; } + for (i = 0; declaration[i].Stream != 0xff; i++) + if (declaration[i].Stream != 0) + return D3DERR_INVALIDCALL; if (options & D3DXMESH_32BIT) index_format = D3DFMT_INDEX32; diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index 570e186..88ac59c 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -1036,6 +1036,12 @@ static void D3DXCreateMeshTest(void) D3DDECL_END(), }; + static const D3DVERTEXELEMENT9 decl3[] = { + {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, + {1, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_NORMAL, 0}, + D3DDECL_END(), + }; + hr = D3DXCreateMesh(0, 0, 0, NULL, NULL, NULL); ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); @@ -1213,6 +1219,10 @@ static void D3DXCreateMeshTest(void) d3dxmesh->lpVtbl->Release(d3dxmesh); } + /* Test a declaration with multiple streams. */ + hr = D3DXCreateMesh(1, 3, D3DXMESH_MANAGED, decl3, device, &d3dxmesh); + ok(hr == D3DERR_INVALIDCALL, "Got result %x, expected %x (D3DERR_INVALIDCALL)\n", hr, D3DERR_INVALIDCALL); + IDirect3DDevice9_Release(device); IDirect3D9_Release(d3d); DestroyWindow(wnd);

1 0

Andrew Eikum : winealsa.drv: Properly allocate and free the WAVEFORMATEX returned by IsFormatSupported.
by Alexandre Julliard 27 Apr '11

27 Apr '11

Module: wine Branch: master Commit: fc4748ae74578644128ec6ca60d7fa573fd8cf38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc4748ae74578644128ec6ca6… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Apr 27 09:12:43 2011 -0500 winealsa.drv: Properly allocate and free the WAVEFORMATEX returned by IsFormatSupported. --- dlls/winealsa.drv/Makefile.in | 2 +- dlls/winealsa.drv/mmdevdrv.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winealsa.drv/Makefile.in b/dlls/winealsa.drv/Makefile.in index 541d360..7a74c36 100644 --- a/dlls/winealsa.drv/Makefile.in +++ b/dlls/winealsa.drv/Makefile.in @@ -1,5 +1,5 @@ MODULE = winealsa.drv -IMPORTS = dxguid uuid winmm user32 advapi32 +IMPORTS = dxguid uuid winmm ole32 user32 advapi32 EXTRALIBS = @ALSALIBS@ C_SRCS = \ diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index b73145c..f041d22 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -271,7 +271,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient *iface) snd_pcm_close(This->pcm_handle); HeapFree(GetProcessHeap(), 0, This->local_buffer); HeapFree(GetProcessHeap(), 0, This->hw_params); - HeapFree(GetProcessHeap(), 0, This->fmt); + CoTaskMemFree(This->fmt); HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -321,7 +321,7 @@ static WAVEFORMATEX *clone_format(const WAVEFORMATEX *fmt) else size = sizeof(WAVEFORMATEX); - ret = HeapAlloc(GetProcessHeap(), 0, size); + ret = CoTaskMemAlloc(size); if(!ret) return NULL; @@ -850,7 +850,7 @@ exit: HeapFree(GetProcessHeap(), 0, formats); if(hr == S_OK || !out){ - HeapFree(GetProcessHeap(), 0, closest); + CoTaskMemFree(closest); if(out) *out = NULL; }else if(closest){

1 0

Andrew Eikum : winealsa.drv: Add mapping for 64-bit floats in IAudioClient: :Initialize().
by Alexandre Julliard 27 Apr '11

27 Apr '11

Module: wine Branch: master Commit: e3ff943e9cf6fe3751b0916f75cce329874ebe9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3ff943e9cf6fe3751b0916f7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Apr 27 09:12:46 2011 -0500 winealsa.drv: Add mapping for 64-bit floats in IAudioClient::Initialize(). --- dlls/winealsa.drv/mmdevdrv.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index f041d22..8957457 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -408,12 +408,15 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, }else if(fmt->wFormatTag == WAVE_FORMAT_IEEE_FLOAT || (fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT))){ - if(fmt->wBitsPerSample != 32){ + if(fmt->wBitsPerSample == 32) + format = SND_PCM_FORMAT_FLOAT_LE; + else if(fmt->wBitsPerSample == 64) + format = SND_PCM_FORMAT_FLOAT64_LE; + else{ WARN("Unsupported float size: %u\n", fmt->wBitsPerSample); hr = AUDCLNT_E_UNSUPPORTED_FORMAT; goto exit; } - format = SND_PCM_FORMAT_FLOAT_LE; }else{ WARN("Unknown wave format: %04x\n", fmt->wFormatTag); hr = AUDCLNT_E_UNSUPPORTED_FORMAT;

1 0

Andrew Eikum : winecoreaudio.drv: Properly allocate and free the WAVEFORMATEX returned by IsFormatSupported.
by Alexandre Julliard 27 Apr '11

27 Apr '11

Module: wine Branch: master Commit: d4c0bedd95735168e4269ba726c3739449ae3a88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4c0bedd95735168e4269ba72… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Apr 27 09:12:48 2011 -0500 winecoreaudio.drv: Properly allocate and free the WAVEFORMATEX returned by IsFormatSupported. --- dlls/winecoreaudio.drv/mmdevdrv.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 216854a..10201e7 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -417,7 +417,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient *iface) if(This->aqueue) AudioQueueDispose(This->aqueue, 1); HeapFree(GetProcessHeap(), 0, This->public_buffer); - HeapFree(GetProcessHeap(), 0, This->fmt); + CoTaskMemFree(This->fmt); IMMDevice_Release(This->parent); HeapFree(GetProcessHeap(), 0, This); } @@ -498,7 +498,7 @@ static WAVEFORMATEX *clone_format(const WAVEFORMATEX *fmt) else size = sizeof(WAVEFORMATEX); - ret = HeapAlloc(GetProcessHeap(), 0, size); + ret = CoTaskMemAlloc(size); if(!ret) return NULL; @@ -700,6 +700,8 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, if(!buf){ AudioQueueDispose(This->aqueue, 1); This->aqueue = NULL; + CoTaskMemFree(This->fmt); + This->fmt = NULL; OSSpinLockUnlock(&This->lock); return E_OUTOFMEMORY; } @@ -708,6 +710,8 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, if(sc != noErr){ AudioQueueDispose(This->aqueue, 1); This->aqueue = NULL; + CoTaskMemFree(This->fmt); + This->fmt = NULL; OSSpinLockUnlock(&This->lock); WARN("Couldn't allocate buffer: %lx\n", sc); return E_FAIL;

1 0

Andrew Eikum : mmdevapi/tests: Add tests for IAudioClock.
by Alexandre Julliard 27 Apr '11

27 Apr '11

Module: wine Branch: master Commit: 29d6fbc3fe651bd166e7e7cb982101e7fe9ebb82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29d6fbc3fe651bd166e7e7cb9… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Apr 27 09:12:52 2011 -0500 mmdevapi/tests: Add tests for IAudioClock. --- dlls/mmdevapi/tests/render.c | 129 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 129 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index f8d06c0..7c8174b 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -476,6 +476,134 @@ static void test_padding(void) IAudioClient_Release(ac); } +static void test_clock(void) +{ + HRESULT hr; + IAudioClient *ac; + IAudioClock *acl; + IAudioRenderClient *arc; + UINT64 freq, pos, pcpos, last; + BYTE *data; + WAVEFORMATEX *pwfx; + + hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, + NULL, (void**)&ac); + ok(hr == S_OK, "Activation failed with %08x\n", hr); + if(hr != S_OK) + return; + + hr = IAudioClient_GetMixFormat(ac, &pwfx); + ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + if(hr != S_OK) + return; + + hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, + 0, 5000000, 0, pwfx, NULL); + ok(hr == S_OK, "Initialize failed: %08x\n", hr); + + hr = IAudioClient_GetService(ac, &IID_IAudioClock, (void**)&acl); + ok(hr == S_OK, "GetService(IAudioClock) failed: %08x\n", hr); + + hr = IAudioClock_GetFrequency(acl, &freq); + ok(hr == S_OK, "GetFrequency failed: %08x\n", hr); + + hr = IAudioClock_GetPosition(acl, NULL, NULL); + ok(hr == E_POINTER, "GetPosition wrong error: %08x\n", hr); + + pcpos = 0; + hr = IAudioClock_GetPosition(acl, &pos, &pcpos); + ok(hr == S_OK, "GetPosition failed: %08x\n", hr); + ok(pos == 0, "GetPosition returned non-zero pos before being started\n"); + ok(pcpos != 0, "GetPosition returned zero pcpos\n"); + last = pos; + + hr = IAudioClient_GetService(ac, &IID_IAudioRenderClient, (void**)&arc); + ok(hr == S_OK, "GetService(IAudioRenderClient) failed: %08x\n", hr); + + hr = IAudioRenderClient_GetBuffer(arc, pwfx->nSamplesPerSec / 2., &data); + ok(hr == S_OK, "GetBuffer failed: %08x\n", hr); + + hr = IAudioRenderClient_ReleaseBuffer(arc, pwfx->nSamplesPerSec / 2., AUDCLNT_BUFFERFLAGS_SILENT); + ok(hr == S_OK, "ReleaseBuffer failed: %08x\n", hr); + + hr = IAudioClock_GetPosition(acl, &pos, NULL); + ok(hr == S_OK, "GetPosition failed: %08x\n", hr); + ok(pos == 0, "GetPosition returned non-zero pos before being started\n"); + + hr = IAudioClient_Start(ac); + ok(hr == S_OK, "Start failed: %08x\n", hr); + + Sleep(100); + + hr = IAudioClock_GetPosition(acl, &pos, NULL); + ok(hr == S_OK, "GetPosition failed: %08x\n", hr); + ok(pos > 0, "Position should have been further along...\n"); + last = pos; + + hr = IAudioClient_Stop(ac); + ok(hr == S_OK, "Stop failed: %08x\n", hr); + + hr = IAudioClock_GetPosition(acl, &pos, NULL); + ok(hr == S_OK, "GetPosition failed: %08x\n", hr); + ok(pos >= last, "Position should have been further along...\n"); + last = pos; + + hr = IAudioClient_Start(ac); + ok(hr == S_OK, "Start failed: %08x\n", hr); + + Sleep(100); + + hr = IAudioClient_Stop(ac); + ok(hr == S_OK, "Stop failed: %08x\n", hr); + + hr = IAudioClock_GetPosition(acl, &pos, NULL); + ok(hr == S_OK, "GetPosition failed: %08x\n", hr); + ok(pos >= last, "Position should have been further along...\n"); + last = pos; + + hr = IAudioClock_GetPosition(acl, &pos, NULL); + ok(hr == S_OK, "GetPosition failed: %08x\n", hr); + ok(pos == last, "Position should have been further along...\n"); + + hr = IAudioClient_Reset(ac); + ok(hr == S_OK, "Reset failed: %08x\n", hr); + + hr = IAudioClock_GetPosition(acl, &pos, NULL); + ok(hr == S_OK, "GetPosition failed: %08x\n", hr); + ok(pos == 0, "GetPosition returned non-zero pos after Reset\n"); + last = pos; + + hr = IAudioRenderClient_GetBuffer(arc, pwfx->nSamplesPerSec / 2., &data); + ok(hr == S_OK, "GetBuffer failed: %08x\n", hr); + + hr = IAudioRenderClient_ReleaseBuffer(arc, pwfx->nSamplesPerSec / 2., AUDCLNT_BUFFERFLAGS_SILENT); + ok(hr == S_OK, "ReleaseBuffer failed: %08x\n", hr); + + hr = IAudioClock_GetPosition(acl, &pos, NULL); + ok(hr == S_OK, "GetPosition failed: %08x\n", hr); + ok(pos == 0, "GetPosition returned non-zero pos after Reset\n"); + last = pos; + + hr = IAudioClient_Start(ac); + ok(hr == S_OK, "Start failed: %08x\n", hr); + + Sleep(100); + + hr = IAudioClock_GetPosition(acl, &pos, NULL); + ok(hr == S_OK, "GetPosition failed: %08x\n", hr); + ok(pos > last, "Position should have been further along...\n"); + + hr = IAudioClient_Stop(ac); + ok(hr == S_OK, "Stop failed: %08x\n", hr); + + hr = IAudioClock_GetPosition(acl, &pos, NULL); + ok(hr == S_OK, "GetPosition failed: %08x\n", hr); + ok(pos >= last, "Position should have been further along...\n"); + + IAudioClock_Release(acl); + IAudioClient_Release(ac); +} + START_TEST(render) { HRESULT hr; @@ -504,6 +632,7 @@ START_TEST(render) test_references(); test_event(); test_padding(); + test_clock(); IMMDevice_Release(dev);

1 0

Marcus Meissner : advapi32: Mark some internal symbols as hidden.
by Alexandre Julliard 27 Apr '11

27 Apr '11

Module: wine Branch: master Commit: 7810e231a8b935632a2db4bcc0d863543c256aa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7810e231a8b935632a2db4bcc… Author: Marcus Meissner <meissner(a)suse.de> Date: Wed Apr 27 11:20:25 2011 +0200 advapi32: Mark some internal symbols as hidden. --- dlls/advapi32/advapi32_misc.h | 10 +++++----- dlls/advapi32/crypt.h | 4 ++-- dlls/advapi32/service.c | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/advapi32/advapi32_misc.h b/dlls/advapi32/advapi32_misc.h index 4d0a0e9..531a4f8 100644 --- a/dlls/advapi32/advapi32_misc.h +++ b/dlls/advapi32/advapi32_misc.h @@ -20,11 +20,11 @@ #ifndef __WINE_ADVAPI32MISC_H #define __WINE_ADVAPI32MISC_H -const char * debugstr_sid(PSID sid); -BOOL ADVAPI_IsLocalComputer(LPCWSTR ServerName); -BOOL ADVAPI_GetComputerSid(PSID sid); +const char * debugstr_sid(PSID sid) DECLSPEC_HIDDEN; +BOOL ADVAPI_IsLocalComputer(LPCWSTR ServerName) DECLSPEC_HIDDEN; +BOOL ADVAPI_GetComputerSid(PSID sid) DECLSPEC_HIDDEN; -BOOL lookup_local_wellknown_name(const LSA_UNICODE_STRING*, PSID, LPDWORD, LPWSTR, LPDWORD, PSID_NAME_USE, BOOL*); -BOOL lookup_local_user_name(const LSA_UNICODE_STRING*, PSID, LPDWORD, LPWSTR, LPDWORD, PSID_NAME_USE, BOOL*); +BOOL lookup_local_wellknown_name(const LSA_UNICODE_STRING*, PSID, LPDWORD, LPWSTR, LPDWORD, PSID_NAME_USE, BOOL*) DECLSPEC_HIDDEN; +BOOL lookup_local_user_name(const LSA_UNICODE_STRING*, PSID, LPDWORD, LPWSTR, LPDWORD, PSID_NAME_USE, BOOL*) DECLSPEC_HIDDEN; #endif /* __WINE_ADVAPI32MISC_H */ diff --git a/dlls/advapi32/crypt.h b/dlls/advapi32/crypt.h index 632e56f..9a199b5 100644 --- a/dlls/advapi32/crypt.h +++ b/dlls/advapi32/crypt.h @@ -87,9 +87,9 @@ typedef struct tagCRYPTHASH #define MAXPROVTYPES 999 extern unsigned char *CRYPT_DEShash( unsigned char *dst, const unsigned char *key, - const unsigned char *src ); + const unsigned char *src ) DECLSPEC_HIDDEN; extern unsigned char *CRYPT_DESunhash( unsigned char *dst, const unsigned char *key, - const unsigned char *src ); + const unsigned char *src ) DECLSPEC_HIDDEN; struct ustring { DWORD Length; diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 96b0848..2b37338 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -143,7 +143,7 @@ static inline DWORD multisz_cb(LPCWSTR wmultisz) * RPC connection with services.exe */ -handle_t __RPC_USER MACHINE_HANDLEW_bind(MACHINE_HANDLEW MachineName) +DECLSPEC_HIDDEN handle_t __RPC_USER MACHINE_HANDLEW_bind(MACHINE_HANDLEW MachineName) { WCHAR transport[] = SVCCTL_TRANSPORT; WCHAR endpoint[] = SVCCTL_ENDPOINT; @@ -170,7 +170,7 @@ handle_t __RPC_USER MACHINE_HANDLEW_bind(MACHINE_HANDLEW MachineName) return rpc_handle; } -void __RPC_USER MACHINE_HANDLEW_unbind(MACHINE_HANDLEW MachineName, handle_t h) +DECLSPEC_HIDDEN void __RPC_USER MACHINE_HANDLEW_unbind(MACHINE_HANDLEW MachineName, handle_t h) { RpcBindingFree(&h); }

1 0

Huw Davies : gdi32: Implement clipping of diagonal lines.
by Alexandre Julliard 27 Apr '11

27 Apr '11

Module: wine Branch: master Commit: e248615ae70bc95051e51d8ed0dadff0269fce8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e248615ae70bc95051e51d8ed… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 27 14:24:08 2011 +0100 gdi32: Implement clipping of diagonal lines. --- dlls/gdi32/dibdrv/objects.c | 344 ++++++++++++++++++++++++++++++++++++++----- dlls/gdi32/tests/dib.c | 24 +++- 2 files changed, 330 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e248615ae70bc95051e51…

1 0

Alexandre Julliard : configure: Add some quoting required by autoconf 2.68.
by Alexandre Julliard 27 Apr '11

27 Apr '11

Module: wine Branch: master Commit: 9797da40ecc785be9024b7ff8c2c8b9563b91f2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9797da40ecc785be9024b7ff8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 27 17:37:43 2011 +0200 configure: Add some quoting required by autoconf 2.68. --- aclocal.m4 | 6 +- configure | 851 ++++++++++++++++++++++++++++++---------------------------- configure.ac | 8 +- 3 files changed, 444 insertions(+), 421 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9797da40ecc785be9024b…

1 0

Andrew Eikum : wineoss.drv: Add mmdevapi driver.
by Alexandre Julliard 27 Apr '11

27 Apr '11

Module: wine Branch: master Commit: be332326ba8fc3def406c5f29adf04fbe9a83976 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be332326ba8fc3def406c5f29… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Apr 27 09:12:36 2011 -0500 wineoss.drv: Add mmdevapi driver. --- configure | 35 +- configure.ac | 26 +- dlls/wineoss.drv/Makefile.in | 5 +- dlls/wineoss.drv/audio.c | 1 - dlls/wineoss.drv/mmdevdrv.c | 1996 +++++++++++++++++++++++++++++++++++++ dlls/wineoss.drv/wineoss.drv.spec | 5 + include/config.h.in | 3 + 7 files changed, 2056 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=be332326ba8fc3def406c…

1 0

Andrew Eikum : winealsa.drv: Replace incorrect 41100 with 44100.
by Alexandre Julliard 27 Apr '11

27 Apr '11

Module: wine Branch: master Commit: 2692a68ce65bd07678a7bad6cce1247360b67533 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2692a68ce65bd07678a7bad6c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Apr 27 09:12:40 2011 -0500 winealsa.drv: Replace incorrect 41100 with 44100. --- dlls/winealsa.drv/mmdevdrv.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 056f9f0..b73145c 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -806,7 +806,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, if(fmt->nSamplesPerSec < min || fmt->nSamplesPerSec > max || (fmt->nSamplesPerSec != 48000 && - fmt->nSamplesPerSec != 41100 && + fmt->nSamplesPerSec != 44100 && fmt->nSamplesPerSec != 22050 && fmt->nSamplesPerSec != 11025 && fmt->nSamplesPerSec != 8000)){ @@ -949,8 +949,8 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, if(max_rate >= 48000) fmt->Format.nSamplesPerSec = 48000; - else if(max_rate >= 41100) - fmt->Format.nSamplesPerSec = 41100; + else if(max_rate >= 44100) + fmt->Format.nSamplesPerSec = 44100; else if(max_rate >= 22050) fmt->Format.nSamplesPerSec = 22050; else if(max_rate >= 11025)

1 0