Ros-diffs

ros-diffs@reactos.org

81390 discussions

[npwoods] 18257: Regedit: Fixed stupid compilation errors
by npwoods＠svn.reactos.com 04 Oct '05

04 Oct '05

Regedit: Fixed stupid compilation errors Modified: trunk/reactos/subsys/system/regedit/framewnd.c Modified: trunk/reactos/subsys/system/regedit/regproc.c _____ Modified: trunk/reactos/subsys/system/regedit/framewnd.c --- trunk/reactos/subsys/system/regedit/framewnd.c 2005-10-04 02:40:01 UTC (rev 18256) +++ trunk/reactos/subsys/system/regedit/framewnd.c 2005-10-04 02:46:14 UTC (rev 18257) @@ -365,7 +365,7 @@ ofn.lpTemplateName = MAKEINTRESOURCE(IDD_EXPORTRANGE); if (GetSaveFileName(&ofn)) { BOOL result; - LPCSTR pszExportKeyPath; + LPSTR pszExportKeyPath; #ifdef UNICODE CHAR buffer[_MAX_PATH]; _____ Modified: trunk/reactos/subsys/system/regedit/regproc.c --- trunk/reactos/subsys/system/regedit/regproc.c 2005-10-04 02:40:01 UTC (rev 18256) +++ trunk/reactos/subsys/system/regedit/regproc.c 2005-10-04 02:46:14 UTC (rev 18257) @@ -1290,7 +1290,7 @@ FILE *file = _tfopen(file_name, _T("w")); if (!file) { perror(""); - fprintf(stderr,"%s: Can't open file \"%s\"\n", getAppName(), file_name); +/* fprintf(stderr,"%s: Can't open file \"%s\"\n", getAppName(), file_name);*/ exit(1); } fputs("REGEDIT4\n", file);

1 0

[npwoods] 18256: Regedit: Fixed exporting subtrees with Unicode
by npwoods＠svn.reactos.com 04 Oct '05

04 Oct '05

Regedit: Fixed exporting subtrees with Unicode Core exporting code still ANSI; need to fix this Modified: trunk/reactos/subsys/system/regedit/framewnd.c Modified: trunk/reactos/subsys/system/regedit/regproc.c Modified: trunk/reactos/subsys/system/regedit/regproc.h _____ Modified: trunk/reactos/subsys/system/regedit/framewnd.c --- trunk/reactos/subsys/system/regedit/framewnd.c 2005-10-03 23:01:10 UTC (rev 18255) +++ trunk/reactos/subsys/system/regedit/framewnd.c 2005-10-04 02:40:01 UTC (rev 18256) @@ -365,10 +365,17 @@ ofn.lpTemplateName = MAKEINTRESOURCE(IDD_EXPORTRANGE); if (GetSaveFileName(&ofn)) { BOOL result; - /* FIXME - convert strings to ascii! */ - result = export_registry_key((CHAR*)ofn.lpstrFile, (CHAR*)ExportKeyPath); - /*result = export_registry_key(ofn.lpstrFile, NULL);*/ - /*if (!export_registry_key(ofn.lpstrFile, NULL)) {*/ + LPCSTR pszExportKeyPath; +#ifdef UNICODE + CHAR buffer[_MAX_PATH]; + + WideCharToMultiByte(CP_ACP, 0, ExportKeyPath, -1, buffer, sizeof(buffer), NULL, NULL); + pszExportKeyPath = buffer; +#else + pszExportKeyPath = ExportKeyPath; +#endif + + result = export_registry_key(ofn.lpstrFile, pszExportKeyPath); if (!result) { /*printf("Can't open file \"%s\"\n", ofn.lpstrFile);*/ return FALSE; _____ Modified: trunk/reactos/subsys/system/regedit/regproc.c --- trunk/reactos/subsys/system/regedit/regproc.c 2005-10-03 23:01:10 UTC (rev 18255) +++ trunk/reactos/subsys/system/regedit/regproc.c 2005-10-04 02:40:01 UTC (rev 18256) @@ -1285,9 +1285,9 @@ /*********************************************************************** ******* * Open file for export. */ -static FILE *REGPROC_open_export_file(CHAR *file_name) +static FILE *REGPROC_open_export_file(const TCHAR *file_name) { - FILE *file = fopen(file_name, "w"); + FILE *file = _tfopen(file_name, _T("w")); if (!file) { perror(""); fprintf(stderr,"%s: Can't open file \"%s\"\n", getAppName(), file_name); @@ -1305,7 +1305,7 @@ * reg_key_name - registry branch to export. The whole registry is exported if * reg_key_name is NULL or contains an empty string. */ -BOOL export_registry_key(CHAR *file_name, CHAR *reg_key_name) +BOOL export_registry_key(const TCHAR *file_name, CHAR *reg_key_name) { HKEY reg_key_class; _____ Modified: trunk/reactos/subsys/system/regedit/regproc.h --- trunk/reactos/subsys/system/regedit/regproc.h 2005-10-03 23:01:10 UTC (rev 18255) +++ trunk/reactos/subsys/system/regedit/regproc.h 2005-10-04 02:40:01 UTC (rev 18256) @@ -38,7 +38,7 @@ void doRegisterDLL(LPSTR lpsLine); void doUnregisterDLL(LPSTR lpsLine); -BOOL export_registry_key(CHAR *file_name, CHAR *reg_key_name); +BOOL export_registry_key(const TCHAR *file_name, CHAR *reg_key_name); BOOL import_registry_file(LPTSTR filename); void delete_registry_key(CHAR *reg_key_name);

1 0

[weiden] 18255: don't leak memory in RegDeleteTree() when NtEnumerateKey() returns an unexpected error code (such as when there's insufficient system resources to perform the query)
by weiden＠svn.reactos.com 03 Oct '05

03 Oct '05

don't leak memory in RegDeleteTree() when NtEnumerateKey() returns an unexpected error code (such as when there's insufficient system resources to perform the query) Modified: trunk/reactos/lib/advapi32/reg/reg.c _____ Modified: trunk/reactos/lib/advapi32/reg/reg.c --- trunk/reactos/lib/advapi32/reg/reg.c 2005-10-03 22:46:49 UTC (rev 18254) +++ trunk/reactos/lib/advapi32/reg/reg.c 2005-10-03 23:01:10 UTC (rev 18255) @@ -1479,14 +1479,18 @@ } SubKeyFailure: - ASSERT(newDelKeys != NULL); - RtlFreeHeap(ProcessHeap, - 0, - newDelKeys); + /* newDelKeys can be NULL here when NtEnumerateKey returned an + error other than STATUS_BUFFER_TOO_SMALL or STATUS_BUFFER_OVERFLOW! */ + if (newDelKeys != NULL) + { + RtlFreeHeap(ProcessHeap, + 0, + newDelKeys); + } SubKeyFailureNoFree: /* don't break, let's try to delete as many keys as possible */ - if (Status2 != STATUS_NO_MORE_ENTRIES && NT_SUCCESS(Status)) + if (NT_SUCCESS(Status)) { Status = Status2; }

