Ros-diffs February 2008

ros-diffs@reactos.org

21 participants
460 discussions

[cfinck] 32092: - Fix funky ways of checking for success, when calling SetFilePointer. The only correct and always working way is checking for INVALID_SET_FILE_POINTER. - Fix setting the file attributes. We didn't pass the destination directory before, so if the user specified another destination directory, the SetFileAttributes call failed. - Simplify GetAttributesOnFile and SetAttributesOnFile
by cfinck＠svn.reactos.org 02 Feb '08

02 Feb '08

Author: cfinck Date: Sat Feb 2 22:21:35 2008 New Revision: 32092 URL: http://svn.reactos.org/svn/reactos?rev=32092&view=rev Log: - Fix funky ways of checking for success, when calling SetFilePointer. The only correct and always working way is checking for INVALID_SET_FILE_POINTER. - Fix setting the file attributes. We didn't pass the destination directory before, so if the user specified another destination directory, the SetFileAttributes call failed. - Simplify GetAttributesOnFile and SetAttributesOnFile Modified: trunk/reactos/tools/cabman/cabinet.cxx trunk/reactos/tools/cabman/cabinet.h Modified: trunk/reactos/tools/cabman/cabinet.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.cxx?r… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.cxx (original) +++ trunk/reactos/tools/cabman/cabinet.cxx Sat Feb 2 22:21:35 2008 @@ -189,7 +189,7 @@ */ { #if defined(WIN32) - if (!SetFilePointer(FileHandle, 0, NULL, FILE_BEGIN)) + if( SetFilePointer(FileHandle, 0, NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER ) return CAB_STATUS_FAILURE; if (!SetEndOfFile(FileHandle)) return CAB_STATUS_FAILURE; @@ -231,10 +231,10 @@ */ { #if defined(WIN32) - if (SetFilePointer(FileHandle, - Position, - NULL, - FILE_BEGIN) == 0xFFFFFFFF) + if( SetFilePointer(FileHandle, + Position, + NULL, + FILE_BEGIN) == INVALID_SET_FILE_POINTER ) return CAB_STATUS_FAILURE; else return CAB_STATUS_SUCCESS; @@ -712,10 +712,9 @@ DataReserved = (Size >> 24) & 0xFF; #if defined(WIN32) - SetFilePointer(FileHandle, CabinetReserved, NULL, FILE_CURRENT); - if (GetLastError() != NO_ERROR) + if (SetFilePointer(FileHandle, CabinetReserved, NULL, FILE_CURRENT) == INVALID_SET_FILE_POINTER) { - DPRINT(MIN_TRACE, ("SetFilePointer() failed.\n")); + DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", GetLastError())); return CAB_STATUS_FAILURE; } #else @@ -823,7 +822,7 @@ ULONG CCabinet::FindFirst(char* FileName, - PCAB_SEARCH Search) + PCAB_SEARCH Search) /* * FUNCTION: Finds the first file in the cabinet that matches a search criteria * ARGUMENTS: @@ -1030,7 +1029,7 @@ #else //DPRINT(MIN_TRACE, ("FIXME: DosDateTimeToFileTime\n")); #endif - SetAttributesOnFile(File); + SetAttributesOnFile(DestName, File->File.Attributes); Buffer = (unsigned char*)AllocateMemory(CAB_BLOCKSIZE + 12); // This should be enough if (!Buffer) @@ -1049,9 +1048,9 @@ File->DataBlock->AbsoluteOffset, NULL, FILE_BEGIN); - if (GetLastError() != NO_ERROR) - { - DPRINT(MIN_TRACE, ("SetFilePointer() failed.\n")); + if (Offset == INVALID_SET_FILE_POINTER) + { + DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", GetLastError())); return CAB_STATUS_INVALID_CAB; } #else @@ -1171,13 +1170,12 @@ /* Search to start of file */ #if defined(WIN32) - SetFilePointer(FileHandle, - File->DataBlock->AbsoluteOffset, - NULL, - FILE_BEGIN); - if (GetLastError() != NO_ERROR) + if( SetFilePointer(FileHandle, + File->DataBlock->AbsoluteOffset, + NULL, + FILE_BEGIN) == INVALID_SET_FILE_POINTER ) { - DPRINT(MIN_TRACE, ("SetFilePointer() failed.\n")); + DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", GetLastError())); return CAB_STATUS_INVALID_CAB; } #else @@ -1247,14 +1245,13 @@ /* Go to next data block */ #if defined(WIN32) - SetFilePointer(FileHandle, - CurrentDataNode->AbsoluteOffset + sizeof(CFDATA) + - CurrentDataNode->Data.CompSize, - NULL, - FILE_BEGIN); - if (GetLastError() != NO_ERROR) + if( SetFilePointer(FileHandle, + CurrentDataNode->AbsoluteOffset + sizeof(CFDATA) + + CurrentDataNode->Data.CompSize, + NULL, + FILE_BEGIN) == INVALID_SET_FILE_POINTER ) { - DPRINT(MIN_TRACE, ("SetFilePointer() failed.\n")); + DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", GetLastError())); return CAB_STATUS_INVALID_CAB; } #else @@ -2231,14 +2228,12 @@ /* Back up some bytes */ Size = (BytesRead - Size) - 1; #if defined(WIN32) - SetLastError(NO_ERROR); - (ULONG)SetFilePointer(FileHandle, - -(LONG)Size, - NULL, - FILE_CURRENT); - if (GetLastError() != NO_ERROR) - { - DPRINT(MIN_TRACE, ("SetFilePointer() failed.\n")); + if( SetFilePointer(FileHandle, + -(LONG)Size, + NULL, + FILE_CURRENT) == INVALID_SET_FILE_POINTER ) + { + DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", GetLastError())); return CAB_STATUS_INVALID_CAB; } #else @@ -2269,15 +2264,12 @@ /* Seek to file table */ #if defined(WIN32) - SetLastError(NO_ERROR); - SetFilePointer(FileHandle, - CABHeader.FileTableOffset, - NULL, - FILE_BEGIN); - if (GetLastError() != NO_ERROR) - { - DPRINT(MIN_TRACE, ("SetFilePointer() failed.\n")); - DPRINT(MIN_TRACE, ("Error: %lu\n", GetLastError())); + if( SetFilePointer(FileHandle, + CABHeader.FileTableOffset, + NULL, + FILE_BEGIN) == INVALID_SET_FILE_POINTER ) + { + DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", GetLastError())); return CAB_STATUS_INVALID_CAB; } #else @@ -2360,14 +2352,12 @@ /* Seek to data block */ #if defined(WIN32) - SetLastError(NO_ERROR); - SetFilePointer(FileHandle, - AbsoluteOffset, - NULL, - FILE_BEGIN); - if (GetLastError() != NO_ERROR) - { - DPRINT(MIN_TRACE, ("SetFilePointer() failed.\n")); + if( SetFilePointer(FileHandle, + AbsoluteOffset, + NULL, + FILE_BEGIN) == INVALID_SET_FILE_POINTER ) + { + DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", GetLastError())); return CAB_STATUS_INVALID_CAB; } #else @@ -3384,20 +3374,10 @@ if (Attributes == -1) return CAB_STATUS_CANNOT_READ; - if (Attributes & FILE_ATTRIBUTE_READONLY) - File->File.Attributes |= CAB_ATTRIB_READONLY; - - if (Attributes & FILE_ATTRIBUTE_HIDDEN) - File->File.Attributes |= CAB_ATTRIB_HIDDEN; - - if (Attributes & FILE_ATTRIBUTE_SYSTEM) - File->File.Attributes |= CAB_ATTRIB_SYSTEM; - - if (Attributes & FILE_ATTRIBUTE_DIRECTORY) - File->File.Attributes |= CAB_ATTRIB_DIRECTORY; - - if (Attributes & FILE_ATTRIBUTE_ARCHIVE) - File->File.Attributes |= CAB_ATTRIB_ARCHIVE; + // 0x37 = READONLY | HIDDEN | SYSTEM | DIRECTORY | ARCHIVE + // The IDs for these attributes are the same in the CAB file and under Windows + // If the file has any other attributes, strip them off by the logical AND. + File->File.Attributes = (USHORT)(Attributes & 0x37); #else struct stat stbuf; char buf[MAX_PATH]; @@ -3431,34 +3411,21 @@ } -ULONG CCabinet::SetAttributesOnFile(PCFFILE_NODE File) +ULONG CCabinet::SetAttributesOnFile(char* FileName, USHORT FileAttributes) /* * FUNCTION: Sets attributes on a file * ARGUMENTS: - * File = Pointer to CFFILE node for file + * FileName = File name with path + * FileAttributes = Attributes of that file * RETURNS: * Status of operation */ { #if defined(WIN32) - ULONG Attributes = 0; - - if (File->File.Attributes & CAB_ATTRIB_READONLY) - Attributes |= FILE_ATTRIBUTE_READONLY; - - if (File->File.Attributes & CAB_ATTRIB_HIDDEN) - Attributes |= FILE_ATTRIBUTE_HIDDEN; - - if (File->File.Attributes & CAB_ATTRIB_SYSTEM) - Attributes |= FILE_ATTRIBUTE_SYSTEM; - - if (File->File.Attributes & CAB_ATTRIB_DIRECTORY) - Attributes |= FILE_ATTRIBUTE_DIRECTORY; - - if (File->File.Attributes & CAB_ATTRIB_ARCHIVE) - Attributes |= FILE_ATTRIBUTE_ARCHIVE; - - SetFileAttributes(File->FileName, Attributes); + // 0x37 = READONLY | HIDDEN | SYSTEM | DIRECTORY | ARCHIVE + // The IDs for these attributes are the same in the CAB file and under Windows + // If the file has any other attributes, strip them off by the logical AND. + SetFileAttributes(FileName, (DWORD)(FileAttributes & 0x37)); return CAB_STATUS_SUCCESS; #else Modified: trunk/reactos/tools/cabman/cabinet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.h?rev… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.h (original) +++ trunk/reactos/tools/cabman/cabinet.h Sat Feb 2 22:21:35 2008 @@ -416,7 +416,7 @@ ULONG CommitDataBlocks(PCFFOLDER_NODE FolderNode); ULONG WriteDataBlock(); ULONG GetAttributesOnFile(PCFFILE_NODE File); - ULONG SetAttributesOnFile(PCFFILE_NODE File); + ULONG SetAttributesOnFile(char* FileName, USHORT FileAttributes); ULONG GetFileTimes(FILEHANDLE FileHandle, PCFFILE_NODE File); #if !defined(WIN32) void ConvertDateAndTime(time_t* Time, PUSHORT DosDate, PUSHORT DosTime);

