- Wine-Devel - list.winehq.org

[PATCH v2 1/4] msvcr120: Add fetestexcept.
by Daniel Lehman March 12, 2021

March 12, 2021

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- v2: - use _statusfp() - improved tests --- .../api-ms-win-crt-runtime-l1-1-0.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120/tests/msvcr120.c | 33 ++++++++++++++++++- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/math.c | 8 +++++ dlls/ucrtbase/ucrtbase.spec | 2 +- include/msvcrt/fenv.h | 1 + 7 files changed, 45 insertions(+), 5 deletions(-) diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index 74d682b33bf..66c2d8cc264 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -95,7 +95,7 @@ @ cdecl fesetenv(ptr) ucrtbase.fesetenv @ stub fesetexceptflag @ cdecl fesetround(long) ucrtbase.fesetround -@ stub fetestexcept +@ cdecl fetestexcept(long) ucrtbase.fetestexcept @ cdecl perror(str) ucrtbase.perror @ cdecl quick_exit(long) ucrtbase.quick_exit @ cdecl raise(long) ucrtbase.raise diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 0e1c7705166..27ae5a930f6 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2154,7 +2154,7 @@ @ cdecl fesetenv(ptr) @ stub fesetexceptflag @ cdecl fesetround(long) -@ stub fetestexcept +@ cdecl fetestexcept(long) @ stub feupdateenv @ cdecl fflush(ptr) @ cdecl fgetc(ptr) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index e8ef2be3520..537e9077402 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -182,6 +182,7 @@ static int (CDECL *p_fegetenv)(fenv_t*); static int (CDECL *p_fesetenv)(const fenv_t*); static int (CDECL *p_fegetround)(void); static int (CDECL *p_fesetround)(int); +static int (CDECL *p_fetestexcept)(int); static int (CDECL *p__clearfp)(void); static _locale_t (__cdecl *p_wcreate_locale)(int, const wchar_t *); static void (__cdecl *p_free_locale)(_locale_t); @@ -257,6 +258,7 @@ static BOOL init(void) SET(p_fesetenv, "fesetenv"); SET(p_fegetround, "fegetround"); SET(p_fesetround, "fesetround"); + SET(p_fetestexcept, "fetestexcept"); SET(p__clearfp, "_clearfp"); SET(p_vsscanf, "vsscanf"); @@ -788,8 +790,17 @@ static void test_critical_section(void) static void test_feenv(void) { + static const int tests[] = { + 0, + FE_INEXACT, + FE_UNDERFLOW, + FE_OVERFLOW, + FE_DIVBYZERO, + FE_INVALID, + FE_ALL_EXCEPT, + }; fenv_t env, env2; - int ret; + int i, ret, flags; p__clearfp(); @@ -807,6 +818,26 @@ static void test_feenv(void) ok(!ret, "fesetenv returned %x\n", ret); ret = p_fegetround(); ok(ret == FE_TONEAREST, "Got unexpected round mode %#x.\n", ret); + + ret = p_fetestexcept(FE_ALL_EXCEPT); + ok(!ret, "fetestexcept returned %x\n", ret); + + flags = 0; + for(i=0; i<ARRAY_SIZE(tests); i++) { + ret = p_fegetenv(&env); + ok(!ret, "Test %d: fegetenv returned %x\n", i, ret); + env._Fe_stat |= tests[i]; + ret = p_fesetenv(&env); + ok(!ret, "Test %d: fesetenv returned %x\n", i, ret); + + ret = p_fetestexcept(tests[i]); + ok(ret == tests[i], "Test %d: expected %x, got %x\n", i, tests[i], ret); + + flags |= tests[i]; + ret = p_fetestexcept(FE_ALL_EXCEPT); + ok(ret == flags, "Test %d: expected %x, got %x\n", i, flags, ret); + } + p__clearfp(); } static void test__wcreate_locale(void) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 05b8a97a084..daee644d965 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1820,7 +1820,7 @@ @ cdecl fesetenv(ptr) msvcr120.fesetenv @ stub fesetexceptflag @ cdecl fesetround(long) msvcr120.fesetround -@ stub fetestexcept +@ cdecl fetestexcept(long) msvcr120.fetestexcept @ stub feupdateenv @ cdecl fflush(ptr) msvcr120.fflush @ cdecl fgetc(ptr) msvcr120.fgetc diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index d6b0d9422e7..6c1d665c843 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2214,6 +2214,14 @@ int CDECL fegetenv(fenv_t *env) env->_Fe_stat = _statusfp(); return 0; } + +/********************************************************************* + * fetestexcept (MSVCR120.@) + */ +int CDECL fetestexcept(int flags) +{ + return _statusfp() & flags; +} #endif #if _MSVCR_VER>=140 diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 0a8d74521f5..d40df5e0efc 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2296,7 +2296,7 @@ @ cdecl fesetenv(ptr) @ stub fesetexceptflag @ cdecl fesetround(long) -@ stub fetestexcept +@ cdecl fetestexcept(long) @ cdecl fflush(ptr) @ cdecl fgetc(ptr) @ cdecl fgetpos(ptr ptr) diff --git a/include/msvcrt/fenv.h b/include/msvcrt/fenv.h index 92b341bd46b..3dcbcf0b8fe 100644 --- a/include/msvcrt/fenv.h +++ b/include/msvcrt/fenv.h @@ -34,6 +34,7 @@ _ACRTIMP int __cdecl fegetenv(fenv_t*); _ACRTIMP int __cdecl fesetenv(const fenv_t*); _ACRTIMP int __cdecl fegetround(void); _ACRTIMP int __cdecl fesetround(int); +_ACRTIMP int __cdecl fetestexcept(int); #ifdef __cplusplus } -- 2.25.1

