[ros-diffs] [tfaber] 60868: [NDK][DDK][RTL] - Correct prototypes and annotations and add missing declarations for Rtl string functions

Author: tfaber
Date: Tue Nov  5 20:40:01 2013
New Revision: 60868

URL: http://svn.reactos.org/svn/reactos?rev=60868&view=rev
Log:
[NDK][DDK][RTL]
- Correct prototypes and annotations and add missing declarations for Rtl string
functions

Modified:
    trunk/reactos/include/ddk/ntddk.h
    trunk/reactos/include/ddk/ntifs.h
    trunk/reactos/include/ndk/rtlfuncs.h
    trunk/reactos/lib/rtl/unicode.c

Modified: trunk/reactos/include/ddk/ntddk.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddk.h?rev=60…
==============================================================================
--- trunk/reactos/include/ddk/ntddk.h	[iso-8859-1] (original)
+++ trunk/reactos/include/ddk/ntddk.h	[iso-8859-1] Tue Nov  5 20:40:01 2013
@@ -4993,7 +4993,7 @@
 NTAPI
 RtlUpperString(
   _Inout_ PSTRING DestinationString,
-  _In_ const PSTRING SourceString);
+  _In_ const STRING *SourceString);
 
 _IRQL_requires_max_(PASSIVE_LEVEL)
 _When_(AllocateDestinationString, _Must_inspect_result_)
@@ -5029,8 +5029,8 @@
 LONG
 NTAPI
 RtlCompareString(
-  _In_ const PSTRING String1,
-  _In_ const PSTRING String2,
+  _In_ const STRING *String1,
+  _In_ const STRING *String2,
   _In_ BOOLEAN CaseInSensitive);
 
 NTSYSAPI
@@ -5038,7 +5038,7 @@
 NTAPI
 RtlCopyString(
   _Out_ PSTRING DestinationString,
-  _In_opt_ const PSTRING SourceString);
+  _In_opt_ const STRING *SourceString);
 
 _IRQL_requires_max_(PASSIVE_LEVEL)
 _Must_inspect_result_
@@ -5046,8 +5046,8 @@
 BOOLEAN
 NTAPI
 RtlEqualString(
-  _In_ const PSTRING String1,
-  _In_ const PSTRING String2,
+  _In_ const STRING *String1,
+  _In_ const STRING *String2,
   _In_ BOOLEAN CaseInSensitive);
 
 _IRQL_requires_max_(PASSIVE_LEVEL)

Modified: trunk/reactos/include/ddk/ntifs.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=60…
==============================================================================
--- trunk/reactos/include/ddk/ntifs.h	[iso-8859-1] (original)
+++ trunk/reactos/include/ddk/ntifs.h	[iso-8859-1] Tue Nov  5 20:40:01 2013
@@ -1005,6 +1005,16 @@
   _Out_ _At_(DestinationString->Buffer, __drv_allocatesMem(Mem))
     PUNICODE_STRING DestinationString,
   _In_z_ PCWSTR SourceString);
+
+_IRQL_requires_max_(PASSIVE_LEVEL)
+_Must_inspect_result_
+NTSYSAPI
+BOOLEAN
+NTAPI
+RtlPrefixString(
+  _In_ const STRING *String1,
+  _In_ const STRING *String2,
+  _In_ BOOLEAN CaseInsensitive);
 
 _IRQL_requires_max_(APC_LEVEL)
 NTSYSAPI

Modified: trunk/reactos/include/ndk/rtlfuncs.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev…
==============================================================================
--- trunk/reactos/include/ndk/rtlfuncs.h	[iso-8859-1] (original)
+++ trunk/reactos/include/ndk/rtlfuncs.h	[iso-8859-1] Tue Nov  5 20:40:01 2013
@@ -2161,22 +2161,74 @@
     INT *Flags
 );
 
