Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-12 15:45:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[RTL]

Browse source 
- NlsDbcsUnicodeToAnsiTable -> NlsUnicodeToMbAnsiTable, NlsDbcsUnicodeToOemTable -> NlsUnicodeToMbOemTable
- Change types to USHORT (its not PWCHAR's)

svn path=/trunk/; revision=72584
This commit is contained in:
Dmitry Chapyshev 2016-09-05 17:32:06 +00:00
parent ee0aa584d8
commit 05a9507394
1 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
reactos/sdk/lib/rtl/nls.c
View file

@ -20,17 +20,16 @@ PUSHORT NlsUnicodeLowercaseTable = NULL;
USHORT NlsAnsiCodePage = 0; /* exported */ USHORT NlsAnsiCodePage = 0; /* exported */
BOOLEAN NlsMbCodePageTag = FALSE; /* exported */ BOOLEAN NlsMbCodePageTag = FALSE; /* exported */
PWCHAR NlsAnsiToUnicodeTable = NULL; PUSHORT NlsAnsiToUnicodeTable = NULL;
PCHAR NlsUnicodeToAnsiTable = NULL; PCHAR NlsUnicodeToAnsiTable = NULL;
PWCHAR NlsDbcsUnicodeToAnsiTable = NULL; PUSHORT NlsUnicodeToMbAnsiTable = NULL;
PUSHORT NlsLeadByteInfo = NULL; /* exported */ PUSHORT NlsLeadByteInfo = NULL; /* exported */
USHORT NlsOemCodePage = 0; USHORT NlsOemCodePage = 0;
BOOLEAN NlsMbOemCodePageTag = FALSE; /* exported */ BOOLEAN NlsMbOemCodePageTag = FALSE; /* exported */
PWCHAR NlsOemToUnicodeTable = NULL; PUSHORT NlsOemToUnicodeTable = NULL;
PCHAR NlsUnicodeToOemTable = NULL; PCHAR NlsUnicodeToOemTable = NULL;
PWCHAR NlsDbcsUnicodeToOemTable = NULL; PUSHORT NlsUnicodeToMbOemTable = NULL;
PUSHORT NlsOemLeadByteInfo = NULL; /* exported */ PUSHORT NlsOemLeadByteInfo = NULL; /* exported */
USHORT NlsOemDefaultChar = '\0'; USHORT NlsOemDefaultChar = '\0';
@ -444,18 +443,18 @@ RtlResetRtlTranslations(IN PNLSTABLEINFO NlsTable)
DPRINT("RtlResetRtlTranslations() called\n"); DPRINT("RtlResetRtlTranslations() called\n");
/* Set ANSI data */ /* Set ANSI data */
NlsAnsiToUnicodeTable = (PWCHAR)NlsTable->AnsiTableInfo.MultiByteTable; /* Real type is PUSHORT */ NlsAnsiToUnicodeTable = (PUSHORT)NlsTable->AnsiTableInfo.MultiByteTable;
NlsUnicodeToAnsiTable = NlsTable->AnsiTableInfo.WideCharTable; NlsUnicodeToAnsiTable = NlsTable->AnsiTableInfo.WideCharTable;
NlsDbcsUnicodeToAnsiTable = (PWCHAR)NlsTable->AnsiTableInfo.WideCharTable; NlsUnicodeToMbAnsiTable = (PUSHORT)NlsTable->AnsiTableInfo.WideCharTable;
NlsMbCodePageTag = (NlsTable->AnsiTableInfo.DBCSCodePage != 0); NlsMbCodePageTag = (NlsTable->AnsiTableInfo.DBCSCodePage != 0);
NlsLeadByteInfo = NlsTable->AnsiTableInfo.DBCSOffsets; NlsLeadByteInfo = NlsTable->AnsiTableInfo.DBCSOffsets;
NlsAnsiCodePage = NlsTable->AnsiTableInfo.CodePage; NlsAnsiCodePage = NlsTable->AnsiTableInfo.CodePage;
DPRINT("Ansi codepage %hu\n", NlsAnsiCodePage); DPRINT("Ansi codepage %hu\n", NlsAnsiCodePage);
/* Set OEM data */ /* Set OEM data */
NlsOemToUnicodeTable = (PWCHAR)NlsTable->OemTableInfo.MultiByteTable; /* Real type is PUSHORT */ NlsOemToUnicodeTable = (PUSHORT)NlsTable->OemTableInfo.MultiByteTable;
NlsUnicodeToOemTable = NlsTable->OemTableInfo.WideCharTable; NlsUnicodeToOemTable = NlsTable->OemTableInfo.WideCharTable;
NlsDbcsUnicodeToOemTable = (PWCHAR)NlsTable->OemTableInfo.WideCharTable; NlsUnicodeToMbOemTable = (PUSHORT)NlsTable->OemTableInfo.WideCharTable;
NlsMbOemCodePageTag = (NlsTable->OemTableInfo.DBCSCodePage != 0); NlsMbOemCodePageTag = (NlsTable->OemTableInfo.DBCSCodePage != 0);
NlsOemLeadByteInfo = NlsTable->OemTableInfo.DBCSOffsets; NlsOemLeadByteInfo = NlsTable->OemTableInfo.DBCSOffsets;
NlsOemCodePage = NlsTable->OemTableInfo.CodePage; NlsOemCodePage = NlsTable->OemTableInfo.CodePage;
@ -566,7 +565,7 @@ RtlUnicodeToMultiByteN (PCHAR MbString,
continue; continue;
} }
MbChar = NlsDbcsUnicodeToAnsiTable[WideChar]; MbChar = NlsUnicodeToMbAnsiTable[WideChar];
if (!HIBYTE(MbChar)) if (!HIBYTE(MbChar))
{ {
@ -616,7 +615,7 @@ RtlUnicodeToMultiByteSize(PULONG MbSize,
{ {
USHORT WideChar = *UnicodeString++; USHORT WideChar = *UnicodeString++;
if (WideChar >= 0x80 && HIBYTE(NlsDbcsUnicodeToAnsiTable[WideChar])) if (WideChar >= 0x80 && HIBYTE(NlsUnicodeToMbAnsiTable[WideChar]))
{ {
MbLength += sizeof(WCHAR); MbLength += sizeof(WCHAR);
} }
@ -682,7 +681,7 @@ RtlUnicodeToOemN (PCHAR OemString,
continue; continue;
} }
OemChar = NlsDbcsUnicodeToOemTable[WideChar]; OemChar = NlsUnicodeToMbOemTable[WideChar];
if (!HIBYTE(OemChar)) if (!HIBYTE(OemChar))
{ {
@ -879,7 +878,7 @@ RtlUpcaseUnicodeToOemN (PCHAR OemString,
continue; continue;
} }
OemChar = NlsDbcsUnicodeToOemTable[WideChar]; OemChar = NlsUnicodeToMbOemTable[WideChar];
if (!HIBYTE(OemChar)) if (!HIBYTE(OemChar))
{ {