1 0

[dreimer] 32091: small cosmetic fix
by dreimer＠svn.reactos.org 02 Feb '08

02 Feb '08

Author: dreimer Date: Sat Feb 2 18:26:20 2008 New Revision: 32091 URL: http://svn.reactos.org/svn/reactos?rev=32091&view=rev Log: small cosmetic fix Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/Root/TimeDate.cmd trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd trunk/tools/RosBE/RosBE-Windows/Root/options.cmd trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd Sat Feb 2 18:26:20 2008 @@ -8,10 +8,10 @@ :: Peter Ward <dralnix(a)gmail.com> :: :: - +@echo off if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 -if %_ROSBE_DEBUG% == 0 ( - @echo off +if %_ROSBE_DEBUG% == 1 ( + @echo on ) :: Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cle… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd Sat Feb 2 18:26:20 2008 @@ -7,10 +7,10 @@ :: Peter Ward <dralnix(a)gmail.com> :: :: - +@echo off if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 -if %_ROSBE_DEBUG% == 0 ( - @echo off +if %_ROSBE_DEBUG% == 1 ( + @echo on ) title Cleaning... Modified: trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Con… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd Sat Feb 2 18:26:20 2008 @@ -6,10 +6,10 @@ :: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> :: :: - +@echo off if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 -if %_ROSBE_DEBUG% == 0 ( - @echo off +if %_ROSBE_DEBUG% == 1 ( + @echo on ) title ReactOS Build Configurator Modified: trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Hel… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd Sat Feb 2 18:26:20 2008 @@ -7,10 +7,10 @@ :: Peter Ward <dralnix(a)gmail.com> :: :: - +@echo off if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 -if %_ROSBE_DEBUG% == 0 ( - @echo off +if %_ROSBE_DEBUG% == 1 ( + @echo on ) :: Modified: trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Min… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd Sat Feb 2 18:26:20 2008 @@ -7,10 +7,10 @@ :: Peter Ward <dralnix(a)gmail.com> :: :: - +@echo off if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 -if %_ROSBE_DEBUG% == 0 ( - @echo off +if %_ROSBE_DEBUG% == 1 ( + @echo on ) if not "%1" == "" ( Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd Sat Feb 2 18:26:20 2008 @@ -8,10 +8,10 @@ :: Peter Ward <dralnix(a)gmail.com> :: :: - +@echo off if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 -if %_ROSBE_DEBUG% == 0 ( - @echo off +if %_ROSBE_DEBUG% == 1 ( + @echo on ) :: Modified: trunk/tools/RosBE/RosBE-Windows/Root/TimeDate.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Tim… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/TimeDate.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/TimeDate.cmd Sat Feb 2 18:26:20 2008 @@ -7,10 +7,10 @@ :: Peter Ward <dralnix(a)gmail.com> :: :: - +@echo off if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 -if %_ROSBE_DEBUG% == 0 ( - @echo off +if %_ROSBE_DEBUG% == 1 ( + @echo on ) :: Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd Sat Feb 2 18:26:20 2008 @@ -8,10 +8,10 @@ :: Peter Ward <dralnix(a)gmail.com> :: :: - +@echo off if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 -if %_ROSBE_DEBUG% == 0 ( - @echo off +if %_ROSBE_DEBUG% == 1 ( + @echo on ) title Change the current working ReactOS source directory... Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd Sat Feb 2 18:26:20 2008 @@ -6,10 +6,10 @@ :: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> :: Peter Ward <dralnix(a)gmail.com> :: - +@echo off if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 -if %_ROSBE_DEBUG% == 0 ( - @echo off +if %_ROSBE_DEBUG% == 1 ( + @echo on ) if "%_ROSBE_MODE%" == "RosBE" ( Modified: trunk/tools/RosBE/RosBE-Windows/Root/options.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/opt… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/options.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/options.cmd Sat Feb 2 18:26:20 2008 @@ -6,10 +6,10 @@ :: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> :: :: - +@echo off if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 -if %_ROSBE_DEBUG% == 0 ( - @echo off +if %_ROSBE_DEBUG% == 1 ( + @echo on ) title Options Modified: trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/rel… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd Sat Feb 2 18:26:20 2008 @@ -8,10 +8,10 @@ :: Peter Ward <dralnix(a)gmail.com> :: :: - +@echo off if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 -if %_ROSBE_DEBUG% == 0 ( - @echo off +if %_ROSBE_DEBUG% == 1 ( + @echo on ) title reladdr2line... Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd Sat Feb 2 18:26:20 2008 @@ -7,10 +7,10 @@ :: Peter Ward <dralnix(a)gmail.com> :: :: - +@echo off if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 -if %_ROSBE_DEBUG% == 0 ( - @echo off +if %_ROSBE_DEBUG% == 1 ( + @echo on ) :: Modified: trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/sSV… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd Sat Feb 2 18:26:20 2008 @@ -6,10 +6,10 @@ :: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> :: :: - +@echo off if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 -if %_ROSBE_DEBUG% == 0 ( - @echo off +if %_ROSBE_DEBUG% == 1 ( + @echo on ) :: Modified: trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/scu… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd Sat Feb 2 18:26:20 2008 @@ -7,10 +7,10 @@ :: Daniel Reimer <reimer.daniel(a)freenet.de> :: Peter Ward <dralnix(a)gmail.com> :: - +@echo off if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 -if %_ROSBE_DEBUG% == 0 ( - @echo off +if %_ROSBE_DEBUG% == 1 ( + @echo on ) :: Check if the parameter is an scut parameter, which can just be forwarded to the EXE file

