May 2022 - Wine-Commits - list.winehq.org

Zebediah Figura : d3d11/tests: Add a test for 2D partial RTV slices of a 3D texture.
by Alexandre Julliard May 24, 2022

May 24, 2022

Module: wine Branch: master Commit: ab88f9b51834ec76145b5578b5fffb5fb9037f80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab88f9b51834ec76145b5578… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon May 23 17:37:44 2022 -0500 d3d11/tests: Add a test for 2D partial RTV slices of a 3D texture. This succeeds with the Vulkan renderer. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 99f304e5b68..8225237568f 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -34199,6 +34199,120 @@ static void test_logic_op(void) release_test_context(&test_context); } +static void test_rtv_depth_slice(void) +{ + D3D11_RENDER_TARGET_VIEW_DESC rtv_desc; + struct d3d11_test_context test_context; + ID3D11ShaderResourceView *srv; + ID3D11DeviceContext *context; + struct resource_readback rb; + ID3D11Texture3D *texture; + unsigned int i, colour; + ID3D11PixelShader *ps; + ID3D11Device *device; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + Texture3D t; + + float4 main(float4 pos : SV_Position) : SV_Target + { + return t[int3(pos.x / 640, pos.y / 480, pos.y * 4 / 480)]; + } +#endif + 0x43425844, 0xef9f40c6, 0xbc613d8c, 0x02b23c2b, 0xd2cfcfe7, 0x00000001, 0x00000148, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x7469736f, 0x006e6f69, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x000000ac, 0x00000040, + 0x0000002b, 0x04002858, 0x00107000, 0x00000000, 0x00005555, 0x04002064, 0x00101032, 0x00000000, + 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0a000038, 0x00100072, + 0x00000000, 0x00101146, 0x00000000, 0x00004002, 0x3acccccd, 0x3b088889, 0x3c088889, 0x00000000, + 0x0500001b, 0x00100072, 0x00000000, 0x00100246, 0x00000000, 0x05000036, 0x00100082, 0x00000000, + 0x00004001, 0x00000000, 0x0700002d, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, + 0x00000000, 0x0100003e, + }; + + static const struct + { + struct vec4 ps_colour; + unsigned int output; + } + colours[] = + { + {{1.0f, 0.0f, 0.0f, 1.0f}, 0xff0000ff}, + {{0.0f, 1.0f, 0.0f, 1.0f}, 0xff00ff00}, + {{0.0f, 0.0f, 1.0f, 1.0f}, 0xffff0000}, + {{1.0f, 1.0f, 1.0f, 1.0f}, 0xffffffff}, + }; + + static const D3D11_TEXTURE3D_DESC texture_desc = + { + .Width = 32, + .Height = 32, + .Depth = ARRAY_SIZE(colours), + .MipLevels = 1, + .Format = DXGI_FORMAT_R32G32B32A32_FLOAT, + .Usage = D3D11_USAGE_DEFAULT, + .BindFlags = D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_RENDER_TARGET, + }; + + 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(hr == S_OK, "Failed to create pixel shader, hr %#lx.\n", hr); + + hr = ID3D11Device_CreateTexture3D(device, &texture_desc, NULL, &texture); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)texture, NULL, &srv); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + for (i = 0; i < texture_desc.Depth; ++i) + { + ID3D11RenderTargetView *rtv; + + rtv_desc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE3D; + rtv_desc.Format = texture_desc.Format; + rtv_desc.Texture3D.MipSlice = 0; + rtv_desc.Texture3D.FirstWSlice = i; + rtv_desc.Texture3D.WSize = 1; + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, &rtv_desc, &rtv); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + ID3D11DeviceContext_OMSetRenderTargets(context, 1, &rtv, NULL); + draw_color_quad(&test_context, &colours[i].ps_colour); + + ID3D11RenderTargetView_Release(rtv); + } + + ID3D11DeviceContext_OMSetRenderTargets(context, 1, &test_context.backbuffer_rtv, NULL); + ID3D11DeviceContext_PSSetShaderResources(context, 0, 1, &srv); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + draw_quad(&test_context); + + get_texture_readback(test_context.backbuffer, 0, &rb); + for (i = 0; i < texture_desc.Depth; ++i) + { + unsigned int x = 320, y = 60 + i * 480 / 4; + + colour = get_readback_color(&rb, x, y, 0); + todo_wine ok(colour == colours[i].output, "Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", + colour, x, y, colours[i].output); + } + release_resource_readback(&rb); + + ID3D11ShaderResourceView_Release(srv); + ID3D11Texture3D_Release(texture); + ID3D11PixelShader_Release(ps); + release_test_context(&test_context); +} + START_TEST(d3d11) { unsigned int argc, i; @@ -34380,6 +34494,7 @@ START_TEST(d3d11) queue_test(test_dynamic_map_synchronization); queue_test(test_user_defined_annotation); queue_test(test_logic_op); + queue_test(test_rtv_depth_slice); run_queued_tests();

1 0

Zebediah Figura : d3d10core/tests: Add a test for 2D partial RTV slices of a 3D texture.
by Alexandre Julliard May 24, 2022

May 24, 2022

Module: wine Branch: master Commit: f371ae8f26b359ed6f27c766a663a6573b7657c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f371ae8f26b359ed6f27c766… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon May 23 17:37:45 2022 -0500 d3d10core/tests: Add a test for 2D partial RTV slices of a 3D texture. This succeeds with the Vulkan renderer. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 113 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 49622bd0e26..15f306f9559 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -19217,6 +19217,118 @@ static void test_dynamic_map_synchronization(void) release_test_context(&test_context); } +static void test_rtv_depth_slice(void) +{ + D3D10_RENDER_TARGET_VIEW_DESC rtv_desc; + struct d3d10core_test_context test_context; + ID3D10ShaderResourceView *srv; + struct resource_readback rb; + ID3D10Texture3D *texture; + unsigned int i, colour; + ID3D10PixelShader *ps; + ID3D10Device *device; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + Texture3D t; + + float4 main(float4 pos : SV_Position) : SV_Target + { + return t[int3(pos.x / 640, pos.y / 480, pos.y * 4 / 480)]; + } +#endif + 0x43425844, 0xef9f40c6, 0xbc613d8c, 0x02b23c2b, 0xd2cfcfe7, 0x00000001, 0x00000148, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x7469736f, 0x006e6f69, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x000000ac, 0x00000040, + 0x0000002b, 0x04002858, 0x00107000, 0x00000000, 0x00005555, 0x04002064, 0x00101032, 0x00000000, + 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0a000038, 0x00100072, + 0x00000000, 0x00101146, 0x00000000, 0x00004002, 0x3acccccd, 0x3b088889, 0x3c088889, 0x00000000, + 0x0500001b, 0x00100072, 0x00000000, 0x00100246, 0x00000000, 0x05000036, 0x00100082, 0x00000000, + 0x00004001, 0x00000000, 0x0700002d, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00107e46, + 0x00000000, 0x0100003e, + }; + + static const struct + { + struct vec4 ps_colour; + unsigned int output; + } + colours[] = + { + {{1.0f, 0.0f, 0.0f, 1.0f}, 0xff0000ff}, + {{0.0f, 1.0f, 0.0f, 1.0f}, 0xff00ff00}, + {{0.0f, 0.0f, 1.0f, 1.0f}, 0xffff0000}, + {{1.0f, 1.0f, 1.0f, 1.0f}, 0xffffffff}, + }; + + static const D3D10_TEXTURE3D_DESC texture_desc = + { + .Width = 32, + .Height = 32, + .Depth = ARRAY_SIZE(colours), + .MipLevels = 1, + .Format = DXGI_FORMAT_R32G32B32A32_FLOAT, + .Usage = D3D10_USAGE_DEFAULT, + .BindFlags = D3D10_BIND_SHADER_RESOURCE | D3D10_BIND_RENDER_TARGET, + }; + + if (!init_test_context(&test_context)) + return; + device = test_context.device; + + hr = ID3D10Device_CreatePixelShader(device, ps_code, sizeof(ps_code), &ps); + ok(hr == S_OK, "Failed to create pixel shader, hr %#x.\n", hr); + + hr = ID3D10Device_CreateTexture3D(device, &texture_desc, NULL, &texture); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)texture, NULL, &srv); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + for (i = 0; i < texture_desc.Depth; ++i) + { + ID3D10RenderTargetView *rtv; + + rtv_desc.ViewDimension = D3D10_RTV_DIMENSION_TEXTURE3D; + rtv_desc.Format = texture_desc.Format; + rtv_desc.Texture3D.MipSlice = 0; + rtv_desc.Texture3D.FirstWSlice = i; + rtv_desc.Texture3D.WSize = 1; + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, &rtv_desc, &rtv); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ID3D10Device_OMSetRenderTargets(device, 1, &rtv, NULL); + draw_color_quad(&test_context, &colours[i].ps_colour); + + ID3D10RenderTargetView_Release(rtv); + } + + ID3D10Device_OMSetRenderTargets(device, 1, &test_context.backbuffer_rtv, NULL); + ID3D10Device_PSSetShaderResources(device, 0, 1, &srv); + ID3D10Device_PSSetShader(device, ps); + draw_quad(&test_context); + + get_texture_readback(test_context.backbuffer, 0, &rb); + for (i = 0; i < texture_desc.Depth; ++i) + { + unsigned int x = 320, y = 60 + i * 480 / 4; + + colour = get_readback_color(&rb, x, y); + todo_wine ok(colour == colours[i].output, "Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", + colour, x, y, colours[i].output); + } + release_resource_readback(&rb); + + ID3D10ShaderResourceView_Release(srv); + ID3D10Texture3D_Release(texture); + ID3D10PixelShader_Release(ps); + release_test_context(&test_context); +} + START_TEST(d3d10core) { unsigned int argc, i; @@ -19347,6 +19459,7 @@ START_TEST(d3d10core) queue_test(test_unbound_streams); queue_test(test_texture_compressed_3d); queue_test(test_dynamic_map_synchronization); + queue_test(test_rtv_depth_slice); run_queued_tests();

1 0

Jacek Caban : winemac: Use NtUserSetClipboardData to import clipboard data.
by Alexandre Julliard May 24, 2022

May 24, 2022

Module: wine Branch: master Commit: 11ee4f3fabbf2f1fccad21dcb836d7c114b0f34f URL: https://source.winehq.org/git/wine.git/?a=commit;h=11ee4f3fabbf2f1fccad21dc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat May 21 23:02:29 2022 +0200 winemac: Use NtUserSetClipboardData to import clipboard data. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/clipboard.c | 153 ++++++++++++++++--------------------------- 1 file changed, 55 insertions(+), 98 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=11ee4f3fabbf2f1fccad…

1 0

Jacek Caban : winemac: Store driver thread data pointer in TEB.
by Alexandre Julliard May 24, 2022

May 24, 2022

Module: wine Branch: master Commit: 47e5a0bb5d8aef98557ddf65d10674e3b03877f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47e5a0bb5d8aef98557ddf65… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 23 20:32:11 2022 +0200 winemac: Store driver thread data pointer in TEB. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/macdrv.h | 4 +--- dlls/winemac.drv/macdrv_main.c | 8 ++------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 68ab74dc56e..04a8af81c53 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -114,13 +114,11 @@ struct macdrv_thread_data WORD keyc2scan[128]; }; -extern DWORD thread_data_tls_index DECLSPEC_HIDDEN; - extern struct macdrv_thread_data *macdrv_init_thread_data(void) DECLSPEC_HIDDEN; static inline struct macdrv_thread_data *macdrv_thread_data(void) { - return TlsGetValue(thread_data_tls_index); + return NtUserGetThreadInfo()->driver_data; } diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 2f05e55cb23..8c101576e99 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -46,8 +46,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(macdrv); C_ASSERT(NUM_EVENT_TYPES <= sizeof(macdrv_event_mask) * 8); -DWORD thread_data_tls_index = TLS_OUT_OF_INDEXES; - int topmost_float_inactive = TOPMOST_FLOAT_INACTIVE_NONFULLSCREEN; int capture_displays_for_fullscreen = 0; BOOL skip_single_buffer_flushes = FALSE; @@ -463,8 +461,6 @@ static BOOL process_attach(void) setup_options(); load_strings(macdrv_module); - if ((thread_data_tls_index = TlsAlloc()) == TLS_OUT_OF_INDEXES) return FALSE; - macdrv_err_on = ERR_ON(macdrv); if (macdrv_start_cocoa_app(GetTickCount64())) { @@ -493,7 +489,7 @@ void macdrv_ThreadDetach(void) CFRelease(data->keyboard_layout_uchr); HeapFree(GetProcessHeap(), 0, data); /* clear data in case we get re-entered from user32 before the thread is truly dead */ - TlsSetValue(thread_data_tls_index, NULL); + NtUserGetThreadInfo()->driver_data = 0; } } @@ -556,7 +552,7 @@ struct macdrv_thread_data *macdrv_init_thread_data(void) macdrv_compute_keyboard_layout(data); set_queue_display_fd(macdrv_get_event_queue_fd(data->queue)); - TlsSetValue(thread_data_tls_index, data); + NtUserGetThreadInfo()->driver_data = data; NtUserActivateKeyboardLayout(data->active_keyboard_layout, 0); return data;

1 0

Rémi Bernon : ntdll: Move subheap decommit hysteresis to free_used_block.
by Alexandre Julliard May 24, 2022

May 24, 2022

Module: wine Branch: master Commit: 2c46ee18904b6fef0110d61dabf95046e9e88f2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c46ee18904b6fef0110d61d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 24 08:54:04 2022 +0200 ntdll: Move subheap decommit hysteresis to free_used_block. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 1093fde41ca..8e578d19d05 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -649,8 +649,7 @@ static inline BOOL HEAP_Decommit( SUBHEAP *subheap, void *ptr ) SIZE_T decommit_size; SIZE_T size = (char *)ptr - (char *)subheap->base; - /* round to next block and add one full block */ - size = ((size + COMMIT_MASK) & ~COMMIT_MASK) + COMMIT_MASK + 1; + size = ((size + COMMIT_MASK) & ~COMMIT_MASK); size = max( size, subheap->min_commit ); if (size >= subheap->commitSize) return TRUE; decommit_size = subheap->commitSize - size; @@ -748,7 +747,11 @@ static void free_used_block( SUBHEAP *subheap, struct block *block ) list_remove( &subheap->entry ); NtFreeVirtualMemory( NtCurrentProcess(), &addr, &size, MEM_RELEASE ); } - else if (!heap->shared) HEAP_Decommit( subheap, entry + 1 ); + else if (!heap->shared) + { + /* keep room for a full commited block as hysteresis */ + HEAP_Decommit( subheap, (char *)(entry + 1) + (COMMIT_MASK + 1) ); + } }

