April 2021 - Wine-commits - list.winehq.org

Jan Sikorski : wined3d: Create null vertex bindings and attributes for unbound shader inputs.
by Alexandre Julliard 27 Apr '21

27 Apr '21

Module: wine Branch: master Commit: d94746314e88df57a2ee8291de3db6e0e37dc9e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d94746314e88df57a2ee8291… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Tue Apr 27 21:23:18 2021 +0200 wined3d: Create null vertex bindings and attributes for unbound shader inputs. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 84 ++++++++++++++++++++++++++++++++++++++++++++--- dlls/wined3d/device.c | 2 +- 2 files changed, 80 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 8719d54644b..fbc1e294fcd 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2004,19 +2004,36 @@ static void wined3d_context_vk_update_blend_state(const struct wined3d_context_v } } +static VkFormat vk_format_from_component_type(enum wined3d_component_type component_type) +{ + switch (component_type) + { + case WINED3D_TYPE_UINT: + return VK_FORMAT_R32G32B32A32_UINT; + case WINED3D_TYPE_INT: + return VK_FORMAT_R32G32B32A32_SINT; + case WINED3D_TYPE_UNKNOWN: + case WINED3D_TYPE_FLOAT: + return VK_FORMAT_R32G32B32A32_SFLOAT; + } + return VK_FORMAT_UNDEFINED; +} + static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_context_vk *context_vk, - const struct wined3d_state *state, VkPipelineLayout vk_pipeline_layout) + const struct wined3d_state *state, VkPipelineLayout vk_pipeline_layout, uint32_t *null_buffer_binding) { unsigned int i, attribute_count, binding_count, divisor_count, stage_count; const struct wined3d_d3d_info *d3d_info = context_vk->c.d3d_info; struct wined3d_graphics_pipeline_key_vk *key; VkPipelineShaderStageCreateInfo *stage; struct wined3d_stream_info stream_info; + struct wined3d_shader *vertex_shader; VkPrimitiveTopology vk_topology; VkShaderModule module; bool update = false; uint32_t mask; + *null_buffer_binding = ~0u; key = &context_vk->graphics.pipeline_key_vk; if (context_vk->c.shader_update_mask & ~(1u << WINED3D_SHADER_TYPE_COMPUTE)) @@ -2041,14 +2058,15 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte || wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_STREAMSRC) || wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX))) { + VkVertexInputAttributeDescription *a; + VkVertexInputBindingDescription *b; + wined3d_stream_info_from_declaration(&stream_info, state, d3d_info); divisor_count = 0; for (i = 0, mask = 0, attribute_count = 0, binding_count = 0; i < ARRAY_SIZE(stream_info.elements); ++i) { VkVertexInputBindingDivisorDescriptionEXT *d; struct wined3d_stream_info_element *e; - VkVertexInputAttributeDescription *a; - VkVertexInputBindingDescription *b; uint32_t binding; if (!(stream_info.use_map & (1u << i))) @@ -2080,6 +2098,55 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte } } + vertex_shader = state->shader[WINED3D_SHADER_TYPE_VERTEX]; + if (vertex_shader && (mask = ~stream_info.use_map & vertex_shader->reg_maps.input_registers)) + { + struct wined3d_shader_signature_element *element; + struct wined3d_shader_signature *signature; + uint32_t null_binding, location; + + for (i = 0; i < ARRAY_SIZE(state->streams); ++i) + { + if (!state->streams[i].buffer) + { + null_binding = i; + break; + } + } + + if (i == ARRAY_SIZE(state->streams)) + { + ERR("No streams left for a null buffer binding.\n"); + } + else + { + signature = &vertex_shader->input_signature; + for (i = 0; i < signature->element_count; ++i) + { + element = &signature->elements[i]; + location = element->register_idx; + + if (!(mask & (1u << location)) || element->sysval_semantic) + continue; + mask &= ~(1u << location); + + a = &key->attributes[attribute_count++]; + a->location = location; + a->binding = null_binding; + a->format = vk_format_from_component_type(element->component_type); + a->offset = 0; + } + + if (mask != (~stream_info.use_map & vertex_shader->reg_maps.input_registers)) + { + b = &key->bindings[binding_count++]; + *null_buffer_binding = b->binding = null_binding; + b->stride = 0; + b->inputRate = VK_VERTEX_INPUT_RATE_VERTEX; + } + } + } + key->input_desc.pNext = NULL; key->input_desc.vertexBindingDescriptionCount = binding_count; key->input_desc.vertexAttributeDescriptionCount = attribute_count; @@ -2991,6 +3058,7 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c VkSampleCountFlagBits sample_count; VkCommandBuffer vk_command_buffer; struct wined3d_buffer *buffer; + uint32_t null_buffer_binding; unsigned int i; if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL)) @@ -3120,8 +3188,8 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c return VK_NULL_HANDLE; } - if (wined3d_context_vk_update_graphics_pipeline_key(context_vk, state, context_vk->graphics.vk_pipeline_layout) - || !context_vk->graphics.vk_pipeline) + if (wined3d_context_vk_update_graphics_pipeline_key(context_vk, state, context_vk->graphics.vk_pipeline_layout, + &null_buffer_binding) || !context_vk->graphics.vk_pipeline) { if (!(context_vk->graphics.vk_pipeline = wined3d_context_vk_get_graphics_pipeline(context_vk))) { @@ -3131,6 +3199,12 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c VK_CALL(vkCmdBindPipeline(vk_command_buffer, VK_PIPELINE_BIND_POINT_GRAPHICS, context_vk->graphics.vk_pipeline)); + if (null_buffer_binding != ~0u) + { + VkDeviceSize offset = 0; + VK_CALL(vkCmdBindVertexBuffers(vk_command_buffer, null_buffer_binding, 1, + &device_vk->null_resources_vk.buffer_info.buffer, &offset)); + } } if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_STENCIL_REF) && dsv) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index bf4c37756a7..f3d7cff74bf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -652,7 +652,7 @@ bool wined3d_device_vk_create_null_resources(struct wined3d_device_vk *device_vk vk_info = context_vk->vk_info; usage = VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT - | VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT; + | VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT | VK_BUFFER_USAGE_VERTEX_BUFFER_BIT; memory_type = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; if (!wined3d_context_vk_create_bo(context_vk, 16, usage, memory_type, &r->bo)) return false;

1 0

Jan Sikorski : d3d11/tests: Add a test for unbound input streams.
by Alexandre Julliard 27 Apr '21

27 Apr '21

Module: wine Branch: master Commit: 5d27777d2c1dda1e792546ea8b7e4420ee7295d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d27777d2c1dda1e792546ea… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Tue Apr 27 21:23:19 2021 +0200 d3d11/tests: Add a test for unbound input streams. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index bf8837ab52c..ca60170d080 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -17157,6 +17157,93 @@ static void test_shader_stage_input_output_matching(void) release_test_context(&test_context); } +static void test_unbound_streams(void) +{ + struct d3d11_test_context test_context; + ID3D11DeviceContext *context; + ID3D11PixelShader *ps; + ID3D11Device *device; + HRESULT hr; + + static const DWORD vs_code[] = + { +#if 0 + struct vs_ps + { + float4 position : SV_POSITION; + float4 color : COLOR0; + }; + + vs_ps vs_main(float4 position : POSITION, float4 color : COLOR0) + { + vs_ps result; + result.position = position; + result.color = color; + result.color.w = 1.0; + return result; + } +#endif + 0x43425844, 0x4a9efaec, 0xe2c6cdf5, 0x15dd28a7, 0xae68e320, 0x00000001, 0x00000154, 0x00000003, + 0x0000002c, 0x0000007c, 0x000000d0, 0x4e475349, 0x00000048, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000041, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x0000070f, 0x49534f50, 0x4e4f4954, 0x4c4f4300, 0xab00524f, 0x4e47534f, + 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, 0x00000003, 0x00000000, + 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, 0x505f5653, + 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, 0x52444853, 0x0000007c, 0x00010040, 0x0000001f, + 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x00101072, 0x00000001, 0x04000067, 0x001020f2, + 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000001, 0x05000036, 0x001020f2, 0x00000000, + 0x00101e46, 0x00000000, 0x05000036, 0x00102072, 0x00000001, 0x00101246, 0x00000001, 0x05000036, + 0x00102082, 0x00000001, 0x00004001, 0x3f800000, 0x0100003e, + }; + + static const DWORD ps_code[] = + { +#if 0 + float4 ps_main(vs_ps input) : SV_TARGET + { + return input.color; + } +#endif + 0x43425844, 0xe2087fa6, 0xa35fbd95, 0x8e585b3f, 0x67890f54, 0x00000001, 0x000000f4, 0x00000003, + 0x0000002c, 0x00000080, 0x000000b4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000038, 0x00000040, + 0x0000000e, 0x03001062, 0x001010f2, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x05000036, + 0x001020f2, 0x00000000, 0x00101e46, 0x00000001, 0x0100003e, + }; + + static const float white[4] = {1.0f, 1.0f, 1.0f, 1.0f}; + + static const D3D11_INPUT_ELEMENT_DESC layout_desc[] = + { + {"POSITION", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0}, + {"COLOR", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 1, 16, D3D11_INPUT_PER_VERTEX_DATA, 0}, + }; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + + hr = ID3D11Device_CreateInputLayout(device, layout_desc, ARRAY_SIZE(layout_desc), + vs_code, sizeof(vs_code), &test_context.input_layout); + ok(SUCCEEDED(hr), "Failed to create input layout, hr %#x.\n", hr); + + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, white); + draw_quad_vs(&test_context, vs_code, sizeof(vs_code)); + check_texture_color(test_context.backbuffer, 0xff000000, 1); + + ID3D11PixelShader_Release(ps); + release_test_context(&test_context); +} + static void test_shader_interstage_interface(void) { struct d3d11_test_context test_context; @@ -32520,6 +32607,7 @@ START_TEST(d3d11) queue_test(test_deferred_context_state); queue_test(test_deferred_context_swap_state); queue_test(test_deferred_context_rendering); + queue_test(test_unbound_streams); run_queued_tests(); }

1 0

Jan Sikorski : d3d10core/tests: Add a test for unbound input streams.
by Alexandre Julliard 27 Apr '21

27 Apr '21

Module: wine Branch: master Commit: 4ccf7498aac20b2b0afa2118f8d919718e5fcbbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ccf7498aac20b2b0afa2118… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Tue Apr 27 21:23:20 2021 +0200 d3d10core/tests: Add a test for unbound input streams. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 86 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 927d79d90e9..ccddb401aed 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -18822,6 +18822,91 @@ static void test_dual_source_blend(void) release_test_context(&test_context); } +static void test_unbound_streams(void) +{ + struct d3d10core_test_context test_context; + ID3D10PixelShader *ps; + ID3D10Device *device; + HRESULT hr; + + static const DWORD vs_code[] = + { +#if 0 + struct vs_ps + { + float4 position : SV_POSITION; + float4 color : COLOR0; + }; + + vs_ps vs_main(float4 position : POSITION, float4 color : COLOR0) + { + vs_ps result; + result.position = position; + result.color = color; + result.color.w = 1.0; + return result; + } +#endif + 0x43425844, 0x4a9efaec, 0xe2c6cdf5, 0x15dd28a7, 0xae68e320, 0x00000001, 0x00000154, 0x00000003, + 0x0000002c, 0x0000007c, 0x000000d0, 0x4e475349, 0x00000048, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000041, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x0000070f, 0x49534f50, 0x4e4f4954, 0x4c4f4300, 0xab00524f, 0x4e47534f, + 0x0000004c, 0x00000002, 0x00000008, 0x00000038, 0x00000000, 0x00000001, 0x00000003, 0x00000000, + 0x0000000f, 0x00000044, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, 0x505f5653, + 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, 0x52444853, 0x0000007c, 0x00010040, 0x0000001f, + 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x00101072, 0x00000001, 0x04000067, 0x001020f2, + 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000001, 0x05000036, 0x001020f2, 0x00000000, + 0x00101e46, 0x00000000, 0x05000036, 0x00102072, 0x00000001, 0x00101246, 0x00000001, 0x05000036, + 0x00102082, 0x00000001, 0x00004001, 0x3f800000, 0x0100003e, + }; + + static const DWORD ps_code[] = + { +#if 0 + float4 ps_main(vs_ps input) : SV_TARGET + { + return input.color; + } +#endif + 0x43425844, 0xe2087fa6, 0xa35fbd95, 0x8e585b3f, 0x67890f54, 0x00000001, 0x000000f4, 0x00000003, + 0x0000002c, 0x00000080, 0x000000b4, 0x4e475349, 0x0000004c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000044, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4f4c4f43, 0xabab0052, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000038, 0x00000040, + 0x0000000e, 0x03001062, 0x001010f2, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x05000036, + 0x001020f2, 0x00000000, 0x00101e46, 0x00000001, 0x0100003e, + }; + + static const float white[4] = {1.0f, 1.0f, 1.0f, 1.0f}; + + static const D3D10_INPUT_ELEMENT_DESC layout_desc[] = + { + {"POSITION", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"COLOR", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 1, 16, D3D10_INPUT_PER_VERTEX_DATA, 0}, + }; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + hr = ID3D10Device_CreatePixelShader(device, ps_code, sizeof(ps_code), &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + + hr = ID3D10Device_CreateInputLayout(device, layout_desc, ARRAY_SIZE(layout_desc), + vs_code, sizeof(vs_code), &test_context.input_layout); + ok(SUCCEEDED(hr), "Failed to create input layout, hr %#x.\n", hr); + + ID3D10Device_PSSetShader(device, ps); + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, white); + draw_quad_vs(&test_context, vs_code, sizeof(vs_code)); + check_texture_color(test_context.backbuffer, 0xff000000, 1); + + ID3D10PixelShader_Release(ps); + release_test_context(&test_context); +} + START_TEST(d3d10core) { unsigned int argc, i; @@ -18946,6 +19031,7 @@ START_TEST(d3d10core) queue_test(test_color_mask); queue_test(test_independent_blend); queue_test(test_dual_source_blend); + queue_test(test_unbound_streams); run_queued_tests();

1 0

Jacek Caban : jscript: Add Map.prototype.has implementation.
by Alexandre Julliard 27 Apr '21

27 Apr '21

Module: wine Branch: master Commit: ae41d600d69233b4bf3f08e5ee7c30b9be3ec61f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae41d600d69233b4bf3f08e5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 27 18:12:21 2021 +0200 jscript: Add Map.prototype.has implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/set.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index 5a2865155ae..bb1cd40b540 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -322,8 +322,17 @@ static HRESULT Map_set(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned static HRESULT Map_has(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - FIXME("%p\n", jsthis); - return E_NOTIMPL; + jsval_t key = argc >= 1 ? argv[0] : jsval_undefined(); + struct jsval_map_entry *entry; + MapInstance *map; + + if(!(map = get_map_this(jsthis))) return JS_E_MAP_EXPECTED; + + TRACE("%p (%s)\n", map, debugstr_jsval(key)); + + entry = get_map_entry(map, key); + if(r) *r = jsval_bool(!!entry); + return S_OK; } static HRESULT Map_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,

1 0

Jacek Caban : jscript: Add Map.size property implementation.
by Alexandre Julliard 27 Apr '21

27 Apr '21

Module: wine Branch: master Commit: b8f17fa48add830e4119f4cd738d2512cb82eec7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8f17fa48add830e4119f4cd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 27 18:12:29 2021 +0200 jscript: Add Map.size property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/set.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index bb1cd40b540..1fdf4f786fe 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -335,6 +335,16 @@ static HRESULT Map_has(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned return S_OK; } +static HRESULT Map_get_size(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) +{ + MapInstance *map = (MapInstance*)jsthis; + + TRACE("%p\n", map); + + *r = jsval_number(map->size); + return S_OK; +} + static HRESULT Map_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { @@ -364,6 +374,10 @@ static const builtin_prop_t Map_prototype_props[] = { {L"set", Map_set, PROPF_METHOD|2}, }; +static const builtin_prop_t Map_props[] = { + {L"size", NULL,0, Map_get_size, builtin_set_const}, +}; + static const builtin_info_t Map_prototype_info = { JSCLASS_OBJECT, {NULL, Map_value, 0}, @@ -376,7 +390,8 @@ static const builtin_info_t Map_prototype_info = { static const builtin_info_t Map_info = { JSCLASS_MAP, {NULL, Map_value, 0}, - 0, NULL, + ARRAY_SIZE(Map_props), + Map_props, Map_destructor, NULL };

1 0

Jacek Caban : jscript: Add Map.prototype.forEach implementation.
by Alexandre Julliard 27 Apr '21

27 Apr '21

Module: wine Branch: master Commit: edda9c1f28d5df8302cb9a7472f82de5f3f5004d URL: https://source.winehq.org/git/wine.git/?a=commit;h=edda9c1f28d5df8302cb9a74… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 27 18:12:37 2021 +0200 jscript: Add Map.prototype.forEach implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/set.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/set.c b/dlls/jscript/set.c index 1fdf4f786fe..8f355f4e4e3 100644 --- a/dlls/jscript/set.c +++ b/dlls/jscript/set.c @@ -252,8 +252,42 @@ static HRESULT Map_delete(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsign static HRESULT Map_forEach(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - FIXME("%p\n", jsthis); - return E_NOTIMPL; + jsval_t callback = argc ? argv[0] : jsval_undefined(); + struct jsval_map_entry *entry; + MapInstance *map; + HRESULT hres; + + if(!(map = get_map_this(jsthis))) return JS_E_MAP_EXPECTED; + + TRACE("%p (%s)\n", map, debugstr_jsval(argc >= 1 ? argv[0] : jsval_undefined())); + + if(!is_object_instance(callback) || !get_object(callback)) { + FIXME("invalid callback %s\n", debugstr_jsval(callback)); + return E_FAIL; + } + + if(argc > 1) { + FIXME("Unsupported argument\n"); + return E_NOTIMPL; + } + + LIST_FOR_EACH_ENTRY(entry, &map->entries, struct jsval_map_entry, list_entry) { + jsval_t args[2], v; + if(entry->deleted) + continue; + args[0] = entry->value; + args[1] = entry->key; + grab_map_entry(entry); + hres = disp_call_value(ctx, get_object(argv[0]), NULL, DISPATCH_METHOD, + ARRAY_SIZE(args), args, &v); + release_map_entry(entry); + if(FAILED(hres)) + return hres; + jsval_release(v); + } + + if(r) *r = jsval_undefined(); + return S_OK; } static HRESULT Map_get(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv,

1 0

Jacek Caban : mshtml/tests: Add Map object tests.
by Alexandre Julliard 27 Apr '21

27 Apr '21

Module: wine Branch: master Commit: 40315aa017793e25716b8eba641aa5b69a624259 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40315aa017793e25716b8eba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 27 18:12:56 2021 +0200 mshtml/tests: Add Map object tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/documentmode.js | 110 +++++++++++++++++++++++++++++++++++++- 1 file changed, 109 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index d4394e011ce..26aa451db0b 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -627,7 +627,7 @@ sync_test("set_obj", function() { sync_test("map_obj", function() { if(!("Map" in window)) return; - var s = new Map, r; + var s = new Map, r, i; ok(Object.getPrototypeOf(s) === Map.prototype, "unexpected Map prototype"); function test_length(name, len) { @@ -642,9 +642,117 @@ sync_test("map_obj", function() { ok(!("entries" in s), "entries are in Map"); ok(!("keys" in s), "keys are in Map"); ok(!("values" in s), "values are in Map"); + todo_wine. + ok("size" in Map.prototype, "size is not in Map.prototype"); r = Object.prototype.toString.call(s); ok(r === "[object Object]", "toString returned " + r); + + r = s.get("test"); + ok(r === undefined, "get(test) returned " + r); + r = s.has("test"); + ok(r === false, "has(test) returned " + r); + ok(s.size === 0, "size = " + s.size + " expected 0"); + + r = s.set("test", 1); + ok(r === undefined, "set returned " + r); + ok(s.size === 1, "size = " + s.size + " expected 1"); + r = s.get("test"); + ok(r === 1, "get(test) returned " + r); + r = s.has("test"); + ok(r === true, "has(test) returned " + r); + + s.size = 100; + ok(s.size === 1, "size = " + s.size + " expected 1"); + + s.set("test", 2); + r = s.get("test"); + ok(r === 2, "get(test) returned " + r); + r = s.has("test"); + ok(r === true, "has(test) returned " + r); + + r = s["delete"]("test"); /* using s.delete() would break parsing in quirks mode */ + ok(r === true, "delete(test) returned " + r); + ok(s.size === 0, "size = " + s.size + " expected 0"); + r = s["delete"]("test"); + ok(r === false, "delete(test) returned " + r); + + var test_keys = [undefined, null, NaN, 3, "str", false, true, {}]; + for(i in test_keys) { + r = s.set(test_keys[i], test_keys[i] + 1); + ok(r === undefined, "set(test) returned " + r); + } + ok(s.size === test_keys.length, "size = " + s.size + " expected " + test_keys.length); + for(i in test_keys) { + r = s.get(test_keys[i]); + if(isNaN(test_keys[i])) + ok(isNaN(r), "get(" + test_keys[i] + ") returned " + r); + else + ok(r === test_keys[i] + 1, "get(" + test_keys[i] + ") returned " + r); + } + + var calls = []; + i = 0; + r = s.forEach(function(value, key) { + if(isNaN(test_keys[i])) { + ok(isNaN(key), "key = " + key + " expected NaN"); + ok(isNaN(value), "value = " + value + " expected NaN"); + }else { + ok(key === test_keys[i], "key = " + key + " expected " + test_keys[i]); + ok(value === key + 1, "value = " + value); + } + i++; + }); + ok(i === test_keys.length, "i = " + i); + ok(r === undefined, "forEach returned " + r); + + s.set(3, "test2") + calls = []; + i = 0; + s.forEach(function(value, key) { + if(isNaN(test_keys[i])) + ok(isNaN(key), "key = " + key + " expected " + test_keys[i]); + else + ok(key === test_keys[i], "key = " + key + " expected " + test_keys[i]); + i++; + }); + ok(i === test_keys.length, "i = " + i); + + r = s.clear(); + ok(r === undefined, "clear returned " + r); + ok(s.size === 0, "size = " + s.size + " expected 0"); + r = s.get(test_keys[0]); + ok(r === undefined, "get returned " + r); + + s = new Map(); + s.set(1, 10); + s.set(2, 20); + s.set(3, 30); + i = true; + s.forEach(function() { + ok(i, "unexpected call"); + s.clear(); + i = false; + }); + + s = new Map(); + s.set(1, 10); + s.set(2, 20); + s.set(3, 30); + i = 0; + s.forEach(function(value, key) { + i += key + value; + r = s["delete"](key); + ok(r === true, "delete returned " + r); + }); + ok(i === 66, "i = " + i); + + try { + Map.prototype.set.call({}, 1, 2); + ok(false, "expected exception"); + }catch(e) { + ok(e.number === 0xa13fc - 0x80000000, "e.number = " + e.number); + } }); sync_test("elem_attr", function() {

1 0

Zebediah Figura : include: Do not include winsock.h in winsock2.h.
by Alexandre Julliard 27 Apr '21

27 Apr '21

Module: wine Branch: master Commit: 904c05d3d31e5b20836f6e71f096d257f57a066e URL: https://source.winehq.org/git/wine.git/?a=commit;h=904c05d3d31e5b20836f6e71… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 27 11:07:19 2021 -0500 include: Do not include winsock.h in winsock2.h. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 2 +- include/winsock.h | 139 +++------------ include/winsock2.h | 480 ++++++++++++++++++++++++++++++++++++++++++++++++++- include/ws2def.h | 160 +++++++++++++++++ server/sock.c | 28 +-- 5 files changed, 661 insertions(+), 148 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=904c05d3d31e5b20836f…

1 0

Zebediah Figura : include: Define _WINSOCKAPI_ in winsock2.h.
by Alexandre Julliard 27 Apr '21

27 Apr '21

Module: wine Branch: master Commit: 9603fba8943f9699e3af6fcfe4acbed09bcb48d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9603fba8943f9699e3af6fcf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 27 11:07:20 2021 -0500 include: Define _WINSOCKAPI_ in winsock2.h. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlfileop.c | 1 - dlls/shell32/tests/string.c | 1 - include/windows.h | 3 --- include/winsock2.h | 1 + tools/winapi/winapi_test | 2 -- 5 files changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 70d90a5c7ac..726585e39a2 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -22,7 +22,6 @@ #include <stdio.h> #define COBJMACROS -#define WINE_NOWINSOCK #include <windows.h> #include "shellapi.h" #include "shlobj.h" diff --git a/dlls/shell32/tests/string.c b/dlls/shell32/tests/string.c index acd94448119..d1d621d9577 100644 --- a/dlls/shell32/tests/string.c +++ b/dlls/shell32/tests/string.c @@ -21,7 +21,6 @@ #include <stdarg.h> #include <stdio.h> -#define WINE_NOWINSOCK #include "windef.h" #include "winbase.h" #include "wtypes.h" diff --git a/include/windows.h b/include/windows.h index ec5c6a20028..47f13e395d2 100644 --- a/include/windows.h +++ b/include/windows.h @@ -59,10 +59,7 @@ #include <rpc.h> #include <shellapi.h> #include <winperf.h> - -#ifndef WINE_NOWINSOCK #include <winsock.h> -#endif /* WINE_NOWINSOCK */ #ifndef NOCRYPT #include <wincrypt.h> diff --git a/include/winsock2.h b/include/winsock2.h index 8739cedcbc6..c299583eaff 100644 --- a/include/winsock2.h +++ b/include/winsock2.h @@ -102,6 +102,7 @@ #ifndef _WINSOCK2API_ #define _WINSOCK2API_ +#define _WINSOCKAPI_ #include <windows.h> diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test index 716bb30ac08..b9628e85154 100755 --- a/tools/winapi/winapi_test +++ b/tools/winapi/winapi_test @@ -517,8 +517,6 @@ sub output_header($$$) { print OUT " */\n"; print OUT "\n"; - print OUT "#define WINE_NOWINSOCK\n"; - print OUT "\n"; foreach my $test (@tests) { my @includes = $tests->get_section($test_dir, $test, "include"); foreach my $include (@includes) {

1 0

Zebediah Figura : include: Properly define struct sockaddr_ipx when not using the WS_ prefix.
by Alexandre Julliard 27 Apr '21

27 Apr '21

Module: wine Branch: master Commit: 468ec36c30acb7841fd69c06cd488cc707ee3df9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=468ec36c30acb7841fd69c06… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 27 11:07:21 2021 -0500 include: Properly define struct sockaddr_ipx when not using the WS_ prefix. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wsipx.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wsipx.h b/include/wsipx.h index 6aa2946ba4c..671e7563470 100644 --- a/include/wsipx.h +++ b/include/wsipx.h @@ -25,7 +25,7 @@ # define WS(x) x #endif -typedef struct WS_sockaddr_ipx +typedef struct WS(sockaddr_ipx) { short sa_family; char sa_netnum[4];

1 0