January 2018 - Wine-commits

Wei Xie : wininet: Don't release connection too early.
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: 6d6dd78e5dad164d1b313599f9afa5f65481d29d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d6dd78e5dad164d1b313599… Author: Wei Xie <xiewei(a)linuxdeepin.com> Date: Fri Jan 19 15:29:54 2018 +0100 wininet: Don't release connection too early. Signed-off-by: Wei Xie <xiewei(a)linuxdeepin.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b1c2d94..6716c80 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -5043,7 +5043,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, res = set_content_length(request); if(res != ERROR_SUCCESS) goto lend; - if(!request->contentLength) + if(!request->contentLength && !secure_proxy_connect) http_release_netconn(request, TRUE); if (!(request->hdr.dwFlags & INTERNET_FLAG_NO_AUTO_REDIRECT) && responseLen)

1 0

Józef Kucia : dxgi/tests: Add test for creating IDXGIFactory2.
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: b2192ea19a1e61cef7d252336d480e83cd09e1db URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2192ea19a1e61cef7d25233… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 19 13:30:11 2018 +0100 dxgi/tests: Add test for creating IDXGIFactory2. 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 | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index a102ed8..89e9279 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -19,6 +19,7 @@ #include <assert.h> #define COBJMACROS #include "initguid.h" +#include "dxgi1_6.h" #include "d3d11.h" #include "wine/test.h" @@ -2305,6 +2306,7 @@ static void test_create_factory(void) { IDXGIFactory1 *factory; IUnknown *iface; + ULONG refcount; HRESULT hr; iface = (void *)0xdeadbeef; @@ -2333,6 +2335,17 @@ static void test_create_factory(void) ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); ok(!iface, "Got unexpected iface %p.\n", iface); + iface = NULL; + hr = CreateDXGIFactory(&IID_IDXGIFactory2, (void **)&iface); + todo_wine + ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + refcount = IUnknown_Release(iface); + ok(!refcount, "Factory has %u references left.\n", refcount); + } + if (!pCreateDXGIFactory1) { win_skip("CreateDXGIFactory1 not available, skipping tests.\n"); @@ -2362,6 +2375,17 @@ static void test_create_factory(void) hr = pCreateDXGIFactory1(&IID_IDXGIFactory1, (void **)&iface); ok(SUCCEEDED(hr), "Failed to create factory with IID_IDXGIFactory1, hr %#x.\n", hr); IUnknown_Release(iface); + + iface = NULL; + hr = pCreateDXGIFactory1(&IID_IDXGIFactory2, (void **)&iface); + todo_wine + ok(hr == S_OK || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + refcount = IUnknown_Release(iface); + ok(!refcount, "Factory has %u references left.\n", refcount); + } } static void test_private_data(void)

1 0

