Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 49821: [CMAKE] - Add missing asm dependency.
by akhaldi＠svn.reactos.org 27 Nov '10

27 Nov '10

Author: akhaldi Date: Sat Nov 27 15:31:33 2010 New Revision: 49821 URL: http://svn.reactos.org/svn/reactos?rev=49821&view=rev Log: [CMAKE] - Add missing asm dependency. Modified: branches/cmake-bringup/hal/CMakeLists.txt Modified: branches/cmake-bringup/hal/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/hal/CMakeLists.tx… ============================================================================== --- branches/cmake-bringup/hal/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/hal/CMakeLists.txt [iso-8859-1] Sat Nov 27 15:31:33 2010 @@ -100,7 +100,7 @@ add_library(mini_hal ${MINI_HAL_SOURCE}) set_property(TARGET mini_hal PROPERTY COMPILE_DEFINITIONS "_BLDR_;_MINIHAL_") -add_dependencies(mini_hal psdk bugcodes) +add_dependencies(mini_hal psdk bugcodes asm) add_minicd_target(hal reactos hal.dll) add_livecd_target(hal reactos/system32) else()

1 0

[fireball] 49820: - Fix POINT/POINTL mismatch.
by fireball＠svn.reactos.org 27 Nov '10

27 Nov '10

Author: fireball Date: Sat Nov 27 14:53:22 2010 New Revision: 49820 URL: http://svn.reactos.org/svn/reactos?rev=49820&view=rev Log: - Fix POINT/POINTL mismatch. Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c [iso-8859-1] Sat Nov 27 14:53:22 2010 @@ -313,7 +313,7 @@ INT XSrc, INT YSrc, DWORD rop) { BOOLEAN bRet; - POINT SourcePoint, BrushOrigin; + POINTL SourcePoint, BrushOrigin; RECTL DestRect; EXLATEOBJ exlo; XLATEOBJ *XlateObj = NULL; Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c [iso-8859-1] Sat Nov 27 14:53:22 2010 @@ -30,7 +30,7 @@ BOOLEAN bRet; RECTL DestRect; MIX Mix; - POINT BrushOrigin; + POINTL BrushOrigin; DestRect.left = LeftRect + pDC->rcDcRect.left + pDC->rcVport.left; DestRect.right = RightRect + pDC->rcDcRect.left + pDC->rcVport.left; @@ -105,7 +105,7 @@ BOOLEAN bRet; MIX Mix; INT i; - POINT BrushOrigin; + POINTL BrushOrigin; BrushOrigin.x = pDC->dclevel.ptlBrushOrigin.x + pDC->rcDcRect.left; BrushOrigin.y = pDC->dclevel.ptlBrushOrigin.y + pDC->rcDcRect.top;

1 0

[akhaldi] 49819: [CMAKE] - Fix xinput9_1_0
by akhaldi＠svn.reactos.org 27 Nov '10

27 Nov '10

Author: akhaldi Date: Sat Nov 27 13:05:52 2010 New Revision: 49819 URL: http://svn.reactos.org/svn/reactos?rev=49819&view=rev Log: [CMAKE] - Fix xinput9_1_0 Modified: branches/cmake-bringup/dll/win32/xinput9_1_0/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/xinput9_1_0/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput9… ============================================================================== --- branches/cmake-bringup/dll/win32/xinput9_1_0/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/xinput9_1_0/CMakeLists.txt [iso-8859-1] Sat Nov 27 13:05:52 2010 @@ -8,8 +8,8 @@ set_source_files_properties(xinput9_1_0.def PROPERTIES EXTERNAL_OBJECT TRUE) endif() +set_module_type(xinput9_1_0 win32dll) + add_importlibs(xinput9_1_0 msvcrt kernel32) -set_module_type(xinput9_1_0 win32dll) - add_cab_target(xinput9_1_0 1)

1 0

[akhaldi] 49818: [CMAKE] - Fix xinput1_2
by akhaldi＠svn.reactos.org 27 Nov '10

27 Nov '10

