- Wine-Devel - list.winehq.org

[PATCH vkd3d v2 1/7] vkd3d-shader/hlsl: Lower casts to bool to comparisons.
by Matteo Bruni April 7, 2022

April 7, 2022

From: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Rebase on top of 231826. libs/vkd3d-shader/hlsl_codegen.c | 32 +++++++++++++++++++++++++++ libs/vkd3d-shader/hlsl_constant_ops.c | 9 ++------ libs/vkd3d-shader/hlsl_sm4.c | 3 ++- 3 files changed, 36 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 2b05264c..72c00430 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -750,6 +750,37 @@ static bool lower_division(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, voi return true; } +static bool lower_casts_to_bool(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) +{ + struct hlsl_type *type = instr->data_type, *arg_type; + struct hlsl_ir_constant *zero; + struct hlsl_ir_expr *expr; + + if (instr->type != HLSL_IR_EXPR) + return false; + expr = hlsl_ir_expr(instr); + if (expr->op != HLSL_OP1_CAST) + return false; + arg_type = expr->operands[0].node->data_type; + if (type->type > HLSL_CLASS_VECTOR || arg_type->type > HLSL_CLASS_VECTOR) + return false; + if (type->base_type != HLSL_TYPE_BOOL) + return false; + + /* Narrowing casts should have already been lowered. */ + assert(type->dimx == arg_type->dimx); + + zero = hlsl_new_constant(ctx, arg_type, &instr->loc); + if (!zero) + return false; + list_add_before(&instr->entry, &zero->node.entry); + + expr->op = HLSL_OP2_NEQUAL; + hlsl_src_from_node(&expr->operands[1], &zero->node); + + return true; +} + static bool dce(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) { switch (instr->type) @@ -1655,6 +1686,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry } while (progress); transform_ir(ctx, lower_narrowing_casts, body, NULL); + transform_ir(ctx, lower_casts_to_bool, body, NULL); do { progress = transform_ir(ctx, hlsl_fold_constants, body, NULL); diff --git a/libs/vkd3d-shader/hlsl_constant_ops.c b/libs/vkd3d-shader/hlsl_constant_ops.c index e282dbd4..5cac4bde 100644 --- a/libs/vkd3d-shader/hlsl_constant_ops.c +++ b/libs/vkd3d-shader/hlsl_constant_ops.c @@ -27,7 +27,6 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct int32_t i; double d; float f; - bool b; if (dst->node.data_type->dimx != src->node.data_type->dimx || dst->node.data_type->dimy != src->node.data_type->dimy) @@ -47,7 +46,6 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct i = src->value[k].f; f = src->value[k].f; d = src->value[k].f; - b = !!src->value[k].f; break; case HLSL_TYPE_DOUBLE: @@ -55,7 +53,6 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct i = src->value[k].d; f = src->value[k].d; d = src->value[k].d; - b = !!src->value[k].d; break; case HLSL_TYPE_INT: @@ -63,7 +60,6 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct i = src->value[k].i; f = src->value[k].i; d = src->value[k].i; - b = !!src->value[k].i; break; case HLSL_TYPE_UINT: @@ -71,7 +67,6 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct i = src->value[k].u; f = src->value[k].u; d = src->value[k].u; - b = !!src->value[k].u; break; case HLSL_TYPE_BOOL: @@ -79,7 +74,6 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct i = !!src->value[k].u; f = !!src->value[k].u; d = !!src->value[k].u; - b = !!src->value[k].u; break; default: @@ -107,7 +101,8 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct break; case HLSL_TYPE_BOOL: - dst->value[k].u = b ? ~0u : 0; + /* Casts to bool should have already been lowered. */ + assert(0); break; default: diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 400c3a62..9de8654c 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1542,7 +1542,8 @@ static void write_sm4_cast(struct hlsl_ctx *ctx, break; case HLSL_TYPE_BOOL: - hlsl_fixme(ctx, &expr->node.loc, "SM4 cast to bool."); + /* Casts to bool should have already been lowered. */ + assert(0); break; default: -- 2.34.1

2 13

[PATCH vkd3d 1/3] vkd3d-shader/hlsl: Drop extra '\n' from hlsl_fixme() messages.
by Matteo Bruni April 7, 2022

April 7, 2022

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- libs/vkd3d-shader/hlsl_sm1.c | 2 +- libs/vkd3d-shader/hlsl_sm4.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index f661dbc2..0cdd3917 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -790,7 +790,7 @@ static void write_sm1_instructions(struct hlsl_ctx *ctx, struct vkd3d_bytecode_b } else if (instr->data_type->type == HLSL_CLASS_OBJECT) { - hlsl_fixme(ctx, &instr->loc, "Object copy.\n"); + hlsl_fixme(ctx, &instr->loc, "Object copy."); break; } diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 872118c1..afc4d26b 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1519,11 +1519,11 @@ static void write_sm4_cast(struct hlsl_ctx *ctx, break; case HLSL_TYPE_BOOL: - hlsl_fixme(ctx, &expr->node.loc, "SM4 cast from bool to uint.\n"); + hlsl_fixme(ctx, &expr->node.loc, "SM4 cast from bool to uint."); break; case HLSL_TYPE_DOUBLE: - hlsl_fixme(ctx, &expr->node.loc, "SM4 cast from double to uint.\n"); + hlsl_fixme(ctx, &expr->node.loc, "SM4 cast from double to uint."); break; default: @@ -1532,15 +1532,15 @@ static void write_sm4_cast(struct hlsl_ctx *ctx, break; case HLSL_TYPE_HALF: - hlsl_fixme(ctx, &expr->node.loc, "SM4 cast to half.\n"); + hlsl_fixme(ctx, &expr->node.loc, "SM4 cast to half."); break; case HLSL_TYPE_DOUBLE: - hlsl_fixme(ctx, &expr->node.loc, "SM4 cast to double.\n"); + hlsl_fixme(ctx, &expr->node.loc, "SM4 cast to double."); break; case HLSL_TYPE_BOOL: - hlsl_fixme(ctx, &expr->node.loc, "SM4 cast to bool.\n"); + hlsl_fixme(ctx, &expr->node.loc, "SM4 cast to bool."); break; default: @@ -2019,7 +2019,7 @@ static void write_sm4_store(struct hlsl_ctx *ctx, if (store->lhs.var->data_type->type == HLSL_CLASS_MATRIX) { - hlsl_fixme(ctx, &store->node.loc, "Store to a matrix variable.\n"); + hlsl_fixme(ctx, &store->node.loc, "Store to a matrix variable."); return; } @@ -2072,7 +2072,7 @@ static void write_sm4_block(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer * } else if (instr->data_type->type == HLSL_CLASS_OBJECT) { - hlsl_fixme(ctx, &instr->loc, "Object copy.\n"); + hlsl_fixme(ctx, &instr->loc, "Object copy."); break; } -- 2.34.1

2 5

[PATCH] winevulkan: Update to VK spec version 1.3.211.
by Georg Lehmann April 7, 2022

April 7, 2022

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

1 0

[PATCH v2 2/2] ncrypt/tests: Add NCryptIsAlgSupported tests.
by Hans Leidekker April 7, 2022

April 7, 2022

From: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> v2: Use one provider handle for all algorithms. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ncrypt/tests/ncrypt.c | 75 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c index 7fb8b2cb4c5..5808a3bb30a 100644 --- a/dlls/ncrypt/tests/ncrypt.c +++ b/dlls/ncrypt/tests/ncrypt.c @@ -465,6 +465,80 @@ static void test_verify_signature(void) NCryptFreeObject(prov); } +static void test_NCryptIsAlgSupported(void) +{ + NCRYPT_PROV_HANDLE prov; + SECURITY_STATUS ret; + + NCryptOpenStorageProvider(&prov, NULL, 0); + ret = NCryptIsAlgSupported(0, BCRYPT_RSA_ALGORITHM, 0); + ok(ret == NTE_INVALID_HANDLE, "expected NTE_INVALID_HANDLE, got %#lx\n", ret); + + ret = NCryptIsAlgSupported(prov, NULL, 0); + ok(ret == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER) || broken(ret == NTE_FAIL) /* win7 */, "got %#lx\n", ret); + + ret = NCryptIsAlgSupported(prov, BCRYPT_RSA_ALGORITHM, 20); + ok(ret == NTE_BAD_FLAGS, "expected NTE_BAD_FLAGS, got %#lx\n", ret); + + ret = NCryptIsAlgSupported(prov, BCRYPT_RSA_ALGORITHM, 0); + ok(ret == ERROR_SUCCESS, "expected BCRYPT_RSA_ALGORITHM to be supported, got %#lx\n", ret); + + ret = NCryptIsAlgSupported(prov, BCRYPT_RSA_ALGORITHM, NCRYPT_SILENT_FLAG); + ok(ret == ERROR_SUCCESS, "expected BCRYPT_RSA_ALGORITHM to be supported, got %#lx\n", ret); + + ret = NCryptIsAlgSupported(prov, BCRYPT_3DES_ALGORITHM, 0); + ok(ret == ERROR_SUCCESS || broken(ret == NTE_NOT_SUPPORTED) /* win7 */, + "expected BCRYPT_3DES_ALGORITHM to be supported, got %#lx\n", ret); + + ret = NCryptIsAlgSupported(prov, BCRYPT_AES_ALGORITHM, 0); + ok(ret == ERROR_SUCCESS || broken(ret == NTE_NOT_SUPPORTED) /* win7 */, + "expected BCRYPT_AES_ALGORITHM to be supported, got %#lx\n", ret); + + ret = NCryptIsAlgSupported(prov, BCRYPT_ECDH_P256_ALGORITHM, 0); + ok(ret == ERROR_SUCCESS, "expected BCRYPT_ECDH_P256_ALGORITHM to be supported, got %#lx\n", ret); + + ret = NCryptIsAlgSupported(prov, BCRYPT_ECDSA_P256_ALGORITHM, 0); + ok(ret == ERROR_SUCCESS, "expected BCRYPT_ECDSA_P256_ALGORITHM to be supported, got %#lx\n", ret); + + ret = NCryptIsAlgSupported(prov, BCRYPT_ECDSA_P384_ALGORITHM, 0); + ok(ret == ERROR_SUCCESS, "expected BCRYPT_ECDSA_P384_ALGORITHM to be supported, got %#lx\n", ret); + + ret = NCryptIsAlgSupported(prov, BCRYPT_DSA_ALGORITHM, 0); + ok(ret == ERROR_SUCCESS, "expected BCRYPT_DSA_ALGORITHM to be supported, got %#lx\n", ret); + + /* Not supported */ + ret = NCryptIsAlgSupported(prov, BCRYPT_SHA256_ALGORITHM, 0); + ok(ret == NTE_NOT_SUPPORTED, "expected BCRYPT_SHA256_ALGORITHM to not be supported, got %#lx\n", ret); + + ret = NCryptIsAlgSupported(prov, BCRYPT_SHA384_ALGORITHM, 0); + ok(ret == NTE_NOT_SUPPORTED, "expected BCRYPT_SHA384_ALGORITHM to not be supported, got %#lx\n", ret); + + ret = NCryptIsAlgSupported(prov, BCRYPT_SHA512_ALGORITHM, 0); + ok(ret == NTE_NOT_SUPPORTED, "expected BCRYPT_SHA512_ALGORITHM to not be supported, got %#lx\n", ret); + + ret = NCryptIsAlgSupported(prov, BCRYPT_SHA1_ALGORITHM, 0); + ok(ret == NTE_NOT_SUPPORTED, "expected BCRYPT_SHA1_ALGORITHM to not be supported, got %#lx\n", ret); + + ret = NCryptIsAlgSupported(prov, BCRYPT_MD5_ALGORITHM, 0); + ok(ret == NTE_NOT_SUPPORTED, "expected BCRYPT_MD5_ALGORITHM to not be supported, got %#lx\n", ret); + + ret = NCryptIsAlgSupported(prov, BCRYPT_MD4_ALGORITHM, 0); + ok(ret == NTE_NOT_SUPPORTED, "expected BCRYPT_MD4_ALGORITHM to not be supported, got %#lx\n", ret); + + ret = NCryptIsAlgSupported(prov, BCRYPT_MD2_ALGORITHM, 0); + ok(ret == NTE_NOT_SUPPORTED, "expected BCRYPT_MD2_ALGORITHM to not be supported, got %#lx\n", ret); + + ret = NCryptIsAlgSupported(prov, BCRYPT_RSA_SIGN_ALGORITHM, 0); + ok(ret == NTE_NOT_SUPPORTED, "expected BCRYPT_RSA_SIGN_ALGORITHM to not be supported, got %#lx\n", ret); + + ret = NCryptIsAlgSupported(prov, BCRYPT_RSA_SIGN_ALGORITHM, 20); + ok(ret == NTE_BAD_FLAGS, "expected NTE_BAD_FLAGS, got %#lx\n", ret); + + ret = NCryptIsAlgSupported(prov, BCRYPT_RNG_ALGORITHM, 0); + ok(ret == NTE_NOT_SUPPORTED, "expected BCRYPT_RNG_ALGORITHM to not be supported, got %#lx\n", ret); + NCryptFreeObject(prov); +} + START_TEST(ncrypt) { test_key_import_rsa(); @@ -474,4 +548,5 @@ START_TEST(ncrypt) test_create_persisted_key(); test_finalize_key(); test_verify_signature(); + test_NCryptIsAlgSupported(); } -- 2.30.2

1 0

[PATCH v2 1/2] ncrypt: Implement NCryptIsAlgSupported.
by Hans Leidekker April 7, 2022

April 7, 2022

From: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Microsoft Edge calls this function expecting an implementation. With this, Internet browsing works. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ncrypt/main.c | 44 +++++++++++++++++++++++++++++++++++++++-- dlls/ncrypt/ncrypt.spec | 2 +- include/ncrypt.h | 1 + 3 files changed, 44 insertions(+), 3 deletions(-) diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index e12284e0867..10cec633269 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -416,8 +416,48 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H SECURITY_STATUS WINAPI NCryptIsAlgSupported(NCRYPT_PROV_HANDLE provider, const WCHAR *algid, DWORD flags) { - FIXME("(%#Ix, %s, %#lx): stub\n", provider, wine_dbgstr_w(algid), flags); - return NTE_NOT_SUPPORTED; + static const ULONG supported = BCRYPT_CIPHER_OPERATION |\ + BCRYPT_ASYMMETRIC_ENCRYPTION_OPERATION |\ + BCRYPT_SIGNATURE_OPERATION |\ + BCRYPT_SECRET_AGREEMENT_OPERATION; + BCRYPT_ALGORITHM_IDENTIFIER *list; + ULONG i, count; + NTSTATUS status; + + TRACE("(%#Ix, %s, %#lx)\n", provider, wine_dbgstr_w(algid), flags); + + if (!provider) return NTE_INVALID_HANDLE; + if (!algid) return HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER); + if (flags == NCRYPT_SILENT_FLAG) + { + FIXME("Silent flag not implemented\n"); + } + else if (flags) + { + WARN("Invalid flags %#lx\n", flags); + return NTE_BAD_FLAGS; + } + if (!lstrcmpiW(BCRYPT_RSA_SIGN_ALGORITHM, algid)) return NTE_NOT_SUPPORTED; + + status = BCryptEnumAlgorithms(supported, &count, &list, 0); + if (status != STATUS_SUCCESS) + { + ERR("Error retrieving algorithm list %#lx\n", status); + return map_ntstatus(status); + } + + status = STATUS_NOT_SUPPORTED; + for (i = 0; i < count; i++) + { + if (!lstrcmpiW(list[i].pszName, algid)) + { + status = STATUS_SUCCESS; + break; + } + } + + BCryptFreeBuffer(list); + return map_ntstatus(status); } BOOL WINAPI NCryptIsKeyHandle(NCRYPT_KEY_HANDLE hKey) diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index bb914616373..60b367260d5 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -77,7 +77,7 @@ @ stdcall NCryptGetProperty(ptr wstr ptr long ptr long) @ stub NCryptGetProtectionDescriptorInfo @ stdcall NCryptImportKey(long long wstr ptr ptr ptr long long) -@ stub NCryptIsAlgSupported(long wstr long) +@ stdcall NCryptIsAlgSupported(long wstr long) @ stdcall NCryptIsKeyHandle(long) @ stub NCryptKeyDerivation @ stub NCryptNotifyChangeKey diff --git a/include/ncrypt.h b/include/ncrypt.h index c09a1ec8676..18198fdc5bb 100644 --- a/include/ncrypt.h +++ b/include/ncrypt.h @@ -118,6 +118,7 @@ SECURITY_STATUS WINAPI NCryptFreeObject(NCRYPT_HANDLE); SECURITY_STATUS WINAPI NCryptGetProperty(NCRYPT_HANDLE, const WCHAR *, BYTE *, DWORD, DWORD *, DWORD); SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE, NCRYPT_KEY_HANDLE, const WCHAR *, NCryptBufferDesc *, NCRYPT_KEY_HANDLE *, BYTE *, DWORD, DWORD); +SECURITY_STATUS WINAPI NCryptIsAlgSupported(NCRYPT_PROV_HANDLE, const WCHAR *, DWORD); SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE, NCRYPT_KEY_HANDLE *, const WCHAR *, DWORD, DWORD); SECURITY_STATUS WINAPI NCryptOpenStorageProvider(NCRYPT_PROV_HANDLE *, const WCHAR *, DWORD); SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE, const WCHAR *, BYTE *, DWORD, DWORD); -- 2.30.2