Józef Kucia : d3d10_1/tests: Introduce check_interface() helper function.
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: e0c7d9039f48e22a97b22631b6fe6823cf249532 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0c7d9039f48e22a97b22631… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 19 13:30:12 2018 +0100 d3d10_1/tests: Introduce check_interface() helper function. 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/d3d10_1/tests/d3d10_1.c | 98 ++++++++++++++++++++------------------------ 1 file changed, 44 insertions(+), 54 deletions(-) diff --git a/dlls/d3d10_1/tests/d3d10_1.c b/dlls/d3d10_1/tests/d3d10_1.c index e1d6d4c..3e1a099 100644 --- a/dlls/d3d10_1/tests/d3d10_1.c +++ b/dlls/d3d10_1/tests/d3d10_1.c @@ -68,6 +68,31 @@ static ID3D10Device1 *create_device(const struct device_desc *desc) return NULL; } +#define check_interface(a, b, c, d) check_interface_(__LINE__, a, b, c, d) +static HRESULT check_interface_(unsigned int line, void *iface, REFIID iid, BOOL supported, BOOL is_broken) +{ + HRESULT hr, expected_hr, broken_hr; + IUnknown *unknown = iface, *out; + + if (supported) + { + expected_hr = S_OK; + broken_hr = E_NOINTERFACE; + } + else + { + expected_hr = E_NOINTERFACE; + broken_hr = S_OK; + } + + hr = IUnknown_QueryInterface(unknown, iid, (void **)&out); + ok_(__FILE__, line)(hr == expected_hr || broken(is_broken && hr == broken_hr), + "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(out); + return hr; +} + static void test_create_device(void) { D3D10_FEATURE_LEVEL1 feature_level, supported_feature_level; @@ -265,13 +290,14 @@ static void test_device_interfaces(void) continue; } - hr = ID3D10Device1_QueryInterface(device, &IID_IUnknown, (void **)&iface); - ok(SUCCEEDED(hr), "Device should implement IUnknown interface, hr %#x.\n", hr); - IUnknown_Release(iface); - - hr = ID3D10Device1_QueryInterface(device, &IID_IDXGIObject, (void **)&iface); - ok(SUCCEEDED(hr), "Device should implement IDXGIObject interface, hr %#x.\n", hr); - IUnknown_Release(iface); + check_interface(device, &IID_IUnknown, TRUE, FALSE); + check_interface(device, &IID_IDXGIObject, TRUE, FALSE); + check_interface(device, &IID_IDXGIDevice, TRUE, FALSE); + check_interface(device, &IID_IDXGIDevice1, TRUE, FALSE); + check_interface(device, &IID_ID3D10Multithread, TRUE, TRUE); /* Not available on all Windows versions. */ + check_interface(device, &IID_ID3D10Device, TRUE, FALSE); + check_interface(device, &IID_ID3D10InfoQueue, FALSE, FALSE); /* Non-debug mode. */ + check_interface(device, &IID_ID3D11Device, TRUE, TRUE); /* Not available on all Windows versions. */ hr = ID3D10Device1_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); ok(SUCCEEDED(hr), "Device should implement IDXGIDevice.\n"); @@ -288,27 +314,6 @@ static void test_device_interfaces(void) IDXGIAdapter_Release(dxgi_adapter); IDXGIDevice_Release(dxgi_device); - hr = ID3D10Device1_QueryInterface(device, &IID_IDXGIDevice1, (void **)&iface); - ok(SUCCEEDED(hr), "Device should implement IDXGIDevice1.\n"); - IUnknown_Release(iface); - - hr = ID3D10Device1_QueryInterface(device, &IID_ID3D10Multithread, (void **)&iface); - ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, - "Device should implement ID3D10Multithread interface, hr %#x.\n", hr); - if (SUCCEEDED(hr)) IUnknown_Release(iface); - - hr = ID3D10Device1_QueryInterface(device, &IID_ID3D10InfoQueue, (void **)&iface); - ok(hr == E_NOINTERFACE, "Found ID3D10InfoQueue interface in non-debug mode, hr %#x.\n", hr); - - hr = ID3D10Device1_QueryInterface(device, &IID_ID3D10Device, (void **)&iface); - ok(SUCCEEDED(hr), "Device should implement ID3D10Device interface, hr %#x.\n", hr); - IUnknown_Release(iface); - - hr = ID3D10Device1_QueryInterface(device, &IID_ID3D11Device, (void **)&iface); - ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, - "Device should implement ID3D11Device interface, hr %#x.\n", hr); - if (SUCCEEDED(hr)) IUnknown_Release(iface); - refcount = ID3D10Device1_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); } @@ -325,9 +330,8 @@ static void test_device_interfaces(void) continue; } - hr = ID3D10Device1_QueryInterface(device, &IID_ID3D10InfoQueue, (void **)&iface); - todo_wine ok(hr == S_OK, "Device should implement ID3D10InfoQueue interface, hr %#x.\n", hr); - if (SUCCEEDED(hr)) IUnknown_Release(iface); + todo_wine + check_interface(device, &IID_ID3D10InfoQueue, TRUE, FALSE); refcount = ID3D10Device1_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); @@ -345,7 +349,6 @@ static void test_create_shader_resource_view(void) ID3D10Device *tmp_device; ID3D10Device1 *device; ID3D10Buffer *buffer; - IUnknown *iface; HRESULT hr; if (!(device = create_device(NULL))) @@ -387,13 +390,9 @@ 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_device); - hr = ID3D10ShaderResourceView1_QueryInterface(srview, &IID_ID3D10ShaderResourceView, (void **)&iface); - ok(SUCCEEDED(hr), "Shader resource view should implement ID3D10ShaderResourceView.\n"); - IUnknown_Release(iface); - hr = ID3D10ShaderResourceView1_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); + check_interface(srview, &IID_ID3D10ShaderResourceView, TRUE, FALSE); + /* Not available on all Windows versions. */ + check_interface(srview, &IID_ID3D11ShaderResourceView, TRUE, TRUE); ID3D10ShaderResourceView1_Release(srview); ID3D10Buffer_Release(buffer); @@ -424,13 +423,9 @@ 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 = ID3D10ShaderResourceView1_QueryInterface(srview, &IID_ID3D10ShaderResourceView, (void **)&iface); - ok(SUCCEEDED(hr), "Shader resource view should implement ID3D10ShaderResourceView.\n"); - IUnknown_Release(iface); - hr = ID3D10ShaderResourceView1_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); + check_interface(srview, &IID_ID3D10ShaderResourceView, TRUE, FALSE); + /* Not available on all Windows versions. */ + check_interface(srview, &IID_ID3D11ShaderResourceView, TRUE, TRUE); ID3D10ShaderResourceView1_Release(srview); ID3D10Texture2D_Release(texture); @@ -536,7 +531,6 @@ static void test_create_blend_state(void) ID3D10Device1 *device; ID3D10Device *tmp; unsigned int i, j; - IUnknown *iface; HRESULT hr; if (!(device = create_device(NULL))) @@ -609,13 +603,9 @@ static void test_create_blend_state(void) obtained_desc.RenderTarget[0].RenderTargetWriteMask, i); } - hr = ID3D10BlendState1_QueryInterface(blend_state1, &IID_ID3D10BlendState, (void **)&iface); - ok(SUCCEEDED(hr), "Blend state should implement ID3D10BlendState.\n"); - IUnknown_Release(iface); - hr = ID3D10BlendState1_QueryInterface(blend_state1, &IID_ID3D11BlendState, (void **)&iface); - ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, - "Blend state should implement ID3D11BlendState.\n"); - if (SUCCEEDED(hr)) IUnknown_Release(iface); + check_interface(blend_state1, &IID_ID3D10BlendState, TRUE, FALSE); + /* Not available on all Windows versions. */ + check_interface(blend_state1, &IID_ID3D11BlendState, TRUE, TRUE); refcount = ID3D10BlendState1_Release(blend_state1); ok(refcount == 1, "Got unexpected refcount %u.\n", refcount);

