Silence most of the msvc warnings

svn path=/trunk/; revision=20374

diff --git a/reactos/services/tcpsvcs/chargen.c b/reactos/services/tcpsvcs/chargen.c
index 0ec68e0..cd2500d 100644 (file)
--- a/reactos/services/tcpsvcs/chargen.c
+++ b/reactos/services/tcpsvcs/chargen.c
@@ -21,13 +21,13 @@ extern BOOL bShutDown;
 
 DWORD WINAPI ChargenHandler(VOID* Sock_)
 {
 
 DWORD WINAPI ChargenHandler(VOID* Sock_)
 {

-    DWORD RetVal = 0;
+    INT RetVal = 0;

     SOCKET Sock = (SOCKET)Sock_;
 
     if (!GenerateChars(Sock))
     {
         LogEvent(_T("Chargen: Char generation failed\n"), 0, FALSE);
     SOCKET Sock = (SOCKET)Sock_;
 
     if (!GenerateChars(Sock))
     {
         LogEvent(_T("Chargen: Char generation failed\n"), 0, FALSE);

-        RetVal = -1;
+        RetVal = 1;

     }
 
     LogEvent(_T("Chargen: Shutting connection down...\n"), 0, FALSE);
     }
 
     LogEvent(_T("Chargen: Shutting connection down...\n"), 0, FALSE);


@@ -36,7 +36,7 @@ DWORD WINAPI ChargenHandler(VOID* Sock_)
     else
     {
         LogEvent(_T("Chargen: Connection shutdown failed\n"), 0, FALSE);
     else
     {
         LogEvent(_T("Chargen: Connection shutdown failed\n"), 0, FALSE);

-        RetVal = -1;
+        RetVal = 1;

     }
     
     LogEvent(_T("Chargen: Terminating thread\n"), 0, FALSE);
     }
     
     LogEvent(_T("Chargen: Terminating thread\n"), 0, FALSE);


@@ -56,7 +56,7 @@ BOOL GenerateChars(SOCKET Sock)
 
     /* fill ring with printable characters */
     for (charIndex=0, i=START; i<=END; charIndex++, i++)
 
     /* fill ring with printable characters */
     for (charIndex=0, i=START; i<=END; charIndex++, i++)

-        ring[charIndex] = i;
+        ring[charIndex] = (char)i;

     /* save the address of the end character in the ring */
     endring = &ring[charIndex];
 
     /* save the address of the end character in the ring */
     endring = &ring[charIndex];
 

diff --git a/reactos/services/tcpsvcs/daytime.c b/reactos/services/tcpsvcs/daytime.c
index 3bcb6a6..b0e42eb 100644 (file)
--- a/reactos/services/tcpsvcs/daytime.c
+++ b/reactos/services/tcpsvcs/daytime.c
@@ -38,7 +38,7 @@ DWORD WINAPI DaytimeHandler(VOID* Sock_)
     else
     {
         LogEvent(_T("DayTime: Connection shutdown failed\n"), 0, FALSE);
     else
     {
         LogEvent(_T("DayTime: Connection shutdown failed\n"), 0, FALSE);

-        RetVal = -1;
+        RetVal = 1;

     }
     
     LogEvent(_T("DayTime: Terminating thread\n"), 0, FALSE);
     }
     
     LogEvent(_T("DayTime: Terminating thread\n"), 0, FALSE);


@@ -48,7 +48,7 @@ DWORD WINAPI DaytimeHandler(VOID* Sock_)
 
 BOOL SendTime(SOCKET Sock, TCHAR *time)
 {
 
 BOOL SendTime(SOCKET Sock, TCHAR *time)
 {

-    INT StringSize = strlen(time);
+    INT StringSize = (INT)_tcsclen(time);

     INT RetVal = send(Sock, time, sizeof(TCHAR) * StringSize, 0);
     
     if (RetVal == SOCKET_ERROR)
     INT RetVal = send(Sock, time, sizeof(TCHAR) * StringSize, 0);
     
     if (RetVal == SOCKET_ERROR)

diff --git a/reactos/services/tcpsvcs/discard.c b/reactos/services/tcpsvcs/discard.c
index bd2818b..727a937 100644 (file)
--- a/reactos/services/tcpsvcs/discard.c
+++ b/reactos/services/tcpsvcs/discard.c
@@ -24,7 +24,7 @@ DWORD WINAPI DiscardHandler(VOID* Sock_)
     if (!RecieveIncomingPackets(Sock))\r
     {\r
         LogEvent(_T("Discard: RecieveIncomingPackets failed\n"), 0, FALSE);\r
     if (!RecieveIncomingPackets(Sock))\r
     {\r
         LogEvent(_T("Discard: RecieveIncomingPackets failed\n"), 0, FALSE);\r

-        RetVal = -1;\r
+        RetVal = 1;\r

     }\r
 \r
     LogEvent(_T("Discard: Shutting connection down...\n"), 0, FALSE);\r
     }\r
 \r
     LogEvent(_T("Discard: Shutting connection down...\n"), 0, FALSE);\r


@@ -33,7 +33,7 @@ DWORD WINAPI DiscardHandler(VOID* Sock_)
     else\r
     {\r
         LogEvent(_T("Discard: Connection shutdown failed\n"), 0, FALSE);\r
     else\r
     {\r
         LogEvent(_T("Discard: Connection shutdown failed\n"), 0, FALSE);\r

-        RetVal = -1;\r
+        RetVal = 1;\r

     }\r
     \r
     LogEvent(_T("Discard: Terminating thread\n"), 0, FALSE);\r
     }\r
     \r
     LogEvent(_T("Discard: Terminating thread\n"), 0, FALSE);\r

diff --git a/reactos/services/tcpsvcs/echo.c b/reactos/services/tcpsvcs/echo.c
index 29eb7ec..3018a57 100644 (file)
--- a/reactos/services/tcpsvcs/echo.c
+++ b/reactos/services/tcpsvcs/echo.c
@@ -23,7 +23,7 @@ DWORD WINAPI EchoHandler(VOID* Sock_)
 
     if (!EchoIncomingPackets(Sock)) {
         LogEvent(_T("Echo: EchoIncomingPackets failed\n"), 0, FALSE);
 
     if (!EchoIncomingPackets(Sock)) {
         LogEvent(_T("Echo: EchoIncomingPackets failed\n"), 0, FALSE);

-        RetVal = -1;
+        RetVal = 1;

     }
 
     LogEvent(_T("Echo: Shutting connection down...\n"), 0, FALSE);
     }
 
     LogEvent(_T("Echo: Shutting connection down...\n"), 0, FALSE);


@@ -33,7 +33,7 @@ DWORD WINAPI EchoHandler(VOID* Sock_)
     else
     {
         LogEvent(_T("Echo: Connection shutdown failed\n"), 0, FALSE);
     else
     {
         LogEvent(_T("Echo: Connection shutdown failed\n"), 0, FALSE);

-        RetVal = -1;
+        RetVal = 1;

     }
     
     LogEvent(_T("Echo: Terminating thread\n"), 0, FALSE);
     }
     
     LogEvent(_T("Echo: Terminating thread\n"), 0, FALSE);

diff --git a/reactos/services/tcpsvcs/qotd.c b/reactos/services/tcpsvcs/qotd.c
index efa1455..4d10221 100644 (file)
--- a/reactos/services/tcpsvcs/qotd.c
+++ b/reactos/services/tcpsvcs/qotd.c
@@ -36,7 +36,7 @@ DWORD WINAPI QotdHandler(VOID* Sock_)
     if(! GetSystemDirectory(Sys, MAX_PATH))
     {
        LogEvent(_T("QOTD: Getting system path failed.\n"), 0, TRUE);
     if(! GetSystemDirectory(Sys, MAX_PATH))
     {
        LogEvent(_T("QOTD: Getting system path failed.\n"), 0, TRUE);

-       ExitThread(-1);
+       ExitThread(1);

     }
     
     _tcscat(Sys, FilePath);
     }
     
     _tcscat(Sys, FilePath);


@@ -49,7 +49,7 @@ DWORD WINAPI QotdHandler(VOID* Sock_)
                _stprintf(buf, _T("QOTD: Error opening quote file : %s\n"), Sys);
         LogEvent(buf, 0, TRUE);
         LogEvent(_T("QOTD: Terminating thread\n"), 0, FALSE);
                _stprintf(buf, _T("QOTD: Error opening quote file : %s\n"), Sys);
         LogEvent(buf, 0, TRUE);
         LogEvent(_T("QOTD: Terminating thread\n"), 0, FALSE);

-        ExitThread(-1);
+        ExitThread(1);

     }
 
     /* read all quotes in the file into an array */
     }
 
     /* read all quotes in the file into an array */


@@ -75,7 +75,7 @@ DWORD WINAPI QotdHandler(VOID* Sock_)
     {
         LogEvent(_T("QOTD: Connection shutdown failed\n"), 0, FALSE);
         LogEvent(_T("QOTD: Terminating thread\n"), 0, FALSE);
     {
         LogEvent(_T("QOTD: Connection shutdown failed\n"), 0, FALSE);
         LogEvent(_T("QOTD: Terminating thread\n"), 0, FALSE);

-        ExitThread(-1);
+        ExitThread(1);

     }
     
     LogEvent(_T("QOTD: Terminating thread\n"), 0, FALSE);
     }
     
     LogEvent(_T("QOTD: Terminating thread\n"), 0, FALSE);


@@ -90,7 +90,7 @@ BOOL SendQuote(SOCKET Sock, TCHAR* Quote)
     INT StringSize;
     INT RetVal;
 
     INT StringSize;
     INT RetVal;
 

-    StringSize = strlen(Quote);
+    StringSize = (INT)_tcsclen(Quote);

     RetVal = send(Sock, Quote, sizeof(TCHAR) * StringSize, 0);
 
     if (RetVal == SOCKET_ERROR)
     RetVal = send(Sock, Quote, sizeof(TCHAR) * StringSize, 0);
 
     if (RetVal == SOCKET_ERROR)

diff --git a/reactos/services/tcpsvcs/skelserver.c b/reactos/services/tcpsvcs/skelserver.c
index 99a6aaa..33847ef 100644 (file)
--- a/reactos/services/tcpsvcs/skelserver.c
+++ b/reactos/services/tcpsvcs/skelserver.c
@@ -21,13 +21,12 @@ DWORD WINAPI StartServer(LPVOID lpParam)
 {
        SOCKET ListeningSocket;
        PSERVICES pServices;
 {
        SOCKET ListeningSocket;
        PSERVICES pServices;

-    const TCHAR* HostIP = "127.0.0.1";

     TCHAR buf[256];
 
     pServices = (PSERVICES)lpParam;
 
 //DebugBreak();
     TCHAR buf[256];
 
     pServices = (PSERVICES)lpParam;
 
 //DebugBreak();

-    ListeningSocket = SetUpListener(HostIP, htons(pServices->Port));
+    ListeningSocket = SetUpListener(htons(pServices->Port));

     if (ListeningSocket == INVALID_SOCKET)
     {
                LogEvent("Socket error when setting up listener\n", 0, TRUE);
     if (ListeningSocket == INVALID_SOCKET)
     {
                LogEvent("Socket error when setting up listener\n", 0, TRUE);


@@ -45,7 +44,7 @@ DWORD WINAPI StartServer(LPVOID lpParam)
 }
 
 
 }
 
 

-SOCKET SetUpListener(const char* ServAddr, int Port)
+SOCKET SetUpListener(USHORT Port)

 {
     SOCKET Sock;
     SOCKADDR_IN Server;
 {
     SOCKET Sock;
     SOCKADDR_IN Server;

diff --git a/reactos/services/tcpsvcs/tcpsvcs.c b/reactos/services/tcpsvcs/tcpsvcs.c
index c8bbffd..809cc05 100644 (file)
--- a/reactos/services/tcpsvcs/tcpsvcs.c
+++ b/reactos/services/tcpsvcs/tcpsvcs.c
@@ -52,7 +52,7 @@ Services[NUM_SERVICES] =
 
 
 int
 
 
 int

-main(int argc, char *argv[])
+main(void)

 {
     SERVICE_TABLE_ENTRY ServiceTable[] =
     {
 {
     SERVICE_TABLE_ENTRY ServiceTable[] =
     {


@@ -245,12 +245,10 @@ CreateServers()
 }
 
 
 }
 
 

-/*     LogEvent is similar to the ReportError function used elsewhere
-       For a service, however, we ReportEvent rather than write to standard
-       error. Eventually, this function should go into the utility
-       library.  */
+/*     This is a temperary log system until our eventlog is in place  */
+

 VOID
 VOID

-LogEvent (LPCTSTR UserMessage, DWORD ExitCode, BOOL PrintErrorMsg)
+LogEvent (LPCTSTR UserMessage, INT ExitCode, BOOL PrintErrorMsg)

 {
        DWORD eMsgLen, ErrNum = GetLastError ();
        LPTSTR lpvSysMsg;
 {
        DWORD eMsgLen, ErrNum = GetLastError ();
        LPTSTR lpvSysMsg;


@@ -265,7 +263,7 @@ LogEvent (LPCTSTR UserMessage, DWORD ExitCode, BOOL PrintErrorMsg)
                        ErrNum, MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT),
                        (LPTSTR)&lpvSysMsg, 0, NULL);
 
                        ErrNum, MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT),
                        (LPTSTR)&lpvSysMsg, 0, NULL);
 

-               _stprintf(MessageBuffer, _T("%s %s ErrNum = %lu. ExitCode = %lu."),
+               _stprintf(MessageBuffer, _T("%s %s ErrNum = %lu. ExitCode = %d."),

                        UserMessage, lpvSysMsg, ErrNum, ExitCode);
                HeapFree(GetProcessHeap (), 0, lpvSysMsg);
        }
                        UserMessage, lpvSysMsg, ErrNum, ExitCode);
                HeapFree(GetProcessHeap (), 0, lpvSysMsg);
        }

diff --git a/reactos/services/tcpsvcs/tcpsvcs.h b/reactos/services/tcpsvcs/tcpsvcs.h
index 9cc089e..ed81563 100644 (file)
--- a/reactos/services/tcpsvcs/tcpsvcs.h
+++ b/reactos/services/tcpsvcs/tcpsvcs.h
@@ -44,7 +44,7 @@
 
 /* data structure to pass to threads */
 typedef struct _Services {
 
 /* data structure to pass to threads */
 typedef struct _Services {

-    INT Port;
+    USHORT Port;

     TCHAR *Name;
     LPTHREAD_START_ROUTINE Service;
 } SERVICES, *PSERVICES;
     TCHAR *Name;
     LPTHREAD_START_ROUTINE Service;
 } SERVICES, *PSERVICES;


@@ -53,13 +53,13 @@ typedef struct _Services {
 //static VOID WINAPI ServiceMain(DWORD argc, LPTSTR argv[]);
 VOID WINAPI ServerCtrlHandler(DWORD control);
 INT CreateServers(VOID);
 //static VOID WINAPI ServiceMain(DWORD argc, LPTSTR argv[]);
 VOID WINAPI ServerCtrlHandler(DWORD control);
 INT CreateServers(VOID);

-VOID LogEvent (LPCTSTR UserMessage, DWORD ExitCode, BOOL PrintErrorMsg);
+VOID LogEvent (LPCTSTR UserMessage, INT ExitCode, BOOL PrintErrorMsg);

 void UpdateStatus (int NewStatus, int Check);
 
 
 /* skelserver functions */
 DWORD WINAPI StartServer(LPVOID lpParam);
 void UpdateStatus (int NewStatus, int Check);
 
 
 /* skelserver functions */
 DWORD WINAPI StartServer(LPVOID lpParam);

-SOCKET SetUpListener(const char* ServAddr, int Port);
+SOCKET SetUpListener(USHORT Port);

 VOID AcceptConnections(SOCKET ListeningSocket,
     LPTHREAD_START_ROUTINE Service, TCHAR *Name);
 BOOL EchoIncomingPackets(SOCKET sd);
 VOID AcceptConnections(SOCKET ListeningSocket,
     LPTHREAD_START_ROUTINE Service, TCHAR *Name);
 BOOL EchoIncomingPackets(SOCKET sd);