- Wine-Devel - list.winehq.org

[PATCH 1/3] shell32/test: Fix an ok() message.
by Francois Gouget July 4, 2021

July 4, 2021

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/shell32/tests/shellpath.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shellpath.c b/dlls/shell32/tests/shellpath.c index ea6f92ce827..96bfd1d94ef 100644 --- a/dlls/shell32/tests/shellpath.c +++ b/dlls/shell32/tests/shellpath.c @@ -3010,7 +3010,7 @@ static void test_PathResolve(void) ok(!lstrcmpiW(path, tests[i].expected_path), "test %d: expected %s, got %s\n", i, wine_dbgstr_w(tests[i].expected_path), wine_dbgstr_w(path)); if (!tests[i].expected) - ok(GetLastError() == ERROR_FILE_NOT_FOUND, "expected ERROR_ALREADY_EXISTS, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "expected ERROR_FILE_NOT_FOUND, got %d\n", GetLastError()); } CloseHandle(file); -- 2.20.1

1 2

[PATCH] user32/tests: Use WineTest contexts to simplify test_mdi().
by Francois Gouget July 4, 2021

July 4, 2021

This also fixes the many ok() calls that were missing context information. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Such as the following failures that happen on cw-gtx560 and cw-rx460: win.c:2283: Test failed: expected !100 win.c:2283: Test failed: expected !100 --- dlls/user32/tests/win.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index c1a9ba50df1..228395e0469 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2145,6 +2145,7 @@ static void test_mdi(void) SCROLLINFO si; BOOL ret, gotit; + winetest_push_context("style %#x", style[i]); mdi_client = CreateWindowExA(0, "mdiclient", NULL, WS_CHILD | style[i], 0, 0, rc.right, rc.bottom, @@ -2183,7 +2184,7 @@ static void test_mdi(void) ret = GetScrollInfo(mdi_client, SB_HORZ, &si); if (style[i] & (WS_HSCROLL | WS_VSCROLL)) { - ok(ret, "style %#x: GetScrollInfo(SB_HORZ) failed\n", style[i]); + ok(ret, "GetScrollInfo(SB_HORZ) failed\n"); ok(si.nPage == 0, "expected 0\n"); ok(si.nPos == 0, "expected 0\n"); ok(si.nTrackPos == 0, "expected 0\n"); @@ -2191,12 +2192,12 @@ static void test_mdi(void) ok(si.nMax == 100, "expected 100\n"); } else - ok(!ret, "style %#x: GetScrollInfo(SB_HORZ) should fail\n", style[i]); + ok(!ret, "GetScrollInfo(SB_HORZ) should fail\n"); ret = GetScrollInfo(mdi_client, SB_VERT, &si); if (style[i] & (WS_HSCROLL | WS_VSCROLL)) { - ok(ret, "style %#x: GetScrollInfo(SB_VERT) failed\n", style[i]); + ok(ret, "GetScrollInfo(SB_VERT) failed\n"); ok(si.nPage == 0, "expected 0\n"); ok(si.nPos == 0, "expected 0\n"); ok(si.nTrackPos == 0, "expected 0\n"); @@ -2204,7 +2205,7 @@ static void test_mdi(void) ok(si.nMax == 100, "expected 100\n"); } else - ok(!ret, "style %#x: GetScrollInfo(SB_VERT) should fail\n", style[i]); + ok(!ret, "GetScrollInfo(SB_VERT) should fail\n"); SetWindowPos(mdi_child, 0, -100, -100, 0, 0, SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOSIZE); @@ -2213,7 +2214,7 @@ static void test_mdi(void) ret = GetScrollInfo(mdi_client, SB_HORZ, &si); if (style[i] & (WS_HSCROLL | WS_VSCROLL)) { - ok(ret, "style %#x: GetScrollInfo(SB_HORZ) failed\n", style[i]); + ok(ret, "GetScrollInfo(SB_HORZ) failed\n"); ok(si.nPage == 0, "expected 0\n"); ok(si.nPos == 0, "expected 0\n"); ok(si.nTrackPos == 0, "expected 0\n"); @@ -2221,12 +2222,12 @@ static void test_mdi(void) ok(si.nMax == 100, "expected 100\n"); } else - ok(!ret, "style %#x: GetScrollInfo(SB_HORZ) should fail\n", style[i]); + ok(!ret, "GetScrollInfo(SB_HORZ) should fail\n"); ret = GetScrollInfo(mdi_client, SB_VERT, &si); if (style[i] & (WS_HSCROLL | WS_VSCROLL)) { - ok(ret, "style %#x: GetScrollInfo(SB_VERT) failed\n", style[i]); + ok(ret, "GetScrollInfo(SB_VERT) failed\n"); ok(si.nPage == 0, "expected 0\n"); ok(si.nPos == 0, "expected 0\n"); ok(si.nTrackPos == 0, "expected 0\n"); @@ -2234,7 +2235,7 @@ static void test_mdi(void) ok(si.nMax == 100, "expected 100\n"); } else - ok(!ret, "style %#x: GetScrollInfo(SB_VERT) should fail\n", style[i]); + ok(!ret, "GetScrollInfo(SB_VERT) should fail\n"); gotit = FALSE; while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) @@ -2261,7 +2262,7 @@ static void test_mdi(void) ret = GetScrollInfo(mdi_client, SB_HORZ, &si); if (style[i] & (WS_HSCROLL | WS_VSCROLL)) { - ok(ret, "style %#x: GetScrollInfo(SB_HORZ) failed\n", style[i]); + ok(ret, "GetScrollInfo(SB_HORZ) failed\n"); todo_wine ok(si.nPage != 0, "expected !0\n"); ok(si.nPos == 0, "expected 0\n"); @@ -2270,12 +2271,12 @@ todo_wine ok(si.nMax != 100, "expected !100\n"); } else - ok(!ret, "style %#x: GetScrollInfo(SB_HORZ) should fail\n", style[i]); + ok(!ret, "GetScrollInfo(SB_HORZ) should fail\n"); ret = GetScrollInfo(mdi_client, SB_VERT, &si); if (style[i] & (WS_HSCROLL | WS_VSCROLL)) { - ok(ret, "style %#x: GetScrollInfo(SB_VERT) failed\n", style[i]); + ok(ret, "GetScrollInfo(SB_VERT) failed\n"); todo_wine ok(si.nPage != 0, "expected !0\n"); ok(si.nPos == 0, "expected 0\n"); @@ -2284,11 +2285,12 @@ todo_wine ok(si.nMax != 100, "expected !100\n"); } else - ok(!ret, "style %#x: GetScrollInfo(SB_VERT) should fail\n", style[i]); + ok(!ret, "GetScrollInfo(SB_VERT) should fail\n"); DestroyMenu(child_menu); DestroyWindow(mdi_child); DestroyWindow(mdi_client); + winetest_pop_context(); } SetMenu(mdi_hwndMain, frame_menu); -- 2.20.1

