January 2015 - Wine-commits

Piotr Caban : msvcrt: Drop read buffer in _flsbuf.
by Alexandre Julliard 21 Jan '15

21 Jan '15

Module: wine Branch: master Commit: ba0d1586ff53221e449f2ed885a059232dd4bea8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba0d1586ff53221e449f2ed88… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 21 16:20:48 2015 +0100 msvcrt: Drop read buffer in _flsbuf. --- dlls/msvcrt/file.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index ff1f5d6..8c59239 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3781,12 +3781,24 @@ int CDECL MSVCRT__flsbuf(int c, MSVCRT_FILE* file) if(!(file->_flag & (MSVCRT__IONBF | MSVCRT__IOMYBUF | MSVCRT__USERBUF))) { msvcrt_alloc_buffer(file); } + if(!(file->_flag & MSVCRT__IOWRT)) { - if(file->_flag & MSVCRT__IORW) - file->_flag |= MSVCRT__IOWRT; - else + if(!(file->_flag & MSVCRT__IORW)) { + file->_flag |= MSVCRT__IOERR; + return MSVCRT_EOF; + } + file->_flag |= MSVCRT__IOWRT; + } + if(file->_flag & MSVCRT__IOREAD) { + if(!(file->_flag & MSVCRT__IOEOF)) { + file->_flag |= MSVCRT__IOERR; return MSVCRT_EOF; + } + file->_cnt = 0; + file->_ptr = file->_base; + file->_flag &= ~(MSVCRT__IOREAD | MSVCRT__IOEOF); } + if(file->_flag & (MSVCRT__IOMYBUF | MSVCRT__USERBUF)) { int res = 0;

1 0

André Hentschel : kernel32/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard 21 Jan '15

21 Jan '15

Module: wine Branch: master Commit: ae1251596e95de283bcf53e7c0199ce9a4b772bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae1251596e95de283bcf53e7c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 20 23:56:41 2015 +0100 kernel32/tests: Don't test function directly when reporting GetLastError(). --- dlls/kernel32/tests/pipe.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 056f95b..3570676 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -89,7 +89,7 @@ static BOOL RpcReadFile(HANDLE hFile, LPVOID buffer, DWORD bytesToRead, LPDWORD { struct rpcThreadArgs rpcargs; HANDLE thread; - DWORD threadId; + DWORD threadId, ret; rpcargs.returnValue = 0; rpcargs.lastError = GetLastError(); @@ -102,7 +102,8 @@ static BOOL RpcReadFile(HANDLE hFile, LPVOID buffer, DWORD bytesToRead, LPDWORD thread = CreateThread(NULL, 0, rpcThreadMain, (void *)&rpcargs, 0, &threadId); ok(thread != NULL, "CreateThread failed. %d\n", GetLastError()); - ok(WaitForSingleObject(thread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed with %d.\n", GetLastError()); + ret = WaitForSingleObject(thread, INFINITE); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject failed with %d.\n", GetLastError()); CloseHandle(thread); SetLastError(rpcargs.lastError);

1 0

André Hentschel : user32/tests: Don' t test function directly when reporting GetLastError().
by Alexandre Julliard 21 Jan '15

21 Jan '15

Module: wine Branch: master Commit: 0b811eeabf0a02cde3a1200f5af5f3c0f4d00a08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b811eeabf0a02cde3a1200f5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jan 20 23:56:46 2015 +0100 user32/tests: Don't test function directly when reporting GetLastError(). --- dlls/user32/tests/msg.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index b243a74..66f054a 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -4533,6 +4533,7 @@ static void test_messages(void) MSG msg; LRESULT res; POINT pos; + BOOL ret; flush_sequence(); @@ -4819,7 +4820,8 @@ static void test_messages(void) flush_events(); flush_sequence(); - ok(DrawMenuBar(hwnd), "DrawMenuBar failed: %d\n", GetLastError()); + ret = DrawMenuBar(hwnd); + ok(ret, "DrawMenuBar failed: %d\n", GetLastError()); flush_events(); ok_sequence(WmDrawMenuBarSeq, "DrawMenuBar", FALSE); ok(SetCursorPos(pos.x, pos.y), "SetCursorPos failed\n"); @@ -4831,7 +4833,8 @@ static void test_messages(void) ok(hwnd != 0, "Failed to create custom dialog window\n"); flush_events(); flush_sequence(); - ok(DrawMenuBar(hwnd), "DrawMenuBar failed: %d\n", GetLastError()); + ret = DrawMenuBar(hwnd); + ok(ret, "DrawMenuBar failed: %d\n", GetLastError()); flush_events(); ok_sequence(WmEmptySeq, "DrawMenuBar for a child window", FALSE);

1 0

Jacek Caban : winegecko.php: Added Wine Gecko 2.36-beta1 release.
by Alexandre Julliard 21 Jan '15

21 Jan '15

Module: tools Branch: master Commit: 72c348695b85eab57eb35eaaea5eadacb2b5195b URL: http://source.winehq.org/git/tools.git/?a=commit;h=72c348695b85eab57eb35eaa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 21 15:55:20 2015 +0100 winegecko.php: Added Wine Gecko 2.36-beta1 release. --- winegecko.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/winegecko.php b/winegecko.php index eaa1f22..b2135a6 100644 --- a/winegecko.php +++ b/winegecko.php @@ -84,7 +84,9 @@ $aFileSizes = array( '2.34-beta2-x86'=>28270080, '2.34-beta2-x86_64'=>29807616, '2.34-x86'=>28269568, - '2.34-x86_64'=>29802496 + '2.34-x86_64'=>29802496, + '2.36-beta1-x86'=>29698560, + '2.36-beta1-x86_64'=>31211008 ); // Exact size of the file:

1 0

Ken Thomases : winemac: Fix conversion of empty RECT to an empty CGRect.
by Alexandre Julliard 20 Jan '15

20 Jan '15

Module: wine Branch: master Commit: 50cd5b6a578a1427a501ef082017aebb66f132e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50cd5b6a578a1427a501ef082… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jan 19 13:11:15 2015 -0600 winemac: Fix conversion of empty RECT to an empty CGRect. For some empty RECTs, such as { INT_MAX, INT_MAX, INT_MIN, INT_MIN }, right minus left or bottom minus top underflow and wrap around to positive values. --- dlls/winemac.drv/macdrv.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 56ca24f..cf0fc64 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -47,7 +47,9 @@ extern const char* debugstr_cf(CFTypeRef t) DECLSPEC_HIDDEN; static inline CGRect cgrect_from_rect(RECT rect) { - return CGRectMake(rect.left, rect.top, max(0, rect.right - rect.left), max(0, rect.bottom - rect.top)); + if (rect.left >= rect.right || rect.top >= rect.bottom) + return CGRectMake(rect.left, rect.top, 0, 0); + return CGRectMake(rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top); } static inline RECT rect_from_cgrect(CGRect cgrect)

1 0

Michael Stefaniuc : oleaut32/tests: Uncomment and fix a test (PVS-Studio).
by Alexandre Julliard 20 Jan '15

20 Jan '15

Module: wine Branch: master Commit: 9bfd58a5c97d471d6453c64bb492974313280d5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bfd58a5c97d471d6453c64bb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 20 00:15:56 2015 +0100 oleaut32/tests: Uncomment and fix a test (PVS-Studio). --- dlls/oleaut32/tests/vartest.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index d15adcb..118aa75 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1383,11 +1383,13 @@ static void test_VarParseNumFromStr(void) /* VB oct char bigger than 7 */ CONVERT("&o128", NUMPRS_HEX_OCT); -/* - Native versions 2.x of oleaut32 allow this to succeed: later versions and Wine don't - EXPECTFAIL; - EXPECTRGB(0,FAILDIG); -*/ + todo_wine { + EXPECT(2,NUMPRS_HEX_OCT,0x40,4,3,0); + EXPECTRGB(0,1); + EXPECTRGB(1,2); + } + EXPECTRGB(3,FAILDIG); + /** NUMPRS_PARENS **/ /* Empty parens = error */

1 0

Michael Stefaniuc : oleaut32: Just stop instead of erroring out on 8 or 9 in octal numbers.
by Alexandre Julliard 20 Jan '15

20 Jan '15

Module: wine Branch: master Commit: 512a814efc3c6f84086ea4eb6b405f374f6753d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=512a814efc3c6f84086ea4eb6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 20 00:21:50 2015 +0100 oleaut32: Just stop instead of erroring out on 8 or 9 in octal numbers. --- dlls/oleaut32/tests/vartest.c | 2 -- dlls/oleaut32/variant.c | 5 ++--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 118aa75..7ed4fd4 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1383,11 +1383,9 @@ static void test_VarParseNumFromStr(void) /* VB oct char bigger than 7 */ CONVERT("&o128", NUMPRS_HEX_OCT); - todo_wine { EXPECT(2,NUMPRS_HEX_OCT,0x40,4,3,0); EXPECTRGB(0,1); EXPECTRGB(1,2); - } EXPECTRGB(3,FAILDIG); /** NUMPRS_PARENS **/ diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 5a28acc..feba6c5 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1736,9 +1736,8 @@ HRESULT WINAPI VarParseNumFromStr(OLECHAR *lpszStr, LCID lcid, ULONG dwFlags, } else { - if ((dwState & B_PROCESSING_OCT) && ((*lpszStr == '8') || (*lpszStr == '9'))) { - return DISP_E_TYPEMISMATCH; - } + if ((dwState & B_PROCESSING_OCT) && ((*lpszStr == '8') || (*lpszStr == '9'))) + break; if (pNumprs->dwOutFlags & NUMPRS_DECIMAL) pNumprs->nPwr10--; /* Count decimal points in nPwr10 */

1 0

Bruno Jesus : ws2_32: getaddrinfo must SetLastError on success or failure.
by Alexandre Julliard 20 Jan '15

20 Jan '15

Module: wine Branch: master Commit: 038399fcdd2f5601cdc59113d810409e08374b73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=038399fcdd2f5601cdc59113d… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Jan 19 21:23:36 2015 -0200 ws2_32: getaddrinfo must SetLastError on success or failure. --- dlls/ws2_32/socket.c | 7 ++++++- dlls/ws2_32/tests/sock.c | 21 +++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 0bc9d16..faf2ec1 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5628,7 +5628,11 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr const char *node; *res = NULL; - if (!nodename && !servname) return WSAHOST_NOT_FOUND; + if (!nodename && !servname) + { + SetLastError(WSAHOST_NOT_FOUND); + return WSAHOST_NOT_FOUND; + } if (!nodename) node = NULL; @@ -5749,6 +5753,7 @@ int WINAPI WS_getaddrinfo(LPCSTR nodename, LPCSTR servname, const struct WS_addr } else result = convert_eai_u2w(result); + SetLastError(result); return result; outofmem: diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 78ae609..7288b5c 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5880,14 +5880,18 @@ static void test_GetAddrInfoW(void) memset(&hint, 0, sizeof(ADDRINFOW)); result = (ADDRINFOW *)0xdeadbeef; + WSASetLastError(0xdeadbeef); ret = pGetAddrInfoW(NULL, NULL, NULL, &result); ok(ret == WSAHOST_NOT_FOUND, "got %d expected WSAHOST_NOT_FOUND\n", ret); + ok(WSAGetLastError() == WSAHOST_NOT_FOUND, "expected 11001, got %d\n", WSAGetLastError()); ok(result == NULL, "got %p\n", result); result = NULL; + WSASetLastError(0xdeadbeef); ret = pGetAddrInfoW(empty, NULL, NULL, &result); ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); ok(result != NULL, "GetAddrInfoW failed\n"); + ok(WSAGetLastError() == 0, "expected 0, got %d\n", WSAGetLastError()); pFreeAddrInfoW(result); result = NULL; @@ -5906,6 +5910,7 @@ static void test_GetAddrInfoW(void) result = NULL; ret = pGetAddrInfoW(empty, zero, NULL, &result); ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); + ok(WSAGetLastError() == 0, "expected 0, got %d\n", WSAGetLastError()); ok(result != NULL, "GetAddrInfoW failed\n"); result2 = NULL; @@ -5942,11 +5947,14 @@ static void test_GetAddrInfoW(void) pFreeAddrInfoW(result); result = NULL; + SetLastError(0xdeadbeef); ret = pGetAddrInfoW(localhost, port, &hint, &result); ok(!ret, "GetAddrInfoW failed with %d\n", WSAGetLastError()); + ok(WSAGetLastError() == 0, "expected 0, got %d\n", WSAGetLastError()); pFreeAddrInfoW(result); result = (ADDRINFOW *)0xdeadbeef; + WSASetLastError(0xdeadbeef); ret = pGetAddrInfoW(NULL, NULL, NULL, &result); if(ret == 0) { @@ -5954,9 +5962,11 @@ static void test_GetAddrInfoW(void) return; } ok(ret == WSAHOST_NOT_FOUND, "got %d expected WSAHOST_NOT_FOUND\n", ret); + ok(WSAGetLastError() == WSAHOST_NOT_FOUND, "expected 11001, got %d\n", WSAGetLastError()); ok(result == NULL, "got %p\n", result); result = (ADDRINFOW *)0xdeadbeef; + WSASetLastError(0xdeadbeef); ret = pGetAddrInfoW(nxdomain, NULL, NULL, &result); if(ret == 0) { @@ -5964,6 +5974,7 @@ static void test_GetAddrInfoW(void) return; } ok(ret == WSAHOST_NOT_FOUND, "got %d expected WSAHOST_NOT_FOUND\n", ret); + ok(WSAGetLastError() == WSAHOST_NOT_FOUND, "expected 11001, got %d\n", WSAGetLastError()); ok(result == NULL, "got %p\n", result); for (i = 0;i < (sizeof(hinttests) / sizeof(hinttests[0]));i++) @@ -6031,14 +6042,18 @@ static void test_getaddrinfo(void) memset(&hint, 0, sizeof(ADDRINFOA)); result = (ADDRINFOA *)0xdeadbeef; + WSASetLastError(0xdeadbeef); ret = pgetaddrinfo(NULL, NULL, NULL, &result); ok(ret == WSAHOST_NOT_FOUND, "got %d expected WSAHOST_NOT_FOUND\n", ret); + ok(WSAGetLastError() == WSAHOST_NOT_FOUND, "expected 11001, got %d\n", WSAGetLastError()); ok(result == NULL, "got %p\n", result); result = NULL; + WSASetLastError(0xdeadbeef); ret = pgetaddrinfo("", NULL, NULL, &result); ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); ok(result != NULL, "getaddrinfo failed\n"); + ok(WSAGetLastError() == 0, "expected 0, got %d\n", WSAGetLastError()); pfreeaddrinfo(result); result = NULL; @@ -6055,8 +6070,10 @@ static void test_getaddrinfo(void) pfreeaddrinfo(result2); result = NULL; + WSASetLastError(0xdeadbeef); ret = pgetaddrinfo("", "0", NULL, &result); ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + ok(WSAGetLastError() == 0, "expected 0, got %d\n", WSAGetLastError()); ok(result != NULL, "getaddrinfo failed\n"); result2 = NULL; @@ -6093,11 +6110,14 @@ static void test_getaddrinfo(void) pfreeaddrinfo(result); result = NULL; + WSASetLastError(0xdeadbeef); ret = pgetaddrinfo("localhost", "80", &hint, &result); ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + ok(WSAGetLastError() == 0, "expected 0, got %d\n", WSAGetLastError()); pfreeaddrinfo(result); result = (ADDRINFOA *)0xdeadbeef; + WSASetLastError(0xdeadbeef); ret = pgetaddrinfo("nxdomain.codeweavers.com", NULL, NULL, &result); if(ret == 0) { @@ -6105,6 +6125,7 @@ static void test_getaddrinfo(void) return; } ok(ret == WSAHOST_NOT_FOUND, "got %d expected WSAHOST_NOT_FOUND\n", ret); + ok(WSAGetLastError() == WSAHOST_NOT_FOUND, "expected 11001, got %d\n", WSAGetLastError()); ok(result == NULL, "got %p\n", result); for (i = 0;i < (sizeof(hinttests) / sizeof(hinttests[0]));i++)

