Ros-diffs February 2011

ros-diffs@reactos.org

18 participants
352 discussions

[tkreuzer] 50696: [ASM] Add ljmp16 .fill and .space macros

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Feb 14 20:12:12 2011 New Revision: 50696 URL: http://svn.reactos.org/svn/reactos?rev=50696&view=rev Log: [ASM] Add ljmp16 .fill and .space macros Modified: branches/cmake-bringup/include/asm/asm.inc Modified: branches/cmake-bringup/include/asm/asm.inc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/asm/asm.i… ============================================================================== --- branches/cmake-bringup/include/asm/asm.inc [iso-8859-1] (original) +++ branches/cmake-bringup/include/asm/asm.inc [iso-8859-1] Mon Feb 14 20:12:12 2011 @@ -11,10 +11,12 @@ /* Allow ".name" identifiers */ OPTION DOTNAME +#ifdef _M_IX86 .686P .XMM .MODEL FLAT ASSUME CS:NOTHING, DS:NOTHING, ES:NOTHING, FS:NOTHING, GS:NOTHING +#endif /* Hex numbers need to be in 01ABh format */ #define HEX(x) 0##x##h @@ -68,11 +70,11 @@ .code16 MACRO ASSUME nothing - .text SEGMENT use16 + .text16 SEGMENT use16 ENDM .endcode16 MACRO - .text ENDS + .text16 ENDS ENDM .bss MACRO @@ -111,12 +113,33 @@ ORG value ENDM -.fill MACRO repeat, size, value -// FIXME +.fill MACRO count, size, value + REPEAT count + if (size == 1) + DB value + elseif (size == 2) + DW value + elseif (size == 4) + DD value + else + endif + ENDM +ENDM + +.space MACRO count + DB 0 DUP (count) ENDM ljmp MACRO segment, offset -// FIXME + DB 0EAh + DD offset + DW segment +ENDM + +ljmp16 MACRO segment, offset + DB 0EAh + DW offset + DW segment ENDM UNIMPLEMENTED MACRO name @@ -177,6 +200,10 @@ #define ENDR .endr .macro ljmp segment, offset + jmp far ptr \segment:\offset +.endm + +.macro ljmp16 segment, offset jmp far ptr \segment:\offset .endm

13 years, 10 months

[tkreuzer] 50695: [WIN32K] - Remove gexloTrivial, it was never used - Remove EXLATEOBJ_vInitTrivial and move the code into EXLATEOBJ_vInitialize - Properly set XO_TABLE - Set ppalDstDc in EXLATEOBJ...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Feb 14 17:23:58 2011 New Revision: 50695 URL: http://svn.reactos.org/svn/reactos?rev=50695&view=rev Log: [WIN32K] - Remove gexloTrivial, it was never used - Remove EXLATEOBJ_vInitTrivial and move the code into EXLATEOBJ_vInitialize - Properly set XO_TABLE - Set ppalDstDc in EXLATEOBJ_vInitXlateFromDCs Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] Mon Feb 14 17:23:58 2011 @@ -17,8 +17,6 @@ /** Globals *******************************************************************/ ULONG giUniqueXlate = 0; -EXLATEOBJ gexloTrivial; -XLATEOBJ* gpxloTrivial = &gexloTrivial.xlo; const BYTE gajXlate5to8[32] = { 0, 8, 16, 25, 33, 41, 49, 58, 66, 74, 82, 90, 99,107,115,123, @@ -328,23 +326,6 @@ /** Private Functions *********************************************************/ - -VOID -NTAPI -EXLATEOBJ_vInitTrivial(PEXLATEOBJ pexlo) -{ - pexlo->xlo.iUniq = InterlockedIncrement((LONG*)&giUniqueXlate); - pexlo->xlo.flXlate = XO_TRIVIAL; - pexlo->xlo.iSrcType = PAL_RGB; - pexlo->xlo.iDstType = PAL_RGB; - pexlo->xlo.cEntries = 0; - pexlo->xlo.pulXlate = pexlo->aulXlate; - pexlo->pfnXlate = EXLATEOBJ_iXlateTrivial; - pexlo->ppalSrc = &gpalRGB; - pexlo->ppalDst = &gpalRGB; - pexlo->ppalDstDc = &gpalRGB; - pexlo->hColorTransform = NULL; -} VOID NTAPI @@ -359,22 +340,24 @@ ULONG cEntries; ULONG i, ulColor; - EXLATEOBJ_vInitTrivial(pexlo); - - if (!ppalSrc || !ppalDst) - { - return; - } - + if (!ppalSrc) ppalSrc = &gpalRGB; + if (!ppalDst) ppalDst = &gpalRGB; + + pexlo->xlo.iUniq = InterlockedIncrement((LONG*)&giUniqueXlate); + pexlo->xlo.cEntries = 0; + pexlo->xlo.flXlate = 0; + pexlo->xlo.pulXlate = pexlo->aulXlate; + pexlo->pfnXlate = EXLATEOBJ_iXlateTrivial; + pexlo->hColorTransform = NULL; pexlo->ppalSrc = ppalSrc; pexlo->ppalDst = ppalDst; pexlo->xlo.iSrcType = ppalSrc->flFlags; pexlo->xlo.iDstType = ppalDst->flFlags; - - if (ppalDst == ppalSrc || - ((ppalDst->flFlags == PAL_RGB || ppalDst->flFlags == PAL_BGR) && - ppalDst->flFlags == ppalSrc->flFlags)) - { + pexlo->ppalDstDc = &gpalRGB; + + if (ppalDst == ppalSrc) + { + pexlo->xlo.flXlate |= XO_TRIVIAL; return; } @@ -460,12 +443,14 @@ return; } } + + pexlo->pfnXlate = EXLATEOBJ_iXlateTable; pexlo->xlo.cEntries = cEntries; - - pexlo->pfnXlate = EXLATEOBJ_iXlateTable; + pexlo->xlo.flXlate |= XO_TABLE; + if (ppalDst->flFlags & PAL_INDEXED) { - pexlo->xlo.flXlate |= XO_TABLE; + ULONG cDiff = 0; for (i = 0; i < cEntries; i++) { @@ -476,11 +461,11 @@ pexlo->xlo.pulXlate[i] = PALETTE_ulGetNearestPaletteIndex(ppalDst, ulColor); - if (pexlo->xlo.pulXlate[i] != i) - pexlo->xlo.flXlate &= ~XO_TRIVIAL; + if (pexlo->xlo.pulXlate[i] != i) cDiff++; } - if (pexlo->xlo.flXlate & XO_TRIVIAL) + /* Check if we have only trivial mappings */ + if (cDiff == 0) { if (pexlo->xlo.pulXlate != pexlo->aulXlate) { @@ -489,6 +474,7 @@ } pexlo->pfnXlate = EXLATEOBJ_iXlateTrivial; pexlo->xlo.flXlate = XO_TRIVIAL; + pexlo->xlo.cEntries = 0; return; } } @@ -619,6 +605,8 @@ pdcSrc->pdcattr->crBackgroundClr, pdcDst->pdcattr->crBackgroundClr, pdcDst->pdcattr->crForegroundClr); + + pexlo->ppalDstDc = pdcDst->dclevel.ppal; } VOID @@ -637,7 +625,6 @@ NTAPI InitXlateImpl(VOID) { - EXLATEOBJ_vInitTrivial(&gexloTrivial); return STATUS_SUCCESS; }

