Ros-diffs April 2009

ros-diffs@reactos.org

25 participants
476 discussions

[sedwards] 40481: move telnetd to main tree, not enabled yet
by sedwards＠svn.reactos.org 13 Apr '09

13 Apr '09

Author: sedwards Date: Mon Apr 13 17:29:21 2009 New Revision: 40481 URL: http://svn.reactos.org/svn/reactos?rev=40481&view=rev Log: move telnetd to main tree, not enabled yet Added: trunk/reactos/base/services/telnetd/ (props changed) - copied from r40480, trunk/rosapps/applications/sysutils/telnetd/ Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Propchange: trunk/reactos/base/services/telnetd/ ------------------------------------------------------------------------------ svn:mergeinfo = Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Mon Apr 13 17:29:21 2009 @@ -670,7 +670,6 @@ modules\rosapps\applications\sysutils\pedump\pedump.exe 1 optional modules\rosapps\applications\sysutils\regexpl\regexpl.exe 1 optional modules\rosapps\applications\sysutils\tcat\tcat.exe 1 optional -modules\rosapps\applications\sysutils\telnetd\telnetd.exe 1 optional modules\rosapps\applications\sysutils\tlist\tlist.exe 1 optional modules\rosapps\applications\sysutils\screenshot\screenshot.exe 1 optional modules\rosapps\applications\sysutils\utils\binpatch\binpatch.exe 1 optional

1 0

[dchapyshev] 40480: - Add more check on CodePage = 0. +2 passed wine tests
by dchapyshev＠svn.reactos.org 13 Apr '09

13 Apr '09

Author: dchapyshev Date: Mon Apr 13 16:33:33 2009 New Revision: 40480 URL: http://svn.reactos.org/svn/reactos?rev=40480&view=rev Log: - Add more check on CodePage = 0. +2 passed wine tests Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] Mon Apr 13 16:33:33 2009 @@ -3023,12 +3023,20 @@ Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - if (IsValidCodePage(Request->Data.SetConsoleOutputCodePage.CodePage)) + if (Request->Data.SetConsoleOutputCodePage.CodePage == 0) + { + ConioUnlockConsole(Console); + return STATUS_INVALID_PARAMETER; + } + else + { + if (IsValidCodePage(Request->Data.SetConsoleOutputCodePage.CodePage)) { Console->OutputCodePage = Request->Data.SetConsoleOutputCodePage.CodePage; ConioUnlockConsole(Console); return STATUS_SUCCESS; } + } ConioUnlockConsole(Console); return STATUS_UNSUCCESSFUL; }

1 0

[dchapyshev] 40479: - Add check on CodePage = 0. +2 passed wine tests
by dchapyshev＠svn.reactos.org 13 Apr '09

13 Apr '09

Author: dchapyshev Date: Mon Apr 13 16:26:28 2009 New Revision: 40479 URL: http://svn.reactos.org/svn/reactos?rev=40479&view=rev Log: - Add check on CodePage = 0. +2 passed wine tests Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] Mon Apr 13 16:26:28 2009 @@ -2970,12 +2970,20 @@ Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - if (IsValidCodePage(Request->Data.SetConsoleCodePage.CodePage)) + if (Request->Data.SetConsoleCodePage.CodePage == 0) + { + ConioUnlockConsole(Console); + return STATUS_INVALID_PARAMETER; + } + else + { + if (IsValidCodePage(Request->Data.SetConsoleCodePage.CodePage)) { Console->CodePage = Request->Data.SetConsoleCodePage.CodePage; ConioUnlockConsole(Console); return STATUS_SUCCESS; } + } ConioUnlockConsole(Console); return STATUS_UNSUCCESSFUL; }

1 0

[dchapyshev] 40478: - Fully implement GetProcessVersion. +1 passed winetest
by dchapyshev＠svn.reactos.org 13 Apr '09

13 Apr '09

