https://git.reactos.org/?p=reactos.git;a=commitdiff;h=50e0b006e7814aaf95035…
commit 50e0b006e7814aaf950358832fd8af88255ba93a
Author: Jérôme Gardou <jerome.gardou(a)reactos.org>
AuthorDate: Tue May 18 23:00:38 2021 +0200
Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com>
CommitDate: Wed May 19 22:50:29 2021 +0200
[NTDLL_APITEST] Add some Japanese to RtlGenerate8dot3Name test case
CORE-17571
---
.../rostests/apitests/ntdll/RtlGenerate8dot3Name.c | 145 ++++++++++-----------
modules/rostests/apitests/ntdll/locale.c | 78 +++++++++++
modules/rostests/apitests/ntdll/precomp.h | 6 +
3 files changed, 156 insertions(+), 73 deletions(-)
diff --git a/modules/rostests/apitests/ntdll/RtlGenerate8dot3Name.c
b/modules/rostests/apitests/ntdll/RtlGenerate8dot3Name.c
index 9b606526c9a..fa8ded244ea 100644
--- a/modules/rostests/apitests/ntdll/RtlGenerate8dot3Name.c
+++ b/modules/rostests/apitests/ntdll/RtlGenerate8dot3Name.c
@@ -2,10 +2,11 @@
// code7bit:
https://github.com/katahiromz/code7bit
// To revert conversion, please execute "code7bit -r <file>".
/*
- * PROJECT: ReactOS api tests
- * LICENSE: GPLv2+ - See COPYING in the top level directory
- * PURPOSE: Test for RtlGenerate8dot3Name
- * PROGRAMMER: Pierre Schweitzer <pierre(a)reactos.org>
+ * PROJECT: ReactOS API tests
+ * LICENSE: GPL-2.0-or-later (
https://spdx.org/licenses/GPL-2.0-or-later.html)
+ * PURPOSE: Test for RtlGenerate8dot3Name
+ * COPYRIGHT: Copyright 2015-2016 Pierre Schweitzer <pierre(a)reactos.org>
+ * Copyright 2021 Jérôme Gardou <jerome.gardou(a)reactos.org>
*/
#include "precomp.h"
@@ -19,40 +20,71 @@ RtlGenerate8dot3Name(
_Inout_ PGENERATE_NAME_CONTEXT Context,
_Inout_ PUNICODE_STRING Name8dot3);
-#define NAMES_COUNT 14
-#define LOCALES_COUNT 3
+ULONG Locales[][2] =
+{
+ {1252, 850}, // Most used for latin langs
+ {1252, 437}, // Used for English US (not only)
+ {1252, 775}, // Used for Estonian
+ {1252, 932}, // Western SBCS, Japanese
+ {932, 1252}, // Japanese, Western SBCS
+ {932, 932}, // Japanese, Japanese
+};
+#define LOCALES_COUNT _countof(Locales)
+
+PWSTR Names[] = {
+ L"Menu D\u00E9marrer",
+ L"S\u00E9lecteur de configuration clavier.lnk",
+ L"\u00E9\u00E8\u00E0\u00F9\u00E7.txt",
+ L"\u00E7\u00F9\u00E0\u00E8\u00E9.txt",
+ L"\u00E9\u00E8\u00E0\u00F9.txt",
+ L"\u00E7\u00F9\u00E0\u00E8.txt",
+ L"\u00E9\u00E8\u00E0\u00F9\u00E7eeauc.txt",
+ L"\u00E9e\u00E8\u00E9\u00E7c\u00F9u.txt",
+ L"test.\u00E9x\u00E8",
+ L"t\u00A3$t\u00A4.txt",
+ L"Long file name.txt",
+ L"Long file name",
+ L"Longfilename.txt",
+ L"Longfilename",
+ L"\u30c7\u30b9\u30af\u30c8\u30c3\u30d7" /* Desktop in Japanese */
+};
+#define NAMES_COUNT _countof(Names)
-PWSTR Names[NAMES_COUNT] = { L"Menu D\u00E9marrer", L"S\u00E9lecteur de
configuration clavier.lnk", L"\u00E9\u00E8\u00E0\u00F9\u00E7.txt",
L"\u00E7\u00F9\u00E0\u00E8\u00E9.txt",
L"\u00E9\u00E8\u00E0\u00F9.txt", L"\u00E7\u00F9\u00E0\u00E8.txt",
L"\u00E9\u00E8\u00E0\u00F9\u00E7eeauc.txt",
L"\u00E9e\u00E8\u00E9\u00E7c\u00F9u.txt", L"test.\u00E9x\u00E8",
L"t\u00A3$t\u00A4.txt", L"Long file name.txt", L"Long file
name", L"Longfilename.txt", L"Longfilename" };
PWSTR ShortNames1[LOCALES_COUNT][NAMES_COUNT] =
{
- { L"MENUDM~1", L"SLECTE~1.LNK", L"5C2D~1.TXT",
L"423C~1.TXT", L"925E~1.TXT", L"7E4C~1.TXT",
L"EEAUC~1.TXT", L"ECU~1.TXT", L"TEST~1.X",
L"T$T~1.TXT", L"LONGFI~1.TXT", L"LONGFI~1",
L"LONGFI~1.TXT", L"LONGFI~1" },
- { L"MENUDM~1", L"SLECTE~1.LNK", L"5C2D~1.TXT",
L"423C~1.TXT", L"925E~1.TXT", L"7E4C~1.TXT",
L"EEAUC~1.TXT", L"ECU~1.TXT", L"TEST~1.X",
L"T$T~1.TXT", L"LONGFI~1.TXT", L"LONGFI~1",
L"LONGFI~1.TXT", L"LONGFI~1" },
- { L"MENUDM~1", L"SLECTE~1.LNK", L"5C2D~1.TXT",
L"423C~1.TXT", L"925E~1.TXT", L"7E4C~1.TXT",
L"EEAUC~1.TXT", L"ECU~1.TXT", L"TEST~1.X",
L"T$T~1.TXT", L"LONGFI~1.TXT", L"LONGFI~1",
L"LONGFI~1.TXT", L"LONGFI~1" },
+ { L"MENUDM~1", L"SLECTE~1.LNK", L"5C2D~1.TXT",
L"423C~1.TXT", L"925E~1.TXT", L"7E4C~1.TXT",
L"EEAUC~1.TXT", L"ECU~1.TXT", L"TEST~1.X",
L"T$T~1.TXT", L"LONGFI~1.TXT", L"LONGFI~1",
L"LONGFI~1.TXT", L"LONGFI~1", L"9A16~1" },
+ { L"MENUDM~1", L"SLECTE~1.LNK", L"5C2D~1.TXT",
L"423C~1.TXT", L"925E~1.TXT", L"7E4C~1.TXT",
L"EEAUC~1.TXT", L"ECU~1.TXT", L"TEST~1.X",
L"T$T~1.TXT", L"LONGFI~1.TXT", L"LONGFI~1",
L"LONGFI~1.TXT", L"LONGFI~1", L"9A16~1" },
+ { L"MENUDM~1", L"SLECTE~1.LNK", L"5C2D~1.TXT",
L"423C~1.TXT", L"925E~1.TXT", L"7E4C~1.TXT",
L"EEAUC~1.TXT", L"ECU~1.TXT", L"TEST~1.X",
L"T$T~1.TXT", L"LONGFI~1.TXT", L"LONGFI~1",
L"LONGFI~1.TXT", L"LONGFI~1", L"9A16~1" },
+ { L"MENUDM~1", L"SLECTE~1.LNK", L"5C2D~1.TXT",
L"423C~1.TXT", L"925E~1.TXT", L"7E4C~1.TXT",
L"EEAUC~1.TXT", L"ECU~1.TXT", L"TEST~1.X",
L"T$T~1.TXT", L"LONGFI~1.TXT", L"LONGFI~1",
L"LONGFI~1.TXT", L"LONGFI~1", L"9A16~1" },
+ { L"MENUDM~1", L"SLECTE~1.LNK", L"5C2D~1.TXT",
L"423C~1.TXT", L"925E~1.TXT", L"7E4C~1.TXT",
L"EEAUC~1.TXT", L"ECU~1.TXT", L"TEST~1.X",
L"T$T~1.TXT", L"LONGFI~1.TXT", L"LONGFI~1",
L"LONGFI~1.TXT", L"LONGFI~1", L"9A16~1" },
+ { L"MENUDM~1", L"SLECTE~1.LNK", L"5C2D~1.TXT",
L"423C~1.TXT", L"925E~1.TXT", L"7E4C~1.TXT",
L"EEAUC~1.TXT", L"ECU~1.TXT", L"TEST~1.X",
L"T$T~1.TXT", L"LONGFI~1.TXT", L"LONGFI~1",
L"LONGFI~1.TXT", L"LONGFI~1", L"9A16~1" },
};
PWSTR ShortNames2[LOCALES_COUNT][NAMES_COUNT] =
{
- { L"MENUDM~2", L"SLECTE~2.LNK", L"5C2D~2.TXT",
L"423C~2.TXT", L"925E~2.TXT", L"7E4C~2.TXT",
L"EEAUC~2.TXT", L"ECU~2.TXT", L"TEST~2.X",
L"T$T~2.TXT", L"LONGFI~2.TXT", L"LONGFI~2",
L"LONGFI~2.TXT", L"LONGFI~2" },
- { L"MENUDM~2", L"SLECTE~2.LNK", L"5C2D~2.TXT",
L"423C~2.TXT", L"925E~2.TXT", L"7E4C~2.TXT",
L"EEAUC~2.TXT", L"ECU~2.TXT", L"TEST~2.X",
L"T$T~2.TXT", L"LONGFI~2.TXT", L"LONGFI~2",
L"LONGFI~2.TXT", L"LONGFI~2" },
- { L"MENUDM~2", L"SLECTE~2.LNK", L"5C2D~2.TXT",
L"423C~2.TXT", L"925E~2.TXT", L"7E4C~2.TXT",
L"EEAUC~2.TXT", L"ECU~2.TXT", L"TEST~2.X",
L"T$T~2.TXT", L"LONGFI~2.TXT", L"LONGFI~2",
L"LONGFI~2.TXT", L"LONGFI~2" },
+ { L"MENUDM~2", L"SLECTE~2.LNK", L"5C2D~2.TXT",
L"423C~2.TXT", L"925E~2.TXT", L"7E4C~2.TXT",
L"EEAUC~2.TXT", L"ECU~2.TXT", L"TEST~2.X",
L"T$T~2.TXT", L"LONGFI~2.TXT", L"LONGFI~2",
L"LONGFI~2.TXT", L"LONGFI~2", L"9A16~2" },
+ { L"MENUDM~2", L"SLECTE~2.LNK", L"5C2D~2.TXT",
L"423C~2.TXT", L"925E~2.TXT", L"7E4C~2.TXT",
L"EEAUC~2.TXT", L"ECU~2.TXT", L"TEST~2.X",
L"T$T~2.TXT", L"LONGFI~2.TXT", L"LONGFI~2",
L"LONGFI~2.TXT", L"LONGFI~2", L"9A16~2" },
+ { L"MENUDM~2", L"SLECTE~2.LNK", L"5C2D~2.TXT",
L"423C~2.TXT", L"925E~2.TXT", L"7E4C~2.TXT",
L"EEAUC~2.TXT", L"ECU~2.TXT", L"TEST~2.X",
L"T$T~2.TXT", L"LONGFI~2.TXT", L"LONGFI~2",
L"LONGFI~2.TXT", L"LONGFI~2", L"9A16~2" },
+ { L"MENUDM~2", L"SLECTE~2.LNK", L"5C2D~2.TXT",
L"423C~2.TXT", L"925E~2.TXT", L"7E4C~2.TXT",
L"EEAUC~2.TXT", L"ECU~2.TXT", L"TEST~2.X",
L"T$T~2.TXT", L"LONGFI~2.TXT", L"LONGFI~2",
L"LONGFI~2.TXT", L"LONGFI~2", L"9A16~2" },
+ { L"MENUDM~2", L"SLECTE~2.LNK", L"5C2D~2.TXT",
L"423C~2.TXT", L"925E~2.TXT", L"7E4C~2.TXT",
L"EEAUC~2.TXT", L"ECU~2.TXT", L"TEST~2.X",
L"T$T~2.TXT", L"LONGFI~2.TXT", L"LONGFI~2",
L"LONGFI~2.TXT", L"LONGFI~2", L"9A16~2" },
+ { L"MENUDM~2", L"SLECTE~2.LNK", L"5C2D~2.TXT",
L"423C~2.TXT", L"925E~2.TXT", L"7E4C~2.TXT",
L"EEAUC~2.TXT", L"ECU~2.TXT", L"TEST~2.X",
L"T$T~2.TXT", L"LONGFI~2.TXT", L"LONGFI~2",
L"LONGFI~2.TXT", L"LONGFI~2", L"9A16~2" },
};
PWSTR ExShortNames1[LOCALES_COUNT][NAMES_COUNT] =
{
- { L"MENUD\u00C9~1", L"S\u00C9LECT~1.LNK",
L"\u00C9\u00C8\u00C0\u00D9\u00C7~1.TXT",
L"\u00C7\u00D9\u00C0\u00C8\u00C9~1.TXT",
L"\u00C9\u00C8\u00C0\u00D9~1.TXT", L"\u00C7\u00D9\u00C0\u00C8~1.TXT",
L"\u00C9\u00C8\u00C0\u00D9\u00C7E~1.TXT",
L"\u00C9E\u00C8\u00C9\u00C7C~1.TXT", L"TEST~1.\u00C9X\u00C8",
L"T\u00A3$T\u00A4~1.TXT", L"LONGFI~1.TXT", L"LONGFI~1",
L"LONGFI~1.TXT", L"LONGFI~1" },
- { L"MENUD\u00C9~1", L"S\u00C9LECT~1.LNK",
L"\u00C9\u00C8\u00C0\u00D9\u00C7~1.TXT",
L"\u00C7\u00D9\u00C0\u00C8\u00C9~1.TXT",
L"\u00C9\u00C8\u00C0\u00D9~1.TXT", L"\u00C7\u00D9\u00C0\u00C8~1.TXT",
L"\u00C9\u00C8\u00C0\u00D9\u00C7E~1.TXT",
L"\u00C9E\u00C8\u00C9\u00C7C~1.TXT", L"TEST~1.\u00C9X\u00C8",
L"T\u00A3$T_~1.TXT", L"LONGFI~1.TXT", L"LONGFI~1",
L"LONGFI~1.TXT", L"LONGFI~1" },
- { L"MENUD\u00C9~1", L"S\u00C9LECT~1.LNK",
L"\u00C9CAU~1.TXT", L"UAC\u00C9~1.TXT", L"\u00C9CAU~1.TXT",
L"UAC~1.TXT", L"\u00C9CAUEE~1.TXT",
L"\u00C9EC\u00C9CU~1.TXT", L"TEST~1.\u00C9XC",
L"T\u00A3$T\u00A4~1.TXT", L"LONGFI~1.TXT", L"LONGFI~1",
L"LONGFI~1.TXT", L"LONGFI~1" },
+ { L"MENUD\u00C9~1", L"S\u00C9LECT~1.LNK",
L"\u00C9\u00C8\u00C0\u00D9\u00C7~1.TXT",
L"\u00C7\u00D9\u00C0\u00C8\u00C9~1.TXT",
L"\u00C9\u00C8\u00C0\u00D9~1.TXT", L"\u00C7\u00D9\u00C0\u00C8~1.TXT",
L"\u00C9\u00C8\u00C0\u00D9\u00C7E~1.TXT",
L"\u00C9E\u00C8\u00C9\u00C7C~1.TXT", L"TEST~1.\u00C9X\u00C8",
L"T\u00A3$T\u00A4~1.TXT", L"LONGFI~1.TXT", L"LONGFI~1",
L"LONGFI~1.TXT", L"LONGFI~1", L"9A16~1" },
+ { L"MENUD\u00C9~1", L"S\u00C9LECT~1.LNK",
L"\u00C9\u00C8\u00C0\u00D9\u00C7~1.TXT",
L"\u00C7\u00D9\u00C0\u00C8\u00C9~1.TXT",
L"\u00C9\u00C8\u00C0\u00D9~1.TXT", L"\u00C7\u00D9\u00C0\u00C8~1.TXT",
L"\u00C9\u00C8\u00C0\u00D9\u00C7E~1.TXT",
L"\u00C9E\u00C8\u00C9\u00C7C~1.TXT", L"TEST~1.\u00C9X\u00C8",
L"T\u00A3$T_~1.TXT", L"LONGFI~1.TXT", L"LONGFI~1",
L"LONGFI~1.TXT", L"LONGFI~1", L"9A16~1" },
+ { L"MENUD\u00C9~1", L"S\u00C9LECT~1.LNK",
L"\u00C9CAU~1.TXT", L"UAC\u00C9~1.TXT", L"\u00C9CAU~1.TXT",
L"UAC~1.TXT", L"\u00C9CAUEE~1.TXT",
L"\u00C9EC\u00C9CU~1.TXT", L"TEST~1.\u00C9XC",
L"T\u00A3$T\u00A4~1.TXT", L"LONGFI~1.TXT", L"LONGFI~1",
L"LONGFI~1.TXT", L"LONGFI~1", L"9A16~1" },
+ { L"MENUDE~1", L"SELECT~1.LNK", L"EEAUC~1.TXT",
L"CUAEE~1.TXT", L"EEAU~1.TXT", L"CUAE~1.TXT",
L"EEAUCE~1.TXT", L"EEEECC~1.TXT", L"TEST~1.EXE",
L"T\uFFE1$T~1.TXT", L"LONGFI~1.TXT", L"LONGFI~1",
L"LONGFI~1.TXT", L"LONGFI~1", L"\u30c7\u30b9\u30af~1" },
+ { L"MENUD\u00C9~1", L"S\u00C9LECT~1.LNK",
L"\u00C9\u00C8\u00C0\u00D9\u00C7~1.TXT",
L"\u00C7\u00D9\u00C0\u00C8\u00C9~1.TXT",
L"\u00C9\u00C8\u00C0\u00D9~1.TXT", L"\u00C7\u00D9\u00C0\u00C8~1.TXT",
L"\u00C9\u00C8\u00C0\u00D9\u00C7E~1.TXT",
L"\u00C9E\u00C8\u00C9\u00C7C~1.TXT", L"TEST~1.\u00C9X\u00C8",
L"T\u00A3$T\u00A4~1.TXT", L"LONGFI~1.TXT", L"LONGFI~1",
L"LONGFI~1.TXT", L"LONGFI~1", L"9A16~1" },
+ { L"MENUDE~1", L"SELECT~1.LNK", L"EEAUC~1.TXT",
L"CUAEE~1.TXT", L"EEAU~1.TXT", L"CUAE~1.TXT",
L"EEAUCE~1.TXT", L"EEEECC~1.TXT", L"TEST~1.EXE",
L"T\uFFE1$T~1.TXT", L"LONGFI~1.TXT", L"LONGFI~1",
L"LONGFI~1.TXT", L"LONGFI~1", L"\u30c7\u30b9\u30af~1" },
};
PWSTR ExShortNames2[LOCALES_COUNT][NAMES_COUNT] =
{
- { L"MENUD\u00C9~2", L"S\u00C9LECT~2.LNK",
L"\u00C9\u00C8\u00C0\u00D9\u00C7~2.TXT",
L"\u00C7\u00D9\u00C0\u00C8\u00C9~2.TXT",
L"\u00C9\u00C8\u00C0\u00D9~2.TXT", L"\u00C7\u00D9\u00C0\u00C8~2.TXT",
L"\u00C9\u00C8\u00C0\u00D9\u00C7E~2.TXT",
L"\u00C9E\u00C8\u00C9\u00C7C~2.TXT", L"TEST~2.\u00C9X\u00C8",
L"T\u00A3$T\u00A4~2.TXT", L"LONGFI~2.TXT", L"LONGFI~2",
L"LONGFI~2.TXT", L"LONGFI~2" },
- { L"MENUD\u00C9~2", L"S\u00C9LECT~2.LNK",
L"\u00C9\u00C8\u00C0\u00D9\u00C7~2.TXT",
L"\u00C7\u00D9\u00C0\u00C8\u00C9~2.TXT",
L"\u00C9\u00C8\u00C0\u00D9~2.TXT", L"\u00C7\u00D9\u00C0\u00C8~2.TXT",
L"\u00C9\u00C8\u00C0\u00D9\u00C7E~2.TXT",
L"\u00C9E\u00C8\u00C9\u00C7C~2.TXT", L"TEST~2.\u00C9X\u00C8",
L"T\u00A3$T_~2.TXT", L"LONGFI~2.TXT", L"LONGFI~2",
L"LONGFI~2.TXT", L"LONGFI~2" },
- { L"MENUD\u00C9~2", L"S\u00C9LECT~2.LNK",
L"\u00C9CAU~2.TXT", L"UAC\u00C9~2.TXT", L"\u00C9CAU~2.TXT",
L"UAC~2.TXT", L"\u00C9CAUEE~2.TXT",
L"\u00C9EC\u00C9CU~2.TXT", L"TEST~2.\u00C9XC",
L"T\u00A3$T\u00A4~2.TXT", L"LONGFI~2.TXT", L"LONGFI~2",
L"LONGFI~2.TXT", L"LONGFI~2" },
-};
-
-ULONG Locales[LOCALES_COUNT][2] =
-{
- {1252, 850}, // Most used for latin langs
- {1252, 437}, // Used for English US (not only)
- {1252, 775}, // Used for Estonian
+ { L"MENUD\u00C9~2", L"S\u00C9LECT~2.LNK",
L"\u00C9\u00C8\u00C0\u00D9\u00C7~2.TXT",
L"\u00C7\u00D9\u00C0\u00C8\u00C9~2.TXT",
L"\u00C9\u00C8\u00C0\u00D9~2.TXT", L"\u00C7\u00D9\u00C0\u00C8~2.TXT",
L"\u00C9\u00C8\u00C0\u00D9\u00C7E~2.TXT",
L"\u00C9E\u00C8\u00C9\u00C7C~2.TXT", L"TEST~2.\u00C9X\u00C8",
L"T\u00A3$T\u00A4~2.TXT", L"LONGFI~2.TXT", L"LONGFI~2",
L"LONGFI~2.TXT", L"LONGFI~2", L"9A16~2" },
+ { L"MENUD\u00C9~2", L"S\u00C9LECT~2.LNK",
L"\u00C9\u00C8\u00C0\u00D9\u00C7~2.TXT",
L"\u00C7\u00D9\u00C0\u00C8\u00C9~2.TXT",
L"\u00C9\u00C8\u00C0\u00D9~2.TXT", L"\u00C7\u00D9\u00C0\u00C8~2.TXT",
L"\u00C9\u00C8\u00C0\u00D9\u00C7E~2.TXT",
L"\u00C9E\u00C8\u00C9\u00C7C~2.TXT", L"TEST~2.\u00C9X\u00C8",
L"T\u00A3$T_~2.TXT", L"LONGFI~2.TXT", L"LONGFI~2",
L"LONGFI~2.TXT", L"LONGFI~2", L"9A16~2" },
+ { L"MENUD\u00C9~2", L"S\u00C9LECT~2.LNK",
L"\u00C9CAU~2.TXT", L"UAC\u00C9~2.TXT", L"\u00C9CAU~2.TXT",
L"UAC~2.TXT", L"\u00C9CAUEE~2.TXT",
L"\u00C9EC\u00C9CU~2.TXT", L"TEST~2.\u00C9XC",
L"T\u00A3$T\u00A4~2.TXT", L"LONGFI~2.TXT", L"LONGFI~2",
L"LONGFI~2.TXT", L"LONGFI~2", L"9A16~2" },
+ { L"MENUDE~2", L"SELECT~2.LNK", L"EEAUC~2.TXT",
L"CUAEE~2.TXT", L"EEAU~2.TXT", L"CUAE~2.TXT",
L"EEAUCE~2.TXT", L"EEEECC~2.TXT", L"TEST~2.EXE",
L"T\uFFE1$T~2.TXT", L"LONGFI~2.TXT", L"LONGFI~2",
L"LONGFI~2.TXT", L"LONGFI~2", L"\u30c7\u30b9\u30af~2" },
+ { L"MENUD\u00C9~2", L"S\u00C9LECT~2.LNK",
L"\u00C9\u00C8\u00C0\u00D9\u00C7~2.TXT",
L"\u00C7\u00D9\u00C0\u00C8\u00C9~2.TXT",
L"\u00C9\u00C8\u00C0\u00D9~2.TXT", L"\u00C7\u00D9\u00C0\u00C8~2.TXT",
L"\u00C9\u00C8\u00C0\u00D9\u00C7E~2.TXT",
L"\u00C9E\u00C8\u00C9\u00C7C~2.TXT", L"TEST~2.\u00C9X\u00C8",
L"T\u00A3$T\u00A4~2.TXT", L"LONGFI~2.TXT", L"LONGFI~2",
L"LONGFI~2.TXT", L"LONGFI~2", L"9A16~2" },
+ { L"MENUDE~2", L"SELECT~2.LNK", L"EEAUC~2.TXT",
L"CUAEE~2.TXT", L"EEAU~2.TXT", L"CUAE~2.TXT",
L"EEAUCE~2.TXT", L"EEEECC~2.TXT", L"TEST~2.EXE",
L"T\uFFE1$T~2.TXT", L"LONGFI~2.TXT", L"LONGFI~2",
L"LONGFI~2.TXT", L"LONGFI~2", L"\u30c7\u30b9\u30af~2" },
};
#define LONG_NAMES_COUNT 12
@@ -68,49 +100,6 @@ PWSTR LongShortNames[LONG_NAMES_COUNT] =
L"VERYLO~1.TXT", L"VERYLO~2.TXT", L"VERYLO~3.TXT",
L"VERYLO~4.TXT", L"VED051~1.TXT", L"VED051~2.TXT",
};
-PVOID LoadCodePageData(ULONG Code)
-{
- char filename[MAX_PATH], sysdir[MAX_PATH];
- HANDLE hFile;
- PVOID Data = NULL;
- GetSystemDirectoryA(sysdir, MAX_PATH);
-
- if (Code != -1)
- StringCbPrintfA(filename, sizeof(filename), "%s\\c_%lu.nls", sysdir,
Code);
- else
- StringCbPrintfA(filename, sizeof(filename), "%s\\l_intl.nls", sysdir);
-
- hFile = CreateFile(filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0,
NULL);
- if (hFile != INVALID_HANDLE_VALUE)
- {
- DWORD dwRead;
- DWORD dwFileSize = GetFileSize(hFile, NULL);
- Data = malloc(dwFileSize);
- ReadFile(hFile, Data, dwFileSize, &dwRead, NULL);
- CloseHandle(hFile);
- }
- return Data;
-}
-
-/*
https://www.microsoft.com/resources/msdn/goglobal/default.mspx */
-void SetupLocale(ULONG AnsiCode, ULONG OemCode, ULONG Unicode)
-{
- NLSTABLEINFO NlsTable;
- PVOID AnsiCodePageData;
- PVOID OemCodePageData;
- PVOID UnicodeCaseTableData;
-
- AnsiCodePageData = LoadCodePageData(AnsiCode);
- OemCodePageData = LoadCodePageData(OemCode);
- UnicodeCaseTableData = LoadCodePageData(Unicode);
-
- RtlInitNlsTables(AnsiCodePageData, OemCodePageData, UnicodeCaseTableData,
&NlsTable);
- RtlResetRtlTranslations(&NlsTable);
- /* Do NOT free the buffers here, they are directly used!
- Yes, we leak the old buffers, but this is a test anyway... */
-
-}
-
START_TEST(RtlGenerate8dot3Name)
{
USHORT i, j;
@@ -134,23 +123,33 @@ START_TEST(RtlGenerate8dot3Name)
RtlGenerate8dot3Name(&LongName, FALSE, &Context, &ShortName);
RtlInitUnicodeString(&Expected, ShortNames1[j][i]);
- ok(RtlEqualUnicodeString(&Expected, &ShortName, FALSE), "%u::
Generated: %.*S. Expected: %.*S\n", j, ShortName.Length / sizeof(WCHAR),
ShortName.Buffer, Expected.Length / sizeof(WCHAR), Expected.Buffer);
+ ok(RtlEqualUnicodeString(&Expected, &ShortName, FALSE), "%u,%u::
Generated: %.*S. Expected: %.*S\n", j, i, ShortName.Length / sizeof(WCHAR),
ShortName.Buffer, Expected.Length / sizeof(WCHAR), Expected.Buffer);
ShortName.Length = 0;
RtlGenerate8dot3Name(&LongName, FALSE, &Context, &ShortName);
RtlInitUnicodeString(&Expected, ShortNames2[j][i]);
- ok(RtlEqualUnicodeString(&Expected, &ShortName, FALSE), "%u::
Generated: %.*S. Expected: %.*S\n", j, ShortName.Length / sizeof(WCHAR),
ShortName.Buffer, Expected.Length / sizeof(WCHAR), Expected.Buffer);
+ ok(RtlEqualUnicodeString(&Expected, &ShortName, FALSE), "%u,%u::
Generated: %.*S. Expected: %.*S\n", j, i, ShortName.Length / sizeof(WCHAR),
ShortName.Buffer, Expected.Length / sizeof(WCHAR), Expected.Buffer);
RtlZeroMemory(&Context, sizeof(GENERATE_NAME_CONTEXT));
ShortName.Length = 0;
RtlGenerate8dot3Name(&LongName, TRUE, &Context, &ShortName);
RtlInitUnicodeString(&Expected, ExShortNames1[j][i]);
- ok(RtlEqualUnicodeString(&Expected, &ShortName, FALSE), "%u::
Generated: %.*S. Expected: %.*S\n", j, ShortName.Length / sizeof(WCHAR),
ShortName.Buffer, Expected.Length / sizeof(WCHAR), Expected.Buffer);
+ ok(RtlEqualUnicodeString(&Expected, &ShortName, FALSE), "%u,%u::
Generated: %.*S. Expected: %.*S\n", j, i, ShortName.Length / sizeof(WCHAR),
ShortName.Buffer, Expected.Length / sizeof(WCHAR), Expected.Buffer);
+ if (!RtlEqualUnicodeString(&Expected, &ShortName, FALSE))
+ {
+ for (int k = 0; k < (ShortName.Length / sizeof(WCHAR)); k++)
+ trace("Got \\u%04x at %d\n", ShortName.Buffer[k], k);
+ }
ShortName.Length = 0;
RtlGenerate8dot3Name(&LongName, TRUE, &Context, &ShortName);
RtlInitUnicodeString(&Expected, ExShortNames2[j][i]);
- ok(RtlEqualUnicodeString(&Expected, &ShortName, FALSE), "%u::
Generated: %.*S. Expected: %.*S\n", j, ShortName.Length / sizeof(WCHAR),
ShortName.Buffer, Expected.Length / sizeof(WCHAR), Expected.Buffer);
+ ok(RtlEqualUnicodeString(&Expected, &ShortName, FALSE), "%u,%u::
Generated: %.*S. Expected: %.*S\n", j, i, ShortName.Length / sizeof(WCHAR),
ShortName.Buffer, Expected.Length / sizeof(WCHAR), Expected.Buffer);
+ if (!RtlEqualUnicodeString(&Expected, &ShortName, FALSE))
+ {
+ for (int k = 0; k < (ShortName.Length / sizeof(WCHAR)); k++)
+ trace("Got \\u%04x at %d\n", ShortName.Buffer[k], k);
+ }
}
}
diff --git a/modules/rostests/apitests/ntdll/locale.c
b/modules/rostests/apitests/ntdll/locale.c
new file mode 100644
index 00000000000..281d3b8b2ba
--- /dev/null
+++ b/modules/rostests/apitests/ntdll/locale.c
@@ -0,0 +1,78 @@
+/*
+ * PROJECT: ReactOS API tests
+ * LICENSE: GPL-2.0-or-later (
https://spdx.org/licenses/GPL-2.0-or-later.html)
+ * PURPOSE: RTL locale support
+ * COPYRIGHT: Copyright 2016 Mark Jansen <mark.jansen(a)reactos.org>
+ * Copyright 2021 Jérôme Gardou <jerome.gardou(a)reactos.org>
+ */
+
+#include "precomp.h"
+
+static BOOL (WINAPI *pWow64DisableWow64FsRedirection)(PVOID *);
+static BOOL (WINAPI *pWow64RevertWow64FsRedirection)(PVOID);
+HANDLE hKernel32;
+
+static PVOID LoadCodePageData(_In_ ULONG Code)
+{
+ char filename[MAX_PATH], sysdir[MAX_PATH];
+ HANDLE hFile;
+ PVOID Data = NULL;
+ PVOID FsRedir;
+
+ if (!hKernel32)
+ {
+ hKernel32 = GetModuleHandleA("kernel32.dll");
+
+ pWow64DisableWow64FsRedirection = (void*)GetProcAddress(hKernel32,
"Wow64DisableWow64FsRedirection");
+ pWow64RevertWow64FsRedirection = (void*)GetProcAddress(hKernel32,
"Wow64RevertWow64FsRedirection");
+ }
+
+ if (pWow64DisableWow64FsRedirection)
+ pWow64DisableWow64FsRedirection(&FsRedir);
+
+ GetSystemDirectoryA(sysdir, MAX_PATH);
+
+ if (Code != -1)
+ StringCbPrintfA(filename, sizeof(filename), "%s\\c_%lu.nls", sysdir,
Code);
+ else
+ StringCbPrintfA(filename, sizeof(filename), "%s\\l_intl.nls", sysdir);
+
+ hFile = CreateFile(filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0,
NULL);
+ ok(hFile != INVALID_HANDLE_VALUE, "Failed to open %s, error %u\n",
filename, (UINT)GetLastError());
+ if (hFile != INVALID_HANDLE_VALUE)
+ {
+ DWORD dwRead;
+ DWORD dwFileSize = GetFileSize(hFile, NULL);
+ Data = malloc(dwFileSize);
+ ReadFile(hFile, Data, dwFileSize, &dwRead, NULL);
+ CloseHandle(hFile);
+ }
+
+ if (pWow64RevertWow64FsRedirection)
+ pWow64RevertWow64FsRedirection(FsRedir);
+
+ return Data;
+}
+
+/*
https://www.microsoft.com/resources/msdn/goglobal/default.mspx */
+void SetupLocale(
+ _In_ ULONG AnsiCode,
+ _In_ ULONG OemCode,
+ _In_ ULONG Unicode)
+{
+ NLSTABLEINFO NlsTable;
+ PVOID AnsiCodePageData;
+ PVOID OemCodePageData;
+ PVOID UnicodeCaseTableData;
+
+ AnsiCodePageData = LoadCodePageData(AnsiCode);
+ OemCodePageData = LoadCodePageData(OemCode);
+ UnicodeCaseTableData = LoadCodePageData(Unicode);
+
+ RtlInitNlsTables(AnsiCodePageData, OemCodePageData, UnicodeCaseTableData,
&NlsTable);
+ RtlResetRtlTranslations(&NlsTable);
+ /*
+ * Do NOT free the buffers here, they are directly used!
+ * Yes, we leak the old buffers, but this is a test anyway...
+ */
+}
diff --git a/modules/rostests/apitests/ntdll/precomp.h
b/modules/rostests/apitests/ntdll/precomp.h
index d476f1cc958..4871076a873 100644
--- a/modules/rostests/apitests/ntdll/precomp.h
+++ b/modules/rostests/apitests/ntdll/precomp.h
@@ -35,4 +35,10 @@ QuerySetThreadValidator(
_In_ ULONG InfoLength,
_In_ NTSTATUS ExpectedStatus);
+void
+SetupLocale(
+ _In_ ULONG AnsiCode,
+ _In_ ULONG OemCode,
+ _In_ ULONG Unicode);
+
#endif /* _NTDLL_APITEST_PRECOMP_H_ */