13 years, 10 months

[tkreuzer] 50694: [WIN32K] Fix initialization of XLATEOBJ, when source and dest format are equal. Patch by Thomas Faber (thfabba at gmx de) See issue #5828 for more details.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Feb 14 16:04:01 2011 New Revision: 50694 URL: http://svn.reactos.org/svn/reactos?rev=50694&view=rev Log: [WIN32K] Fix initialization of XLATEOBJ, when source and dest format are equal. Patch by Thomas Faber (thfabba at gmx de) See issue #5828 for more details. Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c Modified: trunk/reactos/subsystems/win32/win32k/eng/xlate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/xlate.c [iso-8859-1] Mon Feb 14 16:04:01 2011 @@ -361,9 +361,7 @@ EXLATEOBJ_vInitTrivial(pexlo); - if (ppalDst == ppalSrc || !ppalSrc || !ppalDst || - ((ppalDst->flFlags == PAL_RGB || ppalDst->flFlags == PAL_BGR) && - ppalDst->flFlags == ppalSrc->flFlags)) + if (!ppalSrc || !ppalDst) { return; } @@ -372,6 +370,13 @@ pexlo->ppalDst = ppalDst; pexlo->xlo.iSrcType = ppalSrc->flFlags; pexlo->xlo.iDstType = ppalDst->flFlags; + + if (ppalDst == ppalSrc || + ((ppalDst->flFlags == PAL_RGB || ppalDst->flFlags == PAL_BGR) && + ppalDst->flFlags == ppalSrc->flFlags)) + { + return; + } /* Chack if both of the pallettes are indexed */ if (!(ppalSrc->flFlags & PAL_INDEXED) || !(ppalDst->flFlags & PAL_INDEXED)) @@ -607,13 +612,6 @@ psurfDst = pdcDst->dclevel.pSurface; psurfSrc = pdcSrc->dclevel.pSurface; - /* Check for trivial color translation */ - if (psurfDst == psurfSrc) - { - EXLATEOBJ_vInitTrivial(pexlo); - return; - } - /* Normal initialisation. No surface means DEFAULT_BITMAP */ EXLATEOBJ_vInitialize(pexlo, psurfSrc ? psurfSrc->ppal : &gpalMono,

13 years, 10 months

[tkreuzer] 50693: [MSVCRT] _CxxThrowException is stdcall, not cdecl. Someone please forward this to wine

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Feb 14 14:28:07 2011 New Revision: 50693 URL: http://svn.reactos.org/svn/reactos?rev=50693&view=rev Log: [MSVCRT] _CxxThrowException is stdcall, not cdecl. Someone please forward this to wine Modified: branches/cmake-bringup/dll/win32/msvcrt/msvcrt.spec branches/cmake-bringup/dll/win32/msvcrt20/msvcrt20.spec branches/cmake-bringup/dll/win32/msvcrt40/msvcrt40.spec branches/cmake-bringup/lib/sdk/crt/except/cppexcept.c branches/cmake-bringup/lib/sdk/crt/include/internal/wine/cppexcept.h Modified: branches/cmake-bringup/dll/win32/msvcrt/msvcrt.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt/… ============================================================================== --- branches/cmake-bringup/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] Mon Feb 14 14:28:07 2011 @@ -99,7 +99,7 @@ # stub _CrtSetReportHook # stub _CrtSetReportHook2 # stub _CrtSetReportMode -@ cdecl _CxxThrowException(long long) +@ stdcall _CxxThrowException(long long) @ cdecl -i386 -norelay _EH_prolog() @ cdecl _Getdays() @ cdecl _Getmonths() Modified: branches/cmake-bringup/dll/win32/msvcrt20/msvcrt20.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt2… ============================================================================== --- branches/cmake-bringup/dll/win32/msvcrt20/msvcrt20.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvcrt20/msvcrt20.spec [iso-8859-1] Mon Feb 14 14:28:07 2011 @@ -453,7 +453,7 @@ @ cdecl -arch=i386 _CIsqrt() msvcrt._CIsqrt @ cdecl -arch=i386 _CItan() msvcrt._CItan @ cdecl -arch=i386 _CItanh() msvcrt._CItanh -@ cdecl _CxxThrowException(long long) msvcrt._CxxThrowException +@ stdcall _CxxThrowException(long long) msvcrt._CxxThrowException @ extern _HUGE msvcrt._HUGE @ cdecl _XcptFilter(long ptr) msvcrt._XcptFilter @ cdecl -i386 __CxxFrameHandler(ptr ptr ptr ptr) msvcrt.__CxxFrameHandler Modified: branches/cmake-bringup/dll/win32/msvcrt40/msvcrt40.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt4… ============================================================================== --- branches/cmake-bringup/dll/win32/msvcrt40/msvcrt40.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvcrt40/msvcrt40.spec [iso-8859-1] Mon Feb 14 14:28:07 2011 @@ -497,7 +497,7 @@ @ cdecl -arch=i386 _CIsqrt() msvcrt._CIsqrt @ cdecl -arch=i386 _CItan() msvcrt._CItan @ cdecl -arch=i386 _CItanh() msvcrt._CItanh -@ cdecl _CxxThrowException(long long) msvcrt._CxxThrowException +@ stdcall _CxxThrowException(long long) msvcrt._CxxThrowException @ cdecl -i386 _EH_prolog() msvcrt._EH_prolog @ extern _HUGE msvcrt._HUGE @ cdecl _XcptFilter(long ptr) msvcrt._XcptFilter Modified: branches/cmake-bringup/lib/sdk/crt/except/cppexcept.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/excep… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/except/cppexcept.c [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/except/cppexcept.c [iso-8859-1] Mon Feb 14 14:28:07 2011 @@ -490,7 +490,7 @@ /********************************************************************* * _CxxThrowException (MSVCRT.@) */ -void CDECL _CxxThrowException( exception *object, const cxx_exception_type *type ) +void WINAPI _CxxThrowException( exception *object, const cxx_exception_type *type ) { ULONG_PTR args[3]; Modified: branches/cmake-bringup/lib/sdk/crt/include/internal/wine/cppexcept.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/inclu… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/include/internal/wine/cppexcept.h [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/include/internal/wine/cppexcept.h [iso-8859-1] Mon Feb 14 14:28:07 2011 @@ -150,7 +150,7 @@ const cxx_type_info_table *type_info_table; /* list of types for this exception object */ } cxx_exception_type; -void CDECL _CxxThrowException(exception*,const cxx_exception_type*); +void WINAPI _CxxThrowException(exception*,const cxx_exception_type*); int CDECL _XcptFilter(NTSTATUS, PEXCEPTION_POINTERS); int CDECL __CppXcptFilter(NTSTATUS, PEXCEPTION_POINTERS);

