Ros-diffs June 2011

ros-diffs@reactos.org

25 participants
460 discussions

[tkreuzer] 52475: [CABMAN/CDMAKE] check for _WIN32 instead of WIN32, fixes compilation with amd64 toolchain

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jun 26 22:17:01 2011 New Revision: 52475 URL: http://svn.reactos.org/svn/reactos?rev=52475&view=rev Log: [CABMAN/CDMAKE] check for _WIN32 instead of WIN32, fixes compilation with amd64 toolchain Modified: trunk/reactos/tools/cabman/cabinet.cxx trunk/reactos/tools/cabman/cabinet.h trunk/reactos/tools/cabman/dfp.cxx trunk/reactos/tools/cdmake/cdmake.c 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 [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/cabinet.cxx [iso-8859-1] Sun Jun 26 22:17:01 2011 @@ -18,7 +18,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#if !defined(WIN32) +#if !defined(_WIN32) # include <dirent.h> # include <sys/stat.h> # include <sys/types.h> @@ -27,7 +27,7 @@ #include "raw.h" #include "mszip.h" -#if defined(WIN32) +#if defined(_WIN32) #define GetSizeOfFile(handle) _GetSizeOfFile(handle) static LONG _GetSizeOfFile(FILEHANDLE handle) { @@ -126,7 +126,7 @@ { ASSERT(!FileCreated); -#if defined(WIN32) +#if defined(_WIN32) if (GetTempPath(MAX_PATH, FullName) == 0) return CAB_STATUS_CANNOT_CREATE; @@ -147,7 +147,7 @@ DPRINT(MID_TRACE, ("ERROR '%u'.\n", (UINT)GetLastError())); return CAB_STATUS_CANNOT_CREATE; } -#else /* !WIN32 */ +#else /* !_WIN32 */ /*if (tmpnam(FullName) == NULL)*/ if ((FileHandle = tmpfile()) == NULL) return CAB_STATUS_CANNOT_CREATE; @@ -190,12 +190,12 @@ * Status of operation */ { -#if defined(WIN32) +#if defined(_WIN32) if( SetFilePointer(FileHandle, 0, NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER ) return CAB_STATUS_FAILURE; if (!SetEndOfFile(FileHandle)) return CAB_STATUS_FAILURE; -#else /* !WIN32 */ +#else /* !_WIN32 */ fclose(FileHandle); FileHandle = tmpfile(); if (FileHandle == NULL) @@ -215,7 +215,7 @@ * Current position */ { -#if defined(WIN32) +#if defined(_WIN32) return SetFilePointer(FileHandle, 0, NULL, FILE_CURRENT); #else return (ULONG)ftell(FileHandle); @@ -232,7 +232,7 @@ * Status of operation */ { -#if defined(WIN32) +#if defined(_WIN32) if( SetFilePointer(FileHandle, Position, NULL, @@ -260,7 +260,7 @@ * Status of operation */ { -#if defined(WIN32) +#if defined(_WIN32) if (!ReadFile(FileHandle, Buffer, Data->CompSize, (LPDWORD)BytesRead, NULL)) return CAB_STATUS_CANNOT_READ; #else @@ -284,7 +284,7 @@ * Status of operation */ { -#if defined(WIN32) +#if defined(_WIN32) if (!WriteFile(FileHandle, Buffer, Data->CompSize, (LPDWORD)BytesWritten, NULL)) return CAB_STATUS_CANNOT_WRITE; #else @@ -394,7 +394,7 @@ i = 0; while (Path[i] != 0) { -#if defined(WIN32) +#if defined(_WIN32) if (Path[i] == '/') newpath[i] = '\\'; else @@ -632,7 +632,7 @@ FILEHANDLE FileHandle; ULONG BytesRead; -#if defined(WIN32) +#if defined(_WIN32) FileHandle = CreateFile(ConvertPath(FileName, true), // Open this file GENERIC_READ, // Open for reading FILE_SHARE_READ, // Share for reading @@ -645,7 +645,7 @@ DPRINT(MID_TRACE, ("Cannot open cabinet reserved file.\n")); return false; } -#else /* !WIN32 */ +#else /* !_WIN32 */ FileHandle = fopen(ConvertPath(FileName, true), "rb"); if (FileHandle == NULL) { @@ -730,7 +730,7 @@ if (!OutputBuffer) return CAB_STATUS_NOMEMORY; -#if defined(WIN32) +#if defined(_WIN32) FileHandle = CreateFile(CabinetName, // Open this file GENERIC_READ, // Open for reading FILE_SHARE_READ, // Share for reading @@ -744,7 +744,7 @@ DPRINT(MID_TRACE, ("Cannot open file.\n")); return CAB_STATUS_CANNOT_OPEN; } -#else /* !WIN32 */ +#else /* !_WIN32 */ FileHandle = fopen(CabinetName, "rb"); if (FileHandle == NULL) { @@ -791,7 +791,7 @@ FolderReserved = (Size >> 16) & 0xFF; DataReserved = (Size >> 24) & 0xFF; -#if defined(WIN32) +#if defined(_WIN32) if (SetFilePointer(FileHandle, CabinetReserved, NULL, FILE_CURRENT) == INVALID_SET_FILE_POINTER) { DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", (UINT)GetLastError())); @@ -1027,7 +1027,7 @@ CFDATA CFData; ULONG Status; bool Skip; -#if defined(WIN32) +#if defined(_WIN32) FILETIME FileTime; #endif CHAR DestName[MAX_PATH]; @@ -1066,7 +1066,7 @@ strcat(DestName, FileName); /* Create destination file, fail if it already exists */ -#if defined(WIN32) +#if defined(_WIN32) DestFile = CreateFile(DestName, // Create this file GENERIC_WRITE, // Open for writing 0, // No sharing @@ -1099,7 +1099,7 @@ return CAB_STATUS_CANNOT_CREATE; } } -#else /* !WIN32 */ +#else /* !_WIN32 */ DestFile = fopen(DestName, "rb"); if (DestFile != NULL) { @@ -1121,7 +1121,7 @@ return CAB_STATUS_CANNOT_CREATE; } #endif -#if defined(WIN32) +#if defined(_WIN32) if (!DosDateTimeToFileTime(File->File.FileDate, File->File.FileTime, &FileTime)) { CloseFile(DestFile); @@ -1147,7 +1147,7 @@ OnExtract(&File->File, FileName); /* Search to start of file */ -#if defined(WIN32) +#if defined(_WIN32) Offset = SetFilePointer(FileHandle, File->DataBlock->AbsoluteOffset, NULL, @@ -1273,7 +1273,7 @@ File->DataBlock = CurrentFolderNode->DataListHead; /* Search to start of file */ -#if defined(WIN32) +#if defined(_WIN32) if( SetFilePointer(FileHandle, File->DataBlock->AbsoluteOffset, NULL, @@ -1347,7 +1347,7 @@ CFData.CompSize, CFData.UncompSize)); /* Go to next data block */ -#if defined(WIN32) +#if defined(_WIN32) if( SetFilePointer(FileHandle, CurrentDataNode->AbsoluteOffset + sizeof(CFDATA) + CurrentDataNode->Data.CompSize, @@ -1386,7 +1386,7 @@ (UINT)BytesSkipped, (UINT)Skip, (UINT)Size)); -#if defined(WIN32) +#if defined(_WIN32) if (!WriteFile(DestFile, (void*)((PUCHAR)OutputBuffer + BytesSkipped), BytesToWrite, (LPDWORD)&BytesWritten, NULL) || (BytesToWrite != BytesWritten)) @@ -1625,7 +1625,7 @@ if (!ContinueFile) { /* Try to open file */ -#if defined(WIN32) +#if defined(_WIN32) SourceFile = CreateFile( FileNode->FileName, // Open this file GENERIC_READ, // Open for reading @@ -1639,7 +1639,7 @@ DPRINT(MID_TRACE, ("File not found (%s).\n", FileNode->FileName)); return CAB_STATUS_NOFILE; } -#else /* !WIN32 */ +#else /* !_WIN32 */ SourceFile = fopen(FileNode->FileName, "rb"); if (SourceFile == NULL) { @@ -1839,7 +1839,7 @@ OnCabinetName(CurrentDiskNumber, CabinetName); /* Create file, fail if it already exists */ -#if defined(WIN32) +#if defined(_WIN32) FileHandle = CreateFile(CabinetName, // Create this file GENERIC_WRITE, // Open for writing 0, // No sharing @@ -1874,7 +1874,7 @@ return CAB_STATUS_CANNOT_CREATE; } } -#else /* !WIN32 */ +#else /* !_WIN32 */ FileHandle = fopen(CabinetName, "rb"); if (FileHandle != NULL) { @@ -2009,7 +2009,7 @@ ConvertPath(NewFileName, false); /* Try to open file */ -#if defined(WIN32) +#if defined(_WIN32) SrcFile = CreateFile( NewFileName, // Open this file GENERIC_READ, // Open for reading @@ -2024,7 +2024,7 @@ FreeMemory(NewFileName); return CAB_STATUS_CANNOT_OPEN; } -#else /* !WIN32 */ +#else /* !_WIN32 */ SrcFile = fopen(NewFileName, "rb"); if (SrcFile == NULL) { @@ -2085,7 +2085,7 @@ PSEARCH_CRITERIA Criteria; ULONG Status; -#if defined(WIN32) +#if defined(_WIN32) HANDLE hFind; WIN32_FIND_DATA FindFileData; #else @@ -2123,7 +2123,7 @@ { pszFile = Criteria->Search; -#if defined(WIN32) +#if defined(_WIN32) szFilePath[0] = 0; #else // needed for opendir() @@ -2131,7 +2131,7 @@ #endif } -#if defined(WIN32) +#if defined(_WIN32) // Windows: Use the easy FindFirstFile/FindNextFile API for getting all files and checking them against the pattern hFind = FindFirstFile(Criteria->Search, &FindFileData); @@ -2479,7 +2479,7 @@ // + 1 to skip the terminating NULL character as well. Size = -(MaxLength - Size) + 1; -#if defined(WIN32) +#if defined(_WIN32) if( SetFilePointer(FileHandle, (LONG)Size, NULL, @@ -2515,7 +2515,7 @@ (UINT)CABHeader.FileTableOffset)); /* Seek to file table */ -#if defined(WIN32) +#if defined(_WIN32) if( SetFilePointer(FileHandle, CABHeader.FileTableOffset, NULL, @@ -2603,7 +2603,7 @@ } /* Seek to data block */ -#if defined(WIN32) +#if defined(_WIN32) if( SetFilePointer(FileHandle, AbsoluteOffset, NULL, @@ -2999,7 +2999,7 @@ retryFileName = FileName; break; - case '?': + case '?': if (*FileName++ == '\0') return false; @@ -3168,7 +3168,7 @@ CABHeader.CabinetSize = DiskSize; /* Write header */ -#if defined(WIN32) +#if defined(_WIN32) if (!WriteFile(FileHandle, &CABHeader, sizeof(CFHEADER), (LPDWORD)&BytesWritten, NULL)) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); @@ -3191,7 +3191,7 @@ ReservedSize = CabinetReservedFileSize & 0xffff; ReservedSize |= (0 << 16); /* Folder reserved area size */ ReservedSize |= (0 << 24); /* Folder reserved area size */ -#if defined(WIN32) +#if defined(_WIN32) if (!WriteFile(FileHandle, &ReservedSize, sizeof(ULONG), (LPDWORD)&BytesWritten, NULL)) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); @@ -3206,7 +3206,7 @@ } #endif -#if defined(WIN32) +#if defined(_WIN32) if (!WriteFile(FileHandle, CabinetReservedFileBuffer, CabinetReservedFileSize, (LPDWORD)&BytesWritten, NULL)) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); @@ -3228,7 +3228,7 @@ /* Write name of previous cabinet */ Size = (ULONG)strlen(CabinetPrev) + 1; -#if defined(WIN32) +#if defined(_WIN32) if (!WriteFile(FileHandle, CabinetPrev, Size, (LPDWORD)&BytesWritten, NULL)) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); @@ -3247,7 +3247,7 @@ /* Write label of previous disk */ Size = (ULONG)strlen(DiskPrev) + 1; -#if defined(WIN32) +#if defined(_WIN32) if (!WriteFile(FileHandle, DiskPrev, Size, (LPDWORD)&BytesWritten, NULL)) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); @@ -3269,7 +3269,7 @@ /* Write name of next cabinet */ Size = (ULONG)strlen(CabinetNext) + 1; -#if defined(WIN32) +#if defined(_WIN32) if (!WriteFile(FileHandle, CabinetNext, Size, (LPDWORD)&BytesWritten, NULL)) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); @@ -3288,7 +3288,7 @@ /* Write label of next disk */ Size = (ULONG)strlen(DiskNext) + 1; -#if defined(WIN32) +#if defined(_WIN32) if (!WriteFile(FileHandle, DiskNext, Size, (LPDWORD)&BytesWritten, NULL)) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); @@ -3328,7 +3328,7 @@ DPRINT(MAX_TRACE, ("Writing folder entry. CompressionType (0x%X) DataBlockCount (%d) DataOffset (0x%X).\n", FolderNode->Folder.CompressionType, FolderNode->Folder.DataBlockCount, (UINT)FolderNode->Folder.DataOffset)); -#if defined(WIN32) +#if defined(_WIN32) if (!WriteFile(FileHandle, &FolderNode->Folder, sizeof(CFFOLDER), @@ -3390,7 +3390,7 @@ DPRINT(MAX_TRACE, ("Writing file entry. FileControlID (0x%X) FileOffset (0x%X) FileSize (%u) FileName (%s).\n", File->File.FileControlID, (UINT)File->File.FileOffset, (UINT)File->File.FileSize, File->FileName)); -#if defined(WIN32) +#if defined(_WIN32) if (!WriteFile(FileHandle, &File->File, sizeof(CFFILE), @@ -3406,7 +3406,7 @@ } #endif -#if defined(WIN32) +#if defined(_WIN32) if (!WriteFile(FileHandle, GetFileName(File->FileName), (DWORD)strlen(GetFileName(File->FileName)) + 1, @@ -3470,7 +3470,7 @@ return Status; } -#if defined(WIN32) +#if defined(_WIN32) if (!WriteFile(FileHandle, &DataNode->Data, sizeof(CFDATA), (LPDWORD)&BytesWritten, NULL)) { @@ -3486,7 +3486,7 @@ } #endif -#if defined(WIN32) +#if defined(_WIN32) if (!WriteFile(FileHandle, InputBuffer, DataNode->Data.CompSize, (LPDWORD)&BytesWritten, NULL)) { @@ -3595,7 +3595,7 @@ return CAB_STATUS_SUCCESS; } -#if !defined(WIN32) +#if !defined(_WIN32) void CCabinet::ConvertDateAndTime(time_t* Time, PUSHORT DosDate, @@ -3626,7 +3626,7 @@ | (timedef->tm_hour << 11); } -#endif // !WIN32 +#endif // !_WIN32 ULONG CCabinet::GetFileTimes(FILEHANDLE FileHandle, PCFFILE_NODE File) @@ -3639,7 +3639,7 @@ * Status of operation */ { -#if defined(WIN32) +#if defined(_WIN32) FILETIME FileTime; if (GetFileTime(FileHandle, NULL, NULL, &FileTime)) @@ -3679,7 +3679,7 @@ * Status of operation */ { -#if defined(WIN32) +#if defined(_WIN32) LONG Attributes; Attributes = GetFileAttributes(File->FileName); @@ -3734,7 +3734,7 @@ * Status of operation */ { -#if defined(WIN32) +#if defined(_WIN32) // 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. 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 [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/cabinet.h [iso-8859-1] Sun Jun 26 22:17:01 2011 @@ -7,7 +7,7 @@ #pragma once -#if defined(WIN32) +#if defined(_WIN32) #include <windows.h> #else #include <errno.h> @@ -25,7 +25,7 @@ #include <stdio.h> #include <string.h> -#if defined(WIN32) +#if defined(_WIN32) #define DIR_SEPARATOR_CHAR '\\' #define DIR_SEPARATOR_STRING "\\" @@ -431,7 +431,7 @@ ULONG GetAttributesOnFile(PCFFILE_NODE File); ULONG SetAttributesOnFile(char* FileName, USHORT FileAttributes); ULONG GetFileTimes(FILEHANDLE FileHandle, PCFFILE_NODE File); -#if !defined(WIN32) +#if !defined(_WIN32) void ConvertDateAndTime(time_t* Time, PUSHORT DosDate, PUSHORT DosTime); #endif #endif /* CAB_READ_ONLY */ Modified: trunk/reactos/tools/cabman/dfp.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/dfp.cxx?rev=5… ============================================================================== --- trunk/reactos/tools/cabman/dfp.cxx [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/dfp.cxx [iso-8859-1] Sun Jun 26 22:17:01 2011 @@ -18,7 +18,7 @@ #include "dfp.h" -#if defined(WIN32) +#if defined(_WIN32) #define GetSizeOfFile(handle) _GetSizeOfFile(handle) static LONG _GetSizeOfFile(FILEHANDLE handle) { @@ -126,7 +126,7 @@ char buf[MAX_PATH]; char eolbuf[2]; char* destpath; -#if defined(WIN32) +#if defined(_WIN32) ULONG BytesWritten; #endif @@ -149,21 +149,21 @@ strcpy(buf, InfFileName); /* Create .inf file, overwrite if it already exists */ -#if defined(WIN32) +#if defined(_WIN32) InfFileHandle = CreateFile(buf, // Create this file GENERIC_WRITE, // Open for writing 0, // No sharing NULL, // No security CREATE_ALWAYS, // Create or overwrite - FILE_ATTRIBUTE_NORMAL, // Normal file + FILE_ATTRIBUTE_NORMAL, // Normal file NULL); // No attribute template if (InfFileHandle == INVALID_HANDLE_VALUE) { DPRINT(MID_TRACE, ("Error creating '%u'.\n", (UINT)GetLastError())); return; } -#else /* !WIN32 */ - InfFileHandle = fopen(buf, "wb"); +#else /* !_WIN32 */ + InfFileHandle = fopen(buf, "wb"); if (InfFileHandle == NULL) { DPRINT(MID_TRACE, ("Error creating '%i'.\n", errno)); @@ -172,7 +172,7 @@ #endif } -#if defined(WIN32) +#if defined(_WIN32) if (!WriteFile(InfFileHandle, InfLine, (DWORD)strlen(InfLine), (LPDWORD)&BytesWritten, NULL)) { DPRINT(MID_TRACE, ("ERROR WRITING '%u'.\n", (UINT)GetLastError())); @@ -186,7 +186,7 @@ eolbuf[0] = 0x0d; eolbuf[1] = 0x0a; -#if defined(WIN32) +#if defined(_WIN32) if (!WriteFile(InfFileHandle, eolbuf, sizeof(eolbuf), (LPDWORD)&BytesWritten, NULL)) { DPRINT(MID_TRACE, ("ERROR WRITING '%u'.\n", (UINT)GetLastError())); @@ -215,7 +215,7 @@ return CAB_STATUS_SUCCESS; /* Create cabinet file, overwrite if it already exists */ -#if defined(WIN32) +#if defined(_WIN32) FileHandle = CreateFile(FileName, // Create this file GENERIC_READ, // Open for reading 0, // No sharing @@ -225,8 +225,8 @@ NULL); // No attribute template if (FileHandle == INVALID_HANDLE_VALUE) return CAB_STATUS_CANNOT_OPEN; -#else /* !WIN32 */ - FileHandle = fopen(FileName, "rb"); +#else /* !_WIN32 */ + FileHandle = fopen(FileName, "rb"); if (FileHandle == NULL) return CAB_STATUS_CANNOT_OPEN; #endif @@ -1223,7 +1223,7 @@ } else printf("File does not exist: %s.\n", SrcName); - + break; case CAB_STATUS_NOMEMORY: Modified: trunk/reactos/tools/cdmake/cdmake.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/cdmake.c?rev=… ============================================================================== --- trunk/reactos/tools/cdmake/cdmake.c [iso-8859-1] (original) +++ trunk/reactos/tools/cdmake/cdmake.c [iso-8859-1] Sun Jun 26 22:17:01 2011 @@ -33,7 +33,7 @@ #include <stdarg.h> #include <stdlib.h> #include <string.h> -#ifdef WIN32 +#ifdef _WIN32 # include <io.h> # include <dos.h> #else @@ -46,11 +46,11 @@ # include <sys/types.h> # include <dirent.h> # include <unistd.h> -#endif // WIN32 +#endif // _WIN32 #include <ctype.h> #include <setjmp.h> #include <time.h> -#ifndef WIN32 +#ifndef _WIN32 #ifndef MAX_PATH #define MAX_PATH 260 #endif @@ -529,9 +529,9 @@ return c; } -#if WIN32 +#if _WIN32 #define strcasecmp stricmp -#endif//WIN32 +#endif//_WIN32 /*----------------------------------------------------------------------------- This function checks to see if there's a cdname conflict. @@ -643,7 +643,7 @@ for the specified parent and returns a pointer to the new record. -----------------------------------------------------------------------------*/ -#if WIN32 +#if _WIN32 /* Win32 version */ PDIR_RECORD @@ -764,7 +764,7 @@ the specified root. It calls itself recursively to scan all subdirectories. -----------------------------------------------------------------------------*/ -#ifdef WIN32 +#ifdef _WIN32 static void make_directory_records (PDIR_RECORD d)

13 years, 6 months

[tkreuzer] 52474: [CMAKE] Patch by Samuel Serapion: Fix configure script and add support for CodeBlocks and Eclipse

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jun 26 22:05:31 2011 New Revision: 52474 URL: http://svn.reactos.org/svn/reactos?rev=52474&view=rev Log: [CMAKE] Patch by Samuel Serapion: Fix configure script and add support for CodeBlocks and Eclipse Modified: trunk/reactos/configure.cmd Modified: trunk/reactos/configure.cmd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.cmd?rev=52474&r1… ============================================================================== --- trunk/reactos/configure.cmd [iso-8859-1] (original) +++ trunk/reactos/configure.cmd [iso-8859-1] Sun Jun 26 22:05:31 2011 @@ -5,7 +5,7 @@ set USE_NMAKE=0 :: Detect presence of cmake -cmake --version 2>&1 | find "cmake version" > NUL || goto cmake_notfound + cmd /c cmake --version 2>&1 | find "cmake version" > NUL || goto cmake_notfound :: Detect build environment (MinGW, VS, WDK, ...) if defined ROS_ARCH ( @@ -35,7 +35,7 @@ exit /b ) echo Detected Visual Studio Environment %BUILD_ENVIRONMENT%-%ARCH% - if not "%1" == "VSSolution" ( + if /I not "%1" == "VSSolution" ( set USE_NMAKE=1 echo This script defaults to nmake. To use Visual Studio GUI specify "VSSolution" as a parameter. ) @@ -53,7 +53,7 @@ :: Detect NMAKE JOM if %USE_NMAKE% == 1 ( - jom /version 2>&1 | find "jom version" > NUL && set USE_NMAKE=2 + cmd /c jom /version 2>&1 | find "jom version" > NUL && set USE_NMAKE=2 ) :: Checkpoint @@ -91,11 +91,23 @@ set REACTOS_BUILD_TOOLS_DIR=%CD% if "%BUILD_ENVIRONMENT%" == "MinGW" ( - cmake -G "MinGW Makefiles" -DARCH=%ARCH% %REACTOS_SOURCE_DIR% -) else if %USE_NMAKE% == 1 ( - cmake -G "NMake Makefiles" -DARCH=%ARCH% %REACTOS_SOURCE_DIR% -) else if %USE_NMAKE% == 2 ( - cmake -G "NMake Makefiles JOM" -DARCH=%ARCH% %REACTOS_SOURCE_DIR% + if /I "%1" == "Codeblocks" ( + cmake -G "CodeBlocks - MinGW Makefiles" -DARCH=%ARCH% %REACTOS_SOURCE_DIR% + ) else if /I "%1" == "Eclipse" ( + cmake -G "Eclipse CDT4 - MinGW Makefiles" -DARCH=%ARCH% %REACTOS_SOURCE_DIR% + ) else ( + cmake -G "MinGW Makefiles" -DARCH=%ARCH% %REACTOS_SOURCE_DIR% + ) +) else if defined USE_NMAKE ( + if /I "%1" == "CodeBlocks" ( + cmake -G "CodeBlocks - NMake Makefiles" -DARCH=%ARCH% %REACTOS_SOURCE_DIR% + ) else if /I "%1" == "Eclipse" ( + cmake -G "Eclipse CDT4 - NMake Makefiles" -DARCH=%ARCH% %REACTOS_SOURCE_DIR% + ) else if %USE_NMAKE% == 2 ( + cmake -G "NMake Makefiles JOM" -DARCH=%ARCH% %REACTOS_SOURCE_DIR% + ) else ( + cmake -G "NMake Makefiles" -DARCH=%ARCH% %REACTOS_SOURCE_DIR% + ) ) else if "%BUILD_ENVIRONMENT%" == "VS8" ( if "%ARCH%" == "amd64" ( cmake -G "Visual Studio 8 2005 Win64" -DARCH=%ARCH% %REACTOS_SOURCE_DIR% @@ -124,11 +136,23 @@ ) if "%BUILD_ENVIRONMENT%" == "MinGW" ( - cmake -G "MinGW Makefiles" -DENABLE_CCACHE=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% -) else if %USE_NMAKE% == 1 ( - cmake -G "NMake Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DUSE_WDK_HEADERS=%USE_WDK_HEADERS% -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% -) else if %USE_NMAKE% == 2 ( - cmake -G "NMake Makefiles JOM" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DUSE_WDK_HEADERS=%USE_WDK_HEADERS% -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% + if /I "%1" == "CodeBlocks" ( + cmake -G "CodeBlocks - MinGW Makefiles" -DENABLE_CCACHE=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% + ) else if /I "%1" == "Eclipse" ( + cmake -G "Eclipse CDT4 - MinGW Makefiles" -DENABLE_CCACHE=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% + ) else ( + cmake -G "MinGW Makefiles" -DENABLE_CCACHE=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% + ) +) else if defined USE_NMAKE ( + if /I "%1" == "CodeBlocks" ( + cmake -G "CodeBlocks - NMake Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DUSE_WDK_HEADERS=%USE_WDK_HEADERS% -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% + ) else if /I "%1" == "Eclipse" ( + cmake -G "Eclipse CDT4 - NMake Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DUSE_WDK_HEADERS=%USE_WDK_HEADERS% -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% + ) else if %USE_NMAKE% == 2 ( + cmake -G "NMake Makefiles JOM" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DUSE_WDK_HEADERS=%USE_WDK_HEADERS% -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% + ) else ( + cmake -G "NMake Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DUSE_WDK_HEADERS=%USE_WDK_HEADERS% -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% + ) ) else if "%BUILD_ENVIRONMENT%" == "VS8" ( if "%ARCH%" == "amd64" ( cmake -G "Visual Studio 8 2005 Win64" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR%

