Ros-diffs December 2010

ros-diffs@reactos.org

20 participants
369 discussions

[jgardou] 50178: [CMAKE] - add bootcdregtest target

by jgardou＠svn.reactos.org

Author: jgardou Date: Mon Dec 27 23:57:37 2010 New Revision: 50178 URL: http://svn.reactos.org/svn/reactos?rev=50178&view=rev Log: [CMAKE] - add bootcdregtest target Modified: branches/cmake-bringup/ros_cd.cmake Modified: branches/cmake-bringup/ros_cd.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ros_cd.cmake?rev=… ============================================================================== --- branches/cmake-bringup/ros_cd.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/ros_cd.cmake [iso-8859-1] Mon Dec 27 23:57:37 2010 @@ -29,58 +29,76 @@ #reactos.cab add_custom_command( - OUTPUT ${REACTOS_BINARY_DIR}/bootcd/reactos/reactos.inf - COMMAND native-cabman -C ${REACTOS_BINARY_DIR}/boot/reactos.dff -L ${REACTOS_BINARY_DIR}/boot/bootcd/reactos -I + OUTPUT ${REACTOS_BINARY_DIR}/boot/reactos.inf + COMMAND native-cabman -C ${REACTOS_BINARY_DIR}/boot/reactos.dff -L ${REACTOS_BINARY_DIR}/boot -I DEPENDS ${REACTOS_BINARY_DIR}/boot/reactos.dff) add_custom_command( - OUTPUT ${REACTOS_BINARY_DIR}/bootcd/reactos/reactos.cab - COMMAND native-cabman -C ${REACTOS_BINARY_DIR}/boot/reactos.dff -RC ${REACTOS_BINARY_DIR}/boot/bootcd/reactos/reactos.inf -L ${REACTOS_BINARY_DIR}/boot/bootcd/reactos -N - DEPENDS ${REACTOS_BINARY_DIR}/bootcd/reactos/reactos.inf) -list(APPEND BOOTCD_FILES ${REACTOS_BINARY_DIR}/bootcd/reactos/reactos.cab) + OUTPUT ${REACTOS_BINARY_DIR}/boot/reactos.cab + COMMAND native-cabman -C ${REACTOS_BINARY_DIR}/boot/reactos.dff -RC ${REACTOS_BINARY_DIR}/boot/reactos.inf -L ${REACTOS_BINARY_DIR}/boot -N + DEPENDS ${REACTOS_BINARY_DIR}/boot/reactos.inf) #bootcd target -set(BOOTCD_DIR "${REACTOS_BINARY_DIR}/boot/bootcd") +macro(create_bootcd_dir BOOTCD_DIR _target) -file(MAKE_DIRECTORY - "${BOOTCD_DIR}" - "${BOOTCD_DIR}/loader" - "${BOOTCD_DIR}/reactos" - "${BOOTCD_DIR}/reactos/system32") + file(MAKE_DIRECTORY + "${BOOTCD_DIR}" + "${BOOTCD_DIR}/loader" + "${BOOTCD_DIR}/reactos" + "${BOOTCD_DIR}/reactos/system32") -file(STRINGS ${REACTOS_BINARY_DIR}/boot/ros_minicd_target.txt MINICD_TARGET_ENTRIES) -foreach(ENTRY ${MINICD_TARGET_ENTRIES}) - string(REGEX REPLACE "^(.*)\t.*\t.*" "\\1" _targetname ${ENTRY}) - string(REGEX REPLACE "^.*\t(.*)\t.*" "\\1" _DIR ${ENTRY}) - string(REGEX REPLACE "^.*\t.*\t(.*)" "\\1"_NAMEONCD ${ENTRY}) - get_target_property(_FILENAME ${_targetname} LOCATION) - set(filename ${BOOTCD_DIR}/${_DIR}/${_NAMEONCD}) - list(APPEND BOOTCD_FILES ${filename}) + file(STRINGS ${REACTOS_BINARY_DIR}/boot/ros_minicd_target.txt MINICD_TARGET_ENTRIES) + foreach(ENTRY ${MINICD_TARGET_ENTRIES}) + string(REGEX REPLACE "^(.*)\t.*\t.*" "\\1" _targetname ${ENTRY}) + string(REGEX REPLACE "^.*\t(.*)\t.*" "\\1" _DIR ${ENTRY}) + string(REGEX REPLACE "^.*\t.*\t(.*)" "\\1"_NAMEONCD ${ENTRY}) + get_target_property(_FILENAME ${_targetname} LOCATION) + set(filename ${BOOTCD_DIR}/${_DIR}/${_NAMEONCD}) + list(APPEND ${_target}_FILES ${filename}) + add_custom_command( + OUTPUT ${filename} + COMMAND ${CMAKE_COMMAND} -E copy ${_FILENAME} ${filename} + DEPENDS ${_targetname}) + endforeach() + + file(STRINGS ${REACTOS_BINARY_DIR}/boot/ros_minicd.txt MINICD_ENTRIES) + foreach(ENTRY ${MINICD_ENTRIES}) + string(REGEX REPLACE "^(.*)\t.*\t.*" "\\1" _FILENAME ${ENTRY}) + string(REGEX REPLACE "^.*\t(.*)\t.*" "\\1" _DIR ${ENTRY}) + string(REGEX REPLACE "^.*\t.*\t(.*)" "\\1"_NAMEONCD ${ENTRY}) + set(filename ${BOOTCD_DIR}/${_DIR}/${_NAMEONCD}) + list(APPEND ${_target}_FILES ${filename}) + add_custom_command( + OUTPUT ${filename} + COMMAND ${CMAKE_COMMAND} -E copy ${_FILENAME} ${filename} + DEPENDS ${_FILENAME}) + endforeach() + add_custom_command( - OUTPUT ${filename} - COMMAND ${CMAKE_COMMAND} -E copy ${_FILENAME} ${BOOTCD_DIR}/${_DIR}/${_NAMEONCD} - DEPENDS ${_targetname}) -endforeach() + OUTPUT ${BOOTCD_DIR}/reactos/reactos.inf ${BOOTCD_DIR}/reactos/reactos.cab + COMMAND ${CMAKE_COMMAND} -E copy ${REACTOS_BINARY_DIR}/boot/reactos.inf ${BOOTCD_DIR}/reactos/reactos.inf + COMMAND ${CMAKE_COMMAND} -E copy ${REACTOS_BINARY_DIR}/boot/reactos.cab ${BOOTCD_DIR}/reactos/reactos.cab + DEPENDS ${REACTOS_BINARY_DIR}/boot/reactos.cab) + list(APPEND ${_target}_FILES ${filename} ${BOOTCD_DIR}/reactos/reactos.inf ${BOOTCD_DIR}/reactos/reactos.cab) +endmacro() -file(STRINGS ${REACTOS_BINARY_DIR}/boot/ros_minicd.txt MINICD_ENTRIES) -foreach(ENTRY ${MINICD_ENTRIES}) - string(REGEX REPLACE "^(.*)\t.*\t.*" "\\1" _FILENAME ${ENTRY}) - string(REGEX REPLACE "^.*\t(.*)\t.*" "\\1" _DIR ${ENTRY}) - string(REGEX REPLACE "^.*\t.*\t(.*)" "\\1"_NAMEONCD ${ENTRY}) - set(filename ${BOOTCD_DIR}/${_DIR}/${_NAMEONCD}) - list(APPEND BOOTCD_FILES ${filename}) - add_custom_command( - OUTPUT ${filename} - COMMAND ${CMAKE_COMMAND} -E copy ${_FILENAME} ${BOOTCD_DIR}/${_DIR}/${_NAMEONCD} - DEPENDS ${_FILENAME}) -endforeach() +create_bootcd_dir(${REACTOS_BINARY_DIR}/boot/bootcd bootcd) +add_custom_target(bootcd + COMMAND native-cdmake -v -j -m -b ${CMAKE_CURRENT_BINARY_DIR}/boot/freeldr/bootsect/isoboot.bin ${BOOTCD_DIR} REACTOS ${REACTOS_BINARY_DIR}/bootcd.iso + DEPENDS ${bootcd_FILES}) +add_dependencies(bootcd dosmbr ext2 fat32 fat isoboot isobtrt vgafonts) +set_directory_properties(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${REACTOS_BINARY_DIR}/bootcd.iso) -add_custom_target(bootcd - COMMAND native-cdmake -v -j -m -b ${CMAKE_CURRENT_BINARY_DIR}/boot/freeldr/bootsect/isoboot.bin ${BOOTCD_DIR} REACTOS ${REACTOS_BINARY_DIR}/minicd.iso - DEPENDS ${BOOTCD_FILES}) - -add_dependencies(bootcd dosmbr ext2 fat32 fat isoboot isobtrt vgafonts) +#bootcdregtest target +create_bootcd_dir(${REACTOS_BINARY_DIR}/boot/bootcdregtest bootcdregtest) +add_custom_command( + OUTPUT ${REACTOS_BINARY_DIR}/boot/bootcdregtest/reactos/unattend.inf + COMMAND ${CMAKE_COMMAND} -E copy ${REACTOS_SOURCE_DIR}/boot/bootdata/bootcdregtest/unattend.inf ${REACTOS_BINARY_DIR}/boot/bootcdregtest/reactos/unattend.inf + DEPENDS ${REACTOS_SOURCE_DIR}/boot/bootdata/bootcdregtest/unattend.inf ${REACTOS_BINARY_DIR}/boot/bootcdregtest) +add_custom_target(bootcdregtest + COMMAND native-cdmake -v -j -m -b ${CMAKE_CURRENT_BINARY_DIR}/boot/freeldr/bootsect/isoboot.bin ${REACTOS_BINARY_DIR}/boot/bootcdregtest REACTOS ${REACTOS_BINARY_DIR}/bootcdregtest.iso + DEPENDS ${REACTOS_BINARY_DIR}/boot/bootcdregtest/reactos/unattend.inf ${bootcdregtest_FILES}) +add_dependencies(bootcdregtest dosmbr ext2 fat32 fat isoboot isobtrt vgafonts) -set_directory_properties(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${REACTOS_BINARY_DIR}/minicd.iso) #livecd target file(MAKE_DIRECTORY

