April 2016 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : d3d11: Support NULL RenderTargetView pointer in ClearRenderTargetView.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: master Commit: f3bbf32381c4a82c8ed58dbba2bdb3967c8cbe3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3bbf32381c4a82c8ed58dbba… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Apr 12 10:22:29 2016 +0000 d3d11: Support NULL RenderTargetView pointer in ClearRenderTargetView. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 3 +++ dlls/d3d11/tests/d3d11.c | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index c59e5a9..4f24c48 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -967,6 +967,9 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ClearRenderTargetView(ID3D TRACE("iface %p, render_target_view %p, color_rgba %s.\n", iface, render_target_view, debug_float4(color_rgba)); + if (!view) + return; + wined3d_mutex_lock(); if (FAILED(hr = wined3d_device_clear_rendertarget_view(device->wined3d_device, view->wined3d_view, NULL, WINED3DCLEAR_TARGET, &color, 0.0f, 0))) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index a844c11..ee7103d 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -5824,6 +5824,7 @@ static void test_clear_render_target_view(void) { static const DWORD expected_color = 0xbf4c7f19, expected_srgb_color = 0xbf95bc59; static const float color[] = {0.1f, 0.5f, 0.3f, 0.75f}; + static const float green[] = {0.0f, 1.0f, 0.0f, 0.5f}; ID3D11Texture2D *texture, *srgb_texture; struct d3d11_test_context test_context; @@ -5870,6 +5871,9 @@ static void test_clear_render_target_view(void) ID3D11DeviceContext_ClearRenderTargetView(context, rtv, color); check_texture_color(texture, expected_color, 1); + ID3D11DeviceContext_ClearRenderTargetView(context, NULL, green); + check_texture_color(texture, expected_color, 1); + ID3D11DeviceContext_ClearRenderTargetView(context, srgb_rtv, color); check_texture_color(srgb_texture, expected_srgb_color, 1);

1 0

Józef Kucia : dxgi/tests: Add tests for reference counting.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: master Commit: 6061d909ad99502bae8223e6d6ef289d8e1b7926 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6061d909ad99502bae8223e6d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 12 12:29:36 2016 +0200 dxgi/tests: Add tests for reference counting. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/device.c | 38 +++++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 1e4022e..b92d3cc 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -1284,11 +1284,12 @@ static void test_maximum_frame_latency(void) static void test_output_desc(void) { + IDXGIAdapter *adapter, *adapter2; + IDXGIOutput *output, *output2; DXGI_OUTPUT_DESC desc; IDXGIFactory *factory; - IDXGIAdapter *adapter; - IDXGIOutput *output; unsigned int i, j; + ULONG refcount; HRESULT hr; hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory); @@ -1301,6 +1302,18 @@ static void test_output_desc(void) break; ok(SUCCEEDED(hr), "Failed to enumerate adapter %u, hr %#x.\n", i, hr); + hr = IDXGIFactory_EnumAdapters(factory, i, &adapter2); + ok(SUCCEEDED(hr), "Failed to enumerate adapter %u, hr %#x.\n", i, hr); + todo_wine ok(adapter != adapter2, "Expected to get new instance of IDXGIAdapter, %p == %p.\n", adapter, adapter2); + refcount = get_refcount((IUnknown *)adapter); + todo_wine ok(refcount == 1, "Get unexpected refcount %u for adapter %u.\n", refcount, i); + IDXGIAdapter_Release(adapter2); + + refcount = get_refcount((IUnknown *)factory); + todo_wine ok(refcount == 2, "Get unexpected refcount %u.\n", refcount); + refcount = get_refcount((IUnknown *)adapter); + todo_wine ok(refcount == 1, "Get unexpected refcount %u for adapter %u.\n", refcount, i); + for (j = 0; ; ++j) { MONITORINFOEXW monitor_info; @@ -1311,6 +1324,20 @@ static void test_output_desc(void) break; ok(SUCCEEDED(hr), "Failed to enumerate output %u on adapter %u, hr %#x.\n", j, i, hr); + hr = IDXGIAdapter_EnumOutputs(adapter, j, &output2); + ok(SUCCEEDED(hr), "Failed to enumerate output %u on adapter %u, hr %#x.\n", j, i, hr); + todo_wine ok(output != output2, "Expected to get new instance of IDXGIOuput, %p == %p.\n", output, output2); + refcount = get_refcount((IUnknown *)output); + todo_wine ok(refcount == 1, "Get unexpected refcount %u for output %u, adapter %u.\n", refcount, j, i); + IDXGIOutput_Release(output2); + + refcount = get_refcount((IUnknown *)factory); + todo_wine ok(refcount == 2, "Get unexpected refcount %u.\n", refcount); + refcount = get_refcount((IUnknown *)adapter); + ok(refcount == 2, "Get unexpected refcount %u for adapter %u.\n", refcount, i); + refcount = get_refcount((IUnknown *)output); + todo_wine ok(refcount == 1, "Get unexpected refcount %u for output %u, adapter %u.\n", refcount, j, i); + hr = IDXGIOutput_GetDesc(output, NULL); ok(hr == E_INVALIDARG, "Got unexpected hr %#x for output %u on adapter %u.\n", hr, j, i); hr = IDXGIOutput_GetDesc(output, &desc); @@ -1329,12 +1356,17 @@ static void test_output_desc(void) monitor_info.rcMonitor.right, monitor_info.rcMonitor.bottom); IDXGIOutput_Release(output); + refcount = get_refcount((IUnknown *)adapter); + todo_wine ok(refcount == 1, "Get unexpected refcount %u for adapter %u.\n", refcount, i); } IDXGIAdapter_Release(adapter); + refcount = get_refcount((IUnknown *)factory); + ok(refcount == 1, "Get unexpected refcount %u.\n", refcount); } - IDXGIFactory_Release(factory); + refcount = IDXGIFactory_Release(factory); + ok(!refcount, "IDXGIFactory has %u references left.\n", refcount); } START_TEST(device)

