Ros-diffs July 2009

ros-diffs@reactos.org

27 participants
605 discussions

[ros-arm-bringup] 41870: Just cause it ain't AMD64 ain't meaning it's just x86... so make the macro x86-inclusive instead of x64-exclusive (since we don't want those definitions on ARM either)

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sat Jul 11 16:04:26 2009 New Revision: 41870 URL: http://svn.reactos.org/svn/reactos?rev=41870&view=rev Log: Just cause it ain't AMD64 ain't meaning it's just x86... so make the macro x86-inclusive instead of x64-exclusive (since we don't want those definitions on ARM either) Modified: trunk/reactos/boot/freeldr/freeldr/include/reactos.h Modified: trunk/reactos/boot/freeldr/freeldr/include/reactos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/reactos.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/reactos.h [iso-8859-1] Sat Jul 11 16:04:26 2009 @@ -23,7 +23,7 @@ /* Base Addres of Kernel in Physical Memory */ #define KERNEL_BASE_PHYS 0x800000 -#if !defined(_M_AMD64) +#if defined(_M_IX86) /* Bits to shift to convert a Virtual Address into an Offset in the Page Table */ #define PFN_SHIFT 12

15 years, 11 months

[ros-arm-bringup] 41869: Fix incorrect use of PVOID for pointer math, hidden by bad typecasts...

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sat Jul 11 16:03:28 2009 New Revision: 41869 URL: http://svn.reactos.org/svn/reactos?rev=41869&view=rev Log: Fix incorrect use of PVOID for pointer math, hidden by bad typecasts... Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/ex… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/ext2.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/ext2.c [iso-8859-1] Sat Jul 11 16:03:28 2009 @@ -606,7 +606,7 @@ { return FALSE; } - RtlCopyMemory(Ext2SuperBlock, (PVOID)(DISKREADBUFFER + 1024), 1024); + RtlCopyMemory(Ext2SuperBlock, (PVOID)((ULONG_PTR)DISKREADBUFFER + 1024), 1024); DPRINTM(DPRINT_FILESYSTEM, "Dumping super block:\n"); @@ -951,7 +951,7 @@ } // Copy the data to their buffer - RtlCopyMemory(InodeBuffer, (PVOID)(ULONG_PTR)(FILESYSBUFFER + (InodeOffsetInBlock * EXT3_INODE_SIZE(Ext2SuperBlock))), sizeof(EXT2_INODE)); + RtlCopyMemory(InodeBuffer, (PVOID)((ULONG_PTR)FILESYSBUFFER + (InodeOffsetInBlock * EXT3_INODE_SIZE(Ext2SuperBlock))), sizeof(EXT2_INODE)); DPRINTM(DPRINT_FILESYSTEM, "Dumping inode information:\n"); DPRINTM(DPRINT_FILESYSTEM, "i_mode = 0x%x\n", InodeBuffer->i_mode);

15 years, 11 months

[ros-arm-bringup] 41868: Fix lack of casts in certain intrinsic functions, and add others that were being called but not yet implemented... hopefully 4.4 handles built-in intrinsics for ARM now (remains to be seen)

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sat Jul 11 16:02:47 2009 New Revision: 41868 URL: http://svn.reactos.org/svn/reactos?rev=41868&view=rev Log: Fix lack of casts in certain intrinsic functions, and add others that were being called but not yet implemented... hopefully 4.4 handles built-in intrinsics for ARM now (remains to be seen) Modified: trunk/reactos/include/crt/mingw32/intrin_arm.h Modified: trunk/reactos/include/crt/mingw32/intrin_arm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw32/intrin… ============================================================================== --- trunk/reactos/include/crt/mingw32/intrin_arm.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/mingw32/intrin_arm.h [iso-8859-1] Sat Jul 11 16:02:47 2009 @@ -33,6 +33,21 @@ #endif #define _ReadWriteBarrier() __sync_synchronize() + +__INTRIN_INLINE char _InterlockedCompareExchange8(volatile char * const Destination, const char Exchange, const char Comperand) +{ + return __sync_val_compare_and_swap(Destination, Comperand, Exchange); +} + +__INTRIN_INLINE short _InterlockedCompareExchange16(volatile short * const Destination, const short Exchange, const short Comperand) +{ + return __sync_val_compare_and_swap(Destination, Comperand, Exchange); +} + +__INTRIN_INLINE long _InterlockedExchangeAdd16(volatile short * const Addend, const short Value) +{ + return __sync_fetch_and_add(Addend, Value); +} __INTRIN_INLINE long _InterlockedCompareExchange(volatile long * const dest, const long exch, const long comp) { @@ -103,7 +118,7 @@ __INTRIN_INLINE void * _InterlockedExchangePointer(void * volatile * const Target, void * const Value) { - return _InterlockedExchange(Target, Value); + return (void *)_InterlockedExchange((volatile long * const)Target, (const long)Value); } __INTRIN_INLINE char _InterlockedAnd8(volatile char * const value, const char mask)

15 years, 11 months

[ros-arm-bringup] 41867: KeGetDCacheFillSize is arch-specific, so define it in the x86 region only

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sat Jul 11 16:02:05 2009 New Revision: 41867 URL: http://svn.reactos.org/svn/reactos?rev=41867&view=rev Log: KeGetDCacheFillSize is arch-specific, so define it in the x86 region only Modified: trunk/reactos/include/ddk/winddk.h Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Sat Jul 11 16:02:05 2009 @@ -5676,6 +5676,8 @@ #define KeAcquireSpinLock(a,b) *(b) = KfAcquireSpinLock(a) #define KeReleaseSpinLock(a,b) KfReleaseSpinLock(a,b) +#define KeGetDcacheFillSize() 1L + #else // !defined (_X86_) FORCEINLINE @@ -5710,12 +5712,8 @@ #define KeAcquireSpinLock(SpinLock, OldIrql) \ *(OldIrql) = KeAcquireSpinLockRaiseToDpc(SpinLock) - + #endif // !defined (_X86_) - -#define KeGetDcacheFillSize() 1L - - /* ** Utillity functions

15 years, 11 months

[ros-arm-bringup] 41866: Import the generic template and comment out _M_ARM since the toolchain already defines it. THE ARM BUILD STARTS UP AGAIN (all host tools and makefiles are generated correctly). NEW TARGET TOOLCHAIN IS NOW CEGCC 0.55 (GCC-4.4.0).

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sat Jul 11 15:52:22 2009 New Revision: 41866 URL: http://svn.reactos.org/svn/reactos?rev=41866&view=rev Log: Import the generic template and comment out _M_ARM since the toolchain already defines it. THE ARM BUILD STARTS UP AGAIN (all host tools and makefiles are generated correctly). NEW TARGET TOOLCHAIN IS NOW CEGCC 0.55 (GCC-4.4.0). Modified: trunk/reactos/ReactOS-arm.rbuild Modified: trunk/reactos/ReactOS-arm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-arm.rbuild?rev=418… ============================================================================== --- trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] Sat Jul 11 15:52:22 2009 @@ -7,9 +7,9 @@ </xi:fallback> </xi:include> - <xi:include href="baseaddress.rbuild" /> + <xi:include href="ReactOS-generic.rbuild" /> - <define name="_M_ARM" /> +  <define name="_ARM_" /> <define name="__arm__" /> <define name="TARGET_arm" host="true" />

15 years, 11 months

[dchapyshev] 41865: - Return ERROR_NOT_SUPPORTED error code instead ERROR_CALL_NOT_IMPLEMENTED (in BackupRead, BackupSeek, BackupWrite) - Direct call for Set(Get)LastError - Add RemoveVectoredContinueHandler, InterlockedCompareExchange64, GetCurrentProcessorNumber, BaseCheckRunApp, AddVectoredContinueHandler to export list

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Sat Jul 11 15:50:42 2009 New Revision: 41865 URL: http://svn.reactos.org/svn/reactos?rev=41865&view=rev Log: - Return ERROR_NOT_SUPPORTED error code instead ERROR_CALL_NOT_IMPLEMENTED (in BackupRead, BackupSeek, BackupWrite) - Direct call for Set(Get)LastError - Add RemoveVectoredContinueHandler, InterlockedCompareExchange64, GetCurrentProcessorNumber, BaseCheckRunApp, AddVectoredContinueHandler to export list Modified: trunk/reactos/dll/win32/kernel32/file/backup.c trunk/reactos/dll/win32/kernel32/kernel32.pspec trunk/reactos/dll/win32/kernel32/misc/error.c Modified: trunk/reactos/dll/win32/kernel32/file/backup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/ba… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/backup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/backup.c [iso-8859-1] Sat Jul 11 15:50:42 2009 @@ -33,7 +33,7 @@ ) { UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + SetLastError(ERROR_NOT_SUPPORTED); return FALSE; } @@ -53,7 +53,7 @@ ) { UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + SetLastError(ERROR_NOT_SUPPORTED); return FALSE; } @@ -74,7 +74,7 @@ ) { UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + SetLastError(ERROR_NOT_SUPPORTED); return FALSE; } Modified: trunk/reactos/dll/win32/kernel32/kernel32.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] Sat Jul 11 15:50:42 2009 @@ -8,9 +8,10 @@ @ stdcall AddLocalAlternateComputerNameA(str ptr) @ stdcall AddLocalAlternateComputerNameW(wstr ptr) ;@ stdcall AddRefActCtx(ptr) +@ stdcall AddVectoredContinueHandler(long ptr) ntdll.RtlAddVectoredContinueHandler @ stdcall AddVectoredExceptionHandler(long ptr) ntdll.RtlAddVectoredExceptionHandler @ stdcall AllocConsole() -@ stub AllocLSCallback ; missing in XP SP3 +@ stub AllocLSCallback ; missing in XP SP3 and 2003 R2 @ stdcall AllocateUserPhysicalPages(long ptr ptr) @ stdcall AreFileApisANSI() @ stdcall AssignProcessToJobObject(ptr ptr) @@ -19,6 +20,7 @@ @ stdcall BackupSeek(ptr long long ptr ptr ptr) @ stdcall BackupWrite(ptr ptr long ptr long long ptr) @ stdcall BaseCheckAppcompatCache(long long long ptr) ;check +@ stub BaseCheckRunApp @ stdcall BaseCleanupAppcompatCache() @ stdcall BaseCleanupAppcompatCacheSupport(ptr) @ stdcall BaseDumpAppcompatCache() @@ -336,6 +338,7 @@ @ stdcall GetCurrentDirectoryW(long ptr) @ stdcall GetCurrentProcess() @ stdcall GetCurrentProcessId() +@ stdcall GetCurrentProcessorNumber() ntdll.RtlGetCurrentProcessorNumber @ stdcall GetCurrentThread() @ stdcall GetCurrentThreadId() @ stdcall GetDateFormatA(long long ptr str ptr long) @@ -388,7 +391,7 @@ @ stub GetSCallbackTemplate ; missing in XP SP3 @ stdcall GetLargePageMinimum() @ stdcall GetLargestConsoleWindowSize(long) -@ stdcall GetLastError() +@ stdcall GetLastError() ntdll.RtlGetLastWin32Error @ stdcall GetLinguistLangSize(ptr) @ stdcall GetLocalTime(ptr) @ stdcall GetLocaleInfoA(long long ptr long) @@ -573,7 +576,8 @@ ;@ stdcall InitializeCriticalSectionEx(ptr long long) ; missing in XP SP3 @ stdcall InitializeSListHead(ptr) ntdll.RtlInitializeSListHead @ stdcall InitializeSRWLock(ptr) ntdll.RtlInitializeSRWLock -@ stdcall InterlockedCompareExchange (ptr long long) +@ stdcall InterlockedCompareExchange(ptr long long) +@ stdcall InterlockedCompareExchange64(ptr double double) ntdll.RtlInterlockedCompareExchange64 @ stdcall InterlockedDecrement(ptr) @ stdcall InterlockedExchange(ptr long) @ stdcall InterlockedExchangeAdd (ptr long ) @@ -742,6 +746,7 @@ @ stdcall RemoveDirectoryW(wstr) @ stdcall RemoveLocalAlternateComputerNameA(str long) @ stdcall RemoveLocalAlternateComputerNameW(wstr long) +@ stdcall RemoveVectoredContinueHandler(ptr) ntdll.RtlRemoveVectoredContinueHandler @ stdcall RemoveVectoredExceptionHandler(ptr) ntdll.RtlRemoveVectoredExceptionHandler @ stdcall ReplaceFile(wstr wstr wstr long ptr ptr) ReplaceFileW @ stdcall ReplaceFileA(str str str long ptr ptr) @@ -838,7 +843,7 @@ @ stdcall SetHandleInformation(long long long) @ stdcall SetInformationJobObject(long long ptr long) @ stub SetLastConsoleEventActive ; missing in XP SP3 -@ stdcall SetLastError(long) +@ stdcall SetLastError(long) ntdll.RtlSetLastWin32Error @ stub SetLocalPrimaryComputerNameA ; missing in XP SP3 @ stub SetLocalPrimaryComputerNameW ; missing in XP SP3 @ stdcall SetLocalTime(ptr) Modified: trunk/reactos/dll/win32/kernel32/misc/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/er… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/error.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/error.c [iso-8859-1] Sat Jul 11 15:50:42 2009 @@ -15,28 +15,6 @@ #define NDEBUG #include <debug.h> - - -/* - * @implemented - */ -VOID -WINAPI -SetLastError (DWORD dwErrorCode) -{ - NtCurrentTeb ()->LastErrorValue = (ULONG) dwErrorCode; -} - - -/* - * @implemented - */ -DWORD -WINAPI -GetLastError (VOID) -{ - return (DWORD) (NtCurrentTeb ()->LastErrorValue); -} /*

15 years, 11 months

[ros-arm-bringup] 41864: Too many things in -i386 were still "generic" and had to be duplicated accross plat-specific rbuild files, so moved a whole bunch of them into the generic rbuild. Ironically, the one thing that isn't generic -- which files get built -- was in the generic file, blocking the arm rbuild from ever being able to use it, so I split this out now. Cleaned up the i386 and arm rbuild files to use the new generic rbuild. Brought the arm rbuild file up to spec to use the new compile

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sat Jul 11 15:47:21 2009 New Revision: 41864 URL: http://svn.reactos.org/svn/reactos?rev=41864&view=rev Log: Too many things in -i386 were still "generic" and had to be duplicated accross plat-specific rbuild files, so moved a whole bunch of them into the generic rbuild. Ironically, the one thing that isn't generic -- which files get built -- was in the generic file, blocking the arm rbuild from ever being able to use it, so I split this out now. Cleaned up the i386 and arm rbuild files to use the new generic rbuild. Brought the arm rbuild file up to spec to use the new compilerset/linkerset and msvc-compliant options. Modified: trunk/reactos/ReactOS-arm.rbuild trunk/reactos/ReactOS-generic.rbuild trunk/reactos/ReactOS-i386.rbuild Modified: trunk/reactos/ReactOS-arm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-arm.rbuild?rev=418… ============================================================================== --- trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] Sat Jul 11 15:47:21 2009 @@ -8,76 +8,37 @@ </xi:include> <xi:include href="baseaddress.rbuild" /> - - <define name="__REACTOS__" /> + + <define name="_M_ARM" /> <define name="_ARM_" /> <define name="__arm__" /> <define name="TARGET_arm" host="true" /> - - <compilerflag compiler="cc,cxx">-gstabs+</compilerflag> - <compilerflag compiler="as">-gstabs+</compilerflag> - - <if property="DBG" value="1"> - <define name="DBG">1</define> - <define name="_SEH_ENABLE_TRACE" /> - <property name="DBG_OR_KDBG" value="true" /> - </if> - <if property="DBG" value="0"> - <define name="DBG">0</define> - </if> - - <if property="KDBG" value="1"> - <define name="KDBG">1</define> - <property name="DBG_OR_KDBG" value="true" /> - </if> - - <include>.</include> - <include>include</include> - <include root="intermediate">include</include> - <include>include/psdk</include> - <include root="intermediate">include/psdk</include> - <include>include/dxsdk</include> - <include root="intermediate">include/dxsdk</include> - <include>include/crt</include> - <include>include/crt/mingw32</include> - <include>include/ddk</include> - <include>include/GL</include> - <include>include/ndk</include> - <include>include/reactos</include> - <include root="intermediate">include/reactos</include> - <include root="intermediate">include/reactos/mc</include> - <include>include/reactos/libs</include> - <include>include/reactos/arm</include> - - <property name="WINEBUILD_FLAGS" value="--kill-at"/> - <property name="NTOSKRNL_SHARED" value="-file-alignment=0x1000 -section-alignment=0x1000 -shared"/> + + <define name="USE_COMPILER_EXCEPTIONS" /> + + <property name="NTOSKRNL_SHARED" value="-file-alignment=0x1000 -section-alignment=0x1000 -shared"/> + <property name="WINEBUILD_FLAGS" value="--kill-at"/> + + <include>include/reactos/arm</include> <if property="SARCH" value="versatile"> <define name="BOARD_CONFIG_VERSATILE"/> </if> - <if property="OPTIMIZE" value="1"> - <compilerflag>-Os</compilerflag> - <compilerflag>-ftracer</compilerflag> - </if> - <if property="OPTIMIZE" value="2"> - <compilerflag>-Os</compilerflag> - </if> - <if property="OPTIMIZE" value="3"> - <compilerflag>-O1</compilerflag> - </if> - <if property="OPTIMIZE" value="4"> - <compilerflag>-O2</compilerflag> - </if> - <if property="OPTIMIZE" value="5"> - <compilerflag>-O3</compilerflag> - </if> + <group compilerset="gcc"> + <if property="OPTIMIZE" value="1"> + <compilerflag>-ftracer</compilerflag> + </if> + <compilerflag>-Wno-attributes</compilerflag> + </group> - <define name="__MSVCRT__"/> - <compilerflag>-Wno-attributes</compilerflag> - <compilerflag>-fno-strict-aliasing</compilerflag> - <linkerflag>--strip-debug</linkerflag> - <linkerflag>-static</linkerflag> + + <define name="__MSVCRT__"/>  + + <group linkerset="ld"> + <linkerflag>--strip-debug</linkerflag>  + <linkerflag>-static</linkerflag>  + </group> <directory name="media"> <directory name="nls"> @@ -196,6 +157,4 @@ </directory> </directory> </directory> - - <define name="_USE_32BIT_TIME_T" /> </project> Modified: trunk/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev… ============================================================================== --- trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] Sat Jul 11 15:47:21 2009 @@ -85,50 +85,12 @@ <include host="true" root="intermediate">include</include> <include host="true">include/reactos</include> <include host="true">include/reactos/wine</include> - - <directory name="base"> - <xi:include href="base/base.rbuild" /> - </directory> - <directory name="boot"> - <xi:include href="boot/boot.rbuild" /> - </directory> - <directory name="dll"> - <xi:include href="dll/dll.rbuild" /> - </directory> - <directory name="drivers"> - <xi:include href="drivers/drivers.rbuild" /> - </directory> - <directory name="hal"> - <xi:include href="hal/hal.rbuild" /> - </directory> - <directory name="include"> - <xi:include href="include/directory.rbuild" /> - </directory> - <directory name="lib"> - <xi:include href="lib/lib.rbuild" /> - </directory> - <directory name="media"> - <xi:include href="media/media.rbuild" /> - </directory> - <directory name="modules"> - <xi:include href="modules/directory.rbuild" /> - </directory> - <directory name="ntoskrnl"> - <xi:include href="ntoskrnl/ntoskrnl.rbuild" /> - <if property="BUILD_MP" value="1"> - <xi:include href="ntoskrnl/ntkrnlmp.rbuild" /> - </if> - </directory> - <directory name="subsystems"> - <xi:include href="subsystems/subsystems.rbuild" /> - </directory> - <directory name="tools"> - <xi:include href="tools/tools.rbuild" /> - </directory> - + <group compilerset="gcc"> <compilerflag>-Wall</compilerflag> <compilerflag compiler="cxx">-Wno-non-virtual-dtor</compilerflag> + <compilerflag compiler="cc,cxx">-gstabs+</compilerflag> + <compilerflag compiler="as">-gstabs+</compilerflag> </group> <group compilerset="msc"> @@ -137,4 +99,56 @@ <compilerflag>/Zi</compilerflag> <compilerflag>/W1</compilerflag> </group> + + <group compilerset="gcc"> + <if property="OPTIMIZE" value="1"> + <compilerflag>-Os</compilerflag> + </if> + <if property="OPTIMIZE" value="2"> + <compilerflag>-Os</compilerflag> + </if> + <if property="OPTIMIZE" value="3"> + <compilerflag>-O1</compilerflag> + </if> + <if property="OPTIMIZE" value="4"> + <compilerflag>-O2</compilerflag> + </if> + <if property="OPTIMIZE" value="5"> + <compilerflag>-O3</compilerflag> + </if> + + <compilerflag>-fno-strict-aliasing</compilerflag> + <compilerflag>-Wno-strict-aliasing</compilerflag> + <compilerflag>-Wpointer-arith</compilerflag> + <compilerflag>-Wno-multichar</compilerflag> +  + </group> + + <group compilerset="msc"> + <if property="OPTIMIZE" value="1"> + <compilerflag>/O1</compilerflag> + </if> + <if property="OPTIMIZE" value="2"> + <compilerflag>/O2</compilerflag> + </if> + <if property="OPTIMIZE" value="3"> + <compilerflag>/Ox /GS-</compilerflag> + <compilerflag>/Ot</compilerflag> + </if> + <if property="OPTIMIZE" value="4"> + <compilerflag>/Ox /GS-</compilerflag> + <compilerflag>/Os</compilerflag> + </if> + <if property="OPTIMIZE" value="5"> + <compilerflag>/Ox /GS-</compilerflag> + <compilerflag>/Os</compilerflag> + <compilerflag>/Ob2</compilerflag> + <compilerflag>/GF</compilerflag> + <compilerflag>/Gy</compilerflag> + </if> + + <compilerflag>/GS-</compilerflag> + </group> + + <define name="_USE_32BIT_TIME_T" /> </group> Modified: trunk/reactos/ReactOS-i386.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-i386.rbuild?rev=41… ============================================================================== --- trunk/reactos/ReactOS-i386.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-i386.rbuild [iso-8859-1] Sat Jul 11 15:47:21 2009 @@ -21,64 +21,53 @@ <group compilerset="gcc"> <if property="OPTIMIZE" value="1"> - <compilerflag>-Os</compilerflag> <compilerflag>-ftracer</compilerflag> <compilerflag>-momit-leaf-frame-pointer</compilerflag> </if> - <if property="OPTIMIZE" value="2"> - <compilerflag>-Os</compilerflag> - </if> - <if property="OPTIMIZE" value="3"> - <compilerflag>-O1</compilerflag> - </if> - <if property="OPTIMIZE" value="4"> - <compilerflag>-O2</compilerflag> - </if> - <if property="OPTIMIZE" value="5"> - <compilerflag>-O3</compilerflag> - </if> - - <compilerflag>-mpreferred-stack-boundary=2</compilerflag> - <compilerflag>-fno-strict-aliasing</compilerflag> - <compilerflag>-Wno-strict-aliasing</compilerflag> - <compilerflag>-Wpointer-arith</compilerflag> - <compilerflag>-Wno-multichar</compilerflag> - - <compilerflag>-gstabs+</compilerflag> -  - </group> - - <group compilerset="msc"> - <if property="OPTIMIZE" value="1"> - <compilerflag>/O1</compilerflag> - </if> - <if property="OPTIMIZE" value="2"> - <compilerflag>/O2</compilerflag> - </if> - <if property="OPTIMIZE" value="3"> - <compilerflag>/Ox /GS-</compilerflag> - <compilerflag>/Ot</compilerflag> - </if> - <if property="OPTIMIZE" value="4"> - <compilerflag>/Ox /GS-</compilerflag> - <compilerflag>/Os</compilerflag> - </if> - <if property="OPTIMIZE" value="5"> - <compilerflag>/Ox /GS-</compilerflag> - <compilerflag>/Os</compilerflag> - <compilerflag>/Ob2</compilerflag> - <compilerflag>/GF</compilerflag> - <compilerflag>/Gy</compilerflag> - </if> - - <compilerflag>/GS-</compilerflag> - </group> - - <compilerflag compiler="as">-gstabs+</compilerflag> + <compilerflag>-mpreferred-stack-boundary=2</compilerflag> + </group> <group linkerset="ld"> <linkerflag>-disable-stdcall-fixup</linkerflag> </group> - - <define name="_USE_32BIT_TIME_T" /> + + <directory name="base"> + <xi:include href="base/base.rbuild" /> + </directory> + <directory name="boot"> + <xi:include href="boot/boot.rbuild" /> + </directory> + <directory name="dll"> + <xi:include href="dll/dll.rbuild" /> + </directory> + <directory name="drivers"> + <xi:include href="drivers/drivers.rbuild" /> + </directory> + <directory name="hal"> + <xi:include href="hal/hal.rbuild" /> + </directory> + <directory name="include"> + <xi:include href="include/directory.rbuild" /> + </directory> + <directory name="lib"> + <xi:include href="lib/lib.rbuild" /> + </directory> + <directory name="media"> + <xi:include href="media/media.rbuild" /> + </directory> + <directory name="modules"> + <xi:include href="modules/directory.rbuild" /> + </directory> + <directory name="ntoskrnl"> + <xi:include href="ntoskrnl/ntoskrnl.rbuild" /> + <if property="BUILD_MP" value="1"> + <xi:include href="ntoskrnl/ntkrnlmp.rbuild" /> + </if> + </directory> + <directory name="subsystems"> + <xi:include href="subsystems/subsystems.rbuild" /> + </directory> + <directory name="tools"> + <xi:include href="tools/tools.rbuild" /> + </directory> </project>

15 years, 11 months

[ros-arm-bringup] 41863: stop building ntdll as a win32dll so we can fucking stop auto-importing mingw_common and kernel32 into it... it's supposed to be built as a /SUBSYSTEM:WINDOWS dll but since rbuild has now decided to fuck around with these DLLs, it's safer to build it as native so it can be left the fuck alone and not auto-import half the tree

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sat Jul 11 15:43:49 2009 New Revision: 41863 URL: http://svn.reactos.org/svn/reactos?rev=41863&view=rev Log: stop building ntdll as a win32dll so we can fucking stop auto-importing mingw_common and kernel32 into it... it's supposed to be built as a /SUBSYSTEM:WINDOWS dll but since rbuild has now decided to fuck around with these DLLs, it's safer to build it as native so it can be left the fuck alone and not auto-import half the tree Modified: trunk/reactos/dll/ntdll/ntdll.rbuild Modified: trunk/reactos/dll/ntdll/ntdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ntdll.rbuild?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ntdll.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ntdll.rbuild [iso-8859-1] Sat Jul 11 15:43:49 2009 @@ -4,7 +4,7 @@ <module name="ntsys" type="staticlibrary"> <importlibrary definition="def/ntsys.pspec" dllname="ntdll.dll" root="intermediate" /> </module> - <module name="ntdll" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_NTDLL}" installbase="system32" installname="ntdll.dll" iscrt="yes"> + <module name="ntdll" type="nativedll" entrypoint="0" baseaddress="${BASEADDRESS_NTDLL}" installbase="system32" installname="ntdll.dll" iscrt="yes"> <bootstrap installbase="$(CDOUTPUT)/system32" /> <importlibrary definition="def/ntdll_$(ARCH).def" /> <include base="ntdll">include</include>