1 0

Józef Kucia : dxgi: Update to IDXGIFactory2.
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: f99a548148bae4a8db904171a53793e5613c6010 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f99a548148bae4a8db904171… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 19 13:30:13 2018 +0100 dxgi: Update to IDXGIFactory2. 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/adapter.c | 6 +- dlls/dxgi/device.c | 2 +- dlls/dxgi/dxgi_private.h | 5 +- dlls/dxgi/factory.c | 165 ++++++++++++++++++++++++++++++++++++++--------- dlls/dxgi/tests/device.c | 2 - 5 files changed, 141 insertions(+), 39 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f99a548148bae4a8db90…

1 0

Józef Kucia : dxgi: Update to IDXGISwapChain1.
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: 9e961e1fae3715d2f5de8598d1cc09a784452cfd URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e961e1fae3715d2f5de8598… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 19 13:30:14 2018 +0100 dxgi: Update to IDXGISwapChain1. 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/d3d10_1/tests/d3d10_1.c | 4 +- dlls/d3d11/tests/d3d11.c | 2 + dlls/dxgi/dxgi_private.h | 2 +- dlls/dxgi/swapchain.c | 238 +++++++++++++++++++++++++++++++++---------- dlls/dxgi/tests/device.c | 16 ++- 5 files changed, 207 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9e961e1fae3715d2f5de…

1 0

