wine-commits August 2015

wine-commits@winehq.org

2 participants
503 discussions

Sebastian Lackner : ntdll/tests: Add additional tests for calling NtOpenFile with file object as RootDirectory.
by Alexandre Julliard 21 Aug '15

21 Aug '15

Module: wine Branch: master Commit: 84d2610aafb3c8b49f5ff8da71f024dc0cea615a URL: http://source.winehq.org/git/wine.git/?a=commit;h=84d2610aafb3c8b49f5ff8da7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Aug 21 07:25:45 2015 +0200 ntdll/tests: Add additional tests for calling NtOpenFile with file object as RootDirectory. --- dlls/ntdll/tests/file.c | 47 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index ad844b1..4f58788 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -297,7 +297,8 @@ static void create_file_test(void) static void open_file_test(void) { - static const WCHAR fooW[] = {'f','o','o',0}; + static const char testdata[] = "Hello World"; + static WCHAR fooW[] = {'f','o','o',0}; NTSTATUS status; HANDLE dir, root, handle, file; WCHAR path[MAX_PATH], tmpfile[MAX_PATH]; @@ -306,7 +307,8 @@ static void open_file_test(void) IO_STATUS_BLOCK io; UNICODE_STRING nameW; UINT i, len; - BOOL restart = TRUE; + BOOL ret, restart = TRUE; + DWORD numbytes; len = GetWindowsDirectoryW( path, MAX_PATH ); pRtlDosPathNameToNtPathName_U( path, &nameW, NULL, NULL ); @@ -432,6 +434,14 @@ static void open_file_test(void) GetTempFileNameW( path, fooW, 0, tmpfile ); pRtlDosPathNameToNtPathName_U( tmpfile, &nameW, NULL, NULL ); + file = CreateFileW( tmpfile, FILE_WRITE_DATA, 0, NULL, CREATE_ALWAYS, 0, 0 ); + ok( file != INVALID_HANDLE_VALUE, "CreateFile error %d\n", GetLastError() ); + numbytes = 0xdeadbeef; + ret = WriteFile( file, testdata, sizeof(testdata) - 1, &numbytes, NULL ); + ok( ret, "WriteFile failed with error %u\n", GetLastError() ); + ok( numbytes == sizeof(testdata) - 1, "failed to write all data\n" ); + CloseHandle( file ); + attr.Length = sizeof(attr); attr.RootDirectory = 0; attr.ObjectName = &nameW; @@ -443,6 +453,22 @@ static void open_file_test(void) ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); pRtlFreeUnicodeString( &nameW ); + numbytes = 0xdeadbeef; + memset( data, 0, sizeof(data) ); + ret = ReadFile( file, data, sizeof(data), &numbytes, NULL ); + ok( ret, "ReadFile failed with error %u\n", GetLastError() ); + ok( numbytes == sizeof(testdata) - 1, "failed to read all data\n" ); + ok( !memcmp( data, testdata, sizeof(testdata) - 1 ), "testdata doesn't match\n" ); + + nameW.Length = sizeof(fooW) - sizeof(WCHAR); + nameW.Buffer = fooW; + attr.RootDirectory = file; + attr.ObjectName = &nameW; + status = pNtOpenFile( &root, SYNCHRONIZE|FILE_LIST_DIRECTORY, &attr, &io, + FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_NONALERT ); + todo_wine ok( status == STATUS_OBJECT_PATH_NOT_FOUND, + "expected STATUS_OBJECT_PATH_NOT_FOUND, got %08x\n", status ); + nameW.Length = 0; nameW.Buffer = NULL; attr.RootDirectory = file; @@ -451,6 +477,23 @@ static void open_file_test(void) FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_NONALERT ); todo_wine ok( !status, "open %s failed %x\n", wine_dbgstr_w(tmpfile), status ); + numbytes = SetFilePointer( file, 0, 0, FILE_CURRENT ); + ok( numbytes == sizeof(testdata) - 1, "SetFilePointer returned %u\n", numbytes ); + numbytes = SetFilePointer( root, 0, 0, FILE_CURRENT ); + todo_wine ok( numbytes == 0, "SetFilePointer returned %u\n", numbytes ); + + numbytes = 0xdeadbeef; + memset( data, 0, sizeof(data) ); + ret = ReadFile( root, data, sizeof(data), &numbytes, NULL ); + todo_wine ok( ret, "ReadFile failed with error %u\n", GetLastError() ); + todo_wine ok( numbytes == sizeof(testdata) - 1, "failed to read all data\n" ); + todo_wine ok( !memcmp( data, testdata, sizeof(testdata) - 1 ), "testdata doesn't match\n" ); + + numbytes = SetFilePointer( file, 0, 0, FILE_CURRENT ); + ok( numbytes == sizeof(testdata) - 1, "SetFilePointer returned %u\n", numbytes ); + numbytes = SetFilePointer( root, 0, 0, FILE_CURRENT ); + todo_wine ok( numbytes == sizeof(testdata) - 1, "SetFilePointer returned %u\n", numbytes ); + CloseHandle( file ); CloseHandle( root ); DeleteFileW( tmpfile );

1 0

Sebastian Lackner : server: Implement support for FileLinkInformation class in NtSetInformationFile.
by Alexandre Julliard 21 Aug '15

21 Aug '15

Module: wine Branch: master Commit: 1f2a443cb4bc42b7f1934e351feff84679e3ae2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f2a443cb4bc42b7f1934e351… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Aug 21 07:25:12 2015 +0200 server: Implement support for FileLinkInformation class in NtSetInformationFile. --- dlls/ntdll/file.c | 44 +++++++++++++++++++++++++++++++++++++ dlls/ntdll/tests/file.c | 50 +++++++++++++++++++++--------------------- include/wine/server_protocol.h | 4 ++-- server/fd.c | 33 +++++++++++++++++++++++----- server/protocol.def | 1 + server/request.h | 1 + server/trace.c | 1 + 7 files changed, 101 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1f2a443cb4bc42b7f1934…

1 0

Qian Hong : ntdll/tests: Add tests for FileLinkInformation class.
by Alexandre Julliard 21 Aug '15

21 Aug '15

Module: wine Branch: master Commit: 57d443824a0e6739aab5b10351af37ae0d38a9a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57d443824a0e6739aab5b1035… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Aug 21 07:24:49 2015 +0200 ntdll/tests: Add tests for FileLinkInformation class. Based on the FileRenameInformation tests by Sebastian Lackner. --- dlls/ntdll/tests/file.c | 630 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 630 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=57d443824a0e6739aab5b…

1 0

Dmitry Timoshkov : server: For querying thread information demand THREAD_QUERY_LIMITED_INFORMATION access.
by Alexandre Julliard 21 Aug '15

21 Aug '15

Module: wine Branch: master Commit: 3bed65b5a94414b3921f6cdea1bf2515614356eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bed65b5a94414b3921f6cdea… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Aug 21 12:14:23 2015 +0800 server: For querying thread information demand THREAD_QUERY_LIMITED_INFORMATION access. --- dlls/kernel32/tests/thread.c | 7 ++++++- server/thread.c | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 4cf8577..0d1f4a6 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1750,14 +1750,19 @@ static void test_thread_info(void) switch (i) { case ThreadBasicInformation: - case ThreadTimes: case ThreadAmILastThread: case ThreadPriorityBoost: + ok(status == STATUS_SUCCESS, "for info %u expected STATUS_SUCCESS, got %08x (ret_len %u)\n", i, status, ret_len); + break; + + case ThreadTimes: todo_wine ok(status == STATUS_SUCCESS, "for info %u expected STATUS_SUCCESS, got %08x (ret_len %u)\n", i, status, ret_len); break; case ThreadDescriptorTableEntry: + case ThreadAffinityMask: + case ThreadQuerySetWin32StartAddress: todo_wine ok(status == STATUS_ACCESS_DENIED, "for info %u expected STATUS_ACCESS_DENIED, got %08x (ret_len %u)\n", i, status, ret_len); break; diff --git a/server/thread.c b/server/thread.c index 9df2da6..6383000 100644 --- a/server/thread.c +++ b/server/thread.c @@ -1372,7 +1372,7 @@ DECL_HANDLER(get_thread_info) obj_handle_t handle = req->handle; if (!handle) thread = get_thread_from_id( req->tid_in ); - else thread = get_thread_from_handle( req->handle, THREAD_QUERY_INFORMATION ); + else thread = get_thread_from_handle( req->handle, THREAD_QUERY_LIMITED_INFORMATION ); if (thread) {

1 0

Dmitry Timoshkov : server: For querying process information demand PROCESS_QUERY_LIMITED_INFORMATION access.
by Alexandre Julliard 21 Aug '15

21 Aug '15

Module: wine Branch: master Commit: 1d2241eca3b3c19855dea1db017305b1e6113c0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d2241eca3b3c19855dea1db0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Aug 21 12:14:19 2015 +0800 server: For querying process information demand PROCESS_QUERY_LIMITED_INFORMATION access. --- dlls/kernel32/tests/process.c | 12 +++++++----- server/process.c | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 443feb9..8447323 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2901,13 +2901,8 @@ static void test_process_info(void) case ProcessTimes: case ProcessPriorityClass: case ProcessPriorityBoost: - case ProcessImageFileName: case ProcessLUIDDeviceMapsEnabled: case 33 /* ProcessIoPriority */: -todo_wine - ok(status == STATUS_SUCCESS, "for info %u expected STATUS_SUCCESS, got %08x (ret_len %u)\n", i, status, ret_len); - break; - case ProcessIoCounters: case ProcessVmCounters: case ProcessWow64Information: @@ -2916,6 +2911,11 @@ todo_wine ok(status == STATUS_SUCCESS, "for info %u expected STATUS_SUCCESS, got %08x (ret_len %u)\n", i, status, ret_len); break; + case ProcessImageFileName: +todo_wine + ok(status == STATUS_SUCCESS, "for info %u expected STATUS_SUCCESS, got %08x (ret_len %u)\n", i, status, ret_len); + break; + case ProcessAffinityMask: case ProcessBreakOnTermination: ok(status == STATUS_ACCESS_DENIED /* before win8 */ || status == STATUS_SUCCESS /* win8 is less strict */, @@ -2928,6 +2928,8 @@ todo_wine break; case ProcessExecuteFlags: + case ProcessDebugPort: + case ProcessDebugFlags: todo_wine ok(status == STATUS_ACCESS_DENIED, "for info %u expected STATUS_ACCESS_DENIED, got %08x (ret_len %u)\n", i, status, ret_len); break; diff --git a/server/process.c b/server/process.c index a02493a..d4c8adf 100644 --- a/server/process.c +++ b/server/process.c @@ -1343,7 +1343,7 @@ DECL_HANDLER(get_process_info) { struct process *process; - if ((process = get_process_from_handle( req->handle, PROCESS_QUERY_INFORMATION ))) + if ((process = get_process_from_handle( req->handle, PROCESS_QUERY_LIMITED_INFORMATION ))) { reply->pid = get_process_id( process ); reply->ppid = process->parent ? get_process_id( process->parent ) : 0;

1 0

Dmitry Timoshkov : server: Add implicit THREAD_[QUERY|SET] _LIMITED_INFORMATION access.
by Alexandre Julliard 21 Aug '15

21 Aug '15

Module: wine Branch: master Commit: 93e8bea2bd9cf06faebdd0407dacde6c46b98a63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93e8bea2bd9cf06faebdd0407… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Aug 21 12:14:15 2015 +0800 server: Add implicit THREAD_[QUERY|SET]_LIMITED_INFORMATION access. --- server/thread.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/server/thread.c b/server/thread.c index e1696ba..9df2da6 100644 --- a/server/thread.c +++ b/server/thread.c @@ -338,11 +338,15 @@ static int thread_signaled( struct object *obj, struct wait_queue_entry *entry ) static unsigned int thread_map_access( struct object *obj, unsigned int access ) { - if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ | THREAD_QUERY_INFORMATION | THREAD_GET_CONTEXT | THREAD_QUERY_LIMITED_INFORMATION; + if (access & GENERIC_READ) access |= STANDARD_RIGHTS_READ | THREAD_QUERY_INFORMATION | THREAD_GET_CONTEXT; if (access & GENERIC_WRITE) access |= STANDARD_RIGHTS_WRITE | THREAD_SET_INFORMATION | THREAD_SET_CONTEXT | - THREAD_TERMINATE | THREAD_SUSPEND_RESUME | THREAD_SET_LIMITED_INFORMATION; + THREAD_TERMINATE | THREAD_SUSPEND_RESUME; if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE | THREAD_QUERY_LIMITED_INFORMATION; if (access & GENERIC_ALL) access |= THREAD_ALL_ACCESS; + + if (access & THREAD_QUERY_INFORMATION) access |= THREAD_QUERY_LIMITED_INFORMATION; + if (access & THREAD_SET_INFORMATION) access |= THREAD_SET_LIMITED_INFORMATION; + return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); }

1 0

Dmitry Timoshkov : server: Add implicit PROCESS_[QUERY|SET] _LIMITED_INFORMATION access.
by Alexandre Julliard 21 Aug '15

21 Aug '15

Module: wine Branch: master Commit: c19091272d98600de346c516301dd41c2e0a57d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c19091272d98600de346c5163… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Aug 21 12:14:09 2015 +0800 server: Add implicit PROCESS_[QUERY|SET]_LIMITED_INFORMATION access. --- server/process.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/server/process.c b/server/process.c index 7252497..a02493a 100644 --- a/server/process.c +++ b/server/process.c @@ -651,6 +651,10 @@ static unsigned int process_map_access( struct object *obj, unsigned int access PROCESS_VM_WRITE | PROCESS_DUP_HANDLE | PROCESS_CREATE_PROCESS | PROCESS_CREATE_THREAD | PROCESS_VM_OPERATION; if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE | PROCESS_QUERY_LIMITED_INFORMATION | PROCESS_TERMINATE; if (access & GENERIC_ALL) access |= PROCESS_ALL_ACCESS; + + if (access & PROCESS_QUERY_INFORMATION) access |= PROCESS_QUERY_LIMITED_INFORMATION; + if (access & PROCESS_SET_INFORMATION) access |= PROCESS_SET_LIMITED_INFORMATION; + return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); }

1 0

Andrew Eikum : xaudio2: Stub IXAudio2SourceVoice.
by Alexandre Julliard 21 Aug '15

21 Aug '15

Module: wine Branch: master Commit: 63f3a70d56e573fa327f1d9eb8b0040ed48e27c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63f3a70d56e573fa327f1d9eb… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Aug 20 15:06:18 2015 -0500 xaudio2: Stub IXAudio2SourceVoice. --- dlls/xaudio2_7/xaudio_dll.c | 661 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 657 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=63f3a70d56e573fa327f1…

1 0

Andrew Eikum : xaudio2: Add stub IXAudio2MasteringVoice implementation.
by Alexandre Julliard 21 Aug '15

21 Aug '15

Module: wine Branch: master Commit: 51bd01aec86f05cd353cfb4408f28e58e0d093a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51bd01aec86f05cd353cfb440… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Aug 20 15:06:12 2015 -0500 xaudio2: Add stub IXAudio2MasteringVoice implementation. --- dlls/xaudio2_7/xaudio_dll.c | 205 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 204 insertions(+), 1 deletion(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 03909bd..b7bf390 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -28,6 +28,7 @@ #include "rpcproxy.h" #include "wine/debug.h" +#include "wine/list.h" #include <propsys.h> #include "initguid.h" @@ -73,6 +74,8 @@ HRESULT WINAPI DllUnregisterServer(void) typedef struct { IXAudio27 IXAudio27_iface; IXAudio2 IXAudio2_iface; + IXAudio2MasteringVoice IXAudio2MasteringVoice_iface; + LONG ref; DWORD version; @@ -88,6 +91,194 @@ static inline IXAudio2Impl *impl_from_IXAudio27(IXAudio27 *iface) return CONTAINING_RECORD(iface, IXAudio2Impl, IXAudio27_iface); } +IXAudio2Impl *impl_from_IXAudio2MasteringVoice(IXAudio2MasteringVoice *iface) +{ + return CONTAINING_RECORD(iface, IXAudio2Impl, IXAudio2MasteringVoice_iface); +} + +static void WINAPI XA2M_GetVoiceDetails(IXAudio2MasteringVoice *iface, + XAUDIO2_VOICE_DETAILS *pVoiceDetails) +{ + IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + TRACE("%p, %p\n", This, pVoiceDetails); +} + +static HRESULT WINAPI XA2M_SetOutputVoices(IXAudio2MasteringVoice *iface, + const XAUDIO2_VOICE_SENDS *pSendList) +{ + IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + TRACE("%p, %p\n", This, pSendList); + return S_OK; +} + +static HRESULT WINAPI XA2M_SetEffectChain(IXAudio2MasteringVoice *iface, + const XAUDIO2_EFFECT_CHAIN *pEffectChain) +{ + IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + TRACE("%p, %p\n", This, pEffectChain); + return S_OK; +} + +static HRESULT WINAPI XA2M_EnableEffect(IXAudio2MasteringVoice *iface, UINT32 EffectIndex, + UINT32 OperationSet) +{ + IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + TRACE("%p, %u, 0x%x\n", This, EffectIndex, OperationSet); + return S_OK; +} + +static HRESULT WINAPI XA2M_DisableEffect(IXAudio2MasteringVoice *iface, UINT32 EffectIndex, + UINT32 OperationSet) +{ + IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + TRACE("%p, %u, 0x%x\n", This, EffectIndex, OperationSet); + return S_OK; +} + +static void WINAPI XA2M_GetEffectState(IXAudio2MasteringVoice *iface, UINT32 EffectIndex, + BOOL *pEnabled) +{ + IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + TRACE("%p, %u, %p\n", This, EffectIndex, pEnabled); +} + +static HRESULT WINAPI XA2M_SetEffectParameters(IXAudio2MasteringVoice *iface, + UINT32 EffectIndex, const void *pParameters, UINT32 ParametersByteSize, + UINT32 OperationSet) +{ + IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + TRACE("%p, %u, %p, 0x%x, 0x%x\n", This, EffectIndex, pParameters, + ParametersByteSize, OperationSet); + return S_OK; +} + +static HRESULT WINAPI XA2M_GetEffectParameters(IXAudio2MasteringVoice *iface, + UINT32 EffectIndex, void *pParameters, UINT32 ParametersByteSize) +{ + IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + TRACE("%p, %u, %p, 0x%x\n", This, EffectIndex, pParameters, + ParametersByteSize); + return S_OK; +} + +static HRESULT WINAPI XA2M_SetFilterParameters(IXAudio2MasteringVoice *iface, + const XAUDIO2_FILTER_PARAMETERS *pParameters, UINT32 OperationSet) +{ + IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + TRACE("%p, %p, 0x%x\n", This, pParameters, OperationSet); + return S_OK; +} + +static void WINAPI XA2M_GetFilterParameters(IXAudio2MasteringVoice *iface, + XAUDIO2_FILTER_PARAMETERS *pParameters) +{ + IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + TRACE("%p, %p\n", This, pParameters); +} + +static HRESULT WINAPI XA2M_SetOutputFilterParameters(IXAudio2MasteringVoice *iface, + IXAudio2Voice *pDestinationVoice, + const XAUDIO2_FILTER_PARAMETERS *pParameters, UINT32 OperationSet) +{ + IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + TRACE("%p, %p, %p, 0x%x\n", This, pDestinationVoice, pParameters, OperationSet); + return S_OK; +} + +static void WINAPI XA2M_GetOutputFilterParameters(IXAudio2MasteringVoice *iface, + IXAudio2Voice *pDestinationVoice, + XAUDIO2_FILTER_PARAMETERS *pParameters) +{ + IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + TRACE("%p, %p, %p\n", This, pDestinationVoice, pParameters); +} + +static HRESULT WINAPI XA2M_SetVolume(IXAudio2MasteringVoice *iface, float Volume, + UINT32 OperationSet) +{ + IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + TRACE("%p, %f, 0x%x\n", This, Volume, OperationSet); + return S_OK; +} + +static void WINAPI XA2M_GetVolume(IXAudio2MasteringVoice *iface, float *pVolume) +{ + IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + TRACE("%p, %p\n", This, pVolume); +} + +static HRESULT WINAPI XA2M_SetChannelVolumes(IXAudio2MasteringVoice *iface, UINT32 Channels, + const float *pVolumes, UINT32 OperationSet) +{ + IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + TRACE("%p, %u, %p, 0x%x\n", This, Channels, pVolumes, OperationSet); + return S_OK; +} + +static void WINAPI XA2M_GetChannelVolumes(IXAudio2MasteringVoice *iface, UINT32 Channels, + float *pVolumes) +{ + IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + TRACE("%p, %u, %p\n", This, Channels, pVolumes); +} + +static HRESULT WINAPI XA2M_SetOutputMatrix(IXAudio2MasteringVoice *iface, + IXAudio2Voice *pDestinationVoice, UINT32 SourceChannels, + UINT32 DestinationChannels, const float *pLevelMatrix, + UINT32 OperationSet) +{ + IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + TRACE("%p, %p, %u, %u, %p, 0x%x\n", This, pDestinationVoice, + SourceChannels, DestinationChannels, pLevelMatrix, OperationSet); + return S_OK; +} + +static void WINAPI XA2M_GetOutputMatrix(IXAudio2MasteringVoice *iface, + IXAudio2Voice *pDestinationVoice, UINT32 SourceChannels, + UINT32 DestinationChannels, float *pLevelMatrix) +{ + IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + TRACE("%p, %p, %u, %u, %p\n", This, pDestinationVoice, + SourceChannels, DestinationChannels, pLevelMatrix); +} + +static void WINAPI XA2M_DestroyVoice(IXAudio2MasteringVoice *iface) +{ + IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + TRACE("%p\n", This); +} + +/* not present in XAudio2 2.7 */ +static void WINAPI XA2M_GetChannelMask(IXAudio2MasteringVoice *iface, + DWORD *pChannelMask) +{ + IXAudio2Impl *This = impl_from_IXAudio2MasteringVoice(iface); + TRACE("%p %p\n", This, pChannelMask); +} + +struct IXAudio2MasteringVoiceVtbl XAudio2MasteringVoice_Vtbl = { + XA2M_GetVoiceDetails, + XA2M_SetOutputVoices, + XA2M_SetEffectChain, + XA2M_EnableEffect, + XA2M_DisableEffect, + XA2M_GetEffectState, + XA2M_SetEffectParameters, + XA2M_GetEffectParameters, + XA2M_SetFilterParameters, + XA2M_GetFilterParameters, + XA2M_SetOutputFilterParameters, + XA2M_GetOutputFilterParameters, + XA2M_SetVolume, + XA2M_GetVolume, + XA2M_SetChannelVolumes, + XA2M_GetChannelVolumes, + XA2M_SetOutputMatrix, + XA2M_GetOutputMatrix, + XA2M_DestroyVoice, + XA2M_GetChannelMask +}; + static HRESULT WINAPI IXAudio2Impl_QueryInterface(IXAudio2 *iface, REFIID riid, void **ppvObject) { @@ -194,7 +385,18 @@ static HRESULT WINAPI IXAudio2Impl_CreateMasteringVoice(IXAudio2 *iface, ppMasteringVoice, inputChannels, inputSampleRate, flags, wine_dbgstr_w(deviceId), pEffectChain, streamCategory); - return E_NOTIMPL; + if(flags != 0) + WARN("Unknown flags set: 0x%x\n", flags); + + if(pEffectChain) + WARN("Effect chain is unimplemented\n"); + + /* TODO: Initialize mmdevice */ + + /* there can only be one Mastering Voice, so just build it into XA2 */ + *ppMasteringVoice = &This->IXAudio2MasteringVoice_iface; + + return S_OK; } static HRESULT WINAPI IXAudio2Impl_StartEngine(IXAudio2 *iface) @@ -450,6 +652,7 @@ static HRESULT WINAPI XAudio2CF_CreateInstance(IClassFactory *iface, IUnknown *p object->IXAudio27_iface.lpVtbl = &XAudio27_Vtbl; object->IXAudio2_iface.lpVtbl = &XAudio2_Vtbl; + object->IXAudio2MasteringVoice_iface.lpVtbl = &XAudio2MasteringVoice_Vtbl; if(IsEqualGUID(riid, &IID_IXAudio27)) object->version = 27;

1 0

Andrew Eikum : xaudio2: Implement IXAudio27::Initialize.
by Alexandre Julliard 21 Aug '15

21 Aug '15

Module: wine Branch: master Commit: 7a23b9f0f85f652c8d01a0296455e07322268dac URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a23b9f0f85f652c8d01a0296… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Aug 20 15:02:52 2015 -0500 xaudio2: Implement IXAudio27::Initialize. --- dlls/xaudio2_7/xaudio_dll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index b13436c..03909bd 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -297,7 +297,7 @@ static HRESULT WINAPI XA27_Initialize(IXAudio27 *iface, UINT32 flags, { IXAudio2Impl *This = impl_from_IXAudio27(iface); TRACE("(%p)->(0x%x, 0x%x)\n", This, flags, processor); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI XA27_RegisterForCallbacks(IXAudio27 *iface,

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
51
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 August 2015