1 0

[weiden] 18254: fixed a memory leak in RegDeleteTree() that could be caused when two threads attempt to delete the same tree simultaneously
by weiden＠svn.reactos.com 03 Oct '05

03 Oct '05

fixed a memory leak in RegDeleteTree() that could be caused when two threads attempt to delete the same tree simultaneously Modified: trunk/reactos/lib/advapi32/reg/reg.c _____ Modified: trunk/reactos/lib/advapi32/reg/reg.c --- trunk/reactos/lib/advapi32/reg/reg.c 2005-10-03 21:40:58 UTC (rev 18253) +++ trunk/reactos/lib/advapi32/reg/reg.c 2005-10-03 22:46:49 UTC (rev 18254) @@ -1466,7 +1466,15 @@ } else if (Status2 == STATUS_NO_MORE_ENTRIES) { - ASSERT(newDelKeys == NULL); + /* in some race conditions where another thread would delete + the same tree at the same time, newDelKeys could actually + be != NULL! */ + if (newDelKeys != NULL) + { + RtlFreeHeap(ProcessHeap, + 0, + newDelKeys); + } break; } @@ -1555,7 +1563,7 @@ NULL); Status = NtOpenKey(&SubKeyHandle, - DELETE | KEY_ENUMERATE_SUB_KEYS | KEY_QUERY_VALUE, + DELETE | KEY_ENUMERATE_SUB_KEYS, &ObjectAttributes); if (!NT_SUCCESS(Status)) {

1 0

[ea] 18253: A note about this piece of code.
by ea＠svn.reactos.com 03 Oct '05

03 Oct '05

A note about this piece of code. Added: trunk/reactos/lib/nt/readme.txt _____ Added: trunk/reactos/lib/nt/readme.txt --- trunk/reactos/lib/nt/readme.txt 2005-10-03 21:37:05 UTC (rev 18252) +++ trunk/reactos/lib/nt/readme.txt 2005-10-03 21:40:58 UTC (rev 18253) @@ -0,0 +1,2 @@ +This is the startup code for NT native processes. +(smss.exe, autochk.exe, csrss.exe) Property changes on: trunk/reactos/lib/nt/readme.txt ___________________________________________________________________ Name: svn:eol-style + native

1 0

[weiden] 18252: Don't fail when there are no more subkeys to delete in RegDeleteTree()
by weiden＠svn.reactos.com 03 Oct '05

03 Oct '05

Don't fail when there are no more subkeys to delete in RegDeleteTree() Modified: trunk/reactos/lib/advapi32/reg/reg.c _____ Modified: trunk/reactos/lib/advapi32/reg/reg.c --- trunk/reactos/lib/advapi32/reg/reg.c 2005-10-03 21:35:12 UTC (rev 18251) +++ trunk/reactos/lib/advapi32/reg/reg.c 2005-10-03 21:37:05 UTC (rev 18252) @@ -1404,7 +1404,7 @@ /* open the subkey */ Status2 = NtOpenKey(&newDelKeys->KeyHandle, - DELETE | KEY_ENUMERATE_SUB_KEYS | KEY_QUERY_VALUE, + DELETE | KEY_ENUMERATE_SUB_KEYS, &ObjectAttributes); if (!NT_SUCCESS(Status2)) { @@ -1464,6 +1464,11 @@ Status2 = STATUS_INSUFFICIENT_RESOURCES; } } + else if (Status2 == STATUS_NO_MORE_ENTRIES) + { + ASSERT(newDelKeys == NULL); + break; + } SubKeyFailure: ASSERT(newDelKeys != NULL); @@ -1511,7 +1516,7 @@ } else Status = STATUS_INSUFFICIENT_RESOURCES; - + return Status; }

1 0

[ea] 18251: A raw attempt to fix the startup code for native processes.
by ea＠svn.reactos.com 03 Oct '05

03 Oct '05

A raw attempt to fix the startup code for native processes. (note: it seems NTOSKRNL passes nothing to smss.exe) Modified: trunk/reactos/lib/nt/entry_point.c _____ Modified: trunk/reactos/lib/nt/entry_point.c --- trunk/reactos/lib/nt/entry_point.c 2005-10-03 20:28:29 UTC (rev 18250) +++ trunk/reactos/lib/nt/entry_point.c 2005-10-03 21:35:12 UTC (rev 18251) @@ -23,11 +23,36 @@ ULONG DebugFlag ); -#define NDEBUG +//#define NDEBUG #include <debug.h> -/* FUNCTIONSS ****************************************************************/ +/* FUNCTIONS ****************************************************************/ +ULONG FASTCALL WideCharStringToUnicodeString (PWCHAR wsIn, PUNICODE_STRING usOut) +{ + ULONG Length = 0; + PWCHAR CurrentChar = wsIn; + + DPRINT("%s(%08lx,%08lx) called\n", __FUNCTION__, wsIn, usOut); + + if (NULL != CurrentChar) + { + usOut->Buffer = CurrentChar; + while (*CurrentChar ++) + { + ++ Length; + while (*CurrentChar ++) + { + ++ Length; + } + } + ++ Length; + } + usOut->Length = Length; + usOut->MaximumLength = Length; + return Length; +} + VOID STDCALL NtProcessStartup(PPEB Peb) @@ -36,6 +61,8 @@ PRTL_USER_PROCESS_PARAMETERS ProcessParameters; PUNICODE_STRING CmdLineString; ANSI_STRING AnsiCmdLine; + UNICODE_STRING UnicodeEnvironment; + ANSI_STRING AnsiEnvironment; PCHAR NullPointer = NULL; INT argc = 0; PCHAR *argv; @@ -45,6 +72,8 @@ ULONG Length; ASSERT(Peb); + DPRINT("%s(%08lx) called\n", __FUNCTION__, Peb); + /* Normalize and get the Process Parameters */ ProcessParameters = RtlNormalizeProcessParams(Peb->ProcessParameters); ASSERT(ProcessParameters); @@ -93,6 +122,7 @@ { /* Save one token pointer */ *ArgumentList++ = Destination; + DPRINT("NT: argv[%d]=[%d]\n", argc, Destination); /* Increase one token count */ argc++; @@ -112,25 +142,30 @@ /* Now handle the enviornment, point the envp at our current list location. */ envp = ArgumentList; - /* Change our source to the enviroment pointer */ - Source = (PCHAR)ProcessParameters->Environment; - - /* Simply do a direct copy */ - if (Source) + if (0 < WideCharStringToUnicodeString (ProcessParameters->Environment, & UnicodeEnvironment)) { - while (*Source) - { - /* Save a pointer to this token */ - *ArgumentList++ = Source; + RtlUnicodeStringToAnsiString (& AnsiEnvironment, & UnicodeEnvironment, TRUE); - /* Keep looking for another variable */ - while (*Source++); - } - } + /* Change our source to the enviroment pointer */ + Source = AnsiEnvironment.Buffer; - /* Null terminate the list again */ - *ArgumentList++ = NULL; + /* Simply do a direct copy */ + if (Source) + { + while (*Source) + { + /* Save a pointer to this token */ + *ArgumentList++ = Source; + DPRINT("NT: envp[%08x]=[%s]\n",Source,Source); + /* Keep looking for another variable */ + while (*Source++); + } + } + + /* Null terminate the list again */ + *ArgumentList++ = NULL; + } /* Breakpoint if we were requested to do so */ if (ProcessParameters->DebugFlags) DbgBreakPoint();