Author: dchapyshev Date: Mon Apr 13 15:58:39 2009 New Revision: 40478 URL: http://svn.reactos.org/svn/reactos?rev=40478&view=rev Log: - Fully implement GetProcessVersion. +1 passed winetest Modified: trunk/reactos/dll/win32/kernel32/process/proc.c Modified: trunk/reactos/dll/win32/kernel32/process/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/process/proc.c [iso-8859-1] Mon Apr 13 15:58:39 2009 @@ -781,30 +781,89 @@ * @implemented */ DWORD WINAPI -GetProcessVersion (DWORD ProcessId) -{ - DWORD Version = 0; - PIMAGE_NT_HEADERS NtHeader = NULL; - PVOID BaseAddress = NULL; - - /* Caller's */ - if (0 == ProcessId || GetCurrentProcessId() == ProcessId) - { - BaseAddress = (PVOID) NtCurrentPeb()->ImageBaseAddress; - NtHeader = RtlImageNtHeader (BaseAddress); - if (NULL != NtHeader) - { - Version = - (NtHeader->OptionalHeader.MajorOperatingSystemVersion << 16) | - (NtHeader->OptionalHeader.MinorOperatingSystemVersion); - } - } - else /* other process */ - { - /* FIXME: open the other process */ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - } - return (Version); +GetProcessVersion(DWORD ProcessId) +{ + DWORD Version = 0; + PIMAGE_NT_HEADERS NtHeader = NULL; + IMAGE_NT_HEADERS NtHeaders; + IMAGE_DOS_HEADER DosHeader; + PROCESS_BASIC_INFORMATION ProcessBasicInfo; + PVOID BaseAddress = NULL; + HANDLE ProcessHandle; + NTSTATUS Status; + SIZE_T Count; + PEB Peb; + + _SEH2_TRY + { + /* Caller's */ + if (0 == ProcessId || GetCurrentProcessId() == ProcessId) + { + BaseAddress = (PVOID) NtCurrentPeb()->ImageBaseAddress; + NtHeader = RtlImageNtHeader(BaseAddress); + + Version = (NtHeader->OptionalHeader.MajorOperatingSystemVersion << 16) | + (NtHeader->OptionalHeader.MinorOperatingSystemVersion); + } + else /* other process */ + { + ProcessHandle = OpenProcess(PROCESS_VM_READ | PROCESS_QUERY_INFORMATION, + FALSE, + ProcessId); + + if (!ProcessHandle) return 0; + + Status = NtQueryInformationProcess(ProcessHandle, + ProcessBasicInformation, + &ProcessBasicInfo, + sizeof(ProcessBasicInfo), + NULL); + if (!NT_SUCCESS(Status)) goto Error; + + Status = NtReadVirtualMemory(ProcessHandle, + ProcessBasicInfo.PebBaseAddress, + &Peb, + sizeof(Peb), + &Count); + if (!NT_SUCCESS(Status) || Count != sizeof(Peb)) goto Error; + + memset(&DosHeader, 0, sizeof(DosHeader)); + Status = NtReadVirtualMemory(ProcessHandle, + Peb.ImageBaseAddress, + &DosHeader, + sizeof(DosHeader), + &Count); + + if (!NT_SUCCESS(Status) || Count != sizeof(DosHeader)) goto Error; + if (DosHeader.e_magic != IMAGE_DOS_SIGNATURE) goto Error; + + memset(&NtHeaders, 0, sizeof(NtHeaders)); + Status = NtReadVirtualMemory(ProcessHandle, + (char *)Peb.ImageBaseAddress + DosHeader.e_lfanew, + &NtHeaders, + sizeof(NtHeaders), + &Count); + + if (!NT_SUCCESS(Status) || Count != sizeof(NtHeaders)) goto Error; + if (NtHeaders.Signature != IMAGE_NT_SIGNATURE) goto Error; + + Version = MAKELONG(NtHeaders.OptionalHeader.MinorSubsystemVersion, + NtHeaders.OptionalHeader.MajorSubsystemVersion); + +Error: + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + } + } + } + _SEH2_FINALLY + { + if (ProcessHandle) CloseHandle(ProcessHandle); + } + _SEH2_END; + + return Version; }

1 0

[cgutman] 40477: - Fix release build (try 1)
by cgutman＠svn.reactos.org 13 Apr '09

13 Apr '09

Author: cgutman Date: Mon Apr 13 10:04:14 2009 New Revision: 40477 URL: http://svn.reactos.org/svn/reactos?rev=40477&view=rev Log: - Fix release build (try 1) Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Mon Apr 13 10:04:14 2009 @@ -14,9 +14,7 @@ #include "ndissys.h" #include "efilter.h" -#ifdef DBG #include <buffer.h> -#endif /* DBG */ #undef NdisMSendComplete VOID

1 0

[cgutman] 40476: - Fix a typo
by cgutman＠svn.reactos.org 13 Apr '09

13 Apr '09