13 years, 10 months

[tkreuzer] 50692: [NTOSKRNL] Fix build with MSVC

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Feb 14 13:45:15 2011 New Revision: 50692 URL: http://svn.reactos.org/svn/reactos?rev=50692&view=rev Log: [NTOSKRNL] Fix build with MSVC Modified: branches/cmake-bringup/include/asm/syscalls.inc branches/cmake-bringup/ntoskrnl/ex/zw.S branches/cmake-bringup/ntoskrnl/include/internal/i386/asmmacro.S branches/cmake-bringup/ntoskrnl/ke/i386/usercall_asm.S Modified: branches/cmake-bringup/include/asm/syscalls.inc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/asm/sysca… ============================================================================== --- branches/cmake-bringup/include/asm/syscalls.inc [iso-8859-1] (original) +++ branches/cmake-bringup/include/asm/syscalls.inc [iso-8859-1] Mon Feb 14 13:45:15 2011 @@ -1,5 +1,6 @@ #ifdef _M_IX86 +EXTERN _KiSystemService:PROC #define KUSER_SHARED_SYSCALL HEX(7ffe0300) #define KGDT_R0_CODE 8 MACRO(STUBCODE_U, SyscallId, StackBytes) @@ -17,6 +18,7 @@ ret StackBytes ENDM #elif defined(_M_AMD64) +EXTERN KiSystemService:PROC MACRO(STUBCODE_U, SyscallId, StackBytes) mov eax, SyscallId mov r10, rcx Modified: branches/cmake-bringup/ntoskrnl/ex/zw.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/ex/zw.S?… ============================================================================== --- branches/cmake-bringup/ntoskrnl/ex/zw.S [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/ex/zw.S [iso-8859-1] Mon Feb 14 13:45:15 2011 @@ -1,8 +1,6 @@ #include <asm.inc> #include <syscalls.inc> - -EXTERN _KiSystemService .code Modified: branches/cmake-bringup/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/include/… ============================================================================== --- branches/cmake-bringup/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] Mon Feb 14 13:45:15 2011 @@ -6,7 +6,7 @@ * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) * Timo Kreuzer (timo.kreuzer(a)reactos.org) */ - + // Arguments for idt #define INT_32_DPL0 HEX(08E00) #define INT_32_DPL3 HEX(0EE00) @@ -43,7 +43,7 @@ #else #define LOCK #define ACQUIRE_SPINLOCK(x, y) -#define RELEASE_SPINLOCK(x) +#define RELEASE_SPINLOCK(x) #endif // @@ -138,7 +138,7 @@ if (Flags AND KI_DONT_SAVE_SEGS) /* Initialize TrapFrame segment registers with sane values */ - mov eax, 0x23 + mov eax, KGDT_R3_DATA OR 3 mov ecx, fs mov [esp + KTRAP_FRAME_DS], eax mov [esp + KTRAP_FRAME_ES], eax Modified: branches/cmake-bringup/ntoskrnl/ke/i386/usercall_asm.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/ke/i386/… ============================================================================== --- branches/cmake-bringup/ntoskrnl/ke/i386/usercall_asm.S [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/ke/i386/usercall_asm.S [iso-8859-1] Mon Feb 14 13:45:15 2011 @@ -15,6 +15,8 @@ EXTERN _MmGrowKernelStack@4:PROC EXTERN _KeUserCallbackDispatcher:PROC EXTERN @KiServiceExit@8:PROC +EXTERN _KeGetCurrentIrql@0:PROC +EXTERN _KeBugCheckEx@20:PROC /* FUNCTIONS ****************************************************************/ .code @@ -30,7 +32,7 @@ /*++ - * @name KiCallUserMode + * @name KiCallUserMode * * The KiSwitchToUserMode routine sets up a Trap Frame and a Callback stack * for the purpose of switching to user mode. The actual final jump is done @@ -406,7 +408,7 @@ ret 12 /*++ - * @name KeSwitchKernelStack + * @name KeSwitchKernelStack * * The KeSwitchKernelStack routine switches from the current thread's stack * to the new specified base and limit. @@ -419,7 +421,7 @@ * * @return The previous Stack Base of the thread. * - * @remark This routine should typically only be used when converting from a + * @remark This routine should typically only be used when converting from a * non-GUI to a GUI Thread. The caller is responsible for freeing the * previous stack. The new stack values MUST be valid before calling * this routine.

