February 2021 - Wine-Commits

Rémi Bernon : d3d11/tests: Add tests for input assembler stage state swap.
by Alexandre Julliard Feb. 3, 2021

Feb. 3, 2021

Module: wine Branch: master Commit: 3d077ce705fac9d6b709cfc5b6440120aa1897f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d077ce705fac9d6b709cfc5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 2 16:41:03 2021 +0100 d3d11/tests: Add tests for input assembler stage state swap. Signed-off-by: Rémi Bernon <rbernon(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 | 129 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 128 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3d077ce705fac9d6b709…

1 0

Rémi Bernon : d3d11/tests: Add tests for output merger stage state swap.
by Alexandre Julliard Feb. 3, 2021

Feb. 3, 2021

Module: wine Branch: master Commit: 1bbf750847463278ba9fc4f7013c0583d48e4141 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bbf750847463278ba9fc4f7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 2 16:41:04 2021 +0100 d3d11/tests: Add tests for output merger stage state swap. Signed-off-by: Rémi Bernon <rbernon(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 | 214 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 204 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1bbf750847463278ba9f…

1 0

Rémi Bernon : d3d11/tests: Add tests for rasterizer stage state swap.
by Alexandre Julliard Feb. 3, 2021

Feb. 3, 2021

Module: wine Branch: master Commit: 62ea34c569c34efcb0992141737e272f08c8e0e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62ea34c569c34efcb0992141… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 2 16:41:05 2021 +0100 d3d11/tests: Add tests for rasterizer stage state swap. Signed-off-by: Rémi Bernon <rbernon(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 | 103 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 102 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 29f8f124686..63a98f5099a 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -280,6 +280,13 @@ static BOOL compare_color(DWORD c1, DWORD c2, BYTE max_diff) && compare_uint((c1 >> 24) & 0xff, (c2 >> 24) & 0xff, max_diff); } +static char const *debugstr_viewport(D3D11_VIEWPORT *vp) +{ + if (!vp) return "(null)"; + return wine_dbg_sprintf("{%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}", + vp->TopLeftX, vp->TopLeftY, vp->Width, vp->Height, vp->MinDepth, vp->MaxDepth); +} + struct srv_desc { DXGI_FORMAT format; @@ -6770,7 +6777,7 @@ static void test_device_context_state(void) }; ID3DDeviceContextState *context_state, *previous_context_state, *tmp_context_state, *context_state2; - UINT ib_offset, vb_offset, vb_stride, offset, stride, sample_mask, stencil_ref; + UINT ib_offset, vb_offset, vb_stride, offset, stride, sample_mask, stencil_ref, count; ID3D11Buffer *cb, *srvb, *uavb, *ib, *vb, *tmp_cb, *tmp_ib, *tmp_vb; ID3D11UnorderedAccessView *tmp_uav, *uav, *ps_uav; ID3D11Device *d3d11_device, *d3d11_device2; @@ -6784,6 +6791,7 @@ static void test_device_context_state(void) ID3D11RenderTargetView *tmp_rtv, *rtv; ID3D11DepthStencilView *tmp_dsv, *dsv; ID3D11VertexShader *tmp_vs, *vs, *vs2; + ID3D11RasterizerState *tmp_rs, *rs; D3D11_TEXTURE2D_DESC texture_desc; ID3D11GeometryShader *tmp_gs, *gs; enum D3D_PRIMITIVE_TOPOLOGY topo; @@ -6795,8 +6803,11 @@ static void test_device_context_state(void) ID3D11Device1 *device, *device2; ID3D11InputLayout *il, *tmp_il; ID3D11PixelShader *tmp_ps, *ps; + D3D11_RASTERIZER_DESC rs_desc; ID3D11BlendState *tmp_bs, *bs; ID3D11HullShader *tmp_hs, *hs; + D3D11_VIEWPORT tmp_vp[2], vp; + D3D11_RECT tmp_rect[2], rect; D3D11_BLEND_DESC blend_desc; ID3D11Texture2D *texture; enum DXGI_FORMAT format; @@ -6986,6 +6997,27 @@ static void test_device_context_state(void) hr = ID3D11Device1_CreateDepthStencilState(device, &ds_desc, &dss); ok(SUCCEEDED(hr), "Failed to create depthstencil state, hr %#x.\n", hr); + rs_desc.FillMode = D3D11_FILL_SOLID; + rs_desc.CullMode = D3D11_CULL_BACK; + rs_desc.FrontCounterClockwise = FALSE; + rs_desc.DepthBias = 0; + rs_desc.DepthBiasClamp = 0.0f; + rs_desc.SlopeScaledDepthBias = 0.0f; + rs_desc.DepthClipEnable = TRUE; + rs_desc.ScissorEnable = TRUE; + rs_desc.MultisampleEnable = FALSE; + rs_desc.AntialiasedLineEnable = FALSE; + hr = ID3D11Device1_CreateRasterizerState(device, &rs_desc, &rs); + ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); + + SetRect(&rect, 0, 0, 1, 2); + vp.TopLeftX = 0; + vp.TopLeftY = 0; + vp.Width = 3; + vp.Height = 4; + vp.MinDepth = 0.f; + vp.MaxDepth = 0.01f; + ID3D11DeviceContext1_VSSetConstantBuffers(context, 0, 1, &cb); ID3D11DeviceContext1_VSSetSamplers(context, 0, 1, &sampler); ID3D11DeviceContext1_VSSetShader(context, vs, NULL, 0); @@ -7028,6 +7060,10 @@ static void test_device_context_state(void) ID3D11DeviceContext1_OMSetDepthStencilState(context, dss, 3); ID3D11DeviceContext1_OMSetRenderTargetsAndUnorderedAccessViews(context, 1, &rtv, dsv, 1, 1, &ps_uav, NULL); + ID3D11DeviceContext1_RSSetScissorRects(context, 1, &rect); + ID3D11DeviceContext1_RSSetViewports(context, 1, &vp); + ID3D11DeviceContext1_RSSetState(context, rs); + previous_context_state = (ID3DDeviceContextState *)0xdeadbeef; ID3D11DeviceContext1_SwapDeviceContextState(context, NULL, &previous_context_state); todo_wine ok(previous_context_state == NULL, "Got unexpected state pointer.\n"); @@ -7199,6 +7235,19 @@ static void test_device_context_state(void) if (tmp_dss) ID3D11DepthStencilState_Release(tmp_dss); todo_wine ok(stencil_ref == 0, "Got unexpected stencil ref %#x.\n", stencil_ref); + tmp_rs = (ID3D11RasterizerState *)0xdeadbeef; + ID3D11DeviceContext1_RSGetState(context, &tmp_rs); + todo_wine ok(!tmp_rs, "Got unexpected rasterizer state %p.\n", tmp_rs); + if (tmp_rs) ID3D11RasterizerState_Release(tmp_rs); + memset(tmp_vp, 0xa5, sizeof(tmp_vp)); + count = 2; + ID3D11DeviceContext1_RSGetViewports(context, &count, tmp_vp); + todo_wine ok(count == 0, "Got unexpected viewport count %u.\n", count); + memset(tmp_rect, 0xa5, sizeof(tmp_rect)); + count = 2; + ID3D11DeviceContext1_RSGetScissorRects(context, &count, tmp_rect); + todo_wine ok(count == 0, "Got unexpected scissor rect count %u.\n", count); + /* updating the device context should also update the device context state */ hr = ID3D11Device1_CreateVertexShader(device, simple_vs, sizeof(simple_vs), NULL, &vs2); ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); @@ -7457,6 +7506,23 @@ static void test_device_context_state(void) ID3D11DepthStencilState_Release(tmp_dss); ok(stencil_ref == 3, "Got stencil ref %#x, expected 3.\n", stencil_ref); + tmp_rs = (ID3D11RasterizerState *)0xdeadbeef; + ID3D11DeviceContext1_RSGetState(context, &tmp_rs); + ok(tmp_rs == rs, "Got unexpected rasterizer state %p.\n", tmp_rs); + ID3D11RasterizerState_Release(tmp_rs); + memset(tmp_vp, 0xa5, sizeof(tmp_vp)); + count = 2; + ID3D11DeviceContext1_RSGetViewports(context, &count, tmp_vp); + ok(count == 1, "Got viewport count %u, expected 1.\n", count); + ok(!memcmp(tmp_vp, &vp, sizeof(vp)), "Got viewport %s, expected %s.\n", + debugstr_viewport(tmp_vp), debugstr_viewport(&vp)); + memset(tmp_rect, 0xa5, sizeof(tmp_rect)); + count = 2; + ID3D11DeviceContext1_RSGetScissorRects(context, &count, tmp_rect); + todo_wine ok(count == 1, "Got scissor rect count %u, expected 1.\n", count); + ok(!memcmp(tmp_rect, &rect, sizeof(rect)), "Got scissor rect %s, expected %s.\n", + wine_dbgstr_rect(tmp_rect), wine_dbgstr_rect(&rect)); + feature_level = min(feature_level, D3D_FEATURE_LEVEL_10_1); hr = ID3D11Device1_CreateDeviceContextState(device, 0, &feature_level, 1, D3D11_SDK_VERSION, &IID_ID3D10Device, NULL, &context_state); @@ -7674,6 +7740,23 @@ static void test_device_context_state(void) if (tmp_dss) ID3D11DepthStencilState_Release(tmp_dss); todo_wine ok(stencil_ref == 0, "Got unexpected stencil ref %#x.\n", stencil_ref); + ID3D11DeviceContext1_RSSetScissorRects(context, 1, &rect); + ID3D11DeviceContext1_RSSetViewports(context, 1, &vp); + ID3D11DeviceContext1_RSSetState(context, rs); + + tmp_rs = (ID3D11RasterizerState *)0xdeadbeef; + ID3D11DeviceContext1_RSGetState(context, &tmp_rs); + todo_wine ok(!tmp_rs, "Got unexpected rasterizer state %p.\n", tmp_rs); + if (tmp_rs) ID3D11RasterizerState_Release(tmp_rs); + memset(tmp_vp, 0xa5, sizeof(tmp_vp)); + count = 2; + ID3D11DeviceContext1_RSGetViewports(context, &count, tmp_vp); + todo_wine ok(count == 0, "Got unexpected viewport count %u.\n", count); + memset(tmp_rect, 0xa5, sizeof(tmp_rect)); + count = 2; + ID3D11DeviceContext1_RSGetScissorRects(context, &count, tmp_rect); + todo_wine ok(count == 0, "Got unexpected scissor rect count %u.\n", count); + check_interface(device, &IID_ID3D10Device, TRUE, FALSE); check_interface(device, &IID_ID3D10Device1, TRUE, FALSE); @@ -7844,9 +7927,27 @@ static void test_device_context_state(void) ID3D11DepthStencilState_Release(tmp_dss); ok(stencil_ref == 3, "Got stencil ref %#x, expected 3.\n", stencil_ref); + tmp_rs = (ID3D11RasterizerState *)0xdeadbeef; + ID3D11DeviceContext1_RSGetState(context, &tmp_rs); + ok(tmp_rs == rs, "Got unexpected rasterizer state %p.\n", tmp_rs); + ID3D11RasterizerState_Release(tmp_rs); + memset(tmp_vp, 0xa5, sizeof(tmp_vp)); + count = 2; + ID3D11DeviceContext1_RSGetViewports(context, &count, tmp_vp); + ok(count == 1, "Got viewport count %u, expected 1.\n", count); + ok(!memcmp(tmp_vp, &vp, sizeof(vp)), "Got viewport %s, expected %s.\n", + debugstr_viewport(tmp_vp), debugstr_viewport(&vp)); + memset(tmp_rect, 0xa5, sizeof(tmp_rect)); + count = 2; + ID3D11DeviceContext1_RSGetScissorRects(context, &count, tmp_rect); + todo_wine ok(count == 1, "Got scissor rect count %u, expected 1.\n", count); + ok(!memcmp(tmp_rect, &rect, sizeof(rect)), "Got scissor rect %s, expected %s.\n", + wine_dbgstr_rect(tmp_rect), wine_dbgstr_rect(&rect)); + check_interface(device, &IID_ID3D10Device, TRUE, FALSE); check_interface(device, &IID_ID3D10Device1, TRUE, FALSE); + ID3D11RasterizerState_Release(rs); ID3D11BlendState_Release(bs); ID3D11DepthStencilState_Release(dss); ID3D11DepthStencilView_Release(dsv);

1 0

Dmitry Timoshkov : wevtapi: Add EvtGetChannelConfigProperty(EvtChannelLoggingConfigLogFilePath) stub implementation.
by Alexandre Julliard Feb. 3, 2021

Feb. 3, 2021

Module: wine Branch: master Commit: b7e8defd64bc6a28b5dd70f47eb865293d58554c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7e8defd64bc6a28b5dd70f4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 3 11:11:21 2021 +0300 wevtapi: Add EvtGetChannelConfigProperty(EvtChannelLoggingConfigLogFilePath) stub implementation. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wevtapi/main.c | 26 ++++++++++++++++++++++++++ include/winevt.h | 30 ++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/dlls/wevtapi/main.c b/dlls/wevtapi/main.c index 220987650a2..9bd70a4f6ee 100644 --- a/dlls/wevtapi/main.c +++ b/dlls/wevtapi/main.c @@ -19,6 +19,8 @@ #include <stdarg.h> +#define NONAMELESSUNION + #include "windef.h" #include "winbase.h" #include "winevt.h" @@ -26,6 +28,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wevtapi); +static const WCHAR log_pathW[] = L"C:\\windows\\temp\\evt.log"; + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); @@ -63,6 +67,28 @@ BOOL WINAPI EvtGetChannelConfigProperty(EVT_HANDLE ChannelConfig, { FIXME("(%p %i %u %u %p %p) stub\n", ChannelConfig, PropertyId, Flags, PropertyValueBufferSize, PropertyValueBuffer, PropertyValueBufferUsed); + + switch (PropertyId) + { + case EvtChannelLoggingConfigLogFilePath: + *PropertyValueBufferUsed = sizeof(log_pathW) + sizeof(EVT_VARIANT); + + if (PropertyValueBufferSize < sizeof(log_pathW) + sizeof(EVT_VARIANT) || !PropertyValueBuffer) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + return FALSE; + } + + PropertyValueBuffer->u.StringVal = (LPWSTR)(PropertyValueBuffer + 1); + wcscpy((LPWSTR)PropertyValueBuffer->u.StringVal, log_pathW); + PropertyValueBuffer->Type = EvtVarTypeString; + return TRUE; + + default: + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + break; + } + return FALSE; } diff --git a/include/winevt.h b/include/winevt.h index a148dcbb094..a37cdb7297f 100644 --- a/include/winevt.h +++ b/include/winevt.h @@ -62,6 +62,36 @@ typedef enum _EVT_SUBSCRIBE_NOTIFY_ACTION { EvtSubscribeActionDeliver } EVT_SUBSCRIBE_NOTIFY_ACTION; +typedef enum _EVT_VARIANT_TYPE { + EvtVarTypeNull, + EvtVarTypeString, + EvtVarTypeAnsiString, + EvtVarTypeSByte, + EvtVarTypeByte, + EvtVarTypeInt16, + EvtVarTypeUInt16, + EvtVarTypeInt32, + EvtVarTypeUInt32, + EvtVarTypeInt64, + EvtVarTypeUInt64, + EvtVarTypeSingle, + EvtVarTypeDouble, + EvtVarTypeBoolean, + EvtVarTypeBinary, + EvtVarTypeGuid, + EvtVarTypeSizeT, + EvtVarTypeFileTime, + EvtVarTypeSysTime, + EvtVarTypeSid, + EvtVarTypeHexInt32, + EvtVarTypeHexInt64, + EvtVarTypeEvtHandle = 32, + EvtVarTypeEvtXml = 35 +} EVT_VARIANT_TYPE; + +#define EVT_VARIANT_TYPE_MASK 0x7f +#define EVT_VARIANT_TYPE_ARRAY 128 + typedef struct _EVT_VARIANT { union { BOOL BooleanVal;

1 0

Dmitry Timoshkov : wevtapi/tests: Add some EvtGetChannelConfigProperty() tests.
by Alexandre Julliard Feb. 3, 2021

Feb. 3, 2021

Module: wine Branch: master Commit: 29eb6f51f74e896d676b96c35b6fde4c39fb49c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29eb6f51f74e896d676b96c3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Feb 3 11:11:35 2021 +0300 wevtapi/tests: Add some EvtGetChannelConfigProperty() tests. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/wevtapi/Makefile.in | 1 + dlls/wevtapi/tests/Makefile.in | 5 +++ dlls/wevtapi/tests/wevtapi.c | 74 ++++++++++++++++++++++++++++++++++++++++++ include/winevt.h | 1 + 6 files changed, 83 insertions(+) diff --git a/configure b/configure index fa0d6b0c15f..3fc223096ec 100755 --- a/configure +++ b/configure @@ -20831,6 +20831,7 @@ wine_fn_config_makefile dlls/webservices/tests enable_tests wine_fn_config_makefile dlls/wer enable_wer wine_fn_config_makefile dlls/wer/tests enable_tests wine_fn_config_makefile dlls/wevtapi enable_wevtapi +wine_fn_config_makefile dlls/wevtapi/tests enable_tests wine_fn_config_makefile dlls/wevtsvc enable_wevtsvc wine_fn_config_makefile dlls/wiaservc enable_wiaservc wine_fn_config_makefile dlls/wiaservc/tests enable_tests diff --git a/configure.ac b/configure.ac index a9003523700..3a0bc6e713a 100644 --- a/configure.ac +++ b/configure.ac @@ -3756,6 +3756,7 @@ WINE_CONFIG_MAKEFILE(dlls/webservices/tests) WINE_CONFIG_MAKEFILE(dlls/wer) WINE_CONFIG_MAKEFILE(dlls/wer/tests) WINE_CONFIG_MAKEFILE(dlls/wevtapi) +WINE_CONFIG_MAKEFILE(dlls/wevtapi/tests) WINE_CONFIG_MAKEFILE(dlls/wevtsvc) WINE_CONFIG_MAKEFILE(dlls/wiaservc) WINE_CONFIG_MAKEFILE(dlls/wiaservc/tests) diff --git a/dlls/wevtapi/Makefile.in b/dlls/wevtapi/Makefile.in index 9b742fe9aeb..c80aac26d3a 100644 --- a/dlls/wevtapi/Makefile.in +++ b/dlls/wevtapi/Makefile.in @@ -1,4 +1,5 @@ MODULE = wevtapi.dll +IMPORTLIB = wevtapi EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/wevtapi/tests/Makefile.in b/dlls/wevtapi/tests/Makefile.in new file mode 100644 index 00000000000..47fde74b0eb --- /dev/null +++ b/dlls/wevtapi/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = wevtapi.dll +IMPORTS = wevtapi advapi32 + +C_SRCS = \ + wevtapi.c diff --git a/dlls/wevtapi/tests/wevtapi.c b/dlls/wevtapi/tests/wevtapi.c new file mode 100644 index 00000000000..a0a21aa9971 --- /dev/null +++ b/dlls/wevtapi/tests/wevtapi.c @@ -0,0 +1,74 @@ +/* + * Copyright 2021 Dmitry Timoshkov + * + * 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 + */ + +#define NONAMELESSUNION + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winevt.h" +#include "wine/test.h" + +static void test_EvtGetChannelConfigProperty(void) +{ + HKEY key; + EVT_HANDLE config; + DWORD size, ret; + struct + { + EVT_VARIANT var; + WCHAR buf[MAX_PATH]; + } path; + + ret = RegCreateKeyW(HKEY_LOCAL_MACHINE, L"System\\CurrentControlSet\\Services\\EventLog\\Winetest", &key); + if (ret == ERROR_ACCESS_DENIED) + { + skip("Not enough privileges to modify HKLM\n"); + return; + } + ok(ret == ERROR_SUCCESS, "RegCreateKey error %u\n", ret); + + config = EvtOpenChannelConfig(NULL, L"Winetest", 0); + ok(config != NULL, "EvtOpenChannelConfig error %u\n", GetLastError()); + + ret = EvtGetChannelConfigProperty(config, EvtChannelLoggingConfigLogFilePath, 0, 0, NULL, &size); + ok(!ret, "EvtGetChannelConfigProperty should fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + ok(size < sizeof(path), "got %u\n", size); + + memset(&path, 0, sizeof(path)); + path.var.Count = 0xdeadbeef; + path.var.Type = 0xdeadbeef; + ret = EvtGetChannelConfigProperty(config, EvtChannelLoggingConfigLogFilePath, 0, size, (EVT_VARIANT *)&path, &size); + ok(ret, "EvtGetChannelConfigProperty error %u\n", GetLastError()); + ok(path.var.Count == 0xdeadbeef, "got %u\n", path.var.Count); + ok(path.var.Type == EvtVarTypeString, "got %u\n", path.var.Type); + ok(size == sizeof(EVT_VARIANT) + (wcslen(path.var.u.StringVal) + 1) * sizeof(WCHAR), "got %u\n", size); + ok(path.var.u.StringVal == path.buf, "path.var.u.StringVal = %p, path.buf = %p\n", path.var.u.StringVal, path.buf); + + EvtClose(config); + + RegDeleteKeyW(key, L""); + RegCloseKey(key); +} + +START_TEST(wevtapi) +{ + test_EvtGetChannelConfigProperty(); +} diff --git a/include/winevt.h b/include/winevt.h index a37cdb7297f..4f0e7d52a0e 100644 --- a/include/winevt.h +++ b/include/winevt.h @@ -144,6 +144,7 @@ typedef struct _EVT_VARIANT { typedef DWORD (WINAPI *EVT_SUBSCRIBE_CALLBACK)(EVT_SUBSCRIBE_NOTIFY_ACTION Action, PVOID UserContext, EVT_HANDLE Event); +BOOL WINAPI EvtClose(EVT_HANDLE); BOOL WINAPI EvtExportLog(EVT_HANDLE session, const WCHAR *path, const WCHAR *query, const WCHAR *file, DWORD flags); BOOL WINAPI EvtGetChannelConfigProperty(EVT_HANDLE ChannelConfig,

1 0

Piotr Caban : msvcr120/tests: Run strtof tests once.
by Alexandre Julliard Feb. 3, 2021

Feb. 3, 2021

Module: wine Branch: master Commit: ae0ba3f4a33052a00bd2ef9d9352308ae267e5ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae0ba3f4a33052a00bd2ef9d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 3 11:56:17 2021 +0100 msvcr120/tests: Run strtof tests once. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr120/tests/msvcr120.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index a68870ac77b..b3e3828156b 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -1111,7 +1111,6 @@ static void test_CurrentContext(void) START_TEST(msvcr120) { if (!init()) return; - test__strtof(); test_lconv(); test__dsign(); test__dpcomp();

1 0

Roman Pišl : conhost: Improve notification when resizing window.
by Alexandre Julliard Feb. 3, 2021

Feb. 3, 2021

Module: wine Branch: master Commit: 2ca86d3b597c6a16988468ee83ff9f2abf0c2571 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ca86d3b597c6a16988468ee… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Mon Feb 1 18:29:16 2021 +0100 conhost: Improve notification when resizing window. Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 21 +++++++++++++-------- programs/conhost/conhost.h | 2 ++ programs/conhost/window.c | 2 ++ 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 0ac1c5f507b..dd22636be6a 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -1735,6 +1735,18 @@ static NTSTATUS get_output_info( struct screen_buffer *screen_buffer, size_t *ou return STATUS_SUCCESS; } +void notify_screen_buffer_size( struct screen_buffer *screen_buffer ) +{ + if (is_active( screen_buffer ) && screen_buffer->console->mode & ENABLE_WINDOW_INPUT) + { + INPUT_RECORD ir; + ir.EventType = WINDOW_BUFFER_SIZE_EVENT; + ir.Event.WindowBufferSizeEvent.dwSize.X = screen_buffer->width; + ir.Event.WindowBufferSizeEvent.dwSize.Y = screen_buffer->height; + write_console_input( screen_buffer->console, &ir, 1, TRUE ); + } +} + NTSTATUS change_screen_buffer_size( struct screen_buffer *screen_buffer, int new_width, int new_height ) { int i, old_width, old_height, copy_width, copy_height; @@ -1839,14 +1851,7 @@ static NTSTATUS set_output_info( struct screen_buffer *screen_buffer, if (screen_buffer->cursor_x >= info->width) screen_buffer->cursor_x = info->width - 1; if (screen_buffer->cursor_y >= info->height) screen_buffer->cursor_y = info->height - 1; - if (is_active( screen_buffer ) && screen_buffer->console->mode & ENABLE_WINDOW_INPUT) - { - INPUT_RECORD ir; - ir.EventType = WINDOW_BUFFER_SIZE_EVENT; - ir.Event.WindowBufferSizeEvent.dwSize.X = info->width; - ir.Event.WindowBufferSizeEvent.dwSize.Y = info->height; - write_console_input( screen_buffer->console, &ir, 1, TRUE ); - } + notify_screen_buffer_size( screen_buffer ); } if (params->mask & SET_CONSOLE_OUTPUT_INFO_ATTR) { diff --git a/programs/conhost/conhost.h b/programs/conhost/conhost.h index 3094fd6e5f0..6f3985352e2 100644 --- a/programs/conhost/conhost.h +++ b/programs/conhost/conhost.h @@ -136,6 +136,8 @@ void update_window_config( struct console *console ); NTSTATUS write_console_input( struct console *console, const INPUT_RECORD *records, unsigned int count, BOOL flush ); + +void notify_screen_buffer_size( struct screen_buffer *screen_buffer ); NTSTATUS change_screen_buffer_size( struct screen_buffer *screen_buffer, int new_width, int new_height ); static inline void empty_update_rect( struct screen_buffer *screen_buffer, RECT *rect ) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 5e94a1d454e..01917ee8b67 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -1901,6 +1901,8 @@ static void apply_config( struct console *console, const struct console_config * } update_window( console ); + + notify_screen_buffer_size( console->active ); } static void current_config( struct console *console, struct console_config *config )

1 0

Rémi Bernon : d3d11/tests: Add more tests for ID3D11DeviceContext1_SwapDeviceContextState.
by Alexandre Julliard Feb. 3, 2021

Feb. 3, 2021

Module: wine Branch: master Commit: ccffc06c6df30aa8b4ea487b868c419b9c7f5a9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccffc06c6df30aa8b4ea487b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 2 16:41:00 2021 +0100 d3d11/tests: Add more tests for ID3D11DeviceContext1_SwapDeviceContextState. Better checking multiple context swap side effects. Signed-off-by: Rémi Bernon <rbernon(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 | 47 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 43 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index c5c2e16e716..7935dab1332 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -7057,14 +7057,21 @@ static void test_device_context_state(void) ID3D11Device1_GetImmediateContext1(device2, &context2); ok(!!context2, "Failed to get immediate context.\n"); + /* but they track a distinct state on each context */ ID3D11DeviceContext1_SwapDeviceContextState(context2, context_state, &tmp_context_state); ok(!!tmp_context_state, "Failed to get context state.\n"); tmp_vs = (ID3D11VertexShader *)0xdeadbeef; + ID3D11DeviceContext1_VSGetShader(context2, &tmp_vs, NULL, NULL); + ok(!tmp_vs, "Got unexpected shader %p.\n", tmp_vs); + + /* updating context2 vertex shader doesn't update other contexts using the same state */ + ID3D11DeviceContext1_VSSetShader(context2, vs, NULL, 0); ID3D11DeviceContext1_VSGetShader(context, &tmp_vs, NULL, NULL); todo_wine ok(tmp_vs == vs2, "Got shader %p, expected %p.\n", tmp_vs, vs2); if (tmp_vs) refcount = ID3D11VertexShader_Release(tmp_vs); else refcount = 0; todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + ID3D11DeviceContext1_SwapDeviceContextState(context2, tmp_context_state, &context_state2); refcount = ID3DDeviceContextState_Release(tmp_context_state); ok(refcount == 0, "Got refcount %u, expected 1.\n", refcount); @@ -7072,14 +7079,46 @@ static void test_device_context_state(void) todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); todo_wine ok(context_state2 == context_state, "Got unexpected state pointer.\n"); - refcount = ID3D11DeviceContext1_Release(context2); - ok(refcount == 0, "Got refcount %u, expected 0.\n", refcount); - refcount = ID3D11Device1_Release(device2); - ok(refcount == 0, "Got refcount %u, expected 0.\n", refcount); + /* swapping the default state on context2 effectively clears the vertex shader */ + tmp_vs = (ID3D11VertexShader *)0xdeadbeef; + ID3D11DeviceContext1_VSGetShader(context2, &tmp_vs, NULL, NULL); + ok(!tmp_vs, "Got unexpected shader %p.\n", tmp_vs); + + ID3D11DeviceContext1_SwapDeviceContextState(context2, context_state, &tmp_context_state); + ok(!!tmp_context_state, "Failed to get context state.\n"); + refcount = ID3DDeviceContextState_Release(tmp_context_state); + ok(refcount == 0, "Got refcount %u, expected 1.\n", refcount); + /* clearing the vertex shader on context doesn't have side effect on context2 */ ID3D11DeviceContext1_VSSetShader(context, NULL, NULL, 0); refcount = ID3D11VertexShader_Release(vs2); ok(refcount == 0, "Got refcount %u, expected 0.\n", refcount); + tmp_vs = (ID3D11VertexShader *)0xdeadbeef; + ID3D11DeviceContext1_VSGetShader(context2, &tmp_vs, NULL, NULL); + todo_wine ok(tmp_vs == vs, "Got shader %p, expected %p.\n", tmp_vs, vs); + if (tmp_vs) refcount = ID3D11VertexShader_Release(tmp_vs); + else refcount = 0; + todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + + /* even after swapping it again */ + ID3D11DeviceContext1_SwapDeviceContextState(context2, context_state, NULL); + tmp_vs = (ID3D11VertexShader *)0xdeadbeef; + ID3D11DeviceContext1_VSGetShader(context2, &tmp_vs, NULL, NULL); + todo_wine ok(tmp_vs == vs, "Got shader %p, expected %p.\n", tmp_vs, vs); + if (tmp_vs) refcount = ID3D11VertexShader_Release(tmp_vs); + else refcount = 0; + todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + + /* swapping the initial state on context2 doesn't have side effect on context either */ + ID3D11DeviceContext1_SwapDeviceContextState(context2, previous_context_state, NULL); + tmp_vs = (ID3D11VertexShader *)0xdeadbeef; + ID3D11DeviceContext1_VSGetShader(context, &tmp_vs, NULL, NULL); + ok(!tmp_vs, "Got unexpected shader %p.\n", tmp_vs); + + refcount = ID3D11DeviceContext1_Release(context2); + ok(refcount == 0, "Got refcount %u, expected 0.\n", refcount); + refcount = ID3D11Device1_Release(device2); + ok(refcount == 0, "Got refcount %u, expected 0.\n", refcount); ID3D11DeviceContext1_SwapDeviceContextState(context, previous_context_state, &tmp_context_state); refcount = ID3DDeviceContextState_Release(previous_context_state);

1 0

Rémi Bernon : d3d11/tests: Add missing ID3D11DeviceContext1_CSSetUnorderedAccessViews.
by Alexandre Julliard Feb. 3, 2021

Feb. 3, 2021

Module: wine Branch: master Commit: aa2827e8a747472eb7fac0d144bcfb5808c2a9d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa2827e8a747472eb7fac0d1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 2 16:41:01 2021 +0100 d3d11/tests: Add missing ID3D11DeviceContext1_CSSetUnorderedAccessViews. Signed-off-by: Rémi Bernon <rbernon(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 | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 7935dab1332..fbf88891e83 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -7373,6 +7373,7 @@ static void test_device_context_state(void) ID3D11DeviceContext1_CSSetSamplers(context, 0, 1, &sampler); ID3D11DeviceContext1_CSSetShader(context, cs, NULL, 0); ID3D11DeviceContext1_CSSetShaderResources(context, 0, 1, &srv); + ID3D11DeviceContext1_CSSetUnorderedAccessViews(context, 0, 1, &uav, NULL); tmp_cb = (ID3D11Buffer *)0xdeadbeef; ID3D11DeviceContext1_CSGetConstantBuffers(context, 0, 1, &tmp_cb);

1 0

Piotr Caban : msvcp90: Return required buffer size in _Strxfrm.
by Alexandre Julliard Feb. 3, 2021

Feb. 3, 2021

Module: wine Branch: master Commit: 7c5b40ed2ac6b1a82418d5da71b5968dd7c3c1b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c5b40ed2ac6b1a82418d5da… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 3 11:56:29 2021 +0100 msvcp90: Return required buffer size in _Strxfrm. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/locale.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 6b547c384a4..f968ce068ef 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -12663,7 +12663,8 @@ int __cdecl _To_wide(const char *src, wchar_t *dst) return MultiByteToWideChar(CP_ACP, 0, src, -1, dst, MAX_PATH); } -size_t __cdecl _Strxfrm(char *dest, char *dest_end, const char *src, const char *src_end, _Collvec *coll) +size_t __cdecl _Strxfrm(char *dest, char *dest_end, + const char *src, const char *src_end, _Collvec *coll) { size_t dest_len = dest_end - dest; size_t src_len = src_end - src; @@ -12691,12 +12692,14 @@ size_t __cdecl _Strxfrm(char *dest, char *dest_end, const char *src, const char } len = MultiByteToWideChar(cv.page, MB_ERR_INVALID_CHARS, src, src_len, NULL, 0); - if (!len) return 0; + if (!len) return INT_MAX; buf = heap_alloc(len * sizeof(WCHAR)); - if (!buf) return 0; + if (!buf) return INT_MAX; MultiByteToWideChar(cv.page, MB_ERR_INVALID_CHARS, src, src_len, buf, len); - len = LCMapStringW(lcid, LCMAP_SORTKEY, buf, len, (WCHAR*)dest, dest_len); + len = LCMapStringW(lcid, LCMAP_SORTKEY, buf, len, NULL, 0); + if (len <= dest_len) + LCMapStringW(lcid, LCMAP_SORTKEY, buf, len, (WCHAR*)dest, dest_len); heap_free(buf); return len; }

1 0