1 0

[turner] 18250: dont use the whole commandline as a fall back for execution searching because it could contain spaces. also, wrap commandline params in quotes so if there is a space in the path it still finds it. bug found by billgMS.
by turner＠svn.reactos.com 03 Oct '05

03 Oct '05

dont use the whole commandline as a fall back for execution searching because it could contain spaces. also, wrap commandline params in quotes so if there is a space in the path it still finds it. bug found by billgMS. Modified: trunk/reactos/subsys/system/cmd/cmd.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-10-03 18:49:44 UTC (rev 18249) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-10-03 20:28:29 UTC (rev 18250) @@ -423,15 +423,12 @@ /* search the PATH environment variable for the binary */ if (!SearchForExecutable (first, szFullName)) { - if (!SearchForExecutable (full, szFullName)) - { error_bad_command (); free (first); free (rest); free (full); free (szFullName); return; - } } @@ -1619,13 +1616,14 @@ ++i; if (i < argc) { - _tcscpy (commandline, argv[i]); + _tcscpy (commandline, _T("\"")); + _tcscat (commandline, argv[i]); + _tcscat (commandline, _T("\"")); while (++i < argc) { _tcscat (commandline, _T(" ")); _tcscat (commandline, argv[i]); } - ParseCommandLine(commandline); } }

1 0

[hbirr] 18249: Return an error instead of STATUS_SUCCESS for functions which are not implemented or supported (in ScsiPortDeviceControl).
by hbirr＠svn.reactos.com 03 Oct '05

03 Oct '05

Return an error instead of STATUS_SUCCESS for functions which are not implemented or supported (in ScsiPortDeviceControl). Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c _____ Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c --- trunk/reactos/drivers/storage/scsiport/scsiport.c 2005-10-03 18:32:30 UTC (rev 18248) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c 2005-10-03 18:49:44 UTC (rev 18249) @@ -32,6 +32,7 @@ #include <ddk/srb.h> #include <ddk/scsi.h> #include <ddk/ntddscsi.h> +#include <ddk/ntddstor.h> #include <stdio.h> #define NDEBUG @@ -1710,10 +1711,10 @@ { PIO_STACK_LOCATION Stack; PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; + NTSTATUS Status = STATUS_SUCCESS; DPRINT("ScsiPortDeviceControl()\n"); - Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = 0; @@ -1755,16 +1756,35 @@ DPRINT("Inquiry data size: %lu\n", Irp->IoStatus.Information); } break; + + case IOCTL_SCSI_PASS_THROUGH: + DPRINT(" IOCTL_SCSI_PASS_THROUGH\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + case IOCTL_SCSI_PASS_THROUGH_DIRECT: + DPRINT(" IOCTL_SCSI_PASS_THROUGH_DIRECT\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + + case IOCTL_SCSI_MINIPORT: + DPRINT1(" IOCTL_SCSI_MINIPORT\n"); + DPRINT1(" Signature: %.8s\n", ((PSRB_IO_CONTROL)Irp->AssociatedIrp.SystemBuffer)->Signature); + DPRINT1(" ControlCode: 0x%lX\n", ((PSRB_IO_CONTROL)Irp->AssociatedIrp.SystemBuffer)->ControlCode); + Status = STATUS_INVALID_DEVICE_REQUEST; + break; + default: DPRINT1(" unknown ioctl code: 0x%lX\n", Stack->Parameters.DeviceIoControl.IoControlCode); + Status = STATUS_INVALID_DEVICE_REQUEST; break; } + Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); - return(STATUS_SUCCESS); + return Status; } static VOID