1 0

[fireball] 32090: - Mark APIC's memory as WriteThrough / CacheDisabled.
by fireball＠svn.reactos.org 02 Feb '08

02 Feb '08

Author: fireball Date: Sat Feb 2 18:15:41 2008 New Revision: 32090 URL: http://svn.reactos.org/svn/reactos?rev=32090&view=rev Log: - Mark APIC's memory as WriteThrough / CacheDisabled. Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c Sat Feb 2 18:15:41 2008 @@ -436,6 +436,8 @@ = APICAddress >> MM_PAGE_SHIFT; HalPageTable[(APIC_BASE - 0xFFC00000) >> MM_PAGE_SHIFT].Valid = 1; HalPageTable[(APIC_BASE - 0xFFC00000) >> MM_PAGE_SHIFT].Write = 1; + HalPageTable[(APIC_BASE - 0xFFC00000) >> MM_PAGE_SHIFT].WriteThrough = 1; + HalPageTable[(APIC_BASE - 0xFFC00000) >> MM_PAGE_SHIFT].CacheDisable = 1; } #else VOID @@ -547,7 +549,7 @@ // TEMP, DEBUG! // adding special reserved memory zones for vmware workstation -#if 0 +#if 1 { Mad[MadCount].BasePage = 0xfec00; Mad[MadCount].PageCount = 0x10;

