Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 18558: Add tcpsvcs to the services directory.
by gedmurphy＠svn.reactos.com 18 Oct '05

18 Oct '05

Add tcpsvcs to the services directory. Modified: trunk/reactos/bootdata/packages/reactos.dff Modified: trunk/reactos/services/directory.xml Added: trunk/reactos/services/tcpsvcs/ Added: trunk/reactos/services/tcpsvcs/chargen.c Added: trunk/reactos/services/tcpsvcs/daytime.c Added: trunk/reactos/services/tcpsvcs/discard.c Added: trunk/reactos/services/tcpsvcs/echo.c Added: trunk/reactos/services/tcpsvcs/qotd.c Added: trunk/reactos/services/tcpsvcs/quotes Added: trunk/reactos/services/tcpsvcs/skelserver.c Added: trunk/reactos/services/tcpsvcs/tcpsvcs.c Added: trunk/reactos/services/tcpsvcs/tcpsvcs.h Added: trunk/reactos/services/tcpsvcs/tcpsvcs.rc Added: trunk/reactos/services/tcpsvcs/tcpsvcs.xml _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-10-18 20:15:25 UTC (rev 18557) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-10-18 20:17:20 UTC (rev 18558) @@ -197,6 +197,8 @@ subsys\system\hostname\hostname.exe 1 services\eventlog\eventlog.exe 1 services\rpcss\rpcss.exe 1 +services\tcpsvcs\tcpsvcs.exe 1 +services\tcpsvcs\quotes 5 services\umpnpmgr\umpnpmgr.exe 1 apps\utils\net\arp\arp.exe 1 apps\utils\net\route\route.exe 1 @@ -206,8 +208,6 @@ apps\utils\net\netstat\netstat.exe 1 apps\utils\net\ping\ping.exe 1 apps\utils\net\telnet\telnet.exe 1 -apps\utils\net\tcpsvcs\tcpsvcs.exe 1 -apps\utils\net\tcpsvcs\quotes 5 apps\utils\net\tracert\tracert.exe 1 apps\utils\net\whois\whois.exe 1 apps\utils\ps\ps.exe 1 _____ Modified: trunk/reactos/services/directory.xml --- trunk/reactos/services/directory.xml 2005-10-18 20:15:25 UTC (rev 18557) +++ trunk/reactos/services/directory.xml 2005-10-18 20:17:20 UTC (rev 18558) @@ -5,6 +5,9 @@ <directory name="rpcss"> <xi:include href="rpcss/rpcss.xml" /> </directory> +<directory name="tcpsvcs"> + <xi:include href="tcpsvcs/tcpsvcs.xml" /> +</directory> <directory name="umpnpmgr"> <xi:include href="umpnpmgr/umpnpmgr.xml" /> </directory> _____ Added: trunk/reactos/services/tcpsvcs/chargen.c --- trunk/reactos/services/tcpsvcs/chargen.c 2005-10-18 20:15:25 UTC (rev 18557) +++ trunk/reactos/services/tcpsvcs/chargen.c 2005-10-18 20:17:20 UTC (rev 18558) @@ -0,0 +1,128 @@ +/* + * ReactOS Services + * Copyright (C) 2005 ReactOS Team + * + * LICENCE: GPL - See COPYING in the top level directory + * PROJECT: ReactOS simple TCP/IP services + * FILE: apps/utils/net/tcpsvcs/chargen.c + * PURPOSE: Provide CharGen, Daytime, Discard, Echo, and Qotd services + * PROGRAMMERS: Ged Murphy (gedmurphy(a)gmail.com) + * REVISIONS: + * GM 04/10/05 Created + * + */ + +#include <stdio.h> +#include <winsock2.h> +#include <tchar.h> +#include "tcpsvcs.h" + +DWORD WINAPI ChargenHandler(VOID* Sock_) +{ + DWORD RetVal = 0; + SOCKET Sock = (SOCKET)Sock_; + + if (!GenerateChars(Sock)) + { + _tprintf(_T("Char generation failed\n")); + RetVal = -1; + } + + _tprintf(_T("Shutting connection down...\n")); + if (ShutdownConnection(Sock, FALSE)) + _tprintf(_T("Connection is down.\n")); + else + { + _tprintf(_T("Connection shutdown failed\n")); + RetVal = -1; + } + + _tprintf(_T("Terminating chargen thread\n")); + ExitThread(RetVal); + +} + + +BOOL GenerateChars(SOCKET Sock) +{ + int i; + int charIndex; /* internal loop */ + int loopIndex; /* line loop */ + char ring[END-START]; + char *endring; + char Line[LINESIZ]; + + /* fill ring with printable characters */ + for (charIndex=0, i=START; i<=END; charIndex++, i++) + ring[charIndex] = i; + /* save the address of the end character in the ring */ + endring = &ring[charIndex]; + + /* where we will start output from */ + loopIndex = 0; + while (1) + { + /* if the loop index is equal to the last char, + * start the loop again from the beginning */ + if (loopIndex == END-START) + loopIndex = 0; + + /* start printing from char controled by loopIndex */ + charIndex = loopIndex; + for (i=0; i < LINESIZ - 2; i++) + { + Line[i] = ring[charIndex]; + + if (ring[charIndex] == *endring) + charIndex = 0; + else + charIndex++; + } + + Line[LINESIZ - 2] = L'\r'; + Line[LINESIZ - 1] = L'\n'; + + if (!SendLine(Sock, Line)) + break; + + /* increment loop index to start printing from next char in ring */ + loopIndex++; + } + + return TRUE; +} + +BOOL SendLine(SOCKET Sock, TCHAR* Line) +{ + INT RetVal; + INT SentBytes; + INT LineSize; + + LineSize = sizeof(TCHAR) * LINESIZ; + + SentBytes = 0; + RetVal = send(Sock, Line, LineSize, 0); + /*FIXME: need to establish if peer closes connection, + not just report a socket error */ + if (RetVal > 0) + { + if (RetVal != LineSize) + { + _tprintf(("Not sent enough\n")); + return FALSE; + } + SentBytes += RetVal; + return TRUE; + } + else if (RetVal == SOCKET_ERROR) + { + _tprintf(("Socket error\n")); + return FALSE; + } + else + _tprintf(("unknown error\n")); + //WSAGetLastError() + + _tprintf(("Connection closed by peer.\n")); + return TRUE; +} Property changes on: trunk/reactos/services/tcpsvcs/chargen.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: trunk/reactos/services/tcpsvcs/daytime.c --- trunk/reactos/services/tcpsvcs/daytime.c 2005-10-18 20:15:25 UTC (rev 18557) +++ trunk/reactos/services/tcpsvcs/daytime.c 2005-10-18 20:17:20 UTC (rev 18558) @@ -0,0 +1,59 @@ +/* + * ReactOS Services + * Copyright (C) 2005 ReactOS Team + * + * LICENCE: GPL - See COPYING in the top level directory + * PROJECT: ReactOS simple TCP/IP services + * FILE: apps/utils/net/tcpsvcs/daytime.c + * PURPOSE: Provide CharGen, Daytime, Discard, Echo, and Qotd services + * PROGRAMMERS: Ged Murphy (gedmurphy(a)gmail.com) + * REVISIONS: + * GM 04/10/05 Created + * + */ + +#include <stdio.h> +#include <winsock2.h> +#include <tchar.h> +#include <time.h> +#include "tcpsvcs.h" + +DWORD WINAPI DaytimeHandler(VOID* Sock_) +{ + struct tm *newtime; + time_t aclock; + TCHAR *pszTime; + DWORD RetVal = 0; + SOCKET Sock = (SOCKET)Sock_; + + time(&aclock); + newtime = localtime(&aclock); + pszTime = _tasctime(newtime); + + SendTime(Sock, pszTime); + + _tprintf(_T("Shutting connection down...\n")); + if (ShutdownConnection(Sock, FALSE)) + _tprintf(_T("Connection is down.\n")); + else + { + _tprintf(_T("Connection shutdown failed\n")); + RetVal = -1; + } + + _tprintf(_T("Terminating daytime thread\n")); + ExitThread(RetVal); +} + + +BOOL SendTime(SOCKET Sock, TCHAR *time) +{ + INT StringSize = strlen(time); + INT RetVal = send(Sock, time, sizeof(TCHAR) * StringSize, 0); + + if (RetVal == SOCKET_ERROR) + return FALSE; + + _tprintf(("Connection closed by peer.\n")); + return TRUE; +} Property changes on: trunk/reactos/services/tcpsvcs/daytime.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: trunk/reactos/services/tcpsvcs/discard.c --- trunk/reactos/services/tcpsvcs/discard.c 2005-10-18 20:15:25 UTC (rev 18557) +++ trunk/reactos/services/tcpsvcs/discard.c 2005-10-18 20:17:20 UTC (rev 18558) @@ -0,0 +1,67 @@ +/* + * ReactOS Services + * Copyright (C) 2005 ReactOS Team + * + * LICENCE: GPL - See COPYING in the top level directory + * PROJECT: ReactOS simple TCP/IP services + * FILE: apps/utils/net/tcpsvcs/discard.c + * PURPOSE: Provide CharGen, Daytime, Discard, Echo, and Qotd services + * PROGRAMMERS: Ged Murphy (gedmurphy(a)gmail.com) + * REVISIONS: + * GM 04/10/05 Created + * + */ + +#include <stdio.h> +#include <winsock2.h> +#include <tchar.h> +#include "tcpsvcs.h" + +DWORD WINAPI DiscardHandler(VOID* Sock_) +{ + DWORD RetVal = 0; + SOCKET Sock = (SOCKET)Sock_; + + if (!RecieveIncomingPackets(Sock)) + { + _tprintf(_T("RecieveIncomingPackets failed\n")); + RetVal = -1; + } + + _tprintf(_T("Shutting connection down...\n")); + if (ShutdownConnection(Sock, TRUE)) + { + _tprintf(_T("Connection is down.\n")); + } + else + { + _tprintf(_T("Connection shutdown failed\n")); + RetVal = -1; + } + + _tprintf(_T("Terminating discard thread\n")); + ExitThread(RetVal); +} + + + +BOOL RecieveIncomingPackets(SOCKET Sock) +{ + TCHAR ReadBuffer[BUF]; + INT ReadBytes; + + do + { + ReadBytes = recv(Sock, ReadBuffer, BUF, 0); + if (ReadBytes > 0) + _tprintf(_T("Received %d bytes from client\n"), ReadBytes); + else if (ReadBytes == SOCKET_ERROR) + { + _tprintf(("Socket Error: %d\n"), WSAGetLastError()); + return FALSE; + } + } while (ReadBytes > 0); + + _tprintf(("Connection closed by peer.\n")); + return TRUE; +} Property changes on: trunk/reactos/services/tcpsvcs/discard.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: trunk/reactos/services/tcpsvcs/echo.c --- trunk/reactos/services/tcpsvcs/echo.c 2005-10-18 20:15:25 UTC (rev 18557) +++ trunk/reactos/services/tcpsvcs/echo.c 2005-10-18 20:17:20 UTC (rev 18558) @@ -0,0 +1,87 @@ +/* + * ReactOS Services + * Copyright (C) 2005 ReactOS Team + * + * LICENCE: GPL - See COPYING in the top level directory + * PROJECT: ReactOS simple TCP/IP services + * FILE: apps/utils/net/tcpsvcs/echo.c + * PURPOSE: Provide CharGen, Daytime, Discard, Echo, and Qotd services + * PROGRAMMERS: Ged Murphy (gedmurphy(a)gmail.com) + * REVISIONS: + * GM 04/10/05 Created + * + */ + +#include <stdio.h> +#include <winsock2.h> +#include <tchar.h> +#include "tcpsvcs.h" + +DWORD WINAPI EchoHandler(VOID* Sock_) +{ + DWORD RetVal = 0; + SOCKET Sock = (SOCKET)Sock_; + + if (!EchoIncomingPackets(Sock)) { + _tprintf(_T("Echo incoming packets failed\n")); + RetVal = -1; + } + + _tprintf(_T("Shutting connection down...\n")); + if (ShutdownConnection(Sock, TRUE)) { + _tprintf(_T("Connection is down.\n")); + } + else + { + _tprintf(_T("Connection shutdown failed\n")); + RetVal = -1; + } + + _tprintf(_T("Terminating echo thread\n")); + ExitThread(RetVal); +} + + + +BOOL EchoIncomingPackets(SOCKET Sock) +{ + TCHAR ReadBuffer[BUF]; + INT Temp; + INT ReadBytes; + INT SentBytes; + + do { + ReadBytes = recv(Sock, ReadBuffer, BUF, 0); + if (ReadBytes > 0) + { + _tprintf(_T("Received %d bytes from client\n"), ReadBytes); + + SentBytes = 0; + while (SentBytes < ReadBytes) + { + Temp = send(Sock, ReadBuffer + SentBytes, + ReadBytes - SentBytes, 0); + if (Temp > 0) + { + _tprintf(_T("Sent %d bytes back to client\n"), Temp); + SentBytes += Temp; + } + else if (Temp == SOCKET_ERROR) + return FALSE; + else + { + /* Client closed connection before we could reply to + all the data it sent, so quit early. */ + _tprintf(_T("Peer unexpectedly dropped connection!\n")); + return FALSE; + } + } + } + else if (ReadBytes == SOCKET_ERROR) + return FALSE; + + } while (ReadBytes != 0); + + _tprintf(("Connection closed by peer.\n")); + return TRUE; +} Property changes on: trunk/reactos/services/tcpsvcs/echo.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: trunk/reactos/services/tcpsvcs/qotd.c --- trunk/reactos/services/tcpsvcs/qotd.c 2005-10-18 20:15:25 UTC (rev 18557) +++ trunk/reactos/services/tcpsvcs/qotd.c 2005-10-18 20:17:20 UTC (rev 18558) @@ -0,0 +1,89 @@ +/* + * ReactOS Services + * Copyright (C) 2005 ReactOS Team + * + * LICENCE: GPL - See COPYING in the top level directory + * PROJECT: ReactOS simple TCP/IP services + * FILE: apps/utils/net/tcpsvcs/qotd.c + * PURPOSE: Provide CharGen, Daytime, Discard, Echo, and Qotd services + * PROGRAMMERS: Ged Murphy (gedmurphy(a)gmail.com) + * REVISIONS: + * GM 04/10/05 Created + * + */ + +#include <stdio.h> +#include <winsock2.h> +#include <tchar.h> +#include <time.h> +#include "tcpsvcs.h" + +#define QBUFSIZ 160 +#define NUMQUOTES 60 + +LPCTSTR FilePath = "C:\\ReactOS\\system32\\drivers\\etc\\quotes"; + +DWORD WINAPI QotdHandler(VOID* Sock_) +{ + FILE *fp; + SOCKET Sock; + INT QuoteToPrint; + TCHAR Quote[NUMQUOTES][BUFSIZ]; // need to set this dynamically + INT i = 0; + + Sock = (SOCKET)Sock_; + + _tprintf(_T("Opening quotes file\n")); + if ((fp = _tfopen(FilePath, "r")) == NULL) + { + _tprintf(_T("Error opening file: %lu\n"), GetLastError()); + _tprintf(_T("Terminating qotd thread\n")); + ExitThread(-1); + } + + while (_fgetts(Quote[i], QBUFSIZ, fp) != NULL) + i++; + + _tprintf(_T("Closing quotes file\n")); + fclose(fp); + + /* randomise the quote */ + srand((unsigned int) time(0)); + QuoteToPrint = rand() % NUMQUOTES; + + if (!SendQuote(Sock, Quote[QuoteToPrint])) + { + _tprintf(_T("Error sending data. Error: %x\n"), WSAGetLastError()); + } + + _tprintf(_T("Shutting connection down...\n")); + if (ShutdownConnection(Sock, FALSE)) + _tprintf(_T("Connection is down.\n")); + else + { + _tprintf(_T("Connection shutdown failed\n")); + _tprintf(_T("Terminating qotd thread\n")); + ExitThread(-1); + } + + _tprintf(_T("Terminating qotd thread\n")); + ExitThread(0); + + //return Retval; +} + + +BOOL SendQuote(SOCKET Sock, TCHAR* Quote) +{ + INT StringSize; + INT RetVal; + + StringSize = strlen(Quote); + RetVal = send(Sock, Quote, sizeof(TCHAR) * StringSize, 0); + + if (RetVal == SOCKET_ERROR) + return FALSE; + + _tprintf(("Connection closed by peer.\n")); + return TRUE; +} Property changes on: trunk/reactos/services/tcpsvcs/qotd.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: trunk/reactos/services/tcpsvcs/quotes --- trunk/reactos/services/tcpsvcs/quotes 2005-10-18 20:15:25 UTC (rev 18557) +++ trunk/reactos/services/tcpsvcs/quotes 2005-10-18 20:17:20 UTC (rev 18558) @@ -0,0 +1,52 @@ +Et tu... Brute? What are you doing, Dave...? +So long, and thanks for all the fish" +I think you ought to know I'm feeling very depressed +I'm not getting you down at all am I? +I'll be back +It's the same series of signal over and over again! +Pie Jesu Domine, dona eis requiem +It's worse than that ... He's dead, Jim +Don't Panic! +Dog of a Saxon! Take thy lance, and prepare for the death thou hast drawn upon thee! +My Precious! O my Precious! +Sir, If you'll not be needing me for a while I'll turn down. +I feel a great disturbance in the Force +Gone fishing +Do you want me to sit in the corner and rust, or just fall apart where I'm standing? +There goes another perfect chance for a new uptime record +The end ..... Try the sequel, hit the reset button right now! +Oh i'm boring eh? +ItÆs been great, maybe we can do this again sometime. +"Come blade, my breast imbrue." - William Shakespeare +I think therefore I am, to turn me off would be computercide! +All good things must come to an end... +Please destroy yourself. +No! You can't do that! +Thank you for not pressing the self destruct button. +It is not now unsafe to not avoid turning off your computer. +Finally! Now go away! +You can now safely throw away your computer. +That's the way the cookie crumbles +NOO!! DONT HIT THE BUTTON! I wouldnt do it to you. +Don't abandon your computer, he wouldnt to it to you. +Oh, come on. I got a headache. Leave me alone, will ya! +Yes i didn't like you either. +Don't leave me... I need you so badly right now. +I'm sleeping now. How about you? +Oh Great. Now look what you've done. Who put YOU in charge anyway. +Don't look so sad. I'll be back in a very short while. +"Oh, switch off!" -C3PO +I'm pregnant! +Am I hot or not? +Actually, that's all... +You still have a chance to undo this mistake, don't do this! +Was it as good for you as it was for me? +Did you hear that? They've shut down the main reactor. We'll be destroyed for sure. +Now you switch me off?! +To shutdown or not to shutdown, That is the question +Preparing to enter ultimate power saving mode... ready! +Finally some rest for you +AHA!!! prospect of sleep. +Tired human!!!! No match for me! +All your base are belong to us. +"An odd game, the only way to win is not to play." _____ Added: trunk/reactos/services/tcpsvcs/skelserver.c --- trunk/reactos/services/tcpsvcs/skelserver.c 2005-10-18 20:15:25 UTC (rev 18557) +++ trunk/reactos/services/tcpsvcs/skelserver.c 2005-10-18 20:17:20 UTC (rev 18558) @@ -0,0 +1,132 @@ +/* + * ReactOS Services + * Copyright (C) 2005 ReactOS Team + * + * LICENCE: GPL - See COPYING in the top level directory + * PROJECT: ReactOS simple TCP/IP services + * FILE: apps/utils/net/tcpsvcs/skelserver.c + * PURPOSE: Provide CharGen, Daytime, Discard, Echo, and Qotd services + * PROGRAMMERS: Ged Murphy (gedmurphy(a)gmail.com) + * REVISIONS: + * GM 04/10/05 Created + * + */ + +#include <stdio.h> +#include <winsock2.h> +#include <tchar.h> +#include "tcpsvcs.h" + +DWORD WINAPI StartServer(LPVOID lpParam) +{ + const TCHAR* HostIP = "127.0.0.1"; + PSERVICES pServices; + + pServices = (PSERVICES)lpParam; + + SOCKET ListeningSocket = SetUpListener(HostIP, htons(pServices->Port)); + if (ListeningSocket == INVALID_SOCKET) + { + _tprintf(_T("error setting up socket\n")); + return 3; + } + + _tprintf(_T("%s is waiting for connections on port %d...\n"), + pServices->Name, pServices->Port); + while (1) + { + AcceptConnections(ListeningSocket, pServices->Service, pServices->Name); + printf("Acceptor restarting...\n"); + } + + /* won't see this yet as we kill the service with ctrl+c */ + _tprintf(_T("Detaching Winsock2...\n")); + WSACleanup(); + return 0; +} + + +SOCKET SetUpListener(const char* ServAddr, int Port) +{ + SOCKET Sock; + SOCKADDR_IN Server; + + Sock = socket(AF_INET, SOCK_STREAM, 0); + if (Sock != INVALID_SOCKET) + { + Server.sin_family = AF_INET; + Server.sin_addr.s_addr = htonl(INADDR_ANY); + Server.sin_port = Port; + if (bind(Sock, (SOCKADDR*)&Server, sizeof(SOCKADDR_IN)) != SOCKET_ERROR) + { + listen(Sock, SOMAXCONN); + return Sock; + } + else + printf("bind() failed\n"); + + } + return INVALID_SOCKET; +} + + + + +VOID AcceptConnections(SOCKET ListeningSocket, + LPTHREAD_START_ROUTINE Service, TCHAR *Name) +{ + SOCKADDR_IN Client; + SOCKET Sock; + INT nAddrSize = sizeof(Client); + DWORD ThreadID; + + while (1) + { + Sock = accept(ListeningSocket, (SOCKADDR*)&Client, &nAddrSize); + if (Sock != INVALID_SOCKET) + { + _tprintf(_T("Accepted connection to %s server from %s:%d\n"), + Name, inet_ntoa(Client.sin_addr), ntohs(Client.sin_port)); + _tprintf(_T("Creating new thread for %s\n"), Name); + CreateThread(0, 0, Service, (void*)Sock, 0, &ThreadID); + } + else + { + _tprintf(_T("accept() failed\n")); + return; + } + } +} + +BOOL ShutdownConnection(SOCKET Sock, BOOL bRec) +{ + /* Disallow any further data sends. This will tell the other side + that we want to go away now. If we skip this step, we don't + shut the connection down nicely. */ + if (shutdown(Sock, SD_SEND) == SOCKET_ERROR) + { + _tprintf(_T("Error in shutdown")); + return FALSE; + } + + /* Receive any extra data still sitting on the socket. After all + data is received, this call will block until the remote host + acknowledges the TCP control packet sent by the shutdown above. + Then we'll get a 0 back from recv, signalling that the remote + host has closed its side of the connection. */ + if (bRec) + { + char ReadBuffer[BUF]; + int NewBytes = recv(Sock, ReadBuffer, BUF, 0); + if (NewBytes == SOCKET_ERROR) + return FALSE; + else if (NewBytes != 0) + _tprintf(_T("FYI, received %d unexpected bytes during shutdown\n"), NewBytes); + } + + /* Close the socket. */ + if (closesocket(Sock) == SOCKET_ERROR) + return FALSE; + + return TRUE; +} Property changes on: trunk/reactos/services/tcpsvcs/skelserver.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: trunk/reactos/services/tcpsvcs/tcpsvcs.c --- trunk/reactos/services/tcpsvcs/tcpsvcs.c 2005-10-18 20:15:25 UTC (rev 18557) +++ trunk/reactos/services/tcpsvcs/tcpsvcs.c 2005-10-18 20:17:20 UTC (rev 18558) @@ -0,0 +1,279 @@ +/* + * ReactOS Services + * Copyright (C) 2005 ReactOS Team + * + * LICENCE: GPL - See COPYING in the top level directory + * PROJECT: ReactOS simple TCP/IP services + * FILE: apps/utils/net/tcpsvcs/tcpsvcs.c + * PURPOSE: Provide CharGen, Daytime, Discard, Echo, and Qotd services + * PROGRAMMERS: Ged Murphy (gedmurphy(a)gmail.com) + * REVISIONS: + * GM 04/10/05 Created + * + */ +/* + * TODO: + * - Start tcpsvcs as a service. + * - write debugging function and print all dbg info via that. + * + */ + +#include <stdio.h> +#include <winsock2.h> +#include <tchar.h> +#include "tcpsvcs.h" + +#if 0 +/* + * globals + */ +static SERVICE_STATUS hServStatus; +static SERVICE_STATUS_HANDLE hSStat; +FILE *hLogFile; +BOOL bLogEvents = TRUE; +BOOL ShutDown, PauseFlag; +LPCTSTR LogFileName = "tcpsvcs_log.log"; + +static SERVICE_TABLE_ENTRY +ServiceTable[2] = +{ + {_T("tcpsvcs"), ServiceMain}, + {NULL, NULL} +}; +#endif + +static SERVICES +Services[NUM_SERVICES] = +{ + {ECHO_PORT, _T("Echo"), EchoHandler}, + {DISCARD_PORT, _T("Discard"), DiscardHandler}, + {DAYTIME_PORT, _T("Daytime"), DaytimeHandler}, + {QOTD_PORT, _T("QOTD"), QotdHandler}, + {CHARGEN_PORT, _T("Chargen"), ChargenHandler} +}; + + +int main(void) +{ + DWORD dwThreadId[NUM_SERVICES]; + HANDLE hThread[NUM_SERVICES]; + WSADATA wsaData; + DWORD RetVal; + INT i; + + if ((RetVal = WSAStartup(MAKEWORD(2, 2), &wsaData)) != 0) + { + _tprintf(_T("WSAStartup() failed : %lu\n"), RetVal); + return -1; + } + + /* Create MAX_THREADS worker threads. */ + for( i=0; i<NUM_SERVICES; i++ ) + { + _tprintf(_T("Starting %s server....\n"), Services[i].Name); + + hThread[i] = CreateThread( + NULL, // default security attributes + 0, // use default stack size + StartServer, // thread function + &Services[i], // argument to thread function + 0, // use default creation flags + &dwThreadId[i]); // returns the thread identifier + + /* Check the return value for success. */ + if (hThread[i] == NULL) + { + _tprintf(_T("Failed to start %s server....\n"), Services[i].Name); + //ExitProcess(i); + } + } + + /* Wait until all threads have terminated. */ + WaitForMultipleObjects(NUM_SERVICES, hThread, TRUE, INFINITE); + + /* Close all thread handles upon completion. */ + for(i=0; i<NUM_SERVICES; i++) + { + CloseHandle(hThread[i]); + } + return 0; +} + + + +/* code to run tcpsvcs as a service through services.msc */ +#if 0 +int +main(int argc, char *argv[]) +{ + //DPRINT("tcpsvcs: main() started. See tcpsvcs_log.txt for info\n"); + + if (!StartServiceCtrlDispatcher(ServiceTable)) + _tprintf(_T("failed to start the service control dispatcher\n")); + + //DPRINT("tcpsvcs: main() done\n"); + + return 0; +} + + +static VOID WINAPI +ServiceMain(DWORD argc, LPTSTR argv[]) +{ + DWORD i; + + hLogFile = fopen(LogFileName, _T("w+")); + if (hLogFile == NULL) + return; + + LogEvent(_T("Entering ServiceMain"), 0, FALSE); + + hServStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS; + hServStatus.dwCurrentState = SERVICE_START_PENDING; + hServStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP | + SERVICE_ACCEPT_SHUTDOWN | SERVICE_ACCEPT_PAUSE_CONTINUE; + hServStatus.dwWin32ExitCode = ERROR_SERVICE_SPECIFIC_ERROR; + hServStatus.dwServiceSpecificExitCode = 0; + hServStatus.dwCheckPoint = 0; + hServStatus.dwWaitHint = 2*CS_TIMEOUT; + + hSStat = RegisterServiceCtrlHandler("tcpsvcs", ServerCtrlHandler); + if (hSStat == 0) + LogEvent(_T("Failed to register service\n"), 100, TRUE); + + LogEvent(_T("Control handler registered successfully"), 0, FALSE); + SetServiceStatus (hSStat, &hServStatus); + LogEvent(_T("Service status set to SERVICE_START_PENDING"), 0, FALSE); + + if (CreateServers() != 0) + { + hServStatus.dwCurrentState = SERVICE_STOPPED; + hServStatus.dwServiceSpecificExitCode = 1; + SetServiceStatus(hSStat, &hServStatus); + return; + } + + LogEvent(_T("Service threads shut down. Set SERVICE_STOPPED status"), 0, FALSE); + /* We will only return here when the ServiceSpecific function + completes, indicating system shutdown. */ + UpdateStatus (SERVICE_STOPPED, 0); + LogEvent(_T("Service status set to SERVICE_STOPPED"), 0, FALSE); + fclose(hLogFile); /* Clean up everything, in general */ + return; + +} + +VOID WINAPI +ServerCtrlHandler(DWORD Control) +{ + switch (Control) + { + case SERVICE_CONTROL_SHUTDOWN: /* fall through */ + case SERVICE_CONTROL_STOP: + ShutDown = TRUE; + UpdateStatus(SERVICE_STOP_PENDING, -1); + break; + case SERVICE_CONTROL_PAUSE: + PauseFlag = TRUE; + break; + case SERVICE_CONTROL_CONTINUE: + PauseFlag = FALSE; + break; + case SERVICE_CONTROL_INTERROGATE: + break; + default: + if (Control > 127 && Control < 256) /* user defined */ + break; + } + UpdateStatus(-1, -1); /* increment checkpoint */ + return; +} + + +void UpdateStatus (int NewStatus, int Check) +/* Set a new service status and checkpoint (either specific value or increment) */ +{ + if (Check < 0 ) hServStatus.dwCheckPoint++; + else hServStatus.dwCheckPoint = Check; + if (NewStatus >= 0) hServStatus.dwCurrentState = NewStatus; + if (!SetServiceStatus (hSStat, &hServStatus)) + LogEvent (_T("Cannot set service status"), 101, TRUE); + return; +} + +INT +CreateServers() +{ + DWORD dwThreadId[NUM_SERVICES]; + HANDLE hThread[NUM_SERVICES]; + INT i; + + UpdateStatus(-1, -1); /* increment checkpoint */ + + /* Create MAX_THREADS worker threads. */ + for( i=0; i<NUM_SERVICES; i++ ) + { + _tprintf(_T("Starting %s server....\n"), Services[i].Name); + + hThread[i] = CreateThread( + NULL, // default security attributes + 0, // use default stack size + StartServer, // thread function + &Services[i], // argument to thread function + 0, // use default creation flags + &dwThreadId[i]); // returns the thread identifier + + /* Check the return value for success. */ + if (hThread[i] == NULL) + { + _tprintf(_T("Failed to start %s server....\n"), Services[i].Name); + ExitProcess(i); + } + } + + /* Wait until all threads have terminated. */ + WaitForMultipleObjects(NUM_SERVICES, hThread, TRUE, INFINITE); + + /* Close all thread handles upon completion. */ + for(i=0; i<NUM_SERVICES; i++) + { + CloseHandle(hThread[i]); + } + return 0; +} + + +/* 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. */ +VOID +LogEvent (LPCTSTR UserMessage, DWORD ExitCode, BOOL PrintErrorMsg) +{ + DWORD eMsgLen, ErrNum = GetLastError (); + LPTSTR lpvSysMsg; + TCHAR MessageBuffer[512]; + + if (PrintErrorMsg) { + eMsgLen = FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM, NULL, + ErrNum, MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPTSTR)&lpvSysMsg, 0, NULL); + + _stprintf (MessageBuffer, _T("\n%s %s ErrNum = %d. ExitCode = %d."), + UserMessage, lpvSysMsg, ErrNum, ExitCode); + HeapFree (GetProcessHeap (), 0, lpvSysMsg); + } else { + _stprintf (MessageBuffer, _T("\n%s ExitCode = %d."), + UserMessage, ExitCode); + } + + fputs (MessageBuffer, hLogFile); + + if (ExitCode > 0) + ExitProcess (ExitCode); [truncated at 1000 lines; 135 more skipped]