13 years, 6 months

[tkreuzer] 52473: [CMAKE] revert r52460, r52463, r52468 on behalf of Jerome it wrongly gave name decorations to export

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jun 26 21:29:55 2011 New Revision: 52473 URL: http://svn.reactos.org/svn/reactos?rev=52473&view=rev Log: [CMAKE] revert r52460, r52463, r52468 on behalf of Jerome it wrongly gave name decorations to export Modified: trunk/reactos/base/shell/explorer/CMakeLists.txt trunk/reactos/base/shell/explorer/notifyhook/CMakeLists.txt trunk/reactos/cmake/gcc.cmake trunk/reactos/dll/cpl/inetcpl/CMakeLists.txt trunk/reactos/dll/directx/dinput/CMakeLists.txt trunk/reactos/dll/directx/dinput8/CMakeLists.txt trunk/reactos/dll/directx/dplay/CMakeLists.txt trunk/reactos/dll/directx/dplayx/CMakeLists.txt trunk/reactos/dll/directx/dsound/CMakeLists.txt trunk/reactos/dll/directx/ksuser/CMakeLists.txt trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt trunk/reactos/dll/directx/wine/d3dx9_24/CMakeLists.txt trunk/reactos/dll/directx/wine/d3dx9_25/CMakeLists.txt trunk/reactos/dll/directx/wine/d3dx9_26/CMakeLists.txt trunk/reactos/dll/directx/wine/d3dx9_27/CMakeLists.txt trunk/reactos/dll/directx/wine/d3dx9_28/CMakeLists.txt trunk/reactos/dll/directx/wine/d3dx9_29/CMakeLists.txt trunk/reactos/dll/directx/wine/d3dx9_30/CMakeLists.txt trunk/reactos/dll/directx/wine/d3dx9_31/CMakeLists.txt trunk/reactos/dll/directx/wine/d3dx9_32/CMakeLists.txt trunk/reactos/dll/directx/wine/d3dx9_33/CMakeLists.txt trunk/reactos/dll/directx/wine/d3dx9_34/CMakeLists.txt trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt trunk/reactos/dll/directx/wine/ddraw/CMakeLists.txt trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt trunk/reactos/dll/ntdll/CMakeLists.txt trunk/reactos/dll/win32/acledit/CMakeLists.txt trunk/reactos/dll/win32/aclui/CMakeLists.txt trunk/reactos/dll/win32/advapi32/CMakeLists.txt trunk/reactos/dll/win32/atl/CMakeLists.txt trunk/reactos/dll/win32/authz/CMakeLists.txt trunk/reactos/dll/win32/avicap32/CMakeLists.txt trunk/reactos/dll/win32/avifil32/CMakeLists.txt trunk/reactos/dll/win32/batt/CMakeLists.txt trunk/reactos/dll/win32/bcrypt/CMakeLists.txt trunk/reactos/dll/win32/beepmidi/CMakeLists.txt trunk/reactos/dll/win32/cabinet/CMakeLists.txt trunk/reactos/dll/win32/cards/CMakeLists.txt trunk/reactos/dll/win32/cfgmgr32/CMakeLists.txt trunk/reactos/dll/win32/clusapi/CMakeLists.txt trunk/reactos/dll/win32/comctl32/CMakeLists.txt trunk/reactos/dll/win32/comdlg32/CMakeLists.txt trunk/reactos/dll/win32/compstui/CMakeLists.txt trunk/reactos/dll/win32/credui/CMakeLists.txt trunk/reactos/dll/win32/crypt32/CMakeLists.txt trunk/reactos/dll/win32/cryptdlg/CMakeLists.txt trunk/reactos/dll/win32/cryptnet/CMakeLists.txt trunk/reactos/dll/win32/cryptui/CMakeLists.txt trunk/reactos/dll/win32/dbghelp/CMakeLists.txt trunk/reactos/dll/win32/dciman32/CMakeLists.txt trunk/reactos/dll/win32/devmgr/CMakeLists.txt trunk/reactos/dll/win32/dhcpcsvc/CMakeLists.txt trunk/reactos/dll/win32/dnsapi/CMakeLists.txt trunk/reactos/dll/win32/dwmapi/CMakeLists.txt trunk/reactos/dll/win32/faultrep/CMakeLists.txt trunk/reactos/dll/win32/fmifs/CMakeLists.txt trunk/reactos/dll/win32/fusion/CMakeLists.txt trunk/reactos/dll/win32/gdi32/CMakeLists.txt trunk/reactos/dll/win32/gdiplus/CMakeLists.txt trunk/reactos/dll/win32/getuname/CMakeLists.txt trunk/reactos/dll/win32/glu32/CMakeLists.txt trunk/reactos/dll/win32/hlink/CMakeLists.txt trunk/reactos/dll/win32/httpapi/CMakeLists.txt trunk/reactos/dll/win32/icmp/CMakeLists.txt trunk/reactos/dll/win32/imagehlp/CMakeLists.txt trunk/reactos/dll/win32/imm32/CMakeLists.txt trunk/reactos/dll/win32/inetcomm/CMakeLists.txt trunk/reactos/dll/win32/inetmib1/CMakeLists.txt trunk/reactos/dll/win32/initpki/CMakeLists.txt trunk/reactos/dll/win32/inseng/CMakeLists.txt trunk/reactos/dll/win32/iphlpapi/CMakeLists.txt trunk/reactos/dll/win32/itircl/CMakeLists.txt trunk/reactos/dll/win32/itss/CMakeLists.txt trunk/reactos/dll/win32/kernel32/CMakeLists.txt trunk/reactos/dll/win32/loadperf/CMakeLists.txt trunk/reactos/dll/win32/localspl/CMakeLists.txt trunk/reactos/dll/win32/localui/CMakeLists.txt trunk/reactos/dll/win32/lpk/CMakeLists.txt trunk/reactos/dll/win32/lsasrv/CMakeLists.txt trunk/reactos/dll/win32/lz32/CMakeLists.txt trunk/reactos/dll/win32/mapi32/CMakeLists.txt trunk/reactos/dll/win32/mlang/CMakeLists.txt trunk/reactos/dll/win32/modemui/CMakeLists.txt trunk/reactos/dll/win32/mpr/CMakeLists.txt trunk/reactos/dll/win32/mprapi/CMakeLists.txt trunk/reactos/dll/win32/msacm32/CMakeLists.txt trunk/reactos/dll/win32/mscms/CMakeLists.txt trunk/reactos/dll/win32/mscoree/CMakeLists.txt trunk/reactos/dll/win32/msctf/CMakeLists.txt trunk/reactos/dll/win32/msftedit/CMakeLists.txt trunk/reactos/dll/win32/msgina/CMakeLists.txt trunk/reactos/dll/win32/mshtml/CMakeLists.txt trunk/reactos/dll/win32/msi/CMakeLists.txt trunk/reactos/dll/win32/msimg32/CMakeLists.txt trunk/reactos/dll/win32/msimtf/CMakeLists.txt trunk/reactos/dll/win32/msisip/CMakeLists.txt trunk/reactos/dll/win32/msports/CMakeLists.txt trunk/reactos/dll/win32/mssign32/CMakeLists.txt trunk/reactos/dll/win32/mssip32/CMakeLists.txt trunk/reactos/dll/win32/mstask/CMakeLists.txt trunk/reactos/dll/win32/msvcrt/CMakeLists.txt trunk/reactos/dll/win32/msvfw32/CMakeLists.txt trunk/reactos/dll/win32/mswsock/CMakeLists.txt trunk/reactos/dll/win32/msxml3/CMakeLists.txt trunk/reactos/dll/win32/nddeapi/CMakeLists.txt trunk/reactos/dll/win32/netapi32/CMakeLists.txt trunk/reactos/dll/win32/netcfgx/CMakeLists.txt trunk/reactos/dll/win32/netshell/CMakeLists.txt trunk/reactos/dll/win32/newdev/CMakeLists.txt trunk/reactos/dll/win32/ntdsapi/CMakeLists.txt trunk/reactos/dll/win32/ntlanman/CMakeLists.txt trunk/reactos/dll/win32/ntprint/CMakeLists.txt trunk/reactos/dll/win32/odbc32/CMakeLists.txt trunk/reactos/dll/win32/odbccp32/CMakeLists.txt trunk/reactos/dll/win32/ole32/CMakeLists.txt trunk/reactos/dll/win32/oleacc/CMakeLists.txt trunk/reactos/dll/win32/oleaut32/CMakeLists.txt trunk/reactos/dll/win32/olecli32/CMakeLists.txt trunk/reactos/dll/win32/oledlg/CMakeLists.txt trunk/reactos/dll/win32/olesvr32/CMakeLists.txt trunk/reactos/dll/win32/olethk32/CMakeLists.txt trunk/reactos/dll/win32/opengl32/CMakeLists.txt trunk/reactos/dll/win32/pdh/CMakeLists.txt trunk/reactos/dll/win32/pidgen/CMakeLists.txt trunk/reactos/dll/win32/powrprof/CMakeLists.txt trunk/reactos/dll/win32/printui/CMakeLists.txt trunk/reactos/dll/win32/psapi/CMakeLists.txt trunk/reactos/dll/win32/pstorec/CMakeLists.txt trunk/reactos/dll/win32/query/CMakeLists.txt trunk/reactos/dll/win32/rasadhlp/CMakeLists.txt trunk/reactos/dll/win32/rasapi32/CMakeLists.txt trunk/reactos/dll/win32/rasdlg/CMakeLists.txt trunk/reactos/dll/win32/rasman/CMakeLists.txt trunk/reactos/dll/win32/resutils/CMakeLists.txt trunk/reactos/dll/win32/riched20/CMakeLists.txt trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt trunk/reactos/dll/win32/rsaenh/CMakeLists.txt trunk/reactos/dll/win32/samlib/CMakeLists.txt trunk/reactos/dll/win32/sccbase/CMakeLists.txt trunk/reactos/dll/win32/schannel/CMakeLists.txt trunk/reactos/dll/win32/secur32/CMakeLists.txt trunk/reactos/dll/win32/sensapi/CMakeLists.txt trunk/reactos/dll/win32/setupapi/CMakeLists.txt trunk/reactos/dll/win32/sfc/CMakeLists.txt trunk/reactos/dll/win32/sfc_os/CMakeLists.txt trunk/reactos/dll/win32/shdocvw/CMakeLists.txt trunk/reactos/dll/win32/shell32/CMakeLists.txt trunk/reactos/dll/win32/shimgvw/CMakeLists.txt trunk/reactos/dll/win32/shlwapi/CMakeLists.txt trunk/reactos/dll/win32/slbcsp/CMakeLists.txt trunk/reactos/dll/win32/smdll/CMakeLists.txt trunk/reactos/dll/win32/snmpapi/CMakeLists.txt trunk/reactos/dll/win32/spoolss/CMakeLists.txt trunk/reactos/dll/win32/srclient/CMakeLists.txt trunk/reactos/dll/win32/sxs/CMakeLists.txt trunk/reactos/dll/win32/syssetup/CMakeLists.txt trunk/reactos/dll/win32/t2embed/CMakeLists.txt trunk/reactos/dll/win32/tapi32/CMakeLists.txt trunk/reactos/dll/win32/traffic/CMakeLists.txt trunk/reactos/dll/win32/ufatx/CMakeLists.txt trunk/reactos/dll/win32/unicows/CMakeLists.txt trunk/reactos/dll/win32/updspapi/CMakeLists.txt trunk/reactos/dll/win32/url/CMakeLists.txt trunk/reactos/dll/win32/urlmon/CMakeLists.txt trunk/reactos/dll/win32/user32/CMakeLists.txt trunk/reactos/dll/win32/userenv/CMakeLists.txt trunk/reactos/dll/win32/usp10/CMakeLists.txt trunk/reactos/dll/win32/uxtheme/CMakeLists.txt trunk/reactos/dll/win32/version/CMakeLists.txt trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt trunk/reactos/dll/win32/winhttp/CMakeLists.txt trunk/reactos/dll/win32/wininet/CMakeLists.txt trunk/reactos/dll/win32/winmm/CMakeLists.txt trunk/reactos/dll/win32/winspool/CMakeLists.txt trunk/reactos/dll/win32/wintrust/CMakeLists.txt trunk/reactos/dll/win32/wlanapi/CMakeLists.txt trunk/reactos/dll/win32/wldap32/CMakeLists.txt trunk/reactos/dll/win32/ws2_32/CMakeLists.txt trunk/reactos/dll/win32/ws2help/CMakeLists.txt trunk/reactos/dll/win32/wtsapi32/CMakeLists.txt trunk/reactos/dll/win32/xinput1_3/CMakeLists.txt trunk/reactos/dll/win32/xmllite/CMakeLists.txt trunk/reactos/drivers/base/bootvid/CMakeLists.txt trunk/reactos/drivers/base/kdcom/CMakeLists.txt trunk/reactos/drivers/base/kddll/CMakeLists.txt trunk/reactos/drivers/battery/battc/CMakeLists.txt trunk/reactos/drivers/directx/dxgthk/CMakeLists.txt trunk/reactos/drivers/ksfilter/ks/CMakeLists.txt trunk/reactos/drivers/network/ndis/CMakeLists.txt trunk/reactos/drivers/storage/class/class2/CMakeLists.txt trunk/reactos/drivers/storage/ide/pciidex/CMakeLists.txt trunk/reactos/drivers/storage/scsiport/CMakeLists.txt trunk/reactos/drivers/usb/usbd/CMakeLists.txt trunk/reactos/drivers/video/font/ftfd/CMakeLists.txt trunk/reactos/drivers/video/videoprt/CMakeLists.txt trunk/reactos/drivers/wdm/audio/drm/drmk/CMakeLists.txt trunk/reactos/drivers/wmi/CMakeLists.txt trunk/reactos/hal/halx86/CMakeLists.txt trunk/reactos/ntoskrnl/CMakeLists.txt trunk/reactos/subsystems/win32/csrss/csrsrv/CMakeLists.txt trunk/reactos/subsystems/win32/win32k/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/shell/explorer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/CMakeL… Modified: trunk/reactos/base/shell/explorer/notifyhook/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/notify… Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=52473&… Modified: trunk/reactos/dll/cpl/inetcpl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/CMakeLists… Modified: trunk/reactos/dll/directx/dinput/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/CMakeLi… Modified: trunk/reactos/dll/directx/dinput8/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput8/CMakeL… Modified: trunk/reactos/dll/directx/dplay/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dplay/CMakeLis… Modified: trunk/reactos/dll/directx/dplayx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dplayx/CMakeLi… Modified: trunk/reactos/dll/directx/dsound/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/CMakeLi… Modified: trunk/reactos/dll/directx/ksuser/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksuser/CMakeLi… Modified: trunk/reactos/dll/directx/wine/d3d9/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/CMak… Modified: trunk/reactos/dll/directx/wine/d3dx9_24/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_24/… Modified: trunk/reactos/dll/directx/wine/d3dx9_25/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_25/… Modified: trunk/reactos/dll/directx/wine/d3dx9_26/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_26/… Modified: trunk/reactos/dll/directx/wine/d3dx9_27/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_27/… Modified: trunk/reactos/dll/directx/wine/d3dx9_28/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_28/… Modified: trunk/reactos/dll/directx/wine/d3dx9_29/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_29/… Modified: trunk/reactos/dll/directx/wine/d3dx9_30/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_30/… Modified: trunk/reactos/dll/directx/wine/d3dx9_31/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_31/… Modified: trunk/reactos/dll/directx/wine/d3dx9_32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_32/… Modified: trunk/reactos/dll/directx/wine/d3dx9_33/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_33/… Modified: trunk/reactos/dll/directx/wine/d3dx9_34/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_34/… Modified: trunk/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3dx9_36/… Modified: trunk/reactos/dll/directx/wine/ddraw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/CMa… Modified: trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/C… Modified: trunk/reactos/dll/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/CMakeLists.txt?r… Modified: trunk/reactos/dll/win32/acledit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/acledit/CMakeLis… Modified: trunk/reactos/dll/win32/aclui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/CMakeLists… Modified: trunk/reactos/dll/win32/advapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/CMakeLi… Modified: trunk/reactos/dll/win32/atl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/CMakeLists.t… Modified: trunk/reactos/dll/win32/authz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/authz/CMakeLists… Modified: trunk/reactos/dll/win32/avicap32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avicap32/CMakeLi… Modified: trunk/reactos/dll/win32/avifil32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/CMakeLi… Modified: trunk/reactos/dll/win32/batt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/batt/CMakeLists.… Modified: trunk/reactos/dll/win32/bcrypt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/bcrypt/CMakeList… Modified: trunk/reactos/dll/win32/beepmidi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/beepmidi/CMakeLi… Modified: trunk/reactos/dll/win32/cabinet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/CMakeLis… Modified: trunk/reactos/dll/win32/cards/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/CMakeLists… Modified: trunk/reactos/dll/win32/cfgmgr32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cfgmgr32/CMakeLi… Modified: trunk/reactos/dll/win32/clusapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/clusapi/CMakeLis… Modified: trunk/reactos/dll/win32/comctl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/CMakeLi… Modified: trunk/reactos/dll/win32/comdlg32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/CMakeLi… Modified: trunk/reactos/dll/win32/compstui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/compstui/CMakeLi… Modified: trunk/reactos/dll/win32/credui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/CMakeList… Modified: trunk/reactos/dll/win32/crypt32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/CMakeLis… Modified: trunk/reactos/dll/win32/cryptdlg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/CMakeLi… Modified: trunk/reactos/dll/win32/cryptnet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptnet/CMakeLi… Modified: trunk/reactos/dll/win32/cryptui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/CMakeLis… Modified: trunk/reactos/dll/win32/dbghelp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/CMakeLis… Modified: trunk/reactos/dll/win32/dciman32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dciman32/CMakeLi… Modified: trunk/reactos/dll/win32/devmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/CMakeList… Modified: trunk/reactos/dll/win32/dhcpcsvc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/CMakeLi… Modified: trunk/reactos/dll/win32/dnsapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/CMakeList… Modified: trunk/reactos/dll/win32/dwmapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dwmapi/CMakeList… Modified: trunk/reactos/dll/win32/faultrep/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/faultrep/CMakeLi… Modified: trunk/reactos/dll/win32/fmifs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fmifs/CMakeLists… Modified: trunk/reactos/dll/win32/fusion/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fusion/CMakeList… Modified: trunk/reactos/dll/win32/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/CMakeLists… Modified: trunk/reactos/dll/win32/gdiplus/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdiplus/CMakeLis… Modified: trunk/reactos/dll/win32/getuname/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/getuname/CMakeLi… Modified: trunk/reactos/dll/win32/glu32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/glu32/CMakeLists… Modified: trunk/reactos/dll/win32/hlink/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hlink/CMakeLists… Modified: trunk/reactos/dll/win32/httpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/httpapi/CMakeLis… Modified: trunk/reactos/dll/win32/icmp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/icmp/CMakeLists.… Modified: trunk/reactos/dll/win32/imagehlp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/CMakeLi… Modified: trunk/reactos/dll/win32/imm32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imm32/CMakeLists… Modified: trunk/reactos/dll/win32/inetcomm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetcomm/CMakeLi… Modified: trunk/reactos/dll/win32/inetmib1/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetmib1/CMakeLi… Modified: trunk/reactos/dll/win32/initpki/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/initpki/CMakeLis… Modified: trunk/reactos/dll/win32/inseng/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inseng/CMakeList… Modified: trunk/reactos/dll/win32/iphlpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/CMakeLi… Modified: trunk/reactos/dll/win32/itircl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itircl/CMakeList… Modified: trunk/reactos/dll/win32/itss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itss/CMakeLists.… Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/CMakeLi… Modified: trunk/reactos/dll/win32/loadperf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/loadperf/CMakeLi… Modified: trunk/reactos/dll/win32/localspl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localspl/CMakeLi… Modified: trunk/reactos/dll/win32/localui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/CMakeLis… Modified: trunk/reactos/dll/win32/lpk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lpk/CMakeLists.t… Modified: trunk/reactos/dll/win32/lsasrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/CMakeList… Modified: trunk/reactos/dll/win32/lz32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lz32/CMakeLists.… Modified: trunk/reactos/dll/win32/mapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/CMakeList… Modified: trunk/reactos/dll/win32/mlang/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mlang/CMakeLists… Modified: trunk/reactos/dll/win32/modemui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/modemui/CMakeLis… Modified: trunk/reactos/dll/win32/mpr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/CMakeLists.t… Modified: trunk/reactos/dll/win32/mprapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mprapi/CMakeList… Modified: trunk/reactos/dll/win32/msacm32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/CMakeLis… Modified: trunk/reactos/dll/win32/mscms/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscms/CMakeLists… Modified: trunk/reactos/dll/win32/mscoree/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mscoree/CMakeLis… Modified: trunk/reactos/dll/win32/msctf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/CMakeLists… Modified: trunk/reactos/dll/win32/msftedit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msftedit/CMakeLi… Modified: trunk/reactos/dll/win32/msgina/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/CMakeList… Modified: trunk/reactos/dll/win32/mshtml/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/CMakeList… Modified: trunk/reactos/dll/win32/msi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/CMakeLists.t… Modified: trunk/reactos/dll/win32/msimg32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msimg32/CMakeLis… Modified: trunk/reactos/dll/win32/msimtf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msimtf/CMakeList… Modified: trunk/reactos/dll/win32/msisip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msisip/CMakeList… Modified: trunk/reactos/dll/win32/msports/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/CMakeLis… Modified: trunk/reactos/dll/win32/mssign32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mssign32/CMakeLi… Modified: trunk/reactos/dll/win32/mssip32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mssip32/CMakeLis… Modified: trunk/reactos/dll/win32/mstask/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mstask/CMakeList… Modified: trunk/reactos/dll/win32/msvcrt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/CMakeList… Modified: trunk/reactos/dll/win32/msvfw32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/CMakeLis… Modified: trunk/reactos/dll/win32/mswsock/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mswsock/CMakeLis… Modified: trunk/reactos/dll/win32/msxml3/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/CMakeList… Modified: trunk/reactos/dll/win32/nddeapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/nddeapi/CMakeLis… Modified: trunk/reactos/dll/win32/netapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/CMakeLi… Modified: trunk/reactos/dll/win32/netcfgx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/CMakeLis… Modified: trunk/reactos/dll/win32/netshell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/CMakeLi… Modified: trunk/reactos/dll/win32/newdev/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/CMakeList… Modified: trunk/reactos/dll/win32/ntdsapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntdsapi/CMakeLis… Modified: trunk/reactos/dll/win32/ntlanman/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntlanman/CMakeLi… Modified: trunk/reactos/dll/win32/ntprint/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntprint/CMakeLis… Modified: trunk/reactos/dll/win32/odbc32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/odbc32/CMakeList… Modified: trunk/reactos/dll/win32/odbccp32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/odbccp32/CMakeLi… Modified: trunk/reactos/dll/win32/ole32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/CMakeLists… Modified: trunk/reactos/dll/win32/oleacc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/CMakeList… Modified: trunk/reactos/dll/win32/oleaut32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/CMakeLi… Modified: trunk/reactos/dll/win32/olecli32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olecli32/CMakeLi… Modified: trunk/reactos/dll/win32/oledlg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/CMakeList… Modified: trunk/reactos/dll/win32/olesvr32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olesvr32/CMakeLi… Modified: trunk/reactos/dll/win32/olethk32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olethk32/CMakeLi… Modified: trunk/reactos/dll/win32/opengl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/opengl32/CMakeLi… Modified: trunk/reactos/dll/win32/pdh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pdh/CMakeLists.t… Modified: trunk/reactos/dll/win32/pidgen/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pidgen/CMakeList… Modified: trunk/reactos/dll/win32/powrprof/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/powrprof/CMakeLi… Modified: trunk/reactos/dll/win32/printui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/printui/CMakeLis… Modified: trunk/reactos/dll/win32/psapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/psapi/CMakeLists… Modified: trunk/reactos/dll/win32/pstorec/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pstorec/CMakeLis… Modified: trunk/reactos/dll/win32/query/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/query/CMakeLists… Modified: trunk/reactos/dll/win32/rasadhlp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasadhlp/CMakeLi… Modified: trunk/reactos/dll/win32/rasapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasapi32/CMakeLi… Modified: trunk/reactos/dll/win32/rasdlg/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/CMakeList… Modified: trunk/reactos/dll/win32/rasman/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasman/CMakeList… Modified: trunk/reactos/dll/win32/resutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/resutils/CMakeLi… Modified: trunk/reactos/dll/win32/riched20/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/CMakeLi… Modified: trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/CMakeList… Modified: trunk/reactos/dll/win32/rsaenh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/CMakeList… Modified: trunk/reactos/dll/win32/samlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/CMakeList… Modified: trunk/reactos/dll/win32/sccbase/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sccbase/CMakeLis… Modified: trunk/reactos/dll/win32/schannel/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/schannel/CMakeLi… Modified: trunk/reactos/dll/win32/secur32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/CMakeLis… Modified: trunk/reactos/dll/win32/sensapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sensapi/CMakeLis… Modified: trunk/reactos/dll/win32/setupapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/CMakeLi… Modified: trunk/reactos/dll/win32/sfc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sfc/CMakeLists.t… Modified: trunk/reactos/dll/win32/sfc_os/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sfc_os/CMakeList… Modified: trunk/reactos/dll/win32/shdocvw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/CMakeLis… Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLis… Modified: trunk/reactos/dll/win32/shimgvw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/CMakeLis… Modified: trunk/reactos/dll/win32/shlwapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/CMakeLis… Modified: trunk/reactos/dll/win32/slbcsp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/slbcsp/CMakeList… Modified: trunk/reactos/dll/win32/smdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/smdll/CMakeLists… Modified: trunk/reactos/dll/win32/snmpapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/snmpapi/CMakeLis… Modified: trunk/reactos/dll/win32/spoolss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/spoolss/CMakeLis… Modified: trunk/reactos/dll/win32/srclient/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/srclient/CMakeLi… Modified: trunk/reactos/dll/win32/sxs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/sxs/CMakeLists.t… Modified: trunk/reactos/dll/win32/syssetup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/CMakeLi… Modified: trunk/reactos/dll/win32/t2embed/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/t2embed/CMakeLis… Modified: trunk/reactos/dll/win32/tapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapi32/CMakeList… Modified: trunk/reactos/dll/win32/traffic/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/traffic/CMakeLis… Modified: trunk/reactos/dll/win32/ufatx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ufatx/CMakeLists… Modified: trunk/reactos/dll/win32/unicows/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/unicows/CMakeLis… Modified: trunk/reactos/dll/win32/updspapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/updspapi/CMakeLi… Modified: trunk/reactos/dll/win32/url/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/url/CMakeLists.t… Modified: trunk/reactos/dll/win32/urlmon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/urlmon/CMakeList… Modified: trunk/reactos/dll/win32/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/CMakeList… Modified: trunk/reactos/dll/win32/userenv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/CMakeLis… Modified: trunk/reactos/dll/win32/usp10/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/CMakeLists… Modified: trunk/reactos/dll/win32/uxtheme/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/CMakeLis… Modified: trunk/reactos/dll/win32/version/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/version/CMakeLis… Modified: trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/CM… Modified: trunk/reactos/dll/win32/winhttp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/CMakeLis… Modified: trunk/reactos/dll/win32/wininet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/CMakeLis… Modified: trunk/reactos/dll/win32/winmm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/CMakeLists… Modified: trunk/reactos/dll/win32/winspool/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winspool/CMakeLi… Modified: trunk/reactos/dll/win32/wintrust/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/CMakeLi… Modified: trunk/reactos/dll/win32/wlanapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlanapi/CMakeLis… Modified: trunk/reactos/dll/win32/wldap32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/CMakeLis… Modified: trunk/reactos/dll/win32/ws2_32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/CMakeList… Modified: trunk/reactos/dll/win32/ws2help/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2help/CMakeLis… Modified: trunk/reactos/dll/win32/wtsapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wtsapi32/CMakeLi… Modified: trunk/reactos/dll/win32/xinput1_3/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xinput1_3/CMakeL… Modified: trunk/reactos/dll/win32/xmllite/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/xmllite/CMakeLis… Modified: trunk/reactos/drivers/base/bootvid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/CMake… Modified: trunk/reactos/drivers/base/kdcom/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/CMakeLi… Modified: trunk/reactos/drivers/base/kddll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kddll/CMakeLi… Modified: trunk/reactos/drivers/battery/battc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/battery/battc/CMak… Modified: trunk/reactos/drivers/directx/dxgthk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxgthk/CMa… Modified: trunk/reactos/drivers/ksfilter/ks/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/CMakeL… Modified: trunk/reactos/drivers/network/ndis/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/CMake… Modified: trunk/reactos/drivers/storage/class/class2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas… Modified: trunk/reactos/drivers/storage/ide/pciidex/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide… Modified: trunk/reactos/drivers/storage/scsiport/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/C… Modified: trunk/reactos/drivers/usb/usbd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbd/CMakeList… Modified: trunk/reactos/drivers/video/font/ftfd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/font/ftfd/CM… Modified: trunk/reactos/drivers/video/videoprt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/CMa… Modified: trunk/reactos/drivers/wdm/audio/drm/drmk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drm/drmk… Modified: trunk/reactos/drivers/wmi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wmi/CMakeLists.txt… Modified: trunk/reactos/hal/halx86/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/CMakeLists.txt?… Modified: trunk/reactos/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/CMakeLists.txt?re… Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… Modified: trunk/reactos/subsystems/win32/win32k/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/CM…