Author: cgutman Date: Mon Apr 13 07:26:18 2009 New Revision: 40476 URL: http://svn.reactos.org/svn/reactos?rev=40476&view=rev Log: - Fix a typo Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Mon Apr 13 07:26:18 2009 @@ -328,7 +328,7 @@ LookAheadBuffer = ExAllocatePool(NonPagedPool, LookAheadSize); - if (!LookAheadSize) + if (!LookAheadBuffer) { NDIS_DbgPrint(MIN_TRACE, ("Failed to allocate lookahead buffer!\n")); return;

1 0

[cgutman] 40475: - Implement the rest of MiniIndicateReceivePacket - rtl8139 partially works now - It gets an IP address and can ping other computers but attempting to download something results in a page fault during the download
by cgutman＠svn.reactos.org 13 Apr '09

13 Apr '09

Author: cgutman Date: Mon Apr 13 07:11:42 2009 New Revision: 40475 URL: http://svn.reactos.org/svn/reactos?rev=40475&view=rev Log: - Implement the rest of MiniIndicateReceivePacket - rtl8139 partially works now - It gets an IP address and can ping other computers but attempting to download something results in a page fault during the download Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Mon Apr 13 07:11:42 2009 @@ -297,6 +297,60 @@ (*AdapterBinding->ProtocolBinding->Chars.ReceivePacketHandler)( AdapterBinding->NdisOpenBlock.ProtocolBindingContext, PacketArray[i]); + } + } + else + { + for (i = 0; i < NumberOfPackets; i++) + { + UINT FirstBufferLength, TotalBufferLength, LookAheadSize, HeaderSize; + PNDIS_BUFFER NdisBuffer; + PVOID NdisBufferVA, LookAheadBuffer; + NDIS_STATUS NdisStatus; + + + NdisGetFirstBufferFromPacket(PacketArray[i], + &NdisBuffer, + &NdisBufferVA, + &FirstBufferLength, + &TotalBufferLength); + + HeaderSize = NDIS_GET_PACKET_HEADER_SIZE(PacketArray[i]); + + if (Adapter->NdisMiniportBlock.CurrentLookahead < (TotalBufferLength - HeaderSize)) + { + LookAheadSize = Adapter->NdisMiniportBlock.CurrentLookahead; + } + else + { + LookAheadSize = TotalBufferLength - HeaderSize; + } + + + LookAheadBuffer = ExAllocatePool(NonPagedPool, LookAheadSize); + if (!LookAheadSize) + { + NDIS_DbgPrint(MIN_TRACE, ("Failed to allocate lookahead buffer!\n")); + return; + } + + CopyBufferChainToBuffer(LookAheadBuffer, + NdisBuffer, + HeaderSize, + LookAheadSize); + + NdisStatus = (*AdapterBinding->ProtocolBinding->Chars.ReceiveHandler)( + AdapterBinding->NdisOpenBlock.ProtocolBindingContext, + AdapterBinding->NdisOpenBlock.MacHandle, + NdisBufferVA, + HeaderSize, + LookAheadBuffer, + LookAheadSize, + TotalBufferLength - HeaderSize); + + NDIS_SET_PACKET_STATUS(PacketArray[i], NdisStatus); + + ExFreePool(LookAheadBuffer); } }

1 0

[jmorlan] 40474: Various fixes to the way cmd handles errorlevel and the "return values" of commands: - Changed type of return values from BOOL to INT, with 0 indicating success and any other value indicating failure. If the left side of an || operator returns nonzero, errorlevel is set to that value. - The return value of a batch file or FOR is the return value of the last command executed in it. An empty batch file returns 0, unless it was CALLed, in which case it returns errorlevel. - CALL se
by jmorlan＠svn.reactos.org 12 Apr '09

12 Apr '09

