wine-commits January 2015

wine-commits@winehq.org

2 participants
302 discussions

Jacek Caban : activscp.idl: Added SCRIPT_E_* error codes.
by Alexandre Julliard 13 Jan '15

13 Jan '15

Module: wine Branch: master Commit: 50608908ebb5e791692a9d112e55c42009e040b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50608908ebb5e791692a9d112… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 12 17:13:31 2015 +0100 activscp.idl: Added SCRIPT_E_* error codes. --- include/activscp.idl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/activscp.idl b/include/activscp.idl index c7fc2d2..8a3d75d 100644 --- a/include/activscp.idl +++ b/include/activscp.idl @@ -118,6 +118,10 @@ cpp_quote("#define SCRIPTSTAT_INSTRUCTION_COUNT 2") cpp_quote("#define SCRIPTSTAT_INTSTRUCTION_TIME 3") cpp_quote("#define SCRIPTSTAT_TOTAL_TIME 4") +cpp_quote("#define SCRIPT_E_RECORDED 0x86664004") +cpp_quote("#define SCRIPT_E_REPORTED 0x80020101") +cpp_quote("#define SCRIPT_E_PROPAGATE 0x80020102") + [ object, uuid(EAE1BA61-A4ED-11cf-8F20-00805F2CD064),

1 0

Michael Stefaniuc : wrc: Remove some more always-true conditions.
by Alexandre Julliard 13 Jan '15

13 Jan '15

Module: wine Branch: master Commit: 11bee58bdab1211ded89cbc80c705c6a2d60df3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=11bee58bdab1211ded89cbc80… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 12 12:09:38 2015 +0100 wrc: Remove some more always-true conditions. --- tools/wrc/translation.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/tools/wrc/translation.c b/tools/wrc/translation.c index 74f2017..b7caa07 100644 --- a/tools/wrc/translation.c +++ b/tools/wrc/translation.c @@ -614,18 +614,16 @@ static int compare_ver_value(ver_value_t *ver_value1, ver_value_t *ver_value2) { if((ver_value1->type == ver_value2->type)) { switch(ver_value1->type) { case val_str: - if(!different && ver_value1->key && ver_value2->key) + if(ver_value1->key && ver_value2->key) different = compare_string(ver_value1->key, ver_value2->key); - else if(!different && - ((ver_value1->key && !ver_value2->key) || + else if(((ver_value1->key && !ver_value2->key) || (!ver_value1->key && ver_value2->key))) different = 1; break; case val_words: - if(!different && ver_value1->key && ver_value2->key) + if(ver_value1->key && ver_value2->key) different = compare_string(ver_value1->key, ver_value2->key); - else if(!different && - ((ver_value1->key && !ver_value2->key) || + else if(((ver_value1->key && !ver_value2->key) || (!ver_value1->key && ver_value2->key))) different = 1; if(!different && ver_value1->value.words && ver_value2->value.words) { @@ -644,10 +642,9 @@ static int compare_ver_value(ver_value_t *ver_value1, ver_value_t *ver_value2) { different = 1; break; case val_block: - if(!different && ver_value1->value.block && ver_value2->value.block) + if(ver_value1->value.block && ver_value2->value.block) different = compare_ver_block(ver_value1->value.block, ver_value2->value.block); - else if(!different && - ((ver_value1->value.block && !ver_value2->value.block) || + else if(((ver_value1->value.block && !ver_value2->value.block) || (!ver_value1->value.block && ver_value2->value.block))) different = 1; break;

1 0

Michael Stefaniuc : wintab32: Remove an always TRUE conditional expression (PVS-Studio).
by Alexandre Julliard 13 Jan '15

13 Jan '15

Module: wine Branch: master Commit: 0e4c00a7065e854320d90b150ede2062a97c9979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e4c00a7065e854320d90b150… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 12 11:28:30 2015 +0100 wintab32: Remove an always TRUE conditional expression (PVS-Studio). --- dlls/wintab32/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index 9bc29a4..8db6217 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -410,7 +410,7 @@ static UINT WTInfoT(UINT wCategory, UINT nIndex, LPVOID lpOutput, BOOL bUnicode) pWTInfoW(wCategory, nIndex, &buf); /* Handle system extents here, as we can use user32.dll code to set them */ - if(wCategory == WTI_DEFSYSCTX && nIndex == 0) + if(wCategory == WTI_DEFSYSCTX) { buf.lcSysExtX = GetSystemMetrics(SM_CXSCREEN); buf.lcSysExtY = GetSystemMetrics(SM_CYSCREEN);

1 0

Michael Stefaniuc : winmm: Remove an unused variable (PVS-Studio).
by Alexandre Julliard 13 Jan '15

13 Jan '15

Module: wine Branch: master Commit: 36ab1878fa8aa601077f1e38877440db9451c3da URL: http://source.winehq.org/git/wine.git/?a=commit;h=36ab1878fa8aa601077f1e388… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 12 11:12:24 2015 +0100 winmm: Remove an unused variable (PVS-Studio). --- dlls/winmm/mci.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 10e2b40..a77514c 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -2054,14 +2054,13 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm */ static DWORD MCI_Break(UINT wDevID, DWORD dwFlags, LPMCI_BREAK_PARMS lpParms) { - DWORD dwRet = 0; - - if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; + if (lpParms == NULL) + return MCIERR_NULL_PARAMETER_BLOCK; FIXME("(%04x) vkey %04X stub\n", dwFlags, lpParms->nVirtKey); - if (MMSYSERR_NOERROR==dwRet && (dwFlags & MCI_NOTIFY)) + if (dwFlags & MCI_NOTIFY) mciDriverNotify((HWND)lpParms->dwCallback, wDevID, MCI_NOTIFY_SUCCESSFUL); - return dwRet; + return MMSYSERR_NOERROR; } /**************************************************************************

1 0

Michael Stefaniuc : strmbase: Remove an unused variable (PVS-Studio).
by Alexandre Julliard 13 Jan '15

13 Jan '15

Module: wine Branch: master Commit: 762eb676989e8af5bb7198c14d040d55e9e2ef4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=762eb676989e8af5bb7198c14… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 12 10:59:51 2015 +0100 strmbase: Remove an unused variable (PVS-Studio). --- dlls/strmbase/enumpins.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/strmbase/enumpins.c b/dlls/strmbase/enumpins.c index 6993bae..55fa7ec 100644 --- a/dlls/strmbase/enumpins.c +++ b/dlls/strmbase/enumpins.c @@ -125,7 +125,6 @@ static ULONG WINAPI IEnumPinsImpl_Release(IEnumPins * iface) static HRESULT WINAPI IEnumPinsImpl_Next(IEnumPins * iface, ULONG cPins, IPin ** ppPins, ULONG * pcFetched) { IEnumPinsImpl *This = impl_from_IEnumPins(iface); - HRESULT hr = S_OK; ULONG i = 0; TRACE("(%p)->(%u, %p, %p)\n", iface, cPins, ppPins, pcFetched); @@ -142,7 +141,7 @@ static HRESULT WINAPI IEnumPinsImpl_Next(IEnumPins * iface, ULONG cPins, IPin ** if (This->Version != This->receive_version(This->base)) return VFW_E_ENUM_OUT_OF_SYNC; - while (i < cPins && hr == S_OK) + while (i < cPins) { IPin *pin; pin = This->receive_pin(This->base, This->uIndex + i);

1 0

Axel Davy : d3d8/tests: Fix test_3dc_formats getPixelColor check.
by Alexandre Julliard 13 Jan '15

13 Jan '15

Module: wine Branch: master Commit: c5d420b35a53e282e670d027febd16209c2e4fad URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5d420b35a53e282e670d027f… Author: Axel Davy <axel.davy(a)ens.fr> Date: Sun Jan 11 11:29:14 2015 +0100 d3d8/tests: Fix test_3dc_formats getPixelColor check. --- dlls/d3d8/tests/visual.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 68c3319..e47e6a8 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -5197,8 +5197,6 @@ static void test_3dc_formats(void) hr = IDirect3DDevice8_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); - ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); for (i = 0; i < 4; ++i) { color = getPixelColor(device, expected_colors[i].position.x, expected_colors[i].position.y); @@ -5207,6 +5205,8 @@ static void test_3dc_formats(void) expected_colors[i].amd, expected_colors[i].nvidia, color, i); } + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); IDirect3DTexture8_Release(ati2n_texture); IDirect3DTexture8_Release(ati1n_texture); refcount = IDirect3DDevice8_Release(device);

1 0

Axel Davy : d3d8/tests: Fix volume_dxt5_test getPixelColor check.
by Alexandre Julliard 13 Jan '15

13 Jan '15

Module: wine Branch: master Commit: 58083dfb12655ee0e23fc0d2cc248db1d647f220 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58083dfb12655ee0e23fc0d2c… Author: Axel Davy <axel.davy(a)ens.fr> Date: Sun Jan 11 11:29:13 2015 +0100 d3d8/tests: Fix volume_dxt5_test getPixelColor check. getPixelColor should be called before Present, because the device swapchain was created with discard mode. --- dlls/d3d8/tests/visual.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index a8a771e..68c3319 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -4507,8 +4507,6 @@ static void volume_dxt5_test(void) hr = IDirect3DDevice8_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); - ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); for (i = 0; i < 4; i++) { color = getPixelColor(device, 80 + 160 * i, 240); @@ -4516,6 +4514,8 @@ static void volume_dxt5_test(void) "Expected color 0x%08x, got 0x%08x, case %u.\n", expected_colors[i], color, i); } + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); IDirect3DVolumeTexture8_Release(texture); refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Nikolay Sivov : user32: Handle NULL argument in GetKeyboardLayoutNameW().
by Alexandre Julliard 13 Jan '15

13 Jan '15

Module: wine Branch: master Commit: 151694a0bce3160387f6d8c54ebaa2b726dbd4c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=151694a0bce3160387f6d8c54… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 12 01:24:20 2015 +0300 user32: Handle NULL argument in GetKeyboardLayoutNameW(). --- dlls/user32/input.c | 5 +++++ dlls/user32/tests/input.c | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index ec81e60..1f05f34 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -966,6 +966,11 @@ BOOL WINAPI GetKeyboardLayoutNameA(LPSTR pszKLID) */ BOOL WINAPI GetKeyboardLayoutNameW(LPWSTR pwszKLID) { + if (!pwszKLID) + { + SetLastError(ERROR_NOACCESS); + return FALSE; + } return USER_Driver->pGetKeyboardLayoutName(pwszKLID); } diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 39afeb7..76d0821 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1595,6 +1595,14 @@ static void test_keyboard_layout_name(void) BOOL ret; char klid[KL_NAMELENGTH]; +if (0) /* crashes on native system */ + ret = GetKeyboardLayoutNameA(NULL); + + SetLastError(0xdeadbeef); + ret = GetKeyboardLayoutNameW(NULL); + ok(!ret, "got %d\n", ret); + ok(GetLastError() == ERROR_NOACCESS, "got %d\n", GetLastError()); + if (GetKeyboardLayout(0) != (HKL)(ULONG_PTR)0x04090409) return; klid[0] = 0;

1 0

Bruno Jesus : ws2_32: Ensure recv functions set last error to zero when they succeed.
by Alexandre Julliard 13 Jan '15

13 Jan '15

Module: wine Branch: master Commit: ab1eee505bebe93a7d35254a967d2831d1ff4761 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab1eee505bebe93a7d35254a9… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Jan 11 20:20:28 2015 -0200 ws2_32: Ensure recv functions set last error to zero when they succeed. --- dlls/ws2_32/socket.c | 1 + dlls/ws2_32/tests/sock.c | 8 -------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e1b2a05..b4dcd76 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6776,6 +6776,7 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, if (wsa != &localwsa) HeapFree( GetProcessHeap(), 0, wsa ); release_sock_fd( s, fd ); _enable_event(SOCKET2HANDLE(s), FD_READ, 0, 0); + SetLastError(ERROR_SUCCESS); return 0; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index ce47712..78ae609 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5136,14 +5136,12 @@ static void test_events(int useMessages) SetLastError(0xdeadbeef); ret = recv(src, buffer, 1, MSG_PEEK); ok(ret == 1, "Failed to peek at recv buffer %d err %d\n", ret, GetLastError()); -todo_wine ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); ok_event_seq(src, hEvent, read_seq, NULL, 0); SetLastError(0xdeadbeef); ret = recv(src, buffer, 50, 0); ok(ret == 50, "Failed to recv buffer %d err %d\n", ret, GetLastError()); -todo_wine ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); ok_event_seq(src, hEvent, read_seq, NULL, 0); @@ -5171,7 +5169,6 @@ todo_wine SetLastError(0xdeadbeef); ret = recv(src, buffer, 1, 0); ok(ret == 1, "Failed to recv buffer %d err %d\n", ret, GetLastError()); -todo_wine ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); ok_event_seq(src, hEvent, empty_seq, NULL, 0); @@ -5603,7 +5600,6 @@ static void test_WSASendMsg(void) ret = recvfrom(dst, buffer, sizeof(buffer), 0, (struct sockaddr *) &sockaddr, &addrlen); ok(ret == bytesSent, "got %d, expected %d\n", ret, bytesSent); -todo_wine ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); /* A successful call to WSASendMsg must have bound the socket */ @@ -5634,7 +5630,6 @@ todo_wine ret = recvfrom(dst, buffer, sizeof(buffer), 0, (struct sockaddr *) &sockaddr, &addrlen); ok(ret == bytesSent, "got %d, expected %d\n", ret, bytesSent); -todo_wine ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); closesocket(sock); @@ -5770,14 +5765,12 @@ static void test_WSARecv(void) iret = WSARecv(dest, &bufs, 1, &bytesReturned, &flags, NULL, NULL); ok(!iret, "Expected 0, got %d\n", iret); ok(bytesReturned, "Expected 2, got %d\n", bytesReturned); -todo_wine ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); SetLastError(0xdeadbeef); bytesReturned = 0xdeadbeef; iret = WSARecv(dest, &bufs, 1, &bytesReturned, &flags, NULL, NULL); ok(!iret, "Expected 0, got %d\n", iret); ok(bytesReturned, "Expected 2, got %d\n", bytesReturned); -todo_wine ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); bufs.len = 4; @@ -5790,7 +5783,6 @@ todo_wine iret = WSARecv(dest, &bufs, 1, &bytesReturned, &flags, NULL, NULL); ok(!iret, "Expected 0, got %d\n", iret); ok(bytesReturned, "Expected 4, got %d\n", bytesReturned); -todo_wine ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); bufs.len = sizeof(buf);

1 0

Mark Harmstone : dsound: Pretend we have hardware buffers.
by Alexandre Julliard 13 Jan '15

13 Jan '15

Module: wine Branch: master Commit: d4d14cdef0adf150143173f1dd7f9b9f42aaa81d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4d14cdef0adf150143173f1d… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sun Jan 11 21:42:44 2015 +0000 dsound: Pretend we have hardware buffers. When running in Windows XP mode, XAudio2 will refuse to output surround sound unless it can open a buffer with DSBCAPS_LOCHARDWARE. --- dlls/dsound/buffer.c | 3 +++ dlls/dsound/dsound.c | 32 +++++++++++++++++++++++--------- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 36ec132..b1eb9a3 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -994,6 +994,9 @@ void secondarybuffer_destroy(IDirectSoundBufferImpl *This) if (ref > 1) WARN("Destroying buffer with %u in use interfaces\n", ref - 1); + if (This->dsbd.dwFlags & DSBCAPS_LOCHARDWARE) + This->device->drvcaps.dwFreeHwMixingAllBuffers++; + DirectSoundDevice_RemoveBuffer(This->device, This); RtlDeleteResource(&This->lock); diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 8df778a..ab050b5 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -271,8 +271,15 @@ static HRESULT WINAPI IDirectSound8Impl_GetCaps(IDirectSound8 *iface, DSCAPS *ds dscaps->dwMaxHwMixingStaticBuffers = This->device->drvcaps.dwMaxHwMixingStaticBuffers; dscaps->dwMaxHwMixingStreamingBuffers = This->device->drvcaps.dwMaxHwMixingStreamingBuffers; dscaps->dwFreeHwMixingAllBuffers = This->device->drvcaps.dwFreeHwMixingAllBuffers; - dscaps->dwFreeHwMixingStaticBuffers = This->device->drvcaps.dwFreeHwMixingStaticBuffers; - dscaps->dwFreeHwMixingStreamingBuffers = This->device->drvcaps.dwFreeHwMixingStreamingBuffers; + + if (This->device->drvcaps.dwFreeHwMixingAllBuffers > 0) { + dscaps->dwFreeHwMixingStaticBuffers = This->device->drvcaps.dwFreeHwMixingStaticBuffers; + dscaps->dwFreeHwMixingStreamingBuffers = This->device->drvcaps.dwFreeHwMixingStreamingBuffers; + } else { + dscaps->dwFreeHwMixingStaticBuffers = 0; + dscaps->dwFreeHwMixingStreamingBuffers = 0; + } + dscaps->dwMaxHw3DAllBuffers = This->device->drvcaps.dwMaxHw3DAllBuffers; dscaps->dwMaxHw3DStaticBuffers = This->device->drvcaps.dwMaxHw3DStaticBuffers; dscaps->dwMaxHw3DStreamingBuffers = This->device->drvcaps.dwMaxHw3DStreamingBuffers; @@ -913,9 +920,12 @@ HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGUID lpcG device->drvcaps.dwPrimaryBuffers = 1; device->drvcaps.dwMinSecondarySampleRate = DSBFREQUENCY_MIN; device->drvcaps.dwMaxSecondarySampleRate = DSBFREQUENCY_MAX; - device->drvcaps.dwMaxHwMixingAllBuffers = 1; + device->drvcaps.dwMaxHwMixingAllBuffers = 16; device->drvcaps.dwMaxHwMixingStaticBuffers = 1; device->drvcaps.dwMaxHwMixingStreamingBuffers = 1; + device->drvcaps.dwFreeHwMixingAllBuffers = device->drvcaps.dwMaxHwMixingAllBuffers; + device->drvcaps.dwFreeHwMixingStaticBuffers = device->drvcaps.dwMaxHwMixingStaticBuffers; + device->drvcaps.dwFreeHwMixingStreamingBuffers = device->drvcaps.dwMaxHwMixingStreamingBuffers; ZeroMemory(&device->volpan, sizeof(device->volpan)); @@ -975,10 +985,12 @@ HRESULT DirectSoundDevice_CreateSoundBuffer( TRACE("(lpwfxFormat=%p)\n",dsbd->lpwfxFormat); } - if (dsbd->dwFlags & DSBCAPS_LOCHARDWARE && - !(dsbd->dwFlags & DSBCAPS_PRIMARYBUFFER)) { - TRACE("LOCHARDWARE is not supported, returning E_NOTIMPL\n"); - return E_NOTIMPL; + if (!(dsbd->dwFlags & DSBCAPS_PRIMARYBUFFER) && + dsbd->dwFlags & DSBCAPS_LOCHARDWARE && + device->drvcaps.dwFreeHwMixingAllBuffers == 0) + { + WARN("ran out of emulated hardware buffers\n"); + return DSERR_ALLOCATED; } if (dsbd->dwFlags & DSBCAPS_PRIMARYBUFFER) { @@ -1062,9 +1074,11 @@ HRESULT DirectSoundDevice_CreateSoundBuffer( } hres = IDirectSoundBufferImpl_Create(device, &dsb, dsbd); - if (dsb) + if (dsb) { *ppdsb = (IDirectSoundBuffer*)&dsb->IDirectSoundBuffer8_iface; - else + if (dsbd->dwFlags & DSBCAPS_LOCHARDWARE) + device->drvcaps.dwFreeHwMixingAllBuffers--; + } else WARN("IDirectSoundBufferImpl_Create failed\n"); }

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
31
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 January 2015