Ros-diffs April 2013

ros-diffs@reactos.org

14 participants
265 discussions

[spetreolle] 58766: Addendum to r58764: Remove MAX_PATH compatible definition and limits.h inclusion.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sun Apr 14 20:54:33 2013 New Revision: 58766 URL: http://svn.reactos.org/svn/reactos?rev=58766&view=rev Log: Addendum to r58764: Remove MAX_PATH compatible definition and limits.h inclusion. Modified: trunk/reactos/tools/log2lines/compat.h Modified: trunk/reactos/tools/log2lines/compat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/log2lines/compat.h?r… ============================================================================== --- trunk/reactos/tools/log2lines/compat.h [iso-8859-1] (original) +++ trunk/reactos/tools/log2lines/compat.h [iso-8859-1] Sun Apr 14 20:54:33 2013 @@ -16,10 +16,8 @@ #define DIR_FMT "dir /a:-d /s /b %s > %s" #else /* not defined (_WIN32) */ -#include <limits.h> #include <sys/stat.h> -#define MAX_PATH PATH_MAX #define POPEN popen #define PCLOSE pclose #define MKDIR(d) mkdir(d, S_IRWXU|S_IRWXG|S_IROTH|S_IXOTH)

11 years, 5 months

[tkreuzer] 58765: [LOG2LINES] Try to fix build

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Apr 14 20:14:45 2013 New Revision: 58765 URL: http://svn.reactos.org/svn/reactos?rev=58765&view=rev Log: [LOG2LINES] Try to fix build Modified: trunk/reactos/tools/log2lines/log2lines.h Modified: trunk/reactos/tools/log2lines/log2lines.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/log2lines/log2lines.… ============================================================================== --- trunk/reactos/tools/log2lines/log2lines.h [iso-8859-1] (original) +++ trunk/reactos/tools/log2lines/log2lines.h [iso-8859-1] Sun Apr 14 20:14:45 2013 @@ -1,6 +1,7 @@ #pragma once #include <stdio.h> +#include <limits.h> #include <rsym.h> #include "config.h" @@ -11,7 +12,7 @@ struct lineinfo_struct { - int valid; + int valid; char file1[LINESIZE]; char func1[NAMESIZE]; int nr1;

11 years, 5 months

[tkreuzer] 58764: [LOG2LINES] Use PATH_MAX instead of MAX_PATH. Patch by tower.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Apr 14 19:49:34 2013 New Revision: 58764 URL: http://svn.reactos.org/svn/reactos?rev=58764&view=rev Log: [LOG2LINES] Use PATH_MAX instead of MAX_PATH. Patch by tower. Modified: trunk/reactos/tools/log2lines/cache.c trunk/reactos/tools/log2lines/options.c trunk/reactos/tools/log2lines/revision.c trunk/reactos/tools/log2lines/util.c Modified: trunk/reactos/tools/log2lines/cache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/log2lines/cache.c?re… ============================================================================== --- trunk/reactos/tools/log2lines/cache.c [iso-8859-1] (original) +++ trunk/reactos/tools/log2lines/cache.c [iso-8859-1] Sun Apr 14 19:49:34 2013 @@ -26,7 +26,7 @@ { char Line[LINESIZE]; int res = 0; - char iso_tmp[MAX_PATH]; + char iso_tmp[PATH_MAX]; int iso_copied = 0; FILE *fiso; @@ -78,9 +78,9 @@ check_directory(int force) { char Line[LINESIZE]; - char freeldr_path[MAX_PATH]; - char iso_path[MAX_PATH]; - char compressed_7z_path[MAX_PATH]; + char freeldr_path[PATH_MAX]; + char iso_path[PATH_MAX]; + char compressed_7z_path[PATH_MAX]; char *check_iso; char *check_dir; @@ -141,8 +141,8 @@ return 1; } } - cache_name = malloc(MAX_PATH); - tmp_name = malloc(MAX_PATH); + cache_name = malloc(PATH_MAX); + tmp_name = malloc(PATH_MAX); strcpy(cache_name, opt_dir); if (cleanable(opt_dir)) strcat(cache_name, ALT_PATH_STR CACHEFILE); Modified: trunk/reactos/tools/log2lines/options.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/log2lines/options.c?… ============================================================================== --- trunk/reactos/tools/log2lines/options.c [iso-8859-1] (original) +++ trunk/reactos/tools/log2lines/options.c [iso-8859-1] Sun Apr 14 19:49:34 2013 @@ -39,10 +39,10 @@ int opt_redo = 0; // -U char *opt_Revision = NULL; // -R int opt_Revision_check = 0; // -R check -char opt_dir[MAX_PATH]; // -d <opt_dir> -char opt_logFile[MAX_PATH]; // -l|L <opt_logFile> +char opt_dir[PATH_MAX]; // -d <opt_dir> +char opt_logFile[PATH_MAX]; // -l|L <opt_logFile> char *opt_mod = NULL; // -mod for opt_logFile -char opt_7z[MAX_PATH]; // -z <opt_7z> +char opt_7z[PATH_MAX]; // -z <opt_7z> char opt_scanned[LINESIZE]; // all scanned options char opt_SourcesPath[LINESIZE]; //sources path Modified: trunk/reactos/tools/log2lines/revision.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/log2lines/revision.c… ============================================================================== --- trunk/reactos/tools/log2lines/revision.c [iso-8859-1] (original) +++ trunk/reactos/tools/log2lines/revision.c [iso-8859-1] Sun Apr 14 19:49:34 2013 @@ -154,8 +154,8 @@ regscan(FILE *outFile) { int res = 0; - char logname[MAX_PATH]; - char inxname[MAX_PATH]; + char logname[PATH_MAX]; + char inxname[PATH_MAX]; char line[LINESIZE + 1]; char line2[LINESIZE + 1]; FILE *flog = NULL; @@ -189,8 +189,8 @@ if (!res) { char flag[2]; - char path[MAX_PATH]; - char path2[MAX_PATH]; + char path[PATH_MAX]; + char path2[PATH_MAX]; int wflag = 0; clilog(outFile, "Regression candidates:\n"); while (( pos = findRev(finx, &r) )) @@ -257,8 +257,8 @@ updateSvnlog(void) { int res = 0; - char logname[MAX_PATH]; - char inxname[MAX_PATH]; + char logname[PATH_MAX]; + char inxname[PATH_MAX]; char line[LINESIZE + 1]; FILE *flog = NULL; FILE *finx = NULL; Modified: trunk/reactos/tools/log2lines/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/log2lines/util.c?rev… ============================================================================== --- trunk/reactos/tools/log2lines/util.c [iso-8859-1] (original) +++ trunk/reactos/tools/log2lines/util.c [iso-8859-1] Sun Apr 14 19:49:34 2013 @@ -95,7 +95,7 @@ rfopen(char *path, char *mode) { FILE *f = NULL; - char tmppath[MAX_PATH]; // Don't modify const strings + char tmppath[PATH_MAX]; // Don't modify const strings strcpy(tmppath, path); f = fopen(tmppath, mode);

11 years, 5 months

[tkreuzer] 58763: [RTL/MKHIVE] Revert r58762 and apply a better fix.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Apr 14 19:16:20 2013 New Revision: 58763 URL: http://svn.reactos.org/svn/reactos?rev=58763&view=rev Log: [RTL/MKHIVE] Revert r58762 and apply a better fix. Modified: trunk/reactos/lib/rtl/bitmap.c trunk/reactos/tools/mkhive/mkhive.h Modified: trunk/reactos/lib/rtl/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/bitmap.c?rev=58763… ============================================================================== --- trunk/reactos/lib/rtl/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/bitmap.c [iso-8859-1] Sun Apr 14 19:16:20 2013 @@ -13,11 +13,6 @@ #define NDEBUG #include <debug.h> - -/* Hack for host tools */ -#ifndef _SAL_VERSION -#include "../ndk/no_sal2.h" -#endif // FIXME: hack #undef ASSERT Modified: trunk/reactos/tools/mkhive/mkhive.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.h?rev=… ============================================================================== --- trunk/reactos/tools/mkhive/mkhive.h [iso-8859-1] (original) +++ trunk/reactos/tools/mkhive/mkhive.h [iso-8859-1] Sun Apr 14 19:16:20 2013 @@ -137,5 +137,7 @@ #include <string.h> #endif//_WIN32 +#define _In_ +#define _Out_ /* EOF */

11 years, 5 months

[tkreuzer] 58762: [RTL] Fix host tools build

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Apr 14 18:59:37 2013 New Revision: 58762 URL: http://svn.reactos.org/svn/reactos?rev=58762&view=rev Log: [RTL] Fix host tools build Modified: trunk/reactos/lib/rtl/bitmap.c Modified: trunk/reactos/lib/rtl/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/bitmap.c?rev=58762… ============================================================================== --- trunk/reactos/lib/rtl/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/bitmap.c [iso-8859-1] Sun Apr 14 18:59:37 2013 @@ -13,6 +13,11 @@ #define NDEBUG #include <debug.h> + +/* Hack for host tools */ +#ifndef _SAL_VERSION +#include "../ndk/no_sal2.h" +#endif // FIXME: hack #undef ASSERT

11 years, 5 months

[tkreuzer] 58761: [RTL] Add support for RTL_BITMAP64 on x64 builds

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Apr 14 18:49:20 2013 New Revision: 58761 URL: http://svn.reactos.org/svn/reactos?rev=58761&view=rev Log: [RTL] Add support for RTL_BITMAP64 on x64 builds Modified: trunk/reactos/lib/rtl/CMakeLists.txt trunk/reactos/lib/rtl/bitmap.c trunk/reactos/lib/rtl/rtlp.h Modified: trunk/reactos/lib/rtl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/lib/rtl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/CMakeLists.txt [iso-8859-1] Sun Apr 14 18:49:20 2013 @@ -82,6 +82,7 @@ amd64/except_asm.S amd64/slist.S) list(APPEND SOURCE + bitmap64.c byteswap.c amd64/unwind.c amd64/stubs.c Modified: trunk/reactos/lib/rtl/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/bitmap.c?rev=58761… ============================================================================== --- trunk/reactos/lib/rtl/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/bitmap.c [iso-8859-1] Sun Apr 14 18:49:20 2013 @@ -17,6 +17,47 @@ // FIXME: hack #undef ASSERT #define ASSERT(...) + +#ifdef USE_RTL_BITMAP64 +#define _BITCOUNT 64 +typedef ULONG64 BITMAP_INDEX, *PBITMAP_INDEX; +typedef ULONG64 BITMAP_BUFFER, *PBITMAP_BUFFER; +#define RTL_BITMAP RTL_BITMAP64 +#define PRTL_BITMAP PRTL_BITMAP64 +#define RTL_BITMAP_RUN RTL_BITMAP_RUN64 +#define PRTL_BITMAP_RUN PRTL_BITMAP_RUN64 +#undef BitScanForward +#define BitScanForward BitScanForward64 +#define RtlFillMemoryUlong RtlFillMemoryUlonglong + +#define RtlInitializeBitMap RtlInitializeBitMap64 +#define RtlClearAllBits RtlClearAllBits64 +#define RtlSetAllBits RtlSetAllBits64 +#define RtlClearBit RtlClearBit64 +#define RtlSetBit RtlSetBit64 +#define RtlClearBits RtlClearBits64 +#define RtlSetBits RtlSetBits64 +#define RtlTestBit RtlTestBit64 +#define RtlAreBitsClear RtlAreBitsClear64 +#define RtlAreBitsSet RtlAreBitsSet64 +#define RtlNumberOfSetBits RtlNumberOfSetBits64 +#define RtlNumberOfClearBits RtlNumberOfClearBits64 +#define RtlFindClearBits RtlFindClearBits64 +#define RtlFindSetBits RtlFindSetBits64 +#define RtlFindClearBitsAndSet RtlFindClearBitsAndSet64 +#define RtlFindSetBitsAndClear RtlFindSetBitsAndClear64 +#define RtlFindNextForwardRunClear RtlFindNextForwardRunClear64 +#define RtlFindNextForwardRunSet RtlFindNextForwardRunSet64 +#define RtlFindFirstRunClear RtlFindFirstRunClear64 +#define RtlFindLastBackwardRunClear RtlFindLastBackwardRunClear64 +#define RtlFindClearRuns RtlFindClearRuns64 +#define RtlFindLongestRunClear RtlFindLongestRunClear64 +#define RtlFindLongestRunSet RtlFindLongestRunSet64 +#else +#define _BITCOUNT 32 +typedef ULONG BITMAP_INDEX, *PBITMAP_INDEX; +typedef ULONG BITMAP_BUFFER, *PBITMAP_BUFFER; +#endif /* DATA *********************************************************************/ @@ -48,22 +89,22 @@ /* PRIVATE FUNCTIONS ********************************************************/ static __inline -ULONG +BITMAP_INDEX RtlpGetLengthOfRunClear( - IN PRTL_BITMAP BitMapHeader, - IN ULONG StartingIndex, - IN ULONG MaxLength) -{ - ULONG Value, BitPos, Length; - PULONG Buffer, MaxBuffer; + _In_ PRTL_BITMAP BitMapHeader, + _In_ BITMAP_INDEX StartingIndex, + _In_ BITMAP_INDEX MaxLength) +{ + BITMAP_INDEX Value, BitPos, Length; + PBITMAP_BUFFER Buffer, MaxBuffer; /* Calculate positions */ - Buffer = BitMapHeader->Buffer + StartingIndex / 32; - BitPos = StartingIndex & 31; + Buffer = BitMapHeader->Buffer + StartingIndex / _BITCOUNT; + BitPos = StartingIndex & (_BITCOUNT - 1); /* Calculate the maximum length */ MaxLength = min(MaxLength, BitMapHeader->SizeOfBitMap - StartingIndex); - MaxBuffer = Buffer + (BitPos + MaxLength + 31) / 32; + MaxBuffer = Buffer + (BitPos + MaxLength + _BITCOUNT - 1) / _BITCOUNT; /* Clear the bits that don't belong to this run */ Value = *Buffer++ >> BitPos << BitPos; @@ -85,8 +126,8 @@ BitScanForward(&BitPos, Value); /* Calculate length up to where we read */ - Length = (ULONG)(Buffer - BitMapHeader->Buffer) * 32 - StartingIndex; - Length += BitPos - 32; + Length = (BITMAP_INDEX)(Buffer - BitMapHeader->Buffer) * _BITCOUNT - StartingIndex; + Length += BitPos - _BITCOUNT; /* Make sure we don't go past the last bit */ if (Length > BitMapHeader->SizeOfBitMap - StartingIndex) @@ -97,22 +138,22 @@ } static __inline -ULONG +BITMAP_INDEX RtlpGetLengthOfRunSet( - IN PRTL_BITMAP BitMapHeader, - IN ULONG StartingIndex, - IN ULONG MaxLength) -{ - ULONG InvValue, BitPos, Length; - PULONG Buffer, MaxBuffer; + _In_ PRTL_BITMAP BitMapHeader, + _In_ BITMAP_INDEX StartingIndex, + _In_ BITMAP_INDEX MaxLength) +{ + BITMAP_INDEX InvValue, BitPos, Length; + PBITMAP_BUFFER Buffer, MaxBuffer; /* Calculate positions */ - Buffer = BitMapHeader->Buffer + StartingIndex / 32; - BitPos = StartingIndex & 31; + Buffer = BitMapHeader->Buffer + StartingIndex / _BITCOUNT; + BitPos = StartingIndex & (_BITCOUNT - 1); /* Calculate the maximum length */ MaxLength = min(MaxLength, BitMapHeader->SizeOfBitMap - StartingIndex); - MaxBuffer = Buffer + (BitPos + MaxLength + 31) / 32; + MaxBuffer = Buffer + (BitPos + MaxLength + _BITCOUNT - 1) / _BITCOUNT; /* Get the inversed value, clear bits that don't belong to the run */ InvValue = ~(*Buffer++) >> BitPos << BitPos; @@ -134,8 +175,8 @@ BitScanForward(&BitPos, InvValue); /* Calculate length up to where we read */ - Length = (ULONG)(Buffer - BitMapHeader->Buffer) * 32 - StartingIndex; - Length += BitPos - 32; + Length = (ULONG)(Buffer - BitMapHeader->Buffer) * _BITCOUNT - StartingIndex; + Length += BitPos - _BITCOUNT; /* Make sure we don't go past the last bit */ if (Length > BitMapHeader->SizeOfBitMap - StartingIndex) @@ -148,6 +189,7 @@ /* PUBLIC FUNCTIONS **********************************************************/ +#ifndef USE_RTL_BITMAP64 CCHAR NTAPI RtlFindMostSignificantBit(ULONGLONG Value) @@ -160,9 +202,9 @@ return (CCHAR)Position; } #else - if (BitScanReverse(&Position, Value >> 32)) - { - return (CCHAR)(Position + 32); + if (BitScanReverse(&Position, Value >> _BITCOUNT)) + { + return (CCHAR)(Position + _BITCOUNT); } else if (BitScanReverse(&Position, (ULONG)Value)) { @@ -188,20 +230,21 @@ { return (CCHAR)Position; } - else if (BitScanForward(&Position, Value >> 32)) - { - return (CCHAR)(Position + 32); + else if (BitScanForward(&Position, Value >> _BITCOUNT)) + { + return (CCHAR)(Position + _BITCOUNT); } #endif return -1; } +#endif /* !USE_RTL_BITMAP64 */ VOID NTAPI RtlInitializeBitMap( - IN PRTL_BITMAP BitMapHeader, - IN PULONG BitMapBuffer, - IN ULONG SizeOfBitMap) + _Out_ PRTL_BITMAP BitMapHeader, + _In_ PBITMAP_BUFFER BitMapBuffer, + _In_ BITMAP_INDEX SizeOfBitMap) { /* Setup the bitmap header */ BitMapHeader->SizeOfBitMap = SizeOfBitMap; @@ -211,60 +254,60 @@ VOID NTAPI RtlClearAllBits( - IN OUT PRTL_BITMAP BitMapHeader) -{ - ULONG LengthInUlongs; - - LengthInUlongs = (BitMapHeader->SizeOfBitMap + 31) >> 5; - RtlFillMemoryUlong(BitMapHeader->Buffer, LengthInUlongs << 2, 0); + _In_ PRTL_BITMAP BitMapHeader) +{ + BITMAP_INDEX LengthInUlongs; + + LengthInUlongs = (BitMapHeader->SizeOfBitMap + _BITCOUNT - 1) / _BITCOUNT; + RtlFillMemoryUlong(BitMapHeader->Buffer, LengthInUlongs * sizeof(BITMAP_INDEX), 0); } VOID NTAPI RtlSetAllBits( - IN OUT PRTL_BITMAP BitMapHeader) -{ - ULONG LengthInUlongs; - - LengthInUlongs = (BitMapHeader->SizeOfBitMap + 31) >> 5; - RtlFillMemoryUlong(BitMapHeader->Buffer, LengthInUlongs << 2, ~0); + _In_ PRTL_BITMAP BitMapHeader) +{ + BITMAP_INDEX LengthInUlongs; + + LengthInUlongs = (BitMapHeader->SizeOfBitMap + _BITCOUNT - 1) / _BITCOUNT; + RtlFillMemoryUlong(BitMapHeader->Buffer, LengthInUlongs * sizeof(BITMAP_INDEX), ~0); } VOID NTAPI RtlClearBit( - IN PRTL_BITMAP BitMapHeader, - IN ULONG BitNumber) + _In_ PRTL_BITMAP BitMapHeader, + _In_ BITMAP_INDEX BitNumber) { ASSERT(BitNumber <= BitMapHeader->SizeOfBitMap); - BitMapHeader->Buffer[BitNumber >> 5] &= ~(1 << (BitNumber & 31)); + BitMapHeader->Buffer[BitNumber / _BITCOUNT] &= ~(1 << (BitNumber & (_BITCOUNT - 1))); } VOID NTAPI RtlSetBit( - IN PRTL_BITMAP BitMapHeader, - IN ULONG BitNumber) + _In_ PRTL_BITMAP BitMapHeader, + _In_ BITMAP_INDEX BitNumber) { ASSERT(BitNumber <= BitMapHeader->SizeOfBitMap); - BitMapHeader->Buffer[BitNumber >> 5] |= (1 << (BitNumber & 31)); + BitMapHeader->Buffer[BitNumber / _BITCOUNT] |= ((BITMAP_INDEX)1 << (BitNumber & (_BITCOUNT - 1))); } VOID NTAPI RtlClearBits( - IN PRTL_BITMAP BitMapHeader, - IN ULONG StartingIndex, - IN ULONG NumberToClear) -{ - ULONG Bits, Mask; - PULONG Buffer; + _In_ PRTL_BITMAP BitMapHeader, + _In_ BITMAP_INDEX StartingIndex, + _In_ BITMAP_INDEX NumberToClear) +{ + BITMAP_INDEX Bits, Mask; + PBITMAP_BUFFER Buffer; ASSERT(StartingIndex + NumberToClear <= BitMapHeader->SizeOfBitMap); /* Calculate buffer start and first bit index */ - Buffer = &BitMapHeader->Buffer[StartingIndex >> 5]; - Bits = StartingIndex & 31; + Buffer = &BitMapHeader->Buffer[StartingIndex / _BITCOUNT]; + Bits = StartingIndex & (_BITCOUNT - 1); /* Are we unaligned? */ if (Bits) @@ -273,7 +316,7 @@ Mask = MAXULONG << Bits; /* This is what's left in the first ULONG */ - Bits = 32 - Bits; + Bits = _BITCOUNT - Bits; /* Even less bits to clear? */ if (NumberToClear < Bits) @@ -299,10 +342,10 @@ /* Clear all full ULONGs */ RtlFillMemoryUlong(Buffer, NumberToClear >> 3, 0); - Buffer += NumberToClear >> 5; + Buffer += NumberToClear / _BITCOUNT; /* Clear what's left */ - NumberToClear &= 31; + NumberToClear &= (_BITCOUNT - 1); Mask = MAXULONG << NumberToClear; *Buffer &= Mask; } @@ -310,18 +353,18 @@ VOID NTAPI RtlSetBits( - IN PRTL_BITMAP BitMapHeader, - IN ULONG StartingIndex, - IN ULONG NumberToSet) -{ - ULONG Bits, Mask; - PULONG Buffer; + _In_ PRTL_BITMAP BitMapHeader, + _In_ BITMAP_INDEX StartingIndex, + _In_ BITMAP_INDEX NumberToSet) +{ + BITMAP_INDEX Bits, Mask; + PBITMAP_BUFFER Buffer; ASSERT(StartingIndex + NumberToSet <= BitMapHeader->SizeOfBitMap); /* Calculate buffer start and first bit index */ - Buffer = &BitMapHeader->Buffer[StartingIndex >> 5]; - Bits = StartingIndex & 31; + Buffer = &BitMapHeader->Buffer[StartingIndex / _BITCOUNT]; + Bits = StartingIndex & (_BITCOUNT - 1); /* Are we unaligned? */ if (Bits) @@ -330,7 +373,7 @@ Mask = MAXULONG << Bits; /* This is what's left in the first ULONG */ - Bits = 32 - Bits; + Bits = _BITCOUNT - Bits; /* Even less bits to clear? */ if (NumberToSet < Bits) @@ -356,10 +399,10 @@ /* Set all full ULONGs */ RtlFillMemoryUlong(Buffer, NumberToSet >> 3, MAXULONG); - Buffer += NumberToSet >> 5; + Buffer += NumberToSet / _BITCOUNT; /* Set what's left */ - NumberToSet &= 31; + NumberToSet &= (_BITCOUNT - 1); Mask = MAXULONG << NumberToSet; *Buffer |= ~Mask; } @@ -367,19 +410,19 @@ BOOLEAN NTAPI RtlTestBit( - IN PRTL_BITMAP BitMapHeader, - IN ULONG BitNumber) + _In_ PRTL_BITMAP BitMapHeader, + _In_ BITMAP_INDEX BitNumber) { ASSERT(BitNumber < BitMapHeader->SizeOfBitMap); - return (BitMapHeader->Buffer[BitNumber >> 5] >> (BitNumber & 31)) & 1; + return (BitMapHeader->Buffer[BitNumber / _BITCOUNT] >> (BitNumber & (_BITCOUNT - 1))) & 1; } BOOLEAN NTAPI RtlAreBitsClear( - IN PRTL_BITMAP BitMapHeader, - IN ULONG StartingIndex, - IN ULONG Length) + _In_ PRTL_BITMAP BitMapHeader, + _In_ BITMAP_INDEX StartingIndex, + _In_ BITMAP_INDEX Length) { /* Verify parameters */ if ((StartingIndex + Length > BitMapHeader->SizeOfBitMap) || @@ -392,9 +435,9 @@ BOOLEAN NTAPI RtlAreBitsSet( - IN PRTL_BITMAP BitMapHeader, - IN ULONG StartingIndex, - IN ULONG Length) + _In_ PRTL_BITMAP BitMapHeader, + _In_ BITMAP_INDEX StartingIndex, + _In_ BITMAP_INDEX Length) { /* Verify parameters */ if ((StartingIndex + Length > BitMapHeader->SizeOfBitMap) || @@ -404,13 +447,14 @@ return RtlpGetLengthOfRunSet(BitMapHeader, StartingIndex, Length) >= Length; } -ULONG +BITMAP_INDEX NTAPI RtlNumberOfSetBits( - IN PRTL_BITMAP BitMapHeader) + _In_ PRTL_BITMAP BitMapHeader) { PUCHAR Byte, MaxByte; - ULONG BitCount = 0, Shift; + BITMAP_INDEX BitCount = 0; + ULONG Shift; Byte = (PUCHAR)BitMapHeader->Buffer; MaxByte = Byte + BitMapHeader->SizeOfBitMap / 8; @@ -426,23 +470,23 @@ return BitCount; } -ULONG +BITMAP_INDEX NTAPI RtlNumberOfClearBits( - IN PRTL_BITMAP BitMapHeader) + _In_ PRTL_BITMAP BitMapHeader) { /* Do some math */ return BitMapHeader->SizeOfBitMap - RtlNumberOfSetBits(BitMapHeader); } -ULONG +BITMAP_INDEX NTAPI RtlFindClearBits( - IN PRTL_BITMAP BitMapHeader, - IN ULONG NumberToFind, - IN ULONG HintIndex) -{ - ULONG CurrentBit, Margin, CurrentLength; + _In_ PRTL_BITMAP BitMapHeader, + _In_ BITMAP_INDEX NumberToFind, + _In_ BITMAP_INDEX HintIndex) +{ + BITMAP_INDEX CurrentBit, Margin, CurrentLength; /* Check for valid parameters */ if (!BitMapHeader || NumberToFind > BitMapHeader->SizeOfBitMap) @@ -503,14 +547,14 @@ return MAXULONG; } -ULONG +BITMAP_INDEX NTAPI RtlFindSetBits( - IN PRTL_BITMAP BitMapHeader, - IN ULONG NumberToFind, - IN ULONG HintIndex) -{ - ULONG CurrentBit, Margin, CurrentLength; + _In_ PRTL_BITMAP BitMapHeader, + _In_ BITMAP_INDEX NumberToFind, + _In_ BITMAP_INDEX HintIndex) +{ + BITMAP_INDEX CurrentBit, Margin, CurrentLength; /* Check for valid parameters */ if (!BitMapHeader || NumberToFind > BitMapHeader->SizeOfBitMap) @@ -571,14 +615,14 @@ return MAXULONG; } -ULONG +BITMAP_INDEX NTAPI RtlFindClearBitsAndSet( - PRTL_BITMAP BitMapHeader, - ULONG NumberToFind, - ULONG HintIndex) -{ - ULONG Position; + _In_ PRTL_BITMAP BitMapHeader, + _In_ BITMAP_INDEX NumberToFind, + _In_ BITMAP_INDEX HintIndex) +{ + BITMAP_INDEX Position; /* Try to find clear bits */ Position = RtlFindClearBits(BitMapHeader, NumberToFind, HintIndex); @@ -594,14 +638,14 @@ return Position; } -ULONG +BITMAP_INDEX NTAPI RtlFindSetBitsAndClear( - IN PRTL_BITMAP BitMapHeader, - IN ULONG NumberToFind, - IN ULONG HintIndex) -{ - ULONG Position; + _In_ PRTL_BITMAP BitMapHeader, + _In_ BITMAP_INDEX NumberToFind, + _In_ BITMAP_INDEX HintIndex) +{ + BITMAP_INDEX Position; /* Try to find set bits */ Position = RtlFindSetBits(BitMapHeader, NumberToFind, HintIndex); @@ -617,14 +661,14 @@ return Position; } -ULONG +BITMAP_INDEX NTAPI RtlFindNextForwardRunClear( - IN PRTL_BITMAP BitMapHeader, - IN ULONG FromIndex, - IN PULONG StartingRunIndex) -{ - ULONG Length; + _In_ PRTL_BITMAP BitMapHeader, + _In_ BITMAP_INDEX FromIndex, + _Out_ PBITMAP_INDEX StartingRunIndex) +{ + BITMAP_INDEX Length; /* Check for buffer overrun */ if (FromIndex >= BitMapHeader->SizeOfBitMap) @@ -641,14 +685,14 @@ return RtlpGetLengthOfRunClear(BitMapHeader, FromIndex + Length, MAXULONG); } -ULONG +BITMAP_INDEX NTAPI RtlFindNextForwardRunSet( - IN PRTL_BITMAP BitMapHeader, - IN ULONG FromIndex, - IN PULONG StartingRunIndex) -{ - ULONG Length; + _In_ PRTL_BITMAP BitMapHeader, + _In_ BITMAP_INDEX FromIndex, + _Out_ PBITMAP_INDEX StartingRunIndex) +{ + BITMAP_INDEX Length; /* Check for buffer overrun */ if (FromIndex >= BitMapHeader->SizeOfBitMap) @@ -665,21 +709,21 @@ return RtlpGetLengthOfRunSet(BitMapHeader, FromIndex, MAXULONG); } +BITMAP_INDEX +NTAPI +RtlFindFirstRunClear( + _In_ PRTL_BITMAP BitMapHeader, + _Out_ PBITMAP_INDEX StartingIndex) +{ + return RtlFindNextForwardRunClear(BitMapHeader, 0, StartingIndex); +} + ULONG NTAPI -RtlFindFirstRunClear( - IN PRTL_BITMAP BitMapHeader, - IN PULONG StartingIndex) -{ - return RtlFindNextForwardRunClear(BitMapHeader, 0, StartingIndex); -} - -ULONG -NTAPI RtlFindLastBackwardRunClear( - IN PRTL_BITMAP BitMapHeader, - IN ULONG FromIndex, - IN PULONG StartingRunIndex) + _In_ PRTL_BITMAP BitMapHeader, + _In_ BITMAP_INDEX FromIndex, + _Out_ PBITMAP_INDEX StartingRunIndex) { UNIMPLEMENTED; return 0; @@ -689,12 +733,13 @@ ULONG NTAPI RtlFindClearRuns( - IN PRTL_BITMAP BitMapHeader, - IN PRTL_BITMAP_RUN RunArray, - IN ULONG SizeOfRunArray, - IN BOOLEAN LocateLongestRuns) -{ - ULONG StartingIndex, NumberOfBits, Run, FromIndex = 0, SmallestRun = 0; + _In_ PRTL_BITMAP BitMapHeader, + _In_ PRTL_BITMAP_RUN RunArray, + _In_ ULONG SizeOfRunArray, + _In_ BOOLEAN LocateLongestRuns) +{ + BITMAP_INDEX StartingIndex, NumberOfBits, FromIndex = 0, SmallestRun = 0; + ULONG Run; /* Loop the runs */ for (Run = 0; Run < SizeOfRunArray; Run++) @@ -764,13 +809,13 @@ return Run; } -ULONG +BITMAP_INDEX NTAPI RtlFindLongestRunClear( IN PRTL_BITMAP BitMapHeader, - IN PULONG StartingIndex) -{ - ULONG NumberOfBits, Index, MaxNumberOfBits = 0, FromIndex = 0; + IN PBITMAP_INDEX StartingIndex) +{ + BITMAP_INDEX NumberOfBits, Index, MaxNumberOfBits = 0, FromIndex = 0; while (1) { @@ -797,13 +842,13 @@ return MaxNumberOfBits; } -ULONG +BITMAP_INDEX NTAPI RtlFindLongestRunSet( IN PRTL_BITMAP BitMapHeader, - IN PULONG StartingIndex) -{ - ULONG NumberOfBits, Index, MaxNumberOfBits = 0, FromIndex = 0; + IN PBITMAP_INDEX StartingIndex) +{ + BITMAP_INDEX NumberOfBits, Index, MaxNumberOfBits = 0, FromIndex = 0; while (1) { Modified: trunk/reactos/lib/rtl/rtlp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtlp.h?rev=58761&r… ============================================================================== --- trunk/reactos/lib/rtl/rtlp.h [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/rtlp.h [iso-8859-1] Sun Apr 14 18:49:20 2013 @@ -195,4 +195,17 @@ NTSTATUS RtlpInitializeTimerThread(VOID); +/* bitmap64.c */ +typedef struct _RTL_BITMAP64 +{ + ULONG64 SizeOfBitMap; + PULONG64 Buffer; +} RTL_BITMAP64, *PRTL_BITMAP64; + +typedef struct _RTL_BITMAP_RUN64 +{ + ULONG64 StartingIndex; + ULONG64 NumberOfBits; +} RTL_BITMAP_RUN64, *PRTL_BITMAP_RUN64; + /* EOF */

11 years, 5 months

[tkreuzer] 58760: [FREELDR] When generating the memory descriptor list, do not map the pages at the same time, since that requires allocating page tables, which will alter the state of pages, that ...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Apr 14 18:41:54 2013 New Revision: 58760 URL: http://svn.reactos.org/svn/reactos?rev=58760&view=rev Log: [FREELDR] When generating the memory descriptor list, do not map the pages at the same time, since that requires allocating page tables, which will alter the state of pages, that might already have been processed. Instead map everything beforehand. This has not had any impact on x86, since the pfn database initialization code mindlessly adds all mapped pages as valid, even if they were reported as free by the OS loader. But proper Mm code does not necessarily do this. Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c [iso-8859-1] Sun Apr 14 18:41:54 2013 @@ -183,13 +183,16 @@ } /* Kernel mapping */ - if (MempMapRangeOfPages(StartPage * PAGE_SIZE + KSEG0_BASE, - StartPage * PAGE_SIZE, - NumberOfPages) != NumberOfPages) + if (KernelMapping) { - ERR("Failed to map pages %ld, %ld\n", - StartPage, NumberOfPages); - return FALSE; + if (MempMapRangeOfPages(StartPage * PAGE_SIZE + KSEG0_BASE, + StartPage * PAGE_SIZE, + NumberOfPages) != NumberOfPages) + { + ERR("Failed to map pages %ld, %ld\n", + StartPage, NumberOfPages); + return FALSE; + } } return TRUE; @@ -343,7 +346,7 @@ /* Disable Interrupts */ _disable(); - /* Re-initialize EFLAGS */ + /* Re-initalize EFLAGS */ __writeeflags(0); /* Set the new PML4 */ Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c [iso-8859-1] Sun Apr 14 18:41:54 2013 @@ -67,30 +67,21 @@ PFN_NUMBER PageCount, ULONG Type) { - BOOLEAN Status = TRUE; - TRACE("MempAddMemoryBlock(BasePage=0x%lx, PageCount=0x%lx, Type=%ld)\n", BasePage, PageCount, Type); - // - // Check for memory block after 4GB - we don't support it yet - // Note: Even last page before 4GB limit is not supported - // + + /* Check for memory block after 4GB - we don't support it yet + Note: Even last page before 4GB limit is not supported */ if (BasePage >= MM_MAX_PAGE) { - // - // Just skip this, without even adding to MAD list - // + /* Just skip this, without even adding to MAD list */ return; } - // - // Check if last page is after 4GB limit and shorten this block if needed - // + /* Check if last page is after 4GB limit and shorten this block if needed */ if (BasePage + PageCount > MM_MAX_PAGE) { - // - // shorten this block - // + /* Shorten this block */ PageCount = MM_MAX_PAGE - BasePage; } @@ -101,35 +92,29 @@ return; } - /* Get rid of the loader heap */ - //if (Type == LoaderOsloaderHeap) Type = LoaderFirmwareTemporary; - - // - // Set Base page, page count and type - // + /* Set Base page, page count and type */ Mad[MadCount].BasePage = BasePage; Mad[MadCount].PageCount = PageCount; Mad[MadCount].MemoryType = Type; - // - // Add descriptor - // + /* Add descriptor */ WinLdrInsertDescriptor(LoaderBlock, &Mad[MadCount]); MadCount++; +} + +VOID +MempSetupPagingForRegion( + PFN_NUMBER BasePage, + PFN_NUMBER PageCount, + ULONG Type) +{ + BOOLEAN Status = TRUE; + + TRACE("MempSetupPagingForRegion(BasePage=0x%lx, PageCount=0x%lx, Type=%ld)\n", + BasePage, PageCount, Type); /* Make sure we don't map too high */ if (BasePage + PageCount > LoaderPagesSpanned) return; - - /* Special handling for page 0 */ - if (BasePage == 0) - { - /* If its only one page, ignore it! */ - if (PageCount == 1) return; - - /* Otherwise, skip first page */ - BasePage++; - PageCount--; - } switch (Type) { @@ -253,6 +238,21 @@ return FALSE; } #endif + + /* Before creating the map, we need to map pages to kernel mode */ + LastPageIndex = 1; + LastPageType = MemoryMap[1].PageAllocated; + for (i = 2; i < NoEntries; i++) + { + if ((MemoryMap[i].PageAllocated != LastPageType) || + (i == NoEntries - 1)) + { + MempSetupPagingForRegion(LastPageIndex, i - LastPageIndex, LastPageType); + LastPageIndex = i; + LastPageType = MemoryMap[i].PageAllocated; + } + } + // Construct a good memory map from what we've got, // but mark entries which the memory allocation bitmap takes // as free entries (this is done in order to have the ability

