[PATCH v3] kernel32/tests: Add tests for NormalizeString API function.

April 9, 2018

Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com>
---
 dlls/kernel32/tests/locale.c | 189 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 189 insertions(+)

diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c
index a99763db92..bac97c647b 100644
--- a/dlls/kernel32/tests/locale.c
+++ b/dlls/kernel32/tests/locale.c
@@ -106,6 +106,7 @@ static INT (WINAPI *pGetNumberFormatEx)(LPCWSTR, DWORD, LPCWSTR, const NUMBERFMT
 static INT (WINAPI *pFindNLSStringEx)(LPCWSTR, DWORD, LPCWSTR, INT, LPCWSTR, INT, LPINT, LPNLSVERSIONINFO, LPVOID, LPARAM);
 static LANGID (WINAPI *pSetThreadUILanguage)(LANGID);
 static LANGID (WINAPI *pGetThreadUILanguage)(VOID);
+static INT (WINAPI *pNormalizeString)(NORM_FORM, LPCWSTR, INT, LPWSTR, INT);
 
 static void InitFunctionPointers(void)
 {
@@ -141,6 +142,7 @@ static void InitFunctionPointers(void)
   X(FindNLSStringEx);
   X(SetThreadUILanguage);
   X(GetThreadUILanguage);
+  X(NormalizeString);
 
   mod = GetModuleHandleA("ntdll");
   X(RtlUpcaseUnicodeChar);
@@ -5470,6 +5472,192 @@ static void test_SetThreadUILanguage(void)
     "expected %d got %d\n", MAKELANGID(LANG_DUTCH, SUBLANG_DUTCH_BELGIAN), res);
 }
 
