- Handle RtlYyyStringToZzzStringSize->RtlxYyyStringtoZzzStringSize
correctly so that the MSDDK macros can work and be added to the NDK/gnu
ifs
Modified: trunk/reactos/lib/ntdll/def/ntdll.def
Modified: trunk/reactos/lib/rtl/unicode.c
Modified: trunk/reactos/ntoskrnl/ntoskrnl.def
_____
Modified: trunk/reactos/lib/ntdll/def/ntdll.def
--- trunk/reactos/lib/ntdll/def/ntdll.def 2005-09-06 06:19:30 UTC
(rev 17689)
+++ trunk/reactos/lib/ntdll/def/ntdll.def 2005-09-06 06:30:49 UTC
(rev 17690)
@@ -305,7 +305,7 @@
RtlAllocateHandle@8
RtlAllocateHeap@12
RtlAnsiCharToUnicodeChar@4
-RtlAnsiStringToUnicodeSize@4
+RtlAnsiStringToUnicodeSize@4=RtlxAnsiStringToUnicodeSize@4
RtlAnsiStringToUnicodeString@12
RtlAppendAsciizToString@8
RtlAppendStringToString@8
@@ -569,7 +569,7 @@
RtlNumberGenericTableElementsAvl@4
RtlNumberOfClearBits@4
RtlNumberOfSetBits@4
-RtlOemStringToUnicodeSize@4
+RtlOemStringToUnicodeSize@4=RtlxOemStringToUnicodeSize@4
RtlOemStringToUnicodeString@12
RtlOemToUnicodeN@20
RtlOpenCurrentUser@8
@@ -646,11 +646,11 @@
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
_____
Modified: trunk/reactos/lib/rtl/unicode.c
--- trunk/reactos/lib/rtl/unicode.c 2005-09-06 06:19:30 UTC (rev
17689)
+++ trunk/reactos/lib/rtl/unicode.c 2005-09-06 06:30:49 UTC (rev
17690)
@@ -66,7 +66,7 @@
*/
ULONG
STDCALL
-RtlAnsiStringToUnicodeSize(IN PANSI_STRING AnsiString)
+RtlxAnsiStringToUnicodeSize(IN PANSI_STRING AnsiString)
{
ULONG Size;
@@ -883,7 +883,7 @@
*/
ULONG
STDCALL
-RtlUnicodeStringToOemSize(
+RtlxUnicodeStringToOemSize(
IN PUNICODE_STRING UnicodeString)
{
ULONG Size;
@@ -1830,7 +1830,7 @@
*/
ULONG
STDCALL
-RtlOemStringToUnicodeSize(IN POEM_STRING OemString)
+RtlxOemStringToUnicodeSize(IN POEM_STRING OemString)
{
ULONG Size;
@@ -1893,7 +1893,7 @@
*/
ULONG
STDCALL
-RtlUnicodeStringToAnsiSize(
+RtlxUnicodeStringToAnsiSize(
IN PUNICODE_STRING UnicodeString)
{
ULONG Size;
@@ -2261,9 +2261,9 @@
* @implemented
*/
ULONG STDCALL
-RtlxAnsiStringToUnicodeSize(IN PANSI_STRING AnsiString)
+RtlAnsiStringToUnicodeSize(IN PANSI_STRING AnsiString)
{
- return RtlAnsiStringToUnicodeSize(AnsiString);
+ return RtlxAnsiStringToUnicodeSize(AnsiString);
}
@@ -2271,9 +2271,9 @@
* @implemented
*/
ULONG STDCALL
-RtlxOemStringToUnicodeSize(IN POEM_STRING OemString)
+RtlOemStringToUnicodeSize(IN POEM_STRING OemString)
{
- return RtlOemStringToUnicodeSize(OemString);
+ return RtlxOemStringToUnicodeSize(OemString);
}
@@ -2282,9 +2282,9 @@
* @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 @@
* @implemented
*/
ULONG STDCALL
-RtlxUnicodeStringToOemSize(IN PUNICODE_STRING UnicodeString)
+RtlUnicodeStringToOemSize(IN PUNICODE_STRING UnicodeString)
{
- return RtlUnicodeStringToOemSize(UnicodeString);
+ return RtlxUnicodeStringToOemSize(UnicodeString);
}
/*
_____
Modified: trunk/reactos/ntoskrnl/ntoskrnl.def
--- trunk/reactos/ntoskrnl/ntoskrnl.def 2005-09-06 06:19:30 UTC (rev
17689)
+++ trunk/reactos/ntoskrnl/ntoskrnl.def 2005-09-06 06:30:49 UTC (rev
17690)
@@ -962,7 +962,7 @@
;RtlAllocateAndInitializeSid
RtlAllocateHeap@12
RtlAnsiCharToUnicodeChar@4
-RtlAnsiStringToUnicodeSize@4
+RtlAnsiStringToUnicodeSize@4=RtlxAnsiStringToUnicodeSize@4
RtlAnsiStringToUnicodeString@12
RtlAppendAsciizToString@8
RtlAppendStringToString@8
@@ -1149,7 +1149,7 @@
RtlNumberOfClearBits@4
RtlNumberOfSetBits@4
RtlOemStringToCountedUnicodeString@12
-RtlOemStringToUnicodeSize@4
+RtlOemStringToUnicodeSize@4=RtlxOemStringToUnicodeSize@4
RtlOemStringToUnicodeString@12
RtlOemToUnicodeN@20
RtlPinAtomInAtomTable@8
@@ -1193,11 +1193,11 @@
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