1 0

Zebediah Figura : wined3d: Correctly handle 3D textures in wined3d_view_{load, invalidate}_location().
by Alexandre Julliard May 24, 2022

May 24, 2022

Module: wine Branch: master Commit: 7c529506af6c8ad1b8a2d869eb78930469ded85f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c529506af6c8ad1b8a2d869… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon May 23 17:37:43 2022 -0500 wined3d: Correctly handle 3D textures in wined3d_view_{load, invalidate}_location(). The sub-resource index should not be offset by the layer index, which represents a depth offset. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53027 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index f2dea8f0f9a..dbd385219f0 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -315,7 +315,7 @@ static void create_buffer_view(struct wined3d_gl_view *view, struct wined3d_cont static void wined3d_view_invalidate_location(struct wined3d_resource *resource, const struct wined3d_view_desc *desc, DWORD location) { - unsigned int i, sub_resource_idx, layer_count; + unsigned int i, sub_resource_idx; struct wined3d_texture *texture; if (resource->type == WINED3D_RTYPE_BUFFER) @@ -325,17 +325,21 @@ static void wined3d_view_invalidate_location(struct wined3d_resource *resource, } texture = texture_from_resource(resource); + if (resource->type == WINED3D_RTYPE_TEXTURE_3D) + { + wined3d_texture_invalidate_location(texture, desc->u.texture.level_idx, location); + return; + } 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) + for (i = 0; i < desc->u.texture.layer_count; ++i, sub_resource_idx += texture->level_count) 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; + unsigned int i, sub_resource_idx; struct wined3d_texture *texture; if (resource->type == WINED3D_RTYPE_BUFFER) @@ -345,9 +349,14 @@ static void wined3d_view_load_location(struct wined3d_resource *resource, } texture = texture_from_resource(resource); + if (resource->type == WINED3D_RTYPE_TEXTURE_3D) + { + wined3d_texture_load_location(texture, desc->u.texture.level_idx, context, location); + return; + } + 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) + for (i = 0; i < desc->u.texture.layer_count; ++i, sub_resource_idx += texture->level_count) wined3d_texture_load_location(texture, sub_resource_idx, context, location); }