13 years, 8 months

[jgardou] 50177: [CMAKE] - use already set variable for idl file compilation

by jgardou＠svn.reactos.org

Author: jgardou Date: Mon Dec 27 23:57:12 2010 New Revision: 50177 URL: http://svn.reactos.org/svn/reactos?rev=50177&view=rev Log: [CMAKE] - use already set variable for idl file compilation Modified: branches/cmake-bringup/CMakeMacros.cmake Modified: branches/cmake-bringup/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeMacros.cmake… ============================================================================== --- branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] Mon Dec 27 23:57:12 2010 @@ -241,15 +241,10 @@ macro(add_idl_interface IDL_FILE) custom_incdefs() - if(ARCH MATCHES i386) - set(platform_flags "-m32 --win32") - elseif(ARCH MATCHES amd64) - set(platform_flags "-m64 --win64") - endif() get_filename_component(FILE ${IDL_FILE} NAME_WE) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_i.c - COMMAND ${IDL_COMPILER} ${result_incs} ${result_defs} ${platform_flags} -u -U ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_i.c ${CMAKE_CURRENT_SOURCE_DIR}/${IDL_FILE} + COMMAND ${IDL_COMPILER} ${result_incs} ${result_defs} ${IDL_FLAGS} -u -U ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_i.c ${CMAKE_CURRENT_SOURCE_DIR}/${IDL_FILE} DEPENDS ${IDL_FILE}) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${FILE}_i.c PROPERTIES GENERATED TRUE) endmacro()

13 years, 8 months

[tkreuzer] 50176: [CMAKE] Add support for different architectures to configure script and simplify it a bit

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Dec 27 23:14:50 2010 New Revision: 50176 URL: http://svn.reactos.org/svn/reactos?rev=50176&view=rev Log: [CMAKE] Add support for different architectures to configure script and simplify it a bit Modified: branches/cmake-bringup/configure.cmd Modified: branches/cmake-bringup/configure.cmd URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/configure.cmd?rev… ============================================================================== --- branches/cmake-bringup/configure.cmd [iso-8859-1] (original) +++ branches/cmake-bringup/configure.cmd [iso-8859-1] Mon Dec 27 23:14:50 2010 @@ -4,23 +4,14 @@ set ROS_SOURCE_DIR=%~dp0 rem Detect build environment (Mingw, VS, WDK, ...) -if "%ROS_ARCH%" == "i386" ( - echo Detected RosBE for i386 - set BUILD_ENVIRONMENT=MINGW -) -if "%ROS_ARCH%" == "amd64" ( - echo Detected RosBE for amd64 - set BUILD_ENVIRONMENT=MINGW -) -if "%ROS_ARCH%" == "arm" ( - echo Detected RosBE for arm +if not "%ROS_ARCH%" == "" ( + echo Detected RosBE for %ROS_ARCH% set BUILD_ENVIRONMENT=MINGW ) if not "%DDK_TARGET_OS%" == "" ( - echo Detected DDK/WDK + echo Detected DDK/WDK for %_BUILDARCH% set BUILD_ENVIRONMENT=WDK ) - rem Create directories @@ -45,12 +36,12 @@ cd reactos if "%BUILD_ENVIRONMENT%" == "MINGW" ( - cmake -G "MinGW Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-mingw32.cmake %ROS_SOURCE_DIR% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" + cmake -G "MinGW Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-mingw32.cmake -DARCH=%ROS_ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %ROS_SOURCE_DIR% ) if "%BUILD_ENVIRONMENT%" == "WDK" ( - cmake -G "NMake Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake %ROS_SOURCE_DIR% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" + cmake -G "NMake Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%_BUILDARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %ROS_SOURCE_DIR% ) cd.. rem Create a root makefile -@echo someshit > makefile +rem echo ... > makefile

13 years, 8 months

[fireball] 50175: [FASTFAT_NEW] - Don't use same name for a local boolean var and global enum. Spotted by Pierre.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Dec 27 22:02:11 2010 New Revision: 50175 URL: http://svn.reactos.org/svn/reactos?rev=50175&view=rev Log: [FASTFAT_NEW] - Don't use same name for a local boolean var and global enum. Spotted by Pierre. Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] Mon Dec 27 22:02:11 2010 @@ -493,7 +493,7 @@ BOOLEAN OpenDirectory; BOOLEAN IsPagingFile; BOOLEAN OpenTargetDirectory; - BOOLEAN DirectoryFile; + BOOLEAN IsDirectoryFile; BOOLEAN NonDirectoryFile; BOOLEAN NoEaKnowledge; BOOLEAN DeleteOnClose; @@ -609,7 +609,7 @@ Vcb = &((PVOLUME_DEVICE_OBJECT)IrpSp->DeviceObject)->Vcb; /* Get options */ - DirectoryFile = BooleanFlagOn(Options, FILE_DIRECTORY_FILE); + IsDirectoryFile = BooleanFlagOn(Options, FILE_DIRECTORY_FILE); NonDirectoryFile = BooleanFlagOn(Options, FILE_NON_DIRECTORY_FILE); SequentialOnly = BooleanFlagOn(Options, FILE_SEQUENTIAL_ONLY); NoIntermediateBuffering = BooleanFlagOn(Options, FILE_NO_INTERMEDIATE_BUFFERING); @@ -624,17 +624,17 @@ CreateDisposition = (Options >> 24) & 0x000000ff; /* Get Create/Open directory flags based on it */ - CreateDirectory = (BOOLEAN)(DirectoryFile && + CreateDirectory = (BOOLEAN)(IsDirectoryFile && ((CreateDisposition == FILE_CREATE) || (CreateDisposition == FILE_OPEN_IF))); - OpenDirectory = (BOOLEAN)(DirectoryFile && + OpenDirectory = (BOOLEAN)(IsDirectoryFile && ((CreateDisposition == FILE_OPEN) || (CreateDisposition == FILE_OPEN_IF))); /* Validate parameters: directory/nondirectory mismatch and AllocationSize being more than 4GB */ - if ((DirectoryFile && NonDirectoryFile) || + if ((IsDirectoryFile && NonDirectoryFile) || Irp->Overlay.AllocationSize.HighPart != 0) { FatCompleteRequest(IrpContext, Irp, STATUS_INVALID_PARAMETER); @@ -686,9 +686,9 @@ FatDecodeFileObject(RelatedFO, &DecodedVcb, &Fcb, &Ccb) == UserVolumeOpen) { /* Check parameters */ - if (DirectoryFile || OpenTargetDirectory) - { - Status = DirectoryFile ? STATUS_NOT_A_DIRECTORY : STATUS_INVALID_PARAMETER; + if (IsDirectoryFile || OpenTargetDirectory) + { + Status = IsDirectoryFile ? STATUS_NOT_A_DIRECTORY : STATUS_INVALID_PARAMETER; /* Unlock VCB */ FatReleaseVcb(IrpContext, Vcb);

13 years, 8 months

[tkreuzer] 50174: [CMAKE] unix build fixes for host tools

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Dec 27 21:48:25 2010 New Revision: 50174 URL: http://svn.reactos.org/svn/reactos?rev=50174&view=rev Log: [CMAKE] unix build fixes for host tools Modified: branches/cmake-bringup/tools/geninc/geninc.c branches/cmake-bringup/tools/spec2def/spec2def.c branches/cmake-bringup/tools/xml.cpp Modified: branches/cmake-bringup/tools/geninc/geninc.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/geninc/geni… ============================================================================== --- branches/cmake-bringup/tools/geninc/geninc.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/geninc/geninc.c [iso-8859-1] Mon Dec 27 21:48:25 2010 @@ -6,15 +6,20 @@ #ifdef _WIN32 #define PRIx64 "I64x" +typedef unsigned __int16 uint16_t; +typedef unsigned __int32 uint32_t; +typedef unsigned __int64 uint64_t; #else +#include <stdint.h> #define PRIx64 "llx" +#define _stricmp strcasecmp #endif typedef struct { char Type; char Name[55]; - unsigned __int64 Value; + uint64_t Value; } ASMGENDATA; #define TYPE_END 0 @@ -29,24 +34,24 @@ int i, result = -1; int ms_format = 0; char header[20]; - unsigned __int32 e_lfanew, signature; - unsigned __int16 Machine, NumberOfSections, SizeOfOptionalHeader; + uint32_t e_lfanew, signature; + uint16_t Machine, NumberOfSections, SizeOfOptionalHeader; typedef struct { char Name[8]; - unsigned __int32 VirtualSize; - unsigned __int32 VirtualAddress; - unsigned __int32 RawSize; - unsigned __int32 RawAddress; - unsigned __int32 RelocAddress; - unsigned __int32 LineNumbers; - unsigned __int16 RelocationsNumber; - unsigned __int16 LineNumbersNumber; - unsigned __int32 Characteristics; + uint32_t VirtualSize; + uint32_t VirtualAddress; + uint32_t RawSize; + uint32_t RawAddress; + uint32_t RelocAddress; + uint32_t LineNumbers; + uint16_t RelocationsNumber; + uint16_t LineNumbersNumber; + uint32_t Characteristics; } SECTION; SECTION section; - if (argc >= 4 && stricmp(argv[3], "-ms") == 0) ms_format = 1; + if (argc >= 4 && _stricmp(argv[3], "-ms") == 0) ms_format = 1; /* Open the input file */ input = fopen(argv[1], "rb"); @@ -143,7 +148,7 @@ break; } } - + if (i == NumberOfSections) { fprintf(stderr, "Could not find section.\n"); @@ -171,7 +176,7 @@ fprintf(output, "%s\n", data.Name); continue; - case TYPE_CONSTANT: + case TYPE_CONSTANT: if (ms_format) { fprintf(output, "%s equ 0%"PRIx64"h\n", data.Name, data.Value); @@ -182,7 +187,7 @@ } continue; - case TYPE_HEADER: + case TYPE_HEADER: if (ms_format) { fprintf(output, "\n; %s\n", data.Name); Modified: branches/cmake-bringup/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/spec2def/sp… ============================================================================== --- branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] Mon Dec 27 21:48:25 2010 @@ -2,6 +2,10 @@ #include <stdlib.h> #include <ctype.h> #include <string.h> + +#ifndef _WIN32 +#define _stricmp strcasecmp +#endif typedef struct { @@ -145,14 +149,14 @@ (pexp->uFlags & FL_STUB) == 0) return 0; fprintf(file, "int "); - if (strcmp(pszArchString, "i386") == 0 && + if (strcmp(pszArchString, "i386") == 0 && pexp->nCallingConvention == CC_STDCALL) { fprintf(file, "__stdcall "); } fprintf(file, "%.*s(", pexp->nNameLength, pexp->pcName); - + for (i = 0; i < pexp->nArgCount; i++) { if (i != 0) fprintf(file, ", "); @@ -198,7 +202,7 @@ } } fprintf(file, ");\n"); - + if (pexp->nCallingConvention == CC_STUB) { fprintf(file, "\t__wine_spec_unimplemented_stub(\"%s\", __FUNCTION__);\n", pszDllName); @@ -257,7 +261,7 @@ void OutputHeader_def(FILE *file, char *libname) { - fprintf(file, + fprintf(file, "; File generated automatically, do not edit!\n\n" "LIBRARY %s\n\n" "EXPORTS\n", @@ -283,7 +287,7 @@ fprintf(fileDest, "%.*s", pexp->nNameLength, pexp->pcName); - if ((pexp->nCallingConvention == CC_STDCALL || + if ((pexp->nCallingConvention == CC_STDCALL || pexp->nCallingConvention == CC_FASTCALL) && !no_decoration) { fprintf(fileDest, "@%d", pexp->nStackBytes); @@ -295,19 +299,19 @@ int bAddDecorations = 1; fprintf(fileDest, "="); - + /* No decorations, if switch was passed or this is an external */ if (no_decoration || ScanToken(pexp->pcRedirection, '.')) { bAddDecorations = 0; } - + if (pexp->nCallingConvention == CC_FASTCALL && bAddDecorations) { fprintf(fileDest, "@"); } fprintf(fileDest, "%.*s", pexp->nRedirectionLength, pexp->pcRedirection); - if ((pexp->nCallingConvention == CC_STDCALL || + if ((pexp->nCallingConvention == CC_STDCALL || pexp->nCallingConvention == CC_FASTCALL) && bAddDecorations) { fprintf(fileDest, "@%d", pexp->nStackBytes); @@ -348,7 +352,7 @@ int included; //fprintf(stderr, "info: line %d, pcStart:'%.30s'\n", nLine, pcStart); - + /* Loop all lines */ nLine = 1; for (pcLine = pcStart; *pcLine; pcLine = NextLine(pcLine), nLine++) @@ -358,7 +362,7 @@ exp.nArgCount = 0; exp.uFlags = 0; - //fprintf(stderr, "info: line %d, token:'%d, %.20s'\n", + //fprintf(stderr, "info: line %d, token:'%d, %.20s'\n", // nLine, TokenLength(pcLine), pcLine); /* Skip white spaces */ @@ -368,7 +372,7 @@ if (*pc == ';' || *pc <= '#') continue; if (*pc == 0) return 0; - //fprintf(stderr, "info: line %d, token:'%.*s'\n", + //fprintf(stderr, "info: line %d, token:'%.*s'\n", // nLine, TokenLength(pc), pc); /* Now we should get either an ordinal or @ */ @@ -408,7 +412,7 @@ } else { - fprintf(stderr, "error: line %d, expected type, got '%.*s' %d\n", + fprintf(stderr, "error: line %d, expected type, got '%.*s' %d\n", nLine, TokenLength(pc), pc, *pc); return -11; } @@ -441,7 +445,7 @@ { included = 1; } - + /* Skip to next arch or end */ while (*pc > ',') pc++; } @@ -471,7 +475,7 @@ } else { - fprintf(stderr, "info: ignored option: '%.*s'\n", + fprintf(stderr, "info: ignored option: '%.*s'\n", TokenLength(pc), pc); } @@ -480,7 +484,7 @@ } //fprintf(stderr, "info: Name:'%.10s'\n", pc); - + /* If arch didn't match ours, skip this entry */ if (!included) continue; @@ -507,7 +511,7 @@ fprintf(stderr, "error: line %d, expected '('\n", nLine); return -14; } - + /* Skip whitespaces */ while (*pc == ' ' || *pc == '\t') pc++; Modified: branches/cmake-bringup/tools/xml.cpp URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/xml.cpp?rev… ============================================================================== --- branches/cmake-bringup/tools/xml.cpp [iso-8859-1] (original) +++ branches/cmake-bringup/tools/xml.cpp [iso-8859-1] Mon Dec 27 21:48:25 2010 @@ -25,6 +25,7 @@ #include <direct.h> #include <io.h> #else + #include <stdio.h> #include <sys/stat.h> #include <unistd.h> @@ -101,7 +102,7 @@ void XMLException::SetExceptionV ( const std::string& location, const char* format, va_list args ) { char buffer[1024]; - _vsnprintf(buffer, sizeof(buffer)-1, format, args); + vsnprintf(buffer, sizeof(buffer)-1, format, args); _e = location + ": " + buffer; } @@ -426,14 +427,15 @@ XMLFile::Location() const { int line = 1; - char line_str[10]; + char line_str[13]; const char* p = strchr ( _buf.c_str(), '\n' ); while ( p && p < _p ) { ++line; p = strchr ( p+1, '\n' ); } - return _filename + "(" + itoa(line, line_str, 10) + ")"; + sprintf(line_str, "(%i)", line); + return _filename + line_str; } XMLAttribute::XMLAttribute()

13 years, 8 months

[pschweitzer] 50173: [FASTFAT] Remove unused vars ~

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Dec 27 21:38:40 2010 New Revision: 50173 URL: http://svn.reactos.org/svn/reactos?rev=50173&view=rev Log: [FASTFAT] Remove unused vars ~ Modified: trunk/reactos/drivers/filesystems/fastfat/rw.c Modified: trunk/reactos/drivers/filesystems/fastfat/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] Mon Dec 27 21:38:40 2010 @@ -123,7 +123,6 @@ PDEVICE_EXTENSION DeviceExt; BOOLEAN First = TRUE; PVFATFCB Fcb; - PVFATCCB Ccb; NTSTATUS Status; ULONG BytesDone; ULONG BytesPerSector; @@ -145,7 +144,6 @@ *LengthRead = 0; - Ccb = (PVFATCCB)IrpContext->FileObject->FsContext2; Fcb = IrpContext->FileObject->FsContext; BytesPerSector = DeviceExt->FatInfo.BytesPerSector; BytesPerCluster = DeviceExt->FatInfo.BytesPerCluster; @@ -328,7 +326,6 @@ { PDEVICE_EXTENSION DeviceExt; PVFATFCB Fcb; - PVFATCCB Ccb; ULONG Count; ULONG FirstCluster; ULONG CurrentCluster; @@ -352,7 +349,6 @@ ASSERT(IrpContext->FileObject); ASSERT(IrpContext->FileObject->FsContext2 != NULL); - Ccb = (PVFATCCB)IrpContext->FileObject->FsContext2; Fcb = IrpContext->FileObject->FsContext; BytesPerCluster = DeviceExt->FatInfo.BytesPerCluster; BytesPerSector = DeviceExt->FatInfo.BytesPerSector;

13 years, 8 months

[jgardou] 50172: [CMAKE] - add regtest.cmd to reactos.cab

by jgardou＠svn.reactos.org

Author: jgardou Date: Mon Dec 27 21:05:32 2010 New Revision: 50172 URL: http://svn.reactos.org/svn/reactos?rev=50172&view=rev Log: [CMAKE] - add regtest.cmd to reactos.cab Modified: branches/cmake-bringup/boot/CMakeLists.txt Modified: branches/cmake-bringup/boot/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/CMakeLists.t… ============================================================================== --- branches/cmake-bringup/boot/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/boot/CMakeLists.txt [iso-8859-1] Mon Dec 27 21:05:32 2010 @@ -267,3 +267,6 @@ add_livecd_target(setupldr loader) add_livecd(${REACTOS_SOURCE_DIR}/boot/bootdata/livecd.ini "" freeldr.ini) + +#regtest +add_cab(${REACTOS_SOURCE_DIR}/boot/bootdata/bootcdregtest/regtest.cmd 7)

13 years, 8 months

[akhaldi] 50171: [CMAKE] - Improve amd64 toolchain support.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Dec 27 20:10:40 2010 New Revision: 50171 URL: http://svn.reactos.org/svn/reactos?rev=50171&view=rev Log: [CMAKE] - Improve amd64 toolchain support. Added: branches/cmake-bringup/config-amd64.cmake Modified: branches/cmake-bringup/CMakeLists.txt branches/cmake-bringup/CMakeMacros.cmake branches/cmake-bringup/gcc.cmake branches/cmake-bringup/toolchain-mingw32.cmake Modified: branches/cmake-bringup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re… ============================================================================== --- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Mon Dec 27 20:10:40 2010 @@ -3,48 +3,56 @@ project(REACTOS) # Compile options -include(config.cmake) +if(ARCH MATCHES i386) + include(config.cmake) +elseif(ARCH MATCHES amd64) + include(config-amd64.cmake) +endif() if(NOT CMAKE_CROSSCOMPILING) -add_definitions(-DTARGET_i386) -if(MSVC) -add_definitions(-Dinline=__inline) -endif() - -include_directories( - ${REACTOS_SOURCE_DIR}/tools/unicode - include - include/host - include/reactos - include/reactos/wine - ${REACTOS_BINARY_DIR}/include) - -add_subdirectory(tools) -add_subdirectory(lib) - -if(NOT MSVC) -export(TARGETS widl nci buildno gendib cabman cdmake mkhive spec2def geninc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) + if(ARCH MATCHES i386) + add_definitions(-DTARGET_i386) + if(MSVC) + add_definitions(-Dinline=__inline) + endif() + elseif(ARCH MATCHES amd64) + add_definitions(-DTARGET_amd64) + endif() + + include_directories( + ${REACTOS_SOURCE_DIR}/tools/unicode + include + include/host + include/reactos + include/reactos/wine + ${REACTOS_BINARY_DIR}/include) + + add_subdirectory(tools) + add_subdirectory(lib) + + if(NOT MSVC) + export(TARGETS widl nci buildno gendib cabman cdmake mkhive spec2def geninc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) + else() + export(TARGETS nci buildno gendib cabman cdmake mkhive spec2def geninc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) + endif() + else() -export(TARGETS nci buildno gendib cabman cdmake mkhive spec2def geninc FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- ) -endif() - -else() - -if(NOT DEFINED REACTOS_BUILD_TOOLS_DIR) - set(REACTOS_BUILD_TOOLS_DIR ${REACTOS_SOURCE_DIR}/build) -endif() - -set(IMPORT_EXECUTABLES "${REACTOS_BUILD_TOOLS_DIR}/ImportExecutables.cmake" CACHE FILEPATH "Host executables") -include(${IMPORT_EXECUTABLES}) + + if(NOT DEFINED REACTOS_BUILD_TOOLS_DIR) + set(REACTOS_BUILD_TOOLS_DIR ${REACTOS_SOURCE_DIR}/build) + endif() + + set(IMPORT_EXECUTABLES "${REACTOS_BUILD_TOOLS_DIR}/ImportExecutables.cmake" CACHE FILEPATH "Host executables") + include(${IMPORT_EXECUTABLES}) endif(NOT CMAKE_CROSSCOMPILING) # Compiler specific definitions and macros if(MSVC) -include(msc.cmake) + include(msc.cmake) else() -include(gcc.cmake) + include(gcc.cmake) endif(MSVC) # Generic macros @@ -65,147 +73,154 @@ if(CMAKE_CROSSCOMPILING) -#Some cleanup -file(REMOVE - ${REACTOS_BINARY_DIR}/boot/ros_livecd.txt - ${REACTOS_BINARY_DIR}/boot/ros_livecd_target.txt - ${REACTOS_BINARY_DIR}/boot/ros_minicd.txt - ${REACTOS_BINARY_DIR}/boot/ros_minicd_target.txt - ${REACTOS_BINARY_DIR}/boot/ros_cab.txt - ${REACTOS_BINARY_DIR}/boot/ros_cab_target.txt) - -#Some useful variables -set(LIVECD_DIR "${REACTOS_BINARY_DIR}/boot/livecd") -set(BOOTCD_DIR "${REACTOS_BINARY_DIR}/boot/bootcd") - -# Activate support for assembly source files -enable_language(ASM) - -# Activate language support for resource files -enable_language(RC) - - -if(DBG) -add_definitions(-DDBG=1 -D_SEH_ENABLE_TRACE) -else() -add_definitions(-DDBG=0) -endif(DBG) - -if(KDBG) -add_definitions(-DKDBG=1) -else() -add_definitions(-DKDBG=0) -endif(KDBG) - -# Version Options -add_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502 -D_WIN32_WINDOWS=0x502 -D_SETUPAPI_VER=0x502) - -# Arch Options -add_definitions(-D_M_IX86 -D_X86_ -D__i386__) - -# Other -add_definitions(-DUSE_COMPILER_EXCEPTIONS -D_USE_32BIT_TIME_T) - -include_directories( - include - include/psdk - include/dxsdk - ${REACTOS_BINARY_DIR}/include - ${REACTOS_BINARY_DIR}/include/dxsdk - ${REACTOS_BINARY_DIR}/include/psdk - ${REACTOS_BINARY_DIR}/include/reactos - include/crt - include/ddk - include/ndk - include/reactos - include/reactos/libs) - -if(MSVC) -include_directories(include/crt/msc) -else() -include_directories(include/crt/mingw32) -endif(MSVC) - -add_subdirectory(include/psdk) -add_subdirectory(include/dxsdk) -add_subdirectory(include/reactos/idl) -add_subdirectory(include/reactos/wine) -add_subdirectory(include/reactos/mc) -add_subdirectory(include/asm) - -include(baseaddress.cmake) - -add_subdirectory(base) -add_subdirectory(boot) -add_subdirectory(dll) -add_subdirectory(drivers) -add_subdirectory(hal) -add_subdirectory(lib) -add_subdirectory(media) -add_subdirectory(modules) -add_subdirectory(ntoskrnl) -add_subdirectory(subsystems) - -# nci generated intermediate files - -list(APPEND nci_output - ${REACTOS_BINARY_DIR}/ntoskrnl/include/internal/napi.h - ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/include/napi.h - ${REACTOS_BINARY_DIR}/lib/ntdllsys/ntdll.S - ${REACTOS_BINARY_DIR}/ntoskrnl/ex/zw.S - ${REACTOS_BINARY_DIR}/lib/win32ksys/win32k.S - ${REACTOS_BINARY_DIR}/dll/ntdll/def/ntsys.pspec) - -list(APPEND nci_folders - ${CMAKE_CURRENT_BINARY_DIR}/dll/ntdll/def - ${CMAKE_CURRENT_BINARY_DIR}/lib/ntdllsys/ntdll - ${CMAKE_CURRENT_BINARY_DIR}/lib/win32ksys - ${CMAKE_CURRENT_BINARY_DIR}/ntoskrnl/include/internal - ${CMAKE_CURRENT_BINARY_DIR}/ntoskrnl/ex - ${CMAKE_CURRENT_BINARY_DIR}/subsystems/win32/win32k/include) - -file(MAKE_DIRECTORY ${nci_folders}) - -add_custom_command( - OUTPUT ${nci_output} - COMMAND native-nci -arch ${ARCH} ${REACTOS_SOURCE_DIR}/ntoskrnl/sysfuncs.lst ${REACTOS_SOURCE_DIR}/subsystems/win32/win32k/w32ksvc.db ${nci_output} - DEPENDS native-nci ${nci_folders}) - -set_source_files_properties(${nci_output} PROPERTIES GENERATED TRUE) - -add_custom_target(ntdll_S ALL DEPENDS ${REACTOS_BINARY_DIR}/lib/ntdllsys/ntdll.S) -add_custom_target(win32k_S ALL DEPENDS ${REACTOS_BINARY_DIR}/lib/win32ksys/win32k.S) -add_custom_target(ntsys_pspec ALL DEPENDS ${REACTOS_BINARY_DIR}/dll/ntdll/def/ntsys.pspec) -add_custom_target(kernel_napi ALL DEPENDS ${REACTOS_BINARY_DIR}/ntoskrnl/include/internal/napi.h) -add_custom_target(subsystem_napi ALL DEPENDS ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/include/napi.h) -add_custom_target(kernel_zw ALL DEPENDS ${REACTOS_BINARY_DIR}/ntoskrnl/ex/zw.S) - -file(MAKE_DIRECTORY ${REACTOS_BINARY_DIR}/include/reactos) - -add_custom_command( - OUTPUT ${REACTOS_BINARY_DIR}/include/reactos/buildno.h - COMMAND native-buildno ${REACTOS_BINARY_DIR}/include/reactos/buildno.h - DEPENDS ${REACTOS_SOURCE_DIR}/include/reactos/version.h) - -add_custom_target(buildno_header ALL DEPENDS ${REACTOS_BINARY_DIR}/include/reactos/buildno.h) - -file(MAKE_DIRECTORY ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/dib) - -list(APPEND OUTPUT_FILES - ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/dib/dib8gen.c - ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/dib/dib16gen.c - ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/dib/dib32gen.c) - -add_custom_command( - OUTPUT ${OUTPUT_FILES} - COMMAND native-gendib ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/dib - DEPENDS native-gendib) - -add_custom_target(gendib_generated ALL DEPENDS ${OUTPUT_FILES}) - -file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/importlibs) - -#bootcd and livecd -include(ros_cd.cmake) + #Some cleanup + file(REMOVE + ${REACTOS_BINARY_DIR}/boot/ros_livecd.txt + ${REACTOS_BINARY_DIR}/boot/ros_livecd_target.txt + ${REACTOS_BINARY_DIR}/boot/ros_minicd.txt + ${REACTOS_BINARY_DIR}/boot/ros_minicd_target.txt + ${REACTOS_BINARY_DIR}/boot/ros_cab.txt + ${REACTOS_BINARY_DIR}/boot/ros_cab_target.txt) + + #Some useful variables + set(LIVECD_DIR "${REACTOS_BINARY_DIR}/boot/livecd") + set(BOOTCD_DIR "${REACTOS_BINARY_DIR}/boot/bootcd") + + # Activate support for assembly source files + enable_language(ASM) + + # Activate language support for resource files + enable_language(RC) + + if(DBG) + add_definitions(-DDBG=1 -D_SEH_ENABLE_TRACE) + else() + add_definitions(-DDBG=0) + endif() + + if(KDBG) + add_definitions(-DKDBG=1) + else() + add_definitions(-DKDBG=0) + endif() + + # Version Options + add_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502 -D_WIN32_WINDOWS=0x502 -D_SETUPAPI_VER=0x502) + + # Arch Options + if(ARCH MATCHES i386) + add_definitions(-D_M_IX86 -D_X86_ -D__i386__) + elseif(ARCH MATCHES amd64) + add_definitions(-D_M_AMD64 -D_AMD64_ -D_M_AXP64 -D__x86_64__ -D_WIN64) + endif() + + # Other + if(ARCH MATCHES i386) + add_definitions(-DUSE_COMPILER_EXCEPTIONS -D_USE_32BIT_TIME_T) + elseif(ARCH MATCHES amd64) + add_definitions(-DUSE_COMPILER_EXCEPTIONS -DNO_UNDERSCORE_PREFIX) + endif() + + include_directories( + include + include/psdk + include/dxsdk + ${REACTOS_BINARY_DIR}/include + ${REACTOS_BINARY_DIR}/include/dxsdk + ${REACTOS_BINARY_DIR}/include/psdk + ${REACTOS_BINARY_DIR}/include/reactos + include/crt + include/ddk + include/ndk + include/reactos + include/reactos/libs) + + if(MSVC) + include_directories(include/crt/msc) + else() + include_directories(include/crt/mingw32) + endif() + + add_subdirectory(include/psdk) + add_subdirectory(include/dxsdk) + add_subdirectory(include/reactos/idl) + add_subdirectory(include/reactos/wine) + add_subdirectory(include/reactos/mc) + add_subdirectory(include/asm) + + include(baseaddress.cmake) + + add_subdirectory(base) + add_subdirectory(boot) + add_subdirectory(dll) + add_subdirectory(drivers) + add_subdirectory(hal) + add_subdirectory(lib) + add_subdirectory(media) + add_subdirectory(modules) + add_subdirectory(ntoskrnl) + add_subdirectory(subsystems) + + # nci generated intermediate files + + list(APPEND nci_output + ${REACTOS_BINARY_DIR}/ntoskrnl/include/internal/napi.h + ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/include/napi.h + ${REACTOS_BINARY_DIR}/lib/ntdllsys/ntdll.S + ${REACTOS_BINARY_DIR}/ntoskrnl/ex/zw.S + ${REACTOS_BINARY_DIR}/lib/win32ksys/win32k.S + ${REACTOS_BINARY_DIR}/dll/ntdll/def/ntsys.pspec) + + list(APPEND nci_folders + ${CMAKE_CURRENT_BINARY_DIR}/dll/ntdll/def + ${CMAKE_CURRENT_BINARY_DIR}/lib/ntdllsys/ntdll + ${CMAKE_CURRENT_BINARY_DIR}/lib/win32ksys + ${CMAKE_CURRENT_BINARY_DIR}/ntoskrnl/include/internal + ${CMAKE_CURRENT_BINARY_DIR}/ntoskrnl/ex + ${CMAKE_CURRENT_BINARY_DIR}/subsystems/win32/win32k/include) + + file(MAKE_DIRECTORY ${nci_folders}) + + add_custom_command( + OUTPUT ${nci_output} + COMMAND native-nci -arch ${ARCH} ${REACTOS_SOURCE_DIR}/ntoskrnl/sysfuncs.lst ${REACTOS_SOURCE_DIR}/subsystems/win32/win32k/w32ksvc.db ${nci_output} + DEPENDS native-nci ${nci_folders}) + + set_source_files_properties(${nci_output} PROPERTIES GENERATED TRUE) + + add_custom_target(ntdll_S ALL DEPENDS ${REACTOS_BINARY_DIR}/lib/ntdllsys/ntdll.S) + add_custom_target(win32k_S ALL DEPENDS ${REACTOS_BINARY_DIR}/lib/win32ksys/win32k.S) + add_custom_target(ntsys_pspec ALL DEPENDS ${REACTOS_BINARY_DIR}/dll/ntdll/def/ntsys.pspec) + add_custom_target(kernel_napi ALL DEPENDS ${REACTOS_BINARY_DIR}/ntoskrnl/include/internal/napi.h) + add_custom_target(subsystem_napi ALL DEPENDS ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/include/napi.h) + add_custom_target(kernel_zw ALL DEPENDS ${REACTOS_BINARY_DIR}/ntoskrnl/ex/zw.S) + + file(MAKE_DIRECTORY ${REACTOS_BINARY_DIR}/include/reactos) + + add_custom_command( + OUTPUT ${REACTOS_BINARY_DIR}/include/reactos/buildno.h + COMMAND native-buildno ${REACTOS_BINARY_DIR}/include/reactos/buildno.h + DEPENDS ${REACTOS_SOURCE_DIR}/include/reactos/version.h) + + add_custom_target(buildno_header ALL DEPENDS ${REACTOS_BINARY_DIR}/include/reactos/buildno.h) + + file(MAKE_DIRECTORY ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/dib) + + list(APPEND OUTPUT_FILES + ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/dib/dib8gen.c + ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/dib/dib16gen.c + ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/dib/dib32gen.c) + + add_custom_command( + OUTPUT ${OUTPUT_FILES} + COMMAND native-gendib ${REACTOS_BINARY_DIR}/subsystems/win32/win32k/dib + DEPENDS native-gendib) + + add_custom_target(gendib_generated ALL DEPENDS ${OUTPUT_FILES}) + + file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/importlibs) + + #bootcd and livecd + include(ros_cd.cmake) endif() Modified: branches/cmake-bringup/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeMacros.cmake… ============================================================================== --- branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] Mon Dec 27 20:10:40 2010 @@ -241,10 +241,15 @@ macro(add_idl_interface IDL_FILE) custom_incdefs() + if(ARCH MATCHES i386) + set(platform_flags "-m32 --win32") + elseif(ARCH MATCHES amd64) + set(platform_flags "-m64 --win64") + endif() get_filename_component(FILE ${IDL_FILE} NAME_WE) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_i.c - COMMAND ${IDL_COMPILER} ${result_incs} ${result_defs} -m32 --win32 -u -U ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_i.c ${CMAKE_CURRENT_SOURCE_DIR}/${IDL_FILE} + COMMAND ${IDL_COMPILER} ${result_incs} ${result_defs} ${platform_flags} -u -U ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_i.c ${CMAKE_CURRENT_SOURCE_DIR}/${IDL_FILE} DEPENDS ${IDL_FILE}) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${FILE}_i.c PROPERTIES GENERATED TRUE) endmacro() Added: branches/cmake-bringup/config-amd64.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/config-amd64.cmak… ============================================================================== --- branches/cmake-bringup/config-amd64.cmake (added) +++ branches/cmake-bringup/config-amd64.cmake [iso-8859-1] Mon Dec 27 20:10:40 2010 @@ -1,0 +1,43 @@ + +set(SARCH "" CACHE STRING +"Sub-architecture to build for.") + +set(OARCH "athlon64" CACHE STRING +"Generate instructions for this CPU type. Specify one of: + k8 opteron athlon64 athlon-fx") + +set (OPTIMIZE "1" CACHE STRING +"What level of optimisation to use. + 0 = off + 1 = Default option, optimize for size (-Os) with some additional options + 2 = -Os + 3 = -O1 + 4 = -O2 + 5 = -O3") + +set(DBG TRUE CACHE BOOL +"Whether to compile for debugging.") + +set(KDBG FALSE CACHE BOOL +"Whether to compile in the integrated kernel debugger.") + +set(GDB FALSE CACHE BOOL +"Whether to compile for debugging with GDB. +If you don't use GDB, don't enable this.") + +set(_WINKD_ TRUE CACHE BOOL +"Whether to compile with the KD protocol.") + +set(_ELF_ FALSE CACHE BOOL +"Whether to compile support for ELF files. +Do not enable unless you know what you're doing.") + +set(NSWPAT FALSE CACHE BOOL +"Whether to compile apps/libs with features covered software patents or not. +If you live in a country where software patents are valid/apply, don't +enable this (except they/you purchased a license from the patent owner). +This settings is disabled (0) by default.") + +set(USERMODE TRUE CACHE BOOL +"Whether to compile any usermode parts. This is while kernel mode is under + heavy development and usermode part not relevant for bootcd.") Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=501… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Mon Dec 27 20:10:40 2010 @@ -24,16 +24,29 @@ add_definitions(-gdwarf-2 -g2 -femit-struct-debug-detailed=none -feliminate-unused-debug-types) # Tuning -add_definitions(-march=pentium -mtune=i686) +if(ARCH MATCHES i386) + add_definitions(-march=${OARCH} -mtune=${TUNE}) +elseif(ARCH MATCHES amd64) + add_definitions(-march=${OARCH}) +endif() # Warnings add_definitions(-Wall -Wno-char-subscripts -Wpointer-arith -Wno-multichar -Wno-error=uninitialized -Wno-unused-value -Winvalid-pch) # Optimizations -add_definitions(-Os -fno-strict-aliasing -ftracer -momit-leaf-frame-pointer -mpreferred-stack-boundary=2 -fno-set-stack-executable -fno-optimize-sibling-calls) +if(ARCH MATCHES i386) + add_definitions(-Os -fno-strict-aliasing -ftracer -momit-leaf-frame-pointer -mpreferred-stack-boundary=2 -fno-set-stack-executable -fno-optimize-sibling-calls) +elseif(ARCH MATCHES amd64) + add_definitions(-Os -fno-strict-aliasing -ftracer -momit-leaf-frame-pointer -mpreferred-stack-boundary=4) +endif() + +# Other +if(ARCH MATCHES amd64) +add_definitions(-U_X86_ -UWIN32) +endif() # Macros -MACRO(_PCH_GET_COMPILE_FLAGS _target_name _out_compile_flags _header_filename) +macro(_PCH_GET_COMPILE_FLAGS _target_name _out_compile_flags _header_filename) # Add the precompiled header to the build get_filename_component(FILE ${_header_filename} NAME) set(_gch_filename "${_target_name}_${FILE}.gch") @@ -43,7 +56,7 @@ get_directory_property(DIRINC INCLUDE_DIRECTORIES) foreach(item ${DIRINC}) list(APPEND ${_out_compile_flags} -I${item}) - endforeach(item) + endforeach() # This is a particular bit of undocumented/hacky magic I'm quite proud of get_directory_property(_compiler_flags DEFINITIONS) @@ -55,11 +68,11 @@ if (_target_defs) foreach(item ${_target_defs}) list(APPEND ${_out_compile_flags} -D${item}) - endforeach(item) - endif() -ENDMACRO(_PCH_GET_COMPILE_FLAGS) - -MACRO(add_pch _target_name _header_filename _src_list) + endforeach() + endif() +endmacro() + +macro(add_pch _target_name _header_filename _src_list) get_filename_component(FILE ${_header_filename} NAME) set(_gch_filename "${_target_name}_${FILE}.gch") list(APPEND ${_src_list} ${_gch_filename}) @@ -69,7 +82,7 @@ OUTPUT ${_gch_filename} COMMAND ${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1} ${_args} DEPENDS ${_header_filename}) -ENDMACRO(add_pch _target_name _header_filename _src_list) +endmacro() macro(add_linkerflag MODULE _flag) set(NEW_LINKER_FLAGS ${_flag}) @@ -99,11 +112,10 @@ macro(set_module_type MODULE TYPE) add_dependencies(${MODULE} psdk buildno_header) - if(${IS_CPP}) - target_link_libraries(${MODULE} stlport -lsupc++ -lgcc) - endif() - + target_link_libraries(${MODULE} stlport -lsupc++ -lgcc) + endif() + if(${TYPE} MATCHES nativecui) set_subsystem(${MODULE} native) set_entrypoint(${MODULE} NtProcessStartup@4) @@ -115,7 +127,7 @@ else() target_link_libraries(${MODULE} mingw_wmain) endif(NOT IS_UNICODE) - target_link_libraries(${MODULE} mingw_common) + target_link_libraries(${MODULE} mingw_common) elseif(${TYPE} MATCHES win32cui) set_subsystem(${MODULE} console) set_entrypoint(${MODULE} mainCRTStartup) @@ -124,15 +136,15 @@ else() target_link_libraries(${MODULE} mingw_wmain) endif(NOT IS_UNICODE) - target_link_libraries(${MODULE} mingw_common) + target_link_libraries(${MODULE} mingw_common) elseif(${TYPE} MATCHES win32dll) set_entrypoint(${MODULE} DllMainCRTStartup@12) target_link_libraries(${MODULE} mingw_dllmain mingw_common) - if(DEFINED baseaddress_${MODULE}) - set_image_base(${MODULE} ${baseaddress_${MODULE}}) - else() - message(STATUS "${MODULE} has no base address") - endif() + if(DEFINED baseaddress_${MODULE}) + set_image_base(${MODULE} ${baseaddress_${MODULE}}) + else() + message(STATUS "${MODULE} has no base address") + endif() elseif(${TYPE} MATCHES win32ocx) set_entrypoint(${MODULE} DllMainCRTStartup@12) target_link_libraries(${MODULE} mingw_dllmain mingw_common) @@ -142,14 +154,14 @@ target_link_libraries(${MODULE} mingw_dllmain mingw_common) set_target_properties(${MODULE} PROPERTIES SUFFIX ".cpl") elseif(${TYPE} MATCHES kernelmodedriver) - set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "-Wl,--exclude-all-symbols -Wl,-file-alignment=0x1000 -Wl,-section-alignment=0x1000" SUFFIX ".sys") - set_entrypoint(${MODULE} DriverEntry@8) - set_subsystem(${MODULE} native) + set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "-Wl,--exclude-all-symbols -Wl,-file-alignment=0x1000 -Wl,-section-alignment=0x1000" SUFFIX ".sys") + set_entrypoint(${MODULE} DriverEntry@8) + set_subsystem(${MODULE} native) set_image_base(${MODULE} 0x00010000) - add_dependencies(${MODULE} bugcodes) + add_dependencies(${MODULE} bugcodes) elseif(${TYPE} MATCHES nativedll) set_subsystem(${MODULE} native) - else() + else() message(FATAL_ERROR "Unknown module type : ${TYPE}") endif() endmacro() @@ -166,18 +178,24 @@ foreach(arg ${defines}) set(rc_result_defs "${rc_result_defs} -D${arg}") - endforeach(arg ${defines}) + endforeach() foreach(arg ${includes}) set(rc_result_incs "-I${arg} ${rc_result_incs}") - endforeach(arg ${includes}) + endforeach() set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> ${rc_result_defs} ${rc_result_incs} -i <SOURCE> -O coff -o <OBJECT>") endmacro() #idl files support set(IDL_COMPILER native-widl) -set(IDL_FLAGS -m32 --win32) + +if(ARCH MATCHES i386) + set(IDL_FLAGS -m32 --win32) +elseif(ARCH MATCHES amd64) + set(IDL_FLAGS -m64 --win64) +endif() + set(IDL_HEADER_ARG -h -H) #.h set(IDL_TYPELIB_ARG -t -T) #.tlb set(IDL_SERVER_ARG -s -S) #.c for server library Modified: branches/cmake-bringup/toolchain-mingw32.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-mingw32… ============================================================================== --- branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] Mon Dec 27 20:10:40 2010 @@ -34,7 +34,12 @@ set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -x assembler-with-cpp -o <OBJECT> -I${REACTOS_SOURCE_DIR}/include/asm -I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> -D__ASM__ -c <SOURCE>") set(CMAKE_IDL_COMPILER native-widl) +if(ARCH MATCHES i386) set(CMAKE_IDL_COMPILE_OBJECT "<CMAKE_IDL_COMPILER> <FLAGS> <DEFINES> -m32 --win32 -h -H <OBJECT> <SOURCE>") +elseif(ARCH MATCHES amd64) +set(CMAKE_IDL_COMPILE_OBJECT "<CMAKE_IDL_COMPILER> <FLAGS> <DEFINES> -m64 --win64 -h -H <OBJECT> <SOURCE>") +endif() + set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -i <SOURCE> <CMAKE_C_LINK_FLAGS> <DEFINES> -I${REACTOS_SOURCE_DIR}/include/psdk -I${REACTOS_BINARY_DIR}/include/psdk -I${REACTOS_SOURCE_DIR}/include/ -I${REACTOS_SOURCE_DIR}/include/reactos -I${REACTOS_BINARY_DIR}/include/reactos -I${REACTOS_SOURCE_DIR}/include/reactos/wine -I${REACTOS_SOURCE_DIR}/include/crt -I${REACTOS_SOURCE_DIR}/include/crt/mingw32 -O coff -o <OBJECT> ") set(CMAKE_C_CREATE_STATIC_LIBRARY "${MINGW_PREFIX}ar crs <TARGET> <LINK_FLAGS> <OBJECTS>")

13 years, 8 months

[tkreuzer] 50170: [CMAKE] Fix a definition in svcctl.idl (MSVC)

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Dec 27 18:44:31 2010 New Revision: 50170 URL: http://svn.reactos.org/svn/reactos?rev=50170&view=rev Log: [CMAKE] Fix a definition in svcctl.idl (MSVC) Modified: branches/cmake-bringup/include/reactos/idl/svcctl.idl Modified: branches/cmake-bringup/include/reactos/idl/svcctl.idl URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/i… ============================================================================== --- branches/cmake-bringup/include/reactos/idl/svcctl.idl [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/idl/svcctl.idl [iso-8859-1] Mon Dec 27 18:44:31 2010 @@ -434,7 +434,7 @@ /* Function 17 */ DWORD RQueryServiceConfigW( [in] SC_RPC_HANDLE hService, - [out, unique, size_is(cbBufSize)] LPBYTE lpServiceConfig, + [out, size_is(cbBufSize)] LPBYTE lpServiceConfig, /* FIXME: should be [out] LPQUERY_SERVICE_CONFIGW lpServiceConfig, */ [in, range(0, 1024*8)] DWORD cbBufSize, [out] LPBOUNDED_DWORD_8K pcbBytesNeeded); @@ -546,7 +546,7 @@ /* Function 29 */ DWORD RQueryServiceConfigA( [in] SC_RPC_HANDLE hService, - [out, unique, size_is(cbBufSize)] LPBYTE lpServiceConfig, + [out, size_is(cbBufSize)] LPBYTE lpServiceConfig, /* FIXME: should be [out] LPQUERY_SERVICE_CONFIGA lpServiceConfig, */ [in, range(0, 1024*8)] DWORD cbBufSize, [out] LPBOUNDED_DWORD_8K pcbBytesNeeded);

13 years, 8 months

[akhaldi] 50169: [CMAKE] - Improve formatting.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Dec 27 18:29:10 2010 New Revision: 50169 URL: http://svn.reactos.org/svn/reactos?rev=50169&view=rev Log: [CMAKE] - Improve formatting. Modified: branches/cmake-bringup/toolchain-mingw32.cmake Modified: branches/cmake-bringup/toolchain-mingw32.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-mingw32… ============================================================================== --- branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] Mon Dec 27 18:29:10 2010 @@ -1,41 +1,43 @@ if(NOT ARCH) -set(ARCH i386) -endif(NOT ARCH) + set(ARCH i386) +endif() # Choose the right MinGW prefix if(ARCH MATCHES i386) -if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows) -set(MINGW_PREFIX "" CACHE STRING "MinGW Prefix") -else() -set(MINGW_PREFIX "mingw32-" CACHE STRING "MinGW Prefix") -endif(CMAKE_HOST_SYSTEM_NAME MATCHES Windows) + if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows) + set(MINGW_PREFIX "" CACHE STRING "MinGW Prefix") + else() + set(MINGW_PREFIX "mingw32-" CACHE STRING "MinGW Prefix") + endif(CMAKE_HOST_SYSTEM_NAME MATCHES Windows) elseif(ARCH MATCHES amd64) -set(MINGW_PREFIX "x86_64-w64-mingw32-" CACHE STRING "MinGW Prefix") -endif(ARCH MATCHES i386) + set(MINGW_PREFIX "x86_64-w64-mingw32-" CACHE STRING "MinGW Prefix") +endif() if(ENABLE_CCACHE) -set(CCACHE "ccache" CACHE STRING "ccache") + set(CCACHE "ccache" CACHE STRING "ccache") else() -set(CCACHE "" CACHE STRING "ccache") + set(CCACHE "" CACHE STRING "ccache") endif() # the name of the target operating system -SET(CMAKE_SYSTEM_NAME Windows) -SET(CMAKE_SYSTEM_PROCESSOR i686) +set(CMAKE_SYSTEM_NAME Windows) +set(CMAKE_SYSTEM_PROCESSOR i686) # which compilers to use for C and C++ -SET(CMAKE_C_COMPILER ${CCACHE} ${MINGW_PREFIX}gcc) -SET(CMAKE_CXX_COMPILER ${CCACHE} ${MINGW_PREFIX}g++) -SET(CMAKE_RC_COMPILER ${MINGW_PREFIX}windres) -SET(CMAKE_ASM_COMPILER ${MINGW_PREFIX}gcc) -SET(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -x assembler-with-cpp -o <OBJECT> -I${REACTOS_SOURCE_DIR}/include/asm -I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> -D__ASM__ -c <SOURCE>") -SET(CMAKE_IDL_COMPILER native-widl) +set(CMAKE_C_COMPILER ${CCACHE} ${MINGW_PREFIX}gcc) +set(CMAKE_CXX_COMPILER ${CCACHE} ${MINGW_PREFIX}g++) +set(CMAKE_RC_COMPILER ${MINGW_PREFIX}windres) +set(CMAKE_ASM_COMPILER ${MINGW_PREFIX}gcc) +set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -x assembler-with-cpp -o <OBJECT> -I${REACTOS_SOURCE_DIR}/include/asm -I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> -D__ASM__ -c <SOURCE>") +set(CMAKE_IDL_COMPILER native-widl) -SET(CMAKE_IDL_COMPILE_OBJECT "<CMAKE_IDL_COMPILER> <FLAGS> <DEFINES> -m32 --win32 -h -H <OBJECT> <SOURCE>") -SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -i <SOURCE> <CMAKE_C_LINK_FLAGS> <DEFINES> -I${REACTOS_SOURCE_DIR}/include/psdk -I${REACTOS_BINARY_DIR}/include/psdk -I${REACTOS_SOURCE_DIR}/include/ -I${REACTOS_SOURCE_DIR}/include/reactos -I${REACTOS_BINARY_DIR}/include/reactos -I${REACTOS_SOURCE_DIR}/include/reactos/wine -I${REACTOS_SOURCE_DIR}/include/crt -I${REACTOS_SOURCE_DIR}/include/crt/mingw32 -O coff -o <OBJECT> ") +set(CMAKE_IDL_COMPILE_OBJECT "<CMAKE_IDL_COMPILER> <FLAGS> <DEFINES> -m32 --win32 -h -H <OBJECT> <SOURCE>") +set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -i <SOURCE> <CMAKE_C_LINK_FLAGS> <DEFINES> -I${REACTOS_SOURCE_DIR}/include/psdk -I${REACTOS_BINARY_DIR}/include/psdk -I${REACTOS_SOURCE_DIR}/include/ -I${REACTOS_SOURCE_DIR}/include/reactos -I${REACTOS_BINARY_DIR}/include/reactos -I${REACTOS_SOURCE_DIR}/include/reactos/wine -I${REACTOS_SOURCE_DIR}/include/crt -I${REACTOS_SOURCE_DIR}/include/crt/mingw32 -O coff -o <OBJECT> ") + +set(CMAKE_C_CREATE_STATIC_LIBRARY "${MINGW_PREFIX}ar crs <TARGET> <LINK_FLAGS> <OBJECTS>") # Use stdcall fixups, and don't link with anything by default unless we say so set(CMAKE_C_STANDARD_LIBRARIES "-lgcc" CACHE STRING "Standard C Libraries") @@ -44,11 +46,11 @@ set(CMAKE_CXX_STANDARD_LIBRARIES "" CACHE STRING "Standard C++ Libraries") if(ARCH MATCHES i386) -set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--kill-at -Wl,--disable-auto-import") + set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--kill-at -Wl,--disable-auto-import") #-Wl,-T,${REACTOS_SOURCE_DIR}/global.lds elseif(ARCH MATCHES amd64) -set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--kill-at -Wl,--disable-auto-import") -endif(ARCH MATCHES i386) + set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--kill-at -Wl,--disable-auto-import") +endif() # adjust the default behaviour of the FIND_XXX() commands: # search headers and libraries in the target environment, search @@ -56,4 +58,3 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) -

13 years, 8 months

← Newer
1
...
5
6
7
8
9
10
11
...
37
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2010