[SDK:RTL] Minimal formatting for NLS functions + Remove inadequate assert in RtlUpcas...

diff --git a/sdk/lib/rtl/nls.c b/sdk/lib/rtl/nls.c
index a875379..35f19c6 100644 (file)
--- a/sdk/lib/rtl/nls.c
+++ b/sdk/lib/rtl/nls.c
@@ -251,7 +251,9 @@ RtlMultiByteToUnicodeN(OUT PWCHAR UnicodeString,
             *ResultSize = Size * sizeof(WCHAR);
 
         for (i = 0; i < Size; i++)
+        {
             UnicodeString[i] = NlsAnsiToUnicodeTable[(UCHAR)MbString[i]];
+        }
     }
     else
     {
@@ -331,7 +333,7 @@ RtlMultiByteToUnicodeSize(OUT PULONG UnicodeSize,
     if (!NlsMbCodePageTag)
     {
         /* single-byte code page */
-        *UnicodeSize = MbSize * sizeof (WCHAR);
+        *UnicodeSize = MbSize * sizeof(WCHAR);
     }
     else
     {
@@ -535,8 +537,8 @@ RtlUnicodeToMultiByteN(OUT PCHAR MbString,
     if (!NlsMbCodePageTag)
     {
         /* single-byte code page */
-        Size =  (UnicodeSize > (MbSize * sizeof (WCHAR)))
-                 ? MbSize : (UnicodeSize / sizeof (WCHAR));
+        Size = (UnicodeSize > (MbSize * sizeof(WCHAR)))
+                ? MbSize : (UnicodeSize / sizeof(WCHAR));
 
         if (ResultSize)
             *ResultSize = Size;
@@ -830,8 +832,6 @@ RtlUpcaseUnicodeToOemN(OUT PCHAR OemString,
 
     PAGED_CODE_RTL();
 
-    ASSERT(NlsUnicodeToOemTable != NULL);
-
     if (!NlsMbOemCodePageTag)
     {
         /* single-byte code page */

diff --git a/sdk/lib/rtl/unicode.c b/sdk/lib/rtl/unicode.c
index c7e8594..8c7248d 100644 (file)
--- a/sdk/lib/rtl/unicode.c
+++ b/sdk/lib/rtl/unicode.c
@@ -101,7 +101,7 @@ RtlAnsiStringToUnicodeString(
 
     if (NlsMbCodePageTag == FALSE)
     {
-        Length = AnsiSource->Length * 2 + sizeof(WCHAR);
+        Length = (AnsiSource->Length + 1) * sizeof(WCHAR);
     }
     else
     {
@@ -2236,7 +2236,7 @@ RtlCopyString(
     PCHAR p1, p2;
 
     /* Check if there was no source given */
-    if(!SourceString)
+    if (!SourceString)
     {
         /* Simply return an empty string */
         DestinationString->Length = 0;
@@ -2275,7 +2275,7 @@ RtlCopyUnicodeString(
 {
     ULONG SourceLength;
 
-    if(SourceString == NULL)
+    if (!SourceString)
     {
         DestinationString->Length = 0;
     }
@@ -2431,7 +2431,7 @@ RtlAppendUnicodeToString(IN OUT PUNICODE_STRING Destination,
         Destination->Length += Length;
 
         /* append terminating '\0' if enough space */
-        if(Destination->MaximumLength > Destination->Length)
+        if (Destination->MaximumLength > Destination->Length)
         {
             DestBuffer[Length / sizeof(WCHAR)] = UNICODE_NULL;
         }