January 2019 - Wine-Commits

Joshua Ashton : include: Add a few missing d3d9 constants.
by Alexandre Julliard Jan. 24, 2019

Jan. 24, 2019

Module: wine Branch: master Commit: 9f258dab603334d95115e7170144c8031affcbd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f258dab603334d95115e717… Author: Joshua Ashton <joshua(a)froggi.es> Date: Thu Jan 24 20:39:01 2019 +0330 include: Add a few missing d3d9 constants. Signed-off-by: Joshua Ashton <joshua(a)froggi.es> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d9.h | 2 ++ include/d3d9types.h | 3 +++ 2 files changed, 5 insertions(+) diff --git a/include/d3d9.h b/include/d3d9.h index ef3ea2a9..3ebde45 100644 --- a/include/d3d9.h +++ b/include/d3d9.h @@ -65,8 +65,10 @@ #define D3DPRESENT_DONOTWAIT __MSABI_LONG(1) #define D3DPRESENT_LINEAR_CONTENT __MSABI_LONG(2) #define D3DPRESENT_BACK_BUFFERS_MAX __MSABI_LONG(3) +#define D3DPRESENT_BACK_BUFFERS_MAX_EX __MSABI_LONG(30) #define D3DSGR_NO_CALIBRATION __MSABI_LONG(0x00000000) #define D3DSGR_CALIBRATE __MSABI_LONG(0x00000001) +#define D3DCURSOR_IMMEDIATE_UPDATE __MSABI_LONG(0x00000001) #define _FACD3D 0x876 #define MAKE_D3DHRESULT( code ) MAKE_HRESULT( 1, _FACD3D, code ) diff --git a/include/d3d9types.h b/include/d3d9types.h index 4891858..56394df 100644 --- a/include/d3d9types.h +++ b/include/d3d9types.h @@ -481,6 +481,9 @@ typedef enum _D3DSHADER_INSTRUCTION_OPCODE_TYPE { #define D3DSP_DCL_USAGEINDEX_SHIFT 16 #define D3DSP_DCL_USAGEINDEX_MASK 0x000f0000 +#define D3DSP_OPCODESPECIFICCONTROL_SHIFT 16 +#define D3DSP_OPCODESPECIFICCONTROL_MASK 0x00ff0000 + #define D3DSP_TEXTURETYPE_SHIFT 27 #define D3DSP_TEXTURETYPE_MASK 0x78000000

1 0

Józef Kucia : d3d10core/tests: Add test for sample_c_lz instruction.
by Alexandre Julliard Jan. 24, 2019

Jan. 24, 2019

Module: wine Branch: master Commit: e4069767e7338b593ba96381fe8367f707682f62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4069767e7338b593ba96381… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 24 12:31:23 2019 +0100 d3d10core/tests: Add test for sample_c_lz instruction. 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/d3d10core/tests/d3d10core.c | 224 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 224 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e4069767e7338b593ba9…

1 0

Józef Kucia : d3d10core/tests: Fix crashes with debug layer enabled.
by Alexandre Julliard Jan. 24, 2019

Jan. 24, 2019