Józef Kucia : dxgi: Implement dxgi_factory_CreateSwapChainForHwnd().
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: 729baa8a91fdc45ed66e0f8230a38a769beea87d URL: https://source.winehq.org/git/wine.git/?a=commit;h=729baa8a91fdc45ed66e0f82… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 19 13:30:15 2018 +0100 dxgi: Implement dxgi_factory_CreateSwapChainForHwnd(). 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/factory.c | 151 ++++++++++++++++++++++++++++++----------------- dlls/dxgi/tests/device.c | 8 ++- 2 files changed, 105 insertions(+), 54 deletions(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 106efb5..1d699f5 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -184,15 +184,90 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_GetWindowAssociation(IDXGIFactory2 static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChain(IDXGIFactory2 *iface, IUnknown *device, DXGI_SWAP_CHAIN_DESC *desc, IDXGISwapChain **swapchain) { + struct dxgi_factory *factory = impl_from_IDXGIFactory2(iface); + DXGI_SWAP_CHAIN_FULLSCREEN_DESC fullscreen_desc; + DXGI_SWAP_CHAIN_DESC1 swapchain_desc; + + TRACE("iface %p, device %p, desc %p, swapchain %p.\n", iface, device, desc, swapchain); + + if (!desc) + { + WARN("Invalid pointer.\n"); + return DXGI_ERROR_INVALID_CALL; + } + + swapchain_desc.Width = desc->BufferDesc.Width; + swapchain_desc.Height = desc->BufferDesc.Height; + swapchain_desc.Format = desc->BufferDesc.Format; + swapchain_desc.Stereo = FALSE; + swapchain_desc.SampleDesc = desc->SampleDesc; + swapchain_desc.BufferUsage = desc->BufferUsage; + swapchain_desc.BufferCount = desc->BufferCount; + swapchain_desc.Scaling = DXGI_SCALING_STRETCH; + swapchain_desc.SwapEffect = desc->SwapEffect; + swapchain_desc.AlphaMode = DXGI_ALPHA_MODE_IGNORE; + swapchain_desc.Flags = desc->Flags; + + fullscreen_desc.RefreshRate = desc->BufferDesc.RefreshRate; + fullscreen_desc.ScanlineOrdering = desc->BufferDesc.ScanlineOrdering; + fullscreen_desc.Scaling = desc->BufferDesc.Scaling; + fullscreen_desc.Windowed = desc->Windowed; + + return IDXGIFactory2_CreateSwapChainForHwnd(&factory->IDXGIFactory2_iface, + device, desc->OutputWindow, &swapchain_desc, &fullscreen_desc, NULL, + (IDXGISwapChain1 **)swapchain); +} + +static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSoftwareAdapter(IDXGIFactory2 *iface, + HMODULE swrast, IDXGIAdapter **adapter) +{ + FIXME("iface %p, swrast %p, adapter %p stub!\n", iface, swrast, adapter); + + return E_NOTIMPL; +} + +static BOOL STDMETHODCALLTYPE dxgi_factory_IsCurrent(IDXGIFactory2 *iface) +{ + FIXME("iface %p stub!\n", iface); + + return TRUE; +} + +static BOOL STDMETHODCALLTYPE dxgi_factory_IsWindowedStereoEnabled(IDXGIFactory2 *iface) +{ + FIXME("iface %p stub!\n", iface); + + return FALSE; +} + +static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IDXGIFactory2 *iface, + IUnknown *device, HWND window, const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, + const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc, + IDXGIOutput *output, IDXGISwapChain1 **swapchain) +{ struct wined3d_swapchain *wined3d_swapchain; struct wined3d_swapchain_desc wined3d_desc; unsigned int min_buffer_count; IWineDXGIDevice *dxgi_device; HRESULT hr; - FIXME("iface %p, device %p, desc %p, swapchain %p partial stub!\n", iface, device, desc, swapchain); + FIXME("iface %p, device %p, window %p, swapchain_desc %p, fullscreen_desc %p, " + "output %p, swapchain %p partial stub!\n", + iface, device, window, swapchain_desc, fullscreen_desc, output, swapchain); - switch (desc->SwapEffect) + if (!device || !swapchain_desc || !swapchain) + { + WARN("Invalid pointer.\n"); + return DXGI_ERROR_INVALID_CALL; + } + + if (swapchain_desc->Stereo) + { + FIXME("Stereo swapchains are not supported.\n"); + return DXGI_ERROR_UNSUPPORTED; + } + + switch (swapchain_desc->SwapEffect) { case DXGI_SWAP_EFFECT_DISCARD: case DXGI_SWAP_EFFECT_SEQUENTIAL: @@ -205,42 +280,46 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChain(IDXGIFactory2 *ifa break; default: - WARN("Invalid swap effect %u used, returning DXGI_ERROR_INVALID_CALL.\n", desc->SwapEffect); + WARN("Invalid swap effect %u used.\n", swapchain_desc->SwapEffect); return DXGI_ERROR_INVALID_CALL; } - if (desc->BufferCount < min_buffer_count || desc->BufferCount > 16) + if (swapchain_desc->BufferCount < min_buffer_count || swapchain_desc->BufferCount > 16) { - WARN("BufferCount is %u, returning DXGI_ERROR_INVALID_CALL.\n", desc->BufferCount); + WARN("BufferCount is %u.\n", swapchain_desc->BufferCount); return DXGI_ERROR_INVALID_CALL; } - if (!desc->OutputWindow) + if (!window) { FIXME("No output window, should use factory output window.\n"); } - hr = IUnknown_QueryInterface(device, &IID_IWineDXGIDevice, (void **)&dxgi_device); - if (FAILED(hr)) + if (FAILED(hr = IUnknown_QueryInterface(device, &IID_IWineDXGIDevice, (void **)&dxgi_device))) { ERR("This is not the device we're looking for\n"); return hr; } - FIXME("Ignoring SwapEffect %#x.\n", desc->SwapEffect); - - wined3d_desc.backbuffer_width = desc->BufferDesc.Width; - wined3d_desc.backbuffer_height = desc->BufferDesc.Height; - wined3d_desc.backbuffer_format = wined3dformat_from_dxgi_format(desc->BufferDesc.Format); - wined3d_desc.backbuffer_count = desc->BufferCount; + if (swapchain_desc->Scaling != DXGI_SCALING_STRETCH) + FIXME("Ignoring scaling %#x.\n", swapchain_desc->Scaling); + if (swapchain_desc->SwapEffect) + FIXME("Ignoring swap effect %#x.\n", swapchain_desc->SwapEffect); + if (swapchain_desc->AlphaMode != DXGI_ALPHA_MODE_IGNORE) + FIXME("Ignoring alpha mode %#x.\n", swapchain_desc->AlphaMode); + + wined3d_desc.backbuffer_width = swapchain_desc->Width; + wined3d_desc.backbuffer_height = swapchain_desc->Height; + wined3d_desc.backbuffer_format = wined3dformat_from_dxgi_format(swapchain_desc->Format); + wined3d_desc.backbuffer_count = swapchain_desc->BufferCount; wined3d_sample_desc_from_dxgi(&wined3d_desc.multisample_type, - &wined3d_desc.multisample_quality, &desc->SampleDesc); + &wined3d_desc.multisample_quality, &swapchain_desc->SampleDesc); wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; - wined3d_desc.device_window = desc->OutputWindow; - wined3d_desc.windowed = desc->Windowed; + wined3d_desc.device_window = window; + wined3d_desc.windowed = fullscreen_desc ? fullscreen_desc->Windowed : TRUE; wined3d_desc.enable_auto_depth_stencil = FALSE; wined3d_desc.auto_depth_stencil_format = 0; - wined3d_desc.flags = wined3d_swapchain_flags_from_dxgi(desc->Flags); - wined3d_desc.refresh_rate = dxgi_rational_to_uint(&desc->BufferDesc.RefreshRate); + wined3d_desc.flags = wined3d_swapchain_flags_from_dxgi(swapchain_desc->Flags); + wined3d_desc.refresh_rate = fullscreen_desc ? dxgi_rational_to_uint(&fullscreen_desc->RefreshRate) : 0; wined3d_desc.swap_interval = WINED3DPRESENT_INTERVAL_DEFAULT; wined3d_desc.auto_restore_display_mode = TRUE; @@ -259,40 +338,6 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChain(IDXGIFactory2 *ifa return S_OK; } -static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSoftwareAdapter(IDXGIFactory2 *iface, - HMODULE swrast, IDXGIAdapter **adapter) -{ - FIXME("iface %p, swrast %p, adapter %p stub!\n", iface, swrast, adapter); - - return E_NOTIMPL; -} - -static BOOL STDMETHODCALLTYPE dxgi_factory_IsCurrent(IDXGIFactory2 *iface) -{ - FIXME("iface %p stub!\n", iface); - - return TRUE; -} - -static BOOL STDMETHODCALLTYPE dxgi_factory_IsWindowedStereoEnabled(IDXGIFactory2 *iface) -{ - FIXME("iface %p stub!\n", iface); - - return FALSE; -} - -static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IDXGIFactory2 *iface, - IUnknown *device, HWND window, const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, - const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc, - IDXGIOutput *output, IDXGISwapChain1 **swapchain) -{ - FIXME("iface %p, device %p, window %p, swapchain_desc %p, fullscreen_desc %p, " - "output %p, swapchain %p stub!\n", - iface, device, window, swapchain_desc, fullscreen_desc, output, swapchain); - - return E_NOTIMPL; -} - static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForCoreWindow(IDXGIFactory2 *iface, IUnknown *device, IUnknown *window, const DXGI_SWAP_CHAIN_DESC1 *desc, IDXGIOutput *output, IDXGISwapChain1 **swapchain) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 7cfaea4..77b7cb7 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -932,8 +932,14 @@ static void test_create_swapchain(void) refcount = get_refcount((IUnknown *)device); ok(refcount == 2, "Got unexpected refcount %u.\n", refcount); + hr = IDXGIFactory_CreateSwapChain(factory, NULL, &creation_desc, &swapchain); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = IDXGIFactory_CreateSwapChain(factory, obj, NULL, &swapchain); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, NULL); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain); - ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to create swapchain, hr %#x.\n", hr); refcount = get_refcount((IUnknown *)adapter); ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount);