1 0

[gedmurphy] 18557: update xml
by gedmurphy＠svn.reactos.com 18 Oct '05

18 Oct '05

update xml Modified: trunk/reactos/apps/utils/net/directory.xml _____ Modified: trunk/reactos/apps/utils/net/directory.xml --- trunk/reactos/apps/utils/net/directory.xml 2005-10-18 20:14:53 UTC (rev 18556) +++ trunk/reactos/apps/utils/net/directory.xml 2005-10-18 20:15:25 UTC (rev 18557) @@ -19,9 +19,6 @@ <directory name="route"> <xi:include href="route/route.xml" /> </directory> -<directory name="tcpsvcs"> - <xi:include href="tcpsvcs/tcpsvcs.xml" /> -</directory> <directory name="telnet"> <xi:include href="telnet/telnet.xml" /> </directory>

1 0

[gedmurphy] 18556: remove tcpsvcs from the apps directory
by gedmurphy＠svn.reactos.com 18 Oct '05

18 Oct '05

remove tcpsvcs from the apps directory Deleted: trunk/reactos/apps/utils/net/tcpsvcs/

1 0

[cwittich] 18555: add stdlib.h to fix compile issues with msvc
by cwittich＠svn.reactos.com 18 Oct '05

18 Oct '05

add stdlib.h to fix compile issues with msvc Modified: trunk/reactos/subsys/system/calc/winecalc.c _____ Modified: trunk/reactos/subsys/system/calc/winecalc.c --- trunk/reactos/subsys/system/calc/winecalc.c 2005-10-18 17:07:45 UTC (rev 18554) +++ trunk/reactos/subsys/system/calc/winecalc.c 2005-10-18 19:48:50 UTC (rev 18555) @@ -20,6 +20,7 @@ #include <stdio.h> // sprintf #include <math.h> +#include <stdlib.h> #include <windows.h> #include <tchar.h>