Module: wine Branch: master Commit: a3af3e872264f462ee8664820ee38d4760d6c164 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3af3e872264f462ee866482… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 24 12:31:25 2019 +0100 d3d10core/tests: Fix crashes with debug layer enabled. 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/d3d10core/tests/d3d10core.c | 74 +++++++++++++++++++++++----------------- 1 file changed, 43 insertions(+), 31 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 06b9a16..7b0d2fb 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -2825,8 +2825,11 @@ static void test_create_rendertarget_view(void) U(rtv_desc).Buffer.ElementOffset = 0; U(rtv_desc).Buffer.ElementWidth = 64; - hr = ID3D10Device_CreateRenderTargetView(device, NULL, &rtv_desc, &rtview); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + if (!enable_debug_layer) + { + hr = ID3D10Device_CreateRenderTargetView(device, NULL, &rtv_desc, &rtview); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + } expected_refcount = get_refcount(device) + 1; hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)buffer, &rtv_desc, &rtview); @@ -5173,6 +5176,7 @@ float4 main(float4 color : COLOR) : SV_TARGET } ok(!tmp_dsv, "Got unexpected depth stencil view %p.\n", tmp_dsv); + count = 0; ID3D10Device_RSGetScissorRects(device, &count, NULL); ok(!count, "Got unexpected scissor rect count %u.\n", count); memset(tmp_rect, 0x55, sizeof(tmp_rect)); @@ -8567,16 +8571,19 @@ static void test_private_data(void) ok(hr == DXGI_ERROR_MORE_DATA, "Got unexpected hr %#x.\n", hr); ok(size == sizeof(device), "Got unexpected size %u.\n", size); ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); - hr = ID3D10Device_GetPrivateData(device, &test_guid2, NULL, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - size = 0xdeadbabe; - hr = ID3D10Device_GetPrivateData(device, &test_guid2, &size, &ptr); - ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr); - ok(size == 0, "Got unexpected size %u.\n", size); - ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); - hr = ID3D10Device_GetPrivateData(device, &test_guid, NULL, &ptr); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); + if (!enable_debug_layer) + { + hr = ID3D10Device_GetPrivateData(device, &test_guid2, NULL, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + size = 0xdeadbabe; + hr = ID3D10Device_GetPrivateData(device, &test_guid2, &size, &ptr); + ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr); + ok(size == 0, "Got unexpected size %u.\n", size); + ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); + hr = ID3D10Device_GetPrivateData(device, &test_guid, NULL, &ptr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); + } hr = ID3D10Texture2D_SetPrivateDataInterface(texture, &test_guid, (IUnknown *)test_object); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); @@ -10271,23 +10278,27 @@ static void test_check_multisample_quality_levels(void) ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); todo_wine ok(quality_levels == 0xdeadbeef, "Got unexpected quality_levels %u.\n", quality_levels); + if (!enable_debug_layer) + { + hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 0, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 1, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + } + quality_levels = 0xdeadbeef; - hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 0, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 0, &quality_levels); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); ok(!quality_levels, "Got unexpected quality_levels %u.\n", quality_levels); quality_levels = 0xdeadbeef; - hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 1, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 1, &quality_levels); ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); ok(quality_levels == 1, "Got unexpected quality_levels %u.\n", quality_levels); quality_levels = 0xdeadbeef; - hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &quality_levels); ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); ok(quality_levels, "Got unexpected quality_levels %u.\n", quality_levels); @@ -11022,15 +11033,11 @@ static void test_clear_render_target_view_2d(void) ID3D10Device_ClearRenderTargetView(device, rtv, color); check_texture_color(texture, expected_color, 1); - if (is_d3d11_interface_available(device)) + if (is_d3d11_interface_available(device) && !enable_debug_layer) { ID3D10Device_ClearRenderTargetView(device, NULL, green); check_texture_color(texture, expected_color, 1); } - else - { - win_skip("D3D11 is not available.\n"); - } ID3D10Device_ClearRenderTargetView(device, srgb_rtv, color); check_texture_color(srgb_texture, expected_srgb_color, 1); @@ -11140,13 +11147,11 @@ static void test_clear_depth_stencil_view(void) ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH | D3D10_CLEAR_STENCIL, 0.0f, 0); check_texture_color(depth_texture, 0x00000000, 0); - if (is_d3d11_interface_available(device)) + if (is_d3d11_interface_available(device) && !enable_debug_layer) { ID3D10Device_ClearDepthStencilView(device, NULL, D3D10_CLEAR_DEPTH | D3D10_CLEAR_STENCIL, 1.0f, 0xff); check_texture_color(depth_texture, 0x00000000, 0); } - else - win_skip("D3D11 is not available, skipping test.\n"); ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH, 1.0f, 0xff); todo_wine check_texture_color(depth_texture, 0x00ffffff, 0); @@ -14335,10 +14340,13 @@ static void test_render_target_device_mismatch(void) rtv = (ID3D10RenderTargetView *)0xdeadbeef; ID3D10Device_OMGetRenderTargets(device, 1, &rtv, NULL); ok(!rtv, "Got unexpected render target view %p.\n", rtv); - ID3D10Device_OMSetRenderTargets(device, 1, &test_context.backbuffer_rtv, NULL); - ID3D10Device_OMGetRenderTargets(device, 1, &rtv, NULL); - ok(rtv == test_context.backbuffer_rtv, "Got unexpected render target view %p.\n", rtv); - ID3D10RenderTargetView_Release(rtv); + if (!enable_debug_layer) + { + ID3D10Device_OMSetRenderTargets(device, 1, &test_context.backbuffer_rtv, NULL); + ID3D10Device_OMGetRenderTargets(device, 1, &rtv, NULL); + ok(rtv == test_context.backbuffer_rtv, "Got unexpected render target view %p.\n", rtv); + ID3D10RenderTargetView_Release(rtv); + } rtv = NULL; ID3D10Device_OMSetRenderTargets(device, 1, &rtv, NULL); @@ -17385,7 +17393,7 @@ static void test_multiple_viewports(void) vp[1].Width = width; ID3D10Device_RSSetViewports(device, 2, vp); - count = ARRAY_SIZE(vp); + count = enable_debug_layer ? ARRAY_SIZE(vp) - 1 : ARRAY_SIZE(vp); ID3D10Device_RSGetViewports(device, &count, vp); ok(count == 2, "Unexpected viewport count %d.\n", count); @@ -17467,6 +17475,9 @@ static void test_multiple_viewports(void) SetRect(&rect, width, texture_desc.Height / 2, 2 * width - 1, texture_desc.Height - 1); check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[11], 1); + if (enable_debug_layer) + goto done; + /* Viewport count exceeding maximum value. */ ID3D10Device_RSSetViewports(device, 1, vp); @@ -17488,6 +17499,7 @@ static void test_multiple_viewports(void) ok(count == 1, "Unexpected viewport count %d.\n", count); ok(vp[0].TopLeftX == 0.0f && vp[0].Width == width, "Unexpected viewport.\n"); +done: ID3D10RasterizerState_Release(rasterizer_state); ID3D10RenderTargetView_Release(rtv); ID3D10Texture2D_Release(texture);

1 0

Gabriel Ivăncescu : kernel32/tests: Test partially overlapping buffers for MultiByteToWideChar.
by Alexandre Julliard Jan. 24, 2019

Jan. 24, 2019

Module: wine Branch: master Commit: ec89a9302834938aa9620227591760d30b1791b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec89a9302834938aa9620227… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jan 23 13:29:55 2019 +0200 kernel32/tests: Test partially overlapping buffers for MultiByteToWideChar. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/codepage.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index b15a3a1..38f094f 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -314,12 +314,22 @@ static void test_overlapped_buffers(void) char buf[256]; int ret; + /* limit such that strA's NUL terminator overlaps strW's NUL */ + size_t overlap_limit = (sizeof(strW)-sizeof(strA)) - (sizeof(strW[0])-sizeof(strA[0])); + SetLastError(0xdeadbeef); memcpy(buf + 1, strW, sizeof(strW)); ret = WideCharToMultiByte(CP_ACP, 0, (WCHAR *)(buf + 1), -1, buf, sizeof(buf), NULL, NULL); ok(ret == sizeof(strA), "unexpected ret %d\n", ret); ok(!memcmp(buf, strA, sizeof(strA)), "conversion failed: %s\n", buf); ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + memcpy(buf + overlap_limit, strA, sizeof(strA)); + ret = MultiByteToWideChar(CP_ACP, 0, buf + overlap_limit, -1, (WCHAR *)buf, sizeof(buf) / sizeof(WCHAR)); + ok(ret == ARRAY_SIZE(strW), "unexpected ret %d\n", ret); + ok(!memcmp(buf, strW, sizeof(strW)), "conversion failed: %s\n", wine_dbgstr_wn((WCHAR *)buf, ARRAY_SIZE(strW))); + ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u\n", GetLastError()); } static void test_string_conversion(LPBOOL bUsedDefaultChar)

1 0

Gabriel Ivăncescu : shell32/shfldr_mycomp: Use friendly name instead of GUID when SHGDN_FORADDRESSBAR is set.
by Alexandre Julliard Jan. 24, 2019

Jan. 24, 2019

Module: wine Branch: master Commit: 889fce0887451aa2b67541fe9b6951d66c4805d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=889fce0887451aa2b67541fe… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jan 23 17:27:15 2019 +0200 shell32/shfldr_mycomp: Use friendly name instead of GUID when SHGDN_FORADDRESSBAR is set. On Windows, SHGDN_FORPARSING returns the GUID name of a special folder, but only when SHGDN_FORADDRESSBAR is not set. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shfldr_mycomp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index 60f32f1..6a31e8c 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -615,7 +615,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetDisplayNameOf (IShellFolder2 *iface, clsid = _ILGetGUIDPointer (pidl); if (clsid) { - if (GET_SHGDN_FOR (dwFlags) & SHGDN_FORPARSING) + if ((GET_SHGDN_FOR (dwFlags) & (SHGDN_FORPARSING | SHGDN_FORADDRESSBAR)) == SHGDN_FORPARSING) { static const WCHAR clsidW[] = { 'C','L','S','I','D','\\',0 };

1 0

Joshua Ashton : include: Mark IDirect3D9Ex::GetAdapterDisplayModeEx() as PURE.
by Alexandre Julliard Jan. 24, 2019

Jan. 24, 2019

Module: wine Branch: master Commit: d21691a26ac3416914c409ae2eaa5bf4e2ecdd68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d21691a26ac3416914c409ae… Author: Joshua Ashton <joshua(a)froggi.es> Date: Thu Jan 24 20:39:00 2019 +0330 include: Mark IDirect3D9Ex::GetAdapterDisplayModeEx() as PURE. Signed-off-by: Joshua Ashton <joshua(a)froggi.es> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d9.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/d3d9.h b/include/d3d9.h index 08f4555..ef3ea2a9 100644 --- a/include/d3d9.h +++ b/include/d3d9.h @@ -1617,7 +1617,8 @@ DECLARE_INTERFACE_(IDirect3D9Ex, IDirect3D9) STDMETHOD_(UINT, GetAdapterModeCountEx)(THIS_ UINT adapter_idx, const D3DDISPLAYMODEFILTER *filter) PURE; STDMETHOD(EnumAdapterModesEx)(THIS_ UINT adapter_idx, const D3DDISPLAYMODEFILTER *filter, UINT mode_idx, D3DDISPLAYMODEEX *mode) PURE; - STDMETHOD(GetAdapterDisplayModeEx)(THIS_ UINT adapter_idx, D3DDISPLAYMODEEX *mode, D3DDISPLAYROTATION *rotation); + STDMETHOD(GetAdapterDisplayModeEx)(THIS_ UINT adapter_idx, + D3DDISPLAYMODEEX *mode, D3DDISPLAYROTATION *rotation) PURE; STDMETHOD(CreateDeviceEx)(THIS_ UINT adapter_idx, D3DDEVTYPE device_type, HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters, D3DDISPLAYMODEEX *mode, struct IDirect3DDevice9Ex **device) PURE; STDMETHOD(GetAdapterLUID)(THIS_ UINT adapter_idx, LUID *luid) PURE;

1 0

Zhiyi Zhang : user32: Check for null handle in GetRawInputData().
by Alexandre Julliard Jan. 24, 2019

Jan. 24, 2019

Module: wine Branch: master Commit: bd730a5f412c1e3b8a05b3b297ca0642e23fb92b URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd730a5f412c1e3b8a05b3b2… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jan 23 23:27:09 2019 +0800 user32: Check for null handle in GetRawInputData(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46499 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 3 +++ dlls/user32/tests/input.c | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index cf3028a..4bfccdf 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -281,6 +281,9 @@ UINT WINAPI GetRawInputData(HRAWINPUT rawinput, UINT command, void *data, UINT * TRACE("rawinput %p, command %#x, data %p, data_size %p, header_size %u.\n", rawinput, command, data, data_size, header_size); + if (!ri) + return ~0U; + if (header_size != sizeof(RAWINPUTHEADER)) { WARN("Invalid structure size %u.\n", header_size); diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 14fd5f8..ffdd4b7 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1530,6 +1530,16 @@ static void test_GetRawInputDeviceList(void) ok(odevcount == oret, "expected %d, got %d\n", oret, odevcount); } +static void test_GetRawInputData(void) +{ + UINT size; + UINT ret; + + /* Null raw input handle */ + ret = GetRawInputData(NULL, RID_INPUT, NULL, &size, sizeof(RAWINPUTHEADER)); + ok(ret == ~0U, "Expect ret %u, got %u\n", ~0U, ret); +} + static void test_key_map(void) { HKL kl = GetKeyboardLayout(0); @@ -2697,6 +2707,7 @@ START_TEST(input) test_attach_input(); test_GetKeyState(); test_OemKeyScan(); + test_GetRawInputData(); if(pGetMouseMovePointsEx) test_GetMouseMovePointsEx();

1 0

Józef Kucia : d3d10core/tests: Add option to enable debug layer.
by Alexandre Julliard Jan. 24, 2019

Jan. 24, 2019

Module: wine Branch: master Commit: 446dc11aa4e695ca3905aac8c8c33417337d5b75 URL: https://source.winehq.org/git/wine.git/?a=commit;h=446dc11aa4e695ca3905aac8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 24 12:31:24 2019 +0100 d3d10core/tests: Add option to enable debug layer. Some tests crash with the debug layer enabled. 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/d3d10core/tests/d3d10core.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 54edf50..06b9a16 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -34,6 +34,7 @@ #define BITS_1_0 0x3f800000 static unsigned int use_adapter_idx; +static BOOL enable_debug_layer; static BOOL use_warp_adapter; static BOOL use_mt = TRUE; @@ -1093,20 +1094,24 @@ static IDXGIAdapter *create_adapter(void) static ID3D10Device *create_device(void) { + unsigned int flags = 0; IDXGIAdapter *adapter; ID3D10Device *device; HRESULT hr; + if (enable_debug_layer) + flags |= D3D10_CREATE_DEVICE_DEBUG; + adapter = create_adapter(); - hr = D3D10CreateDevice(adapter, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, D3D10_SDK_VERSION, &device); + hr = D3D10CreateDevice(adapter, D3D10_DRIVER_TYPE_HARDWARE, NULL, flags, D3D10_SDK_VERSION, &device); if (adapter) IDXGIAdapter_Release(adapter); if (SUCCEEDED(hr)) return device; - if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_WARP, NULL, 0, D3D10_SDK_VERSION, &device))) + if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_WARP, NULL, flags, D3D10_SDK_VERSION, &device))) return device; - if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_REFERENCE, NULL, 0, D3D10_SDK_VERSION, &device))) + if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_REFERENCE, NULL, flags, D3D10_SDK_VERSION, &device))) return device; return NULL; @@ -17878,7 +17883,9 @@ START_TEST(d3d10core) argc = winetest_get_mainargs(&argv); for (i = 2; i < argc; ++i) { - if (!strcmp(argv[i], "--warp")) + if (!strcmp(argv[i], "--validate")) + enable_debug_layer = TRUE; + else if (!strcmp(argv[i], "--warp")) use_warp_adapter = TRUE; else if (!strcmp(argv[i], "--adapter") && i + 1 < argc) use_adapter_idx = atoi(argv[++i]);

1 0

Zebediah Figura : wined3d: Remove stateblock handling from wined3d_device_set_constant_buffer().
by Alexandre Julliard Jan. 24, 2019

Jan. 24, 2019

Module: wine Branch: master Commit: 6bb73652de78577161b98a3e1f92da7799455b22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bb73652de78577161b98a3e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 23 23:30:53 2019 -0600 wined3d: Remove stateblock handling from wined3d_device_set_constant_buffer(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c799a57..4f61eba 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2247,15 +2247,14 @@ void CDECL wined3d_device_set_constant_buffer(struct wined3d_device *device, return; } - prev = device->update_state->cb[type][idx]; + prev = device->state.cb[type][idx]; if (buffer == prev) return; if (buffer) wined3d_buffer_incref(buffer); - device->update_state->cb[type][idx] = buffer; - if (!device->recording) - wined3d_cs_emit_set_constant_buffer(device->cs, type, idx, buffer); + device->state.cb[type][idx] = buffer; + wined3d_cs_emit_set_constant_buffer(device->cs, type, idx, buffer); if (prev) wined3d_buffer_decref(prev); }

1 0

Zebediah Figura : wined3d: Remove stateblock handling from wined3d_device_set_stream_output().
by Alexandre Julliard Jan. 24, 2019

Jan. 24, 2019

Module: wine Branch: master Commit: 8973c22a485df5858971118f2ec70e1d8a53d435 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8973c22a485df5858971118f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 23 23:30:52 2019 -0600 wined3d: Remove stateblock handling from wined3d_device_set_stream_output(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c466e0c..c799a57 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1329,15 +1329,14 @@ void CDECL wined3d_device_set_stream_output(struct wined3d_device *device, UINT return; } - stream = &device->update_state->stream_output[idx]; + stream = &device->state.stream_output[idx]; prev_buffer = stream->buffer; if (buffer) wined3d_buffer_incref(buffer); stream->buffer = buffer; stream->offset = offset; - if (!device->recording) - wined3d_cs_emit_set_stream_output(device->cs, idx, buffer, offset); + wined3d_cs_emit_set_stream_output(device->cs, idx, buffer, offset); if (prev_buffer) wined3d_buffer_decref(prev_buffer); }

1 0