[ros-diffs] [dchapyshev] 42114: - Fix some warnings

Author: dchapyshev
Date: Tue Jul 21 11:10:28 2009
New Revision: 42114

URL: http://svn.reactos.org/svn/reactos?rev=42114&view=rev
Log:
- Fix some warnings

Modified:
    trunk/reactos/dll/win32/ws2_32_new/src/dthread.c
    trunk/reactos/dll/win32/ws2_32_new/src/getproto.c
    trunk/reactos/dll/win32/ws2_32_new/src/nscatent.c
    trunk/reactos/dll/win32/ws2_32_new/src/select.c
    trunk/reactos/dll/win32/ws2_32_new/src/wsautil.c

Modified: trunk/reactos/dll/win32/ws2_32_new/src/dthread.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/d…
==============================================================================
--- trunk/reactos/dll/win32/ws2_32_new/src/dthread.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ws2_32_new/src/dthread.c [iso-8859-1] Tue Jul 21 11:10:28
2009
@@ -66,7 +66,7 @@
     FARPROC OldHook = Thread->BlockingHook;
 
     /* Check if we're resetting to our default hook */
-    if (BlockingHook == WsThreadDefaultBlockingHook)
+    if (BlockingHook == (FARPROC)WsThreadDefaultBlockingHook)
     {
         /* Clear out the blocking callback */
         Thread->BlockingCallback = NULL;
@@ -87,7 +87,7 @@
 WsThreadUnhookBlockingHook(IN PWSTHREAD Thread)
 {
     /* Reset the hook to the default, and remove the callback */
-    Thread->BlockingHook = WsThreadDefaultBlockingHook;
+    Thread->BlockingHook = (FARPROC)WsThreadDefaultBlockingHook;
     Thread->BlockingCallback = NULL;
 
     /* Return success */
@@ -143,7 +143,7 @@
     Thread = HeapAlloc(WsSockHeap, HEAP_ZERO_MEMORY, sizeof(*Thread));
 
     /* Set non-zero data */
-    Thread->BlockingHook = WsThreadDefaultBlockingHook;
+    Thread->BlockingHook = (FARPROC)WsThreadDefaultBlockingHook;
 
     /* Return it */
     return Thread;

Modified: trunk/reactos/dll/win32/ws2_32_new/src/getproto.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/g…
==============================================================================
--- trunk/reactos/dll/win32/ws2_32_new/src/getproto.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ws2_32_new/src/getproto.c [iso-8859-1] Tue Jul 21 11:10:28
2009
@@ -40,7 +40,7 @@
                                     "DatabasePath",
                                     NULL,
                                     &RegType,
-                                    DatabasePath,
+                                    (LPBYTE)DatabasePath,
                                     &RegSize);
 
         /* Close the key */

Modified: trunk/reactos/dll/win32/ws2_32_new/src/nscatent.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/n…
==============================================================================
--- trunk/reactos/dll/win32/ws2_32_new/src/nscatent.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ws2_32_new/src/nscatent.c [iso-8859-1] Tue Jul 21 11:10:28
2009
@@ -72,7 +72,7 @@
     ULONG RegSize = MAX_PATH;
 
     /* Convert to a 00000xxx string */
-    sprintf(CatalogEntryName, "%0""12""i", UniqueId);
+    sprintf(CatalogEntryName, "%0""12""i", (int)UniqueId);
 
     /* Open the Entry */
     Return = RegOpenKeyEx(ParentKey,

Modified: trunk/reactos/dll/win32/ws2_32_new/src/select.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s…
==============================================================================
--- trunk/reactos/dll/win32/ws2_32_new/src/select.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ws2_32_new/src/select.c [iso-8859-1] Tue Jul 21 11:10:28 2009
@@ -83,7 +83,7 @@
                                                                readfds, 
                                                                writefds,
                                                                exceptfds, 
-                                                               timeout, 
+                                                               (struct timeval *)timeout,

                                                                &ErrorCode);
                 /* Deference the Socket Context */
                 WsSockDereference(Socket);

Modified: trunk/reactos/dll/win32/ws2_32_new/src/wsautil.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/w…
==============================================================================
--- trunk/reactos/dll/win32/ws2_32_new/src/wsautil.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ws2_32_new/src/wsautil.c [iso-8859-1] Tue Jul 21 11:10:28
2009
@@ -182,7 +182,7 @@
         }
 
         /* Try to open it for writing */
-        sprintf(KeyBuffer, "%08.8lX", NewUniqueId);
+        sprintf(KeyBuffer, "%8.8lX", NewUniqueId);
         ErrorCode = RegOpenKeyEx(CatalogKey,
                                  KeyBuffer,
                                  0,