13 years, 10 months

[tkreuzer] 50691: [KDCOM] Fix build of new kdcom

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Feb 14 13:42:40 2011 New Revision: 50691 URL: http://svn.reactos.org/svn/reactos?rev=50691&view=rev Log: [KDCOM] Fix build of new kdcom Added: branches/cmake-bringup/drivers/base/kddll/kdcom.spec - copied unchanged from r50690, branches/cmake-bringup/drivers/base/kddll/kddll.spec Removed: branches/cmake-bringup/drivers/base/kddll/kddll.spec Modified: branches/cmake-bringup/drivers/base/kddll/CMakeLists.txt Modified: branches/cmake-bringup/drivers/base/kddll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/kddl… ============================================================================== --- branches/cmake-bringup/drivers/base/kddll/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/base/kddll/CMakeLists.txt [iso-8859-1] Mon Feb 14 13:42:40 2011 @@ -1,11 +1,11 @@ -spec2def(kdcom.dll kddll.spec) +spec2def(kdcom.dll kdcom.spec) add_library(kdcom SHARED kdcom.c kddll.c kdserial.c - ${CMAKE_CURRENT_BINARY_DIR}/kddll.def) + ${CMAKE_CURRENT_BINARY_DIR}/kdcom.def) set_entrypoint(kdcom 0) set_subsystem(kdcom native) @@ -14,4 +14,4 @@ add_importlibs(kdcom ntoskrnl hal) add_dependencies(kdcom psdk buildno_header bugcodes) -add_importlib_target(kddll.spec kdcom.dll) +add_importlib_target(kdcom.spec) Removed: branches/cmake-bringup/drivers/base/kddll/kddll.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/kddl… ============================================================================== --- branches/cmake-bringup/drivers/base/kddll/kddll.spec [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/base/kddll/kddll.spec (removed) @@ -1,8 +1,0 @@ -@ stdcall KdD0Transition() -@ stdcall KdD3Transition() -@ stdcall KdDebuggerInitialize0(ptr) -@ stdcall KdDebuggerInitialize1(ptr) -@ stdcall KdReceivePacket(long ptr ptr ptr ptr) -@ stdcall KdRestore(long) -@ stdcall KdSave(long) -@ stdcall KdSendPacket(long ptr ptr ptr)

13 years, 10 months

[janderwald] 50690: - Fix compiling (not linking)

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Feb 14 13:02:24 2011 New Revision: 50690 URL: http://svn.reactos.org/svn/reactos?rev=50690&view=rev Log: - Fix compiling (not linking) Modified: branches/cmake-bringup/dll/directx/ksproxy/datatype.cpp branches/cmake-bringup/dll/directx/ksproxy/input_pin.cpp branches/cmake-bringup/dll/directx/ksproxy/interface.cpp branches/cmake-bringup/dll/directx/ksproxy/ksproxy.cpp branches/cmake-bringup/dll/directx/ksproxy/output_pin.cpp Modified: branches/cmake-bringup/dll/directx/ksproxy/datatype.cpp URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/kspro… ============================================================================== --- branches/cmake-bringup/dll/directx/ksproxy/datatype.cpp [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/ksproxy/datatype.cpp [iso-8859-1] Mon Feb 14 13:02:24 2011 @@ -13,6 +13,7 @@ const GUID IID_IUnknown = {0x00000000, 0x0000, 0x0000, {0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}}; #endif const GUID IID_IClassFactory = {0x00000001, 0x0000, 0x0000, {0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46}}; +const GUID IID_IKsDataTypeHandler = {0x5FFBAA02L, 0x49A3, 0x11D0, {0x9F, 0x36, 0x00, 0xAA, 0x00, 0xA2, 0x16, 0xA1}}; class CKsDataTypeHandler : public IKsDataTypeHandler { Modified: branches/cmake-bringup/dll/directx/ksproxy/input_pin.cpp URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/kspro… ============================================================================== --- branches/cmake-bringup/dll/directx/ksproxy/input_pin.cpp [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/ksproxy/input_pin.cpp [iso-8859-1] Mon Feb 14 13:02:24 2011 @@ -10,7 +10,8 @@ const GUID IID_IKsPinPipe = {0xe539cd90, 0xa8b4, 0x11d1, {0x81, 0x89, 0x00, 0xa0, 0xc9, 0x06, 0x28, 0x02}}; const GUID IID_IKsPinEx = {0x7bb38260L, 0xd19c, 0x11d2, {0xb3, 0x8a, 0x00, 0xa0, 0xc9, 0x5e, 0xc2, 0x2e}}; - +const GUID IID_IKsPin = {0xb61178d1L, 0xa2d9, 0x11cf, {0x9e, 0x53, 0x00, 0xaa, 0x00, 0xa2, 0x16, 0xa1}}; +const GUID IID_IKsInterfaceHandler = {0xD3ABC7E0L, 0x9A61, 0x11D0, {0xA4, 0x0D, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; #ifndef _MSC_VER Modified: branches/cmake-bringup/dll/directx/ksproxy/interface.cpp URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/kspro… ============================================================================== --- branches/cmake-bringup/dll/directx/ksproxy/interface.cpp [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/ksproxy/interface.cpp [iso-8859-1] Mon Feb 14 13:02:24 2011 @@ -9,6 +9,8 @@ #include "precomp.h" const GUID IID_IKsObject = {0x423c13a2, 0x2070, 0x11d0, {0x9e, 0xf7, 0x00, 0xaa, 0x00, 0xa2, 0x16, 0xa1}}; + +extern const GUID IID_IKsInterfaceHandler; class CKsInterfaceHandler : public IKsInterfaceHandler { Modified: branches/cmake-bringup/dll/directx/ksproxy/ksproxy.cpp URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/kspro… ============================================================================== --- branches/cmake-bringup/dll/directx/ksproxy/ksproxy.cpp [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/ksproxy/ksproxy.cpp [iso-8859-1] Mon Feb 14 13:02:24 2011 @@ -16,11 +16,12 @@ #ifndef _MSC_VER -const GUID CLSID_KsIBasicAudioInterfaceHandler = {0xb9f8ac3e, 0x0f71, 0x11d2, {0xb7, 0x2c, 0x00, 0xc0, 0x4f, 0xb6, 0xbd, 0x3d}}; const GUID KSPROPSETID_Pin = {0x8C134960, 0x51AD, 0x11CF, {0x87, 0x8A, 0x94, 0xF8, 0x01, 0xC1, 0x00, 0x00}}; const GUID KSINTERFACESETID_Standard = {STATIC_KSINTERFACESETID_Standard}; const GUID CLSID_Proxy = {0x17CCA71B, 0xECD7, 0x11D0, {0xB9, 0x08, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; #endif + +const GUID CLSID_KsIBasicAudioInterfaceHandler = {0xb9f8ac3e, 0x0f71, 0x11d2, {0xb7, 0x2c, 0x00, 0xc0, 0x4f, 0xb6, 0xbd, 0x3d}}; static INTERFACE_TABLE InterfaceTable[] = { Modified: branches/cmake-bringup/dll/directx/ksproxy/output_pin.cpp URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/kspro… ============================================================================== --- branches/cmake-bringup/dll/directx/ksproxy/output_pin.cpp [iso-8859-1] (original) +++ branches/cmake-bringup/dll/directx/ksproxy/output_pin.cpp [iso-8859-1] Mon Feb 14 13:02:24 2011 @@ -7,6 +7,9 @@ * PROGRAMMERS: Johannes Anderwald (janderwald(a)reactos.org) */ #include "precomp.h" + +extern const GUID IID_IKsPin; +extern const GUID IID_IKsInterfaceHandler; class COutputPin : public IPin, public IKsObject, @@ -1681,7 +1684,7 @@ if (GetSupportedSets(&pGuid, &NumGuids)) { // load all proxy plugins - if (FAILED(LoadProxyPlugins(pGuid, NumGuids))); + if (FAILED(LoadProxyPlugins(pGuid, NumGuids))) { #ifdef KSPROXY_TRACE OutputDebugStringW(L"COutputPin::Connect LoadProxyPlugins failed\n");

13 years, 10 months

[tkreuzer] 50689: [CMAKE] - Drop support for MSVC versions below 1300 - use the same flags for WDK / host as normal - Disable optimization on Debug builds, its incompatible with /ZI

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Feb 14 11:09:48 2011 New Revision: 50689 URL: http://svn.reactos.org/svn/reactos?rev=50689&view=rev Log: [CMAKE] - Drop support for MSVC versions below 1300 - use the same flags for WDK / host as normal - Disable optimization on Debug builds, its incompatible with /ZI Modified: branches/cmake-bringup/cmake/Platform/Windows-cl.cmake branches/cmake-bringup/msc.cmake branches/cmake-bringup/toolchain-msvc.cmake Modified: branches/cmake-bringup/cmake/Platform/Windows-cl.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/cmake/Platform/Wi… ============================================================================== --- branches/cmake-bringup/cmake/Platform/Windows-cl.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/cmake/Platform/Windows-cl.cmake [iso-8859-1] Mon Feb 14 11:09:48 2011 @@ -19,44 +19,43 @@ SET(CMAKE_USE_WDK_ENV 1) ENDIF() -IF(CMAKE_USE_WDK_ENV) - - # Detect output architecture - IF(NOT ARCH) - IF($ENV{AMD64} MATCHES 1) - SET(ARCH amd64) - ELSE() - SET(ARCH i386) - ENDIF() - ENDIF() - - # Add library directories - STRING(REPLACE * ${ARCH} ATL_LIB_PATH $ENV{ATL_LIB_PATH}) - STRING(REPLACE * ${ARCH} CRT_LIB_PATH $ENV{CRT_LIB_PATH}) - STRING(REPLACE * ${ARCH} DDK_LIB_PATH $ENV{DDK_LIB_PATH}) - STRING(REPLACE * ${ARCH} KMDF_LIB_PATH $ENV{KMDF_LIB_PATH}) - STRING(REPLACE * ${ARCH} MFC_LIB_PATH $ENV{MFC_LIB_PATH}) - STRING(REPLACE * ${ARCH} SDK_LIB_PATH $ENV{SDK_LIB_PATH}) - LINK_DIRECTORIES(${ATL_LIB_PATH} - ${CRT_LIB_PATH} - ${DDK_LIB_PATH} - ${IFSKIT_LIB_PATH} - ${KMDF_LIB_PATH} - ${MFC_LIB_PATH} - ${SDK_LIB_PATH}) - - # Add environment variables - IF(NOT CMAKE_CROSSCOMPILING) - SET(ENV{INCLUDE} "$ENV{CRT_INC_PATH};$ENV{SDK_INC_PATH};$ENV{SDK_INC_PATH}\\crt\\stl60") - include_directories($ENV{INCLUDE}) - SET(ENV{LIBPATH} "${CRT_LIB_PATH};${SDK_LIB_PATH}") - - SET(ENV{USE_MSVCRT} 1) - SET(ENV{USE_STL} 1) - SET(ENV{STL_VER} 60) - - ENDIF() -ENDIF() +if(CMAKE_USE_WDK_ENV) + + # Detect output architecture + if(NOT ARCH) + if($ENV{AMD64} MATCHES 1) + set(ARCH amd64) + set(MSVC_C_ARCHITECTURE_ID 64) + else() + set(ARCH i386) + endif() + endif() + + # Add library directories + STRING(REPLACE * ${ARCH} ATL_LIB_PATH $ENV{ATL_LIB_PATH}) + STRING(REPLACE * ${ARCH} CRT_LIB_PATH $ENV{CRT_LIB_PATH}) + STRING(REPLACE * ${ARCH} DDK_LIB_PATH $ENV{DDK_LIB_PATH}) + STRING(REPLACE * ${ARCH} KMDF_LIB_PATH $ENV{KMDF_LIB_PATH}) + STRING(REPLACE * ${ARCH} MFC_LIB_PATH $ENV{MFC_LIB_PATH}) + STRING(REPLACE * ${ARCH} SDK_LIB_PATH $ENV{SDK_LIB_PATH}) + LINK_DIRECTORIES(${ATL_LIB_PATH} + ${CRT_LIB_PATH} + ${DDK_LIB_PATH} + ${IFSKIT_LIB_PATH} + ${KMDF_LIB_PATH} + ${MFC_LIB_PATH} + ${SDK_LIB_PATH}) + + # Add environment variables + if(NOT CMAKE_CROSSCOMPILING) + set(ENV{INCLUDE} "$ENV{CRT_INC_PATH};$ENV{SDK_INC_PATH};$ENV{SDK_INC_PATH}\\crt\\stl60") + include_directories($ENV{INCLUDE}) + set(ENV{LIBPATH} "${CRT_LIB_PATH};${SDK_LIB_PATH}") + set(ENV{USE_MSVCRT} 1) + set(ENV{USE_STL} 1) + set(ENV{STL_VER} 60) + endif() +endif() ############ @@ -193,68 +192,34 @@ SET(MSVC_INCREMENTAL_DEFAULT ON) ENDIF() -# default to Debug builds -if(MSVC_VERSION GREATER 1310) - # for 2005 make sure the manifest is put in the dll with mt -# SET(CMAKE_CXX_CREATE_SHARED_LIBRARY "<CMAKE_COMMAND> -E vs_link_dll ${CMAKE_CXX_CREATE_SHARED_LIBRARY}") -# SET(CMAKE_CXX_CREATE_SHARED_MODULE "<CMAKE_COMMAND> -E vs_link_dll ${CMAKE_CXX_CREATE_SHARED_MODULE}") - # create a C shared library -# SET(CMAKE_C_CREATE_SHARED_LIBRARY "${CMAKE_CXX_CREATE_SHARED_LIBRARY}") - # create a C shared module just copy the shared library rule -# SET(CMAKE_C_CREATE_SHARED_MODULE "${CMAKE_CXX_CREATE_SHARED_MODULE}") -# SET(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_COMMAND> -E vs_link_exe ${CMAKE_CXX_LINK_EXECUTABLE}") -# SET(CMAKE_C_LINK_EXECUTABLE "<CMAKE_COMMAND> -E vs_link_exe ${CMAKE_C_LINK_EXECUTABLE}") - - set(CMAKE_BUILD_TYPE_INIT Debug) - - if(ENV{DDKBUILDENV} OR NOT CMAKE_CROSSCOMPILING) - set(CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MTd /ZI /Ob0 /Od") - set(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /ZI /Ob0 /Od") - else() - set(CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /ZI /Ob0 /Od") - set(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /ZI /Ob0 /Od") - endif() - - SET (CMAKE_CXX_FLAGS_INIT "/DWIN32 /D_WINDOWS /W3 /Zm1000 /EHsc") - SET (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "/O1 /Ob1 /D NDEBUG") - SET (CMAKE_CXX_FLAGS_RELEASE_INIT "/O2 /Ob2 /D NDEBUG") - SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "/Zi /O2 /Ob1") - SET (CMAKE_C_FLAGS_INIT "/DWIN32 /D_WINDOWS /W3 /Zm1000") - SET (CMAKE_C_FLAGS_MINSIZEREL_INIT "/O1 /Ob1 /D NDEBUG") - SET (CMAKE_C_FLAGS_RELEASE_INIT "/O2 /Ob2 /D NDEBUG") - SET (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "/Zi /O2 /Ob1") - SET (CMAKE_C_STANDARD_LIBRARIES_INIT "kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib ") - SET (CMAKE_EXE_LINKER_FLAGS_INIT "${CMAKE_EXE_LINKER_FLAGS_INIT}") -ELSE(MSVC_VERSION GREATER 1310) - IF(CMAKE_USING_VC_FREE_TOOLS) - MESSAGE(STATUS "Using FREE VC TOOLS, NO DEBUG available") - SET(CMAKE_BUILD_TYPE_INIT Release) - SET (CMAKE_CXX_FLAGS_INIT "/DWIN32 /D_WINDOWS /W3 /Zm1000 /GX") - SET (CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MTd /Zi /Ob0 /Od /GZ") - SET (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "/MT /O1 /Ob1 /D NDEBUG") - SET (CMAKE_CXX_FLAGS_RELEASE_INIT "/MT /O2 /Ob2 /D NDEBUG") - SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "/MT /Zi /O2 /Ob1 /D NDEBUG") - SET (CMAKE_C_FLAGS_INIT "/DWIN32 /D_WINDOWS /W3 /Zm1000") - SET (CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MTd /Zi /Ob0 /Od /GZ") - SET (CMAKE_C_FLAGS_MINSIZEREL_INIT "/MT /O1 /Ob1 /D NDEBUG") - SET (CMAKE_C_FLAGS_RELEASE_INIT "/MT /O2 /Ob2 /D NDEBUG") - SET (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "/MT /Zi /O2 /Ob1 /D NDEBUG") - ELSE(CMAKE_USING_VC_FREE_TOOLS) - SET(CMAKE_BUILD_TYPE_INIT Debug) - SET (CMAKE_CXX_FLAGS_INIT "/DWIN32 /D_WINDOWS /W3 /Zm1000 /GX") - SET (CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MTd /Zi /Ob0 /Od /GZ") - SET (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "/O1 /Ob1 /D NDEBUG") - SET (CMAKE_CXX_FLAGS_RELEASE_INIT "/O2 /Ob2 /D NDEBUG") - SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "/Zi /O2 /Ob1 /D NDEBUG") - SET (CMAKE_C_FLAGS_INIT "/DWIN32 /D_WINDOWS /W3 /Zm1000") - SET (CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /Zi /Ob0 /Od /GZ") - SET (CMAKE_C_FLAGS_MINSIZEREL_INIT "/O1 /Ob1 /D NDEBUG") - SET (CMAKE_C_FLAGS_RELEASE_INIT "/O2 /Ob2 /D NDEBUG") - SET (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "/Zi /O2 /Ob1 /D NDEBUG") - ENDIF(CMAKE_USING_VC_FREE_TOOLS) - SET (CMAKE_C_STANDARD_LIBRARIES_INIT "kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib") -ENDIF(MSVC_VERSION GREATER 1310) - +# No support for old versions +if(MSVC_VERSION LESS 1310) +message(FATAL_ERROR "Your compiler is too old. Get a newer version!") +endif() + +# for 2005 make sure the manifest is put in the dll with mt +#SET(CMAKE_CXX_CREATE_SHARED_LIBRARY "<CMAKE_COMMAND> -E vs_link_dll ${CMAKE_CXX_CREATE_SHARED_LIBRARY}") +#SET(CMAKE_CXX_CREATE_SHARED_MODULE "<CMAKE_COMMAND> -E vs_link_dll ${CMAKE_CXX_CREATE_SHARED_MODULE}") +# create a C shared library +#SET(CMAKE_C_CREATE_SHARED_LIBRARY "${CMAKE_CXX_CREATE_SHARED_LIBRARY}") +# create a C shared module just copy the shared library rule +#SET(CMAKE_C_CREATE_SHARED_MODULE "${CMAKE_CXX_CREATE_SHARED_MODULE}") +#SET(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_COMMAND> -E vs_link_exe ${CMAKE_CXX_LINK_EXECUTABLE}") +#SET(CMAKE_C_LINK_EXECUTABLE "<CMAKE_COMMAND> -E vs_link_exe ${CMAKE_C_LINK_EXECUTABLE}") + +SET(CMAKE_BUILD_TYPE_INIT Debug) +SET(CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /ZI /Ob0 /Od") +SET(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /ZI /Ob0 /Od") +SET(CMAKE_CXX_FLAGS_INIT "/DWIN32 /D_WINDOWS /W3 /Zm1000 /EHsc") +SET(CMAKE_CXX_FLAGS_MINSIZEREL_INIT "/O1 /Ob1 /D NDEBUG") +SET(CMAKE_CXX_FLAGS_RELEASE_INIT "/O2 /Ob2 /D NDEBUG") +SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "/Zi /O2 /Ob1") +SET(CMAKE_C_FLAGS_INIT "/DWIN32 /D_WINDOWS /W3 /Zm1000") +SET(CMAKE_C_FLAGS_MINSIZEREL_INIT "/O1 /Ob1 /D NDEBUG") +SET(CMAKE_C_FLAGS_RELEASE_INIT "/O2 /Ob2 /D NDEBUG") +SET(CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "/Zi /O2 /Ob1") +SET(CMAKE_C_STANDARD_LIBRARIES_INIT "kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib ") +SET(CMAKE_EXE_LINKER_FLAGS_INIT "${CMAKE_EXE_LINKER_FLAGS_INIT}") SET(CMAKE_CXX_STANDARD_LIBRARIES_INIT "${CMAKE_C_STANDARD_LIBRARIES_INIT}") # executable linker flags Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=506… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Mon Feb 14 11:09:48 2011 @@ -1,6 +1,7 @@ -if(0) # Fixme redefinition warning -if(OPTIMIZE STREQUAL "1") +if(${CMAKE_BUILD_TYPE} MATCHES Debug) + # no optimitation +elseif(OPTIMIZE STREQUAL "1") add_definitions(/O1) elseif(OPTIMIZE STREQUAL "2") add_definitions(/O2) @@ -11,7 +12,6 @@ elseif(OPTIMIZE STREQUAL "5") add_definitions(/GF /Gy /Ob2 /Os /Ox /GS-) endif() -endif() add_definitions(/X /GR- /GS- /Zl) add_definitions(-Dinline=__inline -D__STDC__=1) Modified: branches/cmake-bringup/toolchain-msvc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-msvc.cm… ============================================================================== --- branches/cmake-bringup/toolchain-msvc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-msvc.cmake [iso-8859-1] Mon Feb 14 11:09:48 2011 @@ -19,8 +19,6 @@ "<CMAKE_C_COMPILER> /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp" "<CMAKE_ASM_COMPILER> /nologo /Cp /Fo<OBJECT> /c /Ta <OBJECT>.tmp") -set(CMAKE_C_FLAGS_INIT "/DWIN32 /D_WINDOWS /W1 /Zm1000") - set(CMAKE_C_STANDARD_LIBRARIES "" CACHE INTERNAL "") if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86")