1 0

[PATCH] bthprops.cpl: Add BluetoothFindNextRadio stub.
by Esdras Tarsis July 3, 2021

July 3, 2021

For GangV Battle Royale Signed-off-by: Esdras Tarsis <esdrastarsis(a)gmail.com> --- dlls/bthprops.cpl/bthprops.cpl.spec | 2 +- dlls/bthprops.cpl/main.c | 10 ++++++++++ dlls/irprops.cpl/irprops.cpl.spec | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/bthprops.cpl/bthprops.cpl.spec b/dlls/bthprops.cpl/bthprops.cpl.spec index 26d2429c6ba..49b181763ee 100644 --- a/dlls/bthprops.cpl/bthprops.cpl.spec +++ b/dlls/bthprops.cpl/bthprops.cpl.spec @@ -27,7 +27,7 @@ @ stub BluetoothFindNextProfileDescriptor @ stub BluetoothFindNextProtocolDescriptorStack @ stub BluetoothFindNextProtocolEntry -@ stub BluetoothFindNextRadio +@ stdcall BluetoothFindNextRadio(ptr ptr) @ stub BluetoothFindNextService @ stub BluetoothFindProfileDescriptorClose @ stub BluetoothFindProtocolDescriptorStackClose diff --git a/dlls/bthprops.cpl/main.c b/dlls/bthprops.cpl/main.c index 60a781ef840..943c9dcb764 100644 --- a/dlls/bthprops.cpl/main.c +++ b/dlls/bthprops.cpl/main.c @@ -70,3 +70,13 @@ BOOL WINAPI BluetoothFindDeviceClose(HBLUETOOTH_DEVICE_FIND find) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/********************************************************************* + * BluetoothFindNextRadio + */ +BOOL WINAPI BluetoothFindNextRadio(HBLUETOOTH_RADIO_FIND find, HANDLE *radio) +{ + FIXME("(%p, %p): stub!\n", find, radio); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/irprops.cpl/irprops.cpl.spec b/dlls/irprops.cpl/irprops.cpl.spec index ca24b49dd47..f2fa18aab89 100644 --- a/dlls/irprops.cpl/irprops.cpl.spec +++ b/dlls/irprops.cpl/irprops.cpl.spec @@ -23,7 +23,7 @@ @ stub BluetoothFindNextProfileDescriptor @ stub BluetoothFindNextProtocolDescriptorStack @ stub BluetoothFindNextProtocolEntry -@ stub BluetoothFindNextRadio +@ stdcall BluetoothFindNextRadio(ptr ptr) bthprops.cpl.BluetoothFindNextRadio @ stub BluetoothFindNextService @ stub BluetoothFindProfileDescriptorClose @ stub BluetoothFindProtocolDescriptorStackClose -- 2.32.0

3 2

[PATCH] include/d3d12: add missing enum/structures/defines needed to use d3d12x.h
by Steve Lhomme July 3, 2021

July 3, 2021

d3dx12.h is a useful MIT licensed header from Microsoft to help do regular things with D3D12 (in C++). It's usable with mingw (and thus wine) with these additions. Signed-off-by: Steve Lhomme <robux4(a)ycbcr.xyz> --- include/d3d12.idl | 77 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/include/d3d12.idl b/include/d3d12.idl index 42f33a06e40..056e078ab9d 100644 --- a/include/d3d12.idl +++ b/include/d3d12.idl @@ -75,6 +75,9 @@ const UINT D3D12_UAV_COUNTER_PLACEMENT_ALIGNMENT = 4096; const UINT D3D12_VS_INPUT_REGISTER_COUNT = 32; const UINT D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE = 16; +cpp_quote("#define D3D12_MIN_DEPTH ( 0.0f )") +cpp_quote("#define D3D12_MAX_DEPTH ( 1.0f )") + cpp_quote("#endif") const UINT D3D12_SHADER_COMPONENT_MAPPING_MASK = 0x7; @@ -2005,6 +2008,80 @@ typedef enum D3D12_PREDICATION_OP D3D12_PREDICATION_OP_NOT_EQUAL_ZERO = 1, } D3D12_PREDICATION_OP; +typedef enum D3D12_VIEW_INSTANCING_FLAGS +{ + D3D12_VIEW_INSTANCING_FLAG_NONE, + D3D12_VIEW_INSTANCING_FLAG_ENABLE_VIEW_INSTANCE_MASKING +} D3D12_VIEW_INSTANCING_FLAGS; + +typedef enum D3D12_PIPELINE_STATE_SUBOBJECT_TYPE +{ + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_ROOT_SIGNATURE, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_VS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_PS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_DS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_HS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_GS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_CS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_STREAM_OUTPUT, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_BLEND, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_SAMPLE_MASK, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_RASTERIZER, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_DEPTH_STENCIL, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_INPUT_LAYOUT, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_IB_STRIP_CUT_VALUE, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_PRIMITIVE_TOPOLOGY, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_RENDER_TARGET_FORMATS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_DEPTH_STENCIL_FORMAT, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_SAMPLE_DESC, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_NODE_MASK, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_CACHED_PSO, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_FLAGS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_DEPTH_STENCIL1, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_VIEW_INSTANCING, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_AS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_MS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_MAX_VALID +} D3D12_PIPELINE_STATE_SUBOBJECT_TYPE; + +typedef struct D3D12_DEPTH_STENCIL_DESC1 +{ + BOOL DepthEnable; + D3D12_DEPTH_WRITE_MASK DepthWriteMask; + D3D12_COMPARISON_FUNC DepthFunc; + BOOL StencilEnable; + UINT8 StencilReadMask; + UINT8 StencilWriteMask; + D3D12_DEPTH_STENCILOP_DESC FrontFace; + D3D12_DEPTH_STENCILOP_DESC BackFace; + BOOL DepthBoundsTestEnable; +} D3D12_DEPTH_STENCIL_DESC1; + +typedef struct D3D12_VIEW_INSTANCE_LOCATION +{ + UINT ViewportArrayIndex; + UINT RenderTargetArrayIndex; +} D3D12_VIEW_INSTANCE_LOCATION; + +typedef struct D3D12_VIEW_INSTANCING_DESC +{ + UINT ViewInstanceCount; + const D3D12_VIEW_INSTANCE_LOCATION *pViewInstanceLocations; + D3D12_VIEW_INSTANCING_FLAGS Flags; +} D3D12_VIEW_INSTANCING_DESC; + +typedef struct D3D12_RT_FORMAT_ARRAY +{ + DXGI_FORMAT RTFormats[8]; + UINT NumRenderTargets; +} D3D12_RT_FORMAT_ARRAY; + +typedef struct D3D12_PIPELINE_STATE_STREAM_DESC +{ + SIZE_T SizeInBytes; + void *pPipelineStateSubobjectStream; +} D3D12_PIPELINE_STATE_STREAM_DESC; + [ uuid(8efb471d-616c-4f49-90f7-127bb763fa51), object, -- 2.29.2

1 1

[PATCH] include/d3d12: add missing enum/structures/defines needed to use d3d12x.h
by Steve Lhomme July 3, 2021

July 3, 2021

d3dx12.h is a useful MIT licensed header from Microsoft to help do regular things with D3D12 (in C++). It's usable with mingw (and thus wine) with these additions. Signed-off-by: Steve Lhomme <robux4(a)ycbcr.xyz> --- include/d3d12.idl | 77 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/include/d3d12.idl b/include/d3d12.idl index 42f33a06e40..056e078ab9d 100644 --- a/include/d3d12.idl +++ b/include/d3d12.idl @@ -75,6 +75,9 @@ const UINT D3D12_UAV_COUNTER_PLACEMENT_ALIGNMENT = 4096; const UINT D3D12_VS_INPUT_REGISTER_COUNT = 32; const UINT D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE = 16; +cpp_quote("#define D3D12_MIN_DEPTH ( 0.0f )") +cpp_quote("#define D3D12_MAX_DEPTH ( 1.0f )") + cpp_quote("#endif") const UINT D3D12_SHADER_COMPONENT_MAPPING_MASK = 0x7; @@ -2005,6 +2008,80 @@ typedef enum D3D12_PREDICATION_OP D3D12_PREDICATION_OP_NOT_EQUAL_ZERO = 1, } D3D12_PREDICATION_OP; +typedef enum D3D12_VIEW_INSTANCING_FLAGS +{ + D3D12_VIEW_INSTANCING_FLAG_NONE, + D3D12_VIEW_INSTANCING_FLAG_ENABLE_VIEW_INSTANCE_MASKING +} D3D12_VIEW_INSTANCING_FLAGS; + +typedef enum D3D12_PIPELINE_STATE_SUBOBJECT_TYPE +{ + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_ROOT_SIGNATURE, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_VS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_PS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_DS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_HS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_GS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_CS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_STREAM_OUTPUT, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_BLEND, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_SAMPLE_MASK, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_RASTERIZER, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_DEPTH_STENCIL, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_INPUT_LAYOUT, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_IB_STRIP_CUT_VALUE, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_PRIMITIVE_TOPOLOGY, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_RENDER_TARGET_FORMATS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_DEPTH_STENCIL_FORMAT, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_SAMPLE_DESC, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_NODE_MASK, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_CACHED_PSO, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_FLAGS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_DEPTH_STENCIL1, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_VIEW_INSTANCING, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_AS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_MS, + D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_MAX_VALID +} D3D12_PIPELINE_STATE_SUBOBJECT_TYPE; + +typedef struct D3D12_DEPTH_STENCIL_DESC1 +{ + BOOL DepthEnable; + D3D12_DEPTH_WRITE_MASK DepthWriteMask; + D3D12_COMPARISON_FUNC DepthFunc; + BOOL StencilEnable; + UINT8 StencilReadMask; + UINT8 StencilWriteMask; + D3D12_DEPTH_STENCILOP_DESC FrontFace; + D3D12_DEPTH_STENCILOP_DESC BackFace; + BOOL DepthBoundsTestEnable; +} D3D12_DEPTH_STENCIL_DESC1; + +typedef struct D3D12_VIEW_INSTANCE_LOCATION +{ + UINT ViewportArrayIndex; + UINT RenderTargetArrayIndex; +} D3D12_VIEW_INSTANCE_LOCATION; + +typedef struct D3D12_VIEW_INSTANCING_DESC +{ + UINT ViewInstanceCount; + const D3D12_VIEW_INSTANCE_LOCATION *pViewInstanceLocations; + D3D12_VIEW_INSTANCING_FLAGS Flags; +} D3D12_VIEW_INSTANCING_DESC; + +typedef struct D3D12_RT_FORMAT_ARRAY +{ + DXGI_FORMAT RTFormats[8]; + UINT NumRenderTargets; +} D3D12_RT_FORMAT_ARRAY; + +typedef struct D3D12_PIPELINE_STATE_STREAM_DESC +{ + SIZE_T SizeInBytes; + void *pPipelineStateSubobjectStream; +} D3D12_PIPELINE_STATE_STREAM_DESC; + [ uuid(8efb471d-616c-4f49-90f7-127bb763fa51), object, -- 2.29.2

1 0

[PATCH] include/d3d12: add interfaces to support D3D12 video decoding
by Steve Lhomme July 3, 2021

July 3, 2021

--- include/d3d12.idl | 3 + include/d3d12video.idl | 378 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 381 insertions(+) create mode 100644 include/d3d12video.idl diff --git a/include/d3d12.idl b/include/d3d12.idl index 056e078ab9d..08ec5b9e2d3 100644 --- a/include/d3d12.idl +++ b/include/d3d12.idl @@ -1633,6 +1633,9 @@ typedef enum D3D12_COMMAND_LIST_TYPE D3D12_COMMAND_LIST_TYPE_BUNDLE = 1, D3D12_COMMAND_LIST_TYPE_COMPUTE = 2, D3D12_COMMAND_LIST_TYPE_COPY = 3, + D3D12_COMMAND_LIST_TYPE_VIDEO_DECODE = 4, + D3D12_COMMAND_LIST_TYPE_VIDEO_PROCESS = 5, + D3D12_COMMAND_LIST_TYPE_VIDEO_ENCODE = 6 } D3D12_COMMAND_LIST_TYPE; typedef enum D3D12_COMMAND_QUEUE_PRIORITY diff --git a/include/d3d12video.idl b/include/d3d12video.idl new file mode 100644 index 00000000000..49aa8eea8d8 --- /dev/null +++ b/include/d3d12video.idl @@ -0,0 +1,378 @@ +import "d3d12.idl"; + +typedef enum D3D12_FEATURE_VIDEO +{ + D3D12_FEATURE_VIDEO_DECODE_SUPPORT = 0, + D3D12_FEATURE_VIDEO_DECODE_PROFILES = 1, + D3D12_FEATURE_VIDEO_DECODE_FORMATS = 2, + D3D12_FEATURE_VIDEO_DECODE_CONVERSION_SUPPORT = 3, + D3D12_FEATURE_VIDEO_PROCESS_SUPPORT = 5, + D3D12_FEATURE_VIDEO_PROCESS_MAX_INPUT_STREAMS = 6, + D3D12_FEATURE_VIDEO_PROCESS_REFERENCE_INFO = 7, + D3D12_FEATURE_VIDEO_DECODER_HEAP_SIZE = 8, + D3D12_FEATURE_VIDEO_PROCESSOR_SIZE = 9, + D3D12_FEATURE_VIDEO_DECODE_PROFILE_COUNT = 10, + D3D12_FEATURE_VIDEO_DECODE_FORMAT_COUNT = 11, + D3D12_FEATURE_VIDEO_ARCHITECTURE = 17, + D3D12_FEATURE_VIDEO_DECODE_HISTOGRAM = 18, + D3D12_FEATURE_VIDEO_FEATURE_AREA_SUPPORT = 19, + D3D12_FEATURE_VIDEO_MOTION_ESTIMATOR = 20, + D3D12_FEATURE_VIDEO_MOTION_ESTIMATOR_SIZE = 21, + D3D12_FEATURE_VIDEO_EXTENSION_COMMAND_COUNT = 22, + D3D12_FEATURE_VIDEO_EXTENSION_COMMANDS = 23, + D3D12_FEATURE_VIDEO_EXTENSION_COMMAND_PARAMETER_COUNT = 24, + D3D12_FEATURE_VIDEO_EXTENSION_COMMAND_PARAMETERS = 25, + D3D12_FEATURE_VIDEO_EXTENSION_COMMAND_SUPPORT = 26, + D3D12_FEATURE_VIDEO_EXTENSION_COMMAND_SIZE = 27, + D3D12_FEATURE_VIDEO_DECODE_PROTECTED_RESOURCES = 28, + D3D12_FEATURE_VIDEO_PROCESS_PROTECTED_RESOURCES = 29, + D3D12_FEATURE_VIDEO_MOTION_ESTIMATOR_PROTECTED_RESOURCES = 30, + D3D12_FEATURE_VIDEO_DECODER_HEAP_SIZE1 = 31, + D3D12_FEATURE_VIDEO_PROCESSOR_SIZE1 = 32 +} D3D12_FEATURE_VIDEO; + +typedef enum D3D12_BITSTREAM_ENCRYPTION_TYPE +{ + D3D12_BITSTREAM_ENCRYPTION_TYPE_NONE +} D3D12_BITSTREAM_ENCRYPTION_TYPE; + +typedef enum D3D12_VIDEO_FRAME_CODED_INTERLACE_TYPE +{ + D3D12_VIDEO_FRAME_CODED_INTERLACE_TYPE_NONE, + D3D12_VIDEO_FRAME_CODED_INTERLACE_TYPE_FIELD_BASED +} D3D12_VIDEO_FRAME_CODED_INTERLACE_TYPE; + +typedef enum D3D12_VIDEO_PROCESS_ALPHA_FILL_MODE +{ + D3D12_VIDEO_PROCESS_ALPHA_FILL_MODE_OPAQUE, + D3D12_VIDEO_PROCESS_ALPHA_FILL_MODE_BACKGROUND, + D3D12_VIDEO_PROCESS_ALPHA_FILL_MODE_DESTINATION, + D3D12_VIDEO_PROCESS_ALPHA_FILL_MODE_SOURCE_STREAM +} D3D12_VIDEO_PROCESS_ALPHA_FILL_MODE; + +typedef enum D3D12_VIDEO_PROCESS_FILTER_FLAGS +{ + D3D12_VIDEO_PROCESS_FILTER_FLAG_NONE, + D3D12_VIDEO_PROCESS_FILTER_FLAG_BRIGHTNESS, + D3D12_VIDEO_PROCESS_FILTER_FLAG_CONTRAST, + D3D12_VIDEO_PROCESS_FILTER_FLAG_HUE, + D3D12_VIDEO_PROCESS_FILTER_FLAG_SATURATION, + D3D12_VIDEO_PROCESS_FILTER_FLAG_NOISE_REDUCTION, + D3D12_VIDEO_PROCESS_FILTER_FLAG_EDGE_ENHANCEMENT, + D3D12_VIDEO_PROCESS_FILTER_FLAG_ANAMORPHIC_SCALING, + D3D12_VIDEO_PROCESS_FILTER_FLAG_STEREO_ADJUSTMENT +} D3D12_VIDEO_PROCESS_FILTER_FLAGS; + +typedef enum D3D12_VIDEO_FRAME_STEREO_FORMAT +{ + D3D12_VIDEO_FRAME_STEREO_FORMAT_NONE, + D3D12_VIDEO_FRAME_STEREO_FORMAT_MONO, + D3D12_VIDEO_FRAME_STEREO_FORMAT_HORIZONTAL, + D3D12_VIDEO_FRAME_STEREO_FORMAT_VERTICAL, + D3D12_VIDEO_FRAME_STEREO_FORMAT_SEPARATE +} D3D12_VIDEO_FRAME_STEREO_FORMAT; + +typedef enum D3D12_VIDEO_FIELD_TYPE +{ + D3D12_VIDEO_FIELD_TYPE_NONE, + D3D12_VIDEO_FIELD_TYPE_INTERLACED_TOP_FIELD_FIRST, + D3D12_VIDEO_FIELD_TYPE_INTERLACED_BOTTOM_FIELD_FIRST +} D3D12_VIDEO_FIELD_TYPE; + +typedef enum D3D12_VIDEO_PROCESS_DEINTERLACE_FLAGS +{ + D3D12_VIDEO_PROCESS_DEINTERLACE_FLAG_NONE, + D3D12_VIDEO_PROCESS_DEINTERLACE_FLAG_BOB, + D3D12_VIDEO_PROCESS_DEINTERLACE_FLAG_CUSTOM +} D3D12_VIDEO_PROCESS_DEINTERLACE_FLAGS; + +typedef enum D3D12_VIDEO_DECODE_ARGUMENT_TYPE +{ + D3D12_VIDEO_DECODE_ARGUMENT_TYPE_PICTURE_PARAMETERS, + D3D12_VIDEO_DECODE_ARGUMENT_TYPE_INVERSE_QUANTIZATION_MATRIX, + D3D12_VIDEO_DECODE_ARGUMENT_TYPE_SLICE_CONTROL, + D3D12_VIDEO_DECODE_ARGUMENT_TYPE_MAX_VALID +} D3D12_VIDEO_DECODE_ARGUMENT_TYPE; + +typedef enum D3D12_VIDEO_DECODE_SUPPORT_FLAGS +{ + D3D12_VIDEO_DECODE_SUPPORT_FLAG_NONE = 0x0, + D3D12_VIDEO_DECODE_SUPPORT_FLAG_SUPPORTED = 0x1, +} D3D12_VIDEO_DECODE_SUPPORT_FLAGS; + +typedef enum D3D12_VIDEO_DECODE_CONFIGURATION_FLAGS +{ + D3D12_VIDEO_DECODE_CONFIGURATION_FLAG_NONE = 0x0, + D3D12_VIDEO_DECODE_CONFIGURATION_FLAG_HEIGHT_ALIGNMENT_MULTIPLE_32_REQUIRED = 0x1, + D3D12_VIDEO_DECODE_CONFIGURATION_FLAG_POST_PROCESSING_SUPPORTED = 0x2, + D3D12_VIDEO_DECODE_CONFIGURATION_FLAG_REFERENCE_ONLY_ALLOCATIONS_REQUIRED = 0x4, + D3D12_VIDEO_DECODE_CONFIGURATION_FLAG_ALLOW_RESOLUTION_CHANGE_ON_NON_KEY_FRAME = 0x8, +} D3D12_VIDEO_DECODE_CONFIGURATION_FLAGS; + +typedef enum D3D12_VIDEO_DECODE_TIER +{ + D3D12_VIDEO_DECODE_TIER_NOT_SUPPORTED, + D3D12_VIDEO_DECODE_TIER_1, + D3D12_VIDEO_DECODE_TIER_2, + D3D12_VIDEO_DECODE_TIER_3, +} D3D12_VIDEO_DECODE_TIER; + + +interface ID3D12VideoDecoderHeap; + + +typedef struct D3D12_VIDEO_DECODE_CONFIGURATION +{ + GUID DecodeProfile; + D3D12_BITSTREAM_ENCRYPTION_TYPE BitstreamEncryption; + D3D12_VIDEO_FRAME_CODED_INTERLACE_TYPE InterlaceType; +} D3D12_VIDEO_DECODE_CONFIGURATION; + +typedef struct D3D12_VIDEO_DECODER_DESC +{ + UINT NodeMask; + D3D12_VIDEO_DECODE_CONFIGURATION Configuration; +} D3D12_VIDEO_DECODER_DESC; + +typedef struct D3D12_VIDEO_DECODER_HEAP_DESC +{ + UINT NodeMask; + D3D12_VIDEO_DECODE_CONFIGURATION Configuration; + UINT DecodeWidth; + UINT DecodeHeight; + DXGI_FORMAT Format; + DXGI_RATIONAL FrameRate; + UINT BitRate; + UINT MaxDecodePictureBufferCount; +} D3D12_VIDEO_DECODER_HEAP_DESC; + +typedef struct D3D12_VIDEO_PROCESS_OUTPUT_STREAM_DESC +{ + DXGI_FORMAT Format; + DXGI_COLOR_SPACE_TYPE ColorSpace; + D3D12_VIDEO_PROCESS_ALPHA_FILL_MODE AlphaFillMode; + UINT AlphaFillModeSourceStreamIndex; + FLOAT BackgroundColor[4]; + DXGI_RATIONAL FrameRate; + BOOL EnableStereo; +} D3D12_VIDEO_PROCESS_OUTPUT_STREAM_DESC; + +typedef struct D3D12_VIDEO_SIZE_RANGE +{ + UINT MaxWidth; + UINT MaxHeight; + UINT MinWidth; + UINT MinHeight; +} D3D12_VIDEO_SIZE_RANGE; + +typedef struct D3D12_VIDEO_PROCESS_LUMA_KEY +{ + BOOL Enable; + FLOAT Lower; + FLOAT Upper; +} D3D12_VIDEO_PROCESS_LUMA_KEY; + +typedef struct D3D12_VIDEO_PROCESS_INPUT_STREAM_DESC +{ + DXGI_FORMAT Format; + DXGI_COLOR_SPACE_TYPE ColorSpace; + DXGI_RATIONAL SourceAspectRatio; + DXGI_RATIONAL DestinationAspectRatio; + DXGI_RATIONAL FrameRate; + D3D12_VIDEO_SIZE_RANGE SourceSizeRange; + D3D12_VIDEO_SIZE_RANGE DestinationSizeRange; + BOOL EnableOrientation; + D3D12_VIDEO_PROCESS_FILTER_FLAGS FilterFlags; + D3D12_VIDEO_FRAME_STEREO_FORMAT StereoFormat; + D3D12_VIDEO_FIELD_TYPE FieldType; + D3D12_VIDEO_PROCESS_DEINTERLACE_FLAGS DeinterlaceMode; + BOOL EnableAlphaBlending; + D3D12_VIDEO_PROCESS_LUMA_KEY LumaKey; + UINT NumPastFrames; + UINT NumFutureFrames; + BOOL EnableAutoProcessing; +} D3D12_VIDEO_PROCESS_INPUT_STREAM_DESC; + +typedef struct D3D12_FEATURE_DATA_VIDEO_DECODE_PROFILE_COUNT +{ + UINT NodeIndex; + UINT ProfileCount; +} D3D12_FEATURE_DATA_VIDEO_DECODE_PROFILE_COUNT; + +typedef struct D3D12_FEATURE_DATA_VIDEO_DECODE_PROFILES +{ + UINT NodeIndex; + UINT ProfileCount; + GUID *pProfiles; +} D3D12_FEATURE_DATA_VIDEO_DECODE_PROFILES; + +typedef struct D3D12_FEATURE_DATA_VIDEO_DECODE_FORMAT_COUNT +{ + UINT NodeIndex; + D3D12_VIDEO_DECODE_CONFIGURATION Configuration; + UINT FormatCount; +} D3D12_FEATURE_DATA_VIDEO_DECODE_FORMAT_COUNT; + +typedef struct D3D12_FEATURE_DATA_VIDEO_DECODE_FORMATS +{ + UINT NodeIndex; + D3D12_VIDEO_DECODE_CONFIGURATION Configuration; + UINT FormatCount; + DXGI_FORMAT *pOutputFormats; +} D3D12_FEATURE_DATA_VIDEO_DECODE_FORMATS; + +typedef struct D3D12_FEATURE_DATA_VIDEO_DECODE_SUPPORT +{ + UINT NodeIndex; + D3D12_VIDEO_DECODE_CONFIGURATION Configuration; + UINT Width; + UINT Height; + DXGI_FORMAT DecodeFormat; + DXGI_RATIONAL FrameRate; + UINT BitRate; + D3D12_VIDEO_DECODE_SUPPORT_FLAGS SupportFlags; + D3D12_VIDEO_DECODE_CONFIGURATION_FLAGS ConfigurationFlags; + D3D12_VIDEO_DECODE_TIER DecodeTier; +} D3D12_FEATURE_DATA_VIDEO_DECODE_SUPPORT; + +typedef struct D3D12_VIDEO_DECODE_CONVERSION_ARGUMENTS +{ + BOOL Enable; + ID3D12Resource *pReferenceTexture2D; + UINT ReferenceSubresource; + DXGI_COLOR_SPACE_TYPE OutputColorSpace; + DXGI_COLOR_SPACE_TYPE DecodeColorSpace; +} D3D12_VIDEO_DECODE_CONVERSION_ARGUMENTS; + +typedef struct D3D12_VIDEO_DECODE_OUTPUT_STREAM_ARGUMENTS +{ + ID3D12Resource *pOutputTexture2D; + UINT OutputSubresource; + D3D12_VIDEO_DECODE_CONVERSION_ARGUMENTS ConversionArguments; +} D3D12_VIDEO_DECODE_OUTPUT_STREAM_ARGUMENTS; + +typedef struct D3D12_VIDEO_DECODE_FRAME_ARGUMENT +{ + D3D12_VIDEO_DECODE_ARGUMENT_TYPE Type; + UINT Size; + void *pData; +} D3D12_VIDEO_DECODE_FRAME_ARGUMENT; + +typedef struct D3D12_VIDEO_DECODE_REFERENCE_FRAMES +{ + UINT NumTexture2Ds; + ID3D12Resource **ppTexture2Ds; + UINT *pSubresources; + ID3D12VideoDecoderHeap **ppHeaps; +} D3D12_VIDEO_DECODE_REFERENCE_FRAMES; + +typedef struct D3D12_VIDEO_DECODE_COMPRESSED_BITSTREAM +{ + ID3D12Resource *pBuffer; + UINT64 Offset; + UINT64 Size; +} D3D12_VIDEO_DECODE_COMPRESSED_BITSTREAM; + +typedef struct D3D12_VIDEO_DECODE_INPUT_STREAM_ARGUMENTS +{ + UINT NumFrameArguments; + D3D12_VIDEO_DECODE_FRAME_ARGUMENT FrameArguments[10]; + D3D12_VIDEO_DECODE_REFERENCE_FRAMES ReferenceFrames; + D3D12_VIDEO_DECODE_COMPRESSED_BITSTREAM CompressedBitstream; + ID3D12VideoDecoderHeap *pHeap; +} D3D12_VIDEO_DECODE_INPUT_STREAM_ARGUMENTS; + + +[ + uuid(1F052807-0B46-4ACC-8A89-364F793718A4), + object, + local, + pointer_default(unique) +] +interface ID3D12VideoDevice : IUnknown +{ + HRESULT CheckFeatureSupport(D3D12_FEATURE_VIDEO FeatureVideo, + void *pFeatureSupportData, + UINT FeatureSupportDataSize); + + HRESULT CreateVideoDecoder(const D3D12_VIDEO_DECODER_DESC *pDesc, + REFIID riid, + void **ppVideoDecoder); + + HRESULT CreateVideoDecoderHeap(const D3D12_VIDEO_DECODER_HEAP_DESC *pVideoDecoderHeapDesc, + REFIID riid, + void **ppVideoDecoderHeap); + + HRESULT CreateVideoProcessor(UINT NodeMask, + const D3D12_VIDEO_PROCESS_OUTPUT_STREAM_DESC *pOutputStreamDesc, + UINT NumInputStreamDescs, + const D3D12_VIDEO_PROCESS_INPUT_STREAM_DESC *pInputStreamDescs, + REFIID riid, + void **ppVideoProcessor); +} + +[ + uuid(C59B6BDC-7720-4074-A136-17A156037470), + object, + local, + pointer_default(unique) +] +interface ID3D12VideoDecoder : ID3D12Pageable +{ + D3D12_VIDEO_DECODER_DESC GetDesc(); +} + +[ + uuid(0946B7C9-EBF6-4047-BB73-8683E27DBB1F), + object, + local, + pointer_default(unique) +] +interface ID3D12VideoDecoderHeap : ID3D12Pageable +{ + D3D12_VIDEO_DECODER_HEAP_DESC GetDesc(); +} + +[ + uuid(3B60536E-AD29-4E64-A269-F853837E5E53), + object, + local, + pointer_default(unique) +] +interface ID3D12VideoDecodeCommandList : ID3D12CommandList +{ + HRESULT Close(); + + HRESULT Reset(ID3D12CommandAllocator *pAllocator); + + void ClearState(); + + void ResourceBarrier(UINT NumBarriers, const D3D12_RESOURCE_BARRIER *pBarriers); + + void DiscardResource(ID3D12Resource *pResource, const D3D12_DISCARD_REGION *pRegion); + + void BeginQuery(ID3D12QueryHeap *pQueryHeap, D3D12_QUERY_TYPE Type, UINT Index); + + void EndQuery(ID3D12QueryHeap *pQueryHeap, D3D12_QUERY_TYPE Type, UINT Index); + + void ResolveQueryData(ID3D12QueryHeap *pQueryHeap, D3D12_QUERY_TYPE Type, UINT StartIndex, + UINT NumQueries, ID3D12Resource *pDestinationBuffer, + UINT64 AlignedDestinationBufferOffset); + + void SetPredication(ID3D12Resource *pBuffer, UINT64 AlignedBufferOffset, + D3D12_PREDICATION_OP Operation); + + void SetMarker(UINT Metadata, const void *pData, UINT Size); + + void BeginEvent(UINT Metadata, const void *pData, UINT Size); + + void EndEvent(); + + void DecodeFrame(ID3D12VideoDecoder *pDecoder, + const D3D12_VIDEO_DECODE_OUTPUT_STREAM_ARGUMENTS *pOutputArguments, + const D3D12_VIDEO_DECODE_INPUT_STREAM_ARGUMENTS *pInputArguments); + + void WriteBufferImmediate(UINT Count, + const D3D12_WRITEBUFFERIMMEDIATE_PARAMETER *pParams, + const D3D12_WRITEBUFFERIMMEDIATE_MODE *pModes); +} -- 2.29.2

