February 2024 - Wine-commits

Alexandre Julliard : winedump: Make the ARM exception information more compact.
by Alexandre Julliard 01 Feb '24

01 Feb '24

Module: wine Branch: master Commit: 3825af604129e5403ad7104676e3275a2afe0e0d URL: https://gitlab.winehq.org/wine/wine/-/commit/3825af604129e5403ad7104676e327… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 1 11:39:28 2024 +0100 winedump: Make the ARM exception information more compact. --- tools/winedump/pe.c | 103 ++++++++++++++++++++-------------------------------- 1 file changed, 39 insertions(+), 64 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index c90a339e5ba..4d60c130a4d 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -985,7 +985,7 @@ static void dump_armnt_unwind_info( const struct runtime_function_armnt *fnc ) { const struct unwind_info_armnt *info; const struct unwind_info_ext_armnt *infoex; - const struct unwind_info_epilogue_armnt *infoepi; + const struct unwind_info_epilogue_armnt *infoepi = NULL; unsigned int rva; WORD i, count = 0, words = 0; @@ -993,18 +993,11 @@ static void dump_armnt_unwind_info( const struct runtime_function_armnt *fnc ) { char intregs[32] = {0}, intregspop[32] = {0}, vfpregs[32] = {0}; WORD pf = 0, ef = 0, fpoffset = 0, stack = fnc->StackAdjust; + const char *pfx = " ... "; - printf( "\nFunction %08x-%08x:\n", fnc->BeginAddress & ~1, - (fnc->BeginAddress & ~1) + fnc->FunctionLength * 2 ); - printf( " Flag %x\n", fnc->Flag ); - printf( " FunctionLength %x\n", fnc->FunctionLength ); - printf( " Ret %x\n", fnc->Ret ); - printf( " H %x\n", fnc->H ); - printf( " Reg %x\n", fnc->Reg ); - printf( " R %x\n", fnc->R ); - printf( " L %x\n", fnc->L ); - printf( " C %x\n", fnc->C ); - printf( " StackAdjust %x\n", fnc->StackAdjust ); + printf( "\nFunction %08x-%08x: (flag=%u ret=%u H=%u reg=%u R=%u L=%u C=%u)\n", + fnc->BeginAddress & ~1, (fnc->BeginAddress & ~1) + fnc->FunctionLength * 2, + fnc->Flag, fnc->Ret, fnc->H, fnc->Reg, fnc->R, fnc->L, fnc->C ); if (fnc->StackAdjust >= 0x03f4) { @@ -1075,47 +1068,48 @@ static void dump_armnt_unwind_info( const struct runtime_function_armnt *fnc ) strcpy(vfpregs, "d8"); } + printf( " Prologue:\n" ); if (fnc->Flag == 1) { if (fnc->H) - printf( " Unwind Code\tpush {r0-r3}\n" ); + printf( "%s push {r0-r3}\n", pfx ); if (intregs[0]) - printf( " Unwind Code\tpush {%s}\n", intregs ); + printf( "%s push {%s}\n", pfx, intregs ); if (fnc->C && fpoffset == 0) - printf( " Unwind Code\tmov r11, sp\n" ); + printf( "%s mov r11, sp\n", pfx ); else if (fnc->C) - printf( " Unwind Code\tadd r11, sp, #%d\n", fpoffset * 4 ); + printf( "%s add r11, sp, #%d\n", pfx, fpoffset * 4 ); if (fnc->R && fnc->Reg != 0x07) - printf( " Unwind Code\tvpush {%s}\n", vfpregs ); + printf( "%s vpush {%s}\n", pfx, vfpregs ); if (stack && !pf) - printf( " Unwind Code\tsub sp, sp, #%d\n", stack * 4 ); + printf( "%s sub sp, sp, #%d\n", pfx, stack * 4 ); } if (fnc->Ret == 3) return; - printf( "Epilogue:\n" ); + printf( " Epilogue:\n" ); if (stack && !ef) - printf( " Unwind Code\tadd sp, sp, #%d\n", stack * 4 ); + printf( "%s add sp, sp, #%d\n", pfx, stack * 4 ); if (fnc->R && fnc->Reg != 0x07) - printf( " Unwind Code\tvpop {%s}\n", vfpregs ); + printf( "%s vpop {%s}\n", pfx, vfpregs ); if (intregspop[0]) - printf( " Unwind Code\tpop {%s}\n", intregspop ); + printf( "%s pop {%s}\n", pfx, intregspop ); if (fnc->H && !(fnc->L && fnc->Ret == 0)) - printf( " Unwind Code\tadd sp, sp, #16\n" ); + printf( "%s add sp, sp, #16\n", pfx ); else if (fnc->H && (fnc->L && fnc->Ret == 0)) - printf( " Unwind Code\tldr pc, [sp], #20\n" ); + printf( "%s ldr pc, [sp], #20\n", pfx ); if (fnc->Ret == 1) - printf( " Unwind Code\tbx <reg>\n" ); + printf( "%s bx <reg>\n", pfx ); else if (fnc->Ret == 2) - printf( " Unwind Code\tb <address>\n" ); + printf( "%s b <address>\n", pfx ); return; } @@ -1125,17 +1119,9 @@ static void dump_armnt_unwind_info( const struct runtime_function_armnt *fnc ) count = info->count; words = info->words; - printf( "\nFunction %08x-%08x:\n", fnc->BeginAddress & ~1, - (fnc->BeginAddress & ~1) + info->function_length * 2 ); - printf( " unwind info at %08x\n", fnc->UnwindData ); - printf( " Flag %x\n", fnc->Flag ); - printf( " FunctionLength %x\n", info->function_length ); - printf( " Version %x\n", info->version ); - printf( " X %x\n", info->x ); - printf( " E %x\n", info->e ); - printf( " F %x\n", info->f ); - printf( " Count %x\n", count ); - printf( " Words %x\n", words ); + printf( "\nFunction %08x-%08x: (ver=%u X=%u E=%u F=%u)\n", fnc->BeginAddress & ~1, + (fnc->BeginAddress & ~1) + info->function_length * 2, + info->version, info->x, info->e, info->f ); if (!info->count && !info->words) { @@ -1143,26 +1129,13 @@ static void dump_armnt_unwind_info( const struct runtime_function_armnt *fnc ) rva = rva + sizeof(*infoex); count = infoex->excount; words = infoex->exwords; - printf( " ExtCount %x\n", count ); - printf( " ExtWords %x\n", words ); } - if (!info->e) + if (!info->e) { infoepi = RVA( rva, count * sizeof(*infoepi) ); rva = rva + count * sizeof(*infoepi); - - for (i = 0; i < count; i++) - { - printf( " Epilogue Scope %x\n", i ); - printf( " Offset %x\n", infoepi[i].offset ); - printf( " Reserved %x\n", infoepi[i].res ); - printf( " Condition %x\n", infoepi[i].cond ); - printf( " Index %x\n", infoepi[i].index ); - } } - else - infoepi = NULL; if (words) { @@ -1174,6 +1147,7 @@ static void dump_armnt_unwind_info( const struct runtime_function_armnt *fnc ) rva = rva + words * sizeof(*codes); bytes = (BYTE*)codes; + printf( " Prologue:\n" ); for (b = 0; b < words * sizeof(*codes); b++) { BYTE code = bytes[b]; @@ -1181,7 +1155,7 @@ static void dump_armnt_unwind_info( const struct runtime_function_armnt *fnc ) if (info->e && b == count) { - printf( "Epilogue:\n" ); + printf( " Epilogue:\n" ); inepilogue = TRUE; } else if (!info->e && infoepi) @@ -1189,16 +1163,17 @@ static void dump_armnt_unwind_info( const struct runtime_function_armnt *fnc ) for (i = 0; i < count; i++) if (b == infoepi[i].index) { - printf( "Epilogue from Scope %x at %08x:\n", i, - (fnc->BeginAddress & ~1) + infoepi[i].offset * 2 ); + printf( " Epilogue %u at %08x: (res=%x cond=%x)\n", i, + (fnc->BeginAddress & ~1) + infoepi[i].offset * 2, + infoepi[i].res, infoepi[i].cond ); inepilogue = TRUE; } } - printf( " Unwind Code"); + printf( " "); for (i = 0; i < len; i++) printf( " %02x", bytes[b+i] ); - printf( "\t" ); + printf( " %*s", 3 * (3 - len), "" ); if (code == 0x00) printf( "\n" ); @@ -1232,16 +1207,16 @@ static void dump_armnt_unwind_info( const struct runtime_function_armnt *fnc ) printf( "mov sp, r%u\n", code & 0x0f ); else printf( "mov r%u, sp\n", code & 0x0f ); + else if (code <= 0xd3) + printf( "%s {r4-r%u}\n", inepilogue ? "pop" : "push", (code & 0x03) + 4 ); + else if (code <= 0xd4) + printf( "%s {r4, %s}\n", inepilogue ? "pop" : "push", inepilogue ? "pc" : "lr" ); else if (code <= 0xd7) - if (inepilogue) - printf( "pop {r4-r%u%s}\n", (code & 0x03) + 4, (code & 0x04) ? ", pc" : "" ); - else - printf( "push {r4-r%u%s}\n", (code & 0x03) + 4, (code & 0x04) ? ", lr" : "" ); + printf( "%s {r4-r%u, %s}\n", inepilogue ? "pop" : "push", (code & 0x03) + 4, inepilogue ? "pc" : "lr" ); + else if (code <= 0xdb) + printf( "%s {r4-r%u}\n", inepilogue ? "pop" : "push", (code & 0x03) + 8 ); else if (code <= 0xdf) - if (inepilogue) - printf( "pop {r4-r%u%s}\n", (code & 0x03) + 8, (code & 0x04) ? ", pc" : "" ); - else - printf( "push {r4-r%u%s}\n", (code & 0x03) + 8, (code & 0x04) ? ", lr" : "" ); + printf( "%s {r4-r%u, %s}\n", inepilogue ? "pop" : "push", (code & 0x03) + 8, inepilogue ? "pc" : "lr" ); else if (code <= 0xe7) printf( "%s {d8-d%u}\n", inepilogue ? "vpop" : "vpush", (code & 0x07) + 8 ); else if (code <= 0xeb)

1 0

Alexandre Julliard : winedump: Handle ARM64 exception unwind info with flag==3.
by Alexandre Julliard 01 Feb '24

01 Feb '24

Module: wine Branch: master Commit: a97b3f640cc4d0564774c7c6911d02c87fb5975f URL: https://gitlab.winehq.org/wine/wine/-/commit/a97b3f640cc4d0564774c7c6911d02… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 1 12:28:47 2024 +0100 winedump: Handle ARM64 exception unwind info with flag==3. --- tools/winedump/pe.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 4d60c130a4d..f405acb2710 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -1645,11 +1645,14 @@ static void dump_arm64_unwind_info( const struct runtime_function_arm64 *func ) const struct unwind_info_arm64 *info; const struct unwind_info_ext_arm64 *infoex; const struct unwind_info_epilog_arm64 *infoepi; + const struct runtime_function_arm64 *parent_func; const BYTE *ptr; unsigned int i, rva, codes, epilogs; - if (func->Flag) + switch (func->Flag) { + case 1: + case 2: printf( "\nFunction %08x-%08x:\n", func->BeginAddress, func->BeginAddress + func->FunctionLength * 4 ); printf( " len=%#x flag=%x regF=%u regI=%u H=%u CR=%u frame=%x\n", @@ -1657,6 +1660,13 @@ static void dump_arm64_unwind_info( const struct runtime_function_arm64 *func ) func->H, func->CR, func->FrameSize ); dump_arm64_packed_info( func ); return; + case 3: + rva = func->UnwindData & ~3; + parent_func = RVA( rva, sizeof(*parent_func) ); + printf( "\nFunction %08x-%08x:\n", func->BeginAddress, + func->BeginAddress + 12 /* adrl x16, <dest>; br x16 */ ); + printf( " forward to parent %08x\n", parent_func->BeginAddress ); + return; } rva = func->UnwindData;

