January 2022 - Wine-commits

Jan Sikorski : wined3d: Acquire references to blitted resources for command lists by inspecting CS packets.
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: 51c10cbc3347503f2c7678cddf1a8724cddb854b URL: https://source.winehq.org/git/wine.git/?a=commit;h=51c10cbc3347503f2c7678cd… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Wed Jan 26 15:43:36 2022 +0100 wined3d: Acquire references to blitted resources for command lists by inspecting CS packets. 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/cs.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 42839e813c3..408f9e97a25 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3693,6 +3693,17 @@ static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *pac break; } + case WINED3D_CS_OP_BLT_SUB_RESOURCE: + { + struct wined3d_cs_blt_sub_resource *op; + + op = (struct wined3d_cs_blt_sub_resource *)packet->data; + if (op->src_resource) + wined3d_resource_decref(op->src_resource); + wined3d_resource_decref(op->dst_resource); + break; + } + default: break; } @@ -3904,6 +3915,17 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) break; } + case WINED3D_CS_OP_BLT_SUB_RESOURCE: + { + struct wined3d_cs_blt_sub_resource *op; + + op = (struct wined3d_cs_blt_sub_resource *)packet->data; + if (op->src_resource) + wined3d_resource_incref(op->src_resource); + wined3d_resource_incref(op->dst_resource); + break; + } + default: break; }

1 0

Jan Sikorski : wined3d: Acquire references to unordered-access view counter buffers for command lists by inspecting CS packets.
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: a33ed42ffe8c33a0a8ae543244536acad0cfd025 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a33ed42ffe8c33a0a8ae5432… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Wed Jan 26 15:43:37 2022 +0100 wined3d: Acquire references to unordered-access view counter buffers for command lists by inspecting CS packets. 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/cs.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 408f9e97a25..e272bef14e1 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3704,6 +3704,16 @@ static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *pac break; } + case WINED3D_CS_OP_COPY_UAV_COUNTER: + { + struct wined3d_cs_copy_uav_counter *op; + + op = (struct wined3d_cs_copy_uav_counter *)packet->data; + wined3d_buffer_decref(op->buffer); + wined3d_unordered_access_view_decref(op->view); + break; + } + default: break; } @@ -3926,6 +3936,16 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) break; } + case WINED3D_CS_OP_COPY_UAV_COUNTER: + { + struct wined3d_cs_copy_uav_counter *op; + + op = (struct wined3d_cs_copy_uav_counter *)packet->data; + wined3d_buffer_incref(op->buffer); + wined3d_unordered_access_view_incref(op->view); + break; + } + default: break; }

1 0

Jan Sikorski : wined3d: Acquire references to mip-map generation shader resource views for command lists by inspecting CS packets.
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: b49062303e50468851cb0e718d6f6bb427306952 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b49062303e50468851cb0e71… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Wed Jan 26 15:43:38 2022 +0100 wined3d: Acquire references to mip-map generation shader resource views for command lists by inspecting CS packets. 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/cs.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index e272bef14e1..e8eb8f313e3 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3714,6 +3714,15 @@ static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *pac break; } + case WINED3D_CS_OP_GENERATE_MIPMAPS: + { + struct wined3d_cs_generate_mipmaps *op; + + op = (struct wined3d_cs_generate_mipmaps *)packet->data; + wined3d_shader_resource_view_decref(op->view); + break; + } + default: break; } @@ -3946,6 +3955,15 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) break; } + case WINED3D_CS_OP_GENERATE_MIPMAPS: + { + struct wined3d_cs_generate_mipmaps *op; + + op = (struct wined3d_cs_generate_mipmaps *)packet->data; + wined3d_shader_resource_view_incref(op->view); + break; + } + default: break; }

1 0

Henri Verbeet : wined3d: Use wined3d_uint32_compare() in compare_sig().
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: ceb9994669e8eb0802426cb3434c155fbdaba336 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ceb9994669e8eb0802426cb3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 26 15:43:39 2022 +0100 wined3d: Use wined3d_uint32_compare() in compare_sig(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 1abc64ccdd1..820ba0199e8 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3855,16 +3855,16 @@ static int compare_sig(const struct wined3d_shader_signature *sig1, const struct if ((ret = strcmp(e1->semantic_name, e2->semantic_name))) return ret; - if (e1->semantic_idx != e2->semantic_idx) - return e1->semantic_idx < e2->semantic_idx ? -1 : 1; - if (e1->sysval_semantic != e2->sysval_semantic) - return e1->sysval_semantic < e2->sysval_semantic ? -1 : 1; - if (e1->component_type != e2->component_type) - return e1->component_type < e2->component_type ? -1 : 1; - if (e1->register_idx != e2->register_idx) - return e1->register_idx < e2->register_idx ? -1 : 1; - if (e1->mask != e2->mask) - return e1->mask < e2->mask ? -1 : 1; + if ((ret = wined3d_uint32_compare(e1->semantic_idx, e2->semantic_idx))) + return ret; + if ((ret = wined3d_uint32_compare(e1->sysval_semantic, e2->sysval_semantic))) + return ret; + if ((ret = wined3d_uint32_compare(e1->component_type, e2->component_type))) + return ret; + if ((ret = wined3d_uint32_compare(e1->register_idx, e2->register_idx))) + return ret; + if ((ret = wined3d_uint32_compare(e1->mask, e2->mask))) + return ret; } return 0; }

1 0

Henri Verbeet : wined3d: Use wined3d_uint32_compare() in glsl_program_key_compare().
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: 8350e026e81c039c2ebb155c129dd5785078be58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8350e026e81c039c2ebb155c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 26 15:43:40 2022 +0100 wined3d: Use wined3d_uint32_compare() in glsl_program_key_compare(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e6381265def..e33cd5d5fe0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10978,24 +10978,20 @@ static int glsl_program_key_compare(const void *key, const struct wine_rb_entry const struct glsl_program_key *k = key; const struct glsl_shader_prog_link *prog = WINE_RB_ENTRY_VALUE(entry, const struct glsl_shader_prog_link, program_lookup_entry); + int ret; - if (k->vs_id > prog->vs.id) return 1; - else if (k->vs_id < prog->vs.id) return -1; - - if (k->gs_id > prog->gs.id) return 1; - else if (k->gs_id < prog->gs.id) return -1; - - if (k->ps_id > prog->ps.id) return 1; - else if (k->ps_id < prog->ps.id) return -1; - - if (k->hs_id > prog->hs.id) return 1; - else if (k->hs_id < prog->hs.id) return -1; - - if (k->ds_id > prog->ds.id) return 1; - else if (k->ds_id < prog->ds.id) return -1; - - if (k->cs_id > prog->cs.id) return 1; - else if (k->cs_id < prog->cs.id) return -1; + if ((ret = wined3d_uint32_compare(k->vs_id, prog->vs.id))) + return ret; + if ((ret = wined3d_uint32_compare(k->gs_id, prog->gs.id))) + return ret; + if ((ret = wined3d_uint32_compare(k->ps_id, prog->ps.id))) + return ret; + if ((ret = wined3d_uint32_compare(k->hs_id, prog->hs.id))) + return ret; + if ((ret = wined3d_uint32_compare(k->ds_id, prog->ds.id))) + return ret; + if ((ret = wined3d_uint32_compare(k->cs_id, prog->cs.id))) + return ret; return 0; }

1 0

Henri Verbeet : wined3d: Use wined3d_bit_scan() in vshader_get_input().
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: dc990b6b2b8d55eab0b50cd4529fb266e7dc321d URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc990b6b2b8d55eab0b50cd4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 26 15:43:41 2022 +0100 wined3d: Use wined3d_bit_scan() in vshader_get_input(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 16 ++++++++-------- dlls/wined3d/wined3d_private.h | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 43c6bb402c0..2731639d554 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3578,24 +3578,24 @@ static BOOL match_usage(BYTE usage1, BYTE usage_idx1, BYTE usage2, BYTE usage_id return FALSE; } -BOOL vshader_get_input(const struct wined3d_shader *shader, - BYTE usage_req, BYTE usage_idx_req, unsigned int *regnum) +bool vshader_get_input(const struct wined3d_shader *shader, + uint8_t usage_req, uint8_t usage_idx_req, unsigned int *regnum) { - WORD map = shader->reg_maps.input_registers; + uint32_t map = shader->reg_maps.input_registers & 0xffff; unsigned int i; - for (i = 0; map; map >>= 1, ++i) + while (map) { - if (!(map & 1)) continue; - + i = wined3d_bit_scan(&map); if (match_usage(shader->u.vs.attributes[i].usage, shader->u.vs.attributes[i].usage_idx, usage_req, usage_idx_req)) { *regnum = i; - return TRUE; + return true; } } - return FALSE; + + return false; } static HRESULT shader_init(struct wined3d_shader *shader, struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8e45b61c61e..e28fc3b880d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5759,8 +5759,8 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 BOOL position_transformed, struct ps_compile_args *args, const struct wined3d_context *context) DECLSPEC_HIDDEN; -BOOL vshader_get_input(const struct wined3d_shader *shader, - BYTE usage_req, BYTE usage_idx_req, unsigned int *regnum) DECLSPEC_HIDDEN; +bool vshader_get_input(const struct wined3d_shader *shader, + uint8_t usage_req, uint8_t usage_idx_req, unsigned int *regnum) DECLSPEC_HIDDEN; void find_vs_compile_args(const struct wined3d_state *state, const struct wined3d_shader *shader, struct vs_compile_args *args, const struct wined3d_context *context) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Use wined3d_bit_scan() in wined3d_device_process_vertices().
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: 1e33280864ec2feace44aa41bfa95331f674bf2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e33280864ec2feace44aa41… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 26 15:43:42 2022 +0100 wined3d: Use wined3d_bit_scan() in wined3d_device_process_vertices(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1b3e0fcc8ca..aa456d3e702 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3509,8 +3509,8 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, struct wined3d_box box = {0}; struct wined3d_shader *vs; unsigned int i, j; + uint32_t map; HRESULT hr; - WORD map; TRACE("device %p, src_start_idx %u, dst_idx %u, vertex_count %u, " "dst_buffer %p, declaration %p, flags %#x, dst_fvf %#x.\n", @@ -3530,14 +3530,13 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, * VBOs in those buffers and fix up the stream_info structure. * * Also apply the start index. */ - for (i = 0, map = stream_info.use_map; map; map >>= 1, ++i) + map = stream_info.use_map; + while (map) { struct wined3d_stream_info_element *e; struct wined3d_map_desc map_desc; - if (!(map & 1)) - continue; - + i = wined3d_bit_scan(&map); e = &stream_info.elements[i]; resource = &state->streams[e->stream_idx].buffer->resource; box.left = src_start_idx * e->stride; @@ -3545,10 +3544,12 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, if (FAILED(wined3d_resource_map(resource, 0, &map_desc, &box, WINED3D_MAP_READ))) { ERR("Failed to map resource.\n"); - for (j = 0, map = stream_info.use_map; map && j < i; map >>= 1, ++j) + map = stream_info.use_map; + while (map) { - if (!(map & 1)) - continue; + j = wined3d_bit_scan(&map); + if (j >= i) + break; e = &stream_info.elements[j]; resource = &state->streams[e->stream_idx].buffer->resource; @@ -3564,11 +3565,10 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, hr = process_vertices_strided(device, dst_idx, vertex_count, &stream_info, dst_buffer, flags, dst_fvf); - for (i = 0, map = stream_info.use_map; map; map >>= 1, ++i) + map = stream_info.use_map; + while (map) { - if (!(map & 1)) - continue; - + i = wined3d_bit_scan(&map); resource = &state->streams[stream_info.elements[i].stream_idx].buffer->resource; if (FAILED(wined3d_resource_unmap(resource, 0))) ERR("Failed to unmap resource.\n");

1 0

Henri Verbeet : wined3d: Use wined3d_bit_scan() in context_update_stream_info().
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: caea3d10fa2d6b3a279d78f64eed33033cd0615d URL: https://source.winehq.org/git/wine.git/?a=commit;h=caea3d10fa2d6b3a279d78f6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 26 15:43:43 2022 +0100 wined3d: Use wined3d_bit_scan() in context_update_stream_info(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index ed7fa32f74c..6aa5ae4e997 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -266,20 +266,19 @@ void context_update_stream_info(struct wined3d_context *context, const struct wi const struct wined3d_d3d_info *d3d_info = context->d3d_info; DWORD prev_all_vbo = stream_info->all_vbo; unsigned int i; - WORD map; + uint32_t map; wined3d_stream_info_from_declaration(stream_info, state, d3d_info); stream_info->all_vbo = 1; - for (i = 0, map = stream_info->use_map; map; map >>= 1, ++i) + map = stream_info->use_map; + while (map) { struct wined3d_stream_info_element *element; struct wined3d_bo_address data; struct wined3d_buffer *buffer; - if (!(map & 1)) - continue; - + i = wined3d_bit_scan(&map); element = &stream_info->elements[i]; buffer = state->streams[element->stream_idx].buffer;

1 0

Daniel Lehman : msvcp140: Add importlib.
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: 4ba0dd1ddb62925cd886c488c3bcd7bd96466b72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ba0dd1ddb62925cd886c488… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Jan 25 07:25:56 2022 -0800 msvcp140: Add importlib. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msvcp140/Makefile.in b/dlls/msvcp140/Makefile.in index d82b1a1eaae..eb0c8c3ef39 100644 --- a/dlls/msvcp140/Makefile.in +++ b/dlls/msvcp140/Makefile.in @@ -1,6 +1,7 @@ MODULE = msvcp140.dll EXTRADEFS = -D_MSVCP_VER=140 PARENTSRC = ../msvcp90 +IMPORTLIB = msvcp140 C_SRCS = \ details.c \

1 0

Bernhard Kölbl : combase/tests: Add tests for the hstring_private struct.
by Alexandre Julliard 26 Jan '22

26 Jan '22

Module: wine Branch: master Commit: d372fdfd7dacb1f361fd6f5b3446b575854c98a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d372fdfd7dacb1f361fd6f5b… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Mon Jan 24 16:09:19 2022 +0100 combase/tests: Add tests for the hstring_private struct. The goal of these tests is to show, that the memory layout of hstring_private is different on Windows, than currently used in Wine. This creates issues with the WinRT SDK, which allocates HSTRINGs without using the functions provided by the combase dll. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/tests/string.c | 76 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/dlls/combase/tests/string.c b/dlls/combase/tests/string.c index 5ebf669a426..799a79017fc 100644 --- a/dlls/combase/tests/string.c +++ b/dlls/combase/tests/string.c @@ -479,6 +479,81 @@ static void test_trim(void) ok(WindowsDeleteString(str1) == S_OK, "Failed to delete string\n"); } +static void test_hstring_struct(void) +{ + struct hstring_header + { + UINT32 flags; + UINT32 length; + UINT32 padding1; + UINT32 padding2; + const WCHAR *str; + }; + + struct hstring_private + { + struct hstring_header header; + LONG refcount; + WCHAR buffer[1]; + }; + + HSTRING str; + HSTRING str2; + HSTRING_HEADER hdr; + struct hstring_private* prv; + struct hstring_private* prv2; + + BOOL arch64 = (sizeof(void*) == 8); + + ok(arch64 ? (sizeof(prv->header) == 24) : (sizeof(prv->header) == 20), "hstring_header size incorrect.\n"); + + ok(WindowsCreateString(input_string, 6, &str) == S_OK, "Failed to create string.\n"); + + prv = CONTAINING_RECORD(str, struct hstring_private, header); + + todo_wine + ok(prv->header.flags == 0, "Expected 0 in flags field, got %#x.\n", prv->header.flags); + todo_wine + ok(prv->header.str == prv->buffer, "Expected str to point at buffer, instead pointing at %p.\n", prv->header.str); + todo_wine + ok(prv->refcount == 1, "Expected 1 in refcount, got %u.\n", prv->refcount); + todo_wine + ok(wcscmp(input_string, prv->buffer) == 0, "Expected strings to match.\n"); + todo_wine + ok(prv->buffer[prv->header.length] == '\0', "Expected buffer to be null terminated.\n"); + + ok(WindowsDuplicateString(str, &str2) == S_OK, "Failed to duplicate string.\n"); + + prv2 = CONTAINING_RECORD(str2, struct hstring_private, header); + + todo_wine + ok(prv->refcount == 2, "Expected 2 in refcount, got %u.\n", prv->refcount); + todo_wine + ok(prv2->refcount == 2, "Expected 2 in refcount, got %u.\n", prv2->refcount); + todo_wine + ok(wcscmp(input_string, prv2->buffer) == 0, "Expected strings to match.\n"); + + ok(WindowsDeleteString(str) == S_OK, "Failed to delete string.\n"); + + todo_wine + ok(prv->refcount == 1, "Expected 1 in refcount, got %u.\n", prv->refcount); + + ok(WindowsDeleteString(str) == S_OK, "Failed to delete string.\n"); + + ok(WindowsCreateStringReference(input_string, 6, &hdr, &str) == S_OK, "Failed to create string ref.\n"); + + prv = CONTAINING_RECORD(&hdr, struct hstring_private, header); + prv2 = CONTAINING_RECORD(str, struct hstring_private, header); + + ok(prv == prv2, "Pointers not identical.\n"); + todo_wine + ok(prv2->header.flags == 1, "Expected HSTRING_REFERENCE_FLAG to be set, got %#x.\n", prv2->header.flags); + todo_wine + ok(prv2->header.str == input_string, "Expected str to point at input_string, instead pointing at %p.\n", prv2->header.str); + + ok(WindowsDeleteString(str) == S_OK, "Failed to delete string ref.\n"); +} + START_TEST(string) { test_create_delete(); @@ -489,4 +564,5 @@ START_TEST(string) test_concat(); test_compare(); test_trim(); + test_hstring_struct(); }

1 0