1 2

[PATCH] msxml3: Fix crash when iterating through attributes with namespaces.
by Bernhard Übelacker July 2, 2021

July 2, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50475 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> --- For an attribute xmlns without a :foo prefix, the function domelem_get_item gives a NULL xmlns->prefix into xmlNewNsProp, which therefore fails and leaves domelem_get_item without returning an item. Therefore the crash follows. --- dlls/msxml3/element.c | 5 ++- dlls/msxml3/tests/domdoc.c | 62 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 1a523798328..c11d28b066c 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -1832,7 +1832,10 @@ static HRESULT domelem_get_item(const xmlNodePtr node, LONG index, IXMLDOMNode * if (!xmlns) return E_OUTOFMEMORY; - curr = xmlNewNsProp(NULL, xmlns, ns->prefix, ns->href); + if (ns->prefix) + curr = xmlNewNsProp(NULL, xmlns, ns->prefix, ns->href); + else + curr = xmlNewProp(NULL, xmlns->prefix, ns->href); if (!curr) { xmlFreeNs(xmlns); return E_OUTOFMEMORY; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index df30104a156..8faf5b59be5 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -13628,6 +13628,67 @@ todo_wine DeleteFileA(path); } +static const char svg[] = + "<svg version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\"></svg>"; + +static void test_prefixless_namespace(void) +{ + HRESULT hr; + IXMLDOMDocument *doc; + VARIANT_BOOL b; + BSTR str; + IXMLDOMNodeList *node_list; + LONG length; + IXMLDOMNode *node1; + IXMLDOMNode *node2; + IXMLDOMNamedNodeMap *node_map; + int found; + + doc = create_document(&IID_IXMLDOMDocument); + EXPECT_REF(doc, 1); + + hr = IXMLDOMDocument_loadXML(doc, _bstr_(svg), &b); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_get_childNodes(doc, &node_list); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMNodeList_get_item(node_list, 0, &node1); + EXPECT_HR(hr, S_OK); + + node_map = (void *)0xdeadbeef; + hr = IXMLDOMNode_get_attributes(node1, &node_map); + EXPECT_HR(hr, S_OK); + + length = 0xdeadbeef; + hr = IXMLDOMNamedNodeMap_get_length(node_map, &length); + EXPECT_HR(hr, S_OK); + ok(length == 3, "expected length=%d, got %d\n", 3, length); + + found = 0; + for (int i = 0; i < length; i++) + { + hr = IXMLDOMNamedNodeMap_get_item(node_map, i, &node2); + EXPECT_HR(hr, S_OK); + + str = (void *)0xdeadbeef; + hr = IXMLDOMNode_get_xml(node2, &str); + EXPECT_HR(hr, S_OK); + if (lstrcmpW(str, L"version=\"1.1\"") == 0) found++; + if (lstrcmpW(str, L"xmlns=\"http://www.w3.org/2000/svg\"") == 0) found++; + if (lstrcmpW(str, L"xmlns:xlink=\"http://www.w3.org/1999/xlink\"") == 0) found++; + SysFreeString(str); + + IXMLDOMNode_Release(node2); + } + ok(found == 3, "expected to find %d elements, found %d\n", 3, found); + + IXMLDOMNamedNodeMap_Release(node_map); + IXMLDOMNode_Release(node1); + IXMLDOMNodeList_Release(node_list); + IXMLDOMDocument_Release(doc); +} + START_TEST(domdoc) { HRESULT hr; @@ -13723,6 +13784,7 @@ START_TEST(domdoc) test_mxnamespacemanager(); test_mxnamespacemanager_override(); } + test_prefixless_namespace(); CoUninitialize(); } -- 2.30.2