1 0

Józef Kucia : dxgi/tests: Add test for IDXGISwapChain_GetParent().
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: master Commit: d7b8c2e8f69fa822032c9032b787d85e1890680c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7b8c2e8f69fa822032c9032b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 12 12:29:37 2016 +0200 dxgi/tests: Add test for IDXGISwapChain_GetParent(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/device.c | 46 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 38 insertions(+), 8 deletions(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index b92d3cc..71385ab 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -412,15 +412,15 @@ struct refresh_rates BOOL denominator_should_pass; }; -static void test_createswapchain(void) +static void test_create_swapchain(void) { - IUnknown *obj; + DXGI_SWAP_CHAIN_DESC creation_desc, result_desc; + ULONG refcount, expected_refcount; + IDXGISwapChain *swapchain; + IUnknown *obj, *parent; IDXGIAdapter *adapter; IDXGIFactory *factory; IDXGIDevice *device; - ULONG refcount; - IDXGISwapChain *swapchain; - DXGI_SWAP_CHAIN_DESC creation_desc, result_desc; HRESULT hr; UINT i; @@ -465,14 +465,42 @@ static void test_createswapchain(void) hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr); + expected_refcount = get_refcount((IUnknown *)adapter); + refcount = get_refcount((IUnknown *)factory); + ok(refcount == 2, "Got unexpected refcount %u.\n", refcount); + refcount = get_refcount((IUnknown *)device); + ok(refcount == 2, "Got unexpected refcount %u.\n", refcount); + hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain); ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); + refcount = get_refcount((IUnknown *)adapter); + ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); + refcount = get_refcount((IUnknown *)factory); + todo_wine ok(refcount == 4, "Got unexpected refcount %u.\n", refcount); + refcount = get_refcount((IUnknown *)device); + todo_wine ok(refcount == 3, "Got unexpected refcount %u.\n", refcount); + hr = IDXGISwapChain_GetDesc(swapchain, NULL); ok(hr == E_INVALIDARG, "GetDesc unexpectedly returned %#x.\n", hr); + hr = IDXGISwapChain_GetParent(swapchain, &IID_IUnknown, (void **)&parent); + todo_wine ok(SUCCEEDED(hr), "GetParent failed %#x.\n", hr); + todo_wine ok(parent == (IUnknown *)factory, "Got unexpected parent interface pointer %p.\n", parent); + if (SUCCEEDED(hr)) refcount = IUnknown_Release(parent); + todo_wine ok(refcount == 4, "Got unexpected refcount %u.\n", refcount); + + hr = IDXGISwapChain_GetParent(swapchain, &IID_IDXGIFactory, (void **)&parent); + todo_wine ok(SUCCEEDED(hr), "GetParent failed %#x.\n", hr); + todo_wine ok(parent == (IUnknown *)factory, "Got unexpected parent interface pointer %p.\n", parent); + if (SUCCEEDED(hr)) refcount = IUnknown_Release(parent); + todo_wine ok(refcount == 4, "Got unexpected refcount %u.\n", refcount); + IDXGISwapChain_Release(swapchain); + refcount = get_refcount((IUnknown *)factory); + ok(refcount == 2, "Got unexpected refcount %u.\n", refcount); + for (i = 0; i < sizeof(refresh_list)/sizeof(refresh_list[0]); i++) { creation_desc.BufferDesc.RefreshRate.Numerator = refresh_list[i].numerator; @@ -522,11 +550,13 @@ static void test_createswapchain(void) IDXGISwapChain_Release(swapchain); } - IDXGIFactory_Release(factory); - IDXGIAdapter_Release(adapter); IUnknown_Release(obj); refcount = IDXGIDevice_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); + refcount = IDXGIAdapter_Release(adapter); + todo_wine ok(!refcount, "Adapter has %u references left.\n", refcount); + refcount = IDXGIFactory_Release(factory); + ok(!refcount, "Factory has %u references left.\n", refcount); DestroyWindow(creation_desc.OutputWindow); } @@ -1381,7 +1411,7 @@ START_TEST(device) test_create_surface(); test_parents(); test_output(); - test_createswapchain(); + test_create_swapchain(); test_create_factory(); test_private_data(); test_swapchain_resize();

