October 2021 - Wine-Devel - list.winehq.org

[PATCH] d2d1/tests: Add tests for crop effect.
by Ziqing Hui Oct. 5, 2021

Oct. 5, 2021

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 Oct. 5, 2021

Oct. 5, 2021

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 Oct. 5, 2021

Oct. 5, 2021

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 Oct. 5, 2021

Oct. 5, 2021

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 Oct. 5, 2021

Oct. 5, 2021

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 Oct. 5, 2021

Oct. 5, 2021

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 Oct. 5, 2021

Oct. 5, 2021

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 Oct. 5, 2021

Oct. 5, 2021

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 Oct. 5, 2021

Oct. 5, 2021

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 Oct. 5, 2021

Oct. 5, 2021

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