13 years, 6 months

[tkreuzer] 52472: [FREELDR] Fix amd64 build of setupldr as well.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jun 26 18:06:19 2011 New Revision: 52472 URL: http://svn.reactos.org/svn/reactos?rev=52472&view=rev Log: [FREELDR] Fix amd64 build of setupldr as well. Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/entry.S Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/entry.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/entry.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/entry.S [iso-8859-1] Sun Jun 26 18:06:19 2011 @@ -28,6 +28,10 @@ Int386: PUBLIC PxeCallApi PxeCallApi: +PUBLIC __lgdt +__lgdt: +PUBLIC __ltr +__ltr: nop

13 years, 6 months

[ekohl] 52471: [REGEDIT] Add ability to parse and display REG_RESOURCE_LIST values.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jun 26 16:19:33 2011 New Revision: 52471 URL: http://svn.reactos.org/svn/reactos?rev=52471&view=rev Log: [REGEDIT] Add ability to parse and display REG_RESOURCE_LIST values. Modified: trunk/reactos/base/applications/regedit/edit.c trunk/reactos/base/applications/regedit/lang/bg-BG.rc trunk/reactos/base/applications/regedit/lang/cs-CZ.rc trunk/reactos/base/applications/regedit/lang/de-DE.rc trunk/reactos/base/applications/regedit/lang/el-GR.rc trunk/reactos/base/applications/regedit/lang/en-US.rc trunk/reactos/base/applications/regedit/lang/es-ES.rc trunk/reactos/base/applications/regedit/lang/fr-FR.rc trunk/reactos/base/applications/regedit/lang/hu-HU.rc trunk/reactos/base/applications/regedit/lang/id-ID.rc trunk/reactos/base/applications/regedit/lang/it-IT.rc trunk/reactos/base/applications/regedit/lang/ja-JP.rc trunk/reactos/base/applications/regedit/lang/ko-KR.rc trunk/reactos/base/applications/regedit/lang/nl-NL.rc trunk/reactos/base/applications/regedit/lang/no-NO.rc trunk/reactos/base/applications/regedit/lang/pl-PL.rc trunk/reactos/base/applications/regedit/lang/pt-BR.rc trunk/reactos/base/applications/regedit/lang/pt-PT.rc trunk/reactos/base/applications/regedit/lang/ru-RU.rc trunk/reactos/base/applications/regedit/lang/sk-SK.rc trunk/reactos/base/applications/regedit/lang/sl-SI.rc trunk/reactos/base/applications/regedit/lang/sv-SE.rc trunk/reactos/base/applications/regedit/lang/th-TH.rc trunk/reactos/base/applications/regedit/lang/uk-UA.rc trunk/reactos/base/applications/regedit/lang/zh-CN.rc trunk/reactos/base/applications/regedit/regedit.h trunk/reactos/base/applications/regedit/resource.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/regedit/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/regedit.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/regedit/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/…