13 years, 10 months

[akhaldi] 50688: [CMAKE] - Get rid of the redundancy in setting msvc flags, and set /ZI instead of /Zi for both host and target modules. - Get rid of the redundancy in setting the default behaviour...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Feb 14 10:32:46 2011 New Revision: 50688 URL: http://svn.reactos.org/svn/reactos?rev=50688&view=rev Log: [CMAKE] - Get rid of the redundancy in setting msvc flags, and set /ZI instead of /Zi for both host and target modules. - Get rid of the redundancy in setting the default behaviour of the FIND_XXX() commands between toolchain files. Modified: branches/cmake-bringup/CMakeLists.txt branches/cmake-bringup/cmake/Platform/Windows-cl.cmake branches/cmake-bringup/msc.cmake branches/cmake-bringup/toolchain-mingw32.cmake branches/cmake-bringup/toolchain-msvc.cmake Modified: branches/cmake-bringup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re… ============================================================================== --- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Mon Feb 14 10:32:46 2011 @@ -60,6 +60,13 @@ endif() else() + + # adjust the default behaviour of the FIND_XXX() commands: + # search headers and libraries in the target environment, search + # programs in the host environment + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) + set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) + set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) # Do some cleanup file(REMOVE Modified: branches/cmake-bringup/cmake/Platform/Windows-cl.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/cmake/Platform/Wi… ============================================================================== --- branches/cmake-bringup/cmake/Platform/Windows-cl.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/cmake/Platform/Windows-cl.cmake [iso-8859-1] Mon Feb 14 10:32:46 2011 @@ -194,7 +194,7 @@ ENDIF() # default to Debug builds -IF(MSVC_VERSION GREATER 1310) +if(MSVC_VERSION GREATER 1310) # for 2005 make sure the manifest is put in the dll with mt # SET(CMAKE_CXX_CREATE_SHARED_LIBRARY "<CMAKE_COMMAND> -E vs_link_dll ${CMAKE_CXX_CREATE_SHARED_LIBRARY}") # SET(CMAKE_CXX_CREATE_SHARED_MODULE "<CMAKE_COMMAND> -E vs_link_dll ${CMAKE_CXX_CREATE_SHARED_MODULE}") @@ -205,15 +205,15 @@ # SET(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_COMMAND> -E vs_link_exe ${CMAKE_CXX_LINK_EXECUTABLE}") # SET(CMAKE_C_LINK_EXECUTABLE "<CMAKE_COMMAND> -E vs_link_exe ${CMAKE_C_LINK_EXECUTABLE}") - SET(CMAKE_BUILD_TYPE_INIT Debug) - - IF(ENV{DDKBUILDENV} OR NOT CMAKE_CROSSCOMPILING) - SET (CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MTd /Zi /Ob0 /Od") - SET (CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /Zi /Ob0 /Od") - ELSE() - SET (CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /Zi /Ob0 /Od") - SET (CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /Zi /Ob0 /Od") - ENDIF() + set(CMAKE_BUILD_TYPE_INIT Debug) + + if(ENV{DDKBUILDENV} OR NOT CMAKE_CROSSCOMPILING) + set(CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MTd /ZI /Ob0 /Od") + set(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /ZI /Ob0 /Od") + else() + set(CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /ZI /Ob0 /Od") + set(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /ZI /Ob0 /Od") + endif() SET (CMAKE_CXX_FLAGS_INIT "/DWIN32 /D_WINDOWS /W3 /Zm1000 /EHsc") SET (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "/O1 /Ob1 /D NDEBUG") Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=506… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Mon Feb 14 10:32:46 2011 @@ -13,7 +13,7 @@ endif() endif() -add_definitions(/X /GR- /GS- /Zl /Zi) +add_definitions(/X /GR- /GS- /Zl) add_definitions(-Dinline=__inline -D__STDC__=1) if(${_MACHINE_ARCH_FLAG} MATCHES X86) @@ -130,9 +130,6 @@ set(IS_UNICODE 1) endmacro() -set(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od") -set(CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od") - macro(set_rc_compiler) # dummy, this workaround is only needed in mingw due to lack of RC support in cmake endmacro() Modified: branches/cmake-bringup/toolchain-mingw32.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-mingw32… ============================================================================== --- branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] Mon Feb 14 10:32:46 2011 @@ -48,10 +48,3 @@ elseif(ARCH MATCHES amd64) set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--disable-auto-import") endif() - -# adjust the default behaviour of the FIND_XXX() commands: -# search headers and libraries in the target environment, search -# programs in the host environment -set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) -set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) -set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) Modified: branches/cmake-bringup/toolchain-msvc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-msvc.cm… ============================================================================== --- branches/cmake-bringup/toolchain-msvc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-msvc.cmake [iso-8859-1] Mon Feb 14 10:32:46 2011 @@ -20,12 +20,6 @@ "<CMAKE_ASM_COMPILER> /nologo /Cp /Fo<OBJECT> /c /Ta <OBJECT>.tmp") set(CMAKE_C_FLAGS_INIT "/DWIN32 /D_WINDOWS /W1 /Zm1000") -set(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od") -set(CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od") - -set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) -set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) -set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) set(CMAKE_C_STANDARD_LIBRARIES "" CACHE INTERNAL "")

13 years, 10 months

[tkreuzer] 50687: [CMAKE] Remove the RelWithDebInfo hack for MSVC

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Feb 14 09:33:36 2011 New Revision: 50687 URL: http://svn.reactos.org/svn/reactos?rev=50687&view=rev Log: [CMAKE] Remove the RelWithDebInfo hack for MSVC Modified: branches/cmake-bringup/toolchain-msvc.cmake Modified: branches/cmake-bringup/toolchain-msvc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-msvc.cm… ============================================================================== --- branches/cmake-bringup/toolchain-msvc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-msvc.cmake [iso-8859-1] Mon Feb 14 09:33:36 2011 @@ -8,27 +8,24 @@ set(CMAKE_CXX_COMPILER cl) set(CMAKE_RC_COMPILER rc) if(${ARCH} MATCHES amd64) - set(CMAKE_ASM_COMPILER ml64) + set(CMAKE_ASM_COMPILER ml64) else() - set(CMAKE_ASM_COMPILER ml) + set(CMAKE_ASM_COMPILER ml) endif() set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <DEFINES> /I${REACTOS_SOURCE_DIR}/include/psdk /I${REACTOS_BINARY_DIR}/include/psdk /I${REACTOS_SOURCE_DIR}/include /I${REACTOS_SOURCE_DIR}/include/reactos /I${REACTOS_BINARY_DIR}/include/reactos /I${REACTOS_SOURCE_DIR}/include/reactos/wine /I${REACTOS_SOURCE_DIR}/include/crt /I${REACTOS_SOURCE_DIR}/include/crt/mingw32 /fo <OBJECT> <SOURCE>") -SET(CMAKE_ASM_COMPILE_OBJECT +set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_C_COMPILER> /nologo /X /I${REACTOS_SOURCE_DIR}/include/asm /I${REACTOS_BINARY_DIR}/include/asm <FLAGS> <DEFINES> /D__ASM__ /D_USE_ML /EP /c <SOURCE> > <OBJECT>.tmp" "<CMAKE_ASM_COMPILER> /nologo /Cp /Fo<OBJECT> /c /Ta <OBJECT>.tmp") set(CMAKE_C_FLAGS_INIT "/DWIN32 /D_WINDOWS /W1 /Zm1000") set(CMAKE_C_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od") -SET(CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od") +set(CMAKE_CXX_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od") set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) - -# Prevent from using run time checking when testing the compiler -set(CMAKE_BUILD_TYPE "RelwithDebInfo" CACHE STRING "Build Type") set(CMAKE_C_STANDARD_LIBRARIES "" CACHE INTERNAL "")

13 years, 10 months

← Newer
1
...
22
23
24
25
26
27
28
...
36
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 February 2011