1 0

Józef Kucia : dxgi: Update to IDXGIFactory4.
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: f2d8491ed920e93f5d81ad064843ba08f7d66572 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2d8491ed920e93f5d81ad06… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 19 13:30:16 2018 +0100 dxgi: Update to IDXGIFactory4. 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/adapter.c | 6 +-- dlls/dxgi/device.c | 2 +- dlls/dxgi/dxgi_private.h | 4 +- dlls/dxgi/factory.c | 117 ++++++++++++++++++++++++++++++----------------- 4 files changed, 80 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f2d8491ed920e93f5d81…

1 0

Józef Kucia : dxgi: Implement CreateDXGIFactory2().
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: e72db8de9568bc9dfd38f92fe9fd0737b37edefb URL: https://source.winehq.org/git/wine.git/?a=commit;h=e72db8de9568bc9dfd38f92f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 19 13:30:17 2018 +0100 dxgi: Implement CreateDXGIFactory2(). 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/dxgi.spec | 1 + dlls/dxgi/dxgi_main.c | 22 ++++++++++++++++------ include/dxgi1_3.idl | 6 ++++++ 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/dxgi/dxgi.spec b/dlls/dxgi/dxgi.spec index 3270a53..801e6a4 100644 --- a/dlls/dxgi/dxgi.spec +++ b/dlls/dxgi/dxgi.spec @@ -1,4 +1,5 @@ @ stdcall CreateDXGIFactory(ptr ptr) @ stdcall CreateDXGIFactory1(ptr ptr) +@ stdcall CreateDXGIFactory2(long ptr ptr) @ stdcall DXGID3D10CreateDevice(ptr ptr ptr long ptr long ptr) @ stdcall DXGID3D10RegisterLayers(ptr long) diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c index 60ff3c1..36cf73b 100644 --- a/dlls/dxgi/dxgi_main.c +++ b/dlls/dxgi/dxgi_main.c @@ -56,18 +56,28 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) return TRUE; } -HRESULT WINAPI CreateDXGIFactory1(REFIID riid, void **factory) +HRESULT WINAPI CreateDXGIFactory2(UINT flags, REFIID iid, void **factory) { - TRACE("riid %s, factory %p\n", debugstr_guid(riid), factory); + TRACE("flags %#x, iid %s, factory %p.\n", flags, debugstr_guid(iid), factory); - return dxgi_factory_create(riid, factory, TRUE); + if (flags) + FIXME("Ignoring flags %#x.\n", flags); + + return dxgi_factory_create(iid, factory, TRUE); +} + +HRESULT WINAPI CreateDXGIFactory1(REFIID iid, void **factory) +{ + TRACE("iid %s, factory %p.\n", debugstr_guid(iid), factory); + + return dxgi_factory_create(iid, factory, TRUE); } -HRESULT WINAPI CreateDXGIFactory(REFIID riid, void **factory) +HRESULT WINAPI CreateDXGIFactory(REFIID iid, void **factory) { - TRACE("riid %s, factory %p\n", debugstr_guid(riid), factory); + TRACE("iid %s, factory %p.\n", debugstr_guid(iid), factory); - return dxgi_factory_create(riid, factory, FALSE); + return dxgi_factory_create(iid, factory, FALSE); } static BOOL get_layer(enum dxgi_device_layer_id id, struct dxgi_device_layer *layer) diff --git a/include/dxgi1_3.idl b/include/dxgi1_3.idl index 5ea20dd..b43ca23 100644 --- a/include/dxgi1_3.idl +++ b/include/dxgi1_3.idl @@ -223,3 +223,9 @@ interface IDXGIOutput3 : IDXGIOutput2 [out] UINT *flags ); } + +const UINT DXGI_CREATE_FACTORY_DEBUG = 0x1; + +[local] HRESULT __stdcall CreateDXGIFactory2(UINT flags, REFIID iid, void **factory); + +[local] HRESULT __stdcall DXGIGetDebugInterface1(UINT flags, REFIID iid, void **debug);