1 0

[PATCH 1/3] wininet/tests: Test InternetCrackUrl when given a bogus length
by Tim Clem July 2, 2021

July 2, 2021

Windows will stop processing at the first null, even when given an explicit length. Signed-off-by: Tim Clem <tclem(a)codeweavers.com> --- dlls/wininet/tests/url.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/wininet/tests/url.c b/dlls/wininet/tests/url.c index bce7dc76c59..681b6ef0b32 100644 --- a/dlls/wininet/tests/url.c +++ b/dlls/wininet/tests/url.c @@ -653,6 +653,15 @@ static void InternetCrackUrl_test(void) GLE = GetLastError(); ok(ret == FALSE, "Expected InternetCrackUrl to fail\n"); ok(GLE == ERROR_INTERNET_UNRECOGNIZED_SCHEME, "Expected GLE to represent a failure\n"); + + /* Windows treats dwUrlLength as a maximum - if there is a null before + * that length, it stops there. */ + copy_compsA(&urlSrc, &urlComponents, 32, 1024, 1024, 1024, 1024, 1024); + ret = InternetCrackUrlA("http://x.org", 13 /* includes the nul */, 0, &urlComponents); + ok(ret, "InternetCrackUrlA failed with error %d\n", GetLastError()); + todo_wine + ok(urlComponents.dwHostNameLength == 5, + "Expected dwHostNameLength of 5, got %d\n", urlComponents.dwHostNameLength); } static void InternetCrackUrlW_test(void) @@ -825,6 +834,19 @@ static void InternetCrackUrlW_test(void) ok(r, "InternetCrackUrlW failed unexpectedly\n"); ok(!strcmp_wa(host, "x.org"), "host is %s, should be x.org\n", wine_dbgstr_w(host)); todo_wine ok(urlpart[0] == 0, "urlpart should be empty\n"); + + /* Windows treats dwUrlLength as a maximum - if there is a null before + * that length, it stops there. */ + host[0] = 0; + memset(&comp, 0, sizeof(comp)); + comp.dwStructSize = sizeof(comp); + comp.lpszHostName = host; + comp.dwHostNameLength = ARRAY_SIZE(host); + r = InternetCrackUrlW(url3, 13 /* includes the nul */, 0, &comp); + ok(r, "InternetCrackUrlW failed with error %d\n", GetLastError()); + todo_wine + ok(comp.dwHostNameLength == 5, + "Expected dwHostNameLength of 5, got %d\n", comp.dwHostNameLength); } static void fill_url_components(URL_COMPONENTSA *lpUrlComponents) -- 2.32.0

2 7

[PATCH v2] wined3d: Pass a wined3d_device pointer to wined3d_from_cs().
by Zebediah Figura July 2, 2021

July 2, 2021

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: Remove an assertion from wined3d_cs_queue_is_empty(). dlls/wined3d/adapter_vk.c | 2 +- dlls/wined3d/context_gl.c | 4 ++-- dlls/wined3d/cs.c | 1 - dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 2 +- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/wined3d_private.h | 8 ++++---- 7 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 850e2a6dfdb..d5001c1296b 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -541,7 +541,7 @@ static struct wined3d_context *adapter_vk_acquire_context(struct wined3d_device { TRACE("device %p, texture %p, sub_resource_idx %u.\n", device, texture, sub_resource_idx); - wined3d_from_cs(device->cs); + wined3d_from_cs(device); if (!device->context_count) return NULL; diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 474003d7553..33cb76343cd 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2295,7 +2295,7 @@ void wined3d_context_gl_destroy(struct wined3d_context_gl *context_gl) TRACE("Destroying context %p.\n", context_gl); - wined3d_from_cs(device->cs); + wined3d_from_cs(device); /* We delay destroying a context when it is active. The context_release() * function invokes wined3d_context_gl_destroy() again while leaving the @@ -4229,7 +4229,7 @@ struct wined3d_context_gl *wined3d_context_gl_reacquire(struct wined3d_context_g return NULL; device = context_gl->c.device; - wined3d_from_cs(device->cs); + wined3d_from_cs(device); if (context_gl->c.current_rt.texture) { diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index ce0417c9f71..c5fc8fbb7a6 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3047,7 +3047,6 @@ static const struct wined3d_device_context_ops wined3d_cs_st_ops = static BOOL wined3d_cs_queue_is_empty(const struct wined3d_cs *cs, const struct wined3d_cs_queue *queue) { - wined3d_from_cs(cs); return *(volatile LONG *)&queue->head == queue->tail; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5a2a95ebe96..55879e546f2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5765,7 +5765,7 @@ void device_invalidate_state(const struct wined3d_device *device, unsigned int s unsigned int representative, i, idx, shift; struct wined3d_context *context; - wined3d_from_cs(device->cs); + wined3d_from_cs(device); if (STATE_IS_COMPUTE(state_id)) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a39c6d75750..b87efaddaff 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2694,7 +2694,7 @@ static struct wined3d_context *adapter_no3d_acquire_context(struct wined3d_devic { TRACE("device %p, texture %p, sub_resource_idx %u.\n", device, texture, sub_resource_idx); - wined3d_from_cs(device->cs); + wined3d_from_cs(device); if (!device->context_count) return NULL; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 693557448fe..fe1bcb3824a 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1783,7 +1783,7 @@ static struct wined3d_context_gl *wined3d_swapchain_gl_create_context(struct win TRACE("Creating a new context for swapchain %p, thread %u.\n", swapchain_gl, GetCurrentThreadId()); - wined3d_from_cs(device->cs); + wined3d_from_cs(device); if (!(context_gl = heap_alloc_zero(sizeof(*context_gl)))) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 80e03ad9212..36e1fa4ec7a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -6034,10 +6034,10 @@ static inline void wined3d_insert_bits(DWORD *bitstream, } } -static inline void wined3d_from_cs(const struct wined3d_cs *cs) +static inline void wined3d_from_cs(const struct wined3d_device *device) { - if (cs->thread) - assert(cs->thread_id == GetCurrentThreadId()); + if (device->cs->thread) + assert(device->cs->thread_id == GetCurrentThreadId()); } static inline void wined3d_not_from_cs(const struct wined3d_device *device) @@ -6103,7 +6103,7 @@ void compute_normal_matrix(float *normal_matrix, BOOL legacy_lighting, static inline struct wined3d_context *context_acquire(struct wined3d_device *device, struct wined3d_texture *texture, unsigned int sub_resource_idx) { - wined3d_from_cs(device->cs); + wined3d_from_cs(device); return device->adapter->adapter_ops->adapter_acquire_context(device, texture, sub_resource_idx); } -- 2.30.2

1 0

[PATCH 2/5] wininet: validate InternetGetLastResponseInfo() parameters
by Damjan Jovanovic July 2, 2021

July 2, 2021

Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/wininet/internet.c | 10 ++++++++++ dlls/wininet/tests/ftp.c | 7 +++++++ 2 files changed, 17 insertions(+)

2 1