2 7

[PATCH 1/5] dwrite/tests: Remove tests failing on Win10 20H2.
by Nikolay Sivov March 12, 2021

March 12, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/tests/font.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index d0940c3b145..4b31c331872 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2460,11 +2460,6 @@ static void test_system_fontcollection(void) ok(coll2 == collection, "got %p, was %p\n", coll2, collection); IDWriteFontCollection_Release(coll2); - hr = IDWriteFactory_GetSystemFontCollection(factory, &coll2, TRUE); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(coll2 == collection, "got %p, was %p\n", coll2, collection); - IDWriteFontCollection_Release(coll2); - factory2 = create_factory(); hr = IDWriteFactory_GetSystemFontCollection(factory2, &coll2, FALSE); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -2652,10 +2647,8 @@ todo_wine hr = IDWriteFactory6_GetSystemFontCollection(factory6, FALSE, DWRITE_FONT_FAMILY_MODEL_WEIGHT_STRETCH_STYLE, &collection2); ok(hr == S_OK, "Failed to get collection, hr %#x.\n", hr); - ok(collection == (IDWriteFontCollection *)collection2, "Unexpected instance.\n"); IDWriteFontCollection2_Release(collection2); } - IDWriteFactory6_Release(factory6); } else -- 2.30.1

1 4

[PATCH] reg: Stop parsing REG_SZ values containing NUL character sequences
by Hugh McMaster March 12, 2021

March 12, 2021

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/import.c | 3 +-- programs/reg/tests/import.c | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/programs/reg/import.c b/programs/reg/import.c index f7f87939e23..7ad7b35d5dc 100644 --- a/programs/reg/import.c +++ b/programs/reg/import.c @@ -324,8 +324,7 @@ static BOOL unescape_string(WCHAR *str, WCHAR **unparsed) str[val_idx] = '\r'; break; case '0': - str[val_idx] = '\0'; - break; + return FALSE; case '\\': case '"': str[val_idx] = str[str_idx]; diff --git a/programs/reg/tests/import.c b/programs/reg/tests/import.c index f8e7e4b7acb..06f9cb05f6c 100644 --- a/programs/reg/tests/import.c +++ b/programs/reg/tests/import.c @@ -1600,12 +1600,12 @@ static void test_import(void) "\"Wine70e\"=\"Value3\\0Value4\"\n" "\"Wine70f\"=\"\\0Value5\"\n\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Wine70a"); - todo_wine verify_reg_nonexist(hkey, "Wine70b"); - todo_wine verify_reg_nonexist(hkey, "Wine70c"); - todo_wine verify_reg_nonexist(hkey, "Wine70d"); - todo_wine verify_reg_nonexist(hkey, "Wine70e"); - todo_wine verify_reg_nonexist(hkey, "Wine70f"); + verify_reg_nonexist(hkey, "Wine70a"); + verify_reg_nonexist(hkey, "Wine70b"); + verify_reg_nonexist(hkey, "Wine70c"); + verify_reg_nonexist(hkey, "Wine70d"); + verify_reg_nonexist(hkey, "Wine70e"); + verify_reg_nonexist(hkey, "Wine70f"); /* Test forward and back slashes */ test_import_str("REGEDIT4\n\n" @@ -3149,12 +3149,12 @@ static void test_unicode_import(void) "\"Wine70e\"=\"Value3\\0Value4\"\n" "\"Wine70f\"=\"\\0Value5\"\n\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Wine70a"); - todo_wine verify_reg_nonexist(hkey, "Wine70b"); - todo_wine verify_reg_nonexist(hkey, "Wine70c"); - todo_wine verify_reg_nonexist(hkey, "Wine70d"); - todo_wine verify_reg_nonexist(hkey, "Wine70e"); - todo_wine verify_reg_nonexist(hkey, "Wine70f"); + verify_reg_nonexist(hkey, "Wine70a"); + verify_reg_nonexist(hkey, "Wine70b"); + verify_reg_nonexist(hkey, "Wine70c"); + verify_reg_nonexist(hkey, "Wine70d"); + verify_reg_nonexist(hkey, "Wine70e"); + verify_reg_nonexist(hkey, "Wine70f"); /* Test forward and back slashes */ test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" -- 2.30.2

