[ros-diffs] [tfaber] 56207: [WSHTCPIP] - Fix MSVC warnings, more useful DPRINT [RTL/HEAP] - Do not use RtlFillMemory with a 32 bit pattern (CID 13722)

[tfaber at svn.reactos.org]

Author: tfaber
Date: Wed Mar 21 15:36:59 2012
New Revision: 56207

URL: http://svn.reactos.org/svn/reactos?rev=56207&view=rev
Log:
[WSHTCPIP]
- Fix MSVC warnings, more useful DPRINT
[RTL/HEAP]
- Do not use RtlFillMemory with a 32 bit pattern (CID 13722)

Modified:
    trunk/reactos/dll/win32/wshtcpip/wshtcpip.c
    trunk/reactos/lib/rtl/heappage.c

Modified: trunk/reactos/dll/win32/wshtcpip/wshtcpip.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshtcpip/wshtcpip.c?rev=56207&r1=56206&r2=56207&view=diff
==============================================================================
--- trunk/reactos/dll/win32/wshtcpip/wshtcpip.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wshtcpip/wshtcpip.c [iso-8859-1] Wed Mar 21 15:36:59 2012
@@ -75,7 +75,7 @@
     OUT PSOCKADDR Sockaddr,
     OUT PINT SockaddrLength)
 {
-    DWORD Size = 2 * sizeof(UINT);
+    INT Size = 2 * sizeof(UINT);
 
     if (*SockaddrLength < Size)
     {
@@ -184,10 +184,15 @@
           }
           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 @@
     OUT PSOCKADDR Sockaddr,
     OUT PINT SockaddrLength)
 {
-    DWORD Size = 2 * sizeof(UINT);
+    INT Size = 2 * sizeof(UINT);
 
     if (*SockaddrLength < Size)
     {
@@ -456,7 +461,7 @@
             }
             Context->RequestQueue = NULL;
             break;
-            
+
         default:
             DPRINT1("Unwanted notification received! (%d)\n", NotifyEvent);
             break;

Modified: trunk/reactos/lib/rtl/heappage.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heappage.c?rev=56207&r1=56206&r2=56207&view=diff
==============================================================================
--- trunk/reactos/lib/rtl/heappage.c [iso-8859-1] (original)
+++ trunk/reactos/lib/rtl/heappage.c [iso-8859-1] Wed Mar 21 15:36:59 2012
@@ -1464,7 +1464,7 @@
     }
 
     /* 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;