May 2022 - Wine-commits - list.winehq.org

Huw Davies : gdi32: Remove second initialization of emf->dc_attr.
by Alexandre Julliard 24 May '22

24 May '22

Module: wine Branch: master Commit: 0c8a076e78c033768cbb259f3220a3a64b4ed686 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c8a076e78c033768cbb259f… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 24 12:23:15 2022 +0100 gdi32: Remove second initialization of emf->dc_attr. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/emfdc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index eec700de327..d215162d8d0 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -2426,7 +2426,6 @@ HDC WINAPI CreateEnhMetaFileW( HDC hdc, const WCHAR *filename, const RECT *rect, DeleteDC( ret ); return 0; } - emf->dc_attr = dc_attr; emf->handles = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, HANDLE_LIST_INC * sizeof(emf->handles[0]) );

1 0

Huw Davies : gdi32: Free the client-side emf dc info.
by Alexandre Julliard 24 May '22

24 May '22

Module: wine Branch: master Commit: 6a9a80679d7b0cfe2b83727caf48809ba2280ea1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a9a80679d7b0cfe2b83727c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 24 12:25:08 2022 +0100 gdi32: Free the client-side emf dc info. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/emfdc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/gdi32/emfdc.c b/dlls/gdi32/emfdc.c index d215162d8d0..56327abff8a 100644 --- a/dlls/gdi32/emfdc.c +++ b/dlls/gdi32/emfdc.c @@ -2321,6 +2321,8 @@ void EMFDC_DeleteDC( DC_ATTR *dc_attr ) if (emf->handles[index]) GDI_hdc_not_using_object( emf->handles[index], emf->dc_attr->hdc ); HeapFree( GetProcessHeap(), 0, emf->handles ); + HeapFree( GetProcessHeap(), 0, emf ); + dc_attr->emf = NULL; } /*******************************************************************

1 0

Matteo Bruni : wined3d: Don't touch GL sRGB decode state when not supported.
by Alexandre Julliard 24 May '22

24 May '22

Module: wine Branch: master Commit: 6c820bbcf07c8efd558abfafbb294f90b595e405 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c820bbcf07c8efd558abfaf… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Sun Apr 3 17:30:00 2022 +0200 wined3d: Don't touch GL sRGB decode state when not supported. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/view.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index dbd385219f0..c502fcba992 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1306,7 +1306,8 @@ void wined3d_shader_resource_view_gl_generate_mipmap(struct wined3d_shader_resou if (gl_info->supported[ARB_SAMPLER_OBJECTS]) GL_EXTCALL(glBindSampler(context_gl->active_texture, 0)); gl_tex = wined3d_texture_gl_get_gl_texture(texture_gl, srgb); - if (context_gl->c.d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL) + if (context_gl->c.d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL + && gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) { gl_info->gl_ops.gl.p_glTexParameteri(texture_gl->target, GL_TEXTURE_SRGB_DECODE_EXT, GL_SKIP_DECODE_EXT);

1 0

Matteo Bruni : d3d9/tests: Fix typo.
by Alexandre Julliard 24 May '22

24 May '22

Module: wine Branch: master Commit: 89011e6f0a3ef888d6faaa4ad2ae0cebb714cc4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=89011e6f0a3ef888d6faaa4a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Sun Apr 3 17:31:15 2022 +0200 d3d9/tests: Fix typo. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f20f1ecb369..2913583916a 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1193,7 +1193,7 @@ static void clear_test(void) ok(color == 0x0000ff00, "(322,242) has color %08x\n", color); color = getPixelColor(device, 478, 358); - ok(color == 0x0000ff00, "(478,358 has color %08x\n", color); + ok(color == 0x0000ff00, "(478,358) has color %08x\n", color); color = getPixelColor(device, 482, 358); ok(color == 0x00ffffff, "(482,358) has color %08x\n", color); color = getPixelColor(device, 478, 362);

1 0

Matteo Bruni : wined3d: Allow blits with fixups in the FFP blitter without a shader backend.
by Alexandre Julliard 24 May '22

24 May '22

Module: wine Branch: master Commit: 6247bee483b31b1ea0ad49f85f1cffde7433fed2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6247bee483b31b1ea0ad49f8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue May 17 19:54:09 2022 +0200 wined3d: Allow blits with fixups in the FFP blitter without a shader backend. Along the lines of d37146885801ae384a1cae54edea426b7b58a6a9 but for the no shader backend case. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/texture.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 595baf07788..c952f366a68 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -5753,10 +5753,13 @@ static bool ffp_blit_supported(enum wined3d_blit_op blit_op, const struct wined3 if (!is_identity_fixup(src_format->color_fixup) || !is_identity_fixup(dst_format->color_fixup)) { - if (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER - && dst_format->id == src_format->id && dst_location == WINED3D_LOCATION_DRAWABLE) + if (dst_format->id == src_format->id && dst_location == WINED3D_LOCATION_DRAWABLE) { - WARN("Claiming fixup support because of ORM_BACKBUFFER.\n"); + if (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) + WARN("Claiming fixup support because of ORM_BACKBUFFER.\n"); + else if (context->device->shader_backend == &none_shader_backend) + WARN("Claiming fixup support because of no shader backend.\n"); + return true; } else {

1 0

Matteo Bruni : wined3d: Assert that the CS queue size is a power of two.
by Alexandre Julliard 24 May '22

24 May '22

Module: wine Branch: master Commit: 192695d1db4ceefff8c91e2743f9bb36353e940e URL: https://source.winehq.org/git/wine.git/?a=commit;h=192695d1db4ceefff8c91e27… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 6 13:00:58 2022 +0200 wined3d: Assert that the CS queue size is a power of two. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/wined3d_private.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 00d2cfea8e4..4d208260fbf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4976,6 +4976,8 @@ enum wined3d_push_constants #define WINED3D_CS_SPIN_COUNT 10000000u #define WINED3D_CS_QUEUE_MASK (WINED3D_CS_QUEUE_SIZE - 1) +C_ASSERT(!(WINED3D_CS_QUEUE_SIZE & (WINED3D_CS_QUEUE_SIZE - 1))); + struct wined3d_cs_queue { ULONG head, tail;

1 0

Matteo Bruni : wined3d: Add some state table consistency checking to context_invalidate_state().
by Alexandre Julliard 24 May '22

24 May '22

Module: wine Branch: master Commit: 80eef0039b0e5bdb11a9343312325d1745bfcc60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80eef0039b0e5bdb11a93433… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Sun Apr 3 17:31:43 2022 +0200 wined3d: Add some state table consistency checking to context_invalidate_state(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/wined3d/context.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 8c4277bc7ca..f9af58936a6 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -78,6 +78,9 @@ void context_invalidate_state(struct wined3d_context *context, unsigned int stat unsigned int representative = context->state_table[state_id].representative; unsigned int index, shift; + if (!representative) + ERR("Invalidating representative 0, state_id %u.\n", state_id); + index = representative / (sizeof(*context->dirty_graphics_states) * CHAR_BIT); shift = representative & ((sizeof(*context->dirty_graphics_states) * CHAR_BIT) - 1); context->dirty_graphics_states[index] |= (1u << shift);

1 0

Alexandre Julliard : kernelbase: Don't ignore the specified locale in LCMapStringA/W.
by Alexandre Julliard 24 May '22

24 May '22

Module: wine Branch: master Commit: 2dced17876976ab55730948a27254a23f0c76eba URL: https://source.winehq.org/git/wine.git/?a=commit;h=2dced17876976ab55730948a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 24 18:20:44 2022 +0200 kernelbase: Don't ignore the specified locale in LCMapStringA/W. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 36 ++++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 1648e3fb2e5..692bba4316e 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -5945,7 +5945,7 @@ INT WINAPI DECLSPEC_HOTPATCH LCMapStringA( LCID lcid, DWORD flags, const char *s SetLastError( ERROR_INVALID_FLAGS ); goto done; } - ret = LCMapStringEx( NULL, flags, srcW, srclenW, (WCHAR *)dst, dstlen, NULL, NULL, 0 ); + ret = LCMapStringW( lcid, flags, srcW, srclenW, (WCHAR *)dst, dstlen ); goto done; } @@ -5955,7 +5955,7 @@ INT WINAPI DECLSPEC_HOTPATCH LCMapStringA( LCID lcid, DWORD flags, const char *s goto done; } - dstlenW = LCMapStringEx( NULL, flags, srcW, srclenW, NULL, 0, NULL, NULL, 0 ); + dstlenW = LCMapStringW( lcid, flags, srcW, srclenW, NULL, 0 ); if (!dstlenW) goto done; dstW = HeapAlloc( GetProcessHeap(), 0, dstlenW * sizeof(WCHAR) ); @@ -5964,7 +5964,7 @@ INT WINAPI DECLSPEC_HOTPATCH LCMapStringA( LCID lcid, DWORD flags, const char *s SetLastError( ERROR_NOT_ENOUGH_MEMORY ); goto done; } - LCMapStringEx( NULL, flags, srcW, srclenW, dstW, dstlenW, NULL, NULL, 0 ); + LCMapStringW( lcid, flags, srcW, srclenW, dstW, dstlenW ); ret = WideCharToMultiByte( locale_cp, 0, dstW, dstlenW, dst, dstlen, NULL, NULL ); HeapFree( GetProcessHeap(), 0, dstW ); @@ -5980,7 +5980,35 @@ done: INT WINAPI DECLSPEC_HOTPATCH LCMapStringW( LCID lcid, DWORD flags, const WCHAR *src, int srclen, WCHAR *dst, int dstlen ) { - return LCMapStringEx( NULL, flags, src, srclen, dst, dstlen, NULL, NULL, 0 ); + const WCHAR *locale = LOCALE_NAME_USER_DEFAULT; + + if (flags & (LCMAP_LINGUISTIC_CASING | LCMAP_SORTKEY)) + { + const NLS_LOCALE_LCID_INDEX *entry; + + switch (lcid) + { + case LOCALE_NEUTRAL: + case LOCALE_USER_DEFAULT: + case LOCALE_SYSTEM_DEFAULT: + case LOCALE_CUSTOM_DEFAULT: + case LOCALE_CUSTOM_UNSPECIFIED: + case LOCALE_CUSTOM_UI_DEFAULT: + break; + default: + if (lcid == user_lcid || lcid == system_lcid) break; + if (!(entry = find_lcid_entry( lcid ))) + { + WARN( "unknown locale %04lx\n", lcid ); + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + locale = locale_strings + entry->name + 1; + break; + } + } + + return LCMapStringEx( locale, flags, src, srclen, dst, dstlen, NULL, NULL, 0 ); }

1 0

Alexandre Julliard : kernelbase: Don't ignore the specified locale in CompareStringW.
by Alexandre Julliard 24 May '22

24 May '22

Module: wine Branch: master Commit: a980fa0d786fe9a156b3b76f42e43c069ddde505 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a980fa0d786fe9a156b3b76f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 24 18:21:08 2022 +0200 kernelbase: Don't ignore the specified locale in CompareStringW. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/locale.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 692bba4316e..47d49a17cbe 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -4033,7 +4033,31 @@ INT WINAPI DECLSPEC_HOTPATCH CompareStringA( LCID lcid, DWORD flags, const char INT WINAPI DECLSPEC_HOTPATCH CompareStringW( LCID lcid, DWORD flags, const WCHAR *str1, int len1, const WCHAR *str2, int len2 ) { - return CompareStringEx( NULL, flags, str1, len1, str2, len2, NULL, NULL, 0 ); + const WCHAR *locale = LOCALE_NAME_USER_DEFAULT; + const NLS_LOCALE_LCID_INDEX *entry; + + switch (lcid) + { + case LOCALE_NEUTRAL: + case LOCALE_USER_DEFAULT: + case LOCALE_SYSTEM_DEFAULT: + case LOCALE_CUSTOM_DEFAULT: + case LOCALE_CUSTOM_UNSPECIFIED: + case LOCALE_CUSTOM_UI_DEFAULT: + break; + default: + if (lcid == user_lcid || lcid == system_lcid) break; + if (!(entry = find_lcid_entry( lcid ))) + { + WARN( "unknown locale %04lx\n", lcid ); + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } + locale = locale_strings + entry->name + 1; + break; + } + + return CompareStringEx( locale, flags, str1, len1, str2, len2, NULL, NULL, 0 ); }

1 0

Alexandre Julliard : kernel32/tests: Pass a locale instead of a codepage to CompareStringA/W.
by Alexandre Julliard 24 May '22

24 May '22

Module: wine Branch: master Commit: aad201c731068415ce9db0f098ea2e82d05eb493 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aad201c731068415ce9db0f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 24 18:21:19 2022 +0200 kernel32/tests: Pass a locale instead of a codepage to CompareStringA/W. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 48 ++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 45d5888b432..f6bb6e942f8 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1919,15 +1919,15 @@ static void test_CompareStringA(void) ok (GetLastError() == 0xdeadbeef && ret == CSTR_EQUAL, "ret %d, error %ld, expected value %d\n", ret, GetLastError(), CSTR_EQUAL); - ret = CompareStringA(CP_ACP, 0, ABC_EE, 3, ABC_FF, 3); + ret = CompareStringA(LOCALE_USER_DEFAULT, 0, ABC_EE, 3, ABC_FF, 3); ok(ret == CSTR_EQUAL, "expected CSTR_EQUAL, got %d\n", ret); - ret = CompareStringA(CP_ACP, 0, ABC_EE, 5, ABC_FF, 3); + ret = CompareStringA(LOCALE_USER_DEFAULT, 0, ABC_EE, 5, ABC_FF, 3); ok(ret == CSTR_GREATER_THAN, "expected CSTR_GREATER_THAN, got %d\n", ret); - ret = CompareStringA(CP_ACP, 0, ABC_EE, 3, ABC_FF, 5); + ret = CompareStringA(LOCALE_USER_DEFAULT, 0, ABC_EE, 3, ABC_FF, 5); ok(ret == CSTR_LESS_THAN, "expected CSTR_LESS_THAN, got %d\n", ret); - ret = CompareStringA(CP_ACP, 0, ABC_EE, 5, ABC_FF, 5); + ret = CompareStringA(LOCALE_USER_DEFAULT, 0, ABC_EE, 5, ABC_FF, 5); ok(ret == CSTR_LESS_THAN, "expected CSTR_LESS_THAN, got %d\n", ret); - ret = CompareStringA(CP_ACP, 0, ABC_FF, 5, ABC_EE, 5); + ret = CompareStringA(LOCALE_USER_DEFAULT, 0, ABC_FF, 5, ABC_EE, 5); ok(ret == CSTR_GREATER_THAN, "expected CSTR_GREATER_THAN, got %d\n", ret); } @@ -1959,55 +1959,55 @@ static void test_CompareStringW(void) *str2 = 'B'; /* CompareStringW should abort on the first non-matching character */ - ret = CompareStringW(CP_ACP, 0, str1, 100, str2, 100); + ret = CompareStringW(LOCALE_USER_DEFAULT, 0, str1, 100, str2, 100); ok(ret == CSTR_LESS_THAN, "expected CSTR_LESS_THAN, got %d\n", ret); success = VirtualFree(buf, 0, MEM_RELEASE); ok(success, "VirtualFree failed with %lu\n", GetLastError()); SetLastError(0xdeadbeef); - ret = CompareStringW(CP_ACP, SORT_DIGITSASNUMBERS, L"NULL", -1, L"NULL", -1); + ret = CompareStringW(LOCALE_USER_DEFAULT, SORT_DIGITSASNUMBERS, L"NULL", -1, L"NULL", -1); ok(ret == CSTR_EQUAL || broken(!ret && GetLastError() == ERROR_INVALID_FLAGS) /* <Win7 */, "expected CSTR_EQUAL, got %d, last error %ld\n", ret, GetLastError()); - ret = CompareStringW(CP_ACP, 0, ABC_EE, 3, ABC_FF, 3); + ret = CompareStringW(LOCALE_USER_DEFAULT, 0, ABC_EE, 3, ABC_FF, 3); ok(ret == CSTR_EQUAL, "expected CSTR_EQUAL, got %d\n", ret); - ret = CompareStringW(CP_ACP, 0, ABC_EE, 5, ABC_FF, 3); + ret = CompareStringW(LOCALE_USER_DEFAULT, 0, ABC_EE, 5, ABC_FF, 3); ok(ret == CSTR_GREATER_THAN, "expected CSTR_GREATER_THAN, got %d\n", ret); - ret = CompareStringW(CP_ACP, 0, ABC_EE, 3, ABC_FF, 5); + ret = CompareStringW(LOCALE_USER_DEFAULT, 0, ABC_EE, 3, ABC_FF, 5); ok(ret == CSTR_LESS_THAN, "expected CSTR_LESS_THAN, got %d\n", ret); - ret = CompareStringW(CP_ACP, 0, ABC_EE, 5, ABC_FF, 5); + ret = CompareStringW(LOCALE_USER_DEFAULT, 0, ABC_EE, 5, ABC_FF, 5); ok(ret == CSTR_LESS_THAN, "expected CSTR_LESS_THAN, got %d\n", ret); - ret = CompareStringW(CP_ACP, 0, ABC_FF, 5, ABC_EE, 5); + ret = CompareStringW(LOCALE_USER_DEFAULT, 0, ABC_FF, 5, ABC_EE, 5); ok(ret == CSTR_GREATER_THAN, "expected CSTR_GREATER_THAN, got %d\n", ret); - ret = CompareStringW(CP_ACP, 0, ABC_EE, 4, A_ACUTE_BC, 4); + ret = CompareStringW(LOCALE_USER_DEFAULT, 0, ABC_EE, 4, A_ACUTE_BC, 4); ok(ret == CSTR_LESS_THAN, "expected CSTR_LESS_THAN, got %d\n", ret); - ret = CompareStringW(CP_ACP, 0, ABC_EE, 4, A_ACUTE_BC_DECOMP, 5); + ret = CompareStringW(LOCALE_USER_DEFAULT, 0, ABC_EE, 4, A_ACUTE_BC_DECOMP, 5); ok(ret == CSTR_LESS_THAN, "expected CSTR_LESS_THAN, got %d\n", ret); - ret = CompareStringW(CP_ACP, 0, A_ACUTE_BC, 4, A_ACUTE_BC_DECOMP, 5); + ret = CompareStringW(LOCALE_USER_DEFAULT, 0, A_ACUTE_BC, 4, A_ACUTE_BC_DECOMP, 5); ok(ret == CSTR_EQUAL, "expected CSTR_EQUAL, got %d\n", ret); - ret = CompareStringW(CP_ACP, NORM_IGNORENONSPACE, ABC_EE, 3, A_ACUTE_BC, 4); + ret = CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORENONSPACE, ABC_EE, 3, A_ACUTE_BC, 4); todo_wine ok(ret == CSTR_EQUAL, "expected CSTR_EQUAL, got %d\n", ret); - ret = CompareStringW(CP_ACP, NORM_IGNORENONSPACE, ABC_EE, 4, A_ACUTE_BC_DECOMP, 5); + ret = CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORENONSPACE, ABC_EE, 4, A_ACUTE_BC_DECOMP, 5); todo_wine ok(ret == CSTR_EQUAL, "expected CSTR_EQUAL, got %d\n", ret); - ret = CompareStringW(CP_ACP, NORM_IGNORENONSPACE, A_ACUTE_BC, 4, A_ACUTE_BC_DECOMP, 5); + ret = CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORENONSPACE, A_ACUTE_BC, 4, A_ACUTE_BC_DECOMP, 5); ok(ret == CSTR_EQUAL, "expected CSTR_EQUAL, got %d\n", ret); - ret = CompareStringW(CP_ACP, 0, ABC_EE, 4, A_NULL_BC, 4); + ret = CompareStringW(LOCALE_USER_DEFAULT, 0, ABC_EE, 4, A_NULL_BC, 4); ok(ret == CSTR_EQUAL, "expected CSTR_LESS_THAN, got %d\n", ret); - ret = CompareStringW(CP_ACP, NORM_IGNORENONSPACE, ABC_EE, 4, A_NULL_BC, 4); + ret = CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORENONSPACE, ABC_EE, 4, A_NULL_BC, 4); ok(ret == CSTR_EQUAL, "expected CSTR_EQUAL, got %d\n", ret); - ret = CompareStringW(CP_ACP, 0, A_NULL_BC, 4, A_ACUTE_BC, 4); + ret = CompareStringW(LOCALE_USER_DEFAULT, 0, A_NULL_BC, 4, A_ACUTE_BC, 4); ok(ret == CSTR_LESS_THAN, "expected CSTR_LESS_THAN, got %d\n", ret); - ret = CompareStringW(CP_ACP, NORM_IGNORENONSPACE, A_NULL_BC, 4, A_ACUTE_BC, 4); + ret = CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORENONSPACE, A_NULL_BC, 4, A_ACUTE_BC, 4); todo_wine ok(ret == CSTR_EQUAL, "expected CSTR_EQUAL, got %d\n", ret); - ret = CompareStringW(CP_ACP, 0, A_NULL_BC, 4, A_ACUTE_BC_DECOMP, 5); + ret = CompareStringW(LOCALE_USER_DEFAULT, 0, A_NULL_BC, 4, A_ACUTE_BC_DECOMP, 5); ok(ret == CSTR_LESS_THAN, "expected CSTR_LESS_THAN, got %d\n", ret); - ret = CompareStringW(CP_ACP, NORM_IGNORENONSPACE, A_NULL_BC, 4, A_ACUTE_BC_DECOMP, 5); + ret = CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORENONSPACE, A_NULL_BC, 4, A_ACUTE_BC_DECOMP, 5); todo_wine ok(ret == CSTR_EQUAL, "expected CSTR_EQUAL, got %d\n", ret); }

1 0