1 0

[PATCH vkd3d] build: Enable -Winit-self.
by Zebediah Figura March 12, 2021

March 12, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index b7902b63..2005c763 100644 --- a/configure.ac +++ b/configure.ac @@ -56,6 +56,7 @@ AS_IF([test "x${GCC}" = "xyes"], VKD3D_CHECK_CFLAGS([-std=c99]) VKD3D_CHECK_CFLAGS([-Wdeclaration-after-statement]) VKD3D_CHECK_CFLAGS([-Wimplicit-fallthrough]) + VKD3D_CHECK_CFLAGS([-Winit-self]) VKD3D_CHECK_CFLAGS([-Wmissing-prototypes]) VKD3D_CHECK_CFLAGS([-Wunused-but-set-parameter]) VKD3D_CHECK_CFLAGS([-Wvla]) -- 2.30.1

3 2

[PATCH vkd3d 1/5] vkd3d-shader: Don't use assignment instructions as sources.
by Zebediah Figura March 12, 2021

March 12, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index ce4bd626..a9c9dd02 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1261,6 +1261,7 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in { struct hlsl_ir_assignment *assign; struct hlsl_type *lhs_type; + struct hlsl_ir_expr *copy; DWORD writemask = 0; lhs_type = lhs->data_type; @@ -1321,7 +1322,7 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in lhs = lhs_inner; } - init_node(&assign->node, HLSL_IR_ASSIGNMENT, lhs_type, lhs->loc); + init_node(&assign->node, HLSL_IR_ASSIGNMENT, NULL, lhs->loc); assign->writemask = writemask; assign->lhs.var = hlsl_ir_load(lhs)->src.var; hlsl_src_from_node(&assign->lhs.offset, hlsl_ir_load(lhs)->src.offset.node); @@ -1337,7 +1338,14 @@ static struct hlsl_ir_node *add_assignment(struct hlsl_ctx *ctx, struct list *in hlsl_src_from_node(&assign->rhs, rhs); list_add_tail(instrs, &assign->node.entry); - return &assign->node; + /* Don't use the instruction itself as a source, as this makes structure + * splitting easier. Instead copy it here. Since we retrieve sources from + * the last instruction in the list, we do need to copy. Use a cast + * instruction to the same type as a makeshift identity expression. */ + if (!(copy = hlsl_new_cast(rhs, rhs->data_type, &lhs->loc))) + return NULL; + list_add_tail(instrs, &copy->node.entry); + return &copy->node; } static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, struct hlsl_ir_var *var, -- 2.30.1

4 15

[PATCH] regedit: Stop parsing REG_SZ values containing NUL character sequences
by Hugh McMaster March 12, 2021

March 12, 2021

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/regproc.c | 3 +-- programs/regedit/tests/regedit.c | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 727f39f6158..5bb991865e6 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -402,8 +402,7 @@ static BOOL REGPROC_unescape_string(WCHAR *str, WCHAR **unparsed) str[val_idx] = '\r'; break; case '0': - str[val_idx] = '\0'; - break; + return FALSE; case '\\': case '"': str[val_idx] = str[str_idx]; diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 9b431fa6f38..7d2c9416bcc 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1694,12 +1694,12 @@ static void test_invalid_import(void) "\"Wine33d\"=\"Value2\\0\\0\\0\\0\"\n" "\"Wine33e\"=\"Value3\\0Value4\"\n" "\"Wine33f\"=\"\\0Value5\"\n\n"); - todo_wine verify_reg_nonexist(hkey, "Wine33a"); - todo_wine verify_reg_nonexist(hkey, "Wine33b"); - todo_wine verify_reg_nonexist(hkey, "Wine33c"); - todo_wine verify_reg_nonexist(hkey, "Wine33d"); - todo_wine verify_reg_nonexist(hkey, "Wine33e"); - todo_wine verify_reg_nonexist(hkey, "Wine33f"); + verify_reg_nonexist(hkey, "Wine33a"); + verify_reg_nonexist(hkey, "Wine33b"); + verify_reg_nonexist(hkey, "Wine33c"); + verify_reg_nonexist(hkey, "Wine33d"); + verify_reg_nonexist(hkey, "Wine33e"); + verify_reg_nonexist(hkey, "Wine33f"); close_key(hkey); @@ -2205,12 +2205,12 @@ static void test_invalid_import_unicode(void) "\"Wine33d\"=\"Value2\\0\\0\\0\\0\"\n" "\"Wine33e\"=\"Value3\\0Value4\"\n" "\"Wine33f\"=\"\\0Value5\"\n\n"); - todo_wine verify_reg_nonexist(hkey, "Wine33a"); - todo_wine verify_reg_nonexist(hkey, "Wine33b"); - todo_wine verify_reg_nonexist(hkey, "Wine33c"); - todo_wine verify_reg_nonexist(hkey, "Wine33d"); - todo_wine verify_reg_nonexist(hkey, "Wine33e"); - todo_wine verify_reg_nonexist(hkey, "Wine33f"); + verify_reg_nonexist(hkey, "Wine33a"); + verify_reg_nonexist(hkey, "Wine33b"); + verify_reg_nonexist(hkey, "Wine33c"); + verify_reg_nonexist(hkey, "Wine33d"); + verify_reg_nonexist(hkey, "Wine33e"); + verify_reg_nonexist(hkey, "Wine33f"); close_key(hkey); -- 2.30.2