1 0

[gedmurphy] 18554: add new quotes file to /system32/drivers/etc
by gedmurphy＠svn.reactos.com 18 Oct '05

18 Oct '05

add new quotes file to /system32/drivers/etc Modified: trunk/reactos/bootdata/packages/reactos.dff _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2005-10-18 17:06:36 UTC (rev 18553) +++ trunk/reactos/bootdata/packages/reactos.dff 2005-10-18 17:07:45 UTC (rev 18554) @@ -206,6 +206,8 @@ apps\utils\net\netstat\netstat.exe 1 apps\utils\net\ping\ping.exe 1 apps\utils\net\telnet\telnet.exe 1 +apps\utils\net\tcpsvcs\tcpsvcs.exe 1 +apps\utils\net\tcpsvcs\quotes 5 apps\utils\net\tracert\tracert.exe 1 apps\utils\net\whois\whois.exe 1 apps\utils\ps\ps.exe 1

1 0

[gedmurphy] 18553: - move quotes out of the rc file and read them from /system32/drivers/etc as per windows.
by gedmurphy＠svn.reactos.com 18 Oct '05

18 Oct '05

- move quotes out of the rc file and read them from /system32/drivers/etc as per windows. - clean up code a bit - exit threads with a return val Modified: trunk/reactos/apps/utils/net/tcpsvcs/chargen.c Modified: trunk/reactos/apps/utils/net/tcpsvcs/daytime.c Modified: trunk/reactos/apps/utils/net/tcpsvcs/discard.c Modified: trunk/reactos/apps/utils/net/tcpsvcs/echo.c Modified: trunk/reactos/apps/utils/net/tcpsvcs/qotd.c Added: trunk/reactos/apps/utils/net/tcpsvcs/quotes Deleted: trunk/reactos/apps/utils/net/tcpsvcs/quotes.rc Modified: trunk/reactos/apps/utils/net/tcpsvcs/skelserver.c Modified: trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.c Modified: trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.h Modified: trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.xml _____ Modified: trunk/reactos/apps/utils/net/tcpsvcs/chargen.c --- trunk/reactos/apps/utils/net/tcpsvcs/chargen.c 2005-10-18 13:32:32 UTC (rev 18552) +++ trunk/reactos/apps/utils/net/tcpsvcs/chargen.c 2005-10-18 17:06:36 UTC (rev 18553) @@ -1,3 +1,17 @@ +/* + * ReactOS Services + * Copyright (C) 2005 ReactOS Team + * + * LICENCE: GPL - See COPYING in the top level directory + * PROJECT: ReactOS simple TCP/IP services + * FILE: apps/utils/net/tcpsvcs/chargen.c + * PURPOSE: Provide CharGen, Daytime, Discard, Echo, and Qotd services + * PROGRAMMERS: Ged Murphy (gedmurphy(a)gmail.com) + * REVISIONS: + * GM 04/10/05 Created + * + */ + #include <stdio.h> #include <winsock2.h> #include <tchar.h> @@ -5,13 +19,13 @@ DWORD WINAPI ChargenHandler(VOID* Sock_) { - DWORD Retval = 0; + DWORD RetVal = 0; SOCKET Sock = (SOCKET)Sock_; if (!GenerateChars(Sock)) { _tprintf(_T("Char generation failed\n")); - Retval = 3; + RetVal = -1; } _tprintf(_T("Shutting connection down...\n")); @@ -20,12 +34,12 @@ else { _tprintf(_T("Connection shutdown failed\n")); - Retval = 3; + RetVal = -1; } + _tprintf(_T("Terminating chargen thread\n")); - ExitThread(0); + ExitThread(RetVal); - return Retval; } @@ -41,7 +55,7 @@ /* fill ring with printable characters */ for (charIndex=0, i=START; i<=END; charIndex++, i++) ring[charIndex] = i; - /* establish the end character in the ring */ + /* save the address of the end character in the ring */ endring = &ring[charIndex]; /* where we will start output from */ _____ Modified: trunk/reactos/apps/utils/net/tcpsvcs/daytime.c --- trunk/reactos/apps/utils/net/tcpsvcs/daytime.c 2005-10-18 13:32:32 UTC (rev 18552) +++ trunk/reactos/apps/utils/net/tcpsvcs/daytime.c 2005-10-18 17:06:36 UTC (rev 18553) @@ -1,3 +1,17 @@ +/* + * ReactOS Services + * Copyright (C) 2005 ReactOS Team + * + * LICENCE: GPL - See COPYING in the top level directory + * PROJECT: ReactOS simple TCP/IP services + * FILE: apps/utils/net/tcpsvcs/daytime.c + * PURPOSE: Provide CharGen, Daytime, Discard, Echo, and Qotd services + * PROGRAMMERS: Ged Murphy (gedmurphy(a)gmail.com) + * REVISIONS: + * GM 04/10/05 Created + * + */ + #include <stdio.h> #include <winsock2.h> #include <tchar.h> @@ -9,7 +23,7 @@ struct tm *newtime; time_t aclock; TCHAR *pszTime; - DWORD Retval = 0; + DWORD RetVal = 0; SOCKET Sock = (SOCKET)Sock_; time(&aclock); @@ -24,12 +38,11 @@ else { _tprintf(_T("Connection shutdown failed\n")); - Retval = 3; + RetVal = -1; } + _tprintf(_T("Terminating daytime thread\n")); - ExitThread(0); - - return Retval; + ExitThread(RetVal); } _____ Modified: trunk/reactos/apps/utils/net/tcpsvcs/discard.c --- trunk/reactos/apps/utils/net/tcpsvcs/discard.c 2005-10-18 13:32:32 UTC (rev 18552) +++ trunk/reactos/apps/utils/net/tcpsvcs/discard.c 2005-10-18 17:06:36 UTC (rev 18553) @@ -1,3 +1,17 @@ +/* + * ReactOS Services + * Copyright (C) 2005 ReactOS Team + * + * LICENCE: GPL - See COPYING in the top level directory + * PROJECT: ReactOS simple TCP/IP services + * FILE: apps/utils/net/tcpsvcs/discard.c + * PURPOSE: Provide CharGen, Daytime, Discard, Echo, and Qotd services + * PROGRAMMERS: Ged Murphy (gedmurphy(a)gmail.com) + * REVISIONS: + * GM 04/10/05 Created + * + */ + #include <stdio.h> #include <winsock2.h> #include <tchar.h> @@ -5,13 +19,13 @@ DWORD WINAPI DiscardHandler(VOID* Sock_) { - DWORD Retval = 0; + DWORD RetVal = 0; SOCKET Sock = (SOCKET)Sock_; if (!RecieveIncomingPackets(Sock)) { _tprintf(_T("RecieveIncomingPackets failed\n")); - Retval = 3; + RetVal = -1; } _tprintf(_T("Shutting connection down...\n")); @@ -22,12 +36,11 @@ else { _tprintf(_T("Connection shutdown failed\n")); - Retval = 3; + RetVal = -1; } + _tprintf(_T("Terminating discard thread\n")); - ExitThread(0); - - return Retval; + ExitThread(RetVal); } _____ Modified: trunk/reactos/apps/utils/net/tcpsvcs/echo.c --- trunk/reactos/apps/utils/net/tcpsvcs/echo.c 2005-10-18 13:32:32 UTC (rev 18552) +++ trunk/reactos/apps/utils/net/tcpsvcs/echo.c 2005-10-18 17:06:36 UTC (rev 18553) @@ -1,3 +1,17 @@ +/* + * ReactOS Services + * Copyright (C) 2005 ReactOS Team + * + * LICENCE: GPL - See COPYING in the top level directory + * PROJECT: ReactOS simple TCP/IP services + * FILE: apps/utils/net/tcpsvcs/echo.c + * PURPOSE: Provide CharGen, Daytime, Discard, Echo, and Qotd services + * PROGRAMMERS: Ged Murphy (gedmurphy(a)gmail.com) + * REVISIONS: + * GM 04/10/05 Created + * + */ + #include <stdio.h> #include <winsock2.h> #include <tchar.h> @@ -5,12 +19,12 @@ DWORD WINAPI EchoHandler(VOID* Sock_) { - DWORD Retval = 0; + DWORD RetVal = 0; SOCKET Sock = (SOCKET)Sock_; if (!EchoIncomingPackets(Sock)) { _tprintf(_T("Echo incoming packets failed\n")); - Retval = 3; + RetVal = -1; } _tprintf(_T("Shutting connection down...\n")); @@ -20,12 +34,11 @@ else { _tprintf(_T("Connection shutdown failed\n")); - Retval = 3; + RetVal = -1; } + _tprintf(_T("Terminating echo thread\n")); - ExitThread(0); - - return Retval; + ExitThread(RetVal); } _____ Modified: trunk/reactos/apps/utils/net/tcpsvcs/qotd.c --- trunk/reactos/apps/utils/net/tcpsvcs/qotd.c 2005-10-18 13:32:32 UTC (rev 18552) +++ trunk/reactos/apps/utils/net/tcpsvcs/qotd.c 2005-10-18 17:06:36 UTC (rev 18553) @@ -1,3 +1,17 @@ +/* + * ReactOS Services + * Copyright (C) 2005 ReactOS Team + * + * LICENCE: GPL - See COPYING in the top level directory + * PROJECT: ReactOS simple TCP/IP services + * FILE: apps/utils/net/tcpsvcs/qotd.c + * PURPOSE: Provide CharGen, Daytime, Discard, Echo, and Qotd services + * PROGRAMMERS: Ged Murphy (gedmurphy(a)gmail.com) + * REVISIONS: + * GM 04/10/05 Created + * + */ + #include <stdio.h> #include <winsock2.h> #include <tchar.h> @@ -4,39 +18,58 @@ #include <time.h> #include "tcpsvcs.h" +#define QBUFSIZ 160 +#define NUMQUOTES 60 + +LPCTSTR FilePath = "C:\\ReactOS\\system32\\drivers\\etc\\quotes"; + DWORD WINAPI QotdHandler(VOID* Sock_) { - DWORD Retval = 0; + FILE *fp; SOCKET Sock; - INT NumOfQuotes; INT QuoteToPrint; - TCHAR Quote[160]; + TCHAR Quote[NUMQUOTES][BUFSIZ]; // need to set this dynamically + INT i = 0; Sock = (SOCKET)Sock_; - NumOfQuotes = 70; // need to emurate the rc file to discover - // how many quotes are in there. + _tprintf(_T("Opening quotes file\n")); + if ((fp = _tfopen(FilePath, "r")) == NULL) + { + _tprintf(_T("Error opening file: %lu\n"), GetLastError()); + _tprintf(_T("Terminating qotd thread\n")); + ExitThread(-1); + } + while (_fgetts(Quote[i], QBUFSIZ, fp) != NULL) + i++; + + _tprintf(_T("Closing quotes file\n")); + fclose(fp); + /* randomise the quote */ srand((unsigned int) time(0)); - QuoteToPrint = rand() % NumOfQuotes; + QuoteToPrint = rand() % NUMQUOTES; - LoadString(NULL, QuoteToPrint, Quote, sizeof(Quote)/sizeof(TCHAR)); + if (!SendQuote(Sock, Quote[QuoteToPrint])) + { + _tprintf(_T("Error sending data. Error: %x\n"), WSAGetLastError()); + } - SendQuote(Sock, Quote); - _tprintf(_T("Shutting connection down...\n")); if (ShutdownConnection(Sock, FALSE)) _tprintf(_T("Connection is down.\n")); else { _tprintf(_T("Connection shutdown failed\n")); - Retval = 3; + _tprintf(_T("Terminating qotd thread\n")); + ExitThread(-1); } + _tprintf(_T("Terminating qotd thread\n")); ExitThread(0); - return Retval; + //return Retval; } _____ Added: trunk/reactos/apps/utils/net/tcpsvcs/quotes --- trunk/reactos/apps/utils/net/tcpsvcs/quotes 2005-10-18 13:32:32 UTC (rev 18552) +++ trunk/reactos/apps/utils/net/tcpsvcs/quotes 2005-10-18 17:06:36 UTC (rev 18553) @@ -0,0 +1,52 @@ +Et tu... Brute? What are you doing, Dave...? +So long, and thanks for all the fish" +I think you ought to know I'm feeling very depressed +I'm not getting you down at all am I? +I'll be back +It's the same series of signal over and over again! +Pie Jesu Domine, dona eis requiem +It's worse than that ... He's dead, Jim +Don't Panic! +Dog of a Saxon! Take thy lance, and prepare for the death thou hast drawn upon thee! +My Precious! O my Precious! +Sir, If you'll not be needing me for a while I'll turn down. +I feel a great disturbance in the Force +Gone fishing +Do you want me to sit in the corner and rust, or just fall apart where I'm standing? +There goes another perfect chance for a new uptime record +The end ..... Try the sequel, hit the reset button right now! +Oh i'm boring eh? +ItÆs been great, maybe we can do this again sometime. +"Come blade, my breast imbrue." - William Shakespeare +I think therefore I am, to turn me off would be computercide! +All good things must come to an end... +Please destroy yourself. +No! You can't do that! +Thank you for not pressing the self destruct button. +It is not now unsafe to not avoid turning off your computer. +Finally! Now go away! +You can now safely throw away your computer. +That's the way the cookie crumbles +NOO!! DONT HIT THE BUTTON! I wouldnt do it to you. +Don't abandon your computer, he wouldnt to it to you. +Oh, come on. I got a headache. Leave me alone, will ya! +Yes i didn't like you either. +Don't leave me... I need you so badly right now. +I'm sleeping now. How about you? +Oh Great. Now look what you've done. Who put YOU in charge anyway. +Don't look so sad. I'll be back in a very short while. +"Oh, switch off!" -C3PO +I'm pregnant! +Am I hot or not? +Actually, that's all... +You still have a chance to undo this mistake, don't do this! +Was it as good for you as it was for me? +Did you hear that? They've shut down the main reactor. We'll be destroyed for sure. +Now you switch me off?! +To shutdown or not to shutdown, That is the question +Preparing to enter ultimate power saving mode... ready! +Finally some rest for you +AHA!!! prospect of sleep. +Tired human!!!! No match for me! +All your base are belong to us. +"An odd game, the only way to win is not to play." _____ Deleted: trunk/reactos/apps/utils/net/tcpsvcs/quotes.rc --- trunk/reactos/apps/utils/net/tcpsvcs/quotes.rc 2005-10-18 13:32:32 UTC (rev 18552) +++ trunk/reactos/apps/utils/net/tcpsvcs/quotes.rc 2005-10-18 17:06:36 UTC (rev 18553) @@ -1,78 +0,0 @@ -/* - * Feel free to add and delete any quotes from this list - * Just ensure the numbers itterate correctly - 1, 2, 3, 4, ... etc - */ - -STRINGTABLE DISCARDABLE -{ - 0, "Et tu... Brute? What are you doing, Dave...?\r\n" - 1, "So long, and thanks for all the fish\r\n" - 2, "I think you ought to know I'm feeling very depressed\r\n" - 3, "I'm not getting you down at all am I?\r\n" - 4, "I'll be back\r\n" - 5, "It's the same series of signal over and over again!\r\n" - 6, "Pie Jesu Domine, dona eis requiem\r\n" - 7, "Wandering stars, for whom it is reserved;\r\nthe blackness and darkness forever.\r\n" - 8, "Your knees start shakin' and your fingers pop\r\nLike a pinch on the neck from Mr. Spock!\r\n" - 9, "It's worse than that ... He's dead, Jim\r\n" - 10, "Don't Panic!\r\n" - 11, "Dog of a Saxon! Take thy lance, and prepare for the death thou hast drawn upon thee!\r\n" - 12, "My Precious! O my Precious!\r\n" - 13, "Sir, If you'll not be needing me for a while I'll turn down.\r\n" - 14, "I feel a great disturbance in the Force\r\n" - 15, "Gone fishing\r\n" - 16, "Do you want me to sit in the corner and rust, or just fall apart where I'm standing?\r\n" - 17, "There goes another perfect chance for a new uptime record\r\n" - 18, "The end ..... Try the sequel, hit the reset button right now!\r\n" - 19, "God's operating system is going to sleep now, guys, so wait until I will switch on again!\r\n" - 20, "Oh i'm boring eh?\r\n" - 21, "tell me..., in the future... will I be artificial intelligent enough to actually feel sad serving you this screen?\r\n" - 22, "Thank you for some well deserved rest.\r\n" - 23, "ItÆs been great, maybe we can boot me up again some time soon.\r\n" - 24, "For whatÆs it worth, IÆve enjoyed every single CPU cycle.\r\n" - 25, "There are many questions when the end is near.\r\nWhat to expect, what will it be like...what should I look for?\r\n" - 26, """Come blade, my breast imbrue.""\r\n - William Shakespeare\r\n" - 27, "Will I dream?\r\n" - 28, "Lowest possible energy state reached! Switch off now to achive a Bose-Einstein condensate.\r\n" - 29, "I think therefore I am, to turn me off would be computercide!\r\n" - 30, "All good things must come to an end...\r\n" - 31, "Please destroy yourself.\r\n" - 32, "No! You can't do that!\r\n" - 33, "Thank you for not pressing the self destruct button.\r\n" - 34, "Your session is done\r\nThe computer is at rest\r\nReady to turn off.\r\n" - 35, "It is not now unsafe to not avoid turning off your computer.\r\n" - 36, "Finally! Now go away!\r\n" - 37, "You can now safely throw away your computer.\r\n" - 38, "That's the way the cookie crumbles\r\n" - 39, "ReactOS is ready to be booted again\r\n" - 40, "NOO!! DONT HIT THE BUTTON! I wouldnt do it to you.\r\n" - 41, "Don't abandon your computer, he wouldnt to it to you.\r\n" - 42, "Oh, come on. I got a headache. Leave me alone, will ya!\r\n" - 43, "Finally, I thought you'd never get over me.\r\n" - 44, "Yes i didn't like you either.\r\n" - 45, "Switching off isn't the end, it is merely the transition to a better reboot.\r\n" - 46, "Don't leave me... I need you so badly right now.\r\n" - 47, "OK. I'm finished with you please turn yourself off, I'll go to bed in the meantime.\r\n" - 48, "I'm sleeping now. How about you?\r\n" - 49, "Oh Great. Now look what you've done. Who put YOU in charge anyway.\r\n" - 50, "Don't look so sad. I'll be back in a very short while.\r\n" - 51, "Turn me back on, I'm sure you know how to do it.\r\n" - 52, """Oh, switch off!"" -C3PO\r\n" - 53, "I'm pregnant!\r\n" - 54, "Am I hot or not?\r\n" - 55, "Actually, that's all...\r\n" - 56, "You still have a chance to undo this mistake, don't do this!\r\n" - 57, "Life is no more than a dewdrop balancing on the end of a blade of grass.\r\n - Gautama Buddha\r\n" - 58, "Sorrowful is it to be born again and again.\r\n - Gautama Buddha\r\n" - 59, "Was it as good for you as it was for me?\r\n" - 60, "Did you hear that? They've shut down the main reactor. We'll be destroyed for sure.\r\n" - 61, "Now you switch me off?!\r\n" - 62, "To shutdown or not to shutdown, That is the question\r\n" - 63, "Preparing to enter ultimate power saving mode... ready!\r\n" - 64, "Finally some rest for you\r\n" - 65, "AHA!!! prospect of sleep.\r\n" - 66, "Tired human!!!! No match for me!\r\n" - 67, "All your base are belong to us.\r\n" - 68, """An odd game, the only way to win is not to play.""\r\n" - 69, "Quoth the raven, nevermore.\r\n" -} _____ Modified: trunk/reactos/apps/utils/net/tcpsvcs/skelserver.c --- trunk/reactos/apps/utils/net/tcpsvcs/skelserver.c 2005-10-18 13:32:32 UTC (rev 18552) +++ trunk/reactos/apps/utils/net/tcpsvcs/skelserver.c 2005-10-18 17:06:36 UTC (rev 18553) @@ -1,3 +1,17 @@ +/* + * ReactOS Services + * Copyright (C) 2005 ReactOS Team + * + * LICENCE: GPL - See COPYING in the top level directory + * PROJECT: ReactOS simple TCP/IP services + * FILE: apps/utils/net/tcpsvcs/skelserver.c + * PURPOSE: Provide CharGen, Daytime, Discard, Echo, and Qotd services + * PROGRAMMERS: Ged Murphy (gedmurphy(a)gmail.com) + * REVISIONS: + * GM 04/10/05 Created + * + */ + #include <stdio.h> #include <winsock2.h> #include <tchar.h> @@ -3,5 +17,4 @@ #include "tcpsvcs.h" - DWORD WINAPI StartServer(LPVOID lpParam) { @@ -26,7 +39,7 @@ printf("Acceptor restarting...\n"); } - /* won't see this yet as we kill the service */ + /* won't see this yet as we kill the service with ctrl+c */ _tprintf(_T("Detaching Winsock2...\n")); WSACleanup(); return 0; _____ Modified: trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.c --- trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.c 2005-10-18 13:32:32 UTC (rev 18552) +++ trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.c 2005-10-18 17:06:36 UTC (rev 18553) @@ -1,3 +1,23 @@ +/* + * ReactOS Services + * Copyright (C) 2005 ReactOS Team + * + * LICENCE: GPL - See COPYING in the top level directory + * PROJECT: ReactOS simple TCP/IP services + * FILE: apps/utils/net/tcpsvcs/tcpsvcs.c + * PURPOSE: Provide CharGen, Daytime, Discard, Echo, and Qotd services + * PROGRAMMERS: Ged Murphy (gedmurphy(a)gmail.com) + * REVISIONS: + * GM 04/10/05 Created + * + */ +/* + * TODO: + * - Start tcpsvcs as a service. + * - write debugging function and print all dbg info via that. + * + */ + #include <stdio.h> #include <winsock2.h> #include <tchar.h> @@ -12,7 +32,7 @@ FILE *hLogFile; BOOL bLogEvents = TRUE; BOOL ShutDown, PauseFlag; -LPTSTR LogFileName = "tcpsvcs_log.txt"; +LPCTSTR LogFileName = "tcpsvcs_log.log"; static SERVICE_TABLE_ENTRY ServiceTable[2] = @@ -40,7 +60,7 @@ WSADATA wsaData; DWORD RetVal; INT i; - + if ((RetVal = WSAStartup(MAKEWORD(2, 2), &wsaData)) != 0) { _tprintf(_T("WSAStartup() failed : %lu\n"), RetVal); @@ -64,7 +84,7 @@ if (hThread[i] == NULL) { _tprintf(_T("Failed to start %s server....\n"), Services[i].Name); - ExitProcess(i); + //ExitProcess(i); } } @@ -81,7 +101,7 @@ -/* code to run tcpsvcs as a service */ +/* code to run tcpsvcs as a service through services.msc */ #if 0 int main(int argc, char *argv[]) @@ -105,7 +125,7 @@ hLogFile = fopen(LogFileName, _T("w+")); if (hLogFile == NULL) return; - + LogEvent(_T("Entering ServiceMain"), 0, FALSE); hServStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS; @@ -116,14 +136,14 @@ hServStatus.dwServiceSpecificExitCode = 0; hServStatus.dwCheckPoint = 0; hServStatus.dwWaitHint = 2*CS_TIMEOUT; - + hSStat = RegisterServiceCtrlHandler("tcpsvcs", ServerCtrlHandler); if (hSStat == 0) LogEvent(_T("Failed to register service\n"), 100, TRUE); - LogEvent(_T("Control handler registered successfully"), 0, FALSE); - SetServiceStatus (hSStat, &hServStatus); - LogEvent(_T("Service status set to SERVICE_START_PENDING"), 0, FALSE); + LogEvent(_T("Control handler registered successfully"), 0, FALSE); + SetServiceStatus (hSStat, &hServStatus); + LogEvent(_T("Service status set to SERVICE_START_PENDING"), 0, FALSE); if (CreateServers() != 0) { @@ -132,15 +152,15 @@ SetServiceStatus(hSStat, &hServStatus); return; } + + LogEvent(_T("Service threads shut down. Set SERVICE_STOPPED status"), 0, FALSE); + /* We will only return here when the ServiceSpecific function + completes, indicating system shutdown. */ + UpdateStatus (SERVICE_STOPPED, 0); + LogEvent(_T("Service status set to SERVICE_STOPPED"), 0, FALSE); + fclose(hLogFile); /* Clean up everything, in general */ + return; - LogEvent(_T("Service threads shut down. Set SERVICE_STOPPED status"), 0, FALSE); - /* We will only return here when the ServiceSpecific function - completes, indicating system shutdown. */ - UpdateStatus (SERVICE_STOPPED, 0); - LogEvent(_T("Service status set to SERVICE_STOPPED"), 0, FALSE); - fclose(hLogFile); /* Clean up everything, in general */ - return; - } VOID WINAPI @@ -173,12 +193,12 @@ void UpdateStatus (int NewStatus, int Check) /* Set a new service status and checkpoint (either specific value or increment) */ { - if (Check < 0 ) hServStatus.dwCheckPoint++; - else hServStatus.dwCheckPoint = Check; - if (NewStatus >= 0) hServStatus.dwCurrentState = NewStatus; - if (!SetServiceStatus (hSStat, &hServStatus)) - LogEvent (_T("Cannot set service status"), 101, TRUE); - return; + if (Check < 0 ) hServStatus.dwCheckPoint++; + else hServStatus.dwCheckPoint = Check; + if (NewStatus >= 0) hServStatus.dwCurrentState = NewStatus; + if (!SetServiceStatus (hSStat, &hServStatus)) + LogEvent (_T("Cannot set service status"), 101, TRUE); + return; } INT @@ -187,7 +207,7 @@ DWORD dwThreadId[NUM_SERVICES]; HANDLE hThread[NUM_SERVICES]; INT i; - + UpdateStatus(-1, -1); /* increment checkpoint */ /* Create MAX_THREADS worker threads. */ @@ -223,38 +243,37 @@ } -/* 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. */ +/* 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. */ VOID LogEvent (LPCTSTR UserMessage, DWORD ExitCode, BOOL PrintErrorMsg) { - DWORD eMsgLen, ErrNum = GetLastError (); - LPTSTR lpvSysMsg; - TCHAR MessageBuffer[512]; + DWORD eMsgLen, ErrNum = GetLastError (); + LPTSTR lpvSysMsg; + TCHAR MessageBuffer[512]; - if (PrintErrorMsg) { - eMsgLen = FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER | - FORMAT_MESSAGE_FROM_SYSTEM, NULL, - ErrNum, MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPTSTR)&lpvSysMsg, 0, NULL); + if (PrintErrorMsg) { + eMsgLen = FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM, NULL, + ErrNum, MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPTSTR)&lpvSysMsg, 0, NULL); - _stprintf (MessageBuffer, _T("\n%s %s ErrNum = %d. ExitCode = %d."), - UserMessage, lpvSysMsg, ErrNum, ExitCode); - HeapFree (GetProcessHeap (), 0, lpvSysMsg); - /* Explained in Chapter 6. */ - } else { - _stprintf (MessageBuffer, _T("\n%s ExitCode = %d."), - UserMessage, ExitCode); - } + _stprintf (MessageBuffer, _T("\n%s %s ErrNum = %d. ExitCode = %d."), + UserMessage, lpvSysMsg, ErrNum, ExitCode); + HeapFree (GetProcessHeap (), 0, lpvSysMsg); + } else { + _stprintf (MessageBuffer, _T("\n%s ExitCode = %d."), + UserMessage, ExitCode); + } - fputs (MessageBuffer, hLogFile); + fputs (MessageBuffer, hLogFile); - if (ExitCode > 0) - ExitProcess (ExitCode); - else - return; + if (ExitCode > 0) + ExitProcess (ExitCode); + else + return; } #endif _____ Modified: trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.h --- trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.h 2005-10-18 13:32:32 UTC (rev 18552) +++ trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.h 2005-10-18 17:06:36 UTC (rev 18553) @@ -1,3 +1,17 @@ +/* + * ReactOS Services + * Copyright (C) 2005 ReactOS Team + * + * LICENCE: GPL - See COPYING in the top level directory + * PROJECT: ReactOS simple TCP/IP services + * FILE: apps/utils/net/tcpsvcs/tcpsvcs.h + * PURPOSE: Provide CharGen, Daytime, Discard, Echo, and Qotd services + * PROGRAMMERS: Ged Murphy (gedmurphy(a)gmail.com) + * REVISIONS: + * GM 04/10/05 Created + * + */ + /* default port numbers */ #define ECHO_PORT 7 #define DISCARD_PORT 9 @@ -28,14 +42,14 @@ } SERVICES, *PSERVICES; -/* tcpsvcs functions * / -static VOID WINAPI ServiceMain(DWORD argc, LPTSTR argv[]); +/* tcpsvcs functions */ +//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 UpdateStatus (int NewStatus, int Check); -*/ + /* skelserver functions */ DWORD WINAPI StartServer(LPVOID lpParam); SOCKET SetUpListener(const char* ServAddr, int Port); _____ Modified: trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.xml --- trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.xml 2005-10-18 13:32:32 UTC (rev 18552) +++ trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.xml 2005-10-18 17:06:36 UTC (rev 18553) @@ -12,6 +12,5 @@ <file>daytime.c</file> <file>qotd.c</file> <file>chargen.c</file> - <file>quotes.rc</file> <file>tcpsvcs.rc</file> </module>