1 0

[cfinck] 32089: - Add an -M option to specify, which compression codec shall be used (either "raw" or "mszip") - Enable the RAW codec in the SelectCodec() function - Don't initialize a codec in the CCabinet constructor, this will be done by the ParseCmdline() function - Fix parsing the -L and -P parameters, when there's no whitespace between the parameter and the value - Remove some unneeded casts - Remove the cabman vesion number, it was never updated, although there were many changes since the
by cfinck＠svn.reactos.org 02 Feb '08

02 Feb '08

Author: cfinck Date: Sat Feb 2 17:32:44 2008 New Revision: 32089 URL: http://svn.reactos.org/svn/reactos?rev=32089&view=rev Log: - Add an -M option to specify, which compression codec shall be used (either "raw" or "mszip") - Enable the RAW codec in the SelectCodec() function - Don't initialize a codec in the CCabinet constructor, this will be done by the ParseCmdline() function - Fix parsing the -L and -P parameters, when there's no whitespace between the parameter and the value - Remove some unneeded casts - Remove the cabman vesion number, it was never updated, although there were many changes since the first version Modified: trunk/reactos/tools/cabman/cabinet.cxx trunk/reactos/tools/cabman/cabinet.h trunk/reactos/tools/cabman/dfp.cxx trunk/reactos/tools/cabman/main.cxx Modified: trunk/reactos/tools/cabman/cabinet.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.cxx?r… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.cxx (original) +++ trunk/reactos/tools/cabman/cabinet.cxx Sat Feb 2 17:32:44 2008 @@ -320,9 +320,9 @@ FileListHead = NULL; FileListTail = NULL; - Codec = new CRawCodec(); - CodecId = CAB_CODEC_RAW; - CodecSelected = true; + Codec = NULL; + CodecId = -1; + CodecSelected = false; OutputBuffer = NULL; InputBuffer = NULL; @@ -359,7 +359,7 @@ * ARGUMENTS: * Char = Character to check * RETURNS: - * Wether it is a separator + * Whether it is a separator */ { if ((Char == '\\') || (Char == '/')) @@ -511,6 +511,25 @@ NormalizePath(DestPath, MAX_PATH); } +bool CCabinet::SetCompressionCodec(char* CodecName) +/* + * FUNCTION: Selects the codec to use for compression + * ARGUMENTS: + * CodecName = Pointer to a string with the name of the codec + */ +{ + if( !strcasecmp(CodecName, "raw") ) + SelectCodec(CAB_CODEC_RAW); + else if( !strcasecmp(CodecName, "mszip") ) + SelectCodec(CAB_CODEC_MSZIP); + else + { + printf("Invalid codec specified!\n"); + return false; + } + + return true; +} char* CCabinet::GetDestinationPath() /* @@ -1300,8 +1319,17 @@ return CAB_STATUS_SUCCESS; } - -void CCabinet::SelectCodec(ULONG Id) +bool CCabinet::IsCodecSelected() +/* + * FUNCTION: Returns the value of CodecSelected + * RETURNS: + * Whether a codec is selected + */ +{ + return CodecSelected; +} + +void CCabinet::SelectCodec(LONG Id) /* * FUNCTION: Selects codec engine to use * ARGUMENTS: @@ -1320,9 +1348,7 @@ switch (Id) { case CAB_CODEC_RAW: -#if 0 Codec = new CRawCodec(); -#endif break; case CAB_CODEC_MSZIP: @@ -2080,7 +2106,7 @@ PCFDATA_NODE Node; DPRINT(MAX_TRACE, ("FileName '%s' FileOffset (0x%lX) FileSize (%lu).\n", - (char*)File->FileName, + File->FileName, (ULONG)File->File.FileOffset, (ULONG)File->File.FileSize)); @@ -2291,7 +2317,7 @@ return Status; DPRINT(MAX_TRACE, ("Found file '%s' at uncompressed offset (0x%lX). Size (%lu bytes) ControlId (0x%lX).\n", - (char*)File->FileName, + File->FileName, (ULONG)File->File.FileOffset, (ULONG)File->File.FileSize, (ULONG)File->File.FileControlID)); Modified: trunk/reactos/tools/cabman/cabinet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.h?rev… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.h (original) +++ trunk/reactos/tools/cabman/cabinet.h Sat Feb 2 17:32:44 2008 @@ -347,8 +347,12 @@ /* Extracts a file from the current cabinet file */ ULONG ExtractFile(char* FileName); /* Select codec engine to use */ - void SelectCodec(ULONG Id); + void SelectCodec(LONG Id); + /* Returns if a codec engine is selected */ + bool IsCodecSelected(); #ifndef CAB_READ_ONLY + /* Sets the codec to use for compression (based on a string value) */ + bool SetCompressionCodec(char* CodecName); /* Creates a new cabinet file */ ULONG NewCabinet(); /* Forces a new disk to be created */ @@ -448,7 +452,7 @@ PCFFILE_NODE FileListHead; PCFFILE_NODE FileListTail; CCABCodec *Codec; - ULONG CodecId; + LONG CodecId; bool CodecSelected; void* InputBuffer; void* CurrentIBuffer; // Current offset in input buffer Modified: trunk/reactos/tools/cabman/dfp.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/dfp.cxx?rev=3… ============================================================================== --- trunk/reactos/tools/cabman/dfp.cxx (original) +++ trunk/reactos/tools/cabman/dfp.cxx Sat Feb 2 17:32:44 2008 @@ -1367,7 +1367,7 @@ if (i > 0) { CurrentString[i] = '\0'; - CurrentInteger = atoi((char*)CurrentString); + CurrentInteger = atoi(CurrentString); CurrentToken = TokenInteger; CurrentChar += i; return; Modified: trunk/reactos/tools/cabman/main.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/main.cxx?rev=… ============================================================================== --- trunk/reactos/tools/cabman/main.cxx (original) +++ trunk/reactos/tools/cabman/main.cxx Sat Feb 2 17:32:44 2008 @@ -24,9 +24,6 @@ //ULONG DebugTraceLevel = MAX_TRACE; #endif /* DBG */ - - -#define CM_VERSION "0.9" char* Pad(char* Str, char PadChar, ULONG Length) @@ -191,7 +188,7 @@ * FUNCTION: Display usage information on screen */ { - printf("ReactOS Cabinet Manager - Version %s\n\n", CM_VERSION); + printf("ReactOS Cabinet Manager\n\n"); printf("CABMAN [-D | -E] [-A] [-L dir] cabinet [filename ...]\n"); printf("CABMAN -C dirfile [-I] [-RC file] [-P dir]\n"); printf("CABMAN -S cabinet filename\n"); @@ -210,6 +207,9 @@ printf(" -I Don't create the cabinet, only the .inf file.\n"); printf(" -L dir Location to place extracted or generated files\n"); printf(" (default is current directory).\n"); + printf(" -M Specify the compression method to use\n"); + printf(" raw - No compression\n"); + printf(" mszip - MsZip compression (default)\n"); printf(" -N Don't create the .inf file, only the cabinet.\n"); printf(" -RC Specify file to put in cabinet reserved area\n"); printf(" (size must be less than 64KB).\n"); @@ -269,10 +269,28 @@ if (argv[i][2] == 0) { i++; - SetDestinationPath((char*)&argv[i][0]); + SetDestinationPath(&argv[i][0]); } else - SetDestinationPath((char*)&argv[i][1]); + SetDestinationPath(&argv[i][2]); + + break; + + case 'm': + case 'M': + // Set the compression codec (only affects compression, not decompression) + if(argv[i][2] == 0) + { + i++; + + if( !SetCompressionCodec(&argv[i][0]) ) + return false; + } + else + { + if( !SetCompressionCodec(&argv[i][2]) ) + return false; + } break; @@ -288,7 +306,7 @@ if (argv[i][3] == 0) { i++; - if (!SetCabinetReservedFile((char*)&argv[i][0])) + if (!SetCabinetReservedFile(&argv[i][0])) { printf("Cannot open cabinet reserved area file.\n"); return false; @@ -296,7 +314,7 @@ } else { - if (!SetCabinetReservedFile((char*)&argv[i][3])) + if (!SetCabinetReservedFile(&argv[i][3])) { printf("Cannot open cabinet reserved area file.\n"); return false; @@ -319,10 +337,10 @@ if (argv[i][2] == 0) { i++; - SetFileRelativePath((char*)&argv[i][0]); + SetFileRelativePath(&argv[i][0]); } else - SetFileRelativePath((char*)&argv[i][1]); + SetFileRelativePath(&argv[i][2]); break; @@ -336,7 +354,7 @@ if ((FoundCabinet) || (Mode == CM_MODE_CREATE)) { /* FIXME: There may be many of these if Mode != CM_MODE_CREATE */ - strcpy((char*)FileName, argv[i]); + strcpy(FileName, argv[i]); } else { @@ -352,8 +370,9 @@ return false; } - /* FIXME */ - SelectCodec(CAB_CODEC_MSZIP); + // Select MsZip by default for creating cabinets + if( (Mode == CM_MODE_CREATE || Mode == CM_MODE_CREATE_SIMPLE) && !IsCodecSelected() ) + SelectCodec(CAB_CODEC_MSZIP); return true; } @@ -366,10 +385,10 @@ { ULONG Status; - Status = Load((char*)&FileName); + Status = Load(FileName); if (Status != CAB_STATUS_SUCCESS) { - printf("Specified directive file could not be found: %s.\n", (char*)&FileName); + printf("Specified directive file could not be found: %s.\n", FileName); return false; } @@ -435,9 +454,9 @@ { if (Search.File->FileControlID != CAB_FILE_CONTINUED) { - printf("%s ", Date2Str((char*)&Str, Search.File->FileDate)); - printf("%s ", Time2Str((char*)&Str, Search.File->FileTime)); - printf("%s ", Attr2Str((char*)&Str, Search.File->Attributes)); + printf("%s ", Date2Str(Str, Search.File->FileDate)); + printf("%s ", Time2Str(Str, Search.File->FileTime)); + printf("%s ", Attr2Str(Str, Search.File->Attributes)); sprintf(Str, "%lu", Search.File->FileSize); printf("%s ", Pad(Str, ' ', 13)); printf("%s\n", Search.FileName); @@ -530,7 +549,7 @@ * FUNCTION: Process cabinet */ { - printf("ReactOS Cabinet Manager - Version %s\n\n", CM_VERSION); + printf("ReactOS Cabinet Manager\n\n"); switch (Mode) {