1 0

Alexandre Julliard : winebuild: Default to plain "clang" in find_clang_tool().
by Alexandre Julliard 01 Feb '24

01 Feb '24

Module: wine Branch: master Commit: b1ab51b5084ffa19c47752b4bb94392486c55e10 URL: https://gitlab.winehq.org/wine/wine/-/commit/b1ab51b5084ffa19c47752b4bb9439… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 1 11:05:56 2024 +0100 winebuild: Default to plain "clang" in find_clang_tool(). --- tools/winebuild/utils.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 9f51a60c01f..5e0e2194f10 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -193,6 +193,7 @@ static const char *find_clang_tool( struct strarray clang, const char *tool ) size_t cnt; strarray_addall( &args, clang ); + if (!args.count) strarray_add( &args, "clang" ); strarray_add( &args, strmake( "-print-prog-name=%s", tool )); if (verbose) strarray_add( &args, "-v" ); @@ -247,11 +248,7 @@ struct strarray find_tool( const char *name, const char * const *names ) { if (cc_command.count) file = find_clang_tool( cc_command, name ); if (!file && !(file = find_binary( "llvm", name ))) - { - struct strarray clang = empty_strarray; - strarray_add( &clang, "clang" ); - file = find_clang_tool( clang, strmake( "llvm-%s", name )); - } + file = find_clang_tool( empty_strarray, strmake( "llvm-%s", name )); } if (!file) fatal_error( "cannot find the '%s' tool\n", name ); @@ -267,12 +264,7 @@ struct strarray find_link_tool(void) if (cc_command.count) file = find_clang_tool( cc_command, "lld-link" ); if (!file) file = find_binary( NULL, "lld-link" ); - if (!file) - { - struct strarray clang = empty_strarray; - strarray_add( &clang, "clang" ); - file = find_clang_tool( clang, "lld-link" ); - } + if (!file) file = find_clang_tool( empty_strarray, "lld-link" ); if (!file) fatal_error( "cannot find the 'lld-link' tool\n" ); strarray_add( &ret, file );

1 0

Brendan Shanks : winebuild: Refactor find_tool().
by Alexandre Julliard 01 Feb '24

01 Feb '24

Module: wine Branch: master Commit: d292c7ec74a88b2de46dcde8ca89ab93a41bc1ea URL: https://gitlab.winehq.org/wine/wine/-/commit/d292c7ec74a88b2de46dcde8ca89ab… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Jan 30 10:39:59 2024 -0800 winebuild: Refactor find_tool(). --- tools/winebuild/utils.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 5e0e2194f10..8d7c4c9afc2 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -244,12 +244,10 @@ struct strarray find_tool( const char *name, const char * const *names ) names++; } - if (!file) - { - if (cc_command.count) file = find_clang_tool( cc_command, name ); - if (!file && !(file = find_binary( "llvm", name ))) - file = find_clang_tool( empty_strarray, strmake( "llvm-%s", name )); - } + if (!file && cc_command.count) file = find_clang_tool( cc_command, name ); + if (!file) file = find_binary( "llvm", name ); + if (!file) file = find_clang_tool( empty_strarray, strmake( "llvm-%s", name )); + if (!file) fatal_error( "cannot find the '%s' tool\n", name ); strarray_add( &ret, file );

1 0

Daniel Lehman : oleaut32/tests: Add tests for VarBstrFromR8.
by Alexandre Julliard 01 Feb '24

01 Feb '24

Module: wine Branch: master Commit: 53f81aa1dd8e8e3e49458fe583f2df4af39058d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/53f81aa1dd8e8e3e49458fe583f2df… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Tue Jan 30 22:46:23 2024 -0800 oleaut32/tests: Add tests for VarBstrFromR8. --- dlls/oleaut32/tests/vartype.c | 92 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 9426272d7be..27348b4866e 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -4576,6 +4576,97 @@ static void test_VarBstrFromR4(void) } } +struct r8_test +{ + double val; + const wchar_t *expect; + BOOL todo; +}; + +static void test_VarBstrFromR8(void) +{ + static const struct r8_test tests_en[] = + { + { 0.5, L"0.5" }, + { 0.05, L"0.05" }, + { 0.005, L"0.005" }, + { 0.0005, L"0.0005" }, + { 0.00005, L"0.00005", TRUE }, + { 0.000005, L"0.000005", TRUE }, + + { 1.0e8, L"100000000" }, + { 1.0e12, L"1000000000000" }, + { 1.0e14, L"100000000000000" }, + { 999999999999999.0, L"999999999999999" }, + { 1000000000000000.0, L"1E+15" }, + { 1200000000000000.0, L"1.2E+15" }, + { 1.0e15, L"1E+15" }, + + { 1.000e16, L"1E+16" }, + { 1.234e16, L"1.234E+16" }, + + { 0.0, NULL } + }; + static const struct r8_test tests_es[] = + { + { 0.5, L"0,5" }, + { 0.05, L"0,05" }, + { 0.005, L"0,005" }, + { 0.0005, L"0,0005" }, + { 0.00005, L"0,00005", TRUE }, + { 0.000005, L"0,000005", TRUE }, + + { 1.0e8, L"100000000" }, + { 1.0e12, L"1000000000000" }, + { 1.0e14, L"100000000000000" }, + { 999999999999999.0, L"999999999999999" }, + { 1000000000000000.0, L"1E+15" }, + { 1200000000000000.0, L"1,2E+15", TRUE }, + { 1.0e15, L"1E+15" }, + + { 1.000e16, L"1E+16" }, + { 1.234e16, L"1,234E+16", TRUE }, + + { 0.0, NULL } + }; + const struct r8_test *cur; + HRESULT hres; + BSTR bstr; + LCID lcid; + + lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); + cur = tests_en; + while (cur->expect) + { + bstr = NULL; + hres = VarBstrFromR8(cur->val, lcid, 0, &bstr); + ok(hres == S_OK, "got hres 0x%08lx\n", hres); + if (bstr) + { + todo_wine_if(cur->todo) + ok(wcscmp(bstr, cur->expect) == 0, "expected '%ls', got '%ls'\n", cur->expect, bstr); + SysFreeString(bstr); + } + ++cur; + } + + lcid = MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH), SORT_DEFAULT); + cur = tests_es; + while (cur->expect) + { + bstr = NULL; + hres = VarBstrFromR8(cur->val, lcid, 0, &bstr); + ok(hres == S_OK, "got hres 0x%08lx\n", hres); + if (bstr) + { + todo_wine_if(cur->todo) + ok(wcscmp(bstr, cur->expect) == 0, "expected '%ls', got '%ls'\n", cur->expect, bstr); + SysFreeString(bstr); + } + ++cur; + } +} + static void _BSTR_DATE(DATE dt, const char *str, int line) { LCID lcid = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); @@ -6325,6 +6416,7 @@ START_TEST(vartype) test_VarBstrFromI4(); test_VarBstrFromR4(); + test_VarBstrFromR8(); test_VarBstrFromDate(); test_VarBstrFromCy(); test_VarBstrFromDec();

1 0

Daniel Lehman : oleaut32/tests: Add tests for VarBstrFromR4.
by Alexandre Julliard 01 Feb '24

01 Feb '24

Module: wine Branch: master Commit: 62536d1645afd75965455f6bb8a03001106d57b7 URL: https://gitlab.winehq.org/wine/wine/-/commit/62536d1645afd75965455f6bb8a030… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed Jan 31 21:42:36 2024 -0800 oleaut32/tests: Add tests for VarBstrFromR4. --- dlls/oleaut32/tests/vartype.c | 89 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 27348b4866e..e567f5a5fed 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -4521,8 +4521,65 @@ static void test_VarBstrFromI4(void) } } +struct r4_test +{ + float val; + const wchar_t *expect; + BOOL todo; +}; + static void test_VarBstrFromR4(void) { + static const struct r4_test tests_en[] = + { + { 0.5, L"0.5" }, + { 0.05, L"0.05" }, + { 0.005, L"0.005" }, + { 0.0005, L"0.0005" }, + { 0.00005, L"0.00005", TRUE }, + { 0.000005, L"0.000005", TRUE }, + + { 1.0e8, L"1E+08" }, + { 1.0e12, L"1E+12" }, + { 1.0e14, L"1E+14" }, + { 999999999999999.0, L"1E+15" }, + { 1000000000000000.0, L"1E+15" }, + { 1200000000000000.0, L"1.2E+15" }, + { 1.0e15, L"1E+15" }, + + { 1.000e16, L"1E+16" }, + { 1.234e16, L"1.234E+16" }, + { M_PI, L"3.141593" }, + { 37.86626157, L"37.86626" }, + { 137.86626157, L"137.8663" }, + { 1137.86626157, L"1137.866" }, + + { 0.0, NULL } + }; + static const struct r4_test tests_es[] = + { + { 0.5, L"0,5" }, + { 0.05, L"0,05" }, + { 0.005, L"0,005" }, + { 0.0005, L"0,0005" }, + { 0.00005, L"0,00005", TRUE }, + { 0.000005, L"0,000005", TRUE }, + + { 1.0e8, L"1E+08" }, + { 1.0e12, L"1E+12" }, + { 1.0e14, L"1E+14" }, + { 999999999999999.0, L"1E+15" }, + { 1000000000000000.0, L"1E+15" }, + { 1200000000000000.0, L"1,2E+15", TRUE }, + { 1.0e15, L"1E+15" }, + + { 1.000e16, L"1E+16" }, + { 1.234e16, L"1,234E+16", TRUE }, + { M_PI, L"3,141593" }, + + { 0.0, NULL } + }; + const struct r4_test *cur; static const WCHAR szNative[] = { '6','5','4','3','2','2','.','3','\0' }; static const WCHAR szZero[] = {'0', '\0'}; static const WCHAR szOneHalf_English[] = { '0','.','5','\0' }; /* uses period */ @@ -4574,6 +4631,38 @@ static void test_VarBstrFromR4(void) ok(memcmp(bstr, szOneHalf_Spanish, sizeof(szOneHalf_Spanish)) == 0, "Spanish locale failed (got %s)\n", wtoascii(bstr)); SysFreeString(bstr); } + + lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); + cur = tests_en; + while (cur->expect) + { + bstr = NULL; + hres = VarBstrFromR4(cur->val, lcid, 0, &bstr); + ok(hres == S_OK, "got hres 0x%08lx\n", hres); + if (bstr) + { + todo_wine_if(cur->todo) + ok(wcscmp(bstr, cur->expect) == 0, "expected '%ls', got '%ls'\n", cur->expect, bstr); + SysFreeString(bstr); + } + ++cur; + } + + lcid = MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH), SORT_DEFAULT); + cur = tests_es; + while (cur->expect) + { + bstr = NULL; + hres = VarBstrFromR4(cur->val, lcid, 0, &bstr); + ok(hres == S_OK, "got hres 0x%08lx\n", hres); + if (bstr) + { + todo_wine_if(cur->todo) + ok(wcscmp(bstr, cur->expect) == 0, "expected '%ls', got '%ls'\n", cur->expect, bstr); + SysFreeString(bstr); + } + ++cur; + } } struct r8_test

1 0