+static void test_NormalizeString(void)
+{
+    /* part 0: specific cases */
+    /* LATIN CAPITAL LETTER D WITH DOT ABOVE */
+    static const WCHAR part0_str1[] = {0x1e0a,0};
+    static const WCHAR part0_nfd1[] = {0x0044,0x0307,0};
+
+    /* LATIN CAPITAL LETTER D, COMBINING DOT BELOW, COMBINING DOT ABOVE */
+    static const WCHAR part0_str2[] = {0x0044,0x0323,0x0307,0};
+    static const WCHAR part0_nfc2[] = {0x1e0c,0x0307,0};
+
+    /* LATIN CAPITAL LETTER D, COMBINING HORN, COMBINING DOT BELOW, COMBINING DOT ABOVE */
+    static const WCHAR part0_str3[] = {0x0044,0x031b,0x0323,0x0307,0};
+    static const WCHAR part0_nfc3[] = {0x1e0c,0x031b,0x0307,0};
+
+    /* LATIN CAPITAL LETTER D, COMBINING HORN, COMBINING DOT BELOW, COMBINING DOT ABOVE */
+    static const WCHAR part0_str4[] = {0x0044,0x031b,0x0323,0x0307,0};
+    static const WCHAR part0_nfc4[] = {0x1e0c,0x031b,0x0307,0};
+
+    /*
+     * HEBREW ACCENT SEGOL, HEBREW POINT PATAH, HEBREW POINT DAGESH OR MAPIQ,
+     * HEBREW ACCENT MERKHA, HEBREW POINT SHEVA, HEBREW PUNCTUATION PASEQ,
+     * HEBREW MARK UPPER DOT, HEBREW ACCENT DEHI
+     */
+    static const WCHAR part0_str5[] = {0x0592,0x05B7,0x05BC,0x05A5,0x05B0,0x05C0,0x05C4,0x05AD,0};
+    static const WCHAR part0_nfc5[] = {0x05B0,0x05B7,0x05BC,0x05A5,0x0592,0x05C0,0x05AD,0x05C4,0};
+
+    /*
+     * HEBREW POINT QAMATS, HEBREW POINT HOLAM, HEBREW POINT HATAF SEGOL,
+     * HEBREW ACCENT ETNAHTA, HEBREW PUNCTUATION SOF PASUQ, HEBREW POINT SHEVA,
+     * HEBREW ACCENT ILUY, HEBREW ACCENT QARNEY PARA
+     */
+    static const WCHAR part0_str6[] = {0x05B8,0x05B9,0x05B1,0x0591,0x05C3,0x05B0,0x05AC,0x059F,0};
+    static const WCHAR part0_nfc6[] = {0x05B1,0x05B8,0x05B9,0x0591,0x05C3,0x05B0,0x05AC,0x059F,0};
+
+    /* LATIN CAPITAL LETTER D WITH DOT BELOW */
+    static const WCHAR part0_str8[] = {0x1E0C,0};
+    static const WCHAR part0_nfd8[] = {0x0044,0x0323,0};
+
+    /* LATIN CAPITAL LETTER D WITH DOT ABOVE, COMBINING DOT BELOW */
+    static const WCHAR part0_str9[] = {0x1E0A,0x0323,0};
+    static const WCHAR part0_nfc9[] = {0x1E0C,0x0307,0};
+    static const WCHAR part0_nfd9[] = {0x0044,0x0323,0x0307,0};
+
+    /* LATIN CAPITAL LETTER D WITH DOT BELOW, COMBINING DOT ABOVE */
+    static const WCHAR part0_str10[] = {0x1E0C,0x0307,0};
+    static const WCHAR part0_nfd10[] = {0x0044,0x0323,0x0307,0};
+
+    /* LATIN CAPITAL LETTER E WITH MACRON AND GRAVE, COMBINING MACRON */
+    static const WCHAR part0_str11[] = {0x1E14,0x0304,0};
+    static const WCHAR part0_nfd11[] = {0x0045,0x0304,0x0300,0x0304,0};
+
+    /* LATIN CAPITAL LETTER E WITH MACRON, COMBINING GRAVE ACCENT */
+    static const WCHAR part0_str12[] = {0x0112,0x0300,0};
+    static const WCHAR part0_nfc12[] = {0x1E14,0};
+    static const WCHAR part0_nfd12[] = {0x0045,0x0304,0x0300,0};
+
+    /* part 1: character by character */
+    /* DIAERESIS */
+    static const WCHAR part1_str1[] = {0x00a8,0};
+    static const WCHAR part1_nfkc1[] = {0x0020,0x0308,0};
+
+    /* VULGAR FRACTION ONE QUARTER */
+    static const WCHAR part1_str2[] = {0x00bc,0};
+    static const WCHAR part1_nfkc2[] = {0x0031,0x2044,0x0034,0};
+
+    /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX */
+    static const WCHAR part1_str3[] = {0x00ca,0};
+    static const WCHAR part1_nfd3[] = {0x0045,0x0302,0};
+
+    /* MODIFIER LETTER SMALL GAMMA */
+    static const WCHAR part1_str4[] = {0x02e0,0};
+    static const WCHAR part1_nfkc4[] = {0x0263,0};
+
+    /* CYRILLIC CAPITAL LETTER IE WITH GRAVE */
+    static const WCHAR part1_str5[] = {0x0400,0};
+    static const WCHAR part1_nfd5[] = {0x0415,0x0300,0};
+
+    /* CYRILLIC CAPITAL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT */
+    static const WCHAR part1_str6[] = {0x0476,0};
+    static const WCHAR part1_nfd6[] = {0x0474,0x030F,0};
+
+    /* ARABIC LIGATURE HAH WITH JEEM INITIAL FORM */
+    static const WCHAR part1_str7[] = {0xFCA9,0};
+    static const WCHAR part1_nfkc7[] = {0x062D,0x062C,0};
+
+    /* GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA */
+    static const WCHAR part1_str8[] = {0x1F42,0};
+    static const WCHAR part1_nfd8[] = {0x03BF,0x0313,0x0300,0};
+
+    /* QUADRUPLE PRIME */
+    static const WCHAR part1_str9[] = {0x2057,0};
+    static const WCHAR part1_nfkc9[] = {0x2032,0x2032,0x2032,0x2032,0};
+
+    /* KATAKANA-HIRAGANA VOICED SOUND MARK */
+    static const WCHAR part1_str10[] = {0x309B,0};
+    static const WCHAR part1_nfkc10[] = {0x20,0x3099,0};
+
+    struct test_data_normal {
+        const WCHAR *str;
+        const WCHAR *nfc;
+        const WCHAR *nfd;
+        const WCHAR *nfkc;
+        const WCHAR *nfkd;
+    };
+    static const struct test_data_normal test_arr[] =
+    {
+        { part0_str1, part0_str1, part0_nfd1, part0_str1, part0_nfd1 },
+        { part0_str2, part0_nfc2, part0_str2, part0_nfc2, part0_str2 },
+        { part0_str3, part0_nfc3, part0_str3, part0_nfc3, part0_str3 },
+        { part0_str4, part0_nfc4, part0_str4, part0_nfc4, part0_str4 },
+        { part0_str5, part0_nfc5, part0_nfc5, part0_nfc5, part0_nfc5 },
+        { part0_str6, part0_nfc6, part0_nfc6, part0_nfc6, part0_nfc6 },
+        { part0_str8, part0_str8, part0_nfd8, part0_str8, part0_nfd8 },
+        { part0_str9, part0_nfc9, part0_nfd9, part0_nfc9, part0_nfd9 },
+        { part0_str10, part0_str10, part0_nfd10, part0_str10, part0_nfd10 },
+        { part0_str11, part0_str11, part0_nfd11, part0_str11, part0_nfd11 },
+        { part0_str12, part0_nfc12, part0_nfd12, part0_nfc12, part0_nfd12 },
+        { part1_str1, part1_str1, part1_str1, part1_nfkc1, part1_nfkc1 },
+        { part1_str2, part1_str2, part1_str2, part1_nfkc2, part1_nfkc2 },
+        { part1_str3, part1_str3, part1_nfd3, part1_str3, part1_nfd3 },
+        { part1_str4, part1_str4, part1_str4, part1_nfkc4, part1_nfkc4 },
+        { part1_str5, part1_str5, part1_nfd5, part1_str5, part1_nfd5 },
+        { part1_str6, part1_str6, part1_nfd6, part1_str6, part1_nfd6 },
+        { part1_str7, part1_str7, part1_str7, part1_nfkc7, part1_nfkc7 },
+        { part1_str8, part1_str8, part1_nfd8, part1_str8, part1_nfd8 },
+        { part1_str9, part1_str9, part1_str9, part1_nfkc9, part1_nfkc9 },
+        { part1_str10, part1_str10, part1_str10, part1_nfkc10, part1_nfkc10 },
+        { 0 }
+    };
+    const struct test_data_normal *ptest = test_arr;
+    const int norm_forms[] = { NormalizationC, NormalizationD, NormalizationKC, NormalizationKD };
+    WCHAR dst[80];
+    int dstlen;
+
+    if (!pNormalizeString)
+    {
+        win_skip("NormalizeString is not available.\n");
+        return;
+    }
+
+    todo_wine {
+        dstlen = pNormalizeString( NormalizationD, ptest->str, -1, dst, 1 );
+        ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Should have failed with ERROR_INSUFFICIENT_BUFFER");
+    }
+
+    /*
+     * For each string, first test passing -1 as srclen to NormalizeString,
+     * thereby assuming a null-terminating string in src, and then test passing
+     * explicitly the string length.
+     * Do that for all 4 normalization forms.
+     */
+    while (ptest->str)
+    {
+        int str_cmp, i;
+        const WCHAR *const *norm_str = &ptest->nfc;
+
+        for (i = 0; i < 4; i++)
+        {
+            todo_wine {
+                dstlen = pNormalizeString( norm_forms[i], ptest->str, -1, NULL, 0 );
+                if (dstlen)
+                {
+                    dstlen = pNormalizeString( norm_forms[i], ptest->str, -1, dst, dstlen );
+                    ok(dstlen == strlenW( *norm_str )+1, "Copied length differed: was %d, should be %d\n",
+                       dstlen, strlenW( *norm_str )+1);
+                    str_cmp = strncmpW( *norm_str, dst, dstlen+1 );
+                    ok( str_cmp == 0, "test failed: returned value was %d\n", str_cmp );
+                }
+
+                dstlen = pNormalizeString( norm_forms[i], ptest->str, strlenW(ptest->str), NULL, 0 );
+                if (dstlen)
+                {
+                    dstlen = pNormalizeString( norm_forms[i], ptest->str, strlenW(ptest->str), dst, dstlen );
+                    ok(dstlen == strlenW( *norm_str ), "Copied length differed: was %d, should be %d\n",
+                       dstlen, strlenW( *norm_str ));
+                    str_cmp = strncmpW( *norm_str, dst, dstlen );
+                    ok( str_cmp == 0, "test failed: returned value was %d\n", str_cmp );
+                }
+                norm_str++;
+            }
+        }
+        ptest++;
+    }
+}
+
 START_TEST(locale)
 {
   InitFunctionPointers();
@@ -5518,6 +5706,7 @@ START_TEST(locale)
   test_GetUserPreferredUILanguages();
   test_FindNLSStringEx();
   test_SetThreadUILanguage();
+  test_NormalizeString();
   /* this requires collation table patch to make it MS compatible */
   if (0) test_sorting();
 }
-- 
2.14.1

    

Sergio Gómez Del Real

Huw Davies

tags

participants (2)