1 0

[PATCH resend v3 1/2] iphlpapi: Add a test for GetAdaptersInfo.
by Yeshun Ye March 12, 2021

March 12, 2021

Signed-off-by: Yeshun Ye <yeyeshun(a)uniontech.com> --- dlls/iphlpapi/tests/iphlpapi.c | 79 ++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 358084fde68..44ead2580bf 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -2338,6 +2338,84 @@ static void test_NotifyUnicastIpAddressChange(void) ok(!CloseHandle(handle), "CloseHandle() succeeded.\n"); } +static void test_GetAdaptersInfo_AdapterName(void) +{ + DWORD apiReturn; + ULONG size = 0; + ULONG family = AF_UNSPEC; + ULONG flags = GAA_FLAG_INCLUDE_PREFIX; + + apiReturn = GetAdaptersInfo(NULL, NULL); + if (apiReturn == ERROR_NOT_SUPPORTED) { + skip("GetAdaptersInfo is not supported\n"); + return; + } + apiReturn = GetAdaptersAddresses(0, 0, NULL, NULL, NULL); + if (apiReturn == ERROR_NOT_SUPPORTED) { + skip("GetAdaptersInfo is not supported\n"); + return; + } + apiReturn = GetAdaptersAddresses(family, flags, 0, 0, &size); + ok(apiReturn == ERROR_NO_DATA || apiReturn == ERROR_BUFFER_OVERFLOW, + "GetAdaptersAddresses returned %d, expected ERROR_NO_DATA or ERROR_BUFFER_OVERFLOW\n", + apiReturn); + if (apiReturn == ERROR_NO_DATA) + ; /* no adapter's, that's okay */ + else if (apiReturn == ERROR_BUFFER_OVERFLOW) + { + PIP_ADAPTER_ADDRESSES pAdapterAddress; + PIP_ADAPTER_ADDRESSES pCurrentAddress; + + pAdapterAddress = HeapAlloc(GetProcessHeap(), 0, size); + apiReturn = GetAdaptersAddresses(family, flags, 0, pAdapterAddress, &size); + ok(apiReturn == NO_ERROR, + "GetAdaptersAddresses(family, flags, 0, pAdapterAddress, &size) returned %d, expected NO_ERROR\n", + apiReturn); + + pCurrentAddress = pAdapterAddress; + while (pCurrentAddress) + { + if (pCurrentAddress->IfType == IF_TYPE_ETHERNET_CSMACD && + ((pCurrentAddress->Flags & IP_ADAPTER_IPV4_ENABLED) || (pCurrentAddress->Flags & IP_ADAPTER_IPV6_ENABLED))) + { + ULONG len = 0; + PIP_ADAPTER_INFO ptr, buf; + char IpAddress[16] = {0}; + char IpMask[16] = {0}; + + apiReturn = GetAdaptersInfo(NULL, &len); + ok(apiReturn == ERROR_BUFFER_OVERFLOW, + "GetAdaptersInfo returned %d, expected ERROR_NO_DATA or ERROR_BUFFER_OVERFLOW\n", + apiReturn); + buf = HeapAlloc(GetProcessHeap(), 0, len); + apiReturn = GetAdaptersInfo(buf, &len); + ok(apiReturn == NO_ERROR, + "GetAdaptersInfo(buf, &len) returned %d, expected NO_ERROR\n", + apiReturn); + ptr = buf; + while (ptr) { + if (strcmp(pCurrentAddress->AdapterName, ptr->AdapterName) == 0) + { + ok(ptr->IpAddressList.IpAddress.String[0], "A valid IP must be present\n"); + ok(ptr->IpAddressList.IpMask.String[0], "A valid mask must be present\n"); + trace("Adapter '%s', IP %s, Mask %s\n", ptr->AdapterName, + ptr->IpAddressList.IpAddress.String, ptr->IpAddressList.IpMask.String); + strcpy(IpAddress, ptr->IpAddressList.IpAddress.String); + strcpy(IpMask, ptr->IpAddressList.IpMask.String); + break; + } + ptr = ptr->Next; + } + todo_wine ok(IpAddress[0], "A valid IP must be present for adapter [%s]\n", pCurrentAddress->AdapterName); + todo_wine ok(IpMask[0], "A valid mask must be present for adapter [%s]\n", pCurrentAddress->AdapterName); + HeapFree(GetProcessHeap(), 0, buf); + } + pCurrentAddress = pCurrentAddress->Next; + } + HeapFree(GetProcessHeap(), 0, pAdapterAddress); + } +} + START_TEST(iphlpapi) { @@ -2370,6 +2448,7 @@ START_TEST(iphlpapi) test_GetUdp6Table(); test_ParseNetworkString(); test_NotifyUnicastIpAddressChange(); + test_GetAdaptersInfo_AdapterName(); freeIPHlpApi(); } } -- 2.20.1