Author: jmorlan Date: Mon Apr 13 03:51:15 2009 New Revision: 40474 URL: http://svn.reactos.org/svn/reactos?rev=40474&view=rev Log: Various fixes to the way cmd handles errorlevel and the "return values" of commands: - Changed type of return values from BOOL to INT, with 0 indicating success and any other value indicating failure. If the left side of an || operator returns nonzero, errorlevel is set to that value. - The return value of a batch file or FOR is the return value of the last command executed in it. An empty batch file returns 0, unless it was CALLed, in which case it returns errorlevel. - CALL sets errorlevel to the return value of whatever was called. - Running a GUI program doesn't change errorlevel, but always returns 0. - CMD /C uses the command's return value, not errorlevel, as the process exit code. Modified: trunk/reactos/base/shell/cmd/batch.c trunk/reactos/base/shell/cmd/batch.h trunk/reactos/base/shell/cmd/call.c trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/cmd.h trunk/reactos/base/shell/cmd/for.c trunk/reactos/base/shell/cmd/if.c Modified: trunk/reactos/base/shell/cmd/batch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/batch.c [iso-8859-1] Mon Apr 13 03:51:15 2009 @@ -203,11 +203,12 @@ * */ -BOOL Batch (LPTSTR fullname, LPTSTR firstword, LPTSTR param, PARSED_COMMAND *Cmd) +INT Batch (LPTSTR fullname, LPTSTR firstword, LPTSTR param, PARSED_COMMAND *Cmd) { BATCH_CONTEXT new; LPFOR_CONTEXT saved_fc; INT i; + INT ret = 0; HANDLE hFile; SetLastError(0); @@ -221,7 +222,7 @@ if (hFile == INVALID_HANDLE_VALUE) { ConErrResPuts(STRING_BATCH_ERROR); - return FALSE; + return 1; } if (bc != NULL && Cmd == bc->current) @@ -238,10 +239,19 @@ else { struct _SETLOCAL *setlocal = NULL; - /* If a batch file runs another batch file as part of a compound command - * (e.g. "x.bat & somethingelse") then the first file gets terminated. */ - if (bc && Cmd != NULL) + + if (Cmd == NULL) { + /* This is a CALL. CALL will set errorlevel to our return value, so + * in order to keep the value of errorlevel unchanged in the case + * of calling an empty batch file, we must return that same value. */ + ret = nErrorLevel; + } + else if (bc) + { + /* If a batch file runs another batch file as part of a compound command + * (e.g. "x.bat & somethingelse") then the first file gets terminated. */ + /* Get its SETLOCAL stack so it can be migrated to the new context */ setlocal = bc->setlocal; bc->setlocal = NULL; @@ -272,7 +282,7 @@ if (bc->raw_params == NULL) { error_out_of_memory(); - return FALSE; + return 1; } /* Check if this is a "CALL :label" */ @@ -303,14 +313,14 @@ } bc->current = Cmd; - ExecuteCommand(Cmd); + ret = ExecuteCommand(Cmd); FreeCommand(Cmd); } TRACE ("Batch: returns TRUE\n"); fc = saved_fc; - return TRUE; + return ret; } VOID AddBatchRedirection(REDIRECTION **RedirList) Modified: trunk/reactos/base/shell/cmd/batch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.h?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/batch.h [iso-8859-1] Mon Apr 13 03:51:15 2009 @@ -47,7 +47,7 @@ LPTSTR FindArg (TCHAR, BOOL *); LPTSTR BatchParams (LPTSTR, LPTSTR); VOID ExitBatch (); -BOOL Batch (LPTSTR, LPTSTR, LPTSTR, PARSED_COMMAND *); +INT Batch (LPTSTR, LPTSTR, LPTSTR, PARSED_COMMAND *); LPTSTR ReadBatchLine(); VOID AddBatchRedirection(REDIRECTION **); Modified: trunk/reactos/base/shell/cmd/call.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/call.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/call.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/call.c [iso-8859-1] Mon Apr 13 03:51:15 2009 @@ -73,10 +73,12 @@ /* CALL :label - call a subroutine of the current batch file */ while (*param == _T(' ')) param++; - return !Batch(bc->BatchFilePath, first, param, NULL); + nErrorLevel = Batch(bc->BatchFilePath, first, param, NULL); + return nErrorLevel; } - return !DoCommand(first, param, NULL); + nErrorLevel = DoCommand(first, param, NULL); + return nErrorLevel; } /* EOF */ Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=4… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Mon Apr 13 03:51:15 2009 @@ -308,7 +308,7 @@ * Rest - rest of command line */ -static BOOL +static INT Execute (LPTSTR Full, LPTSTR First, LPTSTR Rest, PARSED_COMMAND *Cmd) { TCHAR szFullName[MAX_PATH]; @@ -363,7 +363,7 @@ } if (!working) ConErrResPuts (STRING_FREE_ERROR1); - return working; + return !working; } /* get the PATH environment variable and parse it */ @@ -372,7 +372,7 @@ if (!SearchForExecutable(First, szFullName)) { error_bad_command(first); - return FALSE; + return 1; } GetConsoleTitle (szWindowTitle, MAX_PATH); @@ -384,7 +384,7 @@ while (*rest == _T(' ')) rest++; TRACE ("[BATCH: %s %s]\n", debugstr_aw(szFullName), debugstr_aw(rest)); - Batch (szFullName, first, rest, Cmd); + dwExitCode = Batch(szFullName, first, rest, Cmd); } else { @@ -448,17 +448,13 @@ GetExitCodeProcess (prci.hProcess, &dwExitCode); nErrorLevel = (INT)dwExitCode; } - else - { - nErrorLevel = 0; - } CloseHandle (prci.hProcess); } else { TRACE ("[ShellExecute failed!: %s]\n", debugstr_aw(Full)); error_bad_command (first); - nErrorLevel = 1; + dwExitCode = 1; } // restore console mode @@ -472,7 +468,7 @@ OutputCodePage = GetConsoleOutputCP(); SetConsoleTitle (szWindowTitle); - return nErrorLevel == 0; + return dwExitCode; } @@ -485,7 +481,7 @@ * rest - rest of command line */ -BOOL +INT DoCommand(LPTSTR first, LPTSTR rest, PARSED_COMMAND *Cmd) { TCHAR com[_tcslen(first) + _tcslen(rest) + 2]; /* full command line */ @@ -530,7 +526,7 @@ if (_tcsicmp(cmdptr->name, _T("echo")) != 0) while (_istspace(*param)) param++; - return !cmdptr->func(param); + return cmdptr->func(param); } } @@ -543,14 +539,16 @@ * full input/output redirection and piping are supported */ -VOID ParseCommandLine (LPTSTR cmd) -{ +INT ParseCommandLine (LPTSTR cmd) +{ + INT Ret = 0; PARSED_COMMAND *Cmd = ParseCommand(cmd); if (Cmd) { - ExecuteCommand(Cmd); + Ret = ExecuteCommand(Cmd); FreeCommand(Cmd); } + return Ret; } /* Execute a command without waiting for it to finish. If it's an internal @@ -679,27 +677,27 @@ #endif } -BOOL +INT ExecuteCommand(PARSED_COMMAND *Cmd) { PARSED_COMMAND *Sub; LPTSTR First, Rest; - BOOL Success = TRUE; + INT Ret = 0; if (!PerformRedirection(Cmd->Redirections)) - return FALSE; + return 1; switch (Cmd->Type) { case C_COMMAND: - Success = FALSE; + Ret = 1; First = DoDelayedExpansion(Cmd->Command.First); if (First) { Rest = DoDelayedExpansion(Cmd->Command.Rest); if (Rest) { - Success = DoCommand(First, Rest, Cmd); + Ret = DoCommand(First, Rest, Cmd); cmd_free(Rest); } cmd_free(First); @@ -709,31 +707,36 @@ case C_BLOCK: case C_MULTI: for (Sub = Cmd->Subcommands; Sub; Sub = Sub->Next) - Success = ExecuteCommand(Sub); + Ret = ExecuteCommand(Sub); break; case C_IFFAILURE: + Sub = Cmd->Subcommands; + Ret = ExecuteCommand(Sub); + if (Ret != 0) + { + nErrorLevel = Ret; + Ret = ExecuteCommand(Sub->Next); + } + break; case C_IFSUCCESS: Sub = Cmd->Subcommands; - Success = ExecuteCommand(Sub); - if (Success == (Cmd->Type - C_IFFAILURE)) - { - Sub = Sub->Next; - Success = ExecuteCommand(Sub); - } + Ret = ExecuteCommand(Sub); + if (Ret == 0) + Ret = ExecuteCommand(Sub->Next); break; case C_PIPE: ExecutePipeline(Cmd); break; case C_IF: - Success = ExecuteIf(Cmd); + Ret = ExecuteIf(Cmd); break; case C_FOR: - Success = ExecuteFor(Cmd); + Ret = ExecuteFor(Cmd); break; } UndoRedirection(Cmd->Redirections, NULL); - return Success; + return Ret; } BOOL @@ -1402,7 +1405,7 @@ return SubstituteVars(ip, commandline, _T('%')); } -static INT +static VOID ProcessInput() { PARSED_COMMAND *Cmd; @@ -1416,8 +1419,6 @@ ExecuteCommand(Cmd); FreeCommand(Cmd); } - - return nErrorLevel; } @@ -1614,6 +1615,7 @@ TCHAR commandline[CMDLINE_LENGTH]; TCHAR ModuleName[_MAX_PATH + 1]; TCHAR lpBuffer[2]; + INT nExitCode; //INT len; TCHAR *ptr, *cmdLine, option = 0; @@ -1760,9 +1762,12 @@ { /* Do the /C or /K command */ GetCmdLineCommand(commandline, &ptr[2], AlwaysStrip); - ParseCommandLine(commandline); + nExitCode = ParseCommandLine(commandline); if (option != _T('K')) + { + nErrorLevel = nExitCode; bExit = TRUE; + } } } @@ -1806,7 +1811,6 @@ HANDLE hConsole; TCHAR startPath[MAX_PATH]; CONSOLE_SCREEN_BUFFER_INFO Info; - INT nExitCode; lpOriginalEnvironment = DuplicateEnvironment(); @@ -1839,15 +1843,15 @@ Initialize(); /* call prompt routine */ - nExitCode = ProcessInput(); + ProcessInput(); /* do the cleanup */ Cleanup(); cmd_free(lpOriginalEnvironment); - cmd_exit(nExitCode); - return(nExitCode); + cmd_exit(nErrorLevel); + return(nErrorLevel); } /* EOF */ Modified: trunk/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=4… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] Mon Apr 13 03:51:15 2009 @@ -102,16 +102,16 @@ /* Prototypes for CMD.C */ INT ConvertULargeInteger(ULONGLONG num, LPTSTR des, INT len, BOOL bPutSeperator); HANDLE RunFile(DWORD, LPTSTR, LPTSTR, LPTSTR, INT); -VOID ParseCommandLine (LPTSTR); +INT ParseCommandLine(LPTSTR); struct _PARSED_COMMAND; -BOOL ExecuteCommand(struct _PARSED_COMMAND *Cmd); +INT ExecuteCommand(struct _PARSED_COMMAND *Cmd); LPCTSTR GetEnvVarOrSpecial ( LPCTSTR varName ); VOID AddBreakHandler (VOID); VOID RemoveBreakHandler (VOID); BOOL SubstituteVars(TCHAR *Src, TCHAR *Dest, TCHAR Delim); BOOL SubstituteForVars(TCHAR *Src, TCHAR *Dest); LPTSTR DoDelayedExpansion(LPTSTR Line); -BOOL DoCommand(LPTSTR first, LPTSTR rest, struct _PARSED_COMMAND *Cmd); +INT DoCommand(LPTSTR first, LPTSTR rest, struct _PARSED_COMMAND *Cmd); BOOL ReadLine(TCHAR *commandline, BOOL bMore); int cmd_main (int argc, const TCHAR *argv[]); @@ -254,7 +254,7 @@ #define FOR_LOOP 4 /* /L */ #define FOR_RECURSIVE 8 /* /R */ INT cmd_for (LPTSTR); -BOOL ExecuteFor(struct _PARSED_COMMAND *Cmd); +INT ExecuteFor(struct _PARSED_COMMAND *Cmd); /* Prototypes for FREE.C */ @@ -283,7 +283,7 @@ enum { IF_CMDEXTVERSION, IF_DEFINED, IF_ERRORLEVEL, IF_EXIST, IF_STRINGEQ, /* == */ IF_EQU, IF_GTR, IF_GEQ, IF_LSS, IF_LEQ, IF_NEQ }; -BOOL ExecuteIf(struct _PARSED_COMMAND *Cmd); +INT ExecuteIf(struct _PARSED_COMMAND *Cmd); /* Prototypes for INTERNAL.C */ Modified: trunk/reactos/base/shell/cmd/for.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/for.c?rev=4… ============================================================================== --- trunk/reactos/base/shell/cmd/for.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/for.c [iso-8859-1] Mon Apr 13 03:51:15 2009 @@ -69,7 +69,7 @@ } /* Execute a single instance of a FOR command */ -static void RunInstance(PARSED_COMMAND *Cmd) +static INT RunInstance(PARSED_COMMAND *Cmd) { if (bEcho && !bDisableBatchEcho && Cmd->Subcommands->Type != C_QUIET) { @@ -80,7 +80,7 @@ ConOutChar(_T('\n')); } /* Just run the command (variable expansion is done in DoDelayedExpansion) */ - ExecuteCommand(Cmd->Subcommands); + return ExecuteCommand(Cmd->Subcommands); } /* Check if this FOR should be terminated early */ @@ -117,7 +117,7 @@ return Contents; } -static BOOL ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) +static INT ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) { LPTSTR Delims = _T(" \t"); TCHAR Eol = _T(';'); @@ -129,6 +129,7 @@ LPTSTR Variables[32]; TCHAR *Start, *End; INT i; + INT Ret = 0; if (Cmd->For.Params) { @@ -228,7 +229,7 @@ { error: error_syntax(Param); - return FALSE; + return 1; } } } @@ -270,7 +271,7 @@ if (!InputFile) { error_bad_command(Start + 1); - return FALSE; + return 1; } FullInput = ReadFileContents(InputFile, Buffer); _pclose(InputFile); @@ -286,7 +287,7 @@ if (!InputFile) { error_sfile_not_found(Start); - return FALSE; + return 1; } FullInput = ReadFileContents(InputFile, Buffer); fclose(InputFile); @@ -295,7 +296,7 @@ if (!FullInput) { error_out_of_memory(); - return FALSE; + return 1; } /* Loop over the input line by line */ @@ -337,20 +338,21 @@ /* Don't run unless the line had enough tokens to fill at least one variable */ if (*Variables[0]) - RunInstance(Cmd); + Ret = RunInstance(Cmd); } while (!Exiting(Cmd) && (In = NextLine) != NULL); cmd_free(FullInput); } - return TRUE; + return Ret; } /* FOR /L: Do a numeric loop */ -static void ForLoop(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) +static INT ForLoop(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) { enum { START, STEP, END }; INT params[3] = { 0, 0, 0 }; INT i; + INT Ret = 0; TCHAR *Start, *End = List; for (i = 0; i < 3 && GetNextElement(&Start, &End); i++) @@ -361,17 +363,19 @@ (params[STEP] >= 0 ? (i <= params[END]) : (i >= params[END]))) { _itot(i, Buffer, 10); - RunInstance(Cmd); + Ret = RunInstance(Cmd); i += params[STEP]; } + return Ret; } /* Process a FOR in one directory. Stored in Buffer (up to BufPos) is a * string which is prefixed to each element of the list. In a normal FOR * it will be empty, but in FOR /R it will be the directory name. */ -static void ForDir(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer, TCHAR *BufPos) +static INT ForDir(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer, TCHAR *BufPos) { TCHAR *Start, *End = List; + INT Ret = 0; while (!Exiting(Cmd) && GetNextElement(&Start, &End)) { if (BufPos + (End - Start) > &Buffer[CMDLINE_LENGTH]) @@ -402,22 +406,24 @@ _tcscmp(w32fd.cFileName, _T("..")) == 0) continue; _tcscpy(FilePart, w32fd.cFileName); - RunInstance(Cmd); + Ret = RunInstance(Cmd); } while (!Exiting(Cmd) && FindNextFile(hFind, &w32fd)); FindClose(hFind); } else { - RunInstance(Cmd); - } - } + Ret = RunInstance(Cmd); + } + } + return Ret; } /* FOR /R: Process a FOR in each directory of a tree, recursively. */ -static void ForRecursive(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer, TCHAR *BufPos) +static INT ForRecursive(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer, TCHAR *BufPos) { HANDLE hFind; WIN32_FIND_DATA w32fd; + INT Ret = 0; if (BufPos[-1] != _T('\\')) { @@ -425,12 +431,12 @@ *BufPos = _T('\0'); } - ForDir(Cmd, List, Buffer, BufPos); + Ret = ForDir(Cmd, List, Buffer, BufPos); _tcscpy(BufPos, _T("*")); hFind = FindFirstFile(Buffer, &w32fd); if (hFind == INVALID_HANDLE_VALUE) - return; + return Ret; do { if (!(w32fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) @@ -438,9 +444,10 @@ if (_tcscmp(w32fd.cFileName, _T(".")) == 0 || _tcscmp(w32fd.cFileName, _T("..")) == 0) continue; - ForRecursive(Cmd, List, Buffer, _stpcpy(BufPos, w32fd.cFileName)); + Ret = ForRecursive(Cmd, List, Buffer, _stpcpy(BufPos, w32fd.cFileName)); } while (!Exiting(Cmd) && FindNextFile(hFind, &w32fd)); FindClose(hFind); + return Ret; } BOOL @@ -449,18 +456,18 @@ TCHAR Buffer[CMDLINE_LENGTH]; /* Buffer to hold the variable value */ LPTSTR BufferPtr = Buffer; LPFOR_CONTEXT lpNew; - BOOL Success = TRUE; + INT Ret; LPTSTR List = DoDelayedExpansion(Cmd->For.List); if (!List) - return FALSE; + return 1; /* Create our FOR context */ lpNew = cmd_alloc(sizeof(FOR_CONTEXT)); if (!lpNew) { cmd_free(List); - return FALSE; + return 1; } lpNew->prev = fc; lpNew->firstvar = Cmd->For.Variable; @@ -472,21 +479,21 @@ if (Cmd->For.Switches & FOR_F) { - Success = ForF(Cmd, List, Buffer); + Ret = ForF(Cmd, List, Buffer); } else if (Cmd->For.Switches & FOR_LOOP) { - ForLoop(Cmd, List, Buffer); + Ret = ForLoop(Cmd, List, Buffer); } else if (Cmd->For.Switches & FOR_RECURSIVE) { DWORD Len = GetFullPathName(Cmd->For.Params ? Cmd->For.Params : _T("."), MAX_PATH, Buffer, NULL); - ForRecursive(Cmd, List, Buffer, &Buffer[Len]); + Ret = ForRecursive(Cmd, List, Buffer, &Buffer[Len]); } else { - ForDir(Cmd, List, Buffer, Buffer); + Ret = ForDir(Cmd, List, Buffer, Buffer); } /* Remove our context, unless someone already did that */ @@ -495,7 +502,7 @@ cmd_free(lpNew); cmd_free(List); - return Success; + return Ret; } /* EOF */ Modified: trunk/reactos/base/shell/cmd/if.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/if.c?rev=40… ============================================================================== --- trunk/reactos/base/shell/cmd/if.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/if.c [iso-8859-1] Mon Apr 13 03:51:15 2009 @@ -63,7 +63,7 @@ return 1; } -BOOL ExecuteIf(PARSED_COMMAND *Cmd) +INT ExecuteIf(PARSED_COMMAND *Cmd) { INT result = FALSE; /* when set cause 'then' clause to be executed */ LPTSTR param; @@ -73,13 +73,13 @@ { Left = DoDelayedExpansion(Cmd->If.LeftArg); if (!Left) - return FALSE; + return 1; } Right = DoDelayedExpansion(Cmd->If.RightArg); if (!Right) { cmd_free(Left); - return FALSE; + return 1; } if (Cmd->If.Operator == IF_CMDEXTVERSION) @@ -91,7 +91,7 @@ { error_syntax(Right); cmd_free(Right); - return FALSE; + return 1; } result = (2 >= n); } @@ -108,7 +108,7 @@ { error_syntax(Right); cmd_free(Right); - return FALSE; + return 1; } result = (nErrorLevel >= n); } @@ -166,7 +166,7 @@ /* full condition was false, do the "else" command if there is one */ if (Cmd->Subcommands->Next) return ExecuteCommand(Cmd->Subcommands->Next); - return TRUE; + return 0; } }

