From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Mon, 17 Dec 2012 13:27:33 +0000 (+0000)
Subject: [RTL]
X-Git-Tag: backups/ros-csrss@60644~104^2~94
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=4ff569d0f3061f79484ff99d3d170193b9ba6ed4

[RTL]
Revert silencing a warning and apply a real fix. Spotted by Thomas.

svn path=/trunk/; revision=57938
---

diff --git a/reactos/lib/rtl/registry.c b/reactos/lib/rtl/registry.c
index 79230a12ce4..1262499047d 100644
--- a/reactos/lib/rtl/registry.c
+++ b/reactos/lib/rtl/registry.c
@@ -10,8 +10,6 @@
 /* INCLUDES *****************************************************************/
 
 #include <rtl.h>
-#include <suppress.h>
-
 #define NDEBUG
 #include <debug.h>
 
@@ -244,8 +242,7 @@ RtlpCallQueryRegistryRoutine(IN PRTL_QUERY_REGISTRY_TABLE QueryTable,
         {
             /* Prepare defaults */
             Status = STATUS_SUCCESS;
-            _PRAGMA_WARNING_SUPPRESS(__WARNING_SIZEOF_COUNTOF_MISMATCH)
-            ValueEnd = (PWSTR)((ULONG_PTR)Data + Length) - sizeof(UNICODE_NULL);
+            ValueEnd = (PWSTR)((ULONG_PTR)Data + Length - sizeof(UNICODE_NULL));
             p = Data;
 
             /* Loop all strings */
@@ -837,7 +834,7 @@ RtlpNtEnumerateSubKey(IN HANDLE KeyHandle,
                             KeyInfo,
                             BufferLength,
                             &ReturnedLength);
-    if (NT_SUCCESS(Status) && (KeyInfo != NULL))
+    if (NT_SUCCESS(Status))
     {
         /* Check if the name fits */
         if (KeyInfo->NameLength <= SubKeyName->MaximumLength)