13 years, 6 months

[ekohl] 52470: [NDK] Add missing interrupt resource descriptor flags.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jun 26 11:29:17 2011 New Revision: 52470 URL: http://svn.reactos.org/svn/reactos?rev=52470&view=rev Log: [NDK] Add missing interrupt resource descriptor flags. Modified: trunk/reactos/include/ndk/cmtypes.h Modified: trunk/reactos/include/ndk/cmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/cmtypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/cmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/cmtypes.h [iso-8859-1] Sun Jun 26 11:29:17 2011 @@ -109,6 +109,12 @@ #define CM_RESOURCE_DMA_TYPE_A 0x0010 #define CM_RESOURCE_DMA_TYPE_B 0x0020 #define CM_RESOURCE_DMA_TYPE_F 0x0040 + +// +// Interrupt Resource Descriptor Flags +// +#define CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE 0x0000 +#define CM_RESOURCE_INTERRUPT_LATCHED 0x0001 // // NtInitializeRegistry Flags

13 years, 6 months

[tkreuzer] 52469: [FREELDR] Fix amd64 build. It doesn't work yet

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jun 26 10:49:22 2011 New Revision: 52469 URL: http://svn.reactos.org/svn/reactos?rev=52469&view=rev Log: [FREELDR] Fix amd64 build. It doesn't work yet Added: trunk/reactos/boot/freeldr/freeldr/arch/amd64/entry.S (with props) Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h trunk/reactos/boot/freeldr/freeldr/include/disk.h trunk/reactos/boot/freeldr/freeldr/include/freeldr.h Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Sun Jun 26 10:49:22 2011 @@ -1,5 +1,5 @@ -if(ARCH MATCHES i386) +if(ARCH MATCHES i386 OR ARCH MATCHES amd64) CreateBootSectorTarget2(frldr16 ${CMAKE_CURRENT_SOURCE_DIR}/arch/realmode/i386.S ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin @@ -120,6 +120,7 @@ endif() elseif(ARCH MATCHES amd64) list(APPEND FREELDR_COMMON_SOURCE + arch/amd64/entry.S arch/amd64/loader.c arch/i386/hardware.c arch/i386/hwacpi.c @@ -137,15 +138,6 @@ arch/i386/pcvideo.c windows/amd64/ntsetup.c windows/amd64/wlmemory.c) - if(NOT MSVC) - list(APPEND FREELDR_COMMON_SOURCE - arch/i386/drvmap.S - arch/i386/i386trap.S - arch/amd64/mb.S) - else() - list(APPEND FREELDR_COMMON_SOURCE - arch/amd64/stubs.S) - endif() else() #TBD endif() Added: trunk/reactos/boot/freeldr/freeldr/arch/amd64/entry.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/entry.S (added) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/entry.S [iso-8859-1] Sun Jun 26 10:49:22 2011 @@ -1,0 +1,35 @@ + + +#include <asm.inc> +#include <arch/pc/x86common.h> + +.code64 + +PUBLIC RealEntryPoint +RealEntryPoint: + +PUBLIC FrldrBootDrive +FrldrBootDrive: + +PUBLIC FrldrBootPartition +FrldrBootPartition: + +PUBLIC PageDirectoryEnd +PageDirectoryEnd: +PUBLIC PageDirectoryStart +PageDirectoryStart: +PUBLIC PnpBiosGetDeviceNode +PnpBiosGetDeviceNode: +PUBLIC PnpBiosGetDeviceNodeCount +PnpBiosGetDeviceNodeCount: +PUBLIC PnpBiosSupported +PnpBiosSupported: +PUBLIC Int386 +Int386: +PUBLIC PxeCallApi +PxeCallApi: + +nop + + +END Propchange: trunk/reactos/boot/freeldr/freeldr/arch/amd64/entry.S ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h [iso-8859-1] Sun Jun 26 10:49:22 2011 @@ -31,9 +31,6 @@ /* Long mode selectors */ #define LMODE_CS 0x10 #define LMODE_DS 0x18 -#define RMODE_CS 0x20 /* RMode code selector, base 0 limit 64k */ -#define RMODE_DS 0x28 /* RMode data selector, base 0 limit 64k */ -#define CMODE_CS 0x30 #define VA_MASK 0x0000FFFFFFFFFFFFUL Modified: trunk/reactos/boot/freeldr/freeldr/include/disk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/disk.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/disk.h [iso-8859-1] Sun Jun 26 10:49:22 2011 @@ -123,10 +123,8 @@ BOOLEAN DiskReadLogicalSectors(ULONG DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer); // Implemented in i386disk.c BOOLEAN DiskIsDriveRemovable(ULONG DriveNumber); VOID DiskStopFloppyMotor(VOID); // Implemented in i386disk.c -#ifndef _M_AMD64 extern ULONG FrldrBootDrive; extern ULONG FrldrBootPartition; -#endif BOOLEAN DiskGetBootPath(char *BootPath, unsigned Size); Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] Sun Jun 26 10:49:22 2011 @@ -93,25 +93,22 @@ #include <ui/tui.h> /* arch specific includes */ +#if defined(_M_IX86) || defined(_M_AMD64) +#include <arch/pc/hardware.h> +#include <arch/pc/machpc.h> +#include <arch/pc/x86common.h> +#include <arch/pc/pcbios.h> +#include <arch/pc/pxe.h> +#endif #if defined(_M_IX86) #include <arch/i386/custom.h> #include <arch/i386/drivemap.h> #include <arch/i386/i386.h> #include <arch/i386/machxbox.h> #include <arch/i386/miscboot.h> -#include <arch/pc/hardware.h> -#include <arch/pc/machpc.h> -#include <arch/pc/x86common.h> -#include <arch/pc/pcbios.h> -#include <arch/pc/pxe.h> #include <internal/i386/intrin_i.h> #elif defined(_M_AMD64) #include <arch/amd64/amd64.h> -#include <arch/pc/hardware.h> -#include <arch/pc/machpc.h> -#include <arch/pc/x86common.h> -#include <arch/pc/pcbios.h> -#include <arch/pc/pxe.h> #include <internal/amd64/intrin_i.h> #elif defined(_M_PPC) #include <arch/powerpc/hardware.h>