1 0

[dreimer] 32088: Commit a possibility to disable all @echo off with one variable: "_ROSBE_DEBUG" I use this a while already and think its a nice thing to find errors when playing around on the cmd files.
by dreimer＠svn.reactos.org 02 Feb '08

02 Feb '08

Author: dreimer Date: Sat Feb 2 16:03:35 2008 New Revision: 32088 URL: http://svn.reactos.org/svn/reactos?rev=32088&view=rev Log: Commit a possibility to disable all @echo off with one variable: "_ROSBE_DEBUG" I use this a while already and think its a nice thing to find errors when playing around on the cmd files. Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/Root/TimeDate.cmd trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd trunk/tools/RosBE/RosBE-Windows/Root/options.cmd trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd Sat Feb 2 16:03:35 2008 @@ -8,7 +8,11 @@ :: Peter Ward <dralnix(a)gmail.com> :: :: -@echo off + +if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 +if %_ROSBE_DEBUG% == 0 ( + @echo off +) :: :: Check if config.template.rbuild is newer than config.rbuild, if it is then Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cle… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd Sat Feb 2 16:03:35 2008 @@ -7,7 +7,11 @@ :: Peter Ward <dralnix(a)gmail.com> :: :: -@echo off + +if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 +if %_ROSBE_DEBUG% == 0 ( + @echo off +) title Cleaning... Modified: trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Con… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd Sat Feb 2 16:03:35 2008 @@ -6,7 +6,11 @@ :: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> :: :: -@echo off + +if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 +if %_ROSBE_DEBUG% == 0 ( + @echo off +) title ReactOS Build Configurator Modified: trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Hel… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd Sat Feb 2 16:03:35 2008 @@ -7,7 +7,11 @@ :: Peter Ward <dralnix(a)gmail.com> :: :: -@echo off + +if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 +if %_ROSBE_DEBUG% == 0 ( + @echo off +) :: :: Check if we are displaying help on all commands, if so, display it. Modified: trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Min… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd Sat Feb 2 16:03:35 2008 @@ -7,7 +7,11 @@ :: Peter Ward <dralnix(a)gmail.com> :: :: -@echo off + +if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 +if %_ROSBE_DEBUG% == 0 ( + @echo off +) if not "%1" == "" ( cls Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd Sat Feb 2 16:03:35 2008 @@ -8,7 +8,11 @@ :: Peter Ward <dralnix(a)gmail.com> :: :: -@echo off + +if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 +if %_ROSBE_DEBUG% == 0 ( + @echo off +) :: :: Set defaults to work with and override them if edited by Modified: trunk/tools/RosBE/RosBE-Windows/Root/TimeDate.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Tim… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/TimeDate.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/TimeDate.cmd Sat Feb 2 16:03:35 2008 @@ -7,7 +7,11 @@ :: Peter Ward <dralnix(a)gmail.com> :: :: -@echo off + +if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 +if %_ROSBE_DEBUG% == 0 ( + @echo off +) :: :: Clear variables before use. Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd Sat Feb 2 16:03:35 2008 @@ -8,7 +8,11 @@ :: Peter Ward <dralnix(a)gmail.com> :: :: -@echo off + +if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 +if %_ROSBE_DEBUG% == 0 ( + @echo off +) title Change the current working ReactOS source directory... Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd Sat Feb 2 16:03:35 2008 @@ -6,7 +6,11 @@ :: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> :: Peter Ward <dralnix(a)gmail.com> :: -@echo off + +if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 +if %_ROSBE_DEBUG% == 0 ( + @echo off +) if "%_ROSBE_MODE%" == "RosBE" ( title Change the current MinGW/GCC directory... Modified: trunk/tools/RosBE/RosBE-Windows/Root/options.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/opt… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/options.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/options.cmd Sat Feb 2 16:03:35 2008 @@ -6,7 +6,11 @@ :: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> :: :: -@echo off + +if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 +if %_ROSBE_DEBUG% == 0 ( + @echo off +) title Options Modified: trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/rel… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd Sat Feb 2 16:03:35 2008 @@ -8,7 +8,11 @@ :: Peter Ward <dralnix(a)gmail.com> :: :: -@echo off + +if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 +if %_ROSBE_DEBUG% == 0 ( + @echo off +) title reladdr2line... Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd Sat Feb 2 16:03:35 2008 @@ -7,7 +7,11 @@ :: Peter Ward <dralnix(a)gmail.com> :: :: -@echo off + +if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 +if %_ROSBE_DEBUG% == 0 ( + @echo off +) :: :: Check if we are running within the RosBE, and if not Modified: trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/sSV… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd Sat Feb 2 16:03:35 2008 @@ -6,7 +6,11 @@ :: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> :: :: -@echo off + +if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 +if %_ROSBE_DEBUG% == 0 ( + @echo off +) :: :: Receive the first parameter and decide what to do. Modified: trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/scu… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd Sat Feb 2 16:03:35 2008 @@ -7,7 +7,11 @@ :: Daniel Reimer <reimer.daniel(a)freenet.de> :: Peter Ward <dralnix(a)gmail.com> :: -@echo off + +if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 +if %_ROSBE_DEBUG% == 0 ( + @echo off +) :: Check if the parameter is an scut parameter, which can just be forwarded to the EXE file if /i "%1" == "add" goto paramcall