1 0

Józef Kucia : dxgi: Implement dxgi_swapchain_GetDevice().
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: master Commit: 282afc4450e71339ce366b55cdf454e05cc04a2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=282afc4450e71339ce366b55c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 12 12:29:38 2016 +0200 dxgi: Implement dxgi_swapchain_GetDevice(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 2 +- dlls/dxgi/device.c | 12 +++++------- dlls/dxgi/dxgi_private.h | 3 ++- dlls/dxgi/factory.c | 2 +- dlls/dxgi/swapchain.c | 41 ++++++++++++++++++++++++++++++++++------- dlls/dxgi/tests/device.c | 2 +- include/wine/winedxgi.idl | 1 + 7 files changed, 45 insertions(+), 18 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 4f24c48..9144438 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -5064,7 +5064,7 @@ static HRESULT CDECL device_parent_create_swapchain(struct wined3d_device_parent return E_FAIL; } - hr = IWineDXGIDevice_create_swapchain(wine_device, desc, swapchain); + hr = IWineDXGIDevice_create_swapchain(wine_device, desc, TRUE, swapchain); IWineDXGIDevice_Release(wine_device); if (FAILED(hr)) { diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index a10bb01..0c82383 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -310,31 +310,29 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *ifa } static HRESULT STDMETHODCALLTYPE dxgi_device_create_swapchain(IWineDXGIDevice *iface, - struct wined3d_swapchain_desc *desc, struct wined3d_swapchain **wined3d_swapchain) + struct wined3d_swapchain_desc *desc, BOOL implicit, struct wined3d_swapchain **wined3d_swapchain) { - struct dxgi_device *This = impl_from_IWineDXGIDevice(iface); + struct dxgi_device *device = impl_from_IWineDXGIDevice(iface); struct dxgi_swapchain *object; HRESULT hr; TRACE("iface %p, desc %p, wined3d_swapchain %p.\n", iface, desc, wined3d_swapchain); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) { ERR("Failed to allocate DXGI swapchain object memory\n"); return E_OUTOFMEMORY; } - hr = dxgi_swapchain_init(object, This, desc); - if (FAILED(hr)) + if (FAILED(hr = dxgi_swapchain_init(object, device, desc, implicit))) { WARN("Failed to initialize swapchain, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); return hr; } - TRACE("Created IDXGISwapChain %p\n", object); + TRACE("Created IDXGISwapChain %p.\n", object); *wined3d_swapchain = object->wined3d_swapchain; return S_OK; diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 86d8608..fb49b21 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -157,10 +157,11 @@ struct dxgi_swapchain LONG refcount; struct wined3d_private_store private_store; struct wined3d_swapchain *wined3d_swapchain; + IWineDXGIDevice *device; }; HRESULT dxgi_swapchain_init(struct dxgi_swapchain *swapchain, struct dxgi_device *device, - struct wined3d_swapchain_desc *desc) DECLSPEC_HIDDEN; + struct wined3d_swapchain_desc *desc, BOOL implicit) DECLSPEC_HIDDEN; /* IDXGISurface */ struct dxgi_surface diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 5956e62..8e16311 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -246,7 +246,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChain(IDXGIFactory1 *ifa wined3d_desc.swap_interval = WINED3DPRESENT_INTERVAL_DEFAULT; wined3d_desc.auto_restore_display_mode = TRUE; - hr = IWineDXGIDevice_create_swapchain(dxgi_device, &wined3d_desc, &wined3d_swapchain); + hr = IWineDXGIDevice_create_swapchain(dxgi_device, &wined3d_desc, FALSE, &wined3d_swapchain); IWineDXGIDevice_Release(dxgi_device); if (FAILED(hr)) { diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 10a5786..b729970 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -70,16 +70,19 @@ static ULONG STDMETHODCALLTYPE dxgi_swapchain_AddRef(IDXGISwapChain *iface) static ULONG STDMETHODCALLTYPE dxgi_swapchain_Release(IDXGISwapChain *iface) { - struct dxgi_swapchain *This = impl_from_IDXGISwapChain(iface); - ULONG refcount = InterlockedDecrement(&This->refcount); + struct dxgi_swapchain *swapchain = impl_from_IDXGISwapChain(iface); + ULONG refcount = InterlockedDecrement(&swapchain->refcount); - TRACE("%p decreasing refcount to %u\n", This, refcount); + TRACE("%p decreasing refcount to %u.\n", swapchain, refcount); if (!refcount) { + IWineDXGIDevice *device = swapchain->device; wined3d_mutex_lock(); - wined3d_swapchain_decref(This->wined3d_swapchain); + wined3d_swapchain_decref(swapchain->wined3d_swapchain); wined3d_mutex_unlock(); + if (device) + IWineDXGIDevice_Release(device); } return refcount; @@ -128,9 +131,18 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetParent(IDXGISwapChain *iface, static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetDevice(IDXGISwapChain *iface, REFIID riid, void **device) { - FIXME("iface %p, riid %s, device %p stub!\n", iface, debugstr_guid(riid), device); + struct dxgi_swapchain *swapchain = impl_from_IDXGISwapChain(iface); - return E_NOTIMPL; + TRACE("iface %p, riid %s, device %p.\n", iface, debugstr_guid(riid), device); + + if (!swapchain->device) + { + ERR("Implicit swapchain does not store reference to device.\n"); + *device = NULL; + return E_NOINTERFACE; + } + + return IWineDXGIDevice_QueryInterface(swapchain->device, riid, device); } /* IDXGISwapChain methods */ @@ -334,7 +346,7 @@ static const struct wined3d_parent_ops dxgi_swapchain_wined3d_parent_ops = }; HRESULT dxgi_swapchain_init(struct dxgi_swapchain *swapchain, struct dxgi_device *device, - struct wined3d_swapchain_desc *desc) + struct wined3d_swapchain_desc *desc, BOOL implicit) { HRESULT hr; @@ -353,5 +365,20 @@ HRESULT dxgi_swapchain_init(struct dxgi_swapchain *swapchain, struct dxgi_device } wined3d_mutex_unlock(); + /** + * A reference to the implicit swapchain is held by the wined3d device. + * In order to avoid circular references we do not keep a reference + * to the device in the implicit swapchain. + */ + if (!implicit) + { + swapchain->device = &device->IWineDXGIDevice_iface; + IWineDXGIDevice_AddRef(swapchain->device); + } + else + { + swapchain->device = NULL; + } + return S_OK; } diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 71385ab..837618a 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -479,7 +479,7 @@ static void test_create_swapchain(void) refcount = get_refcount((IUnknown *)factory); todo_wine ok(refcount == 4, "Got unexpected refcount %u.\n", refcount); refcount = get_refcount((IUnknown *)device); - todo_wine ok(refcount == 3, "Got unexpected refcount %u.\n", refcount); + ok(refcount == 3, "Got unexpected refcount %u.\n", refcount); hr = IDXGISwapChain_GetDesc(swapchain, NULL); ok(hr == E_INVALIDARG, "GetDesc unexpectedly returned %#x.\n", hr); diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl index d13a2f1..d9f6677 100644 --- a/include/wine/winedxgi.idl +++ b/include/wine/winedxgi.idl @@ -36,6 +36,7 @@ interface IWineDXGIDevice : IDXGIDevice1 ); HRESULT create_swapchain( [in] struct wined3d_swapchain_desc *desc, + [in] BOOL implicit, [out] struct wined3d_swapchain **wined3d_swapchain ); }

1 0

Józef Kucia : d3d11/tests: Add more tests for D3D11CreateDeviceAndSwapChain().
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: master Commit: 80284177996d172078fa5197ae84044490c734aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=80284177996d172078fa5197a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 12 12:29:39 2016 +0200 d3d11/tests: Add more tests for D3D11CreateDeviceAndSwapChain(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index ee7103d..6237575 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -677,8 +677,16 @@ static void test_create_device(void) &swapchain_desc, NULL, NULL, NULL, NULL); ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); + hr = D3D11CreateDeviceAndSwapChain(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, + &swapchain_desc, &swapchain, NULL, NULL, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + IDXGISwapChain_Release(swapchain); + swapchain_desc.OutputWindow = NULL; hr = D3D11CreateDeviceAndSwapChain(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, + &swapchain_desc, NULL, NULL, NULL, NULL); + ok(hr == S_FALSE, "D3D11CreateDeviceAndSwapChain returned %#x.\n", hr); + hr = D3D11CreateDeviceAndSwapChain(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, &swapchain_desc, NULL, &device, NULL, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ID3D11Device_Release(device);

1 0

Józef Kucia : dxgi: Partially implement dxgi_swapchain_GetContainingOutput().
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: master Commit: 944190bad442f19fba5e0073d284469bd2329652 URL: http://source.winehq.org/git/wine.git/?a=commit;h=944190bad442f19fba5e0073d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 12 12:29:40 2016 +0200 dxgi: Partially implement dxgi_swapchain_GetContainingOutput(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index b729970..da705e4 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -287,9 +287,32 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_ResizeTarget(IDXGISwapChain *ifa static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetContainingOutput(IDXGISwapChain *iface, IDXGIOutput **output) { - FIXME("iface %p, output %p stub!\n", iface, output); + IDXGIAdapter *adapter; + IDXGIDevice *device; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, output %p.\n", iface, output); + + if (FAILED(hr = dxgi_swapchain_GetDevice(iface, &IID_IDXGIDevice, (void **)&device))) + return hr; + + hr = IDXGIDevice_GetAdapter(device, &adapter); + IDXGIDevice_Release(device); + if (FAILED(hr)) + { + WARN("GetAdapter failed, hr %#x.\n", hr); + return hr; + } + + if (SUCCEEDED(IDXGIAdapter_EnumOutputs(adapter, 1, output))) + { + FIXME("Adapter has got multiple outputs, returning the first one.\n"); + IDXGIOutput_Release(*output); + } + + hr = IDXGIAdapter_EnumOutputs(adapter, 0, output); + IDXGIAdapter_Release(adapter); + return hr; } static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetFrameStatistics(IDXGISwapChain *iface, DXGI_FRAME_STATISTICS *stats)

1 0

Austin English : wimgapi: Add WIMGetMountedImages stub.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: master Commit: dc0377aabaf8457fb436870bf7bc00df7dcd1bbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc0377aabaf8457fb436870bf… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Mar 24 15:25:21 2016 -0500 wimgapi: Add WIMGetMountedImages stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wimgapi/main.c | 8 ++++++++ dlls/wimgapi/wimgapi.spec | 2 +- include/Makefile.in | 1 + include/wimgapi.h | 38 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/wimgapi/main.c b/dlls/wimgapi/main.c index d7c3bab..a7321fa 100644 --- a/dlls/wimgapi/main.c +++ b/dlls/wimgapi/main.c @@ -26,6 +26,7 @@ #include "windef.h" #include "winbase.h" #include "wine/debug.h" +#include "wimgapi.h" WINE_DEFAULT_DEBUG_CHANNEL(wimgapi); @@ -50,3 +51,10 @@ DWORD WINAPI WIMRegisterMessageCallback(HANDLE wim, FARPROC callback, PVOID data FIXME("(%p %p %p) stub\n", wim, callback, data); return 0; } + +BOOL WINAPI WIMGetMountedImages(PWIM_MOUNT_LIST list, DWORD *length) +{ + FIXME("(%p %p) stub\n", list, length); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; +} diff --git a/dlls/wimgapi/wimgapi.spec b/dlls/wimgapi/wimgapi.spec index 7464a5a..bb79d5b 100644 --- a/dlls/wimgapi/wimgapi.spec +++ b/dlls/wimgapi/wimgapi.spec @@ -21,7 +21,7 @@ @ stub WIMGetMountedImageHandle @ stub WIMGetMountedImageInfo @ stub WIMGetMountedImageInfoFromFile -@ stub WIMGetMountedImages +@ stdcall WIMGetMountedImages(ptr ptr) @ stub WIMInitFileIOCallbacks @ stub WIMLoadImage @ stub WIMMountImage diff --git a/include/Makefile.in b/include/Makefile.in index ac10691..fb1c195 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -617,6 +617,7 @@ HEADER_SRCS = \ wfext.h \ wia.h \ wiadef.h \ + wimgapi.h \ winbase.h \ wincon.h \ wincred.h \ diff --git a/include/wimgapi.h b/include/wimgapi.h new file mode 100644 index 0000000..e517b57 --- /dev/null +++ b/include/wimgapi.h @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2015 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _WIMGAPI_H_ +#define _WIMGAPI_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct _WIM_MOUNT_LIST +{ + WCHAR WimPath[MAX_PATH]; + WCHAR MountPath[MAX_PATH]; + DWORD ImageIndex; + BOOL MountedForRW; +} WIM_MOUNT_LIST, *PWIM_MOUNT_LIST, *LPWIM_MOUNT_LIST; + +#ifdef __cplusplus +} +#endif + +#endif /* _WIMGAPI_H_ */

1 0

Austin English : wimgapi: Add WIMCreateFile stub.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: master Commit: 044baef529070818f9bfab434d6b5467a189dca5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=044baef529070818f9bfab434… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Mar 24 15:27:01 2016 -0500 wimgapi: Add WIMCreateFile stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wimgapi/main.c | 7 +++++++ dlls/wimgapi/wimgapi.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/wimgapi/main.c b/dlls/wimgapi/main.c index a7321fa..72437ee 100644 --- a/dlls/wimgapi/main.c +++ b/dlls/wimgapi/main.c @@ -58,3 +58,10 @@ BOOL WINAPI WIMGetMountedImages(PWIM_MOUNT_LIST list, DWORD *length) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } + +HANDLE WINAPI WIMCreateFile(WCHAR *path, DWORD access, DWORD creation, DWORD flags, DWORD compression, DWORD *result) +{ + FIXME("(%s %d %d %d %d %p) stub\n", debugstr_w(path), access, creation, flags, compression, result); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return NULL; +} diff --git a/dlls/wimgapi/wimgapi.spec b/dlls/wimgapi/wimgapi.spec index bb79d5b..17380a7 100644 --- a/dlls/wimgapi/wimgapi.spec +++ b/dlls/wimgapi/wimgapi.spec @@ -5,7 +5,7 @@ @ stub WIMCloseHandle @ stub WIMCommitImageHandle @ stub WIMCopyFile -@ stub WIMCreateFile +@ stdcall WIMCreateFile(wstr long long long long ptr) @ stub WIMCreateImageFile @ stub WIMDeleteImage @ stub WIMDeleteImageMounts

1 0

Sergei Bolotov : widl: Handle "midl_pragma warning" statement in parser.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: master Commit: 646dfe746d0842c882df33fb0f3ebedc2d6095bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=646dfe746d0842c882df33fb0… Author: Sergei Bolotov <bolotov.s.s(a)yandex.ru> Date: Tue Mar 29 23:06:44 2016 +0300 widl: Handle "midl_pragma warning" statement in parser. Signed-off-by: Sergei Bolotov <bolotov.s.s(a)yandex.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.l | 1 + tools/widl/parser.y | 31 ++++++++++++++++++++++++++++++- tools/widl/widltypes.h | 7 +++++++ 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 5c2dcab..c0b2fcd 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -164,6 +164,7 @@ UUID *parse_uuid(const char *u) yy_pop_state(); } <PP_PRAGMA>[^\n]* parser_lval.str = xstrdup(yytext); yy_pop_state(); return aPRAGMA; +<INITIAL>^{ws}*midl_pragma{ws}+warning return tPRAGMA_WARNING; <INITIAL,ATTR>\" yy_push_state(QUOTE); cbufidx = 0; <QUOTE>\" { yy_pop_state(); diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 7de7567..3131e0d 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -83,6 +83,7 @@ static declarator_t *make_declarator(var_t *var); static type_t *make_safearray(type_t *type); static typelib_t *make_library(const char *name, const attr_list_t *attrs); static type_t *append_ptrchain_type(type_t *ptrchain, type_t *type); +static warning_list_t *append_warning(warning_list_t *, int); static type_t *reg_typedefs(decl_spec_t *decl_spec, var_list_t *names, attr_list_t *attrs); static type_t *find_type_or_error(const char *name, int t); @@ -148,6 +149,8 @@ static struct namespace *current_namespace = &global_namespace; declarator_list_t *declarator_list; statement_t *statement; statement_list_t *stmt_list; + warning_t *warning; + warning_list_t *warning_list; ifref_t *ifref; ifref_list_t *ifref_list; char *str; @@ -224,6 +227,7 @@ static struct namespace *current_namespace = &global_namespace; %token tOUT %token tPARTIALIGNORE tPASCAL %token tPOINTERDEFAULT +%token tPRAGMA_WARNING %token tPROGID tPROPERTIES %token tPROPGET tPROPPUT tPROPPUTREF %token tPROXY tPTR @@ -291,8 +295,9 @@ static struct namespace *current_namespace = &global_namespace; %type <uuid> uuid_string %type <import> import_start %type <typelib> library_start librarydef -%type <statement> statement typedef +%type <statement> statement typedef pragma_warning %type <stmt_list> gbl_statements imp_statements int_statements +%type <warning_list> warnings %left ',' %right '?' ':' @@ -373,6 +378,15 @@ statement: | import { $$ = make_statement_import($1); } | typedef ';' { $$ = $1; } | aPRAGMA { $$ = make_statement_pragma($1); } + | pragma_warning { $$ = NULL; } + ; + +pragma_warning: tPRAGMA_WARNING '(' aIDENTIFIER ':' warnings ')' { $$ = NULL; } + ; + +warnings: + aNUM { $$ = append_warning(NULL, $1); } + | warnings aNUM { $$ = append_warning($1, $2); } ; typedecl: @@ -1413,6 +1427,21 @@ static type_t *append_ptrchain_type(type_t *ptrchain, type_t *type) return ptrchain; } +static warning_list_t *append_warning(warning_list_t *list, int num) +{ + warning_t *entry; + + if(!list) + { + list = xmalloc( sizeof(*list) ); + list_init( list ); + } + entry = xmalloc( sizeof(*entry) ); + entry->num = num; + list_add_tail( list, &entry->entry ); + return list; +} + static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const declarator_t *decl, int top) { diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 4d51312..1f4a9dd 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -51,6 +51,7 @@ typedef struct _user_type_t context_handle_t; typedef struct _user_type_t generic_handle_t; typedef struct _type_list_t type_list_t; typedef struct _statement_t statement_t; +typedef struct _warning_t warning_t; typedef struct list attr_list_t; typedef struct list str_list_t; @@ -63,6 +64,7 @@ typedef struct list user_type_list_t; typedef struct list context_handle_list_t; typedef struct list generic_handle_list_t; typedef struct list statement_list_t; +typedef struct list warning_list_t; enum attr_type { @@ -538,6 +540,11 @@ struct _statement_t { } u; }; +struct _warning_t { + int num; + struct list entry; +}; + typedef enum { SYS_WIN16, SYS_WIN32,

1 0

Sergei Bolotov : widl: Support for toggling and checking status for warnings, support for warning 2368.
by Alexandre Julliard 12 Apr '16

12 Apr '16

Module: wine Branch: master Commit: 376daa91d832ec9e4c1d399957b35ee98c761ae8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=376daa91d832ec9e4c1d39995… Author: Sergei Bolotov <bolotov.s.s(a)yandex.ru> Date: Tue Mar 29 23:06:45 2016 +0300 widl: Support for toggling and checking status for warnings, support for warning 2368. Signed-off-by: Sergei Bolotov <bolotov.s.s(a)yandex.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/test_tlb.idl | 2 ++ tools/widl/parser.h | 3 ++ tools/widl/parser.l | 60 ++++++++++++++++++++++++++++++++++++++++ tools/widl/parser.y | 9 +++++- tools/widl/write_msft.c | 3 +- 5 files changed, 75 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/test_tlb.idl b/dlls/oleaut32/tests/test_tlb.idl index 53729dc..ad35af4 100644 --- a/dlls/oleaut32/tests/test_tlb.idl +++ b/dlls/oleaut32/tests/test_tlb.idl @@ -24,6 +24,8 @@ import "oaidl.idl"; /* needed by widl */ +midl_pragma warning ( disable : 2368 ) + [uuid(8b05fe77-4a6c-4133-b9cd-8f81747af784)] library Test { diff --git a/tools/widl/parser.h b/tools/widl/parser.h index 1bcc3c1..f48cacc 100644 --- a/tools/widl/parser.h +++ b/tools/widl/parser.h @@ -45,6 +45,9 @@ void pop_import(void); int is_type(const char *name); +int do_warning(char *toggle, warning_list_t *wnum); +int is_warning_enabled(int warning); + extern char *temp_name; #endif diff --git a/tools/widl/parser.l b/tools/widl/parser.l index c0b2fcd..6520ce7 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -76,6 +76,8 @@ static int cbufalloc = 0; static int kw_token(const char *kw); static int attr_token(const char *kw); +static warning_list_t *disabled_warnings = NULL; + #define MAX_IMPORT_DEPTH 10 struct { YY_BUFFER_STATE state; @@ -556,3 +558,61 @@ void abort_import(void) for (ptr=0; ptr<import_stack_ptr; ptr++) unlink(import_stack[ptr].temp_name); } + +static void warning_disable(int warning) +{ + warning_t *warning_entry; + LIST_FOR_EACH_ENTRY(warning_entry, disabled_warnings, warning_t, entry) + if(warning_entry->num == warning) + return; + warning_entry = xmalloc( sizeof(*warning_entry) ); + warning_entry->num = warning; + list_add_tail(disabled_warnings, &warning_entry->entry); +} + +static void warning_enable(int warning) +{ + warning_t *warning_entry; + LIST_FOR_EACH_ENTRY(warning_entry, disabled_warnings, warning_t, entry) + if(warning_entry->num == warning) + { + list_remove(&warning_entry->entry); + free(warning_entry); + break; + } +} + +int do_warning(char *toggle, warning_list_t *wnum) +{ + warning_t *warning, *next; + int ret = 1; + if(!disabled_warnings) + { + disabled_warnings = xmalloc( sizeof(*disabled_warnings) ); + list_init( disabled_warnings ); + } + + if(!strcmp(toggle, "disable")) + LIST_FOR_EACH_ENTRY(warning, wnum, warning_t, entry) + warning_disable(warning->num); + else if(!strcmp(toggle, "enable")) + LIST_FOR_EACH_ENTRY(warning, wnum, warning_t, entry) + warning_enable(warning->num); + else + ret = 0; + + LIST_FOR_EACH_ENTRY_SAFE(warning, next, wnum, warning_t, entry) + free(warning); + return ret; +} + +int is_warning_enabled(int warning) +{ + warning_t *warning_entry; + if(!disabled_warnings) + return 1; + LIST_FOR_EACH_ENTRY(warning_entry, disabled_warnings, warning_t, entry) + if(warning_entry->num == warning) + return 0; + return 1; +} diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 3131e0d..6551ea2 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -381,7 +381,14 @@ statement: | pragma_warning { $$ = NULL; } ; -pragma_warning: tPRAGMA_WARNING '(' aIDENTIFIER ':' warnings ')' { $$ = NULL; } +pragma_warning: tPRAGMA_WARNING '(' aIDENTIFIER ':' warnings ')' + { + int result; + $$ = NULL; + result = do_warning($3, $5); + if(!result) + error_loc("expected \"disable\" or \"enable\"\n"); + } ; warnings: diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 8b65ead..137bb2d 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -51,6 +51,7 @@ #include "header.h" #include "hash.h" #include "typetree.h" +#include "parser.h" enum MSFT_segment_index { MSFT_SEG_TYPEINFO = 0, /* type information */ @@ -504,7 +505,7 @@ static int ctl2_alloc_guid( offset = ctl2_find_guid(typelib, hash_key, &guid->guid); if (offset != -1) { - if (pedantic) + if (is_warning_enabled(2368)) warning("duplicate uuid {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n", guid->guid.Data1, guid->guid.Data2, guid->guid.Data3, guid->guid.Data4[0], guid->guid.Data4[1], guid->guid.Data4[2], guid->guid.Data4[3],

1 0