Author: akhaldi Date: Sat Nov 27 12:55:14 2010 New Revision: 49818 URL: http://svn.reactos.org/svn/reactos?rev=49818&view=rev Log: [CMAKE] - Fix xinput1_2 Modified: branches/cmake-bringup/dll/win32/xinput1_2/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/xinput1_2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput1… ============================================================================== --- branches/cmake-bringup/dll/win32/xinput1_2/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/xinput1_2/CMakeLists.txt [iso-8859-1] Sat Nov 27 12:55:14 2010 @@ -8,8 +8,8 @@ set_source_files_properties(xinput1_2.def PROPERTIES EXTERNAL_OBJECT TRUE) endif() +set_module_type(xinput1_2 win32dll) + add_importlibs(xinput1_2 msvcrt kernel32) -set_module_type(xinput1_2 win32dll) - add_cab_target(xinput1_2 1)

1 0

[akhaldi] 49817: [CMAKE] - Improve kernel32.
by akhaldi＠svn.reactos.org 27 Nov '10

27 Nov '10

Author: akhaldi Date: Sat Nov 27 12:49:37 2010 New Revision: 49817 URL: http://svn.reactos.org/svn/reactos?rev=49817&view=rev Log: [CMAKE] - Improve kernel32. Modified: branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/kernel3… ============================================================================== --- branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Sat Nov 27 12:49:37 2010 @@ -112,13 +112,13 @@ ${CMAKE_CURRENT_BINARY_DIR}/kernel32_k32.h.gch ${SOURCE}) -set_module_type(kernel32 win32dll) set_entrypoint(kernel32 DllMain@12) +set_image_base(kernel32 ${baseaddress_kernel32}) target_link_libraries(kernel32 ${PSEH_LIB}) add_importlibs(kernel32 ntdll) add_pch(kernel32 ${CMAKE_CURRENT_SOURCE_DIR}/k32.h ${SOURCE}) -add_dependencies(kernel32 errcodes asm) +add_dependencies(kernel32 psdk buildno_header errcodes asm) add_cab_target(kernel32 1) add_importlib_target(kernel32.spec)

1 0

[spetreolle] 49816: [CMAKE] Add msvcrt dependencies.
by spetreolle＠svn.reactos.org 27 Nov '10

27 Nov '10

Author: spetreolle Date: Sat Nov 27 12:46:17 2010 New Revision: 49816 URL: http://svn.reactos.org/svn/reactos?rev=49816&view=rev Log: [CMAKE] Add msvcrt dependencies. Modified: branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt/… ============================================================================== --- branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt [iso-8859-1] Sat Nov 27 12:46:17 2010 @@ -13,6 +13,8 @@ include_directories(${REACTOS_SOURCE_DIR}/lib/sdk/crt/include) +set_rc_compiler() + list(APPEND SOURCE dllmain.c msvcrt_stubs.c @@ -27,6 +29,7 @@ set_target_properties(msvcrt PROPERTIES LINK_FLAGS "-u __seh_longjmp_unwind@4") endif() +add_dependencies(msvcrt psdk buildno_header) set_entrypoint(msvcrt DllMain@12) set_image_base(msvcrt ${baseaddress_msvcrt})

1 0

[akhaldi] 49815: [CMAKE] - Fix msvcrt.
by akhaldi＠svn.reactos.org 27 Nov '10

27 Nov '10

Author: akhaldi Date: Sat Nov 27 12:41:23 2010 New Revision: 49815 URL: http://svn.reactos.org/svn/reactos?rev=49815&view=rev Log: [CMAKE] - Fix msvcrt. Modified: branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt/… ============================================================================== --- branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvcrt/CMakeLists.txt [iso-8859-1] Sat Nov 27 12:41:23 2010 @@ -27,9 +27,8 @@ set_target_properties(msvcrt PROPERTIES LINK_FLAGS "-u __seh_longjmp_unwind@4") endif() -set_module_type(msvcrt win32dll) - set_entrypoint(msvcrt DllMain@12) +set_image_base(msvcrt ${baseaddress_msvcrt}) target_link_libraries(msvcrt crt

1 0

[tkreuzer] 49814: [INTRIN] Implement _inp, _inpd, _inpw, _outp, _outpd, _outpw as intrinsics, like on MSVC
by tkreuzer＠svn.reactos.org 27 Nov '10

27 Nov '10

