August 2021 - Wine-commits - list.winehq.org

Zebediah Figura : vkd3d-shader/hlsl: Write SM4 addition instructions.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: vkd3d Branch: master Commit: fbcdc7a9d4bf39eeb44c98df67e9632c1984e76c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=fbcdc7a9d4bf39eeb44c98d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 24 01:18:12 2021 -0500 vkd3d-shader/hlsl: Write SM4 addition instructions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 1 - libs/vkd3d-shader/hlsl_sm4.c | 62 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 9d0410a..c66f7b5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -273,7 +273,6 @@ XFAIL_TESTS = \ tests/hlsl-return-void.shader_test \ tests/hlsl-static-initializer.shader_test \ tests/hlsl-storage-qualifiers.shader_test \ - tests/hlsl-struct-assignment.shader_test \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 27058fe..32a4eda 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -894,6 +894,27 @@ static void write_sm4_ret(struct vkd3d_bytecode_buffer *buffer) write_sm4_instruction(buffer, &instr); } +static void write_sm4_binary_op(struct vkd3d_bytecode_buffer *buffer, enum vkd3d_sm4_opcode opcode, + const struct hlsl_ir_node *dst, const struct hlsl_ir_node *src1, const struct hlsl_ir_node *src2) +{ + struct sm4_instruction instr; + unsigned int writemask; + + memset(&instr, 0, sizeof(instr)); + instr.opcode = opcode; + + sm4_register_from_node(&instr.dst.reg, &instr.dst.writemask, dst); + instr.has_dst = 1; + + sm4_register_from_node(&instr.srcs[0].reg, &writemask, src1); + instr.srcs[0].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), instr.dst.writemask); + sm4_register_from_node(&instr.srcs[1].reg, &writemask, src2); + instr.srcs[1].swizzle = hlsl_map_swizzle(hlsl_swizzle_from_writemask(writemask), instr.dst.writemask); + instr.src_count = 2; + + write_sm4_instruction(buffer, &instr); +} + static void write_sm4_constant(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_constant *constant) { @@ -918,6 +939,43 @@ static void write_sm4_constant(struct hlsl_ctx *ctx, write_sm4_instruction(buffer, &instr); } +static void write_sm4_expr(struct hlsl_ctx *ctx, + struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_expr *expr) +{ + const struct hlsl_ir_node *arg1 = expr->operands[0].node; + const struct hlsl_ir_node *arg2 = expr->operands[1].node; + + assert(expr->node.reg.allocated); + + switch (expr->node.data_type->base_type) + { + case HLSL_TYPE_FLOAT: + { + switch (expr->op) + { + case HLSL_OP2_ADD: + write_sm4_binary_op(buffer, VKD3D_SM4_OP_ADD, &expr->node, arg1, arg2); + break; + + default: + hlsl_fixme(ctx, expr->node.loc, "SM4 float \"%s\" expression.", debug_hlsl_expr_op(expr->op)); + break; + } + break; + } + + default: + { + struct vkd3d_string_buffer *string; + + if ((string = hlsl_type_to_string(ctx, expr->node.data_type))) + hlsl_fixme(ctx, expr->node.loc, "SM4 %s expression.", string->buffer); + hlsl_release_string_buffer(ctx, string); + break; + } + } +} + static void write_sm4_load(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_load *load) { @@ -1044,6 +1102,10 @@ static void write_sm4_shdr(struct hlsl_ctx *ctx, write_sm4_constant(ctx, &buffer, hlsl_ir_constant(instr)); break; + case HLSL_IR_EXPR: + write_sm4_expr(ctx, &buffer, hlsl_ir_expr(instr)); + break; + case HLSL_IR_LOAD: write_sm4_load(ctx, &buffer, hlsl_ir_load(instr)); break;

1 0

Matteo Bruni : include: Print failed allocation size.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: vkd3d Branch: master Commit: 54bef05070a6d4f229746934fd46abcfbef02399 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=54bef05070a6d4f22974693… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Aug 26 18:05:20 2021 +0200 include: Print failed allocation size. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/private/vkd3d_memory.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/private/vkd3d_memory.h b/include/private/vkd3d_memory.h index f6846d6..8a2edb1 100644 --- a/include/private/vkd3d_memory.h +++ b/include/private/vkd3d_memory.h @@ -37,7 +37,7 @@ static inline void *vkd3d_malloc(size_t size) static inline void *vkd3d_realloc(void *ptr, size_t size) { if (!(ptr = realloc(ptr, size))) - ERR("Out of memory.\n"); + ERR("Out of memory, size %zu.\n", size); return ptr; }

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Move the base type equality case in expr_common_base_type.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: vkd3d Branch: master Commit: 5a55e8e8d549e97c5947511c2849db5c08c1a5f1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5a55e8e8d549e97c5947511… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Aug 27 12:05:11 2021 +0200 vkd3d-shader/hlsl: Move the base type equality case in expr_common_base_type. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index cb4fd7c..4c3c067 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -916,6 +916,9 @@ static enum hlsl_base_type expr_common_base_type(enum hlsl_base_type t1, enum hl }; int t1_idx = -1, t2_idx = -1, i; + if (t1 == t2) + return t1; + for (i = 0; i < ARRAY_SIZE(types); ++i) { /* Always convert away from HLSL_TYPE_HALF */ @@ -981,10 +984,7 @@ static struct hlsl_type *expr_common_type(struct hlsl_ctx *ctx, struct hlsl_type return NULL; } - if (t1->base_type == t2->base_type) - base = t1->base_type; - else - base = expr_common_base_type(t1->base_type, t2->base_type); + base = expr_common_base_type(t1->base_type, t2->base_type); if (t1->dimx == 1 && t1->dimy == 1) {

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Return int as common type between bool and bool.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: vkd3d Branch: master Commit: 176b12f9e4d8c209d10701a19085c1169bca0e60 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=176b12f9e4d8c209d10701a… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Aug 27 12:05:12 2021 +0200 vkd3d-shader/hlsl: Return int as common type between bool and bool. So does the native d3dcompiler, following the spirit of integer promotion in C. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 4c3c067..69c42b6 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -917,7 +917,7 @@ static enum hlsl_base_type expr_common_base_type(enum hlsl_base_type t1, enum hl int t1_idx = -1, t2_idx = -1, i; if (t1 == t2) - return t1; + return t1 == HLSL_TYPE_BOOL ? HLSL_TYPE_INT : t1; for (i = 0; i < ARRAY_SIZE(types); ++i) {

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Simplify expr_common_base_type.
by Alexandre Julliard 27 Aug '21

27 Aug '21

Module: vkd3d Branch: master Commit: b5251b33502c74621f607ca283b848f3c1a8c115 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b5251b33502c74621f607ca… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Aug 27 12:05:13 2021 +0200 vkd3d-shader/hlsl: Simplify expr_common_base_type. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl.y | 39 +++++++++++---------------------------- 1 file changed, 11 insertions(+), 28 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 69c42b6..7906356 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -905,37 +905,20 @@ static bool expr_compatible_data_types(struct hlsl_type *t1, struct hlsl_type *t static enum hlsl_base_type expr_common_base_type(enum hlsl_base_type t1, enum hlsl_base_type t2) { - static const enum hlsl_base_type types[] = - { - HLSL_TYPE_BOOL, - HLSL_TYPE_INT, - HLSL_TYPE_UINT, - HLSL_TYPE_HALF, - HLSL_TYPE_FLOAT, - HLSL_TYPE_DOUBLE, - }; - int t1_idx = -1, t2_idx = -1, i; - - if (t1 == t2) - return t1 == HLSL_TYPE_BOOL ? HLSL_TYPE_INT : t1; - - for (i = 0; i < ARRAY_SIZE(types); ++i) - { - /* Always convert away from HLSL_TYPE_HALF */ - if (t1 == types[i]) - t1_idx = t1 == HLSL_TYPE_HALF ? i + 1 : i; - if (t2 == types[i]) - t2_idx = t2 == HLSL_TYPE_HALF ? i + 1 : i; - - if (t1_idx != -1 && t2_idx != -1) - break; - } - if (t1_idx == -1 || t2_idx == -1) - { + if (t1 > HLSL_TYPE_LAST_SCALAR || t2 > HLSL_TYPE_LAST_SCALAR) { FIXME("Unexpected base type.\n"); return HLSL_TYPE_FLOAT; } - return t1_idx >= t2_idx ? t1 : t2; + if (t1 == t2) + return t1 == HLSL_TYPE_BOOL ? HLSL_TYPE_INT : t1; + if (t1 == HLSL_TYPE_DOUBLE || t2 == HLSL_TYPE_DOUBLE) + return HLSL_TYPE_DOUBLE; + if (t1 == HLSL_TYPE_FLOAT || t2 == HLSL_TYPE_FLOAT + || t1 == HLSL_TYPE_HALF || t2 == HLSL_TYPE_HALF) + return HLSL_TYPE_FLOAT; + if (t1 == HLSL_TYPE_UINT || t2 == HLSL_TYPE_UINT) + return HLSL_TYPE_UINT; + return HLSL_TYPE_INT; } static struct hlsl_type *expr_common_type(struct hlsl_ctx *ctx, struct hlsl_type *t1, struct hlsl_type *t2,

1 0

Francois Gouget : wined3d: Fix the spelling of a comment.
by Alexandre Julliard 26 Aug '21

26 Aug '21

Module: wine Branch: master Commit: 135633bc2001e972a86a2b1708857df1eeaada55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=135633bc2001e972a86a2b17… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 26 14:50:14 2021 +0200 wined3d: Fix the spelling of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index c84fcba7d7d..24892e42b34 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -1682,9 +1682,9 @@ static BOOL wined3d_query_vk_issue(struct wined3d_query *query, uint32_t flags) return false; } - /* A query need to either begin and end inside a single render pass, - * or begin and end ouside of a render pass. Occlusion queries, if issued - * ouside of a render pass, are queued up and only begun when a render + /* A query needs to either begin and end inside a single render pass, + * or begin and end outside of a render pass. Occlusion queries, if issued + * outside of a render pass, are queued up and only begun when a render * pass is started, to avoid interrupting it when the query ends. */ if (context_vk->vk_render_pass) {

1 0

Francois Gouget : ntoskrnl.exe: Fix the spelling of some comments.
by Alexandre Julliard 26 Aug '21

26 Aug '21

Module: wine Branch: master Commit: 87a42df9f704e7d25eaaf2ec741531e26defdb99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87a42df9f704e7d25eaaf2ec… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 26 16:43:19 2021 +0200 ntoskrnl.exe: Fix the spelling of some comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index f11dce1cc93..9886be69ccb 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1355,7 +1355,7 @@ static void test_pnp_devices(void) ok(!ret, "failed to open child: %#x\n", ret); ret = DeviceIoControl(child, IOCTL_WINETEST_MARK_PENDING, NULL, 0, NULL, 0, &size, &ovl); - ok(!ret, "DeviceIoControl succeded\n"); + ok(!ret, "DeviceIoControl succeeded\n"); ok(GetLastError() == ERROR_IO_PENDING, "got error %u\n", GetLastError()); ok(size == 0, "got size %u\n", size); @@ -2693,12 +2693,12 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled SetLastError(0xdeadbeef); ret = ReadFile(async_file, report, caps.InputReportByteLength, NULL, &overlapped); - ok(!ret, "ReadFile succeded\n"); + ok(!ret, "ReadFile succeeded\n"); ok(GetLastError() == ERROR_IO_PENDING, "ReadFile returned error %u\n", GetLastError()); SetLastError(0xdeadbeef); ret = ReadFile(async_file, buffer, caps.InputReportByteLength, NULL, &overlapped2); - ok(!ret, "ReadFile succeded\n"); + ok(!ret, "ReadFile succeeded\n"); ok(GetLastError() == ERROR_IO_PENDING, "ReadFile returned error %u\n", GetLastError()); /* wait for second report to be ready */

1 0

Francois Gouget : wldap32: Make the wrap_*() functions static.
by Alexandre Julliard 26 Aug '21

26 Aug '21

Module: wine Branch: master Commit: efdd07ae3df873450dc3786ac3ff164a8a86b421 URL: https://source.winehq.org/git/wine.git/?a=commit;h=efdd07ae3df873450dc3786a… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 26 14:51:18 2021 +0200 wldap32: Make the wrap_*() functions static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/libldap.c | 126 ++++++++++++++++++++++++------------------------- dlls/wldap32/libldap.h | 82 -------------------------------- 2 files changed, 63 insertions(+), 145 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=efdd07ae3df873450dc3…

1 0

Francois Gouget : winedbg: dbg_get_debuggee_info() is not used anymore. Remove it.
by Alexandre Julliard 26 Aug '21

26 Aug '21

Module: wine Branch: master Commit: 7d82abd2befecfcc6fc1a3be85aa48ee548083ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d82abd2befecfcc6fc1a3be… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 26 14:51:30 2021 +0200 winedbg: dbg_get_debuggee_info() is not used anymore. Remove it. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/debugger.h | 1 - programs/winedbg/winedbg.c | 39 --------------------------------------- 2 files changed, 40 deletions(-) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 3733e1b410f..e7a4901a769 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -464,7 +464,6 @@ extern struct dbg_thread* dbg_get_thread(struct dbg_process* p, DWORD tid); extern void dbg_del_thread(struct dbg_thread* t); extern BOOL dbg_init(HANDLE hProc, const WCHAR* in, BOOL invade); extern BOOL dbg_load_module(HANDLE hProc, HANDLE hFile, const WCHAR* name, DWORD_PTR base, DWORD size); -extern BOOL dbg_get_debuggee_info(HANDLE hProcess, IMAGEHLP_MODULE64* imh_mod); extern void dbg_set_option(const char*, const char*); extern void dbg_start_interactive(HANDLE hFile); extern void dbg_init_console(void); diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 5e433bbb699..6b363168cd7 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -411,45 +411,6 @@ BOOL dbg_init(HANDLE hProc, const WCHAR* in, BOOL invade) return ret; } -struct mod_loader_info -{ - HANDLE handle; - IMAGEHLP_MODULE64* imh_mod; -}; - -static BOOL CALLBACK mod_loader_cb(PCSTR mod_name, DWORD64 base, PVOID ctx) -{ - struct mod_loader_info* mli = ctx; - - if (!strcmp(mod_name, "<wine-loader>")) - { - if (SymGetModuleInfo64(mli->handle, base, mli->imh_mod)) - return FALSE; /* stop enum */ - } - return TRUE; -} - -BOOL dbg_get_debuggee_info(HANDLE hProcess, IMAGEHLP_MODULE64* imh_mod) -{ - struct mod_loader_info mli; - BOOL opt; - - /* this will resynchronize builtin dbghelp's internal ELF module list */ - SymLoadModule(hProcess, 0, 0, 0, 0, 0); - mli.handle = hProcess; - mli.imh_mod = imh_mod; - imh_mod->SizeOfStruct = sizeof(*imh_mod); - imh_mod->BaseOfImage = 0; - /* this is a wine specific options to return also ELF modules in the - * enumeration - */ - opt = SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, TRUE); - SymEnumerateModules64(hProcess, mod_loader_cb, &mli); - SymSetExtendedOption(SYMOPT_EX_WINE_NATIVE_MODULES, opt); - - return imh_mod->BaseOfImage != 0; -} - BOOL dbg_load_module(HANDLE hProc, HANDLE hFile, const WCHAR* name, DWORD_PTR base, DWORD size) { BOOL ret = SymLoadModuleExW(hProc, NULL, name, NULL, base, size, NULL, 0);

1 0

Francois Gouget : kernel32/tests: Test GetTimeFormatA()'s Unicode to ANSI conversion.
by Alexandre Julliard 26 Aug '21

26 Aug '21

Module: wine Branch: master Commit: 10db4147dd416cfef8acc0043f8be7f2b6b3a17d URL: https://source.winehq.org/git/wine.git/?a=commit;h=10db4147dd416cfef8acc004… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Aug 26 18:26:26 2021 +0200 kernel32/tests: Test GetTimeFormatA()'s Unicode to ANSI conversion. The ANSI string may be longer than the Unicode one and the return value should reflect that. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index b83cdc6b956..45bf56d8ad7 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -631,6 +631,34 @@ static void test_GetTimeFormatA(void) curtime.wMonth = 60; ret = GetTimeFormatA(lcid, 0, &curtime, "h:m:s", buffer, ARRAY_SIZE(buffer)); expect_str(ret, buffer, "12:56:13"); + + /* The ANSI string may be longer than the Unicode one. + * In particular, in the Japanese code page, "\x93\xfa" = L"\x65e5". + */ + + lcid = MAKELCID(MAKELANGID(LANG_JAPANESE, SUBLANG_JAPANESE_JAPAN), SORT_DEFAULT); + + ret = GetTimeFormatA(lcid, 0, &curtime, "h\x93\xfa", buffer, 5); + if (broken(1)) /* FIXME Remove once Wine is less broken */ + expect_str(ret, buffer, "12\x93\xfa"); /* only 3+1 WCHARs */ + todo_wine ok(ret == strlen("12\x93\xfa") + 1, "Expected ret %d, got %d\n", strlen("12\x93\xfa") + 1, ret); + ok(strcmp(buffer, "12\x93\xfa") == 0, "Expected '12\x93\xfa', got '%s'\n", buffer); + + ret = GetTimeFormatA(lcid, 0, &curtime, "h\x93\xfa", buffer, 4); + todo_wine expect_err(ret, NULL, ERROR_INSUFFICIENT_BUFFER); + SetLastError(0xdeadbeef); + + ret = GetTimeFormatA(lcid, 0, &curtime, "h\x93\xfa", NULL, 0); + if (broken(1)) /* FIXME Remove once Wine is less broken */ + expect_str(ret, NULL, "12\x93\xfa"); + todo_wine ok(ret == strlen("12\x93\xfa") + 1, "Expected ret %d, got %d\n", strlen("12\x93\xfa") + 1, ret); + + strcpy(buffer, "pristine"); /* clear previous identical result */ + ret = GetTimeFormatA(lcid, 0, &curtime, "h\x93\xfa", buffer, 0); + if (broken(1)) /* FIXME Remove once Wine is less broken */ + expect_str(ret, NULL, "12\x93\xfa"); + todo_wine ok(ret == strlen("12\x93\xfa") + 1, "Expected ret %d, got %d\n", strlen("12\x93\xfa") + 1, ret); + ok(strcmp(buffer, "pristine") == 0, "Expected a pristine buffer, got '%s'\n", buffer); } static void test_GetTimeFormatEx(void)

1 0