1 0

Bernhard Kölbl : windows.media.speech/tests: Fix a few typos.
by Alexandre Julliard May 24, 2022

May 24, 2022

Module: wine Branch: master Commit: d1b2cceb9949d8acc07fa6ab0096cc6ff1d6678d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1b2cceb9949d8acc07fa6ab… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Fri May 20 13:49:58 2022 +0200 windows.media.speech/tests: Fix a few typos. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/tests/speech.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 6fd683109b4..935afb3c773 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -390,7 +390,7 @@ HRESULT WINAPI async_inspectable_handler_Invoke( IAsyncOperationCompletedHandler return S_OK; } -static const struct IAsyncOperationCompletedHandler_IInspectableVtbl asnyc_inspectable_handler_vtbl = +static const struct IAsyncOperationCompletedHandler_IInspectableVtbl async_inspectable_handler_vtbl = { /* IUnknown methods */ async_inspectable_handler_QueryInterface, @@ -402,7 +402,7 @@ static const struct IAsyncOperationCompletedHandler_IInspectableVtbl asnyc_inspe static HRESULT WINAPI async_inspectable_handler_create_static( struct async_inspectable_handler *impl, const GUID *iid ) { - impl->IAsyncOperationCompletedHandler_IInspectable_iface.lpVtbl = &asnyc_inspectable_handler_vtbl; + impl->IAsyncOperationCompletedHandler_IInspectable_iface.lpVtbl = &async_inspectable_handler_vtbl; impl->iid = iid; impl->ref = 1; @@ -425,8 +425,8 @@ static void await_async_inspectable_( unsigned int line, IAsyncOperation_IInspec CloseHandle(handler->event_finished); } -#define check_async_info(obj, exp_id, exp_status, exp_hr) check_asnyc_info_(__LINE__, obj, exp_id, exp_status, exp_hr) -static void check_asnyc_info_( unsigned int line, IInspectable *async_obj, UINT32 expect_id, AsyncStatus expect_status, HRESULT expect_hr) +#define check_async_info(obj, exp_id, exp_status, exp_hr) check_async_info_(__LINE__, obj, exp_id, exp_status, exp_hr) +static void check_async_info_( unsigned int line, IInspectable *async_obj, UINT32 expect_id, AsyncStatus expect_status, HRESULT expect_hr) { IAsyncInfo *async_info; AsyncStatus async_status;

1 0

Nikolay Sivov : vbscript: Implement TimeSerial().
by Alexandre Julliard May 24, 2022

May 24, 2022

Module: wine Branch: master Commit: b4d42d2cba2454b2d5204ff06bd670084173dd0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4d42d2cba2454b2d5204ff0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 24 08:52:07 2022 +0300 vbscript: Implement TimeSerial(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 37 ++++++++++++++++++++++++++++++++++--- dlls/vbscript/tests/api.vbs | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 876a41a14b2..90cfd557038 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2144,10 +2144,41 @@ static HRESULT Global_DateSerial(BuiltinDisp *This, VARIANT *args, unsigned args return hres; } -static HRESULT Global_TimeSerial(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) +static HRESULT Global_TimeSerial(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + int hour, minute, second; + UDATE ud = {{ 0 }}; + HRESULT hres; + double date; + + TRACE("\n"); + + assert(args_cnt == 3); + + if (V_VT(args) == VT_NULL || V_VT(args + 1) == VT_NULL || V_VT(args + 2) == VT_NULL) + return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); + + hres = to_int(args, &hour); + if (SUCCEEDED(hres)) + hres = to_int(args + 1, &minute); + if (SUCCEEDED(hres)) + hres = to_int(args + 2, &second); + + if (SUCCEEDED(hres)) + { + ud.st.wYear = 1899; + ud.st.wMonth = 12; + ud.st.wDay = 30; + ud.st.wHour = hour; + ud.st.wMinute = minute; + ud.st.wSecond = second; + hres = VarDateFromUdateEx(&ud, 0, 0, &date); + } + + if (SUCCEEDED(hres)) + hres = return_date(res, date); + + return hres; } static HRESULT Global_InputBox(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 758013c93ef..be1d4a806c0 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -2165,4 +2165,41 @@ sub testMonthNameError() end sub call testMonthNameError() +sub testTimeSerial(hh, mm, ss, hhexp, mmexp, ssexp, dateexp) + dim x + x = TimeSerial(hh, mm, ss) + call ok(Hour(x) = hhexp, "hour = " & Hour(x) & " expected " & hhexp) + call ok(Minute(x) = mmexp, "minute = " & Minute(x) & " expected " & mmexp) + call ok(Second(x) = ssexp, "second = " & Second(x) & " expected " & ssexp) + call ok(Year(x) = Year(dateexp), "year = " & Year(x)) + call ok(Month(x) = Month(dateexp), "month = " & Month(x)) + call ok(Day(x) = Day(dateexp), "day = " & Day(x)) + call ok(getVT(x) = "VT_DATE*", "getVT = " & getVT(x)) +end sub + +sub testTimeSerialError() + on error resume next + dim x + call Err.clear() + x = TimeSerial(null, 1, 1) + call ok(Err.number = 94, "Err.number = " & Err.number) + call ok(getVT(x) = "VT_EMPTY*", "getVT = " & getVT(x)) + call Err.clear() + call TimeSerial(10, null, 1) + call ok(Err.number = 94, "Err.number = " & Err.number) + call Err.clear() + call TimeSerial(10, 1, null) + call ok(Err.number = 94, "Err.number = " & Err.number) +end sub + +call testTimeSerial(0, 0, 0, 0, 0, 0, DateSerial(1899, 12, 30)) +call testTimeSerial(10, 2, 1, 10, 2, 1, DateSerial(1899, 12, 30)) +call testTimeSerial(0, 2, 1, 0, 2, 1, DateSerial(1899, 12, 30)) +call testTimeSerial(24, 2, 1, 0, 2, 1, DateSerial(1899, 12, 31)) +call testTimeSerial(25, 2, 1, 1, 2, 1, DateSerial(1899, 12, 31)) +call testTimeSerial(50, 2, 1, 2, 2, 1, DateSerial(1900, 1, 1)) +call testTimeSerial(10, 60, 2, 11, 0, 2, DateSerial(1899, 12, 30)) +call testTimeSerial(10, 0, 60, 10, 1, 0, DateSerial(1899, 12, 30)) +call testTimeSerialError() + Call reportSuccess()

1 0

Rémi Bernon : ntdll: Introduce a new subheap_overhead helper.
by Alexandre Julliard May 24, 2022

May 24, 2022

Module: wine Branch: master Commit: c2b89fd77615334d1c4abd3cd81905731657b6fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2b89fd77615334d1c4abd3c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat May 21 08:54:03 2022 +0200 ntdll: Introduce a new subheap_overhead helper. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 40fbd379772..540625bff27 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -271,6 +271,11 @@ static inline SIZE_T subheap_size( const SUBHEAP *subheap ) return subheap->size; } +static inline SIZE_T subheap_overhead( const SUBHEAP *subheap ) +{ + return subheap->headerSize; +} + static inline const void *subheap_commit_end( const SUBHEAP *subheap ) { return (char *)subheap_base( subheap ) + subheap->commitSize; @@ -499,7 +504,7 @@ static void heap_dump( const HEAP *heap ) if (!check_subheap( subheap )) return; - overhead += (char *)first_block( subheap ) - base; + overhead += subheap_overhead( subheap ); for (block = first_block( subheap ); block; block = next_block( subheap, block )) { if (block_get_flags( block ) & ARENA_FLAG_FREE) @@ -1008,7 +1013,7 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, /* Create the first free block */ - create_free_block( subheap, first_block( subheap ), subheap->size - subheap->headerSize ); + create_free_block( subheap, first_block( subheap ), subheap_size( subheap ) - subheap_overhead( subheap ) ); return subheap; } @@ -1863,7 +1868,7 @@ static NTSTATUS heap_walk( const HEAP *heap, struct rtl_heap_entry *entry ) subheap = LIST_ENTRY( next, SUBHEAP, entry ); base = subheap_base( subheap ); entry->lpData = base; - entry->cbData = (char *)first_block( subheap ) - base; + entry->cbData = subheap_overhead( subheap ); entry->cbOverhead = 0; entry->iRegionIndex = 0; entry->wFlags = RTL_HEAP_ENTRY_REGION;

1 0

Rémi Bernon : ntdll: Merge HEAP_InsertFreeBlock with create_free_block.
by Alexandre Julliard May 24, 2022

May 24, 2022

Module: wine Branch: master Commit: 66036effdf8f017a0e0f2bea0f830f6054691ee7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66036effdf8f017a0e0f2bea… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 4 20:50:48 2022 +0200 ntdll: Merge HEAP_InsertFreeBlock with create_free_block. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 767a010d93e..5fe23a3502e 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -595,28 +595,6 @@ static HEAP *HEAP_GetPtr( } -/*********************************************************************** - * HEAP_InsertFreeBlock - * - * Insert a free block into the free list. - */ -static inline void HEAP_InsertFreeBlock( HEAP *heap, ARENA_FREE *pArena, BOOL last ) -{ - SIZE_T block_size = (pArena->size & ARENA_SIZE_MASK) + sizeof(*pArena); - struct entry *list = find_free_list( heap, block_size, last ); - if (last) - { - /* insert at end of free list, i.e. before the next free list entry */ - list_add_before( &list->entry, &pArena->entry ); - } - else - { - /* insert at head of free list */ - list_add_after( &list->entry, &pArena->entry ); - } -} - - static SUBHEAP *find_subheap( const HEAP *heap, const struct block *block, BOOL heap_walk ) { SUBHEAP *subheap; @@ -692,7 +670,7 @@ static inline BOOL HEAP_Decommit( SUBHEAP *subheap, void *ptr ) static void create_free_block( SUBHEAP *subheap, struct block *block, SIZE_T block_size ) { const char *end = (char *)block + block_size, *commit_end = subheap_commit_end( subheap ); - struct entry *entry = (struct entry *)block; + struct entry *entry = (struct entry *)block, *list; HEAP *heap = subheap->heap; DWORD flags = heap->flags; struct block *next; @@ -724,7 +702,9 @@ static void create_free_block( SUBHEAP *subheap, struct block *block, SIZE_T blo *((struct block **)next - 1) = block; } - HEAP_InsertFreeBlock( heap, entry, !next ); + list = find_free_list( heap, block_get_size( block ), !next ); + if (!next) list_add_before( &list->entry, &entry->entry ); + else list_add_after( &list->entry, &entry->entry ); }

1 0