11 years, 5 months

[tkreuzer] 58759: [WIN32K] Calculate flRaster in GDIINFO flags after calling DrvEnablePDEV. Should fix CORE-7079

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Apr 14 17:17:44 2013 New Revision: 58759 URL: http://svn.reactos.org/svn/reactos?rev=58759&view=rev Log: [WIN32K] Calculate flRaster in GDIINFO flags after calling DrvEnablePDEV. Should fix CORE-7079 Modified: trunk/reactos/win32ss/gdi/eng/pdevobj.c Modified: trunk/reactos/win32ss/gdi/eng/pdevobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/pdevobj.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/pdevobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/pdevobj.c [iso-8859-1] Sun Apr 14 17:17:44 2013 @@ -162,6 +162,15 @@ if (ppdev->gdiinfo.ulLogPixelsY == 0) ppdev->gdiinfo.ulLogPixelsY = 96; + + /* Set raster caps */ + ppdev->gdiinfo.flRaster = RC_OP_DX_OUTPUT | RC_GDI20_OUTPUT | RC_BIGFONT; + if ((ppdev->gdiinfo.ulTechnology != DT_PLOTTER) && (ppdev->gdiinfo.ulTechnology != DT_CHARSTREAM)) + ppdev->gdiinfo.flRaster |= RC_STRETCHDIB | RC_STRETCHBLT | RC_DIBTODEV | RC_DI_BITMAP | RC_BITMAP64 | RC_BITBLT; + if (ppdev->gdiinfo.ulTechnology == DT_RASDISPLAY) + ppdev->gdiinfo.flRaster |= RC_FLOODFILL; + if (ppdev->devinfo.flGraphicsCaps & GCAPS_PALMANAGED) + ppdev->gdiinfo.flRaster |= RC_PALETTE; /* Setup Palette */ ppdev->ppalSurf = PALETTE_ShareLockPalette(ppdev->devinfo.hpalDefault);