Author: tkreuzer Date: Sat Nov 27 12:36:14 2010 New Revision: 49814 URL: http://svn.reactos.org/svn/reactos?rev=49814&view=rev Log: [INTRIN] Implement _inp, _inpd, _inpw, _outp, _outpd, _outpw as intrinsics, like on MSVC Modified: branches/cmake-bringup/include/crt/mingw32/intrin_x86.h Modified: branches/cmake-bringup/include/crt/mingw32/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/crt/mingw… ============================================================================== --- branches/cmake-bringup/include/crt/mingw32/intrin_x86.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/crt/mingw32/intrin_x86.h [iso-8859-1] Sat Nov 27 12:36:14 2010 @@ -1113,6 +1113,39 @@ __asm__ __volatile__("rep; outsl" : : [Port] "d" (Port), [Buffer] "S" (Buffer), "c" (Count)); } +__INTRIN_INLINE int _inp(unsigned short Port) +{ + return __inbyte(Port); +} + +__INTRIN_INLINE unsigned short _inpw(unsigned short Port) +{ + return __inword(Port); +} + +__INTRIN_INLINE unsigned long _inpd(unsigned short Port) +{ + return __indword(Port); +} + +__INTRIN_INLINE int _outp(unsigned short Port, int databyte) +{ + __outbyte(Port, databyte); + return databyte; +} + +__INTRIN_INLINE unsigned short _outpw(unsigned short Port, unsigned short dataword) +{ + __outword(Port, dataword); + return dataword; +} + +__INTRIN_INLINE unsigned long _outpd(unsigned short Port, unsigned long dataword) +{ + __outdword(Port, dataword); + return dataword; +} + /*** System information ***/ __INTRIN_INLINE void __cpuid(int CPUInfo[], const int InfoType)

1 0

[akhaldi] 49813: [CMAKE] - Add ccache support.
by akhaldi＠svn.reactos.org 27 Nov '10

27 Nov '10

Author: akhaldi Date: Sat Nov 27 11:27:09 2010 New Revision: 49813 URL: http://svn.reactos.org/svn/reactos?rev=49813&view=rev Log: [CMAKE] - Add ccache support. Modified: branches/cmake-bringup/toolchain-mingw32.cmake Modified: branches/cmake-bringup/toolchain-mingw32.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-mingw32… ============================================================================== --- branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] Sat Nov 27 11:27:09 2010 @@ -16,13 +16,19 @@ set(MINGW_PREFIX "x86_64-w64-mingw32-" CACHE STRING "MinGW Prefix") endif(ARCH MATCHES i386) +if(ENABLE_CCACHE) +set(CCACHE "ccache" CACHE STRING "ccache") +else() +set(CCACHE "" CACHE STRING "ccache") +endif() + # the name of the target operating system SET(CMAKE_SYSTEM_NAME Windows) SET(CMAKE_SYSTEM_PROCESSOR i686) # which compilers to use for C and C++ -SET(CMAKE_C_COMPILER ${MINGW_PREFIX}gcc) -SET(CMAKE_CXX_COMPILER ${MINGW_PREFIX}g++) +SET(CMAKE_C_COMPILER ${CCACHE} ${MINGW_PREFIX}gcc) +SET(CMAKE_CXX_COMPILER ${CCACHE} ${MINGW_PREFIX}g++) SET(CMAKE_RC_COMPILER ${MINGW_PREFIX}windres) SET(CMAKE_ASM_COMPILER ${MINGW_PREFIX}gcc) SET(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -x assembler-with-cpp -o <OBJECT> -I${REACTOS_SOURCE_DIR}/include/asm -I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> -D__ASM__ -c <SOURCE>")

1 0

[akhaldi] 49812: [CMAKE] - Comment out what seems to be a missing file.
by akhaldi＠svn.reactos.org 27 Nov '10

27 Nov '10

Author: akhaldi Date: Sat Nov 27 10:48:44 2010 New Revision: 49812 URL: http://svn.reactos.org/svn/reactos?rev=49812&view=rev Log: [CMAKE] - Comment out what seems to be a missing file. Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/CMake… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] Sat Nov 27 10:48:44 2010 @@ -573,10 +573,9 @@ # This is a temporary solution until we have proper crt libs list(APPEND MSVCSUP_SOURCE - misc/fltused.c - except/i386/chkstk_asm.s - math/i386/ftol2_asm.S -) +# misc/fltused.c FIXME: missing file ? + except/i386/chkstk_asm.s + math/i386/ftol2_asm.S) add_library(msvcsup ${MSVCSUP_SOURCE}) add_dependencies(msvcsup psdk buildno_header asm)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs