November 2018 - Wine-Commits

Alexandre Julliard : oleaut32: Fix argument order with instance and VARIANT return type.
by Alexandre Julliard Nov. 13, 2018

Nov. 13, 2018

Module: wine Branch: master Commit: b73972b9df0e26ebfe07c0d7fbc5b2b9583c556c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b73972b9df0e26ebfe07c0d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 13 19:08:10 2018 +0100 oleaut32: Fix argument order with instance and VARIANT return type. Spotted by Dmitry Timoshkov. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 84 ++++++++++++++++++++++++++++--------------------- 1 file changed, 48 insertions(+), 36 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 4555802..b4d7f7c 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6647,7 +6647,7 @@ DispCallFunc( VARTYPE* prgvt, VARIANTARG** prgpvarg, VARIANT* pvargResult) { #ifdef __i386__ - int argspos, stack_offset; + int argspos = 0, stack_offset; void *func; UINT i; DWORD *args; @@ -6665,8 +6665,6 @@ DispCallFunc( /* maximum size for an argument is sizeof(VARIANT) */ args = heap_alloc(sizeof(VARIANT) * cActuals + sizeof(DWORD) * 2 ); - /* start at 1 in case we need to pass a pointer to the return value as arg 0 */ - argspos = 1; if (pvInstance) { const FARPROC *vtable = *(FARPROC **)pvInstance; @@ -6675,6 +6673,20 @@ DispCallFunc( } else func = (void *)oVft; + switch (vtReturn) + { + case VT_DECIMAL: + case VT_VARIANT: + args[argspos++] = (DWORD)pvargResult; /* arg 0 is a pointer to the result */ + break; + case VT_HRESULT: + WARN("invalid return type %u\n", vtReturn); + heap_free( args ); + return E_INVALIDARG; + default: + break; + } + for (i = 0; i < cActuals; i++) { VARIANT *arg = prgpvarg[i]; @@ -6709,31 +6721,24 @@ DispCallFunc( switch (vtReturn) { case VT_EMPTY: - call_method( func, argspos - 1, args + 1, &stack_offset ); + case VT_DECIMAL: + case VT_VARIANT: + call_method( func, argspos, args, &stack_offset ); break; case VT_R4: - V_R4(pvargResult) = call_double_method( func, argspos - 1, args + 1, &stack_offset ); + V_R4(pvargResult) = call_double_method( func, argspos, args, &stack_offset ); break; case VT_R8: case VT_DATE: - V_R8(pvargResult) = call_double_method( func, argspos - 1, args + 1, &stack_offset ); - break; - case VT_DECIMAL: - case VT_VARIANT: - args[0] = (DWORD)pvargResult; /* arg 0 is a pointer to the result */ - call_method( func, argspos, args, &stack_offset ); + V_R8(pvargResult) = call_double_method( func, argspos, args, &stack_offset ); break; case VT_I8: case VT_UI8: case VT_CY: - V_UI8(pvargResult) = call_method( func, argspos - 1, args + 1, &stack_offset ); + V_UI8(pvargResult) = call_method( func, argspos, args, &stack_offset ); break; - case VT_HRESULT: - WARN("invalid return type %u\n", vtReturn); - heap_free( args ); - return E_INVALIDARG; default: - V_UI4(pvargResult) = call_method( func, argspos - 1, args + 1, &stack_offset ); + V_UI4(pvargResult) = call_method( func, argspos, args, &stack_offset ); break; } heap_free( args ); @@ -6747,7 +6752,7 @@ DispCallFunc( return S_OK; #elif defined(__x86_64__) - int argspos; + int argspos = 0; UINT i; DWORD_PTR *args; void *func; @@ -6765,8 +6770,6 @@ DispCallFunc( /* maximum size for an argument is sizeof(DWORD_PTR) */ args = heap_alloc( sizeof(DWORD_PTR) * (cActuals + 2) ); - /* start at 1 in case we need to pass a pointer to the return value as arg 0 */ - argspos = 1; if (pvInstance) { const FARPROC *vtable = *(FARPROC **)pvInstance; @@ -6775,6 +6778,20 @@ DispCallFunc( } else func = (void *)oVft; + switch (vtReturn) + { + case VT_DECIMAL: + case VT_VARIANT: + args[argspos++] = (DWORD_PTR)pvargResult; /* arg 0 is a pointer to the result */ + break; + case VT_HRESULT: + WARN("invalid return type %u\n", vtReturn); + heap_free( args ); + return E_INVALIDARG; + default: + break; + } + for (i = 0; i < cActuals; i++) { VARIANT *arg = prgpvarg[i]; @@ -6798,23 +6815,18 @@ DispCallFunc( switch (vtReturn) { case VT_R4: - V_R4(pvargResult) = call_double_method( func, argspos - 1, args + 1 ); + V_R4(pvargResult) = call_double_method( func, argspos, args ); break; case VT_R8: case VT_DATE: - V_R8(pvargResult) = call_double_method( func, argspos - 1, args + 1 ); + V_R8(pvargResult) = call_double_method( func, argspos, args ); break; case VT_DECIMAL: case VT_VARIANT: - args[0] = (DWORD_PTR)pvargResult; /* arg 0 is a pointer to the result */ call_method( func, argspos, args ); break; - case VT_HRESULT: - WARN("invalid return type %u\n", vtReturn); - heap_free( args ); - return E_INVALIDARG; default: - V_UI8(pvargResult) = call_method( func, argspos - 1, args + 1 ); + V_UI8(pvargResult) = call_method( func, argspos, args ); break; } heap_free( args ); @@ -6854,6 +6866,14 @@ DispCallFunc( argspos = 0; rcount = 0; + if (pvInstance) + { + const FARPROC *vtable = *(FARPROC **)pvInstance; + func = vtable[oVft/sizeof(void *)]; + regs.r[rcount++] = (DWORD)pvInstance; /* the This pointer is always the first parameter */ + } + else func = (void *)oVft; + /* Determine if we need to pass a pointer for the return value as arg 0. If so, do that */ /* first as it will need to be in the 'r' registers: */ switch (vtReturn) @@ -6869,14 +6889,6 @@ DispCallFunc( break; } - if (pvInstance) - { - const FARPROC *vtable = *(FARPROC **)pvInstance; - func = vtable[oVft/sizeof(void *)]; - regs.r[rcount++] = (DWORD)pvInstance; /* the This pointer is always the first parameter */ - } - else func = (void *)oVft; - /* maximum size for an argument is sizeof(VARIANT). Also allow for return pointer and stack alignment. */ args = heap_alloc( sizeof(VARIANT) * cActuals + sizeof(DWORD) * 4 );

1 0

Józef Kucia : d3d11/tests: Fix crashes with debug layer enabled.
by Alexandre Julliard Nov. 13, 2018

Nov. 13, 2018

Module: wine Branch: master Commit: c518813e1ecc35f58ff887ec814eb3f1618662fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=c518813e1ecc35f58ff887ec… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 13 11:08:13 2018 +0100 d3d11/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/d3d11/tests/d3d11.c | 79 +++++++++++++++++++++++++++++++----------------- 1 file changed, 51 insertions(+), 28 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 76e0db2..aeba9ef 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -3755,8 +3755,11 @@ static void test_create_rendertarget_view(void) U1(U(rtv_desc).Buffer).ElementOffset = 0; U2(U(rtv_desc).Buffer).ElementWidth = 64; - hr = ID3D11Device_CreateRenderTargetView(device, NULL, &rtv_desc, &rtview); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + if (!enable_debug_layer) + { + hr = ID3D11Device_CreateRenderTargetView(device, NULL, &rtv_desc, &rtview); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + } expected_refcount = get_refcount(device) + 1; hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)buffer, &rtv_desc, &rtview); @@ -6039,16 +6042,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 = ID3D11Device_GetPrivateData(device, &test_guid2, NULL, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - size = 0xdeadbabe; - hr = ID3D11Device_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 = ID3D11Device_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 = ID3D11Device_GetPrivateData(device, &test_guid2, NULL, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + size = 0xdeadbabe; + hr = ID3D11Device_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 = ID3D11Device_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 = ID3D11Texture2D_SetPrivateDataInterface(texture, &test_guid, (IUnknown *)test_object); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); @@ -6298,7 +6304,8 @@ static void test_device_context_state(void) tmp_sampler = (ID3D11SamplerState *)0xdeadbeef; ID3D11DeviceContext1_PSGetSamplers(context, 0, 1, &tmp_sampler); ok(tmp_sampler == (ID3D11SamplerState *)0xdeadbeef, "Got unexpected sampler %p.\n", tmp_sampler); - ID3D11DeviceContext1_PSSetSamplers(context, 0, 1, &tmp_sampler); + if (!enable_debug_layer) + ID3D11DeviceContext1_PSSetSamplers(context, 0, 1, &tmp_sampler); check_interface(device, &IID_ID3D10Device, TRUE, FALSE); check_interface(device, &IID_ID3D10Device1, TRUE, FALSE); @@ -10277,8 +10284,11 @@ static void test_clear_state(void) ok(!tmp_uav[i], "Got unexpected unordered access view %p in slot %u.\n", tmp_uav[i], i); } - ID3D11DeviceContext_RSGetScissorRects(context, &count, NULL); - ok(!count, "Got unexpected scissor rect count %u.\n", count); + if (!enable_debug_layer) + { + ID3D11DeviceContext_RSGetScissorRects(context, &count, NULL); + ok(!count, "Got unexpected scissor rect count %u.\n", count); + } memset(tmp_rect, 0x55, sizeof(tmp_rect)); count = D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE; ID3D11DeviceContext_RSGetScissorRects(context, &count, tmp_rect); @@ -13071,23 +13081,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 = ID3D11Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 0, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D11Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 1, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D11Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + } + quality_levels = 0xdeadbeef; - hr = ID3D11Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 0, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = ID3D11Device_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 = ID3D11Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 1, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = ID3D11Device_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 = ID3D11Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = ID3D11Device_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); @@ -13599,7 +13613,8 @@ static void test_clear_render_target_view_2d(void) ID3D11DeviceContext_ClearRenderTargetView(context, rtv, color); check_texture_color(texture, expected_color, 1); - ID3D11DeviceContext_ClearRenderTargetView(context, NULL, green); + if (!enable_debug_layer) + ID3D11DeviceContext_ClearRenderTargetView(context, NULL, green); check_texture_color(texture, expected_color, 1); ID3D11DeviceContext_ClearRenderTargetView(context, srgb_rtv, color); @@ -13755,7 +13770,8 @@ static void test_clear_depth_stencil_view(void) ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 0.25f, 0); check_texture_float(depth_texture, 0.25f, 0); - ID3D11DeviceContext_ClearDepthStencilView(context, NULL, D3D11_CLEAR_DEPTH, 1.0f, 0); + if (!enable_debug_layer) + ID3D11DeviceContext_ClearDepthStencilView(context, NULL, D3D11_CLEAR_DEPTH, 1.0f, 0); check_texture_float(depth_texture, 0.25f, 0); ID3D11Texture2D_Release(depth_texture); @@ -21056,10 +21072,13 @@ static void test_render_target_device_mismatch(void) rtv = (ID3D11RenderTargetView *)0xdeadbeef; ID3D11DeviceContext_OMGetRenderTargets(context, 1, &rtv, NULL); ok(!rtv, "Got unexpected render target view %p.\n", rtv); - ID3D11DeviceContext_OMSetRenderTargets(context, 1, &test_context.backbuffer_rtv, NULL); - ID3D11DeviceContext_OMGetRenderTargets(context, 1, &rtv, NULL); - ok(rtv == test_context.backbuffer_rtv, "Got unexpected render target view %p.\n", rtv); - ID3D11RenderTargetView_Release(rtv); + if (!enable_debug_layer) + { + ID3D11DeviceContext_OMSetRenderTargets(context, 1, &test_context.backbuffer_rtv, NULL); + ID3D11DeviceContext_OMGetRenderTargets(context, 1, &rtv, NULL); + ok(rtv == test_context.backbuffer_rtv, "Got unexpected render target view %p.\n", rtv); + ID3D11RenderTargetView_Release(rtv); + } rtv = NULL; ID3D11DeviceContext_OMSetRenderTargets(context, 1, &rtv, NULL); @@ -27605,7 +27624,7 @@ static void test_multiple_viewports(void) vp[1].Width = width; ID3D11DeviceContext_RSSetViewports(context, 2, vp); - count = ARRAY_SIZE(vp); + count = enable_debug_layer ? ARRAY_SIZE(vp) - 1 : ARRAY_SIZE(vp); ID3D11DeviceContext_RSGetViewports(context, &count, vp); ok(count == 2, "Unexpected viewport count %d.\n", count); @@ -27688,6 +27707,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. */ ID3D11DeviceContext_RSSetViewports(context, 1, vp); @@ -27709,6 +27731,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: ID3D11RenderTargetView_Release(rtv); ID3D11Texture2D_Release(texture);

1 0

Józef Kucia : d3d11/tests: Add option to enable debug layer.
by Alexandre Julliard Nov. 13, 2018

Nov. 13, 2018

Module: wine Branch: master Commit: 5d04dd275026e1582c9b889eb75f324f624eaee6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d04dd275026e1582c9b889e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 13 11:08:12 2018 +0100 d3d11/tests: Add option to enable debug layer. Some tests crashes 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/d3d11/tests/d3d11.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 0174289..76e0db2 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -38,6 +38,7 @@ #define SWAPCHAIN_FLAG_SHADER_INPUT 0x1 static unsigned int use_adapter_idx; +static BOOL enable_debug_layer; static BOOL use_warp_adapter; static BOOL use_mt = TRUE; @@ -1346,6 +1347,9 @@ static ID3D11Device *create_device(const struct device_desc *desc) feature_level_count = ARRAY_SIZE(default_feature_level); } + if (enable_debug_layer) + flags |= D3D11_CREATE_DEVICE_DEBUG; + if ((adapter = create_adapter())) { hr = D3D11CreateDevice(adapter, D3D_DRIVER_TYPE_UNKNOWN, NULL, flags, @@ -2037,7 +2041,7 @@ static void test_device_interfaces(const D3D_FEATURE_LEVEL feature_level) check_interface(device, &IID_ID3D10Multithread, TRUE, TRUE); /* Not available on all Windows versions. */ todo_wine check_interface(device, &IID_ID3D10Device, FALSE, FALSE); todo_wine check_interface(device, &IID_ID3D10Device1, FALSE, FALSE); - check_interface(device, &IID_ID3D11InfoQueue, FALSE, FALSE); /* Non-debug mode. */ + check_interface(device, &IID_ID3D11InfoQueue, enable_debug_layer, FALSE); hr = ID3D11Device_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); ok(SUCCEEDED(hr), "Device should implement IDXGIDevice.\n"); @@ -28750,7 +28754,9 @@ START_TEST(d3d11) 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