11 years, 5 months

[hbelusca] 58758: [CONSRV] Fix some MSVC warnings (type conversions). Ready for merging (TM) :)

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Apr 14 16:04:46 2013 New Revision: 58758 URL: http://svn.reactos.org/svn/reactos?rev=58758&view=rev Log: [CONSRV] Fix some MSVC warnings (type conversions). Ready for merging (TM) :) Modified: branches/ros-csrss/subsystems/win/basesrv/init.c branches/ros-csrss/win32ss/user/consrv/coninput.c branches/ros-csrss/win32ss/user/consrv/conoutput.c branches/ros-csrss/win32ss/user/consrv/console.c branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.c branches/ros-csrss/win32ss/user/consrv/frontends/tui/tuiterm.c branches/ros-csrss/win32ss/user/consrv/include/conio.h branches/ros-csrss/win32ss/user/consrv/lineinput.c branches/ros-csrss/win32ss/user/consrv/settings.c Modified: branches/ros-csrss/subsystems/win/basesrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win/basesr… ============================================================================== --- branches/ros-csrss/subsystems/win/basesrv/init.c [iso-8859-1] (original) +++ branches/ros-csrss/subsystems/win/basesrv/init.c [iso-8859-1] Sun Apr 14 16:04:46 2013 @@ -456,7 +456,7 @@ sizeof(LuidEnabled), NULL); ASSERT(NT_SUCCESS(Status)); - BaseStaticServerData->LUIDDeviceMapsEnabled = LuidEnabled; + BaseStaticServerData->LUIDDeviceMapsEnabled = (BOOLEAN)LuidEnabled; if (!BaseStaticServerData->LUIDDeviceMapsEnabled) { /* Make Global point back to BNO */ Modified: branches/ros-csrss/win32ss/user/consrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/coninput.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/coninput.c [iso-8859-1] Sun Apr 14 16:04:46 2013 @@ -568,7 +568,7 @@ if (Console->LineBuffer == NULL) { /* Starting a new line */ - Console->LineMaxSize = max(256, nNumberOfCharsToRead); + Console->LineMaxSize = (WORD)max(256, nNumberOfCharsToRead); Console->LineBuffer = RtlAllocateHeap(ConSrvHeap, 0, Console->LineMaxSize * sizeof(WCHAR)); if (Console->LineBuffer == NULL) { Modified: branches/ros-csrss/win32ss/user/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/conoutput.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/conoutput.c [iso-8859-1] Sun Apr 14 16:04:46 2013 @@ -60,13 +60,13 @@ ClearLineBuffer(PCONSOLE_SCREEN_BUFFER Buff) { PBYTE Ptr = ConioCoordToPointer(Buff, 0, Buff->CursorPosition.Y); - UINT Pos; + SHORT Pos; for (Pos = 0; Pos < Buff->ScreenBufferSize.X; Pos++) { /* Fill the cell */ *Ptr++ = ' '; - *Ptr++ = Buff->ScreenDefaultAttrib; + *Ptr++ = (BYTE)Buff->ScreenDefaultAttrib; } } @@ -155,7 +155,7 @@ UINT i; PBYTE Ptr; SMALL_RECT UpdateRect; - LONG CursorStartX, CursorStartY; + SHORT CursorStartX, CursorStartY; UINT ScrolledLines; CursorStartX = Buff->CursorPosition.X; @@ -178,8 +178,8 @@ if (Buffer[i] == '\r') { Buff->CursorPosition.X = 0; - UpdateRect.Left = min(UpdateRect.Left, (LONG)Buff->CursorPosition.X); - UpdateRect.Right = max(UpdateRect.Right, (LONG)Buff->CursorPosition.X); + UpdateRect.Left = min(UpdateRect.Left, Buff->CursorPosition.X); + UpdateRect.Right = max(UpdateRect.Right, Buff->CursorPosition.X); continue; } /* --- LF --- */ @@ -200,7 +200,7 @@ /* slide virtual position up */ Buff->CursorPosition.X = Buff->ScreenBufferSize.X - 1; Buff->CursorPosition.Y--; - UpdateRect.Top = min(UpdateRect.Top, (LONG)Buff->CursorPosition.Y); + UpdateRect.Top = min(UpdateRect.Top, Buff->CursorPosition.Y); } else { @@ -208,9 +208,9 @@ } Ptr = ConioCoordToPointer(Buff, Buff->CursorPosition.X, Buff->CursorPosition.Y); Ptr[0] = ' '; - Ptr[1] = Buff->ScreenDefaultAttrib; - UpdateRect.Left = min(UpdateRect.Left, (LONG)Buff->CursorPosition.X); - UpdateRect.Right = max(UpdateRect.Right, (LONG)Buff->CursorPosition.X); + Ptr[1] = (BYTE)Buff->ScreenDefaultAttrib; + UpdateRect.Left = min(UpdateRect.Left, Buff->CursorPosition.X); + UpdateRect.Right = max(UpdateRect.Right, Buff->CursorPosition.X); } continue; } @@ -219,17 +219,17 @@ { UINT EndX; - UpdateRect.Left = min(UpdateRect.Left, (LONG)Buff->CursorPosition.X); + UpdateRect.Left = min(UpdateRect.Left, Buff->CursorPosition.X); EndX = (Buff->CursorPosition.X + TAB_WIDTH) & ~(TAB_WIDTH - 1); - EndX = min(EndX, Buff->ScreenBufferSize.X); + EndX = min(EndX, (UINT)Buff->ScreenBufferSize.X); Ptr = ConioCoordToPointer(Buff, Buff->CursorPosition.X, Buff->CursorPosition.Y); while (Buff->CursorPosition.X < EndX) { *Ptr++ = ' '; - *Ptr++ = Buff->ScreenDefaultAttrib; + *Ptr++ = (BYTE)Buff->ScreenDefaultAttrib; Buff->CursorPosition.X++; } - UpdateRect.Right = max(UpdateRect.Right, (LONG)Buff->CursorPosition.X - 1); + UpdateRect.Right = max(UpdateRect.Right, Buff->CursorPosition.X - 1); if (Buff->CursorPosition.X == Buff->ScreenBufferSize.X) { if (Buff->Mode & ENABLE_WRAP_AT_EOL_OUTPUT) @@ -253,13 +253,13 @@ // continue; // } } - UpdateRect.Left = min(UpdateRect.Left, (LONG)Buff->CursorPosition.X); - UpdateRect.Right = max(UpdateRect.Right, (LONG)Buff->CursorPosition.X); + UpdateRect.Left = min(UpdateRect.Left, Buff->CursorPosition.X); + UpdateRect.Right = max(UpdateRect.Right, Buff->CursorPosition.X); Ptr = ConioCoordToPointer(Buff, Buff->CursorPosition.X, Buff->CursorPosition.Y); Ptr[0] = Buffer[i]; if (Attrib) { - Ptr[1] = Buff->ScreenDefaultAttrib; + Ptr[1] = (BYTE)Buff->ScreenDefaultAttrib; } Buff->CursorPosition.X++; if (Buff->CursorPosition.X == Buff->ScreenBufferSize.X) @@ -278,8 +278,8 @@ if (!ConioIsRectEmpty(&UpdateRect) && Buff == Console->ActiveBuffer) { - ConioWriteStream(Console, &UpdateRect, CursorStartX, CursorStartY, ScrolledLines, - Buffer, Length); + ConioWriteStream(Console, &UpdateRect, CursorStartX, CursorStartY, + ScrolledLines, Buffer, Length); } return STATUS_SUCCESS; @@ -466,7 +466,7 @@ for (i = 0; i < diff; i++) { Buffer[Offset++] = ' '; - Buffer[Offset++] = ScreenBuffer->ScreenDefaultAttrib; + Buffer[Offset++] = (BYTE)ScreenBuffer->ScreenDefaultAttrib; } #endif } @@ -481,7 +481,7 @@ for (i = 0; i < diff; i++) { Buffer[Offset++] = ' '; - Buffer[Offset++] = ScreenBuffer->ScreenDefaultAttrib; + Buffer[Offset++] = (BYTE)ScreenBuffer->ScreenDefaultAttrib; } #endif } @@ -730,7 +730,7 @@ PCHAR_INFO CharInfo; PCHAR_INFO CurCharInfo; PCONSOLE_SCREEN_BUFFER Buff; - DWORD SizeX, SizeY; + SHORT SizeX, SizeY; NTSTATUS Status; COORD BufferSize; COORD BufferCoord; @@ -905,7 +905,7 @@ AsciiChar = CurCharInfo->Char.AsciiChar; } *Ptr++ = AsciiChar; - *Ptr++ = CurCharInfo->Attributes; + *Ptr++ = (BYTE)CurCharInfo->Attributes; CurCharInfo++; } } @@ -929,7 +929,7 @@ PCONSOLE Console; PCONSOLE_SCREEN_BUFFER Buff; USHORT CodeType; - DWORD Xpos, Ypos; + SHORT Xpos, Ypos; PVOID ReadBuffer; DWORD i; ULONG CodeSize; @@ -1324,8 +1324,8 @@ PCONSOLE_SETCURSORPOSITION SetCursorPositionRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.SetCursorPositionRequest; PCONSOLE Console; PCONSOLE_SCREEN_BUFFER Buff; - LONG OldCursorX, OldCursorY; - LONG NewCursorX, NewCursorY; + SHORT OldCursorX, OldCursorY; + SHORT NewCursorX, NewCursorY; DPRINT("SrvSetConsoleCursorPosition\n"); Modified: branches/ros-csrss/win32ss/user/consrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/c… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/console.c [iso-8859-1] Sun Apr 14 16:04:46 2013 @@ -523,7 +523,7 @@ */ if (ConsoleStartInfo->dwStartupFlags & STARTF_USEFILLATTRIBUTE) { - ConsoleInfo.ScreenAttrib = ConsoleStartInfo->FillAttribute; + ConsoleInfo.ScreenAttrib = (USHORT)ConsoleStartInfo->FillAttribute; } if (ConsoleStartInfo->dwStartupFlags & STARTF_USECOUNTCHARS) { Modified: branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/frontends/gui/guiterm.c [iso-8859-1] Sun Apr 14 16:04:46 2013 @@ -595,11 +595,7 @@ } MultiByteToWideChar(Console->OutputCodePage, - 0, - (PCHAR)From, - 1, - To, - 1); + 0, (PCHAR)From, 1, To, 1); To++; From += 2; } @@ -611,13 +607,14 @@ RightChar - Start + 1); } - if (Buff->CursorInfo.bVisible && Buff->CursorBlinkOn && - !Buff->ForceCursorOff) + if (Buff->CursorInfo.bVisible && + Buff->CursorBlinkOn && + !Buff->ForceCursorOff) { CursorX = Buff->CursorPosition.X; CursorY = Buff->CursorPosition.Y; if (LeftChar <= CursorX && CursorX <= RightChar && - TopLine <= CursorY && CursorY <= BottomLine) + TopLine <= CursorY && CursorY <= BottomLine) { CursorHeight = ConioEffectiveCursorSize(Console, GuiData->CharHeight); From = ConioCoordToPointer(Buff, Buff->CursorPosition.X, Buff->CursorPosition.Y) + 1; @@ -836,7 +833,7 @@ } static VOID -GuiInvalidateCell(PCONSOLE Console, UINT x, UINT y) +GuiInvalidateCell(PCONSOLE Console, SHORT x, SHORT y) { SMALL_RECT CellRect = { x, y, x, y }; GuiDrawRegion(Console, &CellRect); @@ -971,8 +968,8 @@ PCONSOLE_SCREEN_BUFFER Buffer = Console->ActiveBuffer; COORD Coord; - Coord.X = Buffer->ShowX + ((short)LOWORD(lParam) / (int)GuiData->CharWidth); - Coord.Y = Buffer->ShowY + ((short)HIWORD(lParam) / (int)GuiData->CharHeight); + Coord.X = Buffer->ShowX + ((SHORT)LOWORD(lParam) / (int)GuiData->CharWidth); + Coord.Y = Buffer->ShowY + ((SHORT)HIWORD(lParam) / (int)GuiData->CharHeight); /* Clip coordinate to ensure it's inside buffer */ if (Coord.X < 0) @@ -2029,12 +2026,12 @@ } static VOID WINAPI -GuiWriteStream(PCONSOLE Console, SMALL_RECT* Region, LONG CursorStartX, LONG CursorStartY, +GuiWriteStream(PCONSOLE Console, SMALL_RECT* Region, SHORT CursorStartX, SHORT CursorStartY, UINT ScrolledLines, CHAR *Buffer, UINT Length) { PGUI_CONSOLE_DATA GuiData = Console->TermIFace.Data; PCONSOLE_SCREEN_BUFFER Buff = Console->ActiveBuffer; - LONG CursorEndX, CursorEndY; + SHORT CursorEndX, CursorEndY; RECT ScrollRect; if (NULL == GuiData || NULL == GuiData->hWindow) @@ -2104,7 +2101,7 @@ } static BOOL WINAPI -GuiSetScreenInfo(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER Buff, UINT OldCursorX, UINT OldCursorY) +GuiSetScreenInfo(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER Buff, SHORT OldCursorX, SHORT OldCursorY) { if (Console->ActiveBuffer == Buff) { Modified: branches/ros-csrss/win32ss/user/consrv/frontends/tui/tuiterm.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/f… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/frontends/tui/tuiterm.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/frontends/tui/tuiterm.c [iso-8859-1] Sun Apr 14 16:04:46 2013 @@ -480,7 +480,7 @@ } static VOID WINAPI -TuiWriteStream(PCONSOLE Console, SMALL_RECT* Region, LONG CursorStartX, LONG CursorStartY, +TuiWriteStream(PCONSOLE Console, SMALL_RECT* Region, SHORT CursorStartX, SHORT CursorStartY, UINT ScrolledLines, CHAR *Buffer, UINT Length) { DWORD BytesWritten; @@ -554,7 +554,7 @@ } static BOOL WINAPI -TuiSetScreenInfo(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER Buff, UINT OldCursorX, UINT OldCursorY) +TuiSetScreenInfo(PCONSOLE Console, PCONSOLE_SCREEN_BUFFER Buff, SHORT OldCursorX, SHORT OldCursorY) { CONSOLE_SCREEN_BUFFER_INFO Info; DWORD BytesReturned; Modified: branches/ros-csrss/win32ss/user/consrv/include/conio.h URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/i… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/include/conio.h [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/include/conio.h [iso-8859-1] Sun Apr 14 16:04:46 2013 @@ -93,8 +93,8 @@ VOID (WINAPI *CleanupConsole)(struct _CONSOLE* Console); VOID (WINAPI *WriteStream)(struct _CONSOLE* Console, SMALL_RECT* Block, - LONG CursorStartX, - LONG CursorStartY, + SHORT CursorStartX, + SHORT CursorStartY, UINT ScrolledLines, CHAR *Buffer, UINT Length); @@ -104,8 +104,8 @@ PCONSOLE_SCREEN_BUFFER ScreenBuffer); BOOL (WINAPI *SetScreenInfo)(struct _CONSOLE* Console, PCONSOLE_SCREEN_BUFFER ScreenBuffer, - UINT OldCursorX, - UINT OldCursorY); + SHORT OldCursorX, + SHORT OldCursorY); BOOL (WINAPI *UpdateScreenInfo)(struct _CONSOLE* Console, PCONSOLE_SCREEN_BUFFER ScreenBuffer); BOOL (WINAPI *IsBufferResizeSupported)(struct _CONSOLE* Console); Modified: branches/ros-csrss/win32ss/user/consrv/lineinput.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/l… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/lineinput.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/lineinput.c [iso-8859-1] Sun Apr 14 16:04:46 2013 @@ -67,14 +67,13 @@ HistoryAddEntry(PCONSOLE Console) { UNICODE_STRING NewEntry; - PHISTORY_BUFFER Hist; + PHISTORY_BUFFER Hist = HistoryCurrentBuffer(Console); INT i; + + if (!Hist) return; NewEntry.Length = NewEntry.MaximumLength = Console->LineSize * sizeof(WCHAR); NewEntry.Buffer = Console->LineBuffer; - - if (!(Hist = HistoryCurrentBuffer(Console))) - return; /* Don't add blank or duplicate entries */ if (NewEntry.Length == 0 || Hist->MaxEntries == 0 || @@ -118,8 +117,9 @@ static VOID HistoryGetCurrentEntry(PCONSOLE Console, PUNICODE_STRING Entry) { - PHISTORY_BUFFER Hist; - if (!(Hist = HistoryCurrentBuffer(Console)) || Hist->NumEntries == 0) + PHISTORY_BUFFER Hist = HistoryCurrentBuffer(Console); + + if (!Hist || Hist->NumEntries == 0) Entry->Length = 0; else *Entry = Hist->Entries[Hist->Position]; @@ -173,8 +173,8 @@ if (Pos != Console->LinePos && Console->InputBuffer.Mode & ENABLE_ECHO_INPUT) { PCONSOLE_SCREEN_BUFFER Buffer = Console->ActiveBuffer; - UINT OldCursorX = Buffer->CursorPosition.X; - UINT OldCursorY = Buffer->CursorPosition.Y; + SHORT OldCursorX = Buffer->CursorPosition.X; + SHORT OldCursorY = Buffer->CursorPosition.Y; INT XY = OldCursorY * Buffer->ScreenBufferSize.X + OldCursorX; XY += (Pos - Console->LinePos); @@ -196,7 +196,7 @@ { UINT Pos = Console->LinePos; UINT NewSize = Console->LineSize - NumToDelete + NumToInsert; - INT i; + UINT i; /* Make sure there's always enough room for ending \r\n */ if (NewSize + 2 > Console->LineMaxSize) @@ -231,20 +231,19 @@ static VOID LineInputRecallHistory(PCONSOLE Console, INT Offset) { - PHISTORY_BUFFER Hist; - - if (!(Hist = HistoryCurrentBuffer(Console)) || Hist->NumEntries == 0) - return; - - Offset += Hist->Position; - Offset = max(Offset, 0); - Offset = min(Offset, Hist->NumEntries - 1); - Hist->Position = Offset; + PHISTORY_BUFFER Hist = HistoryCurrentBuffer(Console); + UINT Position = 0; + + if (!Hist || Hist->NumEntries == 0) return; + + Position = Hist->Position + Offset; + Position = min(max(Position, 0), Hist->NumEntries - 1); + Hist->Position = Position; LineInputSetPos(Console, 0); LineInputEdit(Console, Console->LineSize, - Hist->Entries[Offset].Length / sizeof(WCHAR), - Hist->Entries[Offset].Buffer); + Hist->Entries[Hist->Position].Length / sizeof(WCHAR), + Hist->Entries[Hist->Position].Buffer); } VOID FASTCALL @@ -357,8 +356,8 @@ return; case VK_F8: /* Search for history entries starting with input. */ - if (!(Hist = HistoryCurrentBuffer(Console)) || Hist->NumEntries == 0) - return; + Hist = HistoryCurrentBuffer(Console); + if (!Hist || Hist->NumEntries == 0) return; /* Like Up/F5, on first time start from current (usually last) entry, * but on subsequent times start at previous entry. */ @@ -455,7 +454,7 @@ PHISTORY_BUFFER Hist; PBYTE Buffer = (PBYTE)GetCommandHistoryRequest->History; ULONG BufferSize = GetCommandHistoryRequest->Length; - INT i; + UINT i; if ( !CsrValidateMessageBuffer(ApiMessage, (PVOID*)&GetCommandHistoryRequest->History, @@ -502,7 +501,7 @@ NTSTATUS Status; PHISTORY_BUFFER Hist; ULONG Length = 0; - INT i; + UINT i; if (!CsrValidateMessageBuffer(ApiMessage, (PVOID*)&GetCommandHistoryLengthRequest->ExeName.Buffer, Modified: branches/ros-csrss/win32ss/user/consrv/settings.c URL: http://svn.reactos.org/svn/reactos/branches/ros-csrss/win32ss/user/consrv/s… ============================================================================== --- branches/ros-csrss/win32ss/user/consrv/settings.c [iso-8859-1] (original) +++ branches/ros-csrss/win32ss/user/consrv/settings.c [iso-8859-1] Sun Apr 14 16:04:46 2013 @@ -268,7 +268,7 @@ } else if (!wcscmp(szValueName, L"HistoryNoDup")) { - ConsoleInfo->HistoryNoDup = Value; + ConsoleInfo->HistoryNoDup = (BOOLEAN)Value; RetVal = TRUE; } else if (!wcscmp(szValueName, L"FullScreen")) @@ -278,12 +278,12 @@ } else if (!wcscmp(szValueName, L"QuickEdit")) { - ConsoleInfo->QuickEdit = Value; + ConsoleInfo->QuickEdit = (BOOLEAN)Value; RetVal = TRUE; } else if (!wcscmp(szValueName, L"InsertMode")) { - ConsoleInfo->InsertMode = Value; + ConsoleInfo->InsertMode = (BOOLEAN)Value; RetVal = TRUE; } else if (!wcscmp(szValueName, L"ScreenBufferSize")) @@ -305,12 +305,12 @@ } else if (!wcscmp(szValueName, L"ScreenColors")) { - ConsoleInfo->ScreenAttrib = Value; + ConsoleInfo->ScreenAttrib = (USHORT)Value; RetVal = TRUE; } else if (!wcscmp(szValueName, L"PopupColors")) { - ConsoleInfo->PopupAttrib = Value; + ConsoleInfo->PopupAttrib = (USHORT)Value; RetVal = TRUE; } }

11 years, 5 months

[spetreolle] 58757: [LOG2LINES] Partly fix MSVC build. Disable MSVC build for now.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sun Apr 14 15:09:52 2013 New Revision: 58757 URL: http://svn.reactos.org/svn/reactos?rev=58757&view=rev Log: [LOG2LINES] Partly fix MSVC build. Disable MSVC build for now. Modified: trunk/reactos/tools/CMakeLists.txt trunk/reactos/tools/log2lines/compat.h Modified: trunk/reactos/tools/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/CMakeLists.txt?rev=5… ============================================================================== --- trunk/reactos/tools/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/tools/CMakeLists.txt [iso-8859-1] Sun Apr 14 15:09:52 2013 @@ -11,7 +11,9 @@ add_subdirectory(cdmake) add_subdirectory(gendib) add_subdirectory(geninc) +if(NOT MSVC) add_subdirectory(log2lines) +endif() add_subdirectory(mkhive) add_subdirectory(obj2bin) add_subdirectory(spec2def) Modified: trunk/reactos/tools/log2lines/compat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/log2lines/compat.h?r… ============================================================================== --- trunk/reactos/tools/log2lines/compat.h [iso-8859-1] (original) +++ trunk/reactos/tools/log2lines/compat.h [iso-8859-1] Sun Apr 14 15:09:52 2013 @@ -1,6 +1,6 @@ #pragma once -#if defined (__DJGPP__) || defined (__WIN32__) +#if defined(_WIN32) #include <direct.h> @@ -15,8 +15,7 @@ #define CP_CMD "copy /Y " #define DIR_FMT "dir /a:-d /s /b %s > %s" -#else /* not defined (__DJGPP__) || defined (__WIN32__) */ - +#else /* not defined (_WIN32) */ #include <limits.h> #include <sys/stat.h> @@ -32,6 +31,6 @@ #define CP_CMD "cp -f " #define DIR_FMT "find %s -type f > %s" -#endif /* not defined (__DJGPP__) || defined (__WIN32__) */ +#endif /* not defined (_WIN32) */ /* EOF */

11 years, 5 months

← Newer
1
...
11
12
13
14
15
16
17
...
27
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 April 2013