1 0

[gschneider] 40473: - Add parameter validity check to GetTextFaceA (same as in GetTextFaceW)
by gschneider＠svn.reactos.org 12 Apr '09

12 Apr '09

Author: gschneider Date: Sun Apr 12 22:44:00 2009 New Revision: 40473 URL: http://svn.reactos.org/svn/reactos?rev=40473&view=rev Log: - Add parameter validity check to GetTextFaceA (same as in GetTextFaceW) Modified: trunk/reactos/dll/win32/gdi32/objects/text.c Modified: trunk/reactos/dll/win32/gdi32/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/te… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/text.c [iso-8859-1] Sun Apr 12 22:44:00 2009 @@ -383,8 +383,19 @@ WINAPI GetTextFaceA( HDC hdc, INT count, LPSTR name ) { - INT res = GetTextFaceW(hdc, 0, NULL); - LPWSTR nameW = HeapAlloc( GetProcessHeap(), 0, res * 2 ); + INT res; + LPWSTR nameW; + + /* Validate parameters */ + if (name && count <= 0) + { + /* Set last error and return failure */ + GdiSetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + res = GetTextFaceW(hdc, 0, NULL); + nameW = HeapAlloc( GetProcessHeap(), 0, res * 2 ); GetTextFaceW( hdc, res, nameW ); if (name)

1 0

[fireball] 40472: - FOSDEM 2009 is over.
by fireball＠svn.reactos.org 12 Apr '09

12 Apr '09

Author: fireball Date: Sun Apr 12 16:09:22 2009 New Revision: 40472 URL: http://svn.reactos.org/svn/reactos?rev=40472&view=rev Log: - FOSDEM 2009 is over. Removed: branches/ros-branch-0_3_8-fosdem/

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
48
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2009