15 years, 11 months

[ros-arm-bringup] 41862: __gnu__inline is not supported for a long time in gcc anymore, so remove this to fix a bunch of warnings

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sat Jul 11 15:42:29 2009 New Revision: 41862 URL: http://svn.reactos.org/svn/reactos?rev=41862&view=rev Log: __gnu__inline is not supported for a long time in gcc anymore, so remove this to fix a bunch of warnings Modified: trunk/reactos/include/reactos/wine/list.h Modified: trunk/reactos/include/reactos/wine/list.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/list.… ============================================================================== --- trunk/reactos/include/reactos/wine/list.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/list.h [iso-8859-1] Sat Jul 11 15:42:29 2009 @@ -25,7 +25,7 @@ #define __WINE_SERVER_LIST_INLINE inline #else #if defined(__GNUC__) -#define __WINE_SERVER_LIST_INLINE extern __inline__ __attribute__((__always_inline__,__gnu_inline__)) +#define __WINE_SERVER_LIST_INLINE extern __inline__ __attribute__((__always_inline__)) #elif defined(_MSC_VER) #define __WINE_SERVER_LIST_INLINE __inline #else

15 years, 11 months

[ros-arm-bringup] 41861: use %zd for SIZE_T, not just %d

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Sat Jul 11 15:41:42 2009 New Revision: 41861 URL: http://svn.reactos.org/svn/reactos?rev=41861&view=rev Log: use %zd for SIZE_T, not just %d Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Sat Jul 11 15:41:42 2009 @@ -498,7 +498,7 @@ if ( ModuleHandlerInformations[i].cflags && ModuleHandlerInformations[i].cflags[0] ) { fprintf ( fMakefile, - "MODULETYPE%d_%sFLAGS:=%s\n", + "MODULETYPE%zd_%sFLAGS:=%s\n", i, "C", ModuleHandlerInformations[i].cflags ); @@ -507,7 +507,7 @@ if ( ModuleHandlerInformations[i].cflags && ModuleHandlerInformations[i].cflags[0] ) { fprintf ( fMakefile, - "MODULETYPE%d_%sFLAGS:=%s\n", + "MODULETYPE%zd_%sFLAGS:=%s\n", i, "CXX", ModuleHandlerInformations[i].cflags ); @@ -516,7 +516,7 @@ if ( ModuleHandlerInformations[i].nasmflags && ModuleHandlerInformations[i].nasmflags[0] ) { fprintf ( fMakefile, - "MODULETYPE%d_%sFLAGS:=%s\n", + "MODULETYPE%zd_%sFLAGS:=%s\n", i, "NASM", ModuleHandlerInformations[i].nasmflags );

15 years, 11 months

← Newer
1
...
43
44
45
46
47
48
49
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2009