- wine-devel - winehq.org

[PATCH v2 1/3] user32/tests: Add optional focus winevents to correspond with focus hooks.
by Connor McAdams 11 Oct '21

11 Oct '21

Add optional EVENT_OBJECT_FOCUS winevents to correspond with optional HCBT_SETFOCUS hooks that are currently sent by Wine, and presumably Windows versions prior to Vista. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- -v2: Add extra context in commit message. dlls/user32/tests/msg.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 43253953a9e..3776bd17cd8 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1312,6 +1312,7 @@ static const struct message WmFirstDrawSetWindowPosSeq3[] = { { WM_NCACTIVATE, sent|optional }, { WM_ACTIVATE, sent|optional }, { HCBT_SETFOCUS, hook|optional }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|optional, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|defwinproc|optional }, { 0 } }; @@ -13500,6 +13501,7 @@ static const struct message WmShow[] = { { HCBT_ACTIVATE, hook|optional }, /* win2000 doesn't send it */ { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, /* win2000 doesn't send it */ { HCBT_SETFOCUS, hook|optional }, /* win2000 doesn't send it */ + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|optional, OBJID_CLIENT, 0 }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { 0 } }; @@ -13530,10 +13532,12 @@ static const struct message WmShowNoActivate_2[] = { { WM_MOVE, sent|defwinproc }, { WM_SIZE, sent|wparam|defwinproc, SIZE_RESTORED }, { HCBT_SETFOCUS, hook|optional }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|optional, OBJID_CLIENT, 0 }, { HCBT_ACTIVATE, hook|optional }, /* win2003 doesn't send it */ { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, /* win2003 doesn't send it */ { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { HCBT_SETFOCUS, hook|optional }, /* win2003 doesn't send it */ + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|optional, OBJID_CLIENT, 0 }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, /* Win7 seems to send this twice. */ { EVENT_SYSTEM_MINIMIZEEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, @@ -13560,6 +13564,7 @@ static const struct message WmRestore_1[] = { { HCBT_ACTIVATE, hook|optional }, /* win2000 doesn't send it */ { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, /* win2000 doesn't send it */ { HCBT_SETFOCUS, hook|optional }, /* win2000 doesn't send it */ + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|optional, OBJID_CLIENT, 0 }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_MOVE, sent|defwinproc }, { WM_SIZE, sent|wparam|defwinproc, SIZE_RESTORED }, @@ -13577,6 +13582,7 @@ static const struct message WmRestore_2[] = { { HCBT_ACTIVATE, hook|optional }, /* win2000 doesn't send it */ { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, /* win2000 doesn't send it */ { HCBT_SETFOCUS, hook|optional }, /* win2000 doesn't send it */ + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|optional, OBJID_CLIENT, 0 }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { 0 } }; @@ -13595,6 +13601,7 @@ static const struct message WmRestore_3[] = { { WM_MOVE, sent|defwinproc }, { WM_SIZE, sent|wparam|defwinproc, SIZE_MAXIMIZED }, { HCBT_SETFOCUS, hook|optional }, /* win2003 sends it */ + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|optional, OBJID_CLIENT, 0 }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, /* Win7 seems to send this twice. */ { EVENT_SYSTEM_MINIMIZEEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, @@ -13681,6 +13688,7 @@ static const struct message WmMinimize_1[] = { static const struct message WmMinimize_2[] = { { HCBT_MINMAX, hook|lparam, 0, SW_MINIMIZE }, { HCBT_SETFOCUS, hook|optional }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|optional, OBJID_CLIENT, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED, 0, SWP_NOACTIVATE }, { EVENT_OBJECT_REORDER, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED, 0, SWP_NOACTIVATE }, @@ -13757,6 +13765,7 @@ static const struct message WmShowMaximized_1[] = { { HCBT_ACTIVATE, hook|optional }, /* win2000 doesn't send it */ { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, /* win2000 doesn't send it */ { HCBT_SETFOCUS, hook|optional }, /* win2000 doesn't send it */ + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|optional, OBJID_CLIENT, 0 }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_MOVE, sent|defwinproc }, { WM_SIZE, sent|wparam|defwinproc, SIZE_MAXIMIZED }, @@ -14661,6 +14670,7 @@ static const struct message SetActiveWindowSeq0[] = { WM_GETTEXT, sent|defwinproc|optional }, { WM_ACTIVATE, sent|wparam|optional, 1 }, { HCBT_SETFOCUS, hook|optional }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|optional, OBJID_CLIENT, 0 }, { WM_KILLFOCUS, sent|defwinproc|optional }, { WM_IME_SETCONTEXT, sent|defwinproc|optional }, { WM_IME_SETCONTEXT, sent|defwinproc|optional }, -- 2.25.1

3 5

[PATCH v2 7/7] win32u: Use syscall interface for some palette functions.
by Jacek Caban 11 Oct '21

11 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/gdiobj.c | 5 ----- dlls/win32u/syscall.c | 5 +++++ dlls/win32u/win32u.spec | 10 ++++----- dlls/win32u/win32u_private.h | 5 ----- dlls/win32u/wrappers.c | 25 ----------------------- dlls/wow64win/gdi.c | 39 ++++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 5 +++++ 7 files changed, 54 insertions(+), 40 deletions(-)

1 0

[PATCH v2 6/7] win32u: Use syscall interface for some mapping functions.
by Jacek Caban 11 Oct '21

11 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/gdiobj.c | 2 -- dlls/win32u/syscall.c | 2 ++ dlls/win32u/win32u.spec | 4 ++-- dlls/win32u/win32u_private.h | 4 ---- dlls/win32u/wrappers.c | 12 ------------ dlls/wow64win/gdi.c | 22 ++++++++++++++++++++++ dlls/wow64win/syscall.h | 4 +++- 7 files changed, 29 insertions(+), 21 deletions(-)

1 0

[PATCH v2 5/7] win32u: Use syscall interface for some GDI objects functions.
by Jacek Caban 11 Oct '21

11 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/gdiobj.c | 6 ----- dlls/win32u/syscall.c | 6 +++++ dlls/win32u/win32u.spec | 12 ++++----- dlls/win32u/win32u_private.h | 6 ----- dlls/win32u/wrappers.c | 30 ----------------------- dlls/wow64win/gdi.c | 47 ++++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 6 +++++ 7 files changed, 65 insertions(+), 48 deletions(-)

1 0

[PATCH v2 4/7] win32u: Use syscall interface for some font functions.
by Jacek Caban 11 Oct '21

11 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/gdiobj.c | 8 --- dlls/win32u/syscall.c | 8 +++ dlls/win32u/win32u.spec | 16 +++--- dlls/win32u/win32u_private.h | 14 ----- dlls/win32u/wrappers.c | 46 ----------------- dlls/wow64win/gdi.c | 89 ++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 8 +++ dlls/wow64win/wow64win_private.h | 12 +++++ 8 files changed, 125 insertions(+), 76 deletions(-)

1 0

[PATCH v2 3/7] win32u: Use syscall interface for some DC functions.
by Jacek Caban 11 Oct '21

11 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/gdiobj.c | 7 ----- dlls/win32u/syscall.c | 7 +++++ dlls/win32u/win32u.spec | 14 ++++----- dlls/win32u/win32u_private.h | 8 ----- dlls/win32u/wrappers.c | 35 --------------------- dlls/wow64win/gdi.c | 60 ++++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 9 +++++- 7 files changed, 82 insertions(+), 58 deletions(-)

1 0

[PATCH v2 2/7] win32u: Use syscall interface for region functions.
by Jacek Caban 11 Oct '21

11 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/gdiobj.c | 13 ---- dlls/win32u/syscall.c | 13 ++++ dlls/win32u/win32u.spec | 26 ++++---- dlls/win32u/win32u_private.h | 14 ---- dlls/win32u/wrappers.c | 66 ------------------- dlls/wow64win/gdi.c | 121 +++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 15 ++++- 7 files changed, 161 insertions(+), 107 deletions(-)

1 0

[PATCH v2 1/7] win32u: Use syscall interface for bitmap functions.
by Jacek Caban 11 Oct '21

11 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Fixed wow entries order in patch 5. dlls/win32u/gdiobj.c | 6 --- dlls/win32u/syscall.c | 6 +++ dlls/win32u/win32u.spec | 12 +++--- dlls/win32u/win32u_private.h | 9 ----- dlls/win32u/wrappers.c | 33 ---------------- dlls/wow64win/gdi.c | 68 ++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 8 +++- dlls/wow64win/wow64win_private.h | 12 ++++++ 8 files changed, 99 insertions(+), 55 deletions(-)

1 0

[PATCH 5/7] win32u: Use syscall interface for some GDI objects functions.
by Jacek Caban 11 Oct '21

11 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/gdiobj.c | 6 ----- dlls/win32u/syscall.c | 6 +++++ dlls/win32u/win32u.spec | 12 ++++----- dlls/win32u/win32u_private.h | 6 ----- dlls/win32u/wrappers.c | 30 ----------------------- dlls/wow64win/gdi.c | 47 ++++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 6 +++++ 7 files changed, 65 insertions(+), 48 deletions(-)

3 3

[PATCH 1/3] wined3d: Return the map pitch from wined3d_device_context_emit_map().
by Zebediah Figura 11 Oct '21

11 Oct '21

Partially undoes 61024aa12f. We want to be able to allocate a new upload BO for a given map, but it's a bit structurally awkward to ask for a specific memory layout when parepare_upload_bo() might return different ones depending on the flags and other factors. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- This is kind of janky, though. It might not be all that unreasonable to ask prepare_upload_bo() for a specific layout. dlls/wined3d/cs.c | 21 ++++++++++++++++----- dlls/wined3d/device.c | 7 +------ dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index a34aad060f9..cbe333fab95 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2483,20 +2483,25 @@ static void wined3d_cs_exec_map(struct wined3d_cs *cs, const void *data) op->sub_resource_idx, op->map_ptr, op->box, op->flags); } -HRESULT wined3d_device_context_emit_map(struct wined3d_device_context *context, struct wined3d_resource *resource, - unsigned int sub_resource_idx, void **map_ptr, const struct wined3d_box *box, unsigned int flags) +HRESULT wined3d_device_context_emit_map(struct wined3d_device_context *context, + struct wined3d_resource *resource, unsigned int sub_resource_idx, + struct wined3d_map_desc *map_desc, const struct wined3d_box *box, unsigned int flags) { unsigned int row_pitch, slice_pitch; struct wined3d_cs_map *op; + void *map_ptr; HRESULT hr; wined3d_resource_get_sub_resource_map_pitch(resource, sub_resource_idx, &row_pitch, &slice_pitch); if ((flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) - && (*map_ptr = context->ops->map_upload_bo(context, resource, + && (map_ptr = context->ops->map_upload_bo(context, resource, sub_resource_idx, box, row_pitch, slice_pitch, flags))) { - TRACE("Returning map pointer %p, row pitch %u, slice pitch %u.\n", *map_ptr, row_pitch, slice_pitch); + TRACE("Returning map pointer %p, row pitch %u, slice pitch %u.\n", map_ptr, row_pitch, slice_pitch); + map_desc->data = map_ptr; + map_desc->row_pitch = row_pitch; + map_desc->slice_pitch = slice_pitch; return WINED3D_OK; } @@ -2511,7 +2516,7 @@ HRESULT wined3d_device_context_emit_map(struct wined3d_device_context *context, op->opcode = WINED3D_CS_OP_MAP; op->resource = resource; op->sub_resource_idx = sub_resource_idx; - op->map_ptr = map_ptr; + op->map_ptr = &map_ptr; op->box = box; op->flags = flags; op->hr = &hr; @@ -2519,6 +2524,12 @@ HRESULT wined3d_device_context_emit_map(struct wined3d_device_context *context, wined3d_device_context_submit(context, WINED3D_CS_QUEUE_MAP); wined3d_device_context_finish(context, WINED3D_CS_QUEUE_MAP); + if (SUCCEEDED(hr)) + { + map_desc->data = map_ptr; + map_desc->row_pitch = row_pitch; + map_desc->slice_pitch = slice_pitch; + } return hr; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 71b1e3c3f88..8e84544e6af 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4841,7 +4841,6 @@ HRESULT CDECL wined3d_device_context_map(struct wined3d_device_context *context, { struct wined3d_sub_resource_desc desc; struct wined3d_box b; - HRESULT hr; TRACE("context %p, resource %p, sub_resource_idx %u, map_desc %p, box %s, flags %#x.\n", context, resource, sub_resource_idx, map_desc, debug_box(box), flags); @@ -4885,11 +4884,7 @@ HRESULT CDECL wined3d_device_context_map(struct wined3d_device_context *context, return WINED3DERR_INVALIDCALL; } - if (SUCCEEDED(hr = wined3d_device_context_emit_map(context, resource, - sub_resource_idx, &map_desc->data, box, flags))) - wined3d_resource_get_sub_resource_map_pitch(resource, sub_resource_idx, - &map_desc->row_pitch, &map_desc->slice_pitch); - return hr; + return wined3d_device_context_emit_map(context, resource, sub_resource_idx, map_desc, box, flags); } HRESULT CDECL wined3d_device_context_unmap(struct wined3d_device_context *context, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0c169ec344b..acd3ded7a24 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4868,7 +4868,7 @@ void wined3d_device_context_emit_execute_command_list(struct wined3d_device_cont void wined3d_device_context_emit_generate_mipmaps(struct wined3d_device_context *context, struct wined3d_shader_resource_view *view) DECLSPEC_HIDDEN; HRESULT wined3d_device_context_emit_map(struct wined3d_device_context *context, - struct wined3d_resource *resource, unsigned int sub_resource_idx, void **map_ptr, + struct wined3d_resource *resource, unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, unsigned int flags) DECLSPEC_HIDDEN; void wined3d_device_context_emit_reset_state(struct wined3d_device_context *context, bool invalidate) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_blend_state(struct wined3d_device_context *context, -- 2.33.0

2 13

[PATCH vkd3d 4/4] vkd3d: Ignore D3D12_SO_NO_RASTERIZED_STREAM when stream output is disabled.
by Henri Verbeet 11 Oct '21

11 Oct '21

From: Robin Kertels <robin.kertels(a)gmail.com> Fixes the black screen problem in Diablo 2: Resurrected. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d/state.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 78b0c717..701af891 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2034,7 +2034,8 @@ static void rs_stream_info_from_d3d12(VkPipelineRasterizationStateStreamCreateIn VkPipelineRasterizationStateCreateInfo *vk_rs_desc, const D3D12_STREAM_OUTPUT_DESC *so_desc, const struct vkd3d_vulkan_info *vk_info) { - if (!so_desc->RasterizedStream || so_desc->RasterizedStream == D3D12_SO_NO_RASTERIZED_STREAM) + if (!so_desc->NumEntries || !so_desc->RasterizedStream + || so_desc->RasterizedStream == D3D12_SO_NO_RASTERIZED_STREAM) return; if (!vk_info->rasterization_stream) @@ -2811,7 +2812,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s rs_desc_from_d3d12(&graphics->rs_desc, &desc->RasterizerState); have_attachment = graphics->rt_count || graphics->dsv_format || is_dsv_format_unknown; if ((!have_attachment && !(desc->PS.pShaderBytecode && desc->PS.BytecodeLength)) - || so_desc->RasterizedStream == D3D12_SO_NO_RASTERIZED_STREAM) + || (graphics->xfb_enabled && so_desc->RasterizedStream == D3D12_SO_NO_RASTERIZED_STREAM)) graphics->rs_desc.rasterizerDiscardEnable = VK_TRUE; rs_stream_info_from_d3d12(&graphics->rs_stream_info, &graphics->rs_desc, so_desc, vk_info); -- 2.20.1

1 0

[PATCH vkd3d 3/4] tests: Use D3D12_RESOURCE_STATE_VERTEX_AND_CONSTANT_BUFFER for constant buffers in test_unbounded_resource_arrays().
by Henri Verbeet 11 Oct '21

11 Oct '21

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- tests/d3d12.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 4991dd50..38fab13c 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -34940,7 +34940,7 @@ static void test_unbounded_resource_arrays(void) upload_buffer_data(constant_buffers[i], 0, sizeof(cb_data), &cb_data, queue, command_list); reset_command_list(command_list, context.allocator); transition_resource_state(command_list, constant_buffers[i], - D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE); + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_VERTEX_AND_CONSTANT_BUFFER); cbv_desc.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(constant_buffers[i]); cbv_desc.SizeInBytes = align(sizeof(cb_data), D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT); -- 2.20.1

1 0

[PATCH vkd3d 2/4] tests: Use a bounded range between unbounded ranges in test_unbounded_resource_arrays().
by Henri Verbeet 11 Oct '21

11 Oct '21

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- tests/d3d12.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index cc06b137..4991dd50 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -34855,7 +34855,7 @@ static void test_unbounded_resource_arrays(void) {D3D12_DESCRIPTOR_RANGE_TYPE_CBV, UINT_MAX, 2, 1, 0}, {D3D12_DESCRIPTOR_RANGE_TYPE_SRV, UINT_MAX, 2, 1, 64}, {D3D12_DESCRIPTOR_RANGE_TYPE_UAV, UINT_MAX, 1, 1, 128}, - {D3D12_DESCRIPTOR_RANGE_TYPE_UAV, UINT_MAX, 1, 2, 127}, + {D3D12_DESCRIPTOR_RANGE_TYPE_UAV, 65, 1, 2, 127}, {D3D12_DESCRIPTOR_RANGE_TYPE_UAV, UINT_MAX, 1, 3, 192}, }; @@ -34999,7 +34999,7 @@ static void test_unbounded_resource_arrays(void) D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); get_buffer_readback_with_command_list(output_buffers[i], DXGI_FORMAT_R32_UINT, &rb, queue, command_list); /* Buffers at index >= 64 are aliased. */ - todo_if(i != 74) + todo_if(i != 74 && i > 63) check_readback_data_uint(&rb, NULL, (i < 64 ? 63 - i : 127 - i) ^ 0x35, 0); release_resource_readback(&rb); reset_command_list(command_list, context.allocator); -- 2.20.1

1 0

[PATCH vkd3d 1/4] vkd3d-shader/spirv: Add non-uniform decorations.
by Henri Verbeet 11 Oct '21

11 Oct '21

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Based in part on vkd3d-proton patches by Philip Rebohle and Hans-Kristian Arntzen. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 31 ++++++++++++++++++++++++++++--- tests/d3d12.c | 3 +-- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 0be17e39..ebaf1631 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1838,7 +1838,8 @@ static bool vkd3d_spirv_compile_module(struct vkd3d_spirv_builder *builder, || vkd3d_spirv_capability_is_enabled(builder, SpvCapabilitySampledImageArrayDynamicIndexing) || vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityStorageBufferArrayDynamicIndexing) || vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityStorageTexelBufferArrayDynamicIndexingEXT) - || vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityStorageImageArrayDynamicIndexing)) + || vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityStorageImageArrayDynamicIndexing) + || vkd3d_spirv_capability_is_enabled(builder, SpvCapabilityShaderNonUniformEXT)) vkd3d_spirv_build_op_extension(&stream, "SPV_EXT_descriptor_indexing"); if (builder->ext_instr_set_glsl_450) @@ -2670,6 +2671,15 @@ static void vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(struct vkd3d_dxb vkd3d_dxbc_compiler_emit_descriptor_binding(compiler, variable_id, &binding); } +static void vkd3d_dxbc_compiler_decorate_nonuniform(struct vkd3d_dxbc_compiler *compiler, + uint32_t expression_id) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + + vkd3d_spirv_enable_capability(builder, SpvCapabilityShaderNonUniformEXT); + vkd3d_spirv_build_op_decorate(builder, expression_id, SpvDecorationNonUniformEXT, NULL, 0); +} + static const struct vkd3d_symbol *vkd3d_dxbc_compiler_put_symbol(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_symbol *symbol) { @@ -3314,6 +3324,8 @@ static void vkd3d_dxbc_compiler_emit_dereference_register(struct vkd3d_dxbc_comp ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, register_info->storage_class, type_id); register_info->id = vkd3d_spirv_build_op_access_chain(builder, ptr_type_id, register_info->id, indexes, index_count); + if (reg->non_uniform) + vkd3d_dxbc_compiler_decorate_nonuniform(compiler, register_info->id); } } @@ -7993,8 +8005,16 @@ static void vkd3d_dxbc_compiler_prepare_image(struct vkd3d_dxbc_compiler *compil return; } - image->image_id = load ? vkd3d_spirv_build_op_load(builder, - image->image_type_id, image->id, SpvMemoryAccessMaskNone) : 0; + if (load) + { + image->image_id = vkd3d_spirv_build_op_load(builder, image->image_type_id, image->id, SpvMemoryAccessMaskNone); + if (resource_reg->non_uniform) + vkd3d_dxbc_compiler_decorate_nonuniform(compiler, image->image_id); + } + else + { + image->image_id = 0; + } image->image_type_id = vkd3d_dxbc_compiler_get_image_type_id(compiler, resource_reg, &symbol->info.resource.range, image->resource_type_info, @@ -8023,9 +8043,14 @@ static void vkd3d_dxbc_compiler_prepare_image(struct vkd3d_dxbc_compiler *compil sampler_id = vkd3d_spirv_build_op_load(builder, vkd3d_spirv_get_op_type_sampler(builder), sampler_var_id, SpvMemoryAccessMaskNone); + if (sampler_reg->non_uniform) + vkd3d_dxbc_compiler_decorate_nonuniform(compiler, sampler_id); + sampled_image_type_id = vkd3d_spirv_get_op_type_sampled_image(builder, image->image_type_id); image->sampled_image_id = vkd3d_spirv_build_op_sampled_image(builder, sampled_image_type_id, image->image_id, sampler_id); + if (resource_reg->non_uniform) + vkd3d_dxbc_compiler_decorate_nonuniform(compiler, image->sampled_image_id); } else { diff --git a/tests/d3d12.c b/tests/d3d12.c index efdf0b46..cc06b137 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -34999,7 +34999,7 @@ static void test_unbounded_resource_arrays(void) D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); get_buffer_readback_with_command_list(output_buffers[i], DXGI_FORMAT_R32_UINT, &rb, queue, command_list); /* Buffers at index >= 64 are aliased. */ - todo_if(i != 10 && i != 74) + todo_if(i != 74) check_readback_data_uint(&rb, NULL, (i < 64 ? 63 - i : 127 - i) ^ 0x35, 0); release_resource_readback(&rb); reset_command_list(command_list, context.allocator); @@ -35146,7 +35146,6 @@ static void test_unbounded_samplers(void) { unsigned int value = get_readback_uint(&rb, i, 0, 0); unsigned int expected = (i & 1) ? 100 : 10; - todo_if(i & 1) ok(value == expected, "Got %u, expected %u at %u.\n", value, expected, i); } release_resource_readback(&rb); -- 2.20.1

1 0

[PATCH] wpcap: Accept interfaces without associated IPv4 or IPv6 address.
by Hans Leidekker 11 Oct '21

11 Oct '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wpcap/wpcap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 3a0b2381697..67d55b8f3f0 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -323,7 +323,7 @@ static struct pcap_interface *build_win32_device( const struct pcap_interface *u if (!(ret = calloc( 1, sizeof(*ret) ))) return NULL; if (!(ret->name = build_win32_name( source, adapter_name ))) goto err; if (!(ret->description = build_win32_description( unix_dev ))) goto err; - if (!(ret->addresses = build_win32_addresses( unix_dev->addresses ))) goto err; + ret->addresses = build_win32_addresses( unix_dev->addresses ); ret->flags = unix_dev->flags; return ret; -- 2.30.2

1 0

[PATCH 2/3] msvcrt: Don't crash on NULL in fclose.
by Piotr Caban 11 Oct '21

11 Oct '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/file.c | 4 ++++ dlls/msvcrt/tests/file.c | 3 +++ 2 files changed, 7 insertions(+)

1 0

[PATCH 1/3] ucrtbase: Add __std_terminate export.
by Piotr Caban 11 Oct '21

11 Oct '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ucrtbase/ucrtbase.spec | 1 + 1 file changed, 1 insertion(+)

1 0

[PATCH 7/7] win32u: Use syscall interface for some palette functions.
by Jacek Caban 11 Oct '21

11 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/gdiobj.c | 5 ----- dlls/win32u/syscall.c | 5 +++++ dlls/win32u/win32u.spec | 10 ++++----- dlls/win32u/win32u_private.h | 5 ----- dlls/win32u/wrappers.c | 25 ----------------------- dlls/wow64win/gdi.c | 39 ++++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 5 +++++ 7 files changed, 54 insertions(+), 40 deletions(-)

2 1

[PATCH 6/7] win32u: Use syscall interface for some mapping functions.
by Jacek Caban 11 Oct '21

11 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/gdiobj.c | 2 -- dlls/win32u/syscall.c | 2 ++ dlls/win32u/win32u.spec | 4 ++-- dlls/win32u/win32u_private.h | 4 ---- dlls/win32u/wrappers.c | 12 ------------ dlls/wow64win/gdi.c | 22 ++++++++++++++++++++++ dlls/wow64win/syscall.h | 4 +++- 7 files changed, 29 insertions(+), 21 deletions(-)

2 1

[PATCH 4/7] win32u: Use syscall interface for some font functions.
by Jacek Caban 11 Oct '21

11 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/gdiobj.c | 8 --- dlls/win32u/syscall.c | 8 +++ dlls/win32u/win32u.spec | 16 +++--- dlls/win32u/win32u_private.h | 14 ----- dlls/win32u/wrappers.c | 46 ----------------- dlls/wow64win/gdi.c | 89 ++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 8 +++ dlls/wow64win/wow64win_private.h | 12 +++++ 8 files changed, 125 insertions(+), 76 deletions(-)

2 1

[PATCH 3/7] win32u: Use syscall interface for some DC functions.
by Jacek Caban 11 Oct '21

11 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/gdiobj.c | 7 ----- dlls/win32u/syscall.c | 7 +++++ dlls/win32u/win32u.spec | 14 ++++----- dlls/win32u/win32u_private.h | 8 ----- dlls/win32u/wrappers.c | 35 --------------------- dlls/wow64win/gdi.c | 60 ++++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 9 +++++- 7 files changed, 82 insertions(+), 58 deletions(-)

2 1

[PATCH 2/7] win32u: Use syscall interface for region functions.
by Jacek Caban 11 Oct '21

11 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/gdiobj.c | 13 ---- dlls/win32u/syscall.c | 13 ++++ dlls/win32u/win32u.spec | 26 ++++---- dlls/win32u/win32u_private.h | 14 ---- dlls/win32u/wrappers.c | 66 ------------------- dlls/wow64win/gdi.c | 121 +++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 15 ++++- 7 files changed, 161 insertions(+), 107 deletions(-)

2 1

[PATCH 1/7] win32u: Use syscall interface for bitmap functions.
by Jacek Caban 11 Oct '21

11 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/gdiobj.c | 6 --- dlls/win32u/syscall.c | 6 +++ dlls/win32u/win32u.spec | 12 +++--- dlls/win32u/win32u_private.h | 9 ----- dlls/win32u/wrappers.c | 33 ---------------- dlls/wow64win/gdi.c | 68 ++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 8 +++- dlls/wow64win/wow64win_private.h | 12 ++++++ 8 files changed, 99 insertions(+), 55 deletions(-)

2 1

[PATCH] wininet: Support option INTERNET_OPTION_SERVER_CERT_CHAIN_CONTEXT for http connections
by Alistair Leslie-Hughes 11 Oct '21

11 Oct '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/http.c | 13 +++++++++++++ dlls/wininet/tests/http.c | 14 ++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 8e40a4cee2b..d0150c235a3 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2330,6 +2330,19 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe *(ULONG*)buffer = hdr->ErrorMask; *size = sizeof(ULONG); + return ERROR_SUCCESS; + case INTERNET_OPTION_SERVER_CERT_CHAIN_CONTEXT: + TRACE("INTERNET_OPTION_SERVER_CERT_CHAIN_CONTEXT\n"); + + if (*size < sizeof(PCERT_CHAIN_CONTEXT)) + return ERROR_INSUFFICIENT_BUFFER; + + if(!req->server->cert_chain) + return ERROR_INTERNET_INCORRECT_HANDLE_STATE; + + *((PCERT_CHAIN_CONTEXT*)buffer) = (PCERT_CHAIN_CONTEXT)CertDuplicateCertificateChain(req->server->cert_chain); + *size = sizeof(PCERT_CHAIN_CONTEXT); + return ERROR_SUCCESS; } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index b3fcc93b704..567f63b9c8a 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -7129,6 +7129,7 @@ static void test_secure_connection(void) INTERNET_CERTIFICATE_INFOW *certificate_structW = NULL; char certstr1[512], certstr2[512]; BOOL ret; + PCCERT_CHAIN_CONTEXT ctx = NULL; ses = InternetOpenA("Gizmo5", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); ok(ses != NULL, "InternetOpen failed\n"); @@ -7160,6 +7161,14 @@ static void test_secure_connection(void) test_cert_struct(req, &test_winehq_org_cert); + size = sizeof(PCCERT_CHAIN_CONTEXT); + ret = InternetQueryOptionA(req, INTERNET_OPTION_SERVER_CERT_CHAIN_CONTEXT, &ctx, &size); + ok(ret || GetLastError() == ERROR_INTERNET_INCORRECT_HANDLE_TYPE /* < IE8*/, "InternetQueryOption failed: %d\n", GetLastError()); + if (ret) + { + CertFreeCertificateChain(ctx); + } + /* Querying the same option through InternetQueryOptionW still results in * ANSI strings being returned. */ @@ -8099,6 +8108,7 @@ static void test_cert_string(void) char actual[512]; DWORD size; BOOL res; + PCCERT_CHAIN_CONTEXT ctx = NULL; ses = InternetOpenA( "winetest", 0, NULL, NULL, 0 ); ok( ses != NULL, "InternetOpenA failed\n" ); @@ -8119,6 +8129,10 @@ static void test_cert_string(void) ok( size == 0, "unexpected size: %u\n", size ); ok( actual[0] == 0x55, "unexpected byte: %02x\n", actual[0] ); + size = sizeof(PCCERT_CHAIN_CONTEXT); + res = InternetQueryOptionA(req, INTERNET_OPTION_SERVER_CERT_CHAIN_CONTEXT, &ctx, &size); + ok(!res && (GetLastError() == ERROR_INTERNET_INCORRECT_HANDLE_STATE), "InternetQueryOption failed: %d\n", GetLastError()); + InternetCloseHandle( req ); InternetCloseHandle( con ); InternetCloseHandle( ses ); -- 2.33.0

2 1

[PATCH] maintainers: Update GDI files.
by Huw Davies 11 Oct '21

11 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- MAINTAINERS | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 18478a8871f..5bf636cfd34 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -129,6 +129,26 @@ F: dlls/mscoree/ GDI M: Huw Davies <huw(a)codeweavers.com> F: dlls/gdi32/ +F: dlls/win32u/bitblt.c +F: dlls/win32u/bitmap.c +F: dlls/win32u/brush.c +F: dlls/win32u/clipping.c +F: dlls/win32u/dc.c +F: dlls/win32u/dib.c +F: dlls/win32u/dibdrv/ +F: dlls/win32u/driver.c +F: dlls/win32u/emfdrv.c +F: dlls/win32u/font.c +F: dlls/win32u/freetype.c +F: dlls/win32u/gdiobj.c +F: dlls/win32u/mapping.c +F: dlls/win32u/opentype.c +F: dlls/win32u/painting.c +F: dlls/win32u/palette.c +F: dlls/win32u/path.c +F: dlls/win32u/pen.c +F: dlls/win32u/printdrv.c +F: dlls/win32u/region.c GDIPlus M: Esme Povirk <vincent(a)codeweavers.com> -- 2.23.0

1 0

[PATCH 1/6] dinput: Move device_instance_is_disabled to device.c.
by Rémi Bernon 11 Oct '21

11 Oct '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/device.c | 48 ++++++++++++++++++++++++++++++++++++ dlls/dinput/device_private.h | 1 + dlls/dinput/joystick.c | 48 ------------------------------------ 3 files changed, 49 insertions(+), 48 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index d869f439101..61f6effad19 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -314,6 +314,54 @@ DWORD get_config_key( HKEY defkey, HKEY appkey, const WCHAR *name, WCHAR *buffer return ERROR_FILE_NOT_FOUND; } +BOOL device_instance_is_disabled( DIDEVICEINSTANCEW *instance, BOOL *override ) +{ + static const WCHAR disabled_str[] = {'d', 'i', 's', 'a', 'b', 'l', 'e', 'd', 0}; + static const WCHAR override_str[] = {'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', 0}; + static const WCHAR joystick_key[] = {'J', 'o', 'y', 's', 't', 'i', 'c', 'k', 's', 0}; + WCHAR buffer[MAX_PATH]; + HKEY hkey, appkey, temp; + BOOL disable = FALSE; + + get_app_key( &hkey, &appkey ); + if (override) *override = FALSE; + + /* Joystick settings are in the 'joysticks' subkey */ + if (appkey) + { + if (RegOpenKeyW( appkey, joystick_key, &temp )) temp = 0; + RegCloseKey( appkey ); + appkey = temp; + } + + if (hkey) + { + if (RegOpenKeyW( hkey, joystick_key, &temp )) temp = 0; + RegCloseKey( hkey ); + hkey = temp; + } + + /* Look for the "controllername"="disabled" key */ + if (!get_config_key( hkey, appkey, instance->tszInstanceName, buffer, sizeof(buffer) )) + { + if (!strcmpW( disabled_str, buffer )) + { + TRACE( "Disabling joystick '%s' based on registry key.\n", debugstr_w(instance->tszInstanceName) ); + disable = TRUE; + } + else if (override && !strcmpW( override_str, buffer )) + { + TRACE( "Force enabling joystick '%s' based on registry key.\n", debugstr_w(instance->tszInstanceName) ); + *override = TRUE; + } + } + + if (appkey) RegCloseKey( appkey ); + if (hkey) RegCloseKey( hkey ); + + return disable; +} + /* Conversion between internal data buffer and external data buffer */ void fill_DataFormat(void *out, DWORD size, const void *in, const DataFormat *df) { diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 90eab627c26..8aced6d84dd 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -98,6 +98,7 @@ extern const IDirectInputDevice8AVtbl dinput_device_a_vtbl DECLSPEC_HIDDEN; extern BOOL get_app_key(HKEY*, HKEY*) DECLSPEC_HIDDEN; extern DWORD get_config_key( HKEY, HKEY, const WCHAR *, WCHAR *, DWORD ) DECLSPEC_HIDDEN; +extern BOOL device_instance_is_disabled( DIDEVICEINSTANCEW *instance, BOOL *override ) DECLSPEC_HIDDEN; /* Routines to do DataFormat / WineFormat conversions */ extern void fill_DataFormat(void *out, DWORD size, const void *in, const DataFormat *df) DECLSPEC_HIDDEN; diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 6e573e8741a..979d5a5c7f2 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -279,54 +279,6 @@ BOOL device_disabled_registry(const char* name) return device_instance_is_disabled( &instance, NULL ); } -BOOL device_instance_is_disabled( DIDEVICEINSTANCEW *instance, BOOL *override ) -{ - static const WCHAR disabled_str[] = {'d', 'i', 's', 'a', 'b', 'l', 'e', 'd', 0}; - static const WCHAR override_str[] = {'o', 'v', 'e', 'r', 'r', 'i', 'd', 'e', 0}; - static const WCHAR joystick_key[] = {'J', 'o', 'y', 's', 't', 'i', 'c', 'k', 's', 0}; - WCHAR buffer[MAX_PATH]; - HKEY hkey, appkey, temp; - BOOL disable = FALSE; - - get_app_key(&hkey, &appkey); - if (override) *override = FALSE; - - /* Joystick settings are in the 'joysticks' subkey */ - if (appkey) - { - if (RegOpenKeyW( appkey, joystick_key, &temp )) temp = 0; - RegCloseKey(appkey); - appkey = temp; - } - - if (hkey) - { - if (RegOpenKeyW( hkey, joystick_key, &temp )) temp = 0; - RegCloseKey(hkey); - hkey = temp; - } - - /* Look for the "controllername"="disabled" key */ - if (!get_config_key( hkey, appkey, instance->tszInstanceName, buffer, sizeof(buffer) )) - { - if (!strcmpW( disabled_str, buffer )) - { - TRACE( "Disabling joystick '%s' based on registry key.\n", debugstr_w(instance->tszInstanceName) ); - disable = TRUE; - } - else if (override && !strcmpW( override_str, buffer )) - { - TRACE( "Force enabling joystick '%s' based on registry key.\n", debugstr_w(instance->tszInstanceName) ); - *override = TRUE; - } - } - - if (appkey) RegCloseKey(appkey); - if (hkey) RegCloseKey(hkey); - - return disable; -} - BOOL is_xinput_device(const DIDEVCAPS *devcaps, WORD vid, WORD pid) { int i; -- 2.33.0

2 6

[PATCH] dhcpcsvc6: Add stub DLL
by Alex Henrie 11 Oct '21

11 Oct '21

Entries that are commented out are present in Windows 10 but not in Windows 7. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51863 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- configure.ac | 1 + dlls/dhcpcsvc6/Makefile.in | 3 +++ dlls/dhcpcsvc6/dhcpcsvc6.spec | 22 ++++++++++++++++++++++ 3 files changed, 26 insertions(+) create mode 100644 dlls/dhcpcsvc6/Makefile.in create mode 100644 dlls/dhcpcsvc6/dhcpcsvc6.spec diff --git a/configure.ac b/configure.ac index 530785c0033..42c95ed12f1 100644 --- a/configure.ac +++ b/configure.ac @@ -3042,6 +3042,7 @@ WINE_CONFIG_MAKEFILE(dlls/devenum) WINE_CONFIG_MAKEFILE(dlls/devenum/tests) WINE_CONFIG_MAKEFILE(dlls/dhcpcsvc) WINE_CONFIG_MAKEFILE(dlls/dhcpcsvc/tests) +WINE_CONFIG_MAKEFILE(dlls/dhcpcsvc6) WINE_CONFIG_MAKEFILE(dlls/dhtmled.ocx) WINE_CONFIG_MAKEFILE(dlls/difxapi) WINE_CONFIG_MAKEFILE(dlls/dinput) diff --git a/dlls/dhcpcsvc6/Makefile.in b/dlls/dhcpcsvc6/Makefile.in new file mode 100644 index 00000000000..6b3e0d03000 --- /dev/null +++ b/dlls/dhcpcsvc6/Makefile.in @@ -0,0 +1,3 @@ +MODULE = dhcpcsvc6.dll + +EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/dhcpcsvc6/dhcpcsvc6.spec b/dlls/dhcpcsvc6/dhcpcsvc6.spec new file mode 100644 index 00000000000..f65904d654b --- /dev/null +++ b/dlls/dhcpcsvc6/dhcpcsvc6.spec @@ -0,0 +1,22 @@ +@ stub Dhcpv6AcquireParameters +# @ stub Dhcpv6CApiCleanup +# @ stub Dhcpv6CApiInitialize +@ stub Dhcpv6CancelOperation +# @ stub Dhcpv6EnableDhcp +@ stub Dhcpv6EnableTracing +@ stub Dhcpv6FreeLeaseInfo +# @ stub Dhcpv6FreeLeaseInfoArray +@ stub Dhcpv6GetTraceArray +@ stub Dhcpv6GetUserClasses +@ stub Dhcpv6IsEnabled +@ stub Dhcpv6QueryLeaseInfo +# @ stub Dhcpv6QueryLeaseInfoArray +@ stub Dhcpv6ReleaseParameters +@ stub Dhcpv6ReleasePrefix +@ stub Dhcpv6ReleasePrefixEx +@ stub Dhcpv6RenewPrefix +@ stub Dhcpv6RenewPrefixEx +@ stub Dhcpv6RequestParams +@ stub Dhcpv6RequestPrefix +@ stub Dhcpv6RequestPrefixEx +@ stub Dhcpv6SetUserClass -- 2.33.0

1 0

[PATCH v4 1/2] kernelbase: Fix stack overflow by DefineDosDeviceW().
by Xu Wei 11 Oct '21

11 Oct '21

Signed-off-by: Xu Wei <xuwei(a)uniontech.com> --- dlls/kernelbase/volume.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/volume.c b/dlls/kernelbase/volume.c index d513dda1f9d..e4652d9bd55 100644 --- a/dlls/kernelbase/volume.c +++ b/dlls/kernelbase/volume.c @@ -384,7 +384,7 @@ err_ret: */ BOOL WINAPI DECLSPEC_HOTPATCH DefineDosDeviceW( DWORD flags, const WCHAR *device, const WCHAR *target ) { - WCHAR link_name[15] = L"\\DosDevices\\"; + WCHAR *link_name = NULL; UNICODE_STRING nt_name, nt_target; OBJECT_ATTRIBUTES attr; NTSTATUS status; @@ -395,17 +395,28 @@ BOOL WINAPI DECLSPEC_HOTPATCH DefineDosDeviceW( DWORD flags, const WCHAR *device if (flags & ~(DDD_RAW_TARGET_PATH | DDD_REMOVE_DEFINITION)) FIXME("Ignoring flags %#x.\n", flags & ~(DDD_RAW_TARGET_PATH | DDD_REMOVE_DEFINITION)); - lstrcatW( link_name, device ); + if (!(link_name = HeapAlloc( GetProcessHeap(), 0, sizeof(L"\\DosDevices\\") + (device ? lstrlenW(device)*sizeof(WCHAR) : 0)))) + { + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + + lstrcpyW( link_name, L"\\DosDevices\\" ); + if (device) lstrcatW( link_name, device ); RtlInitUnicodeString( &nt_name, link_name ); InitializeObjectAttributes( &attr, &nt_name, OBJ_CASE_INSENSITIVE | OBJ_PERMANENT, 0, NULL ); if (flags & DDD_REMOVE_DEFINITION) { if (!set_ntstatus( NtOpenSymbolicLinkObject( &handle, 0, &attr ) )) + { + HeapFree( GetProcessHeap(), 0, link_name ); return FALSE; + } status = NtMakeTemporaryObject( handle ); NtClose( handle ); + HeapFree( GetProcessHeap(), 0, link_name ); return set_ntstatus( status ); } @@ -414,6 +425,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH DefineDosDeviceW( DWORD flags, const WCHAR *device if (!RtlDosPathNameToNtPathName_U( target, &nt_target, NULL, NULL)) { SetLastError( ERROR_PATH_NOT_FOUND ); + HeapFree( GetProcessHeap(), 0, link_name ); return FALSE; } } @@ -422,6 +434,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH DefineDosDeviceW( DWORD flags, const WCHAR *device if (!(status = NtCreateSymbolicLinkObject( &handle, SYMBOLIC_LINK_ALL_ACCESS, &attr, &nt_target ))) NtClose( handle ); + HeapFree( GetProcessHeap(), 0, link_name ); return set_ntstatus( status ); } -- 2.20.1

1 1

[PATCH v3 2/2] ntdll: fix LdrGetDllPath with LOAD_WITH_ALTERED_SEARCH_PATH
by Nick 11 Oct '21

11 Oct '21

Empty Message

2 1

[PATCH v3 1/2] kernel32: add tests for LdrGetDllPath with LOAD_WITH_ALTERED_SEARCH_PATH
by Nick 11 Oct '21

11 Oct '21

Empty Message

1 0

[PATCH v2 3/3] kernel32: mark passing todo_wine tests ok
by Nick 10 Oct '21

10 Oct '21

Empty Message

2 1

[PATCH v2 2/3] ntdll: fix LdrGetDllPath with LOAD_WITH_ALTERED_SEARCH_PATH
by Nick 10 Oct '21

10 Oct '21

Empty Message

2 1

[PATCH 0/3] winex11.drv: removing ancient workarounds
by Emil Velikov 10 Oct '21

10 Oct '21

Hey team, Here's another small series, removing more code: - drop 14 year old workaround for broken ATI drivers - drop the RTLD_GLOBAL hack - the respective libs have not been under linked for years - bumps Xrender requirement to 0.9.1 - distros are shipping 0.9.10 for a while now Any input, comments and suggestions are greatly apprecaited, Emil Emil Velikov (3): winex11.drv: stop using RTLD_GLOBAL winex11.drv: remove workaround for ancient ATI drivers winex11.drv: require Xrender 0.9.1 configure.ac | 6 ++---- dlls/winex11.drv/opengl.c | 21 +++------------------ dlls/winex11.drv/x11drv_main.c | 6 +++--- dlls/winex11.drv/xrandr.c | 2 +- dlls/winex11.drv/xrender.c | 20 ++------------------ include/config.h.in | 6 ------ 6 files changed, 11 insertions(+), 50 deletions(-) -- 2.33.0

1 3

[PATCH v2 1/3] kernel32: add tests for LdrGetDllPath with LOAD_WITH_ALTERED_SEARCH_PATH
by Nick 10 Oct '21

10 Oct '21

Empty Message

1 0

[PATCH v3 0/1] Memory leak fix
by David Kahurani 10 Oct '21

10 Oct '21

The following patch fixes a number of possible memory leaks that are caused by overwritting of the original pointer. V2: Resent to add a signature to the patch. v3: Fix build issues David Kahurani (1): tools/winedump : Avoid potential memory leaks tools/winedump/msmangle.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) -- 2.33.0

4 4

[PATCH 1/2] kernel32: add tests for LdrGetDllPath with LOAD_WITH_ALTERED_SEARCH_PATH
by Nick 10 Oct '21

10 Oct '21

Empty Message

2 1

[PATCH 2/2] ntdll: fix LdrGetDllPath with LOAD_WITH_ALTERED_SEARCH_PATH
by Nick 10 Oct '21

10 Oct '21

Empty Message

1 0

[PATCH 0/1] Memory leaks fix
by David Kahurani 09 Oct '21

09 Oct '21

The following patch fixes a number of possible memory leaks that are caused by overwritting of the original pointer. Resent to add a signature to the patch. David Kahurani (1): tools/winedump : Avoid potential memory leaks tools/winedump/msmangle.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -- 2.33.0

2 2

[PATCH 0/1] Memory leaks fix
by David Kahurani 09 Oct '21

09 Oct '21

The following patch fixes a number of possible memory leaks that are caused by overwritting of the original pointer. David Kahurani (1): tools/winedump : Avoid potential memory leaks tools/winedump/msmangle.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -- 2.33.0

2 2

Wine staging 6.19 release
by Alistair Leslie-Hughes 09 Oct '21

09 Oct '21

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 6.19 (627 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * include: Add SPSTREAMFORMAT enum values. * wininet: Set context length for http status 403. * wininet: Allow up to 4K for data buffers. Added: * None Updated: * sapi-iteration-tokens Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH] msxml3/tests: Test VBSAXXMLReader.
by Jefferson Carpenter 08 Oct '21

08 Oct '21

Summary: * Generalized ContentHandler, ErrorHandler, and LexicalHandler implementations in test to not care about which interface is used. * Implemented SAX.*Handler interfaces by calling into these generalized functions. * Implemented VBSAX.*Handler interfaces the same way. * Added vb_reader_support_data using VB interface IID_IVBSAXXMLReader. * Added a data structure containing both reader_support_data and vb_reader_support_data. This is iterated over first in test_saxreader(). The tests generally run. thanks, Jefferson

2 2

[PATCH v2 1/3] iphlpapi: Implement asynchronous events for IcmpSendEcho2Ex.
by Gabriel Ivăncescu 08 Oct '21

08 Oct '21

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v2: Fixed the asm wrapper ret, since it's stdcall. dlls/iphlpapi/iphlpapi_main.c | 91 ++++++++++++++- dlls/iphlpapi/tests/iphlpapi.c | 203 +++++++++++++++++++++++++++++++++ 2 files changed, 288 insertions(+), 6 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index d9a85be..c0ea214 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -4530,6 +4530,16 @@ struct icmp_handle_data HANDLE nsi_device; }; +struct icmp_echo_async_ctx +{ + HANDLE event; + HANDLE request_event; + struct nsiproxy_icmp_echo *in; + struct nsiproxy_icmp_echo_reply *out; + ICMP_ECHO_REPLY *reply; + IO_STATUS_BLOCK iosb; +}; + /*********************************************************************** * IcmpCloseHandle (IPHLPAPI.@) */ @@ -4606,6 +4616,36 @@ static void icmpv4_echo_reply_fixup( ICMP_ECHO_REPLY *dst, struct nsiproxy_icmp_ memcpy( dst->Data, (BYTE *)reply + reply->data_offset, reply->data_size ); } +/************************************************************************* + * icmpv4_echo_async + * + * Wait for the reply, convert it into ICMP_ECHO_REPLY, and signal the event. + */ +static DWORD WINAPI icmpv4_echo_async( VOID *parameter ) +{ + struct icmp_echo_async_ctx *ctx = parameter; + + WaitForSingleObject( ctx->request_event, INFINITE ); + CloseHandle( ctx->request_event ); + + if (!ctx->iosb.Status) + { + icmpv4_echo_reply_fixup( ctx->reply, ctx->out ); + } + else + { + memset( ctx->reply, 0, sizeof(ICMP_ECHO_REPLY) ); + ctx->reply->Status = IP_GENERAL_FAILURE; + } + + SetEvent( ctx->event ); + + heap_free( ctx->out ); + heap_free( ctx->in ); + heap_free( ctx ); + return 0; +} + /*********************************************************************** * IcmpSendEcho (IPHLPAPI.@) */ @@ -4636,25 +4676,43 @@ DWORD WINAPI IcmpSendEcho2Ex( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc_r void *reply, DWORD reply_size, DWORD timeout ) { struct icmp_handle_data *data = (struct icmp_handle_data *)handle; + IO_STATUS_BLOCK iosb_stack, *iosb = &iosb_stack; + struct icmp_echo_async_ctx *async_ctx = NULL; DWORD opt_size, in_size, ret = 0, out_size; struct nsiproxy_icmp_echo *in; struct nsiproxy_icmp_echo_reply *out; HANDLE request_event; - IO_STATUS_BLOCK iosb; NTSTATUS status; - if (event || apc_routine) + if (apc_routine) { FIXME( "Async requests not yet supported\n" ); return 0; } - if (handle == INVALID_HANDLE_VALUE || !reply) + if (handle == INVALID_HANDLE_VALUE || !reply || !reply_size) { SetLastError( ERROR_INVALID_PARAMETER ); return 0; } + if (reply_size < sizeof(ICMP_ECHO_REPLY)) + { + SetLastError( IP_BUF_TOO_SMALL ); + return 0; + } + + if (event) + { + async_ctx = heap_alloc( sizeof(*async_ctx) ); + if (!async_ctx) + { + SetLastError( IP_NO_RESOURCES ); + return 0; + } + iosb = &async_ctx->iosb; + } + opt_size = opts ? (opts->OptionsSize + 3) & ~3 : 0; in_size = FIELD_OFFSET(struct nsiproxy_icmp_echo, data[opt_size + request_size]); in = heap_alloc_zero( in_size ); @@ -4663,6 +4721,7 @@ DWORD WINAPI IcmpSendEcho2Ex( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc_r if (!in || !out) { + heap_free( async_ctx ); heap_free( out ); heap_free( in ); SetLastError( IP_NO_RESOURCES ); @@ -4688,19 +4747,39 @@ DWORD WINAPI IcmpSendEcho2Ex( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc_r request_event = CreateEventW( NULL, 0, 0, NULL ); status = NtDeviceIoControlFile( data->nsi_device, request_event, NULL, NULL, - &iosb, IOCTL_NSIPROXY_WINE_ICMP_ECHO, in, in_size, + iosb, IOCTL_NSIPROXY_WINE_ICMP_ECHO, in, in_size, out, out_size ); - if (status == STATUS_PENDING && !WaitForSingleObject( request_event, INFINITE )) - status = iosb.Status; + if (status == STATUS_PENDING) + { + if (async_ctx) + { + async_ctx->event = event; + async_ctx->request_event = request_event; + async_ctx->in = in; + async_ctx->out = out; + async_ctx->reply = reply; + status = RtlQueueWorkItem( icmpv4_echo_async, async_ctx, WT_EXECUTEDEFAULT | WT_EXECUTELONGFUNCTION ); + if (!status) + { + SetLastError( ERROR_IO_PENDING ); + return 0; + } + /* fall back to sync, we can't have the buffers released now */ + } + if (!WaitForSingleObject( request_event, INFINITE )) + status = iosb->Status; + } if (!status) { icmpv4_echo_reply_fixup( reply, out ); ret = IcmpParseReplies( reply, reply_size ); + if (event) SetEvent( event ); } CloseHandle( request_event ); + heap_free( async_ctx ); heap_free( out ); heap_free( in ); diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index e20ada8..93a5843 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -38,6 +38,7 @@ #include "winsock2.h" #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "ws2tcpip.h" #include "windns.h" #include "iphlpapi.h" @@ -877,9 +878,11 @@ static void testIcmpSendEcho(void) { HANDLE icmp; char senddata[32], replydata[sizeof(senddata) + sizeof(ICMP_ECHO_REPLY)]; + char replydata2[sizeof(replydata) + sizeof(IO_STATUS_BLOCK)]; DWORD ret, error, replysz = sizeof(replydata); IPAddr address; ICMP_ECHO_REPLY *reply; + HANDLE event; INT i; memset(senddata, 0, sizeof(senddata)); @@ -893,6 +896,15 @@ static void testIcmpSendEcho(void) || broken(error == ERROR_INVALID_HANDLE) /* <= 2003 */, "expected 87, got %d\n", error); + address = htonl(INADDR_LOOPBACK); + SetLastError(0xdeadbeef); + ret = IcmpSendEcho2(INVALID_HANDLE_VALUE, NULL, NULL, NULL, address, senddata, sizeof(senddata), NULL, replydata, replysz, 1000); + error = GetLastError(); + ok (!ret, "IcmpSendEcho2 succeeded unexpectedly\n"); + ok (error == ERROR_INVALID_PARAMETER + || broken(error == ERROR_INVALID_HANDLE) /* <= 2003 */, + "expected 87, got %d\n", error); + icmp = IcmpCreateFile(); ok (icmp != INVALID_HANDLE_VALUE, "IcmpCreateFile failed unexpectedly with error %d\n", GetLastError()); @@ -1036,6 +1048,197 @@ static void testIcmpSendEcho(void) ok(reply->DataSize == sizeof(senddata), "Got size:%d\n", reply->DataSize); ok(!memcmp(senddata, reply->Data, min(sizeof(senddata), reply->DataSize)), "Data mismatch\n"); + + /* + * IcmpSendEcho2 + */ + address = 0; + replysz = sizeof(replydata2); + memset(senddata, 0, sizeof(senddata)); + + SetLastError(0xdeadbeef); + ret = IcmpSendEcho2(icmp, NULL, NULL, NULL, address, senddata, sizeof(senddata), NULL, replydata2, replysz, 1000); + error = GetLastError(); + ok(!ret, "IcmpSendEcho2 succeeded unexpectedly\n"); + ok(error == ERROR_INVALID_NETNAME + || broken(error == IP_BAD_DESTINATION) /* <= 2003 */, + "expected 1214, got %d\n", error); + + event = CreateEventW(NULL, FALSE, FALSE, NULL); + ok(event != NULL, "CreateEventW failed unexpectedly with error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = IcmpSendEcho2(icmp, event, NULL, NULL, address, senddata, sizeof(senddata), NULL, replydata2, replysz, 1000); + error = GetLastError(); + ok(!ret, "IcmpSendEcho2 returned success unexpectedly\n"); + ok(error == ERROR_INVALID_NETNAME + || broken(error == ERROR_IO_PENDING) /* <= 2003 */, + "Got last error: 0x%08x\n", error); + if (error == ERROR_IO_PENDING) + { + ret = WaitForSingleObjectEx(event, 2000, TRUE); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObjectEx failed unexpectedly with %u\n", ret); + } + + address = htonl(INADDR_LOOPBACK); + SetLastError(0xdeadbeef); + ret = IcmpSendEcho2(icmp, NULL, NULL, NULL, address, senddata, sizeof(senddata), NULL, NULL, replysz, 1000); + error = GetLastError(); + ok(!ret, "IcmpSendEcho2 succeeded unexpectedly\n"); + ok(error == ERROR_INVALID_PARAMETER + || broken(error == ERROR_NOACCESS) /* <= 2003 */, + "expected 87, got %d\n", error); + + SetLastError(0xdeadbeef); + ret = IcmpSendEcho2(icmp, event, NULL, NULL, address, senddata, sizeof(senddata), NULL, NULL, replysz, 1000); + error = GetLastError(); + ok(!ret, "IcmpSendEcho2 succeeded unexpectedly\n"); + ok(error == ERROR_INVALID_PARAMETER + || broken(error == ERROR_NOACCESS) /* <= 2003 */, + "expected 87, got %d\n", error); + ok(WaitForSingleObjectEx(event, 0, TRUE) == WAIT_TIMEOUT, "Event was unexpectedly signalled.\n"); + + SetLastError(0xdeadbeef); + ret = IcmpSendEcho2(icmp, NULL, NULL, NULL, address, senddata, sizeof(senddata), NULL, replydata2, 0, 1000); + error = GetLastError(); + ok(!ret, "IcmpSendEcho2 succeeded unexpectedly\n"); + ok(error == ERROR_INVALID_PARAMETER + || broken(error == ERROR_INSUFFICIENT_BUFFER) /* <= 2003 */, + "expected 87, got %d\n", error); + + SetLastError(0xdeadbeef); + ret = IcmpSendEcho2(icmp, event, NULL, NULL, address, senddata, sizeof(senddata), NULL, replydata2, 0, 1000); + error = GetLastError(); + ok(!ret, "IcmpSendEcho2 succeeded unexpectedly\n"); + ok(error == ERROR_INVALID_PARAMETER + || broken(error == ERROR_INSUFFICIENT_BUFFER) /* <= 2003 */, + "expected 87, got %d\n", error); + ok(WaitForSingleObjectEx(event, 0, TRUE) == WAIT_TIMEOUT, "Event was unexpectedly signalled.\n"); + + SetLastError(0xdeadbeef); + ret = IcmpSendEcho2(icmp, NULL, NULL, NULL, address, senddata, sizeof(senddata), NULL, NULL, 0, 1000); + error = GetLastError(); + ok(!ret, "IcmpSendEcho2 succeeded unexpectedly\n"); + ok(error == ERROR_INVALID_PARAMETER + || broken(error == ERROR_INSUFFICIENT_BUFFER) /* <= 2003 */, + "expected 87, got %d\n", error); + + SetLastError(0xdeadbeef); + ret = IcmpSendEcho2(icmp, event, NULL, NULL, address, senddata, sizeof(senddata), NULL, NULL, 0, 1000); + error = GetLastError(); + ok(!ret, "IcmpSendEcho2 succeeded unexpectedly\n"); + ok(error == ERROR_INVALID_PARAMETER + || broken(error == ERROR_INSUFFICIENT_BUFFER) /* <= 2003 */, + "expected 87, got %d\n", error); + ok(WaitForSingleObjectEx(event, 0, TRUE) == WAIT_TIMEOUT, "Event was unexpectedly signalled.\n"); + + /* synchronous tests */ + SetLastError(0xdeadbeef); + address = htonl(INADDR_LOOPBACK); + replysz = sizeof(ICMP_ECHO_REPLY) + sizeof(IO_STATUS_BLOCK); + ret = IcmpSendEcho2(icmp, NULL, NULL, NULL, address, senddata, 0, NULL, replydata2, replysz, 1000); + ok(ret, "IcmpSendEcho2 failed unexpectedly with error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = IcmpSendEcho2(icmp, NULL, NULL, NULL, address, NULL, 0, NULL, replydata2, replysz, 1000); + ok(ret, "IcmpSendEcho2 failed unexpectedly with error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = IcmpSendEcho2(icmp, NULL, NULL, NULL, address, senddata, 0, NULL, replydata2, replysz, 1000); + ok(ret, "IcmpSendEcho2 failed unexpectedly with error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + replysz = sizeof(ICMP_ECHO_REPLY) + sizeof(IO_STATUS_BLOCK) + ICMP_MINLEN; + ret = IcmpSendEcho2(icmp, NULL, NULL, NULL, address, senddata, ICMP_MINLEN, NULL, replydata2, replysz, 1000); + ok(ret, "IcmpSendEcho2 failed unexpectedly with error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + replysz = sizeof(replydata2); + ret = IcmpSendEcho2(icmp, NULL, NULL, NULL, address, senddata, sizeof(senddata), NULL, replydata2, replysz, 1000); + if (!ret) + { + error = GetLastError(); + skip("Failed to ping with error %d, is lo interface down?\n", error); + } + else if (winetest_debug > 1) + { + reply = (ICMP_ECHO_REPLY*)replydata2; + trace("send addr : %s\n", ntoa(address)); + trace("reply addr : %s\n", ntoa(reply->Address)); + trace("reply size : %u\n", replysz); + trace("roundtrip : %u ms\n", reply->RoundTripTime); + trace("status : %u\n", reply->Status); + trace("recv size : %u\n", reply->DataSize); + trace("ttl : %u\n", reply->Options.Ttl); + trace("flags : 0x%x\n", reply->Options.Flags); + } + + SetLastError(0xdeadbeef); + for (i = 0; i < ARRAY_SIZE(senddata); i++) senddata[i] = i & 0xff; + ret = IcmpSendEcho2(icmp, NULL, NULL, NULL, address, senddata, sizeof(senddata), NULL, replydata2, replysz, 1000); + error = GetLastError(); + reply = (ICMP_ECHO_REPLY*)replydata2; + ok(ret, "IcmpSendEcho2 failed unexpectedly\n"); + ok(error == NO_ERROR, "Expect last error: 0x%08x, got: 0x%08x\n", NO_ERROR, error); + ok(ntohl(reply->Address) == INADDR_LOOPBACK, "Address mismatch, expect: %s, got: %s\n", ntoa(INADDR_LOOPBACK), + ntoa(reply->Address)); + ok(reply->Status == IP_SUCCESS, "Expect status: 0x%08x, got: 0x%08x\n", IP_SUCCESS, reply->Status); + ok(reply->DataSize == sizeof(senddata), "Got size: %d\n", reply->DataSize); + ok(!memcmp(senddata, reply->Data, min(sizeof(senddata), reply->DataSize)), "Data mismatch\n"); + + /* asynchronous tests with event */ + SetLastError(0xdeadbeef); + replysz = sizeof(replydata2); + address = htonl(INADDR_LOOPBACK); + memset(senddata, 0, sizeof(senddata)); + ret = IcmpSendEcho2(icmp, event, NULL, NULL, address, senddata, sizeof(senddata), NULL, replydata2, replysz, 1000); + error = GetLastError(); + if (!ret && error != ERROR_IO_PENDING) + { + skip("Failed to ping with error %d, is lo interface down?\n", error); + } + else + { + ok(!ret, "IcmpSendEcho2 returned success unexpectedly\n"); + ok(error == ERROR_IO_PENDING, "Expect last error: 0x%08x, got: 0x%08x\n", ERROR_IO_PENDING, error); + ret = WaitForSingleObjectEx(event, 2000, TRUE); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObjectEx failed unexpectedly with %u\n", ret); + reply = (ICMP_ECHO_REPLY*)replydata2; + ok(ntohl(reply->Address) == INADDR_LOOPBACK, "Address mismatch, expect: %s, got: %s\n", ntoa(INADDR_LOOPBACK), + ntoa(reply->Address)); + ok(reply->Status == IP_SUCCESS, "Expect status: 0x%08x, got: 0x%08x\n", IP_SUCCESS, reply->Status); + ok(reply->DataSize == sizeof(senddata), "Got size: %d\n", reply->DataSize); + if (winetest_debug > 1) + { + reply = (ICMP_ECHO_REPLY*)replydata2; + trace("send addr : %s\n", ntoa(address)); + trace("reply addr : %s\n", ntoa(reply->Address)); + trace("reply size : %u\n", replysz); + trace("roundtrip : %u ms\n", reply->RoundTripTime); + trace("status : %u\n", reply->Status); + trace("recv size : %u\n", reply->DataSize); + trace("ttl : %u\n", reply->Options.Ttl); + trace("flags : 0x%x\n", reply->Options.Flags); + } + } + + SetLastError(0xdeadbeef); + for (i = 0; i < ARRAY_SIZE(senddata); i++) senddata[i] = i & 0xff; + ret = IcmpSendEcho2(icmp, event, NULL, NULL, address, senddata, sizeof(senddata), NULL, replydata2, replysz, 1000); + error = GetLastError(); + ok(!ret, "IcmpSendEcho2 returned success unexpectedly\n"); + ok(error == ERROR_IO_PENDING, "Expect last error: 0x%08x, got: 0x%08x\n", ERROR_IO_PENDING, error); + ret = WaitForSingleObjectEx(event, 2000, TRUE); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObjectEx failed unexpectedly with %u\n", ret); + reply = (ICMP_ECHO_REPLY*)replydata2; + ok(ntohl(reply->Address) == INADDR_LOOPBACK, "Address mismatch, expect: %s, got: %s\n", ntoa(INADDR_LOOPBACK), + ntoa(reply->Address)); + ok(reply->Status == IP_SUCCESS, "Expect status: 0x%08x, got: 0x%08x\n", IP_SUCCESS, reply->Status); + ok(reply->DataSize == sizeof(senddata), "Got size: %d\n", reply->DataSize); + /* pre-Vista, reply->Data is an offset; otherwise it's a pointer, so hardcode the offset */ + ok(!memcmp(senddata, reply + 1, min(sizeof(senddata), reply->DataSize)), "Data mismatch\n"); + + CloseHandle(event); IcmpCloseHandle(icmp); } -- 2.31.1

2 5

[PATCH] krnl386: Fix a mistyped NULL check in WOWTHUNK_Init().
by Zebediah Figura 08 Oct '21

08 Oct '21

Fixes Collins English Dictionary, reported in https://bugs.winehq.org/show_bug.cgi?id=51802. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- I didn't catch this when testing, because failure from DllEntryPoint is currently just ignored... dlls/krnl386.exe16/wowthunk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/krnl386.exe16/wowthunk.c b/dlls/krnl386.exe16/wowthunk.c index ca3c57f8e0b..8cc1fa248e6 100644 --- a/dlls/krnl386.exe16/wowthunk.c +++ b/dlls/krnl386.exe16/wowthunk.c @@ -79,7 +79,7 @@ BOOL WOWTHUNK_Init(void) LDT_FLAGS_CODE | LDT_FLAGS_32BIT ); cbclientex_selector = SELECTOR_AllocBlock( cbclientex_ret, cbclientex_ret_end - cbclientex_ret, LDT_FLAGS_CODE | LDT_FLAGS_32BIT ); - if (!codesel || cbclient_selector || !cbclientex_selector) + if (!codesel || !cbclient_selector || !cbclientex_selector) return FALSE; /* Patch the return addresses for CallTo16 routines */ -- 2.33.0

1 0

[PATCH 2/2] vbscript: Don't use function return value for call expressions.
by Jacek Caban 08 Oct '21

08 Oct '21

From: Robert Wilhelm <robert.wilhelm(a)gmx.net> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50758 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/interp.c | 10 +++++++++- dlls/vbscript/tests/lang.vbs | 24 ++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-)

1 0

[PATCH 1/2] vbscript: Use a dedicated opcode for identifier expressions.
by Jacek Caban 08 Oct '21

08 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Supersedes 216693 and 216694. dlls/vbscript/compile.c | 21 ++++++++++++++++++--- dlls/vbscript/interp.c | 29 ++++++++++++++++++++++++----- dlls/vbscript/vbscript.h | 1 + 3 files changed, 43 insertions(+), 8 deletions(-)

1 0

[PATCH v4 01/14] mshtml: Cap the compat mode for filters collection to IE8 mode.
by Gabriel Ivăncescu 08 Oct '21

08 Oct '21

So dispex_to_string returns [object]. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index dada4de..29aa378 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -7074,7 +7074,7 @@ static HRESULT create_filters_collection(compat_mode_t compat_mode, IHTMLFilters collection->ref = 1; init_dispatch(&collection->dispex, (IUnknown*)&collection->IHTMLFiltersCollection_iface, - &HTMLFiltersCollection_dispex, compat_mode); + &HTMLFiltersCollection_dispex, min(compat_mode, COMPAT_MODE_IE8)); *ret = &collection->IHTMLFiltersCollection_iface; return S_OK; -- 2.31.1

3 41

[PATCH vkd3d v2 1/5] vkd3d-shader/hlsl: Parse texture types.
by Zebediah Figura 08 Oct '21

08 Oct '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 21 +++++++++++++++++++-- libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.y | 20 ++++++++++++++++++++ 3 files changed, 40 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index f03777a65..6462ce8fc 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -261,6 +261,21 @@ struct hlsl_type *hlsl_new_struct_type(struct hlsl_ctx *ctx, const char *name, s return type; } +struct hlsl_type *hlsl_new_texture_type(struct hlsl_ctx *ctx, enum hlsl_sampler_dim dim) +{ + struct hlsl_type *type; + + if (!(type = vkd3d_calloc(1, sizeof(*type)))) + return NULL; + type->type = HLSL_CLASS_OBJECT; + type->base_type = HLSL_TYPE_TEXTURE; + type->dimx = 4; + type->dimy = 1; + type->sampler_dim = dim; + list_add_tail(&ctx->types, &type->entry); + return type; +} + struct hlsl_type *hlsl_get_type(struct hlsl_scope *scope, const char *name, bool recursive) { struct rb_entry *entry = rb_get(&scope->types, name); @@ -329,7 +344,8 @@ bool hlsl_types_are_equal(const struct hlsl_type *t1, const struct hlsl_type *t2 return false; if (t1->base_type != t2->base_type) return false; - if (t1->base_type == HLSL_TYPE_SAMPLER && t1->sampler_dim != t2->sampler_dim) + if ((t1->base_type == HLSL_TYPE_SAMPLER || t1->base_type == HLSL_TYPE_TEXTURE) + && t1->sampler_dim != t2->sampler_dim) return false; if ((t1->modifiers & HLSL_MODIFIER_ROW_MAJOR) != (t2->modifiers & HLSL_MODIFIER_ROW_MAJOR)) @@ -734,7 +750,8 @@ static int compare_param_hlsl_types(const struct hlsl_type *t1, const struct hls } if (t1->base_type != t2->base_type) return t1->base_type - t2->base_type; - if (t1->base_type == HLSL_TYPE_SAMPLER && t1->sampler_dim != t2->sampler_dim) + if ((t1->base_type == HLSL_TYPE_SAMPLER || t1->base_type == HLSL_TYPE_TEXTURE) + && t1->sampler_dim != t2->sampler_dim) return t1->sampler_dim - t2->sampler_dim; if (t1->dimx != t2->dimx) return t1->dimx - t2->dimx; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 77b4ce928..65c6f34e0 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -655,6 +655,7 @@ struct hlsl_ir_swizzle *hlsl_new_swizzle(struct hlsl_ctx *ctx, DWORD s, unsigned struct hlsl_ir_node *val, struct vkd3d_shader_location *loc); struct hlsl_ir_var *hlsl_new_synthetic_var(struct hlsl_ctx *ctx, const char *name, struct hlsl_type *type, const struct vkd3d_shader_location loc); +struct hlsl_type *hlsl_new_texture_type(struct hlsl_ctx *ctx, enum hlsl_sampler_dim dim); struct hlsl_ir_constant *hlsl_new_uint_constant(struct hlsl_ctx *ctx, unsigned int n, const struct vkd3d_shader_location loc); struct hlsl_ir_node *hlsl_new_unary_expr(struct hlsl_ctx *ctx, enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 6f1794e79..b8149950d 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2451,6 +2451,26 @@ type: { $$ = ctx->builtin_types.sampler[HLSL_SAMPLER_DIM_3D]; } + | KW_TEXTURE + { + $$ = hlsl_new_texture_type(ctx, HLSL_SAMPLER_DIM_GENERIC); + } + | KW_TEXTURE1D + { + $$ = hlsl_new_texture_type(ctx, HLSL_SAMPLER_DIM_1D); + } + | KW_TEXTURE2D + { + $$ = hlsl_new_texture_type(ctx, HLSL_SAMPLER_DIM_2D); + } + | KW_TEXTURE3D + { + $$ = hlsl_new_texture_type(ctx, HLSL_SAMPLER_DIM_3D); + } + | KW_TEXTURECUBE + { + $$ = hlsl_new_texture_type(ctx, HLSL_SAMPLER_DIM_CUBE); + } | TYPE_IDENTIFIER { $$ = hlsl_get_type(ctx->cur_scope, $1, true); -- 2.33.0

5 24

[PATCH] msvcrt:msvcrt_get_flags: Fix bug 51846 - fopen(..., "wx")
by Ted Lyngmo 08 Oct '21

08 Oct '21

This fixes bug 51846: Standard library call fopen(..., "wx") not recognized - causes destruction of data. Signed-off-by: Ted Lyngmo <ted(a)lyncon.se> --- dlls/msvcrt/file.c | 3 +++ dlls/msvcrt/tests/file.c | 27 +++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index b0eeaf2a351..355638fa783 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1586,6 +1586,9 @@ static int msvcrt_get_flags(const wchar_t* mode, int *open_flags, int* stream_fl *open_flags |= _O_TEXT; *open_flags &= ~_O_BINARY; break; + case 'x': + *open_flags |= _O_EXCL; + break; case 'D': *open_flags |= _O_TEMPORARY; break; diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 1d74c6135b8..3b96be58126 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -110,6 +110,32 @@ static void test_filbuf( void ) unlink("filbuf.tst"); } +static void test_fopen_exclusive( void ) +{ + static const char * const testfile = "fileexcl.tst"; + FILE *fp; + + fp = fopen(testfile, "wx"); + ok(fp != NULL, "creating file with mode wx failed\n"); + if(fp) fclose(fp); + + fp = fopen(testfile, "wx"); + ok(fp == NULL, "overwrote existing file with mode wx\n"); + if(fp) fclose(fp); + + unlink(testfile); + + fp = fopen(testfile, "w+x"); + ok(fp != NULL, "creating file with mode w+x failed\n"); + if(fp) fclose(fp); + + fp = fopen(testfile, "w+x"); + ok(fp == NULL, "overwrote existing file with mode w+x\n"); + if(fp) fclose(fp); + + unlink(testfile); +} + static void test_fdopen( void ) { static const char buffer[] = {0,1,2,3,4,5,6,7,8,9}; @@ -2841,6 +2867,7 @@ START_TEST(file) /* testing stream I/O */ test_filbuf(); + test_fopen_exclusive(); test_fdopen(); test_fopen_fclose_fcloseall(); test_fopen_s(); -- 2.31.1

4 16

[PATCH 5/5] win32u: Use syscall interface for brush functions.
by Jacek Caban 08 Oct '21

08 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/gdiobj.c | 4 -- dlls/win32u/syscall.c | 4 ++ dlls/win32u/win32u.spec | 8 ++-- dlls/win32u/win32u_private.h | 5 --- dlls/win32u/wrappers.c | 21 ---------- dlls/wow64win/Makefile.in | 1 + dlls/wow64win/gdi.c | 71 ++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.c | 7 ---- dlls/wow64win/syscall.h | 4 ++ dlls/wow64win/wow64win_private.h | 4 ++ 10 files changed, 88 insertions(+), 41 deletions(-) create mode 100644 dlls/wow64win/gdi.c

2 1

[PATCH 4/5] gdi32: Use DLL forwarding for D3DKMT functions.
by Jacek Caban 08 Oct '21

08 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdi32.spec | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)

2 1

[PATCH 3/5] gdi32: Don't export Wine extensions.
by Jacek Caban 08 Oct '21

08 Oct '21

Link directly to win32u instead. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/d3d12/Makefile.in | 2 +- dlls/dxgi/Makefile.in | 2 +- dlls/gdi.exe16/Makefile.in | 2 +- dlls/gdi32/gdi32.spec | 20 -------------------- dlls/opengl32/Makefile.in | 2 +- dlls/user.exe16/Makefile.in | 2 +- dlls/wined3d/Makefile.in | 2 +- dlls/winevulkan/Makefile.in | 2 +- 8 files changed, 7 insertions(+), 27 deletions(-)

2 1

[PATCH 2/5] user32: Link directly to win32u.
by Jacek Caban 08 Oct '21

08 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/gdi32.spec | 6 ------ dlls/user32/Makefile.in | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-)

2 1

[PATCH 1/5] gdi32: Rename gdidc.c to dc.c.
by Jacek Caban 08 Oct '21

08 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/Makefile.in | 2 +- dlls/gdi32/{gdidc.c => dc.c} | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) rename dlls/gdi32/{gdidc.c => dc.c} (99%)

2 1

[PATCH 1/5] dinput: Do not wait for internal hooks inside the HID joystick CS.
by Rémi Bernon 08 Oct '21

08 Oct '21

This can cause some deadlocks as the internal thread will acquire the device CS when reading the state. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Fixing the same kind of issue as the series I sent with xinput, where cancelled IO may cause crashes if it completes after the device is gone, although the dinput code needed more fixes first to prevent deadlocks. dlls/dinput/joystick_hid.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 75bf66b7a51..208e73835e9 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -881,13 +881,18 @@ static HRESULT WINAPI hid_joystick_Acquire( IDirectInputDevice8W *iface ) { struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); ULONG report_len = impl->caps.InputReportByteLength; - HRESULT hr; + HRESULT hr = DI_OK; TRACE( "iface %p.\n", iface ); EnterCriticalSection( &impl->base.crit ); - hr = IDirectInputDevice2WImpl_Acquire( iface ); - if (hr == DI_OK) + if (impl->base.acquired) + hr = DI_NOEFFECT; + else if (!impl->base.data_format.user_df) + hr = DIERR_INVALIDPARAM; + else if ((impl->base.dwCoopLevel & DISCL_FOREGROUND) && impl->base.win != GetForegroundWindow()) + hr = DIERR_OTHERAPPHASPRIO; + else { memset( &impl->read_ovl, 0, sizeof(impl->read_ovl) ); impl->read_ovl.hEvent = impl->base.read_event; @@ -895,8 +900,13 @@ static HRESULT WINAPI hid_joystick_Acquire( IDirectInputDevice8W *iface ) impl->base.read_callback( iface ); IDirectInputDevice8_SendForceFeedbackCommand( iface, DISFFC_RESET ); + impl->base.acquired = TRUE; } LeaveCriticalSection( &impl->base.crit ); + if (hr != DI_OK) return hr; + + dinput_hooks_acquire_device( iface ); + check_dinput_hooks( iface, TRUE ); return hr; } @@ -904,21 +914,26 @@ static HRESULT WINAPI hid_joystick_Acquire( IDirectInputDevice8W *iface ) static HRESULT WINAPI hid_joystick_Unacquire( IDirectInputDevice8W *iface ) { struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); - HRESULT hr; + HRESULT hr = DI_OK; BOOL ret; TRACE( "iface %p.\n", iface ); EnterCriticalSection( &impl->base.crit ); - if (impl->base.acquired) + if (!impl->base.acquired) hr = DI_NOEFFECT; + else { ret = CancelIoEx( impl->device, &impl->read_ovl ); if (!ret) WARN( "CancelIoEx failed, last error %u\n", GetLastError() ); IDirectInputDevice8_SendForceFeedbackCommand( iface, DISFFC_RESET ); + impl->base.acquired = FALSE; } - hr = IDirectInputDevice2WImpl_Unacquire( iface ); LeaveCriticalSection( &impl->base.crit ); + if (hr != DI_OK) return hr; + + dinput_hooks_unacquire_device( iface ); + check_dinput_hooks( iface, FALSE ); return hr; } -- 2.33.0

2 10

[PATCH v2 1/5] dinput: Do not wait for internal hooks inside the HID joystick CS.
by Rémi Bernon 08 Oct '21

08 Oct '21

This can cause some deadlocks as the internal thread will acquire the device CS when reading the state. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: * Set acquired flag before calling SendForceFeedbackCommand. * Add missing HRESULT hr declaration, lost in a split. Supersedes: 216794-216798 dlls/dinput/joystick_hid.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 75bf66b7a51..94caf59506e 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -881,22 +881,32 @@ static HRESULT WINAPI hid_joystick_Acquire( IDirectInputDevice8W *iface ) { struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); ULONG report_len = impl->caps.InputReportByteLength; - HRESULT hr; + HRESULT hr = DI_OK; TRACE( "iface %p.\n", iface ); EnterCriticalSection( &impl->base.crit ); - hr = IDirectInputDevice2WImpl_Acquire( iface ); - if (hr == DI_OK) + if (impl->base.acquired) + hr = DI_NOEFFECT; + else if (!impl->base.data_format.user_df) + hr = DIERR_INVALIDPARAM; + else if ((impl->base.dwCoopLevel & DISCL_FOREGROUND) && impl->base.win != GetForegroundWindow()) + hr = DIERR_OTHERAPPHASPRIO; + else { memset( &impl->read_ovl, 0, sizeof(impl->read_ovl) ); impl->read_ovl.hEvent = impl->base.read_event; if (ReadFile( impl->device, impl->input_report_buf, report_len, NULL, &impl->read_ovl )) impl->base.read_callback( iface ); + impl->base.acquired = TRUE; IDirectInputDevice8_SendForceFeedbackCommand( iface, DISFFC_RESET ); } LeaveCriticalSection( &impl->base.crit ); + if (hr != DI_OK) return hr; + + dinput_hooks_acquire_device( iface ); + check_dinput_hooks( iface, TRUE ); return hr; } @@ -904,21 +914,26 @@ static HRESULT WINAPI hid_joystick_Acquire( IDirectInputDevice8W *iface ) static HRESULT WINAPI hid_joystick_Unacquire( IDirectInputDevice8W *iface ) { struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); - HRESULT hr; + HRESULT hr = DI_OK; BOOL ret; TRACE( "iface %p.\n", iface ); EnterCriticalSection( &impl->base.crit ); - if (impl->base.acquired) + if (!impl->base.acquired) hr = DI_NOEFFECT; + else { ret = CancelIoEx( impl->device, &impl->read_ovl ); if (!ret) WARN( "CancelIoEx failed, last error %u\n", GetLastError() ); IDirectInputDevice8_SendForceFeedbackCommand( iface, DISFFC_RESET ); + impl->base.acquired = FALSE; } - hr = IDirectInputDevice2WImpl_Unacquire( iface ); LeaveCriticalSection( &impl->base.crit ); + if (hr != DI_OK) return hr; + + dinput_hooks_unacquire_device( iface ); + check_dinput_hooks( iface, FALSE ); return hr; } -- 2.33.0

1 4

[PATCH vkd3d v4 1/5] vkd3d-shader/hlsl: Parse texture types.
by Zebediah Figura 08 Oct '21

08 Oct '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 21 +++++++++++++++++++-- libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.y | 20 ++++++++++++++++++++ 3 files changed, 40 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index f03777a65..6462ce8fc 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -261,6 +261,21 @@ struct hlsl_type *hlsl_new_struct_type(struct hlsl_ctx *ctx, const char *name, s return type; } +struct hlsl_type *hlsl_new_texture_type(struct hlsl_ctx *ctx, enum hlsl_sampler_dim dim) +{ + struct hlsl_type *type; + + if (!(type = vkd3d_calloc(1, sizeof(*type)))) + return NULL; + type->type = HLSL_CLASS_OBJECT; + type->base_type = HLSL_TYPE_TEXTURE; + type->dimx = 4; + type->dimy = 1; + type->sampler_dim = dim; + list_add_tail(&ctx->types, &type->entry); + return type; +} + struct hlsl_type *hlsl_get_type(struct hlsl_scope *scope, const char *name, bool recursive) { struct rb_entry *entry = rb_get(&scope->types, name); @@ -329,7 +344,8 @@ bool hlsl_types_are_equal(const struct hlsl_type *t1, const struct hlsl_type *t2 return false; if (t1->base_type != t2->base_type) return false; - if (t1->base_type == HLSL_TYPE_SAMPLER && t1->sampler_dim != t2->sampler_dim) + if ((t1->base_type == HLSL_TYPE_SAMPLER || t1->base_type == HLSL_TYPE_TEXTURE) + && t1->sampler_dim != t2->sampler_dim) return false; if ((t1->modifiers & HLSL_MODIFIER_ROW_MAJOR) != (t2->modifiers & HLSL_MODIFIER_ROW_MAJOR)) @@ -734,7 +750,8 @@ static int compare_param_hlsl_types(const struct hlsl_type *t1, const struct hls } if (t1->base_type != t2->base_type) return t1->base_type - t2->base_type; - if (t1->base_type == HLSL_TYPE_SAMPLER && t1->sampler_dim != t2->sampler_dim) + if ((t1->base_type == HLSL_TYPE_SAMPLER || t1->base_type == HLSL_TYPE_TEXTURE) + && t1->sampler_dim != t2->sampler_dim) return t1->sampler_dim - t2->sampler_dim; if (t1->dimx != t2->dimx) return t1->dimx - t2->dimx; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 77b4ce928..65c6f34e0 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -655,6 +655,7 @@ struct hlsl_ir_swizzle *hlsl_new_swizzle(struct hlsl_ctx *ctx, DWORD s, unsigned struct hlsl_ir_node *val, struct vkd3d_shader_location *loc); struct hlsl_ir_var *hlsl_new_synthetic_var(struct hlsl_ctx *ctx, const char *name, struct hlsl_type *type, const struct vkd3d_shader_location loc); +struct hlsl_type *hlsl_new_texture_type(struct hlsl_ctx *ctx, enum hlsl_sampler_dim dim); struct hlsl_ir_constant *hlsl_new_uint_constant(struct hlsl_ctx *ctx, unsigned int n, const struct vkd3d_shader_location loc); struct hlsl_ir_node *hlsl_new_unary_expr(struct hlsl_ctx *ctx, enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 6f1794e79..b8149950d 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2451,6 +2451,26 @@ type: { $$ = ctx->builtin_types.sampler[HLSL_SAMPLER_DIM_3D]; } + | KW_TEXTURE + { + $$ = hlsl_new_texture_type(ctx, HLSL_SAMPLER_DIM_GENERIC); + } + | KW_TEXTURE1D + { + $$ = hlsl_new_texture_type(ctx, HLSL_SAMPLER_DIM_1D); + } + | KW_TEXTURE2D + { + $$ = hlsl_new_texture_type(ctx, HLSL_SAMPLER_DIM_2D); + } + | KW_TEXTURE3D + { + $$ = hlsl_new_texture_type(ctx, HLSL_SAMPLER_DIM_3D); + } + | KW_TEXTURECUBE + { + $$ = hlsl_new_texture_type(ctx, HLSL_SAMPLER_DIM_CUBE); + } | TYPE_IDENTIFIER { $$ = hlsl_get_type(ctx->cur_scope, $1, true); -- 2.33.0

4 19

[PATCH 4/7] iphlpapi: Implement IcmpSendEcho2Ex() using nsiproxy.
by Huw Davies 08 Oct '21

08 Oct '21

This results in a small change in behaviour reflected by the change to the tests: previously IcmpCreateFile() would fail if neither a SOCK_RAW nor a SOCK_DGRAM socket were available. With this patch, that failure is delayed until IcmpSendEcho2Ex(). There's no evidence that the original behaviour matches Windows; it's likely the tests were written this way to match Wine's implementation. If there does turn out to be an app that depends on the old behaviour, it would be possible to send an ioctl during IcmpCreateFile() to probe for this. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/Makefile.in | 1 - dlls/iphlpapi/icmp.c | 643 --------------------------------- dlls/iphlpapi/ip.h | 180 --------- dlls/iphlpapi/ip_icmp.h | 186 ---------- dlls/iphlpapi/iphlpapi_main.c | 172 +++++++++ dlls/iphlpapi/tests/iphlpapi.c | 14 +- 6 files changed, 177 insertions(+), 1019 deletions(-) delete mode 100644 dlls/iphlpapi/icmp.c delete mode 100644 dlls/iphlpapi/ip.h delete mode 100644 dlls/iphlpapi/ip_icmp.h diff --git a/dlls/iphlpapi/Makefile.in b/dlls/iphlpapi/Makefile.in index d5f7818be5f..e413337a420 100644 --- a/dlls/iphlpapi/Makefile.in +++ b/dlls/iphlpapi/Makefile.in @@ -5,7 +5,6 @@ IMPORTS = advapi32 dnsapi nsi uuid EXTRADLLFLAGS = -mcygwin C_SRCS = \ - icmp.c \ iphlpapi_main.c RC_SRCS = version.rc diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c deleted file mode 100644 index 6441d7dd8ad..00000000000 --- a/dlls/iphlpapi/icmp.c +++ /dev/null @@ -1,643 +0,0 @@ -/* - * ICMP - * - * Francois Gouget, 1999, based on the work of - * RW Hall, 1999, based on public domain code PING.C by Mike Muus (1983) - * and later works (c) 1989 Regents of Univ. of California - see copyright - * notice at end of source-code. - * - * 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 - */ - -/* Future work: - * - Systems like FreeBSD don't seem to support the IP_TTL option and maybe others. - * But using IP_HDRINCL and building the IP header by hand might work. - * - Not all IP options are supported. - * - Are ICMP handles real handles, i.e. inheritable and all? There might be some - * more work to do here, including server side stuff with synchronization. - * - This API should probably be thread safe. Is it really? - * - Using the winsock functions has not been tested. - */ - -#include "config.h" - -#include <sys/types.h> -#ifdef HAVE_SYS_SOCKET_H -# include <sys/socket.h> -#endif -#ifdef HAVE_NETDB_H -# include <netdb.h> -#endif -#ifdef HAVE_NETINET_IN_SYSTM_H -# include <netinet/in_systm.h> -#endif -#ifdef HAVE_NETINET_IN_H -# include <netinet/in.h> -#endif - -#ifdef HAVE_SYS_TIME_H -# include <sys/time.h> -#endif -#include <stdarg.h> -#include <string.h> -#include <errno.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif -#ifdef HAVE_ARPA_INET_H -# include <arpa/inet.h> -#endif -#ifdef HAVE_SYS_POLL_H -# include <sys/poll.h> -#endif - -#define USE_WS_PREFIX - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" -#include "winternl.h" -#include "ipexport.h" -#include "icmpapi.h" -#include "wine/debug.h" - -/* Set up endianness macros for the ip and ip_icmp BSD headers */ -#ifndef BIG_ENDIAN -#define BIG_ENDIAN 4321 -#endif -#ifndef LITTLE_ENDIAN -#define LITTLE_ENDIAN 1234 -#endif -#ifndef BYTE_ORDER -#ifdef WORDS_BIGENDIAN -#define BYTE_ORDER BIG_ENDIAN -#else -#define BYTE_ORDER LITTLE_ENDIAN -#endif -#endif /* BYTE_ORDER */ - -#define u_int16_t WORD -#define u_int32_t DWORD - -/* These are BSD headers. We use these here because they are needed on - * libc5 Linux systems. On other platforms they are usually simply more - * complete than the native stuff, and cause less portability problems - * so we use them anyway. - */ -#include "ip.h" -#include "ip_icmp.h" - - -WINE_DEFAULT_DEBUG_CHANNEL(icmp); -WINE_DECLARE_DEBUG_CHANNEL(winediag); - - -typedef struct { - int sid; - IP_OPTION_INFORMATION default_opts; -} icmp_t; - -#define IP_OPTS_UNKNOWN 0 -#define IP_OPTS_DEFAULT 1 -#define IP_OPTS_CUSTOM 2 - -#define MAXIPLEN 60 -#define MAXICMPLEN 76 - -/* The sequence number is unique process wide, so that all threads - * have a distinct sequence number. - */ -static LONG icmp_sequence=0; - -static int in_cksum(u_short *addr, int len) -{ - int nleft=len; - u_short *w = addr; - int sum = 0; - u_short answer = 0; - - while (nleft > 1) { - sum += *w++; - nleft -= 2; - } - - if (nleft == 1) { - *(u_char *)(&answer) = *(u_char *)w; - sum += answer; - } - - sum = (sum >> 16) + (sum & 0xffff); - sum += (sum >> 16); - answer = ~sum; - return(answer); -} - -/* Receive a reply (IPv4); this function uses, takes ownership of and will always free `buffer` */ -static DWORD icmp_get_reply(int sid, unsigned char *buffer, DWORD send_time, void *reply_buf, DWORD reply_size, DWORD timeout) -{ - int repsize = MAXIPLEN + MAXICMPLEN + min(65535, reply_size); - struct icmp *icmp_header = (struct icmp*)buffer; - char *endbuf = (char*)reply_buf + reply_size; - struct ip *ip_header = (struct ip*)buffer; - struct icmp_echo_reply *ier = reply_buf; - unsigned short id, seq, cksum; - struct sockaddr_in addr; - int ip_header_len = 0; - socklen_t addrlen; - struct pollfd fdr; - DWORD recv_time; - int res; - - id = icmp_header->icmp_id; - seq = icmp_header->icmp_seq; - cksum = icmp_header->icmp_cksum; - fdr.fd = sid; - fdr.events = POLLIN; - addrlen = sizeof(addr); - - while (poll(&fdr,1,timeout)>0) { - recv_time = GetTickCount(); - res=recvfrom(sid, buffer, repsize, 0, (struct sockaddr*)&addr, &addrlen); - TRACE("received %d bytes from %s\n",res, inet_ntoa(addr.sin_addr)); - ier->Status=IP_REQ_TIMED_OUT; - - /* Check whether we should ignore this packet */ - if ((ip_header->ip_p==IPPROTO_ICMP) && (res>=sizeof(struct ip)+ICMP_MINLEN)) { - ip_header_len=ip_header->ip_hl << 2; - icmp_header=(struct icmp*)(((char*)ip_header)+ip_header_len); - TRACE("received an ICMP packet of type,code=%d,%d\n",icmp_header->icmp_type,icmp_header->icmp_code); - if (icmp_header->icmp_type==ICMP_ECHOREPLY) { - if ((icmp_header->icmp_id==id) && (icmp_header->icmp_seq==seq)) - { - ier->Status=IP_SUCCESS; - SetLastError(NO_ERROR); - } - } else { - switch (icmp_header->icmp_type) { - case ICMP_UNREACH: - switch (icmp_header->icmp_code) { - case ICMP_UNREACH_HOST: -#ifdef ICMP_UNREACH_HOST_UNKNOWN - case ICMP_UNREACH_HOST_UNKNOWN: -#endif -#ifdef ICMP_UNREACH_ISOLATED - case ICMP_UNREACH_ISOLATED: -#endif -#ifdef ICMP_UNREACH_HOST_PROHIB - case ICMP_UNREACH_HOST_PROHIB: -#endif -#ifdef ICMP_UNREACH_TOSHOST - case ICMP_UNREACH_TOSHOST: -#endif - ier->Status=IP_DEST_HOST_UNREACHABLE; - break; - case ICMP_UNREACH_PORT: - ier->Status=IP_DEST_PORT_UNREACHABLE; - break; - case ICMP_UNREACH_PROTOCOL: - ier->Status=IP_DEST_PROT_UNREACHABLE; - break; - case ICMP_UNREACH_SRCFAIL: - ier->Status=IP_BAD_ROUTE; - break; - default: - ier->Status=IP_DEST_NET_UNREACHABLE; - } - break; - case ICMP_TIMXCEED: - if (icmp_header->icmp_code==ICMP_TIMXCEED_REASS) - ier->Status=IP_TTL_EXPIRED_REASSEM; - else - ier->Status=IP_TTL_EXPIRED_TRANSIT; - break; - case ICMP_PARAMPROB: - ier->Status=IP_PARAM_PROBLEM; - break; - case ICMP_SOURCEQUENCH: - ier->Status=IP_SOURCE_QUENCH; - break; - } - if (ier->Status!=IP_REQ_TIMED_OUT) { - struct ip* rep_ip_header; - struct icmp* rep_icmp_header; - /* The ICMP header size of all the packets we accept is the same */ - rep_ip_header=(struct ip*)(((char*)icmp_header)+ICMP_MINLEN); - rep_icmp_header=(struct icmp*)(((char*)rep_ip_header)+(rep_ip_header->ip_hl << 2)); - - /* Make sure that this is really a reply to our packet */ - if (ip_header_len+ICMP_MINLEN+(rep_ip_header->ip_hl << 2)+ICMP_MINLEN>ip_header->ip_len) { - ier->Status=IP_REQ_TIMED_OUT; - } else if ((rep_icmp_header->icmp_type!=ICMP_ECHO) || - (rep_icmp_header->icmp_code!=0) || - (rep_icmp_header->icmp_id!=id) || - /* windows doesn't check this checksum, else tracert */ - /* behind a Linux 2.2 masquerading firewall would fail*/ - /* (rep_icmp_header->icmp_cksum!=cksum) || */ - (rep_icmp_header->icmp_seq!=seq)) { - /* This was not a reply to one of our packets after all */ - TRACE("skipping type,code=%d,%d id,seq=%d,%d cksum=%d\n", - rep_icmp_header->icmp_type,rep_icmp_header->icmp_code, - rep_icmp_header->icmp_id,rep_icmp_header->icmp_seq, - rep_icmp_header->icmp_cksum); - TRACE("expected type,code=8,0 id,seq=%d,%d cksum=%d\n", - id,seq, - cksum); - ier->Status=IP_REQ_TIMED_OUT; - } - } - } - } - - if (ier->Status==IP_REQ_TIMED_OUT) { - /* This packet was not for us. - * Decrease the timeout so that we don't enter an endless loop even - * if we get flooded with ICMP packets that are not for us. - */ - DWORD t = (recv_time - send_time); - if (timeout > t) timeout -= t; - else timeout = 0; - continue; - } else { - /* Check free space, should be large enough for an ICMP_ECHO_REPLY and remainning icmp data */ - if (endbuf-(char *)ier < sizeof(struct icmp_echo_reply)+(res-ip_header_len-ICMP_MINLEN)) { - res=ier-(ICMP_ECHO_REPLY *)reply_buf; - SetLastError(IP_GENERAL_FAILURE); - goto done; - } - /* This is a reply to our packet */ - memcpy(&ier->Address,&ip_header->ip_src,sizeof(IPAddr)); - /* Status is already set */ - ier->RoundTripTime= recv_time - send_time; - ier->DataSize=res-ip_header_len-ICMP_MINLEN; - ier->Reserved=0; - ier->Data=endbuf-ier->DataSize; - memcpy(ier->Data, ((char *)ip_header)+ip_header_len+ICMP_MINLEN, ier->DataSize); - ier->Options.Ttl=ip_header->ip_ttl; - ier->Options.Tos=ip_header->ip_tos; - ier->Options.Flags=ip_header->ip_off >> 13; - ier->Options.OptionsSize=ip_header_len-sizeof(struct ip); - if (ier->Options.OptionsSize!=0) { - ier->Options.OptionsData=(unsigned char *) ier->Data-ier->Options.OptionsSize; - /* FIXME: We are supposed to rearrange the option's 'source route' data */ - memcpy(ier->Options.OptionsData, ((char *)ip_header)+ip_header_len, ier->Options.OptionsSize); - endbuf=(char*)ier->Options.OptionsData; - } else { - ier->Options.OptionsData=NULL; - endbuf=ier->Data; - } - - /* Prepare for the next packet */ - ier++; - - /* Check out whether there is more but don't wait this time */ - timeout=0; - } - } - res=ier-(ICMP_ECHO_REPLY*)reply_buf; - if (res==0) - SetLastError(IP_REQ_TIMED_OUT); -done: - if (res) - { - /* Move the data so there's no gap between it and the ICMP_ECHO_REPLY array */ - DWORD gap_size = endbuf - (char*)ier; - - if (gap_size) - { - memmove(ier, endbuf, ((char*)reply_buf + reply_size) - endbuf); - - /* Fix the pointers */ - while (ier-- != reply_buf) - { - ier->Data = (char*)ier->Data - gap_size; - if (ier->Options.OptionsData) - ier->Options.OptionsData -= gap_size; - } - - /* According to MSDN, the reply buffer needs to hold space for a IO_STATUS_BLOCK, - found at the very end of the reply. This is confirmed on Windows XP, but Vista - and later do not store it anywhere and in fact don't even require it at all. - - However, in case old apps analyze this IO_STATUS_BLOCK and expect it, we mimic - it and write it out if there's enough space available in the buffer. */ - if (gap_size >= sizeof(IO_STATUS_BLOCK)) - { - IO_STATUS_BLOCK *io = (IO_STATUS_BLOCK*)((char*)reply_buf + reply_size - sizeof(IO_STATUS_BLOCK)); - - io->Pointer = NULL; /* Always NULL or STATUS_SUCCESS */ - io->Information = reply_size - gap_size; - } - } - } - - HeapFree(GetProcessHeap(), 0, buffer); - TRACE("received %d replies\n",res); - return res; -} - - - -/* - * Exported Routines. - */ - -/*********************************************************************** - * IcmpCreateFile (IPHLPAPI.@) - */ -HANDLE WINAPI IcmpCreateFile(VOID) -{ - icmp_t* icp; - - int sid=socket(AF_INET,SOCK_RAW,IPPROTO_ICMP); - if (sid < 0) - { - /* Some systems (e.g. Linux 3.0+ and Mac OS X) support - non-privileged ICMP via SOCK_DGRAM type. */ - sid=socket(AF_INET,SOCK_DGRAM,IPPROTO_ICMP); - } - if (sid < 0) { - ERR_(winediag)("Failed to use ICMP (network ping), this requires special permissions.\n"); - SetLastError(ERROR_ACCESS_DENIED); - return INVALID_HANDLE_VALUE; - } - - icp=HeapAlloc(GetProcessHeap(), 0, sizeof(*icp)); - if (icp==NULL) { - close(sid); - SetLastError(IP_NO_RESOURCES); - return INVALID_HANDLE_VALUE; - } - icp->sid=sid; - icp->default_opts.OptionsSize=IP_OPTS_UNKNOWN; - return (HANDLE)icp; -} - - -/*********************************************************************** - * IcmpCloseHandle (IPHLPAPI.@) - */ -BOOL WINAPI IcmpCloseHandle(HANDLE IcmpHandle) -{ - icmp_t* icp=(icmp_t*)IcmpHandle; - if (IcmpHandle==INVALID_HANDLE_VALUE) { - /* FIXME: in fact win98 seems to ignore the handle value !!! */ - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - - close( icp->sid ); - HeapFree(GetProcessHeap (), 0, icp); - return TRUE; -} - - -/*********************************************************************** - * IcmpSendEcho (IPHLPAPI.@) - */ -DWORD WINAPI IcmpSendEcho( - HANDLE IcmpHandle, - IPAddr DestinationAddress, - LPVOID RequestData, - WORD RequestSize, - PIP_OPTION_INFORMATION RequestOptions, - LPVOID ReplyBuffer, - DWORD ReplySize, - DWORD Timeout - ) -{ - return IcmpSendEcho2Ex(IcmpHandle, NULL, NULL, NULL, 0, DestinationAddress, - RequestData, RequestSize, RequestOptions, ReplyBuffer, ReplySize, Timeout); -} - -/*********************************************************************** - * IcmpSendEcho2 (IPHLPAPI.@) - */ -DWORD WINAPI IcmpSendEcho2( - HANDLE IcmpHandle, - HANDLE Event, - PIO_APC_ROUTINE ApcRoutine, - PVOID ApcContext, - IPAddr DestinationAddress, - LPVOID RequestData, - WORD RequestSize, - PIP_OPTION_INFORMATION RequestOptions, - LPVOID ReplyBuffer, - DWORD ReplySize, - DWORD Timeout - ) -{ - return IcmpSendEcho2Ex(IcmpHandle, Event, ApcRoutine, ApcContext, 0, - DestinationAddress, RequestData, RequestSize, RequestOptions, - ReplyBuffer, ReplySize, Timeout); -} - -/*********************************************************************** - * IcmpSendEcho2Ex (IPHLPAPI.@) - */ -DWORD WINAPI IcmpSendEcho2Ex( - HANDLE IcmpHandle, - HANDLE Event, - PIO_APC_ROUTINE ApcRoutine, - PVOID ApcContext, - IPAddr SourceAddress, - IPAddr DestinationAddress, - LPVOID RequestData, - WORD RequestSize, - PIP_OPTION_INFORMATION RequestOptions, - LPVOID ReplyBuffer, - DWORD ReplySize, - DWORD Timeout - ) -{ - icmp_t* icp=(icmp_t*)IcmpHandle; - struct icmp* icmp_header; - struct sockaddr_in addr; - unsigned short id, seq; - unsigned char *buffer; - int reqsize, repsize; - DWORD send_time; - - TRACE("(%p, %p, %p, %p, %08x, %08x, %p, %d, %p, %p, %d, %d)\n", IcmpHandle, - Event, ApcRoutine, ApcContext, SourceAddress, DestinationAddress, RequestData, - RequestSize, RequestOptions, ReplyBuffer, ReplySize, Timeout); - - if (IcmpHandle==INVALID_HANDLE_VALUE) { - /* FIXME: in fact win98 seems to ignore the handle value !!! */ - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - if (!ReplyBuffer||!ReplySize) { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - if (ReplySize<sizeof(ICMP_ECHO_REPLY)) { - SetLastError(IP_BUF_TOO_SMALL); - return 0; - } - /* check the request size against SO_MAX_MSG_SIZE using getsockopt */ - - if (!DestinationAddress) { - SetLastError(ERROR_INVALID_NETNAME); - return 0; - } - - if (Event) - { - FIXME("unsupported for events\n"); - return 0; - } - if (ApcRoutine) - { - FIXME("unsupported for APCs\n"); - return 0; - } - if (SourceAddress) - { - FIXME("unsupported for source addresses\n"); - return 0; - } - - /* Prepare the request */ - id=getpid() & 0xFFFF; - seq=InterlockedIncrement(&icmp_sequence) & 0xFFFF; - - reqsize=ICMP_MINLEN+RequestSize; - /* max ip header + max icmp header and error data + reply size(max 65535 on Windows) */ - /* FIXME: request size of 65535 is not supported yet because max buffer size of raw socket on linux is 32767 */ - repsize = MAXIPLEN + MAXICMPLEN + min( 65535, ReplySize ); - buffer = HeapAlloc(GetProcessHeap(), 0, max( repsize, reqsize )); - if (buffer == NULL) { - SetLastError(ERROR_OUTOFMEMORY); - return 0; - } - - icmp_header=(struct icmp*)buffer; - icmp_header->icmp_type=ICMP_ECHO; - icmp_header->icmp_code=0; - icmp_header->icmp_cksum=0; - icmp_header->icmp_id=id; - icmp_header->icmp_seq=seq; - memcpy(buffer+ICMP_MINLEN, RequestData, RequestSize); - icmp_header->icmp_cksum=in_cksum((u_short*)buffer,reqsize); - - addr.sin_family=AF_INET; - addr.sin_addr.s_addr=DestinationAddress; - addr.sin_port=0; - - if (RequestOptions!=NULL) { - int val; - if (icp->default_opts.OptionsSize==IP_OPTS_UNKNOWN) { - socklen_t len; - /* Before we mess with the options, get the default values */ - len=sizeof(val); - getsockopt(icp->sid,IPPROTO_IP,IP_TTL,(char *)&val,&len); - icp->default_opts.Ttl=val; - - len=sizeof(val); - getsockopt(icp->sid,IPPROTO_IP,IP_TOS,(char *)&val,&len); - icp->default_opts.Tos=val; - /* FIXME: missing: handling of IP 'flags', and all the other options */ - } - - val=RequestOptions->Ttl; - setsockopt(icp->sid,IPPROTO_IP,IP_TTL,(char *)&val,sizeof(val)); - val=RequestOptions->Tos; - setsockopt(icp->sid,IPPROTO_IP,IP_TOS,(char *)&val,sizeof(val)); - /* FIXME: missing: handling of IP 'flags', and all the other options */ - - icp->default_opts.OptionsSize=IP_OPTS_CUSTOM; - } else if (icp->default_opts.OptionsSize==IP_OPTS_CUSTOM) { - int val; - - /* Restore the default options */ - val=icp->default_opts.Ttl; - setsockopt(icp->sid,IPPROTO_IP,IP_TTL,(char *)&val,sizeof(val)); - val=icp->default_opts.Tos; - setsockopt(icp->sid,IPPROTO_IP,IP_TOS,(char *)&val,sizeof(val)); - /* FIXME: missing: handling of IP 'flags', and all the other options */ - - icp->default_opts.OptionsSize=IP_OPTS_DEFAULT; - } - - /* Send the packet */ - TRACE("Sending %d bytes (RequestSize=%d) to %s\n", reqsize, RequestSize, inet_ntoa(addr.sin_addr)); -#if 0 - if (TRACE_ON(icmp)){ - int i; - printf("Output buffer:\n"); - for (i=0;i<reqsize;i++) - printf("%2x,", buffer[i]); - printf("\n"); - } -#endif - - send_time = GetTickCount(); - if (sendto(icp->sid, buffer, reqsize, 0, (struct sockaddr*)&addr, sizeof(addr)) < 0) { - if (errno==EMSGSIZE) - SetLastError(IP_PACKET_TOO_BIG); - else { - switch (errno) { - case ENETUNREACH: - SetLastError(IP_DEST_NET_UNREACHABLE); - break; - case EHOSTUNREACH: - SetLastError(IP_DEST_HOST_UNREACHABLE); - break; - default: - TRACE("unknown error: errno=%d\n",errno); - SetLastError(IP_GENERAL_FAILURE); - } - } - HeapFree(GetProcessHeap(), 0, buffer); - return 0; - } - - return icmp_get_reply(icp->sid, buffer, send_time, ReplyBuffer, ReplySize, Timeout); -} - -/* - * Copyright (c) 1989 The Regents of the University of California. - * All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Mike Muuss. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - */ diff --git a/dlls/iphlpapi/ip.h b/dlls/iphlpapi/ip.h deleted file mode 100644 index 9c669d9fd88..00000000000 --- a/dlls/iphlpapi/ip.h +++ /dev/null @@ -1,180 +0,0 @@ -/* - * Copyright (c) 1982, 1986, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)ip.h 8.2 (Berkeley) 6/1/94 - * $FreeBSD: src/sys/netinet/ip.h,v 1.16 1999/08/28 00:49:19 peter Exp $ - */ - -#ifndef _NETINET_IP_H_ -#define _NETINET_IP_H_ - -/* - * Definitions for internet protocol version 4. - * Per RFC 791, September 1981. - */ -#define IPVERSION 4 - -/* - * Structure of an internet header, naked of options. - */ -struct ip { -#ifdef _IP_VHL - u_char ip_vhl; /* version << 4 | header length >> 2 */ -#else -#if BYTE_ORDER == LITTLE_ENDIAN - u_int ip_hl:4, /* header length */ - ip_v:4; /* version */ -#endif -#if BYTE_ORDER == BIG_ENDIAN - u_int ip_v:4, /* version */ - ip_hl:4; /* header length */ -#endif -#endif /* not _IP_VHL */ - u_char ip_tos; /* type of service */ - u_short ip_len; /* total length */ - u_short ip_id; /* identification */ - u_short ip_off; /* fragment offset field */ -#define IP_RF 0x8000 /* reserved fragment flag */ -#define IP_DF 0x4000 /* don't fragment flag */ -#define IP_MF 0x2000 /* more fragments flag */ -#define IP_OFFMASK 0x1fff /* mask for fragmenting bits */ - u_char ip_ttl; /* time to live */ - u_char ip_p; /* protocol */ - u_short ip_sum; /* checksum */ - struct in_addr ip_src,ip_dst; /* source and dest address */ -}; - -#ifdef _IP_VHL -#define IP_MAKE_VHL(v, hl) ((v) << 4 | (hl)) -#define IP_VHL_HL(vhl) ((vhl) & 0x0f) -#define IP_VHL_V(vhl) ((vhl) >> 4) -#define IP_VHL_BORING 0x45 -#endif - -#define IP_MAXPACKET 65535 /* maximum packet size */ - -/* - * Definitions for IP type of service (ip_tos) - */ -#define IPTOS_LOWDELAY 0x10 -#define IPTOS_THROUGHPUT 0x08 -#define IPTOS_RELIABILITY 0x04 -#define IPTOS_MINCOST 0x02 - -/* - * Definitions for IP precedence (also in ip_tos) (hopefully unused) - */ -#define IPTOS_PREC_NETCONTROL 0xe0 -#define IPTOS_PREC_INTERNETCONTROL 0xc0 -#define IPTOS_PREC_CRITIC_ECP 0xa0 -#define IPTOS_PREC_FLASHOVERRIDE 0x80 -#define IPTOS_PREC_FLASH 0x60 -#define IPTOS_PREC_IMMEDIATE 0x40 -#define IPTOS_PREC_PRIORITY 0x20 -#define IPTOS_PREC_ROUTINE 0x00 - -/* - * Definitions for options. - */ -#define IPOPT_COPIED(o) ((o)&0x80) -#define IPOPT_CLASS(o) ((o)&0x60) -#define IPOPT_NUMBER(o) ((o)&0x1f) - -#define IPOPT_CONTROL 0x00 -#define IPOPT_RESERVED1 0x20 -#define IPOPT_DEBMEAS 0x40 -#define IPOPT_RESERVED2 0x60 - -#define IPOPT_EOL 0 /* end of option list */ -#define IPOPT_NOP 1 /* no operation */ - -#define IPOPT_RR 7 /* record packet route */ -#define IPOPT_TS 68 /* timestamp */ -#define IPOPT_SECURITY 130 /* provide s,c,h,tcc */ -#define IPOPT_LSRR 131 /* loose source route */ -#define IPOPT_SATID 136 /* satnet id */ -#define IPOPT_SSRR 137 /* strict source route */ -#define IPOPT_RA 148 /* router alert */ - -/* - * Offsets to fields in options other than EOL and NOP. - */ -#define IPOPT_OPTVAL 0 /* option ID */ -#define IPOPT_OLEN 1 /* option length */ -#define IPOPT_OFFSET 2 /* offset within option */ -#define IPOPT_MINOFF 4 /* min value of above */ - -/* - * Time stamp option structure. - */ -struct ip_timestamp { - u_char ipt_code; /* IPOPT_TS */ - u_char ipt_len; /* size of structure (variable) */ - u_char ipt_ptr; /* index of current entry */ -#if BYTE_ORDER == LITTLE_ENDIAN - u_int ipt_flg:4, /* flags, see below */ - ipt_oflw:4; /* overflow counter */ -#endif -#if BYTE_ORDER == BIG_ENDIAN - u_int ipt_oflw:4, /* overflow counter */ - ipt_flg:4; /* flags, see below */ -#endif - union ipt_timestamp { - n_long ipt_time[1]; - struct ipt_ta { - struct in_addr ipt_addr; - n_long ipt_time; - } ipt_ta[1]; - } ipt_timestamp; -}; - -/* flag bits for ipt_flg */ -#define IPOPT_TS_TSONLY 0 /* timestamps only */ -#define IPOPT_TS_TSANDADDR 1 /* timestamps and addresses */ -#define IPOPT_TS_PRESPEC 3 /* specified modules only */ - -/* bits for security (not byte swapped) */ -#define IPOPT_SECUR_UNCLASS 0x0000 -#define IPOPT_SECUR_CONFID 0xf135 -#define IPOPT_SECUR_EFTO 0x789a -#define IPOPT_SECUR_MMMM 0xbc4d -#define IPOPT_SECUR_RESTR 0xaf13 -#define IPOPT_SECUR_SECRET 0xd788 -#define IPOPT_SECUR_TOPSECRET 0x6bc5 - -/* - * Internet implementation parameters. - */ -#define MAXTTL 255 /* maximum time to live (seconds) */ -#define IPDEFTTL 64 /* default ttl, from RFC 1340 */ -#define IPFRAGTTL 60 /* time to live for frags, slowhz */ -#define IPTTLDEC 1 /* subtracted when forwarding */ - -#define IP_MSS 576 /* default maximum segment size */ - -#endif diff --git a/dlls/iphlpapi/ip_icmp.h b/dlls/iphlpapi/ip_icmp.h deleted file mode 100644 index ce5449526d2..00000000000 --- a/dlls/iphlpapi/ip_icmp.h +++ /dev/null @@ -1,186 +0,0 @@ -/* - * Copyright (c) 1982, 1986, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)ip_icmp.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/netinet/ip_icmp.h,v 1.13 1999/08/28 00:49:24 peter Exp $ - */ - -#ifndef _NETINET_IP_ICMP_H_ -#define _NETINET_IP_ICMP_H_ - -/* - * Interface Control Message Protocol Definitions. - * Per RFC 792, September 1981. - */ - -/* - * Internal of an ICMP Router Advertisement - */ -struct icmp_ra_addr { - u_int32_t ira_addr; - u_int32_t ira_preference; -}; - -/* - * Structure of an icmp header. - */ -struct icmp { - u_char icmp_type; /* type of message, see below */ - u_char icmp_code; /* type sub code */ - u_short icmp_cksum; /* ones complement cksum of struct */ - union { - u_char ih_pptr; /* ICMP_PARAMPROB */ - struct in_addr ih_gwaddr; /* ICMP_REDIRECT */ - struct ih_idseq { - n_short icd_id; - n_short icd_seq; - } ih_idseq; - int ih_void; - - /* ICMP_UNREACH_NEEDFRAG -- Path MTU Discovery (RFC1191) */ - struct ih_pmtu { - n_short ipm_void; - n_short ipm_nextmtu; - } ih_pmtu; - - struct ih_rtradv { - u_char irt_num_addrs; - u_char irt_wpa; - u_int16_t irt_lifetime; - } ih_rtradv; - } icmp_hun; -#define icmp_pptr icmp_hun.ih_pptr -#define icmp_gwaddr icmp_hun.ih_gwaddr -#define icmp_id icmp_hun.ih_idseq.icd_id -#define icmp_seq icmp_hun.ih_idseq.icd_seq -#define icmp_void icmp_hun.ih_void -#define icmp_pmvoid icmp_hun.ih_pmtu.ipm_void -#define icmp_nextmtu icmp_hun.ih_pmtu.ipm_nextmtu -#define icmp_num_addrs icmp_hun.ih_rtradv.irt_num_addrs -#define icmp_wpa icmp_hun.ih_rtradv.irt_wpa -#define icmp_lifetime icmp_hun.ih_rtradv.irt_lifetime - union { - struct id_ts { - n_time its_otime; - n_time its_rtime; - n_time its_ttime; - } id_ts; - struct id_ip { - struct ip idi_ip; - /* options and then 64 bits of data */ - } id_ip; - struct icmp_ra_addr id_radv; - u_int32_t id_mask; - char id_data[1]; - } icmp_dun; -#define icmp_otime icmp_dun.id_ts.its_otime -#define icmp_rtime icmp_dun.id_ts.its_rtime -#define icmp_ttime icmp_dun.id_ts.its_ttime -#define icmp_ip icmp_dun.id_ip.idi_ip -#define icmp_radv icmp_dun.id_radv -#define icmp_mask icmp_dun.id_mask -#define icmp_data icmp_dun.id_data -}; - -/* - * Lower bounds on packet lengths for various types. - * For the error advice packets must first insure that the - * packet is large enough to contain the returned ip header. - * Only then can we do the check to see if 64 bits of packet - * data have been returned, since we need to check the returned - * ip header length. - */ -#define ICMP_MINLEN 8 /* abs minimum */ -#define ICMP_TSLEN (8 + 3 * sizeof (n_time)) /* timestamp */ -#define ICMP_MASKLEN 12 /* address mask */ -#define ICMP_ADVLENMIN (8 + sizeof (struct ip) + 8) /* min */ -#ifndef _IP_VHL -#define ICMP_ADVLEN(p) (8 + ((p)->icmp_ip.ip_hl << 2) + 8) - /* N.B.: must separately check that ip_hl >= 5 */ -#else -#define ICMP_ADVLEN(p) (8 + (IP_VHL_HL((p)->icmp_ip.ip_vhl) << 2) + 8) - /* N.B.: must separately check that header length >= 5 */ -#endif - -/* - * Definition of type and code field values. - */ -#define ICMP_ECHOREPLY 0 /* echo reply */ -#define ICMP_UNREACH 3 /* dest unreachable, codes: */ -#define ICMP_UNREACH_NET 0 /* bad net */ -#define ICMP_UNREACH_HOST 1 /* bad host */ -#define ICMP_UNREACH_PROTOCOL 2 /* bad protocol */ -#define ICMP_UNREACH_PORT 3 /* bad port */ -#define ICMP_UNREACH_NEEDFRAG 4 /* IP_DF caused drop */ -#define ICMP_UNREACH_SRCFAIL 5 /* src route failed */ -#define ICMP_UNREACH_NET_UNKNOWN 6 /* unknown net */ -#define ICMP_UNREACH_HOST_UNKNOWN 7 /* unknown host */ -#define ICMP_UNREACH_ISOLATED 8 /* src host isolated */ -#define ICMP_UNREACH_NET_PROHIB 9 /* prohibited access */ -#define ICMP_UNREACH_HOST_PROHIB 10 /* ditto */ -#define ICMP_UNREACH_TOSNET 11 /* bad tos for net */ -#define ICMP_UNREACH_TOSHOST 12 /* bad tos for host */ -#define ICMP_UNREACH_FILTER_PROHIB 13 /* admin prohib */ -#define ICMP_UNREACH_HOST_PRECEDENCE 14 /* host prec vio. */ -#define ICMP_UNREACH_PRECEDENCE_CUTOFF 15 /* prec cutoff */ -#define ICMP_SOURCEQUENCH 4 /* packet lost, slow down */ -#define ICMP_REDIRECT 5 /* shorter route, codes: */ -#define ICMP_REDIRECT_NET 0 /* for network */ -#define ICMP_REDIRECT_HOST 1 /* for host */ -#define ICMP_REDIRECT_TOSNET 2 /* for tos and net */ -#define ICMP_REDIRECT_TOSHOST 3 /* for tos and host */ -#define ICMP_ECHO 8 /* echo service */ -#define ICMP_ROUTERADVERT 9 /* router advertisement */ -#define ICMP_ROUTERSOLICIT 10 /* router solicitation */ -#define ICMP_TIMXCEED 11 /* time exceeded, code: */ -#define ICMP_TIMXCEED_INTRANS 0 /* ttl==0 in transit */ -#define ICMP_TIMXCEED_REASS 1 /* ttl==0 in reass */ -#define ICMP_PARAMPROB 12 /* ip header bad */ -#define ICMP_PARAMPROB_OPTABSENT 1 /* req. opt. absent */ -#define ICMP_TSTAMP 13 /* timestamp request */ -#define ICMP_TSTAMPREPLY 14 /* timestamp reply */ -#define ICMP_IREQ 15 /* information request */ -#define ICMP_IREQREPLY 16 /* information reply */ -#define ICMP_MASKREQ 17 /* address mask request */ -#define ICMP_MASKREPLY 18 /* address mask reply */ - -#define ICMP_MAXTYPE 18 - -#define ICMP_INFOTYPE(type) \ - ((type) == ICMP_ECHOREPLY || (type) == ICMP_ECHO || \ - (type) == ICMP_ROUTERADVERT || (type) == ICMP_ROUTERSOLICIT || \ - (type) == ICMP_TSTAMP || (type) == ICMP_TSTAMPREPLY || \ - (type) == ICMP_IREQ || (type) == ICMP_IREQREPLY || \ - (type) == ICMP_MASKREQ || (type) == ICMP_MASKREPLY) - -#ifdef KERNEL -void icmp_error __P((struct mbuf *, int, int, n_long, struct ifnet *)); -void icmp_input __P((struct mbuf *, int)); -#endif - -#endif diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 2286c732383..6cdf7948901 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -37,6 +37,7 @@ #include "tcpestats.h" #include "ip2string.h" #include "netiodef.h" +#include "icmpapi.h" #include "wine/nsi.h" #include "wine/debug.h" @@ -4543,6 +4544,48 @@ DWORD WINAPI ParseNetworkString(const WCHAR *str, DWORD type, return ERROR_INVALID_PARAMETER; } +struct icmp_handle_data +{ + HANDLE nsi_device; +}; + +/*********************************************************************** + * IcmpCloseHandle (IPHLPAPI.@) + */ +BOOL WINAPI IcmpCloseHandle( HANDLE handle ) +{ + struct icmp_handle_data *data = (struct icmp_handle_data *)handle; + + CloseHandle( data->nsi_device ); + heap_free( data ); + return TRUE; +} + +/*********************************************************************** + * IcmpCreateFile (IPHLPAPI.@) + */ +HANDLE WINAPI IcmpCreateFile( void ) +{ + struct icmp_handle_data *data = heap_alloc( sizeof(*data) ); + static const WCHAR device_name[] = {'\\','\\','.','\\','N','s','i',0}; + + if (!data) + { + SetLastError( IP_NO_RESOURCES ); + return INVALID_HANDLE_VALUE; + } + + data->nsi_device = CreateFileW( device_name, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, + FILE_FLAG_OVERLAPPED, NULL ); + if (data->nsi_device == INVALID_HANDLE_VALUE) + { + heap_free( data ); + return INVALID_HANDLE_VALUE; + } + + return (HANDLE)data; +} + /****************************************************************** * IcmpParseReplies (IPHLPAPI.@) */ @@ -4556,6 +4599,135 @@ DWORD WINAPI IcmpParseReplies( void *reply, DWORD reply_size ) return num_pkts; } +/************************************************************************* + * icmpv4_echo_reply_fixup + * + * Convert struct nsiproxy_icmpv4_echo_reply into ICMP_ECHO_REPLY. + * + * This is necessary due to the different sizes of ICMP_ECHO_REPLY on + * 32 and 64-bits. Despite mention of ICMP_ECHO_REPLY32, 64-bit Windows + * actually does return a full 64-bit version. + */ +static void icmpv4_echo_reply_fixup( ICMP_ECHO_REPLY *dst, struct nsiproxy_icmp_echo_reply *reply ) +{ + dst->Address = reply->addr.Ipv4.sin_addr.s_addr; + dst->Status = reply->status; + dst->RoundTripTime = reply->round_trip_time; + dst->DataSize = reply->data_size; + dst->Reserved = reply->num_of_pkts; + dst->Data = (BYTE *)(dst + 1) + ((reply->opts.options_size + 3) & ~3); + dst->Options.Ttl = reply->opts.ttl; + dst->Options.Tos = reply->opts.tos; + dst->Options.Flags = reply->opts.flags; + dst->Options.OptionsSize = reply->opts.options_size; + dst->Options.OptionsData = (BYTE *)(reply + 1); + + memcpy( dst->Options.OptionsData, (BYTE *)reply + reply->opts.options_offset, reply->opts.options_size ); + memcpy( dst->Data, (BYTE *)reply + reply->data_offset, reply->data_size ); +} + +/*********************************************************************** + * IcmpSendEcho (IPHLPAPI.@) + */ +DWORD WINAPI IcmpSendEcho( HANDLE handle, IPAddr dst, void *request, WORD request_size, + IP_OPTION_INFORMATION *opts, void *reply, DWORD reply_size, + DWORD timeout ) +{ + return IcmpSendEcho2Ex( handle, NULL, NULL, NULL, INADDR_ANY, dst, request, request_size, + opts, reply, reply_size, timeout ); +} + +/*********************************************************************** + * IcmpSendEcho2 (IPHLPAPI.@) + */ +DWORD WINAPI IcmpSendEcho2( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc_routine, void *apc_ctxt, + IPAddr dst, void *request, WORD request_size, IP_OPTION_INFORMATION *opts, + void *reply, DWORD reply_size, DWORD timeout ) +{ + return IcmpSendEcho2Ex( handle, event, apc_routine, apc_ctxt, INADDR_ANY, dst, request, request_size, + opts, reply, reply_size, timeout ); +} + +/*********************************************************************** + * IcmpSendEcho2Ex (IPHLPAPI.@) + */ +DWORD WINAPI IcmpSendEcho2Ex( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc_routine, void *apc_ctxt, + IPAddr src, IPAddr dst, void *request, WORD request_size, IP_OPTION_INFORMATION *opts, + void *reply, DWORD reply_size, DWORD timeout ) +{ + struct icmp_handle_data *data = (struct icmp_handle_data *)handle; + DWORD opt_size, in_size, ret = 0, out_size; + struct nsiproxy_icmp_echo *in; + struct nsiproxy_icmp_echo_reply *out; + HANDLE request_event; + IO_STATUS_BLOCK iosb; + NTSTATUS status; + + if (event || apc_routine) + { + FIXME( "Async requests not yet supported\n" ); + return 0; + } + + if (handle == INVALID_HANDLE_VALUE || !reply) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + + opt_size = opts ? (opts->OptionsSize + 3) & ~3 : 0; + in_size = FIELD_OFFSET(struct nsiproxy_icmp_echo, data[opt_size + request_size]); + in = heap_alloc_zero( in_size ); + out_size = reply_size - sizeof(ICMP_ECHO_REPLY) + sizeof(*out); + out = heap_alloc( out_size ); + + if (!in || !out) + { + heap_free( out ); + heap_free( in ); + SetLastError( IP_NO_RESOURCES ); + return 0; + } + + in->src.Ipv4.sin_family = AF_INET; + in->src.Ipv4.sin_addr.s_addr = src; + in->dst.Ipv4.sin_family = AF_INET; + in->dst.Ipv4.sin_addr.s_addr = dst; + if (opts) + { + in->ttl = opts->Ttl; + in->tos = opts->Tos; + in->flags = opts->Flags; + memcpy( in->data, opts->OptionsData, opts->OptionsSize ); + in->opt_size = opts->OptionsSize; + } + in->req_size = request_size; + in->timeout = timeout; + memcpy( in->data + opt_size, request, request_size ); + + request_event = CreateEventW( NULL, 0, 0, NULL ); + + status = NtDeviceIoControlFile( data->nsi_device, request_event, NULL, NULL, + &iosb, IOCTL_NSIPROXY_WINE_ICMP_ECHO, in, in_size, + out, out_size ); + + if (status == STATUS_PENDING && !WaitForSingleObject( request_event, INFINITE )) + status = iosb.u.Status; + + if (!status) + { + icmpv4_echo_reply_fixup( reply, out ); + ret = IcmpParseReplies( reply, reply_size ); + } + + CloseHandle( request_event ); + heap_free( out ); + heap_free( in ); + + if (status) SetLastError( RtlNtStatusToDosError( status ) ); + return ret; +} + /*********************************************************************** * Icmp6CreateFile (IPHLPAPI.@) */ diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 080feb364f9..e20ada88f16 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -894,15 +894,6 @@ static void testIcmpSendEcho(void) "expected 87, got %d\n", error); icmp = IcmpCreateFile(); - if (icmp == INVALID_HANDLE_VALUE) - { - error = GetLastError(); - if (error == ERROR_ACCESS_DENIED) - { - skip ("ICMP is not available.\n"); - return; - } - } ok (icmp != INVALID_HANDLE_VALUE, "IcmpCreateFile failed unexpectedly with error %d\n", GetLastError()); address = 0; @@ -924,6 +915,11 @@ static void testIcmpSendEcho(void) SetLastError(0xdeadbeef); ret = IcmpSendEcho(icmp, address, senddata, 0, NULL, replydata, replysz, 1000); error = GetLastError(); + if (!ret && error == ERROR_ACCESS_DENIED) + { + skip( "ICMP is not available.\n" ); + return; + } ok (ret, "IcmpSendEcho failed unexpectedly with error %d\n", error); SetLastError(0xdeadbeef); -- 2.25.1

2 3

[PATCH 1/3] iphlpapi: Implement asynchronous events for IcmpSendEcho2Ex.
by Gabriel Ivăncescu 08 Oct '21

08 Oct '21

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/iphlpapi/iphlpapi_main.c | 91 ++++++++++++++- dlls/iphlpapi/tests/iphlpapi.c | 203 +++++++++++++++++++++++++++++++++ 2 files changed, 288 insertions(+), 6 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index d9a85be..c0ea214 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -4530,6 +4530,16 @@ struct icmp_handle_data HANDLE nsi_device; }; +struct icmp_echo_async_ctx +{ + HANDLE event; + HANDLE request_event; + struct nsiproxy_icmp_echo *in; + struct nsiproxy_icmp_echo_reply *out; + ICMP_ECHO_REPLY *reply; + IO_STATUS_BLOCK iosb; +}; + /*********************************************************************** * IcmpCloseHandle (IPHLPAPI.@) */ @@ -4606,6 +4616,36 @@ static void icmpv4_echo_reply_fixup( ICMP_ECHO_REPLY *dst, struct nsiproxy_icmp_ memcpy( dst->Data, (BYTE *)reply + reply->data_offset, reply->data_size ); } +/************************************************************************* + * icmpv4_echo_async + * + * Wait for the reply, convert it into ICMP_ECHO_REPLY, and signal the event. + */ +static DWORD WINAPI icmpv4_echo_async( VOID *parameter ) +{ + struct icmp_echo_async_ctx *ctx = parameter; + + WaitForSingleObject( ctx->request_event, INFINITE ); + CloseHandle( ctx->request_event ); + + if (!ctx->iosb.Status) + { + icmpv4_echo_reply_fixup( ctx->reply, ctx->out ); + } + else + { + memset( ctx->reply, 0, sizeof(ICMP_ECHO_REPLY) ); + ctx->reply->Status = IP_GENERAL_FAILURE; + } + + SetEvent( ctx->event ); + + heap_free( ctx->out ); + heap_free( ctx->in ); + heap_free( ctx ); + return 0; +} + /*********************************************************************** * IcmpSendEcho (IPHLPAPI.@) */ @@ -4636,25 +4676,43 @@ DWORD WINAPI IcmpSendEcho2Ex( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc_r void *reply, DWORD reply_size, DWORD timeout ) { struct icmp_handle_data *data = (struct icmp_handle_data *)handle; + IO_STATUS_BLOCK iosb_stack, *iosb = &iosb_stack; + struct icmp_echo_async_ctx *async_ctx = NULL; DWORD opt_size, in_size, ret = 0, out_size; struct nsiproxy_icmp_echo *in; struct nsiproxy_icmp_echo_reply *out; HANDLE request_event; - IO_STATUS_BLOCK iosb; NTSTATUS status; - if (event || apc_routine) + if (apc_routine) { FIXME( "Async requests not yet supported\n" ); return 0; } - if (handle == INVALID_HANDLE_VALUE || !reply) + if (handle == INVALID_HANDLE_VALUE || !reply || !reply_size) { SetLastError( ERROR_INVALID_PARAMETER ); return 0; } + if (reply_size < sizeof(ICMP_ECHO_REPLY)) + { + SetLastError( IP_BUF_TOO_SMALL ); + return 0; + } + + if (event) + { + async_ctx = heap_alloc( sizeof(*async_ctx) ); + if (!async_ctx) + { + SetLastError( IP_NO_RESOURCES ); + return 0; + } + iosb = &async_ctx->iosb; + } + opt_size = opts ? (opts->OptionsSize + 3) & ~3 : 0; in_size = FIELD_OFFSET(struct nsiproxy_icmp_echo, data[opt_size + request_size]); in = heap_alloc_zero( in_size ); @@ -4663,6 +4721,7 @@ DWORD WINAPI IcmpSendEcho2Ex( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc_r if (!in || !out) { + heap_free( async_ctx ); heap_free( out ); heap_free( in ); SetLastError( IP_NO_RESOURCES ); @@ -4688,19 +4747,39 @@ DWORD WINAPI IcmpSendEcho2Ex( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc_r request_event = CreateEventW( NULL, 0, 0, NULL ); status = NtDeviceIoControlFile( data->nsi_device, request_event, NULL, NULL, - &iosb, IOCTL_NSIPROXY_WINE_ICMP_ECHO, in, in_size, + iosb, IOCTL_NSIPROXY_WINE_ICMP_ECHO, in, in_size, out, out_size ); - if (status == STATUS_PENDING && !WaitForSingleObject( request_event, INFINITE )) - status = iosb.Status; + if (status == STATUS_PENDING) + { + if (async_ctx) + { + async_ctx->event = event; + async_ctx->request_event = request_event; + async_ctx->in = in; + async_ctx->out = out; + async_ctx->reply = reply; + status = RtlQueueWorkItem( icmpv4_echo_async, async_ctx, WT_EXECUTEDEFAULT | WT_EXECUTELONGFUNCTION ); + if (!status) + { + SetLastError( ERROR_IO_PENDING ); + return 0; + } + /* fall back to sync, we can't have the buffers released now */ + } + if (!WaitForSingleObject( request_event, INFINITE )) + status = iosb->Status; + } if (!status) { icmpv4_echo_reply_fixup( reply, out ); ret = IcmpParseReplies( reply, reply_size ); + if (event) SetEvent( event ); } CloseHandle( request_event ); + heap_free( async_ctx ); heap_free( out ); heap_free( in ); diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index e20ada8..93a5843 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -38,6 +38,7 @@ #include "winsock2.h" #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "ws2tcpip.h" #include "windns.h" #include "iphlpapi.h" @@ -877,9 +878,11 @@ static void testIcmpSendEcho(void) { HANDLE icmp; char senddata[32], replydata[sizeof(senddata) + sizeof(ICMP_ECHO_REPLY)]; + char replydata2[sizeof(replydata) + sizeof(IO_STATUS_BLOCK)]; DWORD ret, error, replysz = sizeof(replydata); IPAddr address; ICMP_ECHO_REPLY *reply; + HANDLE event; INT i; memset(senddata, 0, sizeof(senddata)); @@ -893,6 +896,15 @@ static void testIcmpSendEcho(void) || broken(error == ERROR_INVALID_HANDLE) /* <= 2003 */, "expected 87, got %d\n", error); + address = htonl(INADDR_LOOPBACK); + SetLastError(0xdeadbeef); + ret = IcmpSendEcho2(INVALID_HANDLE_VALUE, NULL, NULL, NULL, address, senddata, sizeof(senddata), NULL, replydata, replysz, 1000); + error = GetLastError(); + ok (!ret, "IcmpSendEcho2 succeeded unexpectedly\n"); + ok (error == ERROR_INVALID_PARAMETER + || broken(error == ERROR_INVALID_HANDLE) /* <= 2003 */, + "expected 87, got %d\n", error); + icmp = IcmpCreateFile(); ok (icmp != INVALID_HANDLE_VALUE, "IcmpCreateFile failed unexpectedly with error %d\n", GetLastError()); @@ -1036,6 +1048,197 @@ static void testIcmpSendEcho(void) ok(reply->DataSize == sizeof(senddata), "Got size:%d\n", reply->DataSize); ok(!memcmp(senddata, reply->Data, min(sizeof(senddata), reply->DataSize)), "Data mismatch\n"); + + /* + * IcmpSendEcho2 + */ + address = 0; + replysz = sizeof(replydata2); + memset(senddata, 0, sizeof(senddata)); + + SetLastError(0xdeadbeef); + ret = IcmpSendEcho2(icmp, NULL, NULL, NULL, address, senddata, sizeof(senddata), NULL, replydata2, replysz, 1000); + error = GetLastError(); + ok(!ret, "IcmpSendEcho2 succeeded unexpectedly\n"); + ok(error == ERROR_INVALID_NETNAME + || broken(error == IP_BAD_DESTINATION) /* <= 2003 */, + "expected 1214, got %d\n", error); + + event = CreateEventW(NULL, FALSE, FALSE, NULL); + ok(event != NULL, "CreateEventW failed unexpectedly with error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = IcmpSendEcho2(icmp, event, NULL, NULL, address, senddata, sizeof(senddata), NULL, replydata2, replysz, 1000); + error = GetLastError(); + ok(!ret, "IcmpSendEcho2 returned success unexpectedly\n"); + ok(error == ERROR_INVALID_NETNAME + || broken(error == ERROR_IO_PENDING) /* <= 2003 */, + "Got last error: 0x%08x\n", error); + if (error == ERROR_IO_PENDING) + { + ret = WaitForSingleObjectEx(event, 2000, TRUE); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObjectEx failed unexpectedly with %u\n", ret); + } + + address = htonl(INADDR_LOOPBACK); + SetLastError(0xdeadbeef); + ret = IcmpSendEcho2(icmp, NULL, NULL, NULL, address, senddata, sizeof(senddata), NULL, NULL, replysz, 1000); + error = GetLastError(); + ok(!ret, "IcmpSendEcho2 succeeded unexpectedly\n"); + ok(error == ERROR_INVALID_PARAMETER + || broken(error == ERROR_NOACCESS) /* <= 2003 */, + "expected 87, got %d\n", error); + + SetLastError(0xdeadbeef); + ret = IcmpSendEcho2(icmp, event, NULL, NULL, address, senddata, sizeof(senddata), NULL, NULL, replysz, 1000); + error = GetLastError(); + ok(!ret, "IcmpSendEcho2 succeeded unexpectedly\n"); + ok(error == ERROR_INVALID_PARAMETER + || broken(error == ERROR_NOACCESS) /* <= 2003 */, + "expected 87, got %d\n", error); + ok(WaitForSingleObjectEx(event, 0, TRUE) == WAIT_TIMEOUT, "Event was unexpectedly signalled.\n"); + + SetLastError(0xdeadbeef); + ret = IcmpSendEcho2(icmp, NULL, NULL, NULL, address, senddata, sizeof(senddata), NULL, replydata2, 0, 1000); + error = GetLastError(); + ok(!ret, "IcmpSendEcho2 succeeded unexpectedly\n"); + ok(error == ERROR_INVALID_PARAMETER + || broken(error == ERROR_INSUFFICIENT_BUFFER) /* <= 2003 */, + "expected 87, got %d\n", error); + + SetLastError(0xdeadbeef); + ret = IcmpSendEcho2(icmp, event, NULL, NULL, address, senddata, sizeof(senddata), NULL, replydata2, 0, 1000); + error = GetLastError(); + ok(!ret, "IcmpSendEcho2 succeeded unexpectedly\n"); + ok(error == ERROR_INVALID_PARAMETER + || broken(error == ERROR_INSUFFICIENT_BUFFER) /* <= 2003 */, + "expected 87, got %d\n", error); + ok(WaitForSingleObjectEx(event, 0, TRUE) == WAIT_TIMEOUT, "Event was unexpectedly signalled.\n"); + + SetLastError(0xdeadbeef); + ret = IcmpSendEcho2(icmp, NULL, NULL, NULL, address, senddata, sizeof(senddata), NULL, NULL, 0, 1000); + error = GetLastError(); + ok(!ret, "IcmpSendEcho2 succeeded unexpectedly\n"); + ok(error == ERROR_INVALID_PARAMETER + || broken(error == ERROR_INSUFFICIENT_BUFFER) /* <= 2003 */, + "expected 87, got %d\n", error); + + SetLastError(0xdeadbeef); + ret = IcmpSendEcho2(icmp, event, NULL, NULL, address, senddata, sizeof(senddata), NULL, NULL, 0, 1000); + error = GetLastError(); + ok(!ret, "IcmpSendEcho2 succeeded unexpectedly\n"); + ok(error == ERROR_INVALID_PARAMETER + || broken(error == ERROR_INSUFFICIENT_BUFFER) /* <= 2003 */, + "expected 87, got %d\n", error); + ok(WaitForSingleObjectEx(event, 0, TRUE) == WAIT_TIMEOUT, "Event was unexpectedly signalled.\n"); + + /* synchronous tests */ + SetLastError(0xdeadbeef); + address = htonl(INADDR_LOOPBACK); + replysz = sizeof(ICMP_ECHO_REPLY) + sizeof(IO_STATUS_BLOCK); + ret = IcmpSendEcho2(icmp, NULL, NULL, NULL, address, senddata, 0, NULL, replydata2, replysz, 1000); + ok(ret, "IcmpSendEcho2 failed unexpectedly with error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = IcmpSendEcho2(icmp, NULL, NULL, NULL, address, NULL, 0, NULL, replydata2, replysz, 1000); + ok(ret, "IcmpSendEcho2 failed unexpectedly with error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = IcmpSendEcho2(icmp, NULL, NULL, NULL, address, senddata, 0, NULL, replydata2, replysz, 1000); + ok(ret, "IcmpSendEcho2 failed unexpectedly with error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + replysz = sizeof(ICMP_ECHO_REPLY) + sizeof(IO_STATUS_BLOCK) + ICMP_MINLEN; + ret = IcmpSendEcho2(icmp, NULL, NULL, NULL, address, senddata, ICMP_MINLEN, NULL, replydata2, replysz, 1000); + ok(ret, "IcmpSendEcho2 failed unexpectedly with error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + replysz = sizeof(replydata2); + ret = IcmpSendEcho2(icmp, NULL, NULL, NULL, address, senddata, sizeof(senddata), NULL, replydata2, replysz, 1000); + if (!ret) + { + error = GetLastError(); + skip("Failed to ping with error %d, is lo interface down?\n", error); + } + else if (winetest_debug > 1) + { + reply = (ICMP_ECHO_REPLY*)replydata2; + trace("send addr : %s\n", ntoa(address)); + trace("reply addr : %s\n", ntoa(reply->Address)); + trace("reply size : %u\n", replysz); + trace("roundtrip : %u ms\n", reply->RoundTripTime); + trace("status : %u\n", reply->Status); + trace("recv size : %u\n", reply->DataSize); + trace("ttl : %u\n", reply->Options.Ttl); + trace("flags : 0x%x\n", reply->Options.Flags); + } + + SetLastError(0xdeadbeef); + for (i = 0; i < ARRAY_SIZE(senddata); i++) senddata[i] = i & 0xff; + ret = IcmpSendEcho2(icmp, NULL, NULL, NULL, address, senddata, sizeof(senddata), NULL, replydata2, replysz, 1000); + error = GetLastError(); + reply = (ICMP_ECHO_REPLY*)replydata2; + ok(ret, "IcmpSendEcho2 failed unexpectedly\n"); + ok(error == NO_ERROR, "Expect last error: 0x%08x, got: 0x%08x\n", NO_ERROR, error); + ok(ntohl(reply->Address) == INADDR_LOOPBACK, "Address mismatch, expect: %s, got: %s\n", ntoa(INADDR_LOOPBACK), + ntoa(reply->Address)); + ok(reply->Status == IP_SUCCESS, "Expect status: 0x%08x, got: 0x%08x\n", IP_SUCCESS, reply->Status); + ok(reply->DataSize == sizeof(senddata), "Got size: %d\n", reply->DataSize); + ok(!memcmp(senddata, reply->Data, min(sizeof(senddata), reply->DataSize)), "Data mismatch\n"); + + /* asynchronous tests with event */ + SetLastError(0xdeadbeef); + replysz = sizeof(replydata2); + address = htonl(INADDR_LOOPBACK); + memset(senddata, 0, sizeof(senddata)); + ret = IcmpSendEcho2(icmp, event, NULL, NULL, address, senddata, sizeof(senddata), NULL, replydata2, replysz, 1000); + error = GetLastError(); + if (!ret && error != ERROR_IO_PENDING) + { + skip("Failed to ping with error %d, is lo interface down?\n", error); + } + else + { + ok(!ret, "IcmpSendEcho2 returned success unexpectedly\n"); + ok(error == ERROR_IO_PENDING, "Expect last error: 0x%08x, got: 0x%08x\n", ERROR_IO_PENDING, error); + ret = WaitForSingleObjectEx(event, 2000, TRUE); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObjectEx failed unexpectedly with %u\n", ret); + reply = (ICMP_ECHO_REPLY*)replydata2; + ok(ntohl(reply->Address) == INADDR_LOOPBACK, "Address mismatch, expect: %s, got: %s\n", ntoa(INADDR_LOOPBACK), + ntoa(reply->Address)); + ok(reply->Status == IP_SUCCESS, "Expect status: 0x%08x, got: 0x%08x\n", IP_SUCCESS, reply->Status); + ok(reply->DataSize == sizeof(senddata), "Got size: %d\n", reply->DataSize); + if (winetest_debug > 1) + { + reply = (ICMP_ECHO_REPLY*)replydata2; + trace("send addr : %s\n", ntoa(address)); + trace("reply addr : %s\n", ntoa(reply->Address)); + trace("reply size : %u\n", replysz); + trace("roundtrip : %u ms\n", reply->RoundTripTime); + trace("status : %u\n", reply->Status); + trace("recv size : %u\n", reply->DataSize); + trace("ttl : %u\n", reply->Options.Ttl); + trace("flags : 0x%x\n", reply->Options.Flags); + } + } + + SetLastError(0xdeadbeef); + for (i = 0; i < ARRAY_SIZE(senddata); i++) senddata[i] = i & 0xff; + ret = IcmpSendEcho2(icmp, event, NULL, NULL, address, senddata, sizeof(senddata), NULL, replydata2, replysz, 1000); + error = GetLastError(); + ok(!ret, "IcmpSendEcho2 returned success unexpectedly\n"); + ok(error == ERROR_IO_PENDING, "Expect last error: 0x%08x, got: 0x%08x\n", ERROR_IO_PENDING, error); + ret = WaitForSingleObjectEx(event, 2000, TRUE); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObjectEx failed unexpectedly with %u\n", ret); + reply = (ICMP_ECHO_REPLY*)replydata2; + ok(ntohl(reply->Address) == INADDR_LOOPBACK, "Address mismatch, expect: %s, got: %s\n", ntoa(INADDR_LOOPBACK), + ntoa(reply->Address)); + ok(reply->Status == IP_SUCCESS, "Expect status: 0x%08x, got: 0x%08x\n", IP_SUCCESS, reply->Status); + ok(reply->DataSize == sizeof(senddata), "Got size: %d\n", reply->DataSize); + /* pre-Vista, reply->Data is an offset; otherwise it's a pointer, so hardcode the offset */ + ok(!memcmp(senddata, reply + 1, min(sizeof(senddata), reply->DataSize)), "Data mismatch\n"); + + CloseHandle(event); IcmpCloseHandle(icmp); } -- 2.31.1

1 2

[PATCH] vcruntime140_1: Fix compilation with clang.
by Dmitry Timoshkov 08 Oct '21

08 Oct '21

clang -c -o dlls/vcruntime140_1/except_x86_64.cross.o ../wine.src/dlls/vcruntime140_1/except_x86_64.c -Idlls/vcruntime140_1 \ -I../wine.src/dlls/vcruntime140_1 -Iinclude -I../wine.src/include -I../wine.src/include/msvcrt \ -D__WINESRC__ -D_UCRT -DWINE_CROSS_PE -Wall -target x86_64-windows -fno-strict-aliasing \ -Wdeclaration-after-statement -Wempty-body -Wignored-qualifiers -Winit-self -Wno-pragma-pack \ -Wstrict-prototypes -Wtype-limits -Wvla -Wwrite-strings -Wpointer-arith -Wabsolute-value \ -Wno-format -Wnonnull -mcx16 -gdwarf-2 -gstrict-dwarf -g -O2 In file included from ../wine.src/dlls/vcruntime140_1/except_x86_64.c:25: In file included from ../wine.src/include/wine/exception.h:25: ../wine.src/include/winternl.h:4239:82: error: unknown type name 'va_list' NTSYSAPI NTSTATUS WINAPI RtlFormatMessage(LPCWSTR,ULONG,BOOLEAN,BOOLEAN,BOOLEAN,__ms_va_list *,LPWSTR,ULONG,ULONG*); Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/vcruntime140_1/except_x86_64.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/vcruntime140_1/except_x86_64.c b/dlls/vcruntime140_1/except_x86_64.c index 039da37d598..f50847d886d 100644 --- a/dlls/vcruntime140_1/except_x86_64.c +++ b/dlls/vcruntime140_1/except_x86_64.c @@ -20,6 +20,7 @@ #ifdef __x86_64__ +#include <stdarg.h> #include <stdlib.h> #include "wine/exception.h" -- 2.31.1

2 1

[PATCH 1/5] xinput1_3: Wait for CancelIoEx completion when disabling controllers.
by Rémi Bernon 08 Oct '21

08 Oct '21

Otherwise we may later write the cancelled status to invalid memory. Also use a manual-reset event, as it should be for overlapped I/O, so all waiters are waken up on cancel. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Supersedes: 216572-216573 dlls/xinput1_3/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/xinput1_3/main.c b/dlls/xinput1_3/main.c index 81d11e5d38f..1f9d4881751 100644 --- a/dlls/xinput1_3/main.c +++ b/dlls/xinput1_3/main.c @@ -354,6 +354,7 @@ static void controller_disable(struct xinput_controller *controller) controller->enabled = FALSE; CancelIoEx(controller->device, &controller->hid.read_ovl); + WaitForSingleObject(controller->hid.read_ovl.hEvent, INFINITE); SetEvent(update_event); } @@ -365,7 +366,7 @@ static BOOL controller_init(struct xinput_controller *controller, PHIDP_PREPARSE controller->hid.caps = *caps; if (!(controller->hid.feature_report_buf = calloc(1, controller->hid.caps.FeatureReportByteLength))) goto failed; if (!controller_check_caps(controller, device, preparsed)) goto failed; - if (!(event = CreateEventA(NULL, FALSE, FALSE, NULL))) goto failed; + if (!(event = CreateEventW(NULL, TRUE, FALSE, NULL))) goto failed; TRACE("Found gamepad %s\n", debugstr_w(device_path)); -- 2.33.0

1 4

[PATCH] winebus.sys: Fix incorrect length when parsing uevent "HID_NAME=".
by Rémi Bernon 08 Oct '21

08 Oct '21

From: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winebus.sys/bus_udev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index cc54d6490be..2ed9a031af6 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1108,7 +1108,7 @@ static void get_device_subsystem_info(struct udev_device *dev, char const *subsy if (sscanf(ptr, "HID_UNIQ=%256s\n", buffer) == 1) ntdll_umbstowcs(buffer, strlen(buffer) + 1, desc->serialnumber, ARRAY_SIZE(desc->serialnumber)); } - if (!strncmp(ptr, "HID_NAME=", 7)) + if (!strncmp(ptr, "HID_NAME=", 9)) { if (desc->product[0]) continue; if (sscanf(ptr, "HID_NAME=%256s\n", buffer) == 1) -- 2.33.0

1 0

[PATCH] winebus.sys: Fix memory leaks in bus_event_queue functions.
by Rémi Bernon 08 Oct '21

08 Oct '21

From: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winebus.sys/unixlib.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/winebus.sys/unixlib.c b/dlls/winebus.sys/unixlib.c index ea26094049e..f66fd78d176 100644 --- a/dlls/winebus.sys/unixlib.c +++ b/dlls/winebus.sys/unixlib.c @@ -329,7 +329,11 @@ BOOL bus_event_queue_device_removed(struct list *queue, struct unix_device *devi struct bus_event *event = malloc(size); if (!event) return FALSE; - if (unix_device_incref(device) == 1) return FALSE; /* being destroyed */ + if (unix_device_incref(device) == 1) /* being destroyed */ + { + free(event); + return FALSE; + } event->type = BUS_EVENT_TYPE_DEVICE_REMOVED; event->device = device; @@ -344,7 +348,11 @@ BOOL bus_event_queue_device_created(struct list *queue, struct unix_device *devi struct bus_event *event = malloc(size); if (!event) return FALSE; - if (unix_device_incref(device) == 1) return FALSE; /* being destroyed */ + if (unix_device_incref(device) == 1) /* being destroyed */ + { + free(event); + return FALSE; + } event->type = BUS_EVENT_TYPE_DEVICE_CREATED; event->device = device; @@ -360,7 +368,11 @@ BOOL bus_event_queue_input_report(struct list *queue, struct unix_device *device struct bus_event *event = malloc(size); if (!event) return FALSE; - if (unix_device_incref(device) == 1) return FALSE; /* being destroyed */ + if (unix_device_incref(device) == 1) /* being destroyed */ + { + free(event); + return FALSE; + } event->type = BUS_EVENT_TYPE_INPUT_REPORT; event->device = device; -- 2.33.0

1 0

[PATCH] ntdll: Return a failure if the unix call funcs don't exist.
by Huw Davies 08 Oct '21

08 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- This can happen to bcrypt when builtin without gnutls. dlls/ntdll/unix/virtual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 924aa78b306..6db08de6473 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -642,7 +642,7 @@ static NTSTATUS get_builtin_unix_funcs( void *module, BOOL wow, void **funcs ) { if (builtin->module != module) continue; *funcs = dlsym( builtin->unix_handle, ptr_name ); - status = STATUS_SUCCESS; + status = *funcs ? STATUS_SUCCESS : STATUS_ENTRYPOINT_NOT_FOUND; break; } server_leave_uninterrupted_section( &virtual_mutex, &sigset ); -- 2.23.0

1 0

[PATCH 1/4] winebus.sys: Only keep a single read pending.
by Rémi Bernon 08 Oct '21

08 Oct '21

The design of hidclass.sys prevents any concurrent irps, there's no need to queue more. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51824 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winebus.sys/main.c | 49 +++++++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 19 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index c9e930632e2..33b2a609077 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -19,6 +19,7 @@ */ #include <stdarg.h> +#include <assert.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -74,7 +75,7 @@ struct device_extension DWORD last_report_size; BOOL last_report_read; DWORD buffer_size; - LIST_ENTRY irp_queue; + IRP *pending_read; struct unix_device *unix_device; }; @@ -249,17 +250,28 @@ static WCHAR *get_compatible_ids(DEVICE_OBJECT *device) return dst; } +static IRP *pop_pending_read(struct device_extension *ext) +{ + IRP *pending; + + RtlEnterCriticalSection(&ext->cs); + pending = ext->pending_read; + ext->pending_read = NULL; + RtlLeaveCriticalSection(&ext->cs); + + return pending; +} + static void remove_pending_irps(DEVICE_OBJECT *device) { struct device_extension *ext = device->DeviceExtension; - LIST_ENTRY *entry; + IRP *pending; - while ((entry = RemoveHeadList(&ext->irp_queue)) != &ext->irp_queue) + if ((pending = pop_pending_read(ext))) { - IRP *queued_irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry); - queued_irp->IoStatus.Status = STATUS_DELETE_PENDING; - queued_irp->IoStatus.Information = 0; - IoCompleteRequest(queued_irp, IO_NO_INCREMENT); + pending->IoStatus.Status = STATUS_DELETE_PENDING; + pending->IoStatus.Information = 0; + IoCompleteRequest(pending, IO_NO_INCREMENT); } } @@ -295,7 +307,6 @@ static DEVICE_OBJECT *bus_create_hid_device(struct device_desc *desc, struct uni ext->buffer_size = 0; ext->unix_device = unix_device; - InitializeListHead(&ext->irp_queue); InitializeCriticalSection(&ext->cs); ext->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": cs"); @@ -398,9 +409,10 @@ static NTSTATUS deliver_last_report(struct device_extension *ext, DWORD buffer_l static void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length) { - struct device_extension *ext = (struct device_extension*)device->DeviceExtension; + struct device_extension *ext = (struct device_extension *)device->DeviceExtension; + IO_STACK_LOCATION *stack; + ULONG buffer_len; IRP *irp; - LIST_ENTRY *entry; if (!length || !report) return; @@ -427,15 +439,11 @@ static void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length ext->last_report_size = length; ext->last_report_read = FALSE; - while ((entry = RemoveHeadList(&ext->irp_queue)) != &ext->irp_queue) + if ((irp = pop_pending_read(ext))) { - IO_STACK_LOCATION *irpsp; - TRACE_(hid_report)("Processing Request\n"); - irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry); - irpsp = IoGetCurrentIrpStackLocation(irp); - irp->IoStatus.Status = deliver_last_report(ext, - irpsp->Parameters.DeviceIoControl.OutputBufferLength, - irp->UserBuffer, &irp->IoStatus.Information); + stack = IoGetCurrentIrpStackLocation(irp); + buffer_len = stack->Parameters.DeviceIoControl.OutputBufferLength; + irp->IoStatus.Status = deliver_last_report(ext, buffer_len, irp->UserBuffer, &irp->IoStatus.Information); ext->last_report_read = TRUE; IoCompleteRequest(irp, IO_NO_INCREMENT); } @@ -1015,7 +1023,10 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) } else { - InsertTailList(&ext->irp_queue, &irp->Tail.Overlay.ListEntry); + /* hidclass.sys should guarantee this */ + assert(!ext->pending_read); + ext->pending_read = irp; + IoMarkIrpPending(irp); irp->IoStatus.Status = STATUS_PENDING; } break; -- 2.33.0

1 3

[PATCH 01/11] winebus.sys: Add a PID set periodic output report.
by Rémi Bernon 08 Oct '21

08 Oct '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- With this series we should have all non-custom force feedback effect types supported in the dinput HID joystick through PID reports, as well as down in the SDL and UDEV lnxev devices. Any raw device, like UDEV hidraw or IOHID may be supported too, as long as they use the standard PID reports, although it's quite untested. They may expect slightly different usage of the reports. What remains after that is a effect status input report, in order to implement force feedback status functions, and then dropping the other backends to convert dinput(8) to PE. dlls/winebus.sys/bus_sdl.c | 4 ++ dlls/winebus.sys/bus_udev.c | 4 ++ dlls/winebus.sys/hid.c | 107 ++++++++++++++++++++++++++++++++ dlls/winebus.sys/unix_private.h | 13 ++++ 4 files changed, 128 insertions(+) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 4eab51b5cb2..1bec3661757 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -549,6 +549,10 @@ static NTSTATUS sdl_device_physical_effect_update(struct unix_device *iface, BYT effect.periodic.direction.type = SDL_HAPTIC_SPHERICAL; effect.periodic.direction.dir[0] = params->direction[0] * 36000 / 256; effect.periodic.direction.dir[1] = params->direction[1] * 36000 / 256; + effect.periodic.period = params->periodic.period; + effect.periodic.magnitude = params->periodic.magnitude * 128; + effect.periodic.offset = params->periodic.offset; + effect.periodic.phase = params->periodic.phase; break; case PID_USAGE_ET_SPRING: diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index f780aac2785..e60891c2244 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1001,6 +1001,10 @@ static NTSTATUS lnxev_device_physical_effect_update(struct unix_device *iface, B case PID_USAGE_ET_SAWTOOTH_UP: case PID_USAGE_ET_SAWTOOTH_DOWN: FIXME("periodic effect semi-stub!"); + effect.u.periodic.period = params->periodic.period; + effect.u.periodic.magnitude = params->periodic.magnitude * 128; + effect.u.periodic.offset = params->periodic.offset; + effect.u.periodic.phase = params->periodic.phase; break; case PID_USAGE_ET_SPRING: diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index 72d358e6ad7..10e9316eb6c 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -440,8 +440,85 @@ struct pid_effect_update BYTE enable_bits; BYTE direction[2]; }; + +struct pid_set_periodic +{ + BYTE index; + BYTE magnitude; + BYTE offset; + BYTE phase; + UINT16 period; +}; #include "poppack.h" +static BOOL hid_descriptor_add_set_periodic(struct unix_device *iface) +{ + struct hid_report_descriptor *desc = &iface->hid_report_descriptor; + const BYTE report_id = ++desc->next_report_id[HidP_Output]; + const BYTE template[] = + { + /* Periodic Report Definition */ + USAGE(1, PID_USAGE_SET_PERIODIC_REPORT), + COLLECTION(1, Logical), + REPORT_ID(1, report_id), + + USAGE(1, PID_USAGE_EFFECT_BLOCK_INDEX), + LOGICAL_MAXIMUM(1, 0x7f), + LOGICAL_MINIMUM(1, 0x00), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 1), + OUTPUT(1, Data|Var|Abs), + + USAGE(1, PID_USAGE_MAGNITUDE), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(2, 0x00ff), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(2, 10000), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 1), + OUTPUT(1, Data|Var|Abs), + + USAGE(1, PID_USAGE_OFFSET), + LOGICAL_MINIMUM(1, 0x80), + LOGICAL_MAXIMUM(1, 0x7f), + PHYSICAL_MINIMUM(2, -10000), + PHYSICAL_MAXIMUM(2, 10000), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 1), + OUTPUT(1, Data|Var|Abs), + + USAGE(1, PID_USAGE_PHASE), + UNIT(1, 0x14), /* Eng Rot:Angular Pos */ + UNIT_EXPONENT(1, -2), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(2, 0xff), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(4, 36000), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 1), + OUTPUT(1, Data|Var|Abs), + + USAGE(1, PID_USAGE_PERIOD), + UNIT(2, 0x1003), /* Eng Lin:Time */ + UNIT_EXPONENT(1, -3), /* 10^-3 */ + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(2, 0x7fff), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(2, 0x7fff), + REPORT_SIZE(1, 16), + REPORT_COUNT(1, 1), + OUTPUT(1, Data|Var|Abs), + + PHYSICAL_MAXIMUM(1, 0), + UNIT_EXPONENT(1, 0), + UNIT(1, 0), /* None */ + END_COLLECTION, + }; + + iface->hid_physical.set_periodic_report = report_id; + return hid_report_descriptor_append(desc, template, sizeof(template)); +} + BOOL hid_device_add_physical(struct unix_device *iface, USAGE *usages, USHORT count) { struct hid_report_descriptor *desc = &iface->hid_report_descriptor; @@ -592,6 +669,7 @@ BOOL hid_device_add_physical(struct unix_device *iface, USAGE *usages, USHORT co UNIT(1, 0), /* None */ END_COLLECTION, }; + BOOL periodic = FALSE; ULONG i; if (!hid_report_descriptor_append(desc, device_control_header, sizeof(device_control_header))) @@ -624,6 +702,19 @@ BOOL hid_device_add_physical(struct unix_device *iface, USAGE *usages, USHORT co if (!hid_report_descriptor_append(desc, effect_update_footer, sizeof(effect_update_footer))) return FALSE; + for (i = 0; i < count; ++i) + { + if (usages[i] == PID_USAGE_ET_SINE || + usages[i] == PID_USAGE_ET_SQUARE || + usages[i] == PID_USAGE_ET_TRIANGLE || + usages[i] == PID_USAGE_ET_SAWTOOTH_UP || + usages[i] == PID_USAGE_ET_SAWTOOTH_DOWN) + periodic = TRUE; + } + + if (periodic && !hid_descriptor_add_set_periodic(iface)) + return FALSE; + /* HID nary collection indexes start at 1 */ memcpy(iface->hid_physical.effect_types + 1, usages, count * sizeof(*usages)); @@ -751,6 +842,22 @@ static void hid_device_set_output_report(struct unix_device *iface, HID_XFER_PAC io->Status = iface->hid_vtbl->physical_effect_update(iface, report->index, params); } } + else if (packet->reportId == physical->set_periodic_report) + { + struct pid_set_periodic *report = (struct pid_set_periodic *)(packet->reportBuffer + 1); + struct effect_params *params = iface->hid_physical.effect_params + report->index; + + io->Information = sizeof(*report) + 1; + if (packet->reportBufferLen < io->Information) + io->Status = STATUS_BUFFER_TOO_SMALL; + else + { + params->periodic.magnitude = report->magnitude; + params->periodic.offset = report->offset; + params->periodic.phase = report->phase; + params->periodic.period = report->period; + } + } else { io->Information = 0; diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index 125ee600eb6..5962de7fb10 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -29,6 +29,14 @@ #include "wine/list.h" +struct effect_periodic +{ + BYTE magnitude; + BYTE offset; + BYTE phase; + UINT16 period; +}; + struct effect_params { USAGE effect_type; @@ -41,6 +49,10 @@ struct effect_params BOOL axis_enabled[2]; BOOL direction_enabled; BYTE direction[2]; + union + { + struct effect_periodic periodic; + }; }; struct raw_device_vtbl @@ -112,6 +124,7 @@ struct hid_physical BYTE device_control_report; BYTE effect_control_report; BYTE effect_update_report; + BYTE set_periodic_report; }; struct hid_device_state -- 2.33.0

1 10

[PATCH v6 1/6] robocopy: Add stub
by Florian Eder 08 Oct '21

08 Oct '21

Basic files and required changes to configure(.ac) to create a stub version of the robocopy utility Signed-off-by: Florian Eder <others.meder(a)gmail.com> --- v6: Identical to patch in v5 --- configure | 2 +- configure.ac | 1 + programs/robocopy/Makefile.in | 8 ++++++++ programs/robocopy/main.c | 29 +++++++++++++++++++++++++++++ programs/robocopy/robocopy.rc | 34 ++++++++++++++++++++++++++++++++++ 5 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 programs/robocopy/Makefile.in create mode 100644 programs/robocopy/main.c create mode 100644 programs/robocopy/robocopy.rc diff --git a/configure b/configure index db592f0868d..3a8dee81bbc 100755 --- a/configure +++ b/configure @@ -21235,6 +21235,7 @@ wine_fn_config_makefile programs/regedit/tests enable_tests wine_fn_config_makefile programs/regini enable_regini wine_fn_config_makefile programs/regsvcs enable_regsvcs wine_fn_config_makefile programs/regsvr32 enable_regsvr32 +wine_fn_config_makefile programs/robocopy enable_robocopy wine_fn_config_makefile programs/rpcss enable_rpcss wine_fn_config_makefile programs/rundll.exe16 enable_win16 wine_fn_config_makefile programs/rundll32 enable_rundll32 @@ -22768,4 +22769,3 @@ IFS="$ac_save_IFS" $as_echo " $as_me: Finished. Do '${ac_make}' to compile Wine. " >&6 - diff --git a/configure.ac b/configure.ac index 0bc46a1427b..5bd54cfbba7 100644 --- a/configure.ac +++ b/configure.ac @@ -3959,6 +3959,7 @@ WINE_CONFIG_MAKEFILE(programs/regedit/tests) WINE_CONFIG_MAKEFILE(programs/regini) WINE_CONFIG_MAKEFILE(programs/regsvcs) WINE_CONFIG_MAKEFILE(programs/regsvr32) +WINE_CONFIG_MAKEFILE(programs/robocopy) WINE_CONFIG_MAKEFILE(programs/rpcss) WINE_CONFIG_MAKEFILE(programs/rundll.exe16,enable_win16) WINE_CONFIG_MAKEFILE(programs/rundll32) diff --git a/programs/robocopy/Makefile.in b/programs/robocopy/Makefile.in new file mode 100644 index 00000000000..5a48be3725b --- /dev/null +++ b/programs/robocopy/Makefile.in @@ -0,0 +1,8 @@ +MODULE = robocopy.exe + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + +C_SRCS = \ + main.c + +RC_SRCS = robocopy.rc diff --git a/programs/robocopy/main.c b/programs/robocopy/main.c new file mode 100644 index 00000000000..bbda15f573a --- /dev/null +++ b/programs/robocopy/main.c @@ -0,0 +1,29 @@ +/* + * Copyright 2021 Florian Eder + * + * 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 + */ + +#include "wine/debug.h" +WINE_DEFAULT_DEBUG_CHANNEL(robocopy); + +#define WIN32_LEAN_AND_MEAN +#include <windows.h> + +int __cdecl wmain(int argc, WCHAR *argv[]) +{ + WINE_FIXME("robocopy stub"); + return 1; +} diff --git a/programs/robocopy/robocopy.rc b/programs/robocopy/robocopy.rc new file mode 100644 index 00000000000..edae5b71d86 --- /dev/null +++ b/programs/robocopy/robocopy.rc @@ -0,0 +1,34 @@ +/* + * Copyright 2021 Florian Eder + * + * 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 + */ + +#include <windef.h> + +#pragma makedep po + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define WINE_FILEDESCRIPTION_STR "Wine Robocopy" +#define WINE_FILENAME_STR "robocopy.exe" +#define WINE_FILETYPE VFT_APP +#define WINE_FILEVERSION 5,1,10,1027 +#define WINE_FILEVERSION_STR "5.1.10.1027" + +#define WINE_PRODUCTVERSION 5,1,10,1027 +#define WINE_PRODUCTVERSION_STR "XP027" + +#include "wine/wine_common_ver.rc" -- 2.32.0

3 19

[PATCH] win32u: fix freetype crash.
by Chao Long 08 Oct '21

08 Oct '21

Signed-off-by: Chao Long <longchao(a)uniontech.com> --- dlls/win32u/freetype.c | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/dlls/win32u/freetype.c b/dlls/win32u/freetype.c index b2ca2f545fe..91f97c056e4 100644 --- a/dlls/win32u/freetype.c +++ b/dlls/win32u/freetype.c @@ -2463,6 +2463,7 @@ static BOOL CDECL freetype_load_font( struct gdi_font *font ) if (pFT_New_Memory_Face( library, data_ptr, data_size, font->face_index, &ft_face )) return FALSE; + TRACE("face: %p, charmaps count: %d\n", ft_face, ft_face->num_charmaps); data->ft_face = ft_face; font->scalable = FT_IS_SCALABLE( ft_face ); if (!font->fs.fsCsb[0]) get_fontsig( ft_face, &font->fs ); @@ -2565,20 +2566,24 @@ static BOOL CDECL freetype_get_glyph_index( struct gdi_font *font, UINT *glyph, { FT_Face ft_face = get_ft_face( font ); - if (!use_encoding ^ (ft_face->charmap->encoding == FT_ENCODING_NONE)) return FALSE; - - if (ft_face->charmap->encoding == FT_ENCODING_MS_SYMBOL) + TRACE("face: %p, charmaps count: %d\n", ft_face, ft_face->num_charmaps); + if (ft_face->num_charmaps > 0) { - if (!(*glyph = get_glyph_index_symbol( font, *glyph ))) + if (!use_encoding ^ (ft_face->charmap->encoding == FT_ENCODING_NONE)) return FALSE; + + if (ft_face->charmap->encoding == FT_ENCODING_MS_SYMBOL) { - WCHAR wc = *glyph; - DWORD len; - char ch; + if (!(*glyph = get_glyph_index_symbol( font, *glyph ))) + { + WCHAR wc = *glyph; + DWORD len; + char ch; - len = win32u_wctomb( NULL, &ch, 1, &wc, sizeof(wc) ); - if (len) *glyph = get_glyph_index_symbol( font, (unsigned char)ch ); + len = win32u_wctomb( NULL, &ch, 1, &wc, sizeof(wc) ); + if (len) *glyph = get_glyph_index_symbol( font, (unsigned char)ch ); + } + return TRUE; } - return TRUE; } *glyph = pFT_Get_Char_Index( ft_face, *glyph ); return TRUE; @@ -4002,6 +4007,9 @@ static DWORD CDECL freetype_get_unicode_ranges( struct gdi_font *font, GLYPHSET FT_Face ft_face = get_ft_face( font ); DWORD num_ranges = 0; + if (ft_face->num_charmaps <= 0) + return num_ranges; + if (ft_face->charmap->encoding == FT_ENCODING_UNICODE) { FT_UInt glyph_code; @@ -4187,7 +4195,7 @@ static DWORD CDECL freetype_get_kerning_pairs( struct gdi_font *font, KERNINGPAI return 0; } - if (ft_face->charmap->encoding == FT_ENCODING_UNICODE) + if (ft_face->num_charmaps > 0 && ft_face->charmap->encoding == FT_ENCODING_UNICODE) { FT_UInt glyph_code; FT_ULong char_code; @@ -4214,10 +4222,15 @@ static DWORD CDECL freetype_get_kerning_pairs( struct gdi_font *font, KERNINGPAI } else { - DWORD encoding = RtlUlongByteSwap(ft_face->charmap->encoding); ULONG n; - FIXME("encoding %s not supported\n", debugstr_an((char *)&encoding, 4)); + if (ft_face->num_charmaps > 0) + { + DWORD encoding = RtlUlongByteSwap(ft_face->charmap->encoding); + + FIXME("encoding %s not supported\n", debugstr_an((char *)&encoding, 4)); + } + for (n = 0; n <= 65535; n++) glyph_to_char[n] = (USHORT)n; } -- 2.20.1

1 0

[PATCH 1/3] server: Do not allocate a connect_req structure for nonblocking sockets (Valgrind).
by Zebediah Figura 08 Oct '21

08 Oct '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- server/sock.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/sock.c b/server/sock.c index 396447a0aa4..9cc634d3771 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2290,9 +2290,6 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) if (!send_len) return; } - if (!(req = mem_alloc( sizeof(*req) ))) - return; - sock->state = SOCK_CONNECTING; if (params->synchronous && sock->nonblocking) @@ -2302,6 +2299,9 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return; } + if (!(req = mem_alloc( sizeof(*req) ))) + return; + req->async = (struct async *)grab_object( async ); req->iosb = async_get_iosb( async ); req->sock = (struct sock *)grab_object( sock ); -- 2.33.0

1 2

[PATCH] ucrtbase: Add support for x mode in fopen
by Ted Lyngmo 08 Oct '21

08 Oct '21

This fixes bug 51846: Standard library call fopen(..., "wx") not recognized - causes destruction of data. Signed-off-by: Ted Lyngmo <ted(a)lyncon.se> --- dlls/msvcrt/file.c | 5 +++++ dlls/ucrtbase/tests/misc.c | 25 +++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index b0eeaf2a351..3b36d087822 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1586,6 +1586,11 @@ static int msvcrt_get_flags(const wchar_t* mode, int *open_flags, int* stream_fl *open_flags |= _O_TEXT; *open_flags &= ~_O_BINARY; break; +#if _MSVCR_VER>=140 + case 'x': + *open_flags |= _O_EXCL; + break; +#endif case 'D': *open_flags |= _O_TEMPORARY; break; diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index c2b6dc18d28..c16307ecccb 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -1539,6 +1539,30 @@ static void test_fenv(void) ok(!except, "expected 0, got %lx\n", except); } +static void test_fopen_exclusive( void ) +{ + static const char * const testfile = "fileexcl.tst"; + FILE *fp; + + fp = fopen(testfile, "wx"); + ok(fp != NULL, "creating file with mode wx failed\n"); + fclose(fp); + + fp = fopen(testfile, "wx"); + ok(fp == NULL, "overwrote existing file with mode wx\n"); + + unlink(testfile); + + fp = fopen(testfile, "w+x"); + ok(fp != NULL, "creating file with mode w+x failed\n"); + fclose(fp); + + fp = fopen(testfile, "w+x"); + ok(fp == NULL, "overwrote existing file with mode w+x\n"); + + unlink(testfile); +} + START_TEST(misc) { int arg_c; @@ -1580,4 +1604,5 @@ START_TEST(misc) test_clock(); test_thread_storage(); test_fenv(); + test_fopen_exclusive(); } -- 2.31.1

2 1

[PATCH 9/9] user32: Fix window style while CBT_CREATEWND hook is called.
by Piotr Caban 08 Oct '21

08 Oct '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/user32/tests/win.c | 17 +++++++---------- dlls/user32/win.c | 40 +++++++++++++++++++++++++++------------- server/protocol.def | 2 ++ server/window.c | 2 ++ 4 files changed, 38 insertions(+), 23 deletions(-)

2 1

[PATCH 2/2] vbscript: Handle Recursive calls.
by Robert Wilhelm 07 Oct '21

07 Oct '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50758 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/vbscript/interp.c | 14 ++++++++------ dlls/vbscript/tests/lang.vbs | 24 ++++++++++++++++++++++++ dlls/vbscript/vbscript.h | 1 + 3 files changed, 33 insertions(+), 6 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index e2c1d5cc53d..6064eea5bb0 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -134,7 +134,9 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ DISPID id; HRESULT hres; - if((ctx->func->type == FUNC_FUNCTION || ctx->func->type == FUNC_PROPGET) + TRACE("%s %d\n", debugstr_w(name), invoke_type); + + if((invoke_type != VBDISP_CALLGET) && (ctx->func->type == FUNC_FUNCTION || ctx->func->type == FUNC_PROPGET) && !wcsicmp(name, ctx->func->name)) { ref->type = REF_VAR; ref->u.v = &ctx->ret_val; @@ -615,7 +617,7 @@ static HRESULT variant_call(exec_ctx_t *ctx, VARIANT *v, unsigned arg_cnt, VARIA return S_OK; } -static HRESULT do_icall(exec_ctx_t *ctx, VARIANT *res, BSTR identifier, unsigned arg_cnt) +static HRESULT do_icall(exec_ctx_t *ctx, VARIANT *res, BSTR identifier, vbdisp_invoke_type_t invoke_type, unsigned arg_cnt) { DISPPARAMS dp; ref_t ref; @@ -623,7 +625,7 @@ static HRESULT do_icall(exec_ctx_t *ctx, VARIANT *res, BSTR identifier, unsigned TRACE("%s %u\n", debugstr_w(identifier), arg_cnt); - hres = lookup_identifier(ctx, identifier, VBDISP_CALLGET, &ref); + hres = lookup_identifier(ctx, identifier, invoke_type, &ref); if(FAILED(hres)) return hres; @@ -692,7 +694,7 @@ static HRESULT interp_icall(exec_ctx_t *ctx) TRACE("\n"); - hres = do_icall(ctx, &v, identifier, arg_cnt); + hres = do_icall(ctx, &v, identifier, VBDISP_CALLGET, arg_cnt); if(FAILED(hres)) return hres; @@ -706,7 +708,7 @@ static HRESULT interp_icallv(exec_ctx_t *ctx) TRACE("\n"); - return do_icall(ctx, NULL, identifier, arg_cnt); + return do_icall(ctx, NULL, identifier, VBDISP_CALLGET, arg_cnt); } static HRESULT interp_vcall(exec_ctx_t *ctx) @@ -800,7 +802,7 @@ static HRESULT interp_ident(exec_ctx_t *ctx) TRACE("%s\n", debugstr_w(identifier)); - hres = do_icall(ctx, &v, identifier, 0); + hres = do_icall(ctx, &v, identifier, VBDISP_IDENT, 0); if(FAILED(hres)) return hres; diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index d7865301784..dc2acbae69c 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1882,6 +1882,30 @@ set arr(0) = new TestPropSyntax arr(0).prop = 1 ok arr(0).prop = 1, "arr(0) = " & arr(0).prop +function recursingfunction(x) + if (x) then exit function + recursingfunction = 2 + dim y + y = recursingfunction + call ok(y = 2, "y = " & y) + recursingfunction = 1 + call recursingfunction(True) +end function +call ok(recursingfunction(False) = 1, "unexpected return value " & recursingfunction(False)) + +x = false +function recursingfunction2 + if (x) then exit function + recursingfunction2 = 2 + dim y + y = recursingfunction2 + call ok(y = 2, "y = " & y) + recursingfunction2 = 1 + x = true + recursingfunction2() +end function +call ok(recursingfunction2() = 1, "unexpected return value " & recursingfunction2()) + function f2(x,y) end function diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index f5353b33cae..b23df0fc589 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -57,6 +57,7 @@ typedef struct _vbdisp_t vbdisp_t; typedef enum { VBDISP_CALLGET, + VBDISP_IDENT, VBDISP_LET, VBDISP_SET, VBDISP_ANY -- 2.31.1

2 5

[PATCH] vbscript: Handle recursive call.
by Robert Wilhelm 07 Oct '21

07 Oct '21

You must not lookup return value for recursive call. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50758 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/vbscript/interp.c | 4 +++- dlls/vbscript/tests/lang.vbs | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index f648f073bc8..18446ffb4a2 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -135,7 +135,9 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ HRESULT hres; if((ctx->func->type == FUNC_FUNCTION || ctx->func->type == FUNC_PROPGET) - && !wcsicmp(name, ctx->func->name)) { + && !wcsicmp(name, ctx->func->name) + /* you must not use return value for recursive call */ + && ((invoke_type != VBDISP_CALLGET) || ((invoke_type == VBDISP_CALLGET) && ( V_VT(&ctx->ret_val) == VT_DISPATCH)))) { ref->type = REF_VAR; ref->u.v = &ctx->ret_val; return S_OK; diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index d7865301784..cea34fa40a8 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1882,6 +1882,12 @@ set arr(0) = new TestPropSyntax arr(0).prop = 1 ok arr(0).prop = 1, "arr(0) = " & arr(0).prop +function recursingfunction(x) + if (x) then exit function + call recursingfunction(True) +end function +call recursingfunction(False) + function f2(x,y) end function -- 2.31.1

3 8

[v2 PATCH 1/8] d3d10/effect: Use effect variable pointers to store per-pass shader objects.
by Nikolay Sivov 07 Oct '21

07 Oct '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/d3d10_private.h | 12 +++++-- dlls/d3d10/effect.c | 74 +++++++++++++++++++------------------- dlls/d3d10/tests/effect.c | 28 +++++++++++++++ 3 files changed, 75 insertions(+), 39 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 1ebbbd11ea3..f799d27b323 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -226,6 +226,12 @@ struct d3d10_effect_variable } u; }; +struct d3d10_effect_pass_shader_desc +{ + struct d3d10_effect_variable *shader; + unsigned int index; +}; + /* ID3D10EffectPass */ struct d3d10_effect_pass { @@ -238,9 +244,9 @@ struct d3d10_effect_pass struct d3d10_effect_object *objects; struct d3d10_effect_variable *annotations; - D3D10_PASS_SHADER_DESC vs; - D3D10_PASS_SHADER_DESC ps; - D3D10_PASS_SHADER_DESC gs; + struct d3d10_effect_pass_shader_desc vs; + struct d3d10_effect_pass_shader_desc ps; + struct d3d10_effect_pass_shader_desc gs; UINT stencil_ref; UINT sample_mask; float blend_factor[4]; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 301c7cb55dd..dd4e04d6374 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1944,8 +1944,8 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, ID3D10EffectShaderVariable *sv = variable->lpVtbl->AsShader(variable); if (FAILED(hr = sv->lpVtbl->GetVertexShader(sv, variable_idx, &o->object.vs))) return hr; - o->pass->vs.pShaderVariable = sv; - o->pass->vs.ShaderIndex = variable_idx; + o->pass->vs.shader = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)sv); + o->pass->vs.index = variable_idx; break; } @@ -1954,8 +1954,8 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, ID3D10EffectShaderVariable *sv = variable->lpVtbl->AsShader(variable); if (FAILED(hr = sv->lpVtbl->GetPixelShader(sv, variable_idx, &o->object.ps))) return hr; - o->pass->ps.pShaderVariable = sv; - o->pass->ps.ShaderIndex = variable_idx; + o->pass->ps.shader = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)sv); + o->pass->ps.index = variable_idx; break; } @@ -1964,8 +1964,8 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, ID3D10EffectShaderVariable *sv = variable->lpVtbl->AsShader(variable); if (FAILED(hr = sv->lpVtbl->GetGeometryShader(sv, variable_idx, &o->object.gs))) return hr; - o->pass->gs.pShaderVariable = sv; - o->pass->gs.ShaderIndex = variable_idx; + o->pass->gs.shader = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)sv); + o->pass->gs.index = variable_idx; break; } @@ -2018,9 +2018,9 @@ static HRESULT parse_fx10_pass(const char *data, size_t data_size, return E_OUTOFMEMORY; } - p->vs.pShaderVariable = (ID3D10EffectShaderVariable *)&null_shader_variable.ID3D10EffectVariable_iface; - p->ps.pShaderVariable = (ID3D10EffectShaderVariable *)&null_shader_variable.ID3D10EffectVariable_iface; - p->gs.pShaderVariable = (ID3D10EffectShaderVariable *)&null_shader_variable.ID3D10EffectVariable_iface; + p->vs.shader = &null_shader_variable; + p->ps.shader = &null_shader_variable; + p->gs.shader = &null_shader_variable; for (i = 0; i < p->object_count; ++i) { @@ -3819,7 +3819,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetDesc(ID3D10EffectPass *ifa return E_INVALIDARG; } - s = &impl_from_ID3D10EffectShaderVariable(pass->vs.pShaderVariable)->u.shader; + s = &pass->vs.shader->u.shader; desc->Name = pass->name; desc->Annotations = pass->annotation_count; @@ -3843,23 +3843,24 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetDesc(ID3D10EffectPass *ifa static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetVertexShaderDesc(ID3D10EffectPass *iface, D3D10_PASS_SHADER_DESC *desc) { - struct d3d10_effect_pass *This = impl_from_ID3D10EffectPass(iface); + struct d3d10_effect_pass *pass = impl_from_ID3D10EffectPass(iface); - TRACE("iface %p, desc %p\n", iface, desc); + TRACE("iface %p, desc %p.\n", iface, desc); - if (This == &null_pass) + if (pass == &null_pass) { - WARN("Null pass specified\n"); + WARN("Null pass specified.\n"); return E_FAIL; } if (!desc) { - WARN("Invalid argument specified\n"); + WARN("Invalid argument specified.\n"); return E_INVALIDARG; } - *desc = This->vs; + desc->pShaderVariable = (ID3D10EffectShaderVariable *)&pass->vs.shader->ID3D10EffectVariable_iface; + desc->ShaderIndex = pass->vs.index; return S_OK; } @@ -3867,23 +3868,24 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetVertexShaderDesc(ID3D10Eff static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetGeometryShaderDesc(ID3D10EffectPass *iface, D3D10_PASS_SHADER_DESC *desc) { - struct d3d10_effect_pass *This = impl_from_ID3D10EffectPass(iface); + struct d3d10_effect_pass *pass = impl_from_ID3D10EffectPass(iface); - TRACE("iface %p, desc %p\n", iface, desc); + TRACE("iface %p, desc %p.\n", iface, desc); - if (This == &null_pass) + if (pass == &null_pass) { - WARN("Null pass specified\n"); + WARN("Null pass specified.\n"); return E_FAIL; } if (!desc) { - WARN("Invalid argument specified\n"); + WARN("Invalid argument specified.\n"); return E_INVALIDARG; } - *desc = This->gs; + desc->pShaderVariable = (ID3D10EffectShaderVariable *)&pass->gs.shader->ID3D10EffectVariable_iface; + desc->ShaderIndex = pass->gs.index; return S_OK; } @@ -3891,23 +3893,24 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetGeometryShaderDesc(ID3D10E static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetPixelShaderDesc(ID3D10EffectPass *iface, D3D10_PASS_SHADER_DESC *desc) { - struct d3d10_effect_pass *This = impl_from_ID3D10EffectPass(iface); + struct d3d10_effect_pass *pass = impl_from_ID3D10EffectPass(iface); - TRACE("iface %p, desc %p\n", iface, desc); + TRACE("iface %p, desc %p.\n", iface, desc); - if (This == &null_pass) + if (pass == &null_pass) { - WARN("Null pass specified\n"); + WARN("Null pass specified.\n"); return E_FAIL; } if (!desc) { - WARN("Invalid argument specified\n"); + WARN("Invalid argument specified.\n"); return E_INVALIDARG; } - *desc = This->ps; + desc->pShaderVariable = (ID3D10EffectShaderVariable *)&pass->ps.shader->ID3D10EffectVariable_iface; + desc->ShaderIndex = pass->ps.index; return S_OK; } @@ -3992,9 +3995,8 @@ static void set_sampler(ID3D10Device *device, D3D10_SHADER_VARIABLE_TYPE shader_ } } -static void apply_shader_resources(ID3D10Device *device, struct ID3D10EffectShaderVariable *variable) +static void apply_shader_resources(ID3D10Device *device, struct d3d10_effect_variable *v) { - struct d3d10_effect_variable *v = impl_from_ID3D10EffectShaderVariable(variable); struct d3d10_effect_shader_variable *sv = &v->u.shader; struct d3d10_effect_shader_resource *sr; struct d3d10_effect_variable *rsrc_v; @@ -4092,12 +4094,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_Apply(ID3D10EffectPass *iface if (flags) FIXME("Ignoring flags (%#x)\n", flags); - if (pass->vs.pShaderVariable != (ID3D10EffectShaderVariable *)&null_shader_variable.ID3D10EffectVariable_iface) - apply_shader_resources(device, pass->vs.pShaderVariable); - if (pass->gs.pShaderVariable != (ID3D10EffectShaderVariable *)&null_shader_variable.ID3D10EffectVariable_iface) - apply_shader_resources(device, pass->gs.pShaderVariable); - if (pass->ps.pShaderVariable != (ID3D10EffectShaderVariable *)&null_shader_variable.ID3D10EffectVariable_iface) - apply_shader_resources(device, pass->ps.pShaderVariable); + if (pass->vs.shader != &null_shader_variable) + apply_shader_resources(device, pass->vs.shader); + if (pass->gs.shader != &null_shader_variable) + apply_shader_resources(device, pass->gs.shader); + if (pass->ps.shader != &null_shader_variable) + apply_shader_resources(device, pass->ps.shader); for (i = 0; i < pass->object_count; ++i) { diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 3561e99f338..06c5aa68776 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -2911,6 +2911,7 @@ static void test_effect_local_shader(void) *p3_anon_vs, *p3_anon_ps, *p3_anon_gs, *p6_vs, *p6_ps, *p6_gs, *gs, *ps, *vs; D3D10_EFFECT_SHADER_DESC shaderdesc; D3D10_SIGNATURE_PARAMETER_DESC sign; + D3D10_STATE_BLOCK_MASK mask; ID3D10Device *device; ULONG refcount; @@ -3010,6 +3011,20 @@ if (0) /* pass 0 */ p = t->lpVtbl->GetPassByIndex(t, 0); + + /* Pass without Set*Shader() instructions */ + hr = D3D10StateBlockMaskDisableAll(&mask); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = p->lpVtbl->ComputeStateBlockMask(p, &mask); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_VS, 0); + ok(!ret, "Unexpected mask.\n"); + ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_PS, 0); + ok(!ret, "Unexpected mask.\n"); + ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_GS, 0); + ok(!ret, "Unexpected mask.\n"); + hr = p->lpVtbl->GetVertexShaderDesc(p, &pdesc); ok(hr == S_OK, "GetVertexShaderDesc got %x, expected %x\n", hr, S_OK); ok(pdesc.pShaderVariable == null_shader, "Got %p, expected %p\n", pdesc.pShaderVariable, null_shader); @@ -3145,6 +3160,19 @@ if (0) ok(typedesc.UnpackedSize == 0x0, "UnpackedSize is %#x, expected 0x0\n", typedesc.UnpackedSize); ok(typedesc.Stride == 0x0, "Stride is %#x, expected 0x0\n", typedesc.Stride); + /* Pass is using Set*Shader(NULL) */ + hr = D3D10StateBlockMaskDisableAll(&mask); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = p->lpVtbl->ComputeStateBlockMask(p, &mask); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_VS, 0); + ok(ret, "Unexpected mask.\n"); + ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_PS, 0); + ok(ret, "Unexpected mask.\n"); + ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_GS, 0); + ok(ret, "Unexpected mask.\n"); +} /* pass 2 */ p = t->lpVtbl->GetPassByIndex(t, 2); -- 2.33.0

3 19

[PATCH 1/2] d3dx10: Add stubs for D3DX10CreateTextureFromFile{A,W}.
by Ziqing Hui 07 Oct '21

07 Oct '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d3dx10_43/d3dx10_43.spec | 4 ++-- dlls/d3dx10_43/texture.c | 16 ++++++++++++++++ include/d3dx10tex.h | 6 ++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index 8bc9451aeab..af349afae02 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -42,8 +42,8 @@ @ stub D3DX10CreateShaderResourceViewFromResourceW(ptr long wstr ptr ptr ptr ptr) @ stub D3DX10CreateSkinInfo(ptr) @ stdcall D3DX10CreateSprite(ptr long ptr) -@ stub D3DX10CreateTextureFromFileA(ptr str ptr ptr ptr ptr) -@ stub D3DX10CreateTextureFromFileW(ptr wstr ptr ptr ptr ptr) +@ stdcall D3DX10CreateTextureFromFileA(ptr str ptr ptr ptr ptr) +@ stdcall D3DX10CreateTextureFromFileW(ptr wstr ptr ptr ptr ptr) @ stdcall D3DX10CreateTextureFromMemory(ptr ptr long ptr ptr ptr ptr) @ stub D3DX10CreateTextureFromResourceA(ptr long str ptr ptr ptr ptr) @ stub D3DX10CreateTextureFromResourceW(ptr long wstr ptr ptr ptr ptr) diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c index 32215b0a99a..5aca98610a9 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -573,6 +573,22 @@ end: return S_OK; } +HRESULT WINAPI D3DX10CreateTextureFromFileA(ID3D10Device *device, const char *src_file, + D3DX10_IMAGE_LOAD_INFO *load_info, ID3DX10ThreadPump *pump, ID3D10Resource **texture, HRESULT *hresult) +{ + FIXME("device %p, src_file %s, load_info %p, pump %p, texture %p, hresult %p stub!\n", + device, debugstr_a(src_file), load_info, pump, texture, hresult); + return E_NOTIMPL; +} + +HRESULT WINAPI D3DX10CreateTextureFromFileW(ID3D10Device *device, const WCHAR *src_file, + D3DX10_IMAGE_LOAD_INFO *load_info, ID3DX10ThreadPump *pump, ID3D10Resource **texture, HRESULT *hresult) +{ + FIXME("device %p, src_file %s, load_info %p, pump %p, texture %p, hresult %p stub!\n", + device, debugstr_w(src_file), load_info, pump, texture, hresult); + return E_NOTIMPL; +} + HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *src_data, SIZE_T src_data_size, D3DX10_IMAGE_LOAD_INFO *load_info, ID3DX10ThreadPump *pump, ID3D10Resource **texture, HRESULT *hresult) { diff --git a/include/d3dx10tex.h b/include/d3dx10tex.h index 0f92fd38e6e..022afdd51d9 100644 --- a/include/d3dx10tex.h +++ b/include/d3dx10tex.h @@ -156,6 +156,12 @@ HRESULT WINAPI D3DX10GetImageInfoFromResourceW(HMODULE module, const WCHAR *reso HRESULT WINAPI D3DX10GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX10ThreadPump *pump, D3DX10_IMAGE_INFO *img_info, HRESULT *hresult); +HRESULT WINAPI D3DX10CreateTextureFromFileA(ID3D10Device *device, const char *src_file, + D3DX10_IMAGE_LOAD_INFO *load_info, ID3DX10ThreadPump *pump, ID3D10Resource **texture, HRESULT *hresult); +HRESULT WINAPI D3DX10CreateTextureFromFileW(ID3D10Device *device, const WCHAR *src_file, + D3DX10_IMAGE_LOAD_INFO *load_info, ID3DX10ThreadPump *pump, ID3D10Resource **texture, HRESULT *hresult); +#define D3DX10CreateTextureFromFile WINELIB_NAME_AW(D3DX10CreateTextureFromFile) + HRESULT WINAPI D3DX10LoadTextureFromTexture(ID3D10Resource *src_texture, D3DX10_TEXTURE_LOAD_INFO *load_info, ID3D10Resource *dst_texture); -- 2.25.1

2 3

[PATCH] ntoskrnl.exe: Fix use-after-free when freeing IRP.
by Daniel Lehman 07 Oct '21

07 Oct '21

1 0

[PATCH vkd3d v3 1/5] vkd3d-shader/hlsl: Parse texture types.
by Zebediah Figura 07 Oct '21

07 Oct '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 21 +++++++++++++++++++-- libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.y | 20 ++++++++++++++++++++ 3 files changed, 40 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index f03777a65..6462ce8fc 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -261,6 +261,21 @@ struct hlsl_type *hlsl_new_struct_type(struct hlsl_ctx *ctx, const char *name, s return type; } +struct hlsl_type *hlsl_new_texture_type(struct hlsl_ctx *ctx, enum hlsl_sampler_dim dim) +{ + struct hlsl_type *type; + + if (!(type = vkd3d_calloc(1, sizeof(*type)))) + return NULL; + type->type = HLSL_CLASS_OBJECT; + type->base_type = HLSL_TYPE_TEXTURE; + type->dimx = 4; + type->dimy = 1; + type->sampler_dim = dim; + list_add_tail(&ctx->types, &type->entry); + return type; +} + struct hlsl_type *hlsl_get_type(struct hlsl_scope *scope, const char *name, bool recursive) { struct rb_entry *entry = rb_get(&scope->types, name); @@ -329,7 +344,8 @@ bool hlsl_types_are_equal(const struct hlsl_type *t1, const struct hlsl_type *t2 return false; if (t1->base_type != t2->base_type) return false; - if (t1->base_type == HLSL_TYPE_SAMPLER && t1->sampler_dim != t2->sampler_dim) + if ((t1->base_type == HLSL_TYPE_SAMPLER || t1->base_type == HLSL_TYPE_TEXTURE) + && t1->sampler_dim != t2->sampler_dim) return false; if ((t1->modifiers & HLSL_MODIFIER_ROW_MAJOR) != (t2->modifiers & HLSL_MODIFIER_ROW_MAJOR)) @@ -734,7 +750,8 @@ static int compare_param_hlsl_types(const struct hlsl_type *t1, const struct hls } if (t1->base_type != t2->base_type) return t1->base_type - t2->base_type; - if (t1->base_type == HLSL_TYPE_SAMPLER && t1->sampler_dim != t2->sampler_dim) + if ((t1->base_type == HLSL_TYPE_SAMPLER || t1->base_type == HLSL_TYPE_TEXTURE) + && t1->sampler_dim != t2->sampler_dim) return t1->sampler_dim - t2->sampler_dim; if (t1->dimx != t2->dimx) return t1->dimx - t2->dimx; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 77b4ce928..65c6f34e0 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -655,6 +655,7 @@ struct hlsl_ir_swizzle *hlsl_new_swizzle(struct hlsl_ctx *ctx, DWORD s, unsigned struct hlsl_ir_node *val, struct vkd3d_shader_location *loc); struct hlsl_ir_var *hlsl_new_synthetic_var(struct hlsl_ctx *ctx, const char *name, struct hlsl_type *type, const struct vkd3d_shader_location loc); +struct hlsl_type *hlsl_new_texture_type(struct hlsl_ctx *ctx, enum hlsl_sampler_dim dim); struct hlsl_ir_constant *hlsl_new_uint_constant(struct hlsl_ctx *ctx, unsigned int n, const struct vkd3d_shader_location loc); struct hlsl_ir_node *hlsl_new_unary_expr(struct hlsl_ctx *ctx, enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 6f1794e79..b8149950d 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2451,6 +2451,26 @@ type: { $$ = ctx->builtin_types.sampler[HLSL_SAMPLER_DIM_3D]; } + | KW_TEXTURE + { + $$ = hlsl_new_texture_type(ctx, HLSL_SAMPLER_DIM_GENERIC); + } + | KW_TEXTURE1D + { + $$ = hlsl_new_texture_type(ctx, HLSL_SAMPLER_DIM_1D); + } + | KW_TEXTURE2D + { + $$ = hlsl_new_texture_type(ctx, HLSL_SAMPLER_DIM_2D); + } + | KW_TEXTURE3D + { + $$ = hlsl_new_texture_type(ctx, HLSL_SAMPLER_DIM_3D); + } + | KW_TEXTURECUBE + { + $$ = hlsl_new_texture_type(ctx, HLSL_SAMPLER_DIM_CUBE); + } | TYPE_IDENTIFIER { $$ = hlsl_get_type(ctx->cur_scope, $1, true); -- 2.33.0

1 4

[PATCH 8/9] user32: Fix style passed to HCBT_CREATEWND hook.
by Piotr Caban 07 Oct '21

07 Oct '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/user32/tests/win.c | 12 ++++++------ dlls/user32/win.c | 6 ------ 2 files changed, 6 insertions(+), 12 deletions(-)

2 1

[PATCH 6/9] user32: Update exstyle when setting style in SetWindowLong.
by Piotr Caban 07 Oct '21

07 Oct '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/user32/tests/win.c | 14 ++++++-------- dlls/user32/win.c | 6 +++--- 2 files changed, 9 insertions(+), 11 deletions(-)

2 1

[PATCH 4/9] user32: Simplify CreateWindow condition for setting WS_EX_WINDOWEDGE style.
by Piotr Caban 07 Oct '21

07 Oct '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/user32/win.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)

2 1

[v2 PATCH 3/5] wined3d: Declare gl_Position as invariant.
by Matteo Bruni 07 Oct '21

07 Oct '21

All D3D versions seem to basically guarantee invariance for the vertex position at the very least. In practice, desktop GL implementations also do the same. That's not necessarily the case for tile based renderers, where the cost of providing invariance might be non negligible. We want this behavior though, so let's ask for it explicitly. Based on a patch by Stefan Dösinger. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Move the invariant declaration in shader_glsl_generate_ffp_vertex_shader() in the proper place... Supersedes patch 216446. dlls/wined3d/glsl_shader.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index fb809052d83..c131cf61766 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2184,6 +2184,9 @@ static void shader_generate_glsl_declarations(const struct wined3d_context_gl *c if (map & 1) shader_addline(buffer, "void subroutine%u();\n", i); } + if (version->type != WINED3D_SHADER_TYPE_PIXEL && version->type != WINED3D_SHADER_TYPE_COMPUTE) + shader_addline(buffer, "invariant gl_Position;\n"); + /* Declare the constants (aka uniforms) */ if (shader->limits->constant_float > 0) { @@ -7125,6 +7128,8 @@ static GLuint shader_glsl_generate_vs3_rasterizer_input_setup(struct shader_glsl shader_glsl_add_version_declaration(buffer, gl_info); + shader_addline(buffer, "invariant gl_Position;\n"); + if (per_vertex_point_size) { shader_addline(buffer, "uniform struct\n{\n"); @@ -8994,6 +8999,8 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr if (shader_glsl_use_explicit_attrib_location(gl_info)) shader_addline(buffer, "#extension GL_ARB_explicit_attrib_location : enable\n"); + shader_addline(buffer, "invariant gl_Position;\n"); + for (i = 0; i < WINED3D_FFP_ATTRIBS_COUNT; ++i) { const char *type = i < ARRAY_SIZE(attrib_info) ? attrib_info[i].type : "vec4"; -- 2.26.3

3 2

[PATCH 2/9] user32/tests: Test style returned by GetWindowLong in WM_CREATE.
by Piotr Caban 07 Oct '21

07 Oct '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/user32/tests/win.c | 65 ++++++++++++++++++++++++----------------- 1 file changed, 39 insertions(+), 26 deletions(-)

2 1

[PATCH vkd3d] vkd3d-shader: Allow a NULL buffer in vkd3d_string_buffer.
by Giovanni Mascellani 07 Oct '21

07 Oct '21

Semantically, a NULL buffer is considered equivalent to the empty string. The accessor vkd3d_string_buffer_data implements this equivalence. The reason for this change is to avoid asserting the result of a memory allocation in vkd3d_string_buffer_init, while at the same time keeping it always successful. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/glsl.c | 2 +- libs/vkd3d-shader/hlsl.c | 9 ++++--- libs/vkd3d-shader/hlsl.y | 34 +++++++++++++----------- libs/vkd3d-shader/hlsl_codegen.c | 8 +++--- libs/vkd3d-shader/hlsl_sm1.c | 2 +- libs/vkd3d-shader/hlsl_sm4.c | 5 ++-- libs/vkd3d-shader/preproc.l | 7 ++--- libs/vkd3d-shader/spirv.c | 2 +- libs/vkd3d-shader/trace.c | 2 +- libs/vkd3d-shader/vkd3d_shader_main.c | 25 ++++++++++------- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 11 files changed, 57 insertions(+), 40 deletions(-) diff --git a/libs/vkd3d-shader/glsl.c b/libs/vkd3d-shader/glsl.c index 7e028d23..fec412b1 100644 --- a/libs/vkd3d-shader/glsl.c +++ b/libs/vkd3d-shader/glsl.c @@ -127,7 +127,7 @@ int vkd3d_glsl_generator_generate(struct vkd3d_glsl_generator *generator, if ((code = vkd3d_malloc(generator->buffer.buffer_size))) { - memcpy(code, generator->buffer.buffer, generator->buffer.content_size); + memcpy(code, vkd3d_string_buffer_data(&generator->buffer), generator->buffer.content_size); out->size = generator->buffer.content_size; out->code = code; } diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 66ca389a..e64d8808 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -64,7 +64,8 @@ void hlsl_fixme(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, co string = hlsl_get_string_buffer(ctx); vkd3d_string_buffer_printf(string, "Aborting due to not yet implemented feature: "); vkd3d_string_buffer_vprintf(string, fmt, args); - vkd3d_shader_error(ctx->message_context, &loc, VKD3D_SHADER_ERROR_HLSL_NOT_IMPLEMENTED, "%s", string->buffer); + vkd3d_shader_error(ctx->message_context, &loc, VKD3D_SHADER_ERROR_HLSL_NOT_IMPLEMENTED, + "%s", vkd3d_string_buffer_data(string)); hlsl_release_string_buffer(ctx, string); va_end(args); @@ -855,7 +856,7 @@ struct vkd3d_string_buffer *hlsl_type_to_string(struct hlsl_ctx *ctx, const stru if ((inner_string = hlsl_type_to_string(ctx, t))) { - vkd3d_string_buffer_printf(string, "%s", inner_string->buffer); + vkd3d_string_buffer_printf(string, "%s", vkd3d_string_buffer_data(inner_string)); hlsl_release_string_buffer(ctx, inner_string); } @@ -881,7 +882,7 @@ const char *debug_hlsl_type(struct hlsl_ctx *ctx, const struct hlsl_type *type) if (!(string = hlsl_type_to_string(ctx, type))) return NULL; - ret = vkd3d_dbg_sprintf("%s", string->buffer); + ret = vkd3d_dbg_sprintf("%s", vkd3d_string_buffer_data(string)); hlsl_release_string_buffer(ctx, string); return ret; } @@ -975,7 +976,7 @@ static void dump_ir_var(struct hlsl_ctx *ctx, struct vkd3d_string_buffer *buffer struct vkd3d_string_buffer *string; if ((string = hlsl_modifiers_to_string(ctx, var->modifiers))) - vkd3d_string_buffer_printf(buffer, "%s ", string->buffer); + vkd3d_string_buffer_printf(buffer, "%s ", vkd3d_string_buffer_data(string)); hlsl_release_string_buffer(ctx, string); } vkd3d_string_buffer_printf(buffer, "%s %s", debug_hlsl_type(ctx, var->data_type), var->name); diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index d1ef9eb4..4f5e629d 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -274,7 +274,8 @@ static struct hlsl_ir_node *add_implicit_conversion(struct hlsl_ctx *ctx, struct dst_string = hlsl_type_to_string(ctx, dst_type); if (src_string && dst_string) hlsl_error(ctx, *loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, - "Can't implicitly convert from %s to %s.", src_string->buffer, dst_string->buffer); + "Can't implicitly convert from %s to %s.", + vkd3d_string_buffer_data(src_string), vkd3d_string_buffer_data(dst_string)); hlsl_release_string_buffer(ctx, src_string); hlsl_release_string_buffer(ctx, dst_string); return NULL; @@ -298,7 +299,7 @@ static DWORD add_modifiers(struct hlsl_ctx *ctx, DWORD modifiers, DWORD mod, con if ((string = hlsl_modifiers_to_string(ctx, mod))) hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, - "Modifier '%s' was already specified.", string->buffer); + "Modifier '%s' was already specified.", vkd3d_string_buffer_data(string)); hlsl_release_string_buffer(ctx, string); return modifiers; } @@ -919,7 +920,8 @@ static struct hlsl_type *expr_common_type(struct hlsl_ctx *ctx, struct hlsl_type if ((string = hlsl_type_to_string(ctx, t1))) hlsl_error(ctx, *loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, - "Expression of type \"%s\" cannot be used in a numeric expression.", string->buffer); + "Expression of type \"%s\" cannot be used in a numeric expression.", + vkd3d_string_buffer_data(string)); hlsl_release_string_buffer(ctx, string); return NULL; } @@ -930,7 +932,8 @@ static struct hlsl_type *expr_common_type(struct hlsl_ctx *ctx, struct hlsl_type if ((string = hlsl_type_to_string(ctx, t2))) hlsl_error(ctx, *loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, - "Expression of type \"%s\" cannot be used in a numeric expression.", string->buffer); + "Expression of type \"%s\" cannot be used in a numeric expression.", + vkd3d_string_buffer_data(string)); hlsl_release_string_buffer(ctx, string); return NULL; } @@ -946,7 +949,7 @@ static struct hlsl_type *expr_common_type(struct hlsl_ctx *ctx, struct hlsl_type if (t1_string && t2_string) hlsl_error(ctx, *loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, "Expression data types \"%s\" and \"%s\" are incompatible.", - t1_string->buffer, t2_string->buffer); + vkd3d_string_buffer_data(t1_string), vkd3d_string_buffer_data(t2_string)); hlsl_release_string_buffer(ctx, t1_string); hlsl_release_string_buffer(ctx, t2_string); return NULL; @@ -1410,7 +1413,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t if ((string = hlsl_modifiers_to_string(ctx, modifiers & invalid))) hlsl_error(ctx, var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, - "Modifiers '%s' are not allowed on local variables.", string->buffer); + "Modifiers '%s' are not allowed on local variables.", vkd3d_string_buffer_data(string)); hlsl_release_string_buffer(ctx, string); } if (var->semantic.name) @@ -1673,7 +1676,7 @@ static struct list *add_call(struct hlsl_ctx *ctx, const char *name, if ((string = hlsl_type_to_string(ctx, params->args[i]->data_type))) hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, "Wrong type for argument %u of '%s': expected a numeric type, but got '%s'.\n", - i + 1, name, string->buffer); + i + 1, name, vkd3d_string_buffer_data(string)); hlsl_release_string_buffer(ctx, string); free_parse_initializer(params); return NULL; @@ -1725,7 +1728,7 @@ static struct list *add_constructor(struct hlsl_ctx *ctx, struct hlsl_type *type if ((string = hlsl_type_to_string(ctx, arg->data_type))) hlsl_error(ctx, arg->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, - "Invalid type %s for constructor argument.", string->buffer); + "Invalid type %s for constructor argument.", vkd3d_string_buffer_data(string)); hlsl_release_string_buffer(ctx, string); continue; } @@ -2171,7 +2174,8 @@ field: if ((string = hlsl_modifiers_to_string(ctx, modifiers))) hlsl_error(ctx, @1, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, - "Modifiers '%s' are not allowed on struct fields.", string->buffer); + "Modifiers '%s' are not allowed on struct fields.", + vkd3d_string_buffer_data(string)); hlsl_release_string_buffer(ctx, string); } $$ = gen_struct_fields(ctx, type, $3); @@ -2355,7 +2359,7 @@ input_mods: if ((string = hlsl_modifiers_to_string(ctx, $2))) hlsl_error(ctx, @2, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, - "Modifier \"%s\" was already specified.", string->buffer); + "Modifier \"%s\" was already specified.", vkd3d_string_buffer_data(string)); hlsl_release_string_buffer(ctx, string); YYABORT; } @@ -2386,7 +2390,7 @@ type: string = hlsl_type_to_string(ctx, $3); if (string) hlsl_error(ctx, @3, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, - "Vector base type %s is not scalar.", string->buffer); + "Vector base type %s is not scalar.", vkd3d_string_buffer_data(string)); hlsl_release_string_buffer(ctx, string); YYABORT; } @@ -2408,7 +2412,7 @@ type: string = hlsl_type_to_string(ctx, $3); if (string) hlsl_error(ctx, @3, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, - "Matrix base type %s is not scalar.", string->buffer); + "Matrix base type %s is not scalar.", vkd3d_string_buffer_data(string)); hlsl_release_string_buffer(ctx, string); YYABORT; } @@ -2779,7 +2783,7 @@ selection_statement: if ((string = hlsl_type_to_string(ctx, condition->data_type))) hlsl_error(ctx, instr->node.loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, - "if condition type %s is not scalar.", string->buffer); + "if condition type %s is not scalar.", vkd3d_string_buffer_data(string)); hlsl_release_string_buffer(ctx, string); } $$ = $3; @@ -3022,7 +3026,7 @@ postfix_expr: if ((string = hlsl_type_to_string(ctx, $2))) hlsl_error(ctx, @2, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, - "Constructor data type %s is not numeric.", string->buffer); + "Constructor data type %s is not numeric.", vkd3d_string_buffer_data(string)); hlsl_release_string_buffer(ctx, string); free_parse_initializer(&$4); YYABORT; @@ -3106,7 +3110,7 @@ unary_expr: dst_string = hlsl_type_to_string(ctx, dst_type); if (src_string && dst_string) hlsl_error(ctx, @3, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, "Can't cast from %s to %s.", - src_string->buffer, dst_string->buffer); + vkd3d_string_buffer_data(src_string), vkd3d_string_buffer_data(dst_string)); hlsl_release_string_buffer(ctx, src_string); hlsl_release_string_buffer(ctx, dst_string); YYABORT; diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 9c9a3837..2240f489 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -45,7 +45,7 @@ static void prepend_uniform_copy(struct hlsl_ctx *ctx, struct list *instrs, stru if (!(name = hlsl_get_string_buffer(ctx))) return; vkd3d_string_buffer_printf(name, "<temp-%s>", temp->name); - temp->name = hlsl_strdup(ctx, name->buffer); + temp->name = hlsl_strdup(ctx, vkd3d_string_buffer_data(name)); hlsl_release_string_buffer(ctx, name); if (!(load = hlsl_new_var_load(ctx, uniform, temp->loc))) @@ -76,7 +76,8 @@ static void prepend_input_copy(struct hlsl_ctx *ctx, struct list *instrs, struct return; } new_semantic.index = semantic->index; - if (!(input = hlsl_new_var(ctx, hlsl_strdup(ctx, name->buffer), type, var->loc, &new_semantic, 0, NULL))) + if (!(input = hlsl_new_var(ctx, hlsl_strdup(ctx, vkd3d_string_buffer_data(name)), + type, var->loc, &new_semantic, 0, NULL))) { hlsl_release_string_buffer(ctx, name); vkd3d_free((void *)new_semantic.name); @@ -147,7 +148,8 @@ static void append_output_copy(struct hlsl_ctx *ctx, struct list *instrs, struct return; } new_semantic.index = semantic->index; - if (!(output = hlsl_new_var(ctx, hlsl_strdup(ctx, name->buffer), type, var->loc, &new_semantic, 0, NULL))) + if (!(output = hlsl_new_var(ctx, hlsl_strdup(ctx, vkd3d_string_buffer_data(name)), + type, var->loc, &new_semantic, 0, NULL))) { vkd3d_free((void *)new_semantic.name); hlsl_release_string_buffer(ctx, name); diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index ee2870ec..e64ca5f2 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -326,7 +326,7 @@ static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffe } vkd3d_string_buffer_printf(name, "$%s", var->name); vkd3d_free((char *)var->name); - var->name = hlsl_strdup(ctx, name->buffer); + var->name = hlsl_strdup(ctx, vkd3d_string_buffer_data(name)); hlsl_release_string_buffer(ctx, name); } } diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index f7249431..05612806 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -187,7 +187,8 @@ static void write_sm4_signature(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc, default: if ((string = hlsl_type_to_string(ctx, var->data_type))) hlsl_error(ctx, var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, - "Invalid data type %s for semantic variable %s.", string->buffer, var->name); + "Invalid data type %s for semantic variable %s.", + vkd3d_string_buffer_data(string), var->name); hlsl_release_string_buffer(ctx, string); put_u32(&buffer, D3D_REGISTER_COMPONENT_UNKNOWN); } @@ -1165,7 +1166,7 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, struct vkd3d_string_buffer *string; if ((string = hlsl_type_to_string(ctx, expr->node.data_type))) - hlsl_fixme(ctx, expr->node.loc, "SM4 %s expression.", string->buffer); + hlsl_fixme(ctx, expr->node.loc, "SM4 %s expression.", vkd3d_string_buffer_data(string)); hlsl_release_string_buffer(ctx, string); break; } diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index bf4d669f..75b8e358 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -321,7 +321,8 @@ static bool preproc_push_expansion(struct preproc_ctx *ctx, return false; exp = &ctx->expansion_stack[ctx->expansion_count++]; exp->text = text; - exp->buffer.lexer_buffer = yy_scan_bytes(text->text.buffer, text->text.content_size, ctx->scanner); + exp->buffer.lexer_buffer = yy_scan_bytes(vkd3d_string_buffer_data(&text->text), + text->text.content_size, ctx->scanner); exp->buffer.location = text->location; exp->macro = macro; TRACE("Expansion stack size is now %zu.\n", ctx->expansion_count); @@ -465,7 +466,7 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) { for (i = 0; i < expansion->text.content_size; ++i) { - char c = expansion->text.buffer[i]; + char c = vkd3d_string_buffer_data(&expansion->text)[i]; if (c == '\\' || c == '"') vkd3d_string_buffer_printf(&ctx->buffer, "\\"); @@ -804,7 +805,7 @@ int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, vkd3d_string_buffer_cleanup(&ctx.buffer); return VKD3D_ERROR_OUT_OF_MEMORY; } - memcpy(output_code, ctx.buffer.buffer, ctx.buffer.content_size); + memcpy(output_code, vkd3d_string_buffer_data(&ctx.buffer), ctx.buffer.content_size); out->size = ctx.buffer.content_size; out->code = output_code; vkd3d_string_buffer_trace(&ctx.buffer); diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f604b8ef..1894e140 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2632,7 +2632,7 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor if (shader_interface->binding_count) { struct vkd3d_string_buffer *buffer = vkd3d_shader_register_range_string(compiler, range); - const char *range_str = buffer ? buffer->buffer : ""; + const char *range_str = buffer ? vkd3d_string_buffer_data(buffer) : ""; FIXME("Could not find descriptor binding for type %#x, space %u, registers %s, shader type %#x.\n", descriptor_type, range->space, range_str, compiler->shader_type); vkd3d_dxbc_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_DESCRIPTOR_BINDING_NOT_FOUND, diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 45f38d13..340a4968 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1938,7 +1938,7 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(struct vkd3d_shader_parser *parser, if ((code = vkd3d_malloc(buffer->content_size))) { - memcpy(code, buffer->buffer, buffer->content_size); + memcpy(code, vkd3d_string_buffer_data(buffer), buffer->content_size); out->size = buffer->content_size; out->code = code; } diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index ef9eaef5..8a2dd0e3 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -25,11 +25,9 @@ VKD3D_DEBUG_ENV_NAME("VKD3D_SHADER_DEBUG"); void vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer) { - buffer->buffer_size = 16; + buffer->buffer_size = 0; buffer->content_size = 0; - buffer->buffer = vkd3d_malloc(buffer->buffer_size); - assert(buffer->buffer); - memset(buffer->buffer, 0, buffer->buffer_size); + buffer->buffer = NULL; } void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer) @@ -37,20 +35,29 @@ void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer) vkd3d_free(buffer->buffer); } +const char *vkd3d_string_buffer_data(const struct vkd3d_string_buffer *buffer) +{ + return buffer->buffer ? buffer->buffer : ""; +} + static void vkd3d_string_buffer_clear(struct vkd3d_string_buffer *buffer) { - buffer->buffer[0] = '\0'; - buffer->content_size = 0; + if (buffer->buffer) + { + buffer->buffer[0] = '\0'; + buffer->content_size = 0; + } } static bool vkd3d_string_buffer_resize(struct vkd3d_string_buffer *buffer, int rc) { - unsigned int new_buffer_size = rc >= 0 ? buffer->content_size + rc + 1 : buffer->buffer_size * 2; + unsigned int new_buffer_size = rc >= 0 ? buffer->content_size + rc + 1 : max(32, buffer->buffer_size * 2); if (!vkd3d_array_reserve((void **)&buffer->buffer, &buffer->buffer_size, new_buffer_size, 1)) { ERR("Failed to grow buffer.\n"); - buffer->buffer[buffer->content_size] = '\0'; + if (buffer->buffer) + buffer->buffer[buffer->content_size] = '\0'; return false; } return true; @@ -194,7 +201,7 @@ bool vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_cont if (!(messages = vkd3d_malloc(context->messages.content_size + 1))) return false; - memcpy(messages, context->messages.buffer, context->messages.content_size + 1); + memcpy(messages, vkd3d_string_buffer_data(&context->messages), context->messages.content_size + 1); *out = messages; return true; } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index fa56ba1d..0bad2aa3 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -926,6 +926,7 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(struct vkd3d_shader_parser *parser, void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer); struct vkd3d_string_buffer *vkd3d_string_buffer_get(struct vkd3d_string_buffer_cache *list); void vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer); +const char *vkd3d_string_buffer_data(const struct vkd3d_string_buffer *buffer); void vkd3d_string_buffer_cache_cleanup(struct vkd3d_string_buffer_cache *list); void vkd3d_string_buffer_cache_init(struct vkd3d_string_buffer_cache *list); int vkd3d_string_buffer_printf(struct vkd3d_string_buffer *buffer, const char *format, ...) VKD3D_PRINTF_FUNC(2, 3); -- 2.33.0

3 7

[PATCH 7/9] user32/tests: Test window style in HCBT_CREATEWND hook.
by Piotr Caban 07 Oct '21

07 Oct '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/user32/tests/win.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-)

1 0

[PATCH 5/9] user32: Add helper for setting WS_EX_WINDOWEDGE flag.
by Piotr Caban 07 Oct '21

07 Oct '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/user32/win.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-)

1 0

[PATCH 3/9] user32/tests: Don't use the same condition in ok and todo_wine_if.
by Piotr Caban 07 Oct '21

07 Oct '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/user32/tests/win.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)

1 0

[PATCH 1/9] user32/tests: Print context in window style tests.
by Piotr Caban 07 Oct '21

07 Oct '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/user32/tests/win.c | 93 ++++++++++++++++++++++++----------------- 1 file changed, 54 insertions(+), 39 deletions(-)

1 0

[PATCH] include: Use __builtin_offsetof on Clang.
by Jacek Caban 07 Oct '21

07 Oct '21

Fixes a number of warning on MSVC target. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/stddef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH vkd3d 5/5] vkd3d: Create and write descriptor sets for root signature unbounded ranges.
by Henri Verbeet 07 Oct '21

07 Oct '21

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d/command.c | 120 +++++++++++++++++++----- libs/vkd3d/device.c | 114 +++++++++++++++++++++++ libs/vkd3d/resource.c | 9 ++ libs/vkd3d/state.c | 181 ++++++++++++++++++++++++++++++++----- libs/vkd3d/vkd3d_private.h | 40 +++++++- tests/d3d12.c | 18 ++-- 6 files changed, 424 insertions(+), 58 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 9f4a4149..118fc4bb 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1,6 +1,7 @@ /* * Copyright 2016 Józef Kucia for CodeWeavers * Copyright 2016 Henri Verbeet for CodeWeavers + * Copyright 2021 Conor McCarthy for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1363,10 +1364,12 @@ static VkDescriptorPool d3d12_command_allocator_allocate_descriptor_pool( } static VkDescriptorSet d3d12_command_allocator_allocate_descriptor_set( - struct d3d12_command_allocator *allocator, VkDescriptorSetLayout vk_set_layout) + struct d3d12_command_allocator *allocator, VkDescriptorSetLayout vk_set_layout, + unsigned int variable_binding_size, bool unbounded) { struct d3d12_device *device = allocator->device; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + VkDescriptorSetVariableDescriptorCountAllocateInfoEXT set_size; struct VkDescriptorSetAllocateInfo set_desc; VkDevice vk_device = device->vk_device; VkDescriptorSet vk_descriptor_set; @@ -1382,6 +1385,14 @@ static VkDescriptorSet d3d12_command_allocator_allocate_descriptor_set( set_desc.descriptorPool = allocator->vk_descriptor_pool; set_desc.descriptorSetCount = 1; set_desc.pSetLayouts = &vk_set_layout; + if (unbounded) + { + set_desc.pNext = &set_size; + set_size.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_ALLOCATE_INFO_EXT; + set_size.pNext = NULL; + set_size.descriptorSetCount = 1; + set_size.pDescriptorCounts = &variable_binding_size; + } if ((vr = VK_CALL(vkAllocateDescriptorSets(vk_device, &set_desc, &vk_descriptor_set))) >= 0) return vk_descriptor_set; @@ -2562,7 +2573,12 @@ static void d3d12_command_list_prepare_descriptors(struct d3d12_command_list *li enum vkd3d_pipeline_bind_point bind_point) { struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point]; + unsigned int variable_binding_size, unbounded_offset, table_index, heap_size, i; const struct d3d12_root_signature *root_signature = bindings->root_signature; + const struct d3d12_descriptor_set_layout *layout; + struct d3d12_device *device = list->device; + const struct d3d12_desc *base_descriptor; + VkDescriptorSet vk_descriptor_set; if (bindings->descriptor_set_count && !bindings->in_use) return; @@ -2579,9 +2595,33 @@ static void d3d12_command_list_prepare_descriptors(struct d3d12_command_list *li * by an update command, or freed) between when the command is recorded * and when the command completes executing on the queue." */ - bindings->descriptor_sets[0] = d3d12_command_allocator_allocate_descriptor_set(list->allocator, - root_signature->vk_set_layouts[root_signature->main_set]); - bindings->descriptor_set_count = 1; + bindings->descriptor_set_count = 0; + for (i = root_signature->main_set; i < root_signature->vk_set_count; ++i) + { + layout = &root_signature->descriptor_set_layouts[i]; + unbounded_offset = layout->unbounded_offset; + table_index = layout->table_index; + variable_binding_size = 0; + + if (unbounded_offset != UINT_MAX + /* Descriptors may not be set, eg. WoW. */ + && (base_descriptor = d3d12_desc_from_gpu_handle(bindings->descriptor_tables[table_index]))) + { + heap_size = vkd3d_gpu_descriptor_allocator_range_size_from_descriptor( + &device->gpu_descriptor_allocator, base_descriptor); + + if (heap_size < unbounded_offset) + WARN("Descriptor heap size %u is less than the offset %u of an unbounded range in table %u, " + "vk set %u.\n", heap_size, unbounded_offset, table_index, i); + else + variable_binding_size = heap_size - unbounded_offset; + } + + vk_descriptor_set = d3d12_command_allocator_allocate_descriptor_set(list->allocator, + layout->vk_layout, variable_binding_size, unbounded_offset != UINT_MAX); + bindings->descriptor_sets[bindings->descriptor_set_count++] = vk_descriptor_set; + } + bindings->in_use = false; bindings->descriptor_table_dirty_mask |= bindings->descriptor_table_active_mask & root_signature->descriptor_table_mask; @@ -2596,13 +2636,14 @@ static bool vk_write_descriptor_set_from_d3d12_desc(VkWriteDescriptorSet *vk_des uint32_t descriptor_range_magic = range->descriptor_magic; const struct vkd3d_view *view = descriptor->u.view; uint32_t vk_binding = range->binding; + uint32_t set = range->set; if (descriptor->magic != descriptor_range_magic) return false; vk_descriptor_write->sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; vk_descriptor_write->pNext = NULL; - vk_descriptor_write->dstSet = vk_descriptor_sets[0]; + vk_descriptor_write->dstSet = vk_descriptor_sets[set]; vk_descriptor_write->dstBinding = use_array ? vk_binding : vk_binding + index; vk_descriptor_write->dstArrayElement = use_array ? index : 0; vk_descriptor_write->descriptorCount = 1; @@ -2620,12 +2661,26 @@ static bool vk_write_descriptor_set_from_d3d12_desc(VkWriteDescriptorSet *vk_des case VKD3D_DESCRIPTOR_MAGIC_SRV: case VKD3D_DESCRIPTOR_MAGIC_UAV: /* We use separate bindings for buffer and texture SRVs/UAVs. - * See d3d12_root_signature_init(). */ - if (!use_array) - vk_descriptor_write->dstBinding = vk_binding + 2 * index; - if (descriptor->vk_descriptor_type != VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER - && descriptor->vk_descriptor_type != VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER) - ++vk_descriptor_write->dstBinding; + * See d3d12_root_signature_init(). For unbounded ranges the + * descriptors exist in two consecutive sets, otherwise they occur + * in pairs in one set. */ + if (range->descriptor_count == UINT_MAX) + { + if (descriptor->vk_descriptor_type != VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER + && descriptor->vk_descriptor_type != VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER) + { + vk_descriptor_write->dstSet = vk_descriptor_sets[set + 1]; + vk_descriptor_write->dstBinding = 0; + } + } + else + { + if (!use_array) + vk_descriptor_write->dstBinding = vk_binding + 2 * index; + if (descriptor->vk_descriptor_type != VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER + && descriptor->vk_descriptor_type != VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER) + ++vk_descriptor_write->dstBinding; + } if (descriptor->vk_descriptor_type == VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER || descriptor->vk_descriptor_type == VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER) @@ -2673,19 +2728,38 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list VkDevice vk_device = list->device->vk_device; unsigned int i, j, k, descriptor_count; struct d3d12_desc *descriptor; + unsigned int write_count = 0; + bool unbounded = false; descriptor_table = root_signature_get_descriptor_table(root_signature, index); - descriptor_count = 0; current_descriptor_write = descriptor_writes; current_image_info = image_infos; for (i = 0; i < descriptor_table->range_count; ++i) { range = &descriptor_table->ranges[i]; + /* The first unbounded range of each type is written until the heap end is reached. Do not repeat. */ + if (unbounded && i && range->type == descriptor_table->ranges[i - 1].type) + continue; + descriptor = base_descriptor + range->offset; - for (j = 0; j < range->descriptor_count; ++j, ++descriptor) + descriptor_count = range->descriptor_count; + if ((unbounded = descriptor_count == UINT_MAX)) + { + descriptor_count = vkd3d_gpu_descriptor_allocator_range_size_from_descriptor( + &list->device->gpu_descriptor_allocator, descriptor); + + if (descriptor_count > range->vk_binding_count) + { + ERR("Heap descriptor count %u exceeds maximum Vulkan count %u. Reducing to the Vulkan maximum.\n", + descriptor_count, range->vk_binding_count); + descriptor_count = range->vk_binding_count; + } + } + + for (j = 0; j < descriptor_count; ++j, ++descriptor) { unsigned int register_idx = range->base_register_idx + j; @@ -2707,25 +2781,29 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list } } + /* Not all descriptors are necessarily populated if the range is unbounded. */ + if (descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_FREE) + continue; + if (!vk_write_descriptor_set_from_d3d12_desc(current_descriptor_write, current_image_info, descriptor, range, bindings->descriptor_sets, j, root_signature->use_descriptor_arrays)) continue; - ++descriptor_count; + ++write_count; ++current_descriptor_write; ++current_image_info; - if (descriptor_count == ARRAY_SIZE(descriptor_writes)) + if (write_count == ARRAY_SIZE(descriptor_writes)) { - VK_CALL(vkUpdateDescriptorSets(vk_device, descriptor_count, descriptor_writes, 0, NULL)); - descriptor_count = 0; + VK_CALL(vkUpdateDescriptorSets(vk_device, write_count, descriptor_writes, 0, NULL)); + write_count = 0; current_descriptor_write = descriptor_writes; current_image_info = image_infos; } } } - VK_CALL(vkUpdateDescriptorSets(vk_device, descriptor_count, descriptor_writes, 0, NULL)); + VK_CALL(vkUpdateDescriptorSets(vk_device, write_count, descriptor_writes, 0, NULL)); } static bool vk_write_descriptor_set_from_root_descriptor(VkWriteDescriptorSet *vk_descriptor_write, @@ -2850,8 +2928,8 @@ static void d3d12_command_list_update_uav_counter_descriptors(struct d3d12_comma uav_counter_count = state->uav_counters.binding_count; if (!(vk_descriptor_writes = vkd3d_calloc(uav_counter_count, sizeof(*vk_descriptor_writes)))) return; - if (!(vk_descriptor_set = d3d12_command_allocator_allocate_descriptor_set(list->allocator, - state->uav_counters.vk_set_layout))) + if (!(vk_descriptor_set = d3d12_command_allocator_allocate_descriptor_set( + list->allocator, state->uav_counters.vk_set_layout, 0, false))) goto done; for (i = 0; i < uav_counter_count; ++i) @@ -4946,7 +5024,7 @@ static void d3d12_command_list_clear_uav(struct d3d12_command_list *list, } if (!(write_set.dstSet = d3d12_command_allocator_allocate_descriptor_set( - list->allocator, pipeline.vk_set_layout))) + list->allocator, pipeline.vk_set_layout, 0, false))) { ERR("Failed to allocate descriptor set.\n"); return; diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 0fadb521..320a759a 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2173,6 +2173,118 @@ static void vkd3d_gpu_va_allocator_cleanup(struct vkd3d_gpu_va_allocator *alloca pthread_mutex_destroy(&allocator->mutex); } +bool vkd3d_gpu_descriptor_allocator_register_range(struct vkd3d_gpu_descriptor_allocator *allocator, + const struct d3d12_desc *base, size_t count) +{ + struct vkd3d_gpu_descriptor_allocation *allocation; + int rc; + + if ((rc = pthread_mutex_lock(&allocator->mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); + return false; + } + + if (!vkd3d_array_reserve((void **)&allocator->allocations, &allocator->allocations_size, + allocator->allocation_count + 1, sizeof(*allocator->allocations))) + { + pthread_mutex_unlock(&allocator->mutex); + return false; + } + + allocation = &allocator->allocations[allocator->allocation_count++]; + allocation->base = base; + allocation->count = count; + + pthread_mutex_unlock(&allocator->mutex); + + return true; +} + +bool vkd3d_gpu_descriptor_allocator_unregister_range( + struct vkd3d_gpu_descriptor_allocator *allocator, const struct d3d12_desc *base) +{ + bool found; + size_t i; + int rc; + + if ((rc = pthread_mutex_lock(&allocator->mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); + return false; + } + + for (i = 0, found = false; i < allocator->allocation_count; ++i) + { + if (allocator->allocations[i].base != base) + continue; + + if (i != --allocator->allocation_count) + allocator->allocations[i] = allocator->allocations[allocator->allocation_count]; + + found = true; + break; + } + + pthread_mutex_unlock(&allocator->mutex); + + return found; +} + +/* Return the available size from the specified descriptor to the heap end. */ +size_t vkd3d_gpu_descriptor_allocator_range_size_from_descriptor( + struct vkd3d_gpu_descriptor_allocator *allocator, const struct d3d12_desc *desc) +{ + struct vkd3d_gpu_descriptor_allocation *allocation; + size_t remaining, offset, i; + int rc; + + if ((rc = pthread_mutex_lock(&allocator->mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); + return 0; + } + + for (i = 0, remaining = 0; i < allocator->allocation_count; ++i) + { + allocation = &allocator->allocations[i]; + + if (desc < allocation->base) + continue; + + offset = desc - allocation->base; + if (offset >= allocation->count) + continue; + + remaining = allocation->count - offset; + break; + } + + pthread_mutex_unlock(&allocator->mutex); + + return remaining; +} + +static bool vkd3d_gpu_descriptor_allocator_init(struct vkd3d_gpu_descriptor_allocator *allocator) +{ + int rc; + + memset(allocator, 0, sizeof(*allocator)); + if ((rc = pthread_mutex_init(&allocator->mutex, NULL))) + { + ERR("Failed to initialise mutex, error %d.\n", rc); + return false; + } + + return true; +} + +static void vkd3d_gpu_descriptor_allocator_cleanup(struct vkd3d_gpu_descriptor_allocator *allocator) +{ + vkd3d_free(allocator->allocations); + pthread_mutex_destroy(&allocator->mutex); +} + /* ID3D12Device */ static inline struct d3d12_device *impl_from_ID3D12Device(ID3D12Device *iface) { @@ -2227,6 +2339,7 @@ static ULONG STDMETHODCALLTYPE d3d12_device_Release(ID3D12Device *iface) vkd3d_uav_clear_state_cleanup(&device->uav_clear_state, device); vkd3d_destroy_null_resources(&device->null_resources, device); vkd3d_gpu_va_allocator_cleanup(&device->gpu_va_allocator); + vkd3d_gpu_descriptor_allocator_cleanup(&device->gpu_descriptor_allocator); vkd3d_render_pass_cache_cleanup(&device->render_pass_cache, device); vkd3d_fence_worker_stop(&device->fence_worker, device); d3d12_device_destroy_pipeline_cache(device); @@ -3729,6 +3842,7 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, goto out_destroy_null_resources; vkd3d_render_pass_cache_init(&device->render_pass_cache); + vkd3d_gpu_descriptor_allocator_init(&device->gpu_descriptor_allocator); vkd3d_gpu_va_allocator_init(&device->gpu_va_allocator); for (i = 0; i < ARRAY_SIZE(device->desc_mutex); ++i) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 1ca23a90..a51f5795 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -3351,6 +3351,10 @@ static ULONG STDMETHODCALLTYPE d3d12_descriptor_heap_Release(ID3D12DescriptorHea { d3d12_desc_destroy(&descriptors[i], device); } + + if (device->vk_info.EXT_descriptor_indexing && !vkd3d_gpu_descriptor_allocator_unregister_range( + &device->gpu_descriptor_allocator, descriptors)) + ERR("Failed to unregister descriptor range.\n"); break; } @@ -3547,6 +3551,11 @@ HRESULT d3d12_descriptor_heap_create(struct d3d12_device *device, memset(object->descriptors, 0, descriptor_size * desc->NumDescriptors); + if ((desc->Type == D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV || desc->Type == D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER) + && device->vk_info.EXT_descriptor_indexing && !vkd3d_gpu_descriptor_allocator_register_range( + &device->gpu_descriptor_allocator, (struct d3d12_desc *)object->descriptors, desc->NumDescriptors)) + ERR("Failed to register descriptor range.\n"); + TRACE("Created descriptor heap %p.\n", object); *descriptor_heap = object; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 990b49b2..78b0c717 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1,6 +1,7 @@ /* * Copyright 2016 Józef Kucia for CodeWeavers * Copyright 2016 Henri Verbeet for CodeWeavers + * Copyright 2021 Conor McCarthy for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -57,6 +58,14 @@ static ULONG STDMETHODCALLTYPE d3d12_root_signature_AddRef(ID3D12RootSignature * return refcount; } +static void d3d12_descriptor_set_layout_cleanup( + struct d3d12_descriptor_set_layout *layout, struct d3d12_device *device) +{ + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + + VK_CALL(vkDestroyDescriptorSetLayout(device->vk_device, layout->vk_layout, NULL)); +} + static void d3d12_root_signature_cleanup(struct d3d12_root_signature *root_signature, struct d3d12_device *device) { @@ -66,7 +75,9 @@ static void d3d12_root_signature_cleanup(struct d3d12_root_signature *root_signa if (root_signature->vk_pipeline_layout) VK_CALL(vkDestroyPipelineLayout(device->vk_device, root_signature->vk_pipeline_layout, NULL)); for (i = 0; i < root_signature->vk_set_count; ++i) - VK_CALL(vkDestroyDescriptorSetLayout(device->vk_device, root_signature->vk_set_layouts[i], NULL)); + { + d3d12_descriptor_set_layout_cleanup(&root_signature->descriptor_set_layouts[i], device); + } if (root_signature->parameters) { @@ -370,10 +381,10 @@ static HRESULT d3d12_root_signature_info_count_descriptors(struct d3d12_root_sig info->binding_count += binding_count; } - if (unbounded) + if (unbounded && !use_array) { - FIXME("Unhandled unbounded descriptor range.\n"); - return E_NOTIMPL; + FIXME("The device does not support unbounded descriptor ranges.\n"); + return E_FAIL; } return S_OK; @@ -526,6 +537,8 @@ struct vkd3d_descriptor_set_context { VkDescriptorSetLayoutBinding *current_binding; VkDescriptorSetLayoutBinding *first_binding; + unsigned int table_index; + unsigned int unbounded_offset; unsigned int descriptor_index; uint32_t descriptor_binding; }; @@ -544,24 +557,30 @@ static bool vkd3d_validate_descriptor_set_count(struct d3d12_device *device, uns } static HRESULT vkd3d_create_descriptor_set_layout(struct d3d12_device *device, - VkDescriptorSetLayoutCreateFlags flags, unsigned int binding_count, + VkDescriptorSetLayoutCreateFlags flags, unsigned int binding_count, bool unbounded, const VkDescriptorSetLayoutBinding *bindings, VkDescriptorSetLayout *set_layout); static HRESULT d3d12_root_signature_append_descriptor_set_layout(struct d3d12_root_signature *root_signature, struct vkd3d_descriptor_set_context *context, VkDescriptorSetLayoutCreateFlags flags) { + struct d3d12_descriptor_set_layout *layout; + unsigned int index; HRESULT hr; if (!context->descriptor_binding) return S_OK; - if (!vkd3d_validate_descriptor_set_count(root_signature->device, root_signature->vk_set_count + 1)) + index = root_signature->vk_set_count; + layout = &root_signature->descriptor_set_layouts[index]; + + if (!vkd3d_validate_descriptor_set_count(root_signature->device, index + 1)) return E_INVALIDARG; - if (FAILED(hr = vkd3d_create_descriptor_set_layout(root_signature->device, - flags, context->descriptor_binding, context->first_binding, - &root_signature->vk_set_layouts[root_signature->vk_set_count]))) + if (FAILED(hr = vkd3d_create_descriptor_set_layout(root_signature->device, flags, context->descriptor_binding, + context->unbounded_offset != UINT_MAX, context->first_binding, &layout->vk_layout))) return hr; + layout->table_index = context->table_index; + layout->unbounded_offset = context->unbounded_offset; ++root_signature->vk_set_count; context->current_binding = context->first_binding; @@ -586,6 +605,9 @@ static void d3d12_root_signature_append_vk_binding(struct d3d12_root_signature * mapping->binding.set = root_signature->vk_set_count; mapping->binding.binding = context->descriptor_binding++; mapping->binding.count = descriptor_count; + + if (context->unbounded_offset != UINT_MAX) + d3d12_root_signature_append_descriptor_set_layout(root_signature, context, 0); } static uint32_t d3d12_root_signature_assign_vk_bindings(struct d3d12_root_signature *root_signature, @@ -632,6 +654,16 @@ static uint32_t vkd3d_descriptor_magic_from_d3d12(D3D12_DESCRIPTOR_RANGE_TYPE ty } } +static unsigned int vk_binding_count_from_descriptor_range(const struct d3d12_root_descriptor_table_range *range) +{ + if (range->descriptor_count != UINT_MAX) + return range->descriptor_count; + + /* TODO: Calculate an upper bound from unbounded set counts and Vulkan + * device limits. */ + return 1024; +} + static HRESULT d3d12_root_signature_init_descriptor_array_binding(struct d3d12_root_signature *root_signature, const struct d3d12_root_descriptor_table_range *range, D3D12_SHADER_VISIBILITY visibility, struct vkd3d_descriptor_set_context *context) @@ -640,28 +672,62 @@ static HRESULT d3d12_root_signature_init_descriptor_array_binding(struct d3d12_r bool is_buffer = range->type == VKD3D_SHADER_DESCRIPTOR_TYPE_CBV; enum vkd3d_shader_descriptor_type descriptor_type = range->type; + if (range->descriptor_count == UINT_MAX) + context->unbounded_offset = range->offset; + if (descriptor_type == VKD3D_SHADER_DESCRIPTOR_TYPE_SRV || descriptor_type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV) { if (!vk_binding_from_d3d12_descriptor_range(context->current_binding, - descriptor_type, visibility, true, context->descriptor_binding, range->descriptor_count)) + descriptor_type, visibility, true, context->descriptor_binding, range->vk_binding_count)) return E_NOTIMPL; ++context->current_binding; d3d12_root_signature_append_vk_binding(root_signature, descriptor_type, range->register_space, - range->base_register_idx, true, shader_visibility, range->descriptor_count, context); + range->base_register_idx, true, shader_visibility, range->vk_binding_count, context); } if (!vk_binding_from_d3d12_descriptor_range(context->current_binding, - descriptor_type, visibility, is_buffer, context->descriptor_binding, range->descriptor_count)) + descriptor_type, visibility, is_buffer, context->descriptor_binding, range->vk_binding_count)) return E_NOTIMPL; ++context->current_binding; d3d12_root_signature_append_vk_binding(root_signature, descriptor_type, range->register_space, - range->base_register_idx, is_buffer, shader_visibility, range->descriptor_count, context); + range->base_register_idx, is_buffer, shader_visibility, range->vk_binding_count, context); + + context->unbounded_offset = UINT_MAX; return S_OK; } +static void d3d12_root_signature_map_vk_unbounded_binding(struct d3d12_root_signature *root_signature, + const struct d3d12_root_descriptor_table_range *range, bool buffer_descriptor, + enum vkd3d_shader_visibility shader_visibility, struct vkd3d_descriptor_set_context *context) +{ + struct vkd3d_shader_resource_binding *mapping = &root_signature->descriptor_mapping[context->descriptor_index++]; + + mapping->type = range->type; + mapping->register_space = range->register_space; + mapping->register_index = range->base_register_idx; + mapping->shader_visibility = shader_visibility; + mapping->flags = buffer_descriptor ? VKD3D_SHADER_BINDING_FLAG_BUFFER : VKD3D_SHADER_BINDING_FLAG_IMAGE; + mapping->binding.set = root_signature->main_set + range->set + ((range->type == VKD3D_SHADER_DESCRIPTOR_TYPE_SRV + || range->type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV) && !buffer_descriptor); + mapping->binding.binding = range->binding; + mapping->binding.count = range->vk_binding_count; +} + +static void d3d12_root_signature_map_descriptor_unbounded_binding(struct d3d12_root_signature *root_signature, + const struct d3d12_root_descriptor_table_range *range, + enum vkd3d_shader_visibility shader_visibility, struct vkd3d_descriptor_set_context *context) +{ + bool is_buffer = range->type == VKD3D_SHADER_DESCRIPTOR_TYPE_CBV; + + if (range->type == VKD3D_SHADER_DESCRIPTOR_TYPE_SRV || range->type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV) + d3d12_root_signature_map_vk_unbounded_binding(root_signature, range, true, shader_visibility, context); + + d3d12_root_signature_map_vk_unbounded_binding(root_signature, range, is_buffer, shader_visibility, context); +} + static int compare_register_range(const void *a, const void *b) { const struct d3d12_root_descriptor_table_range *range_a = a, *range_b = b; @@ -676,6 +742,20 @@ static int compare_register_range(const void *a, const void *b) return range_a->base_register_idx - range_b->base_register_idx; } +static int compare_descriptor_range(const void *a, const void *b) +{ + const struct d3d12_root_descriptor_table_range *range_a = a, *range_b = b; + int ret; + + if ((ret = range_a->type - range_b->type)) + return ret; + + if ((ret = range_a->offset - range_b->offset)) + return ret; + + return (range_a->descriptor_count == UINT_MAX) - (range_b->descriptor_count == UINT_MAX); +} + static HRESULT validate_descriptor_register_ranges(const struct d3d12_root_descriptor_table_range *ranges, unsigned int count) { @@ -707,6 +787,7 @@ static HRESULT d3d12_root_signature_init_root_descriptor_tables(struct d3d12_roo for (i = 0; i < desc->NumParameters; ++i) { + const struct d3d12_root_descriptor_table_range *base_range = NULL; const D3D12_ROOT_PARAMETER *p = &desc->pParameters[i]; enum vkd3d_shader_visibility shader_visibility; unsigned int offset = 0; @@ -725,6 +806,8 @@ static HRESULT d3d12_root_signature_init_root_descriptor_tables(struct d3d12_roo if (!(table->ranges = vkd3d_calloc(table->range_count, sizeof(*table->ranges)))) return E_OUTOFMEMORY; + context->table_index = i; + for (j = 0; j < range_count; ++j) { const D3D12_DESCRIPTOR_RANGE *range = &p->u.DescriptorTable.pDescriptorRanges[j]; @@ -732,7 +815,7 @@ static HRESULT d3d12_root_signature_init_root_descriptor_tables(struct d3d12_roo if (range->OffsetInDescriptorsFromTableStart != D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND) offset = range->OffsetInDescriptorsFromTableStart; - if (!vkd3d_bound_range(offset, range->NumDescriptors, UINT_MAX)) + if (range->NumDescriptors != UINT_MAX && !vkd3d_bound_range(offset, range->NumDescriptors, UINT_MAX)) return E_INVALIDARG; table->ranges[j].offset = offset; @@ -745,6 +828,7 @@ static HRESULT d3d12_root_signature_init_root_descriptor_tables(struct d3d12_roo TRACE("Descriptor table %u, range %u, offset %u, type %#x, count %u.\n", i, j, offset, range->RangeType, range->NumDescriptors); + /* If NumDescriptors == UINT_MAX, validation during counting ensures this offset is not used. */ offset += range->NumDescriptors; } @@ -752,15 +836,49 @@ static HRESULT d3d12_root_signature_init_root_descriptor_tables(struct d3d12_roo if (FAILED(hr = validate_descriptor_register_ranges(table->ranges, range_count))) return hr; + qsort(table->ranges, range_count, sizeof(*table->ranges), compare_descriptor_range); + for (j = 0; j < range_count; ++j) { struct d3d12_root_descriptor_table_range *range; VkDescriptorSetLayoutBinding *cur_binding; + range = &table->ranges[j]; + range->set = root_signature->vk_set_count - root_signature->main_set; + if (root_signature->use_descriptor_arrays) { + if (j && range->type != table->ranges[j - 1].type) + base_range = NULL; + + /* Bounded and unbounded ranges can follow unbounded ones, + * so map them all into the first unbounded range. */ + if (base_range) + { + unsigned int rel_offset = range->offset - base_range->offset; + + if (rel_offset >= base_range->vk_binding_count) + { + ERR("Available binding size of %u is insufficient for an offset of %u.\n", + base_range->vk_binding_count, rel_offset); + continue; + } + + range->set = base_range->set; + range->binding = base_range->binding; + range->vk_binding_count = base_range->vk_binding_count - rel_offset; + d3d12_root_signature_map_descriptor_unbounded_binding(root_signature, range, + shader_visibility, context); + continue; + } + else if (range->descriptor_count == UINT_MAX) + { + base_range = range; + } + range->binding = context->descriptor_binding; + range->vk_binding_count = vk_binding_count_from_descriptor_range(range); if (FAILED(hr = d3d12_root_signature_init_descriptor_array_binding(root_signature, range, p->ShaderVisibility, context))) @@ -800,6 +918,7 @@ static HRESULT d3d12_root_signature_init_root_descriptor_tables(struct d3d12_roo ++cur_binding; } + table->ranges[j].vk_binding_count = table->ranges[j].descriptor_count; table->ranges[j].binding = vk_binding; context->current_binding = cur_binding; @@ -897,7 +1016,7 @@ static bool vk_binding_uses_partial_binding(const VkDescriptorSetLayoutBinding * } static HRESULT vkd3d_create_descriptor_set_layout(struct d3d12_device *device, - VkDescriptorSetLayoutCreateFlags flags, unsigned int binding_count, + VkDescriptorSetLayoutCreateFlags flags, unsigned int binding_count, bool unbounded, const VkDescriptorSetLayoutBinding *bindings, VkDescriptorSetLayout *set_layout) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; @@ -916,7 +1035,7 @@ static HRESULT vkd3d_create_descriptor_set_layout(struct d3d12_device *device, unsigned int i; for (i = 0; i < binding_count; ++i) - if (vk_binding_uses_partial_binding(&bindings[i])) + if (unbounded || vk_binding_uses_partial_binding(&bindings[i])) break; if (i < binding_count) @@ -928,6 +1047,10 @@ static HRESULT vkd3d_create_descriptor_set_layout(struct d3d12_device *device, set_flags[i] = vk_binding_uses_partial_binding(&bindings[i]) ? VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT_EXT : 0; + if (unbounded) + set_flags[binding_count - 1] = VK_DESCRIPTOR_BINDING_VARIABLE_DESCRIPTOR_COUNT_BIT_EXT + | VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT_EXT; + flags_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_BINDING_FLAGS_CREATE_INFO_EXT; flags_info.pNext = NULL; flags_info.bindingCount = binding_count; @@ -957,6 +1080,9 @@ static HRESULT vkd3d_create_pipeline_layout(struct d3d12_device *device, struct VkPipelineLayoutCreateInfo pipeline_layout_info; VkResult vr; + if (!vkd3d_validate_descriptor_set_count(device, set_layout_count)) + return E_INVALIDARG; + pipeline_layout_info.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO; pipeline_layout_info.pNext = NULL; pipeline_layout_info.flags = 0; @@ -977,13 +1103,16 @@ static HRESULT vkd3d_create_pipeline_layout(struct d3d12_device *device, static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signature, struct d3d12_device *device, const D3D12_ROOT_SIGNATURE_DESC *desc) { + VkDescriptorSetLayout vk_layouts[VKD3D_MAX_DESCRIPTOR_SETS]; const struct vkd3d_vulkan_info *vk_info = &device->vk_info; struct vkd3d_descriptor_set_context context; VkDescriptorSetLayoutBinding *binding_desc; struct d3d12_root_signature_info info; + unsigned int i; HRESULT hr; memset(&context, 0, sizeof(context)); + context.unbounded_offset = UINT_MAX; binding_desc = NULL; root_signature->ID3D12RootSignature_iface.lpVtbl = &d3d12_root_signature_vtbl; @@ -1047,6 +1176,8 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa goto fail; } + root_signature->main_set = root_signature->vk_set_count; + if (FAILED(hr = d3d12_root_signature_init_push_constants(root_signature, desc, root_signature->push_constant_ranges, &root_signature->push_constant_range_count))) goto fail; @@ -1055,16 +1186,19 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa if (FAILED(hr = d3d12_root_signature_init_root_descriptor_tables(root_signature, desc, &context))) goto fail; - root_signature->main_set = root_signature->vk_set_count; - if (FAILED(hr = d3d12_root_signature_append_descriptor_set_layout(root_signature, &context, 0))) goto fail; vkd3d_free(binding_desc); binding_desc = NULL; + for (i = 0; i < root_signature->vk_set_count; ++i) + { + vk_layouts[i] = root_signature->descriptor_set_layouts[i].vk_layout; + } + if (FAILED(hr = vkd3d_create_pipeline_layout(device, root_signature->vk_set_count, - root_signature->vk_set_layouts, root_signature->push_constant_range_count, + vk_layouts, root_signature->push_constant_range_count, root_signature->push_constant_ranges, &root_signature->vk_pipeline_layout))) goto fail; @@ -1670,7 +1804,7 @@ static HRESULT d3d12_pipeline_state_init_uav_counters(struct d3d12_pipeline_stat descriptor_binding = 0; for (set_index = 0; set_index < root_signature->vk_set_count; ++set_index) - set_layouts[set_index] = root_signature->vk_set_layouts[set_index]; + set_layouts[set_index] = root_signature->descriptor_set_layouts[set_index].vk_layout; for (i = 0, j = 0; i < shader_info->descriptor_count; ++i) { @@ -1699,8 +1833,8 @@ static HRESULT d3d12_pipeline_state_init_uav_counters(struct d3d12_pipeline_stat } /* Create a descriptor set layout for UAV counters. */ - hr = vkd3d_create_descriptor_set_layout(device, - 0, descriptor_binding, binding_desc, &state->uav_counters.vk_set_layout); + hr = vkd3d_create_descriptor_set_layout(device, 0, descriptor_binding, + false, binding_desc, &state->uav_counters.vk_set_layout); vkd3d_free(binding_desc); if (FAILED(hr)) { @@ -3196,7 +3330,8 @@ HRESULT vkd3d_uav_clear_state_init(struct vkd3d_uav_clear_state *state, struct d { set_binding.descriptorType = set_layouts[i].descriptor_type; - if (FAILED(hr = vkd3d_create_descriptor_set_layout(device, 0, 1, &set_binding, set_layouts[i].set_layout))) + if (FAILED(hr = vkd3d_create_descriptor_set_layout(device, 0, + 1, false, &set_binding, set_layouts[i].set_layout))) { ERR("Failed to create descriptor set layout %u, hr %#x.\n", i, hr); goto fail; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 0b326b11..f8474caa 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -54,7 +54,7 @@ #define VKD3D_MAX_SHADER_EXTENSIONS 2u #define VKD3D_MAX_SHADER_STAGES 5u #define VKD3D_MAX_VK_SYNC_OBJECTS 4u -#define VKD3D_MAX_DESCRIPTOR_SETS 2u +#define VKD3D_MAX_DESCRIPTOR_SETS 64u struct d3d12_command_list; struct d3d12_device; @@ -234,6 +234,28 @@ D3D12_GPU_VIRTUAL_ADDRESS vkd3d_gpu_va_allocator_allocate(struct vkd3d_gpu_va_al void *vkd3d_gpu_va_allocator_dereference(struct vkd3d_gpu_va_allocator *allocator, D3D12_GPU_VIRTUAL_ADDRESS address); void vkd3d_gpu_va_allocator_free(struct vkd3d_gpu_va_allocator *allocator, D3D12_GPU_VIRTUAL_ADDRESS address); +struct vkd3d_gpu_descriptor_allocation +{ + const struct d3d12_desc *base; + size_t count; +}; + +struct vkd3d_gpu_descriptor_allocator +{ + pthread_mutex_t mutex; + + struct vkd3d_gpu_descriptor_allocation *allocations; + size_t allocations_size; + size_t allocation_count; +}; + +size_t vkd3d_gpu_descriptor_allocator_range_size_from_descriptor( + struct vkd3d_gpu_descriptor_allocator *allocator, const struct d3d12_desc *desc); +bool vkd3d_gpu_descriptor_allocator_register_range(struct vkd3d_gpu_descriptor_allocator *allocator, + const struct d3d12_desc *base, size_t count); +bool vkd3d_gpu_descriptor_allocator_unregister_range( + struct vkd3d_gpu_descriptor_allocator *allocator, const struct d3d12_desc *base); + struct vkd3d_render_pass_key { unsigned int attachment_count; @@ -647,6 +669,8 @@ struct d3d12_root_descriptor_table_range { unsigned int offset; unsigned int descriptor_count; + unsigned int vk_binding_count; + uint32_t set; uint32_t binding; enum vkd3d_shader_descriptor_type type; @@ -683,6 +707,13 @@ struct d3d12_root_parameter } u; }; +struct d3d12_descriptor_set_layout +{ + VkDescriptorSetLayout vk_layout; + unsigned int unbounded_offset; + unsigned int table_index; +}; + /* ID3D12RootSignature */ struct d3d12_root_signature { @@ -690,8 +721,8 @@ struct d3d12_root_signature LONG refcount; VkPipelineLayout vk_pipeline_layout; + struct d3d12_descriptor_set_layout descriptor_set_layouts[VKD3D_MAX_DESCRIPTOR_SETS]; uint32_t vk_set_count; - VkDescriptorSetLayout vk_set_layouts[VKD3D_MAX_DESCRIPTOR_SETS]; bool use_descriptor_arrays; struct d3d12_root_parameter *parameters; @@ -912,8 +943,10 @@ struct vkd3d_pipeline_bindings const struct d3d12_root_signature *root_signature; VkPipelineBindPoint vk_bind_point; + /* All descriptor sets at index > 1 are for unbounded d3d12 ranges. Set + * 0 or 1 may be unbounded too. */ size_t descriptor_set_count; - VkDescriptorSet descriptor_sets[VKD3D_MAX_DESCRIPTOR_SETS - 1]; + VkDescriptorSet descriptor_sets[VKD3D_MAX_DESCRIPTOR_SETS]; bool in_use; D3D12_GPU_DESCRIPTOR_HANDLE descriptor_tables[D3D12_MAX_ROOT_COST]; @@ -1126,6 +1159,7 @@ struct d3d12_device PFN_vkd3d_signal_event signal_event; size_t wchar_size; + struct vkd3d_gpu_descriptor_allocator gpu_descriptor_allocator; struct vkd3d_gpu_va_allocator gpu_va_allocator; struct vkd3d_fence_worker fence_worker; diff --git a/tests/d3d12.c b/tests/d3d12.c index 57c39d27..2a8bdcf3 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2799,7 +2799,7 @@ static void test_create_root_signature(void) root_signature_desc.pStaticSamplers = NULL; root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE; hr = create_root_signature(device, &root_signature_desc, &root_signature); - todo ok(hr == S_OK || (binding_tier == D3D12_RESOURCE_BINDING_TIER_1 && (hr == E_FAIL || hr == E_INVALIDARG)), + ok(hr == S_OK || (binding_tier == D3D12_RESOURCE_BINDING_TIER_1 && (hr == E_FAIL || hr == E_INVALIDARG)), "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) { @@ -2819,13 +2819,13 @@ static void test_create_root_signature(void) descriptor_ranges[1].RegisterSpace = 0; descriptor_ranges[1].OffsetInDescriptorsFromTableStart = 16; hr = create_root_signature(device, &root_signature_desc, &root_signature); - todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); /* A bounded range overlapping an unbounded one, mapped to the same * register space, but a different type. */ descriptor_ranges[1].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_CBV; hr = create_root_signature(device, &root_signature_desc, &root_signature); - todo ok(hr == S_OK || (binding_tier <= D3D12_RESOURCE_BINDING_TIER_2 && (hr == E_FAIL || hr == E_INVALIDARG)), + ok(hr == S_OK || (binding_tier <= D3D12_RESOURCE_BINDING_TIER_2 && (hr == E_FAIL || hr == E_INVALIDARG)), "Got unexpected hr %#x.\n", hr); if (SUCCEEDED(hr)) { @@ -2838,9 +2838,7 @@ static void test_create_root_signature(void) descriptor_ranges[1].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV; descriptor_ranges[1].NumDescriptors = UINT_MAX; hr = create_root_signature(device, &root_signature_desc, &root_signature); - todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - ID3D12RootSignature_Release(root_signature); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); /* And unbounded range overlapping a bounded one, mapped to the same * register space and type. */ @@ -2848,9 +2846,7 @@ static void test_create_root_signature(void) descriptor_ranges[1].BaseShaderRegister = 0; descriptor_ranges[1].OffsetInDescriptorsFromTableStart = 15; hr = create_root_signature(device, &root_signature_desc, &root_signature); - todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - ID3D12RootSignature_Release(root_signature); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); refcount = ID3D12Device_Release(device); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); @@ -34925,7 +34921,6 @@ static void test_unbounded_resource_arrays(void) root_signature_desc.NumParameters = ARRAY_SIZE(root_parameters); root_signature_desc.pParameters = root_parameters; hr = create_root_signature(device, &root_signature_desc, &context.root_signature); - todo ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); if (FAILED(hr)) goto done; @@ -34999,6 +34994,7 @@ static void test_unbounded_resource_arrays(void) D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); get_buffer_readback_with_command_list(output_buffers[i], DXGI_FORMAT_R32_UINT, &rb, queue, command_list); /* Buffers at index >= 64 are aliased. */ + todo_if(i != 10 && i != 74) check_readback_data_uint(&rb, NULL, (i < 64 ? 63 - i : 127 - i) ^ 0x35, 0); release_resource_readback(&rb); reset_command_list(command_list, context.allocator); @@ -35088,7 +35084,6 @@ static void test_unbounded_samplers(void) root_signature_desc.pParameters = root_parameters; hr = create_root_signature(device, &root_signature_desc, &context.root_signature); - todo ok(SUCCEEDED(hr), "Failed to create root signature, hr %#x.\n", hr); if (FAILED(hr)) goto done; @@ -35146,6 +35141,7 @@ static void test_unbounded_samplers(void) { unsigned int value = get_readback_uint(&rb, i, 0, 0); unsigned int expected = (i & 1) ? 100 : 10; + todo_if(i & 1) ok(value == expected, "Got %u, expected %u at %u.\n", value, expected, i); } release_resource_readback(&rb); -- 2.20.1

3 3

[PATCH] wpcap: Map Unix interfaces to Windows adapters.
by Hans Leidekker 07 Oct '21

07 Oct '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=37167 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wpcap/Makefile.in | 1 + dlls/wpcap/unixlib.c | 4 +- dlls/wpcap/unixlib.h | 25 +++- dlls/wpcap/wpcap.c | 307 +++++++++++++++++++++++++++++++++++++++-- 4 files changed, 318 insertions(+), 19 deletions(-) diff --git a/dlls/wpcap/Makefile.in b/dlls/wpcap/Makefile.in index 4409a8c9e3a..ba3d0145cde 100644 --- a/dlls/wpcap/Makefile.in +++ b/dlls/wpcap/Makefile.in @@ -1,4 +1,5 @@ MODULE = wpcap.dll +IMPORTS = iphlpapi DELAYIMPORTS = ws2_32 EXTRALIBS = $(PCAP_LIBS) diff --git a/dlls/wpcap/unixlib.c b/dlls/wpcap/unixlib.c index 96e30fe2f11..00f412b7869 100644 --- a/dlls/wpcap/unixlib.c +++ b/dlls/wpcap/unixlib.c @@ -143,7 +143,7 @@ static void * CDECL wrap_dump_open( struct pcap *pcap, const char *name ) return pcap_dump_open( pcap->handle, name ); } -static int CDECL wrap_findalldevs( struct pcap_if_hdr **devs, char *errbuf ) +static int CDECL wrap_findalldevs( struct pcap_interface **devs, char *errbuf ) { int ret; ret = pcap_findalldevs( (pcap_if_t **)devs, errbuf ); @@ -162,7 +162,7 @@ static void CDECL wrap_free_tstamp_types( int *types ) pcap_free_tstamp_types( types ); } -static void CDECL wrap_freealldevs( struct pcap_if_hdr *devs ) +static void CDECL wrap_freealldevs( struct pcap_interface *devs ) { pcap_freealldevs( (pcap_if_t *)devs ); } diff --git a/dlls/wpcap/unixlib.h b/dlls/wpcap/unixlib.h index aa00bc33153..f7d627ebad4 100644 --- a/dlls/wpcap/unixlib.h +++ b/dlls/wpcap/unixlib.h @@ -17,10 +17,27 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -struct pcap_if_hdr +struct sockaddr_hdr { - struct pcap_if_hdr *next; + unsigned short sa_family; +}; + +struct pcap_address +{ + struct pcap_address *next; + struct sockaddr_hdr *addr; + struct sockaddr_hdr *netmask; + struct sockaddr_hdr *broadaddr; + struct sockaddr_hdr *dstaddr; +}; + +struct pcap_interface +{ + struct pcap_interface *next; char *name; + char *description; + struct pcap_address *addresses; + unsigned int flags; }; struct pcap_pkthdr_win32 @@ -63,10 +80,10 @@ struct pcap_funcs unsigned char * ); void (CDECL *dump)( unsigned char *, const struct pcap_pkthdr_win32 *, const unsigned char * ); void * (CDECL *dump_open)( struct pcap *, const char * ); - int (CDECL *findalldevs)( struct pcap_if_hdr **, char * ); + int (CDECL *findalldevs)( struct pcap_interface **, char * ); void (CDECL *free_datalinks)( int * ); void (CDECL *free_tstamp_types)( int * ); - void (CDECL *freealldevs)( struct pcap_if_hdr * ); + void (CDECL *freealldevs)( struct pcap_interface * ); void (CDECL *freecode)( void * ); int (CDECL *get_tstamp_precision)( struct pcap * ); char * (CDECL *geterr)( struct pcap * ); diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index ffdb1a3e8d3..3a0b2381697 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -23,8 +23,9 @@ #include "winbase.h" #include "winternl.h" #include "winnls.h" -#define USE_WS_PREFIX #include "winsock2.h" +#include "ws2ipdef.h" +#include "iphlpapi.h" #include "wine/debug.h" #include "unixlib.h" @@ -138,16 +139,254 @@ void * CDECL pcap_dump_open( struct pcap *pcap, const char *filename ) return dumper; } -int CDECL pcap_findalldevs( struct pcap_if_hdr **devs, char *errbuf ) +static void free_addresses( struct pcap_address *addrs ) +{ + struct pcap_address *next, *cur = addrs; + if (!addrs) return; + do + { + free( cur->addr ); + free( cur->netmask ); + free( cur->broadaddr ); + free( cur->dstaddr ); + next = cur->next; + free( cur ); + cur = next; + } while (next); +} + +static void free_devices( struct pcap_interface *devs ) +{ + struct pcap_interface *next, *cur = devs; + if (!devs) return; + do + { + free( cur->name ); + free( cur->description ); + free_addresses( cur->addresses ); + next = cur->next; + free( cur ); + cur = next; + } while (next); +} + +static IP_ADAPTER_ADDRESSES *get_adapters( void ) +{ + DWORD size = 0; + IP_ADAPTER_ADDRESSES *ret; + ULONG flags = GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_MULTICAST | GAA_FLAG_SKIP_DNS_SERVER; + + if (GetAdaptersAddresses( AF_UNSPEC, flags, NULL, NULL, &size ) != ERROR_BUFFER_OVERFLOW) return NULL; + if (!(ret = malloc( size ))) return NULL; + if (GetAdaptersAddresses( AF_UNSPEC, flags, NULL, ret, &size )) + { + free( ret ); + return NULL; + } + return ret; +} + +static IP_ADAPTER_ADDRESSES *find_adapter( IP_ADAPTER_ADDRESSES *list, const char *name ) +{ + IP_ADAPTER_ADDRESSES *ret; + WCHAR *nameW; + + if (!(nameW = strdupAW( name ))) return NULL; + for (ret = list; ret; ret = ret->Next) + { + if (!wcscmp( nameW, ret->FriendlyName )) break; + } + free( nameW); + return ret; +} + +static char *build_win32_name( const char *source, const char *adapter_name ) +{ + const char prefix[] = "\\Device\\NPF_"; + int len = sizeof(prefix) + strlen(adapter_name); + char *ret; + + if (source) len += strlen( source ); + if ((ret = malloc( len ))) + { + ret[0] = 0; + if (source) strcat( ret, source ); + strcat( ret, prefix ); + strcat( ret, adapter_name ); + } + return ret; +} + +static char *build_win32_description( const struct pcap_interface *unix_dev ) +{ + int len = strlen(unix_dev->name) + 1; + char *ret, *ptr; + + if (unix_dev->description && unix_dev->description[0]) len += strlen(unix_dev->description) + 1; + if ((ret = ptr = malloc( len ))) + { + if (unix_dev->description) + { + strcpy( ret, unix_dev->description ); + strcat( ret, " " ); + strcat( ret, unix_dev->name ); + } + else strcpy( ret, unix_dev->name ); + } + return ret; +} + +static struct sockaddr_hdr *dup_sockaddr( const struct sockaddr_hdr *addr ) +{ + struct sockaddr_hdr *ret; + + switch (addr->sa_family) + { + case AF_INET: + { + struct sockaddr_in *dst, *src = (struct sockaddr_in *)addr; + if (!(dst = calloc( 1, sizeof(*dst) ))) return NULL; + dst->sin_family = src->sin_family; + dst->sin_port = src->sin_port; + dst->sin_addr = src->sin_addr; + ret = (struct sockaddr_hdr *)dst; + break; + } + case AF_INET6: + { + struct sockaddr_in6 *dst, *src = (struct sockaddr_in6 *)addr; + if (!(dst = malloc( sizeof(*dst) ))) return NULL; + dst->sin6_family = src->sin6_family; + dst->sin6_port = src->sin6_port; + dst->sin6_flowinfo = src->sin6_flowinfo; + dst->sin6_addr = src->sin6_addr; + dst->sin6_scope_id = src->sin6_scope_id; + ret = (struct sockaddr_hdr *)dst; + break; + } + default: + FIXME( "address family %u not supported\n", addr->sa_family ); + return NULL; + } + + return ret; +} + +static struct pcap_address *build_win32_address( struct pcap_address *src ) +{ + struct pcap_address *dst; + + if (!(dst = calloc( 1, sizeof(*dst) ))) return NULL; + if (src->addr && !(dst->addr = dup_sockaddr( src->addr ))) goto err; + if (src->netmask && !(dst->netmask = dup_sockaddr( src->netmask ))) goto err; + if (src->broadaddr && !(dst->broadaddr = dup_sockaddr( src->broadaddr ))) goto err; + if (src->dstaddr && !(dst->dstaddr = dup_sockaddr( src->dstaddr ))) goto err; + return dst; + +err: + free( dst->addr ); + free( dst->netmask ); + free( dst->broadaddr ); + free( dst->dstaddr ); + free( dst ); + return NULL; +} + +static void add_win32_address( struct pcap_address **list, struct pcap_address *addr ) +{ + struct pcap_address *cur = *list; + if (!cur) *list = addr; + else + { + while (cur->next) { cur = cur->next; } + cur->next = addr; + } +} + +static struct pcap_address *build_win32_addresses( struct pcap_address *addrs ) +{ + struct pcap_address *src, *dst, *ret = NULL; + src = addrs; + while (src) + { + if ((dst = build_win32_address( src ))) add_win32_address( &ret, dst ); + src = src->next; + } + return ret; +} + +static struct pcap_interface *build_win32_device( const struct pcap_interface *unix_dev, const char *source, + const char *adapter_name ) +{ + struct pcap_interface *ret; + + if (!(ret = calloc( 1, sizeof(*ret) ))) return NULL; + if (!(ret->name = build_win32_name( source, adapter_name ))) goto err; + if (!(ret->description = build_win32_description( unix_dev ))) goto err; + if (!(ret->addresses = build_win32_addresses( unix_dev->addresses ))) goto err; + ret->flags = unix_dev->flags; + return ret; + +err: + free( ret->name ); + free( ret->description ); + free_addresses( ret->addresses ); + free( ret ); + return NULL; +} + +static void add_win32_device( struct pcap_interface **list, struct pcap_interface *dev ) +{ + struct pcap_interface *cur = *list; + if (!cur) *list = dev; + else + { + while (cur->next) { cur = cur->next; } + cur->next = dev; + } +} + +static int find_all_devices( const char *source, struct pcap_interface **devs, char *errbuf ) +{ + struct pcap_interface *unix_devs, *win32_devs = NULL, *cur, *dev; + IP_ADAPTER_ADDRESSES *ptr, *adapters = get_adapters(); + int ret; + + if (!adapters) + { + if (errbuf) sprintf( errbuf, "Out of memory." ); + return -1; + } + + if (!(ret = pcap_funcs->findalldevs( &unix_devs, errbuf ))) + { + cur = unix_devs; + while (cur) + { + if ((ptr = find_adapter( adapters, cur->name )) && (dev = build_win32_device( cur, source, ptr->AdapterName ))) + { + add_win32_device( &win32_devs, dev ); + } + cur = cur->next; + } + *devs = win32_devs; + pcap_funcs->freealldevs( unix_devs ); + } + + free( adapters ); + return ret; +} + +int CDECL pcap_findalldevs( struct pcap_interface **devs, char *errbuf ) { TRACE( "%p, %p\n", devs, errbuf ); - return pcap_funcs->findalldevs( devs, errbuf ); + return find_all_devices( NULL, devs, errbuf ); } -int CDECL pcap_findalldevs_ex( char *source, void *auth, struct pcap_if_hdr **devs, char *errbuf ) +int CDECL pcap_findalldevs_ex( char *source, void *auth, struct pcap_interface **devs, char *errbuf ) { FIXME( "%s, %p, %p, %p: partial stub\n", debugstr_a(source), auth, devs, errbuf ); - return pcap_funcs->findalldevs( devs, errbuf ); + return find_all_devices( source, devs, errbuf ); } void CDECL pcap_free_datalinks( int *links ) @@ -162,10 +401,10 @@ void CDECL pcap_free_tstamp_types( int *types ) pcap_funcs->free_tstamp_types( types ); } -void CDECL pcap_freealldevs( struct pcap_if_hdr *devs ) +void CDECL pcap_freealldevs( struct pcap_interface *devs ) { TRACE( "%p\n", devs ); - pcap_funcs->freealldevs( devs ); + free_devices( devs ); } void CDECL pcap_freecode( void *program ) @@ -229,15 +468,14 @@ int CDECL pcap_list_tstamp_types( struct pcap *pcap, int **types ) char * CDECL pcap_lookupdev( char *errbuf ) { static char *ret; - struct pcap_if_hdr *devs; + struct pcap_interface *devs; TRACE( "%p\n", errbuf ); if (!ret) { - if (pcap_funcs->findalldevs( &devs, errbuf ) == -1) return NULL; - if (!devs) return NULL; + if (pcap_findalldevs( &devs, errbuf ) == -1 || devs) return NULL; if ((ret = malloc( strlen(devs->name) + 1 ))) strcpy( ret, devs->name ); - pcap_funcs->freealldevs( devs ); + pcap_freealldevs( devs ); } return ret; } @@ -280,17 +518,60 @@ int CDECL pcap_next_ex( struct pcap *pcap, struct pcap_pkthdr_win32 **hdr, const return pcap_funcs->next_ex( pcap, hdr, data ); } +static char *strdupWA( const WCHAR *src ) +{ + char *dst; + int len = WideCharToMultiByte( CP_ACP, 0, src, -1, NULL, 0, NULL, NULL ); + if ((dst = malloc( len ))) WideCharToMultiByte( CP_ACP, 0, src, -1, dst, len, NULL, NULL ); + return dst; +} + +static char *map_win32_device_name( const char *dev ) +{ + IP_ADAPTER_ADDRESSES *ptr, *adapters = get_adapters(); + const char *name = strchr( dev, '{' ); + char *ret = NULL; + + if (!adapters || !name) return NULL; + for (ptr = adapters; ptr; ptr = ptr->Next) + { + if (!strcmp( name, ptr->AdapterName )) + { + ret = strdupWA( ptr->FriendlyName ); + break; + } + } + free( adapters ); + return ret; +} + +static struct pcap *open_live( const char *source, int snaplen, int promisc, int timeout, char *errbuf ) +{ + char *unix_dev; + struct pcap *ret; + + if (!(unix_dev = map_win32_device_name( source ))) + { + if (errbuf) sprintf( errbuf, "Unable to open the adapter." ); + return NULL; + } + + ret = pcap_funcs->open_live( unix_dev, snaplen, promisc, timeout, errbuf ); + free( unix_dev ); + return ret; +} + #define PCAP_OPENFLAG_PROMISCUOUS 1 struct pcap * CDECL pcap_open( const char *source, int snaplen, int flags, int timeout, void *auth, char *errbuf ) { FIXME( "%s, %d, %d, %d, %p, %p: partial stub\n", debugstr_a(source), snaplen, flags, timeout, auth, errbuf ); - return pcap_funcs->open_live( source, snaplen, flags & PCAP_OPENFLAG_PROMISCUOUS, timeout, errbuf ); + return open_live( source, snaplen, flags & PCAP_OPENFLAG_PROMISCUOUS, timeout, errbuf ); } struct pcap * CDECL pcap_open_live( const char *source, int snaplen, int promisc, int to_ms, char *errbuf ) { TRACE( "%s, %d, %d, %d, %p\n", debugstr_a(source), snaplen, promisc, to_ms, errbuf ); - return pcap_funcs->open_live( source, snaplen, promisc, to_ms, errbuf ); + return open_live( source, snaplen, promisc, to_ms, errbuf ); } #define PCAP_SRC_FILE 2 -- 2.30.2

1 0

[PATCH v3 01/17] mshtml: Add names for each object and use it in the Navigator.
by Gabriel Ivăncescu 07 Oct '21

07 Oct '21

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/dispex.c | 29 +++++++++++++++++++++++++++++ dlls/mshtml/htmlanchor.c | 1 + dlls/mshtml/htmlarea.c | 1 + dlls/mshtml/htmlattr.c | 1 + dlls/mshtml/htmlbody.c | 1 + dlls/mshtml/htmlcomment.c | 1 + dlls/mshtml/htmlcurstyle.c | 1 + dlls/mshtml/htmldoc.c | 2 ++ dlls/mshtml/htmlelem.c | 6 ++++++ dlls/mshtml/htmlelemcol.c | 1 + dlls/mshtml/htmlevent.c | 6 ++++++ dlls/mshtml/htmlform.c | 1 + dlls/mshtml/htmlframe.c | 2 ++ dlls/mshtml/htmlgeneric.c | 1 + dlls/mshtml/htmlhead.c | 4 ++++ dlls/mshtml/htmlimg.c | 2 ++ dlls/mshtml/htmlinput.c | 3 +++ dlls/mshtml/htmllink.c | 1 + dlls/mshtml/htmllocation.c | 1 + dlls/mshtml/htmlnode.c | 2 ++ dlls/mshtml/htmlobject.c | 2 ++ dlls/mshtml/htmlscript.c | 1 + dlls/mshtml/htmlselect.c | 3 +++ dlls/mshtml/htmlstorage.c | 1 + dlls/mshtml/htmlstyle.c | 2 ++ dlls/mshtml/htmlstyleelem.c | 1 + dlls/mshtml/htmlstylesheet.c | 4 ++++ dlls/mshtml/htmltable.c | 3 +++ dlls/mshtml/htmltextarea.c | 1 + dlls/mshtml/htmltextnode.c | 1 + dlls/mshtml/htmlwindow.c | 1 + dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/omnavigator.c | 18 ++++++++++++------ dlls/mshtml/range.c | 2 ++ dlls/mshtml/selection.c | 1 + dlls/mshtml/xmlhttprequest.c | 2 ++ 36 files changed, 106 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 64ead8f..1adcc67 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -886,6 +886,7 @@ static const dispex_static_data_vtbl_t function_dispex_vtbl = { static const tid_t function_iface_tids[] = {0}; static dispex_static_data_t function_dispex = { + L"Function", &function_dispex_vtbl, NULL_tid, function_iface_tids @@ -1482,6 +1483,34 @@ compat_mode_t dispex_compat_mode(DispatchEx *dispex) : dispex->info->desc->vtbl->get_compat_mode(dispex); } +HRESULT dispex_to_string(DispatchEx *dispex, BSTR *ret) +{ + static const WCHAR prefix[8] = L"[object "; + static const WCHAR suffix[] = L"]"; + WCHAR buf[ARRAY_SIZE(prefix) + 28 + ARRAY_SIZE(suffix)], *p = buf; + compat_mode_t compat_mode = dispex_compat_mode(dispex); + const WCHAR *name = dispex->info->desc->name; + unsigned len; + + if(!ret) + return E_INVALIDARG; + + memcpy(p, prefix, sizeof(prefix)); + p += ARRAY_SIZE(prefix); + if(compat_mode < COMPAT_MODE_IE9) + p--; + else { + len = wcslen(name); + assert(len <= 28); + memcpy(p, name, len * sizeof(WCHAR)); + p += len; + } + memcpy(p, suffix, sizeof(suffix)); + + *ret = SysAllocString(buf); + return *ret ? S_OK : E_OUTOFMEMORY; +} + static dispex_data_t *ensure_dispex_info(dispex_static_data_t *desc, compat_mode_t compat_mode) { if(!desc->info_cache[compat_mode]) { diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index da48601..4416624 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -857,6 +857,7 @@ static const tid_t HTMLAnchorElement_iface_tids[] = { }; static dispex_static_data_t HTMLAnchorElement_dispex = { + L"HTMLAnchorElement", NULL, DispHTMLAnchorElement_tid, HTMLAnchorElement_iface_tids, diff --git a/dlls/mshtml/htmlarea.c b/dlls/mshtml/htmlarea.c index e785871..6c0da36 100644 --- a/dlls/mshtml/htmlarea.c +++ b/dlls/mshtml/htmlarea.c @@ -477,6 +477,7 @@ static const tid_t HTMLAreaElement_iface_tids[] = { 0 }; static dispex_static_data_t HTMLAreaElement_dispex = { + L"HTMLAreaElement", NULL, DispHTMLAreaElement_tid, HTMLAreaElement_iface_tids, diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index dc8c45e..e10c7c3 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -484,6 +484,7 @@ static const tid_t HTMLDOMAttribute_iface_tids[] = { 0 }; static dispex_static_data_t HTMLDOMAttribute_dispex = { + L"Attr", NULL, DispHTMLDOMAttribute_tid, HTMLDOMAttribute_iface_tids diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 32c49fe..551c3a1 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -1008,6 +1008,7 @@ static const tid_t HTMLBodyElement_iface_tids[] = { }; static dispex_static_data_t HTMLBodyElement_dispex = { + L"HTMLBodyElement", NULL, DispHTMLBody_tid, HTMLBodyElement_iface_tids, diff --git a/dlls/mshtml/htmlcomment.c b/dlls/mshtml/htmlcomment.c index 85eceef..7815865 100644 --- a/dlls/mshtml/htmlcomment.c +++ b/dlls/mshtml/htmlcomment.c @@ -199,6 +199,7 @@ static const tid_t HTMLCommentElement_iface_tids[] = { 0 }; static dispex_static_data_t HTMLCommentElement_dispex = { + L"Comment", NULL, DispHTMLCommentElement_tid, HTMLCommentElement_iface_tids, diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 2abe5df..e66a42c 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -1300,6 +1300,7 @@ static const tid_t HTMLCurrentStyle_iface_tids[] = { 0 }; static dispex_static_data_t HTMLCurrentStyle_dispex = { + L"MSCurrentStyleCSSProperties", &CSSStyle_dispex_vtbl, DispHTMLCurrentStyle_tid, HTMLCurrentStyle_iface_tids, diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 9faf987..6bbf058 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5654,6 +5654,7 @@ static void HTMLDocumentNode_init_dispex_info(dispex_data_t *info, compat_mode_t } static dispex_static_data_t HTMLDocumentNode_dispex = { + L"HTMLDocument", &HTMLDocumentNode_event_target_vtbl.dispex_vtbl, DispHTMLDocument_tid, HTMLDocumentNode_iface_tids, @@ -5949,6 +5950,7 @@ static const tid_t HTMLDocumentObj_iface_tids[] = { 0 }; static dispex_static_data_t HTMLDocumentObj_dispex = { + L"HTMLDocumentObj", NULL, DispHTMLDocument_tid, HTMLDocumentObj_iface_tids diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index b07de03..cb7a528 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -527,6 +527,7 @@ static const tid_t HTMLRect_iface_tids[] = { 0 }; static dispex_static_data_t HTMLRect_dispex = { + L"ClientRect", NULL, IHTMLRect_tid, HTMLRect_iface_tids @@ -788,6 +789,7 @@ static const tid_t HTMLRectCollection_iface_tids[] = { 0 }; static dispex_static_data_t HTMLRectCollection_dispex = { + L"ClientRectList", &HTMLRectCollection_dispex_vtbl, IHTMLRectCollection_tid, HTMLRectCollection_iface_tids @@ -6669,6 +6671,7 @@ static const tid_t token_list_iface_tids[] = { 0 }; static dispex_static_data_t token_list_dispex = { + L"DOMTokenList", &token_list_dispex_vtbl, IWineDOMTokenList_tid, token_list_iface_tids @@ -6779,6 +6782,7 @@ static const IWineHTMLElementPrivateVtbl WineHTMLElementPrivateVtbl = { }; static dispex_static_data_t HTMLElement_dispex = { + L"HTMLElement", &HTMLElement_event_target_vtbl.dispex_vtbl, DispHTMLUnknownElement_tid, HTMLElement_iface_tids, @@ -7053,6 +7057,7 @@ static const tid_t HTMLFiltersCollection_iface_tids[] = { 0 }; static dispex_static_data_t HTMLFiltersCollection_dispex = { + L"FiltersCollection", &HTMLFiltersCollection_dispex_vtbl, IHTMLFiltersCollection_tid, HTMLFiltersCollection_iface_tids @@ -7626,6 +7631,7 @@ static const tid_t HTMLAttributeCollection_iface_tids[] = { }; static dispex_static_data_t HTMLAttributeCollection_dispex = { + L"NamedNodeMap", &HTMLAttributeCollection_dispex_vtbl, DispHTMLAttributeCollection_tid, HTMLAttributeCollection_iface_tids diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index e72f21f..86ef3a3 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -618,6 +618,7 @@ static const tid_t HTMLElementCollection_iface_tids[] = { }; static dispex_static_data_t HTMLElementCollection_dispex = { + L"HTMLCollection", &HTMLElementColection_dispex_vtbl, DispHTMLElementCollection_tid, HTMLElementCollection_iface_tids diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 5b040c4..3f545bb 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -750,6 +750,7 @@ static const tid_t HTMLEventObj_iface_tids[] = { }; static dispex_static_data_t HTMLEventObj_dispex = { + L"MSEventObj", NULL, DispCEventObj_tid, HTMLEventObj_iface_tids @@ -2135,6 +2136,7 @@ static const tid_t DOMEvent_iface_tids[] = { }; static dispex_static_data_t DOMEvent_dispex = { + L"Event", NULL, DispDOMEvent_tid, DOMEvent_iface_tids @@ -2147,6 +2149,7 @@ static const tid_t DOMUIEvent_iface_tids[] = { }; static dispex_static_data_t DOMUIEvent_dispex = { + L"UIEvent", NULL, DispDOMUIEvent_tid, DOMUIEvent_iface_tids @@ -2160,6 +2163,7 @@ static const tid_t DOMMouseEvent_iface_tids[] = { }; static dispex_static_data_t DOMMouseEvent_dispex = { + L"MouseEvent", NULL, DispDOMMouseEvent_tid, DOMMouseEvent_iface_tids @@ -2173,6 +2177,7 @@ static const tid_t DOMKeyboardEvent_iface_tids[] = { }; static dispex_static_data_t DOMKeyboardEvent_dispex = { + L"KeyboardEvent", NULL, DispDOMKeyboardEvent_tid, DOMKeyboardEvent_iface_tids @@ -2185,6 +2190,7 @@ static const tid_t DOMCustomEvent_iface_tids[] = { }; static dispex_static_data_t DOMCustomEvent_dispex = { + L"CustomEvent", NULL, DispDOMCustomEvent_tid, DOMCustomEvent_iface_tids diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index 5d0928e..566612f 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -827,6 +827,7 @@ static const tid_t HTMLFormElement_iface_tids[] = { }; static dispex_static_data_t HTMLFormElement_dispex = { + L"HTMLFormElement", NULL, DispHTMLFormElement_tid, HTMLFormElement_iface_tids, diff --git a/dlls/mshtml/htmlframe.c b/dlls/mshtml/htmlframe.c index 7118ea8..e794284 100644 --- a/dlls/mshtml/htmlframe.c +++ b/dlls/mshtml/htmlframe.c @@ -1023,6 +1023,7 @@ static const tid_t HTMLFrameElement_iface_tids[] = { }; static dispex_static_data_t HTMLFrameElement_dispex = { + L"HTMLFrameElement", NULL, DispHTMLFrameElement_tid, HTMLFrameElement_iface_tids, @@ -1603,6 +1604,7 @@ static const tid_t HTMLIFrame_iface_tids[] = { }; static dispex_static_data_t HTMLIFrame_dispex = { + L"HTMLIFrameElement", NULL, DispHTMLIFrame_tid, HTMLIFrame_iface_tids, diff --git a/dlls/mshtml/htmlgeneric.c b/dlls/mshtml/htmlgeneric.c index 639c95e..459fc78 100644 --- a/dlls/mshtml/htmlgeneric.c +++ b/dlls/mshtml/htmlgeneric.c @@ -168,6 +168,7 @@ static const tid_t HTMLGenericElement_iface_tids[] = { }; static dispex_static_data_t HTMLGenericElement_dispex = { + L"HTMLUnknownElement", NULL, DispHTMLGenericElement_tid, HTMLGenericElement_iface_tids, diff --git a/dlls/mshtml/htmlhead.c b/dlls/mshtml/htmlhead.c index 5dbf8d6..1bad06e 100644 --- a/dlls/mshtml/htmlhead.c +++ b/dlls/mshtml/htmlhead.c @@ -169,6 +169,7 @@ static const tid_t HTMLTitleElement_iface_tids[] = { 0 }; static dispex_static_data_t HTMLTitleElement_dispex = { + L"HTMLTitleElement", NULL, DispHTMLTitleElement_tid, HTMLTitleElement_iface_tids, @@ -352,6 +353,7 @@ static const tid_t HTMLHtmlElement_iface_tids[] = { 0 }; static dispex_static_data_t HTMLHtmlElement_dispex = { + L"HTMLHtmlElement", NULL, DispHTMLHtmlElement_tid, HTMLHtmlElement_iface_tids, @@ -588,6 +590,7 @@ static const tid_t HTMLMetaElement_iface_tids[] = { }; static dispex_static_data_t HTMLMetaElement_dispex = { + L"HTMLMetaElement", NULL, DispHTMLMetaElement_tid, HTMLMetaElement_iface_tids, @@ -751,6 +754,7 @@ static const tid_t HTMLHeadElement_iface_tids[] = { 0 }; static dispex_static_data_t HTMLHeadElement_dispex = { + L"HTMLHeadElement", NULL, DispHTMLHeadElement_tid, HTMLHeadElement_iface_tids, diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index f89e8e5..96b8d31 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -730,6 +730,7 @@ static const tid_t HTMLImgElement_iface_tids[] = { 0 }; static dispex_static_data_t HTMLImgElement_dispex = { + L"HTMLImageElement", NULL, DispHTMLImg_tid, HTMLImgElement_iface_tids, @@ -974,6 +975,7 @@ static const dispex_static_data_vtbl_t HTMLImageElementFactory_dispex_vtbl = { }; static dispex_static_data_t HTMLImageElementFactory_dispex = { + L"Function", &HTMLImageElementFactory_dispex_vtbl, IHTMLImageElementFactory_tid, HTMLImageElementFactory_iface_tids diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 1a0a739..e9b53da 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1441,6 +1441,7 @@ static const tid_t HTMLInputElement_iface_tids[] = { 0 }; static dispex_static_data_t HTMLInputElement_dispex = { + L"HTMLInputElement", NULL, DispHTMLInputElement_tid, HTMLInputElement_iface_tids, @@ -1637,6 +1638,7 @@ static const tid_t HTMLLabelElement_iface_tids[] = { }; static dispex_static_data_t HTMLLabelElement_dispex = { + L"HTMLLabelElement", NULL, DispHTMLLabelElement_tid, HTMLLabelElement_iface_tids, @@ -1983,6 +1985,7 @@ static const tid_t HTMLButtonElement_iface_tids[] = { }; static dispex_static_data_t HTMLButtonElement_dispex = { + L"HTMLButtonElement", NULL, DispHTMLButtonElement_tid, HTMLButtonElement_iface_tids, diff --git a/dlls/mshtml/htmllink.c b/dlls/mshtml/htmllink.c index ddf67ca..1dd4873 100644 --- a/dlls/mshtml/htmllink.c +++ b/dlls/mshtml/htmllink.c @@ -446,6 +446,7 @@ static const tid_t HTMLLinkElement_iface_tids[] = { 0 }; static dispex_static_data_t HTMLLinkElement_dispex = { + L"HTMLLinkElement", NULL, DispHTMLLinkElement_tid, HTMLLinkElement_iface_tids, diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index a85c9a6..85dfc40 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -631,6 +631,7 @@ static const tid_t HTMLLocation_iface_tids[] = { 0 }; static dispex_static_data_t HTMLLocation_dispex = { + L"Object", NULL, DispHTMLLocation_tid, HTMLLocation_iface_tids diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index b5ff02b..996c28c 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -429,6 +429,7 @@ static const tid_t HTMLDOMChildrenCollection_iface_tids[] = { }; static dispex_static_data_t HTMLDOMChildrenCollection_dispex = { + L"NodeList", &HTMLDOMChildrenCollection_dispex_vtbl, DispDOMChildrenCollection_tid, HTMLDOMChildrenCollection_iface_tids, @@ -1476,6 +1477,7 @@ static const tid_t HTMLDOMNode_iface_tids[] = { 0 }; static dispex_static_data_t HTMLDOMNode_dispex = { + L"Node", NULL, IHTMLDOMNode_tid, HTMLDOMNode_iface_tids, diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index 6702548..9c8af17 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -766,6 +766,7 @@ static const tid_t HTMLObjectElement_iface_tids[] = { 0 }; static dispex_static_data_t HTMLObjectElement_dispex = { + L"HTMLObjectElement", NULL, DispHTMLObjectElement_tid, HTMLObjectElement_iface_tids, @@ -1028,6 +1029,7 @@ static const tid_t HTMLEmbedElement_iface_tids[] = { 0 }; static dispex_static_data_t HTMLEmbedElement_dispex = { + L"HTMLEmbedElement", NULL, DispHTMLEmbed_tid, HTMLEmbedElement_iface_tids, diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 9b7f95e..9f3a0b2 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -479,6 +479,7 @@ static const tid_t HTMLScriptElement_iface_tids[] = { }; static dispex_static_data_t HTMLScriptElement_dispex = { + L"HTMLScriptElement", NULL, DispHTMLScriptElement_tid, HTMLScriptElement_iface_tids, diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index ad801f8..7869a8e 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -416,6 +416,7 @@ static const tid_t HTMLOptionElement_iface_tids[] = { 0 }; static dispex_static_data_t HTMLOptionElement_dispex = { + L"HTMLOptionElement", NULL, DispHTMLOptionElement_tid, HTMLOptionElement_iface_tids, @@ -595,6 +596,7 @@ static const tid_t HTMLOptionElementFactory_iface_tids[] = { }; static dispex_static_data_t HTMLOptionElementFactory_dispex = { + L"Function", NULL, IHTMLOptionElementFactory_tid, HTMLOptionElementFactory_iface_tids, @@ -1281,6 +1283,7 @@ static const tid_t HTMLSelectElement_tids[] = { }; static dispex_static_data_t HTMLSelectElement_dispex = { + L"HTMLSelectElement", NULL, DispHTMLSelectElement_tid, HTMLSelectElement_tids, diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index c389647..9c1f904 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -195,6 +195,7 @@ static const tid_t HTMLStorage_iface_tids[] = { 0 }; static dispex_static_data_t HTMLStorage_dispex = { + L"Storage", NULL, IHTMLStorage_tid, HTMLStorage_iface_tids diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 4ee81ba..7dd7000 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -10006,6 +10006,7 @@ static const tid_t HTMLStyle_iface_tids[] = { 0 }; static dispex_static_data_t HTMLStyle_dispex = { + L"MSStyleCSSProperties", &CSSStyle_dispex_vtbl, DispHTMLStyle_tid, HTMLStyle_iface_tids, @@ -10100,6 +10101,7 @@ static const tid_t HTMLW3CComputedStyle_iface_tids[] = { 0 }; static dispex_static_data_t HTMLW3CComputedStyle_dispex = { + L"CSSStyleDeclaration", &CSSStyle_dispex_vtbl, DispHTMLW3CComputedStyle_tid, HTMLW3CComputedStyle_iface_tids, diff --git a/dlls/mshtml/htmlstyleelem.c b/dlls/mshtml/htmlstyleelem.c index d2a4a75..cf57547 100644 --- a/dlls/mshtml/htmlstyleelem.c +++ b/dlls/mshtml/htmlstyleelem.c @@ -462,6 +462,7 @@ static const tid_t HTMLStyleElement_iface_tids[] = { 0 }; static dispex_static_data_t HTMLStyleElement_dispex = { + L"HTMLStyleElement", NULL, DispHTMLStyleElement_tid, HTMLStyleElement_iface_tids, diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index b6f1c98..cbc2adf 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -202,6 +202,7 @@ static const tid_t HTMLStyleSheetRule_iface_tids[] = { 0 }; static dispex_static_data_t HTMLStyleSheetRule_dispex = { + L"CSSStyleRule", NULL, DispHTMLStyleSheetRule_tid, HTMLStyleSheetRule_iface_tids @@ -376,6 +377,7 @@ static const tid_t HTMLStyleSheetRulesCollection_iface_tids[] = { 0 }; static dispex_static_data_t HTMLStyleSheetRulesCollection_dispex = { + L"MSCSSRuleList", NULL, DispHTMLStyleSheetRulesCollection_tid, HTMLStyleSheetRulesCollection_iface_tids @@ -575,6 +577,7 @@ static const tid_t HTMLStyleSheetsCollection_iface_tids[] = { 0 }; static dispex_static_data_t HTMLStyleSheetsCollection_dispex = { + L"StyleSheetList", NULL, DispHTMLStyleSheetsCollection_tid, HTMLStyleSheetsCollection_iface_tids @@ -1144,6 +1147,7 @@ static const tid_t HTMLStyleSheet_iface_tids[] = { 0 }; static dispex_static_data_t HTMLStyleSheet_dispex = { + L"CSSStyleSheet", NULL, DispHTMLStyleSheet_tid, HTMLStyleSheet_iface_tids, diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index 178e9e5..53c9820 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -520,6 +520,7 @@ static const tid_t HTMLTableCell_iface_tids[] = { }; static dispex_static_data_t HTMLTableCell_dispex = { + L"HTMLTableDataCellElement", NULL, DispHTMLTableCell_tid, HTMLTableCell_iface_tids, @@ -964,6 +965,7 @@ static const tid_t HTMLTableRow_iface_tids[] = { }; static dispex_static_data_t HTMLTableRow_dispex = { + L"HTMLTableRowElement", NULL, DispHTMLTableRow_tid, HTMLTableRow_iface_tids, @@ -1996,6 +1998,7 @@ static const tid_t HTMLTable_iface_tids[] = { }; static dispex_static_data_t HTMLTable_dispex = { + L"HTMLTableElement", NULL, DispHTMLTable_tid, HTMLTable_iface_tids, diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index 57f3373..f95b559 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -479,6 +479,7 @@ static const tid_t HTMLTextAreaElement_iface_tids[] = { }; static dispex_static_data_t HTMLTextAreaElement_dispex = { + L"HTMLTextAreaElement", NULL, DispHTMLTextAreaElement_tid, HTMLTextAreaElement_iface_tids, diff --git a/dlls/mshtml/htmltextnode.c b/dlls/mshtml/htmltextnode.c index 56a0572..afe5d21 100644 --- a/dlls/mshtml/htmltextnode.c +++ b/dlls/mshtml/htmltextnode.c @@ -358,6 +358,7 @@ static const tid_t HTMLDOMTextNode_iface_tids[] = { 0 }; static dispex_static_data_t HTMLDOMTextNode_dispex = { + L"Text", NULL, DispHTMLDOMTextNode_tid, HTMLDOMTextNode_iface_tids, diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 870d7e8..2dfa879 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3687,6 +3687,7 @@ static const tid_t HTMLWindow_iface_tids[] = { }; static dispex_static_data_t HTMLWindow_dispex = { + L"Window", &HTMLWindow_event_target_vtbl.dispex_vtbl, DispHTMLWindow2_tid, HTMLWindow_iface_tids, diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index c1e7e78..9429a4b 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -327,6 +327,7 @@ typedef struct { } dispex_static_data_vtbl_t; typedef struct { + const WCHAR *name; const dispex_static_data_vtbl_t *vtbl; const tid_t disp_tid; const tid_t* const iface_tids; @@ -393,6 +394,7 @@ HRESULT get_class_typeinfo(const CLSID*,ITypeInfo**) DECLSPEC_HIDDEN; const void *dispex_get_vtbl(DispatchEx*) DECLSPEC_HIDDEN; void dispex_info_add_interface(dispex_data_t*,tid_t,const dispex_hook_t*) DECLSPEC_HIDDEN; compat_mode_t dispex_compat_mode(DispatchEx*) DECLSPEC_HIDDEN; +HRESULT dispex_to_string(DispatchEx*,BSTR*) DECLSPEC_HIDDEN; typedef enum { DISPEXPROP_CUSTOM, diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index eff9576..7b41563 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -304,6 +304,7 @@ static const tid_t HTMLDOMImplementation_iface_tids[] = { 0 }; static dispex_static_data_t HTMLDOMImplementation_dispex = { + L"DOMImplementation", NULL, DispHTMLDOMImplementation_tid, HTMLDOMImplementation_iface_tids @@ -555,6 +556,7 @@ static const tid_t HTMLScreen_iface_tids[] = { 0 }; static dispex_static_data_t HTMLScreen_dispex = { + L"Screen", NULL, DispHTMLScreen_tid, HTMLScreen_iface_tids @@ -718,6 +720,7 @@ static const tid_t OmHistory_iface_tids[] = { 0 }; static dispex_static_data_t OmHistory_dispex = { + L"History", NULL, DispHTMLHistory_tid, OmHistory_iface_tids @@ -874,6 +877,7 @@ static const tid_t HTMLPluginsCollection_iface_tids[] = { 0 }; static dispex_static_data_t HTMLPluginsCollection_dispex = { + L"PluginArray", NULL, DispCPlugins_tid, HTMLPluginsCollection_iface_tids @@ -1018,6 +1022,7 @@ static const tid_t HTMLMimeTypesCollection_iface_tids[] = { 0 }; static dispex_static_data_t HTMLMimeTypesCollection_dispex = { + L"MimeTypeArray", NULL, IHTMLMimeTypesCollection_tid, HTMLMimeTypesCollection_iface_tids @@ -1310,12 +1315,7 @@ static HRESULT WINAPI OmNavigator_toString(IOmNavigator *iface, BSTR *String) TRACE("(%p)->(%p)\n", This, String); - if(!String) - return E_INVALIDARG; - - *String = SysAllocString(dispex_compat_mode(&This->dispex) < COMPAT_MODE_IE9 - ? L"[object]" : L"[object Navigator]"); - return *String ? S_OK : E_OUTOFMEMORY; + return dispex_to_string(&This->dispex, String); } static HRESULT WINAPI OmNavigator_get_cpuClass(IOmNavigator *iface, BSTR *p) @@ -1469,6 +1469,7 @@ static const tid_t OmNavigator_iface_tids[] = { 0 }; static dispex_static_data_t OmNavigator_dispex = { + L"Navigator", NULL, DispHTMLNavigator_tid, OmNavigator_iface_tids @@ -1849,6 +1850,7 @@ static const tid_t HTMLPerformanceTiming_iface_tids[] = { 0 }; static dispex_static_data_t HTMLPerformanceTiming_dispex = { + L"PerformanceTiming", NULL, IHTMLPerformanceTiming_tid, HTMLPerformanceTiming_iface_tids @@ -1998,6 +2000,7 @@ static const tid_t HTMLPerformanceNavigation_iface_tids[] = { 0 }; static dispex_static_data_t HTMLPerformanceNavigation_dispex = { + L"PerformanceNavigation", NULL, IHTMLPerformanceNavigation_tid, HTMLPerformanceNavigation_iface_tids @@ -2188,6 +2191,7 @@ static const tid_t HTMLPerformance_iface_tids[] = { 0 }; static dispex_static_data_t HTMLPerformance_dispex = { + L"Performance", NULL, IHTMLPerformance_tid, HTMLPerformance_iface_tids @@ -2346,6 +2350,7 @@ static const tid_t HTMLNamespaceCollection_iface_tids[] = { 0 }; static dispex_static_data_t HTMLNamespaceCollection_dispex = { + L"MSNamespaceInfoCollection", NULL, DispHTMLNamespaceCollection_tid, HTMLNamespaceCollection_iface_tids @@ -2601,6 +2606,7 @@ static const tid_t console_iface_tids[] = { 0 }; static dispex_static_data_t console_dispex = { + L"Console", NULL, IWineMSHTMLConsole_tid, console_iface_tids diff --git a/dlls/mshtml/range.c b/dlls/mshtml/range.c index 89f6804..bea5ac6 100644 --- a/dlls/mshtml/range.c +++ b/dlls/mshtml/range.c @@ -1715,6 +1715,7 @@ static const tid_t HTMLTxtRange_iface_tids[] = { 0 }; static dispex_static_data_t HTMLTxtRange_dispex = { + L"TextRange", NULL, IHTMLTxtRange_tid, HTMLTxtRange_iface_tids @@ -2060,6 +2061,7 @@ static const tid_t HTMLDOMRange_iface_tids[] = { }; static dispex_static_data_t HTMLDOMRange_dispex = { + L"Range", NULL, DispHTMLDOMRange_tid, HTMLDOMRange_iface_tids diff --git a/dlls/mshtml/selection.c b/dlls/mshtml/selection.c index 786c2bd..280fdaa 100644 --- a/dlls/mshtml/selection.c +++ b/dlls/mshtml/selection.c @@ -330,6 +330,7 @@ static const tid_t HTMLSelectionObject_iface_tids[] = { 0 }; static dispex_static_data_t HTMLSelectionObject_dispex = { + L"MSSelection", NULL, IHTMLSelectionObject_tid, /* FIXME: We have a test for that, but it doesn't expose IHTMLSelectionObject2 iface. */ HTMLSelectionObject_iface_tids diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index d7d8ce5..56e18d0 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -895,6 +895,7 @@ static const tid_t HTMLXMLHttpRequest_iface_tids[] = { 0 }; static dispex_static_data_t HTMLXMLHttpRequest_dispex = { + L"XMLHttpRequest", &HTMLXMLHttpRequest_event_target_vtbl.dispex_vtbl, DispHTMLXMLHttpRequest_tid, HTMLXMLHttpRequest_iface_tids, @@ -1066,6 +1067,7 @@ static const tid_t HTMLXMLHttpRequestFactory_iface_tids[] = { 0 }; static dispex_static_data_t HTMLXMLHttpRequestFactory_dispex = { + L"Function", &HTMLXMLHttpRequestFactory_dispex_vtbl, IHTMLXMLHttpRequestFactory_tid, HTMLXMLHttpRequestFactory_iface_tids -- 2.31.1

3 34

[PATCH v4] wininet: Allow up to 4K for response headers.
by Hans Leidekker 07 Oct '21

07 Oct '21

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> v4: Use a static buffer in the test. Fix patch subject. LevelHead includes a Header value that is > 3K in length which causes a crash after linking your account. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47505 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wininet/internet.h | 2 +- dlls/wininet/tests/http.c | 47 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index e9d68e2c2d9..b361c0d1b4d 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -462,7 +462,7 @@ void free_authorization_cache(void) DECLSPEC_HIDDEN; void init_winsock(void) DECLSPEC_HIDDEN; -#define MAX_REPLY_LEN 0x5B4 +#define MAX_REPLY_LEN 0x1000 /* Used for debugging - maybe need to be shared in the Wine debugging code ? */ typedef struct diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index ae95b4399e0..d1d7e678853 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2410,6 +2410,17 @@ static DWORD CALLBACK server_thread(LPVOID param) static const char headmsg[] = "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\n0123456789"; send(c, headmsg, sizeof(headmsg)-1, 0); } + if (strstr(buffer, "GET /test_large_header")) + { + static const char allokmsg[] = "HTTP/1.1 200 OK\r\nServer: winetest\r\n"; + char header[4000 + sizeof("wine-header: ") - 1]; + + memset(header, 'A', sizeof(header)); + memcpy(header, "wine-header: ", sizeof("wine-header: ") - 1); + send(c, allokmsg, sizeof(allokmsg) - 1, 0); + send(c, header, sizeof(header), 0); + send(c, "\r\n\r\n", 4, 0); + } if (strstr(buffer, "GET /test_conn_close")) { static const char conn_close_response[] = "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\nsome content"; @@ -3616,6 +3627,41 @@ static void test_not_modified(int port) InternetCloseHandle(ses); } +static void test_large_header(int port) +{ + HINTERNET ses, con, req; + BOOL ret; + DWORD size, index, error; + char buffer[13]; + + ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL, "InternetOpen failed\n"); + + con = InternetConnectA(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed\n"); + + req = HttpOpenRequestA(con, NULL, "/test_large_header", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + SetLastError(0xdeadbeef); + ret = HttpSendRequestW(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + test_status_code(req, 200); + + index = 0; + size = sizeof(buffer); + strcpy(buffer, "wine-header"); + ret = HttpQueryInfoA(req, HTTP_QUERY_CUSTOM, buffer, &size, &index); + error = GetLastError(); + ok(!ret, "HttpQueryInfoA succeeded\n"); + ok(error == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %u\n", error); + ok(size == 4001, "got %u\n", size); + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); +} + static void test_conn_close(int port) { HINTERNET session, connection, req; @@ -6190,6 +6236,7 @@ static void test_http_connection(void) test_options(si.port); test_no_content(si.port); test_not_modified(si.port); + test_large_header(si.port); test_conn_close(si.port); test_no_cache(si.port); test_cache_read_gzipped(si.port); -- 2.30.2

2 1

[PATCH v2 1/2] xinput1_3: Destroy controllers when ReadFile fails and I/O is not pending.
by Rémi Bernon 07 Oct '21

07 Oct '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Don't move the xinput controller list initial enumeration. I changed that after adding the start event, not completely sure why, but it actually introduces a race condition. Supersedes: 216570-216571 dlls/xinput1_3/main.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/xinput1_3/main.c b/dlls/xinput1_3/main.c index 81d11e5d38f..f3ad7d1d360 100644 --- a/dlls/xinput1_3/main.c +++ b/dlls/xinput1_3/main.c @@ -331,9 +331,14 @@ static DWORD HID_set_state(struct xinput_controller *controller, XINPUT_VIBRATIO return ERROR_SUCCESS; } +static void controller_destroy(struct xinput_controller *controller); + static void controller_enable(struct xinput_controller *controller) { + ULONG report_len = controller->hid.caps.InputReportByteLength; + char *report_buf = controller->hid.input_report_buf; XINPUT_VIBRATION state = controller->vibration; + BOOL ret; if (controller->enabled) return; if (controller->caps.Flags & XINPUT_CAPS_FFB_SUPPORTED) HID_set_state(controller, &state); @@ -341,8 +346,9 @@ static void controller_enable(struct xinput_controller *controller) memset(&controller->hid.read_ovl, 0, sizeof(controller->hid.read_ovl)); controller->hid.read_ovl.hEvent = controller->hid.read_event; - ReadFile(controller->device, controller->hid.input_report_buf, controller->hid.caps.InputReportByteLength, NULL, &controller->hid.read_ovl); - SetEvent(update_event); + ret = ReadFile(controller->device, report_buf, report_len, NULL, &controller->hid.read_ovl); + if (!ret && GetLastError() != ERROR_IO_PENDING) controller_destroy(controller); + else SetEvent(update_event); } static void controller_disable(struct xinput_controller *controller) @@ -554,6 +560,7 @@ static void read_controller_state(struct xinput_controller *controller) NTSTATUS status; USAGE buttons[11]; ULONG i, button_length, value; + BOOL ret; if (!GetOverlappedResult(controller->device, &controller->hid.read_ovl, &read_len, TRUE)) { @@ -635,7 +642,8 @@ static void read_controller_state(struct xinput_controller *controller) controller->state = state; memset(&controller->hid.read_ovl, 0, sizeof(controller->hid.read_ovl)); controller->hid.read_ovl.hEvent = controller->hid.read_event; - ReadFile(controller->device, controller->hid.input_report_buf, controller->hid.caps.InputReportByteLength, NULL, &controller->hid.read_ovl); + ret = ReadFile(controller->device, report_buf, report_len, NULL, &controller->hid.read_ovl); + if (!ret && GetLastError() != ERROR_IO_PENDING) controller_destroy(controller); } LeaveCriticalSection(&controller->crit); } -- 2.33.0

2 3

[PATCH 1/2] xinput1_3: Destroy controllers when ReadFile fails and I/O is not pending.
by Rémi Bernon 07 Oct '21

07 Oct '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- These should help with some inconsistent hotplugging behavior in xinput, PATCH 2 is adapted from a Proton patch. dlls/xinput1_3/main.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/xinput1_3/main.c b/dlls/xinput1_3/main.c index 81d11e5d38f..f3ad7d1d360 100644 --- a/dlls/xinput1_3/main.c +++ b/dlls/xinput1_3/main.c @@ -331,9 +331,14 @@ static DWORD HID_set_state(struct xinput_controller *controller, XINPUT_VIBRATIO return ERROR_SUCCESS; } +static void controller_destroy(struct xinput_controller *controller); + static void controller_enable(struct xinput_controller *controller) { + ULONG report_len = controller->hid.caps.InputReportByteLength; + char *report_buf = controller->hid.input_report_buf; XINPUT_VIBRATION state = controller->vibration; + BOOL ret; if (controller->enabled) return; if (controller->caps.Flags & XINPUT_CAPS_FFB_SUPPORTED) HID_set_state(controller, &state); @@ -341,8 +346,9 @@ static void controller_enable(struct xinput_controller *controller) memset(&controller->hid.read_ovl, 0, sizeof(controller->hid.read_ovl)); controller->hid.read_ovl.hEvent = controller->hid.read_event; - ReadFile(controller->device, controller->hid.input_report_buf, controller->hid.caps.InputReportByteLength, NULL, &controller->hid.read_ovl); - SetEvent(update_event); + ret = ReadFile(controller->device, report_buf, report_len, NULL, &controller->hid.read_ovl); + if (!ret && GetLastError() != ERROR_IO_PENDING) controller_destroy(controller); + else SetEvent(update_event); } static void controller_disable(struct xinput_controller *controller) @@ -554,6 +560,7 @@ static void read_controller_state(struct xinput_controller *controller) NTSTATUS status; USAGE buttons[11]; ULONG i, button_length, value; + BOOL ret; if (!GetOverlappedResult(controller->device, &controller->hid.read_ovl, &read_len, TRUE)) { @@ -635,7 +642,8 @@ static void read_controller_state(struct xinput_controller *controller) controller->state = state; memset(&controller->hid.read_ovl, 0, sizeof(controller->hid.read_ovl)); controller->hid.read_ovl.hEvent = controller->hid.read_event; - ReadFile(controller->device, controller->hid.input_report_buf, controller->hid.caps.InputReportByteLength, NULL, &controller->hid.read_ovl); + ret = ReadFile(controller->device, report_buf, report_len, NULL, &controller->hid.read_ovl); + if (!ret && GetLastError() != ERROR_IO_PENDING) controller_destroy(controller); } LeaveCriticalSection(&controller->crit); } -- 2.33.0

2 2

[PATCH v2 1/2] dinput: Remove "stub!" from HID joystick IDirectInputDevice8_EnumCreatedEffectObjects.
by Rémi Bernon 07 Oct '21

07 Oct '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Resending the first two patches, to remove some leftover code from PATCH 2, other patches should still apply cleanly on top. Supersedes: 216557-216558 dlls/dinput/joystick_hid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 2ef01ac6ace..d2aa352b6e2 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1195,7 +1195,7 @@ static HRESULT WINAPI hid_joystick_EnumCreatedEffectObjects( IDirectInputDevice8 struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); struct hid_joystick_effect *effect, *next; - FIXME( "iface %p, callback %p, context %p, flags %#x stub!\n", iface, callback, context, flags ); + TRACE( "iface %p, callback %p, context %p, flags %#x.\n", iface, callback, context, flags ); if (!callback) return DIERR_INVALIDPARAM; if (flags) return DIERR_INVALIDPARAM; -- 2.33.0

1 1

[PATCH 01/11] dinput: Remove "stub!" from HID joystick IDirectInputDevice8_EnumCreatedEffectObjects.
by Rémi Bernon 07 Oct '21

07 Oct '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/joystick_hid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 2ef01ac6ace..d2aa352b6e2 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1195,7 +1195,7 @@ static HRESULT WINAPI hid_joystick_EnumCreatedEffectObjects( IDirectInputDevice8 struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); struct hid_joystick_effect *effect, *next; - FIXME( "iface %p, callback %p, context %p, flags %#x stub!\n", iface, callback, context, flags ); + TRACE( "iface %p, callback %p, context %p, flags %#x.\n", iface, callback, context, flags ); if (!callback) return DIERR_INVALIDPARAM; if (flags) return DIERR_INVALIDPARAM; -- 2.33.0

1 10

[PATCH] configure: No longer disable iphlpapi in a Windows build.
by Huw Davies 07 Oct '21

07 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- configure.ac | 1 - 1 file changed, 1 deletion(-) diff --git a/configure.ac b/configure.ac index 4497e98e7bb..39fb1eabc4b 100644 --- a/configure.ac +++ b/configure.ac @@ -723,7 +723,6 @@ case $host_os in [LDDLLFLAGS="-Wl,--disable-stdcall-fixup"]) ;; esac dnl Disable modules that can't be used on Windows - enable_iphlpapi=${enable_iphlpapi:-no} enable_mountmgr_sys=${enable_mountmgr_sys:-no} enable_loader=${enable_loader:-no} enable_server=${enable_server:-no} -- 2.23.0

1 0

[PATCH v3] wininet: Allow up to 4K for data buffers
by Alistair Leslie-Hughes 07 Oct '21

07 Oct '21

LevelHead includes a Header value that is > 3K in length which causes a crash after linking your account. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47505 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/internet.h | 2 +- dlls/wininet/tests/http.c | 54 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index e9d68e2c2d9..8538699811c 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -462,7 +462,7 @@ void free_authorization_cache(void) DECLSPEC_HIDDEN; void init_winsock(void) DECLSPEC_HIDDEN; -#define MAX_REPLY_LEN 0x5B4 +#define MAX_REPLY_LEN 0x1000 /* Used for debugging - maybe need to be shared in the Wine debugging code ? */ typedef struct diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index ae95b4399e0..219b635488e 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -44,6 +44,8 @@ static BOOL first_connection_to_test_url = TRUE; static BOOL https_support = TRUE; +#define HEADER_VALUE_SIZE 4000 + /* Adapted from dlls/urlmon/tests/protocol.c */ #define SET_EXPECT2(status, num) \ @@ -2410,6 +2412,22 @@ static DWORD CALLBACK server_thread(LPVOID param) static const char headmsg[] = "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\n0123456789"; send(c, headmsg, sizeof(headmsg)-1, 0); } + if (strstr(buffer, "GET /test_large_header_length")) + { + static const char allokmsg[] = "HTTP/1.1 200 OK\r\nCache-Control: no-cache\r\n" + "Server: winetest\r\n"; + + char *p = HeapAlloc(GetProcessHeap(), 0, HEADER_VALUE_SIZE + 13 ); + strcpy(p, "wine-header: "); + memset(p+13, 'A', HEADER_VALUE_SIZE); + p[HEADER_VALUE_SIZE+12] = 0; + + send(c, allokmsg, sizeof(allokmsg)-1, 0); + send(c, p, HEADER_VALUE_SIZE + 12, 0); + send(c, "\r\n\r\n", 4, 0); + + HeapFree(GetProcessHeap(), 0, p); + } if (strstr(buffer, "GET /test_conn_close")) { static const char conn_close_response[] = "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\nsome content"; @@ -3616,6 +3634,41 @@ static void test_not_modified(int port) InternetCloseHandle(ses); } +static void test_header_length_value(int port) +{ + HINTERNET ses, con, req; + BOOL ret; + DWORD size, index, error; + char buffer[13]; + + ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL, "InternetOpen failed\n"); + + con = InternetConnectA(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed\n"); + + req = HttpOpenRequestA(con, NULL, "/test_large_header_length", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + SetLastError(0xdeadbeef); + ret = HttpSendRequestW(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + test_status_code(req, 200); + + index = 0; + size = sizeof(buffer); + strcpy(buffer, "wine-header"); + ret = HttpQueryInfoA(req, HTTP_QUERY_CUSTOM, buffer, &size, &index); + error = GetLastError(); + ok(!ret, "HttpQueryInfoA succeeded\n"); + ok(error == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %u\n", error); + ok(size == HEADER_VALUE_SIZE, "got %u\n", size); + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); +} + static void test_conn_close(int port) { HINTERNET session, connection, req; @@ -6190,6 +6243,7 @@ static void test_http_connection(void) test_options(si.port); test_no_content(si.port); test_not_modified(si.port); + test_header_length_value(si.port); test_conn_close(si.port); test_no_cache(si.port); test_cache_read_gzipped(si.port); -- 2.33.0

2 1

[PATCH v2] wininet: Allow up to 4K for data buffers
by Alistair Leslie-Hughes 07 Oct '21

07 Oct '21

LevelHead includes a Header value that is > 3K in length which causes a crash after linking your account. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47505 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/internet.h | 2 +- dlls/wininet/tests/http.c | 54 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index e9d68e2c2d9..8538699811c 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -462,7 +462,7 @@ void free_authorization_cache(void) DECLSPEC_HIDDEN; void init_winsock(void) DECLSPEC_HIDDEN; -#define MAX_REPLY_LEN 0x5B4 +#define MAX_REPLY_LEN 0x1000 /* Used for debugging - maybe need to be shared in the Wine debugging code ? */ typedef struct diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index ae95b4399e0..ace2291fe5c 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -44,6 +44,8 @@ static BOOL first_connection_to_test_url = TRUE; static BOOL https_support = TRUE; +#define HEADER_VALUE_SIZE 4098 + /* Adapted from dlls/urlmon/tests/protocol.c */ #define SET_EXPECT2(status, num) \ @@ -2410,6 +2412,22 @@ static DWORD CALLBACK server_thread(LPVOID param) static const char headmsg[] = "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\n0123456789"; send(c, headmsg, sizeof(headmsg)-1, 0); } + if (strstr(buffer, "GET /test_large_header_length")) + { + static const char allokmsg[] = "HTTP/1.1 200 OK\r\nCache-Control: no-cache\r\n" + "Server: winetest\r\n"; + + char *p = HeapAlloc(GetProcessHeap(), 0, HEADER_VALUE_SIZE + 13 ); + strcpy(p, "wine-header: "); + memset(p+13, 'A', HEADER_VALUE_SIZE); + p[HEADER_VALUE_SIZE+12] = 0; + + send(c, allokmsg, sizeof(allokmsg)-1, 0); + send(c, p, HEADER_VALUE_SIZE + 12, 0); + send(c, "\r\n\r\n", 4, 0); + + HeapFree(GetProcessHeap(), 0, p); + } if (strstr(buffer, "GET /test_conn_close")) { static const char conn_close_response[] = "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\nsome content"; @@ -3616,6 +3634,41 @@ static void test_not_modified(int port) InternetCloseHandle(ses); } +static void test_header_length_value(int port) +{ + HINTERNET ses, con, req; + BOOL ret; + DWORD size, index, error; + char buffer[13]; + + ses = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL, "InternetOpen failed\n"); + + con = InternetConnectA(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed\n"); + + req = HttpOpenRequestA(con, NULL, "/test_large_header_length", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + SetLastError(0xdeadbeef); + ret = HttpSendRequestW(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); + test_status_code(req, 200); + + index = 0; + size = sizeof(buffer); + strcpy(buffer, "wine-header"); + ret = HttpQueryInfoA(req, HTTP_QUERY_CUSTOM, buffer, &size, &index); + error = GetLastError(); + ok(!ret, "HttpQueryInfoA succeeded\n"); + ok(error == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %u\n", error); + ok(size == HEADER_VALUE_SIZE, "got %u\n", size); + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); +} + static void test_conn_close(int port) { HINTERNET session, connection, req; @@ -6190,6 +6243,7 @@ static void test_http_connection(void) test_options(si.port); test_no_content(si.port); test_not_modified(si.port); + test_header_length_value(si.port); test_conn_close(si.port); test_no_cache(si.port); test_cache_read_gzipped(si.port); -- 2.33.0

2 1

[PATCH] api-ms-win-core-realtime-l1-1-1: Add stub DLL.
by Brendan Shanks 06 Oct '21

06 Oct '21

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- Used by the Swift on Windows runtime. configure.ac | 1 + dlls/api-ms-win-core-realtime-l1-1-1/Makefile.in | 1 + .../api-ms-win-core-realtime-l1-1-1.spec | 3 +++ tools/make_specfiles | 1 + 4 files changed, 6 insertions(+) create mode 100644 dlls/api-ms-win-core-realtime-l1-1-1/Makefile.in create mode 100644 dlls/api-ms-win-core-realtime-l1-1-1/api-ms-win-core-realtime-l1-1-1.spec diff --git a/configure.ac b/configure.ac index 6321206b9db..fdaebc6deb2 100644 --- a/configure.ac +++ b/configure.ac @@ -2772,6 +2772,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-psapi-obsolete-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-psm-appnotify-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-quirks-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-realtime-l1-1-0) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-realtime-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-registry-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-registry-l2-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-registry-l2-2-0) diff --git a/dlls/api-ms-win-core-realtime-l1-1-1/Makefile.in b/dlls/api-ms-win-core-realtime-l1-1-1/Makefile.in new file mode 100644 index 00000000000..88ebedfb236 --- /dev/null +++ b/dlls/api-ms-win-core-realtime-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-realtime-l1-1-1.dll diff --git a/dlls/api-ms-win-core-realtime-l1-1-1/api-ms-win-core-realtime-l1-1-1.spec b/dlls/api-ms-win-core-realtime-l1-1-1/api-ms-win-core-realtime-l1-1-1.spec new file mode 100644 index 00000000000..6cffa1f0b08 --- /dev/null +++ b/dlls/api-ms-win-core-realtime-l1-1-1/api-ms-win-core-realtime-l1-1-1.spec @@ -0,0 +1,3 @@ +@ stub QueryInterruptTime +@ stub QueryInterruptTimePrecise +@ stub QueryUnbiasedInterruptTimePrecise diff --git a/tools/make_specfiles b/tools/make_specfiles index a7ee7e7f4db..ecfc6d0e8f2 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -219,6 +219,7 @@ my @dll_groups = "api-ms-win-core-misc-l1-1-0", "api-ms-win-core-profile-l1-1-0", "api-ms-win-core-realtime-l1-1-0", + "api-ms-win-core-realtime-l1-1-1", "api-ms-win-core-sidebyside-l1-1-0", "api-ms-win-core-string-l1-1-0", "api-ms-win-core-string-obsolete-l1-1-0", -- 2.32.0

1 0

wine-6.0.2-rc1 Available
by Michael Stefaniuc 06 Oct '21

06 Oct '21

Hello guys, I have pushed wine-6.0.2-rc1 (bc884477a6ebac35c9a54d5ea04e8baa130b71ae) to https://github.com/mstefani/wine-stable/tree/stable https://people.redhat.com/mstefani/wine/stable/ Nothing fancy so without further ado.: What's new in this release (see below for details): - Compilation fixes (freetype, gcc 11) - Various bug fixes ---------------------------------------------------------------- Bugs fixed in 6.0.2 (total 51): 12076 Multiple applications refuse to install unless '%SystemRoot%\System32\Drivers\Etc\{services,host}' exist (Informix Database apps, Autodesk 3ds Max 9, SAP GUI) 12457 Multiple apps crash with NotImplementedException at IWebBrowser2.get_LocationName() (SharpDevelop 2.2, Clarion Enterprise Edition 9.0.10376) 19756 Date/time picker doesn't notify app about checkbox changes (TaskCoach: Cannot add new task with a due date) 24893 File/folder context menus have missing options (Explorer++, Double Commander) 29903 Multiple games and applications fail to enumerate processes due to 'wtsapi32.WTSEnumerateProcessesW' stub (Visual Studio 2005, .NET 2.0 SDK DbgCLR, Akamai DL Manager, Dekaron) 32749 Implement atl100.dll.AtlAxDialogBoxW to show error dialogs (Visual Studio 2010 (10.0) Express Edition) 35539 Proteus 8 demo fails to install 36010 Changing font resolution on winecfg changes default main font to Tahoma 39841 IShellFolder.CreateViewObject() doesn't support IID_IContextMenu (Double Commander "Error: invalid parameter" when right-clicking on an empty space) 44813 Some applications fail when calling ntdll.NtReadFile on a directory (expect STATUS_INVALID_DEVICE_REQUEST) 46817 Steam Big Picture needs d3d11_device_CreateDeviceContextState 47296 Google drive crashes before login 47310 Canon TS3100 series full driver and software package refuses to install: "To install the software, you must be logged in to an administrator account." 48123 Word 97 crashes after calling stub URLMoniker_ComposeWith 48412 Multiple games have lighting issue and textures blinking (Call of Duty 4: Modern Warfare, Call of Duty: Modern Warfare 2) 48507 osu! icons in the setting and music player are not being rendered 49434 Wine builtin 'iexplore' crashes upon loading Google Account login page 49663 Performance regression in TrackMania Nations Forever 49954 Multiple games and applications need msvcp140_1._Aligned_get_default_resource (EVE Online Launcher, QT Creator 3.x, Kate, Snap Camera 1.11.x, Cppcheck 2.3) 50119 Dark Souls II: Scholar of the First Sin shows a white screen with vulkan renderer 50147 Microsoft WebView2 "evergreen bootstrapper"/installer needs IStream::CopyTo() 50168 Error when running notepad.exe: Failed to start RpcSs service 50318 'HKLM\System\CurrentControlSet\Services\Tcpip\Parameters\DataBasePath' registry entry has non-standard value 50362 Fl Studio 20.8 crashes on startup 50436 Upstream FAudio pkg-config file not found 50492 Amazon Chime 4.x (.NET 4.5 app) reports 'Failed to InjectErrorHandlingScript, Unable to cast COM object of type 'System.__ComObject' to interface type 'mshtml.HTMLHeadElement'' 50628 Fairy Tale About Father Frost, Ivan and Nastya crashes on DDERR_SURFACE_LOST 50673 FlatOut 2 crashes on launch 50697 Multiple applications crash due to DHTMLEdit 'IOleObject::GetExtent' stub (Atomic Mail Sender 4.2x) 50725 Nvidia FrameView 1.2 (Win10 app) crashes on unimplemented function tdh.dll.TdhLoadManifestFromBinary 50756 "Path is invalid." when using "SVN update" with SVN for Windows, which is used by TortoiseSVN 50791 NtQueryObject( ..., ObjectBasicInformation, NULL, 0, &retLen) returns incorrect NTSTATUS error code and no buffer size (EditSection, Google sandbox-attacksurface-analysis-tools v1.1.x) 50805 Win32_OperatingSystem class is missing 'ProductType' (affects Chocolatey) 50809 Multiple .NET 4.x application installers fail due to 'MsiNetAssemblySupport' property returning incorrect version (IronPython 2.7.5) 50811 gdi32.res fails to compile when freetype pkg-config cflags contain "-pthread" 50818 Mahou Shoujo Shoumou Sensen - DeadΩAegis (Trial) shows unreadable text in the message box. 50829 Process Hacker 2.38 crashes on unimplemented function dbghelp.dll.SymFromNameW 50830 Process Hacker 2.38 crashes on unimplemented function advapi32.dll.LsaEnumerateAccounts 50845 jscript crashes on internal assert(0) in PE build with clang 50854 Multiple Windows 10 application installers refuse to install, requiring 'advapi32.dll' version >= 6.3.10000.0 (Elgato Stream Deck 4.9.3, Windows Admin Center 2103) 50875 HTMLElement_get_offsetParent crashes wine if a NULL offset parent is expected (VbsEdit) 50885 PdfSharp creates invalid PDF files 50925 Error fetching public key in GetRSAKeyFromCert - File not found 50952 Legends of Runeterra crashes at launch 50960 NETCoreCheck from .NET Deployment Tools crashes on unimplemented function api-ms-win-crt-stdio-l1-1-0.dll.__stdio_common_vfwprintf_p 51035 Alacritty v0.7.2 portable crashes: SetEnvironmentVariable ("some_non-existant_var", NULL) should return TRUE 51041 Scalable fonts with fsCsb[0] == 0 are not enumerated correctly 51076 demangle_datatype in ucrtbase crash in vc2019 x86 mode 51117 Silverlight_x64.exe (part of LEGO MINDSTORMS EV3 Home Edition installer) crashes 51324 Imperium Great Battles of Rome can't play videos 51631 winhttp:winhttp and winhttp:notification fail because echo.websocket.org is out of commission ---------------------------------------------------------------- Changes since 6.0.1: Akihiro Sagawa (2): gdi32: Move otmEMSquare initialization to freetype_load_font. gdi32: Fix text metrics used in EnumFonts families. Alexandre Julliard (4): makefiles: Only allow includes and defines in pkg-config flags. configure: Fix package name for FAudio. ws2_32: Install network database files. wine.inf: Fix the Tcpip database path. Alistair Leslie-Hughes (1): gdi32: Don't override FontSubstitutes on a DPI only change. Andrew Eikum (1): windowscodecs: Avoid types deprecated in libtiff 4.3. Andrey Turkin (1): ieframe: Implement IWebBrowser2::get_LocationName(). Anton Baskanov (4): amstream/tests: Add a test for event parameter of IDirectDrawStreamSample::Update. amstream: Support the event parameter in IDirectDrawStreamSample::Update. fonts: Fix breve glyph position in 16px MS Sans Serif. fonts: Fix dotaccent glyph position in Small Fonts. Arkadiusz Hiler (3): msvcp90: Add helpers for creating base class RTTI. msvcp140_1: Implement the DLL. kernelbase: Fix GetFileVersionInfo*() crashes with malformed resources. Austin English (2): tdh: Add TdhLoadManifestFromBinary stub. readme: Document Libera Chat migration. Brendan Shanks (2): wined3d: Add GPU information for Intel UHD Graphics 630. configure: Work around Xcode 12's ld assuming 16KB page sizes. Damjan Jovanovic (6): comctl32: Send DTN_DATETIMECHANGE when the checkbox changes too. shell32: The menu wIDs in hmenu were rebased by idCmdFirst. shell32: Use a smaller range of shellview menu IDs in our IContextMenu functions. shell32: Implement IID_IContextMenu in CreateViewObject() methods for shell folders that support it. shell32/tests: Fix test failures from ad412b11a7ea17b708994ed6609f8ed0cbfb169b. shell32: Fix a lock leak. David Torok (1): ntdll: Add NtCreateThread stub. David White (1): urlmon: Implement IMoniker_ComposeWith() for url monikers. Dmitry Kislyuk (1): mshtml: Fix NULL offset parent handling in IHTMLElement::get_offsetParent. Dmitry Timoshkov (3): crypt32: Implement CryptImportPublicKeyInfoEx2. crypt32: Add support for importing RSA public keys with BCrypt. ntdll: Exclude large integer APIs from relay tracing. Esme Povirk (1): gdiplus: Implement reference counting for private font families. François Gouget (3): tests: Trace the filename in winetest_wait_child_process(). tests: Add ignore_exceptions(). make_unicode: Add support for the 720 codepage (Arabic, Farsi and Urdu). Gijs Vermeulen (9): wtsapi32: Avoid calling GetUserNameW() twice in WTSQuerySessionInformationW(WTSUserName). wtsapi32/tests: Test returned username for WTSQuerySessionInformation(WTSUserName). kernelbase: Reject SORT_DIGITSASNUMBERS in CompareStringA(). kernelbase: Support FileRenameInfo in SetFileInformationByHandle. ntdll: Return STATUS_INFO_LENGTH_MISMATCH when len is too small in NtQueryObject(ObjectBasicInformation). dbghelp: Implement SymFromNameW(). ntdll/tests: Refactor RtlSetEnvironmentVariable() tests. ntdll: Don't fail when trying to remove the value of a non-existant variable in RtlSetEnvironmentVariable(). amstream: Handle AMMSF_RENDERALLSTREAMS in IAMMultiMediaStream::OpenFile(). Haidong Yu (2): shell32: Fix a memory leak. shell32: Fix a memory leak. Hans Leidekker (3): ntdll: Fall back to reading /dev/urandom if getrandom() is not supported. msi: Fix building the fusion filename. winhttp: Use ws.ifelse.io for websocket tests. Haoyang Chen (2): gdiplus: Avoid filtering of special characters. gdi32: Fix a memory leak. Jacek Caban (3): mshtml: Support DispHTMLHeadElement interface. jscript: Use quiet NaNs in jsval. msvcrt: Add sincos to importlib. Jan Sikorski (1): wined3d: Handle different slice pitches in uncompressed texture updates. John Zourlios (1): kernelbase: Accept LINGUISTIC_IGNOREDIACRITIC & SORT_DIGITSASNUMBERS in CompareStringEx(). Lauri Kenttä (1): msvcrt: Handle negative zero, infinity and nan in _ecvt and others. Louis Lenders (5): wtsapi32: Implement WTSQuerySessionInformation(WTSDomainName). wbemprox: Add ProductType to win32_operatingsystem class. advapi32: Update version resource. advapi32: Add stub for LsaEnumerateAccounts. kernel32: Remove entry for BasepDebugDump. Matteo Bruni (2): wined3d: Handle blits to Vulkan swapchains not matching the D3D swapchain. wined3d: Don't skip FFP vertex pipeline state handlers when STATE_VDECL is dirty. Michele Dionisio (1): msvcrt: Add __stdio_common_vfprintf_p and __stdio_common_vfwprintf_p. Nguyễn Chính Hữu (1): wined3d: Add GPU information for NVIDIA GT 1030. Nikolay Sivov (2): gdi32: Enumerate scalable fonts with zero charset mask as OEM. shcore/stream: Implement generic CopyTo(). Owen Rudge (1): winspool: Filter invalid characters when creating the PPD filename. Paul Gofman (2): ddraw/tests: Also test RT caps for software device. vcruntime140_1: Support two continuation addresses for catchblock. Piotr Caban (7): msvcp90: Add macro that define type_info vtable. msvcrt: Cleanup _ecvt tests. msvcrt/tests: Link to malloc/free functions in cpp tests. msvcrt/tests: Cleanup datatype demangle tests. msvcrt: Fix _unDName crash when demangling class function pointer. msvcrt: Improve memmove performance on i386 and x86_64 architectures. winemac.drv: Don't filter non active displays out. Qian Hong (1): atl: Implement AtlAxDialogBox(). Roman Pišl (2): kernel32/tests: Add test for FileRenameInfo in SetFileInformationByHandle. kernelbase: Convert DOS to NT path for FileRenameInfo in SetFileInformationByHandle. Rémi Bernon (3): d3d11: Add initial implementation of CreateDeviceContextState. dinput: Wait for the hook thread to exit when stopping it. dinput: Prevent a device interface leak when enumerating. Sebastian Lackner (1): ntdll: Return STATUS_INVALID_DEVICE_REQUEST when trying to call NtReadFile on directory. Torge Matthies (1): winex11.drv: Avoid race condition in X11 error handling. Vijay Kiran Kamuju (3): dhtmled.ocx: Implement IOleObject::SetExtent and IOleObject::GetExtent functions. dhtmled.ocx: Add stub IOleControl interface. dhtmled.ocx: Fake success in IDHTMLEdit::NewDocument. Zebediah Figura (5): msi: Check for a NULL return from deformat_string() when checking for failure. include: Factor out winetest_printf(). include: Introduce winetest_push_context() and winetest_pop_context(). wtsapi32: Implement WTSEnumerateProcessesW(). wine.inf: Install the protocol database at etc\protocol. Zhiyi Zhang (1): ntoskrnl.exe: Exclude large integer APIs from relay tracing. -- Michael Stefaniuc mstefani(a)winehq.org

1 0

[PATCH v5 7/7] win32u: Move ntgdi implementation from gdi32.
by Jacek Caban 06 Oct '21

06 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/Makefile.in | 38 +-- dlls/gdi32/objects.c | 2 - dlls/win32u/Makefile.in | 34 +- dlls/{gdi32 => win32u}/bitblt.c | 0 dlls/{gdi32 => win32u}/bitmap.c | 0 dlls/{gdi32 => win32u}/brush.c | 0 dlls/{gdi32 => win32u}/clipping.c | 0 dlls/{gdi32 => win32u}/dc.c | 0 dlls/{gdi32 => win32u}/dib.c | 0 dlls/{gdi32 => win32u}/dibdrv/bitblt.c | 0 dlls/{gdi32 => win32u}/dibdrv/dc.c | 0 dlls/{gdi32 => win32u}/dibdrv/dibdrv.h | 0 dlls/{gdi32 => win32u}/dibdrv/graphics.c | 0 dlls/{gdi32 => win32u}/dibdrv/objects.c | 0 dlls/{gdi32 => win32u}/dibdrv/opengl.c | 0 dlls/{gdi32 => win32u}/dibdrv/primitives.c | 0 dlls/{gdi32 => win32u}/driver.c | 0 dlls/{gdi32 => win32u}/emfdrv.c | 0 dlls/{gdi32 => win32u}/font.c | 0 dlls/{gdi32 => win32u}/freetype.c | 2 - dlls/{gdi32 => win32u}/gdiobj.c | 13 +- dlls/win32u/main.c | 6 +- dlls/{gdi32 => win32u}/mapping.c | 0 dlls/{gdi32 => win32u}/ntgdi_private.h | 0 dlls/{gdi32 => win32u}/opentype.c | 0 dlls/{gdi32 => win32u}/painting.c | 0 dlls/{gdi32 => win32u}/palette.c | 0 dlls/{gdi32 => win32u}/path.c | 0 dlls/{gdi32 => win32u}/pen.c | 0 dlls/{gdi32 => win32u}/printdrv.c | 0 dlls/{gdi32 => win32u}/region.c | 0 dlls/win32u/syscall.c | 20 +- dlls/{gdi32 => win32u}/vertical.c | 0 dlls/{gdi32 => win32u}/vulkan.c | 0 dlls/win32u/win32u.spec | 362 +++++++++++---------- dlls/{gdi32 => win32u}/win32u_private.h | 8 +- dlls/{gdi32 => win32u}/wrappers.c | 26 +- 37 files changed, 263 insertions(+), 248 deletions(-) rename dlls/{gdi32 => win32u}/bitblt.c (100%) rename dlls/{gdi32 => win32u}/bitmap.c (100%) rename dlls/{gdi32 => win32u}/brush.c (100%) rename dlls/{gdi32 => win32u}/clipping.c (100%) rename dlls/{gdi32 => win32u}/dc.c (100%) rename dlls/{gdi32 => win32u}/dib.c (100%) rename dlls/{gdi32 => win32u}/dibdrv/bitblt.c (100%) rename dlls/{gdi32 => win32u}/dibdrv/dc.c (100%) rename dlls/{gdi32 => win32u}/dibdrv/dibdrv.h (100%) rename dlls/{gdi32 => win32u}/dibdrv/graphics.c (100%) rename dlls/{gdi32 => win32u}/dibdrv/objects.c (100%) rename dlls/{gdi32 => win32u}/dibdrv/opengl.c (100%) rename dlls/{gdi32 => win32u}/dibdrv/primitives.c (100%) rename dlls/{gdi32 => win32u}/driver.c (100%) rename dlls/{gdi32 => win32u}/emfdrv.c (100%) rename dlls/{gdi32 => win32u}/font.c (100%) rename dlls/{gdi32 => win32u}/freetype.c (99%) rename dlls/{gdi32 => win32u}/gdiobj.c (99%) rename dlls/{gdi32 => win32u}/mapping.c (100%) rename dlls/{gdi32 => win32u}/ntgdi_private.h (100%) rename dlls/{gdi32 => win32u}/opentype.c (100%) rename dlls/{gdi32 => win32u}/painting.c (100%) rename dlls/{gdi32 => win32u}/palette.c (100%) rename dlls/{gdi32 => win32u}/path.c (100%) rename dlls/{gdi32 => win32u}/pen.c (100%) rename dlls/{gdi32 => win32u}/printdrv.c (100%) rename dlls/{gdi32 => win32u}/region.c (100%) rename dlls/{gdi32 => win32u}/vertical.c (100%) rename dlls/{gdi32 => win32u}/vulkan.c (100%) rename dlls/{gdi32 => win32u}/win32u_private.h (99%) rename dlls/{gdi32 => win32u}/wrappers.c (98%)

3 2

[PATCH vkd3d 1/5] vkd3d-shader/hlsl: SM4 immediate constants do not have a register index.
by Zebediah Figura 06 Oct '21

06 Oct '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_sm4.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index f72494311..328a8ba1b 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -961,8 +961,6 @@ static void write_sm4_constant(struct hlsl_ctx *ctx, instr.srcs[0].reg.dim = (dimx > 1) ? VKD3D_SM4_DIMENSION_VEC4 : VKD3D_SM4_DIMENSION_SCALAR; instr.srcs[0].reg.type = VKD3D_SM4_RT_IMMCONST; - instr.srcs[0].reg.idx[0] = constant->reg.id; - instr.srcs[0].reg.idx_count = 1; for (i = 0; i < dimx; ++i) instr.srcs[0].reg.immconst_uint[i] = constant->value[i].u; instr.src_count = 1, -- 2.33.0

6 22

[v2 PATCH 1/5] d3dcompiler/tests: Also accept broken HRESULT with d3dcompiler_46.
by Matteo Bruni 06 Oct '21

06 Oct '21

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Simplify broken() condition (thanks Zebediah). Supsersedes patch 216441. dlls/d3dcompiler_43/tests/reflection.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index 75f30e45dce..6d6173824a2 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -164,8 +164,8 @@ static void test_reflection_interfaces(void) expected_hr = D3D_COMPILER_VERSION < 46 ? E_NOINTERFACE : D3D_COMPILER_VERSION == 46 ? E_INVALIDARG : S_OK; hr = call_reflect(test_reflection_blob, test_reflection_blob[6], &IID_ID3D12ShaderReflection, (void **)&ref12); - /* Broken with older d3dcompiler_47. */ - ok(hr == expected_hr || broken(expected_hr == S_OK && hr == E_NOINTERFACE), "Got unexpected hr %#x.\n", hr); + /* Broken with older d3dcompiler_46, d3dcompiler_47. */ + ok(hr == expected_hr || broken(hr == E_NOINTERFACE), "Got unexpected hr %#x.\n", hr); if (hr != S_OK) return; -- 2.26.3

1 0

[PATCH vkd3d v2] tests: Mark WriteToSubresource test as todo on NVIDIA.
by Giovanni Mascellani 06 Oct '21

06 Oct '21

Similarly to ReadFromSubresource, WriteToSubresource is currently implemented only for images with linear tiling, which NVIDIA drivers currently do not support. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- tests/d3d12.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 89b1f000..1fa017ab 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -32060,6 +32060,7 @@ static void test_read_write_subresource(void) /* NULL box */ hr = ID3D12Resource_WriteToSubresource(src_texture, 0, NULL, dst_buffer, row_pitch, slice_pitch); + todo_if(is_nvidia_device(device)) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = ID3D12Resource_ReadFromSubresource(src_texture, dst_buffer, row_pitch, slice_pitch, 0, NULL); @@ -32102,17 +32103,20 @@ static void test_read_write_subresource(void) if (i) { hr = ID3D12Resource_WriteToSubresource(src_texture, 0, NULL, zero_buffer, row_pitch, slice_pitch); + todo_if(is_nvidia_device(device)) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); /* Write region 1 */ set_box(&box, 0, 0, 0, 2, 2, 2); hr = ID3D12Resource_WriteToSubresource(src_texture, 0, &box, dst_buffer, row_pitch, slice_pitch); + todo_if(is_nvidia_device(device)) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); /* Write region 2 */ set_box(&box, 2, 2, 2, 11, 13, 17); hr = ID3D12Resource_WriteToSubresource(src_texture, 0, &box, &dst_buffer[2 * 128 * 100 + 2 * 128 + 2], row_pitch, slice_pitch); + todo_if(is_nvidia_device(device)) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); } else @@ -32217,6 +32221,7 @@ static void test_read_write_subresource(void) if (got != expected) break; } + todo_if(is_nvidia_device(device)) ok(got == expected, "Got unexpected value 0x%08x at (%u, %u, %u), expected 0x%08x.\n", got, x, y, z, expected); release_resource_readback(&rb); -- 2.33.0

2 1

[PATCH v2 1/5] winegstreamer: Handle zero-length reads in src_getrange_cb().
by Zebediah Figura 06 Oct '21

06 Oct '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/wg_parser.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 72dfab8f3d6..9a382cb724c 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1272,7 +1272,7 @@ static GstFlowReturn src_getrange_cb(GstPad *pad, GstObject *parent, GstMapInfo map_info; bool ret; - GST_LOG("pad %p, offset %" G_GINT64_MODIFIER "u, length %u, buffer %p.", pad, offset, size, *buffer); + GST_LOG("pad %p, offset %" G_GINT64_MODIFIER "u, size %u, buffer %p.", pad, offset, size, *buffer); if (offset == GST_BUFFER_OFFSET_NONE) offset = parser->next_pull_offset; @@ -1281,6 +1281,16 @@ static GstFlowReturn src_getrange_cb(GstPad *pad, GstObject *parent, if (!*buffer) *buffer = new_buffer = gst_buffer_new_and_alloc(size); + if (!size) + { + /* asfreader occasionally asks for zero bytes. gst_buffer_map() will + * return NULL in this case. Avoid confusing the read thread by asking + * it for zero bytes. */ + gst_buffer_set_size(*buffer, 0); + GST_LOG("Returning empty buffer."); + return GST_FLOW_OK; + } + gst_buffer_map(*buffer, &map_info, GST_MAP_WRITE); pthread_mutex_lock(&parser->mutex); -- 2.33.0

1 4

[PATCH vkd3d 4/5] vkd3d: Reject descriptor tables containing register collisions.
by Henri Verbeet 06 Oct '21

06 Oct '21

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d/state.c | 37 +++++++++++++++++++++++++++++++++++++ tests/d3d12.c | 4 +--- 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index ffb3e2f5..990b49b2 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -662,6 +662,39 @@ static HRESULT d3d12_root_signature_init_descriptor_array_binding(struct d3d12_r return S_OK; } +static int compare_register_range(const void *a, const void *b) +{ + const struct d3d12_root_descriptor_table_range *range_a = a, *range_b = b; + int ret; + + if ((ret = range_a->type - range_b->type)) + return ret; + + if ((ret = range_a->register_space - range_b->register_space)) + return ret; + + return range_a->base_register_idx - range_b->base_register_idx; +} + +static HRESULT validate_descriptor_register_ranges(const struct d3d12_root_descriptor_table_range *ranges, + unsigned int count) +{ + const struct d3d12_root_descriptor_table_range *range, *prev; + unsigned int i; + + for (i = 1; i < count; ++i) + { + range = &ranges[i]; + prev = &ranges[i - 1]; + + if (range->type == prev->type && range->register_space == prev->register_space + && range->base_register_idx - prev->base_register_idx < prev->descriptor_count) + return E_INVALIDARG; + } + + return S_OK; +} + static HRESULT d3d12_root_signature_init_root_descriptor_tables(struct d3d12_root_signature *root_signature, const D3D12_ROOT_SIGNATURE_DESC *desc, struct vkd3d_descriptor_set_context *context) { @@ -715,6 +748,10 @@ static HRESULT d3d12_root_signature_init_root_descriptor_tables(struct d3d12_roo offset += range->NumDescriptors; } + qsort(table->ranges, range_count, sizeof(*table->ranges), compare_register_range); + if (FAILED(hr = validate_descriptor_register_ranges(table->ranges, range_count))) + return hr; + for (j = 0; j < range_count; ++j) { struct d3d12_root_descriptor_table_range *range; diff --git a/tests/d3d12.c b/tests/d3d12.c index 5dea7812..57c39d27 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2674,9 +2674,7 @@ static void test_create_root_signature(void) descriptor_ranges[1].BaseShaderRegister = 7; descriptor_ranges[1].OffsetInDescriptorsFromTableStart = 8; hr = create_root_signature(device, &root_signature_desc, &root_signature); - todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - if (SUCCEEDED(hr)) - ID3D12RootSignature_Release(root_signature); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); /* Identical ranges and register indices but different type. */ descriptor_ranges[1] = descriptor_ranges[0]; -- 2.20.1

1 0

[PATCH vkd3d 3/5] vkd3d: Reject OFFSET_APPEND after unbounded ranges in d3d12_root_signature_info_count_descriptors().
by Henri Verbeet 06 Oct '21

06 Oct '21

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d/state.c | 17 ++++++++++++++--- tests/d3d12.c | 2 +- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 9e554b44..ffb3e2f5 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -325,6 +325,7 @@ struct d3d12_root_signature_info static HRESULT d3d12_root_signature_info_count_descriptors(struct d3d12_root_signature_info *info, const D3D12_ROOT_DESCRIPTOR_TABLE *table, bool use_array) { + bool unbounded = false; unsigned int i; for (i = 0; i < table->NumDescriptorRanges; ++i) @@ -332,12 +333,16 @@ static HRESULT d3d12_root_signature_info_count_descriptors(struct d3d12_root_sig const D3D12_DESCRIPTOR_RANGE *range = &table->pDescriptorRanges[i]; unsigned int binding_count; - if (range->NumDescriptors == 0xffffffff) + if (unbounded && range->OffsetInDescriptorsFromTableStart == D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND) { - FIXME("Unhandled unbound descriptor range.\n"); - return E_NOTIMPL; + WARN("An unbounded range with offset D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND occurs after " + "another unbounded range.\n"); + return E_INVALIDARG; } + if (range->NumDescriptors == UINT_MAX) + unbounded = true; + binding_count = use_array ? 1 : range->NumDescriptors; switch (range->RangeType) @@ -365,6 +370,12 @@ static HRESULT d3d12_root_signature_info_count_descriptors(struct d3d12_root_sig info->binding_count += binding_count; } + if (unbounded) + { + FIXME("Unhandled unbounded descriptor range.\n"); + return E_NOTIMPL; + } + return S_OK; } diff --git a/tests/d3d12.c b/tests/d3d12.c index 74b4877c..5dea7812 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2814,7 +2814,7 @@ static void test_create_root_signature(void) * D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND. */ descriptor_ranges[1].OffsetInDescriptorsFromTableStart = D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND; hr = create_root_signature(device, &root_signature_desc, &root_signature); - todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); /* A bounded range overlapping an unbounded one, mapped to the same * register space and type. */ -- 2.20.1

1 0

[PATCH vkd3d 2/5] tests: Add root signature tests for unbounded descriptor ranges.
by Henri Verbeet 06 Oct '21

06 Oct '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- tests/d3d12.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 0b02e107..74b4877c 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2777,6 +2777,83 @@ static void test_create_root_signature(void) refcount = ID3D12RootSignature_Release(root_signature); ok(!refcount, "ID3D12RootSignature has %u references left.\n", (unsigned int)refcount); + /* Unbounded descriptor ranges. */ + + /* A bounded range overlapping an unbounded one, mapped to a different + * register space of the same type. */ + descriptor_ranges[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV; + descriptor_ranges[0].NumDescriptors = UINT_MAX; + descriptor_ranges[0].BaseShaderRegister = 0; + descriptor_ranges[0].RegisterSpace = 0; + descriptor_ranges[0].OffsetInDescriptorsFromTableStart = 0; + descriptor_ranges[1].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV; + descriptor_ranges[1].NumDescriptors = 1; + descriptor_ranges[1].BaseShaderRegister = 16; + descriptor_ranges[1].RegisterSpace = 1; + descriptor_ranges[1].OffsetInDescriptorsFromTableStart = 16; + root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE; + root_parameters[0].DescriptorTable.NumDescriptorRanges = 2; + root_parameters[0].DescriptorTable.pDescriptorRanges = descriptor_ranges; + root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL; + root_signature_desc.NumParameters = 1; + root_signature_desc.pParameters = root_parameters; + root_signature_desc.NumStaticSamplers = 0; + root_signature_desc.pStaticSamplers = NULL; + root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE; + hr = create_root_signature(device, &root_signature_desc, &root_signature); + todo ok(hr == S_OK || (binding_tier == D3D12_RESOURCE_BINDING_TIER_1 && (hr == E_FAIL || hr == E_INVALIDARG)), + "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + refcount = ID3D12RootSignature_Release(root_signature); + ok(!refcount, "Got unexpected refcount %u.\n", (unsigned int)refcount); + } + + /* A bounded range overlapping an unbounded one, mapped to a different + * register space of the same type. Using + * D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND. */ + descriptor_ranges[1].OffsetInDescriptorsFromTableStart = D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND; + hr = create_root_signature(device, &root_signature_desc, &root_signature); + todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + /* A bounded range overlapping an unbounded one, mapped to the same + * register space and type. */ + descriptor_ranges[1].RegisterSpace = 0; + descriptor_ranges[1].OffsetInDescriptorsFromTableStart = 16; + hr = create_root_signature(device, &root_signature_desc, &root_signature); + todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + /* A bounded range overlapping an unbounded one, mapped to the same + * register space, but a different type. */ + descriptor_ranges[1].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_CBV; + hr = create_root_signature(device, &root_signature_desc, &root_signature); + todo ok(hr == S_OK || (binding_tier <= D3D12_RESOURCE_BINDING_TIER_2 && (hr == E_FAIL || hr == E_INVALIDARG)), + "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + refcount = ID3D12RootSignature_Release(root_signature); + ok(!refcount, "Got unexpected refcount %u.\n", (unsigned int)refcount); + } + + /* An unbounded range overlapping another unbounded range, mapped to the + * same register space and type. */ + descriptor_ranges[1].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV; + descriptor_ranges[1].NumDescriptors = UINT_MAX; + hr = create_root_signature(device, &root_signature_desc, &root_signature); + todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ID3D12RootSignature_Release(root_signature); + + /* And unbounded range overlapping a bounded one, mapped to the same + * register space and type. */ + descriptor_ranges[0].NumDescriptors = 16; + descriptor_ranges[1].BaseShaderRegister = 0; + descriptor_ranges[1].OffsetInDescriptorsFromTableStart = 15; + hr = create_root_signature(device, &root_signature_desc, &root_signature); + todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ID3D12RootSignature_Release(root_signature); + refcount = ID3D12Device_Release(device); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } -- 2.20.1

1 0

[PATCH vkd3d 1/5] tests: Add root signature tests for descriptor register range collisions.
by Henri Verbeet 06 Oct '21

06 Oct '21

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- tests/d3d12.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 009f8331..0b02e107 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -584,6 +584,21 @@ static bool is_shader_float64_supported(ID3D12Device *device) return options.DoublePrecisionFloatShaderOps; } +static D3D12_RESOURCE_BINDING_TIER get_resource_binding_tier(ID3D12Device *device) +{ + D3D12_FEATURE_DATA_D3D12_OPTIONS options; + HRESULT hr; + + if (FAILED(hr = ID3D12Device_CheckFeatureSupport(device, + D3D12_FEATURE_D3D12_OPTIONS, &options, sizeof(options)))) + { + trace("Failed to check feature support, hr %#x.\n", hr); + return D3D12_RESOURCE_BINDING_TIER_1; + } + + return options.ResourceBindingTier; +} + #define create_cb_root_signature(a, b, c, e) create_cb_root_signature_(__LINE__, a, b, c, e) static ID3D12RootSignature *create_cb_root_signature_(unsigned int line, ID3D12Device *device, unsigned int reg_idx, D3D12_SHADER_VISIBILITY shader_visibility, @@ -2590,6 +2605,7 @@ static void test_create_root_signature(void) { D3D12_ROOT_SIGNATURE_DESC root_signature_desc; D3D12_DESCRIPTOR_RANGE descriptor_ranges[2]; + D3D12_RESOURCE_BINDING_TIER binding_tier; D3D12_ROOT_PARAMETER root_parameters[3]; ID3D12RootSignature *root_signature; ID3D12Device *device, *tmp_device; @@ -2602,6 +2618,11 @@ static void test_create_root_signature(void) return; } + /* Tier 2 is required for unbounded SRVs and Tier > 2 for unbounded CBVs and UAVs + * due to the need for partial binding support. It is also required for overlapping + * ranges of different types. */ + binding_tier = get_resource_binding_tier(device); + /* descriptor table */ descriptor_ranges[0].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV; descriptor_ranges[0].NumDescriptors = 1; @@ -2637,6 +2658,35 @@ static void test_create_root_signature(void) refcount = ID3D12RootSignature_Release(root_signature); ok(!refcount, "ID3D12RootSignature has %u references left.\n", (unsigned int)refcount); + /* Overlapping ranges but unique register indices. */ + descriptor_ranges[0].NumDescriptors = 8; + descriptor_ranges[1].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SRV; + descriptor_ranges[1].NumDescriptors = 2; + descriptor_ranges[1].BaseShaderRegister = 8; + descriptor_ranges[1].RegisterSpace = 0; + descriptor_ranges[1].OffsetInDescriptorsFromTableStart = 7; + root_parameters[0].DescriptorTable.NumDescriptorRanges = 2; + hr = create_root_signature(device, &root_signature_desc, &root_signature); + ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); + ID3D12RootSignature_Release(root_signature); + + /* Separate ranges with ambiguous register indices. */ + descriptor_ranges[1].BaseShaderRegister = 7; + descriptor_ranges[1].OffsetInDescriptorsFromTableStart = 8; + hr = create_root_signature(device, &root_signature_desc, &root_signature); + todo ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ID3D12RootSignature_Release(root_signature); + + /* Identical ranges and register indices but different type. */ + descriptor_ranges[1] = descriptor_ranges[0]; + descriptor_ranges[1].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_CBV; + hr = create_root_signature(device, &root_signature_desc, &root_signature); + ok(hr == S_OK || (binding_tier <= D3D12_RESOURCE_BINDING_TIER_2 && (hr == E_FAIL || hr == E_INVALIDARG)), + "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ID3D12RootSignature_Release(root_signature); + /* sampler and SRV in the same descriptor table */ descriptor_ranges[1].RangeType = D3D12_DESCRIPTOR_RANGE_TYPE_SAMPLER; descriptor_ranges[1].NumDescriptors = 1; -- 2.20.1

1 0

[PATCH 1/5] d3dcompiler/tests: Also accept broken HRESULT with d3dcompiler_46.
by Matteo Bruni 06 Oct '21

06 Oct '21

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- For reference, I got this "new" result with a d3dcompiler_46.dll found in Steam's directory. dlls/d3dcompiler_43/tests/reflection.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index 75f30e45dce..8cf6edb1c97 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -164,8 +164,8 @@ static void test_reflection_interfaces(void) expected_hr = D3D_COMPILER_VERSION < 46 ? E_NOINTERFACE : D3D_COMPILER_VERSION == 46 ? E_INVALIDARG : S_OK; hr = call_reflect(test_reflection_blob, test_reflection_blob[6], &IID_ID3D12ShaderReflection, (void **)&ref12); - /* Broken with older d3dcompiler_47. */ - ok(hr == expected_hr || broken(expected_hr == S_OK && hr == E_NOINTERFACE), "Got unexpected hr %#x.\n", hr); + /* Broken with older d3dcompiler_46, d3dcompiler_47. */ + ok(hr == expected_hr || broken(expected_hr != E_NOINTERFACE && hr == E_NOINTERFACE), "Got unexpected hr %#x.\n", hr); if (hr != S_OK) return; -- 2.26.3

5 10

[PATCH v5 1/2] wined3d: Set VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT for unordered access images.
by Jan Sikorski 06 Oct '21

06 Oct '21

Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/texture.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index db32274960f..339bf4e205a 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -5092,8 +5092,13 @@ BOOL wined3d_texture_vk_prepare_texture(struct wined3d_texture_vk *texture_vk, resource = &texture_vk->t.resource; format_vk = wined3d_format_vk(resource->format); - if (wined3d_format_is_typeless(&format_vk->f) || texture_vk->t.swapchain) + if (wined3d_format_is_typeless(&format_vk->f) || texture_vk->t.swapchain + || (texture_vk->t.resource.bind_flags & WINED3D_BIND_UNORDERED_ACCESS)) + { + /* For UAVs, we need this in case a clear necessitates creation of a new view + * with a different format. */ flags |= VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT; + } switch (resource->type) { -- 2.30.2

2 3

[PATCH v2] wined3d: Use a single allocation for command list data.
by Jan Sikorski 06 Oct '21

06 Oct '21

Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/cs.c | 54 ++++++++++++++++++++--------------------------- 1 file changed, 23 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 8307ce0fa96..576a3ccd50e 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -76,11 +76,6 @@ static void wined3d_command_list_destroy_object(void *object) for (i = 0; i < list->upload_count; ++i) heap_free(list->uploads[i].sysmem); - heap_free(list->command_lists); - heap_free(list->uploads); - heap_free(list->resources); - heap_free(list->data); - heap_free(list->queries); heap_free(list); } @@ -3734,45 +3729,54 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device { struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context); struct wined3d_command_list *object; + void *memory; TRACE("context %p, list %p.\n", context, list); - if (!(object = heap_alloc_zero(sizeof(*object)))) + memory = heap_alloc(sizeof(*object) + deferred->resource_count * sizeof(*object->resources) + + deferred->upload_count * sizeof(*object->uploads) + + deferred->command_list_count * sizeof(*object->command_lists) + + deferred->query_count * sizeof(*object->queries) + + deferred->data_size); + + if (!memory) return E_OUTOFMEMORY; + object = memory; + memory = &object[1]; + memset(object, 0, sizeof(*object)); object->refcount = 1; object->device = deferred->c.device; - if (!(object->data = heap_alloc(deferred->data_size))) - goto out_free_list; - object->data_size = deferred->data_size; - memcpy(object->data, deferred->data, deferred->data_size); - - if (!(object->resources = heap_alloc(deferred->resource_count * sizeof(*object->resources)))) - goto out_free_data; + object->resources = memory; + memory = &object->resources[deferred->resource_count]; object->resource_count = deferred->resource_count; memcpy(object->resources, deferred->resources, deferred->resource_count * sizeof(*object->resources)); /* Transfer our references to the resources to the command list. */ - if (!(object->uploads = heap_alloc(deferred->upload_count * sizeof(*object->uploads)))) - goto out_free_resources; + object->uploads = memory; + memory = &object->uploads[deferred->upload_count]; object->upload_count = deferred->upload_count; memcpy(object->uploads, deferred->uploads, deferred->upload_count * sizeof(*object->uploads)); /* Transfer our references to the resources to the command list. */ - if (!(object->command_lists = heap_alloc(deferred->command_list_count * sizeof(*object->command_lists)))) - goto out_free_uploads; + object->command_lists = memory; + memory = &object->command_lists[deferred->command_list_count]; object->command_list_count = deferred->command_list_count; memcpy(object->command_lists, deferred->command_lists, deferred->command_list_count * sizeof(*object->command_lists)); /* Transfer our references to the command lists to the command list. */ - if (!(object->queries = heap_alloc(deferred->query_count * sizeof(*object->queries)))) - goto out_free_command_lists; + object->queries = memory; + memory = &object->queries[deferred->query_count]; object->query_count = deferred->query_count; memcpy(object->queries, deferred->queries, deferred->query_count * sizeof(*object->queries)); /* Transfer our references to the queries to the command list. */ + object->data = memory; + object->data_size = deferred->data_size; + memcpy(object->data, deferred->data, deferred->data_size); + deferred->data_size = 0; deferred->resource_count = 0; deferred->upload_count = 0; @@ -3789,16 +3793,4 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device *list = object; return S_OK; - -out_free_command_lists: - heap_free(object->command_lists); -out_free_uploads: - heap_free(object->uploads); -out_free_resources: - heap_free(object->resources); -out_free_data: - heap_free(object->data); -out_free_list: - heap_free(object); - return E_OUTOFMEMORY; } -- 2.30.2

2 1

[PATCH 0/1] Patch removing some dead code
by David Kahurani 06 Oct '21

06 Oct '21

The following patch removes some dead code. It is not clear to me whether the FIXME should remain as it is so it has been left out. David Kahurani (1): dlls/ntdll: Remove dead code dlls/ntdll/unix/system.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) -- 2.33.0

6 8

[PATCH vkd3d 5/6] vkd3d-shader/sm1: Introduce a parser for the legacy D3D byte-code format.
by Henri Verbeet 06 Oct '21

06 Oct '21

This is largely derived from the parser in Wine/wined3d, as of wine-6.18. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- Makefile.am | 1 + include/private/vkd3d_debug.h | 1 + include/vkd3d_shader.h | 5 + libs/vkd3d-common/debug.c | 18 +- libs/vkd3d-shader/d3dbc.c | 958 +++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_main.c | 50 ++ libs/vkd3d-shader/vkd3d_shader_private.h | 12 + programs/vkd3d-compiler/main.c | 4 + tests/vkd3d_shader_api.c | 89 +++ 9 files changed, 1133 insertions(+), 5 deletions(-) create mode 100644 libs/vkd3d-shader/d3dbc.c diff --git a/Makefile.am b/Makefile.am index ee3d7495..eaa4f816 100644 --- a/Makefile.am +++ b/Makefile.am @@ -184,6 +184,7 @@ libvkd3d_shader_la_SOURCES = \ include/private/vkd3d_memory.h \ include/vkd3d_shader.h \ libs/vkd3d-shader/checksum.c \ + libs/vkd3d-shader/d3dbc.c \ libs/vkd3d-shader/dxbc.c \ libs/vkd3d-shader/glsl.c \ libs/vkd3d-shader/hlsl.c \ diff --git a/include/private/vkd3d_debug.h b/include/private/vkd3d_debug.h index a206a92b..8ab653ae 100644 --- a/include/private/vkd3d_debug.h +++ b/include/private/vkd3d_debug.h @@ -51,6 +51,7 @@ void vkd3d_dbg_printf(enum vkd3d_dbg_level level, const char *function, const ch const char *vkd3d_dbg_sprintf(const char *fmt, ...) VKD3D_PRINTF_FUNC(1, 2); const char *vkd3d_dbg_vsprintf(const char *fmt, va_list args); const char *debugstr_a(const char *str); +const char *debugstr_an(const char *str, size_t n); const char *debugstr_w(const WCHAR *wstr, size_t wchar_size); #define VKD3D_DBG_LOG(level) \ diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 58e507b7..37b5936d 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -467,6 +467,11 @@ enum vkd3d_shader_source_type VKD3D_SHADER_SOURCE_DXBC_TPF, /** High-Level Shader Language source code. */ VKD3D_SHADER_SOURCE_HLSL, + /** + * Legacy Direct3D byte-code. This is the format used for Direct3D shader + * model 1, 2, and 3 shaders. + */ + VKD3D_SHADER_SOURCE_D3D_BYTECODE, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_SOURCE_TYPE), }; diff --git a/libs/vkd3d-common/debug.c b/libs/vkd3d-common/debug.c index dcf53fa9..4868f3fb 100644 --- a/libs/vkd3d-common/debug.c +++ b/libs/vkd3d-common/debug.c @@ -132,22 +132,25 @@ static int get_escape_char(int c) } } -const char *debugstr_a(const char *str) +const char *debugstr_an(const char *str, size_t n) { char *buffer, *ptr; + int escape_char; char c; if (!str) return "(null)"; + if (n == SIZE_MAX) + n = strlen(str); ptr = buffer = get_buffer(); *ptr++ = '"'; - while ((c = *str++) && ptr <= buffer + VKD3D_DEBUG_BUFFER_SIZE - 8) + while (n-- && ptr <= buffer + VKD3D_DEBUG_BUFFER_SIZE - 8) { - int escape_char = get_escape_char(c); + c = *str++; - if (escape_char) + if ((escape_char = get_escape_char(c))) { *ptr++ = '\\'; *ptr++ = escape_char; @@ -167,7 +170,7 @@ const char *debugstr_a(const char *str) } *ptr++ = '"'; - if (c) + if (++n) { *ptr++ = '.'; *ptr++ = '.'; @@ -178,6 +181,11 @@ const char *debugstr_a(const char *str) return buffer; } +const char *debugstr_a(const char *str) +{ + return debugstr_an(str, SIZE_MAX); +} + static const char *debugstr_w16(const uint16_t *wstr) { char *buffer, *ptr; diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c new file mode 100644 index 00000000..267f9609 --- /dev/null +++ b/libs/vkd3d-shader/d3dbc.c @@ -0,0 +1,958 @@ +/* + * Copyright 2002-2003 Jason Edmeades + * Copyright 2002-2003 Raphael Junqueira + * Copyright 2004 Christian Costa + * Copyright 2005 Oliver Stieber + * Copyright 2006 Ivan Gyurdiev + * Copyright 2007-2008 Stefan Dösinger for CodeWeavers + * Copyright 2009, 2021 Henri Verbeet for CodeWeavers + * + * 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 + */ + +#include "vkd3d_shader_private.h" + +#define VKD3D_SM1_VS 0xfffeu +#define VKD3D_SM1_PS 0xffffu + +#define VKD3D_SM1_DCL_USAGE_SHIFT 0u +#define VKD3D_SM1_DCL_USAGE_MASK (0xfu << VKD3D_SM1_DCL_USAGE_SHIFT) +#define VKD3D_SM1_DCL_USAGE_INDEX_SHIFT 16u +#define VKD3D_SM1_DCL_USAGE_INDEX_MASK (0xfu << VKD3D_SM1_DCL_USAGE_INDEX_SHIFT) + +#define VKD3D_SM1_RESOURCE_TYPE_SHIFT 27u +#define VKD3D_SM1_RESOURCE_TYPE_MASK (0xfu << VKD3D_SM1_RESOURCE_TYPE_SHIFT) + +#define VKD3D_SM1_OPCODE_MASK 0x0000ffffu + +#define VKD3D_SM1_INSTRUCTION_FLAGS_SHIFT 16u +#define VKD3D_SM1_INSTRUCTION_FLAGS_MASK (0xffu << VKD3D_SM1_INSTRUCTION_FLAGS_SHIFT) + +#define VKD3D_SM1_INSTRUCTION_LENGTH_SHIFT 24u +#define VKD3D_SM1_INSTRUCTION_LENGTH_MASK (0xfu << VKD3D_SM1_INSTRUCTION_LENGTH_SHIFT) + +#define VKD3D_SM1_COISSUE (0x1u << 30u) + +#define VKD3D_SM1_COMMENT_SIZE_SHIFT 16u +#define VKD3D_SM1_COMMENT_SIZE_MASK (0x7fffu << VKD3D_SM1_COMMENT_SIZE_SHIFT) + +#define VKD3D_SM1_INSTRUCTION_PREDICATED (0x1u << 28u) + +#define VKD3D_SM1_INSTRUCTION_PARAMETER (0x1u << 31u) + +#define VKD3D_SM1_REGISTER_NUMBER_MASK 0x000007ffu + +#define VKD3D_SM1_REGISTER_TYPE_SHIFT 28u +#define VKD3D_SM1_REGISTER_TYPE_MASK (0x7u << VKD3D_SM1_REGISTER_TYPE_SHIFT) +#define VKD3D_SM1_REGISTER_TYPE_SHIFT2 8u +#define VKD3D_SM1_REGISTER_TYPE_MASK2 (0x18u << VKD3D_SM1_REGISTER_TYPE_SHIFT2) + +#define VKD3D_SM1_ADDRESS_MODE_SHIFT 13u +#define VKD3D_SM1_ADDRESS_MODE_MASK (0x1u << VKD3D_SM1_ADDRESS_MODE_SHIFT) + +#define VKD3D_SM1_DST_MODIFIER_SHIFT 20u +#define VKD3D_SM1_DST_MODIFIER_MASK (0xfu << VKD3D_SM1_DST_MODIFIER_SHIFT) + +#define VKD3D_SM1_DSTSHIFT_SHIFT 24u +#define VKD3D_SM1_DSTSHIFT_MASK (0xfu << VKD3D_SM1_DSTSHIFT_SHIFT) + +#define VKD3D_SM1_WRITEMASK_SHIFT 16u +#define VKD3D_SM1_WRITEMASK_MASK (0xfu << VKD3D_SM1_WRITEMASK_SHIFT) + +#define VKD3D_SM1_SWIZZLE_SHIFT 16u +#define VKD3D_SM1_SWIZZLE_MASK (0xffu << VKD3D_SM1_SWIZZLE_SHIFT) +#define VKD3D_SM1_SWIZZLE_DEFAULT (0u | (1u << 2) | (2u << 4) | (3u << 6)) + +#define VKD3D_SM1_SWIZZLE_COMPONENT_SHIFT(idx) (2u * (idx)) +#define VKD3D_SM1_SWIZZLE_COMPONENT_MASK(idx) (0x3u << VKD3D_SM1_SWIZZLE_COMPONENT_SHIFT(idx)) + +#define VKD3D_SM1_SRC_MODIFIER_SHIFT 24u +#define VKD3D_SM1_SRC_MODIFIER_MASK (0xfu << VKD3D_SM1_SRC_MODIFIER_SHIFT) + +#define VKD3D_SM1_END 0x0000ffffu + +#define VKD3D_SM1_VERSION_MAJOR(version) (((version) >> 8u) & 0xffu) +#define VKD3D_SM1_VERSION_MINOR(version) (((version) >> 0u) & 0xffu) + +enum vkd3d_sm1_address_mode_type +{ + VKD3D_SM1_ADDRESS_MODE_ABSOLUTE = 0x0, + VKD3D_SM1_ADDRESS_MODE_RELATIVE = 0x1, +}; + +enum vkd3d_sm1_resource_type +{ + VKD3D_SM1_RESOURCE_UNKNOWN = 0x0, + VKD3D_SM1_RESOURCE_TEXTURE_1D = 0x1, + VKD3D_SM1_RESOURCE_TEXTURE_2D = 0x2, + VKD3D_SM1_RESOURCE_TEXTURE_CUBE = 0x3, + VKD3D_SM1_RESOURCE_TEXTURE_3D = 0x4, +}; + +enum vkd3d_sm1_opcode +{ + VKD3D_SM1_OP_NOP = 0x00, + VKD3D_SM1_OP_MOV = 0x01, + VKD3D_SM1_OP_ADD = 0x02, + VKD3D_SM1_OP_SUB = 0x03, + VKD3D_SM1_OP_MAD = 0x04, + VKD3D_SM1_OP_MUL = 0x05, + VKD3D_SM1_OP_RCP = 0x06, + VKD3D_SM1_OP_RSQ = 0x07, + VKD3D_SM1_OP_DP3 = 0x08, + VKD3D_SM1_OP_DP4 = 0x09, + VKD3D_SM1_OP_MIN = 0x0a, + VKD3D_SM1_OP_MAX = 0x0b, + VKD3D_SM1_OP_SLT = 0x0c, + VKD3D_SM1_OP_SGE = 0x0d, + VKD3D_SM1_OP_EXP = 0x0e, + VKD3D_SM1_OP_LOG = 0x0f, + VKD3D_SM1_OP_LIT = 0x10, + VKD3D_SM1_OP_DST = 0x11, + VKD3D_SM1_OP_LRP = 0x12, + VKD3D_SM1_OP_FRC = 0x13, + VKD3D_SM1_OP_M4x4 = 0x14, + VKD3D_SM1_OP_M4x3 = 0x15, + VKD3D_SM1_OP_M3x4 = 0x16, + VKD3D_SM1_OP_M3x3 = 0x17, + VKD3D_SM1_OP_M3x2 = 0x18, + VKD3D_SM1_OP_CALL = 0x19, + VKD3D_SM1_OP_CALLNZ = 0x1a, + VKD3D_SM1_OP_LOOP = 0x1b, + VKD3D_SM1_OP_RET = 0x1c, + VKD3D_SM1_OP_ENDLOOP = 0x1d, + VKD3D_SM1_OP_LABEL = 0x1e, + VKD3D_SM1_OP_DCL = 0x1f, + VKD3D_SM1_OP_POW = 0x20, + VKD3D_SM1_OP_CRS = 0x21, + VKD3D_SM1_OP_SGN = 0x22, + VKD3D_SM1_OP_ABS = 0x23, + VKD3D_SM1_OP_NRM = 0x24, + VKD3D_SM1_OP_SINCOS = 0x25, + VKD3D_SM1_OP_REP = 0x26, + VKD3D_SM1_OP_ENDREP = 0x27, + VKD3D_SM1_OP_IF = 0x28, + VKD3D_SM1_OP_IFC = 0x29, + VKD3D_SM1_OP_ELSE = 0x2a, + VKD3D_SM1_OP_ENDIF = 0x2b, + VKD3D_SM1_OP_BREAK = 0x2c, + VKD3D_SM1_OP_BREAKC = 0x2d, + VKD3D_SM1_OP_MOVA = 0x2e, + VKD3D_SM1_OP_DEFB = 0x2f, + VKD3D_SM1_OP_DEFI = 0x30, + + VKD3D_SM1_OP_TEXCOORD = 0x40, + VKD3D_SM1_OP_TEXKILL = 0x41, + VKD3D_SM1_OP_TEX = 0x42, + VKD3D_SM1_OP_TEXBEM = 0x43, + VKD3D_SM1_OP_TEXBEML = 0x44, + VKD3D_SM1_OP_TEXREG2AR = 0x45, + VKD3D_SM1_OP_TEXREG2GB = 0x46, + VKD3D_SM1_OP_TEXM3x2PAD = 0x47, + VKD3D_SM1_OP_TEXM3x2TEX = 0x48, + VKD3D_SM1_OP_TEXM3x3PAD = 0x49, + VKD3D_SM1_OP_TEXM3x3TEX = 0x4a, + VKD3D_SM1_OP_TEXM3x3DIFF = 0x4b, + VKD3D_SM1_OP_TEXM3x3SPEC = 0x4c, + VKD3D_SM1_OP_TEXM3x3VSPEC = 0x4d, + VKD3D_SM1_OP_EXPP = 0x4e, + VKD3D_SM1_OP_LOGP = 0x4f, + VKD3D_SM1_OP_CND = 0x50, + VKD3D_SM1_OP_DEF = 0x51, + VKD3D_SM1_OP_TEXREG2RGB = 0x52, + VKD3D_SM1_OP_TEXDP3TEX = 0x53, + VKD3D_SM1_OP_TEXM3x2DEPTH = 0x54, + VKD3D_SM1_OP_TEXDP3 = 0x55, + VKD3D_SM1_OP_TEXM3x3 = 0x56, + VKD3D_SM1_OP_TEXDEPTH = 0x57, + VKD3D_SM1_OP_CMP = 0x58, + VKD3D_SM1_OP_BEM = 0x59, + VKD3D_SM1_OP_DP2ADD = 0x5a, + VKD3D_SM1_OP_DSX = 0x5b, + VKD3D_SM1_OP_DSY = 0x5c, + VKD3D_SM1_OP_TEXLDD = 0x5d, + VKD3D_SM1_OP_SETP = 0x5e, + VKD3D_SM1_OP_TEXLDL = 0x5f, + VKD3D_SM1_OP_BREAKP = 0x60, + + VKD3D_SM1_OP_PHASE = 0xfffd, + VKD3D_SM1_OP_COMMENT = 0xfffe, + VKD3D_SM1_OP_END = 0Xffff, +}; + +struct vkd3d_sm1_opcode_info +{ + enum vkd3d_sm1_opcode sm1_opcode; + unsigned int dst_count; + unsigned int src_count; + enum vkd3d_shader_opcode vkd3d_opcode; + struct + { + unsigned int major, minor; + } min_version, max_version; +}; + +struct vkd3d_shader_sm1_parser +{ + const struct vkd3d_sm1_opcode_info *opcode_table; + const uint32_t *start, *end; + bool abort; + + struct vkd3d_shader_src_param src_rel_addr[4]; + struct vkd3d_shader_src_param pred_rel_addr; + struct vkd3d_shader_src_param dst_rel_addr; + struct vkd3d_shader_src_param src_param[4]; + struct vkd3d_shader_src_param pred_param; + struct vkd3d_shader_dst_param dst_param; + + struct vkd3d_shader_parser p; +}; + +/* This table is not order or position dependent. */ +static const struct vkd3d_sm1_opcode_info vs_opcode_table[] = +{ + /* Arithmetic */ + {VKD3D_SM1_OP_NOP, 0, 0, VKD3DSIH_NOP}, + {VKD3D_SM1_OP_MOV, 1, 1, VKD3DSIH_MOV}, + {VKD3D_SM1_OP_MOVA, 1, 1, VKD3DSIH_MOVA, {2, 0}, {~0u, ~0u}}, + {VKD3D_SM1_OP_ADD, 1, 2, VKD3DSIH_ADD}, + {VKD3D_SM1_OP_SUB, 1, 2, VKD3DSIH_SUB}, + {VKD3D_SM1_OP_MAD, 1, 3, VKD3DSIH_MAD}, + {VKD3D_SM1_OP_MUL, 1, 2, VKD3DSIH_MUL}, + {VKD3D_SM1_OP_RCP, 1, 1, VKD3DSIH_RCP}, + {VKD3D_SM1_OP_RSQ, 1, 1, VKD3DSIH_RSQ}, + {VKD3D_SM1_OP_DP3, 1, 2, VKD3DSIH_DP3}, + {VKD3D_SM1_OP_DP4, 1, 2, VKD3DSIH_DP4}, + {VKD3D_SM1_OP_MIN, 1, 2, VKD3DSIH_MIN}, + {VKD3D_SM1_OP_MAX, 1, 2, VKD3DSIH_MAX}, + {VKD3D_SM1_OP_SLT, 1, 2, VKD3DSIH_SLT}, + {VKD3D_SM1_OP_SGE, 1, 2, VKD3DSIH_SGE}, + {VKD3D_SM1_OP_ABS, 1, 1, VKD3DSIH_ABS}, + {VKD3D_SM1_OP_EXP, 1, 1, VKD3DSIH_EXP}, + {VKD3D_SM1_OP_LOG, 1, 1, VKD3DSIH_LOG}, + {VKD3D_SM1_OP_EXPP, 1, 1, VKD3DSIH_EXPP}, + {VKD3D_SM1_OP_LOGP, 1, 1, VKD3DSIH_LOGP}, + {VKD3D_SM1_OP_LIT, 1, 1, VKD3DSIH_LIT}, + {VKD3D_SM1_OP_DST, 1, 2, VKD3DSIH_DST}, + {VKD3D_SM1_OP_LRP, 1, 3, VKD3DSIH_LRP}, + {VKD3D_SM1_OP_FRC, 1, 1, VKD3DSIH_FRC}, + {VKD3D_SM1_OP_POW, 1, 2, VKD3DSIH_POW}, + {VKD3D_SM1_OP_CRS, 1, 2, VKD3DSIH_CRS}, + {VKD3D_SM1_OP_SGN, 1, 3, VKD3DSIH_SGN, {2, 0}, { 2, 1}}, + {VKD3D_SM1_OP_SGN, 1, 1, VKD3DSIH_SGN, {3, 0}, {~0u, ~0u}}, + {VKD3D_SM1_OP_NRM, 1, 1, VKD3DSIH_NRM,}, + {VKD3D_SM1_OP_SINCOS, 1, 3, VKD3DSIH_SINCOS, {2, 0}, { 2, 1}}, + {VKD3D_SM1_OP_SINCOS, 1, 1, VKD3DSIH_SINCOS, {3, 0}, {~0u, ~0u}}, + /* Matrix */ + {VKD3D_SM1_OP_M4x4, 1, 2, VKD3DSIH_M4x4}, + {VKD3D_SM1_OP_M4x3, 1, 2, VKD3DSIH_M4x3}, + {VKD3D_SM1_OP_M3x4, 1, 2, VKD3DSIH_M3x4}, + {VKD3D_SM1_OP_M3x3, 1, 2, VKD3DSIH_M3x3}, + {VKD3D_SM1_OP_M3x2, 1, 2, VKD3DSIH_M3x2}, + /* Declarations */ + {VKD3D_SM1_OP_DCL, 0, 2, VKD3DSIH_DCL}, + /* Constant definitions */ + {VKD3D_SM1_OP_DEF, 1, 4, VKD3DSIH_DEF}, + {VKD3D_SM1_OP_DEFB, 1, 1, VKD3DSIH_DEFB}, + {VKD3D_SM1_OP_DEFI, 1, 4, VKD3DSIH_DEFI}, + /* Control flow */ + {VKD3D_SM1_OP_REP, 0, 1, VKD3DSIH_REP, {2, 0}, {~0u, ~0u}}, + {VKD3D_SM1_OP_ENDREP, 0, 0, VKD3DSIH_ENDREP, {2, 0}, {~0u, ~0u}}, + {VKD3D_SM1_OP_IF, 0, 1, VKD3DSIH_IF, {2, 0}, {~0u, ~0u}}, + {VKD3D_SM1_OP_IFC, 0, 2, VKD3DSIH_IFC, {2, 1}, {~0u, ~0u}}, + {VKD3D_SM1_OP_ELSE, 0, 0, VKD3DSIH_ELSE, {2, 0}, {~0u, ~0u}}, + {VKD3D_SM1_OP_ENDIF, 0, 0, VKD3DSIH_ENDIF, {2, 0}, {~0u, ~0u}}, + {VKD3D_SM1_OP_BREAK, 0, 0, VKD3DSIH_BREAK, {2, 1}, {~0u, ~0u}}, + {VKD3D_SM1_OP_BREAKC, 0, 2, VKD3DSIH_BREAKC, {2, 1}, {~0u, ~0u}}, + {VKD3D_SM1_OP_BREAKP, 0, 1, VKD3DSIH_BREAKP}, + {VKD3D_SM1_OP_CALL, 0, 1, VKD3DSIH_CALL, {2, 0}, {~0u, ~0u}}, + {VKD3D_SM1_OP_CALLNZ, 0, 2, VKD3DSIH_CALLNZ, {2, 0}, {~0u, ~0u}}, + {VKD3D_SM1_OP_LOOP, 0, 2, VKD3DSIH_LOOP, {2, 0}, {~0u, ~0u}}, + {VKD3D_SM1_OP_RET, 0, 0, VKD3DSIH_RET, {2, 0}, {~0u, ~0u}}, + {VKD3D_SM1_OP_ENDLOOP, 0, 0, VKD3DSIH_ENDLOOP, {2, 0}, {~0u, ~0u}}, + {VKD3D_SM1_OP_LABEL, 0, 1, VKD3DSIH_LABEL, {2, 0}, {~0u, ~0u}}, + + {VKD3D_SM1_OP_SETP, 1, 2, VKD3DSIH_SETP}, + {VKD3D_SM1_OP_TEXLDL, 1, 2, VKD3DSIH_TEXLDL, {3, 0}, {~0u, ~0u}}, + {0, 0, 0, VKD3DSIH_INVALID}, +}; + +static const struct vkd3d_sm1_opcode_info ps_opcode_table[] = +{ + /* Arithmetic */ + {VKD3D_SM1_OP_NOP, 0, 0, VKD3DSIH_NOP}, + {VKD3D_SM1_OP_MOV, 1, 1, VKD3DSIH_MOV}, + {VKD3D_SM1_OP_ADD, 1, 2, VKD3DSIH_ADD}, + {VKD3D_SM1_OP_SUB, 1, 2, VKD3DSIH_SUB}, + {VKD3D_SM1_OP_MAD, 1, 3, VKD3DSIH_MAD}, + {VKD3D_SM1_OP_MUL, 1, 2, VKD3DSIH_MUL}, + {VKD3D_SM1_OP_RCP, 1, 1, VKD3DSIH_RCP}, + {VKD3D_SM1_OP_RSQ, 1, 1, VKD3DSIH_RSQ}, + {VKD3D_SM1_OP_DP3, 1, 2, VKD3DSIH_DP3}, + {VKD3D_SM1_OP_DP4, 1, 2, VKD3DSIH_DP4}, + {VKD3D_SM1_OP_MIN, 1, 2, VKD3DSIH_MIN}, + {VKD3D_SM1_OP_MAX, 1, 2, VKD3DSIH_MAX}, + {VKD3D_SM1_OP_SLT, 1, 2, VKD3DSIH_SLT}, + {VKD3D_SM1_OP_SGE, 1, 2, VKD3DSIH_SGE}, + {VKD3D_SM1_OP_ABS, 1, 1, VKD3DSIH_ABS}, + {VKD3D_SM1_OP_EXP, 1, 1, VKD3DSIH_EXP}, + {VKD3D_SM1_OP_LOG, 1, 1, VKD3DSIH_LOG}, + {VKD3D_SM1_OP_EXPP, 1, 1, VKD3DSIH_EXPP}, + {VKD3D_SM1_OP_LOGP, 1, 1, VKD3DSIH_LOGP}, + {VKD3D_SM1_OP_DST, 1, 2, VKD3DSIH_DST}, + {VKD3D_SM1_OP_LRP, 1, 3, VKD3DSIH_LRP}, + {VKD3D_SM1_OP_FRC, 1, 1, VKD3DSIH_FRC}, + {VKD3D_SM1_OP_CND, 1, 3, VKD3DSIH_CND, {1, 0}, { 1, 4}}, + {VKD3D_SM1_OP_CMP, 1, 3, VKD3DSIH_CMP, {1, 2}, { 3, 0}}, + {VKD3D_SM1_OP_POW, 1, 2, VKD3DSIH_POW}, + {VKD3D_SM1_OP_CRS, 1, 2, VKD3DSIH_CRS}, + {VKD3D_SM1_OP_NRM, 1, 1, VKD3DSIH_NRM}, + {VKD3D_SM1_OP_SINCOS, 1, 3, VKD3DSIH_SINCOS, {2, 0}, { 2, 1}}, + {VKD3D_SM1_OP_SINCOS, 1, 1, VKD3DSIH_SINCOS, {3, 0}, {~0u, ~0u}}, + {VKD3D_SM1_OP_DP2ADD, 1, 3, VKD3DSIH_DP2ADD, {2, 0}, {~0u, ~0u}}, + /* Matrix */ + {VKD3D_SM1_OP_M4x4, 1, 2, VKD3DSIH_M4x4}, + {VKD3D_SM1_OP_M4x3, 1, 2, VKD3DSIH_M4x3}, + {VKD3D_SM1_OP_M3x4, 1, 2, VKD3DSIH_M3x4}, + {VKD3D_SM1_OP_M3x3, 1, 2, VKD3DSIH_M3x3}, + {VKD3D_SM1_OP_M3x2, 1, 2, VKD3DSIH_M3x2}, + /* Declarations */ + {VKD3D_SM1_OP_DCL, 0, 2, VKD3DSIH_DCL}, + /* Constant definitions */ + {VKD3D_SM1_OP_DEF, 1, 4, VKD3DSIH_DEF}, + {VKD3D_SM1_OP_DEFB, 1, 1, VKD3DSIH_DEFB}, + {VKD3D_SM1_OP_DEFI, 1, 4, VKD3DSIH_DEFI}, + /* Control flow */ + {VKD3D_SM1_OP_REP, 0, 1, VKD3DSIH_REP, {2, 1}, {~0u, ~0u}}, + {VKD3D_SM1_OP_ENDREP, 0, 0, VKD3DSIH_ENDREP, {2, 1}, {~0u, ~0u}}, + {VKD3D_SM1_OP_IF, 0, 1, VKD3DSIH_IF, {2, 1}, {~0u, ~0u}}, + {VKD3D_SM1_OP_IFC, 0, 2, VKD3DSIH_IFC, {2, 1}, {~0u, ~0u}}, + {VKD3D_SM1_OP_ELSE, 0, 0, VKD3DSIH_ELSE, {2, 1}, {~0u, ~0u}}, + {VKD3D_SM1_OP_ENDIF, 0, 0, VKD3DSIH_ENDIF, {2, 1}, {~0u, ~0u}}, + {VKD3D_SM1_OP_BREAK, 0, 0, VKD3DSIH_BREAK, {2, 1}, {~0u, ~0u}}, + {VKD3D_SM1_OP_BREAKC, 0, 2, VKD3DSIH_BREAKC, {2, 1}, {~0u, ~0u}}, + {VKD3D_SM1_OP_BREAKP, 0, 1, VKD3DSIH_BREAKP}, + {VKD3D_SM1_OP_CALL, 0, 1, VKD3DSIH_CALL, {2, 1}, {~0u, ~0u}}, + {VKD3D_SM1_OP_CALLNZ, 0, 2, VKD3DSIH_CALLNZ, {2, 1}, {~0u, ~0u}}, + {VKD3D_SM1_OP_LOOP, 0, 2, VKD3DSIH_LOOP, {3, 0}, {~0u, ~0u}}, + {VKD3D_SM1_OP_RET, 0, 0, VKD3DSIH_RET, {2, 1}, {~0u, ~0u}}, + {VKD3D_SM1_OP_ENDLOOP, 0, 0, VKD3DSIH_ENDLOOP, {3, 0}, {~0u, ~0u}}, + {VKD3D_SM1_OP_LABEL, 0, 1, VKD3DSIH_LABEL, {2, 1}, {~0u, ~0u}}, + /* Texture */ + {VKD3D_SM1_OP_TEXCOORD, 1, 0, VKD3DSIH_TEXCOORD, {0, 0}, { 1, 3}}, + {VKD3D_SM1_OP_TEXCOORD, 1, 1, VKD3DSIH_TEXCOORD, {1 ,4}, { 1, 4}}, + {VKD3D_SM1_OP_TEXKILL, 1, 0, VKD3DSIH_TEXKILL, {1 ,0}, { 3, 0}}, + {VKD3D_SM1_OP_TEX, 1, 0, VKD3DSIH_TEX, {0, 0}, { 1, 3}}, + {VKD3D_SM1_OP_TEX, 1, 1, VKD3DSIH_TEX, {1, 4}, { 1, 4}}, + {VKD3D_SM1_OP_TEX, 1, 2, VKD3DSIH_TEX, {2, 0}, {~0u, ~0u}}, + {VKD3D_SM1_OP_TEXBEM, 1, 1, VKD3DSIH_TEXBEM, {0, 0}, { 1, 3}}, + {VKD3D_SM1_OP_TEXBEML, 1, 1, VKD3DSIH_TEXBEML, {1, 0}, { 1, 3}}, + {VKD3D_SM1_OP_TEXREG2AR, 1, 1, VKD3DSIH_TEXREG2AR, {1, 0}, { 1, 3}}, + {VKD3D_SM1_OP_TEXREG2GB, 1, 1, VKD3DSIH_TEXREG2GB, {1, 0}, { 1, 3}}, + {VKD3D_SM1_OP_TEXREG2RGB, 1, 1, VKD3DSIH_TEXREG2RGB, {1, 2}, { 1, 3}}, + {VKD3D_SM1_OP_TEXM3x2PAD, 1, 1, VKD3DSIH_TEXM3x2PAD, {1, 0}, { 1, 3}}, + {VKD3D_SM1_OP_TEXM3x2TEX, 1, 1, VKD3DSIH_TEXM3x2TEX, {1, 0}, { 1, 3}}, + {VKD3D_SM1_OP_TEXM3x3PAD, 1, 1, VKD3DSIH_TEXM3x3PAD, {1, 0}, { 1, 3}}, + {VKD3D_SM1_OP_TEXM3x3DIFF, 1, 1, VKD3DSIH_TEXM3x3DIFF, {0, 0}, { 0, 0}}, + {VKD3D_SM1_OP_TEXM3x3SPEC, 1, 2, VKD3DSIH_TEXM3x3SPEC, {1, 0}, { 1, 3}}, + {VKD3D_SM1_OP_TEXM3x3VSPEC, 1, 1, VKD3DSIH_TEXM3x3VSPEC, {1, 0}, { 1, 3}}, + {VKD3D_SM1_OP_TEXM3x3TEX, 1, 1, VKD3DSIH_TEXM3x3TEX, {1, 0}, { 1, 3}}, + {VKD3D_SM1_OP_TEXDP3TEX, 1, 1, VKD3DSIH_TEXDP3TEX, {1, 2}, { 1, 3}}, + {VKD3D_SM1_OP_TEXM3x2DEPTH, 1, 1, VKD3DSIH_TEXM3x2DEPTH, {1, 3}, { 1, 3}}, + {VKD3D_SM1_OP_TEXDP3, 1, 1, VKD3DSIH_TEXDP3, {1, 2}, { 1, 3}}, + {VKD3D_SM1_OP_TEXM3x3, 1, 1, VKD3DSIH_TEXM3x3, {1, 2}, { 1, 3}}, + {VKD3D_SM1_OP_TEXDEPTH, 1, 0, VKD3DSIH_TEXDEPTH, {1, 4}, { 1, 4}}, + {VKD3D_SM1_OP_BEM, 1, 2, VKD3DSIH_BEM, {1, 4}, { 1, 4}}, + {VKD3D_SM1_OP_DSX, 1, 1, VKD3DSIH_DSX, {2, 1}, {~0u, ~0u}}, + {VKD3D_SM1_OP_DSY, 1, 1, VKD3DSIH_DSY, {2, 1}, {~0u, ~0u}}, + {VKD3D_SM1_OP_TEXLDD, 1, 4, VKD3DSIH_TEXLDD, {2, 1}, {~0u, ~0u}}, + {VKD3D_SM1_OP_SETP, 1, 2, VKD3DSIH_SETP}, + {VKD3D_SM1_OP_TEXLDL, 1, 2, VKD3DSIH_TEXLDL, {3, 0}, {~0u, ~0u}}, + {VKD3D_SM1_OP_PHASE, 0, 0, VKD3DSIH_PHASE}, + {0, 0, 0, VKD3DSIH_INVALID}, +}; + +static const enum vkd3d_shader_resource_type resource_type_table[] = +{ + /* VKD3D_SM1_RESOURCE_UNKNOWN */ VKD3D_SHADER_RESOURCE_NONE, + /* VKD3D_SM1_RESOURCE_TEXTURE_1D */ VKD3D_SHADER_RESOURCE_TEXTURE_1D, + /* VKD3D_SM1_RESOURCE_TEXTURE_2D */ VKD3D_SHADER_RESOURCE_TEXTURE_2D, + /* VKD3D_SM1_RESOURCE_TEXTURE_CUBE */ VKD3D_SHADER_RESOURCE_TEXTURE_CUBE, + /* VKD3D_SM1_RESOURCE_TEXTURE_3D */ VKD3D_SHADER_RESOURCE_TEXTURE_3D, +}; + +static struct vkd3d_shader_sm1_parser *vkd3d_shader_sm1_parser(struct vkd3d_shader_parser *parser) +{ + return CONTAINING_RECORD(parser, struct vkd3d_shader_sm1_parser, p); +} + +static uint32_t read_u32(const uint32_t **ptr) +{ + return *(*ptr)++; +} + +static bool shader_ver_ge(const struct vkd3d_shader_version *v, unsigned int major, unsigned int minor) +{ + return v->major > major || (v->major == major && v->minor >= minor); +} + +static bool shader_ver_le(const struct vkd3d_shader_version *v, unsigned int major, unsigned int minor) +{ + return v->major < major || (v->major == major && v->minor <= minor); +} + +static bool has_relative_address(uint32_t param) +{ + enum vkd3d_sm1_address_mode_type address_mode; + + address_mode = (param & VKD3D_SM1_ADDRESS_MODE_MASK) >> VKD3D_SM1_ADDRESS_MODE_SHIFT; + + return address_mode == VKD3D_SM1_ADDRESS_MODE_RELATIVE; +} + +static const struct vkd3d_sm1_opcode_info *shader_sm1_get_opcode_info( + const struct vkd3d_shader_sm1_parser *sm1, enum vkd3d_sm1_opcode opcode) +{ + const struct vkd3d_sm1_opcode_info *info; + unsigned int i = 0; + + for (;;) + { + info = &sm1->opcode_table[i++]; + if (info->vkd3d_opcode == VKD3DSIH_INVALID) + return NULL; + + if (opcode == info->sm1_opcode + && shader_ver_ge(&sm1->p.shader_version, info->min_version.major, info->min_version.minor) + && (shader_ver_le(&sm1->p.shader_version, info->max_version.major, info->max_version.minor) + || !info->max_version.major)) + return info; + } +} + +static unsigned int shader_sm1_get_swizzle_component(uint32_t swizzle, unsigned int idx) +{ + return (swizzle & VKD3D_SM1_SWIZZLE_COMPONENT_MASK(idx)) >> VKD3D_SM1_SWIZZLE_COMPONENT_SHIFT(idx); +} + +static uint32_t swizzle_from_sm1(uint32_t swizzle) +{ + return vkd3d_shader_create_swizzle(shader_sm1_get_swizzle_component(swizzle, 0), + shader_sm1_get_swizzle_component(swizzle, 1), + shader_sm1_get_swizzle_component(swizzle, 2), + shader_sm1_get_swizzle_component(swizzle, 3)); +} + +static void shader_sm1_parse_src_param(uint32_t param, const struct vkd3d_shader_src_param *rel_addr, + struct vkd3d_shader_src_param *src) +{ + src->reg.type = ((param & VKD3D_SM1_REGISTER_TYPE_MASK) >> VKD3D_SM1_REGISTER_TYPE_SHIFT) + | ((param & VKD3D_SM1_REGISTER_TYPE_MASK2) >> VKD3D_SM1_REGISTER_TYPE_SHIFT2); + src->reg.precision = VKD3D_SHADER_REGISTER_PRECISION_DEFAULT; + src->reg.non_uniform = false; + src->reg.data_type = VKD3D_DATA_FLOAT; + src->reg.idx[0].offset = param & VKD3D_SM1_REGISTER_NUMBER_MASK; + src->reg.idx[0].rel_addr = rel_addr; + src->reg.idx[1].offset = ~0u; + src->reg.idx[1].rel_addr = NULL; + src->reg.idx[2].offset = ~0u; + src->reg.idx[2].rel_addr = NULL; + src->swizzle = swizzle_from_sm1((param & VKD3D_SM1_SWIZZLE_MASK) >> VKD3D_SM1_SWIZZLE_SHIFT); + src->modifiers = (param & VKD3D_SM1_SRC_MODIFIER_MASK) >> VKD3D_SM1_SRC_MODIFIER_SHIFT; +} + +static void shader_sm1_parse_dst_param(uint32_t param, const struct vkd3d_shader_src_param *rel_addr, + struct vkd3d_shader_dst_param *dst) +{ + dst->reg.type = ((param & VKD3D_SM1_REGISTER_TYPE_MASK) >> VKD3D_SM1_REGISTER_TYPE_SHIFT) + | ((param & VKD3D_SM1_REGISTER_TYPE_MASK2) >> VKD3D_SM1_REGISTER_TYPE_SHIFT2); + dst->reg.precision = VKD3D_SHADER_REGISTER_PRECISION_DEFAULT; + dst->reg.non_uniform = false; + dst->reg.data_type = VKD3D_DATA_FLOAT; + dst->reg.idx[0].offset = param & VKD3D_SM1_REGISTER_NUMBER_MASK; + dst->reg.idx[0].rel_addr = rel_addr; + dst->reg.idx[1].offset = ~0u; + dst->reg.idx[1].rel_addr = NULL; + dst->reg.idx[2].offset = ~0u; + dst->reg.idx[2].rel_addr = NULL; + dst->write_mask = (param & VKD3D_SM1_WRITEMASK_MASK) >> VKD3D_SM1_WRITEMASK_SHIFT; + dst->modifiers = (param & VKD3D_SM1_DST_MODIFIER_MASK) >> VKD3D_SM1_DST_MODIFIER_SHIFT; + dst->shift = (param & VKD3D_SM1_DSTSHIFT_MASK) >> VKD3D_SM1_DSTSHIFT_SHIFT; +} + +/* Read a parameter token from the input stream, and possibly a relative + * addressing token. */ +static void shader_sm1_read_param(struct vkd3d_shader_sm1_parser *sm1, + const uint32_t **ptr, uint32_t *token, uint32_t *addr_token) +{ + if (*ptr >= sm1->end) + { + vkd3d_shader_parser_error(&sm1->p, VKD3D_SHADER_ERROR_D3DBC_UNEXPECTED_EOF, + "Attempted to read a parameter token, but no more tokens are remaining."); + sm1->abort = true; + *token = 0; + return; + } + *token = read_u32(ptr); + if (!has_relative_address(*token)) + return; + + /* PS >= 3.0 have relative addressing (with token) + * VS >= 2.0 have relative addressing (with token) + * VS >= 1.0 < 2.0 have relative addressing (without token) + * The version check below should work in general. */ + if (sm1->p.shader_version.major < 2) + { + *addr_token = (1u << 31) + | ((VKD3DSPR_ADDR << VKD3D_SM1_REGISTER_TYPE_SHIFT2) & VKD3D_SM1_REGISTER_TYPE_MASK2) + | ((VKD3DSPR_ADDR << VKD3D_SM1_REGISTER_TYPE_SHIFT) & VKD3D_SM1_REGISTER_TYPE_MASK) + | (VKD3D_SM1_SWIZZLE_DEFAULT << VKD3D_SM1_SWIZZLE_SHIFT); + return; + } + + if (*ptr >= sm1->end) + { + vkd3d_shader_parser_error(&sm1->p, VKD3D_SHADER_ERROR_D3DBC_UNEXPECTED_EOF, + "Attempted to read an indirect addressing token, but no more tokens are remaining."); + sm1->abort = true; + *addr_token = 0; + return; + } + *addr_token = read_u32(ptr); +} + +/* Skip the parameter tokens for an opcode. */ +static void shader_sm1_skip_opcode(const struct vkd3d_shader_sm1_parser *sm1, const uint32_t **ptr, + const struct vkd3d_sm1_opcode_info *opcode_info, uint32_t opcode_token) +{ + unsigned int length; + + /* Version 2.0+ shaders may contain address tokens, but fortunately they + * have a useful length mask - use it here. Version 1.x shaders contain no + * such tokens. */ + if (sm1->p.shader_version.major >= 2) + { + length = (opcode_token & VKD3D_SM1_INSTRUCTION_LENGTH_MASK) >> VKD3D_SM1_INSTRUCTION_LENGTH_SHIFT; + *ptr += length; + return; + } + + *ptr += (opcode_info->dst_count + opcode_info->src_count); +} + +static void shader_sm1_destroy(struct vkd3d_shader_parser *parser) +{ + struct vkd3d_shader_sm1_parser *sm1 = vkd3d_shader_sm1_parser(parser); + + free_shader_desc(&sm1->p.shader_desc); + vkd3d_free(sm1); +} + +static void shader_sm1_read_src_param(struct vkd3d_shader_sm1_parser *sm1, const uint32_t **ptr, + struct vkd3d_shader_src_param *src_param, struct vkd3d_shader_src_param *src_rel_addr) +{ + uint32_t token, addr_token; + + shader_sm1_read_param(sm1, ptr, &token, &addr_token); + if (has_relative_address(token)) + shader_sm1_parse_src_param(addr_token, NULL, src_rel_addr); + else + src_rel_addr = NULL; + shader_sm1_parse_src_param(token, src_rel_addr, src_param); +} + +static void shader_sm1_read_dst_param(struct vkd3d_shader_sm1_parser *sm1, const uint32_t **ptr, + struct vkd3d_shader_dst_param *dst_param, struct vkd3d_shader_src_param *dst_rel_addr) +{ + uint32_t token, addr_token; + + shader_sm1_read_param(sm1, ptr, &token, &addr_token); + if (has_relative_address(token)) + shader_sm1_parse_src_param(addr_token, NULL, dst_rel_addr); + else + dst_rel_addr = NULL; + shader_sm1_parse_dst_param(token, dst_rel_addr, dst_param); +} + +static void shader_sm1_read_semantic(struct vkd3d_shader_sm1_parser *sm1, + const uint32_t **ptr, struct vkd3d_shader_semantic *semantic) +{ + enum vkd3d_sm1_resource_type resource_type; + struct vkd3d_shader_register_range *range; + uint32_t usage_token, dst_token; + + if (*ptr >= sm1->end || sm1->end - *ptr < 2) + { + vkd3d_shader_parser_error(&sm1->p, VKD3D_SHADER_ERROR_D3DBC_UNEXPECTED_EOF, + "Attempted to read a declaration instruction, but not enough tokens are remaining."); + sm1->abort = true; + return; + } + + usage_token = read_u32(ptr); + dst_token = read_u32(ptr); + + semantic->usage = (usage_token & VKD3D_SM1_DCL_USAGE_MASK) >> VKD3D_SM1_DCL_USAGE_SHIFT; + semantic->usage_idx = (usage_token & VKD3D_SM1_DCL_USAGE_INDEX_MASK) >> VKD3D_SM1_DCL_USAGE_INDEX_SHIFT; + resource_type = (usage_token & VKD3D_SM1_RESOURCE_TYPE_MASK) >> VKD3D_SM1_RESOURCE_TYPE_SHIFT; + if (resource_type >= ARRAY_SIZE(resource_type_table)) + { + vkd3d_shader_parser_error(&sm1->p, VKD3D_SHADER_ERROR_D3DBC_INVALID_RESOURCE_TYPE, + "Invalid resource type %#x.", resource_type); + semantic->resource_type = VKD3D_SHADER_RESOURCE_NONE; + } + else + { + semantic->resource_type = resource_type_table[resource_type]; + } + semantic->resource_data_type[0] = VKD3D_DATA_FLOAT; + semantic->resource_data_type[1] = VKD3D_DATA_FLOAT; + semantic->resource_data_type[2] = VKD3D_DATA_FLOAT; + semantic->resource_data_type[3] = VKD3D_DATA_FLOAT; + shader_sm1_parse_dst_param(dst_token, NULL, &semantic->resource.reg); + range = &semantic->resource.range; + range->space = 0; + range->first = range->last = semantic->resource.reg.reg.idx[0].offset; +} + +static void shader_sm1_read_immconst(struct vkd3d_shader_sm1_parser *sm1, const uint32_t **ptr, + struct vkd3d_shader_src_param *src_param, enum vkd3d_immconst_type type, enum vkd3d_data_type data_type) +{ + unsigned int count = type == VKD3D_IMMCONST_VEC4 ? 4 : 1; + + if (*ptr >= sm1->end || sm1->end - *ptr < count) + { + vkd3d_shader_parser_error(&sm1->p, VKD3D_SHADER_ERROR_D3DBC_UNEXPECTED_EOF, + "Attempted to read a constant definition, but not enough tokens are remaining. " + "%zu token(s) available, %u required.", sm1->end - *ptr, count); + sm1->abort = true; + return; + } + + src_param->reg.type = VKD3DSPR_IMMCONST; + src_param->reg.precision = VKD3D_SHADER_REGISTER_PRECISION_DEFAULT; + src_param->reg.non_uniform = false; + src_param->reg.data_type = data_type; + src_param->reg.idx[0].offset = ~0u; + src_param->reg.idx[0].rel_addr = NULL; + src_param->reg.idx[1].offset = ~0u; + src_param->reg.idx[1].rel_addr = NULL; + src_param->reg.idx[2].offset = ~0u; + src_param->reg.idx[2].rel_addr = NULL; + src_param->reg.immconst_type = type; + memcpy(src_param->reg.u.immconst_uint, *ptr, count * sizeof(uint32_t)); + src_param->swizzle = VKD3D_SHADER_NO_SWIZZLE; + src_param->modifiers = 0; + + *ptr += count; +} + +static void shader_sm1_read_comment(struct vkd3d_shader_sm1_parser *sm1) +{ + const uint32_t **ptr = &sm1->p.ptr; + const char *comment; + unsigned int size; + size_t remaining; + uint32_t token; + + if (*ptr >= sm1->end) + return; + + remaining = sm1->end - *ptr; + + token = **ptr; + while ((token & VKD3D_SM1_OPCODE_MASK) == VKD3D_SM1_OP_COMMENT) + { + size = (token & VKD3D_SM1_COMMENT_SIZE_MASK) >> VKD3D_SM1_COMMENT_SIZE_SHIFT; + + if (size > --remaining) + { + vkd3d_shader_parser_error(&sm1->p, VKD3D_SHADER_ERROR_D3DBC_UNEXPECTED_EOF, + "Encountered a %u token comment, but only %zu token(s) is/are remaining.", + size, remaining); + return; + } + + comment = (const char *)++(*ptr); + remaining -= size; + *ptr += size; + + if (size > 1 && *(const uint32_t *)comment == TAG_TEXT) + { + const char *end = comment + size * sizeof(token); + const char *p = comment + sizeof(token); + const char *line; + + TRACE("// TEXT\n"); + for (line = p; line < end; line = p) + { + if (!(p = memchr(line, '\n', end - line))) + p = end; + else + ++p; + TRACE("// %s\n", debugstr_an(line, p - line)); + } + } + else if (size) + { + TRACE("// %s\n", debugstr_an(comment, size * sizeof(token))); + } + else + break; + + if (!remaining) + break; + token = **ptr; + } +} + +static void shader_sm1_validate_instruction(struct vkd3d_shader_sm1_parser *sm1, struct vkd3d_shader_instruction *ins) +{ + if ((ins->handler_idx == VKD3DSIH_BREAKP || ins->handler_idx == VKD3DSIH_IF) && ins->flags) + { + vkd3d_shader_parser_warning(&sm1->p, VKD3D_SHADER_WARNING_D3DBC_IGNORED_INSTRUCTION_FLAGS, + "Ignoring unexpected instruction flags %#x.", ins->flags); + ins->flags = 0; + } +} + +static void shader_sm1_read_instruction(struct vkd3d_shader_parser *parser, struct vkd3d_shader_instruction *ins) +{ + struct vkd3d_shader_sm1_parser *sm1 = vkd3d_shader_sm1_parser(parser); + const struct vkd3d_sm1_opcode_info *opcode_info; + const uint32_t **ptr = &parser->ptr; + uint32_t opcode_token; + const uint32_t *p; + unsigned int i; + + shader_sm1_read_comment(sm1); + + if (*ptr >= sm1->end) + { + WARN("End of byte-code, failed to read opcode.\n"); + goto fail; + } + + ++parser->location.line; + opcode_token = read_u32(ptr); + if (!(opcode_info = shader_sm1_get_opcode_info(sm1, opcode_token & VKD3D_SM1_OPCODE_MASK))) + { + vkd3d_shader_parser_error(parser, VKD3D_SHADER_ERROR_D3DBC_INVALID_OPCODE, + "Invalid opcode %#x (token 0x%08x, shader version %u.%u).", + opcode_token & VKD3D_SM1_OPCODE_MASK, opcode_token, + sm1->p.shader_version.major, sm1->p.shader_version.minor); + goto fail; + } + + ins->handler_idx = opcode_info->vkd3d_opcode; + ins->flags = (opcode_token & VKD3D_SM1_INSTRUCTION_FLAGS_MASK) >> VKD3D_SM1_INSTRUCTION_FLAGS_SHIFT; + ins->coissue = opcode_token & VKD3D_SM1_COISSUE; + ins->raw = false; + ins->structured = false; + ins->predicate = opcode_token & VKD3D_SM1_INSTRUCTION_PREDICATED ? &sm1->pred_param : NULL; + ins->dst_count = opcode_info->dst_count; + ins->dst = &sm1->dst_param; + ins->src_count = opcode_info->src_count; + ins->src = sm1->src_param; + ins->resource_type = VKD3D_SHADER_RESOURCE_NONE; + ins->resource_stride = 0; + ins->resource_data_type[0] = VKD3D_DATA_FLOAT; + ins->resource_data_type[1] = VKD3D_DATA_FLOAT; + ins->resource_data_type[2] = VKD3D_DATA_FLOAT; + ins->resource_data_type[3] = VKD3D_DATA_FLOAT; + memset(&ins->texel_offset, 0, sizeof(ins->texel_offset)); + + p = *ptr; + shader_sm1_skip_opcode(sm1, ptr, opcode_info, opcode_token); + if (*ptr > sm1->end) + { + vkd3d_shader_parser_error(&sm1->p, VKD3D_SHADER_ERROR_D3DBC_UNEXPECTED_EOF, + "The current instruction ends %zu token(s) past the end of the shader.", + *ptr - sm1->end); + goto fail; + } + + if (ins->handler_idx == VKD3DSIH_DCL) + { + shader_sm1_read_semantic(sm1, &p, &ins->declaration.semantic); + } + else if (ins->handler_idx == VKD3DSIH_DEF) + { + shader_sm1_read_dst_param(sm1, &p, &sm1->dst_param, &sm1->dst_rel_addr); + shader_sm1_read_immconst(sm1, &p, &sm1->src_param[0], VKD3D_IMMCONST_VEC4, VKD3D_DATA_FLOAT); + } + else if (ins->handler_idx == VKD3DSIH_DEFB) + { + shader_sm1_read_dst_param(sm1, &p, &sm1->dst_param, &sm1->dst_rel_addr); + shader_sm1_read_immconst(sm1, &p, &sm1->src_param[0], VKD3D_IMMCONST_SCALAR, VKD3D_DATA_UINT); + } + else if (ins->handler_idx == VKD3DSIH_DEFI) + { + shader_sm1_read_dst_param(sm1, &p, &sm1->dst_param, &sm1->dst_rel_addr); + shader_sm1_read_immconst(sm1, &p, &sm1->src_param[0], VKD3D_IMMCONST_VEC4, VKD3D_DATA_INT); + } + else + { + /* Destination token */ + if (ins->dst_count) + shader_sm1_read_dst_param(sm1, &p, &sm1->dst_param, &sm1->dst_rel_addr); + + /* Predication token */ + if (ins->predicate) + shader_sm1_read_src_param(sm1, &p, &sm1->pred_param, &sm1->pred_rel_addr); + + /* Other source tokens */ + for (i = 0; i < ins->src_count; ++i) + shader_sm1_read_src_param(sm1, &p, &sm1->src_param[i], &sm1->src_rel_addr[i]); + } + + if (sm1->abort) + { + sm1->abort = false; + goto fail; + } + + shader_sm1_validate_instruction(sm1, ins); + return; + +fail: + ins->handler_idx = VKD3DSIH_INVALID; + *ptr = sm1->end; +} + +static bool shader_sm1_is_end(struct vkd3d_shader_parser *parser) +{ + struct vkd3d_shader_sm1_parser *sm1 = vkd3d_shader_sm1_parser(parser); + const uint32_t **ptr = &parser->ptr; + + shader_sm1_read_comment(sm1); + + if (*ptr >= sm1->end) + return true; + + if (**ptr == VKD3D_SM1_END) + { + ++(*ptr); + return true; + } + + return false; +} + +static void shader_sm1_reset(struct vkd3d_shader_parser *parser) +{ + struct vkd3d_shader_sm1_parser *sm1 = vkd3d_shader_sm1_parser(parser); + + parser->ptr = sm1->start; + parser->failed = false; +} + +const struct vkd3d_shader_parser_ops shader_sm1_parser_ops = +{ + .parser_reset = shader_sm1_reset, + .parser_destroy = shader_sm1_destroy, + .parser_read_instruction = shader_sm1_read_instruction, + .parser_is_end = shader_sm1_is_end, +}; + +static enum vkd3d_result shader_sm1_init(struct vkd3d_shader_sm1_parser *sm1, + const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_message_context *message_context) +{ + const struct vkd3d_shader_location location = {.source_name = compile_info->source_name}; + const uint32_t *code = compile_info->source.code; + size_t code_size = compile_info->source.size; + struct vkd3d_shader_desc *shader_desc; + struct vkd3d_shader_version version; + uint16_t shader_type; + size_t token_count; + + code = compile_info->source.code; + code_size = compile_info->source.size; + token_count = code_size / sizeof(*sm1->start); + + if (token_count < 2) + { + vkd3d_shader_error(message_context, &location, VKD3D_SHADER_ERROR_D3DBC_UNEXPECTED_EOF, + "Invalid shader size %zu (token count %zu). At least 2 tokens are required.", + code_size, token_count); + return VKD3D_ERROR_INVALID_SHADER; + } + + TRACE("Version: 0x%08x.\n", code[0]); + + shader_type = code[0] >> 16; + version.major = VKD3D_SM1_VERSION_MAJOR(code[0]); + version.minor = VKD3D_SM1_VERSION_MINOR(code[0]); + + switch (shader_type) + { + case VKD3D_SM1_VS: + version.type = VKD3D_SHADER_TYPE_VERTEX; + sm1->opcode_table = vs_opcode_table; + break; + + case VKD3D_SM1_PS: + version.type = VKD3D_SHADER_TYPE_PIXEL; + sm1->opcode_table = ps_opcode_table; + break; + + default: + vkd3d_shader_error(message_context, &location, VKD3D_SHADER_ERROR_D3DBC_INVALID_VERSION_TOKEN, + "Invalid shader type %#x (token 0x%08x).", shader_type, code[0]); + return VKD3D_ERROR_INVALID_SHADER; + } + + if (!shader_ver_le(&version, 3, 0)) + { + vkd3d_shader_error(message_context, &location, VKD3D_SHADER_ERROR_D3DBC_INVALID_VERSION_TOKEN, + "Invalid shader version %u.%u (token 0x%08x).", version.major, version.minor, code[0]); + return VKD3D_ERROR_INVALID_SHADER; + } + + sm1->start = &code[1]; + sm1->end = &code[token_count]; + + vkd3d_shader_parser_init(&sm1->p, message_context, compile_info->source_name, &version, &shader_sm1_parser_ops); + shader_desc = &sm1->p.shader_desc; + shader_desc->byte_code = code; + shader_desc->byte_code_size = code_size; + sm1->p.ptr = sm1->start; + + return VKD3D_OK; +} + +int vkd3d_shader_sm1_parser_create(const struct vkd3d_shader_compile_info *compile_info, + struct vkd3d_shader_message_context *message_context, struct vkd3d_shader_parser **parser) +{ + struct vkd3d_shader_sm1_parser *sm1; + int ret; + + if (!(sm1 = vkd3d_calloc(1, sizeof(*sm1)))) + { + ERR("Failed to allocate parser.\n"); + return VKD3D_ERROR_OUT_OF_MEMORY; + } + + if ((ret = shader_sm1_init(sm1, compile_info, message_context)) < 0) + { + WARN("Failed to initialise shader parser, ret %d.\n", ret); + vkd3d_free(sm1); + return ret; + } + + *parser = &sm1->p; + + return VKD3D_OK; +} diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 98607154..6c9301c2 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -337,6 +337,8 @@ static const char *shader_get_source_type_suffix(enum vkd3d_shader_source_type t return "dxbc"; case VKD3D_SHADER_SOURCE_HLSL: return "hlsl"; + case VKD3D_SHADER_SOURCE_D3D_BYTECODE: + return "d3dbc"; default: FIXME("Unhandled source type %#x.\n", type); return "bin"; @@ -386,6 +388,16 @@ void VKD3D_PRINTF_FUNC(3, 4) vkd3d_shader_parser_error(struct vkd3d_shader_parse parser->failed = true; } +void VKD3D_PRINTF_FUNC(3, 4) vkd3d_shader_parser_warning(struct vkd3d_shader_parser *parser, + enum vkd3d_shader_error error, const char *format, ...) +{ + va_list args; + + va_start(args, format); + vkd3d_shader_vwarning(parser->message_context, &parser->location, error, format, args); + va_end(args); +} + static int vkd3d_shader_validate_compile_info(const struct vkd3d_shader_compile_info *compile_info, bool validate_target_type) { @@ -1119,6 +1131,30 @@ static int compile_hlsl(const struct vkd3d_shader_compile_info *compile_info, return ret; } +static int compile_d3d_bytecode(const struct vkd3d_shader_compile_info *compile_info, + struct vkd3d_shader_code *out, struct vkd3d_shader_message_context *message_context) +{ + struct vkd3d_shader_parser *parser; + int ret; + + if ((ret = vkd3d_shader_sm1_parser_create(compile_info, message_context, &parser)) < 0) + { + WARN("Failed to initialise shader parser.\n"); + return ret; + } + + vkd3d_shader_dump_shader(compile_info->source_type, parser->shader_version.type, &compile_info->source); + + if (compile_info->target_type == VKD3D_SHADER_TARGET_D3D_ASM) + { + ret = vkd3d_dxbc_binary_to_text(parser, compile_info, out); + vkd3d_shader_parser_destroy(parser); + return ret; + } + + return VKD3D_ERROR; +} + int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_code *out, char **messages) { @@ -1145,6 +1181,10 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, ret = compile_hlsl(compile_info, out, &message_context); break; + case VKD3D_SHADER_SOURCE_D3D_BYTECODE: + ret = compile_d3d_bytecode(compile_info, out, &message_context); + break; + default: assert(0); } @@ -1301,6 +1341,7 @@ const enum vkd3d_shader_source_type *vkd3d_shader_get_supported_source_types(uns { VKD3D_SHADER_SOURCE_DXBC_TPF, VKD3D_SHADER_SOURCE_HLSL, + VKD3D_SHADER_SOURCE_D3D_BYTECODE, }; TRACE("count %p.\n", count); @@ -1327,6 +1368,11 @@ const enum vkd3d_shader_target_type *vkd3d_shader_get_supported_target_types( VKD3D_SHADER_TARGET_DXBC_TPF, }; + static const enum vkd3d_shader_target_type d3dbc_types[] = + { + VKD3D_SHADER_TARGET_D3D_ASM, + }; + TRACE("source_type %#x, count %p.\n", source_type, count); switch (source_type) @@ -1339,6 +1385,10 @@ const enum vkd3d_shader_target_type *vkd3d_shader_get_supported_target_types( *count = ARRAY_SIZE(hlsl_types); return hlsl_types; + case VKD3D_SHADER_SOURCE_D3D_BYTECODE: + *count = ARRAY_SIZE(d3dbc_types); + return d3dbc_types; + default: *count = 0; return NULL; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index da12247a..cacba300 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -117,6 +117,13 @@ enum vkd3d_shader_error VKD3D_SHADER_WARNING_HLSL_IMPLICIT_TRUNCATION = 5300, VKD3D_SHADER_ERROR_GLSL_INTERNAL = 6000, + + VKD3D_SHADER_ERROR_D3DBC_UNEXPECTED_EOF = 7000, + VKD3D_SHADER_ERROR_D3DBC_INVALID_VERSION_TOKEN = 7001, + VKD3D_SHADER_ERROR_D3DBC_INVALID_OPCODE = 7002, + VKD3D_SHADER_ERROR_D3DBC_INVALID_RESOURCE_TYPE = 7003, + + VKD3D_SHADER_WARNING_D3DBC_IGNORED_INSTRUCTION_FLAGS= 7300, }; enum vkd3d_shader_opcode @@ -918,6 +925,8 @@ void vkd3d_shader_parser_error(struct vkd3d_shader_parser *parser, void vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, struct vkd3d_shader_message_context *message_context, const char *source_name, const struct vkd3d_shader_version *version, const struct vkd3d_shader_parser_ops *ops); +void vkd3d_shader_parser_warning(struct vkd3d_shader_parser *parser, + enum vkd3d_shader_error error, const char *format, ...) VKD3D_PRINTF_FUNC(3, 4); static inline void vkd3d_shader_parser_destroy(struct vkd3d_shader_parser *parser) { @@ -1029,6 +1038,8 @@ void vkd3d_shader_trace_text_(const char *text, size_t size, const char *functio #define vkd3d_shader_trace_text(text, size) \ vkd3d_shader_trace_text_(text, size, __FUNCTION__) +int vkd3d_shader_sm1_parser_create(const struct vkd3d_shader_compile_info *compile_info, + struct vkd3d_shader_message_context *message_context, struct vkd3d_shader_parser **parser); int vkd3d_shader_sm4_parser_create(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_message_context *message_context, struct vkd3d_shader_parser **parser); @@ -1217,6 +1228,7 @@ static inline void *vkd3d_find_struct_(const struct vkd3d_struct *chain, #define TAG_RTS0 MAKE_TAG('R', 'T', 'S', '0') #define TAG_SHDR MAKE_TAG('S', 'H', 'D', 'R') #define TAG_SHEX MAKE_TAG('S', 'H', 'E', 'X') +#define TAG_TEXT MAKE_TAG('T', 'E', 'X', 'T') struct dxbc_writer_section { diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index ac01d59a..4d7d628c 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -65,6 +65,10 @@ source_type_info[] = {VKD3D_SHADER_SOURCE_HLSL, "hlsl", "High Level Shader Language source code.\n", false}, + {VKD3D_SHADER_SOURCE_D3D_BYTECODE, + "d3dbc", "Legacy Direct3D byte-code.\n" + " This is the format used for Direct3D shader model 1, 2, and 3 shaders.\n", + true}, }; static const struct target_type_info diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index d0f3f5d2..c9045b81 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -227,6 +227,94 @@ static void test_version(void) ok(minor == expected_minor, "Got unexpected minor version %u.\n", minor); } +static void test_d3dbc(void) +{ + struct vkd3d_shader_compile_info info; + struct vkd3d_shader_code d3d_asm; + int rc; + + static const uint32_t vs_minimal[] = + { + 0xfffe0100, /* vs_1_0 */ + 0x0000ffff, /* end */ + }; + static const uint32_t invalid_type[] = + { + 0x00010100, /* <invalid>_1_0 */ + 0x0000ffff, /* end */ + }; + static const uint32_t invalid_version[] = + { + 0xfffe0400, /* vs_4_0 */ + 0x0000ffff, /* end */ + }; + static const uint32_t ps[] = + { + 0xffff0101, /* ps_1_1 */ + 0x00000001, 0x800f0000, 0x90e40000, /* mov r0, v0 */ + 0x0000ffff, /* end */ + }; + static const char expected[] = "vs_1_0\n"; + + info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; + info.next = NULL; + info.source.code = vs_minimal; + info.source.size = sizeof(vs_minimal); + info.source_type = VKD3D_SHADER_SOURCE_D3D_BYTECODE; + info.target_type = VKD3D_SHADER_TARGET_D3D_ASM; + info.options = NULL; + info.option_count = 0; + info.log_level = VKD3D_SHADER_LOG_NONE; + info.source_name = NULL; + + rc = vkd3d_shader_compile(&info, &d3d_asm, NULL); + ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); + ok(d3d_asm.size == strlen(expected), "Got unexpected size %zu.\n", d3d_asm.size); + ok(!memcmp(d3d_asm.code, expected, d3d_asm.size), "Got unexpected code \"%.*s\"\n", + (int)d3d_asm.size, (char *)d3d_asm.code); + vkd3d_shader_free_shader_code(&d3d_asm); + + info.source.size = sizeof(vs_minimal) + 1; + rc = vkd3d_shader_compile(&info, &d3d_asm, NULL); + ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); + vkd3d_shader_free_shader_code(&d3d_asm); + + info.source.size = ~(size_t)0; + rc = vkd3d_shader_compile(&info, &d3d_asm, NULL); + ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); + vkd3d_shader_free_shader_code(&d3d_asm); + + info.source.size = sizeof(vs_minimal) - 1; + rc = vkd3d_shader_compile(&info, &d3d_asm, NULL); + ok(rc == VKD3D_ERROR_INVALID_SHADER, "Got unexpected error code %d.\n", rc); + + info.source.code = invalid_type; + info.source.size = sizeof(invalid_type); + rc = vkd3d_shader_compile(&info, &d3d_asm, NULL); + ok(rc == VKD3D_ERROR_INVALID_SHADER, "Got unexpected error code %d.\n", rc); + + info.source.code = invalid_version; + info.source.size = sizeof(invalid_version); + rc = vkd3d_shader_compile(&info, &d3d_asm, NULL); + ok(rc == VKD3D_ERROR_INVALID_SHADER, "Got unexpected error code %d.\n", rc); + + info.source.code = ps; + info.source.size = sizeof(ps); + rc = vkd3d_shader_compile(&info, &d3d_asm, NULL); + ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); + vkd3d_shader_free_shader_code(&d3d_asm); + + /* Truncated before the destination parameter. */ + info.source.size = sizeof(ps) - 3 * sizeof(*ps); + rc = vkd3d_shader_compile(&info, &d3d_asm, NULL); + ok(rc == VKD3D_ERROR_INVALID_SHADER, "Got unexpected error code %d.\n", rc); + + /* Truncated before the source parameter. */ + info.source.size = sizeof(ps) - 2 * sizeof(*ps); + rc = vkd3d_shader_compile(&info, &d3d_asm, NULL); + ok(rc == VKD3D_ERROR_INVALID_SHADER, "Got unexpected error code %d.\n", rc); +} + START_TEST(vkd3d_shader_api) { setlocale(LC_ALL, ""); @@ -234,4 +322,5 @@ START_TEST(vkd3d_shader_api) run_test(test_invalid_shaders); run_test(test_vkd3d_shader_pfns); run_test(test_version); + run_test(test_d3dbc); } -- 2.20.1

2 1

[PATCH 1/3] user32/tests: Add optional focus winevents to correspond with focus hooks.
by Connor McAdams 06 Oct '21

06 Oct '21

Add optional EVENT_OBJECT_FOCUS winevents to correspond with optional HCBT_SETFOCUS hooks. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/user32/tests/msg.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 43253953a9e..3776bd17cd8 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1312,6 +1312,7 @@ static const struct message WmFirstDrawSetWindowPosSeq3[] = { { WM_NCACTIVATE, sent|optional }, { WM_ACTIVATE, sent|optional }, { HCBT_SETFOCUS, hook|optional }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|optional, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|defwinproc|optional }, { 0 } }; @@ -13500,6 +13501,7 @@ static const struct message WmShow[] = { { HCBT_ACTIVATE, hook|optional }, /* win2000 doesn't send it */ { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, /* win2000 doesn't send it */ { HCBT_SETFOCUS, hook|optional }, /* win2000 doesn't send it */ + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|optional, OBJID_CLIENT, 0 }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { 0 } }; @@ -13530,10 +13532,12 @@ static const struct message WmShowNoActivate_2[] = { { WM_MOVE, sent|defwinproc }, { WM_SIZE, sent|wparam|defwinproc, SIZE_RESTORED }, { HCBT_SETFOCUS, hook|optional }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|optional, OBJID_CLIENT, 0 }, { HCBT_ACTIVATE, hook|optional }, /* win2003 doesn't send it */ { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, /* win2003 doesn't send it */ { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { HCBT_SETFOCUS, hook|optional }, /* win2003 doesn't send it */ + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|optional, OBJID_CLIENT, 0 }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, /* Win7 seems to send this twice. */ { EVENT_SYSTEM_MINIMIZEEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, @@ -13560,6 +13564,7 @@ static const struct message WmRestore_1[] = { { HCBT_ACTIVATE, hook|optional }, /* win2000 doesn't send it */ { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, /* win2000 doesn't send it */ { HCBT_SETFOCUS, hook|optional }, /* win2000 doesn't send it */ + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|optional, OBJID_CLIENT, 0 }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_MOVE, sent|defwinproc }, { WM_SIZE, sent|wparam|defwinproc, SIZE_RESTORED }, @@ -13577,6 +13582,7 @@ static const struct message WmRestore_2[] = { { HCBT_ACTIVATE, hook|optional }, /* win2000 doesn't send it */ { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, /* win2000 doesn't send it */ { HCBT_SETFOCUS, hook|optional }, /* win2000 doesn't send it */ + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|optional, OBJID_CLIENT, 0 }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { 0 } }; @@ -13595,6 +13601,7 @@ static const struct message WmRestore_3[] = { { WM_MOVE, sent|defwinproc }, { WM_SIZE, sent|wparam|defwinproc, SIZE_MAXIMIZED }, { HCBT_SETFOCUS, hook|optional }, /* win2003 sends it */ + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|optional, OBJID_CLIENT, 0 }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, /* Win7 seems to send this twice. */ { EVENT_SYSTEM_MINIMIZEEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, @@ -13681,6 +13688,7 @@ static const struct message WmMinimize_1[] = { static const struct message WmMinimize_2[] = { { HCBT_MINMAX, hook|lparam, 0, SW_MINIMIZE }, { HCBT_SETFOCUS, hook|optional }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|optional, OBJID_CLIENT, 0 }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED, 0, SWP_NOACTIVATE }, { EVENT_OBJECT_REORDER, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED, 0, SWP_NOACTIVATE }, @@ -13757,6 +13765,7 @@ static const struct message WmShowMaximized_1[] = { { HCBT_ACTIVATE, hook|optional }, /* win2000 doesn't send it */ { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, /* win2000 doesn't send it */ { HCBT_SETFOCUS, hook|optional }, /* win2000 doesn't send it */ + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|optional, OBJID_CLIENT, 0 }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOCOPYBITS|SWP_STATECHANGED }, { WM_MOVE, sent|defwinproc }, { WM_SIZE, sent|wparam|defwinproc, SIZE_MAXIMIZED }, @@ -14661,6 +14670,7 @@ static const struct message SetActiveWindowSeq0[] = { WM_GETTEXT, sent|defwinproc|optional }, { WM_ACTIVATE, sent|wparam|optional, 1 }, { HCBT_SETFOCUS, hook|optional }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|optional, OBJID_CLIENT, 0 }, { WM_KILLFOCUS, sent|defwinproc|optional }, { WM_IME_SETCONTEXT, sent|defwinproc|optional }, { WM_IME_SETCONTEXT, sent|defwinproc|optional }, -- 2.25.1

2 3

[PATCH vkd3d 6/6] vkd3d-shader/sm1: Add support for vkd3d_shader_scan().
by Henri Verbeet 06 Oct '21

06 Oct '21

Nominally, at least. Not all of the early shader models explicitly declare resources and samplers, so those may currently get missed for those. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/vkd3d_shader_main.c | 51 ++++++++++++++++++++++----- tests/vkd3d_shader_api.c | 3 ++ 2 files changed, 45 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 6c9301c2..d2045332 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -928,13 +928,12 @@ static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *conte return VKD3D_OK; } -static int scan_dxbc(const struct vkd3d_shader_compile_info *compile_info, - struct vkd3d_shader_message_context *message_context) +static int scan_with_parser(const struct vkd3d_shader_compile_info *compile_info, + struct vkd3d_shader_message_context *message_context, struct vkd3d_shader_parser *parser) { struct vkd3d_shader_scan_descriptor_info *scan_descriptor_info; struct vkd3d_shader_instruction instruction; struct vkd3d_shader_scan_context context; - struct vkd3d_shader_parser *parser; int ret; if ((scan_descriptor_info = vkd3d_find_struct(compile_info->next, SCAN_DESCRIPTOR_INFO))) @@ -945,12 +944,6 @@ static int scan_dxbc(const struct vkd3d_shader_compile_info *compile_info, vkd3d_shader_scan_context_init(&context, compile_info, scan_descriptor_info, message_context); - if ((ret = vkd3d_shader_sm4_parser_create(compile_info, message_context, &parser)) < 0) - { - vkd3d_shader_scan_context_cleanup(&context); - return ret; - } - if (TRACE_ON()) { vkd3d_shader_trace(parser); @@ -982,7 +975,42 @@ static int scan_dxbc(const struct vkd3d_shader_compile_info *compile_info, done: vkd3d_shader_scan_context_cleanup(&context); + return ret; +} + +static int scan_dxbc(const struct vkd3d_shader_compile_info *compile_info, + struct vkd3d_shader_message_context *message_context) +{ + struct vkd3d_shader_parser *parser; + int ret; + + if ((ret = vkd3d_shader_sm4_parser_create(compile_info, message_context, &parser)) < 0) + { + WARN("Failed to initialise shader parser.\n"); + return ret; + } + + ret = scan_with_parser(compile_info, message_context, parser); + vkd3d_shader_parser_destroy(parser); + + return ret; +} + +static int scan_d3dbc(const struct vkd3d_shader_compile_info *compile_info, + struct vkd3d_shader_message_context *message_context) +{ + struct vkd3d_shader_parser *parser; + int ret; + + if ((ret = vkd3d_shader_sm1_parser_create(compile_info, message_context, &parser)) < 0) + { + WARN("Failed to initialise shader parser.\n"); + return ret; + } + + ret = scan_with_parser(compile_info, message_context, parser); vkd3d_shader_parser_destroy(parser); + return ret; } @@ -1012,6 +1040,10 @@ int vkd3d_shader_scan(const struct vkd3d_shader_compile_info *compile_info, char ret = VKD3D_ERROR_NOT_IMPLEMENTED; break; + case VKD3D_SHADER_SOURCE_D3D_BYTECODE: + ret = scan_d3dbc(compile_info, &message_context); + break; + default: ERR("Unsupported source type %#x.\n", compile_info->source_type); ret = VKD3D_ERROR_INVALID_ARGUMENT; @@ -1045,6 +1077,7 @@ static int compile_dxbc_tpf(const struct vkd3d_shader_compile_info *compile_info if ((ret = vkd3d_shader_sm4_parser_create(compile_info, message_context, &parser)) < 0) { + WARN("Failed to initialise shader parser.\n"); vkd3d_shader_free_scan_descriptor_info(&scan_descriptor_info); return ret; } diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index c9045b81..6fb855c2 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -274,6 +274,9 @@ static void test_d3dbc(void) (int)d3d_asm.size, (char *)d3d_asm.code); vkd3d_shader_free_shader_code(&d3d_asm); + rc = vkd3d_shader_scan(&info, NULL); + ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); + info.source.size = sizeof(vs_minimal) + 1; rc = vkd3d_shader_compile(&info, &d3d_asm, NULL); ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); -- 2.20.1

1 0

[PATCH vkd3d 4/6] vkd3d-shader: Introduce struct vkd3d_shader_parser_ops.
by Henri Verbeet 06 Oct '21

06 Oct '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 182 ++++++++++++----------- libs/vkd3d-shader/glsl.c | 4 +- libs/vkd3d-shader/trace.c | 6 +- libs/vkd3d-shader/vkd3d_shader_main.c | 18 +-- libs/vkd3d-shader/vkd3d_shader_private.h | 39 ++++- 5 files changed, 138 insertions(+), 111 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 656c982c..44e842d3 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -960,90 +960,7 @@ static enum vkd3d_data_type map_data_type(char t) } } -static bool shader_sm4_init(struct vkd3d_shader_sm4_parser *sm4, const uint32_t *byte_code, - size_t byte_code_size, const char *source_name, const struct vkd3d_shader_signature *output_signature, - struct vkd3d_shader_message_context *message_context) -{ - struct vkd3d_shader_version version; - uint32_t version_token, token_count; - unsigned int i; - - if (byte_code_size / sizeof(*byte_code) < 2) - { - WARN("Invalid byte code size %lu.\n", (long)byte_code_size); - return false; - } - - version_token = byte_code[0]; - TRACE("Version: 0x%08x.\n", version_token); - token_count = byte_code[1]; - TRACE("Token count: %u.\n", token_count); - - if (token_count < 2 || byte_code_size / sizeof(*byte_code) < token_count) - { - WARN("Invalid token count %u.\n", token_count); - return false; - } - - sm4->start = &byte_code[2]; - sm4->end = &byte_code[token_count]; - - switch (version_token >> 16) - { - case VKD3D_SM4_PS: - version.type = VKD3D_SHADER_TYPE_PIXEL; - break; - - case VKD3D_SM4_VS: - version.type = VKD3D_SHADER_TYPE_VERTEX; - break; - - case VKD3D_SM4_GS: - version.type = VKD3D_SHADER_TYPE_GEOMETRY; - break; - - case VKD3D_SM5_HS: - version.type = VKD3D_SHADER_TYPE_HULL; - break; - - case VKD3D_SM5_DS: - version.type = VKD3D_SHADER_TYPE_DOMAIN; - break; - - case VKD3D_SM5_CS: - version.type = VKD3D_SHADER_TYPE_COMPUTE; - break; - - default: - FIXME("Unrecognised shader type %#x.\n", version_token >> 16); - } - version.major = VKD3D_SM4_VERSION_MAJOR(version_token); - version.minor = VKD3D_SM4_VERSION_MINOR(version_token); - - vkd3d_shader_parser_init(&sm4->p, message_context, source_name, &version); - sm4->p.ptr = sm4->start; - - memset(sm4->output_map, 0xff, sizeof(sm4->output_map)); - for (i = 0; i < output_signature->element_count; ++i) - { - struct vkd3d_shader_signature_element *e = &output_signature->elements[i]; - - if (e->register_index >= ARRAY_SIZE(sm4->output_map)) - { - WARN("Invalid output index %u.\n", e->register_index); - continue; - } - - sm4->output_map[e->register_index] = e->semantic_index; - } - - list_init(&sm4->src_free); - list_init(&sm4->src); - - return true; -} - -void shader_sm4_free(struct vkd3d_shader_parser *parser) +static void shader_sm4_destroy(struct vkd3d_shader_parser *parser) { struct vkd3d_shader_sm4_parser *sm4 = vkd3d_shader_sm4_parser(parser); struct vkd3d_shader_src_param_entry *e1, *e2; @@ -1521,7 +1438,7 @@ static void shader_sm4_read_instruction_modifier(DWORD modifier, struct vkd3d_sh } } -void shader_sm4_read_instruction(struct vkd3d_shader_parser *parser, struct vkd3d_shader_instruction *ins) +static void shader_sm4_read_instruction(struct vkd3d_shader_parser *parser, struct vkd3d_shader_instruction *ins) { struct vkd3d_shader_sm4_parser *sm4 = vkd3d_shader_sm4_parser(parser); const struct vkd3d_sm4_opcode_info *opcode_info; @@ -1643,14 +1560,14 @@ fail: return; } -bool shader_sm4_is_end(struct vkd3d_shader_parser *parser) +static bool shader_sm4_is_end(struct vkd3d_shader_parser *parser) { struct vkd3d_shader_sm4_parser *sm4 = vkd3d_shader_sm4_parser(parser); return parser->ptr == sm4->end; } -void shader_sm4_reset(struct vkd3d_shader_parser *parser) +static void shader_sm4_reset(struct vkd3d_shader_parser *parser) { struct vkd3d_shader_sm4_parser *sm4 = vkd3d_shader_sm4_parser(parser); @@ -1658,6 +1575,97 @@ void shader_sm4_reset(struct vkd3d_shader_parser *parser) parser->failed = false; } +static const struct vkd3d_shader_parser_ops shader_sm4_parser_ops = +{ + .parser_reset = shader_sm4_reset, + .parser_destroy = shader_sm4_destroy, + .parser_read_instruction = shader_sm4_read_instruction, + .parser_is_end = shader_sm4_is_end, +}; + +static bool shader_sm4_init(struct vkd3d_shader_sm4_parser *sm4, const uint32_t *byte_code, + size_t byte_code_size, const char *source_name, const struct vkd3d_shader_signature *output_signature, + struct vkd3d_shader_message_context *message_context) +{ + struct vkd3d_shader_version version; + uint32_t version_token, token_count; + unsigned int i; + + if (byte_code_size / sizeof(*byte_code) < 2) + { + WARN("Invalid byte code size %lu.\n", (long)byte_code_size); + return false; + } + + version_token = byte_code[0]; + TRACE("Version: 0x%08x.\n", version_token); + token_count = byte_code[1]; + TRACE("Token count: %u.\n", token_count); + + if (token_count < 2 || byte_code_size / sizeof(*byte_code) < token_count) + { + WARN("Invalid token count %u.\n", token_count); + return false; + } + + sm4->start = &byte_code[2]; + sm4->end = &byte_code[token_count]; + + switch (version_token >> 16) + { + case VKD3D_SM4_PS: + version.type = VKD3D_SHADER_TYPE_PIXEL; + break; + + case VKD3D_SM4_VS: + version.type = VKD3D_SHADER_TYPE_VERTEX; + break; + + case VKD3D_SM4_GS: + version.type = VKD3D_SHADER_TYPE_GEOMETRY; + break; + + case VKD3D_SM5_HS: + version.type = VKD3D_SHADER_TYPE_HULL; + break; + + case VKD3D_SM5_DS: + version.type = VKD3D_SHADER_TYPE_DOMAIN; + break; + + case VKD3D_SM5_CS: + version.type = VKD3D_SHADER_TYPE_COMPUTE; + break; + + default: + FIXME("Unrecognised shader type %#x.\n", version_token >> 16); + } + version.major = VKD3D_SM4_VERSION_MAJOR(version_token); + version.minor = VKD3D_SM4_VERSION_MINOR(version_token); + + vkd3d_shader_parser_init(&sm4->p, message_context, source_name, &version, &shader_sm4_parser_ops); + sm4->p.ptr = sm4->start; + + memset(sm4->output_map, 0xff, sizeof(sm4->output_map)); + for (i = 0; i < output_signature->element_count; ++i) + { + struct vkd3d_shader_signature_element *e = &output_signature->elements[i]; + + if (e->register_index >= ARRAY_SIZE(sm4->output_map)) + { + WARN("Invalid output index %u.\n", e->register_index); + continue; + } + + sm4->output_map[e->register_index] = e->semantic_index; + } + + list_init(&sm4->src_free); + list_init(&sm4->src); + + return true; +} + int vkd3d_shader_sm4_parser_create(const struct vkd3d_shader_compile_info *compile_info, struct vkd3d_shader_message_context *message_context, struct vkd3d_shader_parser **parser) { diff --git a/libs/vkd3d-shader/glsl.c b/libs/vkd3d-shader/glsl.c index b90a5d91..56fa7043 100644 --- a/libs/vkd3d-shader/glsl.c +++ b/libs/vkd3d-shader/glsl.c @@ -99,9 +99,9 @@ int vkd3d_glsl_generator_generate(struct vkd3d_glsl_generator *generator, vkd3d_string_buffer_printf(&generator->buffer, "#version 440\n\n"); vkd3d_string_buffer_printf(&generator->buffer, "void main()\n{\n"); - while (!shader_sm4_is_end(parser)) + while (!vkd3d_shader_parser_is_end(parser)) { - shader_sm4_read_instruction(parser, &ins); + vkd3d_shader_parser_read_instruction(parser, &ins); if (ins.handler_idx == VKD3DSIH_INVALID) { diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 57104246..edba0b42 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1889,12 +1889,12 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(struct vkd3d_shader_parser *parser, shader_version->minor, compiler.colours.reset); indent = 0; - shader_sm4_reset(parser); - while (!shader_sm4_is_end(parser)) + vkd3d_shader_parser_reset(parser); + while (!vkd3d_shader_parser_is_end(parser)) { struct vkd3d_shader_instruction ins; - shader_sm4_read_instruction(parser, &ins); + vkd3d_shader_parser_read_instruction(parser, &ins); if (ins.handler_idx == VKD3DSIH_INVALID) { WARN("Skipping unrecognized instruction.\n"); diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index c30a3757..98607154 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -364,18 +364,14 @@ void vkd3d_shader_dump_shader(enum vkd3d_shader_source_type source_type, void vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, struct vkd3d_shader_message_context *message_context, const char *source_name, - const struct vkd3d_shader_version *version) + const struct vkd3d_shader_version *version, const struct vkd3d_shader_parser_ops *ops) { parser->message_context = message_context; parser->location.source_name = source_name; parser->location.line = 1; parser->location.column = 0; parser->shader_version = *version; -} - -static void vkd3d_shader_parser_destroy(struct vkd3d_shader_parser *parser) -{ - shader_sm4_free(parser); + parser->ops = ops; } void VKD3D_PRINTF_FUNC(3, 4) vkd3d_shader_parser_error(struct vkd3d_shader_parser *parser, @@ -946,12 +942,12 @@ static int scan_dxbc(const struct vkd3d_shader_compile_info *compile_info, if (TRACE_ON()) { vkd3d_shader_trace(parser); - shader_sm4_reset(parser); + vkd3d_shader_parser_reset(parser); } - while (!shader_sm4_is_end(parser)) + while (!vkd3d_shader_parser_is_end(parser)) { - shader_sm4_read_instruction(parser, &instruction); + vkd3d_shader_parser_read_instruction(parser, &instruction); if (instruction.handler_idx == VKD3DSIH_INVALID) { @@ -1081,9 +1077,9 @@ static int compile_dxbc_tpf(const struct vkd3d_shader_compile_info *compile_info return VKD3D_ERROR; } - while (!shader_sm4_is_end(parser)) + while (!vkd3d_shader_parser_is_end(parser)) { - shader_sm4_read_instruction(parser, &instruction); + vkd3d_shader_parser_read_instruction(parser, &instruction); if (instruction.handler_idx == VKD3DSIH_INVALID) { diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 97048ea6..da12247a 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -902,24 +902,47 @@ struct vkd3d_shader_parser struct vkd3d_shader_desc shader_desc; struct vkd3d_shader_version shader_version; const uint32_t *ptr; + const struct vkd3d_shader_parser_ops *ops; +}; + +struct vkd3d_shader_parser_ops +{ + void (*parser_reset)(struct vkd3d_shader_parser *parser); + void (*parser_destroy)(struct vkd3d_shader_parser *parser); + void (*parser_read_instruction)(struct vkd3d_shader_parser *parser, struct vkd3d_shader_instruction *instruction); + bool (*parser_is_end)(struct vkd3d_shader_parser *parser); }; void vkd3d_shader_parser_error(struct vkd3d_shader_parser *parser, enum vkd3d_shader_error error, const char *format, ...) VKD3D_PRINTF_FUNC(3, 4); void vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, struct vkd3d_shader_message_context *message_context, const char *source_name, - const struct vkd3d_shader_version *version); + const struct vkd3d_shader_version *version, const struct vkd3d_shader_parser_ops *ops); -void vkd3d_shader_trace(struct vkd3d_shader_parser *parser); +static inline void vkd3d_shader_parser_destroy(struct vkd3d_shader_parser *parser) +{ + parser->ops->parser_destroy(parser); +} -const char *shader_get_type_prefix(enum vkd3d_shader_type type); +static inline bool vkd3d_shader_parser_is_end(struct vkd3d_shader_parser *parser) +{ + return parser->ops->parser_is_end(parser); +} -struct vkd3d_shader_message_context; +static inline void vkd3d_shader_parser_read_instruction(struct vkd3d_shader_parser *parser, + struct vkd3d_shader_instruction *instruction) +{ + parser->ops->parser_read_instruction(parser, instruction); +} + +static inline void vkd3d_shader_parser_reset(struct vkd3d_shader_parser *parser) +{ + parser->ops->parser_reset(parser); +} + +void vkd3d_shader_trace(struct vkd3d_shader_parser *parser); -void shader_sm4_free(struct vkd3d_shader_parser *parser); -void shader_sm4_read_instruction(struct vkd3d_shader_parser *parser, struct vkd3d_shader_instruction *ins); -bool shader_sm4_is_end(struct vkd3d_shader_parser *parser); -void shader_sm4_reset(struct vkd3d_shader_parser *parser); +const char *shader_get_type_prefix(enum vkd3d_shader_type type); struct vkd3d_string_buffer { -- 2.20.1

1 0

[PATCH vkd3d 3/6] vkd3d-shader: Introduce vkd3d_shader_parser_error().
by Henri Verbeet 06 Oct '21

06 Oct '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 18 +++--------------- libs/vkd3d-shader/vkd3d_shader_main.c | 12 ++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 2 ++ 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 527f69b8..656c982c 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -175,18 +175,6 @@ static bool shader_is_sm_5_1(const struct vkd3d_shader_sm4_parser *sm4) return version->major >= 5 && version->minor >= 1; } -static void VKD3D_PRINTF_FUNC(3, 4) shader_sm4_error(struct vkd3d_shader_sm4_parser *sm4, - enum vkd3d_shader_error error, const char *format, ...) -{ - va_list args; - - va_start(args, format); - vkd3d_shader_verror(sm4->p.message_context, &sm4->p.location, error, format, args); - va_end(args); - - sm4->p.failed = true; -} - static bool shader_sm4_read_src_param(struct vkd3d_shader_sm4_parser *priv, const uint32_t **ptr, const uint32_t *end, enum vkd3d_data_type data_type, struct vkd3d_shader_src_param *src_param); static bool shader_sm4_read_dst_param(struct vkd3d_shader_sm4_parser *priv, const uint32_t **ptr, @@ -246,15 +234,15 @@ static void shader_sm4_read_shader_data(struct vkd3d_shader_instruction *ins, ui ins->declaration.icb = &priv->icb; } -static void shader_sm4_set_descriptor_register_range(struct vkd3d_shader_sm4_parser *priv, +static void shader_sm4_set_descriptor_register_range(struct vkd3d_shader_sm4_parser *sm4, struct vkd3d_shader_register *reg, struct vkd3d_shader_register_range *range) { range->first = reg->idx[1].offset; - range->last = reg->idx[shader_is_sm_5_1(priv) ? 2 : 1].offset; + range->last = reg->idx[shader_is_sm_5_1(sm4) ? 2 : 1].offset; if (range->last < range->first) { FIXME("Invalid register range [%u:%u].\n", range->first, range->last); - shader_sm4_error(priv, VKD3D_SHADER_ERROR_TPF_INVALID_REGISTER_RANGE, + vkd3d_shader_parser_error(&sm4->p, VKD3D_SHADER_ERROR_TPF_INVALID_REGISTER_RANGE, "Last register %u must not be less than first register %u in range.\n", range->last, range->first); } } diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 696c332f..c30a3757 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -378,6 +378,18 @@ static void vkd3d_shader_parser_destroy(struct vkd3d_shader_parser *parser) shader_sm4_free(parser); } +void VKD3D_PRINTF_FUNC(3, 4) vkd3d_shader_parser_error(struct vkd3d_shader_parser *parser, + enum vkd3d_shader_error error, const char *format, ...) +{ + va_list args; + + va_start(args, format); + vkd3d_shader_verror(parser->message_context, &parser->location, error, format, args); + va_end(args); + + parser->failed = true; +} + static int vkd3d_shader_validate_compile_info(const struct vkd3d_shader_compile_info *compile_info, bool validate_target_type) { diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index ba17d296..97048ea6 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -904,6 +904,8 @@ struct vkd3d_shader_parser const uint32_t *ptr; }; +void vkd3d_shader_parser_error(struct vkd3d_shader_parser *parser, + enum vkd3d_shader_error error, const char *format, ...) VKD3D_PRINTF_FUNC(3, 4); void vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, struct vkd3d_shader_message_context *message_context, const char *source_name, const struct vkd3d_shader_version *version); -- 2.20.1

1 0

[PATCH vkd3d 2/6] vkd3d-shader/sm4: Set an error state when shader_sm4_error() is called.
by Henri Verbeet 06 Oct '21

06 Oct '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 3 +++ libs/vkd3d-shader/glsl.c | 4 ++-- libs/vkd3d-shader/trace.c | 3 +++ libs/vkd3d-shader/vkd3d_shader_main.c | 5 ++++- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index e9b89547..527f69b8 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -183,6 +183,8 @@ static void VKD3D_PRINTF_FUNC(3, 4) shader_sm4_error(struct vkd3d_shader_sm4_par va_start(args, format); vkd3d_shader_verror(sm4->p.message_context, &sm4->p.location, error, format, args); va_end(args); + + sm4->p.failed = true; } static bool shader_sm4_read_src_param(struct vkd3d_shader_sm4_parser *priv, const uint32_t **ptr, @@ -1665,6 +1667,7 @@ void shader_sm4_reset(struct vkd3d_shader_parser *parser) struct vkd3d_shader_sm4_parser *sm4 = vkd3d_shader_sm4_parser(parser); parser->ptr = sm4->start; + parser->failed = false; } int vkd3d_shader_sm4_parser_create(const struct vkd3d_shader_compile_info *compile_info, diff --git a/libs/vkd3d-shader/glsl.c b/libs/vkd3d-shader/glsl.c index 9858098b..b90a5d91 100644 --- a/libs/vkd3d-shader/glsl.c +++ b/libs/vkd3d-shader/glsl.c @@ -114,8 +114,8 @@ int vkd3d_glsl_generator_generate(struct vkd3d_glsl_generator *generator, vkd3d_glsl_handle_instruction(generator, &ins); } - if (generator->failed) - return VKD3D_ERROR; + if (parser->failed || generator->failed) + return VKD3D_ERROR_INVALID_SHADER; vkd3d_string_buffer_printf(&generator->buffer, "}\n"); diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 2858c7f9..57104246 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1937,6 +1937,9 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(struct vkd3d_shader_parser *parser, } } + if (parser->failed) + result = VKD3D_ERROR_INVALID_SHADER; + if ((code = vkd3d_malloc(buffer->content_size))) { memcpy(code, buffer->buffer, buffer->content_size); diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index f02514b1..696c332f 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -958,7 +958,7 @@ static int scan_dxbc(const struct vkd3d_shader_compile_info *compile_info, } } - ret = VKD3D_OK; + ret = parser->failed ? VKD3D_ERROR_INVALID_SHADER : VKD3D_OK; done: vkd3d_shader_scan_context_cleanup(&context); @@ -1084,6 +1084,9 @@ static int compile_dxbc_tpf(const struct vkd3d_shader_compile_info *compile_info break; } + if (parser->failed) + ret = VKD3D_ERROR_INVALID_SHADER; + if (ret >= 0) ret = vkd3d_dxbc_compiler_generate_spirv(spirv_compiler, compile_info, out); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index f937ff54..ba17d296 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -897,6 +897,7 @@ struct vkd3d_shader_parser { struct vkd3d_shader_message_context *message_context; struct vkd3d_shader_location location; + bool failed; struct vkd3d_shader_desc shader_desc; struct vkd3d_shader_version shader_version; -- 2.20.1

1 0

[PATCH vkd3d 1/6] vkd3d-shader/sm4: Use the parser location in shader_sm4_error().
by Henri Verbeet 06 Oct '21

06 Oct '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index f6d99ea6..e9b89547 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -181,7 +181,7 @@ static void VKD3D_PRINTF_FUNC(3, 4) shader_sm4_error(struct vkd3d_shader_sm4_par va_list args; va_start(args, format); - vkd3d_shader_verror(sm4->p.message_context, NULL, error, format, args); + vkd3d_shader_verror(sm4->p.message_context, &sm4->p.location, error, format, args); va_end(args); } -- 2.20.1

1 0

[PATCH v5 6/7] gdi32: Use __wine_ prefix for Wine ntgdi extensions.
by Jacek Caban 06 Oct '21

06 Oct '21

2 1

[PATCH v5 5/7] gdi32: Use __wine_unix_call interface for Unix library.
by Jacek Caban 06 Oct '21

06 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/Makefile.in | 3 ++- dlls/gdi32/dibdrv/dc.c | 4 +++- dlls/gdi32/font.c | 28 +++++++++++++++++----------- dlls/gdi32/gdiobj.c | 14 +++++++++----- dlls/gdi32/wrappers.c | 14 ++++++++++++-- 5 files changed, 43 insertions(+), 20 deletions(-)

2 1

[PATCH v3 2/7] ntdll: Provide some Unicode helpers for Unix libs.
by Jacek Caban 06 Oct '21

06 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/env.c | 98 ++++++++++++++++++++++++++++++------------- 1 file changed, 69 insertions(+), 29 deletions(-)

2 3

[PATCH 1/4] winegstreamer: Move Unix library definitions into a separate header.
by Zebediah Figura 06 Oct '21

06 Oct '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/gst_private.h | 137 +------------------------ dlls/winegstreamer/unixlib.h | 165 +++++++++++++++++++++++++++++++ dlls/winegstreamer/wg_parser.c | 17 +++- 3 files changed, 179 insertions(+), 140 deletions(-) create mode 100644 dlls/winegstreamer/unixlib.h diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 3470f7870fa..91c646571cf 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -36,6 +36,8 @@ #include "wine/debug.h" #include "wine/strmbase.h" +#include "unixlib.h" + static inline const char *debugstr_time(REFERENCE_TIME time) { ULONGLONG abstime = time >= 0 ? time : -time; @@ -59,141 +61,6 @@ static inline const char *debugstr_time(REFERENCE_TIME time) #define MEDIATIME_FROM_BYTES(x) ((LONGLONG)(x) * 10000000) -struct wg_format -{ - enum wg_major_type - { - WG_MAJOR_TYPE_UNKNOWN, - WG_MAJOR_TYPE_VIDEO, - WG_MAJOR_TYPE_AUDIO, - } major_type; - - union - { - struct - { - enum wg_video_format - { - WG_VIDEO_FORMAT_UNKNOWN, - - WG_VIDEO_FORMAT_BGRA, - WG_VIDEO_FORMAT_BGRx, - WG_VIDEO_FORMAT_BGR, - WG_VIDEO_FORMAT_RGB15, - WG_VIDEO_FORMAT_RGB16, - - WG_VIDEO_FORMAT_AYUV, - WG_VIDEO_FORMAT_I420, - WG_VIDEO_FORMAT_NV12, - WG_VIDEO_FORMAT_UYVY, - WG_VIDEO_FORMAT_YUY2, - WG_VIDEO_FORMAT_YV12, - WG_VIDEO_FORMAT_YVYU, - - WG_VIDEO_FORMAT_CINEPAK, - } format; - uint32_t width, height; - uint32_t fps_n, fps_d; - } video; - struct - { - enum wg_audio_format - { - WG_AUDIO_FORMAT_UNKNOWN, - - WG_AUDIO_FORMAT_U8, - WG_AUDIO_FORMAT_S16LE, - WG_AUDIO_FORMAT_S24LE, - WG_AUDIO_FORMAT_S32LE, - WG_AUDIO_FORMAT_F32LE, - WG_AUDIO_FORMAT_F64LE, - - WG_AUDIO_FORMAT_MPEG1_LAYER1, - WG_AUDIO_FORMAT_MPEG1_LAYER2, - WG_AUDIO_FORMAT_MPEG1_LAYER3, - } format; - - uint32_t channels; - uint32_t channel_mask; /* In WinMM format. */ - uint32_t rate; - } audio; - } u; -}; - -enum wg_parser_event_type -{ - WG_PARSER_EVENT_NONE = 0, - WG_PARSER_EVENT_BUFFER, - WG_PARSER_EVENT_EOS, - WG_PARSER_EVENT_SEGMENT, -}; - -struct wg_parser_event -{ - enum wg_parser_event_type type; - union - { - struct - { - /* pts and duration are in 100-nanosecond units. */ - ULONGLONG pts, duration; - uint32_t size; - bool discontinuity, preroll, delta, has_pts, has_duration; - } buffer; - struct - { - ULONGLONG position, stop; - DOUBLE rate; - } segment; - } u; -}; -C_ASSERT(sizeof(struct wg_parser_event) == 40); - -enum wg_parser_type -{ - WG_PARSER_DECODEBIN, - WG_PARSER_AVIDEMUX, - WG_PARSER_MPEGAUDIOPARSE, - WG_PARSER_WAVPARSE, -}; - -struct unix_funcs -{ - struct wg_parser *(CDECL *wg_parser_create)(enum wg_parser_type type, bool unlimited_buffering); - void (CDECL *wg_parser_destroy)(struct wg_parser *parser); - - HRESULT (CDECL *wg_parser_connect)(struct wg_parser *parser, uint64_t file_size); - void (CDECL *wg_parser_disconnect)(struct wg_parser *parser); - - void (CDECL *wg_parser_begin_flush)(struct wg_parser *parser); - void (CDECL *wg_parser_end_flush)(struct wg_parser *parser); - - bool (CDECL *wg_parser_get_next_read_offset)(struct wg_parser *parser, - uint64_t *offset, uint32_t *size); - void (CDECL *wg_parser_push_data)(struct wg_parser *parser, - const void *data, uint32_t size); - - uint32_t (CDECL *wg_parser_get_stream_count)(struct wg_parser *parser); - struct wg_parser_stream *(CDECL *wg_parser_get_stream)(struct wg_parser *parser, uint32_t index); - - void (CDECL *wg_parser_stream_get_preferred_format)(struct wg_parser_stream *stream, struct wg_format *format); - void (CDECL *wg_parser_stream_enable)(struct wg_parser_stream *stream, const struct wg_format *format); - void (CDECL *wg_parser_stream_disable)(struct wg_parser_stream *stream); - - bool (CDECL *wg_parser_stream_get_event)(struct wg_parser_stream *stream, struct wg_parser_event *event); - bool (CDECL *wg_parser_stream_copy_buffer)(struct wg_parser_stream *stream, - void *data, uint32_t offset, uint32_t size); - void (CDECL *wg_parser_stream_release_buffer)(struct wg_parser_stream *stream); - void (CDECL *wg_parser_stream_notify_qos)(struct wg_parser_stream *stream, - bool underflow, double proportion, int64_t diff, uint64_t timestamp); - - /* Returns the duration in 100-nanosecond units. */ - uint64_t (CDECL *wg_parser_stream_get_duration)(struct wg_parser_stream *stream); - /* start_pos and stop_pos are in 100-nanosecond units. */ - bool (CDECL *wg_parser_stream_seek)(struct wg_parser_stream *stream, double rate, - uint64_t start_pos, uint64_t stop_pos, DWORD start_flags, DWORD stop_flags); -}; - extern const struct unix_funcs *unix_funcs; HRESULT avi_splitter_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h new file mode 100644 index 00000000000..e917f7b5557 --- /dev/null +++ b/dlls/winegstreamer/unixlib.h @@ -0,0 +1,165 @@ +/* + * winegstreamer Unix library interface + * + * Copyright 2020-2021 Zebediah Figura for CodeWeavers + * + * 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 + */ + +#ifndef __WINE_WINEGSTREAMER_UNIXLIB_H +#define __WINE_WINEGSTREAMER_UNIXLIB_H + +#include <stdbool.h> +#include <stdint.h> +#include "windef.h" +#include "wtypes.h" +#include "mmreg.h" + +struct wg_format +{ + enum wg_major_type + { + WG_MAJOR_TYPE_UNKNOWN, + WG_MAJOR_TYPE_VIDEO, + WG_MAJOR_TYPE_AUDIO, + } major_type; + + union + { + struct + { + enum wg_video_format + { + WG_VIDEO_FORMAT_UNKNOWN, + + WG_VIDEO_FORMAT_BGRA, + WG_VIDEO_FORMAT_BGRx, + WG_VIDEO_FORMAT_BGR, + WG_VIDEO_FORMAT_RGB15, + WG_VIDEO_FORMAT_RGB16, + + WG_VIDEO_FORMAT_AYUV, + WG_VIDEO_FORMAT_I420, + WG_VIDEO_FORMAT_NV12, + WG_VIDEO_FORMAT_UYVY, + WG_VIDEO_FORMAT_YUY2, + WG_VIDEO_FORMAT_YV12, + WG_VIDEO_FORMAT_YVYU, + + WG_VIDEO_FORMAT_CINEPAK, + } format; + uint32_t width, height; + uint32_t fps_n, fps_d; + } video; + struct + { + enum wg_audio_format + { + WG_AUDIO_FORMAT_UNKNOWN, + + WG_AUDIO_FORMAT_U8, + WG_AUDIO_FORMAT_S16LE, + WG_AUDIO_FORMAT_S24LE, + WG_AUDIO_FORMAT_S32LE, + WG_AUDIO_FORMAT_F32LE, + WG_AUDIO_FORMAT_F64LE, + + WG_AUDIO_FORMAT_MPEG1_LAYER1, + WG_AUDIO_FORMAT_MPEG1_LAYER2, + WG_AUDIO_FORMAT_MPEG1_LAYER3, + } format; + + uint32_t channels; + uint32_t channel_mask; /* In WinMM format. */ + uint32_t rate; + } audio; + } u; +}; + +enum wg_parser_event_type +{ + WG_PARSER_EVENT_NONE = 0, + WG_PARSER_EVENT_BUFFER, + WG_PARSER_EVENT_EOS, + WG_PARSER_EVENT_SEGMENT, +}; + +struct wg_parser_event +{ + enum wg_parser_event_type type; + union + { + struct + { + /* pts and duration are in 100-nanosecond units. */ + ULONGLONG pts, duration; + uint32_t size; + bool discontinuity, preroll, delta, has_pts, has_duration; + } buffer; + struct + { + ULONGLONG position, stop; + DOUBLE rate; + } segment; + } u; +}; +C_ASSERT(sizeof(struct wg_parser_event) == 40); + +enum wg_parser_type +{ + WG_PARSER_DECODEBIN, + WG_PARSER_AVIDEMUX, + WG_PARSER_MPEGAUDIOPARSE, + WG_PARSER_WAVPARSE, +}; + +struct unix_funcs +{ + struct wg_parser *(CDECL *wg_parser_create)(enum wg_parser_type type, bool unlimited_buffering); + void (CDECL *wg_parser_destroy)(struct wg_parser *parser); + + HRESULT (CDECL *wg_parser_connect)(struct wg_parser *parser, uint64_t file_size); + void (CDECL *wg_parser_disconnect)(struct wg_parser *parser); + + void (CDECL *wg_parser_begin_flush)(struct wg_parser *parser); + void (CDECL *wg_parser_end_flush)(struct wg_parser *parser); + + bool (CDECL *wg_parser_get_next_read_offset)(struct wg_parser *parser, + uint64_t *offset, uint32_t *size); + void (CDECL *wg_parser_push_data)(struct wg_parser *parser, + const void *data, uint32_t size); + + uint32_t (CDECL *wg_parser_get_stream_count)(struct wg_parser *parser); + struct wg_parser_stream *(CDECL *wg_parser_get_stream)(struct wg_parser *parser, uint32_t index); + + void (CDECL *wg_parser_stream_get_preferred_format)(struct wg_parser_stream *stream, struct wg_format *format); + void (CDECL *wg_parser_stream_enable)(struct wg_parser_stream *stream, const struct wg_format *format); + void (CDECL *wg_parser_stream_disable)(struct wg_parser_stream *stream); + + bool (CDECL *wg_parser_stream_get_event)(struct wg_parser_stream *stream, struct wg_parser_event *event); + bool (CDECL *wg_parser_stream_copy_buffer)(struct wg_parser_stream *stream, + void *data, uint32_t offset, uint32_t size); + void (CDECL *wg_parser_stream_release_buffer)(struct wg_parser_stream *stream); + void (CDECL *wg_parser_stream_notify_qos)(struct wg_parser_stream *stream, + bool underflow, double proportion, int64_t diff, uint64_t timestamp); + + /* Returns the duration in 100-nanosecond units. */ + uint64_t (CDECL *wg_parser_stream_get_duration)(struct wg_parser_stream *stream); + /* start_pos and stop_pos are in 100-nanosecond units. */ + bool (CDECL *wg_parser_stream_seek)(struct wg_parser_stream *stream, double rate, + uint64_t start_pos, uint64_t stop_pos, DWORD start_flags, DWORD stop_flags); +}; + +#endif /* __WINE_WINEGSTREAMER_UNIXLIB_H */ diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 21278682318..b89a50b5d8f 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -25,15 +25,22 @@ #endif #include "config.h" -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "gst_private.h" -#include "winternl.h" + +#include <assert.h> +#include <stdarg.h> +#include <stdio.h> #include <gst/gst.h> #include <gst/video/video.h> #include <gst/audio/audio.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "winternl.h" +#include "dshow.h" + +#include "unixlib.h" + typedef enum { GST_AUTOPLUG_SELECT_TRY, @@ -1859,7 +1866,7 @@ static void init_gstreamer_once(void) if (!gst_init_check(&argc, &argv, &err)) { - fprintf(stderr, "winegstreamer: failed to initialize GStreamer: %s\n", debugstr_a(err->message)); + fprintf(stderr, "winegstreamer: failed to initialize GStreamer: %s\n", err->message); g_error_free(err); return; } -- 2.33.0

4 9

[PATCH v5 4/7] ntdll: Handle Unix lib exception outside Unix stack.
by Jacek Caban 06 Oct '21

06 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/signal_arm.c | 2 +- dlls/ntdll/unix/signal_arm64.c | 2 +- dlls/ntdll/unix/signal_i386.c | 2 +- dlls/ntdll/unix/signal_x86_64.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)

1 0

[PATCH v5 3/7] ntdll: Allow Unix libraries to use exception macros.
by Jacek Caban 06 Oct '21

06 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/virtual.c | 33 +++++---------------------------- include/wine/exception.h | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 28 deletions(-)

1 0

[PATCH v5 2/7] ntdll: Provide some Unicode helpers for Unix libs.
by Jacek Caban 06 Oct '21

06 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v5: Fixed string composing on macOS dlls/ntdll/unix/env.c | 101 +++++++++++++++++++++++++++++------------- 1 file changed, 71 insertions(+), 30 deletions(-)

1 0

[PATCH v5 1/7] ntdll: Introduce ntdll_get_build_dir and ntdll_get_data_dir.
by Jacek Caban 06 Oct '21

06 Oct '21

To expose build and data dirs for Unix libs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/env.c | 18 ++++++++++++++++++ include/wine/unixlib.h | 2 ++ 2 files changed, 20 insertions(+)

1 0

[PATCH v2 01/16] mshtml: Add names for each object and use it in the Navigator.
by Gabriel Ivăncescu 06 Oct '21

06 Oct '21

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- All the names match native, and will be tested later when more are implemented. dlls/mshtml/dispex.c | 29 +++++++++++++++++++++++++++++ dlls/mshtml/htmlanchor.c | 1 + dlls/mshtml/htmlarea.c | 1 + dlls/mshtml/htmlattr.c | 1 + dlls/mshtml/htmlbody.c | 1 + dlls/mshtml/htmlcomment.c | 1 + dlls/mshtml/htmlcurstyle.c | 1 + dlls/mshtml/htmldoc.c | 2 ++ dlls/mshtml/htmlelem.c | 6 ++++++ dlls/mshtml/htmlelemcol.c | 1 + dlls/mshtml/htmlevent.c | 6 ++++++ dlls/mshtml/htmlform.c | 1 + dlls/mshtml/htmlframe.c | 2 ++ dlls/mshtml/htmlgeneric.c | 1 + dlls/mshtml/htmlhead.c | 4 ++++ dlls/mshtml/htmlimg.c | 2 ++ dlls/mshtml/htmlinput.c | 3 +++ dlls/mshtml/htmllink.c | 1 + dlls/mshtml/htmllocation.c | 1 + dlls/mshtml/htmlnode.c | 2 ++ dlls/mshtml/htmlobject.c | 2 ++ dlls/mshtml/htmlscript.c | 1 + dlls/mshtml/htmlselect.c | 3 +++ dlls/mshtml/htmlstorage.c | 1 + dlls/mshtml/htmlstyle.c | 2 ++ dlls/mshtml/htmlstyleelem.c | 1 + dlls/mshtml/htmlstylesheet.c | 4 ++++ dlls/mshtml/htmltable.c | 3 +++ dlls/mshtml/htmltextarea.c | 1 + dlls/mshtml/htmltextnode.c | 1 + dlls/mshtml/htmlwindow.c | 1 + dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/omnavigator.c | 18 ++++++++++++------ dlls/mshtml/range.c | 2 ++ dlls/mshtml/selection.c | 1 + dlls/mshtml/xmlhttprequest.c | 2 ++ 36 files changed, 106 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 64ead8f..26aab5e 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -886,6 +886,7 @@ static const dispex_static_data_vtbl_t function_dispex_vtbl = { static const tid_t function_iface_tids[] = {0}; static dispex_static_data_t function_dispex = { + NULL, &function_dispex_vtbl, NULL_tid, function_iface_tids @@ -1482,6 +1483,34 @@ compat_mode_t dispex_compat_mode(DispatchEx *dispex) : dispex->info->desc->vtbl->get_compat_mode(dispex); } +HRESULT dispex_to_string(DispatchEx *dispex, BSTR *ret) +{ + static const WCHAR prefix[8] = L"[object "; + static const WCHAR suffix[] = L"]"; + WCHAR buf[ARRAY_SIZE(prefix) + 28 + ARRAY_SIZE(suffix)], *p = buf; + compat_mode_t compat_mode = dispex_compat_mode(dispex); + const WCHAR *name = dispex->info->desc->name; + unsigned len; + + if(!ret) + return E_INVALIDARG; + + memcpy(p, prefix, sizeof(prefix)); + p += ARRAY_SIZE(prefix); + if(compat_mode < COMPAT_MODE_IE9 || !name) + p--; + else { + len = wcslen(name); + assert(len <= 28); + memcpy(p, name, len * sizeof(WCHAR)); + p += len; + } + memcpy(p, suffix, sizeof(suffix)); + + *ret = SysAllocString(buf); + return *ret ? S_OK : E_OUTOFMEMORY; +} + static dispex_data_t *ensure_dispex_info(dispex_static_data_t *desc, compat_mode_t compat_mode) { if(!desc->info_cache[compat_mode]) { diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index da48601..4416624 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -857,6 +857,7 @@ static const tid_t HTMLAnchorElement_iface_tids[] = { }; static dispex_static_data_t HTMLAnchorElement_dispex = { + L"HTMLAnchorElement", NULL, DispHTMLAnchorElement_tid, HTMLAnchorElement_iface_tids, diff --git a/dlls/mshtml/htmlarea.c b/dlls/mshtml/htmlarea.c index e785871..6c0da36 100644 --- a/dlls/mshtml/htmlarea.c +++ b/dlls/mshtml/htmlarea.c @@ -477,6 +477,7 @@ static const tid_t HTMLAreaElement_iface_tids[] = { 0 }; static dispex_static_data_t HTMLAreaElement_dispex = { + L"HTMLAreaElement", NULL, DispHTMLAreaElement_tid, HTMLAreaElement_iface_tids, diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index dc8c45e..e10c7c3 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -484,6 +484,7 @@ static const tid_t HTMLDOMAttribute_iface_tids[] = { 0 }; static dispex_static_data_t HTMLDOMAttribute_dispex = { + L"Attr", NULL, DispHTMLDOMAttribute_tid, HTMLDOMAttribute_iface_tids diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 32c49fe..551c3a1 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -1008,6 +1008,7 @@ static const tid_t HTMLBodyElement_iface_tids[] = { }; static dispex_static_data_t HTMLBodyElement_dispex = { + L"HTMLBodyElement", NULL, DispHTMLBody_tid, HTMLBodyElement_iface_tids, diff --git a/dlls/mshtml/htmlcomment.c b/dlls/mshtml/htmlcomment.c index 85eceef..40066cb 100644 --- a/dlls/mshtml/htmlcomment.c +++ b/dlls/mshtml/htmlcomment.c @@ -199,6 +199,7 @@ static const tid_t HTMLCommentElement_iface_tids[] = { 0 }; static dispex_static_data_t HTMLCommentElement_dispex = { + NULL, NULL, DispHTMLCommentElement_tid, HTMLCommentElement_iface_tids, diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 2abe5df..e66a42c 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -1300,6 +1300,7 @@ static const tid_t HTMLCurrentStyle_iface_tids[] = { 0 }; static dispex_static_data_t HTMLCurrentStyle_dispex = { + L"MSCurrentStyleCSSProperties", &CSSStyle_dispex_vtbl, DispHTMLCurrentStyle_tid, HTMLCurrentStyle_iface_tids, diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 9faf987..4c6c470 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5654,6 +5654,7 @@ static void HTMLDocumentNode_init_dispex_info(dispex_data_t *info, compat_mode_t } static dispex_static_data_t HTMLDocumentNode_dispex = { + L"HTMLDocument", &HTMLDocumentNode_event_target_vtbl.dispex_vtbl, DispHTMLDocument_tid, HTMLDocumentNode_iface_tids, @@ -5949,6 +5950,7 @@ static const tid_t HTMLDocumentObj_iface_tids[] = { 0 }; static dispex_static_data_t HTMLDocumentObj_dispex = { + NULL, NULL, DispHTMLDocument_tid, HTMLDocumentObj_iface_tids diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index b07de03..4b16fce 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -527,6 +527,7 @@ static const tid_t HTMLRect_iface_tids[] = { 0 }; static dispex_static_data_t HTMLRect_dispex = { + L"ClientRect", NULL, IHTMLRect_tid, HTMLRect_iface_tids @@ -788,6 +789,7 @@ static const tid_t HTMLRectCollection_iface_tids[] = { 0 }; static dispex_static_data_t HTMLRectCollection_dispex = { + L"ClientRectList", &HTMLRectCollection_dispex_vtbl, IHTMLRectCollection_tid, HTMLRectCollection_iface_tids @@ -6669,6 +6671,7 @@ static const tid_t token_list_iface_tids[] = { 0 }; static dispex_static_data_t token_list_dispex = { + L"DOMTokenList", &token_list_dispex_vtbl, IWineDOMTokenList_tid, token_list_iface_tids @@ -6779,6 +6782,7 @@ static const IWineHTMLElementPrivateVtbl WineHTMLElementPrivateVtbl = { }; static dispex_static_data_t HTMLElement_dispex = { + L"HTMLElement", &HTMLElement_event_target_vtbl.dispex_vtbl, DispHTMLUnknownElement_tid, HTMLElement_iface_tids, @@ -7053,6 +7057,7 @@ static const tid_t HTMLFiltersCollection_iface_tids[] = { 0 }; static dispex_static_data_t HTMLFiltersCollection_dispex = { + NULL, &HTMLFiltersCollection_dispex_vtbl, IHTMLFiltersCollection_tid, HTMLFiltersCollection_iface_tids @@ -7626,6 +7631,7 @@ static const tid_t HTMLAttributeCollection_iface_tids[] = { }; static dispex_static_data_t HTMLAttributeCollection_dispex = { + L"NamedNodeMap", &HTMLAttributeCollection_dispex_vtbl, DispHTMLAttributeCollection_tid, HTMLAttributeCollection_iface_tids diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index e72f21f..86ef3a3 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -618,6 +618,7 @@ static const tid_t HTMLElementCollection_iface_tids[] = { }; static dispex_static_data_t HTMLElementCollection_dispex = { + L"HTMLCollection", &HTMLElementColection_dispex_vtbl, DispHTMLElementCollection_tid, HTMLElementCollection_iface_tids diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 5b040c4..3f545bb 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -750,6 +750,7 @@ static const tid_t HTMLEventObj_iface_tids[] = { }; static dispex_static_data_t HTMLEventObj_dispex = { + L"MSEventObj", NULL, DispCEventObj_tid, HTMLEventObj_iface_tids @@ -2135,6 +2136,7 @@ static const tid_t DOMEvent_iface_tids[] = { }; static dispex_static_data_t DOMEvent_dispex = { + L"Event", NULL, DispDOMEvent_tid, DOMEvent_iface_tids @@ -2147,6 +2149,7 @@ static const tid_t DOMUIEvent_iface_tids[] = { }; static dispex_static_data_t DOMUIEvent_dispex = { + L"UIEvent", NULL, DispDOMUIEvent_tid, DOMUIEvent_iface_tids @@ -2160,6 +2163,7 @@ static const tid_t DOMMouseEvent_iface_tids[] = { }; static dispex_static_data_t DOMMouseEvent_dispex = { + L"MouseEvent", NULL, DispDOMMouseEvent_tid, DOMMouseEvent_iface_tids @@ -2173,6 +2177,7 @@ static const tid_t DOMKeyboardEvent_iface_tids[] = { }; static dispex_static_data_t DOMKeyboardEvent_dispex = { + L"KeyboardEvent", NULL, DispDOMKeyboardEvent_tid, DOMKeyboardEvent_iface_tids @@ -2185,6 +2190,7 @@ static const tid_t DOMCustomEvent_iface_tids[] = { }; static dispex_static_data_t DOMCustomEvent_dispex = { + L"CustomEvent", NULL, DispDOMCustomEvent_tid, DOMCustomEvent_iface_tids diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index 5d0928e..566612f 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -827,6 +827,7 @@ static const tid_t HTMLFormElement_iface_tids[] = { }; static dispex_static_data_t HTMLFormElement_dispex = { + L"HTMLFormElement", NULL, DispHTMLFormElement_tid, HTMLFormElement_iface_tids, diff --git a/dlls/mshtml/htmlframe.c b/dlls/mshtml/htmlframe.c index 7118ea8..e794284 100644 --- a/dlls/mshtml/htmlframe.c +++ b/dlls/mshtml/htmlframe.c @@ -1023,6 +1023,7 @@ static const tid_t HTMLFrameElement_iface_tids[] = { }; static dispex_static_data_t HTMLFrameElement_dispex = { + L"HTMLFrameElement", NULL, DispHTMLFrameElement_tid, HTMLFrameElement_iface_tids, @@ -1603,6 +1604,7 @@ static const tid_t HTMLIFrame_iface_tids[] = { }; static dispex_static_data_t HTMLIFrame_dispex = { + L"HTMLIFrameElement", NULL, DispHTMLIFrame_tid, HTMLIFrame_iface_tids, diff --git a/dlls/mshtml/htmlgeneric.c b/dlls/mshtml/htmlgeneric.c index 639c95e..459fc78 100644 --- a/dlls/mshtml/htmlgeneric.c +++ b/dlls/mshtml/htmlgeneric.c @@ -168,6 +168,7 @@ static const tid_t HTMLGenericElement_iface_tids[] = { }; static dispex_static_data_t HTMLGenericElement_dispex = { + L"HTMLUnknownElement", NULL, DispHTMLGenericElement_tid, HTMLGenericElement_iface_tids, diff --git a/dlls/mshtml/htmlhead.c b/dlls/mshtml/htmlhead.c index 5dbf8d6..1bad06e 100644 --- a/dlls/mshtml/htmlhead.c +++ b/dlls/mshtml/htmlhead.c @@ -169,6 +169,7 @@ static const tid_t HTMLTitleElement_iface_tids[] = { 0 }; static dispex_static_data_t HTMLTitleElement_dispex = { + L"HTMLTitleElement", NULL, DispHTMLTitleElement_tid, HTMLTitleElement_iface_tids, @@ -352,6 +353,7 @@ static const tid_t HTMLHtmlElement_iface_tids[] = { 0 }; static dispex_static_data_t HTMLHtmlElement_dispex = { + L"HTMLHtmlElement", NULL, DispHTMLHtmlElement_tid, HTMLHtmlElement_iface_tids, @@ -588,6 +590,7 @@ static const tid_t HTMLMetaElement_iface_tids[] = { }; static dispex_static_data_t HTMLMetaElement_dispex = { + L"HTMLMetaElement", NULL, DispHTMLMetaElement_tid, HTMLMetaElement_iface_tids, @@ -751,6 +754,7 @@ static const tid_t HTMLHeadElement_iface_tids[] = { 0 }; static dispex_static_data_t HTMLHeadElement_dispex = { + L"HTMLHeadElement", NULL, DispHTMLHeadElement_tid, HTMLHeadElement_iface_tids, diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index f89e8e5..2724c28 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -730,6 +730,7 @@ static const tid_t HTMLImgElement_iface_tids[] = { 0 }; static dispex_static_data_t HTMLImgElement_dispex = { + L"HTMLImageElement", NULL, DispHTMLImg_tid, HTMLImgElement_iface_tids, @@ -974,6 +975,7 @@ static const dispex_static_data_vtbl_t HTMLImageElementFactory_dispex_vtbl = { }; static dispex_static_data_t HTMLImageElementFactory_dispex = { + NULL, &HTMLImageElementFactory_dispex_vtbl, IHTMLImageElementFactory_tid, HTMLImageElementFactory_iface_tids diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 1a0a739..e9b53da 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1441,6 +1441,7 @@ static const tid_t HTMLInputElement_iface_tids[] = { 0 }; static dispex_static_data_t HTMLInputElement_dispex = { + L"HTMLInputElement", NULL, DispHTMLInputElement_tid, HTMLInputElement_iface_tids, @@ -1637,6 +1638,7 @@ static const tid_t HTMLLabelElement_iface_tids[] = { }; static dispex_static_data_t HTMLLabelElement_dispex = { + L"HTMLLabelElement", NULL, DispHTMLLabelElement_tid, HTMLLabelElement_iface_tids, @@ -1983,6 +1985,7 @@ static const tid_t HTMLButtonElement_iface_tids[] = { }; static dispex_static_data_t HTMLButtonElement_dispex = { + L"HTMLButtonElement", NULL, DispHTMLButtonElement_tid, HTMLButtonElement_iface_tids, diff --git a/dlls/mshtml/htmllink.c b/dlls/mshtml/htmllink.c index ddf67ca..1dd4873 100644 --- a/dlls/mshtml/htmllink.c +++ b/dlls/mshtml/htmllink.c @@ -446,6 +446,7 @@ static const tid_t HTMLLinkElement_iface_tids[] = { 0 }; static dispex_static_data_t HTMLLinkElement_dispex = { + L"HTMLLinkElement", NULL, DispHTMLLinkElement_tid, HTMLLinkElement_iface_tids, diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index a85c9a6..85dfc40 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -631,6 +631,7 @@ static const tid_t HTMLLocation_iface_tids[] = { 0 }; static dispex_static_data_t HTMLLocation_dispex = { + L"Object", NULL, DispHTMLLocation_tid, HTMLLocation_iface_tids diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index b5ff02b..6e65581 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -429,6 +429,7 @@ static const tid_t HTMLDOMChildrenCollection_iface_tids[] = { }; static dispex_static_data_t HTMLDOMChildrenCollection_dispex = { + L"NodeList", &HTMLDOMChildrenCollection_dispex_vtbl, DispDOMChildrenCollection_tid, HTMLDOMChildrenCollection_iface_tids, @@ -1476,6 +1477,7 @@ static const tid_t HTMLDOMNode_iface_tids[] = { 0 }; static dispex_static_data_t HTMLDOMNode_dispex = { + NULL, NULL, IHTMLDOMNode_tid, HTMLDOMNode_iface_tids, diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index 6702548..9c8af17 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -766,6 +766,7 @@ static const tid_t HTMLObjectElement_iface_tids[] = { 0 }; static dispex_static_data_t HTMLObjectElement_dispex = { + L"HTMLObjectElement", NULL, DispHTMLObjectElement_tid, HTMLObjectElement_iface_tids, @@ -1028,6 +1029,7 @@ static const tid_t HTMLEmbedElement_iface_tids[] = { 0 }; static dispex_static_data_t HTMLEmbedElement_dispex = { + L"HTMLEmbedElement", NULL, DispHTMLEmbed_tid, HTMLEmbedElement_iface_tids, diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 9b7f95e..9f3a0b2 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -479,6 +479,7 @@ static const tid_t HTMLScriptElement_iface_tids[] = { }; static dispex_static_data_t HTMLScriptElement_dispex = { + L"HTMLScriptElement", NULL, DispHTMLScriptElement_tid, HTMLScriptElement_iface_tids, diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index ad801f8..4585e2e 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -416,6 +416,7 @@ static const tid_t HTMLOptionElement_iface_tids[] = { 0 }; static dispex_static_data_t HTMLOptionElement_dispex = { + L"HTMLOptionElement", NULL, DispHTMLOptionElement_tid, HTMLOptionElement_iface_tids, @@ -595,6 +596,7 @@ static const tid_t HTMLOptionElementFactory_iface_tids[] = { }; static dispex_static_data_t HTMLOptionElementFactory_dispex = { + NULL, NULL, IHTMLOptionElementFactory_tid, HTMLOptionElementFactory_iface_tids, @@ -1281,6 +1283,7 @@ static const tid_t HTMLSelectElement_tids[] = { }; static dispex_static_data_t HTMLSelectElement_dispex = { + L"HTMLSelectElement", NULL, DispHTMLSelectElement_tid, HTMLSelectElement_tids, diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index c389647..9c1f904 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -195,6 +195,7 @@ static const tid_t HTMLStorage_iface_tids[] = { 0 }; static dispex_static_data_t HTMLStorage_dispex = { + L"Storage", NULL, IHTMLStorage_tid, HTMLStorage_iface_tids diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 4ee81ba..7dd7000 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -10006,6 +10006,7 @@ static const tid_t HTMLStyle_iface_tids[] = { 0 }; static dispex_static_data_t HTMLStyle_dispex = { + L"MSStyleCSSProperties", &CSSStyle_dispex_vtbl, DispHTMLStyle_tid, HTMLStyle_iface_tids, @@ -10100,6 +10101,7 @@ static const tid_t HTMLW3CComputedStyle_iface_tids[] = { 0 }; static dispex_static_data_t HTMLW3CComputedStyle_dispex = { + L"CSSStyleDeclaration", &CSSStyle_dispex_vtbl, DispHTMLW3CComputedStyle_tid, HTMLW3CComputedStyle_iface_tids, diff --git a/dlls/mshtml/htmlstyleelem.c b/dlls/mshtml/htmlstyleelem.c index d2a4a75..cf57547 100644 --- a/dlls/mshtml/htmlstyleelem.c +++ b/dlls/mshtml/htmlstyleelem.c @@ -462,6 +462,7 @@ static const tid_t HTMLStyleElement_iface_tids[] = { 0 }; static dispex_static_data_t HTMLStyleElement_dispex = { + L"HTMLStyleElement", NULL, DispHTMLStyleElement_tid, HTMLStyleElement_iface_tids, diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index b6f1c98..cbc2adf 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -202,6 +202,7 @@ static const tid_t HTMLStyleSheetRule_iface_tids[] = { 0 }; static dispex_static_data_t HTMLStyleSheetRule_dispex = { + L"CSSStyleRule", NULL, DispHTMLStyleSheetRule_tid, HTMLStyleSheetRule_iface_tids @@ -376,6 +377,7 @@ static const tid_t HTMLStyleSheetRulesCollection_iface_tids[] = { 0 }; static dispex_static_data_t HTMLStyleSheetRulesCollection_dispex = { + L"MSCSSRuleList", NULL, DispHTMLStyleSheetRulesCollection_tid, HTMLStyleSheetRulesCollection_iface_tids @@ -575,6 +577,7 @@ static const tid_t HTMLStyleSheetsCollection_iface_tids[] = { 0 }; static dispex_static_data_t HTMLStyleSheetsCollection_dispex = { + L"StyleSheetList", NULL, DispHTMLStyleSheetsCollection_tid, HTMLStyleSheetsCollection_iface_tids @@ -1144,6 +1147,7 @@ static const tid_t HTMLStyleSheet_iface_tids[] = { 0 }; static dispex_static_data_t HTMLStyleSheet_dispex = { + L"CSSStyleSheet", NULL, DispHTMLStyleSheet_tid, HTMLStyleSheet_iface_tids, diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index 178e9e5..53c9820 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -520,6 +520,7 @@ static const tid_t HTMLTableCell_iface_tids[] = { }; static dispex_static_data_t HTMLTableCell_dispex = { + L"HTMLTableDataCellElement", NULL, DispHTMLTableCell_tid, HTMLTableCell_iface_tids, @@ -964,6 +965,7 @@ static const tid_t HTMLTableRow_iface_tids[] = { }; static dispex_static_data_t HTMLTableRow_dispex = { + L"HTMLTableRowElement", NULL, DispHTMLTableRow_tid, HTMLTableRow_iface_tids, @@ -1996,6 +1998,7 @@ static const tid_t HTMLTable_iface_tids[] = { }; static dispex_static_data_t HTMLTable_dispex = { + L"HTMLTableElement", NULL, DispHTMLTable_tid, HTMLTable_iface_tids, diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index 57f3373..f95b559 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -479,6 +479,7 @@ static const tid_t HTMLTextAreaElement_iface_tids[] = { }; static dispex_static_data_t HTMLTextAreaElement_dispex = { + L"HTMLTextAreaElement", NULL, DispHTMLTextAreaElement_tid, HTMLTextAreaElement_iface_tids, diff --git a/dlls/mshtml/htmltextnode.c b/dlls/mshtml/htmltextnode.c index 56a0572..afe5d21 100644 --- a/dlls/mshtml/htmltextnode.c +++ b/dlls/mshtml/htmltextnode.c @@ -358,6 +358,7 @@ static const tid_t HTMLDOMTextNode_iface_tids[] = { 0 }; static dispex_static_data_t HTMLDOMTextNode_dispex = { + L"Text", NULL, DispHTMLDOMTextNode_tid, HTMLDOMTextNode_iface_tids, diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 870d7e8..2dfa879 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3687,6 +3687,7 @@ static const tid_t HTMLWindow_iface_tids[] = { }; static dispex_static_data_t HTMLWindow_dispex = { + L"Window", &HTMLWindow_event_target_vtbl.dispex_vtbl, DispHTMLWindow2_tid, HTMLWindow_iface_tids, diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index c1e7e78..9429a4b 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -327,6 +327,7 @@ typedef struct { } dispex_static_data_vtbl_t; typedef struct { + const WCHAR *name; const dispex_static_data_vtbl_t *vtbl; const tid_t disp_tid; const tid_t* const iface_tids; @@ -393,6 +394,7 @@ HRESULT get_class_typeinfo(const CLSID*,ITypeInfo**) DECLSPEC_HIDDEN; const void *dispex_get_vtbl(DispatchEx*) DECLSPEC_HIDDEN; void dispex_info_add_interface(dispex_data_t*,tid_t,const dispex_hook_t*) DECLSPEC_HIDDEN; compat_mode_t dispex_compat_mode(DispatchEx*) DECLSPEC_HIDDEN; +HRESULT dispex_to_string(DispatchEx*,BSTR*) DECLSPEC_HIDDEN; typedef enum { DISPEXPROP_CUSTOM, diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index eff9576..7b41563 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -304,6 +304,7 @@ static const tid_t HTMLDOMImplementation_iface_tids[] = { 0 }; static dispex_static_data_t HTMLDOMImplementation_dispex = { + L"DOMImplementation", NULL, DispHTMLDOMImplementation_tid, HTMLDOMImplementation_iface_tids @@ -555,6 +556,7 @@ static const tid_t HTMLScreen_iface_tids[] = { 0 }; static dispex_static_data_t HTMLScreen_dispex = { + L"Screen", NULL, DispHTMLScreen_tid, HTMLScreen_iface_tids @@ -718,6 +720,7 @@ static const tid_t OmHistory_iface_tids[] = { 0 }; static dispex_static_data_t OmHistory_dispex = { + L"History", NULL, DispHTMLHistory_tid, OmHistory_iface_tids @@ -874,6 +877,7 @@ static const tid_t HTMLPluginsCollection_iface_tids[] = { 0 }; static dispex_static_data_t HTMLPluginsCollection_dispex = { + L"PluginArray", NULL, DispCPlugins_tid, HTMLPluginsCollection_iface_tids @@ -1018,6 +1022,7 @@ static const tid_t HTMLMimeTypesCollection_iface_tids[] = { 0 }; static dispex_static_data_t HTMLMimeTypesCollection_dispex = { + L"MimeTypeArray", NULL, IHTMLMimeTypesCollection_tid, HTMLMimeTypesCollection_iface_tids @@ -1310,12 +1315,7 @@ static HRESULT WINAPI OmNavigator_toString(IOmNavigator *iface, BSTR *String) TRACE("(%p)->(%p)\n", This, String); - if(!String) - return E_INVALIDARG; - - *String = SysAllocString(dispex_compat_mode(&This->dispex) < COMPAT_MODE_IE9 - ? L"[object]" : L"[object Navigator]"); - return *String ? S_OK : E_OUTOFMEMORY; + return dispex_to_string(&This->dispex, String); } static HRESULT WINAPI OmNavigator_get_cpuClass(IOmNavigator *iface, BSTR *p) @@ -1469,6 +1469,7 @@ static const tid_t OmNavigator_iface_tids[] = { 0 }; static dispex_static_data_t OmNavigator_dispex = { + L"Navigator", NULL, DispHTMLNavigator_tid, OmNavigator_iface_tids @@ -1849,6 +1850,7 @@ static const tid_t HTMLPerformanceTiming_iface_tids[] = { 0 }; static dispex_static_data_t HTMLPerformanceTiming_dispex = { + L"PerformanceTiming", NULL, IHTMLPerformanceTiming_tid, HTMLPerformanceTiming_iface_tids @@ -1998,6 +2000,7 @@ static const tid_t HTMLPerformanceNavigation_iface_tids[] = { 0 }; static dispex_static_data_t HTMLPerformanceNavigation_dispex = { + L"PerformanceNavigation", NULL, IHTMLPerformanceNavigation_tid, HTMLPerformanceNavigation_iface_tids @@ -2188,6 +2191,7 @@ static const tid_t HTMLPerformance_iface_tids[] = { 0 }; static dispex_static_data_t HTMLPerformance_dispex = { + L"Performance", NULL, IHTMLPerformance_tid, HTMLPerformance_iface_tids @@ -2346,6 +2350,7 @@ static const tid_t HTMLNamespaceCollection_iface_tids[] = { 0 }; static dispex_static_data_t HTMLNamespaceCollection_dispex = { + L"MSNamespaceInfoCollection", NULL, DispHTMLNamespaceCollection_tid, HTMLNamespaceCollection_iface_tids @@ -2601,6 +2606,7 @@ static const tid_t console_iface_tids[] = { 0 }; static dispex_static_data_t console_dispex = { + L"Console", NULL, IWineMSHTMLConsole_tid, console_iface_tids diff --git a/dlls/mshtml/range.c b/dlls/mshtml/range.c index 89f6804..bea5ac6 100644 --- a/dlls/mshtml/range.c +++ b/dlls/mshtml/range.c @@ -1715,6 +1715,7 @@ static const tid_t HTMLTxtRange_iface_tids[] = { 0 }; static dispex_static_data_t HTMLTxtRange_dispex = { + L"TextRange", NULL, IHTMLTxtRange_tid, HTMLTxtRange_iface_tids @@ -2060,6 +2061,7 @@ static const tid_t HTMLDOMRange_iface_tids[] = { }; static dispex_static_data_t HTMLDOMRange_dispex = { + L"Range", NULL, DispHTMLDOMRange_tid, HTMLDOMRange_iface_tids diff --git a/dlls/mshtml/selection.c b/dlls/mshtml/selection.c index 786c2bd..280fdaa 100644 --- a/dlls/mshtml/selection.c +++ b/dlls/mshtml/selection.c @@ -330,6 +330,7 @@ static const tid_t HTMLSelectionObject_iface_tids[] = { 0 }; static dispex_static_data_t HTMLSelectionObject_dispex = { + L"MSSelection", NULL, IHTMLSelectionObject_tid, /* FIXME: We have a test for that, but it doesn't expose IHTMLSelectionObject2 iface. */ HTMLSelectionObject_iface_tids diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index d7d8ce5..70a332c 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -895,6 +895,7 @@ static const tid_t HTMLXMLHttpRequest_iface_tids[] = { 0 }; static dispex_static_data_t HTMLXMLHttpRequest_dispex = { + L"XMLHttpRequest", &HTMLXMLHttpRequest_event_target_vtbl.dispex_vtbl, DispHTMLXMLHttpRequest_tid, HTMLXMLHttpRequest_iface_tids, @@ -1066,6 +1067,7 @@ static const tid_t HTMLXMLHttpRequestFactory_iface_tids[] = { 0 }; static dispex_static_data_t HTMLXMLHttpRequestFactory_dispex = { + NULL, &HTMLXMLHttpRequestFactory_dispex_vtbl, IHTMLXMLHttpRequestFactory_tid, HTMLXMLHttpRequestFactory_iface_tids -- 2.31.1

3 33

[PATCH vkd3d v2] vkd3d-shader: Allow a NULL buffer in vkd3d_string_buffer.
by Giovanni Mascellani 06 Oct '21

06 Oct '21

Semantically, a NULL buffer is considered equivalent to the empty string. The accessor vkd3d_string_buffer_data implements this equivalence. The reason for this change is to avoid asserting the result of a memory allocation in vkd3d_string_buffer_init, while at the same time keeping it always successful. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- libs/vkd3d-shader/glsl.c | 2 +- libs/vkd3d-shader/hlsl.c | 9 ++++--- libs/vkd3d-shader/hlsl.y | 34 +++++++++++++----------- libs/vkd3d-shader/hlsl_codegen.c | 8 +++--- libs/vkd3d-shader/hlsl_sm1.c | 2 +- libs/vkd3d-shader/hlsl_sm4.c | 5 ++-- libs/vkd3d-shader/preproc.l | 7 ++--- libs/vkd3d-shader/spirv.c | 2 +- libs/vkd3d-shader/trace.c | 2 +- libs/vkd3d-shader/vkd3d_shader_main.c | 20 +++++++------- libs/vkd3d-shader/vkd3d_shader_private.h | 5 ++++ 11 files changed, 56 insertions(+), 40 deletions(-) diff --git a/libs/vkd3d-shader/glsl.c b/libs/vkd3d-shader/glsl.c index 7e028d23..fec412b1 100644 --- a/libs/vkd3d-shader/glsl.c +++ b/libs/vkd3d-shader/glsl.c @@ -127,7 +127,7 @@ int vkd3d_glsl_generator_generate(struct vkd3d_glsl_generator *generator, if ((code = vkd3d_malloc(generator->buffer.buffer_size))) { - memcpy(code, generator->buffer.buffer, generator->buffer.content_size); + memcpy(code, vkd3d_string_buffer_data(&generator->buffer), generator->buffer.content_size); out->size = generator->buffer.content_size; out->code = code; } diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 66ca389a..e64d8808 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -64,7 +64,8 @@ void hlsl_fixme(struct hlsl_ctx *ctx, const struct vkd3d_shader_location loc, co string = hlsl_get_string_buffer(ctx); vkd3d_string_buffer_printf(string, "Aborting due to not yet implemented feature: "); vkd3d_string_buffer_vprintf(string, fmt, args); - vkd3d_shader_error(ctx->message_context, &loc, VKD3D_SHADER_ERROR_HLSL_NOT_IMPLEMENTED, "%s", string->buffer); + vkd3d_shader_error(ctx->message_context, &loc, VKD3D_SHADER_ERROR_HLSL_NOT_IMPLEMENTED, + "%s", vkd3d_string_buffer_data(string)); hlsl_release_string_buffer(ctx, string); va_end(args); @@ -855,7 +856,7 @@ struct vkd3d_string_buffer *hlsl_type_to_string(struct hlsl_ctx *ctx, const stru if ((inner_string = hlsl_type_to_string(ctx, t))) { - vkd3d_string_buffer_printf(string, "%s", inner_string->buffer); + vkd3d_string_buffer_printf(string, "%s", vkd3d_string_buffer_data(inner_string)); hlsl_release_string_buffer(ctx, inner_string); } @@ -881,7 +882,7 @@ const char *debug_hlsl_type(struct hlsl_ctx *ctx, const struct hlsl_type *type) if (!(string = hlsl_type_to_string(ctx, type))) return NULL; - ret = vkd3d_dbg_sprintf("%s", string->buffer); + ret = vkd3d_dbg_sprintf("%s", vkd3d_string_buffer_data(string)); hlsl_release_string_buffer(ctx, string); return ret; } @@ -975,7 +976,7 @@ static void dump_ir_var(struct hlsl_ctx *ctx, struct vkd3d_string_buffer *buffer struct vkd3d_string_buffer *string; if ((string = hlsl_modifiers_to_string(ctx, var->modifiers))) - vkd3d_string_buffer_printf(buffer, "%s ", string->buffer); + vkd3d_string_buffer_printf(buffer, "%s ", vkd3d_string_buffer_data(string)); hlsl_release_string_buffer(ctx, string); } vkd3d_string_buffer_printf(buffer, "%s %s", debug_hlsl_type(ctx, var->data_type), var->name); diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index d1ef9eb4..4f5e629d 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -274,7 +274,8 @@ static struct hlsl_ir_node *add_implicit_conversion(struct hlsl_ctx *ctx, struct dst_string = hlsl_type_to_string(ctx, dst_type); if (src_string && dst_string) hlsl_error(ctx, *loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, - "Can't implicitly convert from %s to %s.", src_string->buffer, dst_string->buffer); + "Can't implicitly convert from %s to %s.", + vkd3d_string_buffer_data(src_string), vkd3d_string_buffer_data(dst_string)); hlsl_release_string_buffer(ctx, src_string); hlsl_release_string_buffer(ctx, dst_string); return NULL; @@ -298,7 +299,7 @@ static DWORD add_modifiers(struct hlsl_ctx *ctx, DWORD modifiers, DWORD mod, con if ((string = hlsl_modifiers_to_string(ctx, mod))) hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, - "Modifier '%s' was already specified.", string->buffer); + "Modifier '%s' was already specified.", vkd3d_string_buffer_data(string)); hlsl_release_string_buffer(ctx, string); return modifiers; } @@ -919,7 +920,8 @@ static struct hlsl_type *expr_common_type(struct hlsl_ctx *ctx, struct hlsl_type if ((string = hlsl_type_to_string(ctx, t1))) hlsl_error(ctx, *loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, - "Expression of type \"%s\" cannot be used in a numeric expression.", string->buffer); + "Expression of type \"%s\" cannot be used in a numeric expression.", + vkd3d_string_buffer_data(string)); hlsl_release_string_buffer(ctx, string); return NULL; } @@ -930,7 +932,8 @@ static struct hlsl_type *expr_common_type(struct hlsl_ctx *ctx, struct hlsl_type if ((string = hlsl_type_to_string(ctx, t2))) hlsl_error(ctx, *loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, - "Expression of type \"%s\" cannot be used in a numeric expression.", string->buffer); + "Expression of type \"%s\" cannot be used in a numeric expression.", + vkd3d_string_buffer_data(string)); hlsl_release_string_buffer(ctx, string); return NULL; } @@ -946,7 +949,7 @@ static struct hlsl_type *expr_common_type(struct hlsl_ctx *ctx, struct hlsl_type if (t1_string && t2_string) hlsl_error(ctx, *loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, "Expression data types \"%s\" and \"%s\" are incompatible.", - t1_string->buffer, t2_string->buffer); + vkd3d_string_buffer_data(t1_string), vkd3d_string_buffer_data(t2_string)); hlsl_release_string_buffer(ctx, t1_string); hlsl_release_string_buffer(ctx, t2_string); return NULL; @@ -1410,7 +1413,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t if ((string = hlsl_modifiers_to_string(ctx, modifiers & invalid))) hlsl_error(ctx, var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, - "Modifiers '%s' are not allowed on local variables.", string->buffer); + "Modifiers '%s' are not allowed on local variables.", vkd3d_string_buffer_data(string)); hlsl_release_string_buffer(ctx, string); } if (var->semantic.name) @@ -1673,7 +1676,7 @@ static struct list *add_call(struct hlsl_ctx *ctx, const char *name, if ((string = hlsl_type_to_string(ctx, params->args[i]->data_type))) hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, "Wrong type for argument %u of '%s': expected a numeric type, but got '%s'.\n", - i + 1, name, string->buffer); + i + 1, name, vkd3d_string_buffer_data(string)); hlsl_release_string_buffer(ctx, string); free_parse_initializer(params); return NULL; @@ -1725,7 +1728,7 @@ static struct list *add_constructor(struct hlsl_ctx *ctx, struct hlsl_type *type if ((string = hlsl_type_to_string(ctx, arg->data_type))) hlsl_error(ctx, arg->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, - "Invalid type %s for constructor argument.", string->buffer); + "Invalid type %s for constructor argument.", vkd3d_string_buffer_data(string)); hlsl_release_string_buffer(ctx, string); continue; } @@ -2171,7 +2174,8 @@ field: if ((string = hlsl_modifiers_to_string(ctx, modifiers))) hlsl_error(ctx, @1, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, - "Modifiers '%s' are not allowed on struct fields.", string->buffer); + "Modifiers '%s' are not allowed on struct fields.", + vkd3d_string_buffer_data(string)); hlsl_release_string_buffer(ctx, string); } $$ = gen_struct_fields(ctx, type, $3); @@ -2355,7 +2359,7 @@ input_mods: if ((string = hlsl_modifiers_to_string(ctx, $2))) hlsl_error(ctx, @2, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, - "Modifier \"%s\" was already specified.", string->buffer); + "Modifier \"%s\" was already specified.", vkd3d_string_buffer_data(string)); hlsl_release_string_buffer(ctx, string); YYABORT; } @@ -2386,7 +2390,7 @@ type: string = hlsl_type_to_string(ctx, $3); if (string) hlsl_error(ctx, @3, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, - "Vector base type %s is not scalar.", string->buffer); + "Vector base type %s is not scalar.", vkd3d_string_buffer_data(string)); hlsl_release_string_buffer(ctx, string); YYABORT; } @@ -2408,7 +2412,7 @@ type: string = hlsl_type_to_string(ctx, $3); if (string) hlsl_error(ctx, @3, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, - "Matrix base type %s is not scalar.", string->buffer); + "Matrix base type %s is not scalar.", vkd3d_string_buffer_data(string)); hlsl_release_string_buffer(ctx, string); YYABORT; } @@ -2779,7 +2783,7 @@ selection_statement: if ((string = hlsl_type_to_string(ctx, condition->data_type))) hlsl_error(ctx, instr->node.loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, - "if condition type %s is not scalar.", string->buffer); + "if condition type %s is not scalar.", vkd3d_string_buffer_data(string)); hlsl_release_string_buffer(ctx, string); } $$ = $3; @@ -3022,7 +3026,7 @@ postfix_expr: if ((string = hlsl_type_to_string(ctx, $2))) hlsl_error(ctx, @2, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, - "Constructor data type %s is not numeric.", string->buffer); + "Constructor data type %s is not numeric.", vkd3d_string_buffer_data(string)); hlsl_release_string_buffer(ctx, string); free_parse_initializer(&$4); YYABORT; @@ -3106,7 +3110,7 @@ unary_expr: dst_string = hlsl_type_to_string(ctx, dst_type); if (src_string && dst_string) hlsl_error(ctx, @3, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, "Can't cast from %s to %s.", - src_string->buffer, dst_string->buffer); + vkd3d_string_buffer_data(src_string), vkd3d_string_buffer_data(dst_string)); hlsl_release_string_buffer(ctx, src_string); hlsl_release_string_buffer(ctx, dst_string); YYABORT; diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 9c9a3837..2240f489 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -45,7 +45,7 @@ static void prepend_uniform_copy(struct hlsl_ctx *ctx, struct list *instrs, stru if (!(name = hlsl_get_string_buffer(ctx))) return; vkd3d_string_buffer_printf(name, "<temp-%s>", temp->name); - temp->name = hlsl_strdup(ctx, name->buffer); + temp->name = hlsl_strdup(ctx, vkd3d_string_buffer_data(name)); hlsl_release_string_buffer(ctx, name); if (!(load = hlsl_new_var_load(ctx, uniform, temp->loc))) @@ -76,7 +76,8 @@ static void prepend_input_copy(struct hlsl_ctx *ctx, struct list *instrs, struct return; } new_semantic.index = semantic->index; - if (!(input = hlsl_new_var(ctx, hlsl_strdup(ctx, name->buffer), type, var->loc, &new_semantic, 0, NULL))) + if (!(input = hlsl_new_var(ctx, hlsl_strdup(ctx, vkd3d_string_buffer_data(name)), + type, var->loc, &new_semantic, 0, NULL))) { hlsl_release_string_buffer(ctx, name); vkd3d_free((void *)new_semantic.name); @@ -147,7 +148,8 @@ static void append_output_copy(struct hlsl_ctx *ctx, struct list *instrs, struct return; } new_semantic.index = semantic->index; - if (!(output = hlsl_new_var(ctx, hlsl_strdup(ctx, name->buffer), type, var->loc, &new_semantic, 0, NULL))) + if (!(output = hlsl_new_var(ctx, hlsl_strdup(ctx, vkd3d_string_buffer_data(name)), + type, var->loc, &new_semantic, 0, NULL))) { vkd3d_free((void *)new_semantic.name); hlsl_release_string_buffer(ctx, name); diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index ee2870ec..e64ca5f2 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -326,7 +326,7 @@ static void write_sm1_uniforms(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffe } vkd3d_string_buffer_printf(name, "$%s", var->name); vkd3d_free((char *)var->name); - var->name = hlsl_strdup(ctx, name->buffer); + var->name = hlsl_strdup(ctx, vkd3d_string_buffer_data(name)); hlsl_release_string_buffer(ctx, name); } } diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index f7249431..05612806 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -187,7 +187,8 @@ static void write_sm4_signature(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc, default: if ((string = hlsl_type_to_string(ctx, var->data_type))) hlsl_error(ctx, var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, - "Invalid data type %s for semantic variable %s.", string->buffer, var->name); + "Invalid data type %s for semantic variable %s.", + vkd3d_string_buffer_data(string), var->name); hlsl_release_string_buffer(ctx, string); put_u32(&buffer, D3D_REGISTER_COMPONENT_UNKNOWN); } @@ -1165,7 +1166,7 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, struct vkd3d_string_buffer *string; if ((string = hlsl_type_to_string(ctx, expr->node.data_type))) - hlsl_fixme(ctx, expr->node.loc, "SM4 %s expression.", string->buffer); + hlsl_fixme(ctx, expr->node.loc, "SM4 %s expression.", vkd3d_string_buffer_data(string)); hlsl_release_string_buffer(ctx, string); break; } diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index bf4d669f..75b8e358 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -321,7 +321,8 @@ static bool preproc_push_expansion(struct preproc_ctx *ctx, return false; exp = &ctx->expansion_stack[ctx->expansion_count++]; exp->text = text; - exp->buffer.lexer_buffer = yy_scan_bytes(text->text.buffer, text->text.content_size, ctx->scanner); + exp->buffer.lexer_buffer = yy_scan_bytes(vkd3d_string_buffer_data(&text->text), + text->text.content_size, ctx->scanner); exp->buffer.location = text->location; exp->macro = macro; TRACE("Expansion stack size is now %zu.\n", ctx->expansion_count); @@ -465,7 +466,7 @@ int yylex(YYSTYPE *lval, YYLTYPE *lloc, yyscan_t scanner) { for (i = 0; i < expansion->text.content_size; ++i) { - char c = expansion->text.buffer[i]; + char c = vkd3d_string_buffer_data(&expansion->text)[i]; if (c == '\\' || c == '"') vkd3d_string_buffer_printf(&ctx->buffer, "\\"); @@ -804,7 +805,7 @@ int preproc_lexer_parse(const struct vkd3d_shader_compile_info *compile_info, vkd3d_string_buffer_cleanup(&ctx.buffer); return VKD3D_ERROR_OUT_OF_MEMORY; } - memcpy(output_code, ctx.buffer.buffer, ctx.buffer.content_size); + memcpy(output_code, vkd3d_string_buffer_data(&ctx.buffer), ctx.buffer.content_size); out->size = ctx.buffer.content_size; out->code = output_code; vkd3d_string_buffer_trace(&ctx.buffer); diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f604b8ef..1894e140 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2632,7 +2632,7 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor if (shader_interface->binding_count) { struct vkd3d_string_buffer *buffer = vkd3d_shader_register_range_string(compiler, range); - const char *range_str = buffer ? buffer->buffer : ""; + const char *range_str = buffer ? vkd3d_string_buffer_data(buffer) : ""; FIXME("Could not find descriptor binding for type %#x, space %u, registers %s, shader type %#x.\n", descriptor_type, range->space, range_str, compiler->shader_type); vkd3d_dxbc_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_DESCRIPTOR_BINDING_NOT_FOUND, diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 45f38d13..340a4968 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1938,7 +1938,7 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(struct vkd3d_shader_parser *parser, if ((code = vkd3d_malloc(buffer->content_size))) { - memcpy(code, buffer->buffer, buffer->content_size); + memcpy(code, vkd3d_string_buffer_data(buffer), buffer->content_size); out->size = buffer->content_size; out->code = code; } diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index ef9eaef5..3e7d26e4 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -25,11 +25,9 @@ VKD3D_DEBUG_ENV_NAME("VKD3D_SHADER_DEBUG"); void vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer) { - buffer->buffer_size = 16; + buffer->buffer_size = 0; buffer->content_size = 0; - buffer->buffer = vkd3d_malloc(buffer->buffer_size); - assert(buffer->buffer); - memset(buffer->buffer, 0, buffer->buffer_size); + buffer->buffer = NULL; } void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer) @@ -39,18 +37,22 @@ void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer) static void vkd3d_string_buffer_clear(struct vkd3d_string_buffer *buffer) { - buffer->buffer[0] = '\0'; - buffer->content_size = 0; + if (buffer->buffer) + { + buffer->buffer[0] = '\0'; + buffer->content_size = 0; + } } static bool vkd3d_string_buffer_resize(struct vkd3d_string_buffer *buffer, int rc) { - unsigned int new_buffer_size = rc >= 0 ? buffer->content_size + rc + 1 : buffer->buffer_size * 2; + unsigned int new_buffer_size = rc >= 0 ? buffer->content_size + rc + 1 : max(32, buffer->buffer_size * 2); if (!vkd3d_array_reserve((void **)&buffer->buffer, &buffer->buffer_size, new_buffer_size, 1)) { ERR("Failed to grow buffer.\n"); - buffer->buffer[buffer->content_size] = '\0'; + if (buffer->buffer) + buffer->buffer[buffer->content_size] = '\0'; return false; } return true; @@ -194,7 +196,7 @@ bool vkd3d_shader_message_context_copy_messages(struct vkd3d_shader_message_cont if (!(messages = vkd3d_malloc(context->messages.content_size + 1))) return false; - memcpy(messages, context->messages.buffer, context->messages.content_size + 1); + memcpy(messages, vkd3d_string_buffer_data(&context->messages), context->messages.content_size + 1); *out = messages; return true; } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index fa56ba1d..d6f4a2c9 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -935,6 +935,11 @@ void vkd3d_string_buffer_release(struct vkd3d_string_buffer_cache *list, struct void vkd3d_string_buffer_trace_(const struct vkd3d_string_buffer *buffer, const char *function); int vkd3d_string_buffer_vprintf(struct vkd3d_string_buffer *buffer, const char *format, va_list args); +static inline const char *vkd3d_string_buffer_data(const struct vkd3d_string_buffer *buffer) +{ + return buffer->buffer ? buffer->buffer : ""; +} + struct vkd3d_bytecode_buffer { uint8_t *data; -- 2.33.0

1 0

[PATCH v3 7/7] win32u: Move ntgdi implementation from gdi32.
by Jacek Caban 06 Oct '21

06 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/Makefile.in | 38 +-- dlls/gdi32/objects.c | 2 - dlls/win32u/Makefile.in | 34 +- dlls/{gdi32 => win32u}/bitblt.c | 0 dlls/{gdi32 => win32u}/bitmap.c | 0 dlls/{gdi32 => win32u}/brush.c | 0 dlls/{gdi32 => win32u}/clipping.c | 0 dlls/{gdi32 => win32u}/dc.c | 0 dlls/{gdi32 => win32u}/dib.c | 0 dlls/{gdi32 => win32u}/dibdrv/bitblt.c | 0 dlls/{gdi32 => win32u}/dibdrv/dc.c | 0 dlls/{gdi32 => win32u}/dibdrv/dibdrv.h | 0 dlls/{gdi32 => win32u}/dibdrv/graphics.c | 0 dlls/{gdi32 => win32u}/dibdrv/objects.c | 0 dlls/{gdi32 => win32u}/dibdrv/opengl.c | 0 dlls/{gdi32 => win32u}/dibdrv/primitives.c | 0 dlls/{gdi32 => win32u}/driver.c | 0 dlls/{gdi32 => win32u}/emfdrv.c | 0 dlls/{gdi32 => win32u}/font.c | 0 dlls/{gdi32 => win32u}/freetype.c | 2 - dlls/{gdi32 => win32u}/gdiobj.c | 13 +- dlls/win32u/main.c | 6 +- dlls/{gdi32 => win32u}/mapping.c | 0 dlls/{gdi32 => win32u}/ntgdi_private.h | 0 dlls/{gdi32 => win32u}/opentype.c | 0 dlls/{gdi32 => win32u}/painting.c | 0 dlls/{gdi32 => win32u}/palette.c | 0 dlls/{gdi32 => win32u}/path.c | 0 dlls/{gdi32 => win32u}/pen.c | 0 dlls/{gdi32 => win32u}/printdrv.c | 0 dlls/{gdi32 => win32u}/region.c | 0 dlls/win32u/syscall.c | 20 +- dlls/{gdi32 => win32u}/vertical.c | 0 dlls/{gdi32 => win32u}/vulkan.c | 0 dlls/win32u/win32u.spec | 362 +++++++++++---------- dlls/{gdi32 => win32u}/win32u_private.h | 8 +- dlls/{gdi32 => win32u}/wrappers.c | 26 +- 37 files changed, 263 insertions(+), 248 deletions(-) rename dlls/{gdi32 => win32u}/bitblt.c (100%) rename dlls/{gdi32 => win32u}/bitmap.c (100%) rename dlls/{gdi32 => win32u}/brush.c (100%) rename dlls/{gdi32 => win32u}/clipping.c (100%) rename dlls/{gdi32 => win32u}/dc.c (100%) rename dlls/{gdi32 => win32u}/dib.c (100%) rename dlls/{gdi32 => win32u}/dibdrv/bitblt.c (100%) rename dlls/{gdi32 => win32u}/dibdrv/dc.c (100%) rename dlls/{gdi32 => win32u}/dibdrv/dibdrv.h (100%) rename dlls/{gdi32 => win32u}/dibdrv/graphics.c (100%) rename dlls/{gdi32 => win32u}/dibdrv/objects.c (100%) rename dlls/{gdi32 => win32u}/dibdrv/opengl.c (100%) rename dlls/{gdi32 => win32u}/dibdrv/primitives.c (100%) rename dlls/{gdi32 => win32u}/driver.c (100%) rename dlls/{gdi32 => win32u}/emfdrv.c (100%) rename dlls/{gdi32 => win32u}/font.c (100%) rename dlls/{gdi32 => win32u}/freetype.c (99%) rename dlls/{gdi32 => win32u}/gdiobj.c (99%) rename dlls/{gdi32 => win32u}/mapping.c (100%) rename dlls/{gdi32 => win32u}/ntgdi_private.h (100%) rename dlls/{gdi32 => win32u}/opentype.c (100%) rename dlls/{gdi32 => win32u}/painting.c (100%) rename dlls/{gdi32 => win32u}/palette.c (100%) rename dlls/{gdi32 => win32u}/path.c (100%) rename dlls/{gdi32 => win32u}/pen.c (100%) rename dlls/{gdi32 => win32u}/printdrv.c (100%) rename dlls/{gdi32 => win32u}/region.c (100%) rename dlls/{gdi32 => win32u}/vertical.c (100%) rename dlls/{gdi32 => win32u}/vulkan.c (100%) rename dlls/{gdi32 => win32u}/win32u_private.h (99%) rename dlls/{gdi32 => win32u}/wrappers.c (98%)

2 1

[PATCH 1/3] winebus.sys: Remove "stub!" from lnxev_device_haptics_start trace.
by Rémi Bernon 06 Oct '21

06 Oct '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winebus.sys/bus_udev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 0aade2fd104..1f563ebb56f 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -791,7 +791,7 @@ static NTSTATUS lnxev_device_haptics_start(struct unix_device *iface, DWORD dura }; struct input_event event; - TRACE("iface %p, duration_ms %u, rumble_intensity %u, buzz_intensity %u stub!\n", iface, + TRACE("iface %p, duration_ms %u, rumble_intensity %u, buzz_intensity %u.\n", iface, duration_ms, rumble_intensity, buzz_intensity); effect.replay.length = duration_ms; -- 2.33.0

1 2

[PATCH] winexinput.sys: Remove unnecessary IOCTL_HID_GET_STRING condition.
by Rémi Bernon 06 Oct '21

06 Oct '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winexinput.sys/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winexinput.sys/main.c b/dlls/winexinput.sys/main.c index d9a6fd5dd70..05d64b05d4f 100644 --- a/dlls/winexinput.sys/main.c +++ b/dlls/winexinput.sys/main.c @@ -400,7 +400,7 @@ static NTSTATUS WINAPI internal_ioctl(DEVICE_OBJECT *device, IRP *irp) TRACE("device %p, irp %p, code %#x, bus_device %p.\n", device, irp, code, fdo->bus_device); if (code == IOCTL_HID_READ_REPORT) return try_complete_pending_read(device, irp); - if (impl->is_gamepad || code == IOCTL_HID_GET_STRING) return gamepad_internal_ioctl(device, irp); + if (impl->is_gamepad) return gamepad_internal_ioctl(device, irp); IoSkipCurrentIrpStackLocation(irp); return IoCallDriver(fdo->bus_device, irp); -- 2.33.0

1 0

[PATCH] cryptnet/tests: Explicitly set cbSize before each test.
by Huw Davies 06 Oct '21

06 Oct '21

This is clearer and also avoids out-of-bounds compiler warnings relating to the memset()s. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/cryptnet/tests/cryptnet.c | 59 ++++++++++++++++++++++------------ 1 file changed, 39 insertions(+), 20 deletions(-) diff --git a/dlls/cryptnet/tests/cryptnet.c b/dlls/cryptnet/tests/cryptnet.c index b37a5e698f3..b545cf880ee 100644 --- a/dlls/cryptnet/tests/cryptnet.c +++ b/dlls/cryptnet/tests/cryptnet.c @@ -593,7 +593,7 @@ static SYSTEMTIME may2007 = { 2007, 5, 2, 1, 0, 0, 0, 0 }; static void test_verifyRevocation(void) { - CERT_REVOCATION_STATUS status = {sizeof(status)}; + CERT_REVOCATION_STATUS status; CERT_REVOCATION_PARA params = {sizeof(params)}; const CERT_CONTEXT *certs[2]; FILETIME time; @@ -608,7 +608,8 @@ static void test_verifyRevocation(void) } SetLastError(0xdeadbeef); - memset(&status.dwIndex, 0xcc, sizeof(status) - offsetof(CERT_REVOCATION_STATUS, dwIndex)); + memset(&status, 0xcc, sizeof(status)); + status.cbSize = sizeof(status); ret = pCertVerifyRevocation(0, 0, 0, NULL, 0, NULL, &status); ok(!ret, "expected failure\n"); ok(GetLastError() == E_INVALIDARG, "got error %#x\n", GetLastError()); @@ -617,7 +618,8 @@ static void test_verifyRevocation(void) todo_wine ok(!status.dwReason, "got reason %u\n", status.dwReason); SetLastError(0xdeadbeef); - memset(&status.dwIndex, 0xcc, sizeof(status) - offsetof(CERT_REVOCATION_STATUS, dwIndex)); + memset(&status, 0xcc, sizeof(status)); + status.cbSize = sizeof(status); ret = pCertVerifyRevocation(X509_ASN_ENCODING, 0, 0, NULL, 0, NULL, &status); ok(!ret, "expected failure\n"); ok(GetLastError() == E_INVALIDARG, "got error %#x\n", GetLastError()); @@ -626,7 +628,8 @@ static void test_verifyRevocation(void) todo_wine ok(!status.dwReason, "got reason %u\n", status.dwReason); SetLastError(0xdeadbeef); - memset(&status.dwIndex, 0xcc, sizeof(status) - offsetof(CERT_REVOCATION_STATUS, dwIndex)); + memset(&status, 0xcc, sizeof(status)); + status.cbSize = sizeof(status); ret = pCertVerifyRevocation(0, CERT_CONTEXT_REVOCATION_TYPE, 0, NULL, 0, NULL, &status); ok(!ret, "expected failure\n"); ok(GetLastError() == E_INVALIDARG, "got error %#x\n", GetLastError()); @@ -637,7 +640,8 @@ static void test_verifyRevocation(void) certs[0] = CertCreateCertificateContext(X509_ASN_ENCODING, bigCert, sizeof(bigCert)); SetLastError(0xdeadbeef); - memset(&status.dwIndex, 0xcc, sizeof(status) - offsetof(CERT_REVOCATION_STATUS, dwIndex)); + memset(&status, 0xcc, sizeof(status)); + status.cbSize = sizeof(status); ret = pCertVerifyRevocation(0, CERT_CONTEXT_REVOCATION_TYPE, 1, (void **)certs, 0, NULL, &status); ok(!ret, "expected failure\n"); ok(GetLastError() == CRYPT_E_NO_REVOCATION_CHECK, "got error %#x\n", GetLastError()); @@ -652,7 +656,8 @@ static void test_verifyRevocation(void) /* The root cert itself can't be checked for revocation */ SetLastError(0xdeadbeef); - memset(&status.dwIndex, 0xcc, sizeof(status) - offsetof(CERT_REVOCATION_STATUS, dwIndex)); + memset(&status, 0xcc, sizeof(status)); + status.cbSize = sizeof(status); ret = pCertVerifyRevocation(0, CERT_CONTEXT_REVOCATION_TYPE, 1, (void **)&certs[0], 0, NULL, &status); ok(!ret, "expected failure\n"); ok(GetLastError() == CRYPT_E_NO_REVOCATION_CHECK, "got error %#x\n", GetLastError()); @@ -662,7 +667,8 @@ static void test_verifyRevocation(void) /* Neither can the end cert */ SetLastError(0xdeadbeef); - memset(&status.dwIndex, 0xcc, sizeof(status) - offsetof(CERT_REVOCATION_STATUS, dwIndex)); + memset(&status, 0xcc, sizeof(status)); + status.cbSize = sizeof(status); ret = pCertVerifyRevocation(0, CERT_CONTEXT_REVOCATION_TYPE, 1, (void **)&certs[1], 0, NULL, &status); ok(!ret, "expected failure\n"); ok(GetLastError() == CRYPT_E_NO_REVOCATION_CHECK, "got error %#x\n", GetLastError()); @@ -672,7 +678,8 @@ static void test_verifyRevocation(void) /* Both certs together can't, either (they're not CRLs) */ SetLastError(0xdeadbeef); - memset(&status.dwIndex, 0xcc, sizeof(status) - offsetof(CERT_REVOCATION_STATUS, dwIndex)); + memset(&status, 0xcc, sizeof(status)); + status.cbSize = sizeof(status); ret = pCertVerifyRevocation(0, CERT_CONTEXT_REVOCATION_TYPE, 2, (void **)certs, 0, NULL, &status); ok(!ret, "expected failure\n"); ok(GetLastError() == CRYPT_E_NO_REVOCATION_CHECK, "got error %#x\n", GetLastError()); @@ -688,7 +695,8 @@ static void test_verifyRevocation(void) ok(ret, "failed to add CRL, error %u\n", GetLastError()); SetLastError(0xdeadbeef); - memset(&status.dwIndex, 0xcc, sizeof(status) - offsetof(CERT_REVOCATION_STATUS, dwIndex)); + memset(&status, 0xcc, sizeof(status)); + status.cbSize = sizeof(status); ret = pCertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, 2, (void **)certs, 0, &params, &status); ok(!ret, "expected failure\n"); @@ -699,7 +707,8 @@ static void test_verifyRevocation(void) /* Specifying CERT_VERIFY_REV_CHAIN_FLAG doesn't change things either */ SetLastError(0xdeadbeef); - memset(&status.dwIndex, 0xcc, sizeof(status) - offsetof(CERT_REVOCATION_STATUS, dwIndex)); + memset(&status, 0xcc, sizeof(status)); + status.cbSize = sizeof(status); ret = pCertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, 2, (void **)certs, CERT_VERIFY_REV_CHAIN_FLAG, &params, &status); ok(!ret, "expected failure\n"); @@ -711,7 +720,8 @@ static void test_verifyRevocation(void) /* Again, specifying the issuer cert: no change */ params.pIssuerCert = certs[0]; SetLastError(0xdeadbeef); - memset(&status.dwIndex, 0xcc, sizeof(status) - offsetof(CERT_REVOCATION_STATUS, dwIndex)); + memset(&status, 0xcc, sizeof(status)); + status.cbSize = sizeof(status); ret = pCertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, 1, (void **)&certs[1], 0, &params, &status); ok(!ret, "expected failure\n"); @@ -725,7 +735,8 @@ static void test_verifyRevocation(void) params.pftTimeToUse = &time; SetLastError(0xdeadbeef); - memset(&status.dwIndex, 0xcc, sizeof(status) - offsetof(CERT_REVOCATION_STATUS, dwIndex)); + memset(&status, 0xcc, sizeof(status)); + status.cbSize = sizeof(status); ret = pCertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, 1, (void **)&certs[1], 0, &params, &status); ok(!ret, "expected failure\n"); @@ -749,7 +760,8 @@ static void test_verifyRevocation(void) params.pftTimeToUse = NULL; SetLastError(0xdeadbeef); - memset(&status.dwIndex, 0xcc, sizeof(status) - offsetof(CERT_REVOCATION_STATUS, dwIndex)); + memset(&status, 0xcc, sizeof(status)); + status.cbSize = sizeof(status); ret = pCertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, 1, (void **)&certs[1], 0, &params, &status); ok(!ret, "expected failure\n"); @@ -761,7 +773,8 @@ static void test_verifyRevocation(void) SystemTimeToFileTime(&oct2007, &time); params.pftTimeToUse = &time; SetLastError(0xdeadbeef); - memset(&status.dwIndex, 0xcc, sizeof(status) - offsetof(CERT_REVOCATION_STATUS, dwIndex)); + memset(&status, 0xcc, sizeof(status)); + status.cbSize = sizeof(status); ret = pCertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, 1, (void **)&certs[1], 0, &params, &status); ok(!ret, "expected failure\n"); @@ -772,7 +785,8 @@ static void test_verifyRevocation(void) SystemTimeToFileTime(&may2007, &time); SetLastError(0xdeadbeef); - memset(&status.dwIndex, 0xcc, sizeof(status) - offsetof(CERT_REVOCATION_STATUS, dwIndex)); + memset(&status, 0xcc, sizeof(status)); + status.cbSize = sizeof(status); ret = pCertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, 1, (void **)&certs[1], 0, &params, &status); ok(!ret, "expected failure\n"); @@ -790,7 +804,8 @@ static void test_verifyRevocation(void) params.pftTimeToUse = NULL; SetLastError(0xdeadbeef); - memset(&status.dwIndex, 0xcc, sizeof(status) - offsetof(CERT_REVOCATION_STATUS, dwIndex)); + memset(&status, 0xcc, sizeof(status)); + status.cbSize = sizeof(status); ret = pCertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, 1, (void **)&certs[1], 0, &params, &status); ok(!ret, "expected failure\n"); @@ -802,7 +817,8 @@ static void test_verifyRevocation(void) SystemTimeToFileTime(&oct2007, &time); params.pftTimeToUse = &time; SetLastError(0xdeadbeef); - memset(&status.dwIndex, 0xcc, sizeof(status) - offsetof(CERT_REVOCATION_STATUS, dwIndex)); + memset(&status, 0xcc, sizeof(status)); + status.cbSize = sizeof(status); ret = pCertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, 1, (void **)&certs[1], 0, &params, &status); ok(!ret, "expected failure\n"); @@ -813,7 +829,8 @@ static void test_verifyRevocation(void) SystemTimeToFileTime(&may2007, &time); SetLastError(0xdeadbeef); - memset(&status.dwIndex, 0xcc, sizeof(status) - offsetof(CERT_REVOCATION_STATUS, dwIndex)); + memset(&status, 0xcc, sizeof(status)); + status.cbSize = sizeof(status); ret = pCertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, 1, (void **)&certs[1], 0, &params, &status); ok(!ret, "expected failure\n"); @@ -826,7 +843,8 @@ static void test_verifyRevocation(void) /* Test with the wrong encoding type. */ SetLastError(0xdeadbeef); - memset(&status.dwIndex, 0xcc, sizeof(status) - offsetof(CERT_REVOCATION_STATUS, dwIndex)); + memset(&status, 0xcc, sizeof(status)); + status.cbSize = sizeof(status); ret = pCertVerifyRevocation(0, CERT_CONTEXT_REVOCATION_TYPE, 1, (void **)&certs[1], 0, &params, &status); ok(!ret, "expected failure\n"); @@ -837,7 +855,8 @@ static void test_verifyRevocation(void) /* Test with the wrong context type. */ SetLastError(0xdeadbeef); - memset(&status.dwIndex, 0xcc, sizeof(status) - offsetof(CERT_REVOCATION_STATUS, dwIndex)); + memset(&status, 0xcc, sizeof(status)); + status.cbSize = sizeof(status); ret = pCertVerifyRevocation(X509_ASN_ENCODING, 0xdeadbeef, 1, (void **)&certs[1], 0, &params, &status); ok(!ret, "expected failure\n"); -- 2.23.0

1 0

[PATCH v3 6/7] gdi32: Use __wine_ prefix for Wine ntgdi extensions.
by Jacek Caban 06 Oct '21

06 Oct '21

1 0

[PATCH v3 5/7] gdi32: Use __wine_unix_call interface for Unix library.
by Jacek Caban 06 Oct '21

06 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/Makefile.in | 3 ++- dlls/gdi32/dibdrv/dc.c | 4 +++- dlls/gdi32/font.c | 28 +++++++++++++++++----------- dlls/gdi32/gdiobj.c | 14 +++++++++----- dlls/gdi32/wrappers.c | 14 ++++++++++++-- 5 files changed, 43 insertions(+), 20 deletions(-)

1 0

[PATCH v3 4/7] ntdll: Handle Unix lib exception outside Unix stack.
by Jacek Caban 06 Oct '21

06 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/signal_arm.c | 2 +- dlls/ntdll/unix/signal_arm64.c | 2 +- dlls/ntdll/unix/signal_i386.c | 2 +- dlls/ntdll/unix/signal_x86_64.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)

1 0

[PATCH v3 3/7] ntdll: Allow Unix libraries to use exception macros.
by Jacek Caban 06 Oct '21

06 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- I added new USE_SYSCALL_EXCEPTIONS macro. When we no longer use non-native Unix libs, we may just replace it with WINE_UNIX_LIB. dlls/ntdll/unix/virtual.c | 33 +++++---------------------------- include/wine/exception.h | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 28 deletions(-)

1 0

[PATCH v3 1/7] ntdll: Introduce ntdll_get_build_dir and ntdll_get_data_dir.
by Jacek Caban 06 Oct '21

06 Oct '21

To expose build and data dirs for Unix libs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v3: Using proper exception handling and added patches moving code to win32u for better context. dlls/ntdll/unix/env.c | 18 ++++++++++++++++++ include/wine/unixlib.h | 2 ++ 2 files changed, 20 insertions(+)

1 0

[PATCH 7/7] iphlpapi: Use wide character string literals.
by Huw Davies 06 Oct '21

06 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 59 +++++++++++++---------------------- 1 file changed, 21 insertions(+), 38 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 42cd58fa1a6..d9a85beda5f 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -45,7 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); #define CHARS_IN_GUID 39 -static const WCHAR device_tcpip[] = {'\\','D','E','V','I','C','E','\\','T','C','P','I','P','_',0}; +static const WCHAR *device_tcpip = L"\\DEVICE\\TCPIP_"; DWORD WINAPI AllocateAndGetIpAddrTableFromStack( MIB_IPADDRTABLE **table, BOOL sort, HANDLE heap, DWORD flags ); @@ -67,12 +67,8 @@ DWORD WINAPI ConvertGuidToStringA( const GUID *guid, char *str, DWORD len ) DWORD WINAPI ConvertGuidToStringW( const GUID *guid, WCHAR *str, DWORD len ) { - static const WCHAR fmt[] = { '{','%','0','8','X','-','%','0','4','X','-','%','0','4','X','-', - '%','0','2','X','%','0','2','X','-','%','0','2','X','%','0','2','X', - '%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X','}',0 }; - if (len < CHARS_IN_GUID) return ERROR_INSUFFICIENT_BUFFER; - swprintf( str, len, fmt, + swprintf( str, len, L"{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); return ERROR_SUCCESS; @@ -1536,8 +1532,8 @@ DWORD WINAPI GetIcmpStatisticsEx( MIB_ICMP_EX *stats, DWORD family ) static void if_row_fill( MIB_IFROW *row, struct nsi_ndis_ifinfo_rw *rw, struct nsi_ndis_ifinfo_dynamic *dyn, struct nsi_ndis_ifinfo_static *stat ) { - memcpy( row->wszName, device_tcpip, sizeof(device_tcpip) ); - ConvertGuidToStringW( &stat->if_guid, row->wszName + ARRAY_SIZE(device_tcpip) - 1, CHARS_IN_GUID ); + wcscpy( row->wszName, device_tcpip ); + ConvertGuidToStringW( &stat->if_guid, row->wszName + wcslen( device_tcpip ), CHARS_IN_GUID ); row->dwIndex = stat->if_index; row->dwType = stat->type; row->dwMtu = dyn->mtu; @@ -1917,8 +1913,8 @@ DWORD WINAPI GetInterfaceInfo( IP_INTERFACE_INFO *table, ULONG *size ) if (stat[i].type == IF_TYPE_SOFTWARE_LOOPBACK) continue; row = table->Adapter + num++; row->Index = stat[i].if_index; - memcpy( row->Name, device_tcpip, sizeof(device_tcpip) ); - ConvertGuidToStringW( &stat[i].if_guid, row->Name + ARRAY_SIZE(device_tcpip) - 1, CHARS_IN_GUID ); + wcscpy( row->Name, device_tcpip ); + ConvertGuidToStringW( &stat[i].if_guid, row->Name + wcslen( device_tcpip ), CHARS_IN_GUID ); } done: NsiFreeTable( keys, NULL, NULL, stat ); @@ -4244,16 +4240,6 @@ DWORD WINAPI ConvertInterfaceLuidToNameA(const NET_LUID *luid, char *name, SIZE_ return err; } -static const WCHAR otherW[] = {'o','t','h','e','r',0}; -static const WCHAR ethernetW[] = {'e','t','h','e','r','n','e','t',0}; -static const WCHAR tokenringW[] = {'t','o','k','e','n','r','i','n','g',0}; -static const WCHAR pppW[] = {'p','p','p',0}; -static const WCHAR loopbackW[] = {'l','o','o','p','b','a','c','k',0}; -static const WCHAR atmW[] = {'a','t','m',0}; -static const WCHAR wirelessW[] = {'w','i','r','e','l','e','s','s',0}; -static const WCHAR tunnelW[] = {'t','u','n','n','e','l',0}; -static const WCHAR ieee1394W[] = {'i','e','e','e','1','3','9','4',0}; - struct name_prefix { const WCHAR *prefix; @@ -4261,15 +4247,15 @@ struct name_prefix }; static const struct name_prefix name_prefixes[] = { - { otherW, IF_TYPE_OTHER }, - { ethernetW, IF_TYPE_ETHERNET_CSMACD }, - { tokenringW, IF_TYPE_ISO88025_TOKENRING }, - { pppW, IF_TYPE_PPP }, - { loopbackW, IF_TYPE_SOFTWARE_LOOPBACK }, - { atmW, IF_TYPE_ATM }, - { wirelessW, IF_TYPE_IEEE80211 }, - { tunnelW, IF_TYPE_TUNNEL }, - { ieee1394W, IF_TYPE_IEEE1394 } + { L"other", IF_TYPE_OTHER }, + { L"ethernet", IF_TYPE_ETHERNET_CSMACD }, + { L"tokenring", IF_TYPE_ISO88025_TOKENRING }, + { L"ppp", IF_TYPE_PPP }, + { L"loopback", IF_TYPE_SOFTWARE_LOOPBACK }, + { L"atm", IF_TYPE_ATM }, + { L"wireless", IF_TYPE_IEEE80211 }, + { L"tunnel", IF_TYPE_TUNNEL }, + { L"ieee1394", IF_TYPE_IEEE1394 } }; /****************************************************************** @@ -4280,8 +4266,6 @@ DWORD WINAPI ConvertInterfaceLuidToNameW(const NET_LUID *luid, WCHAR *name, SIZE DWORD i, needed; const WCHAR *prefix = NULL; WCHAR buf[IF_MAX_STRING_SIZE + 1]; - static const WCHAR prefix_fmt[] = {'%','s','_','%','d',0}; - static const WCHAR unk_fmt[] = {'i','f','t','y','p','e','%','d','_','%','d',0}; TRACE( "(%p %p %u)\n", luid, name, (DWORD)len ); @@ -4296,8 +4280,8 @@ DWORD WINAPI ConvertInterfaceLuidToNameW(const NET_LUID *luid, WCHAR *name, SIZE } } - if (prefix) needed = swprintf( buf, len, prefix_fmt, prefix, luid->Info.NetLuidIndex ); - else needed = swprintf( buf, len, unk_fmt, luid->Info.IfType, luid->Info.NetLuidIndex ); + if (prefix) needed = swprintf( buf, len, L"%s_%d", prefix, luid->Info.NetLuidIndex ); + else needed = swprintf( buf, len, L"iftype%d_%d", luid->Info.IfType, luid->Info.NetLuidIndex ); if (needed >= len) return ERROR_NOT_ENOUGH_MEMORY; memcpy( name, buf, (needed + 1) * sizeof(WCHAR) ); @@ -4326,8 +4310,8 @@ DWORD WINAPI ConvertInterfaceNameToLuidA(const char *name, NET_LUID *luid) DWORD WINAPI ConvertInterfaceNameToLuidW(const WCHAR *name, NET_LUID *luid) { const WCHAR *sep; - static const WCHAR iftype[] = {'i','f','t','y','p','e',0}; DWORD type = ~0u, i; + int iftype_len = wcslen( L"iftype" ); WCHAR buf[IF_MAX_STRING_SIZE + 1]; TRACE( "(%s %p)\n", debugstr_w(name), luid ); @@ -4339,9 +4323,9 @@ DWORD WINAPI ConvertInterfaceNameToLuidW(const WCHAR *name, NET_LUID *luid) memcpy( buf, name, (sep - name) * sizeof(WCHAR) ); buf[sep - name] = '\0'; - if (sep - name > ARRAY_SIZE(iftype) - 1 && !memcmp( buf, iftype, (ARRAY_SIZE(iftype) - 1) * sizeof(WCHAR) )) + if (sep - name > iftype_len && !memcmp( buf, L"iftype", iftype_len * sizeof(WCHAR) )) { - type = wcstol( buf + ARRAY_SIZE(iftype) - 1, NULL, 10 ); + type = wcstol( buf + iftype_len, NULL, 10 ); } else { @@ -4564,7 +4548,6 @@ BOOL WINAPI IcmpCloseHandle( HANDLE handle ) HANDLE WINAPI IcmpCreateFile( void ) { struct icmp_handle_data *data = heap_alloc( sizeof(*data) ); - static const WCHAR device_name[] = {'\\','\\','.','\\','N','s','i',0}; if (!data) { @@ -4572,7 +4555,7 @@ HANDLE WINAPI IcmpCreateFile( void ) return INVALID_HANDLE_VALUE; } - data->nsi_device = CreateFileW( device_name, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, + data->nsi_device = CreateFileW( L"\\\\.\\Nsi", 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL ); if (data->nsi_device == INVALID_HANDLE_VALUE) { -- 2.25.1

1 0

[PATCH 6/7] iphlpapi: Build with nameless structs and unions.
by Huw Davies 06 Oct '21

06 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 78 +++++++++++++++++------------------ 1 file changed, 38 insertions(+), 40 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index cb27044ae02..42cd58fa1a6 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -20,8 +20,6 @@ */ #include <stdarg.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "winreg.h" @@ -746,7 +744,7 @@ static void address_entry_size( void *ptr, ULONG offset, void *ctxt ) IP_ADAPTER_DNS_SERVER_ADDRESS *src_addr = ptr; /* all list types are super-sets of this type */ ULONG *total = (ULONG *)ctxt, align = sizeof(ULONGLONG) - 1; - *total = (*total + src_addr->u.s.Length + src_addr->Address.iSockaddrLength + align) & ~align; + *total = (*total + src_addr->Length + src_addr->Address.iSockaddrLength + align) & ~align; } struct address_entry_copy_params @@ -764,8 +762,8 @@ static void address_entry_copy( void *ptr, ULONG offset, void *ctxt ) IP_ADAPTER_DNS_SERVER_ADDRESS *dst_addr = (IP_ADAPTER_DNS_SERVER_ADDRESS *)params->ptr; ULONG align = sizeof(ULONGLONG) - 1; - memcpy( dst_addr, src_addr, src_addr->u.s.Length ); - params->ptr += src_addr->u.s.Length; + memcpy( dst_addr, src_addr, src_addr->Length ); + params->ptr += src_addr->Length; dst_addr->Address.lpSockaddr = (SOCKADDR *)params->ptr; memcpy( dst_addr->Address.lpSockaddr, src_addr->Address.lpSockaddr, src_addr->Address.iSockaddrLength ); params->ptr += (src_addr->Address.iSockaddrLength + align) & ~align; @@ -957,7 +955,7 @@ static DWORD unicast_addresses_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG family, UL err = ERROR_NOT_ENOUGH_MEMORY; goto err; } - addr->u.s.Length = sizeof(*addr); + addr->Length = sizeof(*addr); addr->Address.lpSockaddr = (SOCKADDR *)(addr + 1); addr->Address.iSockaddrLength = sockaddr_size; addr->Address.lpSockaddr->sa_family = family; @@ -979,7 +977,7 @@ static DWORD unicast_addresses_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG family, UL addr->PreferredLifetime = rw[i].preferred_lifetime; addr->LeaseLifetime = rw[i].valid_lifetime; /* FIXME */ addr->OnLinkPrefixLength = rw[i].on_link_prefix; - if (unicast_is_dns_eligible( addr )) addr->u.s.Flags |= IP_ADAPTER_ADDRESS_DNS_ELIGIBLE; + if (unicast_is_dns_eligible( addr )) addr->Flags |= IP_ADAPTER_ADDRESS_DNS_ELIGIBLE; *next = addr; next = &addr->Next; @@ -1051,7 +1049,7 @@ static DWORD gateway_and_prefix_addresses_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG err = ERROR_NOT_ENOUGH_MEMORY; goto err; } - gw->u.s.Length = sizeof(*gw); + gw->Length = sizeof(*gw); gw->Address.lpSockaddr = (SOCKADDR *)(gw + 1); gw->Address.iSockaddrLength = sockaddr_size; memcpy( gw->Address.lpSockaddr, &sockaddr, sockaddr_size ); @@ -1091,7 +1089,7 @@ static DWORD gateway_and_prefix_addresses_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG err = ERROR_NOT_ENOUGH_MEMORY; goto err; } - prefix->u.s.Length = sizeof(*prefix); + prefix->Length = sizeof(*prefix); prefix->Address.lpSockaddr = (SOCKADDR *)(prefix + 1); prefix->Address.iSockaddrLength = sockaddr_size; memcpy( prefix->Address.lpSockaddr, &sockaddr, sockaddr_size ); @@ -1177,7 +1175,7 @@ static DWORD dns_info_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG family, ULONG flags err = ERROR_NOT_ENOUGH_MEMORY; break; } - dns->u.s.Length = sizeof(*dns); + dns->Length = sizeof(*dns); dns->Address.lpSockaddr = (SOCKADDR *)(dns + 1); dns->Address.iSockaddrLength = sockaddr_len; memcpy( dns->Address.lpSockaddr, servers->AddrArray[i].MaxSa, sockaddr_len ); @@ -1239,8 +1237,8 @@ static DWORD adapters_addresses_alloc( ULONG family, ULONG flags, IP_ADAPTER_ADD str_ptr = (char *)(aa + count); for (i = 0; i < count; i++) { - aa[i].u.s.Length = sizeof(*aa); - aa[i].u.s.IfIndex = stat[i].if_index; + aa[i].Length = sizeof(*aa); + aa[i].IfIndex = stat[i].if_index; if (i < count - 1) aa[i].Next = aa + i + 1; ConvertInterfaceLuidToGuid( luids + i, &guid ); ConvertGuidToStringA( &guid, str_ptr, CHARS_IN_GUID ); @@ -1404,7 +1402,7 @@ DWORD WINAPI GetBestRoute(DWORD dwDestAddr, DWORD dwSourceAddr, PMIB_IPFORWARDRO DWORD ndx, matchedBits, matchedNdx = table->dwNumEntries; for (ndx = 0, matchedBits = 0; ndx < table->dwNumEntries; ndx++) { - if (table->table[ndx].u1.ForwardType != MIB_IPROUTE_TYPE_INVALID && + if (table->table[ndx].ForwardType != MIB_IPROUTE_TYPE_INVALID && (dwDestAddr & table->table[ndx].dwForwardMask) == (table->table[ndx].dwForwardDest & table->table[ndx].dwForwardMask)) { DWORD numShifts, mask; @@ -2039,7 +2037,7 @@ static int ipforward_row_cmp( const void *a, const void *b ) int ret; if ((ret = rowA->dwForwardDest - rowB->dwForwardDest) != 0) return ret; - if ((ret = rowA->u2.dwForwardProto - rowB->u2.dwForwardProto) != 0) return ret; + if ((ret = rowA->dwForwardProto - rowB->dwForwardProto) != 0) return ret; if ((ret = rowA->dwForwardPolicy - rowB->dwForwardPolicy) != 0) return ret; return rowA->dwForwardNextHop - rowB->dwForwardNextHop; } @@ -2097,7 +2095,7 @@ DWORD WINAPI GetIpForwardTable( MIB_IPFORWARDTABLE *table, ULONG *size, BOOL sor ConvertLengthToIpv4Mask( keys[i].prefix_len, &row->dwForwardMask ); row->dwForwardPolicy = 0; row->dwForwardNextHop = keys[i].next_hop.s_addr; - row->u1.dwForwardType = row->dwForwardNextHop ? MIB_IPROUTE_TYPE_INDIRECT : MIB_IPROUTE_TYPE_DIRECT; + row->dwForwardType = row->dwForwardNextHop ? MIB_IPROUTE_TYPE_INDIRECT : MIB_IPROUTE_TYPE_DIRECT; if (!row->dwForwardNextHop) /* find the interface's addr */ { for (addr = 0; addr < uni_count; addr++) @@ -2110,7 +2108,7 @@ DWORD WINAPI GetIpForwardTable( MIB_IPFORWARDTABLE *table, ULONG *size, BOOL sor } } row->dwForwardIfIndex = stat[i].if_index; - row->u2.dwForwardProto = rw[i].protocol; + row->dwForwardProto = rw[i].protocol; row->dwForwardAge = dyn[i].age; row->dwForwardNextHopAS = 0; row->dwForwardMetric1 = rw[i].metric; /* FIXME: add interface metric */ @@ -2347,19 +2345,19 @@ DWORD WINAPI GetIpNetTable( MIB_IPNETTABLE *table, ULONG *size, BOOL sort ) { case NlnsUnreachable: case NlnsIncomplete: - row->u.Type = MIB_IPNET_TYPE_INVALID; + row->Type = MIB_IPNET_TYPE_INVALID; break; case NlnsProbe: case NlnsDelay: case NlnsStale: case NlnsReachable: - row->u.Type = MIB_IPNET_TYPE_DYNAMIC; + row->Type = MIB_IPNET_TYPE_DYNAMIC; break; case NlnsPermanent: - row->u.Type = MIB_IPNET_TYPE_STATIC; + row->Type = MIB_IPNET_TYPE_STATIC; break; default: - row->u.Type = MIB_IPNET_TYPE_OTHER; + row->Type = MIB_IPNET_TYPE_OTHER; } } @@ -2426,9 +2424,9 @@ static void ipnet_row2_fill( MIB_IPNET_ROW2 *row, USHORT fam, void *key, struct memset( row->PhysicalAddress + row->PhysicalAddressLength, 0, sizeof(row->PhysicalAddress) - row->PhysicalAddressLength ); row->State = dyn->state; - row->u.Flags = 0; - row->u.s.IsRouter = dyn->flags.is_router; - row->u.s.IsUnreachable = dyn->flags.is_unreachable; + row->Flags = 0; + row->IsRouter = dyn->flags.is_router; + row->IsUnreachable = dyn->flags.is_unreachable; row->ReachabilityTime.LastReachable = dyn->time; } @@ -2544,7 +2542,7 @@ DWORD WINAPI GetIpStatisticsEx( MIB_IPSTATS *stats, DWORD family ) &cmpt_dyn, sizeof(cmpt_dyn), NULL, 0 ); if (err) return err; - stats->u.Forwarding = cmpt_rw.not_forwarding + 1; + stats->Forwarding = cmpt_rw.not_forwarding + 1; stats->dwDefaultTTL = cmpt_rw.default_ttl; stats->dwInReceives = dyn.in_recv; stats->dwInHdrErrors = dyn.in_hdr_errs; @@ -2685,7 +2683,7 @@ DWORD WINAPI GetNetworkParams( FIXED_INFO *info, ULONG *size ) } if (!GetIpStatistics( &ip_stats )) - info->EnableRouting = (ip_stats.u.Forwarding == MIB_IP_FORWARDING); + info->EnableRouting = (ip_stats.Forwarding == MIB_IP_FORWARDING); return ERROR_SUCCESS; } @@ -2827,7 +2825,7 @@ DWORD WINAPI GetTcpStatisticsEx( MIB_TCPSTATS *stats, DWORD family ) &dyn, sizeof(dyn), &stat, sizeof(stat) ); if (err) return err; - stats->u.RtoAlgorithm = stat.rto_algo; + stats->RtoAlgorithm = stat.rto_algo; stats->dwRtoMin = stat.rto_min; stats->dwRtoMax = stat.rto_max; stats->dwMaxConn = stat.max_conns; @@ -2923,7 +2921,7 @@ static void tcp_row_fill( void *table, DWORD num, ULONG family, ULONG table_clas case TCP_TABLE_BASIC_ALL: { MIB_TCPROW *row = ((MIB_TCPTABLE *)table)->table + num; - row->u.dwState = dyn->state; + row->dwState = dyn->state; row->dwLocalAddr = key->local.Ipv4.sin_addr.s_addr; row->dwLocalPort = key->local.Ipv4.sin_port; row->dwRemoteAddr = key->remote.Ipv4.sin_addr.s_addr; @@ -3568,7 +3566,7 @@ static void unicast_row_fill( MIB_UNICASTIPADDRESS_ROW *row, USHORT fam, void *k row->OnLinkPrefixLength = rw->on_link_prefix; row->SkipAsSource = 0; row->DadState = dyn->dad_state; - row->ScopeId.u.Value = dyn->scope_id; + row->ScopeId.Value = dyn->scope_id; row->CreationTimeStamp.QuadPart = stat->creation_time; } @@ -3771,7 +3769,7 @@ DWORD WINAPI NotifyAddrChange(PHANDLE Handle, LPOVERLAPPED overlapped) { FIXME("(Handle %p, overlapped %p): stub\n", Handle, overlapped); if (Handle) *Handle = INVALID_HANDLE_VALUE; - if (overlapped) ((IO_STATUS_BLOCK *) overlapped)->u.Status = STATUS_PENDING; + if (overlapped) ((IO_STATUS_BLOCK *) overlapped)->Status = STATUS_PENDING; return ERROR_IO_PENDING; } @@ -4473,8 +4471,8 @@ DWORD WINAPI ParseNetworkString(const WCHAR *str, DWORD type, if (info) { info->Format = NET_ADDRESS_IPV4; - info->u.Ipv4Address.sin_addr = temp_addr4; - info->u.Ipv4Address.sin_port = 0; + info->Ipv4Address.sin_addr = temp_addr4; + info->Ipv4Address.sin_port = 0; } if (port) *port = 0; if (prefix_len) *prefix_len = 255; @@ -4489,8 +4487,8 @@ DWORD WINAPI ParseNetworkString(const WCHAR *str, DWORD type, if (info) { info->Format = NET_ADDRESS_IPV4; - info->u.Ipv4Address.sin_addr = temp_addr4; - info->u.Ipv4Address.sin_port = temp_port; + info->Ipv4Address.sin_addr = temp_addr4; + info->Ipv4Address.sin_port = temp_port; } if (port) *port = ntohs(temp_port); if (prefix_len) *prefix_len = 255; @@ -4505,9 +4503,9 @@ DWORD WINAPI ParseNetworkString(const WCHAR *str, DWORD type, if (info) { info->Format = NET_ADDRESS_IPV6; - info->u.Ipv6Address.sin6_addr = temp_addr6; - info->u.Ipv6Address.sin6_scope_id = temp_scope; - info->u.Ipv6Address.sin6_port = 0; + info->Ipv6Address.sin6_addr = temp_addr6; + info->Ipv6Address.sin6_scope_id = temp_scope; + info->Ipv6Address.sin6_port = 0; } if (port) *port = 0; if (prefix_len) *prefix_len = 255; @@ -4522,9 +4520,9 @@ DWORD WINAPI ParseNetworkString(const WCHAR *str, DWORD type, if (info) { info->Format = NET_ADDRESS_IPV6; - info->u.Ipv6Address.sin6_addr = temp_addr6; - info->u.Ipv6Address.sin6_scope_id = temp_scope; - info->u.Ipv6Address.sin6_port = temp_port; + info->Ipv6Address.sin6_addr = temp_addr6; + info->Ipv6Address.sin6_scope_id = temp_scope; + info->Ipv6Address.sin6_port = temp_port; } if (port) *port = ntohs(temp_port); if (prefix_len) *prefix_len = 255; @@ -4711,7 +4709,7 @@ DWORD WINAPI IcmpSendEcho2Ex( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc_r out, out_size ); if (status == STATUS_PENDING && !WaitForSingleObject( request_event, INFINITE )) - status = iosb.u.Status; + status = iosb.Status; if (!status) { -- 2.25.1

1 0

[PATCH 5/7] iphlpapi: Build with msvcrt.
by Huw Davies 06 Oct '21

06 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/Makefile.in | 2 -- dlls/iphlpapi/iphlpapi_main.c | 35 +++++++++++++++++------------------ 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/dlls/iphlpapi/Makefile.in b/dlls/iphlpapi/Makefile.in index e413337a420..d01c764c61f 100644 --- a/dlls/iphlpapi/Makefile.in +++ b/dlls/iphlpapi/Makefile.in @@ -2,8 +2,6 @@ MODULE = iphlpapi.dll IMPORTLIB = iphlpapi IMPORTS = advapi32 dnsapi nsi uuid -EXTRADLLFLAGS = -mcygwin - C_SRCS = \ iphlpapi_main.c diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 6cdf7948901..cb27044ae02 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -41,7 +41,6 @@ #include "wine/nsi.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); @@ -75,7 +74,7 @@ DWORD WINAPI ConvertGuidToStringW( const GUID *guid, WCHAR *str, DWORD len ) '%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X','}',0 }; if (len < CHARS_IN_GUID) return ERROR_INSUFFICIENT_BUFFER; - sprintfW( str, fmt, + swprintf( str, len, fmt, guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); return ERROR_SUCCESS; @@ -536,8 +535,8 @@ DWORD WINAPI GetAdapterIndex( WCHAR *adapter_name, ULONG *index ) TRACE( "name %s, index %p\n", debugstr_w( adapter_name ), index ); - if (strlenW( adapter_name ) < strlenW( device_tcpip )) return ERROR_INVALID_PARAMETER; - err = ConvertStringToGuidW( adapter_name + strlenW( device_tcpip ), &guid ); + if (wcslen( adapter_name ) < wcslen( device_tcpip )) return ERROR_INVALID_PARAMETER; + err = ConvertStringToGuidW( adapter_name + wcslen( device_tcpip ), &guid ); if (err) return err; err = ConvertInterfaceGuidToLuid( &guid, &luid ); if (err) return err; @@ -834,8 +833,8 @@ static ULONG adapters_addresses_size( IP_ADAPTER_ADDRESSES *info ) for (aa = info; aa; aa = aa->Next) { size += sizeof(*aa) + ((strlen( aa->AdapterName ) + 1 + 1) & ~1); - size += (strlenW( aa->Description ) + 1 + strlenW( aa->DnsSuffix ) + 1) * sizeof(WCHAR); - if (aa->FriendlyName) size += (strlenW(aa->FriendlyName) + 1) * sizeof(WCHAR); + size += (wcslen( aa->Description ) + 1 + wcslen( aa->DnsSuffix ) + 1) * sizeof(WCHAR); + if (aa->FriendlyName) size += (wcslen( aa->FriendlyName ) + 1) * sizeof(WCHAR); size = (size + align) & ~align; address_lists_iterate( aa, address_entry_size, &size ); } @@ -858,17 +857,17 @@ static void adapters_addresses_copy( IP_ADAPTER_ADDRESSES *dst, IP_ADAPTER_ADDRE memcpy( dst->AdapterName, src->AdapterName, len ); ptr += (len + 1) & ~1; dst->Description = (WCHAR *)ptr; - len = (strlenW( src->Description ) + 1) * sizeof(WCHAR); + len = (wcslen( src->Description ) + 1) * sizeof(WCHAR); memcpy( dst->Description, src->Description, len ); ptr += len; dst->DnsSuffix = (WCHAR *)ptr; - len = (strlenW( src->DnsSuffix ) + 1) * sizeof(WCHAR); + len = (wcslen( src->DnsSuffix ) + 1) * sizeof(WCHAR); memcpy( dst->DnsSuffix, src->DnsSuffix, len ); ptr += len; if (src->FriendlyName) { dst->FriendlyName = (WCHAR *)ptr; - len = (strlenW( src->FriendlyName ) + 1) * sizeof(WCHAR); + len = (wcslen( src->FriendlyName ) + 1) * sizeof(WCHAR); memcpy( dst->FriendlyName, src->FriendlyName, len ); ptr += len; } @@ -1198,9 +1197,9 @@ static DWORD dns_info_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG family, ULONG flags (search = heap_alloc( size ))) { if (!DnsQueryConfig( DnsConfigSearchList, 0, name, NULL, search, &size ) && - search->dwStringCount && strlenW( search->pStringArray[0] ) < MAX_DNS_SUFFIX_STRING_LENGTH) + search->dwStringCount && wcslen( search->pStringArray[0] ) < MAX_DNS_SUFFIX_STRING_LENGTH) { - strcpyW( aa->DnsSuffix, search->pStringArray[0] ); + wcscpy( aa->DnsSuffix, search->pStringArray[0] ); } heap_free( search ); } @@ -4097,7 +4096,7 @@ DWORD WINAPI ConvertInterfaceAliasToLuid( const WCHAR *alias, NET_LUID *luid ) if (!alias || !*alias || !luid) return ERROR_INVALID_PARAMETER; luid->Value = 0; - len = strlenW( alias ); + len = wcslen( alias ); err = NsiAllocateAndGetTable( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, (void **)&keys, sizeof(*keys), (void **)&data, sizeof(*data), NULL, 0, NULL, 0, &count, 0 ); @@ -4299,8 +4298,8 @@ DWORD WINAPI ConvertInterfaceLuidToNameW(const NET_LUID *luid, WCHAR *name, SIZE } } - if (prefix) needed = snprintfW( buf, len, prefix_fmt, prefix, luid->Info.NetLuidIndex ); - else needed = snprintfW( buf, len, unk_fmt, luid->Info.IfType, luid->Info.NetLuidIndex ); + if (prefix) needed = swprintf( buf, len, prefix_fmt, prefix, luid->Info.NetLuidIndex ); + else needed = swprintf( buf, len, unk_fmt, luid->Info.IfType, luid->Info.NetLuidIndex ); if (needed >= len) return ERROR_NOT_ENOUGH_MEMORY; memcpy( name, buf, (needed + 1) * sizeof(WCHAR) ); @@ -4338,19 +4337,19 @@ DWORD WINAPI ConvertInterfaceNameToLuidW(const WCHAR *name, NET_LUID *luid) if (!luid) return ERROR_INVALID_PARAMETER; memset( luid, 0, sizeof(*luid) ); - if (!name || !(sep = strchrW( name, '_' )) || sep >= name + ARRAY_SIZE(buf)) return ERROR_INVALID_NAME; + if (!name || !(sep = wcschr( name, '_' )) || sep >= name + ARRAY_SIZE(buf)) return ERROR_INVALID_NAME; memcpy( buf, name, (sep - name) * sizeof(WCHAR) ); buf[sep - name] = '\0'; if (sep - name > ARRAY_SIZE(iftype) - 1 && !memcmp( buf, iftype, (ARRAY_SIZE(iftype) - 1) * sizeof(WCHAR) )) { - type = atoiW( buf + ARRAY_SIZE(iftype) - 1 ); + type = wcstol( buf + ARRAY_SIZE(iftype) - 1, NULL, 10 ); } else { for (i = 0; i < ARRAY_SIZE(name_prefixes); i++) { - if (!strcmpW( buf, name_prefixes[i].prefix )) + if (!wcscmp( buf, name_prefixes[i].prefix )) { type = name_prefixes[i].type; break; @@ -4359,7 +4358,7 @@ DWORD WINAPI ConvertInterfaceNameToLuidW(const WCHAR *name, NET_LUID *luid) } if (type == ~0u) return ERROR_INVALID_NAME; - luid->Info.NetLuidIndex = atoiW( sep + 1 ); + luid->Info.NetLuidIndex = wcstol( sep + 1, NULL, 10 ); luid->Info.IfType = type; return ERROR_SUCCESS; } -- 2.25.1

1 0

[PATCH 3/7] iphlpapi: Move the Icmp6 stubs to iphlpapi_main.c .
by Huw Davies 06 Oct '21

06 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/icmp.c | 58 ----------------------------------- dlls/iphlpapi/iphlpapi_main.c | 23 ++++++++++++++ 2 files changed, 23 insertions(+), 58 deletions(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index 8ef03219e52..6441d7dd8ad 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -353,64 +353,6 @@ done: * Exported Routines. */ -/*********************************************************************** - * Icmp6CreateFile (IPHLPAPI.@) - */ -HANDLE WINAPI Icmp6CreateFile(VOID) -{ - icmp_t* icp; - - int sid=socket(AF_INET6,SOCK_RAW,IPPROTO_ICMPV6); - if (sid < 0) - { - /* Some systems (e.g. Linux 3.0+ and Mac OS X) support - non-privileged ICMP via SOCK_DGRAM type. */ - sid=socket(AF_INET6,SOCK_DGRAM,IPPROTO_ICMPV6); - } - if (sid < 0) { - ERR_(winediag)("Failed to use ICMPV6 (network ping), this requires special permissions.\n"); - SetLastError(ERROR_ACCESS_DENIED); - return INVALID_HANDLE_VALUE; - } - - icp=HeapAlloc(GetProcessHeap(), 0, sizeof(*icp)); - if (icp==NULL) { - close(sid); - SetLastError(IP_NO_RESOURCES); - return INVALID_HANDLE_VALUE; - } - icp->sid=sid; - icp->default_opts.OptionsSize=IP_OPTS_UNKNOWN; - return (HANDLE)icp; -} - - -/*********************************************************************** - * Icmp6SendEcho2 (IPHLPAPI.@) - */ -DWORD WINAPI Icmp6SendEcho2( - HANDLE IcmpHandle, - HANDLE Event, - PIO_APC_ROUTINE ApcRoutine, - PVOID ApcContext, - struct sockaddr_in6* SourceAddress, - struct sockaddr_in6* DestinationAddress, - LPVOID RequestData, - WORD RequestSize, - PIP_OPTION_INFORMATION RequestOptions, - LPVOID ReplyBuffer, - DWORD ReplySize, - DWORD Timeout - ) -{ - FIXME("(%p, %p, %p, %p, %p, %p, %p, %d, %p, %p, %d, %d): stub\n", IcmpHandle, Event, - ApcRoutine, ApcContext, SourceAddress, DestinationAddress, RequestData, - RequestSize, RequestOptions, ReplyBuffer, ReplySize, Timeout); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - /*********************************************************************** * IcmpCreateFile (IPHLPAPI.@) */ diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 9e525a2116c..2286c732383 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -4555,3 +4555,26 @@ DWORD WINAPI IcmpParseReplies( void *reply, DWORD reply_size ) if (!num_pkts) SetLastError( icmp_reply->Status ); return num_pkts; } + +/*********************************************************************** + * Icmp6CreateFile (IPHLPAPI.@) + */ +HANDLE WINAPI Icmp6CreateFile( void ) +{ + FIXME( "stub\n" ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return INVALID_HANDLE_VALUE; +} + +/*********************************************************************** + * Icmp6SendEcho2 (IPHLPAPI.@) + */ +DWORD WINAPI Icmp6SendEcho2( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc_routine, void *apc_ctxt, + struct sockaddr_in6 *src, struct sockaddr_in6 *dst, void *request, WORD request_size, + IP_OPTION_INFORMATION *opts, void *reply, DWORD reply_size, DWORD timeout ) +{ + FIXME( "(%p, %p, %p, %p, %p, %p, %p, %d, %p, %p, %d, %d): stub\n", handle, event, + apc_routine, apc_ctxt, src, dst, request, request_size, opts, reply, reply_size, timeout ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return 0; +} -- 2.25.1

1 0

[PATCH 2/7] iphlpapi: Implement IcmpParseReplies().
by Huw Davies 06 Oct '21

06 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 14 ++++++++++ dlls/iphlpapi/tests/iphlpapi.c | 49 ++++++++++++++++++++++++---------- 3 files changed, 50 insertions(+), 15 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 6c51548b6e3..ce188084c01 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -157,7 +157,7 @@ @ stdcall Icmp6SendEcho2(ptr ptr ptr ptr ptr ptr ptr long ptr ptr long long) @ stdcall IcmpCloseHandle(ptr) @ stdcall IcmpCreateFile() -@ stub IcmpParseReplies +@ stdcall IcmpParseReplies(ptr long) @ stdcall IcmpSendEcho2Ex(ptr ptr ptr ptr long long ptr long ptr ptr long long) @ stdcall IcmpSendEcho2(ptr ptr ptr ptr long ptr long ptr ptr long long) @ stdcall IcmpSendEcho(ptr long ptr long ptr ptr long long) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index d52441f022a..9e525a2116c 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2,6 +2,7 @@ * iphlpapi dll implementation * * Copyright (C) 2003,2006 Juan Lang + * Copyright 2021 Huw Davies * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -4541,3 +4542,16 @@ DWORD WINAPI ParseNetworkString(const WCHAR *str, DWORD type, return ERROR_INVALID_PARAMETER; } + +/****************************************************************** + * IcmpParseReplies (IPHLPAPI.@) + */ +DWORD WINAPI IcmpParseReplies( void *reply, DWORD reply_size ) +{ + ICMP_ECHO_REPLY *icmp_reply = reply; + DWORD num_pkts = icmp_reply->Reserved; + + icmp_reply->Reserved = 0; + if (!num_pkts) SetLastError( icmp_reply->Status ); + return num_pkts; +} diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 223d6d270cb..080feb364f9 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1043,20 +1043,40 @@ static void testIcmpSendEcho(void) IcmpCloseHandle(icmp); } -/* -still-to-be-tested NT4-onward functions: -CreateIpForwardEntry -DeleteIpForwardEntry -CreateIpNetEntry -DeleteIpNetEntry -GetFriendlyIfIndex -GetRTTAndHopCount -SetIfEntry -SetIpForwardEntry -SetIpNetEntry -SetIpStatistics -SetIpTTL -*/ +static void testIcmpParseReplies( void ) +{ + ICMP_ECHO_REPLY reply = { 0 }; + DWORD ret; + + SetLastError( 0xdeadbeef ); + ret = IcmpParseReplies( &reply, sizeof(reply) ); + ok( ret == 0, "ret %d\n", ret ); + ok( GetLastError() == 0, "gle %d\n", GetLastError() ); + + reply.Status = 12345; + SetLastError( 0xdeadbeef ); + ret = IcmpParseReplies( &reply, sizeof(reply) ); + ok( ret == 0, "ret %d\n", ret ); + ok( GetLastError() == 12345, "gle %d\n", GetLastError() ); + ok( reply.Status == 12345, "status %d\n", reply.Status ); + + reply.Reserved = 1; + SetLastError( 0xdeadbeef ); + ret = IcmpParseReplies( &reply, sizeof(reply) ); + ok( ret == 1, "ret %d\n", ret ); + ok( GetLastError() == 0xdeadbeef, "gle %d\n", GetLastError() ); + ok( reply.Status == 12345, "status %d\n", reply.Status ); + ok( !reply.Reserved, "reserved %d\n", reply.Reserved ); + + reply.Reserved = 3; + SetLastError( 0xdeadbeef ); + ret = IcmpParseReplies( &reply, sizeof(reply) ); + ok( ret == 3, "ret %d\n", ret ); + ok( GetLastError() == 0xdeadbeef, "gle %d\n", GetLastError() ); + ok( reply.Status == 12345, "status %d\n", reply.Status ); + ok( !reply.Reserved, "reserved %d\n", reply.Reserved ); +} + static void testWinNT4Functions(void) { testGetNumberOfInterfaces(); @@ -1076,6 +1096,7 @@ static void testWinNT4Functions(void) testGetUdpTable(); testSetTcpEntry(); testIcmpSendEcho(); + testIcmpParseReplies(); } static void testGetInterfaceInfo(void) -- 2.25.1

1 0

[PATCH 1/7] iphlpapi: Stop using USE_WS_PREFIX.
by Huw Davies 06 Oct '21

06 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 231 ++++++++++++++++------------------ 1 file changed, 105 insertions(+), 126 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index b2e996a6241..d52441f022a 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -17,26 +17,13 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "config.h" - #include <stdarg.h> -#include <stdlib.h> -#include <stdio.h> -#include <sys/types.h> -#ifdef HAVE_NETINET_IN_H -# include <netinet/in.h> -#endif -#ifdef HAVE_ARPA_INET_H -# include <arpa/inet.h> -#endif #define NONAMELESSUNION #define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "winreg.h" -#define USE_WS_PREFIX #include "winsock2.h" #include "winternl.h" #include "ws2ipdef.h" @@ -57,14 +44,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); -#ifndef IF_NAMESIZE -#define IF_NAMESIZE 16 -#endif - -#ifndef INADDR_NONE -#define INADDR_NONE ~0UL -#endif - #define CHARS_IN_GUID 39 static const WCHAR device_tcpip[] = {'\\','D','E','V','I','C','E','\\','T','C','P','I','P','_',0}; @@ -73,8 +52,8 @@ DWORD WINAPI AllocateAndGetIpAddrTableFromStack( MIB_IPADDRTABLE **table, BOOL s static const NPI_MODULEID *ip_module_id( USHORT family ) { - if (family == WS_AF_INET) return &NPI_MS_IPV4_MODULEID; - if (family == WS_AF_INET6) return &NPI_MS_IPV6_MODULEID; + if (family == AF_INET) return &NPI_MS_IPV4_MODULEID; + if (family == AF_INET6) return &NPI_MS_IPV6_MODULEID; return NULL; } @@ -245,7 +224,7 @@ DWORD WINAPI CreateProxyArpEntry(DWORD dwAddress, DWORD dwMask, DWORD dwIfIndex) return ERROR_NOT_SUPPORTED; } -static char *debugstr_ipv6(const struct WS_sockaddr_in6 *sin, char *buf) +static char *debugstr_ipv6(const struct sockaddr_in6 *sin, char *buf) { const IN6_ADDR *addr = &sin->sin6_addr; char *p = buf; @@ -278,14 +257,14 @@ static BOOL map_address_6to4( const SOCKADDR_IN6 *addr6, SOCKADDR_IN *addr4 ) { ULONG i; - if (addr6->sin6_family != WS_AF_INET6) return FALSE; + if (addr6->sin6_family != AF_INET6) return FALSE; for (i = 0; i < 5; i++) if (addr6->sin6_addr.u.Word[i]) return FALSE; if (addr6->sin6_addr.u.Word[5] != 0xffff) return FALSE; - addr4->sin_family = WS_AF_INET; + addr4->sin_family = AF_INET; addr4->sin_port = addr6->sin6_port; addr4->sin_addr.S_un.S_addr = addr6->sin6_addr.u.Word[6] << 16 | addr6->sin6_addr.u.Word[7]; memset( &addr4->sin_zero, 0, sizeof(addr4->sin_zero) ); @@ -305,7 +284,7 @@ static BOOL find_src_address( MIB_IPADDRTABLE *table, const SOCKADDR_IN *dst, SO /* take the first address */ if (table->table[i].dwIndex == row.dwForwardIfIndex) { - src->sin6_family = WS_AF_INET6; + src->sin6_family = AF_INET6; src->sin6_port = 0; src->sin6_flowinfo = 0; for (j = 0; j < 5; j++) src->sin6_addr.u.Word[j] = 0; @@ -368,7 +347,7 @@ DWORD WINAPI CreateSortedAddressPairs( const PSOCKADDR_IN6 src_list, DWORD src_c char buf[46]; FIXME( "source address for %s not found\n", debugstr_ipv6(&dst_list[i], buf) ); memset( pairs[i].SourceAddress, 0, sizeof(*pairs[i].SourceAddress) ); - pairs[i].SourceAddress->sin6_family = WS_AF_INET6; + pairs[i].SourceAddress->sin6_family = AF_INET6; } pairs[i].DestinationAddress = ptr++; @@ -580,7 +559,7 @@ static DWORD get_wins_servers( SOCKADDR_INET **servers ) size = sizeof(buf); if (!RegQueryValueExA( key, values[i], NULL, NULL, (LPBYTE)buf, &size )) if (!RtlIpv4StringToAddressA( buf, TRUE, NULL, addrs + count ) && - addrs[count].WS_s_addr != INADDR_NONE && addrs[count].WS_s_addr != INADDR_ANY) + addrs[count].s_addr != INADDR_NONE && addrs[count].s_addr != INADDR_ANY) count++; } RegCloseKey( key ); @@ -591,7 +570,7 @@ static DWORD get_wins_servers( SOCKADDR_INET **servers ) if (!*servers) return 0; for (i = 0; i < count; i++) { - (*servers)[i].Ipv4.sin_family = WS_AF_INET; + (*servers)[i].Ipv4.sin_family = AF_INET; (*servers)[i].Ipv4.sin_addr = addrs[i]; } } @@ -705,21 +684,21 @@ DWORD WINAPI GetAdaptersInfo( IP_ADAPTER_INFO *info, ULONG *size ) cursor->Next = extra_ip_addrs++; cursor = cursor->Next; } - ConvertLengthToIpv4Mask( uni_rw[uni].on_link_prefix, &mask.WS_s_addr ); + ConvertLengthToIpv4Mask( uni_rw[uni].on_link_prefix, &mask.s_addr ); ip_addr_string_init( cursor, &uni_keys[uni].addr, &mask, 0 ); } if (!cursor) { - mask.WS_s_addr = INADDR_ANY; + mask.s_addr = INADDR_ANY; ip_addr_string_init( &info->IpAddressList, &mask, &mask, 0 ); } - gw.WS_s_addr = INADDR_ANY; - mask.WS_s_addr = INADDR_NONE; + gw.s_addr = INADDR_ANY; + mask.s_addr = INADDR_NONE; for (fwd = 0; fwd < fwd_count; fwd++) { /* find the first router on this interface */ if (fwd_keys[fwd].luid.Value == if_keys[i].Value && - fwd_keys[fwd].next_hop.WS_s_addr != INADDR_ANY && + fwd_keys[fwd].next_hop.s_addr != INADDR_ANY && !fwd_keys[fwd].prefix_len) { gw = fwd_keys[fwd].next_hop; @@ -735,7 +714,7 @@ DWORD WINAPI GetAdaptersInfo( IP_ADAPTER_INFO *info, ULONG *size ) ip_addr_string_init( &info->SecondaryWinsServer, NULL, NULL, 0 ); if (info->HaveWins) { - mask.WS_s_addr = INADDR_NONE; + mask.s_addr = INADDR_NONE; ip_addr_string_init( &info->PrimaryWinsServer, &wins_servers[0].Ipv4.sin_addr, &mask, 0 ); if (wins_server_count > 1) ip_addr_string_init( &info->SecondaryWinsServer, &wins_servers[1].Ipv4.sin_addr, &mask, 0 ); @@ -912,25 +891,25 @@ static void adapters_addresses_copy( IP_ADAPTER_ADDRESSES *dst, IP_ADAPTER_ADDRE static BOOL sockaddr_is_loopback( SOCKADDR *sock ) { - if (sock->sa_family == WS_AF_INET) + if (sock->sa_family == AF_INET) { SOCKADDR_IN *sin = (SOCKADDR_IN *)sock; - return (sin->sin_addr.WS_s_addr & 0xff) == 127; + return (sin->sin_addr.s_addr & 0xff) == 127; } - else if (sock->sa_family == WS_AF_INET6) + else if (sock->sa_family == AF_INET6) { SOCKADDR_IN6 *sin6 = (SOCKADDR_IN6 *)sock; - return WS_IN6_IS_ADDR_LOOPBACK( &sin6->sin6_addr ); + return IN6_IS_ADDR_LOOPBACK( &sin6->sin6_addr ); } return FALSE; } static BOOL sockaddr_is_linklocal( SOCKADDR *sock ) { - if (sock->sa_family == WS_AF_INET6) + if (sock->sa_family == AF_INET6) { SOCKADDR_IN6 *sin6 = (SOCKADDR_IN6 *)sock; - return WS_IN6_IS_ADDR_LINKLOCAL( &sin6->sin6_addr ); + return IN6_IS_ADDR_LINKLOCAL( &sin6->sin6_addr ); } return FALSE; } @@ -949,8 +928,8 @@ static DWORD unicast_addresses_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG family, UL struct nsi_ip_unicast_dynamic *dyn; struct nsi_ip_unicast_static *stat; IP_ADAPTER_UNICAST_ADDRESS *addr, **next; - DWORD err, count, i, key_size = (family == WS_AF_INET) ? sizeof(*key4) : sizeof(*key6); - DWORD sockaddr_size = (family == WS_AF_INET) ? sizeof(SOCKADDR_IN) : sizeof(SOCKADDR_IN6); + DWORD err, count, i, key_size = (family == AF_INET) ? sizeof(*key4) : sizeof(*key6); + DWORD sockaddr_size = (family == AF_INET) ? sizeof(SOCKADDR_IN) : sizeof(SOCKADDR_IN6); NET_LUID *luid; void *key; @@ -969,7 +948,7 @@ static DWORD unicast_addresses_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG family, UL { key4 = (struct nsi_ipv4_unicast_key *)key + i; key6 = (struct nsi_ipv6_unicast_key *)key + i; - luid = (family == WS_AF_INET) ? &key4->luid : &key6->luid; + luid = (family == AF_INET) ? &key4->luid : &key6->luid; if (luid->Value != aa->Luid.Value) continue; addr = heap_alloc_zero( sizeof(*addr) + sockaddr_size ); if (!addr) @@ -981,7 +960,7 @@ static DWORD unicast_addresses_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG family, UL addr->Address.lpSockaddr = (SOCKADDR *)(addr + 1); addr->Address.iSockaddrLength = sockaddr_size; addr->Address.lpSockaddr->sa_family = family; - if (family == WS_AF_INET) + if (family == AF_INET) { SOCKADDR_IN *in = (SOCKADDR_IN *)addr->Address.lpSockaddr; in->sin_addr = key4->addr; @@ -1018,8 +997,8 @@ static DWORD gateway_and_prefix_addresses_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG struct nsi_ipv6_forward_key *key6; IP_ADAPTER_GATEWAY_ADDRESS *gw, **gw_next; IP_ADAPTER_PREFIX *prefix, **prefix_next; - DWORD err, count, i, prefix_len, key_size = (family == WS_AF_INET) ? sizeof(*key4) : sizeof(*key6); - DWORD sockaddr_size = (family == WS_AF_INET) ? sizeof(SOCKADDR_IN) : sizeof(SOCKADDR_IN6); + DWORD err, count, i, prefix_len, key_size = (family == AF_INET) ? sizeof(*key4) : sizeof(*key6); + DWORD sockaddr_size = (family == AF_INET) ? sizeof(SOCKADDR_IN) : sizeof(SOCKADDR_IN6); SOCKADDR_INET sockaddr; NET_LUID *luid; void *key; @@ -1039,15 +1018,15 @@ static DWORD gateway_and_prefix_addresses_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG { key4 = (struct nsi_ipv4_forward_key *)key + i; key6 = (struct nsi_ipv6_forward_key *)key + i; - luid = (family == WS_AF_INET) ? &key4->luid : &key6->luid; + luid = (family == AF_INET) ? &key4->luid : &key6->luid; if (luid->Value != aa->Luid.Value) continue; if (flags & GAA_FLAG_INCLUDE_ALL_GATEWAYS) { memset( &sockaddr, 0, sizeof(sockaddr) ); - if (family == WS_AF_INET) + if (family == AF_INET) { - if (key4->next_hop.WS_s_addr != 0) + if (key4->next_hop.s_addr != 0) { sockaddr.si_family = family; sockaddr.Ipv4.sin_addr = key4->next_hop; @@ -1083,9 +1062,9 @@ static DWORD gateway_and_prefix_addresses_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG if (flags & GAA_FLAG_INCLUDE_PREFIX) { memset( &sockaddr, 0, sizeof(sockaddr) ); - if (family == WS_AF_INET) + if (family == AF_INET) { - if (!key4->next_hop.WS_s_addr) + if (!key4->next_hop.s_addr) { sockaddr.si_family = family; sockaddr.Ipv4.sin_addr = key4->prefix; @@ -1134,15 +1113,15 @@ static DWORD call_families( DWORD (*fn)( IP_ADAPTER_ADDRESSES *aa, ULONG family, { DWORD err; - if (family != WS_AF_INET) + if (family != AF_INET) { - err = fn( aa, WS_AF_INET6, flags ); + err = fn( aa, AF_INET6, flags ); if (err) return err; } - if (family != WS_AF_INET6) + if (family != AF_INET6) { - err = fn( aa, WS_AF_INET, flags ); + err = fn( aa, AF_INET, flags ); if (err) return err; } return err; @@ -1150,8 +1129,8 @@ static DWORD call_families( DWORD (*fn)( IP_ADAPTER_ADDRESSES *aa, ULONG family, static DWORD dns_servers_query_code( ULONG family ) { - if (family == WS_AF_INET) return DnsConfigDnsServersIpv4; - if (family == WS_AF_INET6) return DnsConfigDnsServersIpv6; + if (family == AF_INET) return DnsConfigDnsServersIpv4; + if (family == AF_INET6) return DnsConfigDnsServersIpv6; return DnsConfigDnsServersUnspec; } @@ -1351,11 +1330,11 @@ ULONG WINAPI DECLSPEC_HOTPATCH GetAdaptersAddresses( ULONG family, ULONG flags, */ DWORD WINAPI GetBestInterface(IPAddr dwDestAddr, PDWORD pdwBestIfIndex) { - struct WS_sockaddr_in sa_in; + struct sockaddr_in sa_in; memset(&sa_in, 0, sizeof(sa_in)); - sa_in.sin_family = WS_AF_INET; + sa_in.sin_family = AF_INET; sa_in.sin_addr.S_un.S_addr = dwDestAddr; - return GetBestInterfaceEx((struct WS_sockaddr *)&sa_in, pdwBestIfIndex); + return GetBestInterfaceEx((struct sockaddr *)&sa_in, pdwBestIfIndex); } /****************************************************************** @@ -1371,7 +1350,7 @@ DWORD WINAPI GetBestInterface(IPAddr dwDestAddr, PDWORD pdwBestIfIndex) * Success: NO_ERROR * Failure: error code from winerror.h */ -DWORD WINAPI GetBestInterfaceEx(struct WS_sockaddr *pDestAddr, PDWORD pdwBestIfIndex) +DWORD WINAPI GetBestInterfaceEx(struct sockaddr *pDestAddr, PDWORD pdwBestIfIndex) { DWORD ret; @@ -1381,8 +1360,8 @@ DWORD WINAPI GetBestInterfaceEx(struct WS_sockaddr *pDestAddr, PDWORD pdwBestIfI else { MIB_IPFORWARDROW ipRow; - if (pDestAddr->sa_family == WS_AF_INET) { - ret = GetBestRoute(((struct WS_sockaddr_in *)pDestAddr)->sin_addr.S_un.S_addr, 0, &ipRow); + if (pDestAddr->sa_family == AF_INET) { + ret = GetBestRoute(((struct sockaddr_in *)pDestAddr)->sin_addr.S_un.S_addr, 0, &ipRow); if (ret == ERROR_SUCCESS) *pdwBestIfIndex = ipRow.dwForwardIfIndex; } else { @@ -1510,7 +1489,7 @@ static void icmp_stats_ex_to_icmp_stats( MIBICMPSTATS_EX *stats_ex, MIBICMPSTATS DWORD WINAPI GetIcmpStatistics( MIB_ICMP *stats ) { MIB_ICMP_EX stats_ex; - DWORD err = GetIcmpStatisticsEx( &stats_ex, WS_AF_INET ); + DWORD err = GetIcmpStatisticsEx( &stats_ex, AF_INET ); if (err) return err; @@ -1999,7 +1978,7 @@ DWORD WINAPI GetIpAddrTable( MIB_IPADDRTABLE *table, ULONG *size, BOOL sort ) if (!!loopback != (keys[i].luid.Info.IfType == MIB_IF_TYPE_LOOPBACK)) continue; - row->dwAddr = keys[i].addr.WS_s_addr; + row->dwAddr = keys[i].addr.s_addr; ConvertInterfaceLuidToIndex( &keys[i].luid, &row->dwIndex ); ConvertLengthToIpv4Mask( rw[i].on_link_prefix, &row->dwMask ); row->dwBCastAddr = 1; @@ -2113,10 +2092,10 @@ DWORD WINAPI GetIpForwardTable( MIB_IPFORWARDTABLE *table, ULONG *size, BOOL sor { MIB_IPFORWARDROW *row = table->table + i; - row->dwForwardDest = keys[i].prefix.WS_s_addr; + row->dwForwardDest = keys[i].prefix.s_addr; ConvertLengthToIpv4Mask( keys[i].prefix_len, &row->dwForwardMask ); row->dwForwardPolicy = 0; - row->dwForwardNextHop = keys[i].next_hop.WS_s_addr; + row->dwForwardNextHop = keys[i].next_hop.s_addr; row->u1.dwForwardType = row->dwForwardNextHop ? MIB_IPROUTE_TYPE_INDIRECT : MIB_IPROUTE_TYPE_DIRECT; if (!row->dwForwardNextHop) /* find the interface's addr */ { @@ -2124,7 +2103,7 @@ DWORD WINAPI GetIpForwardTable( MIB_IPFORWARDTABLE *table, ULONG *size, BOOL sor { if (uni_keys[addr].luid.Value == keys[i].luid.Value) { - row->dwForwardNextHop = uni_keys[addr].addr.WS_s_addr; + row->dwForwardNextHop = uni_keys[addr].addr.s_addr; break; } } @@ -2193,7 +2172,7 @@ static void forward_row2_fill( MIB_IPFORWARD_ROW2 *row, USHORT fam, void *key, s struct nsi_ipv4_forward_dynamic *dyn4 = (struct nsi_ipv4_forward_dynamic *)dyn; struct nsi_ipv6_forward_dynamic *dyn6 = (struct nsi_ipv6_forward_dynamic *)dyn; - if (fam == WS_AF_INET) + if (fam == AF_INET) { row->InterfaceLuid = key4->luid; row->DestinationPrefix.Prefix.Ipv4.sin_family = fam; @@ -2251,19 +2230,19 @@ DWORD WINAPI GetIpForwardTable2( ADDRESS_FAMILY family, MIB_IPFORWARD_TABLE2 **t struct nsi_ip_forward_rw *rw[2] = { NULL, NULL }; void *dyn[2] = { NULL, NULL }; struct nsi_ip_forward_static *stat[2] = { NULL, NULL }; - static const USHORT fam[2] = { WS_AF_INET, WS_AF_INET6 }; + static const USHORT fam[2] = { AF_INET, AF_INET6 }; static const DWORD key_size[2] = { sizeof(struct nsi_ipv4_forward_key), sizeof(struct nsi_ipv6_forward_key) }; static const DWORD dyn_size[2] = { sizeof(struct nsi_ipv4_forward_dynamic), sizeof(struct nsi_ipv6_forward_dynamic) }; DWORD err = ERROR_SUCCESS, i, size, count[2] = { 0, 0 }; TRACE( "%u, %p\n", family, table ); - if (!table || (family != WS_AF_INET && family != WS_AF_INET6 && family != WS_AF_UNSPEC)) + if (!table || (family != AF_INET && family != AF_INET6 && family != AF_UNSPEC)) return ERROR_INVALID_PARAMETER; for (i = 0; i < 2; i++) { - if (family != WS_AF_UNSPEC && family != fam[i]) continue; + if (family != AF_UNSPEC && family != fam[i]) continue; err = NsiAllocateAndGetTable( 1, ip_module_id( fam[i] ), NSI_IP_FORWARD_TABLE, key + i, key_size[i], (void **)rw + i, sizeof(**rw), dyn + i, dyn_size[i], @@ -2362,7 +2341,7 @@ DWORD WINAPI GetIpNetTable( MIB_IPNETTABLE *table, ULONG *size, BOOL sort ) memcpy( row->bPhysAddr, rw[i].phys_addr, row->dwPhysAddrLen ); memset( row->bPhysAddr + row->dwPhysAddrLen, 0, sizeof(row->bPhysAddr) - row->dwPhysAddrLen ); - row->dwAddr = keys[i].addr.WS_s_addr; + row->dwAddr = keys[i].addr.s_addr; switch (dyn->state) { case NlnsUnreachable: @@ -2419,7 +2398,7 @@ static void ipnet_row2_fill( MIB_IPNET_ROW2 *row, USHORT fam, void *key, struct struct nsi_ipv4_neighbour_key *key4 = (struct nsi_ipv4_neighbour_key *)key; struct nsi_ipv6_neighbour_key *key6 = (struct nsi_ipv6_neighbour_key *)key; - if (fam == WS_AF_INET) + if (fam == AF_INET) { row->Address.Ipv4.sin_family = fam; row->Address.Ipv4.sin_port = 0; @@ -2460,18 +2439,18 @@ DWORD WINAPI GetIpNetTable2( ADDRESS_FAMILY family, MIB_IPNET_TABLE2 **table ) void *key[2] = { NULL, NULL }; struct nsi_ip_neighbour_rw *rw[2] = { NULL, NULL }; struct nsi_ip_neighbour_dynamic *dyn[2] = { NULL, NULL }; - static const USHORT fam[2] = { WS_AF_INET, WS_AF_INET6 }; + static const USHORT fam[2] = { AF_INET, AF_INET6 }; static const DWORD key_size[2] = { sizeof(struct nsi_ipv4_neighbour_key), sizeof(struct nsi_ipv6_neighbour_key) }; DWORD err = ERROR_SUCCESS, i, size, count[2] = { 0, 0 }; TRACE( "%u, %p\n", family, table ); - if (!table || (family != WS_AF_INET && family != WS_AF_INET6 && family != WS_AF_UNSPEC)) + if (!table || (family != AF_INET && family != AF_INET6 && family != AF_UNSPEC)) return ERROR_INVALID_PARAMETER; for (i = 0; i < 2; i++) { - if (family != WS_AF_UNSPEC && family != fam[i]) continue; + if (family != AF_UNSPEC && family != fam[i]) continue; err = NsiAllocateAndGetTable( 1, ip_module_id( fam[i] ), NSI_IP_NEIGHBOUR_TABLE, key + i, key_size[i], (void **)rw + i, sizeof(**rw), (void **)dyn + i, sizeof(**dyn), @@ -2523,7 +2502,7 @@ err: */ DWORD WINAPI GetIpStatistics( MIB_IPSTATS *stats ) { - return GetIpStatisticsEx( stats, WS_AF_INET ); + return GetIpStatisticsEx( stats, AF_INET ); } /****************************************************************** @@ -2817,7 +2796,7 @@ BOOL WINAPI GetRTTAndHopCount(IPAddr DestIpAddress, PULONG HopCount, ULONG MaxHo */ DWORD WINAPI GetTcpStatistics( MIB_TCPSTATS *stats ) { - return GetTcpStatisticsEx( stats, WS_AF_INET ); + return GetTcpStatisticsEx( stats, AF_INET ); } /****************************************************************** @@ -2901,27 +2880,27 @@ static DWORD tcp_table_size( ULONG family, ULONG table_class, DWORD row_count, D case TCP_TABLE_BASIC_LISTENER: case TCP_TABLE_BASIC_CONNECTIONS: case TCP_TABLE_BASIC_ALL: - *row_size = (family == WS_AF_INET) ? sizeof(MIB_TCPROW) : sizeof(MIB_TCP6ROW); - return (family == WS_AF_INET) ? FIELD_OFFSET(MIB_TCPTABLE, table[row_count]) : + *row_size = (family == AF_INET) ? sizeof(MIB_TCPROW) : sizeof(MIB_TCP6ROW); + return (family == AF_INET) ? FIELD_OFFSET(MIB_TCPTABLE, table[row_count]) : FIELD_OFFSET(MIB_TCP6TABLE, table[row_count]); case TCP_TABLE_OWNER_PID_LISTENER: case TCP_TABLE_OWNER_PID_CONNECTIONS: case TCP_TABLE_OWNER_PID_ALL: - *row_size = (family == WS_AF_INET) ? sizeof(MIB_TCPROW_OWNER_PID) : sizeof(MIB_TCP6ROW_OWNER_PID); - return (family == WS_AF_INET) ? FIELD_OFFSET(MIB_TCPTABLE_OWNER_PID, table[row_count]) : + *row_size = (family == AF_INET) ? sizeof(MIB_TCPROW_OWNER_PID) : sizeof(MIB_TCP6ROW_OWNER_PID); + return (family == AF_INET) ? FIELD_OFFSET(MIB_TCPTABLE_OWNER_PID, table[row_count]) : FIELD_OFFSET(MIB_TCP6TABLE_OWNER_PID, table[row_count]); case TCP_TABLE_OWNER_MODULE_LISTENER: case TCP_TABLE_OWNER_MODULE_CONNECTIONS: case TCP_TABLE_OWNER_MODULE_ALL: - *row_size = (family == WS_AF_INET) ? sizeof(MIB_TCPROW_OWNER_MODULE) : sizeof(MIB_TCP6ROW_OWNER_MODULE); - return (family == WS_AF_INET) ? FIELD_OFFSET(MIB_TCPTABLE_OWNER_MODULE, table[row_count]) : + *row_size = (family == AF_INET) ? sizeof(MIB_TCPROW_OWNER_MODULE) : sizeof(MIB_TCP6ROW_OWNER_MODULE); + return (family == AF_INET) ? FIELD_OFFSET(MIB_TCPTABLE_OWNER_MODULE, table[row_count]) : FIELD_OFFSET(MIB_TCP6TABLE_OWNER_MODULE, table[row_count]); case TCP_TABLE2: - *row_size = (family == WS_AF_INET) ? sizeof(MIB_TCPROW2) : sizeof(MIB_TCP6ROW2); - return (family == WS_AF_INET) ? FIELD_OFFSET(MIB_TCPTABLE2, table[row_count]) : + *row_size = (family == AF_INET) ? sizeof(MIB_TCPROW2) : sizeof(MIB_TCP6ROW2); + return (family == AF_INET) ? FIELD_OFFSET(MIB_TCPTABLE2, table[row_count]) : FIELD_OFFSET(MIB_TCP6TABLE2, table[row_count]); default: @@ -2934,7 +2913,7 @@ static void tcp_row_fill( void *table, DWORD num, ULONG family, ULONG table_clas struct nsi_tcp_conn_key *key, struct nsi_tcp_conn_dynamic *dyn, struct nsi_tcp_conn_static *stat ) { - if (family == WS_AF_INET) + if (family == AF_INET) { switch (table_class) { @@ -2944,9 +2923,9 @@ static void tcp_row_fill( void *table, DWORD num, ULONG family, ULONG table_clas { MIB_TCPROW *row = ((MIB_TCPTABLE *)table)->table + num; row->u.dwState = dyn->state; - row->dwLocalAddr = key->local.Ipv4.sin_addr.WS_s_addr; + row->dwLocalAddr = key->local.Ipv4.sin_addr.s_addr; row->dwLocalPort = key->local.Ipv4.sin_port; - row->dwRemoteAddr = key->remote.Ipv4.sin_addr.WS_s_addr; + row->dwRemoteAddr = key->remote.Ipv4.sin_addr.s_addr; row->dwRemotePort = key->remote.Ipv4.sin_port; return; } @@ -2956,9 +2935,9 @@ static void tcp_row_fill( void *table, DWORD num, ULONG family, ULONG table_clas { MIB_TCPROW_OWNER_PID *row = ((MIB_TCPTABLE_OWNER_PID *)table)->table + num; row->dwState = dyn->state; - row->dwLocalAddr = key->local.Ipv4.sin_addr.WS_s_addr; + row->dwLocalAddr = key->local.Ipv4.sin_addr.s_addr; row->dwLocalPort = key->local.Ipv4.sin_port; - row->dwRemoteAddr = key->remote.Ipv4.sin_addr.WS_s_addr; + row->dwRemoteAddr = key->remote.Ipv4.sin_addr.s_addr; row->dwRemotePort = key->remote.Ipv4.sin_port; row->dwOwningPid = stat->pid; return; @@ -2969,9 +2948,9 @@ static void tcp_row_fill( void *table, DWORD num, ULONG family, ULONG table_clas { MIB_TCPROW_OWNER_MODULE *row = ((MIB_TCPTABLE_OWNER_MODULE *)table)->table + num; row->dwState = dyn->state; - row->dwLocalAddr = key->local.Ipv4.sin_addr.WS_s_addr; + row->dwLocalAddr = key->local.Ipv4.sin_addr.s_addr; row->dwLocalPort = key->local.Ipv4.sin_port; - row->dwRemoteAddr = key->remote.Ipv4.sin_addr.WS_s_addr; + row->dwRemoteAddr = key->remote.Ipv4.sin_addr.s_addr; row->dwRemotePort = key->remote.Ipv4.sin_port; row->dwOwningPid = stat->pid; row->liCreateTimestamp.QuadPart = stat->create_time; @@ -2983,9 +2962,9 @@ static void tcp_row_fill( void *table, DWORD num, ULONG family, ULONG table_clas { MIB_TCPROW2 *row = ((MIB_TCPTABLE2 *)table)->table + num; row->dwState = dyn->state; - row->dwLocalAddr = key->local.Ipv4.sin_addr.WS_s_addr; + row->dwLocalAddr = key->local.Ipv4.sin_addr.s_addr; row->dwLocalPort = key->local.Ipv4.sin_port; - row->dwRemoteAddr = key->remote.Ipv4.sin_addr.WS_s_addr; + row->dwRemoteAddr = key->remote.Ipv4.sin_addr.s_addr; row->dwRemotePort = key->remote.Ipv4.sin_port; row->dwOwningPid = stat->pid; row->dwOffloadState = 0; /* FIXME */ @@ -3156,7 +3135,7 @@ static DWORD get_extended_tcp_table( void *table, DWORD *size, BOOL sort, ULONG int (*fn)(const void *, const void *); DWORD offset; - if (family == WS_AF_INET) fn = tcp_row_cmp; + if (family == AF_INET) fn = tcp_row_cmp; else if (row_size == sizeof(MIB_TCP6ROW)) fn = tcp6_row_basic_cmp; else fn = tcp6_row_owner_cmp; @@ -3206,7 +3185,7 @@ DWORD WINAPI GetExtendedTcpTable( void *table, DWORD *size, BOOL sort, ULONG fam DWORD WINAPI GetTcpTable( MIB_TCPTABLE *table, DWORD *size, BOOL sort ) { TRACE( "table %p, size %p, sort %d\n", table, size, sort ); - return get_extended_tcp_table( table, size, sort, WS_AF_INET, TCP_TABLE_BASIC_ALL ); + return get_extended_tcp_table( table, size, sort, AF_INET, TCP_TABLE_BASIC_ALL ); } /****************************************************************** @@ -3215,7 +3194,7 @@ DWORD WINAPI GetTcpTable( MIB_TCPTABLE *table, DWORD *size, BOOL sort ) ULONG WINAPI GetTcp6Table( MIB_TCP6TABLE *table, ULONG *size, BOOL sort ) { TRACE( "table %p, size %p, sort %d\n", table, size, sort ); - return get_extended_tcp_table( table, size, sort, WS_AF_INET6, TCP_TABLE_BASIC_ALL ); + return get_extended_tcp_table( table, size, sort, AF_INET6, TCP_TABLE_BASIC_ALL ); } /****************************************************************** @@ -3224,7 +3203,7 @@ ULONG WINAPI GetTcp6Table( MIB_TCP6TABLE *table, ULONG *size, BOOL sort ) ULONG WINAPI GetTcpTable2( MIB_TCPTABLE2 *table, ULONG *size, BOOL sort ) { TRACE( "table %p, size %p, sort %d\n", table, size, sort ); - return get_extended_tcp_table( table, size, sort, WS_AF_INET, TCP_TABLE2 ); + return get_extended_tcp_table( table, size, sort, AF_INET, TCP_TABLE2 ); } /****************************************************************** @@ -3233,7 +3212,7 @@ ULONG WINAPI GetTcpTable2( MIB_TCPTABLE2 *table, ULONG *size, BOOL sort ) ULONG WINAPI GetTcp6Table2( MIB_TCP6TABLE2 *table, ULONG *size, BOOL sort ) { TRACE( "table %p, size %p, sort %d\n", table, size, sort ); - return get_extended_tcp_table( table, size, sort, WS_AF_INET6, TCP_TABLE2 ); + return get_extended_tcp_table( table, size, sort, AF_INET6, TCP_TABLE2 ); } static DWORD allocate_tcp_table( void **table, BOOL sort, HANDLE heap, DWORD flags, @@ -3263,7 +3242,7 @@ DWORD WINAPI AllocateAndGetTcpTableFromStack( MIB_TCPTABLE **table, BOOL sort, H if (!table) return ERROR_INVALID_PARAMETER; - return allocate_tcp_table( (void **)table, sort, heap, flags, WS_AF_INET, TCP_TABLE_BASIC_ALL ); + return allocate_tcp_table( (void **)table, sort, heap, flags, AF_INET, TCP_TABLE_BASIC_ALL ); } /****************************************************************** @@ -3274,7 +3253,7 @@ DWORD WINAPI AllocateAndGetTcpExTableFromStack( void **table, BOOL sort, HANDLE TRACE( "table %p, sort %d, heap %p, flags 0x%08x, family %u\n", table, sort, heap, flags, family ); if (!table || !ip_module_id( family )) return ERROR_INVALID_PARAMETER; - if (family == WS_AF_INET6) return ERROR_NOT_SUPPORTED; + if (family == AF_INET6) return ERROR_NOT_SUPPORTED; return allocate_tcp_table( table, sort, heap, flags, family, TCP_TABLE_OWNER_PID_ALL ); } @@ -3289,7 +3268,7 @@ DWORD WINAPI AllocateAndGetTcpExTableFromStack( void **table, BOOL sort, HANDLE */ DWORD WINAPI GetUdpStatistics( MIB_UDPSTATS *stats ) { - return GetUdpStatisticsEx( stats, WS_AF_INET ); + return GetUdpStatisticsEx( stats, AF_INET ); } /****************************************************************** @@ -3339,7 +3318,7 @@ DWORD WINAPI GetUdpStatisticsEx( MIB_UDPSTATS *stats, DWORD family ) */ DWORD WINAPI GetUdpTable( MIB_UDPTABLE *table, DWORD *size, BOOL sort ) { - return GetExtendedUdpTable( table, size, sort, WS_AF_INET, UDP_TABLE_BASIC, 0 ); + return GetExtendedUdpTable( table, size, sort, AF_INET, UDP_TABLE_BASIC, 0 ); } /****************************************************************** @@ -3347,7 +3326,7 @@ DWORD WINAPI GetUdpTable( MIB_UDPTABLE *table, DWORD *size, BOOL sort ) */ DWORD WINAPI GetUdp6Table( MIB_UDP6TABLE *table, DWORD *size, BOOL sort ) { - return GetExtendedUdpTable( table, size, sort, WS_AF_INET6, UDP_TABLE_BASIC, 0 ); + return GetExtendedUdpTable( table, size, sort, AF_INET6, UDP_TABLE_BASIC, 0 ); } static DWORD udp_table_size( ULONG family, ULONG table_class, DWORD row_count, DWORD *row_size ) @@ -3355,18 +3334,18 @@ static DWORD udp_table_size( ULONG family, ULONG table_class, DWORD row_count, D switch (table_class) { case UDP_TABLE_BASIC: - *row_size = (family == WS_AF_INET) ? sizeof(MIB_UDPROW) : sizeof(MIB_UDP6ROW); - return (family == WS_AF_INET) ? FIELD_OFFSET(MIB_UDPTABLE, table[row_count]) : + *row_size = (family == AF_INET) ? sizeof(MIB_UDPROW) : sizeof(MIB_UDP6ROW); + return (family == AF_INET) ? FIELD_OFFSET(MIB_UDPTABLE, table[row_count]) : FIELD_OFFSET(MIB_UDP6TABLE, table[row_count]); case UDP_TABLE_OWNER_PID: - *row_size = (family == WS_AF_INET) ? sizeof(MIB_UDPROW_OWNER_PID) : sizeof(MIB_UDP6ROW_OWNER_PID); - return (family == WS_AF_INET) ? FIELD_OFFSET(MIB_UDPTABLE_OWNER_PID, table[row_count]) : + *row_size = (family == AF_INET) ? sizeof(MIB_UDPROW_OWNER_PID) : sizeof(MIB_UDP6ROW_OWNER_PID); + return (family == AF_INET) ? FIELD_OFFSET(MIB_UDPTABLE_OWNER_PID, table[row_count]) : FIELD_OFFSET(MIB_UDP6TABLE_OWNER_PID, table[row_count]); case UDP_TABLE_OWNER_MODULE: - *row_size = (family == WS_AF_INET) ? sizeof(MIB_UDPROW_OWNER_MODULE) : sizeof(MIB_UDP6ROW_OWNER_MODULE); - return (family == WS_AF_INET) ? FIELD_OFFSET(MIB_UDPTABLE_OWNER_MODULE, table[row_count]) : + *row_size = (family == AF_INET) ? sizeof(MIB_UDPROW_OWNER_MODULE) : sizeof(MIB_UDP6ROW_OWNER_MODULE); + return (family == AF_INET) ? FIELD_OFFSET(MIB_UDPTABLE_OWNER_MODULE, table[row_count]) : FIELD_OFFSET(MIB_UDP6TABLE_OWNER_MODULE, table[row_count]); default: @@ -3379,21 +3358,21 @@ static void udp_row_fill( void *table, DWORD num, ULONG family, ULONG table_clas struct nsi_udp_endpoint_key *key, struct nsi_udp_endpoint_static *stat ) { - if (family == WS_AF_INET) + if (family == AF_INET) { switch (table_class) { case UDP_TABLE_BASIC: { MIB_UDPROW *row = ((MIB_UDPTABLE *)table)->table + num; - row->dwLocalAddr = key->local.Ipv4.sin_addr.WS_s_addr; + row->dwLocalAddr = key->local.Ipv4.sin_addr.s_addr; row->dwLocalPort = key->local.Ipv4.sin_port; return; } case UDP_TABLE_OWNER_PID: { MIB_UDPROW_OWNER_PID *row = ((MIB_UDPTABLE_OWNER_PID *)table)->table + num; - row->dwLocalAddr = key->local.Ipv4.sin_addr.WS_s_addr; + row->dwLocalAddr = key->local.Ipv4.sin_addr.s_addr; row->dwLocalPort = key->local.Ipv4.sin_port; row->dwOwningPid = stat->pid; return; @@ -3401,7 +3380,7 @@ static void udp_row_fill( void *table, DWORD num, ULONG family, ULONG table_clas case UDP_TABLE_OWNER_MODULE: { MIB_UDPROW_OWNER_MODULE *row = ((MIB_UDPTABLE_OWNER_MODULE *)table)->table + num; - row->dwLocalAddr = key->local.Ipv4.sin_addr.WS_s_addr; + row->dwLocalAddr = key->local.Ipv4.sin_addr.s_addr; row->dwLocalPort = key->local.Ipv4.sin_port; row->dwOwningPid = stat->pid; row->liCreateTimestamp.QuadPart = stat->create_time; @@ -3525,7 +3504,7 @@ DWORD WINAPI GetExtendedUdpTable( void *table, DWORD *size, BOOL sort, ULONG fam int (*fn)(const void *, const void *); DWORD offset = udp_table_size( family, table_class, 0, &row_size ); - if (family == WS_AF_INET) fn = udp_row_cmp; + if (family == AF_INET) fn = udp_row_cmp; else fn = udp6_row_cmp; qsort( (BYTE *)table + offset, num, row_size, fn ); @@ -3547,7 +3526,7 @@ DWORD WINAPI AllocateAndGetUdpTableFromStack( MIB_UDPTABLE **table, BOOL sort, H { *table = HeapAlloc( heap, flags, size ); if (!*table) return ERROR_NOT_ENOUGH_MEMORY; - err = GetExtendedUdpTable( *table, &size, sort, WS_AF_INET, UDP_TABLE_BASIC, 0 ); + err = GetExtendedUdpTable( *table, &size, sort, AF_INET, UDP_TABLE_BASIC, 0 ); if (!err) break; HeapFree( heap, flags, *table ); *table = NULL; @@ -3562,7 +3541,7 @@ static void unicast_row_fill( MIB_UNICASTIPADDRESS_ROW *row, USHORT fam, void *k struct nsi_ipv4_unicast_key *key4 = (struct nsi_ipv4_unicast_key *)key; struct nsi_ipv6_unicast_key *key6 = (struct nsi_ipv6_unicast_key *)key; - if (fam == WS_AF_INET) + if (fam == AF_INET) { row->Address.Ipv4.sin_family = fam; row->Address.Ipv4.sin_port = 0; @@ -3615,7 +3594,7 @@ DWORD WINAPI GetUnicastIpAddressEntry(MIB_UNICASTIPADDRESS_ROW *row) if (err) return err; } - if (row->Address.si_family == WS_AF_INET) + if (row->Address.si_family == AF_INET) { key4.luid = row->InterfaceLuid; key4.addr = row->Address.Ipv4.sin_addr; @@ -3623,7 +3602,7 @@ DWORD WINAPI GetUnicastIpAddressEntry(MIB_UNICASTIPADDRESS_ROW *row) key = &key4; key_size = sizeof(key4); } - else if (row->Address.si_family == WS_AF_INET6) + else if (row->Address.si_family == AF_INET6) { key6.luid = row->InterfaceLuid; key6.addr = row->Address.Ipv6.sin6_addr; @@ -3644,18 +3623,18 @@ DWORD WINAPI GetUnicastIpAddressTable(ADDRESS_FAMILY family, MIB_UNICASTIPADDRES struct nsi_ip_unicast_rw *rw[2] = { NULL, NULL }; struct nsi_ip_unicast_dynamic *dyn[2] = { NULL, NULL }; struct nsi_ip_unicast_static *stat[2] = { NULL, NULL }; - static const USHORT fam[2] = { WS_AF_INET, WS_AF_INET6 }; + static const USHORT fam[2] = { AF_INET, AF_INET6 }; static const DWORD key_size[2] = { sizeof(struct nsi_ipv4_unicast_key), sizeof(struct nsi_ipv6_unicast_key) }; DWORD err, i, size, count[2] = { 0, 0 }; TRACE( "%u, %p\n", family, table ); - if (!table || (family != WS_AF_INET && family != WS_AF_INET6 && family != WS_AF_UNSPEC)) + if (!table || (family != AF_INET && family != AF_INET6 && family != AF_UNSPEC)) return ERROR_INVALID_PARAMETER; for (i = 0; i < 2; i++) { - if (family != WS_AF_UNSPEC && family != fam[i]) continue; + if (family != AF_UNSPEC && family != fam[i]) continue; err = NsiAllocateAndGetTable( 1, ip_module_id( fam[i] ), NSI_IP_UNICAST_TABLE, key + i, key_size[i], (void **)rw + i, sizeof(**rw), (void **)dyn + i, sizeof(**dyn), -- 2.25.1

1 0

[PATCH 1/2] joy.cpl: Acquire the device before starting effect.
by Rémi Bernon 06 Oct '21

06 Oct '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- We are going to implement more accurate checks in SetParameters and these calls seem to be required in order to start an effect. dlls/joy.cpl/main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 57c188a5df1..3c9949b7ef3 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -726,6 +726,9 @@ static void ff_handle_effectchange(HWND hwnd, struct Joystick *joy) if (sel < 0) return; joy->chosen_effect = sel; + IDirectInputDevice8_Unacquire(joy->device); + IDirectInputDevice8_SetCooperativeLevel(joy->device, GetAncestor(hwnd, GA_ROOT), DISCL_BACKGROUND|DISCL_EXCLUSIVE); + IDirectInputDevice8_Acquire(joy->device); } static DWORD WINAPI ff_input_thread(void *param) -- 2.33.0

1 1

[PATCH 01/11] dinput8/tests: Reduce test output verbosity.
by Rémi Bernon 06 Oct '21

06 Oct '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51784 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- The first two patches aren't really solving the mentionned bug but they should help. At least they prevent this series from overflowing. dlls/dinput8/tests/hid.c | 498 +++++++++++++++++++-------------------- 1 file changed, 249 insertions(+), 249 deletions(-) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index f4e180a85f3..466331b326b 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3735,7 +3735,7 @@ static void test_simple_joystick(void) } hr = IDirectInput8_EnumDevices( di, DI8DEVCLASS_ALL, find_test_device, &devinst, DIEDFL_ALLDEVICES ); - ok( hr == DI_OK, "IDirectInput8_EnumDevices returned: %#x\n", hr ); + ok( hr == DI_OK, "EnumDevices returned: %#x\n", hr ); if (!IsEqualGUID( &devinst.guidProduct, &expect_guid_product )) { win_skip( "device not found, skipping tests\n" ); @@ -3755,62 +3755,62 @@ static void test_simple_joystick(void) check_member( devinst, expect_devinst, "%04x", wUsage ); hr = IDirectInput8_CreateDevice( di, &devinst.guidInstance, NULL, NULL ); - ok( hr == E_POINTER, "IDirectInput8_CreateDevice returned %#x\n", hr ); + ok( hr == E_POINTER, "CreateDevice returned %#x\n", hr ); hr = IDirectInput8_CreateDevice( di, NULL, &device, NULL ); - ok( hr == E_POINTER, "IDirectInput8_CreateDevice returned %#x\n", hr ); + ok( hr == E_POINTER, "CreateDevice returned %#x\n", hr ); hr = IDirectInput8_CreateDevice( di, &GUID_NULL, &device, NULL ); - ok( hr == DIERR_DEVICENOTREG, "IDirectInput8_CreateDevice returned %#x\n", hr ); + ok( hr == DIERR_DEVICENOTREG, "CreateDevice returned %#x\n", hr ); hr = IDirectInput8_CreateDevice( di, &devinst.guidInstance, &device, NULL ); - ok( hr == DI_OK, "IDirectInput8_CreateDevice returned %#x\n", hr ); + ok( hr == DI_OK, "CreateDevice returned %#x\n", hr ); prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_VIDPID, &prop_dword.diph ); - ok( hr == DI_OK, "IDirectInputDevice8_GetProperty DIPROP_VIDPID returned %#x\n", hr ); + ok( hr == DI_OK, "GetProperty DIPROP_VIDPID returned %#x\n", hr ); /* Wine may get the wrong device here, because the test driver creates another instance of hidclass.sys, and gets duplicate rawinput handles, which we use in the guidInstance */ todo_wine_if( prop_dword.dwData != EXPECT_VIDPID ) ok( prop_dword.dwData == EXPECT_VIDPID, "got %#x expected %#x\n", prop_dword.dwData, EXPECT_VIDPID ); ref = IDirectInputDevice8_Release( device ); - ok( ref == 0, "IDirectInputDeviceW_Release returned %d\n", ref ); + ok( ref == 0, "Release returned %d\n", ref ); hr = IDirectInput8_CreateDevice( di, &expect_guid_product, &device, NULL ); - ok( hr == DI_OK, "IDirectInput8_CreateDevice returned %#x\n", hr ); + ok( hr == DI_OK, "CreateDevice returned %#x\n", hr ); hr = IDirectInputDevice8_Initialize( device, instance, 0x0700, &GUID_NULL ); todo_wine - ok( hr == DIERR_BETADIRECTINPUTVERSION, "IDirectInputDevice8_Initialize returned %#x\n", hr ); + ok( hr == DIERR_BETADIRECTINPUTVERSION, "Initialize returned %#x\n", hr ); hr = IDirectInputDevice8_Initialize( device, instance, DIRECTINPUT_VERSION, NULL ); todo_wine - ok( hr == E_POINTER, "IDirectInputDevice8_Initialize returned %#x\n", hr ); + ok( hr == E_POINTER, "Initialize returned %#x\n", hr ); hr = IDirectInputDevice8_Initialize( device, NULL, DIRECTINPUT_VERSION, &GUID_NULL ); todo_wine - ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_Initialize returned %#x\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "Initialize returned %#x\n", hr ); hr = IDirectInputDevice8_Initialize( device, instance, DIRECTINPUT_VERSION, &GUID_NULL ); todo_wine - ok( hr == REGDB_E_CLASSNOTREG, "IDirectInputDevice8_Initialize returned %#x\n", hr ); + ok( hr == REGDB_E_CLASSNOTREG, "Initialize returned %#x\n", hr ); hr = IDirectInputDevice8_Initialize( device, instance, DIRECTINPUT_VERSION, &devinst.guidInstance ); - ok( hr == DI_OK, "IDirectInputDevice8_Initialize returned %#x\n", hr ); + ok( hr == DI_OK, "Initialize returned %#x\n", hr ); guid = devinst.guidInstance; memset( &devinst, 0, sizeof(devinst) ); devinst.dwSize = sizeof(DIDEVICEINSTANCEW); hr = IDirectInputDevice8_GetDeviceInfo( device, &devinst ); - ok( hr == DI_OK, "IDirectInputDevice8_GetDeviceInfo returned %#x\n", hr ); + ok( hr == DI_OK, "GetDeviceInfo returned %#x\n", hr ); ok( IsEqualGUID( &guid, &devinst.guidInstance ), "got %s expected %s\n", debugstr_guid( &guid ), debugstr_guid( &devinst.guidInstance ) ); hr = IDirectInputDevice8_Initialize( device, instance, DIRECTINPUT_VERSION, &devinst.guidProduct ); - ok( hr == DI_OK, "IDirectInputDevice8_Initialize returned %#x\n", hr ); + ok( hr == DI_OK, "Initialize returned %#x\n", hr ); hr = IDirectInputDevice8_GetDeviceInfo( device, NULL ); - ok( hr == E_POINTER, "IDirectInputDevice8_GetDeviceInfo returned %#x\n", hr ); + ok( hr == E_POINTER, "GetDeviceInfo returned %#x\n", hr ); devinst.dwSize = sizeof(DIDEVICEINSTANCEW) + 1; hr = IDirectInputDevice8_GetDeviceInfo( device, &devinst ); - ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_GetDeviceInfo returned %#x\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "GetDeviceInfo returned %#x\n", hr ); devinst.dwSize = sizeof(DIDEVICEINSTANCE_DX3W); hr = IDirectInputDevice8_GetDeviceInfo( device, &devinst ); - ok( hr == DI_OK, "IDirectInputDevice8_GetDeviceInfo returned %#x\n", hr ); + ok( hr == DI_OK, "GetDeviceInfo returned %#x\n", hr ); todo_wine check_member_guid( devinst, expect_devinst, guidInstance ); check_member_guid( devinst, expect_devinst, guidProduct ); @@ -3823,7 +3823,7 @@ static void test_simple_joystick(void) memset( &devinst, 0, sizeof(devinst) ); devinst.dwSize = sizeof(DIDEVICEINSTANCEW); hr = IDirectInputDevice8_GetDeviceInfo( device, &devinst ); - ok( hr == DI_OK, "IDirectInputDevice8_GetDeviceInfo returned %#x\n", hr ); + ok( hr == DI_OK, "GetDeviceInfo returned %#x\n", hr ); check_member( devinst, expect_devinst, "%d", dwSize ); todo_wine check_member_guid( devinst, expect_devinst, guidInstance ); @@ -3838,13 +3838,13 @@ static void test_simple_joystick(void) check_member( devinst, expect_devinst, "%04x", wUsage ); hr = IDirectInputDevice8_GetCapabilities( device, NULL ); - ok( hr == E_POINTER, "IDirectInputDevice8_GetCapabilities returned %#x\n", hr ); + ok( hr == E_POINTER, "GetCapabilities returned %#x\n", hr ); hr = IDirectInputDevice8_GetCapabilities( device, &caps ); todo_wine - ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_GetCapabilities returned %#x\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "GetCapabilities returned %#x\n", hr ); caps.dwSize = sizeof(DIDEVCAPS); hr = IDirectInputDevice8_GetCapabilities( device, &caps ); - ok( hr == DI_OK, "IDirectInputDevice8_GetCapabilities returned %#x\n", hr ); + ok( hr == DI_OK, "GetCapabilities returned %#x\n", hr ); check_member( caps, expect_caps, "%d", dwSize ); check_member( caps, expect_caps, "%#x", dwFlags ); check_member( caps, expect_caps, "%#x", dwDevType ); @@ -3858,25 +3858,25 @@ static void test_simple_joystick(void) check_member( caps, expect_caps, "%d", dwFFDriverVersion ); hr = IDirectInputDevice8_GetProperty( device, NULL, NULL ); - ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_GetProperty returned %#x\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "GetProperty returned %#x\n", hr ); hr = IDirectInputDevice8_GetProperty( device, &GUID_NULL, NULL ); - ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_GetProperty returned %#x\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "GetProperty returned %#x\n", hr ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_VIDPID, NULL ); - ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_GetProperty returned %#x\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "GetProperty returned %#x\n", hr ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_VIDPID, &prop_string.diph ); - ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_GetProperty returned %#x\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "GetProperty returned %#x\n", hr ); prop_dword.diph.dwHeaderSize = sizeof(DIPROPHEADER) - 1; hr = IDirectInputDevice8_GetProperty( device, DIPROP_VIDPID, &prop_dword.diph ); - ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_GetProperty returned %#x\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "GetProperty returned %#x\n", hr ); prop_dword.diph.dwHeaderSize = sizeof(DIPROPHEADER); prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_VIDPID, &prop_dword.diph ); - ok( hr == DI_OK, "IDirectInputDevice8_GetProperty DIPROP_VIDPID returned %#x\n", hr ); + ok( hr == DI_OK, "GetProperty DIPROP_VIDPID returned %#x\n", hr ); ok( prop_dword.dwData == EXPECT_VIDPID, "got %#x expected %#x\n", prop_dword.dwData, EXPECT_VIDPID ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_GUIDANDPATH, &prop_guid_path.diph ); - ok( hr == DI_OK, "IDirectInputDevice8_GetProperty DIPROP_GUIDANDPATH returned %#x\n", hr ); + ok( hr == DI_OK, "GetProperty DIPROP_GUIDANDPATH returned %#x\n", hr ); todo_wine ok( IsEqualGUID( &prop_guid_path.guidClass, &GUID_DEVCLASS_HIDCLASS ), "got guid %s\n", debugstr_guid( &prop_guid_path.guidClass ) ); @@ -3892,77 +3892,77 @@ static void test_simple_joystick(void) } hr = IDirectInputDevice8_GetProperty( device, DIPROP_INSTANCENAME, &prop_string.diph ); - ok( hr == DI_OK, "IDirectInputDevice8_GetProperty DIPROP_INSTANCENAME returned %#x\n", hr ); + ok( hr == DI_OK, "GetProperty DIPROP_INSTANCENAME returned %#x\n", hr ); todo_wine ok( !wcscmp( prop_string.wsz, expect_devinst.tszInstanceName ), "got instance %s\n", debugstr_w(prop_string.wsz) ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_PRODUCTNAME, &prop_string.diph ); - ok( hr == DI_OK, "IDirectInputDevice8_GetProperty DIPROP_PRODUCTNAME returned %#x\n", hr ); + ok( hr == DI_OK, "GetProperty DIPROP_PRODUCTNAME returned %#x\n", hr ); todo_wine ok( !wcscmp( prop_string.wsz, expect_devinst.tszProductName ), "got product %s\n", debugstr_w(prop_string.wsz) ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_TYPENAME, &prop_string.diph ); todo_wine - ok( hr == DI_OK, "IDirectInputDevice8_GetProperty DIPROP_TYPENAME returned %#x\n", hr ); + ok( hr == DI_OK, "GetProperty DIPROP_TYPENAME returned %#x\n", hr ); todo_wine ok( !wcscmp( prop_string.wsz, expect_vidpid_str ), "got type %s\n", debugstr_w(prop_string.wsz) ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_USERNAME, &prop_string.diph ); - ok( hr == S_FALSE, "IDirectInputDevice8_GetProperty DIPROP_USERNAME returned %#x\n", hr ); + ok( hr == S_FALSE, "GetProperty DIPROP_USERNAME returned %#x\n", hr ); todo_wine ok( !wcscmp( prop_string.wsz, L"" ), "got user %s\n", debugstr_w(prop_string.wsz) ); prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_JOYSTICKID, &prop_dword.diph ); - ok( hr == DI_OK, "IDirectInputDevice8_GetProperty DIPROP_JOYSTICKID returned %#x\n", hr ); + ok( hr == DI_OK, "GetProperty DIPROP_JOYSTICKID returned %#x\n", hr ); todo_wine ok( prop_dword.dwData == 0, "got %#x expected %#x\n", prop_dword.dwData, 0 ); prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_AXISMODE, &prop_dword.diph ); todo_wine - ok( hr == DI_OK, "IDirectInputDevice8_GetProperty DIPROP_AXISMODE returned %#x\n", hr ); + ok( hr == DI_OK, "GetProperty DIPROP_AXISMODE returned %#x\n", hr ); todo_wine ok( prop_dword.dwData == DIPROPAXISMODE_ABS, "got %u expected %u\n", prop_dword.dwData, DIPROPAXISMODE_ABS ); prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_BUFFERSIZE, &prop_dword.diph ); - ok( hr == DI_OK, "IDirectInputDevice8_GetProperty DIPROP_BUFFERSIZE returned %#x\n", hr ); + ok( hr == DI_OK, "GetProperty DIPROP_BUFFERSIZE returned %#x\n", hr ); ok( prop_dword.dwData == 0, "got %#x expected %#x\n", prop_dword.dwData, 0 ); prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_FFGAIN, &prop_dword.diph ); todo_wine - ok( hr == DI_OK, "IDirectInputDevice8_GetProperty DIPROP_FFGAIN returned %#x\n", hr ); + ok( hr == DI_OK, "GetProperty DIPROP_FFGAIN returned %#x\n", hr ); todo_wine ok( prop_dword.dwData == 10000, "got %u expected %u\n", prop_dword.dwData, 10000 ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_CALIBRATION, &prop_dword.diph ); - ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_GetProperty DIPROP_CALIBRATION returned %#x\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "GetProperty DIPROP_CALIBRATION returned %#x\n", hr ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_AUTOCENTER, &prop_dword.diph ); - ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_GetProperty DIPROP_AUTOCENTER returned %#x\n", hr ); + ok( hr == DIERR_UNSUPPORTED, "GetProperty DIPROP_AUTOCENTER returned %#x\n", hr ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_DEADZONE, &prop_dword.diph ); - ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_GetProperty DIPROP_DEADZONE returned %#x\n", hr ); + ok( hr == DIERR_UNSUPPORTED, "GetProperty DIPROP_DEADZONE returned %#x\n", hr ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_FFLOAD, &prop_dword.diph ); todo_wine - ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_GetProperty DIPROP_FFLOAD returned %#x\n", hr ); + ok( hr == DIERR_UNSUPPORTED, "GetProperty DIPROP_FFLOAD returned %#x\n", hr ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_GRANULARITY, &prop_dword.diph ); - ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_GetProperty DIPROP_GRANULARITY returned %#x\n", hr ); + ok( hr == DIERR_UNSUPPORTED, "GetProperty DIPROP_GRANULARITY returned %#x\n", hr ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_SATURATION, &prop_dword.diph ); - ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_GetProperty DIPROP_SATURATION returned %#x\n", hr ); + ok( hr == DIERR_UNSUPPORTED, "GetProperty DIPROP_SATURATION returned %#x\n", hr ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_RANGE, &prop_range.diph ); - ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_GetProperty DIPROP_RANGE returned %#x\n", hr ); + ok( hr == DIERR_UNSUPPORTED, "GetProperty DIPROP_RANGE returned %#x\n", hr ); prop_dword.diph.dwHow = DIPH_BYUSAGE; prop_dword.diph.dwObj = MAKELONG( HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC ); prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_DEADZONE, &prop_dword.diph ); - ok( hr == DI_OK, "IDirectInputDevice8_GetProperty DIPROP_DEADZONE returned %#x\n", hr ); + ok( hr == DI_OK, "GetProperty DIPROP_DEADZONE returned %#x\n", hr ); ok( prop_dword.dwData == 0, "got %u expected %u\n", prop_dword.dwData, 0 ); prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_GRANULARITY, &prop_dword.diph ); - ok( hr == DI_OK, "IDirectInputDevice8_GetProperty DIPROP_GRANULARITY returned %#x\n", hr ); + ok( hr == DI_OK, "GetProperty DIPROP_GRANULARITY returned %#x\n", hr ); ok( prop_dword.dwData == 1, "got %u expected %u\n", prop_dword.dwData, 1 ); prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_SATURATION, &prop_dword.diph ); - ok( hr == DI_OK, "IDirectInputDevice8_GetProperty DIPROP_SATURATION returned %#x\n", hr ); + ok( hr == DI_OK, "GetProperty DIPROP_SATURATION returned %#x\n", hr ); ok( prop_dword.dwData == 10000, "got %u expected %u\n", prop_dword.dwData, 10000 ); prop_range.diph.dwHow = DIPH_BYUSAGE; @@ -3970,18 +3970,18 @@ static void test_simple_joystick(void) prop_range.lMin = 0xdeadbeef; prop_range.lMax = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_RANGE, &prop_range.diph ); - ok( hr == DIERR_NOTFOUND, "IDirectInputDevice8_GetProperty DIPROP_RANGE returned %#x\n", hr ); + ok( hr == DIERR_NOTFOUND, "GetProperty DIPROP_RANGE returned %#x\n", hr ); prop_range.diph.dwObj = MAKELONG( 0, HID_USAGE_PAGE_GENERIC ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_RANGE, &prop_range.diph ); - ok( hr == DIERR_NOTFOUND, "IDirectInputDevice8_GetProperty DIPROP_RANGE returned %#x\n", hr ); + ok( hr == DIERR_NOTFOUND, "GetProperty DIPROP_RANGE returned %#x\n", hr ); prop_range.diph.dwObj = MAKELONG( HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_X ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_RANGE, &prop_range.diph ); - ok( hr == DIERR_NOTFOUND, "IDirectInputDevice8_GetProperty DIPROP_RANGE returned %#x\n", hr ); + ok( hr == DIERR_NOTFOUND, "GetProperty DIPROP_RANGE returned %#x\n", hr ); prop_range.diph.dwObj = MAKELONG( HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC ); prop_range.lMin = 0xdeadbeef; prop_range.lMax = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_RANGE, &prop_range.diph ); - ok( hr == DI_OK, "IDirectInputDevice8_GetProperty DIPROP_RANGE returned %#x\n", hr ); + ok( hr == DI_OK, "GetProperty DIPROP_RANGE returned %#x\n", hr ); ok( prop_range.lMin == 0, "got %d expected %d\n", prop_range.lMin, 0 ); ok( prop_range.lMax == 65535, "got %d expected %d\n", prop_range.lMax, 65535 ); @@ -3989,35 +3989,35 @@ static void test_simple_joystick(void) prop_pointer.diph.dwObj = MAKELONG( HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_APPDATA, &prop_pointer.diph ); todo_wine - ok( hr == DIERR_NOTINITIALIZED, "IDirectInputDevice8_GetProperty DIPROP_APPDATA returned %#x\n", hr ); + ok( hr == DIERR_NOTINITIALIZED, "GetProperty DIPROP_APPDATA returned %#x\n", hr ); hr = IDirectInputDevice8_EnumObjects( device, NULL, NULL, DIDFT_ALL ); - ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_EnumObjects returned %#x\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "EnumObjects returned %#x\n", hr ); hr = IDirectInputDevice8_EnumObjects( device, check_object_count, &res, 0x20 ); - ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_EnumObjects returned %#x\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "EnumObjects returned %#x\n", hr ); res = 0; hr = IDirectInputDevice8_EnumObjects( device, check_object_count, &res, DIDFT_AXIS | DIDFT_PSHBUTTON ); - ok( hr == DI_OK, "IDirectInputDevice8_EnumObjects returned %#x\n", hr ); + ok( hr == DI_OK, "EnumObjects returned %#x\n", hr ); ok( res == 5, "got %u expected %u\n", res, 5 ); hr = IDirectInputDevice8_EnumObjects( device, check_objects, &check_objects_params, DIDFT_ALL ); - ok( hr == DI_OK, "IDirectInputDevice8_EnumObjects returned %#x\n", hr ); + ok( hr == DI_OK, "EnumObjects returned %#x\n", hr ); ok( check_objects_params.index >= check_objects_params.expect_count, "missing %u objects\n", check_objects_params.expect_count - check_objects_params.index ); hr = IDirectInputDevice8_GetObjectInfo( device, NULL, 0, DIPH_DEVICE ); - ok( hr == E_POINTER, "IDirectInputDevice8_GetObjectInfo returned: %#x\n", hr ); + ok( hr == E_POINTER, "GetObjectInfo returned: %#x\n", hr ); hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, 0, DIPH_DEVICE ); - ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_GetObjectInfo returned: %#x\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "GetObjectInfo returned: %#x\n", hr ); objinst.dwSize = sizeof(DIDEVICEOBJECTINSTANCEW); hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, 0, DIPH_DEVICE ); - ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_GetObjectInfo returned: %#x\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "GetObjectInfo returned: %#x\n", hr ); res = MAKELONG( HID_USAGE_GENERIC_Z, HID_USAGE_PAGE_GENERIC ); hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, res, DIPH_BYUSAGE ); - ok( hr == DIERR_NOTFOUND, "IDirectInputDevice8_GetObjectInfo returned: %#x\n", hr ); + ok( hr == DIERR_NOTFOUND, "GetObjectInfo returned: %#x\n", hr ); res = MAKELONG( HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC ); hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, res, DIPH_BYUSAGE ); - ok( hr == DI_OK, "IDirectInputDevice8_GetObjectInfo returned: %#x\n", hr ); + ok( hr == DI_OK, "GetObjectInfo returned: %#x\n", hr ); check_member( objinst, expect_objects[1], "%u", dwSize ); check_member_guid( objinst, expect_objects[1], guidType ); @@ -4036,15 +4036,15 @@ static void test_simple_joystick(void) check_member( objinst, expect_objects[1], "%u", wReportId ); hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, 0x14, DIPH_BYOFFSET ); - ok( hr == DIERR_NOTFOUND, "IDirectInputDevice8_GetObjectInfo returned: %#x\n", hr ); + ok( hr == DIERR_NOTFOUND, "GetObjectInfo returned: %#x\n", hr ); hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, 0, DIPH_BYOFFSET ); - ok( hr == DIERR_NOTFOUND, "IDirectInputDevice8_GetObjectInfo returned: %#x\n", hr ); + ok( hr == DIERR_NOTFOUND, "GetObjectInfo returned: %#x\n", hr ); res = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( 3 ); hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, res, DIPH_BYID ); - ok( hr == DIERR_NOTFOUND, "IDirectInputDevice8_GetObjectInfo returned: %#x\n", hr ); + ok( hr == DIERR_NOTFOUND, "GetObjectInfo returned: %#x\n", hr ); res = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( 1 ); hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, res, DIPH_BYID ); - ok( hr == DI_OK, "IDirectInputDevice8_GetObjectInfo returned: %#x\n", hr ); + ok( hr == DI_OK, "GetObjectInfo returned: %#x\n", hr ); check_member( objinst, expect_objects[5], "%u", dwSize ); check_member_guid( objinst, expect_objects[5], guidType ); @@ -4063,46 +4063,46 @@ static void test_simple_joystick(void) check_member( objinst, expect_objects[5], "%u", wReportId ); hr = IDirectInputDevice8_EnumEffects( device, NULL, NULL, DIEFT_ALL ); - ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_EnumEffects returned %#x\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "EnumEffects returned %#x\n", hr ); res = 0; hr = IDirectInputDevice8_EnumEffects( device, check_effect_count, &res, 0xfe ); - ok( hr == DI_OK, "IDirectInputDevice8_EnumEffects returned %#x\n", hr ); + ok( hr == DI_OK, "EnumEffects returned %#x\n", hr ); ok( res == 0, "got %u expected %u\n", res, 0 ); res = 0; hr = IDirectInputDevice8_EnumEffects( device, check_effect_count, &res, DIEFT_PERIODIC ); - ok( hr == DI_OK, "IDirectInputDevice8_EnumEffects returned %#x\n", hr ); + ok( hr == DI_OK, "EnumEffects returned %#x\n", hr ); ok( res == 0, "got %u expected %u\n", res, 0 ); hr = IDirectInputDevice8_EnumEffects( device, check_effects, &check_effects_params, DIEFT_ALL ); - ok( hr == DI_OK, "IDirectInputDevice8_EnumEffects returned %#x\n", hr ); + ok( hr == DI_OK, "EnumEffects returned %#x\n", hr ); ok( check_effects_params.index >= check_effects_params.expect_count, "missing %u effects\n", check_effects_params.expect_count - check_effects_params.index ); hr = IDirectInputDevice8_GetEffectInfo( device, NULL, &GUID_Sine ); - ok( hr == E_POINTER, "IDirectInputDevice8_GetEffectInfo returned %#x\n", hr ); + ok( hr == E_POINTER, "GetEffectInfo returned %#x\n", hr ); effectinfo.dwSize = sizeof(DIEFFECTINFOW) + 1; hr = IDirectInputDevice8_GetEffectInfo( device, &effectinfo, &GUID_Sine ); - ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_GetEffectInfo returned %#x\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "GetEffectInfo returned %#x\n", hr ); effectinfo.dwSize = sizeof(DIEFFECTINFOW); hr = IDirectInputDevice8_GetEffectInfo( device, &effectinfo, &GUID_NULL ); - ok( hr == DIERR_DEVICENOTREG, "IDirectInputDevice8_GetEffectInfo returned %#x\n", hr ); + ok( hr == DIERR_DEVICENOTREG, "GetEffectInfo returned %#x\n", hr ); hr = IDirectInputDevice8_GetEffectInfo( device, &effectinfo, &GUID_Sine ); - ok( hr == DIERR_DEVICENOTREG, "IDirectInputDevice8_GetEffectInfo returned %#x\n", hr ); + ok( hr == DIERR_DEVICENOTREG, "GetEffectInfo returned %#x\n", hr ); hr = IDirectInputDevice8_SetDataFormat( device, NULL ); - ok( hr == E_POINTER, "IDirectInputDevice8_SetDataFormat returned: %#x\n", hr ); + ok( hr == E_POINTER, "SetDataFormat returned: %#x\n", hr ); hr = IDirectInputDevice8_SetDataFormat( device, &dataformat ); - ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SetDataFormat returned: %#x\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "SetDataFormat returned: %#x\n", hr ); dataformat.dwSize = sizeof(DIDATAFORMAT); hr = IDirectInputDevice8_SetDataFormat( device, &dataformat ); - ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SetDataFormat returned: %#x\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "SetDataFormat returned: %#x\n", hr ); dataformat.dwObjSize = sizeof(DIOBJECTDATAFORMAT); hr = IDirectInputDevice8_SetDataFormat( device, &dataformat ); - ok( hr == DI_OK, "IDirectInputDevice8_SetDataFormat returned: %#x\n", hr ); + ok( hr == DI_OK, "SetDataFormat returned: %#x\n", hr ); hr = IDirectInputDevice8_SetDataFormat( device, &c_dfDIJoystick2 ); - ok( hr == DI_OK, "IDirectInputDevice8_SetDataFormat returned: %#x\n", hr ); + ok( hr == DI_OK, "SetDataFormat returned: %#x\n", hr ); hr = IDirectInputDevice8_GetObjectInfo( device, &objinst, DIJOFS_Y, DIPH_BYOFFSET ); - ok( hr == DI_OK, "IDirectInputDevice8_GetObjectInfo returned: %#x\n", hr ); + ok( hr == DI_OK, "GetObjectInfo returned: %#x\n", hr ); check_member( objinst, expect_objects[0], "%u", dwSize ); check_member_guid( objinst, expect_objects[0], guidType ); @@ -4122,71 +4122,71 @@ static void test_simple_joystick(void) hr = IDirectInputDevice8_SetEventNotification( device, (HANDLE)0xdeadbeef ); todo_wine - ok( hr == E_HANDLE, "IDirectInputDevice8_SetEventNotification returned: %#x\n", hr ); + ok( hr == E_HANDLE, "SetEventNotification returned: %#x\n", hr ); event = CreateEventW( NULL, FALSE, FALSE, NULL ); ok( event != NULL, "CreateEventW failed, last error %u\n", GetLastError() ); hr = IDirectInputDevice8_SetEventNotification( device, event ); - ok( hr == DI_OK, "IDirectInputDevice8_SetEventNotification returned: %#x\n", hr ); + ok( hr == DI_OK, "SetEventNotification returned: %#x\n", hr ); file = CreateFileW( prop_guid_path.wszPath, FILE_READ_ACCESS | FILE_WRITE_ACCESS, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL ); ok( file != INVALID_HANDLE_VALUE, "got error %u\n", GetLastError() ); hr = IDirectInputDevice8_SetCooperativeLevel( device, NULL, 0 ); - ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SetCooperativeLevel returned: %#x\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "SetCooperativeLevel returned: %#x\n", hr ); hr = IDirectInputDevice8_SetCooperativeLevel( device, NULL, DISCL_BACKGROUND ); - ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SetCooperativeLevel returned: %#x\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "SetCooperativeLevel returned: %#x\n", hr ); hr = IDirectInputDevice8_SetCooperativeLevel( device, NULL, DISCL_FOREGROUND | DISCL_NONEXCLUSIVE ); - ok( hr == E_HANDLE, "IDirectInputDevice8_SetCooperativeLevel returned: %#x\n", hr ); + ok( hr == E_HANDLE, "SetCooperativeLevel returned: %#x\n", hr ); hr = IDirectInputDevice8_SetCooperativeLevel( device, NULL, DISCL_BACKGROUND | DISCL_EXCLUSIVE ); - ok( hr == E_HANDLE, "IDirectInputDevice8_SetCooperativeLevel returned: %#x\n", hr ); + ok( hr == E_HANDLE, "SetCooperativeLevel returned: %#x\n", hr ); hr = IDirectInputDevice8_SetCooperativeLevel( device, NULL, DISCL_FOREGROUND | DISCL_EXCLUSIVE ); - ok( hr == E_HANDLE, "IDirectInputDevice8_SetCooperativeLevel returned: %#x\n", hr ); + ok( hr == E_HANDLE, "SetCooperativeLevel returned: %#x\n", hr ); hwnd = CreateWindowW( L"static", L"dinput", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 10, 10, 200, 200, NULL, NULL, NULL, NULL ); hr = IDirectInputDevice8_SetCooperativeLevel( device, hwnd, DISCL_FOREGROUND | DISCL_NONEXCLUSIVE ); - ok( hr == DI_OK, "IDirectInputDevice8_SetCooperativeLevel returned: %#x\n", hr ); + ok( hr == DI_OK, "SetCooperativeLevel returned: %#x\n", hr ); hr = IDirectInputDevice8_SetCooperativeLevel( device, hwnd, DISCL_BACKGROUND | DISCL_EXCLUSIVE ); - ok( hr == DI_OK, "IDirectInputDevice8_SetCooperativeLevel returned: %#x\n", hr ); + ok( hr == DI_OK, "SetCooperativeLevel returned: %#x\n", hr ); hr = IDirectInputDevice8_SetCooperativeLevel( device, hwnd, DISCL_FOREGROUND | DISCL_EXCLUSIVE ); - ok( hr == DI_OK, "IDirectInputDevice8_SetCooperativeLevel returned: %#x\n", hr ); + ok( hr == DI_OK, "SetCooperativeLevel returned: %#x\n", hr ); hr = IDirectInputDevice8_Unacquire( device ); - ok( hr == DI_NOEFFECT, "IDirectInputDevice8_Unacquire returned: %#x\n", hr ); + ok( hr == DI_NOEFFECT, "Unacquire returned: %#x\n", hr ); hr = IDirectInputDevice8_Acquire( device ); - ok( hr == DI_OK, "IDirectInputDevice8_Acquire returned: %#x\n", hr ); + ok( hr == DI_OK, "Acquire returned: %#x\n", hr ); hr = IDirectInputDevice8_SetCooperativeLevel( device, hwnd, DISCL_FOREGROUND | DISCL_EXCLUSIVE ); - ok( hr == DIERR_ACQUIRED, "IDirectInputDevice8_SetCooperativeLevel returned: %#x\n", hr ); + ok( hr == DIERR_ACQUIRED, "SetCooperativeLevel returned: %#x\n", hr ); hr = IDirectInputDevice8_Unacquire( device ); - ok( hr == DI_OK, "IDirectInputDevice8_Unacquire returned: %#x\n", hr ); + ok( hr == DI_OK, "Unacquire returned: %#x\n", hr ); DestroyWindow( hwnd ); hr = IDirectInputDevice8_SetCooperativeLevel( device, NULL, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE ); - ok( hr == DI_OK, "IDirectInputDevice8_SetCooperativeLevel returned: %#x\n", hr ); + ok( hr == DI_OK, "SetCooperativeLevel returned: %#x\n", hr ); hr = IDirectInputDevice8_GetDeviceState( device, sizeof(DIJOYSTATE2), &state ); - ok( hr == DIERR_NOTACQUIRED, "IDirectInputDevice8_GetDeviceState returned: %#x\n", hr ); + ok( hr == DIERR_NOTACQUIRED, "GetDeviceState returned: %#x\n", hr ); hr = IDirectInputDevice8_Poll( device ); - ok( hr == DIERR_NOTACQUIRED, "IDirectInputDevice8_Poll returned: %#x\n", hr ); + ok( hr == DIERR_NOTACQUIRED, "Poll returned: %#x\n", hr ); hr = IDirectInputDevice8_Acquire( device ); - ok( hr == DI_OK, "IDirectInputDevice8_Acquire returned: %#x\n", hr ); + ok( hr == DI_OK, "Acquire returned: %#x\n", hr ); hr = IDirectInputDevice8_Poll( device ); - ok( hr == DI_NOEFFECT, "IDirectInputDevice8_Poll returned: %#x\n", hr ); + ok( hr == DI_NOEFFECT, "Poll returned: %#x\n", hr ); hr = IDirectInputDevice8_GetDeviceState( device, sizeof(DIJOYSTATE2) + 1, &state ); - ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_GetDeviceState returned: %#x\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "GetDeviceState returned: %#x\n", hr ); for (i = 0; i < ARRAY_SIZE(injected_input); ++i) { winetest_push_context( "state[%d]", i ); hr = IDirectInputDevice8_GetDeviceState( device, sizeof(DIJOYSTATE2), &state ); - ok( hr == DI_OK, "IDirectInputDevice8_GetDeviceState returned: %#x\n", hr ); + ok( hr == DI_OK, "GetDeviceState returned: %#x\n", hr ); check_member( state, expect_state[i], "%d", lX ); check_member( state, expect_state[i], "%d", lY ); check_member( state, expect_state[i], "%d", lZ ); @@ -4207,7 +4207,7 @@ static void test_simple_joystick(void) } hr = IDirectInputDevice8_GetDeviceState( device, sizeof(DIJOYSTATE2), &state ); - ok( hr == DI_OK, "IDirectInputDevice8_GetDeviceState returned: %#x\n", hr ); + ok( hr == DI_OK, "GetDeviceState returned: %#x\n", hr ); winetest_push_context( "state[%d]", i ); check_member( state, expect_state[i], "%d", lX ); check_member( state, expect_state[i], "%d", lY ); @@ -4223,24 +4223,24 @@ static void test_simple_joystick(void) res = 1; hr = IDirectInputDevice8_GetDeviceData( device, sizeof(DIDEVICEOBJECTDATA) - 1, objdata, &res, DIGDD_PEEK ); todo_wine - ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_GetDeviceData returned %#x\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "GetDeviceData returned %#x\n", hr ); res = 1; hr = IDirectInputDevice8_GetDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, DIGDD_PEEK ); - ok( hr == DIERR_NOTBUFFERED, "IDirectInputDevice8_GetDeviceData returned %#x\n", hr ); + ok( hr == DIERR_NOTBUFFERED, "GetDeviceData returned %#x\n", hr ); hr = IDirectInputDevice8_Unacquire( device ); - ok( hr == DI_OK, "IDirectInputDevice8_Unacquire returned: %#x\n", hr ); + ok( hr == DI_OK, "Unacquire returned: %#x\n", hr ); prop_dword.diph.dwHow = DIPH_DEVICE; prop_dword.diph.dwObj = 0; prop_dword.dwData = 1; hr = IDirectInputDevice8_SetProperty( device, DIPROP_BUFFERSIZE, &prop_dword.diph ); - ok( hr == DI_OK, "IDirectInputDevice8_SetProperty DIPROP_BUFFERSIZE returned %#x\n", hr ); + ok( hr == DI_OK, "SetProperty DIPROP_BUFFERSIZE returned %#x\n", hr ); hr = IDirectInputDevice8_Acquire( device ); - ok( hr == DI_OK, "IDirectInputDevice8_Unacquire returned: %#x\n", hr ); + ok( hr == DI_OK, "Unacquire returned: %#x\n", hr ); res = 1; hr = IDirectInputDevice8_GetDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, DIGDD_PEEK ); - ok( hr == DI_OK, "IDirectInputDevice8_GetDeviceData returned %#x\n", hr ); + ok( hr == DI_OK, "GetDeviceData returned %#x\n", hr ); ok( res == 0, "got %u expected %u\n", res, 0 ); send_hid_input( file, &injected_input[0], sizeof(*injected_input) ); @@ -4250,23 +4250,23 @@ static void test_simple_joystick(void) res = 1; hr = IDirectInputDevice8_GetDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, DIGDD_PEEK ); - ok( hr == DI_BUFFEROVERFLOW, "IDirectInputDevice8_GetDeviceData returned %#x\n", hr ); + ok( hr == DI_BUFFEROVERFLOW, "GetDeviceData returned %#x\n", hr ); ok( res == 0, "got %u expected %u\n", res, 0 ); res = 1; hr = IDirectInputDevice8_GetDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, 0 ); todo_wine - ok( hr == DI_OK, "IDirectInputDevice8_GetDeviceData returned %#x\n", hr ); + ok( hr == DI_OK, "GetDeviceData returned %#x\n", hr ); ok( res == 0, "got %u expected %u\n", res, 0 ); hr = IDirectInputDevice8_Unacquire( device ); - ok( hr == DI_OK, "IDirectInputDevice8_Unacquire returned: %#x\n", hr ); + ok( hr == DI_OK, "Unacquire returned: %#x\n", hr ); prop_dword.diph.dwHow = DIPH_DEVICE; prop_dword.diph.dwObj = 0; prop_dword.dwData = 10; hr = IDirectInputDevice8_SetProperty( device, DIPROP_BUFFERSIZE, &prop_dword.diph ); - ok( hr == DI_OK, "IDirectInputDevice8_SetProperty DIPROP_BUFFERSIZE returned %#x\n", hr ); + ok( hr == DI_OK, "SetProperty DIPROP_BUFFERSIZE returned %#x\n", hr ); hr = IDirectInputDevice8_Acquire( device ); - ok( hr == DI_OK, "IDirectInputDevice8_Unacquire returned: %#x\n", hr ); + ok( hr == DI_OK, "Unacquire returned: %#x\n", hr ); send_hid_input( file, &injected_input[1], sizeof(*injected_input) ); res = WaitForSingleObject( event, 100 ); @@ -4275,14 +4275,14 @@ static void test_simple_joystick(void) res = 1; hr = IDirectInputDevice8_GetDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, DIGDD_PEEK ); - ok( hr == DI_OK, "IDirectInputDevice8_GetDeviceData returned %#x\n", hr ); + ok( hr == DI_OK, "GetDeviceData returned %#x\n", hr ); ok( res == 1, "got %u expected %u\n", res, 1 ); check_member( objdata[0], expect_objdata[0], "%#x", dwOfs ); check_member( objdata[0], expect_objdata[0], "%#x", dwData ); ok( objdata[0].uAppData == -1, "got %p, expected %p\n", (void *)objdata[0].uAppData, (void *)-1 ); res = 4; hr = IDirectInputDevice8_GetDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, 0 ); - ok( hr == DI_OK, "IDirectInputDevice8_GetDeviceData returned %#x\n", hr ); + ok( hr == DI_OK, "GetDeviceData returned %#x\n", hr ); ok( res == 4, "got %u expected %u\n", res, 4 ); for (i = 0; i < 4; ++i) { @@ -4304,7 +4304,7 @@ static void test_simple_joystick(void) res = 1; hr = IDirectInputDevice8_GetDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, 0 ); - ok( hr == DI_BUFFEROVERFLOW, "IDirectInputDevice8_GetDeviceData returned %#x\n", hr ); + ok( hr == DI_BUFFEROVERFLOW, "GetDeviceData returned %#x\n", hr ); ok( res == 1, "got %u expected %u\n", res, 1 ); todo_wine check_member( objdata[0], expect_objdata[5], "%#x", dwOfs ); @@ -4313,7 +4313,7 @@ static void test_simple_joystick(void) ok( objdata[0].uAppData == -1, "got %p, expected %p\n", (void *)objdata[0].uAppData, (void *)-1 ); res = ARRAY_SIZE(objdata); hr = IDirectInputDevice8_GetDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, 0 ); - ok( hr == DI_OK, "IDirectInputDevice8_GetDeviceData returned %#x\n", hr ); + ok( hr == DI_OK, "GetDeviceData returned %#x\n", hr ); ok( res == 8, "got %u expected %u\n", res, 8 ); for (i = 0; i < 8; ++i) { @@ -4332,7 +4332,7 @@ static void test_simple_joystick(void) ResetEvent( event ); hr = IDirectInputDevice8_GetDeviceState( device, sizeof(DIJOYSTATE2), &state ); - ok( hr == DI_OK, "IDirectInputDevice8_GetDeviceState returned: %#x\n", hr ); + ok( hr == DI_OK, "GetDeviceState returned: %#x\n", hr ); check_member( state, expect_state[3], "%d", lX ); check_member( state, expect_state[3], "%d", lY ); check_member( state, expect_state[3], "%d", lZ ); @@ -4348,30 +4348,30 @@ static void test_simple_joystick(void) prop_range.lMin = 1000; prop_range.lMax = 51000; hr = IDirectInputDevice8_SetProperty( device, DIPROP_RANGE, &prop_range.diph ); - ok( hr == DI_OK, "IDirectInputDevice8_SetProperty DIPROP_RANGE returned %#x\n", hr ); + ok( hr == DI_OK, "SetProperty DIPROP_RANGE returned %#x\n", hr ); prop_range.diph.dwHow = DIPH_BYUSAGE; prop_range.diph.dwObj = MAKELONG( HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC ); prop_range.lMin = -4000; prop_range.lMax = -14000; hr = IDirectInputDevice8_SetProperty( device, DIPROP_RANGE, &prop_range.diph ); - ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SetProperty DIPROP_RANGE returned %#x\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "SetProperty DIPROP_RANGE returned %#x\n", hr ); prop_range.lMin = -14000; prop_range.lMax = -4000; hr = IDirectInputDevice8_SetProperty( device, DIPROP_RANGE, &prop_range.diph ); - ok( hr == DI_OK, "IDirectInputDevice8_SetProperty DIPROP_RANGE returned %#x\n", hr ); + ok( hr == DI_OK, "SetProperty DIPROP_RANGE returned %#x\n", hr ); prop_range.diph.dwHow = DIPH_DEVICE; prop_range.diph.dwObj = 0; prop_range.lMin = 0xdeadbeef; prop_range.lMax = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_RANGE, &prop_range.diph ); - ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_GetProperty DIPROP_RANGE returned %#x\n", hr ); + ok( hr == DIERR_UNSUPPORTED, "GetProperty DIPROP_RANGE returned %#x\n", hr ); prop_range.diph.dwHow = DIPH_BYUSAGE; prop_range.diph.dwObj = MAKELONG( HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC ); prop_range.lMin = 0xdeadbeef; prop_range.lMax = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_RANGE, &prop_range.diph ); - ok( hr == DI_OK, "IDirectInputDevice8_GetProperty DIPROP_RANGE returned %#x\n", hr ); + ok( hr == DI_OK, "GetProperty DIPROP_RANGE returned %#x\n", hr ); ok( prop_range.lMin == -14000, "got %d expected %d\n", prop_range.lMin, -14000 ); ok( prop_range.lMax == -4000, "got %d expected %d\n", prop_range.lMax, -4000 ); prop_range.diph.dwHow = DIPH_BYUSAGE; @@ -4379,12 +4379,12 @@ static void test_simple_joystick(void) prop_range.lMin = 0xdeadbeef; prop_range.lMax = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_RANGE, &prop_range.diph ); - ok( hr == DI_OK, "IDirectInputDevice8_GetProperty DIPROP_RANGE returned %#x\n", hr ); + ok( hr == DI_OK, "GetProperty DIPROP_RANGE returned %#x\n", hr ); ok( prop_range.lMin == 1000, "got %d expected %d\n", prop_range.lMin, 1000 ); ok( prop_range.lMax == 51000, "got %d expected %d\n", prop_range.lMax, 51000 ); hr = IDirectInputDevice8_GetDeviceState( device, sizeof(DIJOYSTATE2), &state ); - ok( hr == DI_OK, "IDirectInputDevice8_GetDeviceState returned: %#x\n", hr ); + ok( hr == DI_OK, "GetDeviceState returned: %#x\n", hr ); check_member( state, expect_state_abs[1], "%d", lX ); check_member( state, expect_state_abs[1], "%d", lY ); check_member( state, expect_state_abs[1], "%d", lZ ); @@ -4396,118 +4396,118 @@ static void test_simple_joystick(void) check_member( state, expect_state_abs[1], "%#x", rgbButtons[2] ); hr = IDirectInputDevice8_SetProperty( device, NULL, NULL ); - ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SetProperty returned %#x\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "SetProperty returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, &GUID_NULL, NULL ); - ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SetProperty returned %#x\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "SetProperty returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_VIDPID, NULL ); - ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SetProperty returned %#x\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "SetProperty returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_VIDPID, &prop_string.diph ); - ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SetProperty returned %#x\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "SetProperty returned %#x\n", hr ); prop_dword.diph.dwHow = DIPH_DEVICE; prop_dword.diph.dwObj = 0; prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_SetProperty( device, DIPROP_VIDPID, &prop_dword.diph ); - ok( hr == DIERR_READONLY, "IDirectInputDevice8_SetProperty DIPROP_VIDPID returned %#x\n", hr ); + ok( hr == DIERR_READONLY, "SetProperty DIPROP_VIDPID returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_GUIDANDPATH, &prop_guid_path.diph ); - ok( hr == DIERR_READONLY, "IDirectInputDevice8_SetProperty DIPROP_GUIDANDPATH returned %#x\n", hr ); + ok( hr == DIERR_READONLY, "SetProperty DIPROP_GUIDANDPATH returned %#x\n", hr ); prop_string.diph.dwHow = DIPH_DEVICE; prop_string.diph.dwObj = 0; wcscpy( prop_string.wsz, L"instance name" ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_INSTANCENAME, &prop_string.diph ); - ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_SetProperty DIPROP_INSTANCENAME returned %#x\n", hr ); + ok( hr == DIERR_UNSUPPORTED, "SetProperty DIPROP_INSTANCENAME returned %#x\n", hr ); wcscpy( prop_string.wsz, L"product name" ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_PRODUCTNAME, &prop_string.diph ); todo_wine - ok( hr == DI_OK, "IDirectInputDevice8_SetProperty DIPROP_PRODUCTNAME returned %#x\n", hr ); + ok( hr == DI_OK, "SetProperty DIPROP_PRODUCTNAME returned %#x\n", hr ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_PRODUCTNAME, &prop_string.diph ); - ok( hr == DI_OK, "IDirectInputDevice8_GetProperty DIPROP_PRODUCTNAME returned %#x\n", hr ); + ok( hr == DI_OK, "GetProperty DIPROP_PRODUCTNAME returned %#x\n", hr ); todo_wine ok( !wcscmp( prop_string.wsz, expect_devinst.tszProductName ), "got product %s\n", debugstr_w(prop_string.wsz) ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_TYPENAME, &prop_string.diph ); - ok( hr == DIERR_READONLY, "IDirectInputDevice8_SetProperty DIPROP_TYPENAME returned %#x\n", hr ); + ok( hr == DIERR_READONLY, "SetProperty DIPROP_TYPENAME returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_USERNAME, &prop_string.diph ); - ok( hr == DIERR_READONLY, "IDirectInputDevice8_SetProperty DIPROP_USERNAME returned %#x\n", hr ); + ok( hr == DIERR_READONLY, "SetProperty DIPROP_USERNAME returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_FFLOAD, &prop_dword.diph ); - ok( hr == DIERR_READONLY, "IDirectInputDevice8_SetProperty DIPROP_FFLOAD returned %#x\n", hr ); + ok( hr == DIERR_READONLY, "SetProperty DIPROP_FFLOAD returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_GRANULARITY, &prop_dword.diph ); - ok( hr == DIERR_READONLY, "IDirectInputDevice8_SetProperty DIPROP_GRANULARITY returned %#x\n", hr ); + ok( hr == DIERR_READONLY, "SetProperty DIPROP_GRANULARITY returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_JOYSTICKID, &prop_dword.diph ); todo_wine - ok( hr == DIERR_ACQUIRED, "IDirectInputDevice8_SetProperty DIPROP_JOYSTICKID returned %#x\n", hr ); + ok( hr == DIERR_ACQUIRED, "SetProperty DIPROP_JOYSTICKID returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_AXISMODE, &prop_dword.diph ); - ok( hr == DIERR_ACQUIRED, "IDirectInputDevice8_SetProperty DIPROP_AXISMODE returned %#x\n", hr ); + ok( hr == DIERR_ACQUIRED, "SetProperty DIPROP_AXISMODE returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_BUFFERSIZE, &prop_dword.diph ); - ok( hr == DIERR_ACQUIRED, "IDirectInputDevice8_SetProperty DIPROP_BUFFERSIZE returned %#x\n", hr ); + ok( hr == DIERR_ACQUIRED, "SetProperty DIPROP_BUFFERSIZE returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_AUTOCENTER, &prop_dword.diph ); - ok( hr == DIERR_ACQUIRED, "IDirectInputDevice8_SetProperty DIPROP_AUTOCENTER returned %#x\n", hr ); + ok( hr == DIERR_ACQUIRED, "SetProperty DIPROP_AUTOCENTER returned %#x\n", hr ); prop_pointer.diph.dwHow = DIPH_BYUSAGE; prop_pointer.diph.dwObj = MAKELONG( HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_APPDATA, &prop_pointer.diph ); todo_wine - ok( hr == DIERR_ACQUIRED, "IDirectInputDevice8_SetProperty DIPROP_APPDATA returned %#x\n", hr ); + ok( hr == DIERR_ACQUIRED, "SetProperty DIPROP_APPDATA returned %#x\n", hr ); prop_dword.diph.dwHow = DIPH_DEVICE; prop_dword.diph.dwObj = 0; prop_dword.dwData = 10001; hr = IDirectInputDevice8_SetProperty( device, DIPROP_DEADZONE, &prop_dword.diph ); - ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SetProperty DIPROP_DEADZONE returned %#x\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "SetProperty DIPROP_DEADZONE returned %#x\n", hr ); hr = IDirectInputDevice8_SetProperty( device, DIPROP_SATURATION, &prop_dword.diph ); - ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SetProperty DIPROP_SATURATION returned %#x\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "SetProperty DIPROP_SATURATION returned %#x\n", hr ); prop_dword.dwData = 1000; hr = IDirectInputDevice8_SetProperty( device, DIPROP_DEADZONE, &prop_dword.diph ); - ok( hr == DI_OK, "IDirectInputDevice8_SetProperty DIPROP_DEADZONE returned %#x\n", hr ); + ok( hr == DI_OK, "SetProperty DIPROP_DEADZONE returned %#x\n", hr ); prop_dword.dwData = 6000; hr = IDirectInputDevice8_SetProperty( device, DIPROP_SATURATION, &prop_dword.diph ); - ok( hr == DI_OK, "IDirectInputDevice8_SetProperty DIPROP_SATURATION returned %#x\n", hr ); + ok( hr == DI_OK, "SetProperty DIPROP_SATURATION returned %#x\n", hr ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_DEADZONE, &prop_dword.diph ); - ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_GetProperty DIPROP_DEADZONE returned %#x\n", hr ); + ok( hr == DIERR_UNSUPPORTED, "GetProperty DIPROP_DEADZONE returned %#x\n", hr ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_SATURATION, &prop_dword.diph ); - ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_GetProperty DIPROP_SATURATION returned %#x\n", hr ); + ok( hr == DIERR_UNSUPPORTED, "GetProperty DIPROP_SATURATION returned %#x\n", hr ); prop_dword.diph.dwHow = DIPH_BYUSAGE; prop_dword.diph.dwObj = MAKELONG( HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC ); prop_dword.dwData = 2000; hr = IDirectInputDevice8_SetProperty( device, DIPROP_DEADZONE, &prop_dword.diph ); - ok( hr == DI_OK, "IDirectInputDevice8_SetProperty DIPROP_DEADZONE returned %#x\n", hr ); + ok( hr == DI_OK, "SetProperty DIPROP_DEADZONE returned %#x\n", hr ); ok( prop_dword.dwData == 2000, "got %u expected %u\n", prop_dword.dwData, 2000 ); prop_dword.dwData = 7000; hr = IDirectInputDevice8_SetProperty( device, DIPROP_SATURATION, &prop_dword.diph ); - ok( hr == DI_OK, "IDirectInputDevice8_SetProperty DIPROP_SATURATION returned %#x\n", hr ); + ok( hr == DI_OK, "SetProperty DIPROP_SATURATION returned %#x\n", hr ); prop_dword.diph.dwHow = DIPH_BYUSAGE; prop_dword.diph.dwObj = MAKELONG( HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC ); prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_DEADZONE, &prop_dword.diph ); - ok( hr == DI_OK, "IDirectInputDevice8_GetProperty DIPROP_DEADZONE returned %#x\n", hr ); + ok( hr == DI_OK, "GetProperty DIPROP_DEADZONE returned %#x\n", hr ); ok( prop_dword.dwData == 2000, "got %u expected %u\n", prop_dword.dwData, 2000 ); prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_SATURATION, &prop_dword.diph ); - ok( hr == DI_OK, "IDirectInputDevice8_GetProperty DIPROP_SATURATION returned %#x\n", hr ); + ok( hr == DI_OK, "GetProperty DIPROP_SATURATION returned %#x\n", hr ); ok( prop_dword.dwData == 7000, "got %u expected %u\n", prop_dword.dwData, 7000 ); prop_dword.diph.dwHow = DIPH_BYUSAGE; prop_dword.diph.dwObj = MAKELONG( HID_USAGE_GENERIC_Y, HID_USAGE_PAGE_GENERIC ); prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_DEADZONE, &prop_dword.diph ); - ok( hr == DI_OK, "IDirectInputDevice8_GetProperty DIPROP_DEADZONE returned %#x\n", hr ); + ok( hr == DI_OK, "GetProperty DIPROP_DEADZONE returned %#x\n", hr ); ok( prop_dword.dwData == 1000, "got %u expected %u\n", prop_dword.dwData, 1000 ); prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_SATURATION, &prop_dword.diph ); - ok( hr == DI_OK, "IDirectInputDevice8_GetProperty DIPROP_SATURATION returned %#x\n", hr ); + ok( hr == DI_OK, "GetProperty DIPROP_SATURATION returned %#x\n", hr ); ok( prop_dword.dwData == 6000, "got %u expected %u\n", prop_dword.dwData, 6000 ); for (i = 0; i < ARRAY_SIZE(injected_input); ++i) { winetest_push_context( "state[%d]", i ); hr = IDirectInputDevice8_GetDeviceState( device, sizeof(DIJOYSTATE2), &state ); - ok( hr == DI_OK, "IDirectInputDevice8_GetDeviceState returned: %#x\n", hr ); + ok( hr == DI_OK, "GetDeviceState returned: %#x\n", hr ); if (broken( state.lX == -10750 )) win_skip( "Ignoring 32-bit rounding\n" ); else { @@ -4532,7 +4532,7 @@ static void test_simple_joystick(void) } hr = IDirectInputDevice8_GetDeviceState( device, sizeof(DIJOYSTATE2), &state ); - ok( hr == DI_OK, "IDirectInputDevice8_GetDeviceState returned: %#x\n", hr ); + ok( hr == DI_OK, "GetDeviceState returned: %#x\n", hr ); winetest_push_context( "state[%d]", i ); check_member( state, expect_state_abs[i], "%d", lX ); check_member( state, expect_state_abs[i], "%d", lY ); @@ -4546,56 +4546,56 @@ static void test_simple_joystick(void) winetest_pop_context(); hr = IDirectInputDevice8_Unacquire( device ); - ok( hr == DI_OK, "IDirectInputDevice8_Unacquire returned: %#x\n", hr ); + ok( hr == DI_OK, "Unacquire returned: %#x\n", hr ); prop_dword.diph.dwHow = DIPH_DEVICE; prop_dword.diph.dwObj = 0; hr = IDirectInputDevice8_SetProperty( device, DIPROP_JOYSTICKID, &prop_dword.diph ); - ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_SetProperty DIPROP_JOYSTICKID returned %#x\n", hr ); + ok( hr == DIERR_UNSUPPORTED, "SetProperty DIPROP_JOYSTICKID returned %#x\n", hr ); prop_dword.dwData = 0x1000; hr = IDirectInputDevice8_SetProperty( device, DIPROP_BUFFERSIZE, &prop_dword.diph ); - ok( hr == DI_OK, "IDirectInputDevice8_SetProperty DIPROP_BUFFERSIZE returned %#x\n", hr ); + ok( hr == DI_OK, "SetProperty DIPROP_BUFFERSIZE returned %#x\n", hr ); prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_SetProperty( device, DIPROP_AUTOCENTER, &prop_dword.diph ); - ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SetProperty DIPROP_AUTOCENTER returned %#x\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "SetProperty DIPROP_AUTOCENTER returned %#x\n", hr ); prop_dword.dwData = DIPROPAUTOCENTER_ON; hr = IDirectInputDevice8_SetProperty( device, DIPROP_AUTOCENTER, &prop_dword.diph ); - ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_SetProperty DIPROP_AUTOCENTER returned %#x\n", hr ); + ok( hr == DIERR_UNSUPPORTED, "SetProperty DIPROP_AUTOCENTER returned %#x\n", hr ); prop_pointer.diph.dwHow = DIPH_BYUSAGE; prop_pointer.diph.dwObj = MAKELONG( HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC ); prop_pointer.uData = 0xfeedcafe; hr = IDirectInputDevice8_SetProperty( device, DIPROP_APPDATA, &prop_pointer.diph ); todo_wine - ok( hr == DI_OK, "IDirectInputDevice8_SetProperty DIPROP_APPDATA returned %#x\n", hr ); + ok( hr == DI_OK, "SetProperty DIPROP_APPDATA returned %#x\n", hr ); prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_SetProperty( device, DIPROP_AXISMODE, &prop_dword.diph ); todo_wine - ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SetProperty DIPROP_AXISMODE returned %#x\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "SetProperty DIPROP_AXISMODE returned %#x\n", hr ); prop_dword.dwData = DIPROPAXISMODE_REL; hr = IDirectInputDevice8_SetProperty( device, DIPROP_AXISMODE, &prop_dword.diph ); - ok( hr == DI_OK, "IDirectInputDevice8_SetProperty DIPROP_AXISMODE returned %#x\n", hr ); + ok( hr == DI_OK, "SetProperty DIPROP_AXISMODE returned %#x\n", hr ); hr = IDirectInputDevice8_Acquire( device ); - ok( hr == DI_OK, "IDirectInputDevice8_Unacquire returned: %#x\n", hr ); + ok( hr == DI_OK, "Unacquire returned: %#x\n", hr ); prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_AXISMODE, &prop_dword.diph ); todo_wine - ok( hr == DI_OK, "IDirectInputDevice8_GetProperty DIPROP_AXISMODE returned %#x\n", hr ); + ok( hr == DI_OK, "GetProperty DIPROP_AXISMODE returned %#x\n", hr ); todo_wine ok( prop_dword.dwData == DIPROPAXISMODE_REL, "got %u expected %u\n", prop_dword.dwData, DIPROPAXISMODE_REL ); prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_BUFFERSIZE, &prop_dword.diph ); - ok( hr == DI_OK, "IDirectInputDevice8_GetProperty DIPROP_BUFFERSIZE returned %#x\n", hr ); + ok( hr == DI_OK, "GetProperty DIPROP_BUFFERSIZE returned %#x\n", hr ); ok( prop_dword.dwData == 0x1000, "got %#x expected %#x\n", prop_dword.dwData, 0x1000 ); prop_pointer.diph.dwHow = DIPH_BYUSAGE; prop_pointer.diph.dwObj = MAKELONG( HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_APPDATA, &prop_pointer.diph ); todo_wine - ok( hr == DI_OK, "IDirectInputDevice8_GetProperty DIPROP_APPDATA returned %#x\n", hr ); + ok( hr == DI_OK, "GetProperty DIPROP_APPDATA returned %#x\n", hr ); ok( prop_pointer.uData == 0xfeedcafe, "got %p expected %p\n", (void *)prop_pointer.uData, (void *)0xfeedcafe ); prop_dword.diph.dwHow = DIPH_DEVICE; @@ -4603,28 +4603,28 @@ static void test_simple_joystick(void) prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_SetProperty( device, DIPROP_FFGAIN, &prop_dword.diph ); todo_wine - ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SetProperty DIPROP_FFGAIN returned %#x\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "SetProperty DIPROP_FFGAIN returned %#x\n", hr ); prop_dword.dwData = 1000; hr = IDirectInputDevice8_SetProperty( device, DIPROP_FFGAIN, &prop_dword.diph ); todo_wine - ok( hr == DI_OK, "IDirectInputDevice8_SetProperty DIPROP_FFGAIN returned %#x\n", hr ); + ok( hr == DI_OK, "SetProperty DIPROP_FFGAIN returned %#x\n", hr ); prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_SetProperty( device, DIPROP_CALIBRATION, &prop_dword.diph ); todo_wine - ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SetProperty DIPROP_CALIBRATION returned %#x\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "SetProperty DIPROP_CALIBRATION returned %#x\n", hr ); prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_SetProperty( device, DIPROP_DEADZONE, &prop_dword.diph ); - ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SetProperty DIPROP_DEADZONE returned %#x\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "SetProperty DIPROP_DEADZONE returned %#x\n", hr ); prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_SetProperty( device, DIPROP_SATURATION, &prop_dword.diph ); - ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SetProperty DIPROP_SATURATION returned %#x\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "SetProperty DIPROP_SATURATION returned %#x\n", hr ); for (i = 0; i < ARRAY_SIZE(injected_input); ++i) { winetest_push_context( "state[%d]", i ); hr = IDirectInputDevice8_GetDeviceState( device, sizeof(DIJOYSTATE2), &state ); - ok( hr == DI_OK, "IDirectInputDevice8_GetDeviceState returned: %#x\n", hr ); + ok( hr == DI_OK, "GetDeviceState returned: %#x\n", hr ); todo_wine check_member( state, expect_state_rel[i], "%d", lX ); todo_wine @@ -4648,7 +4648,7 @@ static void test_simple_joystick(void) } hr = IDirectInputDevice8_GetDeviceState( device, sizeof(DIJOYSTATE2), &state ); - ok( hr == DI_OK, "IDirectInputDevice8_GetDeviceState returned: %#x\n", hr ); + ok( hr == DI_OK, "GetDeviceState returned: %#x\n", hr ); winetest_push_context( "state[%d]", i ); todo_wine check_member( state, expect_state_rel[i], "%d", lX ); @@ -4665,63 +4665,63 @@ static void test_simple_joystick(void) winetest_pop_context(); hr = IDirectInputDevice8_GetForceFeedbackState( device, NULL ); - ok( hr == E_POINTER, "IDirectInputDevice8_GetForceFeedbackState returned %#x\n", hr ); + ok( hr == E_POINTER, "GetForceFeedbackState returned %#x\n", hr ); res = 0xdeadbeef; hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); - ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_GetForceFeedbackState returned %#x\n", hr ); + ok( hr == DIERR_UNSUPPORTED, "GetForceFeedbackState returned %#x\n", hr ); hr = IDirectInputDevice8_SendForceFeedbackCommand( device, 0xdeadbeef ); - ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SendForceFeedbackCommand returned %#x\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "SendForceFeedbackCommand returned %#x\n", hr ); hr = IDirectInputDevice8_SendForceFeedbackCommand( device, DISFFC_RESET ); - ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_SendForceFeedbackCommand returned %#x\n", hr ); + ok( hr == DIERR_UNSUPPORTED, "SendForceFeedbackCommand returned %#x\n", hr ); objdata[0].dwOfs = 0xd; objdata[0].dwData = 0x80; res = 1; hr = IDirectInputDevice8_SendDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, 0xdeadbeef ); todo_wine - ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SendDeviceData returned %#x\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "SendDeviceData returned %#x\n", hr ); res = 1; hr = IDirectInputDevice8_SendDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, 1 /*DISDD_CONTINUE*/ ); todo_wine - ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SendDeviceData returned %#x\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "SendDeviceData returned %#x\n", hr ); res = 1; hr = IDirectInputDevice8_SendDeviceData( device, sizeof(DIDEVICEOBJECTDATA), objdata, &res, 0 ); todo_wine - ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SendDeviceData returned %#x\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "SendDeviceData returned %#x\n", hr ); hr = IDirectInputDevice8_CreateEffect( device, &GUID_Sine, NULL, NULL, NULL ); - ok( hr == E_POINTER, "IDirectInputDevice8_CreateEffect returned %#x\n", hr ); + ok( hr == E_POINTER, "CreateEffect returned %#x\n", hr ); hr = IDirectInputDevice8_CreateEffect( device, NULL, NULL, &effect, NULL ); - ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_CreateEffect returned %#x\n", hr ); + ok( hr == DIERR_UNSUPPORTED, "CreateEffect returned %#x\n", hr ); hr = IDirectInputDevice8_CreateEffect( device, &GUID_NULL, NULL, &effect, NULL ); - ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_CreateEffect returned %#x\n", hr ); + ok( hr == DIERR_UNSUPPORTED, "CreateEffect returned %#x\n", hr ); hr = IDirectInputDevice8_CreateEffect( device, &GUID_Sine, NULL, &effect, NULL ); - ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_CreateEffect returned %#x\n", hr ); + ok( hr == DIERR_UNSUPPORTED, "CreateEffect returned %#x\n", hr ); hr = IDirectInputDevice8_Unacquire( device ); - ok( hr == DI_OK, "IDirectInputDevice8_Unacquire returned: %#x\n", hr ); + ok( hr == DI_OK, "Unacquire returned: %#x\n", hr ); hr = IDirectInputDevice8_CreateEffect( device, &GUID_Sine, NULL, &effect, NULL ); - ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_CreateEffect returned %#x\n", hr ); + ok( hr == DIERR_UNSUPPORTED, "CreateEffect returned %#x\n", hr ); hr = IDirectInputDevice8_EnumCreatedEffectObjects( device, NULL, effect, 0 ); - ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_EnumCreatedEffectObjects returned %#x\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "EnumCreatedEffectObjects returned %#x\n", hr ); hr = IDirectInputDevice8_EnumCreatedEffectObjects( device, check_no_created_effect_objects, effect, 0xdeadbeef ); - ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_EnumCreatedEffectObjects returned %#x\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "EnumCreatedEffectObjects returned %#x\n", hr ); hr = IDirectInputDevice8_EnumCreatedEffectObjects( device, check_no_created_effect_objects, (void *)0xdeadbeef, 0 ); - ok( hr == DI_OK, "IDirectInputDevice8_EnumCreatedEffectObjects returned %#x\n", hr ); + ok( hr == DI_OK, "EnumCreatedEffectObjects returned %#x\n", hr ); hr = IDirectInputDevice8_Escape( device, NULL ); todo_wine - ok( hr == E_POINTER, "IDirectInputDevice8_Escape returned: %#x\n", hr ); + ok( hr == E_POINTER, "Escape returned: %#x\n", hr ); hr = IDirectInputDevice8_Escape( device, &escape ); todo_wine - ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_Escape returned: %#x\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "Escape returned: %#x\n", hr ); escape.dwSize = sizeof(DIEFFESCAPE) + 1; hr = IDirectInputDevice8_Escape( device, &escape ); todo_wine - ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_Escape returned: %#x\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "Escape returned: %#x\n", hr ); escape.dwSize = sizeof(DIEFFESCAPE); escape.dwCommand = 0; escape.lpvInBuffer = buffer; @@ -4730,19 +4730,19 @@ static void test_simple_joystick(void) escape.cbOutBuffer = 10; hr = IDirectInputDevice8_Escape( device, &escape ); todo_wine - ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_Escape returned: %#x\n", hr ); + ok( hr == DIERR_UNSUPPORTED, "Escape returned: %#x\n", hr ); /* FIXME: we have to wait a bit because Wine DInput internal thread keeps a reference */ Sleep( 100 ); ref = IDirectInputDevice8_Release( device ); - ok( ref == 0, "IDirectInputDeviceW_Release returned %d\n", ref ); + ok( ref == 0, "Release returned %d\n", ref ); CloseHandle( event ); CloseHandle( file ); ref = IDirectInput8_Release( di ); - ok( ref == 0, "IDirectInput8_Release returned %d\n", ref ); + ok( ref == 0, "Release returned %d\n", ref ); done: pnp_driver_stop(); @@ -5030,7 +5030,7 @@ static BOOL test_device_types(void) } hr = IDirectInput8_EnumDevices( di, DI8DEVCLASS_ALL, find_test_device, &devinst, DIEDFL_ALLDEVICES ); - ok( hr == DI_OK, "IDirectInput8_EnumDevices returned: %#x\n", hr ); + ok( hr == DI_OK, "EnumDevices returned: %#x\n", hr ); if (!IsEqualGUID( &devinst.guidProduct, &expect_guid_product )) { win_skip( "device not found, skipping tests\n" ); @@ -5040,10 +5040,10 @@ static BOOL test_device_types(void) } hr = IDirectInput8_CreateDevice( di, &expect_guid_product, &device, NULL ); - ok( hr == DI_OK, "IDirectInput8_CreateDevice returned %#x\n", hr ); + ok( hr == DI_OK, "CreateDevice returned %#x\n", hr ); hr = IDirectInputDevice8_GetDeviceInfo( device, &devinst ); - ok( hr == DI_OK, "IDirectInputDevice8_GetDeviceInfo returned %#x\n", hr ); + ok( hr == DI_OK, "GetDeviceInfo returned %#x\n", hr ); check_member( devinst, expect_devinst[i], "%d", dwSize ); todo_wine check_member_guid( devinst, expect_devinst[i], guidInstance ); @@ -5058,7 +5058,7 @@ static BOOL test_device_types(void) check_member( devinst, expect_devinst[i], "%04x", wUsage ); hr = IDirectInputDevice8_GetCapabilities( device, &caps ); - ok( hr == DI_OK, "IDirectInputDevice8_GetCapabilities returned %#x\n", hr ); + ok( hr == DI_OK, "GetCapabilities returned %#x\n", hr ); check_member( caps, expect_caps[i], "%d", dwSize ); check_member( caps, expect_caps[i], "%#x", dwFlags ); check_member( caps, expect_caps[i], "%#x", dwDevType ); @@ -5072,10 +5072,10 @@ static BOOL test_device_types(void) check_member( caps, expect_caps[i], "%d", dwFFDriverVersion ); ref = IDirectInputDevice8_Release( device ); - ok( ref == 0, "IDirectInputDeviceW_Release returned %d\n", ref ); + ok( ref == 0, "Release returned %d\n", ref ); ref = IDirectInput8_Release( di ); - ok( ref == 0, "IDirectInput8_Release returned %d\n", ref ); + ok( ref == 0, "Release returned %d\n", ref ); done: pnp_driver_stop(); @@ -5095,29 +5095,29 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file ) ULONG ref; hr = IDirectInputDevice8_CreateEffect( device, &GUID_Sine, NULL, NULL, NULL ); - ok( hr == E_POINTER, "IDirectInputDevice8_CreateEffect returned %#x\n", hr ); + ok( hr == E_POINTER, "CreateEffect returned %#x\n", hr ); hr = IDirectInputDevice8_CreateEffect( device, NULL, NULL, &effect, NULL ); todo_wine - ok( hr == E_POINTER, "IDirectInputDevice8_CreateEffect returned %#x\n", hr ); + ok( hr == E_POINTER, "CreateEffect returned %#x\n", hr ); if (hr == DI_OK) IDirectInputEffect_Release( effect ); hr = IDirectInputDevice8_CreateEffect( device, &GUID_NULL, NULL, &effect, NULL ); todo_wine - ok( hr == DIERR_DEVICENOTREG, "IDirectInputDevice8_CreateEffect returned %#x\n", hr ); + ok( hr == DIERR_DEVICENOTREG, "CreateEffect returned %#x\n", hr ); if (hr == DI_OK) IDirectInputEffect_Release( effect ); hr = IDirectInputDevice8_CreateEffect( device, &GUID_Sine, NULL, &effect, NULL ); - ok( hr == DI_OK, "IDirectInputDevice8_CreateEffect returned %#x\n", hr ); + ok( hr == DI_OK, "CreateEffect returned %#x\n", hr ); if (hr != DI_OK) return; hr = IDirectInputDevice8_EnumCreatedEffectObjects( device, check_no_created_effect_objects, effect, 0xdeadbeef ); - ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_EnumCreatedEffectObjects returned %#x\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "EnumCreatedEffectObjects returned %#x\n", hr ); check_params.expect_effect = effect; hr = IDirectInputDevice8_EnumCreatedEffectObjects( device, check_created_effect_objects, &check_params, 0 ); - ok( hr == DI_OK, "IDirectInputDevice8_EnumCreatedEffectObjects returned %#x\n", hr ); + ok( hr == DI_OK, "EnumCreatedEffectObjects returned %#x\n", hr ); ok( check_params.count == 1, "got count %u, expected 1\n", check_params.count ); ref = IDirectInputEffect_Release( effect ); - ok( ref == 0, "IDirectInputDeviceW_Release returned %d\n", ref ); + ok( ref == 0, "Release returned %d\n", ref ); } static void test_force_feedback_joystick( void ) @@ -5664,7 +5664,7 @@ static void test_force_feedback_joystick( void ) } hr = IDirectInput8_EnumDevices( di, DI8DEVCLASS_ALL, find_test_device, &devinst, DIEDFL_ALLDEVICES ); - ok( hr == DI_OK, "IDirectInput8_EnumDevices returned: %#x\n", hr ); + ok( hr == DI_OK, "EnumDevices returned: %#x\n", hr ); if (!IsEqualGUID( &devinst.guidProduct, &expect_guid_product )) { win_skip( "device not found, skipping tests\n" ); @@ -5673,10 +5673,10 @@ static void test_force_feedback_joystick( void ) } hr = IDirectInput8_CreateDevice( di, &expect_guid_product, &device, NULL ); - ok( hr == DI_OK, "IDirectInput8_CreateDevice returned %#x\n", hr ); + ok( hr == DI_OK, "CreateDevice returned %#x\n", hr ); hr = IDirectInputDevice8_GetDeviceInfo( device, &devinst ); - ok( hr == DI_OK, "IDirectInputDevice8_GetDeviceInfo returned %#x\n", hr ); + ok( hr == DI_OK, "GetDeviceInfo returned %#x\n", hr ); check_member( devinst, expect_devinst, "%d", dwSize ); todo_wine check_member_guid( devinst, expect_devinst, guidInstance ); @@ -5692,7 +5692,7 @@ static void test_force_feedback_joystick( void ) caps.dwSize = sizeof(DIDEVCAPS); hr = IDirectInputDevice8_GetCapabilities( device, &caps ); - ok( hr == DI_OK, "IDirectInputDevice8_GetCapabilities returned %#x\n", hr ); + ok( hr == DI_OK, "GetCapabilities returned %#x\n", hr ); check_member( caps, expect_caps, "%d", dwSize ); check_member( caps, expect_caps, "%#x", dwFlags ); check_member( caps, expect_caps, "%#x", dwDevType ); @@ -5708,35 +5708,35 @@ static void test_force_feedback_joystick( void ) prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_FFGAIN, &prop_dword.diph ); todo_wine - ok( hr == DI_OK, "IDirectInputDevice8_GetProperty DIPROP_FFGAIN returned %#x\n", hr ); + ok( hr == DI_OK, "GetProperty DIPROP_FFGAIN returned %#x\n", hr ); todo_wine ok( prop_dword.dwData == 10000, "got %u expected %u\n", prop_dword.dwData, 10000 ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_FFLOAD, &prop_dword.diph ); todo_wine - ok( hr == DIERR_NOTEXCLUSIVEACQUIRED, "IDirectInputDevice8_GetProperty DIPROP_FFLOAD returned %#x\n", hr ); + ok( hr == DIERR_NOTEXCLUSIVEACQUIRED, "GetProperty DIPROP_FFLOAD returned %#x\n", hr ); hr = IDirectInputDevice8_EnumObjects( device, check_objects, &check_objects_params, DIDFT_ALL ); - ok( hr == DI_OK, "IDirectInputDevice8_EnumObjects returned %#x\n", hr ); + ok( hr == DI_OK, "EnumObjects returned %#x\n", hr ); ok( check_objects_params.index >= check_objects_params.expect_count, "missing %u objects\n", check_objects_params.expect_count - check_objects_params.index ); res = 0; hr = IDirectInputDevice8_EnumEffects( device, check_effect_count, &res, 0xfe ); - ok( hr == DI_OK, "IDirectInputDevice8_EnumEffects returned %#x\n", hr ); + ok( hr == DI_OK, "EnumEffects returned %#x\n", hr ); ok( res == 0, "got %u expected %u\n", res, 0 ); res = 0; hr = IDirectInputDevice8_EnumEffects( device, check_effect_count, &res, DIEFT_PERIODIC ); - ok( hr == DI_OK, "IDirectInputDevice8_EnumEffects returned %#x\n", hr ); + ok( hr == DI_OK, "EnumEffects returned %#x\n", hr ); ok( res == 1, "got %u expected %u\n", res, 1 ); hr = IDirectInputDevice8_EnumEffects( device, check_effects, &check_effects_params, DIEFT_ALL ); - ok( hr == DI_OK, "IDirectInputDevice8_EnumEffects returned %#x\n", hr ); + ok( hr == DI_OK, "EnumEffects returned %#x\n", hr ); ok( check_effects_params.index >= check_effects_params.expect_count, "missing %u effects\n", check_effects_params.expect_count - check_effects_params.index ); effectinfo.dwSize = sizeof(DIEFFECTINFOW); hr = IDirectInputDevice8_GetEffectInfo( device, &effectinfo, &GUID_Sine ); - ok( hr == DI_OK, "IDirectInputDevice8_GetEffectInfo returned %#x\n", hr ); + ok( hr == DI_OK, "GetEffectInfo returned %#x\n", hr ); check_member_guid( effectinfo, expect_effects[0], guid ); check_member( effectinfo, expect_effects[0], "%#x", dwEffType ); check_member( effectinfo, expect_effects[0], "%#x", dwStaticParams ); @@ -5744,10 +5744,10 @@ static void test_force_feedback_joystick( void ) check_member_wstr( effectinfo, expect_effects[0], tszName ); hr = IDirectInputDevice8_SetDataFormat( device, &c_dfDIJoystick2 ); - ok( hr == DI_OK, "IDirectInputDevice8_SetDataFormat returned: %#x\n", hr ); + ok( hr == DI_OK, "SetDataFormat returned: %#x\n", hr ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_GUIDANDPATH, &prop_guid_path.diph ); - ok( hr == DI_OK, "IDirectInputDevice8_GetProperty DIPROP_GUIDANDPATH returned %#x\n", hr ); + ok( hr == DI_OK, "GetProperty DIPROP_GUIDANDPATH returned %#x\n", hr ); file = CreateFileW( prop_guid_path.wszPath, FILE_READ_ACCESS | FILE_WRITE_ACCESS, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL ); @@ -5757,33 +5757,33 @@ static void test_force_feedback_joystick( void ) NULL, NULL, NULL, NULL ); hr = IDirectInputDevice8_SetCooperativeLevel( device, hwnd, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE ); - ok( hr == DI_OK, "IDirectInputDevice8_SetCooperativeLevel returned: %#x\n", hr ); + ok( hr == DI_OK, "SetCooperativeLevel returned: %#x\n", hr ); hr = IDirectInputDevice8_Acquire( device ); - ok( hr == DI_OK, "IDirectInputDevice8_Acquire returned: %#x\n", hr ); + ok( hr == DI_OK, "Acquire returned: %#x\n", hr ); prop_dword.diph.dwHow = DIPH_DEVICE; prop_dword.diph.dwObj = 0; prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_SetProperty( device, DIPROP_FFGAIN, &prop_dword.diph ); todo_wine - ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SetProperty DIPROP_FFGAIN returned %#x\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "SetProperty DIPROP_FFGAIN returned %#x\n", hr ); prop_dword.dwData = 1000; hr = IDirectInputDevice8_SetProperty( device, DIPROP_FFGAIN, &prop_dword.diph ); todo_wine - ok( hr == DI_OK, "IDirectInputDevice8_SetProperty DIPROP_FFGAIN returned %#x\n", hr ); + ok( hr == DI_OK, "SetProperty DIPROP_FFGAIN returned %#x\n", hr ); prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_SetProperty( device, DIPROP_FFLOAD, &prop_dword.diph ); - ok( hr == DIERR_READONLY, "IDirectInputDevice8_SetProperty DIPROP_FFLOAD returned %#x\n", hr ); + ok( hr == DIERR_READONLY, "SetProperty DIPROP_FFLOAD returned %#x\n", hr ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_FFLOAD, &prop_dword.diph ); todo_wine - ok( hr == DIERR_NOTEXCLUSIVEACQUIRED, "IDirectInputDevice8_GetProperty DIPROP_FFLOAD returned %#x\n", hr ); + ok( hr == DIERR_NOTEXCLUSIVEACQUIRED, "GetProperty DIPROP_FFLOAD returned %#x\n", hr ); hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); todo_wine - ok( hr == DIERR_NOTEXCLUSIVEACQUIRED, "IDirectInputDevice8_GetForceFeedbackState returned %#x\n", hr ); + ok( hr == DIERR_NOTEXCLUSIVEACQUIRED, "GetForceFeedbackState returned %#x\n", hr ); hr = IDirectInputDevice8_SendForceFeedbackCommand( device, DISFFC_RESET ); - ok( hr == DIERR_NOTEXCLUSIVEACQUIRED, "IDirectInputDevice8_SendForceFeedbackCommand returned %#x\n", hr ); + ok( hr == DIERR_NOTEXCLUSIVEACQUIRED, "SendForceFeedbackCommand returned %#x\n", hr ); escape.dwSize = sizeof(DIEFFESCAPE); escape.dwCommand = 0; @@ -5793,75 +5793,75 @@ static void test_force_feedback_joystick( void ) escape.cbOutBuffer = 10; hr = IDirectInputDevice8_Escape( device, &escape ); todo_wine - ok( hr == DIERR_NOTEXCLUSIVEACQUIRED, "IDirectInputDevice8_Escape returned: %#x\n", hr ); + ok( hr == DIERR_NOTEXCLUSIVEACQUIRED, "Escape returned: %#x\n", hr ); hr = IDirectInputDevice8_Unacquire( device ); - ok( hr == DI_OK, "IDirectInputDevice8_Unacquire returned: %#x\n", hr ); + ok( hr == DI_OK, "Unacquire returned: %#x\n", hr ); hr = IDirectInputDevice8_SetCooperativeLevel( device, hwnd, DISCL_BACKGROUND | DISCL_EXCLUSIVE ); - ok( hr == DI_OK, "IDirectInputDevice8_SetCooperativeLevel returned: %#x\n", hr ); + ok( hr == DI_OK, "SetCooperativeLevel returned: %#x\n", hr ); set_hid_expect( file, &expect_dc_reset, sizeof(expect_dc_reset) ); hr = IDirectInputDevice8_Acquire( device ); - ok( hr == DI_OK, "IDirectInputDevice8_Acquire returned: %#x\n", hr ); + ok( hr == DI_OK, "Acquire returned: %#x\n", hr ); set_hid_expect( file, NULL, 0 ); hr = IDirectInputDevice8_Escape( device, &escape ); todo_wine - ok( hr == DIERR_UNSUPPORTED, "IDirectInputDevice8_Escape returned: %#x\n", hr ); + ok( hr == DIERR_UNSUPPORTED, "Escape returned: %#x\n", hr ); prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_FFLOAD, &prop_dword.diph ); todo_wine - ok( hr == 0x80040301, "IDirectInputDevice8_GetProperty DIPROP_FFLOAD returned %#x\n", hr ); + ok( hr == 0x80040301, "GetProperty DIPROP_FFLOAD returned %#x\n", hr ); res = 0xdeadbeef; hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); todo_wine - ok( hr == 0x80040301, "IDirectInputDevice8_GetForceFeedbackState returned %#x\n", hr ); + ok( hr == 0x80040301, "GetForceFeedbackState returned %#x\n", hr ); hr = IDirectInputDevice8_SendForceFeedbackCommand( device, 0xdeadbeef ); - ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SendForceFeedbackCommand returned %#x\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "SendForceFeedbackCommand returned %#x\n", hr ); set_hid_expect( file, &expect_dc_reset, sizeof(expect_dc_reset) ); hr = IDirectInputDevice8_SendForceFeedbackCommand( device, DISFFC_RESET ); - ok( hr == DI_OK, "IDirectInputDevice8_SendForceFeedbackCommand returned %#x\n", hr ); + ok( hr == DI_OK, "SendForceFeedbackCommand returned %#x\n", hr ); set_hid_expect( file, NULL, 0 ); hr = IDirectInputDevice8_SendForceFeedbackCommand( device, DISFFC_STOPALL ); - ok( hr == HIDP_STATUS_USAGE_NOT_FOUND, "IDirectInputDevice8_SendForceFeedbackCommand returned %#x\n", hr ); + ok( hr == HIDP_STATUS_USAGE_NOT_FOUND, "SendForceFeedbackCommand returned %#x\n", hr ); hr = IDirectInputDevice8_SendForceFeedbackCommand( device, DISFFC_PAUSE ); - ok( hr == HIDP_STATUS_USAGE_NOT_FOUND, "IDirectInputDevice8_SendForceFeedbackCommand returned %#x\n", hr ); + ok( hr == HIDP_STATUS_USAGE_NOT_FOUND, "SendForceFeedbackCommand returned %#x\n", hr ); hr = IDirectInputDevice8_SendForceFeedbackCommand( device, DISFFC_CONTINUE ); - ok( hr == HIDP_STATUS_USAGE_NOT_FOUND, "IDirectInputDevice8_SendForceFeedbackCommand returned %#x\n", hr ); + ok( hr == HIDP_STATUS_USAGE_NOT_FOUND, "SendForceFeedbackCommand returned %#x\n", hr ); hr = IDirectInputDevice8_SendForceFeedbackCommand( device, DISFFC_SETACTUATORSON ); - ok( hr == HIDP_STATUS_USAGE_NOT_FOUND, "IDirectInputDevice8_SendForceFeedbackCommand returned %#x\n", hr ); + ok( hr == HIDP_STATUS_USAGE_NOT_FOUND, "SendForceFeedbackCommand returned %#x\n", hr ); hr = IDirectInputDevice8_SendForceFeedbackCommand( device, DISFFC_SETACTUATORSOFF ); - ok( hr == HIDP_STATUS_USAGE_NOT_FOUND, "IDirectInputDevice8_SendForceFeedbackCommand returned %#x\n", hr ); + ok( hr == HIDP_STATUS_USAGE_NOT_FOUND, "SendForceFeedbackCommand returned %#x\n", hr ); objdata.dwOfs = 0x1e; objdata.dwData = 0x80; res = 1; hr = IDirectInputDevice8_SendDeviceData( device, sizeof(DIDEVICEOBJECTDATA), &objdata, &res, 0 ); todo_wine - ok( hr == DIERR_INVALIDPARAM, "IDirectInputDevice8_SendDeviceData returned %#x\n", hr ); + ok( hr == DIERR_INVALIDPARAM, "SendDeviceData returned %#x\n", hr ); test_periodic_effect( device, file ); set_hid_expect( file, &expect_dc_reset, sizeof(expect_dc_reset) ); hr = IDirectInputDevice8_Unacquire( device ); - ok( hr == DI_OK, "IDirectInputDevice8_Unacquire returned: %#x\n", hr ); + ok( hr == DI_OK, "Unacquire returned: %#x\n", hr ); set_hid_expect( file, NULL, 0 ); /* FIXME: we have to wait a bit because Wine DInput internal thread keeps a reference */ Sleep( 100 ); ref = IDirectInputDevice8_Release( device ); - ok( ref == 0, "IDirectInputDeviceW_Release returned %d\n", ref ); + ok( ref == 0, "Release returned %d\n", ref ); DestroyWindow( hwnd ); CloseHandle( file ); ref = IDirectInput8_Release( di ); - ok( ref == 0, "IDirectInput8_Release returned %d\n", ref ); + ok( ref == 0, "Release returned %d\n", ref ); done: pnp_driver_stop(); -- 2.33.0

1 11

[PATCH 1/4] iphlpapi: Remove some unneeded system headers.
by Huw Davies 06 Oct '21

06 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index b2e996a6241..ae356dc7b8c 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -17,19 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -#include "config.h" - #include <stdarg.h> -#include <stdlib.h> -#include <stdio.h> -#include <sys/types.h> -#ifdef HAVE_NETINET_IN_H -# include <netinet/in.h> -#endif -#ifdef HAVE_ARPA_INET_H -# include <arpa/inet.h> -#endif #define NONAMELESSUNION #define NONAMELESSSTRUCT @@ -57,13 +45,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); -#ifndef IF_NAMESIZE -#define IF_NAMESIZE 16 -#endif - #ifndef INADDR_NONE #define INADDR_NONE ~0UL #endif +#define INADDR_ANY 0UL #define CHARS_IN_GUID 39 -- 2.23.0

1 1

[PATCH 01/19] dbghelp: don't expose SymTagExe or SymTagCompiland's address nor length in SymGetTypeInfo()
by Eric Pouech 06 Oct '21

06 Oct '21

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/type.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 70719cf6b7c..0baa9d72c32 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -158,11 +158,11 @@ BOOL symt_get_address(const struct symt* type, ULONG64* addr) case SymTagThunk: *addr = ((const struct symt_thunk*)type)->address; break; - case SymTagCompiland: - *addr = ((const struct symt_compiland*)type)->address; - break; default: FIXME("Unsupported sym-tag %s for get-address\n", symt_get_tag_str(type->tag)); + /* fall through */ + case SymTagExe: + case SymTagCompiland: return FALSE; } return TRUE; @@ -689,6 +689,8 @@ BOOL symt_get_info(struct module* module, const struct symt* type, FIXME("Unsupported sym-tag %s for get-length\n", symt_get_tag_str(type->tag)); /* fall through */ + case SymTagExe: + case SymTagCompiland: case SymTagFunctionType: return FALSE; }

1 18

[PATCH 5/5] comctl32/tests: Fix a treeview test failure when theming is on.
by Zhiyi Zhang 06 Oct '21

06 Oct '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/treeview.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 02d914c249c..0d245cf9d15 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -27,12 +27,17 @@ #include "winuser.h" #include "winnls.h" #include "winreg.h" -#include "commctrl.h" +#include "commctrl.h" +#include "uxtheme.h" +#include "vsstyle.h" #include "wine/test.h" #include "v6util.h" #include "msg.h" +static HTHEME (WINAPI *pGetWindowTheme)(HWND); +static BOOL (WINAPI *pIsThemeBackgroundPartiallyTransparent)(HTHEME, int, int); + static BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); static const char *TEST_CALLBACK_TEXT = "callback_text"; @@ -2121,6 +2126,8 @@ static void test_TVS_SINGLEEXPAND(void) static void test_WM_PAINT(void) { + BOOL is_glyph_transparent; + HTHEME htheme; HWND hTree; COLORREF clr; LONG ret; @@ -2144,7 +2151,11 @@ static void test_WM_PAINT(void) ok(ret == 0, "got %d\n", ret); clr = GetPixel(hdc, 1, 1); - ok(clr == RGB(255, 0, 0) || broken(clr == RGB(0, 0, 0)) /* win98 */, + htheme = pGetWindowTheme(hTree); + is_glyph_transparent = htheme && pIsThemeBackgroundPartiallyTransparent(htheme, TVP_GLYPH, 0); + ok(clr == RGB(255, 0, 0) || broken(clr == RGB(0, 0, 0)) /* win98 */ + /* When theming is on and treeview glyphs are transparent, parent window needs to be repainted */ + || (is_glyph_transparent && clr == GetSysColor(COLOR_WINDOW)), "got 0x%x\n", clr); ReleaseDC(hMainWnd, hdc); @@ -2945,9 +2956,13 @@ static void test_right_click(void) static void init_functions(void) { HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); + HMODULE hUxtheme = LoadLibraryA("uxtheme.dll"); -#define X(f) p##f = (void*)GetProcAddress(hComCtl32, #f); - X(InitCommonControlsEx); +#define X(module, f) p##f = (void*)GetProcAddress(module, #f); + X(hComCtl32, InitCommonControlsEx); + + X(hUxtheme, GetWindowTheme); + X(hUxtheme, IsThemeBackgroundPartiallyTransparent); #undef X } -- 2.30.2

1 0

[PATCH 4/5] comctl32/status: Do not use theme metrics to compute height.
by Zhiyi Zhang 06 Oct '21

06 Oct '21

Fix status test failures when theming is on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/status.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 7bc9ec4386f..9078e4a70bc 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -102,7 +102,6 @@ static inline LPCSTR debugstr_t(LPCWSTR text, BOOL isW) static UINT STATUSBAR_ComputeHeight(STATUS_INFO *infoPtr) { - HTHEME theme; UINT height; TEXTMETRICW tm; int margin; @@ -111,21 +110,6 @@ STATUSBAR_ComputeHeight(STATUS_INFO *infoPtr) margin = (tm.tmInternalLeading ? tm.tmInternalLeading : 2); height = max(tm.tmHeight + margin + 2*GetSystemMetrics(SM_CYBORDER), infoPtr->minHeight) + infoPtr->verticalBorder; - if ((theme = GetWindowTheme(infoPtr->Self))) - { - /* Determine bar height from theme such that the content area is - * textHeight pixels large */ - HDC hdc = GetDC(infoPtr->Self); - RECT r; - - SetRect(&r, 0, 0, 0, max(infoPtr->minHeight, tm.tmHeight)); - if (SUCCEEDED(GetThemeBackgroundExtent(theme, hdc, SP_PANE, 0, &r, &r))) - { - height = r.bottom - r.top; - } - ReleaseDC(infoPtr->Self, hdc); - } - TRACE(" textHeight=%d+%d, final height=%d\n", tm.tmHeight, tm.tmInternalLeading, height); return height; } -- 2.30.2

1 0

[PATCH 3/5] comctl32/tests: Delete unused headers.
by Zhiyi Zhang 06 Oct '21

06 Oct '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/rebar.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index 462782a1b11..d0b201a8763 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -18,11 +18,9 @@ */ #include <assert.h> -#include <stdarg.h> #include <windows.h> #include <commctrl.h> -#include <uxtheme.h> #include "wine/heap.h" #include "wine/test.h" -- 2.30.2

1 0

[PATCH 2/5] comctl32/rebar: Do not remove WS_BORDER when theming is on.
by Zhiyi Zhang 06 Oct '21

06 Oct '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/rebar.c | 17 +++---------- dlls/comctl32/tests/rebar.c | 50 +++++++++++++++++++++++++++++-------- 2 files changed, 42 insertions(+), 25 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 84390bd0b52..6a065514e60 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -2930,14 +2930,9 @@ REBAR_Create (REBAR_INFO *infoPtr, LPCREATESTRUCTW cs) cs->x, cs->y, cs->cx, cs->cy); } + OpenThemeData(infoPtr->hwndSelf, themeClass); + TRACE("created!\n"); - - if (OpenThemeData (infoPtr->hwndSelf, themeClass)) - { - /* native seems to clear WS_BORDER when themed */ - infoPtr->dwStyle &= ~WS_BORDER; - } - return 0; } @@ -3508,8 +3503,6 @@ REBAR_StyleChanged (REBAR_INFO *infoPtr, INT nType, const STYLESTRUCT *lpStyle) if (nType == GWL_STYLE) { infoPtr->orgStyle = infoPtr->dwStyle = lpStyle->styleNew; - if (GetWindowTheme (infoPtr->hwndSelf)) - infoPtr->dwStyle &= ~WS_BORDER; /* maybe it should be COMMON_STYLES like in toolbar */ if ((lpStyle->styleNew ^ lpStyle->styleOld) & CCS_VERT) REBAR_Layout(infoPtr); @@ -3522,11 +3515,7 @@ static LRESULT theme_changed (REBAR_INFO* infoPtr) { HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); CloseThemeData (theme); - theme = OpenThemeData (infoPtr->hwndSelf, themeClass); - /* WS_BORDER disappears when theming is enabled and reappears when - * disabled... */ - infoPtr->dwStyle &= ~WS_BORDER; - infoPtr->dwStyle |= theme ? 0 : (infoPtr->orgStyle & WS_BORDER); + OpenThemeData(infoPtr->hwndSelf, themeClass); return 0; } diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index 21b655b197f..462782a1b11 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -77,11 +77,11 @@ static void init_system_font_height(void) { system_font_height = tm.tmHeight; } -static HWND create_rebar_control(void) +static HWND create_rebar_control(DWORD style) { HWND hwnd; - hwnd = CreateWindowA(REBARCLASSNAMEA, NULL, WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, + hwnd = CreateWindowA(REBARCLASSNAMEA, NULL, style | WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, hMainWnd, (HMENU)17, GetModuleHandleA(NULL), NULL); ok(hwnd != NULL, "Failed to create Rebar\n"); @@ -499,7 +499,7 @@ static void test_layout(void) rbsize_results_init(); - hRebar = create_rebar_control(); + hRebar = create_rebar_control(0); check_sizes(); rbi.cbSize = REBARBANDINFOA_V6_SIZE; rbi.fMask = RBBIM_SIZE | RBBIM_CHILDSIZE | RBBIM_CHILD; @@ -559,7 +559,7 @@ static void test_layout(void) DestroyWindow(hRebar); - hRebar = create_rebar_control(); + hRebar = create_rebar_control(0); add_band_w(hRebar, "ABC", 70, 40, 100); add_band_w(hRebar, NULL, 40, 70, 100); add_band_w(hRebar, NULL, 170, 240, 100); @@ -602,7 +602,7 @@ static void test_layout(void) DestroyWindow(hRebar); /* VARHEIGHT resizing test on a horizontal rebar */ - hRebar = create_rebar_control(); + hRebar = create_rebar_control(0); SetWindowLongA(hRebar, GWL_STYLE, GetWindowLongA(hRebar, GWL_STYLE) | RBS_AUTOSIZE); check_sizes(); rbi.fMask = RBBIM_CHILD | RBBIM_CHILDSIZE | RBBIM_SIZE | RBBIM_STYLE; @@ -630,7 +630,7 @@ static void test_layout(void) DestroyWindow(hRebar); /* VARHEIGHT resizing on a vertical rebar */ - hRebar = create_rebar_control(); + hRebar = create_rebar_control(0); SetWindowLongA(hRebar, GWL_STYLE, GetWindowLongA(hRebar, GWL_STYLE) | CCS_VERT | RBS_AUTOSIZE); check_sizes(); rbi.fMask = RBBIM_CHILD | RBBIM_CHILDSIZE | RBBIM_SIZE | RBBIM_STYLE; @@ -661,7 +661,7 @@ static void test_layout(void) pImageList_Destroy(himl); /* One hidden band. */ - hRebar = create_rebar_control(); + hRebar = create_rebar_control(0); rbi.cbSize = REBARBANDINFOA_V6_SIZE; rbi.fMask = RBBIM_STYLE | RBBIM_SIZE | RBBIM_CHILDSIZE | RBBIM_CHILD; @@ -966,7 +966,7 @@ static void test_bandinfo(void) CHAR szABCD[] = "ABCD"; HWND hRebar; - hRebar = create_rebar_control(); + hRebar = create_rebar_control(0); rb.cbSize = REBARBANDINFOA_V6_SIZE; rb.fMask = 0; if (!SendMessageA(hRebar, RB_INSERTBANDA, 0, (LPARAM)&rb)) @@ -1027,7 +1027,7 @@ static void test_colors(void) HWND hRebar; REBARBANDINFOA bi; - hRebar = create_rebar_control(); + hRebar = create_rebar_control(0); /* test default colors */ clr = SendMessageA(hRebar, RB_GETTEXTCOLOR, 0, 0); @@ -1106,7 +1106,7 @@ static void test_showband(void) REBARBANDINFOA rbi; BOOL ret; - hRebar = create_rebar_control(); + hRebar = create_rebar_control(0); /* no bands */ ret = SendMessageA(hRebar, RB_SHOWBAND, 0, TRUE); @@ -1135,7 +1135,7 @@ static void test_notification(void) MEASUREITEMSTRUCT mis; HWND rebar; - rebar = create_rebar_control(); + rebar = create_rebar_control(0); g_parent_measureitem = 0; SendMessageA(rebar, WM_MEASUREITEM, 0, (LPARAM)&mis); @@ -1144,6 +1144,33 @@ static void test_notification(void) DestroyWindow(rebar); } +static void test_style(void) +{ + STYLESTRUCT style_struct; + LONG style; + HWND hwnd; + RECT rect; + + /* WS_BORDER */ + hwnd = create_rebar_control(WS_BORDER); + ok(GetWindowLongW(hwnd, GWL_STYLE) & WS_BORDER, "Expected WS_BORDER.\n"); + + GetClientRect(hwnd, &rect); + SendMessageW(hwnd, WM_NCCALCSIZE, 0, (LPARAM)&rect); + ok(GetWindowLongW(hwnd, GWL_STYLE) & WS_BORDER, "Expected WS_BORDER.\n"); + + SendMessageW(hwnd, WM_THEMECHANGED, 0, 0); + style = GetWindowLongW(hwnd, GWL_STYLE); + ok(style & WS_BORDER, "Expected WS_BORDER.\n"); + + style_struct.styleOld = style; + style_struct.styleNew = style | WS_DLGFRAME; + SendMessageW(hwnd, WM_STYLECHANGED, (WPARAM)GWL_STYLE, (LPARAM)&style_struct); + ok(GetWindowLongW(hwnd, GWL_STYLE) & WS_BORDER, "Expected WS_BORDER.\n"); + + DestroyWindow(hwnd); +} + static void init_functions(void) { HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); @@ -1176,6 +1203,7 @@ START_TEST(rebar) test_layout(); test_resize(); + test_style(); out: PostQuitMessage(0); -- 2.30.2

1 0

[PATCH 1/5] comctl32/rebar: Do not adjust non-client size when themed.
by Zhiyi Zhang 06 Oct '21

06 Oct '21

Fix rebar test failures when theming is on. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/rebar.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index af35008b692..84390bd0b52 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -3207,19 +3207,13 @@ REBAR_MouseMove (REBAR_INFO *infoPtr, LPARAM lParam) static inline LRESULT REBAR_NCCalcSize (const REBAR_INFO *infoPtr, RECT *rect) { - HTHEME theme; - if (infoPtr->dwStyle & WS_BORDER) { rect->left = min(rect->left + GetSystemMetrics(SM_CXEDGE), rect->right); rect->right = max(rect->right - GetSystemMetrics(SM_CXEDGE), rect->left); rect->top = min(rect->top + GetSystemMetrics(SM_CYEDGE), rect->bottom); rect->bottom = max(rect->bottom - GetSystemMetrics(SM_CYEDGE), rect->top); } - else if ((theme = GetWindowTheme (infoPtr->hwndSelf))) - { - /* FIXME: should use GetThemeInt */ - rect->top = min(rect->top + 1, rect->bottom); - } + TRACE("new client=(%s)\n", wine_dbgstr_rect(rect)); return 0; } -- 2.30.2

1 0

[PATCH v2 00/22] ntdll: Relax the loader locking to match newer Windows behaviour.
by Paul Gofman 06 Oct '21

06 Oct '21

Changes from the previous version accross the patches: - use ldr_data_srw_lock instead of introducing a new one when modifying WINE_MODREF data with a shared loader lock. - protect cached_modref with ldr_data_srw_lock instead of introducing interlocked access; - remove redundant 'volatile' qualifier from locked_exclusive; - fix and improve tests, split them across the patchset. I actually mean to send first 7 patches from this series for review and not 22 at once but it feels like the changes introduced by these first patches make sense in this exact form only if the general idea of locking rework is accepted. So I am sending the whole thing in its current state in a hope it would be possible to see what I am suggesting and make a decision on the general idea at least. I did some cleanup on all the functional patches, although would look once again at those below patch 7 at least before sending that for review. The test in the last patch obviously needs more work, it works well for me on the recent enough Windows 10 but not that well yet on earlier versions, also needs cleaning up and splitting. Some facts about the current Windows loader behaviour: - It seems that loader lock (the one that can be managed externally through LdrLockLoaderLock) is held only when calling the app's functions from the loader: DLL entry point, TLS callbacks, LDR notifications and LdrEnumerateLoadedModules callback. There is a quirk (at least on the newer Win10) with LDR notifications: the loader lock is held during the unload event but not during the load event, at least the first one. I am guessing that maybe it is unheld only until the first dependency DLL entry point is called (so they take it once there and then keep until process attach ends, leaving first load notification behind), but I didn't test that with the DLL with dependencies yet. In any case it looks to me this quirk may be left for later. - There is apparently other lock mechanics involved as Windows does not allow loading process of different DLLs to go in parallel; - It looks like any function which does not end up requiring actual loading or unloading of the DLL and does not query anything from the module currently being loaded or unloaded can be executed in parallel with the current load process. E. g., LoadLibrary("b.dll") won't ever block if the DLL is already loaded, LdrAddRefDll never blocks at all even if called for the module currently being loaded (hanging in dll entry point process attach) or unloaded (hanging in detach), LdrUnloadDll will only block if it decrements load count to zero. - The behaviour of the functions operating on the module being currently loaded or unloaded looks quirky. Here is what I recovered from testing on the 19043.1237 (that is mostly covered in the test in the last patch): - LdrUnloadDll blocks until the DLL load sequence is complete and succeeds without waiting if unload sequence is in progress; - LdrAddRefDll never blocks but behaviour depends on whether it is called from the app callback (tested with entry point and LDR notification) or outside of that (patch 0014). - LdrGetDllHandleEx blocks during module unload but not load; - LdrGetProcedureAddress waits until the module is being loaded and immediately returns an error if module is being unloaded; - Looks like calling functions from LDR notifications is the special case. Those that wouldn't block work, but those that would block if called from outside return error STATUS_NOT_FOUND. That is apparently not how that behaves from DLL entry points and TLS callbacks. I think the main patch in the series is patch 0008 which introduces exclusive locks downgrade / upgrade functions. The idea is that we can take shared or exclusive lock from loader function. The exclusive lock can be downgraded to shared. However, the thread still holds exlusiveness in this state in a sense that other exclusive lock cannot be taken until the initial exclusive lock is released. Shared lock waiters can joing when the exlusive lock is downgraded. This works recursively so loader functions can call each other and call outside callbacks with the lock held, with the exception that exclusive lock cannot be taken recursively if shared is currently held. So, the way of using it is: - Never call the callbacks with read lock held: that will assert once the application calls some loader function which takes the exclusive lock. - The way to call the callbacks is to have an exclusive lock and downgrade it to shared, then the recursive taking of exclusive lock is ok; - If it is unclear at function start whether exclusive lock is needed or not, the way to go is to start from shared lock, try to perform the operation (in case of LdrAddRefDll / LdrUnloadLibrary I used an extra short lived SRW lock), and if that is not possible release the shared lock and restart from scratch with exclusive. I think maybe it would be technically possible not to introduce the limitation and allow upgrading shared locks to exclusive but it seems it would make things much more complicated than they are: it would require some neater and finer grained structure access sync to avoid invalidating all the data the shared locker depends on at the moment it wants to upgrade to exclusive and yields to exclusive library load / unload sequence. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> -- 2.31.1

2 29

[PATCH 1/2] mfplat/tests: Test reading past the end of a file stream.
by Zebediah Figura 06 Oct '21

06 Oct '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/mfplat/tests/mfplat.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 541459c715b..1b51cd73dc3 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -1947,8 +1947,10 @@ static void test_file_stream(void) WCHAR pathW[MAX_PATH]; DWORD caps, count; WCHAR *filename; + BYTE data[8]; HRESULT hr; WCHAR *str; + ULONG size; BOOL eos; filename = load_resource(L"test.mp4"); @@ -2023,6 +2025,31 @@ static void test_file_stream(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(position == 2 * bytestream_length, "Unexpected position.\n"); + hr = IMFByteStream_IsEndOfStream(bytestream, &eos); + ok(hr == S_OK, "Failed query end of stream, hr %#x.\n", hr); + ok(eos == TRUE, "Unexpected IsEndOfStream result, %u.\n", eos); + + size = 0xdeadbeef; + hr = IMFByteStream_Read(bytestream, data, sizeof(data), &size); + todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_HANDLE_EOF), "Unexpected hr %#x.\n", hr); + todo_wine ok(size == 0xdeadbeef, "Got size %u.\n", size); + + hr = IMFByteStream_SetCurrentPosition(bytestream, bytestream_length - 4); + ok(hr == S_OK, "Failed to set bytestream position, hr %#x.\n", hr); + + size = 0xdeadbeef; + hr = IMFByteStream_Read(bytestream, data, sizeof(data), &size); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(size == 4, "Got size %u.\n", size); + + hr = IMFByteStream_SetCurrentPosition(bytestream, bytestream_length); + ok(hr == S_OK, "Failed to set bytestream position, hr %#x.\n", hr); + + size = 0xdeadbeef; + hr = IMFByteStream_Read(bytestream, data, sizeof(data), &size); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!size, "Got size %u.\n", size); + hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, filename, &bytestream2); ok(hr == S_OK, "got 0x%08x\n", hr); -- 2.33.0

2 3

[PATCH vkd3d 1/3] tests: Add a test for exporting SV_StencilRef from a pixel shader.
by Conor McCarthy 06 Oct '21

06 Oct '21

Based on a vkd3d-proton patch by Philip Rebohle. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- tests/d3d12.c | 181 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 181 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 89b1f000..dd0c0b61 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -673,6 +673,21 @@ static bool is_shader_float64_supported(ID3D12Device *device) return options.DoublePrecisionFloatShaderOps; } +static bool is_stencil_ref_export_supported(ID3D12Device *device) +{ + D3D12_FEATURE_DATA_D3D12_OPTIONS options; + HRESULT hr; + + if (FAILED(hr = ID3D12Device_CheckFeatureSupport(device, + D3D12_FEATURE_D3D12_OPTIONS, &options, sizeof(options)))) + { + trace("Failed to check feature support, hr %#x.\n", hr); + return false; + } + + return options.PSSpecifiedStencilRefSupported; +} + #define create_cb_root_signature(a, b, c, e) create_cb_root_signature_(__LINE__, a, b, c, e) static ID3D12RootSignature *create_cb_root_signature_(unsigned int line, ID3D12Device *device, unsigned int reg_idx, D3D12_SHADER_VISIBILITY shader_visibility, @@ -20547,6 +20562,171 @@ static void test_stencil_load(void) destroy_test_context(&context); } +static void test_stencil_export(void) +{ + D3D12_SHADER_RESOURCE_VIEW_DESC stencil_srv_desc; + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12GraphicsCommandList *command_list; + D3D12_DESCRIPTOR_HEAP_DESC heap_desc; + struct depth_stencil_resource ds; + ID3D12PipelineState *pso_sample; + ID3D12RootSignature *rs_sample; + ID3D12DescriptorHeap *srv_heap; + struct test_context_desc desc; + struct test_context context; + ID3D12CommandQueue *queue; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + uint stencil_ref; + + uint main() : SV_StencilRef + { + return stencil_ref; + } +#endif + 0x43425844, 0x3980cb16, 0xbbe87d38, 0xb93f7c61, 0x200c41ed, 0x00000001, 0x000000cc, 0x00000004, + 0x00000030, 0x00000040, 0x00000078, 0x000000bc, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, + 0x4e47534f, 0x00000030, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0xffffffff, 0x00000e01, 0x535f5653, 0x636e6574, 0x65526c69, 0xabab0066, 0x58454853, 0x0000003c, + 0x00000050, 0x0000000f, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x02000065, + 0x00029001, 0x05000036, 0x00029001, 0x0020800a, 0x00000000, 0x00000000, 0x0100003e, 0x30494653, + 0x00000008, 0x00000200, 0x00000000, + }; + const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + static const DWORD ps_sample_code[] = + { +#if 0 + Texture2D<uint4> tex : register(t0); + + uint4 main(float4 pos : SV_Position) : SV_TARGET + { + return tex[uint2(pos.xy)].g; + } +#endif + 0x43425844, 0xdd1e98d4, 0x53c81701, 0x576f6b2e, 0x040b18bb, 0x00000001, 0x0000014c, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x7469736f, 0x006e6f69, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x58454853, 0x000000b0, 0x00000050, + 0x0000002c, 0x0100086a, 0x04001858, 0x00107000, 0x00000000, 0x00004444, 0x04002064, 0x00101032, + 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0500001c, + 0x00100032, 0x00000000, 0x00101046, 0x00000000, 0x08000036, 0x001000c2, 0x00000000, 0x00004002, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8900002d, 0x800000c2, 0x00111103, 0x00100012, + 0x00000000, 0x00100e46, 0x00000000, 0x00107e16, 0x00000000, 0x05000036, 0x001020f2, 0x00000000, + 0x00100006, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_sample = {ps_sample_code, sizeof(ps_sample_code)}; + static const float clear_color[4] = {0.0f, 0.0f, 0.0f, 0.0f}; + + memset(&desc, 0, sizeof(desc)); + desc.rt_width = 640; + desc.rt_height = 480; + desc.rt_format = DXGI_FORMAT_R8_UINT; + desc.no_root_signature = true; + if (!init_test_context(&context, &desc)) + return; + + if (!is_stencil_ref_export_supported(context.device)) + { + skip("The device does not support stencil ref export.\n"); + destroy_test_context(&context); + return; + } + + command_list = context.list; + queue = context.queue; + + init_depth_stencil(&ds, context.device, 640, 480, 1, 1, + DXGI_FORMAT_R32G8X24_TYPELESS, DXGI_FORMAT_D32_FLOAT_S8X24_UINT, NULL); + set_viewport(&context.viewport, 0.0f, 0.0f, 640.0f, 480.0f, 0.0f, 1.0f); + set_rect(&context.scissor_rect, 0, 0, 640, 480); + + context.root_signature = create_32bit_constants_root_signature(context.device, + 0, 1, D3D12_SHADER_VISIBILITY_PIXEL); + + init_pipeline_state_desc(&pso_desc, context.root_signature, 0, NULL, &ps, NULL); + + pso_desc.NumRenderTargets = 0; + pso_desc.DSVFormat = DXGI_FORMAT_D32_FLOAT_S8X24_UINT; + pso_desc.DepthStencilState.StencilEnable = true; + pso_desc.DepthStencilState.StencilReadMask = 0xff; + pso_desc.DepthStencilState.StencilWriteMask = 0xff; + pso_desc.DepthStencilState.FrontFace.StencilFailOp = D3D12_STENCIL_OP_REPLACE; + pso_desc.DepthStencilState.FrontFace.StencilDepthFailOp = D3D12_STENCIL_OP_REPLACE; + pso_desc.DepthStencilState.FrontFace.StencilPassOp = D3D12_STENCIL_OP_REPLACE; + pso_desc.DepthStencilState.FrontFace.StencilFunc = D3D12_COMPARISON_FUNC_ALWAYS; + pso_desc.DepthStencilState.BackFace = pso_desc.DepthStencilState.FrontFace; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(SUCCEEDED(hr), "Failed to create graphics pipeline state, hr %#x.\n", hr); + + rs_sample = create_texture_root_signature(context.device, + D3D12_SHADER_VISIBILITY_PIXEL, 0, 0); + init_pipeline_state_desc(&pso_desc, rs_sample, DXGI_FORMAT_R8_UINT, NULL, &ps_sample, NULL); + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&pso_sample); + ok(SUCCEEDED(hr), "Failed to create graphics pipeline state, hr %#x.\n", hr); + + heap_desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV; + heap_desc.NumDescriptors = 1; + heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE; + heap_desc.NodeMask = 0; + + hr = ID3D12Device_CreateDescriptorHeap(context.device, &heap_desc, &IID_ID3D12DescriptorHeap, (void **)&srv_heap); + ok(hr == S_OK, "Failed to create descriptor heap, hr %#x.\n", hr); + + ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle, + D3D12_CLEAR_FLAG_STENCIL, 0.0f, 0x80, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 0, NULL, false, &ds.dsv_handle); + ID3D12GraphicsCommandList_OMSetStencilRef(command_list, 0x40); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstant(command_list, 0, 0xff, 0); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_resource_state(command_list, ds.texture, + D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE); + + stencil_srv_desc.ViewDimension = D3D12_SRV_DIMENSION_TEXTURE2D; + stencil_srv_desc.Format = DXGI_FORMAT_X32_TYPELESS_G8X24_UINT; + stencil_srv_desc.Shader4ComponentMapping = D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING; + stencil_srv_desc.Texture2D.MostDetailedMip = 0; + stencil_srv_desc.Texture2D.MipLevels = 1; + stencil_srv_desc.Texture2D.PlaneSlice = 1; + stencil_srv_desc.Texture2D.ResourceMinLODClamp = 0.0f; + + ID3D12Device_CreateShaderResourceView(context.device, ds.texture, &stencil_srv_desc, + ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(srv_heap)); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, clear_color, 0, NULL); + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &srv_heap); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, rs_sample); + ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, + ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(srv_heap)); + ID3D12GraphicsCommandList_SetPipelineState(command_list, pso_sample); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + + check_sub_resource_uint8(context.render_target, 0, queue, command_list, 0xff, 0); + + ID3D12DescriptorHeap_Release(srv_heap); + ID3D12PipelineState_Release(pso_sample); + ID3D12RootSignature_Release(rs_sample); + destroy_depth_stencil(&ds); + destroy_test_context(&context); +} + static void test_typed_buffer_uav(void) { D3D12_CPU_DESCRIPTOR_HANDLE cpu_descriptor_handle; @@ -35223,6 +35403,7 @@ START_TEST(d3d12) run_test(test_depth_load); run_test(test_depth_read_only_view); run_test(test_stencil_load); + run_test(test_stencil_export); run_test(test_typed_buffer_uav); run_test(test_typed_uav_store); run_test(test_compute_shader_registers); -- 2.32.0

1 2

[PATCH 1/5] winegstreamer: Handle zero-length reads in src_getrange_cb().
by Zebediah Figura 06 Oct '21

06 Oct '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/wg_parser.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 72dfab8f3d6..9a382cb724c 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1272,7 +1272,7 @@ static GstFlowReturn src_getrange_cb(GstPad *pad, GstObject *parent, GstMapInfo map_info; bool ret; - GST_LOG("pad %p, offset %" G_GINT64_MODIFIER "u, length %u, buffer %p.", pad, offset, size, *buffer); + GST_LOG("pad %p, offset %" G_GINT64_MODIFIER "u, size %u, buffer %p.", pad, offset, size, *buffer); if (offset == GST_BUFFER_OFFSET_NONE) offset = parser->next_pull_offset; @@ -1281,6 +1281,16 @@ static GstFlowReturn src_getrange_cb(GstPad *pad, GstObject *parent, if (!*buffer) *buffer = new_buffer = gst_buffer_new_and_alloc(size); + if (!size) + { + /* asfreader occasionally asks for zero bytes. gst_buffer_map() will + * return NULL in this case. Avoid confusing the read thread by asking + * it for zero bytes. */ + gst_buffer_set_size(*buffer, 0); + GST_LOG("Returning empty buffer."); + return GST_FLOW_OK; + } + gst_buffer_map(*buffer, &map_info, GST_MAP_WRITE); pthread_mutex_lock(&parser->mutex); -- 2.33.0

1 4

[PATCH vkd3d 1/5] vkd3d-shader/hlsl: Parse texture types.
by Zebediah Figura 06 Oct '21

06 Oct '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 22 +++++++++++++++++++--- libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.y | 20 ++++++++++++++++++++ 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index f03777a65..2dba001ee 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -261,6 +261,21 @@ struct hlsl_type *hlsl_new_struct_type(struct hlsl_ctx *ctx, const char *name, s return type; } +struct hlsl_type *hlsl_new_texture_type(struct hlsl_ctx *ctx, enum hlsl_sampler_dim dim) +{ + struct hlsl_type *type; + + if (!(type = vkd3d_calloc(1, sizeof(*type)))) + return NULL; + type->type = HLSL_CLASS_OBJECT; + type->base_type = HLSL_TYPE_TEXTURE; + type->dimx = 4; + type->dimy = 1; + type->sampler_dim = dim; + list_add_tail(&ctx->types, &type->entry); + return type; +} + struct hlsl_type *hlsl_get_type(struct hlsl_scope *scope, const char *name, bool recursive) { struct rb_entry *entry = rb_get(&scope->types, name); @@ -329,7 +344,8 @@ bool hlsl_types_are_equal(const struct hlsl_type *t1, const struct hlsl_type *t2 return false; if (t1->base_type != t2->base_type) return false; - if (t1->base_type == HLSL_TYPE_SAMPLER && t1->sampler_dim != t2->sampler_dim) + if ((t1->base_type == HLSL_TYPE_SAMPLER || t1->base_type == HLSL_TYPE_TEXTURE) + && t1->sampler_dim != t2->sampler_dim) return false; if ((t1->modifiers & HLSL_MODIFIER_ROW_MAJOR) != (t2->modifiers & HLSL_MODIFIER_ROW_MAJOR)) @@ -734,8 +750,8 @@ static int compare_param_hlsl_types(const struct hlsl_type *t1, const struct hls } if (t1->base_type != t2->base_type) return t1->base_type - t2->base_type; - if (t1->base_type == HLSL_TYPE_SAMPLER && t1->sampler_dim != t2->sampler_dim) - return t1->sampler_dim - t2->sampler_dim; + if ((t1->base_type == HLSL_TYPE_SAMPLER || t1->base_type == HLSL_TYPE_TEXTURE) + && t1->sampler_dim != t2->sampler_dim) if (t1->dimx != t2->dimx) return t1->dimx - t2->dimx; if (t1->dimy != t2->dimy) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 77b4ce928..65c6f34e0 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -655,6 +655,7 @@ struct hlsl_ir_swizzle *hlsl_new_swizzle(struct hlsl_ctx *ctx, DWORD s, unsigned struct hlsl_ir_node *val, struct vkd3d_shader_location *loc); struct hlsl_ir_var *hlsl_new_synthetic_var(struct hlsl_ctx *ctx, const char *name, struct hlsl_type *type, const struct vkd3d_shader_location loc); +struct hlsl_type *hlsl_new_texture_type(struct hlsl_ctx *ctx, enum hlsl_sampler_dim dim); struct hlsl_ir_constant *hlsl_new_uint_constant(struct hlsl_ctx *ctx, unsigned int n, const struct vkd3d_shader_location loc); struct hlsl_ir_node *hlsl_new_unary_expr(struct hlsl_ctx *ctx, enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 6f1794e79..b8149950d 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2451,6 +2451,26 @@ type: { $$ = ctx->builtin_types.sampler[HLSL_SAMPLER_DIM_3D]; } + | KW_TEXTURE + { + $$ = hlsl_new_texture_type(ctx, HLSL_SAMPLER_DIM_GENERIC); + } + | KW_TEXTURE1D + { + $$ = hlsl_new_texture_type(ctx, HLSL_SAMPLER_DIM_1D); + } + | KW_TEXTURE2D + { + $$ = hlsl_new_texture_type(ctx, HLSL_SAMPLER_DIM_2D); + } + | KW_TEXTURE3D + { + $$ = hlsl_new_texture_type(ctx, HLSL_SAMPLER_DIM_3D); + } + | KW_TEXTURECUBE + { + $$ = hlsl_new_texture_type(ctx, HLSL_SAMPLER_DIM_CUBE); + } | TYPE_IDENTIFIER { $$ = hlsl_get_type(ctx->cur_scope, $1, true); -- 2.33.0

3 6

[PATCH v2] wininet: Clear cached credentials after the first failed attempt.
by Alistair Leslie-Hughes 05 Oct '21

05 Oct '21

Windows when using cached credentials will use them on the first challenge, if then a second 403 (ACCESS_DENIED) is received, the user is prompted again but this time with the password and save checkbox cleared. v2: Use a BOOL flag variable. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/dialogs.c | 21 ++++++++++++++++++++- dlls/wininet/internet.h | 1 + 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index a48c75865ac..969e2ee490f 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -152,9 +152,25 @@ static BOOL WININET_GetSetPassword( HWND hdlg, LPCWSTR szServer, p = wcschr( szUserPass, ':' ); if( p ) { + struct WININET_ErrorDlgParams *params; + HWND hwnd; + + params = (struct WININET_ErrorDlgParams*) + GetWindowLongPtrW( hdlg, GWLP_USERDATA ); + *p = 0; SetWindowTextW( hUserItem, szUserPass ); - SetWindowTextW( hPassItem, p+1 ); + + if (!params->req->clear_auth) + { + SetWindowTextW( hPassItem, p+1 ); + + hwnd = GetDlgItem( hdlg, IDC_SAVEPASSWORD ); + if (hwnd) + SendMessageW(hwnd, BM_SETCHECK, BST_CHECKED, 0); + } + else + WININET_GetSetPassword( hdlg, szServer, szRealm, TRUE ); } return TRUE; @@ -264,6 +280,8 @@ static INT_PTR WINAPI WININET_ProxyPasswordDialog( WININET_GetSetPassword( hdlg, params->req->session->appInfo->proxy, szRealm, TRUE ); WININET_SetAuthorization( params->req, username, password, TRUE ); + params->req->clear_auth = TRUE; + EndDialog( hdlg, ERROR_INTERNET_FORCE_RETRY ); return TRUE; } @@ -340,6 +358,7 @@ static INT_PTR WINAPI WININET_PasswordDialog( WININET_GetSetPassword( hdlg, params->req->session->hostName, szRealm, TRUE ); } WININET_SetAuthorization( params->req, username, password, FALSE ); + params->req->clear_auth = TRUE; EndDialog( hdlg, ERROR_INTERNET_FORCE_RETRY ); return TRUE; diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index e9d68e2c2d9..9ece506ceac 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -361,6 +361,7 @@ typedef struct LPWSTR statusText; DWORD bytesToWrite; DWORD bytesWritten; + BOOL clear_auth; /* Flag to clear the password field on the authorization dialog */ CRITICAL_SECTION headers_section; /* section to protect the headers array */ HTTPHEADERW *custHeaders; -- 2.33.0

1 0

[PATCH] ntdll: Double dll name buffer size for relay traces.
by Nikolay Sivov 05 Oct '21

05 Oct '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Otherwise some of api-ms-* names are getting truncated. dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index e00c1e0c31d..797d72aedb6 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1343,7 +1343,7 @@ static void call_tls_callbacks( HMODULE module, UINT reason ) */ static NTSTATUS MODULE_InitDLL( WINE_MODREF *wm, UINT reason, LPVOID lpReserved ) { - WCHAR mod_name[32]; + WCHAR mod_name[64]; NTSTATUS status = STATUS_SUCCESS; DLLENTRYPROC entry = wm->ldr.EntryPoint; void *module = wm->ldr.DllBase; -- 2.33.0

1 0

[PATCH v2 4/6] ntdll: Expose ntdll_check_buffer_for_read and ntdll_check_buffer_for_write to Unix libs.
by Jacek Caban 05 Oct '21

05 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/file.c | 6 +++--- dlls/ntdll/unix/socket.c | 2 +- dlls/ntdll/unix/unix_private.h | 2 -- dlls/ntdll/unix/virtual.c | 16 ++++++++-------- include/wine/unixlib.h | 2 ++ 5 files changed, 14 insertions(+), 14 deletions(-)

2 4

[PATCH vkd3d] vkd3d-shader/hlsl: Mark WriteToSubresource test as todo on NVIDIA.
by Giovanni Mascellani 05 Oct '21

05 Oct '21

Similarly to ReadFromSubresource, WriteToSubresource is currently implemented only for images with linear tiling, which NVIDIA drivers currently do not support. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- tests/d3d12.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 89b1f000..1fa017ab 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -32060,6 +32060,7 @@ static void test_read_write_subresource(void) /* NULL box */ hr = ID3D12Resource_WriteToSubresource(src_texture, 0, NULL, dst_buffer, row_pitch, slice_pitch); + todo_if(is_nvidia_device(device)) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = ID3D12Resource_ReadFromSubresource(src_texture, dst_buffer, row_pitch, slice_pitch, 0, NULL); @@ -32102,17 +32103,20 @@ static void test_read_write_subresource(void) if (i) { hr = ID3D12Resource_WriteToSubresource(src_texture, 0, NULL, zero_buffer, row_pitch, slice_pitch); + todo_if(is_nvidia_device(device)) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); /* Write region 1 */ set_box(&box, 0, 0, 0, 2, 2, 2); hr = ID3D12Resource_WriteToSubresource(src_texture, 0, &box, dst_buffer, row_pitch, slice_pitch); + todo_if(is_nvidia_device(device)) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); /* Write region 2 */ set_box(&box, 2, 2, 2, 11, 13, 17); hr = ID3D12Resource_WriteToSubresource(src_texture, 0, &box, &dst_buffer[2 * 128 * 100 + 2 * 128 + 2], row_pitch, slice_pitch); + todo_if(is_nvidia_device(device)) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); } else @@ -32217,6 +32221,7 @@ static void test_read_write_subresource(void) if (got != expected) break; } + todo_if(is_nvidia_device(device)) ok(got == expected, "Got unexpected value 0x%08x at (%u, %u, %u), expected 0x%08x.\n", got, x, y, z, expected); release_resource_readback(&rb); -- 2.33.0

2 1

[PATCH 1/9] dbghelp/dwarf: better handling of SymTagExe and SymTagCompiland
by Eric Pouech 05 Oct '21

05 Oct '21

- children of SymTagExe and SymTagCompiland can now be enumerated - SymTagCompiland's lexical parent is now reported to SymTagExe - native doesn't expose compiland's address, so don't expose it Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/symbol.c | 4 ++++ dlls/dbghelp/type.c | 16 +++++++++++++--- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 0587ce13914..2fc5a7e5eca 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -169,6 +169,7 @@ struct symt_block struct symt_module /* in fact any of .exe, .dll... */ { struct symt symt; /* module */ + struct vector vchildren; /* compilation units */ struct module* module; }; diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index e2fde00456a..091ea173305 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -191,6 +191,7 @@ struct symt_module* symt_new_module(struct module* module) { sym->symt.tag = SymTagExe; sym->module = module; + vector_init(&sym->vchildren, sizeof(struct symt*), 8); } return sym; } @@ -199,6 +200,7 @@ struct symt_compiland* symt_new_compiland(struct module* module, ULONG_PTR address, unsigned src_idx) { struct symt_compiland* sym; + struct symt_compiland** p; TRACE_(dbghelp_symt)("Adding compiland symbol %s:%s\n", debugstr_w(module->modulename), source_get(module, src_idx)); @@ -210,6 +212,8 @@ struct symt_compiland* symt_new_compiland(struct module* module, sym->source = src_idx; vector_init(&sym->vchildren, sizeof(struct symt*), 32); sym->user = NULL; + p = vector_add(&module->top->vchildren, &module->pool); + *p = sym; } return sym; } diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 70719cf6b7c..4eb230e2755 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -158,11 +158,10 @@ BOOL symt_get_address(const struct symt* type, ULONG64* addr) case SymTagThunk: *addr = ((const struct symt_thunk*)type)->address; break; - case SymTagCompiland: - *addr = ((const struct symt_compiland*)type)->address; - break; default: FIXME("Unsupported sym-tag %s for get-address\n", symt_get_tag_str(type->tag)); + /* fall through */ + case SymTagCompiland: return FALSE; } return TRUE; @@ -549,6 +548,8 @@ BOOL symt_get_info(struct module* module, const struct symt* type, switch (type->tag) { + case SymTagExe: v = &((const struct symt_module*)type)->vchildren; break; + case SymTagCompiland: v = &((const struct symt_compiland*)type)->vchildren; break; case SymTagUDT: v = &((const struct symt_udt*)type)->vchildren; break; case SymTagEnum: v = &((const struct symt_enum*)type)->vchildren; break; case SymTagFunctionType: v = &((const struct symt_function_signature*)type)->vchildren; break; @@ -594,6 +595,12 @@ BOOL symt_get_info(struct module* module, const struct symt* type, case TI_GET_CHILDRENCOUNT: switch (type->tag) { + case SymTagExe: + X(DWORD) = vector_length(&((const struct symt_module*)type)->vchildren); + break; + case SymTagCompiland: + X(DWORD) = vector_length(&((const struct symt_compiland*)type)->vchildren); + break; case SymTagUDT: X(DWORD) = vector_length(&((const struct symt_udt*)type)->vchildren); break; @@ -697,6 +704,9 @@ BOOL symt_get_info(struct module* module, const struct symt* type, case TI_GET_LEXICALPARENT: switch (type->tag) { + case SymTagCompiland: + X(DWORD) = symt_ptr2index(module, &((const struct symt_compiland*)type)->container->symt); + break; case SymTagBlock: X(DWORD) = symt_ptr2index(module, ((const struct symt_block*)type)->container); break;

2 9

[PATCH v2 1/5] wined3d: Do not emit an upload for NOOVERWRITE maps on deferred contexts.
by Zebediah Figura 05 Oct '21

05 Oct '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/cs.c | 18 ++++++++++++------ dlls/wined3d/wined3d_private.h | 3 +++ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index dd8cae825fa..626dd0ac132 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -34,6 +34,7 @@ struct wined3d_deferred_upload unsigned int sub_resource_idx; uint8_t *sysmem; struct wined3d_box box; + uint32_t upload_flags; }; struct wined3d_command_list @@ -2429,9 +2430,9 @@ static void wined3d_device_context_upload_bo(struct wined3d_device_context *cont { struct wined3d_cs_update_sub_resource *op; - TRACE("context %p, resource %p, sub_resource_idx %u, box %s, bo %s, row_pitch %u, slice_pitch %u.\n", + TRACE("context %p, resource %p, sub_resource_idx %u, box %s, bo %s, flags %#x, row_pitch %u, slice_pitch %u.\n", context, resource, sub_resource_idx, debug_box(box), - debug_const_bo_address(&bo->addr), row_pitch, slice_pitch); + debug_const_bo_address(&bo->addr), bo->flags, row_pitch, slice_pitch); op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_UPDATE_SUB_RESOURCE; @@ -2518,7 +2519,8 @@ HRESULT wined3d_device_context_emit_unmap(struct wined3d_device_context *context unsigned int row_pitch, slice_pitch; wined3d_resource_get_sub_resource_map_pitch(resource, sub_resource_idx, &row_pitch, &slice_pitch); - wined3d_device_context_upload_bo(context, resource, sub_resource_idx, &box, &bo, row_pitch, slice_pitch); + if (bo.flags & UPLOAD_BO_UPLOAD_ON_UNMAP) + wined3d_device_context_upload_bo(context, resource, sub_resource_idx, &box, &bo, row_pitch, slice_pitch); return WINED3D_OK; } @@ -2749,6 +2751,7 @@ void wined3d_device_context_emit_update_sub_resource(struct wined3d_device_conte op->box = *box; op->bo.addr.buffer_object = 0; op->bo.addr.addr = data; + op->bo.flags = 0; op->row_pitch = row_pitch; op->slice_pitch = slice_pitch; @@ -3475,7 +3478,7 @@ static void wined3d_deferred_context_push_constants(struct wined3d_device_contex FIXME("context %p, p %#x, start_idx %u, count %u, constants %p, stub!\n", context, p, start_idx, count, constants); } -static const struct wined3d_deferred_upload *deferred_context_get_upload(struct wined3d_deferred_context *deferred, +static struct wined3d_deferred_upload *deferred_context_get_upload(struct wined3d_deferred_context *deferred, struct wined3d_resource *resource, unsigned int sub_resource_idx) { SIZE_T i = deferred->upload_count; @@ -3519,13 +3522,13 @@ static void *wined3d_deferred_context_prepare_upload_bo(struct wined3d_device_co if (flags & WINED3D_MAP_NOOVERWRITE) { - const struct wined3d_deferred_upload *upload; - if ((upload = deferred_context_get_upload(deferred, resource, sub_resource_idx))) { + upload->upload_flags = 0; map_ptr = (uint8_t *)align((size_t)upload->sysmem, RESOURCE_ALIGNMENT); bo->addr.buffer_object = 0; bo->addr.addr = map_ptr; + bo->flags = 0; return map_ptr; } @@ -3540,6 +3543,7 @@ static void *wined3d_deferred_context_prepare_upload_bo(struct wined3d_device_co return NULL; upload = &deferred->uploads[deferred->upload_count++]; + upload->upload_flags = UPLOAD_BO_UPLOAD_ON_UNMAP; upload->resource = resource; wined3d_resource_incref(resource); upload->sub_resource_idx = sub_resource_idx; @@ -3549,6 +3553,7 @@ static void *wined3d_deferred_context_prepare_upload_bo(struct wined3d_device_co bo->addr.buffer_object = 0; map_ptr = (uint8_t *)align((size_t)sysmem, RESOURCE_ALIGNMENT); bo->addr.addr = map_ptr; + bo->flags = UPLOAD_BO_UPLOAD_ON_UNMAP; return map_ptr; } @@ -3563,6 +3568,7 @@ static bool wined3d_deferred_context_get_upload_bo(struct wined3d_device_context *box = upload->box; bo->addr.buffer_object = 0; bo->addr.addr = (uint8_t *)align((size_t)upload->sysmem, RESOURCE_ALIGNMENT); + bo->flags = upload->upload_flags; return true; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c801e5b3ce8..520eb968eb6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3324,9 +3324,12 @@ bool wined3d_driver_info_init(struct wined3d_driver_info *driver_info, const struct wined3d_gpu_description *gpu_description, enum wined3d_feature_level feature_level, UINT64 vram_bytes, UINT64 sysmem_bytes) DECLSPEC_HIDDEN; +#define UPLOAD_BO_UPLOAD_ON_UNMAP 0x1 + struct upload_bo { struct wined3d_const_bo_address addr; + uint32_t flags; }; struct wined3d_adapter_ops -- 2.33.0

3 10

[PATCH v4 1/4] wined3d: Introduce wined3d_view_load_location() helper.
by Jan Sikorski 05 Oct '21

05 Oct '21

Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/view.c | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 0adb0a115dc..dfca8fc53f8 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -332,6 +332,25 @@ static void wined3d_view_invalidate_location(struct wined3d_resource *resource, wined3d_texture_invalidate_location(texture, sub_resource_idx, location); } +static void wined3d_view_load_location(struct wined3d_resource *resource, + const struct wined3d_view_desc *desc, struct wined3d_context *context, DWORD location) +{ + unsigned int i, sub_resource_idx, layer_count; + struct wined3d_texture *texture; + + if (resource->type == WINED3D_RTYPE_BUFFER) + { + wined3d_buffer_load_location(buffer_from_resource(resource), context, location); + return; + } + + texture = texture_from_resource(resource); + sub_resource_idx = desc->u.texture.layer_idx * texture->level_count + desc->u.texture.level_idx; + layer_count = resource->type != WINED3D_RTYPE_TEXTURE_3D ? desc->u.texture.layer_count : 1; + for (i = 0; i < layer_count; ++i, sub_resource_idx += texture->level_count) + wined3d_texture_load_location(texture, sub_resource_idx, context, location); +} + ULONG CDECL wined3d_rendertarget_view_incref(struct wined3d_rendertarget_view *view) { ULONG refcount = InterlockedIncrement(&view->refcount); @@ -461,21 +480,7 @@ void wined3d_rendertarget_view_prepare_location(struct wined3d_rendertarget_view void wined3d_rendertarget_view_load_location(struct wined3d_rendertarget_view *view, struct wined3d_context *context, DWORD location) { - struct wined3d_resource *resource = view->resource; - unsigned int i, sub_resource_idx, layer_count; - struct wined3d_texture *texture; - - if (resource->type == WINED3D_RTYPE_BUFFER) - { - wined3d_buffer_load_location(buffer_from_resource(resource), context, location); - return; - } - - texture = texture_from_resource(resource); - sub_resource_idx = view->sub_resource_idx; - layer_count = resource->type != WINED3D_RTYPE_TEXTURE_3D ? view->layer_count : 1; - for (i = 0; i < layer_count; ++i, sub_resource_idx += texture->level_count) - wined3d_texture_load_location(texture, sub_resource_idx, context, location); + wined3d_view_load_location(view->resource, &view->desc, context, location); } void wined3d_rendertarget_view_validate_location(struct wined3d_rendertarget_view *view, DWORD location) -- 2.30.2

3 6

[PATCH] d2d1/tests: Add tests for crop effect.
by Ziqing Hui 05 Oct '21

05 Oct '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 90 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 4beba7c963a..cf37efdc7e8 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -10045,6 +10045,95 @@ static void test_effect_2d_affine(BOOL d3d11) release_test_context(&ctx); } +static void test_effect_crop(BOOL d3d11) +{ + D2D1_BITMAP_PROPERTIES1 bitmap_desc; + struct d2d1_test_context ctx; + ID2D1DeviceContext *context; + D2D_RECT_F output_bounds; + D2D1_SIZE_U input_size; + ID2D1Factory1 *factory; + ID2D1Bitmap1 *bitmap; + DWORD image[16 * 16]; + ID2D1Effect *effect; + ID2D1Image *output; + unsigned int i; + HRESULT hr; + + const struct crop_effect_test + { + D2D_VECTOR_4F crop_rect; /* {x: left, y: top, z: right, w: bottom} */ + D2D_RECT_F bounds; + } + crop_effect_tests[] = + { + {{0.0f, 0.0f, 8.0f, 8.0f}, {0.0f, 0.0f, 8.0f, 8.0f}}, + {{4.0f, 4.0f, 8.0f, 8.0f}, {4.0f, 4.0f, 8.0f, 8.0f}}, + {{10.0f, 10.0f, 20.0f, 20.0f}, {10.0f, 10.0f, 16.0f, 16.0f}}, + {{-10.0f, 10.0f, 20.0f, 12.0f}, {0.0f, 10.0f, 16.0f, 12.0f}}, + {{3.0f, -2.0f, 5.0f, 1.0f}, {3.0f, 0.0f, 5.0f, 1.0f}}, + {{-1.0f, -1.0f, 20.0f, 20.0f}, {0.0f, 0.0f, 16.0f, 16.0f}}, + {{-5.0f, -5.0f, -1.0f, -1.0f}, {0.0f, 0.0f, 0.0f, 0.0f}}, + }; + memset(image, 0xff, sizeof(image)); + + if (!init_test_context(&ctx, d3d11)) + return; + + if (FAILED(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory1, NULL, (void **)&factory))) + { + win_skip("ID2D1Factory1 is not supported.\n"); + release_test_context(&ctx); + return; + } + + hr = ID2D1RenderTarget_QueryInterface(ctx.rt, &IID_ID2D1DeviceContext, (void **)&context); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = ID2D1DeviceContext_CreateEffect(context, &CLSID_D2D1Crop, &effect); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(crop_effect_tests); ++i) + { + const struct crop_effect_test *test = &crop_effect_tests[i]; + winetest_push_context("Test %u", i); + + set_size_u(&input_size, 16, 16); + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + bitmap_desc.dpiX = 96.0f; + bitmap_desc.dpiY = 96.0f; + bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_NONE; + bitmap_desc.colorContext = NULL; + hr = ID2D1DeviceContext_CreateBitmap(context, input_size, image, + sizeof(*image) * 16, &bitmap_desc, &bitmap); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ID2D1Effect_SetInput(effect, 0, (ID2D1Image *)bitmap, FALSE); + hr = ID2D1Effect_SetValue(effect, D2D1_CROP_PROP_RECT, D2D1_PROPERTY_TYPE_VECTOR4, + (const BYTE *)&test->crop_rect, sizeof(test->crop_rect)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ID2D1Effect_GetOutput(effect, &output); + + set_rect(&output_bounds, -1.0f, -1.0f, -1.0f, -1.0f); + ID2D1DeviceContext_GetImageLocalBounds(context, output, &output_bounds); + todo_wine + ok(compare_rect(&output_bounds, test->bounds.left, test->bounds.top, test->bounds.right, test->bounds.bottom, 0), + "Got unexpected output bounds {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", + output_bounds.left, output_bounds.top, output_bounds.right, output_bounds.bottom, + test->bounds.left, test->bounds.top, test->bounds.right, test->bounds.bottom); + + ID2D1Image_Release(output); + ID2D1Bitmap1_Release(bitmap); + winetest_pop_context(); + } + + ID2D1Effect_Release(effect); + ID2D1DeviceContext_Release(context); + ID2D1Factory1_Release(factory); + release_test_context(&ctx); +} + START_TEST(d2d1) { HMODULE d2d1_dll = GetModuleHandleA("d2d1.dll"); @@ -10108,6 +10197,7 @@ START_TEST(d2d1) queue_test(test_mt_factory); queue_test(test_effect); queue_test(test_effect_2d_affine); + queue_test(test_effect_crop); run_queued_tests(); } -- 2.25.1

2 1

[PATCH 1/4] wined3d: Fix the center offset in get_projection_matrix.
by Stefan Dösinger 05 Oct '21

05 Oct '21

If we have clip control, viewport_miscpart_cc applies both the half pixel offset and the filling convention nudge. We always have integer pixel centers in this <= d3d9-only codepath. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- Taking d3d10+ pixel centers out of consideration here keeps the next patch simpler because we don't have to account for the situation where we have to apply the nudge only because we don't have clip control but also somehow have GL-style pixel centers. It seems like a non-obvious set of conditions for catching a case we know won't is dead code. Do add an ERR though because it actually hardwires client lib knowledge into wined3d. --- dlls/wined3d/utils.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4019dd4d812..0a1e0707359 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5550,12 +5550,16 @@ void get_projection_matrix(const struct wined3d_context *context, const struct w * driver, but small enough to prevent it from interfering with any * anti-aliasing. */ + /* Projection matrices are <= d3d9, which all have integer pixel centers. */ + if (!(d3d_info->wined3d_creation_flags & WINED3D_PIXEL_CENTER_INTEGER)) + ERR("Did not expect to enter this codepath without WINED3D_PIXEL_CENTER_INTEGER.\n"); + clip_control = d3d_info->clip_control; flip = !clip_control && context->render_offscreen; - if (!clip_control && d3d_info->wined3d_creation_flags & WINED3D_PIXEL_CENTER_INTEGER) + if (!clip_control) center_offset = 63.0f / 64.0f; else - center_offset = -1.0f / 64.0f; + center_offset = 0.0f; if (context->last_was_rhw) { -- 2.32.0

3 6

[PATCH 1/3] wined3d: Initial implementation of queries for deferred contexts.
by Jan Sikorski 05 Oct '21

05 Oct '21

Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 75 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/cs.c | 67 ++++++++++++++++++++++++++++++++++- 2 files changed, 141 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index d8c10ab054c..c0d3b650d79 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -33026,6 +33026,80 @@ static void test_deferred_context_rendering(void) release_test_context(&test_context); } +static void test_deferred_context_queries(void) +{ + ID3D11DeviceContext *immediate, *deferred; + struct d3d11_test_context test_context; + D3D11_QUERY_DESC query_desc; + ID3D11Asynchronous *query; + ID3D11CommandList *list; + ID3D11Device *device; + HRESULT hr; + + union + { + UINT64 uint; + DWORD dword[2]; + } data; + + static const struct vec4 white = {1.0f, 1.0f, 1.0f, 1.0f}; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + immediate = test_context.immediate_context; + + hr = ID3D11Device_CreateDeferredContext(device, 0, &deferred); + ok(hr == S_OK, "Failed to create deferred context, hr %#x.\n", hr); + + query_desc.Query = D3D11_QUERY_OCCLUSION; + query_desc.MiscFlags = 0; + hr = ID3D11Device_CreateQuery(device, &query_desc, (ID3D11Query **)&query); + ok(hr == S_OK, "Failed to create query, hr %#x.\n", hr); + + hr = ID3D11DeviceContext_GetData(deferred, query, NULL, 0, 0); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(deferred, query, &data, sizeof(data), 0); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + ID3D11DeviceContext_OMSetRenderTargets(deferred, 1, &test_context.backbuffer_rtv, NULL); + set_viewport(deferred, 0.0f, 0.0f, 640.0f, 480.0f, 0.0f, 1.0f); + + ID3D11DeviceContext_Begin(deferred, query); + + hr = ID3D11DeviceContext_GetData(deferred, query, &data, sizeof(data), 0); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + test_context.immediate_context = deferred; + draw_color_quad(&test_context, &white); + test_context.immediate_context = immediate; + + ID3D11DeviceContext_End(deferred, query); + + hr = ID3D11DeviceContext_GetData(deferred, query, &data, sizeof(data), 0); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(immediate, query, &data, sizeof(data), 0); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + hr = ID3D11DeviceContext_FinishCommandList(deferred, FALSE, &list); + + hr = ID3D11DeviceContext_GetData(deferred, query, &data, sizeof(data), 0); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = ID3D11DeviceContext_GetData(immediate, query, &data, sizeof(data), 0); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + ID3D11DeviceContext_ExecuteCommandList(immediate, list, FALSE); + + get_query_data(immediate, query, &data, sizeof(data)); + ok(data.uint == 640 * 480, "Got unexpected query result 0x%08x%08x.\n", data.dword[1], data.dword[0]); + + ID3D11Asynchronous_Release(query); + ID3D11CommandList_Release(list); + ID3D11DeviceContext_Release(deferred); + release_test_context(&test_context); +} + static void test_deferred_context_map(void) { ID3D11DeviceContext *immediate, *deferred; @@ -33984,6 +34058,7 @@ START_TEST(d3d11) queue_test(test_deferred_context_swap_state); queue_test(test_deferred_context_rendering); queue_test(test_deferred_context_map); + queue_test(test_deferred_context_queries); queue_test(test_unbound_streams); queue_test(test_texture_compressed_3d); queue_test(test_constant_buffer_offset); diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 2d295d4660e..839853840e9 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -34,6 +34,12 @@ struct wined3d_deferred_upload struct wined3d_box box; }; +struct wined3d_deferred_query_issue +{ + struct wined3d_query *query; + unsigned int flags; +}; + struct wined3d_command_list { LONG refcount; @@ -54,6 +60,9 @@ struct wined3d_command_list * to hold a reference here (and in wined3d_deferred_context) as well. */ SIZE_T command_list_count; struct wined3d_command_list **command_lists; + + SIZE_T query_count; + struct wined3d_deferred_query_issue *queries; }; static void wined3d_command_list_destroy_object(void *object) @@ -70,6 +79,7 @@ static void wined3d_command_list_destroy_object(void *object) heap_free(list->uploads); heap_free(list->resources); heap_free(list->data); + heap_free(list->queries); heap_free(list); } @@ -99,6 +109,8 @@ ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) wined3d_resource_decref(list->resources[i]); for (i = 0; i < list->upload_count; ++i) wined3d_resource_decref(list->uploads[i].resource); + for (i = 0; i < list->query_count; ++i) + wined3d_query_decref(list->queries[i].query); wined3d_cs_destroy_object(device->cs, wined3d_command_list_destroy_object, list); } @@ -2368,8 +2380,27 @@ static void wined3d_cs_issue_query(struct wined3d_device_context *context, static void wined3d_cs_acquire_command_list(struct wined3d_device_context *context, struct wined3d_command_list *list) { + struct wined3d_cs *cs = wined3d_cs_from_context(context); SIZE_T i; + if (list->query_count) + { + cs->queries_flushed = FALSE; + + for (i = 0; i < list->query_count; ++i) + { + if (list->queries[i].flags & WINED3DISSUE_END) + { + list->queries[i].query->counter_main++; + list->queries[i].query->state = QUERY_SIGNALLED; + } + else + { + list->queries[i].query->state = QUERY_BUILDING; + } + } + } + for (i = 0; i < list->resource_count; ++i) wined3d_resource_acquire(list->resources[i]); @@ -3421,6 +3452,9 @@ struct wined3d_deferred_context * we need to hold a reference here and in wined3d_command_list as well. */ SIZE_T command_list_count, command_lists_capacity; struct wined3d_command_list **command_lists; + + SIZE_T query_count, queries_capacity; + struct wined3d_deferred_query_issue *queries; }; static struct wined3d_deferred_context *wined3d_deferred_context_from_context(struct wined3d_device_context *context) @@ -3569,7 +3603,25 @@ static bool wined3d_deferred_context_get_upload_bo(struct wined3d_device_context static void wined3d_deferred_context_issue_query(struct wined3d_device_context *context, struct wined3d_query *query, unsigned int flags) { - FIXME("context %p, query %p, flags %#x, stub!\n", context, query, flags); + struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context); + struct wined3d_cs_query_issue *op; + + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op->opcode = WINED3D_CS_OP_QUERY_ISSUE; + op->query = query; + op->flags = flags; + + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); + + if (!wined3d_array_reserve((void **)&deferred->queries, &deferred->queries_capacity, + deferred->query_count + 1, sizeof(*deferred->queries))) + { + ERR("Failed to reserve memory.\n"); + return; + } + + deferred->queries[deferred->query_count].flags = flags; + wined3d_query_incref(deferred->queries[deferred->query_count++].query = query); } static void wined3d_deferred_context_flush(struct wined3d_device_context *context) @@ -3669,6 +3721,10 @@ void CDECL wined3d_deferred_context_destroy(struct wined3d_device_context *conte wined3d_command_list_decref(deferred->command_lists[i]); heap_free(deferred->command_lists); + for (i = 0; i < deferred->query_count; ++i) + wined3d_query_decref(deferred->queries[i].query); + heap_free(deferred->queries); + wined3d_state_destroy(deferred->c.state); heap_free(deferred->data); heap_free(deferred); @@ -3712,10 +3768,17 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device deferred->command_list_count * sizeof(*object->command_lists)); /* Transfer our references to the command lists to the command list. */ + if (!(object->queries = heap_alloc(deferred->query_count * sizeof(*object->queries)))) + goto out_free_command_lists; + object->query_count = deferred->query_count; + memcpy(object->queries, deferred->queries, deferred->query_count * sizeof(*object->queries)); + /* Transfer our references to the queries to the command list. */ + deferred->data_size = 0; deferred->resource_count = 0; deferred->upload_count = 0; deferred->command_list_count = 0; + deferred->query_count = 0; /* This is in fact recorded into a subsequent command list. */ if (restore) @@ -3728,6 +3791,8 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device return S_OK; +out_free_command_lists: + heap_free(object->command_lists); out_free_uploads: heap_free(object->uploads); out_free_resources: -- 2.30.2

4 9

[PATCH vkd3d 1/3] vkd3d-shader/hlsl: Set the name for anonymous structures at creation time.
by Zebediah Figura 05 Oct '21

05 Oct '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- This series is kind of an RFC, though, because I'm not actually sure we want to do this. The obvious benefit is that we get rid of a lot of common boilerplate that's otherwise pretty hard to sidestep—as shown by the diffstat in patch 3. On the other hand, we might want to do something like GCC's "x <aka y>", in which case this would be a step in the wrong direction (and a pretty impactful step at that.) (This series also has us taking a bit more memory, but it's not a lot. We already allocate names for all numeric types, since they aren't keywords.) libs/vkd3d-shader/hlsl.y | 9 +++++++-- libs/vkd3d-shader/hlsl_sm4.c | 3 +-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 6f1794e79..585331062 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2075,7 +2075,7 @@ struct_declaration: if (!$3) { - if (!$2->name) + if (!strcmp($2->name, "<unnamed>")) hlsl_error(ctx, @2, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, "Anonymous struct type must declare a variable."); if (modifiers) @@ -2116,7 +2116,12 @@ named_struct_spec: unnamed_struct_spec: KW_STRUCT '{' fields_list '}' { - $$ = hlsl_new_struct_type(ctx, NULL, $3); + char *name; + + if (!(name = hlsl_strdup(ctx, "<unnamed>"))) + YYABORT; + + $$ = hlsl_new_struct_type(ctx, name, $3); } any_identifier: diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 328a8ba1b..8c2bc8f84 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -329,7 +329,6 @@ static D3D_SHADER_VARIABLE_TYPE sm4_base_type(const struct hlsl_type *type) static void write_sm4_type(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, struct hlsl_type *type) { const struct hlsl_type *array_type = get_array_type(type); - const char *name = array_type->name ? array_type->name : "<unnamed>"; const struct hlsl_profile_info *profile = ctx->profile; unsigned int field_count = 0, array_size = 0; size_t fields_offset = 0, name_offset = 0; @@ -339,7 +338,7 @@ static void write_sm4_type(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b return; if (profile->major_version >= 5) - name_offset = put_string(buffer, name); + name_offset = put_string(buffer, array_type->name); if (type->type == HLSL_CLASS_ARRAY) array_size = get_array_size(type); -- 2.33.0

4 5

[PATCH v6] gdi32: Create the registry keys recursively, if needed.
by Gabriel Ivăncescu 05 Oct '21

05 Oct '21

Fixes a regression introduced by 1cdc74b2d62d1c94005c46f9c8f4b566aa8bdcbd when creating new prefixes, as NtCreateKey does not recursively create keys. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/gdi32/font.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index c6bc3a7..8cc60d5 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -31,6 +31,8 @@ #include <assert.h> #include <pthread.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "winerror.h" #include "windef.h" #include "winbase.h" @@ -564,11 +566,13 @@ static HKEY reg_open_key( HKEY root, const WCHAR *name, ULONG name_len ) return ret; } +/* wrapper for NtCreateKey that creates the key recursively if necessary */ static HKEY reg_create_key( HKEY root, const WCHAR *name, ULONG name_len, DWORD options, DWORD *disposition ) { UNICODE_STRING nameW = { name_len, name_len, (WCHAR *)name }; OBJECT_ATTRIBUTES attr; + NTSTATUS status; HANDLE ret; attr.Length = sizeof(attr); @@ -578,7 +582,34 @@ static HKEY reg_create_key( HKEY root, const WCHAR *name, ULONG name_len, attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - if (NtCreateKey( &ret, MAXIMUM_ALLOWED, &attr, 0, NULL, options, disposition )) return 0; + status = NtCreateKey( &ret, MAXIMUM_ALLOWED, &attr, 0, NULL, options, disposition ); + if (status == STATUS_OBJECT_NAME_NOT_FOUND) + { + static const WCHAR registry_rootW[] = { '\\','R','e','g','i','s','t','r','y','\\' }; + DWORD pos = 0, i = 0, len = name_len / sizeof(WCHAR); + + /* don't try to create registry root */ + if (!root && len > ARRAY_SIZE(registry_rootW) && + !memcmp( name, registry_rootW, sizeof(registry_rootW) )) + i += ARRAY_SIZE(registry_rootW); + + while (i < len && name[i] != '\\') i++; + if (i == len) return 0; + for (;;) + { + nameW.Buffer = (WCHAR *)name + pos; + nameW.Length = (i - pos) * sizeof(WCHAR); + status = NtCreateKey( &ret, MAXIMUM_ALLOWED, &attr, 0, NULL, options, disposition ); + + if (attr.RootDirectory != root) NtClose( attr.RootDirectory ); + if (!NT_SUCCESS(status)) return 0; + if (i == len) break; + attr.RootDirectory = ret; + while (i < len && name[i] == '\\') i++; + pos = i; + while (i < len && name[i] != '\\') i++; + } + } return ret; } -- 2.31.1

3 2

New WineTest report size crisis
by Francois Gouget 05 Oct '21

05 Oct '21

The ntoskrnl output is now very reasonable. Many thanks to Zebediah for taking care of this. But the WineTest reports are, again, above the 1.5 MB size limit on Wine. Not by much, from 22 to 90kB, but that's enough to cause a lot of Wine results to disappear from test.winehq.org: https://test.winehq.org/data/patterns.html (notice the underscores at the end of the linux_ lines) The limit could be raised (if Alexandre accepts the patch), but we also cannot let the tests output increase without control if we want to keep reasonable file sizes. If all tests outputted as much as the top 5 we would have 40 MB test reports which would have a serious impact on the test.winehq.org disk usage. It also means the 'full report' HTML pages would blow up to about 152 MB. That might prove hard on web browsers. So maybe increasing the limit is necessary and maybe even overdue. But it's also the easy way out and the top 5 offenders (see list at bottom) are clearly generating too much output anyway. So I think we should make some effort to bring them to more reasonable sizes. Anyway, the main tests responsible for the size increase are: * user32:msg (+63kB) * dinput8:hid (+26kB) * and a smattering of d3d tests Also this time there is no single patch to blame. Instead a range of patches added 105kB to the reports, pushing them over the edge: Sep 08: d3dcompiler_46:hlsl_d3d11 (new, +1.7kB) d3dx10_38:d3dx10 (new, +3kB) user32:msg (+6kB) Sep 09: dinput8:hid (new, +4kB) user32:msg (+18kB) Sep 13: d3dx10_37:d3dx10 (new, +3kB) Sep 15: dinput8:hid (+3kB) Sep 15: d3dx10_36:d3dx10 (new, +3kB) Sep 16: dinput8:hid (+3kB) Sep 17: dinput8:hid (+10kB) user32:msg (+6kB) Sep 20: dinput8:hid (+7kB) d3dx10_35:d3dx10 (new, +3kB) user32:msg (+15kB) Sep 21: user32:msg (+19kB) Of course we still have the old offenders so that the top 5 tests (1.36% of the total) now use 17% (270kB) of the maximum report size! So I created bugs to track this and I'm calling for help to get this under control: * bug 51780 - user32:msg (97kB) * bug 51781 - d3d11:d3d11 (84kB) * bug 51782 - ws2_32:sock (29kB) * bug 51783 - ieframe:webbrowser (29kB) * bug 51785 - d3dx10_*:d3dx10 (29kB) * bug 51784 - dinput8:hid (26kB) (not in top 5 if aggregating d3dx10_*) Note: Yes, I'm using 1000 bytes kBs here: I have an easier time dividing the 'wc -c' output by 1000 in my head than by 1024. -- Francois Gouget <fgouget(a)codeweavers.com>

3 2

[PATCH] include: Don't use DECLSPEC_HIDDEN for NTSYSAPI in Unix libs.
by Jacek Caban 05 Oct '21

05 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Supersedes 216212 and 216211. dlls/nsiproxy.sys/icmp_echo.c | 2 -- dlls/nsiproxy.sys/ip.c | 2 -- dlls/winepulse.drv/pulse.c | 2 -- include/winnt.h | 2 +- 4 files changed, 1 insertion(+), 7 deletions(-)

1 0

[PATCH 1/6] makedep: Always define _NTSYSTEM_ for native Unix libraries.
by Jacek Caban 05 Oct '21

05 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/nsiproxy.sys/ip.c | 2 -- dlls/winepulse.drv/pulse.c | 2 -- tools/makedep.c | 2 ++ 3 files changed, 2 insertions(+), 4 deletions(-)

3 3

[PATCH v5] gdi32: Create the registry keys recursively, if needed.
by Gabriel Ivăncescu 05 Oct '21

05 Oct '21

Fixes a regression introduced by 1cdc74b2d62d1c94005c46f9c8f4b566aa8bdcbd when creating new prefixes, as NtCreateKey does not recursively create keys. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v5: Fix memcmp size... dlls/gdi32/font.c | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 98c70a6..4784c1d 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -29,6 +29,8 @@ #include <stdlib.h> #include <string.h> #include <assert.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "winerror.h" #include "windef.h" #include "winbase.h" @@ -569,11 +571,13 @@ static HKEY reg_open_key( HKEY root, const WCHAR *name, ULONG name_len ) return ret; } +/* wrapper for NtCreateKey that creates the key recursively if necessary */ static HKEY reg_create_key( HKEY root, const WCHAR *name, ULONG name_len, DWORD options, DWORD *disposition ) { UNICODE_STRING nameW = { name_len, name_len, (WCHAR *)name }; OBJECT_ATTRIBUTES attr; + NTSTATUS status; HANDLE ret; attr.Length = sizeof(attr); @@ -583,7 +587,32 @@ static HKEY reg_create_key( HKEY root, const WCHAR *name, ULONG name_len, attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - if (NtCreateKey( &ret, MAXIMUM_ALLOWED, &attr, 0, NULL, options, disposition )) return 0; + status = NtCreateKey( &ret, MAXIMUM_ALLOWED, &attr, 0, NULL, options, disposition ); + if (status == STATUS_OBJECT_NAME_NOT_FOUND) + { + static const WCHAR registry_rootW[] = { '\\','R','e','g','i','s','t','r','y','\\' }; + DWORD pos = 0, i = 0, len = name_len / sizeof(WCHAR); + + /* don't try to create registry root */ + if (!root && len > 10 && !memcmp( name, registry_rootW, 10 * sizeof(WCHAR) )) i += 10; + + while (i < len && name[i] != '\\') i++; + if (i == len) return 0; + for (;;) + { + nameW.Buffer = (WCHAR *)name + pos; + nameW.Length = (i - pos) * sizeof(WCHAR); + status = NtCreateKey( &ret, MAXIMUM_ALLOWED, &attr, 0, NULL, options, disposition ); + + if (attr.RootDirectory != root) NtClose( attr.RootDirectory ); + if (!NT_SUCCESS(status)) return 0; + if (i == len) break; + attr.RootDirectory = ret; + while (i < len && name[i] == '\\') i++; + pos = i; + while (i < len && name[i] != '\\') i++; + } + } return ret; } -- 2.31.1

2 2

[PATCH v2 1/2] winevulkan: Support aliased constants.
by Georg Lehmann 05 Oct '21

05 Oct '21

Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 3a6bc66d32b..9e55753ca38 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -3445,11 +3445,17 @@ class VkRegistry(object): enum.create_alias(enum_elem.attrib["name"], enum_elem.attrib["alias"]) elif "value" in enum_elem.keys(): - # Constants are not aliased, no need to add them here, they'll get added later on. + # Constant with an explicit value if only_aliased: return self.consts.append(VkConstant(enum_elem.attrib["name"], enum_elem.attrib["value"])) + elif "alias" in enum_elem.keys(): + # Aliased constant + if not only_aliased: + return + + self.consts.append(VkConstant(enum_elem.attrib["name"], enum_elem.attrib["alias"])) @staticmethod def _require_type(type_info): -- 2.33.0

1 1

[PATCH v2 6/6] gdi32: Use __wine_unix_call interface for Unix library.
by Jacek Caban 05 Oct '21

05 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/Makefile.in | 3 ++- dlls/gdi32/dibdrv/dc.c | 17 ++++++----------- dlls/gdi32/font.c | 35 ++++++++++++++++++----------------- dlls/gdi32/gdiobj.c | 14 +++++++++----- dlls/gdi32/wrappers.c | 14 ++++++++++++-- 5 files changed, 47 insertions(+), 36 deletions(-)

3 2

[PATCH] winevulkan: Update to VK spec version 1.2.195.
by Georg Lehmann 05 Oct '21

05 Oct '21

Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 3a6bc66d32b..5bbc836941b 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.2.191" +VK_XML_VERSION = "1.2.195" WINE_VK_VERSION = (1, 2) # Filenames to create. -- 2.33.0

2 1

[PATCH] user32: Update exstyle when setting style in SetWindowLong.
by Piotr Caban 05 Oct '21

05 Oct '21

Rockstar Games Launcher checks extended window style and exits if it is incorrect. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/user32/tests/win.c | 18 +++++++++++++++++- dlls/user32/win.c | 15 ++++++++++++--- 2 files changed, 29 insertions(+), 4 deletions(-)

3 2

[PATCH v2 5/6] ntdll: Handle Unix lib exception outside Unix stack.
by Jacek Caban 05 Oct '21

05 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- The next patch uses the new style Unix lib, but still bypasses syscall thunks for ntgdi functions. Once ntgdi is moved to win32u (and with this series it's ready to be moved; I plan to do that in the next series), it may start using proper syscall interface. While ntgdi internals are ready for this and we can change a number of functions right away, functions that call external drivers can't use syscalls interface until drivers are converted to Unix libs as well (and we can't convert drivers without useful win32u). The patch is not very invasive and my thinking is to break this circular dependency by allowing bypassing syscall thunks until win32u is ready (we may revert this patch by then). dlls/ntdll/unix/signal_arm.c | 2 +- dlls/ntdll/unix/signal_arm64.c | 2 +- dlls/ntdll/unix/signal_i386.c | 2 +- dlls/ntdll/unix/signal_x86_64.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)

1 0

[PATCH v2 3/6] ntdll: Provide some Unicode helpers for Unix libs.
by Jacek Caban 05 Oct '21

05 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- I think that those are useful enough to expose them from ntdll instead of copying to other libraries (at least gdi32/win32u will need those) and mapping casemap multiple times. I used Rtl* names instead of exposing ntdll_* as it seems nice to not use existing prototypes, but I don't feel strongly about any of above. dlls/ntdll/unix/env.c | 98 ++++++++++++++++++++++++++++++------------- 1 file changed, 69 insertions(+), 29 deletions(-)

1 0

[PATCH v2 2/6] ntdll: Introduce ntdll_get_build_dir and ntdll_get_data_dir.
by Jacek Caban 05 Oct '21

05 Oct '21

To expose build and data dirs for Unix libs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/env.c | 18 ++++++++++++++++++ include/wine/unixlib.h | 2 ++ 2 files changed, 20 insertions(+)

1 0

[PATCH v2 1/6] makedep: Always define _NTSYSTEM_ for native Unix libraries.
by Jacek Caban 05 Oct '21

05 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Fixed ntdll_umbstowcs in patch 3. dlls/nsiproxy.sys/ip.c | 2 -- dlls/winepulse.drv/pulse.c | 2 -- tools/makedep.c | 2 ++ 3 files changed, 2 insertions(+), 4 deletions(-)

1 0

[PATCH 6/6] gdi32: Use __wine_unix_call interface for Unix library.
by Jacek Caban 05 Oct '21

05 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/Makefile.in | 3 ++- dlls/gdi32/dibdrv/dc.c | 17 ++++++----------- dlls/gdi32/font.c | 35 ++++++++++++++++++----------------- dlls/gdi32/gdiobj.c | 14 +++++++++----- dlls/gdi32/wrappers.c | 14 ++++++++++++-- 5 files changed, 47 insertions(+), 36 deletions(-)

2 1

[PATCH 5/6] ntdll: Handle Unix lib exception outside Unix stack.
by Jacek Caban 05 Oct '21

05 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- The next patch uses the new style Unix lib, but still bypasses syscall thunks for ntgdi functions. Once ntgdi is moved to win32u (and with this series it's ready to be moved; I plan to do that in the next series), it may start using proper syscall interface. While ntgdi internals are ready for this and we can change a number of functions right away, functions that call external drivers can't use syscalls interface until drivers are converted to Unix libs as well (and we can't convert drivers without useful win32u). The patch is not very invasive and my thinking is to break this circular dependency by allowing bypassing syscall thunks until win32u is ready (we may revert this patch by then). dlls/ntdll/unix/signal_arm.c | 2 +- dlls/ntdll/unix/signal_arm64.c | 2 +- dlls/ntdll/unix/signal_i386.c | 2 +- dlls/ntdll/unix/signal_x86_64.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)

2 1

[PATCH 4/6] ntdll: Expose ntdll_check_buffer_for_read and ntdll_check_buffer_for_write to Unix libs.
by Jacek Caban 05 Oct '21

05 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/file.c | 6 +++--- dlls/ntdll/unix/socket.c | 2 +- dlls/ntdll/unix/unix_private.h | 2 -- dlls/ntdll/unix/virtual.c | 16 ++++++++-------- include/wine/unixlib.h | 2 ++ 5 files changed, 14 insertions(+), 14 deletions(-)

2 1

[PATCH 3/6] ntdll: Provide some Unicode helpers for Unix libs.
by Jacek Caban 05 Oct '21

05 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- I think that those are useful enough to expose them from ntdll instead of copying to other libraries (at least gdi32/win32u will need those) and mapping casemap multiple times. I used Rtl* names instead of exposing ntdll_* as it seems nice to not use existing prototypes, but I don't feel strongly about any of above. dlls/ntdll/unix/env.c | 97 ++++++++++++++++++++++++++++++------------- 1 file changed, 68 insertions(+), 29 deletions(-)

2 1

[PATCH 2/6] ntdll: Introduce ntdll_get_build_dir and ntdll_get_data_dir.
by Jacek Caban 05 Oct '21

05 Oct '21

To expose build and data dirs for Unix libs. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/unix/env.c | 18 ++++++++++++++++++ include/wine/unixlib.h | 2 ++ 2 files changed, 20 insertions(+)

1 0

[PATCH] winebus.sys: Convert the product strings to unicode on the unix-side.
by Huw Davies 05 Oct '21

05 Oct '21

This avoids keeping two copies of each string. It also fixes a regression on macOS from commit 9d4b70473c147b that incorrectly treated a CFStringRef as a char ptr. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winebus.sys/bus_iohid.c | 17 +++++++++++----- dlls/winebus.sys/bus_sdl.c | 15 +++++++++----- dlls/winebus.sys/bus_udev.c | 38 ++++++++++++++++++++++++------------ dlls/winebus.sys/main.c | 24 ++++++++--------------- dlls/winebus.sys/unixlib.c | 12 ++++++------ dlls/winebus.sys/unixlib.h | 6 +++--- 6 files changed, 64 insertions(+), 48 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index a450402e87b..4412a4bf6dd 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -130,6 +130,13 @@ static struct iohid_device *find_device_from_iohid(IOHIDDeviceRef IOHIDDevice) return NULL; } +static void CFStringToWSTR(CFStringRef cstr, LPWSTR wstr, int length) +{ + int len = min(CFStringGetLength(cstr), length - 1); + CFStringGetCharacters(cstr, CFRangeMake(0, len), (UniChar*)wstr); + wstr[len] = 0; +} + static DWORD CFNumberToDWORD(CFNumberRef num) { int dwNum = 0; @@ -265,10 +272,10 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * struct device_desc desc = { .input = -1, - .serialnumber = {"0000"}, + .serialnumber = {'0','0','0','0',0}, }; struct iohid_device *impl; - CFStringRef str = NULL; + CFStringRef str; desc.vid = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDVendorIDKey))); desc.pid = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDProductIDKey))); @@ -283,11 +290,11 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * IOHIDDeviceScheduleWithRunLoop(IOHIDDevice, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode); str = IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDManufacturerKey)); - if (str) lstrcpynA(desc.manufacturer, str, sizeof(desc.manufacturer)); + if (str) CFStringToWSTR(str, desc.manufacturer, ARRAY_SIZE(desc.manufacturer)); str = IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDProductKey)); - if (str) lstrcpynA(desc.product, str, sizeof(desc.product)); + if (str) CFStringToWSTR(str, desc.product, ARRAY_SIZE(desc.product)); str = IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDSerialNumberKey)); - if (str) lstrcpynA(desc.serialnumber, str, sizeof(desc.serialnumber)); + if (str) CFStringToWSTR(str, desc.serialnumber, ARRAY_SIZE(desc.serialnumber)); if (IOHIDDeviceConformsTo(IOHIDDevice, kHIDPage_GenericDesktop, kHIDUsage_GD_GamePad) || IOHIDDeviceConformsTo(IOHIDDevice, kHIDPage_GenericDesktop, kHIDUsage_GD_Joystick)) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 33386a80a34..4e4f275fbc9 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -51,6 +51,7 @@ #include "wine/debug.h" #include "wine/hid.h" +#include "wine/unixlib.h" #include "unix_private.h" @@ -589,8 +590,8 @@ static void sdl_add_device(unsigned int index) struct device_desc desc = { .input = -1, - .manufacturer = {"SDL"}, - .serialnumber = {"0000"}, + .manufacturer = {'S','D','L',0}, + .serialnumber = {'0','0','0','0',0}, }; struct sdl_device *impl; @@ -598,6 +599,8 @@ static void sdl_add_device(unsigned int index) SDL_JoystickID id; SDL_JoystickGUID guid; SDL_GameController *controller = NULL; + const char *str; + char guid_str[33]; if ((joystick = pSDL_JoystickOpen(index)) == NULL) { @@ -608,8 +611,9 @@ static void sdl_add_device(unsigned int index) if (options.map_controllers && pSDL_IsGameController(index)) controller = pSDL_GameControllerOpen(index); - if (controller) lstrcpynA(desc.product, pSDL_GameControllerName(controller), sizeof(desc.product)); - else lstrcpynA(desc.product, pSDL_JoystickName(joystick), sizeof(desc.product)); + if (controller) str = pSDL_GameControllerName(controller); + else str = pSDL_JoystickName(joystick); + if (str) ntdll_umbstowcs(str, strlen(str) + 1, desc.product, ARRAY_SIZE(desc.product)); id = pSDL_JoystickInstanceID(joystick); @@ -626,7 +630,8 @@ static void sdl_add_device(unsigned int index) } guid = pSDL_JoystickGetGUID(joystick); - pSDL_JoystickGetGUIDString(guid, desc.serialnumber, sizeof(desc.serialnumber)); + pSDL_JoystickGetGUIDString(guid, guid_str, sizeof(guid_str)); + ntdll_umbstowcs(guid_str, strlen(guid_str) + 1, desc.serialnumber, ARRAY_SIZE(desc.serialnumber)); if (controller) desc.is_gamepad = TRUE; else diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 3db261b2404..90213b7cd5b 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -73,6 +73,7 @@ #include "wine/debug.h" #include "wine/hid.h" +#include "wine/unixlib.h" #ifdef HAS_PROPER_INPUT_HEADER # include "hidusage.h" @@ -945,8 +946,10 @@ static void get_device_subsystem_info(struct udev_device *dev, char const *subsy if (!strncmp(ptr, "HID_UNIQ=", 9)) { + char buffer[MAX_PATH]; if (desc->serialnumber[0]) continue; - sscanf(ptr, "HID_UNIQ=%256s\n", desc->serialnumber); + if (sscanf(ptr, "HID_UNIQ=%256s\n", buffer) == 1) + ntdll_umbstowcs(buffer, strlen(buffer) + 1, desc->serialnumber, ARRAY_SIZE(desc->serialnumber)); } if (!strncmp(ptr, "HID_PHYS=", 9) || !strncmp(ptr, "PHYS=\"", 6)) { @@ -970,13 +973,13 @@ static void get_device_subsystem_info(struct udev_device *dev, char const *subsy } if (!desc->manufacturer[0] && (tmp = udev_device_get_sysattr_value(dev, "manufacturer"))) - lstrcpynA(desc->manufacturer, tmp, sizeof(desc->manufacturer)); + ntdll_umbstowcs(tmp, strlen(tmp) + 1, desc->manufacturer, ARRAY_SIZE(desc->manufacturer)); if (!desc->product[0] && (tmp = udev_device_get_sysattr_value(dev, "product"))) - lstrcpynA(desc->product, tmp, sizeof(desc->product)); + ntdll_umbstowcs(tmp, strlen(tmp) + 1, desc->product, ARRAY_SIZE(desc->product)); if (!desc->serialnumber[0] && (tmp = udev_device_get_sysattr_value(dev, "serial"))) - lstrcpynA(desc->serialnumber, tmp, sizeof(desc->serialnumber)); + ntdll_umbstowcs(tmp, strlen(tmp) + 1, desc->serialnumber, ARRAY_SIZE(desc->serialnumber)); } static void udev_add_device(struct udev_device *dev) @@ -1017,17 +1020,22 @@ static void udev_add_device(struct udev_device *dev) subsystem = udev_device_get_subsystem(dev); if (!strcmp(subsystem, "hidraw")) { - if (!desc.manufacturer[0]) strcpy(desc.manufacturer, "hidraw"); + static const WCHAR hidraw[] = {'h','i','d','r','a','w',0}; + char product[MAX_PATH]; + + if (!desc.manufacturer[0]) memcpy(desc.manufacturer, hidraw, sizeof(hidraw)); #ifdef HAVE_LINUX_HIDRAW_H - if (!desc.product[0] && ioctl(fd, HIDIOCGRAWNAME(sizeof(desc.product) - 1), desc.product) < 0) - desc.product[0] = 0; + if (!desc.product[0] && ioctl(fd, HIDIOCGRAWNAME(sizeof(product) - 1), product) >= 0) + ntdll_umbstowcs(product, strlen(product) + 1, desc.product, ARRAY_SIZE(desc.product)); #endif } #ifdef HAS_PROPER_INPUT_HEADER else if (!strcmp(subsystem, "input")) { + static const WCHAR evdev[] = {'e','v','d','e','v',0}; struct input_id device_id = {0}; + char buffer[MAX_PATH]; if (ioctl(fd, EVIOCGID, &device_id) < 0) WARN("ioctl(EVIOCGID) failed: %d %s\n", errno, strerror(errno)); @@ -1038,17 +1046,21 @@ static void udev_add_device(struct udev_device *dev) desc.version = device_id.version; } - if (!desc.manufacturer[0]) strcpy(desc.manufacturer, "evdev"); + if (!desc.manufacturer[0]) memcpy(desc.manufacturer, evdev, sizeof(evdev)); - if (!desc.product[0] && ioctl(fd, EVIOCGNAME(sizeof(desc.product) - 1), desc.product) <= 0) - desc.product[0] = 0; + if (!desc.product[0] && ioctl(fd, EVIOCGNAME(sizeof(buffer) - 1), buffer) > 0) + ntdll_umbstowcs(buffer, strlen(buffer) + 1, desc.product, ARRAY_SIZE(desc.product)); - if (!desc.serialnumber[0] && ioctl(fd, EVIOCGUNIQ(sizeof(desc.serialnumber)), desc.serialnumber) < 0) - desc.serialnumber[0] = 0; + if (!desc.serialnumber[0] && ioctl(fd, EVIOCGUNIQ(sizeof(buffer)), buffer) >= 0) + ntdll_umbstowcs(buffer, strlen(buffer) + 1, desc.serialnumber, ARRAY_SIZE(desc.serialnumber)); } #endif - if (!desc.serialnumber[0]) strcpy(desc.serialnumber, "0000"); + if (!desc.serialnumber[0]) + { + static const WCHAR zeros[] = {'0','0','0','0',0}; + memcpy(desc.serialnumber, zeros, sizeof(zeros)); + } if (is_xbox_gamepad(desc.vid, desc.pid)) desc.is_gamepad = TRUE; diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index b5130a7908e..6a4695cd3be 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -70,10 +70,6 @@ struct device_extension struct device_desc desc; DWORD index; - WCHAR manufacturer[MAX_PATH]; - WCHAR product[MAX_PATH]; - WCHAR serialnumber[MAX_PATH]; - BYTE *last_report; DWORD last_report_size; BOOL last_report_read; @@ -180,11 +176,11 @@ static DWORD get_device_index(struct device_desc *desc) static WCHAR *get_instance_id(DEVICE_OBJECT *device) { struct device_extension *ext = (struct device_extension *)device->DeviceExtension; - DWORD len = wcslen(ext->serialnumber) + 33; + DWORD len = wcslen(ext->desc.serialnumber) + 33; WCHAR *dst; if ((dst = ExAllocatePool(PagedPool, len * sizeof(WCHAR)))) - swprintf(dst, len, L"%i&%s&%x&%i", ext->desc.version, ext->serialnumber, ext->desc.uid, ext->index); + swprintf(dst, len, L"%i&%s&%x&%i", ext->desc.version, ext->desc.serialnumber, ext->desc.uid, ext->index); return dst; } @@ -299,10 +295,6 @@ static DEVICE_OBJECT *bus_create_hid_device(struct device_desc *desc, struct uni ext->buffer_size = 0; ext->unix_device = unix_device; - MultiByteToWideChar(CP_UNIXCP, 0, ext->desc.manufacturer, -1, ext->manufacturer, MAX_PATH); - MultiByteToWideChar(CP_UNIXCP, 0, ext->desc.product, -1, ext->product, MAX_PATH); - MultiByteToWideChar(CP_UNIXCP, 0, ext->desc.serialnumber, -1, ext->serialnumber, MAX_PATH); - InitializeListHead(&ext->irp_queue); InitializeCriticalSection(&ext->cs); ext->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": cs"); @@ -894,19 +886,19 @@ static NTSTATUS hid_get_device_string(DEVICE_OBJECT *device, DWORD index, WCHAR switch (index) { case HID_STRING_ID_IMANUFACTURER: - len = (wcslen(ext->manufacturer) + 1) * sizeof(WCHAR); + len = (wcslen(ext->desc.manufacturer) + 1) * sizeof(WCHAR); if (len > buffer_len) return STATUS_BUFFER_TOO_SMALL; - else memcpy(buffer, ext->manufacturer, len); + else memcpy(buffer, ext->desc.manufacturer, len); return STATUS_SUCCESS; case HID_STRING_ID_IPRODUCT: - len = (wcslen(ext->product) + 1) * sizeof(WCHAR); + len = (wcslen(ext->desc.product) + 1) * sizeof(WCHAR); if (len > buffer_len) return STATUS_BUFFER_TOO_SMALL; - else memcpy(buffer, ext->product, len); + else memcpy(buffer, ext->desc.product, len); return STATUS_SUCCESS; case HID_STRING_ID_ISERIALNUMBER: - len = (wcslen(ext->serialnumber) + 1) * sizeof(WCHAR); + len = (wcslen(ext->desc.serialnumber) + 1) * sizeof(WCHAR); if (len > buffer_len) return STATUS_BUFFER_TOO_SMALL; - else memcpy(buffer, ext->serialnumber, len); + else memcpy(buffer, ext->desc.serialnumber, len); return STATUS_SUCCESS; } diff --git a/dlls/winebus.sys/unixlib.c b/dlls/winebus.sys/unixlib.c index 29537170df7..d14fb30d917 100644 --- a/dlls/winebus.sys/unixlib.c +++ b/dlls/winebus.sys/unixlib.c @@ -114,9 +114,9 @@ static const struct device_desc mouse_device_desc = .vid = 0x845e, .pid = 0x0001, .input = -1, - .manufacturer = {"The Wine Project"}, - .product = {"Wine HID mouse"}, - .serialnumber = {"0000"}, + .manufacturer = {'T','h','e',' ','W','i','n','e',' ','P','r','o','j','e','c','t',0}, + .product = {'W','i','n','e',' ','H','I','D',' ','m','o','u','s','e',0}, + .serialnumber = {'0','0','0','0',0}, }; static NTSTATUS mouse_device_create(void *args) @@ -184,9 +184,9 @@ static const struct device_desc keyboard_device_desc = .vid = 0x845e, .pid = 0x0002, .input = -1, - .manufacturer = {"The Wine Project"}, - .product = {"Wine HID keyboard"}, - .serialnumber = {"0000"}, + .manufacturer = {'T','h','e',' ','W','i','n','e',' ','P','r','o','j','e','c','t',0}, + .product = {'W','i','n','e',' ','H','I','D',' ','k','e','y','b','o','a','r','d',0}, + .serialnumber = {'0','0','0','0',0}, }; static NTSTATUS keyboard_device_create(void *args) diff --git a/dlls/winebus.sys/unixlib.h b/dlls/winebus.sys/unixlib.h index 317599571c2..e3996838c61 100644 --- a/dlls/winebus.sys/unixlib.h +++ b/dlls/winebus.sys/unixlib.h @@ -39,9 +39,9 @@ struct device_desc DWORD uid; BOOL is_gamepad; - char manufacturer[MAX_PATH]; - char product[MAX_PATH]; - char serialnumber[MAX_PATH]; + WCHAR manufacturer[MAX_PATH]; + WCHAR product[MAX_PATH]; + WCHAR serialnumber[MAX_PATH]; }; struct sdl_bus_options -- 2.25.1

2 1

[PATCH 1/7] d3d10/effect: Remove fixme from D3D10CreateEffectFromMemory().
by Nikolay Sivov 05 Oct '21

05 Oct '21

It's definitely not complete, but it's not a stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 5a5f9f37e6d..c135c76811d 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -8631,7 +8631,7 @@ HRESULT WINAPI D3D10CreateEffectFromMemory(void *data, SIZE_T data_size, UINT fl ID3D10Effect *pool = NULL; HRESULT hr; - FIXME("data %p, data_size %lu, flags %#x, device %p, effect_pool %p, effect %p stub!\n", + TRACE("data %p, data_size %lu, flags %#x, device %p, effect_pool %p, effect %p.\n", data, data_size, flags, device, effect_pool, effect); if (!(flags & D3D10_EFFECT_COMPILE_CHILD_EFFECT) != !effect_pool) -- 2.33.0

3 18

[PATCH 1/7] winebus.sys: Add a PID effect update output report.
by Rémi Bernon 05 Oct '21

05 Oct '21

Advertising support of the periodic effect types only for now. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winebus.sys/bus_sdl.c | 20 ++++- dlls/winebus.sys/bus_udev.c | 19 +++- dlls/winebus.sys/hid.c | 151 +++++++++++++++++++++++++++++++- dlls/winebus.sys/unix_private.h | 21 ++++- dlls/winebus.sys/unixlib.c | 14 +++ 5 files changed, 220 insertions(+), 5 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 33386a80a34..9c2112f8e56 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -174,7 +174,8 @@ static void set_hat_value(struct unix_device *iface, int index, int value) static BOOL descriptor_add_haptic(struct sdl_device *impl) { - USHORT i; + USHORT i, count = 0; + USAGE usages[16]; if (!pSDL_JoystickIsHaptic(impl->sdl_joystick) || !(impl->sdl_haptic = pSDL_HapticOpenFromJoystick(impl->sdl_joystick))) @@ -200,7 +201,13 @@ static BOOL descriptor_add_haptic(struct sdl_device *impl) if ((impl->effect_support & EFFECT_SUPPORT_PHYSICAL)) { - if (!hid_device_add_physical(&impl->unix_device)) + /* SDL_HAPTIC_SQUARE doesn't exist */ + if (impl->effect_support & SDL_HAPTIC_SINE) usages[count++] = PID_USAGE_ET_SINE; + if (impl->effect_support & SDL_HAPTIC_TRIANGLE) usages[count++] = PID_USAGE_ET_TRIANGLE; + if (impl->effect_support & SDL_HAPTIC_SAWTOOTHUP) usages[count++] = PID_USAGE_ET_SAWTOOTH_UP; + if (impl->effect_support & SDL_HAPTIC_SAWTOOTHDOWN) usages[count++] = PID_USAGE_ET_SAWTOOTH_DOWN; + + if (!hid_device_add_physical(&impl->unix_device, usages, count)) return FALSE; } @@ -471,6 +478,14 @@ static NTSTATUS sdl_device_physical_effect_control(struct unix_device *iface, BY return STATUS_SUCCESS; } +static NTSTATUS sdl_device_physical_effect_update(struct unix_device *iface, BYTE index, + struct effect_params *params) +{ + FIXME("iface %p, index %u, params %p stub!\n", iface, index, params); + + return STATUS_NOT_IMPLEMENTED; +} + static const struct hid_device_vtbl sdl_device_vtbl = { sdl_device_destroy, @@ -479,6 +494,7 @@ static const struct hid_device_vtbl sdl_device_vtbl = sdl_device_haptics_start, sdl_device_physical_device_control, sdl_device_physical_effect_control, + sdl_device_physical_effect_update, }; static BOOL set_report_from_joystick_event(struct sdl_device *impl, SDL_Event *event) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 3db261b2404..d63c9aab589 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -567,6 +567,8 @@ static NTSTATUS build_report_descriptor(struct unix_device *iface, struct udev_d BYTE ffbits[(FF_MAX+7)/8]; struct ff_effect effect; USAGE_AND_PAGE usage; + USHORT count = 0; + USAGE usages[16]; INT i, button_count, abs_count, rel_count, hat_count; const BYTE *device_usage = what_am_I(dev); struct lnxev_device *impl = lnxev_impl_from_unix_device(iface); @@ -664,7 +666,13 @@ static NTSTATUS build_report_descriptor(struct unix_device *iface, struct udev_d for (i = 0; i < FF_MAX; ++i) if (test_bit(ffbits, i)) break; if (i != FF_MAX) { - if (!hid_device_add_physical(iface)) + if (test_bit(ffbits, FF_SINE)) usages[count++] = PID_USAGE_ET_SINE; + if (test_bit(ffbits, FF_SQUARE)) usages[count++] = PID_USAGE_ET_SQUARE; + if (test_bit(ffbits, FF_TRIANGLE)) usages[count++] = PID_USAGE_ET_TRIANGLE; + if (test_bit(ffbits, FF_SAW_UP)) usages[count++] = PID_USAGE_ET_SAWTOOTH_UP; + if (test_bit(ffbits, FF_SAW_DOWN)) usages[count++] = PID_USAGE_ET_SAWTOOTH_DOWN; + + if (!hid_device_add_physical(iface, usages, count)) return STATUS_NO_MEMORY; } @@ -916,6 +924,14 @@ static NTSTATUS lnxev_device_physical_effect_control(struct unix_device *iface, return STATUS_SUCCESS; } +static NTSTATUS lnxev_device_physical_effect_update(struct unix_device *iface, BYTE index, + struct effect_params *params) +{ + FIXME("iface %p, index %u, params %p stub!\n", iface, index, params); + + return STATUS_NOT_IMPLEMENTED; +} + static const struct hid_device_vtbl lnxev_device_vtbl = { lnxev_device_destroy, @@ -924,6 +940,7 @@ static const struct hid_device_vtbl lnxev_device_vtbl = lnxev_device_haptics_start, lnxev_device_physical_device_control, lnxev_device_physical_effect_control, + lnxev_device_physical_effect_update, }; #endif /* HAS_PROPER_INPUT_HEADER */ diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c index 4ddee27cff9..72d358e6ad7 100644 --- a/dlls/winebus.sys/hid.c +++ b/dlls/winebus.sys/hid.c @@ -426,12 +426,27 @@ static const USAGE pid_effect_control_usages[] = PID_USAGE_OP_EFFECT_START_SOLO, PID_USAGE_OP_EFFECT_STOP, }; + +struct pid_effect_update +{ + BYTE index; + BYTE type_index; + UINT16 duration; + UINT16 trigger_repeat_interval; + UINT16 sample_period; + UINT16 start_delay; + BYTE gain; + BYTE trigger_button; + BYTE enable_bits; + BYTE direction[2]; +}; #include "poppack.h" -BOOL hid_device_add_physical(struct unix_device *iface) +BOOL hid_device_add_physical(struct unix_device *iface, USAGE *usages, USHORT count) { struct hid_report_descriptor *desc = &iface->hid_report_descriptor; const BYTE device_control_report = ++desc->next_report_id[HidP_Output]; + struct hid_device_state *state = &iface->hid_device_state; const BYTE device_control_header[] = { USAGE_PAGE(1, HID_USAGE_PAGE_PID), @@ -488,6 +503,95 @@ BOOL hid_device_add_physical(struct unix_device *iface) OUTPUT(1, Data|Var|Abs), END_COLLECTION, }; + + const BYTE effect_update_report = ++desc->next_report_id[HidP_Output]; + const BYTE effect_update_header[] = + { + /* Set effect properties */ + USAGE(1, PID_USAGE_SET_EFFECT_REPORT), + COLLECTION(1, Logical), + REPORT_ID(1, effect_update_report), + + USAGE(1, PID_USAGE_EFFECT_BLOCK_INDEX), + LOGICAL_MAXIMUM(1, 0x7f), + LOGICAL_MINIMUM(1, 0x00), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 1), + OUTPUT(1, Data|Var|Abs), + + USAGE(1, PID_USAGE_EFFECT_TYPE), + COLLECTION(1, Logical), + }; + const BYTE effect_update_footer[] = + { + LOGICAL_MINIMUM(1, 1), + LOGICAL_MAXIMUM(1, count), + REPORT_SIZE(1, 8), + OUTPUT(1, Data|Ary|Abs), + END_COLLECTION, + + USAGE(1, PID_USAGE_DURATION), + USAGE(1, PID_USAGE_TRIGGER_REPEAT_INTERVAL), + USAGE(1, PID_USAGE_SAMPLE_PERIOD), + USAGE(1, PID_USAGE_START_DELAY), + UNIT(2, 0x1003), /* Eng Lin:Time */ + UNIT_EXPONENT(1, -3), /* 10^-3 */ + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(2, 0x7fff), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(2, 0x7fff), + REPORT_SIZE(1, 16), + REPORT_COUNT(1, 4), + OUTPUT(1, Data|Var|Abs), + PHYSICAL_MAXIMUM(1, 0), + UNIT_EXPONENT(1, 0), + UNIT(1, 0), /* None */ + + USAGE(1, PID_USAGE_GAIN), + LOGICAL_MAXIMUM(1, 0x7f), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 1), + OUTPUT(1, Data|Var|Abs), + + USAGE(1, PID_USAGE_TRIGGER_BUTTON), + LOGICAL_MAXIMUM(2, state->button_count), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 1), + OUTPUT(1, Data|Var|Abs|Null), + + USAGE(1, PID_USAGE_AXES_ENABLE), + COLLECTION(1, Logical), + USAGE(4, (HID_USAGE_PAGE_GENERIC<<16)|HID_USAGE_GENERIC_X), + USAGE(4, (HID_USAGE_PAGE_GENERIC<<16)|HID_USAGE_GENERIC_Y), + LOGICAL_MAXIMUM(1, 1), + REPORT_SIZE(1, 1), + REPORT_COUNT(1, 2), + OUTPUT(1, Data|Var|Abs), + END_COLLECTION, + USAGE(1, PID_USAGE_DIRECTION_ENABLE), + REPORT_COUNT(1, 1), + OUTPUT(1, Data|Var|Abs), + REPORT_COUNT(1, 5), + OUTPUT(1, Cnst|Var|Abs), /* 5-bit pad */ + + USAGE(1, PID_USAGE_DIRECTION), + COLLECTION(1, Logical), + USAGE(4, (HID_USAGE_PAGE_ORDINAL<<16)|1), + USAGE(4, (HID_USAGE_PAGE_ORDINAL<<16)|2), + UNIT(1, 0x14), /* Eng Rot:Angular Pos */ + UNIT_EXPONENT(1, -2), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(2, 0x00ff), + PHYSICAL_MAXIMUM(4, 36000), + REPORT_SIZE(1, 8), + REPORT_COUNT(1, 2), + OUTPUT(1, Data|Var|Abs), + END_COLLECTION, + PHYSICAL_MAXIMUM(1, 0), + UNIT_EXPONENT(1, 0), + UNIT(1, 0), /* None */ + END_COLLECTION, + }; ULONG i; if (!hid_report_descriptor_append(desc, device_control_header, sizeof(device_control_header))) @@ -510,8 +614,22 @@ BOOL hid_device_add_physical(struct unix_device *iface) if (!hid_report_descriptor_append(desc, effect_control_footer, sizeof(effect_control_footer))) return FALSE; + if (!hid_report_descriptor_append(desc, effect_update_header, sizeof(effect_update_header))) + return FALSE; + for (i = 0; i < count; ++i) + { + if (!hid_report_descriptor_append_usage(desc, usages[i])) + return FALSE; + } + if (!hid_report_descriptor_append(desc, effect_update_footer, sizeof(effect_update_footer))) + return FALSE; + + /* HID nary collection indexes start at 1 */ + memcpy(iface->hid_physical.effect_types + 1, usages, count * sizeof(*usages)); + iface->hid_physical.device_control_report = device_control_report; iface->hid_physical.effect_control_report = effect_control_report; + iface->hid_physical.effect_update_report = effect_update_report; return TRUE; } @@ -602,6 +720,37 @@ static void hid_device_set_output_report(struct unix_device *iface, HID_XFER_PAC else io->Status = iface->hid_vtbl->physical_effect_control(iface, report->index, control, report->iterations); } + else if (packet->reportId == physical->effect_update_report) + { + struct pid_effect_update *report = (struct pid_effect_update *)(packet->reportBuffer + 1); + struct effect_params *params = iface->hid_physical.effect_params + report->index; + USAGE effect_type; + + io->Information = sizeof(*report) + 1; + if (packet->reportBufferLen < io->Information) + io->Status = STATUS_BUFFER_TOO_SMALL; + else if (report->type_index >= ARRAY_SIZE(iface->hid_physical.effect_types)) + io->Status = STATUS_INVALID_PARAMETER; + else if (!(effect_type = iface->hid_physical.effect_types[report->type_index])) + io->Status = STATUS_INVALID_PARAMETER; + else + { + params->effect_type = effect_type; + params->duration = report->duration; + params->trigger_repeat_interval = report->trigger_repeat_interval; + params->sample_period = report->sample_period; + params->start_delay = report->start_delay; + params->gain = report->gain; + params->trigger_button = report->trigger_button == 0xff ? 0 : report->trigger_button; + params->axis_enabled[0] = (report->enable_bits & 1) != 0; + params->axis_enabled[1] = (report->enable_bits & 2) != 0; + params->direction_enabled = (report->enable_bits & 4) != 0; + params->direction[0] = report->direction[0]; + params->direction[1] = report->direction[1]; + + io->Status = iface->hid_vtbl->physical_effect_update(iface, report->index, params); + } + } else { io->Information = 0; diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index 2446b8de4a7..125ee600eb6 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -29,6 +29,20 @@ #include "wine/list.h" +struct effect_params +{ + USAGE effect_type; + UINT16 duration; + UINT16 trigger_repeat_interval; + UINT16 sample_period; + UINT16 start_delay; + BYTE gain; + BYTE trigger_button; + BOOL axis_enabled[2]; + BOOL direction_enabled; + BYTE direction[2]; +}; + struct raw_device_vtbl { void (*destroy)(struct unix_device *iface); @@ -49,6 +63,7 @@ struct hid_device_vtbl USHORT rumble_intensity, USHORT buzz_intensity); NTSTATUS (*physical_device_control)(struct unix_device *iface, USAGE control); NTSTATUS (*physical_effect_control)(struct unix_device *iface, BYTE index, USAGE control, BYTE iterations); + NTSTATUS (*physical_effect_update)(struct unix_device *iface, BYTE index, struct effect_params *params); }; struct hid_report_descriptor @@ -91,8 +106,12 @@ struct hid_haptics struct hid_physical { + USAGE effect_types[32]; + struct effect_params effect_params[256]; + BYTE device_control_report; BYTE effect_control_report; + BYTE effect_update_report; }; struct hid_device_state @@ -161,7 +180,7 @@ extern BOOL hid_device_add_axes(struct unix_device *iface, BYTE count, USAGE usa const USAGE *usages, BOOL rel, LONG min, LONG max) DECLSPEC_HIDDEN; extern BOOL hid_device_add_haptics(struct unix_device *iface) DECLSPEC_HIDDEN; -extern BOOL hid_device_add_physical(struct unix_device *iface) DECLSPEC_HIDDEN; +extern BOOL hid_device_add_physical(struct unix_device *iface, USAGE *usages, USHORT count) DECLSPEC_HIDDEN; extern BOOL hid_device_set_abs_axis(struct unix_device *iface, ULONG index, LONG value) DECLSPEC_HIDDEN; extern BOOL hid_device_set_rel_axis(struct unix_device *iface, ULONG index, LONG value) DECLSPEC_HIDDEN; diff --git a/dlls/winebus.sys/unixlib.c b/dlls/winebus.sys/unixlib.c index 29537170df7..c9d5fa5fd43 100644 --- a/dlls/winebus.sys/unixlib.c +++ b/dlls/winebus.sys/unixlib.c @@ -99,6 +99,12 @@ static NTSTATUS mouse_physical_effect_control(struct unix_device *iface, BYTE in return STATUS_NOT_SUPPORTED; } +static NTSTATUS mouse_physical_effect_update(struct unix_device *iface, BYTE index, + struct effect_params *params) +{ + return STATUS_NOT_SUPPORTED; +} + static const struct hid_device_vtbl mouse_vtbl = { mouse_destroy, @@ -107,6 +113,7 @@ static const struct hid_device_vtbl mouse_vtbl = mouse_haptics_start, mouse_physical_device_control, mouse_physical_effect_control, + mouse_physical_effect_update, }; static const struct device_desc mouse_device_desc = @@ -169,6 +176,12 @@ static NTSTATUS keyboard_physical_effect_control(struct unix_device *iface, BYTE return STATUS_NOT_SUPPORTED; } +static NTSTATUS keyboard_physical_effect_update(struct unix_device *iface, BYTE index, + struct effect_params *params) +{ + return STATUS_NOT_SUPPORTED; +} + static const struct hid_device_vtbl keyboard_vtbl = { keyboard_destroy, @@ -177,6 +190,7 @@ static const struct hid_device_vtbl keyboard_vtbl = keyboard_haptics_start, keyboard_physical_device_control, keyboard_physical_effect_control, + keyboard_physical_effect_update, }; static const struct device_desc keyboard_device_desc = -- 2.33.0

2 8

[PATCH 1/6] winexinput.sys: Fix casing of "Xbox One for Windows" product string.
by Rémi Bernon 05 Oct '21

05 Oct '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This is a series of patches from Proton, improving the compatibility for some popular controllers. dlls/winexinput.sys/main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winexinput.sys/main.c b/dlls/winexinput.sys/main.c index 79c566e7cc8..56d60f55570 100644 --- a/dlls/winexinput.sys/main.c +++ b/dlls/winexinput.sys/main.c @@ -325,11 +325,11 @@ static const struct device_strings device_strings[] = { { .id = L"VID_045E&PID_028E", .product = L"Controller (XBOX 360 For Windows)" }, { .id = L"VID_045E&PID_028F", .product = L"Controller (XBOX 360 For Windows)" }, - { .id = L"VID_045E&PID_02D1", .product = L"Controller (XBOX One For Windows)" }, - { .id = L"VID_045E&PID_02DD", .product = L"Controller (XBOX One For Windows)" }, - { .id = L"VID_045E&PID_02E3", .product = L"Controller (XBOX One For Windows)" }, - { .id = L"VID_045E&PID_02EA", .product = L"Controller (XBOX One For Windows)" }, - { .id = L"VID_045E&PID_02FD", .product = L"Controller (XBOX One For Windows)" }, + { .id = L"VID_045E&PID_02D1", .product = L"Controller (Xbox One For Windows)" }, + { .id = L"VID_045E&PID_02DD", .product = L"Controller (Xbox One For Windows)" }, + { .id = L"VID_045E&PID_02E3", .product = L"Controller (Xbox One For Windows)" }, + { .id = L"VID_045E&PID_02EA", .product = L"Controller (Xbox One For Windows)" }, + { .id = L"VID_045E&PID_02FD", .product = L"Controller (Xbox One For Windows)" }, { .id = L"VID_045E&PID_0719", .product = L"Controller (XBOX 360 For Windows)" }, }; -- 2.33.0

1 5

[PATCH 4/4] iphlpapi: Move the Icmp6 stubs to iphlpapi_main.c .
by Huw Davies 05 Oct '21

05 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/icmp.c | 58 ----------------------------------- dlls/iphlpapi/iphlpapi_main.c | 23 ++++++++++++++ 2 files changed, 23 insertions(+), 58 deletions(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index 8ef03219e52..6441d7dd8ad 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -353,64 +353,6 @@ done: * Exported Routines. */ -/*********************************************************************** - * Icmp6CreateFile (IPHLPAPI.@) - */ -HANDLE WINAPI Icmp6CreateFile(VOID) -{ - icmp_t* icp; - - int sid=socket(AF_INET6,SOCK_RAW,IPPROTO_ICMPV6); - if (sid < 0) - { - /* Some systems (e.g. Linux 3.0+ and Mac OS X) support - non-privileged ICMP via SOCK_DGRAM type. */ - sid=socket(AF_INET6,SOCK_DGRAM,IPPROTO_ICMPV6); - } - if (sid < 0) { - ERR_(winediag)("Failed to use ICMPV6 (network ping), this requires special permissions.\n"); - SetLastError(ERROR_ACCESS_DENIED); - return INVALID_HANDLE_VALUE; - } - - icp=HeapAlloc(GetProcessHeap(), 0, sizeof(*icp)); - if (icp==NULL) { - close(sid); - SetLastError(IP_NO_RESOURCES); - return INVALID_HANDLE_VALUE; - } - icp->sid=sid; - icp->default_opts.OptionsSize=IP_OPTS_UNKNOWN; - return (HANDLE)icp; -} - - -/*********************************************************************** - * Icmp6SendEcho2 (IPHLPAPI.@) - */ -DWORD WINAPI Icmp6SendEcho2( - HANDLE IcmpHandle, - HANDLE Event, - PIO_APC_ROUTINE ApcRoutine, - PVOID ApcContext, - struct sockaddr_in6* SourceAddress, - struct sockaddr_in6* DestinationAddress, - LPVOID RequestData, - WORD RequestSize, - PIP_OPTION_INFORMATION RequestOptions, - LPVOID ReplyBuffer, - DWORD ReplySize, - DWORD Timeout - ) -{ - FIXME("(%p, %p, %p, %p, %p, %p, %p, %d, %p, %p, %d, %d): stub\n", IcmpHandle, Event, - ApcRoutine, ApcContext, SourceAddress, DestinationAddress, RequestData, - RequestSize, RequestOptions, ReplyBuffer, ReplySize, Timeout); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - /*********************************************************************** * IcmpCreateFile (IPHLPAPI.@) */ diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 9e525a2116c..2286c732383 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -4555,3 +4555,26 @@ DWORD WINAPI IcmpParseReplies( void *reply, DWORD reply_size ) if (!num_pkts) SetLastError( icmp_reply->Status ); return num_pkts; } + +/*********************************************************************** + * Icmp6CreateFile (IPHLPAPI.@) + */ +HANDLE WINAPI Icmp6CreateFile( void ) +{ + FIXME( "stub\n" ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return INVALID_HANDLE_VALUE; +} + +/*********************************************************************** + * Icmp6SendEcho2 (IPHLPAPI.@) + */ +DWORD WINAPI Icmp6SendEcho2( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc_routine, void *apc_ctxt, + struct sockaddr_in6 *src, struct sockaddr_in6 *dst, void *request, WORD request_size, + IP_OPTION_INFORMATION *opts, void *reply, DWORD reply_size, DWORD timeout ) +{ + FIXME( "(%p, %p, %p, %p, %p, %p, %p, %d, %p, %p, %d, %d): stub\n", handle, event, + apc_routine, apc_ctxt, src, dst, request, request_size, opts, reply, reply_size, timeout ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return 0; +} -- 2.23.0

1 0

[PATCH 3/4] iphlpapi: Implement IcmpParseReplies().
by Huw Davies 05 Oct '21

05 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 14 ++++++++++ dlls/iphlpapi/tests/iphlpapi.c | 49 ++++++++++++++++++++++++---------- 3 files changed, 50 insertions(+), 15 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 6c51548b6e3..ce188084c01 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -157,7 +157,7 @@ @ stdcall Icmp6SendEcho2(ptr ptr ptr ptr ptr ptr ptr long ptr ptr long long) @ stdcall IcmpCloseHandle(ptr) @ stdcall IcmpCreateFile() -@ stub IcmpParseReplies +@ stdcall IcmpParseReplies(ptr long) @ stdcall IcmpSendEcho2Ex(ptr ptr ptr ptr long long ptr long ptr ptr long long) @ stdcall IcmpSendEcho2(ptr ptr ptr ptr long ptr long ptr ptr long long) @ stdcall IcmpSendEcho(ptr long ptr long ptr ptr long long) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index d52441f022a..9e525a2116c 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2,6 +2,7 @@ * iphlpapi dll implementation * * Copyright (C) 2003,2006 Juan Lang + * Copyright 2021 Huw Davies * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -4541,3 +4542,16 @@ DWORD WINAPI ParseNetworkString(const WCHAR *str, DWORD type, return ERROR_INVALID_PARAMETER; } + +/****************************************************************** + * IcmpParseReplies (IPHLPAPI.@) + */ +DWORD WINAPI IcmpParseReplies( void *reply, DWORD reply_size ) +{ + ICMP_ECHO_REPLY *icmp_reply = reply; + DWORD num_pkts = icmp_reply->Reserved; + + icmp_reply->Reserved = 0; + if (!num_pkts) SetLastError( icmp_reply->Status ); + return num_pkts; +} diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 223d6d270cb..080feb364f9 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1043,20 +1043,40 @@ static void testIcmpSendEcho(void) IcmpCloseHandle(icmp); } -/* -still-to-be-tested NT4-onward functions: -CreateIpForwardEntry -DeleteIpForwardEntry -CreateIpNetEntry -DeleteIpNetEntry -GetFriendlyIfIndex -GetRTTAndHopCount -SetIfEntry -SetIpForwardEntry -SetIpNetEntry -SetIpStatistics -SetIpTTL -*/ +static void testIcmpParseReplies( void ) +{ + ICMP_ECHO_REPLY reply = { 0 }; + DWORD ret; + + SetLastError( 0xdeadbeef ); + ret = IcmpParseReplies( &reply, sizeof(reply) ); + ok( ret == 0, "ret %d\n", ret ); + ok( GetLastError() == 0, "gle %d\n", GetLastError() ); + + reply.Status = 12345; + SetLastError( 0xdeadbeef ); + ret = IcmpParseReplies( &reply, sizeof(reply) ); + ok( ret == 0, "ret %d\n", ret ); + ok( GetLastError() == 12345, "gle %d\n", GetLastError() ); + ok( reply.Status == 12345, "status %d\n", reply.Status ); + + reply.Reserved = 1; + SetLastError( 0xdeadbeef ); + ret = IcmpParseReplies( &reply, sizeof(reply) ); + ok( ret == 1, "ret %d\n", ret ); + ok( GetLastError() == 0xdeadbeef, "gle %d\n", GetLastError() ); + ok( reply.Status == 12345, "status %d\n", reply.Status ); + ok( !reply.Reserved, "reserved %d\n", reply.Reserved ); + + reply.Reserved = 3; + SetLastError( 0xdeadbeef ); + ret = IcmpParseReplies( &reply, sizeof(reply) ); + ok( ret == 3, "ret %d\n", ret ); + ok( GetLastError() == 0xdeadbeef, "gle %d\n", GetLastError() ); + ok( reply.Status == 12345, "status %d\n", reply.Status ); + ok( !reply.Reserved, "reserved %d\n", reply.Reserved ); +} + static void testWinNT4Functions(void) { testGetNumberOfInterfaces(); @@ -1076,6 +1096,7 @@ static void testWinNT4Functions(void) testGetUdpTable(); testSetTcpEntry(); testIcmpSendEcho(); + testIcmpParseReplies(); } static void testGetInterfaceInfo(void) -- 2.23.0

1 0

[PATCH 2/4] iphlpapi: Stop using USE_WS_PREFIX.
by Huw Davies 05 Oct '21

05 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 216 +++++++++++++++++----------------- 1 file changed, 105 insertions(+), 111 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index ae356dc7b8c..d52441f022a 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -24,7 +24,6 @@ #include "windef.h" #include "winbase.h" #include "winreg.h" -#define USE_WS_PREFIX #include "winsock2.h" #include "winternl.h" #include "ws2ipdef.h" @@ -45,11 +44,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); -#ifndef INADDR_NONE -#define INADDR_NONE ~0UL -#endif -#define INADDR_ANY 0UL - #define CHARS_IN_GUID 39 static const WCHAR device_tcpip[] = {'\\','D','E','V','I','C','E','\\','T','C','P','I','P','_',0}; @@ -58,8 +52,8 @@ DWORD WINAPI AllocateAndGetIpAddrTableFromStack( MIB_IPADDRTABLE **table, BOOL s static const NPI_MODULEID *ip_module_id( USHORT family ) { - if (family == WS_AF_INET) return &NPI_MS_IPV4_MODULEID; - if (family == WS_AF_INET6) return &NPI_MS_IPV6_MODULEID; + if (family == AF_INET) return &NPI_MS_IPV4_MODULEID; + if (family == AF_INET6) return &NPI_MS_IPV6_MODULEID; return NULL; } @@ -230,7 +224,7 @@ DWORD WINAPI CreateProxyArpEntry(DWORD dwAddress, DWORD dwMask, DWORD dwIfIndex) return ERROR_NOT_SUPPORTED; } -static char *debugstr_ipv6(const struct WS_sockaddr_in6 *sin, char *buf) +static char *debugstr_ipv6(const struct sockaddr_in6 *sin, char *buf) { const IN6_ADDR *addr = &sin->sin6_addr; char *p = buf; @@ -263,14 +257,14 @@ static BOOL map_address_6to4( const SOCKADDR_IN6 *addr6, SOCKADDR_IN *addr4 ) { ULONG i; - if (addr6->sin6_family != WS_AF_INET6) return FALSE; + if (addr6->sin6_family != AF_INET6) return FALSE; for (i = 0; i < 5; i++) if (addr6->sin6_addr.u.Word[i]) return FALSE; if (addr6->sin6_addr.u.Word[5] != 0xffff) return FALSE; - addr4->sin_family = WS_AF_INET; + addr4->sin_family = AF_INET; addr4->sin_port = addr6->sin6_port; addr4->sin_addr.S_un.S_addr = addr6->sin6_addr.u.Word[6] << 16 | addr6->sin6_addr.u.Word[7]; memset( &addr4->sin_zero, 0, sizeof(addr4->sin_zero) ); @@ -290,7 +284,7 @@ static BOOL find_src_address( MIB_IPADDRTABLE *table, const SOCKADDR_IN *dst, SO /* take the first address */ if (table->table[i].dwIndex == row.dwForwardIfIndex) { - src->sin6_family = WS_AF_INET6; + src->sin6_family = AF_INET6; src->sin6_port = 0; src->sin6_flowinfo = 0; for (j = 0; j < 5; j++) src->sin6_addr.u.Word[j] = 0; @@ -353,7 +347,7 @@ DWORD WINAPI CreateSortedAddressPairs( const PSOCKADDR_IN6 src_list, DWORD src_c char buf[46]; FIXME( "source address for %s not found\n", debugstr_ipv6(&dst_list[i], buf) ); memset( pairs[i].SourceAddress, 0, sizeof(*pairs[i].SourceAddress) ); - pairs[i].SourceAddress->sin6_family = WS_AF_INET6; + pairs[i].SourceAddress->sin6_family = AF_INET6; } pairs[i].DestinationAddress = ptr++; @@ -565,7 +559,7 @@ static DWORD get_wins_servers( SOCKADDR_INET **servers ) size = sizeof(buf); if (!RegQueryValueExA( key, values[i], NULL, NULL, (LPBYTE)buf, &size )) if (!RtlIpv4StringToAddressA( buf, TRUE, NULL, addrs + count ) && - addrs[count].WS_s_addr != INADDR_NONE && addrs[count].WS_s_addr != INADDR_ANY) + addrs[count].s_addr != INADDR_NONE && addrs[count].s_addr != INADDR_ANY) count++; } RegCloseKey( key ); @@ -576,7 +570,7 @@ static DWORD get_wins_servers( SOCKADDR_INET **servers ) if (!*servers) return 0; for (i = 0; i < count; i++) { - (*servers)[i].Ipv4.sin_family = WS_AF_INET; + (*servers)[i].Ipv4.sin_family = AF_INET; (*servers)[i].Ipv4.sin_addr = addrs[i]; } } @@ -690,21 +684,21 @@ DWORD WINAPI GetAdaptersInfo( IP_ADAPTER_INFO *info, ULONG *size ) cursor->Next = extra_ip_addrs++; cursor = cursor->Next; } - ConvertLengthToIpv4Mask( uni_rw[uni].on_link_prefix, &mask.WS_s_addr ); + ConvertLengthToIpv4Mask( uni_rw[uni].on_link_prefix, &mask.s_addr ); ip_addr_string_init( cursor, &uni_keys[uni].addr, &mask, 0 ); } if (!cursor) { - mask.WS_s_addr = INADDR_ANY; + mask.s_addr = INADDR_ANY; ip_addr_string_init( &info->IpAddressList, &mask, &mask, 0 ); } - gw.WS_s_addr = INADDR_ANY; - mask.WS_s_addr = INADDR_NONE; + gw.s_addr = INADDR_ANY; + mask.s_addr = INADDR_NONE; for (fwd = 0; fwd < fwd_count; fwd++) { /* find the first router on this interface */ if (fwd_keys[fwd].luid.Value == if_keys[i].Value && - fwd_keys[fwd].next_hop.WS_s_addr != INADDR_ANY && + fwd_keys[fwd].next_hop.s_addr != INADDR_ANY && !fwd_keys[fwd].prefix_len) { gw = fwd_keys[fwd].next_hop; @@ -720,7 +714,7 @@ DWORD WINAPI GetAdaptersInfo( IP_ADAPTER_INFO *info, ULONG *size ) ip_addr_string_init( &info->SecondaryWinsServer, NULL, NULL, 0 ); if (info->HaveWins) { - mask.WS_s_addr = INADDR_NONE; + mask.s_addr = INADDR_NONE; ip_addr_string_init( &info->PrimaryWinsServer, &wins_servers[0].Ipv4.sin_addr, &mask, 0 ); if (wins_server_count > 1) ip_addr_string_init( &info->SecondaryWinsServer, &wins_servers[1].Ipv4.sin_addr, &mask, 0 ); @@ -897,25 +891,25 @@ static void adapters_addresses_copy( IP_ADAPTER_ADDRESSES *dst, IP_ADAPTER_ADDRE static BOOL sockaddr_is_loopback( SOCKADDR *sock ) { - if (sock->sa_family == WS_AF_INET) + if (sock->sa_family == AF_INET) { SOCKADDR_IN *sin = (SOCKADDR_IN *)sock; - return (sin->sin_addr.WS_s_addr & 0xff) == 127; + return (sin->sin_addr.s_addr & 0xff) == 127; } - else if (sock->sa_family == WS_AF_INET6) + else if (sock->sa_family == AF_INET6) { SOCKADDR_IN6 *sin6 = (SOCKADDR_IN6 *)sock; - return WS_IN6_IS_ADDR_LOOPBACK( &sin6->sin6_addr ); + return IN6_IS_ADDR_LOOPBACK( &sin6->sin6_addr ); } return FALSE; } static BOOL sockaddr_is_linklocal( SOCKADDR *sock ) { - if (sock->sa_family == WS_AF_INET6) + if (sock->sa_family == AF_INET6) { SOCKADDR_IN6 *sin6 = (SOCKADDR_IN6 *)sock; - return WS_IN6_IS_ADDR_LINKLOCAL( &sin6->sin6_addr ); + return IN6_IS_ADDR_LINKLOCAL( &sin6->sin6_addr ); } return FALSE; } @@ -934,8 +928,8 @@ static DWORD unicast_addresses_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG family, UL struct nsi_ip_unicast_dynamic *dyn; struct nsi_ip_unicast_static *stat; IP_ADAPTER_UNICAST_ADDRESS *addr, **next; - DWORD err, count, i, key_size = (family == WS_AF_INET) ? sizeof(*key4) : sizeof(*key6); - DWORD sockaddr_size = (family == WS_AF_INET) ? sizeof(SOCKADDR_IN) : sizeof(SOCKADDR_IN6); + DWORD err, count, i, key_size = (family == AF_INET) ? sizeof(*key4) : sizeof(*key6); + DWORD sockaddr_size = (family == AF_INET) ? sizeof(SOCKADDR_IN) : sizeof(SOCKADDR_IN6); NET_LUID *luid; void *key; @@ -954,7 +948,7 @@ static DWORD unicast_addresses_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG family, UL { key4 = (struct nsi_ipv4_unicast_key *)key + i; key6 = (struct nsi_ipv6_unicast_key *)key + i; - luid = (family == WS_AF_INET) ? &key4->luid : &key6->luid; + luid = (family == AF_INET) ? &key4->luid : &key6->luid; if (luid->Value != aa->Luid.Value) continue; addr = heap_alloc_zero( sizeof(*addr) + sockaddr_size ); if (!addr) @@ -966,7 +960,7 @@ static DWORD unicast_addresses_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG family, UL addr->Address.lpSockaddr = (SOCKADDR *)(addr + 1); addr->Address.iSockaddrLength = sockaddr_size; addr->Address.lpSockaddr->sa_family = family; - if (family == WS_AF_INET) + if (family == AF_INET) { SOCKADDR_IN *in = (SOCKADDR_IN *)addr->Address.lpSockaddr; in->sin_addr = key4->addr; @@ -1003,8 +997,8 @@ static DWORD gateway_and_prefix_addresses_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG struct nsi_ipv6_forward_key *key6; IP_ADAPTER_GATEWAY_ADDRESS *gw, **gw_next; IP_ADAPTER_PREFIX *prefix, **prefix_next; - DWORD err, count, i, prefix_len, key_size = (family == WS_AF_INET) ? sizeof(*key4) : sizeof(*key6); - DWORD sockaddr_size = (family == WS_AF_INET) ? sizeof(SOCKADDR_IN) : sizeof(SOCKADDR_IN6); + DWORD err, count, i, prefix_len, key_size = (family == AF_INET) ? sizeof(*key4) : sizeof(*key6); + DWORD sockaddr_size = (family == AF_INET) ? sizeof(SOCKADDR_IN) : sizeof(SOCKADDR_IN6); SOCKADDR_INET sockaddr; NET_LUID *luid; void *key; @@ -1024,15 +1018,15 @@ static DWORD gateway_and_prefix_addresses_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG { key4 = (struct nsi_ipv4_forward_key *)key + i; key6 = (struct nsi_ipv6_forward_key *)key + i; - luid = (family == WS_AF_INET) ? &key4->luid : &key6->luid; + luid = (family == AF_INET) ? &key4->luid : &key6->luid; if (luid->Value != aa->Luid.Value) continue; if (flags & GAA_FLAG_INCLUDE_ALL_GATEWAYS) { memset( &sockaddr, 0, sizeof(sockaddr) ); - if (family == WS_AF_INET) + if (family == AF_INET) { - if (key4->next_hop.WS_s_addr != 0) + if (key4->next_hop.s_addr != 0) { sockaddr.si_family = family; sockaddr.Ipv4.sin_addr = key4->next_hop; @@ -1068,9 +1062,9 @@ static DWORD gateway_and_prefix_addresses_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG if (flags & GAA_FLAG_INCLUDE_PREFIX) { memset( &sockaddr, 0, sizeof(sockaddr) ); - if (family == WS_AF_INET) + if (family == AF_INET) { - if (!key4->next_hop.WS_s_addr) + if (!key4->next_hop.s_addr) { sockaddr.si_family = family; sockaddr.Ipv4.sin_addr = key4->prefix; @@ -1119,15 +1113,15 @@ static DWORD call_families( DWORD (*fn)( IP_ADAPTER_ADDRESSES *aa, ULONG family, { DWORD err; - if (family != WS_AF_INET) + if (family != AF_INET) { - err = fn( aa, WS_AF_INET6, flags ); + err = fn( aa, AF_INET6, flags ); if (err) return err; } - if (family != WS_AF_INET6) + if (family != AF_INET6) { - err = fn( aa, WS_AF_INET, flags ); + err = fn( aa, AF_INET, flags ); if (err) return err; } return err; @@ -1135,8 +1129,8 @@ static DWORD call_families( DWORD (*fn)( IP_ADAPTER_ADDRESSES *aa, ULONG family, static DWORD dns_servers_query_code( ULONG family ) { - if (family == WS_AF_INET) return DnsConfigDnsServersIpv4; - if (family == WS_AF_INET6) return DnsConfigDnsServersIpv6; + if (family == AF_INET) return DnsConfigDnsServersIpv4; + if (family == AF_INET6) return DnsConfigDnsServersIpv6; return DnsConfigDnsServersUnspec; } @@ -1336,11 +1330,11 @@ ULONG WINAPI DECLSPEC_HOTPATCH GetAdaptersAddresses( ULONG family, ULONG flags, */ DWORD WINAPI GetBestInterface(IPAddr dwDestAddr, PDWORD pdwBestIfIndex) { - struct WS_sockaddr_in sa_in; + struct sockaddr_in sa_in; memset(&sa_in, 0, sizeof(sa_in)); - sa_in.sin_family = WS_AF_INET; + sa_in.sin_family = AF_INET; sa_in.sin_addr.S_un.S_addr = dwDestAddr; - return GetBestInterfaceEx((struct WS_sockaddr *)&sa_in, pdwBestIfIndex); + return GetBestInterfaceEx((struct sockaddr *)&sa_in, pdwBestIfIndex); } /****************************************************************** @@ -1356,7 +1350,7 @@ DWORD WINAPI GetBestInterface(IPAddr dwDestAddr, PDWORD pdwBestIfIndex) * Success: NO_ERROR * Failure: error code from winerror.h */ -DWORD WINAPI GetBestInterfaceEx(struct WS_sockaddr *pDestAddr, PDWORD pdwBestIfIndex) +DWORD WINAPI GetBestInterfaceEx(struct sockaddr *pDestAddr, PDWORD pdwBestIfIndex) { DWORD ret; @@ -1366,8 +1360,8 @@ DWORD WINAPI GetBestInterfaceEx(struct WS_sockaddr *pDestAddr, PDWORD pdwBestIfI else { MIB_IPFORWARDROW ipRow; - if (pDestAddr->sa_family == WS_AF_INET) { - ret = GetBestRoute(((struct WS_sockaddr_in *)pDestAddr)->sin_addr.S_un.S_addr, 0, &ipRow); + if (pDestAddr->sa_family == AF_INET) { + ret = GetBestRoute(((struct sockaddr_in *)pDestAddr)->sin_addr.S_un.S_addr, 0, &ipRow); if (ret == ERROR_SUCCESS) *pdwBestIfIndex = ipRow.dwForwardIfIndex; } else { @@ -1495,7 +1489,7 @@ static void icmp_stats_ex_to_icmp_stats( MIBICMPSTATS_EX *stats_ex, MIBICMPSTATS DWORD WINAPI GetIcmpStatistics( MIB_ICMP *stats ) { MIB_ICMP_EX stats_ex; - DWORD err = GetIcmpStatisticsEx( &stats_ex, WS_AF_INET ); + DWORD err = GetIcmpStatisticsEx( &stats_ex, AF_INET ); if (err) return err; @@ -1984,7 +1978,7 @@ DWORD WINAPI GetIpAddrTable( MIB_IPADDRTABLE *table, ULONG *size, BOOL sort ) if (!!loopback != (keys[i].luid.Info.IfType == MIB_IF_TYPE_LOOPBACK)) continue; - row->dwAddr = keys[i].addr.WS_s_addr; + row->dwAddr = keys[i].addr.s_addr; ConvertInterfaceLuidToIndex( &keys[i].luid, &row->dwIndex ); ConvertLengthToIpv4Mask( rw[i].on_link_prefix, &row->dwMask ); row->dwBCastAddr = 1; @@ -2098,10 +2092,10 @@ DWORD WINAPI GetIpForwardTable( MIB_IPFORWARDTABLE *table, ULONG *size, BOOL sor { MIB_IPFORWARDROW *row = table->table + i; - row->dwForwardDest = keys[i].prefix.WS_s_addr; + row->dwForwardDest = keys[i].prefix.s_addr; ConvertLengthToIpv4Mask( keys[i].prefix_len, &row->dwForwardMask ); row->dwForwardPolicy = 0; - row->dwForwardNextHop = keys[i].next_hop.WS_s_addr; + row->dwForwardNextHop = keys[i].next_hop.s_addr; row->u1.dwForwardType = row->dwForwardNextHop ? MIB_IPROUTE_TYPE_INDIRECT : MIB_IPROUTE_TYPE_DIRECT; if (!row->dwForwardNextHop) /* find the interface's addr */ { @@ -2109,7 +2103,7 @@ DWORD WINAPI GetIpForwardTable( MIB_IPFORWARDTABLE *table, ULONG *size, BOOL sor { if (uni_keys[addr].luid.Value == keys[i].luid.Value) { - row->dwForwardNextHop = uni_keys[addr].addr.WS_s_addr; + row->dwForwardNextHop = uni_keys[addr].addr.s_addr; break; } } @@ -2178,7 +2172,7 @@ static void forward_row2_fill( MIB_IPFORWARD_ROW2 *row, USHORT fam, void *key, s struct nsi_ipv4_forward_dynamic *dyn4 = (struct nsi_ipv4_forward_dynamic *)dyn; struct nsi_ipv6_forward_dynamic *dyn6 = (struct nsi_ipv6_forward_dynamic *)dyn; - if (fam == WS_AF_INET) + if (fam == AF_INET) { row->InterfaceLuid = key4->luid; row->DestinationPrefix.Prefix.Ipv4.sin_family = fam; @@ -2236,19 +2230,19 @@ DWORD WINAPI GetIpForwardTable2( ADDRESS_FAMILY family, MIB_IPFORWARD_TABLE2 **t struct nsi_ip_forward_rw *rw[2] = { NULL, NULL }; void *dyn[2] = { NULL, NULL }; struct nsi_ip_forward_static *stat[2] = { NULL, NULL }; - static const USHORT fam[2] = { WS_AF_INET, WS_AF_INET6 }; + static const USHORT fam[2] = { AF_INET, AF_INET6 }; static const DWORD key_size[2] = { sizeof(struct nsi_ipv4_forward_key), sizeof(struct nsi_ipv6_forward_key) }; static const DWORD dyn_size[2] = { sizeof(struct nsi_ipv4_forward_dynamic), sizeof(struct nsi_ipv6_forward_dynamic) }; DWORD err = ERROR_SUCCESS, i, size, count[2] = { 0, 0 }; TRACE( "%u, %p\n", family, table ); - if (!table || (family != WS_AF_INET && family != WS_AF_INET6 && family != WS_AF_UNSPEC)) + if (!table || (family != AF_INET && family != AF_INET6 && family != AF_UNSPEC)) return ERROR_INVALID_PARAMETER; for (i = 0; i < 2; i++) { - if (family != WS_AF_UNSPEC && family != fam[i]) continue; + if (family != AF_UNSPEC && family != fam[i]) continue; err = NsiAllocateAndGetTable( 1, ip_module_id( fam[i] ), NSI_IP_FORWARD_TABLE, key + i, key_size[i], (void **)rw + i, sizeof(**rw), dyn + i, dyn_size[i], @@ -2347,7 +2341,7 @@ DWORD WINAPI GetIpNetTable( MIB_IPNETTABLE *table, ULONG *size, BOOL sort ) memcpy( row->bPhysAddr, rw[i].phys_addr, row->dwPhysAddrLen ); memset( row->bPhysAddr + row->dwPhysAddrLen, 0, sizeof(row->bPhysAddr) - row->dwPhysAddrLen ); - row->dwAddr = keys[i].addr.WS_s_addr; + row->dwAddr = keys[i].addr.s_addr; switch (dyn->state) { case NlnsUnreachable: @@ -2404,7 +2398,7 @@ static void ipnet_row2_fill( MIB_IPNET_ROW2 *row, USHORT fam, void *key, struct struct nsi_ipv4_neighbour_key *key4 = (struct nsi_ipv4_neighbour_key *)key; struct nsi_ipv6_neighbour_key *key6 = (struct nsi_ipv6_neighbour_key *)key; - if (fam == WS_AF_INET) + if (fam == AF_INET) { row->Address.Ipv4.sin_family = fam; row->Address.Ipv4.sin_port = 0; @@ -2445,18 +2439,18 @@ DWORD WINAPI GetIpNetTable2( ADDRESS_FAMILY family, MIB_IPNET_TABLE2 **table ) void *key[2] = { NULL, NULL }; struct nsi_ip_neighbour_rw *rw[2] = { NULL, NULL }; struct nsi_ip_neighbour_dynamic *dyn[2] = { NULL, NULL }; - static const USHORT fam[2] = { WS_AF_INET, WS_AF_INET6 }; + static const USHORT fam[2] = { AF_INET, AF_INET6 }; static const DWORD key_size[2] = { sizeof(struct nsi_ipv4_neighbour_key), sizeof(struct nsi_ipv6_neighbour_key) }; DWORD err = ERROR_SUCCESS, i, size, count[2] = { 0, 0 }; TRACE( "%u, %p\n", family, table ); - if (!table || (family != WS_AF_INET && family != WS_AF_INET6 && family != WS_AF_UNSPEC)) + if (!table || (family != AF_INET && family != AF_INET6 && family != AF_UNSPEC)) return ERROR_INVALID_PARAMETER; for (i = 0; i < 2; i++) { - if (family != WS_AF_UNSPEC && family != fam[i]) continue; + if (family != AF_UNSPEC && family != fam[i]) continue; err = NsiAllocateAndGetTable( 1, ip_module_id( fam[i] ), NSI_IP_NEIGHBOUR_TABLE, key + i, key_size[i], (void **)rw + i, sizeof(**rw), (void **)dyn + i, sizeof(**dyn), @@ -2508,7 +2502,7 @@ err: */ DWORD WINAPI GetIpStatistics( MIB_IPSTATS *stats ) { - return GetIpStatisticsEx( stats, WS_AF_INET ); + return GetIpStatisticsEx( stats, AF_INET ); } /****************************************************************** @@ -2802,7 +2796,7 @@ BOOL WINAPI GetRTTAndHopCount(IPAddr DestIpAddress, PULONG HopCount, ULONG MaxHo */ DWORD WINAPI GetTcpStatistics( MIB_TCPSTATS *stats ) { - return GetTcpStatisticsEx( stats, WS_AF_INET ); + return GetTcpStatisticsEx( stats, AF_INET ); } /****************************************************************** @@ -2886,27 +2880,27 @@ static DWORD tcp_table_size( ULONG family, ULONG table_class, DWORD row_count, D case TCP_TABLE_BASIC_LISTENER: case TCP_TABLE_BASIC_CONNECTIONS: case TCP_TABLE_BASIC_ALL: - *row_size = (family == WS_AF_INET) ? sizeof(MIB_TCPROW) : sizeof(MIB_TCP6ROW); - return (family == WS_AF_INET) ? FIELD_OFFSET(MIB_TCPTABLE, table[row_count]) : + *row_size = (family == AF_INET) ? sizeof(MIB_TCPROW) : sizeof(MIB_TCP6ROW); + return (family == AF_INET) ? FIELD_OFFSET(MIB_TCPTABLE, table[row_count]) : FIELD_OFFSET(MIB_TCP6TABLE, table[row_count]); case TCP_TABLE_OWNER_PID_LISTENER: case TCP_TABLE_OWNER_PID_CONNECTIONS: case TCP_TABLE_OWNER_PID_ALL: - *row_size = (family == WS_AF_INET) ? sizeof(MIB_TCPROW_OWNER_PID) : sizeof(MIB_TCP6ROW_OWNER_PID); - return (family == WS_AF_INET) ? FIELD_OFFSET(MIB_TCPTABLE_OWNER_PID, table[row_count]) : + *row_size = (family == AF_INET) ? sizeof(MIB_TCPROW_OWNER_PID) : sizeof(MIB_TCP6ROW_OWNER_PID); + return (family == AF_INET) ? FIELD_OFFSET(MIB_TCPTABLE_OWNER_PID, table[row_count]) : FIELD_OFFSET(MIB_TCP6TABLE_OWNER_PID, table[row_count]); case TCP_TABLE_OWNER_MODULE_LISTENER: case TCP_TABLE_OWNER_MODULE_CONNECTIONS: case TCP_TABLE_OWNER_MODULE_ALL: - *row_size = (family == WS_AF_INET) ? sizeof(MIB_TCPROW_OWNER_MODULE) : sizeof(MIB_TCP6ROW_OWNER_MODULE); - return (family == WS_AF_INET) ? FIELD_OFFSET(MIB_TCPTABLE_OWNER_MODULE, table[row_count]) : + *row_size = (family == AF_INET) ? sizeof(MIB_TCPROW_OWNER_MODULE) : sizeof(MIB_TCP6ROW_OWNER_MODULE); + return (family == AF_INET) ? FIELD_OFFSET(MIB_TCPTABLE_OWNER_MODULE, table[row_count]) : FIELD_OFFSET(MIB_TCP6TABLE_OWNER_MODULE, table[row_count]); case TCP_TABLE2: - *row_size = (family == WS_AF_INET) ? sizeof(MIB_TCPROW2) : sizeof(MIB_TCP6ROW2); - return (family == WS_AF_INET) ? FIELD_OFFSET(MIB_TCPTABLE2, table[row_count]) : + *row_size = (family == AF_INET) ? sizeof(MIB_TCPROW2) : sizeof(MIB_TCP6ROW2); + return (family == AF_INET) ? FIELD_OFFSET(MIB_TCPTABLE2, table[row_count]) : FIELD_OFFSET(MIB_TCP6TABLE2, table[row_count]); default: @@ -2919,7 +2913,7 @@ static void tcp_row_fill( void *table, DWORD num, ULONG family, ULONG table_clas struct nsi_tcp_conn_key *key, struct nsi_tcp_conn_dynamic *dyn, struct nsi_tcp_conn_static *stat ) { - if (family == WS_AF_INET) + if (family == AF_INET) { switch (table_class) { @@ -2929,9 +2923,9 @@ static void tcp_row_fill( void *table, DWORD num, ULONG family, ULONG table_clas { MIB_TCPROW *row = ((MIB_TCPTABLE *)table)->table + num; row->u.dwState = dyn->state; - row->dwLocalAddr = key->local.Ipv4.sin_addr.WS_s_addr; + row->dwLocalAddr = key->local.Ipv4.sin_addr.s_addr; row->dwLocalPort = key->local.Ipv4.sin_port; - row->dwRemoteAddr = key->remote.Ipv4.sin_addr.WS_s_addr; + row->dwRemoteAddr = key->remote.Ipv4.sin_addr.s_addr; row->dwRemotePort = key->remote.Ipv4.sin_port; return; } @@ -2941,9 +2935,9 @@ static void tcp_row_fill( void *table, DWORD num, ULONG family, ULONG table_clas { MIB_TCPROW_OWNER_PID *row = ((MIB_TCPTABLE_OWNER_PID *)table)->table + num; row->dwState = dyn->state; - row->dwLocalAddr = key->local.Ipv4.sin_addr.WS_s_addr; + row->dwLocalAddr = key->local.Ipv4.sin_addr.s_addr; row->dwLocalPort = key->local.Ipv4.sin_port; - row->dwRemoteAddr = key->remote.Ipv4.sin_addr.WS_s_addr; + row->dwRemoteAddr = key->remote.Ipv4.sin_addr.s_addr; row->dwRemotePort = key->remote.Ipv4.sin_port; row->dwOwningPid = stat->pid; return; @@ -2954,9 +2948,9 @@ static void tcp_row_fill( void *table, DWORD num, ULONG family, ULONG table_clas { MIB_TCPROW_OWNER_MODULE *row = ((MIB_TCPTABLE_OWNER_MODULE *)table)->table + num; row->dwState = dyn->state; - row->dwLocalAddr = key->local.Ipv4.sin_addr.WS_s_addr; + row->dwLocalAddr = key->local.Ipv4.sin_addr.s_addr; row->dwLocalPort = key->local.Ipv4.sin_port; - row->dwRemoteAddr = key->remote.Ipv4.sin_addr.WS_s_addr; + row->dwRemoteAddr = key->remote.Ipv4.sin_addr.s_addr; row->dwRemotePort = key->remote.Ipv4.sin_port; row->dwOwningPid = stat->pid; row->liCreateTimestamp.QuadPart = stat->create_time; @@ -2968,9 +2962,9 @@ static void tcp_row_fill( void *table, DWORD num, ULONG family, ULONG table_clas { MIB_TCPROW2 *row = ((MIB_TCPTABLE2 *)table)->table + num; row->dwState = dyn->state; - row->dwLocalAddr = key->local.Ipv4.sin_addr.WS_s_addr; + row->dwLocalAddr = key->local.Ipv4.sin_addr.s_addr; row->dwLocalPort = key->local.Ipv4.sin_port; - row->dwRemoteAddr = key->remote.Ipv4.sin_addr.WS_s_addr; + row->dwRemoteAddr = key->remote.Ipv4.sin_addr.s_addr; row->dwRemotePort = key->remote.Ipv4.sin_port; row->dwOwningPid = stat->pid; row->dwOffloadState = 0; /* FIXME */ @@ -3141,7 +3135,7 @@ static DWORD get_extended_tcp_table( void *table, DWORD *size, BOOL sort, ULONG int (*fn)(const void *, const void *); DWORD offset; - if (family == WS_AF_INET) fn = tcp_row_cmp; + if (family == AF_INET) fn = tcp_row_cmp; else if (row_size == sizeof(MIB_TCP6ROW)) fn = tcp6_row_basic_cmp; else fn = tcp6_row_owner_cmp; @@ -3191,7 +3185,7 @@ DWORD WINAPI GetExtendedTcpTable( void *table, DWORD *size, BOOL sort, ULONG fam DWORD WINAPI GetTcpTable( MIB_TCPTABLE *table, DWORD *size, BOOL sort ) { TRACE( "table %p, size %p, sort %d\n", table, size, sort ); - return get_extended_tcp_table( table, size, sort, WS_AF_INET, TCP_TABLE_BASIC_ALL ); + return get_extended_tcp_table( table, size, sort, AF_INET, TCP_TABLE_BASIC_ALL ); } /****************************************************************** @@ -3200,7 +3194,7 @@ DWORD WINAPI GetTcpTable( MIB_TCPTABLE *table, DWORD *size, BOOL sort ) ULONG WINAPI GetTcp6Table( MIB_TCP6TABLE *table, ULONG *size, BOOL sort ) { TRACE( "table %p, size %p, sort %d\n", table, size, sort ); - return get_extended_tcp_table( table, size, sort, WS_AF_INET6, TCP_TABLE_BASIC_ALL ); + return get_extended_tcp_table( table, size, sort, AF_INET6, TCP_TABLE_BASIC_ALL ); } /****************************************************************** @@ -3209,7 +3203,7 @@ ULONG WINAPI GetTcp6Table( MIB_TCP6TABLE *table, ULONG *size, BOOL sort ) ULONG WINAPI GetTcpTable2( MIB_TCPTABLE2 *table, ULONG *size, BOOL sort ) { TRACE( "table %p, size %p, sort %d\n", table, size, sort ); - return get_extended_tcp_table( table, size, sort, WS_AF_INET, TCP_TABLE2 ); + return get_extended_tcp_table( table, size, sort, AF_INET, TCP_TABLE2 ); } /****************************************************************** @@ -3218,7 +3212,7 @@ ULONG WINAPI GetTcpTable2( MIB_TCPTABLE2 *table, ULONG *size, BOOL sort ) ULONG WINAPI GetTcp6Table2( MIB_TCP6TABLE2 *table, ULONG *size, BOOL sort ) { TRACE( "table %p, size %p, sort %d\n", table, size, sort ); - return get_extended_tcp_table( table, size, sort, WS_AF_INET6, TCP_TABLE2 ); + return get_extended_tcp_table( table, size, sort, AF_INET6, TCP_TABLE2 ); } static DWORD allocate_tcp_table( void **table, BOOL sort, HANDLE heap, DWORD flags, @@ -3248,7 +3242,7 @@ DWORD WINAPI AllocateAndGetTcpTableFromStack( MIB_TCPTABLE **table, BOOL sort, H if (!table) return ERROR_INVALID_PARAMETER; - return allocate_tcp_table( (void **)table, sort, heap, flags, WS_AF_INET, TCP_TABLE_BASIC_ALL ); + return allocate_tcp_table( (void **)table, sort, heap, flags, AF_INET, TCP_TABLE_BASIC_ALL ); } /****************************************************************** @@ -3259,7 +3253,7 @@ DWORD WINAPI AllocateAndGetTcpExTableFromStack( void **table, BOOL sort, HANDLE TRACE( "table %p, sort %d, heap %p, flags 0x%08x, family %u\n", table, sort, heap, flags, family ); if (!table || !ip_module_id( family )) return ERROR_INVALID_PARAMETER; - if (family == WS_AF_INET6) return ERROR_NOT_SUPPORTED; + if (family == AF_INET6) return ERROR_NOT_SUPPORTED; return allocate_tcp_table( table, sort, heap, flags, family, TCP_TABLE_OWNER_PID_ALL ); } @@ -3274,7 +3268,7 @@ DWORD WINAPI AllocateAndGetTcpExTableFromStack( void **table, BOOL sort, HANDLE */ DWORD WINAPI GetUdpStatistics( MIB_UDPSTATS *stats ) { - return GetUdpStatisticsEx( stats, WS_AF_INET ); + return GetUdpStatisticsEx( stats, AF_INET ); } /****************************************************************** @@ -3324,7 +3318,7 @@ DWORD WINAPI GetUdpStatisticsEx( MIB_UDPSTATS *stats, DWORD family ) */ DWORD WINAPI GetUdpTable( MIB_UDPTABLE *table, DWORD *size, BOOL sort ) { - return GetExtendedUdpTable( table, size, sort, WS_AF_INET, UDP_TABLE_BASIC, 0 ); + return GetExtendedUdpTable( table, size, sort, AF_INET, UDP_TABLE_BASIC, 0 ); } /****************************************************************** @@ -3332,7 +3326,7 @@ DWORD WINAPI GetUdpTable( MIB_UDPTABLE *table, DWORD *size, BOOL sort ) */ DWORD WINAPI GetUdp6Table( MIB_UDP6TABLE *table, DWORD *size, BOOL sort ) { - return GetExtendedUdpTable( table, size, sort, WS_AF_INET6, UDP_TABLE_BASIC, 0 ); + return GetExtendedUdpTable( table, size, sort, AF_INET6, UDP_TABLE_BASIC, 0 ); } static DWORD udp_table_size( ULONG family, ULONG table_class, DWORD row_count, DWORD *row_size ) @@ -3340,18 +3334,18 @@ static DWORD udp_table_size( ULONG family, ULONG table_class, DWORD row_count, D switch (table_class) { case UDP_TABLE_BASIC: - *row_size = (family == WS_AF_INET) ? sizeof(MIB_UDPROW) : sizeof(MIB_UDP6ROW); - return (family == WS_AF_INET) ? FIELD_OFFSET(MIB_UDPTABLE, table[row_count]) : + *row_size = (family == AF_INET) ? sizeof(MIB_UDPROW) : sizeof(MIB_UDP6ROW); + return (family == AF_INET) ? FIELD_OFFSET(MIB_UDPTABLE, table[row_count]) : FIELD_OFFSET(MIB_UDP6TABLE, table[row_count]); case UDP_TABLE_OWNER_PID: - *row_size = (family == WS_AF_INET) ? sizeof(MIB_UDPROW_OWNER_PID) : sizeof(MIB_UDP6ROW_OWNER_PID); - return (family == WS_AF_INET) ? FIELD_OFFSET(MIB_UDPTABLE_OWNER_PID, table[row_count]) : + *row_size = (family == AF_INET) ? sizeof(MIB_UDPROW_OWNER_PID) : sizeof(MIB_UDP6ROW_OWNER_PID); + return (family == AF_INET) ? FIELD_OFFSET(MIB_UDPTABLE_OWNER_PID, table[row_count]) : FIELD_OFFSET(MIB_UDP6TABLE_OWNER_PID, table[row_count]); case UDP_TABLE_OWNER_MODULE: - *row_size = (family == WS_AF_INET) ? sizeof(MIB_UDPROW_OWNER_MODULE) : sizeof(MIB_UDP6ROW_OWNER_MODULE); - return (family == WS_AF_INET) ? FIELD_OFFSET(MIB_UDPTABLE_OWNER_MODULE, table[row_count]) : + *row_size = (family == AF_INET) ? sizeof(MIB_UDPROW_OWNER_MODULE) : sizeof(MIB_UDP6ROW_OWNER_MODULE); + return (family == AF_INET) ? FIELD_OFFSET(MIB_UDPTABLE_OWNER_MODULE, table[row_count]) : FIELD_OFFSET(MIB_UDP6TABLE_OWNER_MODULE, table[row_count]); default: @@ -3364,21 +3358,21 @@ static void udp_row_fill( void *table, DWORD num, ULONG family, ULONG table_clas struct nsi_udp_endpoint_key *key, struct nsi_udp_endpoint_static *stat ) { - if (family == WS_AF_INET) + if (family == AF_INET) { switch (table_class) { case UDP_TABLE_BASIC: { MIB_UDPROW *row = ((MIB_UDPTABLE *)table)->table + num; - row->dwLocalAddr = key->local.Ipv4.sin_addr.WS_s_addr; + row->dwLocalAddr = key->local.Ipv4.sin_addr.s_addr; row->dwLocalPort = key->local.Ipv4.sin_port; return; } case UDP_TABLE_OWNER_PID: { MIB_UDPROW_OWNER_PID *row = ((MIB_UDPTABLE_OWNER_PID *)table)->table + num; - row->dwLocalAddr = key->local.Ipv4.sin_addr.WS_s_addr; + row->dwLocalAddr = key->local.Ipv4.sin_addr.s_addr; row->dwLocalPort = key->local.Ipv4.sin_port; row->dwOwningPid = stat->pid; return; @@ -3386,7 +3380,7 @@ static void udp_row_fill( void *table, DWORD num, ULONG family, ULONG table_clas case UDP_TABLE_OWNER_MODULE: { MIB_UDPROW_OWNER_MODULE *row = ((MIB_UDPTABLE_OWNER_MODULE *)table)->table + num; - row->dwLocalAddr = key->local.Ipv4.sin_addr.WS_s_addr; + row->dwLocalAddr = key->local.Ipv4.sin_addr.s_addr; row->dwLocalPort = key->local.Ipv4.sin_port; row->dwOwningPid = stat->pid; row->liCreateTimestamp.QuadPart = stat->create_time; @@ -3510,7 +3504,7 @@ DWORD WINAPI GetExtendedUdpTable( void *table, DWORD *size, BOOL sort, ULONG fam int (*fn)(const void *, const void *); DWORD offset = udp_table_size( family, table_class, 0, &row_size ); - if (family == WS_AF_INET) fn = udp_row_cmp; + if (family == AF_INET) fn = udp_row_cmp; else fn = udp6_row_cmp; qsort( (BYTE *)table + offset, num, row_size, fn ); @@ -3532,7 +3526,7 @@ DWORD WINAPI AllocateAndGetUdpTableFromStack( MIB_UDPTABLE **table, BOOL sort, H { *table = HeapAlloc( heap, flags, size ); if (!*table) return ERROR_NOT_ENOUGH_MEMORY; - err = GetExtendedUdpTable( *table, &size, sort, WS_AF_INET, UDP_TABLE_BASIC, 0 ); + err = GetExtendedUdpTable( *table, &size, sort, AF_INET, UDP_TABLE_BASIC, 0 ); if (!err) break; HeapFree( heap, flags, *table ); *table = NULL; @@ -3547,7 +3541,7 @@ static void unicast_row_fill( MIB_UNICASTIPADDRESS_ROW *row, USHORT fam, void *k struct nsi_ipv4_unicast_key *key4 = (struct nsi_ipv4_unicast_key *)key; struct nsi_ipv6_unicast_key *key6 = (struct nsi_ipv6_unicast_key *)key; - if (fam == WS_AF_INET) + if (fam == AF_INET) { row->Address.Ipv4.sin_family = fam; row->Address.Ipv4.sin_port = 0; @@ -3600,7 +3594,7 @@ DWORD WINAPI GetUnicastIpAddressEntry(MIB_UNICASTIPADDRESS_ROW *row) if (err) return err; } - if (row->Address.si_family == WS_AF_INET) + if (row->Address.si_family == AF_INET) { key4.luid = row->InterfaceLuid; key4.addr = row->Address.Ipv4.sin_addr; @@ -3608,7 +3602,7 @@ DWORD WINAPI GetUnicastIpAddressEntry(MIB_UNICASTIPADDRESS_ROW *row) key = &key4; key_size = sizeof(key4); } - else if (row->Address.si_family == WS_AF_INET6) + else if (row->Address.si_family == AF_INET6) { key6.luid = row->InterfaceLuid; key6.addr = row->Address.Ipv6.sin6_addr; @@ -3629,18 +3623,18 @@ DWORD WINAPI GetUnicastIpAddressTable(ADDRESS_FAMILY family, MIB_UNICASTIPADDRES struct nsi_ip_unicast_rw *rw[2] = { NULL, NULL }; struct nsi_ip_unicast_dynamic *dyn[2] = { NULL, NULL }; struct nsi_ip_unicast_static *stat[2] = { NULL, NULL }; - static const USHORT fam[2] = { WS_AF_INET, WS_AF_INET6 }; + static const USHORT fam[2] = { AF_INET, AF_INET6 }; static const DWORD key_size[2] = { sizeof(struct nsi_ipv4_unicast_key), sizeof(struct nsi_ipv6_unicast_key) }; DWORD err, i, size, count[2] = { 0, 0 }; TRACE( "%u, %p\n", family, table ); - if (!table || (family != WS_AF_INET && family != WS_AF_INET6 && family != WS_AF_UNSPEC)) + if (!table || (family != AF_INET && family != AF_INET6 && family != AF_UNSPEC)) return ERROR_INVALID_PARAMETER; for (i = 0; i < 2; i++) { - if (family != WS_AF_UNSPEC && family != fam[i]) continue; + if (family != AF_UNSPEC && family != fam[i]) continue; err = NsiAllocateAndGetTable( 1, ip_module_id( fam[i] ), NSI_IP_UNICAST_TABLE, key + i, key_size[i], (void **)rw + i, sizeof(**rw), (void **)dyn + i, sizeof(**dyn), -- 2.23.0

1 0

[PATCH 5/5] nsiproxy: Implement the ability to cancel the listener.
by Huw Davies 05 Oct '21

05 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/device.c | 16 ++++++++++++++-- dlls/nsiproxy.sys/icmp_echo.c | 31 +++++++++++++++++++++++++++++-- dlls/nsiproxy.sys/nsi.c | 1 + dlls/nsiproxy.sys/unix_private.h | 1 + 4 files changed, 45 insertions(+), 4 deletions(-) diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c index 6461071c395..90a7a3ded7c 100644 --- a/dlls/nsiproxy.sys/device.c +++ b/dlls/nsiproxy.sys/device.c @@ -58,6 +58,7 @@ static NTSTATUS nsiproxy_call( unsigned int code, void *args ) enum unix_calls { + icmp_cancel_listen, icmp_close, icmp_listen, icmp_send_echo, @@ -191,12 +192,23 @@ static inline HANDLE irp_set_icmp_handle( IRP *irp, HANDLE handle ) static void WINAPI icmp_echo_cancel( DEVICE_OBJECT *device, IRP *irp ) { + HANDLE handle; + TRACE( "device %p, irp %p.\n", device, irp ); IoReleaseCancelSpinLock( irp->CancelIrql ); - /* FIXME: at the moment just let the request thread bail */ - return; + EnterCriticalSection( &nsiproxy_cs ); + + /* If the handle is not set, either the irp is still + in the request queue, in which case the request thread will + cancel it, or the irp has already finished. If the handle + does exist then notify the listen thread. In all cases the irp + will be completed elsewhere. */ + handle = irp_get_icmp_handle( irp ); + if (handle) nsiproxy_call( icmp_cancel_listen, handle ); + + LeaveCriticalSection( &nsiproxy_cs ); } static NTSTATUS nsiproxy_icmp_echo( IRP *irp ) diff --git a/dlls/nsiproxy.sys/icmp_echo.c b/dlls/nsiproxy.sys/icmp_echo.c index cef5c04a6c7..999b53186c2 100644 --- a/dlls/nsiproxy.sys/icmp_echo.c +++ b/dlls/nsiproxy.sys/icmp_echo.c @@ -100,6 +100,7 @@ struct icmp_data { LARGE_INTEGER send_time; int socket; + int cancel_pipe[2]; unsigned short id; unsigned short seq; const struct family_ops *ops; @@ -522,8 +523,14 @@ static NTSTATUS icmp_data_create( ADDRESS_FAMILY win_family, struct icmp_data ** if (ops->family == AF_INET) ops = &ipv4_linux_ping; #endif } - data->ops = ops; + if (pipe( data->cancel_pipe )) + { + close( data->socket ); + free( data ); + return STATUS_ACCESS_DENIED; + } + data->ops = ops; *icmp_data = data; return STATUS_SUCCESS; } @@ -531,6 +538,8 @@ static NTSTATUS icmp_data_create( ADDRESS_FAMILY win_family, struct icmp_data ** static void icmp_data_free( struct icmp_data *data ) { close( data->socket ); + close( data->cancel_pipe[0] ); + close( data->cancel_pipe[1] ); free( data ); } @@ -668,7 +677,7 @@ NTSTATUS icmp_listen( void *args ) { struct icmp_listen_params *params = args; struct icmp_data *data; - struct pollfd fds[1]; + struct pollfd fds[2]; NTSTATUS status; int ret; @@ -677,9 +686,17 @@ NTSTATUS icmp_listen( void *args ) fds[0].fd = data->socket; fds[0].events = POLLIN; + fds[1].fd = data->cancel_pipe[0]; + fds[1].events = POLLIN; while ((ret = poll( fds, ARRAY_SIZE(fds), get_timeout( data->send_time, params->timeout ) )) > 0) { + if (fds[1].revents & POLLIN) + { + TRACE( "cancelled\n" ); + return STATUS_CANCELLED; + } + status = recv_msg( data, params ); if (status == STATUS_RETRY) continue; return status; @@ -694,6 +711,16 @@ NTSTATUS icmp_listen( void *args ) return set_reply_ip_status( params, errno_to_ip_status( errno ) ); } +NTSTATUS icmp_cancel_listen( void *args ) +{ + HANDLE handle = args; + struct icmp_data *data = handle_data( handle ); + + if (!data) return STATUS_INVALID_PARAMETER; + write( data->cancel_pipe[1], "x", 1 ); + return STATUS_SUCCESS; +} + NTSTATUS icmp_close( void *args ) { HANDLE handle = args; diff --git a/dlls/nsiproxy.sys/nsi.c b/dlls/nsiproxy.sys/nsi.c index b92de7a9a11..fa997d2fe36 100644 --- a/dlls/nsiproxy.sys/nsi.c +++ b/dlls/nsiproxy.sys/nsi.c @@ -147,6 +147,7 @@ static NTSTATUS unix_nsi_get_parameter_ex( void *args ) const unixlib_entry_t __wine_unix_call_funcs[] = { + icmp_cancel_listen, icmp_close, icmp_listen, icmp_send_echo, diff --git a/dlls/nsiproxy.sys/unix_private.h b/dlls/nsiproxy.sys/unix_private.h index 855c06011f9..ffb48cc7380 100644 --- a/dlls/nsiproxy.sys/unix_private.h +++ b/dlls/nsiproxy.sys/unix_private.h @@ -157,6 +157,7 @@ static inline int ascii_strcasecmp( const char *s1, const char *s2 ) return ascii_strncasecmp( s1, s2, -1 ); } +NTSTATUS icmp_cancel_listen( void *args ) DECLSPEC_HIDDEN; NTSTATUS icmp_close( void *args ) DECLSPEC_HIDDEN; NTSTATUS icmp_listen( void *args ) DECLSPEC_HIDDEN; NTSTATUS icmp_send_echo( void *args ) DECLSPEC_HIDDEN; -- 2.23.0

1 0

[PATCH 4/5] nsiproxy: Add support for parsing other icmp packets.
by Huw Davies 05 Oct '21

05 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/icmp_echo.c | 63 ++++++++++++++++++++++++++++++++++- 1 file changed, 62 insertions(+), 1 deletion(-) diff --git a/dlls/nsiproxy.sys/icmp_echo.c b/dlls/nsiproxy.sys/icmp_echo.c index abcccdb4c73..cef5c04a6c7 100644 --- a/dlls/nsiproxy.sys/icmp_echo.c +++ b/dlls/nsiproxy.sys/icmp_echo.c @@ -297,6 +297,30 @@ static BOOL ipv4_linux_ping_parse_ip_hdr( struct msghdr *msg, int recvd, static int ipv4_parse_icmp_hdr_( struct icmp_data *data, struct icmp_hdr *icmp, int icmp_size, struct nsiproxy_icmp_echo_reply *reply, int ping_socket ) { + static const IP_STATUS unreach_codes[] = + { + IP_DEST_NET_UNREACHABLE, /* ICMP_UNREACH_NET */ + IP_DEST_HOST_UNREACHABLE, /* ICMP_UNREACH_HOST */ + IP_DEST_PROT_UNREACHABLE, /* ICMP_UNREACH_PROTOCOL */ + IP_DEST_PORT_UNREACHABLE, /* ICMP_UNREACH_PORT */ + IP_PACKET_TOO_BIG, /* ICMP_UNREACH_NEEDFRAG */ + IP_BAD_ROUTE, /* ICMP_UNREACH_SRCFAIL */ + IP_DEST_NET_UNREACHABLE, /* ICMP_UNREACH_NET_UNKNOWN */ + IP_DEST_HOST_UNREACHABLE, /* ICMP_UNREACH_HOST_UNKNOWN */ + IP_DEST_HOST_UNREACHABLE, /* ICMP_UNREACH_ISOLATED */ + IP_DEST_NET_UNREACHABLE, /* ICMP_UNREACH_NET_PROHIB */ + IP_DEST_HOST_UNREACHABLE, /* ICMP_UNREACH_HOST_PROHIB */ + IP_DEST_NET_UNREACHABLE, /* ICMP_UNREACH_TOSNET */ + IP_DEST_HOST_UNREACHABLE, /* ICMP_UNREACH_TOSHOST */ + IP_DEST_HOST_UNREACHABLE, /* ICMP_UNREACH_FILTER_PROHIB */ + IP_DEST_HOST_UNREACHABLE, /* ICMP_UNREACH_HOST_PRECEDENCE */ + IP_DEST_HOST_UNREACHABLE /* ICMP_UNREACH_PRECEDENCE_CUTOFF */ + }; + const struct ip_hdr *orig_ip_hdr; + const struct icmp_hdr *orig_icmp_hdr; + int orig_ip_hdr_len; + IP_STATUS status; + switch (icmp->type) { case ICMP4_ECHO_REPLY: @@ -306,11 +330,48 @@ static int ipv4_parse_icmp_hdr_( struct icmp_data *data, struct icmp_hdr *icmp, reply->status = IP_SUCCESS; return icmp_size - sizeof(*icmp); - /* FIXME: handle other icmp messages */ + case ICMP4_DST_UNREACH: + if (icmp->code < ARRAY_SIZE(unreach_codes)) + status = unreach_codes[icmp->code]; + else + status = IP_DEST_HOST_UNREACHABLE; + break; + + case ICMP4_TIME_EXCEEDED: + if (icmp->code == 1) /* ICMP_TIMXCEED_REASS */ + status = IP_TTL_EXPIRED_REASSEM; + else + status = IP_TTL_EXPIRED_TRANSIT; + break; + + case ICMP4_PARAM_PROB: + status = IP_PARAM_PROBLEM; + break; + + case ICMP4_SOURCE_QUENCH: + status = IP_SOURCE_QUENCH; + break; default: return -1; } + + /* Check that the appended packet is really ours - + * all handled icmp replies have an 8-byte header + * followed by the original ip hdr. */ + if (icmp_size < sizeof(*icmp) + sizeof(*orig_ip_hdr)) return -1; + orig_ip_hdr = (struct ip_hdr *)(icmp + 1); + if (orig_ip_hdr->v_hl >> 4 != 4 || orig_ip_hdr->protocol != IPPROTO_ICMP) return -1; + orig_ip_hdr_len = (orig_ip_hdr->v_hl & 0xf) << 2; + if (icmp_size < sizeof(*icmp) + orig_ip_hdr_len + sizeof(*orig_icmp_hdr)) return -1; + orig_icmp_hdr = (const struct icmp_hdr *)((const BYTE *)orig_ip_hdr + orig_ip_hdr_len); + if (orig_icmp_hdr->type != ICMP4_ECHO_REQUEST || + orig_icmp_hdr->code != 0 || + (!ping_socket && orig_icmp_hdr->un.echo.id != data->id) || + orig_icmp_hdr->un.echo.sequence != data->seq) return -1; + + reply->status = status; + return 0; } static int ipv4_parse_icmp_hdr( struct icmp_data *data, struct icmp_hdr *icmp, int icmp_size, -- 2.23.0

1 0

[PATCH 3/5] nsiproxy: Parse any received ICMP_ECHO_REPLY.
by Huw Davies 05 Oct '21

05 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/icmp_echo.c | 205 +++++++++++++++++++++++++++++++++- 1 file changed, 203 insertions(+), 2 deletions(-) diff --git a/dlls/nsiproxy.sys/icmp_echo.c b/dlls/nsiproxy.sys/icmp_echo.c index afb48fc72e3..abcccdb4c73 100644 --- a/dlls/nsiproxy.sys/icmp_echo.c +++ b/dlls/nsiproxy.sys/icmp_echo.c @@ -233,6 +233,100 @@ static void ipv4_linux_ping_set_socket_opts( struct icmp_data *data, struct icmp } #endif +static int ipv4_reply_buffer_len( int reply_len ) +{ + return sizeof(struct ip_hdr) + sizeof(struct icmp_hdr) + reply_len - sizeof(struct nsiproxy_icmp_echo_reply); +} + +#ifdef __linux__ +static int ipv4_linux_ping_reply_buffer_len( int reply_len ) +{ + return sizeof(struct icmp_hdr) + reply_len - sizeof(struct nsiproxy_icmp_echo_reply); +} +#endif + +static BOOL ipv4_parse_ip_hdr( struct msghdr *msg, int recvd, + int *ip_hdr_len, struct nsiproxy_icmp_echo_reply *reply, void **opts ) +{ + struct ip_hdr *ip_hdr; + + if (recvd < sizeof(*ip_hdr)) return FALSE; + ip_hdr = msg->msg_iov[0].iov_base; + if (ip_hdr->v_hl >> 4 != 4 || ip_hdr->protocol != IPPROTO_ICMP) return FALSE; + *ip_hdr_len = (ip_hdr->v_hl & 0xf) << 2; + if (*ip_hdr_len < sizeof(*ip_hdr)) return FALSE; + *opts = ip_hdr + 1; + reply->opts.ttl = ip_hdr->ttl; + reply->opts.tos = ip_hdr->tos; + reply->opts.flags = ip_hdr->frag_off >> 13; + reply->opts.options_size = *ip_hdr_len - sizeof(*ip_hdr); + + return TRUE; +} + +#ifdef __linux__ +static BOOL ipv4_linux_ping_parse_ip_hdr( struct msghdr *msg, int recvd, + int *ip_hdr_len, struct nsiproxy_icmp_echo_reply *reply, void **opts ) +{ + struct cmsghdr *cmsg; + + *ip_hdr_len = 0; + *opts = NULL; + reply->opts.ttl = 0; + reply->opts.tos = 0; + reply->opts.flags = 0; + reply->opts.options_size = 0; /* FIXME from IP_OPTIONS but will require checking for space in the reply */ + + for (cmsg = CMSG_FIRSTHDR( msg ); cmsg; cmsg = CMSG_NXTHDR( msg, cmsg )) + { + if (cmsg->cmsg_level != IPPROTO_IP) continue; + switch (cmsg->cmsg_type) + { + case IP_TTL: + reply->opts.ttl = *(BYTE *)CMSG_DATA( cmsg ); + break; + case IP_TOS: + reply->opts.tos = *(BYTE *)CMSG_DATA( cmsg ); + break; + } + } + return TRUE; +} +#endif + +static int ipv4_parse_icmp_hdr_( struct icmp_data *data, struct icmp_hdr *icmp, int icmp_size, + struct nsiproxy_icmp_echo_reply *reply, int ping_socket ) +{ + switch (icmp->type) + { + case ICMP4_ECHO_REPLY: + if ((!ping_socket && icmp->un.echo.id != data->id) || + icmp->un.echo.sequence != data->seq) return -1; + + reply->status = IP_SUCCESS; + return icmp_size - sizeof(*icmp); + + /* FIXME: handle other icmp messages */ + + default: + return -1; + } +} + +static int ipv4_parse_icmp_hdr( struct icmp_data *data, struct icmp_hdr *icmp, int icmp_size, + struct nsiproxy_icmp_echo_reply *reply ) +{ + return ipv4_parse_icmp_hdr_( data, icmp, icmp_size, reply, 0 ); +} + +#ifdef __linux__ +static int ipv4_linux_ping_parse_icmp_hdr( struct icmp_data *data, struct icmp_hdr *icmp, int icmp_size, + struct nsiproxy_icmp_echo_reply *reply ) +{ + return ipv4_parse_icmp_hdr_( data, icmp, icmp_size, reply, 1 ); +} +#endif + struct family_ops { int family; @@ -240,6 +334,11 @@ struct family_ops void (*init_icmp_hdr)( struct icmp_data *data, struct icmp_hdr *icmp_hdr ); unsigned short (*chksum)( BYTE *data, unsigned int count ); void (*set_socket_opts)( struct icmp_data *data, struct icmp_send_echo_params *params ); + int (*reply_buffer_len)( int reply_len ); + BOOL (*parse_ip_hdr)( struct msghdr *msg, int recvd, + int *ip_hdr_len, struct nsiproxy_icmp_echo_reply *reply, void **opts ); + int (*parse_icmp_hdr)( struct icmp_data *data, struct icmp_hdr *icmp, int icmp_len, + struct nsiproxy_icmp_echo_reply *reply ); }; static const struct family_ops ipv4 = @@ -249,6 +348,9 @@ static const struct family_ops ipv4 = ipv4_init_icmp_hdr, chksum, ipv4_set_socket_opts, + ipv4_reply_buffer_len, + ipv4_parse_ip_hdr, + ipv4_parse_icmp_hdr, }; #ifdef __linux__ @@ -260,6 +362,9 @@ static const struct family_ops ipv4_linux_ping = ipv4_init_icmp_hdr, null_chksum, ipv4_linux_ping_set_socket_opts, + ipv4_linux_ping_reply_buffer_len, + ipv4_linux_ping_parse_ip_hdr, + ipv4_linux_ping_parse_icmp_hdr, }; #endif @@ -302,6 +407,34 @@ static int SOCKADDR_INET_to_sockaddr( const SOCKADDR_INET *in, struct sockaddr * return 0; } +static BOOL sockaddr_to_SOCKADDR_INET( const struct sockaddr *in, SOCKADDR_INET *out ) +{ + switch (in->sa_family) + { + case AF_INET: + { + struct sockaddr_in *sa = (struct sockaddr_in *)in; + + out->Ipv4.sin_family = WS_AF_INET; + out->Ipv4.sin_port = sa->sin_port; + out->Ipv4.sin_addr.WS_s_addr = sa->sin_addr.s_addr; + return TRUE; + } + case AF_INET6: + { + struct sockaddr_in6 *sa = (struct sockaddr_in6 *)in; + + out->Ipv6.sin6_family = WS_AF_INET6; + out->Ipv6.sin6_port = sa->sin6_port; + out->Ipv6.sin6_flowinfo = sa->sin6_flowinfo; + memcpy( out->Ipv6.sin6_addr.WS_s6_addr, sa->sin6_addr.s6_addr, sizeof(sa->sin6_addr.s6_addr) ); + out->Ipv6.sin6_scope_id = sa->sin6_scope_id; + return TRUE; + } + } + return FALSE; +} + static NTSTATUS icmp_data_create( ADDRESS_FAMILY win_family, struct icmp_data **icmp_data ) { struct icmp_data *data; @@ -404,11 +537,78 @@ static int get_timeout( LARGE_INTEGER start, DWORD timeout ) return min( (end.QuadPart - now.QuadPart) / 10000, INT_MAX ); } +static ULONG get_rtt( LARGE_INTEGER start ) +{ + LARGE_INTEGER now; + + NtQueryPerformanceCounter( &now, NULL ); + return (now.QuadPart - start.QuadPart) / 10000; +} + +static NTSTATUS recv_msg( struct icmp_data *data, struct icmp_listen_params *params ) +{ + struct nsiproxy_icmp_echo_reply *reply = (struct nsiproxy_icmp_echo_reply *)params->reply; + struct sockaddr_storage addr; + struct iovec iov[1]; + BYTE cmsg_buf[1024]; + struct msghdr msg = { .msg_name = &addr, .msg_namelen = sizeof(addr), + .msg_iov = iov, .msg_iovlen = ARRAY_SIZE(iov), + .msg_control = cmsg_buf, .msg_controllen = sizeof(cmsg_buf) }; + int ip_hdr_len, recvd, reply_buf_len, data_size; + char *reply_buf; + void *opts; + struct icmp_hdr *icmp_hdr; + + reply_buf_len = data->ops->reply_buffer_len( params->reply_len ); + reply_buf = malloc( reply_buf_len ); + if (!reply_buf) return STATUS_NO_MEMORY; + + iov[0].iov_base = reply_buf; + iov[0].iov_len = reply_buf_len; + + recvd = recvmsg( data->socket, &msg, 0 ); + TRACE( "recvmsg() rets %d errno %d addr_len %d iovlen %d msg_flags %x\n", + recvd, errno, msg.msg_namelen, (int)iov[0].iov_len, msg.msg_flags ); + + if (!data->ops->parse_ip_hdr( &msg, recvd, &ip_hdr_len, reply, &opts )) goto skip; + if (recvd < ip_hdr_len + sizeof(*icmp_hdr)) goto skip; + + icmp_hdr = (struct icmp_hdr *)(reply_buf + ip_hdr_len); + if ((data_size = data->ops->parse_icmp_hdr( data, icmp_hdr, recvd - ip_hdr_len, reply )) < 0) goto skip; + reply->data_size = data_size; + if (reply->data_size && msg.msg_flags & MSG_TRUNC) + { + free( reply_buf ); + return set_reply_ip_status( params, IP_GENERAL_FAILURE ); + } + + sockaddr_to_SOCKADDR_INET( (struct sockaddr *)&addr, &reply->addr ); + reply->round_trip_time = get_rtt( data->send_time ); + reply->num_of_pkts = 1; + reply->opts.options_offset = sizeof(*reply); + reply->data_offset = sizeof(*reply) + ((reply->opts.options_size + 3) & ~3); + if (reply->opts.options_size) + memcpy( (char *)reply + reply->opts.options_offset, opts, reply->opts.options_size ); + if (reply->opts.options_size & 3) + memset( (char *)reply + reply->opts.options_offset + reply->opts.options_size, 0, 4 - (reply->opts.options_size & 3) ); + if (reply->data_size) + memcpy( (char *)reply + reply->data_offset, icmp_hdr + 1, reply->data_size ); + + params->reply_len = reply->data_offset + reply->data_size; + free( reply_buf ); + return STATUS_SUCCESS; + +skip: + free( reply_buf ); + return STATUS_RETRY; +} + NTSTATUS icmp_listen( void *args ) { struct icmp_listen_params *params = args; struct icmp_data *data; struct pollfd fds[1]; + NTSTATUS status; int ret; data = handle_data( params->handle ); @@ -419,8 +619,9 @@ NTSTATUS icmp_listen( void *args ) while ((ret = poll( fds, ARRAY_SIZE(fds), get_timeout( data->send_time, params->timeout ) )) > 0) { - /* FIXME */ - return STATUS_NOT_SUPPORTED; + status = recv_msg( data, params ); + if (status == STATUS_RETRY) continue; + return status; } if (!ret) /* timeout */ -- 2.23.0

1 0

[PATCH 2/5] nsiproxy: Wait for an icmp reply.
by Huw Davies 05 Oct '21

05 Oct '21

This patch doesn't yet recv() that reply. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/device.c | 19 +++++++++-- dlls/nsiproxy.sys/icmp_echo.c | 50 ++++++++++++++++++++++++++++ dlls/nsiproxy.sys/nsi.c | 1 + dlls/nsiproxy.sys/nsiproxy_private.h | 7 ++++ dlls/nsiproxy.sys/unix_private.h | 1 + 5 files changed, 76 insertions(+), 2 deletions(-) diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c index 0cd168946cb..6461071c395 100644 --- a/dlls/nsiproxy.sys/device.c +++ b/dlls/nsiproxy.sys/device.c @@ -59,6 +59,7 @@ static NTSTATUS nsiproxy_call( unsigned int code, void *args ) enum unix_calls { icmp_close, + icmp_listen, icmp_send_echo, nsi_enumerate_all_ex, nsi_get_all_parameters_ex, @@ -306,16 +307,30 @@ static int add_device( DRIVER_OBJECT *driver ) static DWORD WINAPI listen_thread_proc( void *arg ) { IRP *irp = arg; + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + struct nsiproxy_icmp_echo *in = irp->AssociatedIrp.SystemBuffer; + struct icmp_listen_params params; + NTSTATUS status; TRACE( "\n" ); - /* FIXME */ + params.handle = irp_get_icmp_handle( irp ); + params.timeout = in->timeout; + params.reply = irp->AssociatedIrp.SystemBuffer; + params.reply_len = irpsp->Parameters.DeviceIoControl.OutputBufferLength; + + status = nsiproxy_call( icmp_listen, &params ); + TRACE( "icmp_listen rets %08x\n", status ); EnterCriticalSection( &nsiproxy_cs ); nsiproxy_call( icmp_close, irp_set_icmp_handle( irp, NULL ) ); - irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + irp->IoStatus.Status = status; + if (status == STATUS_SUCCESS) + irp->IoStatus.Information = params.reply_len; + else + irp->IoStatus.Information = 0; IoCompleteRequest( irp, IO_NO_INCREMENT ); LeaveCriticalSection( &nsiproxy_cs ); diff --git a/dlls/nsiproxy.sys/icmp_echo.c b/dlls/nsiproxy.sys/icmp_echo.c index 90a779fb67e..afb48fc72e3 100644 --- a/dlls/nsiproxy.sys/icmp_echo.c +++ b/dlls/nsiproxy.sys/icmp_echo.c @@ -31,6 +31,7 @@ #include <errno.h> #include <limits.h> #include <pthread.h> +#include <poll.h> #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> @@ -382,6 +383,55 @@ NTSTATUS icmp_send_echo( void *args ) return params->handle ? STATUS_PENDING : STATUS_NO_MEMORY; } +static NTSTATUS set_reply_ip_status( struct icmp_listen_params *params, IP_STATUS ip_status ) +{ + struct nsiproxy_icmp_echo_reply *reply = params->reply; + + memset( reply, 0, sizeof(*reply) ); + reply->status = ip_status; + params->reply_len = sizeof(*reply); + return STATUS_SUCCESS; +} + +static int get_timeout( LARGE_INTEGER start, DWORD timeout ) +{ + LARGE_INTEGER now, end; + + end.QuadPart = start.QuadPart + (ULONGLONG)timeout * 10000; + NtQueryPerformanceCounter( &now, NULL ); + if (now.QuadPart >= end.QuadPart) return 0; + + return min( (end.QuadPart - now.QuadPart) / 10000, INT_MAX ); +} + +NTSTATUS icmp_listen( void *args ) +{ + struct icmp_listen_params *params = args; + struct icmp_data *data; + struct pollfd fds[1]; + int ret; + + data = handle_data( params->handle ); + if (!data) return STATUS_INVALID_PARAMETER; + + fds[0].fd = data->socket; + fds[0].events = POLLIN; + + while ((ret = poll( fds, ARRAY_SIZE(fds), get_timeout( data->send_time, params->timeout ) )) > 0) + { + /* FIXME */ + return STATUS_NOT_SUPPORTED; + } + + if (!ret) /* timeout */ + { + TRACE( "timeout\n" ); + return set_reply_ip_status( params, IP_REQ_TIMED_OUT ); + } + /* ret < 0 */ + return set_reply_ip_status( params, errno_to_ip_status( errno ) ); +} + NTSTATUS icmp_close( void *args ) { HANDLE handle = args; diff --git a/dlls/nsiproxy.sys/nsi.c b/dlls/nsiproxy.sys/nsi.c index dec66ad6a33..b92de7a9a11 100644 --- a/dlls/nsiproxy.sys/nsi.c +++ b/dlls/nsiproxy.sys/nsi.c @@ -148,6 +148,7 @@ static NTSTATUS unix_nsi_get_parameter_ex( void *args ) const unixlib_entry_t __wine_unix_call_funcs[] = { icmp_close, + icmp_listen, icmp_send_echo, unix_nsi_enumerate_all_ex, unix_nsi_get_all_parameters_ex, diff --git a/dlls/nsiproxy.sys/nsiproxy_private.h b/dlls/nsiproxy.sys/nsiproxy_private.h index b40a6198c7c..91dd393e41e 100644 --- a/dlls/nsiproxy.sys/nsiproxy_private.h +++ b/dlls/nsiproxy.sys/nsiproxy_private.h @@ -17,6 +17,13 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +struct icmp_listen_params +{ + HANDLE handle; + void *reply; + unsigned int reply_len; + int timeout; +}; struct icmp_send_echo_params { diff --git a/dlls/nsiproxy.sys/unix_private.h b/dlls/nsiproxy.sys/unix_private.h index 7f81336e3f1..855c06011f9 100644 --- a/dlls/nsiproxy.sys/unix_private.h +++ b/dlls/nsiproxy.sys/unix_private.h @@ -158,4 +158,5 @@ static inline int ascii_strcasecmp( const char *s1, const char *s2 ) } NTSTATUS icmp_close( void *args ) DECLSPEC_HIDDEN; +NTSTATUS icmp_listen( void *args ) DECLSPEC_HIDDEN; NTSTATUS icmp_send_echo( void *args ) DECLSPEC_HIDDEN; -- 2.23.0

1 0

[PATCH 1/5] nsiproxy: Pass the listen request off to a separate thread.
by Huw Davies 05 Oct '21

05 Oct '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsiproxy.sys/device.c | 36 ++++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/nsiproxy.sys/device.c b/dlls/nsiproxy.sys/device.c index cd0bc0e4db2..0cd168946cb 100644 --- a/dlls/nsiproxy.sys/device.c +++ b/dlls/nsiproxy.sys/device.c @@ -178,6 +178,16 @@ static NTSTATUS nsiproxy_get_parameter( IRP *irp ) return status; } +static inline HANDLE irp_get_icmp_handle( IRP *irp ) +{ + return irp->Tail.Overlay.DriverContext[0]; +} + +static inline HANDLE irp_set_icmp_handle( IRP *irp, HANDLE handle ) +{ + return InterlockedExchangePointer( irp->Tail.Overlay.DriverContext, handle ); +} + static void WINAPI icmp_echo_cancel( DEVICE_OBJECT *device, IRP *irp ) { TRACE( "device %p, irp %p.\n", device, irp ); @@ -293,6 +303,26 @@ static int add_device( DRIVER_OBJECT *driver ) return 1; } +static DWORD WINAPI listen_thread_proc( void *arg ) +{ + IRP *irp = arg; + + TRACE( "\n" ); + + /* FIXME */ + + EnterCriticalSection( &nsiproxy_cs ); + + nsiproxy_call( icmp_close, irp_set_icmp_handle( irp, NULL ) ); + + irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + IoCompleteRequest( irp, IO_NO_INCREMENT ); + + LeaveCriticalSection( &nsiproxy_cs ); + + return 0; +} + static void handle_queued_send_echo( IRP *irp ) { struct nsiproxy_icmp_echo *in = (struct nsiproxy_icmp_echo *)irp->AssociatedIrp.SystemBuffer; @@ -323,10 +353,8 @@ static void handle_queued_send_echo( IRP *irp ) } else { - /* FIXME */ - nsiproxy_call( icmp_close, params.handle ); - irp->IoStatus.Status = STATUS_NOT_SUPPORTED; - IoCompleteRequest( irp, IO_NO_INCREMENT ); + irp_set_icmp_handle( irp, params.handle ); + RtlQueueWorkItem( listen_thread_proc, irp, WT_EXECUTELONGFUNCTION ); } } -- 2.23.0

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel