From 870c588c1e2bc86dabae15ea42cbc01432a0a674 Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Tue, 6 Sep 2005 06:30:49 +0000
Subject: [PATCH] - Handle
 RtlYyyStringToZzzStringSize->RtlxYyyStringtoZzzStringSize correctly so that
 the MSDDK macros can work and be added to the NDK/gnu ifs

svn path=/trunk/; revision=17690
---
 reactos/lib/ntdll/def/ntdll.def |  8 ++++----
 reactos/lib/rtl/unicode.c       | 24 ++++++++++++------------
 reactos/ntoskrnl/ntoskrnl.def   |  8 ++++----
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/reactos/lib/ntdll/def/ntdll.def b/reactos/lib/ntdll/def/ntdll.def
index 9c3ff0522bc..ad84e2e758b 100644
--- a/reactos/lib/ntdll/def/ntdll.def
+++ b/reactos/lib/ntdll/def/ntdll.def
@@ -305,7 +305,7 @@ RtlAllocateAndInitializeSid@44
 RtlAllocateHandle@8
 RtlAllocateHeap@12
 RtlAnsiCharToUnicodeChar@4
-RtlAnsiStringToUnicodeSize@4
+RtlAnsiStringToUnicodeSize@4=RtlxAnsiStringToUnicodeSize@4
 RtlAnsiStringToUnicodeString@12
 RtlAppendAsciizToString@8
 RtlAppendStringToString@8
@@ -569,7 +569,7 @@ RtlNumberGenericTableElements@4
 RtlNumberGenericTableElementsAvl@4
 RtlNumberOfClearBits@4
 RtlNumberOfSetBits@4
-RtlOemStringToUnicodeSize@4
+RtlOemStringToUnicodeSize@4=RtlxOemStringToUnicodeSize@4
 RtlOemStringToUnicodeString@12
 RtlOemToUnicodeN@20
 RtlOpenCurrentUser@8
@@ -646,11 +646,11 @@ RtlTimeToTimeFields@8
 RtlTryEnterCriticalSection@4
 @RtlUlongByteSwap@4
 @RtlUlonglongByteSwap@8
-RtlUnicodeStringToAnsiSize@4
+RtlUnicodeStringToAnsiSize@4=RtlxUnicodeStringToAnsiSize@4
 RtlUnicodeStringToAnsiString@12
 RtlUnicodeStringToCountedOemString@12
 RtlUnicodeStringToInteger@12
-RtlUnicodeStringToOemSize@4
+RtlUnicodeStringToOemSize@4=RtlxUnicodeStringToOemSize@4
 RtlUnicodeStringToOemString@12
 RtlUnicodeToCustomCPN@24
 RtlUnicodeToMultiByteN@20
diff --git a/reactos/lib/rtl/unicode.c b/reactos/lib/rtl/unicode.c
index 56c0a44d1cb..2fccb36b52b 100644
--- a/reactos/lib/rtl/unicode.c
+++ b/reactos/lib/rtl/unicode.c
@@ -66,7 +66,7 @@ RtlAnsiCharToUnicodeChar (IN CHAR AnsiChar)
  */
 ULONG
 STDCALL
-RtlAnsiStringToUnicodeSize(IN PANSI_STRING AnsiString)
+RtlxAnsiStringToUnicodeSize(IN PANSI_STRING AnsiString)
 {
    ULONG Size;
 
@@ -883,7 +883,7 @@ RtlUnicodeStringToInteger(
  */
 ULONG
 STDCALL
-RtlUnicodeStringToOemSize(
+RtlxUnicodeStringToOemSize(
    IN PUNICODE_STRING UnicodeString)
 {
    ULONG Size;
@@ -1830,7 +1830,7 @@ RtlUpcaseUnicodeStringToOemString (
  */
 ULONG
 STDCALL
-RtlOemStringToUnicodeSize(IN POEM_STRING OemString)
+RtlxOemStringToUnicodeSize(IN POEM_STRING OemString)
 {
    ULONG Size;
 
@@ -1893,7 +1893,7 @@ RtlStringFromGUID (IN REFGUID Guid,
  */
 ULONG
 STDCALL
-RtlUnicodeStringToAnsiSize(
+RtlxUnicodeStringToAnsiSize(
    IN PUNICODE_STRING UnicodeString)
 {
    ULONG Size;
@@ -2261,9 +2261,9 @@ RtlUpperString(PSTRING DestinationString,
  * @implemented
  */
 ULONG STDCALL
-RtlxAnsiStringToUnicodeSize(IN PANSI_STRING AnsiString)
+RtlAnsiStringToUnicodeSize(IN PANSI_STRING AnsiString)
 {
-   return RtlAnsiStringToUnicodeSize(AnsiString);
+   return RtlxAnsiStringToUnicodeSize(AnsiString);
 }
 
 
@@ -2271,9 +2271,9 @@ RtlxAnsiStringToUnicodeSize(IN PANSI_STRING AnsiString)
  * @implemented
  */
 ULONG STDCALL
-RtlxOemStringToUnicodeSize(IN POEM_STRING OemString)
+RtlOemStringToUnicodeSize(IN POEM_STRING OemString)
 {
-   return RtlOemStringToUnicodeSize(OemString);
+   return RtlxOemStringToUnicodeSize(OemString);
 }
 
 
@@ -2282,9 +2282,9 @@ RtlxOemStringToUnicodeSize(IN POEM_STRING OemString)
  * @implemented
  */
 ULONG STDCALL
-RtlxUnicodeStringToAnsiSize(IN PCUNICODE_STRING UnicodeString)
+RtlUnicodeStringToAnsiSize(IN PUNICODE_STRING UnicodeString)
 {
-   return RtlUnicodeStringToAnsiSize((PUNICODE_STRING)UnicodeString);
+   return RtlxUnicodeStringToAnsiSize(UnicodeString);
 }
 
 
@@ -2292,9 +2292,9 @@ RtlxUnicodeStringToAnsiSize(IN PCUNICODE_STRING UnicodeString)
  * @implemented
  */
 ULONG STDCALL
-RtlxUnicodeStringToOemSize(IN PUNICODE_STRING UnicodeString)
+RtlUnicodeStringToOemSize(IN PUNICODE_STRING UnicodeString)
 {
-   return RtlUnicodeStringToOemSize(UnicodeString);
+   return RtlxUnicodeStringToOemSize(UnicodeString);
 }
 
 /*
diff --git a/reactos/ntoskrnl/ntoskrnl.def b/reactos/ntoskrnl/ntoskrnl.def
index abe4606ed98..e84d3bc71db 100644
--- a/reactos/ntoskrnl/ntoskrnl.def
+++ b/reactos/ntoskrnl/ntoskrnl.def
@@ -962,7 +962,7 @@ RtlAddRange@36
 ;RtlAllocateAndInitializeSid
 RtlAllocateHeap@12
 RtlAnsiCharToUnicodeChar@4
-RtlAnsiStringToUnicodeSize@4
+RtlAnsiStringToUnicodeSize@4=RtlxAnsiStringToUnicodeSize@4
 RtlAnsiStringToUnicodeString@12
 RtlAppendAsciizToString@8
 RtlAppendStringToString@8
@@ -1149,7 +1149,7 @@ RtlNumberGenericTableElementsAvl@4
 RtlNumberOfClearBits@4
 RtlNumberOfSetBits@4
 RtlOemStringToCountedUnicodeString@12
-RtlOemStringToUnicodeSize@4
+RtlOemStringToUnicodeSize@4=RtlxOemStringToUnicodeSize@4
 RtlOemStringToUnicodeString@12
 RtlOemToUnicodeN@20
 RtlPinAtomInAtomTable@8
@@ -1193,11 +1193,11 @@ RtlTimeToSecondsSince1980@8
 RtlTimeToTimeFields@8
 @RtlUlongByteSwap@4
 @RtlUlonglongByteSwap@8
-RtlUnicodeStringToAnsiSize@4
+RtlUnicodeStringToAnsiSize@4=RtlxUnicodeStringToAnsiSize@4
 RtlUnicodeStringToAnsiString@12
 RtlUnicodeStringToCountedOemString@12
 RtlUnicodeStringToInteger@12
-RtlUnicodeStringToOemSize@4
+RtlUnicodeStringToOemSize@4=RtlxUnicodeStringToOemSize@4
 RtlUnicodeStringToOemString@12
 RtlUnicodeToCustomCPN@24
 RtlUnicodeToMultiByteN@20