[PATCH v2 1/2] kernel32/tests: Trace the mapped string when FoldStringW fails.

[Mathew Hodson]

Signed-off-by: Mathew Hodson <mathew.hodson(a)gmail.com>
---
 dlls/kernel32/tests/locale.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c
index e43eee2..9328666 100644
--- a/dlls/kernel32/tests/locale.c
+++ b/dlls/kernel32/tests/locale.c
@@ -3585,7 +3585,7 @@ static void test_FoldStringW(void)
   ok(ret == ARRAY_SIZE(foldczone_dst), "Got %d, error %d\n", ret, GetLastError());
   ok(!memcmp(dst, foldczone_dst, sizeof(foldczone_dst))
      || broken(!memcmp(dst, foldczone_broken_dst, sizeof(foldczone_broken_dst))),
-     "MAP_FOLDCZONE: Expanded incorrectly\n");
+     "Got unexpected string %s.\n", wine_dbgstr_w(dst));
 
   /* MAP_EXPAND_LIGATURES */
   SetLastError(0);
@@ -3594,7 +3594,7 @@ static void test_FoldStringW(void)
   if (!(ret == 0 && GetLastError() == ERROR_INVALID_FLAGS)) {
     ok(ret == ARRAY_SIZE(ligatures_dst), "Got %d, error %d\n", ret, GetLastError());
     ok(!memcmp(dst, ligatures_dst, sizeof(ligatures_dst)),
-       "MAP_EXPAND_LIGATURES: Expanded incorrectly\n");
+       "Got unexpected string %s.\n", wine_dbgstr_w(dst));
   }
 
   /* FIXME: MAP_PRECOMPOSED : MAP_COMPOSITE */
-- 
2.7.4

[PATCH v2 2/2] kernel32/tests: Add broken result for Windows XP and 2003.

[Mathew Hodson]

Signed-off-by: Mathew Hodson <mathew.hodson(a)gmail.com>
---
 dlls/kernel32/tests/locale.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c
index 9328666..c8cc904 100644
--- a/dlls/kernel32/tests/locale.c
+++ b/dlls/kernel32/tests/locale.c
@@ -3439,7 +3439,7 @@ static void test_FoldStringW(void)
   };
   static const WCHAR foldczone_broken_dst[] =
   {
-    'W','i','n','e',0x0348,0x0551,0x1323,0x280d,'W','i','n','e',0x3cb,0x1f0,0xa0,0xaa,0
+    'W','i','n','e',0x0348,0x0551,0x1323,0x280d,'W','i','n','e',0x03c5,0x0308,'j',0x030c,0x00a0,0x00aa,0
   };
   static const WCHAR ligatures_src[] =
   {
@@ -3582,9 +3582,11 @@ static void test_FoldStringW(void)
   /* MAP_FOLDCZONE */
   SetLastError(0);
   ret = pFoldStringW(MAP_FOLDCZONE, foldczone_src, -1, dst, 256);
-  ok(ret == ARRAY_SIZE(foldczone_dst), "Got %d, error %d\n", ret, GetLastError());
+  ok(ret == ARRAY_SIZE(foldczone_dst)
+     || broken(ret == ARRAY_SIZE(foldczone_broken_dst)), /* winxp, win2003 */
+     "Got %d, error %d.\n", ret, GetLastError());
   ok(!memcmp(dst, foldczone_dst, sizeof(foldczone_dst))
-     || broken(!memcmp(dst, foldczone_broken_dst, sizeof(foldczone_broken_dst))),
+     || broken(!memcmp(dst, foldczone_broken_dst, sizeof(foldczone_broken_dst))), /* winxp, win2003 */
      "Got unexpected string %s.\n", wine_dbgstr_w(dst));
 
   /* MAP_EXPAND_LIGATURES */
-- 
2.7.4

[PATCH v2 2/2] kernel32/tests: Add broken result for Windows XP and 2003.

[Mathew Hodson]

Here's what the docs say about the behaviour of FoldStringW:

https://docs.microsoft.com/en-us/windows/win32/api/stringapiset/nf-stringapi...
> Startng with Windows Vista: This function supports Unicode normalization.
> All Unicode compatibility characters are mapped.
>
> Startng with Windows Vista: The transformations indicated by the
> MAP_FOLDCZONE, MAP_PRECOMPOSED, and MAP_COMPOSITE flags use
> Unicode normalization forms KC, C, and D (through the NormalizeString
> function) to do the mappings.

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=61587

Your paranoid android.


=== wxppro (32 bit report) ===

kernel32:
locale.c:3586: Test failed: Got unexpected string L"Wine\0348\0551\1323\280dWine\03c5\0308j\030c\00a0\00aa".

=== w2003std (32 bit report) ===

kernel32:
locale.c:3586: Test failed: Got unexpected string L"Wine\0348\0551\1323\280dWine\03c5\0308j\030c\00a0\00aa".