From fd8fa4a64cc0147d1cfd2605a014b37d83cbc14c Mon Sep 17 00:00:00 2001 From: Dmitry Chapyshev Date: Tue, 21 Jul 2009 09:10:28 +0000 Subject: [PATCH] - Fix some warnings svn path=/trunk/; revision=42114 --- reactos/dll/win32/ws2_32_new/src/dthread.c | 6 +++--- reactos/dll/win32/ws2_32_new/src/getproto.c | 2 +- reactos/dll/win32/ws2_32_new/src/nscatent.c | 2 +- reactos/dll/win32/ws2_32_new/src/select.c | 2 +- reactos/dll/win32/ws2_32_new/src/wsautil.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/reactos/dll/win32/ws2_32_new/src/dthread.c b/reactos/dll/win32/ws2_32_new/src/dthread.c index 1534f8d4026..8349552abf7 100644 --- a/reactos/dll/win32/ws2_32_new/src/dthread.c +++ b/reactos/dll/win32/ws2_32_new/src/dthread.c @@ -66,7 +66,7 @@ WsThreadSetBlockingHook(IN PWSTHREAD Thread, 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 @@ WSAAPI 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 @@ WsThreadAllocate(VOID) Thread = HeapAlloc(WsSockHeap, HEAP_ZERO_MEMORY, sizeof(*Thread)); /* Set non-zero data */ - Thread->BlockingHook = WsThreadDefaultBlockingHook; + Thread->BlockingHook = (FARPROC)WsThreadDefaultBlockingHook; /* Return it */ return Thread; diff --git a/reactos/dll/win32/ws2_32_new/src/getproto.c b/reactos/dll/win32/ws2_32_new/src/getproto.c index e4a06cca1a4..3fe8f6b5525 100644 --- a/reactos/dll/win32/ws2_32_new/src/getproto.c +++ b/reactos/dll/win32/ws2_32_new/src/getproto.c @@ -40,7 +40,7 @@ GetProtoOpenNetworkDatabase(PCHAR Name) "DatabasePath", NULL, &RegType, - DatabasePath, + (LPBYTE)DatabasePath, &RegSize); /* Close the key */ diff --git a/reactos/dll/win32/ws2_32_new/src/nscatent.c b/reactos/dll/win32/ws2_32_new/src/nscatent.c index 190f7747e70..13794a7440a 100644 --- a/reactos/dll/win32/ws2_32_new/src/nscatent.c +++ b/reactos/dll/win32/ws2_32_new/src/nscatent.c @@ -72,7 +72,7 @@ WsNcEntryInitializeFromRegistry(IN PNSCATALOG_ENTRY CatalogEntry, 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, diff --git a/reactos/dll/win32/ws2_32_new/src/select.c b/reactos/dll/win32/ws2_32_new/src/select.c index 22b9a726203..79680b715d9 100644 --- a/reactos/dll/win32/ws2_32_new/src/select.c +++ b/reactos/dll/win32/ws2_32_new/src/select.c @@ -83,7 +83,7 @@ select(IN INT s, readfds, writefds, exceptfds, - timeout, + (struct timeval *)timeout, &ErrorCode); /* Deference the Socket Context */ WsSockDereference(Socket); diff --git a/reactos/dll/win32/ws2_32_new/src/wsautil.c b/reactos/dll/win32/ws2_32_new/src/wsautil.c index 9881d97a9b4..9372c8306d0 100644 --- a/reactos/dll/win32/ws2_32_new/src/wsautil.c +++ b/reactos/dll/win32/ws2_32_new/src/wsautil.c @@ -182,7 +182,7 @@ WsSetupCatalogProtection(IN HKEY CatalogKey, } /* Try to open it for writing */ - sprintf(KeyBuffer, "%08.8lX", NewUniqueId); + sprintf(KeyBuffer, "%8.8lX", NewUniqueId); ErrorCode = RegOpenKeyEx(CatalogKey, KeyBuffer, 0,