Henri Verbeet : wined3d: Introduce a separate structure for OpenGL shader resource view information.
by Alexandre Julliard Nov. 13, 2018

Nov. 13, 2018

Module: wine Branch: master Commit: c0981736709cc2161e2ea97965dda6ee7585b70d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0981736709cc2161e2ea979… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 13 16:58:17 2018 +0330 wined3d: Introduce a separate structure for OpenGL shader resource view information. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 2 +- dlls/wined3d/view.c | 72 ++++++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 16 ++++++++-- 3 files changed, 52 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c0981736709cc2161e2e…

1 0

Henri Verbeet : wined3d: Introduce a separate structure for OpenGL unordered access view information.
by Alexandre Julliard Nov. 13, 2018

Nov. 13, 2018

Module: wine Branch: master Commit: cf6b3f28d73a6609debeb22f0b1df7a62935bcdf URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf6b3f28d73a6609debeb22f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 13 16:58:18 2018 +0330 wined3d: Introduce a separate structure for OpenGL unordered access view information. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 21 ++++++++------- dlls/wined3d/view.c | 61 ++++++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 15 +++++++++-- 3 files changed, 56 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cf6b3f28d73a6609debe…

1 0

Henri Verbeet : wined3d: Introduce a separate structure for OpenGL rendertarget view information.
by Alexandre Julliard Nov. 13, 2018

Nov. 13, 2018

Module: wine Branch: master Commit: 0799c3babd25150aa27645361ced67d8e99e5be0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0799c3babd25150aa2764536… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 13 16:58:16 2018 +0330 wined3d: Introduce a separate structure for OpenGL rendertarget view information. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 39 ++++++++++++++++++++---------------- dlls/wined3d/view.c | 45 +++++++++++++++++++++--------------------- dlls/wined3d/wined3d_private.h | 13 +++++++++++- 3 files changed, 57 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0799c3babd25150aa276…

1 0

Henri Verbeet : d3d8: Do not add map access indiscriminately in d3d8_device_create_surface().
by Alexandre Julliard Nov. 13, 2018

Nov. 13, 2018

Module: wine Branch: master Commit: 366d2bb75e2f805285591cd28f45f5dc09c06450 URL: https://source.winehq.org/git/wine.git/?a=commit;h=366d2bb75e2f805285591cd2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 13 16:58:15 2018 +0330 d3d8: Do not add map access indiscriminately in d3d8_device_create_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 885849f..476e3e1 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1166,8 +1166,7 @@ static HRESULT d3d8_device_create_surface(struct d3d8_device *device, UINT width if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; desc.bind_flags = wined3d_bind_flags_from_d3d8_usage(usage); - desc.access = wined3daccess_from_d3dpool(pool, usage) - | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + desc.access = wined3daccess_from_d3dpool(pool, usage); desc.width = width; desc.height = height; desc.depth = 1;

1 0

Dmitry Timoshkov : oleaut32/tests: Add test for calling function with instance and VARIANT return type.
by Alexandre Julliard Nov. 13, 2018

Nov. 13, 2018

Module: wine Branch: master Commit: b7dad74f53293b0c64aec9877b53dd7df8f565cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7dad74f53293b0c64aec987… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 13 16:15:30 2018 +0300 oleaut32/tests: Add test for calling function with instance and VARIANT return type. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/typelib.c | 59 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 57 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 0303174..90f0cb2 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1199,11 +1199,41 @@ static HRESULT WINAPI ret_false_func(void) return S_FALSE; } -static const void *vtable[] = { NULL, NULL, NULL, inst_func }; +static const WCHAR testW[] = { 'T','e','s','t',0 }; + +static void WINAPI variant_func2(VARIANT *ret, VARIANT v1, VARIANT v2) +{ + ok(V_VT(&v1) == VT_I4, "unexpected %d\n", V_VT(&v1)); + ok(V_I4(&v1) == 2, "unexpected %d\n", V_I4(&v1)); + ok(V_VT(&v2) == VT_BSTR, "unexpected %d\n", V_VT(&v2)); + ok(lstrcmpW(V_BSTR(&v2), testW) == 0, "unexpected %s\n", wine_dbgstr_w(V_BSTR(&v2))); + + V_VT(ret) = VT_UI4; + V_I4(ret) = 4321; +} + +static void WINAPI inst_func2(void *inst, VARIANT *ret, VARIANT v1, VARIANT v2) +{ + ok( (*(void ***)inst)[3] == inst_func2, "wrong ptr %p\n", inst ); + + ok(V_VT(ret) == VT_I4 || broken(V_VT(ret) == VT_VARIANT) /* win64 */, "unexpected %d\n", V_VT(ret)); + ok(V_I4(ret) == 1234, "unexpected %d\n", V_I4(ret)); + + ok(V_VT(&v1) == VT_I4, "unexpected %d\n", V_VT(&v1)); + ok(V_I4(&v1) == 2, "unexpected %d\n", V_I4(&v1)); + ok(V_VT(&v2) == VT_BSTR, "unexpected %d\n", V_VT(&v2)); + ok(lstrcmpW(V_BSTR(&v2), testW) == 0, "unexpected %s\n", wine_dbgstr_w(V_BSTR(&v2))); + + V_VT(ret) = VT_UI4; + V_I4(ret) = 4321; +} + +static void *vtable[] = { NULL, NULL, NULL, inst_func }; +static void *vtable2[] = { NULL, NULL, NULL, inst_func2 }; static void test_DispCallFunc(void) { - const void **inst = vtable; + void **inst; HRESULT res; VARIANT result, args[5]; VARIANTARG *pargs[5]; @@ -1213,6 +1243,30 @@ static void test_DispCallFunc(void) for (i = 0; i < 5; i++) pargs[i] = &args[i]; memset( args, 0x55, sizeof(args) ); + + types[0] = VT_VARIANT; + V_VT(&args[0]) = VT_I4; + V_I4(&args[0]) = 2; + types[1] = VT_VARIANT; + V_VT(&args[1]) = VT_BSTR; + V_BSTR(&args[1]) = SysAllocString(testW); + memset( &result, 0xcc, sizeof(result) ); + res = DispCallFunc(NULL, (ULONG_PTR)variant_func2, CC_STDCALL, VT_VARIANT, 2, types, pargs, &result); + ok(res == S_OK, "DispCallFunc error %#x\n", res); + ok(V_VT(&result) == VT_UI4, "wrong result type %d\n", V_VT(&result)); + ok(V_UI4(&result) == 4321, "wrong result %u\n", V_UI4(&result)); + + V_VT(&result) = VT_I4; + V_UI4(&result) = 1234; + inst = vtable2; + res = DispCallFunc(&inst, 3 * sizeof(void *), CC_STDCALL, VT_VARIANT, 2, types, pargs, &result); + ok(res == S_OK, "DispCallFunc error %#x\n", res); + ok(V_VT(&result) == VT_UI4, "wrong result type %d\n", V_VT(&result)); + ok(V_UI4(&result) == 4321, "wrong result %u\n", V_UI4(&result)); + + VariantClear(&args[1]); + + memset( args, 0x55, sizeof(args) ); types[0] = VT_UI4; V_UI4(&args[0]) = 1; types[1] = VT_I4; @@ -1310,6 +1364,7 @@ static void test_DispCallFunc(void) types[0] = VT_I4; V_I4(&args[0]) = 3; memset( &result, 0xcc, sizeof(result) ); + inst = vtable; res = DispCallFunc( &inst, 3 * sizeof(void*), CC_STDCALL, VT_I4, 1, types, pargs, &result ); ok( res == S_OK, "DispCallFunc failed %x\n", res ); ok( V_VT(&result) == VT_I4, "wrong result type %d\n", V_VT(&result) );

1 0

Alex Henrie : kernel32: Remove duplicate spec file entries.
by Alexandre Julliard Nov. 13, 2018

Nov. 13, 2018

Module: wine Branch: master Commit: 305597439b34bdace061706c11f1dd91de13da1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=305597439b34bdace061706c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 12 22:35:06 2018 -0700 kernel32: Remove duplicate spec file entries. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 74af2a4..f600c7e 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -195,7 +195,6 @@ # @ stub BasepFreeActivationContextActivationBlock # @ stub BasepFreeAppCompatData # @ stub BasepMapModuleHandle -# @ stub BaseVerifyUnicodeString @ stdcall Beep(long long) @ stdcall BeginUpdateResourceA(str long) @ stdcall BeginUpdateResourceW(wstr long) @@ -286,13 +285,11 @@ @ stdcall CreateFileMappingA(long ptr long long long str) # @ stub CreateFileMappingNumaA # @ stub CreateFileMappingNumaW -@ stdcall CreateHardLinkTransactedA(str str ptr ptr) -@ stdcall CreateHardLinkTransactedW(wstr wstr ptr ptr) @ stdcall CreateFileMappingW(long ptr long long long wstr) @ stdcall CreateFileW(wstr long long ptr long long long) @ stdcall CreateHardLinkA(str str ptr) -# @ stub CreateHardLinkTransactedA -# @ stub CreateHardLinkTransactedW +@ stdcall CreateHardLinkTransactedA(str str ptr ptr) +@ stdcall CreateHardLinkTransactedW(wstr wstr ptr ptr) @ stdcall CreateHardLinkW(wstr wstr ptr) @ stdcall CreateIoCompletionPort(long long long long) @ stdcall CreateJobObjectA(ptr str)

1 0

Byeongsik Jeon : gdi32: Specify the suitable hinting flags explicitly.
by Alexandre Julliard Nov. 13, 2018

Nov. 13, 2018

Module: wine Branch: master Commit: 7da7930a10f22cf186e9454fec2807d75f239fad URL: https://source.winehq.org/git/wine.git/?a=commit;h=7da7930a10f22cf186e9454f… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Tue Nov 13 09:27:09 2018 +0000 gdi32: Specify the suitable hinting flags explicitly. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41639 Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b62288c..99b7d8c 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6801,6 +6801,37 @@ static unsigned int get_bezier_glyph_outline(FT_Outline *outline, unsigned int b return needed; } +static FT_Int get_load_flags( UINT format ) +{ + FT_Int load_flags = FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH; + + if (format & GGO_UNHINTED) + return load_flags | FT_LOAD_NO_HINTING; + + switch (format & ~GGO_GLYPH_INDEX) + { + case GGO_BITMAP: + load_flags |= FT_LOAD_TARGET_MONO; + break; + case GGO_GRAY2_BITMAP: + case GGO_GRAY4_BITMAP: + case GGO_GRAY8_BITMAP: + case WINE_GGO_GRAY16_BITMAP: + load_flags |= FT_LOAD_TARGET_NORMAL; + break; + case WINE_GGO_HRGB_BITMAP: + case WINE_GGO_HBGR_BITMAP: + load_flags |= FT_LOAD_TARGET_LCD; + break; + case WINE_GGO_VRGB_BITMAP: + case WINE_GGO_VBGR_BITMAP: + load_flags |= FT_LOAD_TARGET_LCD_V; + break; + } + + return load_flags; +} + static const BYTE masks[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}; static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, @@ -6820,7 +6851,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, FT_Vector adv; INT origin_x = 0, origin_y = 0; FT_Angle angle = 0; - FT_Int load_flags = FT_LOAD_DEFAULT | FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH; + FT_Int load_flags = get_load_flags(format); double widthRatio = 1.0; FT_Matrix transMat = identityMat; FT_Matrix transMatUnrotated; @@ -6859,10 +6890,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, tategaki = check_unicode_tategaki(glyph); } - if(format & GGO_UNHINTED) { - load_flags |= FT_LOAD_NO_HINTING; - format &= ~GGO_UNHINTED; - } + format &= ~GGO_UNHINTED; if(original_index >= font->gmsize * GM_BLOCK_SIZE) { font->gmsize = (original_index / GM_BLOCK_SIZE + 1);

1 0