1 0

[gedmurphy] 18248: - Don't call winsock initialiser for each seperate server thread
by gedmurphy＠svn.reactos.com 03 Oct '05

03 Oct '05

- Don't call winsock initialiser for each seperate server thread - Add more code for tcpsvcs to be controled via services. Still #if 0'd out until fully implemented. - Make server more informative with what is happening. (this info will be output to a log file once implemented as a service. 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 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/chargen.c --- trunk/reactos/apps/utils/net/tcpsvcs/chargen.c 2005-10-03 14:42:34 UTC (rev 18247) +++ trunk/reactos/apps/utils/net/tcpsvcs/chargen.c 2005-10-03 18:32:30 UTC (rev 18248) @@ -22,7 +22,7 @@ _tprintf(_T("Connection shutdown failed\n")); Retval = 3; } - _tprintf(_T("Terminating thread\n")); + _tprintf(_T("Terminating chargen thread\n")); ExitThread(0); return Retval; _____ Modified: trunk/reactos/apps/utils/net/tcpsvcs/daytime.c --- trunk/reactos/apps/utils/net/tcpsvcs/daytime.c 2005-10-03 14:42:34 UTC (rev 18247) +++ trunk/reactos/apps/utils/net/tcpsvcs/daytime.c 2005-10-03 18:32:30 UTC (rev 18248) @@ -26,7 +26,7 @@ _tprintf(_T("Connection shutdown failed\n")); Retval = 3; } - _tprintf(_T("Terminating thread\n")); + _tprintf(_T("Terminating daytime thread\n")); ExitThread(0); return Retval; _____ Modified: trunk/reactos/apps/utils/net/tcpsvcs/discard.c --- trunk/reactos/apps/utils/net/tcpsvcs/discard.c 2005-10-03 14:42:34 UTC (rev 18247) +++ trunk/reactos/apps/utils/net/tcpsvcs/discard.c 2005-10-03 18:32:30 UTC (rev 18248) @@ -24,7 +24,7 @@ _tprintf(_T("Connection shutdown failed\n")); Retval = 3; } - _tprintf(_T("Terminating thread\n")); + _tprintf(_T("Terminating discard thread\n")); ExitThread(0); return Retval; _____ Modified: trunk/reactos/apps/utils/net/tcpsvcs/echo.c --- trunk/reactos/apps/utils/net/tcpsvcs/echo.c 2005-10-03 14:42:34 UTC (rev 18247) +++ trunk/reactos/apps/utils/net/tcpsvcs/echo.c 2005-10-03 18:32:30 UTC (rev 18248) @@ -22,7 +22,7 @@ _tprintf(_T("Connection shutdown failed\n")); Retval = 3; } - _tprintf(_T("Terminating thread\n")); + _tprintf(_T("Terminating echo thread\n")); ExitThread(0); return Retval; _____ Modified: trunk/reactos/apps/utils/net/tcpsvcs/qotd.c --- trunk/reactos/apps/utils/net/tcpsvcs/qotd.c 2005-10-03 14:42:34 UTC (rev 18247) +++ trunk/reactos/apps/utils/net/tcpsvcs/qotd.c 2005-10-03 18:32:30 UTC (rev 18248) @@ -33,7 +33,7 @@ _tprintf(_T("Connection shutdown failed\n")); Retval = 3; } - _tprintf(_T("Terminating thread\n")); + _tprintf(_T("Terminating qotd thread\n")); ExitThread(0); return Retval; _____ Modified: trunk/reactos/apps/utils/net/tcpsvcs/skelserver.c --- trunk/reactos/apps/utils/net/tcpsvcs/skelserver.c 2005-10-03 14:42:34 UTC (rev 18247) +++ trunk/reactos/apps/utils/net/tcpsvcs/skelserver.c 2005-10-03 18:32:30 UTC (rev 18248) @@ -7,18 +7,10 @@ DWORD WINAPI StartServer(LPVOID lpParam) { const TCHAR* HostIP = "127.0.0.1"; - DWORD RetVal; - WSADATA wsaData; PSERVICES pServices; pServices = (PSERVICES)lpParam; - if ((RetVal = WSAStartup(MAKEWORD(2, 2), &wsaData)) != 0) - { - _tprintf(_T("WSAStartup() failed : %lu\n"), RetVal); - return -1; - } - SOCKET ListeningSocket = SetUpListener(HostIP, htons(pServices->Port)); if (ListeningSocket == INVALID_SOCKET) { @@ -26,10 +18,11 @@ return 3; } - _tprintf(_T("Waiting for connections...\n")); + _tprintf(_T("%s is waiting for connections on port %d...\n"), + pServices->Name, pServices->Port); while (1) { - AcceptConnections(ListeningSocket, pServices->Service); + AcceptConnections(ListeningSocket, pServices->Service, pServices->Name); printf("Acceptor restarting...\n"); } @@ -66,7 +59,8 @@ -VOID AcceptConnections(SOCKET ListeningSocket, LPTHREAD_START_ROUTINE Service) +VOID AcceptConnections(SOCKET ListeningSocket, + LPTHREAD_START_ROUTINE Service, TCHAR *Name) { SOCKADDR_IN Client; SOCKET Sock; @@ -78,9 +72,9 @@ Sock = accept(ListeningSocket, (SOCKADDR*)&Client, &nAddrSize); if (Sock != INVALID_SOCKET) { - _tprintf(_T("Accepted connection from %s:%d\n"), - inet_ntoa(Client.sin_addr), ntohs(Client.sin_port)); - _tprintf(_T("About to create thread\n")); + _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 _____ Modified: trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.c --- trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.c 2005-10-03 14:42:34 UTC (rev 18247) +++ trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.c 2005-10-03 18:32:30 UTC (rev 18248) @@ -3,68 +3,67 @@ #include <tchar.h> #include "tcpsvcs.h" -static -LPTHREAD_START_ROUTINE -ServiceHandler[NUM_SERVICES] = -{ - EchoHandler, - DiscardHandler, - DaytimeHandler, - QotdHandler, - ChargenHandler -}; +#if 0 +/* + * globals + */ +static SERVICE_STATUS hServStatus; +static SERVICE_STATUS_HANDLE hSStat; +FILE *hLogFile; +BOOL bLogEvents = TRUE; +BOOL ShutDown, PauseFlag; +LPTSTR LogFileName = "tcpsvcs_log.txt"; -static int -ServicePort[NUM_SERVICES] = -{ - ECHO_PORT, - DISCARD_PORT, - DAYTIME_PORT, - QOTD_PORT, - CHARGEN_PORT -}; - -#if 0 -static -SERVICE_TABLE_ENTRY +static SERVICE_TABLE_ENTRY ServiceTable[2] = { - {TEXT("tcpsvcs"), ServiceMain}, + {_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) { - PSERVICES pServices[NUM_SERVICES]; 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++ ) { - /* Allocate memory for thread data. */ - pServices[i] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SERVICES)); + _tprintf(_T("Starting %s server....\n"), Services[i].Name); - if( pServices[i] == NULL ) - ExitProcess(2); - - /* Generate unique data for each thread. */ - pServices[i]->Service = ServiceHandler[i]; - pServices[i]->Port = ServicePort[i]; - hThread[i] = CreateThread( NULL, // default security attributes 0, // use default stack size StartServer, // thread function - pServices[i], // argument to 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); } } @@ -80,39 +79,134 @@ return 0; } + + +/* code to run tcpsvcs as a service */ #if 0 -static VOID CALLBACK -ServiceMain(DWORD argc, LPTSTR *argv) +int +main(int argc, char *argv[]) { - PSERVICES pServices[NUM_SERVICES]; + //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++ ) { - /* Allocate memory for thread data. */ - pServices[i] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(SERVICES)); + _tprintf(_T("Starting %s server....\n"), Services[i].Name); - if( pServices[i] == NULL ) - ExitProcess(2); - - /* Generate unique data for each thread. */ - pServices[i]->Service = ServiceHandler[i]; - pServices[i]->Port = ServicePort[i]; - hThread[i] = CreateThread( NULL, // default security attributes 0, // use default stack size StartServer, // thread function - pServices[i], // argument to 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); } } @@ -125,20 +219,42 @@ { CloseHandle(hThread[i]); } - + return 0; } -int -main(int argc, char *argv[]) + +/* 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) { - DPRINT("tcpsvcs: main() started\n"); + DWORD eMsgLen, ErrNum = GetLastError (); + LPTSTR lpvSysMsg; + TCHAR MessageBuffer[512]; - StartServiceCtrlDispatcher(ServiceTable); + if (PrintErrorMsg) { + eMsgLen = FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM, NULL, + ErrNum, MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPTSTR)&lpvSysMsg, 0, NULL); - DPRINT("Umpnpmgr: main() done\n"); + _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); + } - ExitThread(0); + fputs (MessageBuffer, hLogFile); - return 0; + 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-03 14:42:34 UTC (rev 18247) +++ trunk/reactos/apps/utils/net/tcpsvcs/tcpsvcs.h 2005-10-03 18:32:30 UTC (rev 18248) @@ -5,9 +5,10 @@ #define QOTD_PORT 17 #define CHARGEN_PORT 19 -#define NUM_SERVICES 6 +#define NUM_SERVICES 5 #define BUF_SIZE 255 #define BUF 1024 +#define CS_TIMEOUT 1000 /* RFC865 states no more than 512 chars per line */ #define MAX_QUOTE_BUF 512 @@ -22,16 +23,24 @@ /* data structure to pass to threads */ typedef struct _Services { INT Port; + TCHAR *Name; LPTHREAD_START_ROUTINE Service; } SERVICES, *PSERVICES; -/* tcpsvcs functions */ -//static VOID CALLBACK 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); -VOID AcceptConnections(SOCKET ListeningSocket, LPTHREAD_START_ROUTINE Service); +VOID AcceptConnections(SOCKET ListeningSocket, + LPTHREAD_START_ROUTINE Service, TCHAR *Name); BOOL EchoIncomingPackets(SOCKET sd); BOOL ShutdownConnection(SOCKET Sock, BOOL bRec);

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