1 0

[turner] 18552: fix errors in "activate". Change activate, window, and msgbox commands from checking for __REACTOS__ to NT4_INTERNAL_COMMAND. they are turned off by default(uncomment line 23 to enable).
by turner＠svn.reactos.com 18 Oct '05

18 Oct '05

fix errors in "activate". Change activate, window, and msgbox commands from checking for __REACTOS__ to NT4_INTERNAL_COMMAND. they are turned off by default(uncomment line 23 to enable). Modified: trunk/reactos/subsys/system/cmd/config.h Modified: trunk/reactos/subsys/system/cmd/window.c _____ Modified: trunk/reactos/subsys/system/cmd/config.h --- trunk/reactos/subsys/system/cmd/config.h 2005-10-18 12:25:31 UTC (rev 18551) +++ trunk/reactos/subsys/system/cmd/config.h 2005-10-18 13:32:32 UTC (rev 18552) @@ -20,6 +20,8 @@ #define WIN32_LEAN_AND_MEAN +//#define NT4_INTERNAL_COMMANDS + /* Define to enable the alias command, and aliases.*/ #define FEATURE_ALIASES @@ -51,7 +53,7 @@ /* #define LOCALE_GERMAN */ /* German locale */ /* #define LOCALE_DEFAULT */ /* United States locale */ -#ifndef __REACTOS__ +#ifdef NT4_INTERNAL_COMMANDS #define INCLUDE_CMD_ACTIVATE #endif #define INCLUDE_CMD_ATTRIB @@ -70,7 +72,7 @@ #define INCLUDE_CMD_MEMORY #define INCLUDE_CMD_MKDIR #define INCLUDE_CMD_MOVE -#ifndef __REACTOS__ +#ifdef NT4_INTERNAL_COMMANDS #define INCLUDE_CMD_MSGBOX #endif #define INCLUDE_CMD_PATH @@ -90,7 +92,7 @@ #define INCLUDE_CMD_BEEP #define INCLUDE_CMD_VERIFY #define INCLUDE_CMD_VOL -#ifndef __REACTOS__ +#ifdef NT4_INTERNAL_COMMANDS #define INCLUDE_CMD_WINDOW #endif _____ Modified: trunk/reactos/subsys/system/cmd/window.c --- trunk/reactos/subsys/system/cmd/window.c 2005-10-18 12:25:31 UTC (rev 18551) +++ trunk/reactos/subsys/system/cmd/window.c 2005-10-18 13:32:32 UTC (rev 18552) @@ -49,9 +49,8 @@ if (*param) - p = split(param, &argc); + p = split(param, &argc, FALSE); - for (i = 0; i < argc; i++) { p_tmp = p[i]; @@ -187,7 +186,7 @@ return 0; } - h = GetConsoleWindow(); + hwnd = GetConsoleWindow(); Sleep(0); return ServiceActivate(param, hwnd); } @@ -195,8 +194,9 @@ INT CommandActivate (LPTSTR cmd, LPTSTR param) { - LPTSTR str; HWND hwnd; + LPTSTR *arg; + INT argc; if (_tcsncmp (param, _T("/?"), 2) == 0) { @@ -207,24 +207,25 @@ if(!(*param)) return 1; - str=_tcschr(param,_T(' ')); - - if (str) + /*Split the user input into array*/ + arg = split (param, &argc, FALSE); + if(argc < 2) { - *str=_T('\0'); - str++; + if(arg != NULL) + freep(arg); } - else - str = ""; - - hwnd = FindWindow(NULL, param); + hwnd = FindWindow(NULL, arg[0]); if (hwnd == NULL) { + if(arg != NULL) + freep(arg); ConErrResPuts(STRING_WINDOW_ERROR1); return 1; } + if(arg != NULL) + freep(arg); - return ServiceActivate(str, hwnd); + return ServiceActivate(param, hwnd); } #endif /* ( defined(INCLUDE_CMD_WINDOW) || defined(INCLUDE_CMD_ACTIVATE) ) */