1 0

[cfinck] 32087: Get it to compile warning-free under MSVC (at /W3)
by cfinck＠svn.reactos.org 02 Feb '08

02 Feb '08

Author: cfinck Date: Sat Feb 2 15:05:05 2008 New Revision: 32087 URL: http://svn.reactos.org/svn/reactos?rev=32087&view=rev Log: Get it to compile warning-free under MSVC (at /W3) Modified: trunk/reactos/tools/cabman/cabinet.h trunk/reactos/tools/cabman/dfp.cxx Modified: trunk/reactos/tools/cabman/cabinet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.h?rev… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.h (original) +++ trunk/reactos/tools/cabman/cabinet.h Sat Feb 2 15:05:05 2008 @@ -33,7 +33,9 @@ #define DIR_SEPARATOR_CHAR '\\' #define DIR_SEPARATOR_STRING "\\" -#define strcasecmp strcmpi +#define strcasecmp _strcmpi +#define strdup _strdup + #define AllocateMemory(size) HeapAlloc(GetProcessHeap(), 0, size) #define FreeMemory(buffer) HeapFree(GetProcessHeap(), 0, buffer) #define FILEHANDLE HANDLE Modified: trunk/reactos/tools/cabman/dfp.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/dfp.cxx?rev=3… ============================================================================== --- trunk/reactos/tools/cabman/dfp.cxx (original) +++ trunk/reactos/tools/cabman/dfp.cxx Sat Feb 2 15:05:05 2008 @@ -29,7 +29,7 @@ return size; } #define ReadFileData(handle, buffer, size, bytesread) _ReadFileData(handle, buffer, size, bytesread) -static bool _ReadFileData(FILEHANDLE handle, void* buffer, ULONG size, PULONG bytesread) +static BOOL _ReadFileData(FILEHANDLE handle, void* buffer, ULONG size, PULONG bytesread) { return ReadFile(handle, buffer, size, (LPDWORD)bytesread, NULL); }

1 0

[cfinck] 32086: [FORMATTING] TABs -> 4 spaces
by cfinck＠svn.reactos.org 02 Feb '08

02 Feb '08

Author: cfinck Date: Sat Feb 2 14:57:16 2008 New Revision: 32086 URL: http://svn.reactos.org/svn/reactos?rev=32086&view=rev Log: [FORMATTING] TABs -> 4 spaces Modified: trunk/reactos/tools/cabman/cabinet.cxx trunk/reactos/tools/cabman/cabinet.h trunk/reactos/tools/cabman/cabman.h trunk/reactos/tools/cabman/dfp.cxx trunk/reactos/tools/cabman/dfp.h trunk/reactos/tools/cabman/main.cxx trunk/reactos/tools/cabman/mszip.cxx trunk/reactos/tools/cabman/mszip.h trunk/reactos/tools/cabman/raw.cxx trunk/reactos/tools/cabman/raw.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/tools/cabman/cabinet.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.cxx?r… Modified: trunk/reactos/tools/cabman/cabinet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.h?rev… Modified: trunk/reactos/tools/cabman/cabman.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabman.h?rev=… Modified: trunk/reactos/tools/cabman/dfp.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/dfp.cxx?rev=3… Modified: trunk/reactos/tools/cabman/dfp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/dfp.h?rev=320… Modified: trunk/reactos/tools/cabman/main.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/main.cxx?rev=… Modified: trunk/reactos/tools/cabman/mszip.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/mszip.cxx?rev… Modified: trunk/reactos/tools/cabman/mszip.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/mszip.h?rev=3… Modified: trunk/reactos/tools/cabman/raw.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/raw.cxx?rev=3… Modified: trunk/reactos/tools/cabman/raw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/raw.h?rev=320…

