From 1476d96626b764ada83f79fa01d354a431c25b41 Mon Sep 17 00:00:00 2001
From: Thomas Faber <thomas.faber@reactos.org>
Date: Wed, 21 Mar 2012 15:36:59 +0000
Subject: [PATCH] [WSHTCPIP] - Fix MSVC warnings, more useful DPRINT [RTL/HEAP]
 - Do not use RtlFillMemory with a 32 bit pattern (CID 13722)

svn path=/trunk/; revision=56207
---
 reactos/dll/win32/wshtcpip/wshtcpip.c | 13 +++++++++----
 reactos/lib/rtl/heappage.c            |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/reactos/dll/win32/wshtcpip/wshtcpip.c b/reactos/dll/win32/wshtcpip/wshtcpip.c
index f9393a0957b..f21833c100e 100644
--- a/reactos/dll/win32/wshtcpip/wshtcpip.c
+++ b/reactos/dll/win32/wshtcpip/wshtcpip.c
@@ -75,7 +75,7 @@ WSHGetBroadcastSockaddr(
     OUT PSOCKADDR Sockaddr,
     OUT PINT SockaddrLength)
 {
-    DWORD Size = 2 * sizeof(UINT);
+    INT Size = 2 * sizeof(UINT);
 
     if (*SockaddrLength < Size)
     {
@@ -184,10 +184,15 @@ GetAddressOption(INT Level, INT OptionName)
           }
           break;
 
+       case SOL_SOCKET:
+          DPRINT1("SOL_SOCKET option %d\n", OptionName);
+          break;
+
        default:
           DPRINT1("Unknown level: %d\n", Level);
-          return 0;
+          break;
     }
+    return 0;
 }
 
 INT
@@ -215,7 +220,7 @@ WSHGetWildcardSockaddr(
     OUT PSOCKADDR Sockaddr,
     OUT PINT SockaddrLength)
 {
-    DWORD Size = 2 * sizeof(UINT);
+    INT Size = 2 * sizeof(UINT);
 
     if (*SockaddrLength < Size)
     {
@@ -456,7 +461,7 @@ WSHNotify(
             }
             Context->RequestQueue = NULL;
             break;
-            
+
         default:
             DPRINT1("Unwanted notification received! (%d)\n", NotifyEvent);
             break;
diff --git a/reactos/lib/rtl/heappage.c b/reactos/lib/rtl/heappage.c
index f8a7efd0652..8698180eda9 100644
--- a/reactos/lib/rtl/heappage.c
+++ b/reactos/lib/rtl/heappage.c
@@ -1464,7 +1464,7 @@ RtlpPageHeapCreate(ULONG Flags,
     }
 
     /* Start preparing the 1st page. Fill it with the default filler */
-    RtlFillMemory(Base, PAGE_SIZE, DPH_FILL);
+    RtlFillMemoryUlong(Base, PAGE_SIZE, DPH_FILL);
 
     /* Set flags in the "HEAP" structure */
     HeapPtr = (PHEAP)Base;