13 years, 6 months

[jgardou] 52468: [CMAKE] - add back add_importlib_target for def files, w32kdll relies on it.

by jgardou＠svn.reactos.org

Author: jgardou Date: Sun Jun 26 10:21:57 2011 New Revision: 52468 URL: http://svn.reactos.org/svn/reactos?rev=52468&view=rev Log: [CMAKE] - add back add_importlib_target for def files, w32kdll relies on it. Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=52468&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sun Jun 26 10:21:57 2011 @@ -221,17 +221,17 @@ macro(add_importlib_target _exports_file) - # get_filename_component(_name ${_exports_file} NAME_WE) - # get_filename_component(_extension ${_exports_file} EXT) - # get_target_property(_suffix ${_name} SUFFIX) - # if(${_suffix} STREQUAL "_suffix-NOTFOUND") - # get_target_property(_type ${_name} TYPE) - # if(${_type} MATCHES EXECUTABLE) - # set(_suffix ".exe") - # else() - # set(_suffix ".dll") - # endif() - # endif() + get_filename_component(_name ${_exports_file} NAME_WE) + get_filename_component(_extension ${_exports_file} EXT) + get_target_property(_suffix ${_name} SUFFIX) + if(${_suffix} STREQUAL "_suffix-NOTFOUND") + get_target_property(_type ${_name} TYPE) + if(${_type} MATCHES EXECUTABLE) + set(_suffix ".exe") + else() + set(_suffix ".dll") + endif() + endif() # if (${_extension} STREQUAL ".spec") @@ -250,28 +250,25 @@ # DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}) # elseif(${_extension} STREQUAL ".def") - # message("Use of def files for import libs is deprecated: ${_exports_file}") - # add_custom_command( - # OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a - # COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} --kill-at --output-lib=${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a - # DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}) - # add_custom_command( - # OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_delayed.a - # COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} --kill-at --output-delaylib ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_delayed.a - # DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}) - # else() - # message(FATAL_ERROR "Unsupported exports file extension: ${_extension}") - # endif() - - # # Normal importlib target - # add_custom_target( - # lib${_name} - # DEPENDS ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a) - # # Delayed importlib target - # add_custom_target( - # lib${_name}_delayed - # DEPENDS ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_delayed.a) - + if(${_extension} STREQUAL ".def") + message("Use of def files for import libs is deprecated: ${_exports_file}") + add_custom_command( + OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a + COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} --kill-at --output-lib=${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}) + add_custom_command( + OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_delayed.a + COMMAND ${MINGW_PREFIX}dlltool --def ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file} --kill-at --output-delaylib ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_delayed.a + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_exports_file}) + # Normal importlib target + add_custom_target( + lib${_name} + DEPENDS ${CMAKE_BINARY_DIR}/importlibs/lib${_name}.a) + # Delayed importlib target + add_custom_target( + lib${_name}_delayed + DEPENDS ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_delayed.a) + endif() endmacro() macro(spec2def _dllname _spec_file)