1 0

[PATCH] wmic: Use CRT allocation functions.
by Nikolay Sivov April 7, 2022

April 7, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- programs/wmic/main.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/programs/wmic/main.c b/programs/wmic/main.c index 50c28ebec5d..15b590098e7 100644 --- a/programs/wmic/main.c +++ b/programs/wmic/main.c @@ -61,15 +61,6 @@ static const WCHAR *find_class( const WCHAR *alias ) return NULL; } -static inline WCHAR *strdupW( const WCHAR *src ) -{ - WCHAR *dst; - if (!src) return NULL; - if (!(dst = HeapAlloc( GetProcessHeap(), 0, (lstrlenW( src ) + 1) * sizeof(WCHAR) ))) return NULL; - lstrcpyW( dst, src ); - return dst; -} - static WCHAR *find_prop( IWbemClassObject *class, const WCHAR *prop ) { SAFEARRAY *sa; @@ -85,7 +76,7 @@ static WCHAR *find_prop( IWbemClassObject *class, const WCHAR *prop ) SafeArrayGetElement( sa, &i, &str ); if (!wcsicmp( str, prop )) { - ret = strdupW( str ); + ret = wcsdup( str ); break; } } @@ -228,7 +219,7 @@ done: SysFreeString( path ); SysFreeString( query ); SysFreeString( wql ); - HeapFree( GetProcessHeap(), 0, prop ); + free( prop ); CoUninitialize(); return ret; } -- 2.35.1