2 2

[PATCH 1/6] dwrite/tests: Do not segfault in tests if NULL is returned.
by Giovanni Mascellani March 12, 2021

March 12, 2021

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/dwrite/tests/layout.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 43a00b7e22e..d186f47cc94 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -4714,6 +4714,7 @@ if (font) { ok(scale == 1.0f, "got %f\n", scale); ok(font != NULL, "got %p\n", font); +if (font) { exists = FALSE; hr = IDWriteFont_GetInformationalStrings(font, DWRITE_INFORMATIONAL_STRING_WIN32_FAMILY_NAMES, &strings, &exists); ok(hr == S_OK && exists, "got 0x%08x, exists %d\n", hr, exists); @@ -4722,6 +4723,7 @@ if (font) { ok(!lstrcmpW(buffW, L"Tahoma"), "Unexpected string %s.\n", wine_dbgstr_w(buffW)); IDWriteLocalizedStrings_Release(strings); IDWriteFont_Release(font); +} /* 2. Hiragana character, force Tahoma font does not support Japanese */ g_source = str2W; @@ -4735,6 +4737,7 @@ if (font) { ok(scale == 1.0f, "got %f\n", scale); ok(font != NULL, "got %p\n", font); +if (font) { exists = FALSE; hr = IDWriteFont_GetInformationalStrings(font, DWRITE_INFORMATIONAL_STRING_WIN32_FAMILY_NAMES, &strings, &exists); ok(hr == S_OK && exists, "got 0x%08x, exists %d\n", hr, exists); @@ -4744,6 +4747,7 @@ todo_wine ok(lstrcmpW(buffW, L"Tahoma"), "Unexpected string %s.\n", wine_dbgstr_w(buffW)); IDWriteLocalizedStrings_Release(strings); IDWriteFont_Release(font); +} IDWriteFontFallback_Release(fallback); IDWriteFactory2_Release(factory2); -- 2.30.1

2 11

[PATCH 5/5] riched20: Handle EM_FINDTEXTEX's unicode conversion in the host.
by Huw Davies March 12, 2021

March 12, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 19 +------------------ dlls/riched20/txthost.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 93daa472048..eb1ec78d962 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4167,30 +4167,13 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, { return editor->nTextLimit; } - case EM_FINDTEXTEX: - { - LRESULT r; - if(!unicode){ - FINDTEXTEXA *ex = (FINDTEXTEXA *)lParam; - int nChars = MultiByteToWideChar(CP_ACP, 0, ex->lpstrText, -1, NULL, 0); - WCHAR *tmp; - - if ((tmp = heap_alloc(nChars * sizeof(*tmp))) != NULL) - MultiByteToWideChar(CP_ACP, 0, ex->lpstrText, -1, tmp, nChars); - r = ME_FindText(editor, wParam, &ex->chrg, tmp, &ex->chrgText); - heap_free(tmp); - }else{ - FINDTEXTEXW *ex = (FINDTEXTEXW *)lParam; - r = ME_FindText(editor, wParam, &ex->chrg, ex->lpstrText, &ex->chrgText); - } - return r; - } case EM_FINDTEXT: case EM_FINDTEXTW: { FINDTEXTW *ft = (FINDTEXTW *)lParam; return ME_FindText(editor, wParam, &ft->chrg, ft->lpstrText, NULL); } + case EM_FINDTEXTEX: case EM_FINDTEXTEXW: { FINDTEXTEXW *ex = (FINDTEXTEXW *)lParam; diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 00801b5b9af..d249137d829 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -850,6 +850,27 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, if (!unicode) ME_EndToUnicode( CP_ACP, (WCHAR *)new_params.lpstrText ); break; } + case EM_FINDTEXTEX: + { + FINDTEXTEXA *paramsA = (FINDTEXTEXA *)lparam; + FINDTEXTEXW *params = (FINDTEXTEXW *)lparam; + FINDTEXTEXW new_params; + int len; + + if (!unicode) + { + new_params.chrg = params->chrg; + new_params.lpstrText = ME_ToUnicode( CP_ACP, (char *)params->lpstrText, &len ); + params = &new_params; + } + hr = ITextServices_TxSendMessage( host->text_srv, EM_FINDTEXTEXW, wparam, (LPARAM)params, &res ); + if (!unicode) + { + ME_EndToUnicode( CP_ACP, (WCHAR *)new_params.lpstrText ); + paramsA->chrgText = params->chrgText; + } + break; + } case WM_GETTEXT: { GETTEXTEX params; -- 2.23.0

1 0

[PATCH 4/5] riched20: Handle EM_FINDTEXT's unicode conversion in the host.
by Huw Davies March 12, 2021

March 12, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 19 +------------------ dlls/riched20/txthost.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index f96f52ef56d..93daa472048 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4167,24 +4167,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, { return editor->nTextLimit; } - case EM_FINDTEXT: - { - LRESULT r; - if(!unicode){ - FINDTEXTA *ft = (FINDTEXTA *)lParam; - int nChars = MultiByteToWideChar(CP_ACP, 0, ft->lpstrText, -1, NULL, 0); - WCHAR *tmp; - - if ((tmp = heap_alloc(nChars * sizeof(*tmp))) != NULL) - MultiByteToWideChar(CP_ACP, 0, ft->lpstrText, -1, tmp, nChars); - r = ME_FindText(editor, wParam, &ft->chrg, tmp, NULL); - heap_free(tmp); - }else{ - FINDTEXTW *ft = (FINDTEXTW *)lParam; - r = ME_FindText(editor, wParam, &ft->chrg, ft->lpstrText, NULL); - } - return r; - } case EM_FINDTEXTEX: { LRESULT r; @@ -4203,6 +4185,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } return r; } + case EM_FINDTEXT: case EM_FINDTEXTW: { FINDTEXTW *ft = (FINDTEXTW *)lParam; diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 3c968ddfecc..00801b5b9af 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -834,6 +834,22 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, FillRect( hdc, &rc, editor->hbrBackground ); return 1; } + case EM_FINDTEXT: + { + FINDTEXTW *params = (FINDTEXTW *)lparam; + FINDTEXTW new_params; + int len; + + if (!unicode) + { + new_params.chrg = params->chrg; + new_params.lpstrText = ME_ToUnicode( CP_ACP, (char *)params->lpstrText, &len ); + params = &new_params; + } + hr = ITextServices_TxSendMessage( host->text_srv, EM_FINDTEXTW, wparam, (LPARAM)params, &res ); + if (!unicode) ME_EndToUnicode( CP_ACP, (WCHAR *)new_params.lpstrText ); + break; + } case WM_GETTEXT: { GETTEXTEX params; -- 2.23.0

1 0