13 years, 6 months

[rharabien] 52467: [MSTSC][USETUP] - Fix MSVC warnings - Remove duplicated code in usetup progress bar

by rharabien＠svn.reactos.org

Author: rharabien Date: Sun Jun 26 10:08:31 2011 New Revision: 52467 URL: http://svn.reactos.org/svn/reactos?rev=52467&view=rev Log: [MSTSC][USETUP] - Fix MSVC warnings - Remove duplicated code in usetup progress bar Modified: trunk/reactos/base/applications/mstsc/connectdialog.c trunk/reactos/base/setup/usetup/fslist.c trunk/reactos/base/setup/usetup/inffile.c trunk/reactos/base/setup/usetup/partlist.c trunk/reactos/base/setup/usetup/progress.c trunk/reactos/base/setup/usetup/progress.h trunk/reactos/base/setup/usetup/registry.c Modified: trunk/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/co… ============================================================================== --- trunk/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/connectdialog.c [iso-8859-1] Sun Jun 26 10:08:31 2011 @@ -1136,10 +1136,10 @@ SRCCOPY); SelectObject(hdcMem, hBmpOld); - txtRc.left = bmpRc.right * 0.25; + txtRc.left = bmpRc.right / 4; txtRc.top = 10; - txtRc.right = bmpRc.right * 0.75; - txtRc.bottom = pInfo->headerbitmap.bmHeight * 0.5; + txtRc.right = bmpRc.right * 3 / 4; + txtRc.bottom = pInfo->headerbitmap.bmHeight / 2; ZeroMemory(&lf, sizeof(LOGFONTW)); @@ -1172,10 +1172,10 @@ } } - txtRc.left = bmpRc.right * 0.25; + txtRc.left = bmpRc.right / 4; txtRc.top = txtRc.bottom - 5; - txtRc.right = bmpRc.right * 0.75; - txtRc.bottom = pInfo->headerbitmap.bmHeight * 0.9; + txtRc.right = bmpRc.right * 3 / 4; + txtRc.bottom = pInfo->headerbitmap.bmHeight * 9 / 10; if (LoadStringW(hInst, IDS_HEADERTEXT2, Modified: trunk/reactos/base/setup/usetup/fslist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/fslist.c… ============================================================================== --- trunk/reactos/base/setup/usetup/fslist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/fslist.c [iso-8859-1] Sun Jun 26 10:08:31 2011 @@ -172,11 +172,11 @@ if (ListEntry == &List->Selected->ListEntry) CONSOLE_SetInvertedTextXY(List->Left, - List->Top + Index, + List->Top + (SHORT)Index, Buffer); else CONSOLE_SetTextXY(List->Left, - List->Top + Index, + List->Top + (SHORT)Index, Buffer); Index++; ListEntry = ListEntry->Flink; Modified: trunk/reactos/base/setup/usetup/inffile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/inffile.… ============================================================================== --- trunk/reactos/base/setup/usetup/inffile.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/inffile.c [iso-8859-1] Sun Jun 26 10:08:31 2011 @@ -75,7 +75,7 @@ Status = InfOpenFile( &hInf, &FileNameU, - LocaleId, + LANGIDFROMLCID(LocaleId), &ErrorLineUL); *ErrorLine = (UINT)ErrorLineUL; if (!NT_SUCCESS(Status)) @@ -197,7 +197,7 @@ &hInf, FileBuffer, FileSize, - LocaleId, + LANGIDFROMLCID(LocaleId), &ErrorLineUL); *ErrorLine = (UINT)ErrorLineUL; if (!NT_SUCCESS(Status)) Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Sun Jun 26 10:08:31 2011 @@ -1612,7 +1612,7 @@ PPARTENTRY PartEntry; PLIST_ENTRY Entry1; PLIST_ENTRY Entry2; - ULONG i; + UCHAR i; /* Check for empty disks */ if (IsListEmpty (&List->DiskListHead)) @@ -1965,7 +1965,7 @@ PartEntry->PartInfo[0].StartingOffset.QuadPart = PartEntry->UnpartitionedOffset + DiskEntry->TrackSize; PartEntry->PartInfo[0].HiddenSectors = - PartEntry->PartInfo[0].StartingOffset.QuadPart / DiskEntry->BytesPerSector; + (ULONG)(PartEntry->PartInfo[0].StartingOffset.QuadPart / DiskEntry->BytesPerSector); PartEntry->PartInfo[0].PartitionLength.QuadPart = PartEntry->UnpartitionedLength - DiskEntry->TrackSize; PartEntry->PartInfo[0].PartitionType = PARTITION_ENTRY_UNUSED; @@ -1996,7 +1996,7 @@ PrevPartEntry->PartInfo[1].StartingOffset.QuadPart = PartEntry->PartInfo[0].StartingOffset.QuadPart - DiskEntry->TrackSize; PrevPartEntry->PartInfo[1].HiddenSectors = - PrevPartEntry->PartInfo[1].StartingOffset.QuadPart / DiskEntry->BytesPerSector; + (ULONG)(PrevPartEntry->PartInfo[1].StartingOffset.QuadPart / DiskEntry->BytesPerSector); if (DiskEntry->PartListHead.Flink == &PrevPartEntry->ListEntry) { @@ -2024,7 +2024,7 @@ PrevPartEntry->PartInfo[1].StartingOffset.QuadPart = PartEntry->PartInfo[0].StartingOffset.QuadPart - DiskEntry->TrackSize; PrevPartEntry->PartInfo[1].HiddenSectors = - PrevPartEntry->PartInfo[1].StartingOffset.QuadPart / DiskEntry->BytesPerSector; + (ULONG)(PrevPartEntry->PartInfo[1].StartingOffset.QuadPart / DiskEntry->BytesPerSector); if (DiskEntry->PartListHead.Flink == &PrevPartEntry->ListEntry) { @@ -2081,7 +2081,7 @@ NewPartEntry->PartInfo[0].StartingOffset.QuadPart = PartEntry->UnpartitionedOffset + DiskEntry->TrackSize; NewPartEntry->PartInfo[0].HiddenSectors = - NewPartEntry->PartInfo[0].StartingOffset.QuadPart / DiskEntry->BytesPerSector; + (ULONG)(NewPartEntry->PartInfo[0].StartingOffset.QuadPart / DiskEntry->BytesPerSector); NewPartEntry->PartInfo[0].PartitionLength.QuadPart = PartitionSize - DiskEntry->TrackSize; NewPartEntry->PartInfo[0].PartitionType = PARTITION_ENTRY_UNUSED; @@ -2112,7 +2112,7 @@ PrevPartEntry->PartInfo[1].StartingOffset.QuadPart = NewPartEntry->PartInfo[0].StartingOffset.QuadPart - DiskEntry->TrackSize; PrevPartEntry->PartInfo[1].HiddenSectors = - PrevPartEntry->PartInfo[1].StartingOffset.QuadPart / DiskEntry->BytesPerSector; + (ULONG)(PrevPartEntry->PartInfo[1].StartingOffset.QuadPart / DiskEntry->BytesPerSector); if (DiskEntry->PartListHead.Flink == &PrevPartEntry->ListEntry) { @@ -2140,7 +2140,7 @@ PrevPartEntry->PartInfo[1].StartingOffset.QuadPart = NewPartEntry->PartInfo[0].StartingOffset.QuadPart - DiskEntry->TrackSize; PrevPartEntry->PartInfo[1].HiddenSectors = - PrevPartEntry->PartInfo[1].StartingOffset.QuadPart / DiskEntry->BytesPerSector; + (ULONG)(PrevPartEntry->PartInfo[1].StartingOffset.QuadPart / DiskEntry->BytesPerSector); if (DiskEntry->PartListHead.Flink == &PrevPartEntry->ListEntry) { Modified: trunk/reactos/base/setup/usetup/progress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/progress… ============================================================================== --- trunk/reactos/base/setup/usetup/progress.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/progress.c [iso-8859-1] Sun Jun 26 10:08:31 2011 @@ -290,17 +290,24 @@ VOID ProgressNextStep(PPROGRESSBAR Bar) { + ProgressSetStep(Bar, Bar->CurrentStep + 1); +} + + +VOID +ProgressSetStep (PPROGRESSBAR Bar, + ULONG Step) +{ CHAR TextBuffer[8]; COORD coPos; DWORD Written; ULONG NewPercent; ULONG NewPos; - if ((Bar->StepCount == 0) || - (Bar->CurrentStep == Bar->StepCount)) + if (Step > Bar->StepCount) return; - Bar->CurrentStep++; + Bar->CurrentStep = Step; /* Calculate new percentage */ NewPercent = (ULONG)(((100.0 * (float)Bar->CurrentStep) / (float)Bar->StepCount) + 0.5); @@ -361,79 +368,4 @@ } } - -VOID -ProgressSetStep (PPROGRESSBAR Bar, - ULONG Step) -{ - CHAR TextBuffer[8]; - COORD coPos; - DWORD Written; - ULONG NewPercent; - ULONG NewPos; - - if (Step > Bar->StepCount) - return; - - Bar->CurrentStep = Step; - - /* Calculate new percentage */ - NewPercent = (ULONG)(((100.0 * (float)Bar->CurrentStep) / (float)Bar->StepCount) + 0.5); - - /* Redraw precentage if changed */ - if (Bar->Percent != NewPercent) - { - Bar->Percent = NewPercent; - - sprintf(TextBuffer, "%-3lu%%", Bar->Percent); - - coPos.X = Bar->Left + (Bar->Width - 2) / 2; - coPos.Y = Bar->Top; - WriteConsoleOutputCharacterA(StdOutput, - TextBuffer, - 4, - coPos, - &Written); - } - - /* Calculate bar position */ - NewPos = (ULONG)((((float)(Bar->Width - 2) * 2.0 * (float)Bar->CurrentStep) / (float)Bar->StepCount) + 0.5); - - /* Redraw bar if changed */ - if (Bar->Pos != NewPos) - { - Bar->Pos = NewPos; - - for (coPos.Y = Bar->Top + 2; coPos.Y <= Bar->Bottom - 1; coPos.Y++) - { - coPos.X = Bar->Left + 1; - FillConsoleOutputCharacterA(StdOutput, - 0xDB, - Bar->Pos / 2, - coPos, - &Written); - coPos.X += Bar->Pos/2; - - if (NewPos & 1) - { - FillConsoleOutputCharacterA(StdOutput, - 0xDD, - 1, - coPos, - &Written); - coPos.X++; - } - - if (coPos.X <= Bar->Right - 1) - { - FillConsoleOutputCharacterA(StdOutput, - ' ', - Bar->Right - coPos.X, - coPos, - &Written); - } - } - } -} - /* EOF */ Modified: trunk/reactos/base/setup/usetup/progress.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/progress… ============================================================================== --- trunk/reactos/base/setup/usetup/progress.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/progress.h [iso-8859-1] Sun Jun 26 10:08:31 2011 @@ -38,7 +38,7 @@ SHORT Width; ULONG Percent; - ULONG Pos; + SHORT Pos; ULONG StepCount; ULONG CurrentStep; Modified: trunk/reactos/base/setup/usetup/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/registry… ============================================================================== --- trunk/reactos/base/setup/usetup/registry.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/registry.c [iso-8859-1] Sun Jun 26 10:08:31 2011 @@ -398,8 +398,7 @@ UNICODE_STRING LocalKeyName; ULONG Disposition; NTSTATUS Status; - ULONG FullNameLength; - ULONG Length; + USHORT FullNameLength; PWCHAR Ptr; HANDLE LocalKeyHandle; @@ -421,7 +420,7 @@ RtlCreateUnicodeString (&LocalKeyName, ObjectAttributes->ObjectName->Buffer); LocalObjectAttributes.ObjectName = &LocalKeyName; - FullNameLength = LocalKeyName.Length / sizeof(WCHAR); + FullNameLength = LocalKeyName.Length; /* Remove the last part of the key name and try to create the key again. */ while (Status == STATUS_OBJECT_NAME_NOT_FOUND) @@ -452,10 +451,9 @@ } /* Add removed parts of the key name and create them too. */ - Length = wcslen (LocalKeyName.Buffer); while (TRUE) { - if (Length == FullNameLength) + if (LocalKeyName.Length == FullNameLength) { Status = STATUS_SUCCESS; *KeyHandle = LocalKeyHandle; @@ -463,9 +461,8 @@ } NtClose (LocalKeyHandle); - LocalKeyName.Buffer[Length] = L'\\'; - Length = wcslen (LocalKeyName.Buffer); - LocalKeyName.Length = Length * sizeof(WCHAR); + LocalKeyName.Buffer[LocalKeyName.Length / sizeof(WCHAR)] = L'\\'; + LocalKeyName.Length = wcslen (LocalKeyName.Buffer) * sizeof(WCHAR); Status = NtCreateKey (&LocalKeyHandle, KEY_ALL_ACCESS,

13 years, 6 months

[tkreuzer] 52466: [PSDK] Samuel Serapion: Fix duplicate definitions on amd64 build

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jun 26 09:37:59 2011 New Revision: 52466 URL: http://svn.reactos.org/svn/reactos?rev=52466&view=rev Log: [PSDK] Samuel Serapion: Fix duplicate definitions on amd64 build Modified: trunk/reactos/include/psdk/basetsd.h Modified: trunk/reactos/include/psdk/basetsd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/basetsd.h?rev… ============================================================================== --- trunk/reactos/include/psdk/basetsd.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/basetsd.h [iso-8859-1] Sun Jun 26 09:37:59 2011 @@ -142,9 +142,6 @@ typedef unsigned __int64 UINT_PTR, *PUINT_PTR; typedef __int64 LONG_PTR, *PLONG_PTR; typedef unsigned __int64 ULONG_PTR, *PULONG_PTR; -typedef unsigned __int64 HANDLE_PTR; -typedef unsigned int UHALF_PTR, *PUHALF_PTR; -typedef int HALF_PTR, *PHALF_PTR; #if !defined(__midl) && !defined(__WIDL__) static inline unsigned long HandleToUlong(const void* h )

13 years, 6 months

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 June 2011