June 2011 - Wine-Commits - list.winehq.org

Jörg Höhle : winecoreaudio: mmdevapi' s mixer format is 32bit floating point.
by Alexandre Julliard June 6, 2011

June 6, 2011

Module: wine Branch: master Commit: fd2d6f39283d021dc89fdda25bb552e9df2b73b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd2d6f39283d021dc89fdda25… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Mon Jun 6 07:59:44 2011 +0200 winecoreaudio: mmdevapi's mixer format is 32bit floating point. --- dlls/winecoreaudio.drv/mmdevdrv.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 2819ca7..ed97e99 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1207,10 +1207,8 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, } fmt->Format.nSamplesPerSec = rate; - /* CoreAudio doesn't seem to give a device format preference, so just - * choose a common format... */ - fmt->Format.wBitsPerSample = 16; - fmt->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + fmt->Format.wBitsPerSample = 32; + fmt->SubFormat = KSDATAFORMAT_SUBTYPE_IEEE_FLOAT; fmt->Format.nBlockAlign = (fmt->Format.wBitsPerSample * fmt->Format.nChannels) / 8;

1 0

Huw Davies : winex11: Move the code that checks for a colortable based dib to a separate function .
by Alexandre Julliard June 6, 2011

June 6, 2011

Module: wine Branch: master Commit: 129021a0ab10e42cec9c16aa8049d229876de290 URL: http://source.winehq.org/git/wine.git/?a=commit;h=129021a0ab10e42cec9c16aa8… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 6 12:58:42 2011 +0100 winex11: Move the code that checks for a colortable based dib to a separate function. --- dlls/winex11.drv/xrender.c | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 52e7f25..48ecd22 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1788,6 +1788,22 @@ static int XRenderErrorHandler(Display *dpy, XErrorEvent *event, void *arg) return 1; } +/******************************************************************** + * is_dib_with_colortable + * + * Return TRUE if physdev is backed by a dibsection with <= 8 bits per pixel + */ +static inline BOOL is_dib_with_colortable( X11DRV_PDEVICE *physDev ) +{ + DIBSECTION dib; + + if( physDev->bitmap && GetObjectW( physDev->bitmap->hbitmap, sizeof(dib), &dib ) == sizeof(dib) && + dib.dsBmih.biBitCount <= 8 ) + return TRUE; + + return FALSE; +} + /*********************************************************************** * X11DRV_XRender_ExtTextOut */ @@ -1803,16 +1819,12 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag HRGN saved_region = 0; BOOL disable_antialias = FALSE; AA_Type aa_type = AA_None; - DIBSECTION bmp; unsigned int idx; const WineXRenderFormat *dst_format = get_xrender_format_from_color_shifts(physDev->depth, physDev->color_shifts); Picture tile_pict = 0; - /* Do we need to disable antialiasing because of palette mode? */ - if( !physDev->bitmap || GetObjectW( physDev->bitmap->hbitmap, sizeof(bmp), &bmp ) != sizeof(bmp) ) { - TRACE("bitmap is not a DIB\n"); - } - else if (bmp.dsBmih.biBitCount <= 8) { + if(is_dib_with_colortable( physDev )) + { TRACE("Disabling antialiasing\n"); disable_antialias = TRUE; }

1 0

Jörg Höhle : mmdevapi/tests: Fix wrong buffer unit and memory leaks.
by Alexandre Julliard June 6, 2011

June 6, 2011

