August 2015 - Wine-commits - list.winehq.org

Aaryaman Vasishta : d3drm: Implement IDirect3DRM::CreateDeviceFromD3D.
by Alexandre Julliard 21 Aug '15

21 Aug '15

Module: wine Branch: master Commit: 9603125efc4f65b29be9a581b615da5d05a5cee2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9603125efc4f65b29be9a581b… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Thu Aug 20 20:34:39 2015 +0530 d3drm: Implement IDirect3DRM::CreateDeviceFromD3D. --- dlls/d3drm/d3drm.c | 14 +++++++++++++- dlls/d3drm/d3drm_private.h | 2 ++ dlls/d3drm/device.c | 10 ++++++++++ dlls/d3drm/tests/d3drm.c | 22 +++++++++++----------- 4 files changed, 36 insertions(+), 12 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index aeb1f86..6372cce 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -279,13 +279,25 @@ static HRESULT WINAPI d3drm1_CreateDeviceFromD3D(IDirect3DRM *iface, { struct d3drm_device *object; HRESULT hr; - FIXME("iface %p, d3d %p, d3d_device %p, device %p partial stub.\n", + TRACE("iface %p, d3d %p, d3d_device %p, device %p.\n", iface, d3d, d3d_device, device); + if (!device) + return D3DRMERR_BADVALUE; + *device = NULL; + if (!d3d || !d3d_device) + return D3DRMERR_BADVALUE; + hr = d3drm_device_create(&object); if (FAILED(hr)) return hr; + hr = d3drm_device_set_ddraw_device_d3d(object, iface, d3d, d3d_device); + if (FAILED(hr)) + { + d3drm_device_destroy(object); + return hr; + } *device = IDirect3DRMDevice_from_impl(object); return D3DRM_OK; diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 9e2b3bd..5df83a7 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -50,6 +50,8 @@ HRESULT d3drm_device_create_surfaces_from_clipper(struct d3drm_device *object, I HRESULT d3drm_device_init(struct d3drm_device *device, UINT version, IDirect3DRM *d3drm, IDirectDraw *ddraw, IDirectDrawSurface *surface, BOOL create_z_surface) DECLSPEC_HIDDEN; +HRESULT d3drm_device_set_ddraw_device_d3d(struct d3drm_device *device, IDirect3DRM *d3drm, IDirect3D *d3d, IDirect3DDevice *d3d_device) DECLSPEC_HIDDEN; + struct d3drm_file_header { WORD major; diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index 03caa36..3cf6791 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -241,6 +241,16 @@ HRESULT d3drm_device_init(struct d3drm_device *device, UINT version, IDirect3DRM return hr; } +HRESULT d3drm_device_set_ddraw_device_d3d(struct d3drm_device *device, IDirect3DRM *d3drm, IDirect3D *d3d, IDirect3DDevice *d3d_device) +{ + device->d3drm = d3drm; + IDirect3DRM_AddRef(d3drm); + device->device = d3d_device; + IDirect3DDevice_AddRef(d3d_device); + + return IDirect3D_QueryInterface(d3d, &IID_IDirectDraw, (void **)&device->ddraw); +} + static HRESULT WINAPI d3drm_device1_QueryInterface(IDirect3DRMDevice *iface, REFIID riid, void **out) { struct d3drm_device *device = impl_from_IDirect3DRMDevice(iface); diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 65472cd..b971938 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -3117,7 +3117,7 @@ static void test_create_device_from_d3d1(void) IDirectDraw *ddraw1 = NULL; IDirect3D *d3d1 = NULL; IDirect3DRM *d3drm1 = NULL; - IDirect3DRMDevice *device1 = NULL; + IDirect3DRMDevice *device1 = (IDirect3DRMDevice *)0xdeadbeef; IDirect3DDevice *d3ddevice1 = NULL, *d3drm_d3ddevice1 = NULL; IDirectDrawSurface *surface = NULL, *ds = NULL, *d3drm_ds = NULL; DWORD expected_flags; @@ -3152,13 +3152,20 @@ static void test_create_device_from_d3d1(void) ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x).\n", hr); ref1 = get_refcount((IUnknown *)d3drm1); + hr = IDirect3DRM_CreateDeviceFromD3D(d3drm1, NULL, d3ddevice1, &device1); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); + ok(device1 == NULL, "Expected device returned == NULL, got %p.\n", device1); + hr = IDirect3DRM_CreateDeviceFromD3D(d3drm1, d3d1, NULL, &device1); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); + hr = IDirect3DRM_CreateDeviceFromD3D(d3drm1, d3d1, d3ddevice1, NULL); + ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); hr = IDirect3DRM_CreateDeviceFromD3D(d3drm1, d3d1, d3ddevice1, &device1); ok(hr == DD_OK, "Failed to create IDirect3DRMDevice interface (hr = %x)\n", hr); ref2 = get_refcount((IUnknown *)d3drm1); - todo_wine ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2); + ok(ref2 > ref1, "expected ref2 > ref1, got ref1 = %u , ref2 = %u.\n", ref1, ref2); device_ref2 = get_refcount((IUnknown *)d3ddevice1); - todo_wine ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %u, device_ref2 = %u.\n", device_ref1, device_ref2); + ok(device_ref2 > device_ref1, "Expected device_ref2 > device_ref1, got device_ref1 = %u, device_ref2 = %u.\n", device_ref1, device_ref2); hr = IDirectDraw_EnumSurfaces(ddraw1, DDENUMSURFACES_ALL | DDENUMSURFACES_DOESEXIST, NULL, &surface, surface_callback); @@ -3166,9 +3173,7 @@ static void test_create_device_from_d3d1(void) ok(surface == NULL, "No primary surface should have enumerated (%p).\n", surface); hr = IDirect3DRMDevice_GetDirect3DDevice(device1, &d3drm_d3ddevice1); - todo_wine ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface (hr = %x).\n", hr); - if (FAILED(hr)) - goto cleanup; + ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface (hr = %x).\n", hr); ok(d3ddevice1 == d3drm_d3ddevice1, "Expected Immediate Mode deivce created == %p, got %p.\n", d3ddevice1, d3drm_d3ddevice1); /* Check properties of render target and depth surfaces */ @@ -3203,13 +3208,8 @@ static void test_create_device_from_d3d1(void) IDirectDrawSurface_Release(d3drm_ds); IDirectDrawSurface_Release(ds); - ds = NULL; IDirectDrawSurface_Release(surface); IDirect3DDevice_Release(d3drm_d3ddevice1); -cleanup: - if (ds) - IDirectDrawSurface_Release(ds); - IDirect3DRMDevice_Release(device1); ref2 = get_refcount((IUnknown *)d3drm1); ok(ref1 == ref2, "expected ref1 == ref2, got ref1 = %u, ref2 = %u.\n", ref1, ref2);

1 0

Aaryaman Vasishta : d3drm: Implement IDirect3DRM{2-3}:: CreateDeviceFromD3D.
by Alexandre Julliard 21 Aug '15

21 Aug '15

Module: wine Branch: master Commit: ed1d4f86c3d0e55e59992f062e8dd33d12253bcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed1d4f86c3d0e55e59992f062… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Thu Aug 20 20:34:40 2015 +0530 d3drm: Implement IDirect3DRM{2-3}::CreateDeviceFromD3D. --- dlls/d3drm/d3drm.c | 67 ++++++++++++++++++++++++++++++++++++++++-------- dlls/d3drm/device.c | 15 +++-------- dlls/d3drm/tests/d3drm.c | 46 +++++++++++++++++---------------- 3 files changed, 84 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ed1d4f86c3d0e55e59992…

1 0

Alistair Leslie-Hughes : include: Add more WELL_KNOWN_SID_TYPE values.
by Alexandre Julliard 21 Aug '15

21 Aug '15

Module: wine Branch: master Commit: 0174a6fc1de85d18119f458ea977d39adf0158e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0174a6fc1de85d18119f458ea… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 19 13:08:09 2015 +1000 include: Add more WELL_KNOWN_SID_TYPE values. --- include/winnt.h | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index a1116bd..93e216f 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4301,6 +4301,31 @@ typedef enum { WinLocalLogonSid = 80, WinConsoleLogonSid = 81, WinThisOrganizationCertificateSid = 82, + WinApplicationPackageAuthoritySid = 83, + WinBuiltinAnyPackageSid = 84, + WinCapabilityInternetClientSid = 85, + WinCapabilityInternetClientServerSid = 86, + WinCapabilityPrivateNetworkClientServerSid = 87, + WinCapabilityPicturesLibrarySid = 88, + WinCapabilityVideosLibrarySid = 89, + WinCapabilityMusicLibrarySid = 90, + WinCapabilityDocumentsLibrarySid = 91, + WinCapabilitySharedUserCertificatesSid = 92, + WinCapabilityEnterpriseAuthenticationSid = 93, + WinCapabilityRemovableStorageSid = 94, + WinBuiltinRDSRemoteAccessServersSid = 95, + WinBuiltinRDSEndpointServersSid = 96, + WinBuiltinRDSManagementServersSid = 97, + WinUserModeDriversSid = 98, + WinBuiltinHyperVAdminsSid = 99, + WinAccountCloneableControllersSid = 100, + WinBuiltinAccessControlAssistanceOperatorsSid = 101, + WinBuiltinRemoteManagementUsersSid = 102, + WinAuthenticationAuthorityAssertedSid = 103, + WinAuthenticationServiceAssertedSid = 104, + WinLocalAccountSid = 105, + WinLocalAccountAndAdministratorSid = 106, + WinAccountProtectedUsersSid = 107, } WELL_KNOWN_SID_TYPE; /*

1 0

Nikolay Sivov : dwrite/tests: Fix layout test failure on Win10.
by Alexandre Julliard 21 Aug '15

21 Aug '15

Module: wine Branch: master Commit: 8dd0738b1ca3fb8f75301edde9d8c078f810cbd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dd0738b1ca3fb8f75301edde… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 20 20:33:29 2015 +0300 dwrite/tests: Fix layout test failure on Win10. --- dlls/dwrite/tests/layout.c | 2 +- include/dwrite.idl | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 9e2aaea..67d49d1 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -975,7 +975,7 @@ if (0) /* crashes on native */ hr = IDWriteTextFormat_SetLineSpacing(format, DWRITE_LINE_SPACING_METHOD_DEFAULT, -10.0, 0.0); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); - hr = IDWriteTextFormat_SetLineSpacing(format, DWRITE_LINE_SPACING_METHOD_UNIFORM+1, 0.0, 0.0); + hr = IDWriteTextFormat_SetLineSpacing(format, DWRITE_LINE_SPACING_METHOD_PROPORTIONAL+1, 0.0, 0.0); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); hr = IDWriteTextFormat_SetTrimming(format, &trimming, NULL); diff --git a/include/dwrite.idl b/include/dwrite.idl index bb41b4f..f8644ba 100644 --- a/include/dwrite.idl +++ b/include/dwrite.idl @@ -219,7 +219,8 @@ typedef enum DWRITE_BREAK_CONDITION typedef enum DWRITE_LINE_SPACING_METHOD { DWRITE_LINE_SPACING_METHOD_DEFAULT, - DWRITE_LINE_SPACING_METHOD_UNIFORM + DWRITE_LINE_SPACING_METHOD_UNIFORM, + DWRITE_LINE_SPACING_METHOD_PROPORTIONAL } DWRITE_LINE_SPACING_METHOD; cpp_quote("#define DWRITE_MAKE_OPENTYPE_TAG(a,b,c,d) ( \\")

1 0

Nikolay Sivov : dwrite/tests: Fix analyzer test failures on Win10.
by Alexandre Julliard 21 Aug '15

21 Aug '15

Module: wine Branch: master Commit: 4c12157c345ac6a77991e4fef332f6da3dbc0609 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c12157c345ac6a77991e4fef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 20 20:33:58 2015 +0300 dwrite/tests: Fix analyzer test failures on Win10. --- dlls/dwrite/tests/analyzer.c | 50 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 41 insertions(+), 9 deletions(-) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 402787f..cee9934 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -1197,6 +1197,35 @@ static void test_numbersubstitution(void) IDWriteNumberSubstitution_Release(substitution); } +static void get_fontface_glyphs(IDWriteFontFace *fontface, const WCHAR *str, UINT16 *glyphs) +{ + while (*str) { + UINT32 codepoint = *str; + HRESULT hr; + + hr = IDWriteFontFace_GetGlyphIndices(fontface, &codepoint, 1, glyphs++); + ok(hr == S_OK, "got 0x%08x\n", hr); + str++; + } +} + +static void get_fontface_advances(IDWriteFontFace *fontface, FLOAT emsize, const UINT16 *glyphs, FLOAT *advances, UINT32 count) +{ + DWRITE_FONT_METRICS fontmetrics; + UINT32 i; + + IDWriteFontFace_GetMetrics(fontface, &fontmetrics); + for (i = 0; i < count; i++) { + DWRITE_GLYPH_METRICS metrics; + HRESULT hr; + + hr = IDWriteFontFace_GetDesignGlyphMetrics(fontface, glyphs + i, 1, &metrics, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + advances[i] = (FLOAT)metrics.advanceWidth * emsize / (FLOAT)fontmetrics.designUnitsPerEm; + } +} + static void test_GetGlyphs(void) { static const WCHAR test1W[] = {'<','B',' ','C',0}; @@ -1205,6 +1234,7 @@ static void test_GetGlyphs(void) DWRITE_SHAPING_GLYPH_PROPERTIES shapingprops[20]; DWRITE_SHAPING_TEXT_PROPERTIES props[20]; UINT32 maxglyphcount, actual_count; + FLOAT advances[10], advances2[10]; IDWriteTextAnalyzer *analyzer; IDWriteFontFace *fontface; DWRITE_SCRIPT_ANALYSIS sa; @@ -1212,7 +1242,6 @@ static void test_GetGlyphs(void) UINT16 clustermap[10]; UINT16 glyphs1[10]; UINT16 glyphs2[10]; - FLOAT advances[10]; HRESULT hr; hr = IDWriteFactory_CreateTextAnalyzer(factory, &analyzer); @@ -1275,13 +1304,16 @@ if (0) { ok(glyphs1[0] != glyphs2[0], "got %d\n", glyphs1[0]); /* embedded control codes, with unknown script id 0 */ + get_fontface_glyphs(fontface, test3W, glyphs2); + get_fontface_advances(fontface, 10.0, glyphs2, advances2, 2); + actual_count = 0; hr = IDWriteTextAnalyzer_GetGlyphs(analyzer, test3W, lstrlenW(test3W), fontface, FALSE, TRUE, &sa, NULL, NULL, NULL, NULL, 0, maxglyphcount, clustermap, props, glyphs1, shapingprops, &actual_count); ok(hr == S_OK, "got 0x%08x\n", hr); ok(actual_count == 2, "got %d\n", actual_count); - ok(glyphs1[0] == 0, "got %d\n", glyphs1[0]); - ok(glyphs1[1] == 0, "got %d\n", glyphs1[1]); + ok(glyphs1[0] == glyphs2[0], "got %u, expected %u\n", glyphs1[0], glyphs2[0]); + ok(glyphs1[1] == glyphs2[1], "got %u, expected %u\n", glyphs1[1], glyphs2[1]); ok(shapingprops[0].isClusterStart == 1, "got %d\n", shapingprops[0].isClusterStart); ok(shapingprops[0].isZeroWidthSpace == 0, "got %d\n", shapingprops[0].isZeroWidthSpace); ok(shapingprops[1].isClusterStart == 1, "got %d\n", shapingprops[1].isClusterStart); @@ -1294,8 +1326,8 @@ if (0) { glyphs1, shapingprops, actual_count, fontface, 10.0, FALSE, FALSE, &sa, NULL, NULL, NULL, 0, advances, offsets); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(advances[0] == 10.0, "got %.2f\n", advances[0]); - ok(advances[1] == 10.0, "got %.2f\n", advances[1]); + ok(advances[0] == advances2[0], "got %.2f, expected %.2f\n", advances[0], advances2[0]); + ok(advances[1] == advances2[1], "got %.2f, expected %.2f\n", advances[1], advances2[1]); /* embedded control codes with proper script */ sa.script = 0; @@ -1306,8 +1338,8 @@ if (0) { NULL, NULL, NULL, 0, maxglyphcount, clustermap, props, glyphs1, shapingprops, &actual_count); ok(hr == S_OK, "got 0x%08x\n", hr); ok(actual_count == 2, "got %d\n", actual_count); - ok(glyphs1[0] == 0, "got %d\n", glyphs1[0]); - ok(glyphs1[1] == 0, "got %d\n", glyphs1[1]); + ok(glyphs1[0] == glyphs2[0], "got %u, expected %u\n", glyphs1[0], glyphs2[0]); + ok(glyphs1[1] == glyphs2[1], "got %u, expected %u\n", glyphs1[1], glyphs2[1]); ok(shapingprops[0].isClusterStart == 1, "got %d\n", shapingprops[0].isClusterStart); ok(shapingprops[0].isZeroWidthSpace == 0, "got %d\n", shapingprops[0].isZeroWidthSpace); ok(shapingprops[1].isClusterStart == 1, "got %d\n", shapingprops[1].isClusterStart); @@ -1320,8 +1352,8 @@ if (0) { glyphs1, shapingprops, actual_count, fontface, 10.0, FALSE, FALSE, &sa, NULL, NULL, NULL, 0, advances, offsets); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(advances[0] == 10.0, "got %.2f\n", advances[0]); - ok(advances[1] == 10.0, "got %.2f\n", advances[1]); + ok(advances[0] == advances2[0], "got %.2f, expected %.2f\n", advances[0], advances2[0]); + ok(advances[1] == advances2[1], "got %.2f, expected %.2f\n", advances[1], advances2[1]); IDWriteTextAnalyzer_Release(analyzer); IDWriteFontFace_Release(fontface);

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

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: 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

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

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