1 0

[PATCH 1/2] d2d1/tests: Add tests for GetImageLocalBounds().
by Ziqing Hui April 7, 2022

April 7, 2022

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 73 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 826526d9d38..5b72d79de0e 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -10764,6 +10764,78 @@ static void test_stroke_contains_point(BOOL d3d11) ID2D1Factory_Release(factory); } +static void test_image_bounds(BOOL d3d11) +{ + D2D1_BITMAP_PROPERTIES bitmap_desc; + D2D_RECT_F bounds, expected_bounds; + struct d2d1_test_context ctx; + ID2D1DeviceContext *context; + ID2D1Factory1 *factory; + ID2D1Bitmap *bitmap; + D2D1_SIZE_F size; + unsigned int i; + HRESULT hr; + + const struct bitmap_bounds_test + { + float dpi_x; + float dpi_y; + D2D_SIZE_U pixel_size; + } + bitmap_bounds_tests[] = + { + {96.0f, 96.0f, {100, 100}}, + {48.0f, 48.0f, {100, 100}}, + {192.0f, 192.0f, {100, 100}}, + {96.0f, 48.0f, {100, 100}}, + {48.0f, 192.0f, {100, 100}}, + {150.0f, 150.0f, {100, 100}}, + {96.0f, 96.0f, {1, 1}}, + {192.0f, 192.0f, {1, 1}}, + }; + + 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 %#lx.\n", hr); + + for (i = 0; i < ARRAY_SIZE(bitmap_bounds_tests); ++i) + { + const struct bitmap_bounds_test *test = &bitmap_bounds_tests[i]; + winetest_push_context("Test %u", i); + + bitmap_desc.dpiX = test->dpi_x; + bitmap_desc.dpiY = test->dpi_y; + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + hr = ID2D1RenderTarget_CreateBitmap(ctx.rt, test->pixel_size, NULL, 0, &bitmap_desc, &bitmap); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + set_rect(&bounds, 0.0f, 0.0f, 0.0f, 0.0f); + size = ID2D1Bitmap_GetSize(bitmap); + ID2D1DeviceContext_GetImageLocalBounds(context, (ID2D1Image *)bitmap, &bounds); + todo_wine ok(compare_rect(&bounds, 0.0f, 0.0f, size.width, size.height, 0), + "Got unexpected bounds {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", + bounds.left, bounds.top, bounds.right, bounds.bottom, + expected_bounds.left, expected_bounds.top, expected_bounds.right, expected_bounds.bottom); + + ID2D1Bitmap_Release(bitmap); + winetest_pop_context(); + } + + ID2D1DeviceContext_Release(context); + ID2D1Factory1_Release(factory); + release_test_context(&ctx); +} + START_TEST(d2d1) { HMODULE d2d1_dll = GetModuleHandleA("d2d1.dll"); @@ -10835,6 +10907,7 @@ START_TEST(d2d1) queue_test(test_effect_crop); queue_test(test_effect_grayscale); queue_d3d10_test(test_stroke_contains_point); + queue_test(test_image_bounds); run_queued_tests(); } -- 2.25.1

2 3

[PATCH 1/2] wmp: Use CRT allocation functions.
by Nikolay Sivov April 7, 2022

April 7, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wmp/events.c | 15 +++++++-------- dlls/wmp/oleobj.c | 5 ++--- dlls/wmp/player.c | 40 ++++++++++++++++++++-------------------- dlls/wmp/wmp_private.h | 17 ----------------- 4 files changed, 29 insertions(+), 48 deletions(-) diff --git a/dlls/wmp/events.c b/dlls/wmp/events.c index f541830773b..9f2b1cb4b29 100644 --- a/dlls/wmp/events.c +++ b/dlls/wmp/events.c @@ -152,7 +152,7 @@ static ULONG WINAPI EnumConnections_Release(IEnumConnections *iface) if(!ref) { IConnectionPoint_Release(&This->cp->IConnectionPoint_iface); - heap_free(This); + free(This); } return ref; @@ -296,10 +296,9 @@ static HRESULT WINAPI ConnectionPoint_Advise(IConnectionPoint *iface, IUnknown * } if(i == This->sinks_size) - This->sinks = heap_realloc(This->sinks, - (++This->sinks_size)*sizeof(*This->sinks)); + This->sinks = realloc(This->sinks, (++This->sinks_size)*sizeof(*This->sinks)); }else { - This->sinks = heap_alloc(sizeof(*This->sinks)); + This->sinks = malloc(sizeof(*This->sinks)); This->sinks_size = 1; i = 0; } @@ -333,7 +332,7 @@ static HRESULT WINAPI ConnectionPoint_EnumConnections(IConnectionPoint *iface, TRACE("(%p)->(%p)\n", This, ppEnum); - ret = heap_alloc(sizeof(*ret)); + ret = malloc(sizeof(*ret)); if(!ret) return E_OUTOFMEMORY; @@ -370,14 +369,14 @@ static void ConnectionPoint_Destroy(ConnectionPoint *This) IDispatch_Release(This->sinks[i]); } - heap_free(This->sinks); - heap_free(This); + free(This->sinks); + free(This); } static void ConnectionPoint_Create(REFIID riid, ConnectionPoint **cp, IConnectionPointContainer *container) { - ConnectionPoint *ret = heap_alloc(sizeof(ConnectionPoint)); + ConnectionPoint *ret = malloc(sizeof(ConnectionPoint)); ret->IConnectionPoint_iface.lpVtbl = &ConnectionPointVtbl; diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index 5eaa789f87f..e227f91f8ba 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -20,7 +20,6 @@ #include "olectl.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(wmp); @@ -307,7 +306,7 @@ static ULONG WINAPI OleObject_Release(IOleObject *iface) release_client_site(This); destroy_player(This); ConnectionPointContainer_Destroy(This); - heap_free(This); + free(This); } return ref; @@ -890,7 +889,7 @@ HRESULT WINAPI WMPFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, TRACE("(%p %s %p)\n", outer, debugstr_guid(riid), ppv); - wmp = heap_alloc_zero(sizeof(*wmp)); + wmp = calloc(1, sizeof(*wmp)); if(!wmp) return E_OUTOFMEMORY; diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index 7225e7130a9..254d04d23f8 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -1741,9 +1741,9 @@ static ULONG WINAPI WMPMedia_Release(IWMPMedia *iface) TRACE("(%p) ref=%ld\n", This, ref); if(!ref) { - heap_free(This->url); - heap_free(This->name); - heap_free(This); + free(This->url); + free(This->name); + free(This); } return ref; @@ -1815,8 +1815,8 @@ static HRESULT WINAPI WMPMedia_put_name(IWMPMedia *iface, BSTR name) if (!name) return E_POINTER; - heap_free(This->name); - This->name = heap_strdupW(name); + free(This->name); + This->name = wcsdup(name); return S_OK; } @@ -1990,9 +1990,9 @@ static ULONG WINAPI WMPPlaylist_Release(IWMPPlaylist *iface) TRACE("(%p) ref=%ld\n", This, ref); if(!ref) { - heap_free(This->url); - heap_free(This->name); - heap_free(This); + free(This->url); + free(This->name); + free(This); } return ref; @@ -2060,8 +2060,8 @@ static HRESULT WINAPI WMPPlaylist_put_name(IWMPPlaylist *iface, BSTR name) if (!name) return E_POINTER; - heap_free(This->name); - This->name = heap_strdupW(name); + free(This->name); + This->name = wcsdup(name); return S_OK; } @@ -2282,7 +2282,7 @@ HRESULT create_media_from_url(BSTR url, double duration, IWMPMedia **ppMedia) HRESULT hr; WCHAR *name_dup; - media = heap_alloc_zero(sizeof(*media)); + media = calloc(1, sizeof(*media)); if (!media) return E_OUTOFMEMORY; @@ -2290,20 +2290,20 @@ HRESULT create_media_from_url(BSTR url, double duration, IWMPMedia **ppMedia) if (url) { - media->url = heap_strdupW(url); - name_dup = heap_strdupW(url); + media->url = wcsdup(url); + name_dup = wcsdup(url); hr = CreateUri(name_dup, Uri_CREATE_ALLOW_RELATIVE | Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, 0, &uri); if (FAILED(hr)) { - heap_free(name_dup); + free(name_dup); IWMPMedia_Release(&media->IWMPMedia_iface); return hr; } hr = IUri_GetPath(uri, &path); if (hr != S_OK) { - heap_free(name_dup); + free(name_dup); IUri_Release(uri); IWMPMedia_Release(&media->IWMPMedia_iface); return hr; @@ -2323,8 +2323,8 @@ HRESULT create_media_from_url(BSTR url, double duration, IWMPMedia **ppMedia) } else { - media->url = heap_strdupW(L""); - media->name = heap_strdupW(L""); + media->url = wcsdup(L""); + media->name = wcsdup(L""); } media->duration = duration; @@ -2343,13 +2343,13 @@ HRESULT create_playlist(BSTR name, BSTR url, LONG count, IWMPPlaylist **ppPlayli { WMPPlaylist *playlist; - playlist = heap_alloc_zero(sizeof(*playlist)); + playlist = calloc(1, sizeof(*playlist)); if (!playlist) return E_OUTOFMEMORY; playlist->IWMPPlaylist_iface.lpVtbl = &WMPPlaylistVtbl; - playlist->url = heap_strdupW(url ? url : L""); - playlist->name = heap_strdupW(name ? name : L""); + playlist->url = wcsdup(url ? url : L""); + playlist->name = wcsdup(name ? name : L""); playlist->ref = 1; playlist->count = count; diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h index e1a1e036cd1..ffeaca09a47 100644 --- a/dlls/wmp/wmp_private.h +++ b/dlls/wmp/wmp_private.h @@ -19,7 +19,6 @@ #define COBJMACROS #include "windows.h" -#include "wine/heap.h" #include "ole2.h" #include "dshow.h" #include "wmp.h" @@ -129,22 +128,6 @@ void unregister_player_msg_class(void) DECLSPEC_HIDDEN; extern HINSTANCE wmp_instance DECLSPEC_HIDDEN; -static inline WCHAR *heap_strdupW(const WCHAR *str) -{ - WCHAR *ret; - - if(str) { - size_t size = lstrlenW(str)+1; - ret = heap_alloc(size*sizeof(WCHAR)); - if(ret) - memcpy(ret, str, size*sizeof(WCHAR)); - }else { - ret = NULL; - } - - return ret; -} - static inline HRESULT return_bstr(const WCHAR *value, BSTR *p) { if(!p) -- 2.35.1

1 1

[PATCH] qmgr: Use CRT allocation functions.
by Nikolay Sivov April 7, 2022

April 7, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/qmgr/enum_files.c | 11 +++++----- dlls/qmgr/enum_jobs.c | 11 +++++----- dlls/qmgr/file.c | 23 ++++++++----------- dlls/qmgr/job.c | 50 ++++++++++++++++++++---------------------- dlls/qmgr/qmgr.h | 7 ------ 5 files changed, 43 insertions(+), 59 deletions(-) diff --git a/dlls/qmgr/enum_files.c b/dlls/qmgr/enum_files.c index 92834c6bd3b..a7a26da60c9 100644 --- a/dlls/qmgr/enum_files.c +++ b/dlls/qmgr/enum_files.c @@ -76,8 +76,8 @@ static ULONG WINAPI EnumBackgroundCopyFiles_Release(IEnumBackgroundCopyFiles *if { for(i = 0; i < This->numFiles; i++) IBackgroundCopyFile2_Release(This->files[i]); - HeapFree(GetProcessHeap(), 0, This->files); - HeapFree(GetProcessHeap(), 0, This); + free(This->files); + free(This); } return ref; @@ -188,7 +188,7 @@ HRESULT EnumBackgroundCopyFilesConstructor(BackgroundCopyJobImpl *job, IEnumBack TRACE("%p, %p)\n", job, enum_files); - This = HeapAlloc(GetProcessHeap(), 0, sizeof *This); + This = malloc(sizeof(*This)); if (!This) return E_OUTOFMEMORY; @@ -202,12 +202,11 @@ HRESULT EnumBackgroundCopyFilesConstructor(BackgroundCopyJobImpl *job, IEnumBack This->files = NULL; if (This->numFiles > 0) { - This->files = HeapAlloc(GetProcessHeap(), 0, - This->numFiles * sizeof This->files[0]); + This->files = malloc(This->numFiles * sizeof This->files[0]); if (!This->files) { LeaveCriticalSection(&job->cs); - HeapFree(GetProcessHeap(), 0, This); + free(This); return E_OUTOFMEMORY; } } diff --git a/dlls/qmgr/enum_jobs.c b/dlls/qmgr/enum_jobs.c index 00d8ea52b4f..d31303ab1fc 100644 --- a/dlls/qmgr/enum_jobs.c +++ b/dlls/qmgr/enum_jobs.c @@ -76,8 +76,8 @@ static ULONG WINAPI EnumBackgroundCopyJobs_Release(IEnumBackgroundCopyJobs *ifac if (ref == 0) { for(i = 0; i < This->numJobs; i++) IBackgroundCopyJob4_Release(This->jobs[i]); - HeapFree(GetProcessHeap(), 0, This->jobs); - HeapFree(GetProcessHeap(), 0, This); + free(This->jobs); + free(This); } return ref; @@ -182,7 +182,7 @@ HRESULT enum_copy_job_create(BackgroundCopyManagerImpl *qmgr, IEnumBackgroundCop TRACE("%p, %p)\n", qmgr, enumjob); - This = HeapAlloc(GetProcessHeap(), 0, sizeof *This); + This = malloc(sizeof(*This)); if (!This) return E_OUTOFMEMORY; This->IEnumBackgroundCopyJobs_iface.lpVtbl = &EnumBackgroundCopyJobsVtbl; @@ -196,12 +196,11 @@ HRESULT enum_copy_job_create(BackgroundCopyManagerImpl *qmgr, IEnumBackgroundCop if (0 < This->numJobs) { - This->jobs = HeapAlloc(GetProcessHeap(), 0, - This->numJobs * sizeof *This->jobs); + This->jobs = malloc(This->numJobs * sizeof *This->jobs); if (!This->jobs) { LeaveCriticalSection(&qmgr->cs); - HeapFree(GetProcessHeap(), 0, This); + free(This); return E_OUTOFMEMORY; } } diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c index 339354d59c0..c82344a51a8 100644 --- a/dlls/qmgr/file.c +++ b/dlls/qmgr/file.c @@ -82,9 +82,9 @@ static ULONG WINAPI BackgroundCopyFile_Release( if (ref == 0) { IBackgroundCopyJob4_Release(&file->owner->IBackgroundCopyJob4_iface); - HeapFree(GetProcessHeap(), 0, file->info.LocalName); - HeapFree(GetProcessHeap(), 0, file->info.RemoteName); - HeapFree(GetProcessHeap(), 0, file); + free(file->info.LocalName); + free(file->info.RemoteName); + free(file); } return ref; @@ -167,34 +167,29 @@ HRESULT BackgroundCopyFileConstructor(BackgroundCopyJobImpl *owner, TRACE("(%s, %s, %p)\n", debugstr_w(remoteName), debugstr_w(localName), file); - This = HeapAlloc(GetProcessHeap(), 0, sizeof *This); + This = calloc(1, sizeof(*This)); if (!This) return E_OUTOFMEMORY; - This->info.RemoteName = strdupW(remoteName); + This->info.RemoteName = wcsdup(remoteName); if (!This->info.RemoteName) { - HeapFree(GetProcessHeap(), 0, This); + free(This); return E_OUTOFMEMORY; } - This->info.LocalName = strdupW(localName); + This->info.LocalName = wcsdup(localName); if (!This->info.LocalName) { - HeapFree(GetProcessHeap(), 0, This->info.RemoteName); - HeapFree(GetProcessHeap(), 0, This); + free(This->info.RemoteName); + free(This); return E_OUTOFMEMORY; } This->IBackgroundCopyFile2_iface.lpVtbl = &BackgroundCopyFile2Vtbl; This->ref = 1; - This->fileProgress.BytesTotal = BG_SIZE_UNKNOWN; - This->fileProgress.BytesTransferred = 0; - This->fileProgress.Completed = FALSE; This->owner = owner; - This->read_size = 0; - This->tempFileName[0] = 0; IBackgroundCopyJob4_AddRef(&owner->IBackgroundCopyJob4_iface); *file = This; diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index 2b8572465ad..233d894b3ea 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -99,7 +99,7 @@ static ULONG WINAPI copy_error_Release( if (!refs) { if (error->file) IBackgroundCopyFile2_Release(error->file); - HeapFree(GetProcessHeap(), 0, error); + free(error); } return refs; } @@ -189,7 +189,7 @@ static HRESULT create_copy_error( TRACE("context %u code %08lx file %p\n", context, code, file); - if (!(error = HeapAlloc(GetProcessHeap(), 0, sizeof(*error) ))) return E_OUTOFMEMORY; + if (!(error = malloc(sizeof(*error) ))) return E_OUTOFMEMORY; error->IBackgroundCopyError_iface.lpVtbl = &copy_error_vtbl; error->refs = 1; error->context = context; @@ -262,22 +262,22 @@ static ULONG WINAPI BackgroundCopyJob_Release(IBackgroundCopyJob4 *iface) DeleteCriticalSection(&job->cs); if (job->callback) IBackgroundCopyCallback2_Release(job->callback); - HeapFree(GetProcessHeap(), 0, job->displayName); - HeapFree(GetProcessHeap(), 0, job->description); - HeapFree(GetProcessHeap(), 0, job->http_options.headers); + free(job->displayName); + free(job->description); + free(job->http_options.headers); for (i = 0; i < BG_AUTH_TARGET_PROXY; i++) { for (j = 0; j < BG_AUTH_SCHEME_PASSPORT; j++) { BG_AUTH_CREDENTIALS *cred = &job->http_options.creds[i][j]; - HeapFree(GetProcessHeap(), 0, cred->Credentials.Basic.UserName); - HeapFree(GetProcessHeap(), 0, cred->Credentials.Basic.Password); + free(cred->Credentials.Basic.UserName); + free(cred->Credentials.Basic.Password); } } CloseHandle(job->wait); CloseHandle(job->cancel); CloseHandle(job->done); - HeapFree(GetProcessHeap(), 0, job); + free(job); } return ref; @@ -578,10 +578,8 @@ static HRESULT WINAPI BackgroundCopyJob_SetDescription(IBackgroundCopyJob4 *ifac } else { - HeapFree(GetProcessHeap(), 0, job->description); - if ((job->description = HeapAlloc(GetProcessHeap(), 0, (len+1)*sizeof(WCHAR)))) - lstrcpyW(job->description, desc); - else + free(job->description); + if (!(job->description = wcsdup(desc))) hr = E_OUTOFMEMORY; } @@ -803,13 +801,13 @@ static HRESULT WINAPI BackgroundCopyJob_SetCredentials(IBackgroundCopyJob4 *ifac if (cred->Credentials.Basic.UserName) { - HeapFree(GetProcessHeap(), 0, new_cred->Credentials.Basic.UserName); - new_cred->Credentials.Basic.UserName = strdupW(cred->Credentials.Basic.UserName); + free(new_cred->Credentials.Basic.UserName); + new_cred->Credentials.Basic.UserName = wcsdup(cred->Credentials.Basic.UserName); } if (cred->Credentials.Basic.Password) { - HeapFree(GetProcessHeap(), 0, new_cred->Credentials.Basic.Password); - new_cred->Credentials.Basic.Password = strdupW(cred->Credentials.Basic.Password); + free(new_cred->Credentials.Basic.Password); + new_cred->Credentials.Basic.Password = wcsdup(cred->Credentials.Basic.Password); } LeaveCriticalSection(&job->cs); @@ -834,9 +832,9 @@ static HRESULT WINAPI BackgroundCopyJob_RemoveCredentials( EnterCriticalSection(&job->cs); new_cred->Target = new_cred->Scheme = 0; - HeapFree(GetProcessHeap(), 0, new_cred->Credentials.Basic.UserName); + free(new_cred->Credentials.Basic.UserName); new_cred->Credentials.Basic.UserName = NULL; - HeapFree(GetProcessHeap(), 0, new_cred->Credentials.Basic.Password); + free(new_cred->Credentials.Basic.Password); new_cred->Credentials.Basic.Password = NULL; LeaveCriticalSection(&job->cs); @@ -1047,18 +1045,18 @@ static HRESULT WINAPI http_options_SetCustomHeaders( if (RequestHeaders) { - WCHAR *headers = strdupW(RequestHeaders); + WCHAR *headers = wcsdup(RequestHeaders); if (!headers) { LeaveCriticalSection(&job->cs); return E_OUTOFMEMORY; } - HeapFree(GetProcessHeap(), 0, job->http_options.headers); + free(job->http_options.headers); job->http_options.headers = headers; } else { - HeapFree(GetProcessHeap(), 0, job->http_options.headers); + free(job->http_options.headers); job->http_options.headers = NULL; } @@ -1140,7 +1138,7 @@ HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, GUID TRACE("(%s,%d,%p)\n", debugstr_w(displayName), type, job); - This = HeapAlloc(GetProcessHeap(), 0, sizeof *This); + This = malloc(sizeof(*This)); if (!This) return E_OUTOFMEMORY; @@ -1152,12 +1150,12 @@ HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, GUID This->ref = 1; This->type = type; - This->displayName = strdupW(displayName); + This->displayName = wcsdup(displayName); if (!This->displayName) { This->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->cs); - HeapFree(GetProcessHeap(), 0, This); + free(This); return E_OUTOFMEMORY; } @@ -1166,8 +1164,8 @@ HRESULT BackgroundCopyJobConstructor(LPCWSTR displayName, BG_JOB_TYPE type, GUID { This->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->cs); - HeapFree(GetProcessHeap(), 0, This->displayName); - HeapFree(GetProcessHeap(), 0, This); + free(This->displayName); + free(This); return hr; } *job_id = This->jobId; diff --git a/dlls/qmgr/qmgr.h b/dlls/qmgr/qmgr.h index de808049ea3..8d9ccae73ff 100644 --- a/dlls/qmgr/qmgr.h +++ b/dlls/qmgr/qmgr.h @@ -115,13 +115,6 @@ BOOL processFile(BackgroundCopyFileImpl *file, BackgroundCopyJobImpl *job) DECLS BOOL transitionJobState(BackgroundCopyJobImpl *job, BG_JOB_STATE from, BG_JOB_STATE to) DECLSPEC_HIDDEN; /* Little helper functions */ -static inline WCHAR *strdupW(const WCHAR *src) -{ - WCHAR *dst = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(src) + 1) * sizeof(WCHAR)); - if (dst) lstrcpyW(dst, src); - return dst; -} - static inline WCHAR *co_strdupW(const WCHAR *src) { WCHAR *dst = CoTaskMemAlloc((lstrlenW(src) + 1) * sizeof(WCHAR)); -- 2.35.1

1 0

[PATCH] localui/tests: Use CRT allocation functions.
by Nikolay Sivov April 7, 2022

April 7, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/localui/tests/localui.c | 35 ++++++++--------------------------- 1 file changed, 8 insertions(+), 27 deletions(-) diff --git a/dlls/localui/tests/localui.c b/dlls/localui/tests/localui.c index 28cecaabd50..b504bd870f7 100644 --- a/dlls/localui/tests/localui.c +++ b/dlls/localui/tests/localui.c @@ -69,7 +69,7 @@ static PORT_INFO_2W * find_portinfo2(LPCWSTR pPort) return NULL; } ok(!res, "EnumPorts succeeded: got %ld\n", res); - pi_buffer = HeapAlloc(GetProcessHeap(), 0, pi_needed); + pi_buffer = malloc(pi_needed); res = EnumPortsW(NULL, 2, pi_buffer, pi_needed, &pi_needed, &pi_numports); ok(res == 1, "EnumPorts failed: got %ld\n", res); } @@ -105,21 +105,6 @@ static LPCSTR load_functions(void) return NULL; } -/* ########################### - * strdupW [internal] - */ - -static LPWSTR strdupW(LPCWSTR strW) -{ - LPWSTR ptr; - - ptr = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(strW) + 1) * sizeof(WCHAR)); - if (ptr) { - lstrcpyW(ptr, strW); - } - return ptr; -} - /* ########################### */ static void test_AddPortUI(void) @@ -267,7 +252,6 @@ START_TEST(localui) DWORD numentries; PORT_INFO_2W * pi2; WCHAR bufferW[16]; - CHAR bufferA[16]; DWORD id; /* localui.dll does not exist before w2k */ @@ -302,29 +286,26 @@ START_TEST(localui) /* "LPT1:" - "LPT9:" */ while (((lpt_present == NULL) || (lpt_absent == NULL)) && id < 9) { id++; - sprintf(bufferA, "LPT%lu:", id); - MultiByteToWideChar( CP_ACP, 0, bufferA, -1, bufferW, ARRAY_SIZE(bufferW)); + swprintf(bufferW, ARRAY_SIZE(bufferW), L"LPT%lu:", id); pi2 = find_portinfo2(bufferW); if (pi2 && (lpt_present == NULL)) lpt_present = pi2; - if (!pi2 && (lpt_absent == NULL)) lpt_absent = strdupW(bufferW); + if (!pi2 && (lpt_absent == NULL)) lpt_absent = wcsdup(bufferW); } id = 0; /* "COM1:" - "COM9:" */ while (((com_present == NULL) || (com_absent == NULL)) && id < 9) { id++; - sprintf(bufferA, "COM%lu:", id); - MultiByteToWideChar( CP_ACP, 0, bufferA, -1, bufferW, ARRAY_SIZE(bufferW)); + swprintf(bufferW, ARRAY_SIZE(bufferW), L"COM%lu:", id); pi2 = find_portinfo2(bufferW); if (pi2 && (com_present == NULL)) com_present = pi2; - if (!pi2 && (com_absent == NULL)) com_absent = strdupW(bufferW); + if (!pi2 && (com_absent == NULL)) com_absent = wcsdup(bufferW); } test_AddPortUI(); test_ConfigurePortUI(); - /* cleanup */ - HeapFree(GetProcessHeap(), 0, lpt_absent); - HeapFree(GetProcessHeap(), 0, com_absent); - HeapFree(GetProcessHeap(), 0, pi_buffer); + free(lpt_absent); + free(com_absent); + free(pi_buffer); } -- 2.35.1

1 0