September 2015 - Wine-commits

Józef Kucia : d3d10core/tests: Port test_depthstencil_view_interfaces() from d3d11.
by Alexandre Julliard 14 Sep '15

14 Sep '15

Module: wine Branch: master Commit: fbf7b84d10175798cac19fe9e5f980593671f163 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbf7b84d10175798cac19fe9e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 14 00:13:31 2015 +0200 d3d10core/tests: Port test_depthstencil_view_interfaces() from d3d11. --- dlls/d3d10core/tests/device.c | 69 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index ebe50cc..e24cc94 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -704,6 +704,74 @@ static void test_create_depthstencil_view(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_depthstencil_view_interfaces(void) +{ + D3D11_DEPTH_STENCIL_VIEW_DESC d3d11_dsv_desc; + D3D10_DEPTH_STENCIL_VIEW_DESC dsv_desc; + ID3D11DepthStencilView *d3d11_dsview; + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10DepthStencilView *dsview; + ID3D10Texture2D *texture; + ID3D10Device *device; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + texture_desc.Width = 512; + texture_desc.Height = 512; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_D24_UNORM_S8_UINT; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + texture_desc.BindFlags = D3D10_BIND_DEPTH_STENCIL; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x.\n", hr); + + dsv_desc.Format = texture_desc.Format; + dsv_desc.ViewDimension = D3D10_DSV_DIMENSION_TEXTURE2D; + U(dsv_desc).Texture2D.MipSlice = 0; + + hr = ID3D10Device_CreateDepthStencilView(device, (ID3D10Resource *)texture, &dsv_desc, &dsview); + ok(SUCCEEDED(hr), "Failed to create a depthstencil view, hr %#x.\n", hr); + + hr = ID3D10DepthStencilView_QueryInterface(dsview, &IID_ID3D11DepthStencilView, (void **)&d3d11_dsview); + ID3D10DepthStencilView_Release(dsview); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Depth stencil view should implement ID3D11DepthStencilView.\n"); + + if (SUCCEEDED(hr)) + { + ID3D11DepthStencilView_GetDesc(d3d11_dsview, &d3d11_dsv_desc); + ok(d3d11_dsv_desc.Format == dsv_desc.Format, "Got unexpected format %#x.\n", d3d11_dsv_desc.Format); + ok(d3d11_dsv_desc.ViewDimension == (D3D11_DSV_DIMENSION)dsv_desc.ViewDimension, + "Got unexpected view dimension %u.\n", d3d11_dsv_desc.ViewDimension); + ok(!d3d11_dsv_desc.Flags, "Got unexpected flags %#x.\n", d3d11_dsv_desc.Flags); + ok(U(d3d11_dsv_desc).Texture2D.MipSlice == U(dsv_desc).Texture2D.MipSlice, + "Got unexpected mip slice %u.\n", U(d3d11_dsv_desc).Texture2D.MipSlice); + + ID3D11DepthStencilView_Release(d3d11_dsview); + } + else + { + win_skip("D3D11 is not available.\n"); + } + + ID3D10Texture2D_Release(texture); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + static void test_create_rendertarget_view(void) { D3D10_RENDER_TARGET_VIEW_DESC rtv_desc; @@ -3738,6 +3806,7 @@ START_TEST(device) test_create_texture3d(); test_buffer_interfaces(); test_create_depthstencil_view(); + test_depthstencil_view_interfaces(); test_create_rendertarget_view(); test_create_shader_resource_view(); test_create_shader();

1 0

Józef Kucia : d3d10core/tests: Check that shader resource view implements ID3D11ShaderResourceView.
by Alexandre Julliard 14 Sep '15

14 Sep '15

Module: wine Branch: master Commit: 6d916dc3e5a4aeb432bc27ef11b7d6c4c465192c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d916dc3e5a4aeb432bc27ef1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 14 00:13:33 2015 +0200 d3d10core/tests: Check that shader resource view implements ID3D11ShaderResourceView. --- dlls/d3d10core/tests/device.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 836da96..ec835ab 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -887,6 +887,7 @@ static void test_create_shader_resource_view(void) ID3D10Device *device, *tmp; ID3D10Texture2D *texture; ID3D10Buffer *buffer; + IUnknown *iface; HRESULT hr; if (!(device = create_device())) @@ -925,6 +926,11 @@ static void test_create_shader_resource_view(void) ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); ID3D10Device_Release(tmp); + hr = ID3D10ShaderResourceView_QueryInterface(srview, &IID_ID3D11ShaderResourceView, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Shader resource view should implement ID3D11ShaderResourceView.\n"); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + ID3D10ShaderResourceView_Release(srview); ID3D10Buffer_Release(buffer); @@ -954,6 +960,11 @@ static void test_create_shader_resource_view(void) U(srv_desc).Texture2D.MostDetailedMip); ok(U(srv_desc).Texture2D.MipLevels == 10, "Got unexpected MipLevels %u.\n", U(srv_desc).Texture2D.MipLevels); + hr = ID3D10ShaderResourceView_QueryInterface(srview, &IID_ID3D11ShaderResourceView, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Shader resource view should implement ID3D11ShaderResourceView.\n"); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + ID3D10ShaderResourceView_Release(srview); ID3D10Texture2D_Release(texture);

1 0

Józef Kucia : d3d11/tests: Port test_create_depthstencil_view() from d3d10core.
by Alexandre Julliard 14 Sep '15

14 Sep '15

Module: wine Branch: master Commit: e0bd44583ccb3493f395f98e4a7a72d9114bc825 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0bd44583ccb3493f395f98e4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 14 00:13:34 2015 +0200 d3d11/tests: Port test_create_depthstencil_view() from d3d10core. --- dlls/d3d11/tests/d3d11.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 8bf31dc..44e1550 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -815,6 +815,64 @@ static void test_buffer_interfaces(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_create_depthstencil_view(void) +{ + D3D11_DEPTH_STENCIL_VIEW_DESC dsv_desc; + D3D11_TEXTURE2D_DESC texture_desc; + ULONG refcount, expected_refcount; + ID3D11DepthStencilView *dsview; + ID3D11Device *device, *tmp; + ID3D11Texture2D *texture; + HRESULT hr; + + if (!(device = create_device(NULL))) + { + skip("Failed to create device.\n"); + return; + } + + texture_desc.Width = 512; + texture_desc.Height = 512; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_D24_UNORM_S8_UINT; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_DEPTH_STENCIL; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x.\n", hr); + + expected_refcount = get_refcount((IUnknown *)device) + 1; + hr = ID3D11Device_CreateDepthStencilView(device, (ID3D11Resource *)texture, NULL, &dsview); + ok(SUCCEEDED(hr), "Failed to create a depthstencil view, hr %#x.\n", hr); + refcount = get_refcount((IUnknown *)device); + ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); + tmp = NULL; + expected_refcount = refcount + 1; + ID3D11DepthStencilView_GetDevice(dsview, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ID3D11Device_Release(tmp); + + ID3D11DepthStencilView_GetDesc(dsview, &dsv_desc); + ok(dsv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", dsv_desc.Format); + ok(dsv_desc.ViewDimension == D3D11_DSV_DIMENSION_TEXTURE2D, + "Got unexpected view dimension %#x.\n", dsv_desc.ViewDimension); + ok(!dsv_desc.Flags, "Got unexpected flags %#x.\n", dsv_desc.Flags); + ok(U(dsv_desc).Texture2D.MipSlice == 0, "Got Unexpected mip slice %u.\n", U(dsv_desc).Texture2D.MipSlice); + + ID3D11DepthStencilView_Release(dsview); + ID3D11Texture2D_Release(texture); + + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + static void test_depthstencil_view_interfaces(void) { D3D10_DEPTH_STENCIL_VIEW_DESC d3d10_dsv_desc; @@ -1094,6 +1152,7 @@ START_TEST(d3d11) test_create_texture3d(); test_texture3d_interfaces(); test_buffer_interfaces(); + test_create_depthstencil_view(); test_depthstencil_view_interfaces(); test_create_rendertarget_view(); test_create_shader_resource_view();

1 0

Józef Kucia : dxgi/tests: Check that DXGI surface implements ID3D11Texture2D.
by Alexandre Julliard 14 Sep '15

14 Sep '15

Module: wine Branch: master Commit: cee4d0bb9151fc5361d36e36094c7d08c577af7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cee4d0bb9151fc5361d36e360… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 14 00:13:38 2015 +0200 dxgi/tests: Check that DXGI surface implements ID3D11Texture2D. --- dlls/dxgi/tests/device.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index d6db790..fe2c453 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -172,10 +172,10 @@ done: static void test_create_surface(void) { - ID3D10Texture2D *texture; - IDXGISurface *surface; DXGI_SURFACE_DESC desc; + IDXGISurface *surface; IDXGIDevice *device; + IUnknown *texture; ULONG refcount; HRESULT hr; @@ -196,7 +196,12 @@ static void test_create_surface(void) hr = IDXGISurface_QueryInterface(surface, &IID_ID3D10Texture2D, (void **)&texture); ok(SUCCEEDED(hr), "Surface should implement ID3D10Texture2D\n"); - if (SUCCEEDED(hr)) ID3D10Texture2D_Release(texture); + IUnknown_Release(texture); + + hr = IDXGISurface_QueryInterface(surface, &IID_ID3D11Texture2D, (void **)&texture); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Surface should implement ID3D11Texture2D.\n"); + if (SUCCEEDED(hr)) IUnknown_Release(texture); IDXGISurface_Release(surface); refcount = IDXGIDevice_Release(device);

1 0

Józef Kucia : dxgi/tests: Add missing DestroyWindow() call in test_createswapchain().
by Alexandre Julliard 14 Sep '15

14 Sep '15

Module: wine Branch: master Commit: 7d9049c2dfdbb9cd6e44bbcee5bc52ed79a2ee5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d9049c2dfdbb9cd6e44bbcee… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 14 00:13:39 2015 +0200 dxgi/tests: Add missing DestroyWindow() call in test_createswapchain(). --- dlls/dxgi/tests/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index fe2c453..1e9507f 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -520,6 +520,7 @@ static void test_createswapchain(void) IUnknown_Release(obj); refcount = IDXGIDevice_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(creation_desc.OutputWindow); } static void test_create_factory(void)

1 0

Alexandre Julliard : include: Avoid some type redefinitions.
by Alexandre Julliard 14 Sep '15

14 Sep '15

Module: wine Branch: master Commit: b30517defd743f4295eaada3a7eabe98f31a395a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b30517defd743f4295eaada3a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 14 16:19:14 2015 +0900 include: Avoid some type redefinitions. --- include/webservices.h | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/include/webservices.h b/include/webservices.h index 744bee4..0a8b206 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -25,10 +25,11 @@ extern "C" { typedef struct _WS_ERROR WS_ERROR; typedef struct _WS_HEAP WS_HEAP; -typedef struct _WS_STRUCT_DESCRIPTION WS_STRUCT_DESCRIPTION; typedef struct _WS_XML_BUFFER WS_XML_BUFFER; typedef struct _WS_XML_READER WS_XML_READER; -typedef struct _WS_XML_STRING WS_XML_STRING; + +struct _WS_STRUCT_DESCRIPTION; +struct _WS_XML_STRING; typedef enum { WS_ERROR_PROPERTY_STRING_COUNT, @@ -140,10 +141,10 @@ typedef struct _WS_XML_READER_STREAM_INPUT { } WS_XML_READER_STREAM_INPUT; typedef struct _WS_XML_DICTIONARY { - GUID guid; - WS_XML_STRING *strings; - ULONG stringCount; - BOOL isConst; + GUID guid; + struct _WS_XML_STRING *strings; + ULONG stringCount; + BOOL isConst; } WS_XML_DICTIONARY; typedef struct _WS_XML_STRING { @@ -254,8 +255,8 @@ typedef struct _WS_STRUCT_DESCRIPTION { ULONG fieldCount; WS_XML_STRING *typeLocalName; WS_XML_STRING *typeNs; - WS_STRUCT_DESCRIPTION *parentType; - WS_STRUCT_DESCRIPTION **subTypes; + struct _WS_STRUCT_DESCRIPTION *parentType; + struct _WS_STRUCT_DESCRIPTION **subTypes; ULONG subTypeCount; ULONG structOptions; } WS_STRUCT_DESCRIPTION;

1 0

Piotr Caban : msi/tests: Fix MsiProvideQualifiedComponent test failure.
by Alexandre Julliard 14 Sep '15

14 Sep '15

Module: wine Branch: master Commit: f326e372d113332cb238584350b11702ec0b28a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f326e372d113332cb23858435… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 11 16:33:33 2015 +0200 msi/tests: Fix MsiProvideQualifiedComponent test failure. --- dlls/msi/tests/action.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 2aa5b0b..05e3b1e 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -5902,9 +5902,8 @@ static void test_publish_components(void) res = RegDeleteKeyA(HKEY_CURRENT_USER, keypath); ok(res == ERROR_SUCCESS, "RegDeleteKey failed %d\n", res); - res = RegCreateKeyA(HKEY_LOCAL_MACHINE, keypath2, &key); - ok(res == ERROR_SUCCESS, "RegCreateKey failed %d\n", res); - + res = RegCreateKeyExA(HKEY_LOCAL_MACHINE, keypath2, 0, NULL, REG_OPTION_NON_VOLATILE, + MAXIMUM_ALLOWED | KEY_WOW64_64KEY, NULL, &key, NULL ); res = RegSetValueExA(key, "english.txt", 0, REG_MULTI_SZ, data, size); ok(res == ERROR_SUCCESS, "RegSetValueEx failed %d\n", res); RegCloseKey(key); @@ -5914,7 +5913,10 @@ static void test_publish_components(void) "english.txt", INSTALLMODE_DEFAULT, NULL, &size); ok(r == ERROR_SUCCESS, "MsiProvideQualifiedCompontent returned %d\n", r); - res = RegDeleteKeyA(HKEY_LOCAL_MACHINE, keypath2); + if (pRegDeleteKeyExA) + res = pRegDeleteKeyExA(HKEY_LOCAL_MACHINE, keypath2, KEY_WOW64_64KEY, 0); + else + res = RegDeleteKeyA(HKEY_LOCAL_MACHINE, keypath2); ok(res == ERROR_SUCCESS, "RegDeleteKey failed %d\n", res); res = RegCreateKeyA(HKEY_CURRENT_USER, keypath, &key);

1 0

Andrew Eikum : xaudio2: Don' t keep running after master voice is destroyed.
by Alexandre Julliard 14 Sep '15

14 Sep '15

Module: wine Branch: master Commit: 4c8ed8d104bcdb6cb71bc9a73d1d7dd6e9a2f6bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c8ed8d104bcdb6cb71bc9a73… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Sep 11 10:55:50 2015 -0500 xaudio2: Don't keep running after master voice is destroyed. --- dlls/xaudio2_7/xaudio_dll.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 739c919..ce7a15b 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1188,6 +1188,8 @@ static void WINAPI XA2M_DestroyVoice(IXAudio2MasteringVoice *iface) return; } + This->running = FALSE; + IAudioRenderClient_Release(This->render); This->render = NULL; @@ -3068,11 +3070,13 @@ static DWORD WINAPI engine_threadproc(void *arg) if(This->stop_engine) break; - if(!This->running) - continue; - EnterCriticalSection(&This->lock); + if(!This->running || !This->aclient){ + LeaveCriticalSection(&This->lock); + continue; + } + do_engine_tick(This); LeaveCriticalSection(&This->lock);

1 0

Andrew Eikum : xaudio2: Quiet down some noisy stubs.
by Alexandre Julliard 14 Sep '15

14 Sep '15

Module: wine Branch: master Commit: 031af2ca9aa82ac4cd2c9222b4d37e7c1a137973 URL: http://source.winehq.org/git/wine.git/?a=commit;h=031af2ca9aa82ac4cd2c9222b… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Sep 11 10:55:55 2015 -0500 xaudio2: Quiet down some noisy stubs. --- dlls/xaudio2_7/xaudio_dll.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index ce7a15b..e68f1b6 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1964,7 +1964,7 @@ static HRESULT WINAPI IXAudio2Impl_CommitChanges(IXAudio2 *iface, { IXAudio2Impl *This = impl_from_IXAudio2(iface); - FIXME("(%p)->(0x%x): stub!\n", This, operationSet); + TRACE("(%p)->(0x%x): stub!\n", This, operationSet); return E_NOTIMPL; } @@ -1974,7 +1974,7 @@ static void WINAPI IXAudio2Impl_GetPerformanceData(IXAudio2 *iface, { IXAudio2Impl *This = impl_from_IXAudio2(iface); - FIXME("(%p)->(%p): stub!\n", This, pPerfData); + TRACE("(%p)->(%p): stub!\n", This, pPerfData); memset(pPerfData, 0, sizeof(*pPerfData)); }

1 0

Francois Gouget : dissect: Raise the new platforms' failed tests limit so they get a chance to improve.
by Alexandre Julliard 14 Sep '15

14 Sep '15

Module: tools Branch: master Commit: f108c92f2cf6c03737f42d955cb7deea49f529ad URL: http://source.winehq.org/git/tools.git/?a=commit;h=f108c92f2cf6c03737f42d95… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 13 15:56:28 2015 +0200 dissect: Raise the new platforms' failed tests limit so they get a chance to improve. New platforms typically have so many test failures that their results are ignored. But developers cannot fix test failures they are not aware of, resulting in slow progress. So temporarily cut some slack to the new platforms. --- winetest/dissect | 2 ++ 1 file changed, 2 insertions(+) diff --git a/winetest/dissect b/winetest/dissect index 7a40234..067fa7b 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -216,6 +216,8 @@ if ($plid==1 && $major==4) { } elsif ($plid==3) { #$version = "ce$major$minor"; } +# Give a little slack to the new platforms. +$maxfailedtests += 20 if ($version eq "win8" || $version eq "win10"); if ($prediluvian and not $acceptprediluvianwin) { mydie "platform $version not accepted\n"; }

1 0