+_IRQL_requires_max_(PASSIVE_LEVEL)
+_Must_inspect_result_
 NTSYSAPI
 BOOLEAN
 NTAPI
 RtlPrefixString(
-    PSTRING String1,
-    PSTRING String2,
-    BOOLEAN CaseInsensitive
-);
-
+    _In_ const STRING *String1,
+    _In_ const STRING *String2,
+    _In_ BOOLEAN CaseInsensitive
+);
+
+_IRQL_requires_max_(PASSIVE_LEVEL)
+_Must_inspect_result_
 NTSYSAPI
 BOOLEAN
 NTAPI
 RtlPrefixUnicodeString(
-    PCUNICODE_STRING String1,
-    PCUNICODE_STRING String2,
-    BOOLEAN CaseInsensitive
+    _In_ PCUNICODE_STRING String1,
+    _In_ PCUNICODE_STRING String2,
+    _In_ BOOLEAN CaseInsensitive
+);
+
+_IRQL_requires_max_(PASSIVE_LEVEL)
+NTSYSAPI
+VOID
+NTAPI
+RtlUpperString(
+    _Inout_ PSTRING DestinationString,
+    _In_ const STRING *SourceString
+);
+
+_IRQL_requires_max_(PASSIVE_LEVEL)
+_Must_inspect_result_
+NTSYSAPI
+LONG
+NTAPI
+RtlCompareString(
+    _In_ const STRING *String1,
+    _In_ const STRING *String2,
+    _In_ BOOLEAN CaseInSensitive
+);
+
+NTSYSAPI
+VOID
+NTAPI
+RtlCopyString(
+    _Out_ PSTRING DestinationString,
+    _In_opt_ const STRING *SourceString
+);
+
+_IRQL_requires_max_(PASSIVE_LEVEL)
+_Must_inspect_result_
+NTSYSAPI
+BOOLEAN
+NTAPI
+RtlEqualString(
+    _In_ const STRING *String1,
+    _In_ const STRING *String2,
+    _In_ BOOLEAN CaseInSensitive
+);
+
+_IRQL_requires_max_(APC_LEVEL)
+NTSYSAPI
+NTSTATUS
+NTAPI
+RtlAppendStringToString(
+    _Inout_ PSTRING Destination,
+    _In_ const STRING *Source
 );
 
 _IRQL_requires_max_(PASSIVE_LEVEL)
@@ -2190,7 +2242,7 @@
         PUNICODE_STRING DestinationString,
     _In_ PCUNICODE_STRING SourceString,
     _In_ BOOLEAN AllocateDestinationString
-    );
+);
 
 _IRQL_requires_max_(PASSIVE_LEVEL)
 NTSYSAPI

Modified: trunk/reactos/lib/rtl/unicode.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/unicode.c?rev=6086…
==============================================================================
--- trunk/reactos/lib/rtl/unicode.c	[iso-8859-1] (original)
+++ trunk/reactos/lib/rtl/unicode.c	[iso-8859-1] Tue Nov  5 20:40:01 2013
@@ -173,7 +173,7 @@
 NTSTATUS
 NTAPI
 RtlAppendStringToString(IN PSTRING Destination,
-                        IN PSTRING Source)
+                        IN const STRING *Source)
 {
     USHORT SourceLength = Source->Length;
 
@@ -346,8 +346,8 @@
 LONG
 NTAPI
 RtlCompareString(
-    IN PSTRING s1,
-    IN PSTRING s2,
+    IN const STRING *s1,
+    IN const STRING *s2,
     IN BOOLEAN CaseInsensitive)
 {
     unsigned int len;
@@ -382,8 +382,8 @@
 BOOLEAN
 NTAPI
 RtlEqualString(
-    IN PSTRING s1,
-    IN PSTRING s2,
+    IN const STRING *s1,
+    IN const STRING *s2,
     IN BOOLEAN CaseInsensitive)
 {
     if (s1->Length != s2->Length) return FALSE;
@@ -835,8 +835,8 @@
 BOOLEAN
 NTAPI
 RtlPrefixString(
-    PSTRING String1,
-    PSTRING String2,
+    const STRING *String1,
+    const STRING *String2,
     BOOLEAN CaseInsensitive)
 {
     PCHAR pc1;
@@ -2115,7 +2115,7 @@
 NTAPI
 RtlCopyString(
     IN OUT PSTRING DestinationString,
-    IN PSTRING SourceString OPTIONAL)
+    IN const STRING *SourceString OPTIONAL)
 {
     ULONG SourceLength;
     PCHAR p1, p2;
@@ -2362,7 +2362,7 @@
 VOID
 NTAPI
 RtlUpperString(PSTRING DestinationString,
-               PSTRING SourceString)
+               const STRING *SourceString)
 {
     USHORT Length;
     PCHAR Src, Dest;