Module: wine Branch: master Commit: c192041204436ebab5f3b20542f225920fa1de5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c192041204436ebab5f3b2054… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Fri Jun 3 19:48:57 2011 +0200 mmdevapi/tests: Fix wrong buffer unit and memory leaks. --- dlls/mmdevapi/tests/render.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index c0507fe..b0d0c6c 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -371,6 +371,8 @@ static void test_references(void) 0, pwfx, NULL); ok(hr == S_OK, "Initialize failed: %08x\n", hr); + CoTaskMemFree(pwfx); + hr = IAudioClient_GetService(ac, &IID_IAudioStreamVolume, (void**)&asv); ok(hr == S_OK, "GetService failed: %08x\n", hr); @@ -467,7 +469,7 @@ static void test_padding(void) hr = IAudioClient_GetService(ac, &IID_IAudioRenderClient, (void**)&arc); ok(hr == S_OK, "GetService failed: %08x\n", hr); - psize = (defp / 10000000.) * pwfx->nSamplesPerSec * pwfx->nBlockAlign; + psize = (defp / 10000000.) * pwfx->nSamplesPerSec * 10; written = 0; hr = IAudioClient_GetCurrentPadding(ac, &pad); @@ -487,7 +489,7 @@ static void test_padding(void) ok(hr == S_OK, "GetCurrentPadding failed: %08x\n", hr); ok(pad == written, "GetCurrentPadding returned %u, should be %u\n", pad, written); - psize = (minp / 10000000.) * pwfx->nSamplesPerSec * pwfx->nBlockAlign; + psize = (minp / 10000000.) * pwfx->nSamplesPerSec * 10; hr = IAudioRenderClient_GetBuffer(arc, psize, &buf); ok(hr == S_OK, "GetBuffer failed: %08x\n", hr); @@ -645,6 +647,8 @@ static void test_clock(void) ok(hr == S_OK, "GetPosition failed: %08x\n", hr); ok(pos >= last, "Position should have been further along...\n"); + CoTaskMemFree(pwfx); + IAudioClock_Release(acl); IAudioClient_Release(ac); }

1 0

Jörg Höhle : winecoreaudio: Properly allocate the WAVEFORMATEXTENSIBLE returned by GetMixFormat.
by Alexandre Julliard June 6, 2011

June 6, 2011

Module: wine Branch: master Commit: 8337ffb727265c38bbbd81cf9d3da7b61832507a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8337ffb727265c38bbbd81cf9… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Jun 5 10:26:57 2011 +0200 winecoreaudio: Properly allocate the WAVEFORMATEXTENSIBLE returned by GetMixFormat. --- dlls/winecoreaudio.drv/mmdevdrv.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 9075aa8..2819ca7 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1155,13 +1155,12 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, if(!pwfx) return E_POINTER; + *pwfx = NULL; - *pwfx = HeapAlloc(GetProcessHeap(), 0, sizeof(WAVEFORMATEXTENSIBLE)); - if(!*pwfx) + fmt = CoTaskMemAlloc(sizeof(WAVEFORMATEXTENSIBLE)); + if(!fmt) return E_OUTOFMEMORY; - fmt = (WAVEFORMATEXTENSIBLE*)*pwfx; - fmt->Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; addr.mScope = This->scope; @@ -1170,21 +1169,21 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, sc = AudioObjectGetPropertyDataSize(This->adevid, &addr, 0, NULL, &size); if(sc != noErr){ - HeapFree(GetProcessHeap(), 0, fmt); + CoTaskMemFree(fmt); WARN("Unable to get size for _StreamConfiguration property: %lx\n", sc); return E_FAIL; } buffers = HeapAlloc(GetProcessHeap(), 0, size); if(!buffers){ - HeapFree(GetProcessHeap(), 0, fmt); + CoTaskMemFree(fmt); return E_OUTOFMEMORY; } sc = AudioObjectGetPropertyData(This->adevid, &addr, 0, NULL, &size, buffers); if(sc != noErr){ - HeapFree(GetProcessHeap(), 0, fmt); + CoTaskMemFree(fmt); HeapFree(GetProcessHeap(), 0, buffers); WARN("Unable to get _StreamConfiguration property: %lx\n", sc); return E_FAIL; @@ -1202,7 +1201,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, size = sizeof(Float64); sc = AudioObjectGetPropertyData(This->adevid, &addr, 0, NULL, &size, &rate); if(sc != noErr){ - HeapFree(GetProcessHeap(), 0, fmt); + CoTaskMemFree(fmt); WARN("Unable to get _NominalSampleRate property: %lx\n", sc); return E_FAIL; } @@ -1221,6 +1220,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, fmt->Samples.wValidBitsPerSample = fmt->Format.wBitsPerSample; fmt->Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); + *pwfx = (WAVEFORMATEX*)fmt; dump_fmt(*pwfx); return S_OK;

1 0

Detlef Riekenberg : shdocvw: Add support for IOleInPlaceSiteEx.
by Alexandre Julliard June 6, 2011

June 6, 2011

Module: wine Branch: master Commit: d49b23d6efd6b9171210d9832fec25a16356a9ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=d49b23d6efd6b9171210d9832… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Mon Jun 6 00:02:02 2011 +0200 shdocvw: Add support for IOleInPlaceSiteEx. --- dlls/shdocvw/client.c | 134 ++++++++++++++++++++++++++++++++--------------- dlls/shdocvw/shdocvw.h | 4 +- 2 files changed, 93 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d49b23d6efd6b9171210d…

1 0

Andrew Nguyen : d3d8: Increment the reference count of the IDirect3D8 parent when creating a device .
by Alexandre Julliard June 6, 2011

June 6, 2011

Module: wine Branch: master Commit: 174b03cad867aa92210ff411d3e95bde10e3c75c URL: http://source.winehq.org/git/wine.git/?a=commit;h=174b03cad867aa92210ff411d… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Fri Jun 3 07:23:21 2011 -0500 d3d8: Increment the reference count of the IDirect3D8 parent when creating a device. --- dlls/d3d8/d3d8_private.h | 5 +++-- dlls/d3d8/device.c | 29 ++++++++--------------------- dlls/d3d8/directx.c | 2 +- dlls/d3d8/tests/device.c | 12 ++++++++++++ 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 914dec5..f98b334 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -177,7 +177,8 @@ struct IDirect3DDevice8Impl IDirect3DDevice8 IDirect3DDevice8_iface; struct wined3d_device_parent device_parent; LONG ref; - struct wined3d_device *wined3d_device; + struct wined3d_device *wined3d_device; + IDirect3D8 *d3d_parent; struct d3d8_handle_table handle_table; /* FVF management */ @@ -189,7 +190,7 @@ struct IDirect3DDevice8Impl BOOL lost; }; -HRESULT device_init(IDirect3DDevice8Impl *device, struct wined3d *wined3d, UINT adapter, +HRESULT device_init(IDirect3DDevice8Impl *device, IDirect3D8Impl *parent, struct wined3d *wined3d, UINT adapter, D3DDEVTYPE device_type, HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters) DECLSPEC_HIDDEN; /* ---------------- */ diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index aa85c61..6266bfa 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -301,6 +301,7 @@ static ULONG WINAPI IDirect3DDevice8Impl_Release(IDirect3DDevice8 *iface) if (ref == 0) { unsigned i; + IDirect3D8 *parent = This->d3d_parent; TRACE("Releasing wined3d device %p.\n", This->wined3d_device); @@ -320,6 +321,8 @@ static ULONG WINAPI IDirect3DDevice8Impl_Release(IDirect3DDevice8 *iface) HeapFree(GetProcessHeap(), 0, This); wined3d_mutex_unlock(); + + IDirect3D8_Release(parent); } return ref; } @@ -373,8 +376,6 @@ static HRESULT WINAPI IDirect3DDevice8Impl_ResourceManagerDiscardBytes(IDirect3D static HRESULT WINAPI IDirect3DDevice8Impl_GetDirect3D(IDirect3DDevice8 *iface, IDirect3D8 **ppD3D8) { IDirect3DDevice8Impl *This = impl_from_IDirect3DDevice8(iface); - struct wined3d *wined3d; - HRESULT hr; TRACE("iface %p, d3d8 %p.\n", iface, ppD3D8); @@ -382,24 +383,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetDirect3D(IDirect3DDevice8 *iface, return D3DERR_INVALIDCALL; } - wined3d_mutex_lock(); - hr = wined3d_device_get_wined3d(This->wined3d_device, &wined3d); - if (SUCCEEDED(hr) && wined3d) - { - *ppD3D8 = wined3d_get_parent(wined3d); - IDirect3D8_AddRef(*ppD3D8); - wined3d_decref(wined3d); - } - else - { - FIXME("Call to IWineD3DDevice_GetDirect3D failed\n"); - *ppD3D8 = NULL; - } - wined3d_mutex_unlock(); - - TRACE("(%p) returning %p\n",This , *ppD3D8); - - return hr; + return IDirect3D8_QueryInterface(This->d3d_parent, &IID_IDirect3D8, (void **)ppD3D8); } static HRESULT WINAPI IDirect3DDevice8Impl_GetDeviceCaps(IDirect3DDevice8 *iface, D3DCAPS8 *pCaps) @@ -3095,7 +3079,7 @@ static void setup_fpu(void) #endif } -HRESULT device_init(IDirect3DDevice8Impl *device, struct wined3d *wined3d, UINT adapter, +HRESULT device_init(IDirect3DDevice8Impl *device, IDirect3D8Impl *parent, struct wined3d *wined3d, UINT adapter, D3DDEVTYPE device_type, HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters) { WINED3DPRESENT_PARAMETERS wined3d_parameters; @@ -3209,6 +3193,9 @@ HRESULT device_init(IDirect3DDevice8Impl *device, struct wined3d *wined3d, UINT goto err; } + device->d3d_parent = &parent->IDirect3D8_iface; + IDirect3D8_AddRef(device->d3d_parent); + return D3D_OK; err: diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 249399e..266b68e 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -368,7 +368,7 @@ static HRESULT WINAPI IDirect3D8Impl_CreateDevice(IDirect3D8 *iface, UINT adapte return E_OUTOFMEMORY; } - hr = device_init(object, This->WineD3D, adapter, device_type, focus_window, flags, parameters); + hr = device_init(object, This, This->WineD3D, adapter, device_type, focus_window, flags, parameters); if (FAILED(hr)) { WARN("Failed to initialize device, hr %#x.\n", hr); diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 3bb70b7..9a4369b 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -343,6 +343,7 @@ static void test_refcount(void) HRESULT hr; HWND hwnd = NULL; IDirect3D8 *pD3d = NULL; + IDirect3D8 *pD3d2 = NULL; IDirect3DDevice8 *pDevice = NULL; IDirect3DVertexBuffer8 *pVertexBuffer = NULL; IDirect3DIndexBuffer8 *pIndexBuffer = NULL; @@ -381,6 +382,8 @@ static void test_refcount(void) ok(hwnd != NULL, "Failed to create window\n"); if (!pD3d || !hwnd) goto cleanup; + CHECK_REFCOUNT( pD3d, 1 ); + IDirect3D8_GetAdapterDisplayMode( pD3d, D3DADAPTER_DEFAULT, &d3ddm ); ZeroMemory( &d3dpp, sizeof(d3dpp) ); d3dpp.Windowed = TRUE; @@ -401,6 +404,15 @@ static void test_refcount(void) refcount = get_refcount( (IUnknown *)pDevice ); ok(refcount == 1, "Invalid device RefCount %d\n", refcount); + CHECK_REFCOUNT( pD3d, 2 ); + + hr = IDirect3DDevice8_GetDirect3D(pDevice, &pD3d2); + CHECK_CALL( hr, "GetDirect3D", pDevice, refcount ); + + ok(pD3d2 == pD3d, "Expected IDirect3D8 pointers to be equal\n"); + CHECK_REFCOUNT( pD3d, 3 ); + CHECK_RELEASE_REFCOUNT( pD3d, 2 ); + /** * Check refcount of implicit surfaces. Findings: * - the container is the device

1 0

Andrew Eikum : wineoss.drv: Partially implement IAudioSessionManager2.
by Alexandre Julliard June 6, 2011

June 6, 2011

Module: wine Branch: master Commit: a63346aa40f2fab53db8bf2d96c2027c965edd35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a63346aa40f2fab53db8bf2d9… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jun 6 08:49:26 2011 -0500 wineoss.drv: Partially implement IAudioSessionManager2. --- dlls/wineoss.drv/mmdevdrv.c | 325 +++++++++++++++++++++++++++++-------- dlls/wineoss.drv/wineoss.drv.spec | 1 + 2 files changed, 259 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a63346aa40f2fab53db8b…

1 0

Andrew Eikum : mmdevapi: Add support for IAudioSessionManager in IMMDevice: :Activate.
by Alexandre Julliard June 6, 2011

June 6, 2011

Module: wine Branch: master Commit: 4e7d039722fa8f9c99ba7637aed5c988da87452b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e7d039722fa8f9c99ba7637a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jun 6 08:49:48 2011 -0500 mmdevapi: Add support for IAudioSessionManager in IMMDevice::Activate. --- dlls/mmdevapi/devenum.c | 2 +- dlls/mmdevapi/main.c | 1 + dlls/mmdevapi/mmdevapi.h | 2 + dlls/mmdevapi/tests/render.c | 105 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 109 insertions(+), 1 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index d2a4620..7f94917 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -547,7 +547,7 @@ static HRESULT WINAPI MMDevice_Activate(IMMDevice *iface, REFIID riid, DWORD cls else if (IsEqualIID(riid, &IID_IAudioSessionManager) || IsEqualIID(riid, &IID_IAudioSessionManager2)) { - FIXME("IID_IAudioSessionManager unsupported\n"); + hr = drvs.pGetAudioSessionManager(This->flow, (IAudioSessionManager2**)ppv); } else if (IsEqualIID(riid, &IID_IBaseFilter)) { diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index ed0039a..f65ea3a 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -75,6 +75,7 @@ static BOOL load_driver(const WCHAR *name) if(!drvs.p##n) { FreeLibrary(drvs.module); return FALSE; } } while(0) LDFC(GetEndpointIDs); LDFC(GetAudioEndpoint); + LDFC(GetAudioSessionManager); #undef LDFC TRACE("Successfully loaded %s\n", wine_dbgstr_w(driver_module)); diff --git a/dlls/mmdevapi/mmdevapi.h b/dlls/mmdevapi/mmdevapi.h index 9740395..f3a26b9 100644 --- a/dlls/mmdevapi/mmdevapi.h +++ b/dlls/mmdevapi/mmdevapi.h @@ -37,6 +37,8 @@ typedef struct _DriverFuncs { void ***keys, UINT *num, UINT *default_index); HRESULT WINAPI (*pGetAudioEndpoint)(void *key, IMMDevice *dev, EDataFlow dataflow, IAudioClient **out); + HRESULT WINAPI (*pGetAudioSessionManager)(EDataFlow flow, + IAudioSessionManager2 **out); } DriverFuncs; extern DriverFuncs drvs DECLSPEC_HIDDEN; diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 1e54dab..c0507fe 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -1213,6 +1213,110 @@ static void test_volume_dependence(void) IAudioClient_Release(ac); } +static void test_session_creation(void) +{ + IMMDevice *cap_dev; + IAudioClient *ac; + IAudioSessionManager *sesm; + ISimpleAudioVolume *sav; + GUID session_guid; + float vol; + HRESULT hr; + WAVEFORMATEX *fmt; + + CoCreateGuid(&session_guid); + + hr = IMMDevice_Activate(dev, &IID_IAudioSessionManager, + CLSCTX_INPROC_SERVER, NULL, (void**)&sesm); + ok(hr == S_OK, "Activate failed: %08x\n", hr); + + hr = IAudioSessionManager_GetSimpleAudioVolume(sesm, &session_guid, + FALSE, &sav); + ok(hr == S_OK, "GetSimpleAudioVolume failed: %08x\n", hr); + + hr = ISimpleAudioVolume_SetMasterVolume(sav, 0.6f, NULL); + ok(hr == S_OK, "SetMasterVolume failed: %08x\n", hr); + + /* Release completely to show session persistence */ + ISimpleAudioVolume_Release(sav); + IAudioSessionManager_Release(sesm); + + /* test if we can create a capture audioclient in the session we just + * created from a SessionManager derived from a render device */ + hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(mme, eCapture, + eMultimedia, &cap_dev); + if(hr == S_OK){ + WAVEFORMATEX *cap_pwfx; + IAudioClient *cap_ac; + ISimpleAudioVolume *cap_sav; + IAudioSessionManager *cap_sesm; + + hr = IMMDevice_Activate(cap_dev, &IID_IAudioSessionManager, + CLSCTX_INPROC_SERVER, NULL, (void**)&cap_sesm); + ok(hr == S_OK, "Activate failed: %08x\n", hr); + + hr = IAudioSessionManager_GetSimpleAudioVolume(cap_sesm, &session_guid, + FALSE, &cap_sav); + ok(hr == S_OK, "GetSimpleAudioVolume failed: %08x\n", hr); + + vol = 0.5f; + hr = ISimpleAudioVolume_GetMasterVolume(cap_sav, &vol); + ok(hr == S_OK, "GetMasterVolume failed: %08x\n", hr); + ok(vol == 1.f, "Got wrong volume: %f\n", vol); + + ISimpleAudioVolume_Release(cap_sav); + IAudioSessionManager_Release(cap_sesm); + + hr = IMMDevice_Activate(cap_dev, &IID_IAudioClient, + CLSCTX_INPROC_SERVER, NULL, (void**)&cap_ac); + ok(hr == S_OK, "Activate failed: %08x\n", hr); + + hr = IAudioClient_GetMixFormat(cap_ac, &cap_pwfx); + ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + + hr = IAudioClient_Initialize(cap_ac, AUDCLNT_SHAREMODE_SHARED, + 0, 5000000, 0, cap_pwfx, &session_guid); + ok(hr == S_OK, "Initialize failed: %08x\n", hr); + + hr = IAudioClient_GetService(cap_ac, &IID_ISimpleAudioVolume, + (void**)&cap_sav); + ok(hr == S_OK, "GetService failed: %08x\n", hr); + + vol = 0.5f; + hr = ISimpleAudioVolume_GetMasterVolume(cap_sav, &vol); + ok(hr == S_OK, "GetMasterVolume failed: %08x\n", hr); + ok(vol == 1.f, "Got wrong volume: %f\n", vol); + + CoTaskMemFree(cap_pwfx); + ISimpleAudioVolume_Release(cap_sav); + IAudioClient_Release(cap_ac); + IMMDevice_Release(cap_dev); + } + + hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, + NULL, (void**)&ac); + ok(hr == S_OK, "Activation failed with %08x\n", hr); + + hr = IAudioClient_GetMixFormat(ac, &fmt); + ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + + hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, + AUDCLNT_STREAMFLAGS_NOPERSIST, 5000000, 0, fmt, &session_guid); + ok(hr == S_OK, "Initialize failed: %08x\n", hr); + + hr = IAudioClient_GetService(ac, &IID_ISimpleAudioVolume, (void**)&sav); + ok(hr == S_OK, "GetService failed: %08x\n", hr); + + vol = 0.5f; + hr = ISimpleAudioVolume_GetMasterVolume(sav, &vol); + ok(hr == S_OK, "GetMasterVolume failed: %08x\n", hr); + ok(fabs(vol - 0.6f) < 0.05f, "Got wrong volume: %f\n", vol); + + CoTaskMemFree(fmt); + ISimpleAudioVolume_Release(sav); + IAudioClient_Release(ac); +} + START_TEST(render) { HRESULT hr; @@ -1246,6 +1350,7 @@ START_TEST(render) test_channelvolume(); test_simplevolume(); test_volume_dependence(); + test_session_creation(); IMMDevice_Release(dev);

1 0

Andrew Eikum : winecoreaudio.drv: Partially implement IAudioSessionManager2 .
by Alexandre Julliard June 6, 2011

June 6, 2011

Module: wine Branch: master Commit: 38d80c7310ccb3a86ad833c9e2d7a76c8252528b URL: http://source.winehq.org/git/wine.git/?a=commit;h=38d80c7310ccb3a86ad833c9e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jun 6 08:49:34 2011 -0500 winecoreaudio.drv: Partially implement IAudioSessionManager2. --- dlls/winecoreaudio.drv/mmdevdrv.c | 323 +++++++++++++++++++------ dlls/winecoreaudio.drv/winecoreaudio.drv.spec | 1 + 2 files changed, 255 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=38d80c7310ccb3a86ad83…

1 0

André Hentschel : include: Add PF_XSAVE_ENABLED.
by Alexandre Julliard June 6, 2011

June 6, 2011

Module: wine Branch: master Commit: 2680548086c6dd29aaebc27999d883dc0a0820b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2680548086c6dd29aaebc2799… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Jun 4 18:41:04 2011 +0200 include: Add PF_XSAVE_ENABLED. --- include/winnt.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index b4aa5a0..11f1ea2 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -777,6 +777,7 @@ typedef enum _HEAP_INFORMATION_CLASS { #define PF_COMPARE_EXCHANGE128 14 #define PF_COMPARE64_EXCHANGE128 15 #define PF_CHANNELS_ENABLED 16 +#define PF_XSAVE_ENABLED 17 /* Execution state flags */

1 0