1 0

Francois Gouget : dsound: Make DSOUND_FindSpeakerConfig() static.
by Alexandre Julliard 20 Jan '15

20 Jan '15

Module: wine Branch: master Commit: 82c298ee6ed0199e15be26e8c7c31d8ef9137d91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82c298ee6ed0199e15be26e8c… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 20 03:25:49 2015 +0100 dsound: Make DSOUND_FindSpeakerConfig() static. --- dlls/dsound/dsound_private.h | 1 - dlls/dsound/primary.c | 98 ++++++++++++++++++++++---------------------- 2 files changed, 49 insertions(+), 50 deletions(-) diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 52b2847..af2034a 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -219,7 +219,6 @@ HRESULT DSOUND_PrimaryGetPosition(DirectSoundDevice *device, LPDWORD playpos, LP LPWAVEFORMATEX DSOUND_CopyFormat(LPCWAVEFORMATEX wfex) DECLSPEC_HIDDEN; HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) DECLSPEC_HIDDEN; HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device) DECLSPEC_HIDDEN; -DWORD DSOUND_FindSpeakerConfig(IMMDevice *mmdevice, int channels) DECLSPEC_HIDDEN; HRESULT primarybuffer_create(DirectSoundDevice *device, IDirectSoundBufferImpl **ppdsb, const DSBUFFERDESC *dsbd) DECLSPEC_HIDDEN; void primarybuffer_destroy(IDirectSoundBufferImpl *This) DECLSPEC_HIDDEN; diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 7d05efd..52d00f9 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -79,6 +79,55 @@ static DWORD speaker_config_to_channel_mask(DWORD speaker_config) return SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT; } +static DWORD DSOUND_FindSpeakerConfig(IMMDevice *mmdevice, int channels) +{ + IPropertyStore *store; + HRESULT hr; + PROPVARIANT pv; + ULONG phys_speakers; + + const DWORD def = DSSPEAKER_COMBINED(DSSPEAKER_STEREO, DSSPEAKER_GEOMETRY_WIDE); + + hr = IMMDevice_OpenPropertyStore(mmdevice, STGM_READ, &store); + if (FAILED(hr)) { + WARN("IMMDevice_OpenPropertyStore failed: %08x\n", hr); + return def; + } + + hr = IPropertyStore_GetValue(store, &PKEY_AudioEndpoint_PhysicalSpeakers, &pv); + + if (FAILED(hr)) { + WARN("IPropertyStore_GetValue failed: %08x\n", hr); + IPropertyStore_Release(store); + return def; + } + + if (pv.vt != VT_UI4) { + WARN("PKEY_AudioEndpoint_PhysicalSpeakers is not a ULONG: 0x%x\n", pv.vt); + PropVariantClear(&pv); + IPropertyStore_Release(store); + return def; + } + + phys_speakers = pv.u.ulVal; + + PropVariantClear(&pv); + IPropertyStore_Release(store); + + if ((channels >= 6 || channels == 0) && (phys_speakers & KSAUDIO_SPEAKER_5POINT1) == KSAUDIO_SPEAKER_5POINT1) + return DSSPEAKER_5POINT1_BACK; + else if ((channels >= 6 || channels == 0) && (phys_speakers & KSAUDIO_SPEAKER_5POINT1_SURROUND) == KSAUDIO_SPEAKER_5POINT1_SURROUND) + return DSSPEAKER_5POINT1_SURROUND; + else if ((channels >= 4 || channels == 0) && (phys_speakers & KSAUDIO_SPEAKER_QUAD) == KSAUDIO_SPEAKER_QUAD) + return DSSPEAKER_QUAD; + else if ((channels >= 2 || channels == 0) && (phys_speakers & KSAUDIO_SPEAKER_STEREO) == KSAUDIO_SPEAKER_STEREO) + return DSSPEAKER_COMBINED(DSSPEAKER_STEREO, DSSPEAKER_GEOMETRY_WIDE); + else if ((phys_speakers & KSAUDIO_SPEAKER_MONO) == KSAUDIO_SPEAKER_MONO) + return DSSPEAKER_MONO; + + return def; +} + static HRESULT DSOUND_WaveFormat(DirectSoundDevice *device, IAudioClient *client, BOOL forcewave, WAVEFORMATEX **wfx) { @@ -166,55 +215,6 @@ static HRESULT DSOUND_WaveFormat(DirectSoundDevice *device, IAudioClient *client return S_OK; } -DWORD DSOUND_FindSpeakerConfig(IMMDevice *mmdevice, int channels) -{ - IPropertyStore *store; - HRESULT hr; - PROPVARIANT pv; - ULONG phys_speakers; - - const DWORD def = DSSPEAKER_COMBINED(DSSPEAKER_STEREO, DSSPEAKER_GEOMETRY_WIDE); - - hr = IMMDevice_OpenPropertyStore(mmdevice, STGM_READ, &store); - if (FAILED(hr)) { - WARN("IMMDevice_OpenPropertyStore failed: %08x\n", hr); - return def; - } - - hr = IPropertyStore_GetValue(store, &PKEY_AudioEndpoint_PhysicalSpeakers, &pv); - - if (FAILED(hr)) { - WARN("IPropertyStore_GetValue failed: %08x\n", hr); - IPropertyStore_Release(store); - return def; - } - - if (pv.vt != VT_UI4) { - WARN("PKEY_AudioEndpoint_PhysicalSpeakers is not a ULONG: 0x%x\n", pv.vt); - PropVariantClear(&pv); - IPropertyStore_Release(store); - return def; - } - - phys_speakers = pv.u.ulVal; - - PropVariantClear(&pv); - IPropertyStore_Release(store); - - if ((channels >= 6 || channels == 0) && (phys_speakers & KSAUDIO_SPEAKER_5POINT1) == KSAUDIO_SPEAKER_5POINT1) - return DSSPEAKER_5POINT1_BACK; - else if ((channels >= 6 || channels == 0) && (phys_speakers & KSAUDIO_SPEAKER_5POINT1_SURROUND) == KSAUDIO_SPEAKER_5POINT1_SURROUND) - return DSSPEAKER_5POINT1_SURROUND; - else if ((channels >= 4 || channels == 0) && (phys_speakers & KSAUDIO_SPEAKER_QUAD) == KSAUDIO_SPEAKER_QUAD) - return DSSPEAKER_QUAD; - else if ((channels >= 2 || channels == 0) && (phys_speakers & KSAUDIO_SPEAKER_STEREO) == KSAUDIO_SPEAKER_STEREO) - return DSSPEAKER_COMBINED(DSSPEAKER_STEREO, DSSPEAKER_GEOMETRY_WIDE); - else if ((phys_speakers & KSAUDIO_SPEAKER_MONO) == KSAUDIO_SPEAKER_MONO) - return DSSPEAKER_MONO; - - return def; -} - HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) { UINT prebuf_frames;

1 0

Francois Gouget : dsound: Reorder the interfaces to remove the need for forward declarations.
by Alexandre Julliard 20 Jan '15

20 Jan '15

Module: wine Branch: master Commit: dfaef5306f2e96dc3cddf530e5f63f01a048c47e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfaef5306f2e96dc3cddf530e… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 20 03:28:02 2015 +0100 dsound: Reorder the interfaces to remove the need for forward declarations. --- dlls/dsound/dsound.c | 1675 +++++++++++++++++++++--------------------- dlls/dsound/dsound_private.h | 14 - 2 files changed, 838 insertions(+), 851 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dfaef5306f2e96dc3cddf…

1 0