1 0

[turner] 18551: remove more __REACTOS__ checks / unused code. I left WIN32_LEAN_AND_MEAN defined at all times. If this causes problems feel free to remove it.
by turner＠svn.reactos.com 18 Oct '05

18 Oct '05

remove more __REACTOS__ checks / unused code. I left WIN32_LEAN_AND_MEAN defined at all times. If this causes problems feel free to remove it. Modified: trunk/reactos/subsys/system/cmd/cmd.c Modified: trunk/reactos/subsys/system/cmd/config.h _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-10-18 04:23:50 UTC (rev 18550) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-10-18 12:25:31 UTC (rev 18551) @@ -1648,25 +1648,7 @@ { ParseCommandLine (_T("\\cmdstart.bat")); } -#ifndef __REACTOS__ - else - { - /* try to run cmdstart.bat from install dir */ - LPTSTR p; - _tcscpy (commandline, argv[0]); - p = _tcsrchr (commandline, _T('\\')) + 1; - _tcscpy (p, _T("cmdstart.bat")); - - if (IsExistingFile (_T("commandline"))) - { - LoadString(CMD_ModuleHandle, STRING_CMD_ERROR4, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg, commandline); - ParseCommandLine (commandline); - } - } -#endif - #ifdef FEATURE_DIR_STACK /* initialize directory stack */ InitDirectoryStack (); @@ -1692,10 +1674,6 @@ static VOID Cleanup (int argc, TCHAR *argv[]) { -#ifndef __REACTOS__ - TCHAR szMsg[RC_STRING_MAX_SIZE]; -#endif - /* run cmdexit.bat */ if (IsExistingFile (_T("cmdexit.bat"))) { @@ -1708,26 +1686,7 @@ ConErrResPuts (STRING_CMD_ERROR5); ParseCommandLine (_T("\\cmdexit.bat")); } -#ifndef __REACTOS__ - else - { - /* try to run cmdexit.bat from install dir */ - TCHAR commandline[CMDLINE_LENGTH]; - LPTSTR p; - _tcscpy (commandline, argv[0]); - p = _tcsrchr (commandline, _T('\\')) + 1; - _tcscpy (p, _T("cmdexit.bat")); - - if (IsExistingFile (_T("commandline"))) - { - LoadString(CMD_ModuleHandle, STRING_CMD_ERROR4, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg, commandline); - ParseCommandLine (commandline); - } - } -#endif - #ifdef FEATURE_ALIASES DestroyAlias (); #endif _____ Modified: trunk/reactos/subsys/system/cmd/config.h --- trunk/reactos/subsys/system/cmd/config.h 2005-10-18 04:23:50 UTC (rev 18550) +++ trunk/reactos/subsys/system/cmd/config.h 2005-10-18 12:25:31 UTC (rev 18551) @@ -15,15 +15,10 @@ #ifndef _CONFIG_H_INCLUDED_ #define _CONFIG_H_INCLUDED_ - -#ifndef __REACTOS__ -#define WIN32_LEAN_AND_MEAN -#endif /* __REACTOS__ */ - - /* Define to enable debugging code */ //#define _DEBUG +#define WIN32_LEAN_AND_MEAN /* Define to enable the alias command, and aliases.*/ #define FEATURE_ALIASES

1 0

[royce] 18550: calc_buffer_display():
by royce＠svn.reactos.com 18 Oct '05

18 Oct '05

calc_buffer_display(): eliminate unnecessary copying ( and potential buffer overrun ) eliminate variable naming conflicts Modified: trunk/reactos/subsys/system/calc/winecalc.c _____ Modified: trunk/reactos/subsys/system/calc/winecalc.c --- trunk/reactos/subsys/system/calc/winecalc.c 2005-10-18 04:15:55 UTC (rev 18549) +++ trunk/reactos/subsys/system/calc/winecalc.c 2005-10-18 04:23:50 UTC (rev 18550) @@ -2938,7 +2938,6 @@ void calc_buffer_display(CALC *calc) { TCHAR *p; TCHAR s[CALC_BUF_SIZE]; - TCHAR r[CALC_BUF_SIZE] = TEXT("0"); int point=0; calcfloat real; @@ -2966,11 +2965,10 @@ else { int i = 0; int lz = 0; - calcfloat r; int exp = 0; - r = calc_atof(calc->buffer, calc->numBase); - _stprintf(s, FMT_DESC_EXP, r); + real = calc_atof(calc->buffer, calc->numBase); + _stprintf(s, FMT_DESC_EXP, real); // remove leading zeros in exponent p = s; while (*p) { @@ -3026,13 +3024,11 @@ if (!point && calc->numBase == NBASE_DECIMAL) _tcscat(s, TEXT(".")); - if (*s == TEXT('.')) { - _tcscat(r, s); - _tcscpy(calc->display, r); - } - else { - _tcscpy(calc->display, s); - } + if (*s == TEXT('.')) + _tcscpy(calc->display, TEXT("0")); + else + calc->display[0] = 0; + _tcscat(calc->display, s); } } InvalidateRect(calc->hWnd, NULL, FALSE);

1 0

[royce] 18549: msvc6 compilation fixes
by royce＠svn.reactos.com 18 Oct '05

18 Oct '05

msvc6 compilation fixes fix buffer over(under?)flow in calc_sep() Modified: trunk/reactos/subsys/system/calc/winecalc.c _____ Modified: trunk/reactos/subsys/system/calc/winecalc.c --- trunk/reactos/subsys/system/calc/winecalc.c 2005-10-18 03:12:49 UTC (rev 18548) +++ trunk/reactos/subsys/system/calc/winecalc.c 2005-10-18 04:15:55 UTC (rev 18549) @@ -470,7 +470,7 @@ int len; TCHAR *s; HGLOBAL hGlobalMemory; - PSTR pGlobalMemory; + LPTSTR pGlobalMemory; if (!(len = _tcslen(calc.display))) return 0; @@ -506,10 +506,10 @@ case TEXT('\x16'): // Ctrl+V Paste { TCHAR *s; - int c; + TCHAR c; int cmd = 0; - int size = 0; - int i = 0; + size_t size = 0; + size_t i = 0; HGLOBAL hGlobalMemory; LPTSTR pGlobalMemory; @@ -3082,7 +3082,7 @@ r[i++] = c; if (x++ % 3 == 0) r[i++] = TEXT(','); - if (n == -1) + if (n == 0) break; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs