January 2013 - Wine-commits

Henri Verbeet : ddraw: Avoid LPD3DRECT.
by Alexandre Julliard 02 Jan '13

02 Jan '13

Module: wine Branch: master Commit: 8f32358b0d7618eef2ead5a16a70b3a219f06706 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f32358b0d7618eef2ead5a16… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 2 12:07:25 2013 +0100 ddraw: Avoid LPD3DRECT. --- include/d3d.h | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 6dbf3d8..33fbd50 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -661,7 +661,7 @@ DECLARE_INTERFACE_(IDirect3DViewport,IUnknown) STDMETHOD(GetBackground)(THIS_ D3DMATERIALHANDLE *material, BOOL *valid) PURE; STDMETHOD(SetBackgroundDepth)(THIS_ IDirectDrawSurface *surface) PURE; STDMETHOD(GetBackgroundDepth)(THIS_ IDirectDrawSurface **surface, BOOL *valid) PURE; - STDMETHOD(Clear)(THIS_ DWORD dwCount, LPD3DRECT lpRects, DWORD dwFlags) PURE; + STDMETHOD(Clear)(THIS_ DWORD count, D3DRECT *rects, DWORD flags) PURE; STDMETHOD(AddLight)(THIS_ IDirect3DLight *light) PURE; STDMETHOD(DeleteLight)(THIS_ IDirect3DLight *light) PURE; STDMETHOD(NextLight)(THIS_ IDirect3DLight *ref, IDirect3DLight **light, DWORD flags) PURE; @@ -729,7 +729,7 @@ DECLARE_INTERFACE_(IDirect3DViewport2,IDirect3DViewport) STDMETHOD(GetBackground)(THIS_ D3DMATERIALHANDLE *material, BOOL *valid) PURE; STDMETHOD(SetBackgroundDepth)(THIS_ IDirectDrawSurface *surface) PURE; STDMETHOD(GetBackgroundDepth)(THIS_ IDirectDrawSurface **surface, BOOL *valid) PURE; - STDMETHOD(Clear)(THIS_ DWORD dwCount, LPD3DRECT lpRects, DWORD dwFlags) PURE; + STDMETHOD(Clear)(THIS_ DWORD count, D3DRECT *rects, DWORD flags) PURE; STDMETHOD(AddLight)(THIS_ IDirect3DLight *light) PURE; STDMETHOD(DeleteLight)(THIS_ IDirect3DLight *light) PURE; STDMETHOD(NextLight)(THIS_ IDirect3DLight *ref, IDirect3DLight **light, DWORD flags) PURE; @@ -805,7 +805,7 @@ DECLARE_INTERFACE_(IDirect3DViewport3,IDirect3DViewport2) STDMETHOD(GetBackground)(THIS_ D3DMATERIALHANDLE *material, BOOL *valid) PURE; STDMETHOD(SetBackgroundDepth)(THIS_ IDirectDrawSurface *surface) PURE; STDMETHOD(GetBackgroundDepth)(THIS_ IDirectDrawSurface **surface, BOOL *valid) PURE; - STDMETHOD(Clear)(THIS_ DWORD dwCount, LPD3DRECT lpRects, DWORD dwFlags) PURE; + STDMETHOD(Clear)(THIS_ DWORD count, D3DRECT *rects, DWORD flags) PURE; STDMETHOD(AddLight)(THIS_ IDirect3DLight *light) PURE; STDMETHOD(DeleteLight)(THIS_ IDirect3DLight *light) PURE; STDMETHOD(NextLight)(THIS_ IDirect3DLight *ref, IDirect3DLight **light, DWORD flags) PURE; @@ -815,7 +815,7 @@ DECLARE_INTERFACE_(IDirect3DViewport3,IDirect3DViewport2) /*** IDirect3DViewport3 methods ***/ STDMETHOD(SetBackgroundDepth2)(THIS_ IDirectDrawSurface4 *surface) PURE; STDMETHOD(GetBackgroundDepth2)(THIS_ IDirectDrawSurface4 **surface, BOOL *valid) PURE; - STDMETHOD(Clear2)(THIS_ DWORD dwCount,LPD3DRECT lpRects,DWORD dwFlags,DWORD dwColor,D3DVALUE dvZ,DWORD dwStencil) PURE; + STDMETHOD(Clear2)(THIS_ DWORD count, D3DRECT *rects, DWORD flags, DWORD color, D3DVALUE z, DWORD stencil) PURE; }; #undef INTERFACE @@ -1303,7 +1303,7 @@ DECLARE_INTERFACE_(IDirect3DDevice7,IUnknown) STDMETHOD(GetDirect3D)(THIS_ IDirect3D7 **d3d) PURE; STDMETHOD(SetRenderTarget)(THIS_ IDirectDrawSurface7 *surface, DWORD flags) PURE; STDMETHOD(GetRenderTarget)(THIS_ IDirectDrawSurface7 **surface) PURE; - STDMETHOD(Clear)(THIS_ DWORD dwCount,LPD3DRECT lpRects,DWORD dwFlags,D3DCOLOR dwColor,D3DVALUE dvZ,DWORD dwStencil) PURE; + STDMETHOD(Clear)(THIS_ DWORD count, D3DRECT *rects, DWORD flags, D3DCOLOR color, D3DVALUE z, DWORD stencil) PURE; STDMETHOD(SetTransform)(THIS_ D3DTRANSFORMSTATETYPE dtstTransformStateType, LPD3DMATRIX lpD3DMatrix) PURE; STDMETHOD(GetTransform)(THIS_ D3DTRANSFORMSTATETYPE dtstTransformStateType, LPD3DMATRIX lpD3DMatrix) PURE; STDMETHOD(SetViewport)(THIS_ LPD3DVIEWPORT7 lpData) PURE;

1 0

Henri Verbeet : d3d10core: Implement d3d10_rasterizer_state_GetDesc().
by Alexandre Julliard 02 Jan '13

02 Jan '13

Module: wine Branch: master Commit: 4f9814c5368cdbf4d3d745a34158e59a1f38defa URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f9814c5368cdbf4d3d745a34… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 2 12:07:26 2013 +0100 d3d10core: Implement d3d10_rasterizer_state_GetDesc(). --- dlls/d3d10core/d3d10core_private.h | 5 ++++- dlls/d3d10core/device.c | 6 ++++-- dlls/d3d10core/state.c | 9 +++++++-- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index b5ba293..ede3b7a 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -247,9 +247,12 @@ struct d3d10_rasterizer_state { ID3D10RasterizerState ID3D10RasterizerState_iface; LONG refcount; + + D3D10_RASTERIZER_DESC desc; }; -HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state) DECLSPEC_HIDDEN; +HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state, + const D3D10_RASTERIZER_DESC *desc) DECLSPEC_HIDDEN; struct d3d10_rasterizer_state *unsafe_impl_from_ID3D10RasterizerState(ID3D10RasterizerState *iface) DECLSPEC_HIDDEN; /* ID3D10SamplerState */ diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index bcf49da..3542d53 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1480,6 +1480,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRasterizerState(ID3D10Device TRACE("iface %p, desc %p, rasterizer_state %p.\n", iface, desc, rasterizer_state); + if (!desc) + return E_INVALIDARG; + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { @@ -1487,8 +1490,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRasterizerState(ID3D10Device return E_OUTOFMEMORY; } - hr = d3d10_rasterizer_state_init(object); - if (FAILED(hr)) + if (FAILED(hr = d3d10_rasterizer_state_init(object, desc))) { WARN("Failed to initialize rasterizer state, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index b2aebdc..f49875d 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -392,7 +392,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_SetPrivateDataInterface( static void STDMETHODCALLTYPE d3d10_rasterizer_state_GetDesc(ID3D10RasterizerState *iface, D3D10_RASTERIZER_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3d10_rasterizer_state *state = impl_from_ID3D10RasterizerState(iface); + + TRACE("iface %p, desc %p.\n", iface, desc); + + *desc = state->desc; } static const struct ID3D10RasterizerStateVtbl d3d10_rasterizer_state_vtbl = @@ -410,10 +414,11 @@ static const struct ID3D10RasterizerStateVtbl d3d10_rasterizer_state_vtbl = d3d10_rasterizer_state_GetDesc, }; -HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state) +HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state, const D3D10_RASTERIZER_DESC *desc) { state->ID3D10RasterizerState_iface.lpVtbl = &d3d10_rasterizer_state_vtbl; state->refcount = 1; + state->desc = *desc; return S_OK; }

1 0

Henri Verbeet : d3d10core: Only create unique rasterizer state objects.
by Alexandre Julliard 02 Jan '13

02 Jan '13

Module: wine Branch: master Commit: 5d38662235aa5d89e0b3754fbbc8c2df36838367 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d38662235aa5d89e0b3754fb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 2 12:07:27 2013 +0100 d3d10core: Only create unique rasterizer state objects. --- dlls/d3d10core/d3d10core_private.h | 5 +++- dlls/d3d10core/device.c | 42 +++++++++++++++++++++++++++++++++++- dlls/d3d10core/state.c | 19 ++++++++++++---- 3 files changed, 59 insertions(+), 7 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index ede3b7a..a859642 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -248,10 +248,12 @@ struct d3d10_rasterizer_state ID3D10RasterizerState ID3D10RasterizerState_iface; LONG refcount; + struct d3d10_device *device; D3D10_RASTERIZER_DESC desc; + struct wine_rb_entry entry; }; -HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state, +HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state, struct d3d10_device *device, const D3D10_RASTERIZER_DESC *desc) DECLSPEC_HIDDEN; struct d3d10_rasterizer_state *unsafe_impl_from_ID3D10RasterizerState(ID3D10RasterizerState *iface) DECLSPEC_HIDDEN; @@ -294,6 +296,7 @@ struct d3d10_device struct wine_rb_tree blend_states; struct wine_rb_tree depthstencil_states; + struct wine_rb_tree rasterizer_states; struct wine_rb_tree sampler_states; struct d3d10_blend_state *blend_state; diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 3542d53..4783781 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -82,6 +82,7 @@ static ULONG STDMETHODCALLTYPE d3d10_device_inner_Release(IUnknown *iface) if (device->wined3d_device) wined3d_device_decref(device->wined3d_device); wine_rb_destroy(&device->sampler_states, NULL, NULL); + wine_rb_destroy(&device->rasterizer_states, NULL, NULL); wine_rb_destroy(&device->depthstencil_states, NULL, NULL); wine_rb_destroy(&device->blend_states, NULL, NULL); } @@ -1475,7 +1476,9 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilState(ID3D10Devi static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRasterizerState(ID3D10Device *iface, const D3D10_RASTERIZER_DESC *desc, ID3D10RasterizerState **rasterizer_state) { + struct d3d10_device *device = impl_from_ID3D10Device(iface); struct d3d10_rasterizer_state *object; + struct wine_rb_entry *entry; HRESULT hr; TRACE("iface %p, desc %p, rasterizer_state %p.\n", iface, desc, rasterizer_state); @@ -1483,6 +1486,18 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRasterizerState(ID3D10Device if (!desc) return E_INVALIDARG; + if ((entry = wine_rb_get(&device->rasterizer_states, desc))) + { + object = WINE_RB_ENTRY_VALUE(entry, struct d3d10_rasterizer_state, entry); + + TRACE("Returning existing rasterizer state %p.\n", object); + *rasterizer_state = &object->ID3D10RasterizerState_iface; + ID3D10RasterizerState_AddRef(*rasterizer_state); + + return S_OK; + } + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) { @@ -1490,7 +1505,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRasterizerState(ID3D10Device return E_OUTOFMEMORY; } - if (FAILED(hr = d3d10_rasterizer_state_init(object, desc))) + if (FAILED(hr = d3d10_rasterizer_state_init(object, device, desc))) { WARN("Failed to initialize rasterizer state, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); @@ -2020,6 +2035,22 @@ static const struct wine_rb_functions d3d10_depthstencil_state_rb_ops = d3d10_depthstencil_state_compare, }; +static int d3d10_rasterizer_state_compare(const void *key, const struct wine_rb_entry *entry) +{ + const D3D10_RASTERIZER_DESC *ka = key; + const D3D10_RASTERIZER_DESC *kb = &WINE_RB_ENTRY_VALUE(entry, const struct d3d10_rasterizer_state, entry)->desc; + + return memcmp(ka, kb, sizeof(*ka)); +} + +static const struct wine_rb_functions d3d10_rasterizer_state_rb_ops = +{ + d3d10_rb_alloc, + d3d10_rb_realloc, + d3d10_rb_free, + d3d10_rasterizer_state_compare, +}; + HRESULT d3d10_device_init(struct d3d10_device *device, void *outer_unknown) { device->ID3D10Device_iface.lpVtbl = &d3d10_device_vtbl; @@ -2043,9 +2074,18 @@ HRESULT d3d10_device_init(struct d3d10_device *device, void *outer_unknown) return E_FAIL; } + if (wine_rb_init(&device->rasterizer_states, &d3d10_rasterizer_state_rb_ops) == -1) + { + WARN("Failed to initialize rasterizer state rbtree.\n"); + wine_rb_destroy(&device->depthstencil_states, NULL, NULL); + wine_rb_destroy(&device->blend_states, NULL, NULL); + return E_FAIL; + } + if (wine_rb_init(&device->sampler_states, &d3d10_sampler_state_rb_ops) == -1) { WARN("Failed to initialize sampler state rbtree.\n"); + wine_rb_destroy(&device->rasterizer_states, NULL, NULL); wine_rb_destroy(&device->depthstencil_states, NULL, NULL); wine_rb_destroy(&device->blend_states, NULL, NULL); return E_FAIL; diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c index f49875d..f0d162b 100644 --- a/dlls/d3d10core/state.c +++ b/dlls/d3d10core/state.c @@ -341,14 +341,15 @@ static ULONG STDMETHODCALLTYPE d3d10_rasterizer_state_AddRef(ID3D10RasterizerSta static ULONG STDMETHODCALLTYPE d3d10_rasterizer_state_Release(ID3D10RasterizerState *iface) { - struct d3d10_rasterizer_state *This = impl_from_ID3D10RasterizerState(iface); - ULONG refcount = InterlockedDecrement(&This->refcount); + struct d3d10_rasterizer_state *state = impl_from_ID3D10RasterizerState(iface); + ULONG refcount = InterlockedDecrement(&state->refcount); - TRACE("%p decreasing refcount to %u.\n", This, refcount); + TRACE("%p decreasing refcount to %u.\n", state, refcount); if (!refcount) { - HeapFree(GetProcessHeap(), 0, This); + wine_rb_remove(&state->device->rasterizer_states, &state->desc); + HeapFree(GetProcessHeap(), 0, state); } return refcount; @@ -414,12 +415,20 @@ static const struct ID3D10RasterizerStateVtbl d3d10_rasterizer_state_vtbl = d3d10_rasterizer_state_GetDesc, }; -HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state, const D3D10_RASTERIZER_DESC *desc) +HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state, struct d3d10_device *device, + const D3D10_RASTERIZER_DESC *desc) { state->ID3D10RasterizerState_iface.lpVtbl = &d3d10_rasterizer_state_vtbl; state->refcount = 1; + state->device = device; state->desc = *desc; + if (wine_rb_put(&device->rasterizer_states, desc, &state->entry) == -1) + { + ERR("Failed to insert rasterizer state entry.\n"); + return E_FAIL; + } + return S_OK; }

1 0

Henri Verbeet : d3d10core/tests: Add a small test for ID3D10Device_CreateRasterizerState().
by Alexandre Julliard 02 Jan '13

02 Jan '13

Module: wine Branch: master Commit: 8e9f0af2a91bc68fb26aa2192a99e7626f6fa2e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e9f0af2a91bc68fb26aa2192… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 2 12:07:28 2013 +0100 d3d10core/tests: Add a small test for ID3D10Device_CreateRasterizerState(). --- dlls/d3d10core/tests/device.c | 44 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index b045c50..1ed99a0 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -719,6 +719,49 @@ static void test_create_depthstencil_state(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_create_rasterizer_state(void) +{ + ID3D10RasterizerState *rast_state1, *rast_state2; + D3D10_RASTERIZER_DESC rast_desc; + ID3D10Device *device; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + hr = ID3D10Device_CreateRasterizerState(device, NULL, &rast_state1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + rast_desc.FillMode = D3D10_FILL_SOLID; + rast_desc.CullMode = D3D10_CULL_BACK; + rast_desc.FrontCounterClockwise = FALSE; + rast_desc.DepthBias = 0; + rast_desc.DepthBiasClamp = 0.0f; + rast_desc.SlopeScaledDepthBias = 0.0f; + rast_desc.DepthClipEnable = TRUE; + rast_desc.ScissorEnable = FALSE; + rast_desc.MultisampleEnable = FALSE; + rast_desc.AntialiasedLineEnable = FALSE; + + hr = ID3D10Device_CreateRasterizerState(device, &rast_desc, &rast_state1); + ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); + hr = ID3D10Device_CreateRasterizerState(device, &rast_desc, &rast_state2); + ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); + ok(rast_state1 == rast_state2, "Got different rasterizer state objects.\n"); + + refcount = ID3D10RasterizerState_Release(rast_state2); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + refcount = ID3D10RasterizerState_Release(rast_state1); + ok(!refcount, "Got unexpected refcount %u.\n", refcount); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(device) { test_device_interfaces(); @@ -731,4 +774,5 @@ START_TEST(device) test_create_sampler_state(); test_create_blend_state(); test_create_depthstencil_state(); + test_create_rasterizer_state(); }

1 0

Hans Leidekker : winhttp/tests: Accept another error from WinHttpGetProxyForUrl.
by Alexandre Julliard 02 Jan '13

02 Jan '13

Module: wine Branch: master Commit: 8d0551b98d8161b0664eeb78fae2cfcf50f3ccb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d0551b98d8161b0664eeb78f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 2 13:05:57 2013 +0100 winhttp/tests: Accept another error from WinHttpGetProxyForUrl. --- dlls/winhttp/tests/winhttp.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 05e7804..132551c 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2697,7 +2697,8 @@ static void test_WinHttpGetProxyForUrl(void) SetLastError(0xdeadbeef); ret = WinHttpGetProxyForUrl( session, urlW, &options, &info ); error = GetLastError(); - if (!ret) ok( error == ERROR_WINHTTP_AUTODETECTION_FAILED, "got %u\n", error ); + if (!ret) ok( error == ERROR_WINHTTP_AUTODETECTION_FAILED || + error == ERROR_WINHTTP_UNABLE_TO_DOWNLOAD_SCRIPT, "got %u\n", error ); else { trace("Proxy.AccessType=%u\n", info.dwAccessType);

1 0

Andrew Eikum : winmm: Don't map the device if WAVE_FORMAT_DIRECT is given.
by Alexandre Julliard 02 Jan '13

02 Jan '13

Module: wine Branch: master Commit: 93348b21f7fb4946d46d2006a9f8075e5fbfc0dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=93348b21f7fb4946d46d2006a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Dec 28 15:37:39 2012 -0600 winmm: Don't map the device if WAVE_FORMAT_DIRECT is given. --- dlls/winmm/waveform.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 207b6ca..ec230c9 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -1137,7 +1137,7 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_OpenInfo *info, AUDCLNT_STREAMFLAGS_EVENTCALLBACK | AUDCLNT_STREAMFLAGS_NOPERSIST, AC_BUFLEN, 0, device->orig_fmt, &device->parent->session); if(FAILED(hr)){ - if(hr == AUDCLNT_E_UNSUPPORTED_FORMAT){ + if(hr == AUDCLNT_E_UNSUPPORTED_FORMAT && !(info->flags & WAVE_FORMAT_DIRECT)){ ret = WINMM_MapDevice(device, is_out); if(ret != MMSYSERR_NOERROR || info->flags & WAVE_FORMAT_QUERY) goto error;

1 0