1 0

Henri Verbeet : d3d10: Validate the DXBC version.
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: 8553df475ec32a9caf68a4b3f8ffd2289aa6eabf URL: https://source.winehq.org/git/wine.git/?a=commit;h=8553df475ec32a9caf68a4b3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 19 19:25:14 2018 +0100 d3d10: Validate the DXBC version. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/utils.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10/utils.c b/dlls/d3d10/utils.c index 39b0902..223b33a 100644 --- a/dlls/d3d10/utils.c +++ b/dlls/d3d10/utils.c @@ -159,6 +159,7 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size, DWORD chunk_count; DWORD total_size; unsigned int i; + DWORD version; DWORD tag; if (!data) @@ -179,7 +180,13 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size, /* checksum? */ skip_dword_unknown("DXBC header", &ptr, 4); - skip_dword_unknown("DXBC header", &ptr, 1); + read_dword(&ptr, &version); + TRACE("version: %#x.\n", version); + if (version != 0x00000001) + { + WARN("Got unexpected DXBC version %#x.\n", version); + return E_FAIL; + } read_dword(&ptr, &total_size); TRACE("total size: %#x\n", total_size);

1 0

Henri Verbeet : d3d11: Validate the DXBC version.
by Alexandre Julliard 19 Jan '18

19 Jan '18

Module: wine Branch: master Commit: ed0b366322f4bd36d6462294bc529b25a073f369 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed0b366322f4bd36d6462294… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 19 19:25:15 2018 +0100 d3d11: Validate the DXBC version. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/utils.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index c9e137c..c72216d 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -789,6 +789,7 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size, DWORD chunk_count; DWORD total_size; unsigned int i; + DWORD version; DWORD tag; read_dword(&ptr, &tag); @@ -803,7 +804,13 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size, WARN("Ignoring DXBC checksum.\n"); skip_dword_unknown(&ptr, 4); - skip_dword_unknown(&ptr, 1); /* It seems to always be 0x00000001. */ + read_dword(&ptr, &version); + TRACE("version: %#x.\n", version); + if (version != 0x00000001) + { + WARN("Got unexpected DXBC version %#x.\n", version); + return E_INVALIDARG; + } read_dword(&ptr, &total_size); TRACE("total size: %#x\n", total_size);

1 0