1 0

[cwittich] 32085: display short version info for "ver" as default use /c, /r or /w to get more details
by cwittich＠svn.reactos.org 02 Feb '08

02 Feb '08

Author: cwittich Date: Sat Feb 2 14:03:43 2008 New Revision: 32085 URL: http://svn.reactos.org/svn/reactos?rev=32085&view=rev Log: display short version info for "ver" as default use /c, /r or /w to get more details Modified: trunk/reactos/base/shell/cmd/ver.c Modified: trunk/reactos/base/shell/cmd/ver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/ver.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/ver.c (original) +++ trunk/reactos/base/shell/cmd/ver.c Sat Feb 2 14:03:43 2008 @@ -72,17 +72,14 @@ } ShortVersion(); - ConOutPuts (_T("Copyright (C) 1994-1998 Tim Norman and others.")); - ConOutPuts (_T("Copyright (C) 1998-" COPYRIGHT_YEAR " ReactOS Team")); /* Basic copyright notice */ - if (param[0] == _T('\0')) + if (param[0] != _T('\0')) { - ConOutResPuts (STRING_CMD_SHELLINFO ); - ConOutResPuts(STRING_VERSION_HELP2); - } - else - { + + ConOutPuts (_T("Copyright (C) 1994-1998 Tim Norman and others.")); + ConOutPuts (_T("Copyright (C) 1998-" COPYRIGHT_YEAR " ReactOS Team")); + for (i = 0; param[i]; i++) { /* skip spaces */ @@ -124,9 +121,8 @@ return 1; } } + ConOutResPuts(STRING_VERSION_HELP5); } - - ConOutResPuts(STRING_VERSION_HELP5); return 0; }

1 0

[cwittich] 32084: move code to the correct position to handle all cases in 'if'
by cwittich＠svn.reactos.org 02 Feb '08

02 Feb '08

Author: cwittich Date: Sat Feb 2 13:52:29 2008 New Revision: 32084 URL: http://svn.reactos.org/svn/reactos?rev=32084&view=rev Log: move code to the correct position to handle all cases in 'if' Modified: trunk/reactos/base/shell/cmd/if.c Modified: trunk/reactos/base/shell/cmd/if.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/if.c?rev=32… ============================================================================== --- trunk/reactos/base/shell/cmd/if.c (original) +++ trunk/reactos/base/shell/cmd/if.c Sat Feb 2 13:52:29 2008 @@ -181,26 +181,26 @@ x_flag ^= X_EXEC; pp += p1len; - while (_istspace (*pp)) /* skip spaces */ - pp++; - - if (*pp == _T('(')) - { - if (bc) - { - pp++; - bc->bCmdBlock++; - if ((bc->bCmdBlock >= 0) && (bc->bCmdBlock < MAX_PATH)) - bc->bExecuteBlock[bc->bCmdBlock] = x_flag & X_EXEC; - /* commands are in the next lines */ - if (*pp == _T('\0')) - return 0; - } - } - if ( x_flag ) { x_flag |= X_EMPTY; + } + } + + while (_istspace (*pp)) /* skip spaces */ + pp++; + + if (*pp == _T('(')) + { + if (bc) + { + pp++; + bc->bCmdBlock++; + if ((bc->bCmdBlock >= 0) && (bc->bCmdBlock < MAX_PATH)) + bc->bExecuteBlock[bc->bCmdBlock] = x_flag & X_EXEC; + /* commands are in the next lines */ + if (*pp == _T('\0')) + return 0; } }

1 0

[cwittich] 32083: don't overwrite terminating \0 char some code cleanup
by cwittich＠svn.reactos.org 02 Feb '08

02 Feb '08

Author: cwittich Date: Sat Feb 2 13:38:37 2008 New Revision: 32083 URL: http://svn.reactos.org/svn/reactos?rev=32083&view=rev Log: don't overwrite terminating \0 char some code cleanup Modified: trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/misc.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c (original) +++ trunk/reactos/base/shell/cmd/cmd.c Sat Feb 2 13:38:37 2008 @@ -1465,7 +1465,7 @@ } } - if (_istcntrl (*ip)) + if (*ip != _T('\0') && (_istcntrl (*ip))) *ip = _T(' '); *cp++ = *ip++; Modified: trunk/reactos/base/shell/cmd/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/misc.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/misc.c (original) +++ trunk/reactos/base/shell/cmd/misc.c Sat Feb 2 13:38:37 2008 @@ -454,13 +454,12 @@ LPSTR lpString; CHAR ch; DWORD dwRead; - INT len; + INT len = 0; #ifdef _UNICODE lpString = cmd_alloc(nBufferLength); #else lpString = lpBuffer; #endif - len = 0; while ((--nBufferLength > 0) && ReadFile(hFile, &ch, 1, &dwRead, NULL) && dwRead) { @@ -482,7 +481,7 @@ lpString[len++] = _T('\0'); #ifdef _UNICODE - MultiByteToWideChar(CP_ACP, 0, lpString, len, lpBuffer, len); + MultiByteToWideChar(CP_ACP, 0, lpString, -1, lpBuffer, len); cmd_free(lpString); #endif return TRUE;

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 February 2008