Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 50182: [CMAKE] Fix configure script for host tools
by tkreuzer＠svn.reactos.org 28 Dec '10

28 Dec '10

Author: tkreuzer Date: Tue Dec 28 09:17:42 2010 New Revision: 50182 URL: http://svn.reactos.org/svn/reactos?rev=50182&view=rev Log: [CMAKE] Fix configure script for host tools Modified: branches/cmake-bringup/configure.cmd Modified: branches/cmake-bringup/configure.cmd URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/configure.cmd?rev… ============================================================================== --- branches/cmake-bringup/configure.cmd [iso-8859-1] (original) +++ branches/cmake-bringup/configure.cmd [iso-8859-1] Tue Dec 28 09:17:42 2010 @@ -22,10 +22,10 @@ cd host-tools set REACTOS_BUILD_TOOLS_DIR=%CD% if "%BUILD_ENVIRONMENT%" == "MINGW" ( - cmake -G "MinGW Makefiles" %ROS_SOURCE_DIR% + cmake -G "MinGW Makefiles" -DARCH=%ROS_ARCH% %ROS_SOURCE_DIR% ) if "%BUILD_ENVIRONMENT%" == "WDK" ( - cmake -G "NMake Makefiles" %ROS_SOURCE_DIR% + cmake -G "NMake Makefiles" -DARCH=%_BUILDARCH% %ROS_SOURCE_DIR% ) cd..

1 0

[jimtabor] 50181: [Win32k|User32] - Fix all the user32 wine win test_SetParent tests.
by jimtabor＠svn.reactos.org 28 Dec '10

28 Dec '10

Author: jimtabor Date: Tue Dec 28 07:22:42 2010 New Revision: 50181 URL: http://svn.reactos.org/svn/reactos?rev=50181&view=rev Log: [Win32k|User32] - Fix all the user32 wine win test_SetParent tests. Modified: trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Tue Dec 28 07:22:42 2010 @@ -1450,14 +1450,11 @@ _SEH2_TRY { - while (Wnd != NULL) + while (Wnd != NULL && ((Wnd->style & (WS_POPUP|WS_CHILD)) == WS_CHILD)) { if (Wnd->spwndParent != NULL) { Wnd = DesktopPtrToUser(Wnd->spwndParent); - - if(Wnd == DesktopWnd) - Wnd = NULL; if (Wnd == WndParent) { Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Tue Dec 28 07:22:42 2010 @@ -899,15 +899,11 @@ PWND Window; Window = BaseWindow; - while (Window) + while (Window && ((Window->style & (WS_POPUP|WS_CHILD)) == WS_CHILD)) { if (Window == Parent) { return(TRUE); - } - if(!(Window->style & WS_CHILD)) - { - break; } Window = Window->spwndParent; @@ -1090,7 +1086,7 @@ PWND FASTCALL co_IntSetParent(PWND Wnd, PWND WndNewParent) { - PWND WndOldParent; + PWND WndOldParent, pWndExam; BOOL WasVisible; ASSERT(Wnd); @@ -1098,11 +1094,29 @@ ASSERT_REFS_CO(Wnd); ASSERT_REFS_CO(WndNewParent); + if (Wnd == Wnd->head.rpdesk->spwndMessage) + { + EngSetLastError(ERROR_ACCESS_DENIED); + return( NULL); + } + /* Some applications try to set a child as a parent */ if (IntIsChildWindow(Wnd, WndNewParent)) { EngSetLastError( ERROR_INVALID_PARAMETER ); return NULL; + } + + pWndExam = WndNewParent; // Load parent Window to examine. + // Now test for set parent to parent hit. + while (pWndExam) + { + if (Wnd == pWndExam) + { + EngSetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + pWndExam = pWndExam->spwndParent; } /* @@ -1148,6 +1162,62 @@ */ return WndOldParent; +} + +HWND FASTCALL +co_UserSetParent(HWND hWndChild, HWND hWndNewParent) +{ + PWND Wnd = NULL, WndParent = NULL, WndOldParent; + HWND hWndOldParent = NULL; + USER_REFERENCE_ENTRY Ref, ParentRef; + + if (IntIsBroadcastHwnd(hWndChild) || IntIsBroadcastHwnd(hWndNewParent)) + { + EngSetLastError(ERROR_INVALID_PARAMETER); + return( NULL); + } + + if (hWndChild == IntGetDesktopWindow()) + { + EngSetLastError(ERROR_ACCESS_DENIED); + return( NULL); + } + + if (hWndNewParent) + { + if (!(WndParent = UserGetWindowObject(hWndNewParent))) + { + return( NULL); + } + } + else + { + if (!(WndParent = UserGetWindowObject(IntGetDesktopWindow()))) + { + return( NULL); + } + } + + if (!(Wnd = UserGetWindowObject(hWndChild))) + { + return( NULL); + } + + UserRefObjectCo(Wnd, &Ref); + UserRefObjectCo(WndParent, &ParentRef); + + WndOldParent = co_IntSetParent(Wnd, WndParent); + + UserDerefObjectCo(WndParent); + UserDerefObjectCo(Wnd); + + if (WndOldParent) + { + hWndOldParent = WndOldParent->head.h; + UserDereferenceObject(WndOldParent); + } + + return( hWndOldParent); } BOOL FASTCALL @@ -3055,63 +3125,6 @@ DPRINT("Leave NtUserGetListBoxInfo, ret=%i\n",_ret_); UserLeave(); END_CLEANUP; -} - - -HWND FASTCALL -co_UserSetParent(HWND hWndChild, HWND hWndNewParent) -{ - PWND Wnd = NULL, WndParent = NULL, WndOldParent; - HWND hWndOldParent = NULL; - USER_REFERENCE_ENTRY Ref, ParentRef; - - if (IntIsBroadcastHwnd(hWndChild) || IntIsBroadcastHwnd(hWndNewParent)) - { - EngSetLastError(ERROR_INVALID_PARAMETER); - return( NULL); - } - - if (hWndChild == IntGetDesktopWindow()) - { - EngSetLastError(ERROR_ACCESS_DENIED); - return( NULL); - } - - if (hWndNewParent) - { - if (!(WndParent = UserGetWindowObject(hWndNewParent))) - { - return( NULL); - } - } - else - { - if (!(WndParent = UserGetWindowObject(IntGetDesktopWindow()))) - { - return( NULL); - } - } - - if (!(Wnd = UserGetWindowObject(hWndChild))) - { - return( NULL); - } - - UserRefObjectCo(Wnd, &Ref); - UserRefObjectCo(WndParent, &ParentRef); - - WndOldParent = co_IntSetParent(Wnd, WndParent); - - UserDerefObjectCo(WndParent); - UserDerefObjectCo(Wnd); - - if (WndOldParent) - { - hWndOldParent = WndOldParent->head.h; - UserDereferenceObject(WndOldParent); - } - - return( hWndOldParent); } /*

1 0

[tkreuzer] 50180: [CMAKE] Fix genincdata for amd64
by tkreuzer＠svn.reactos.org 28 Dec '10

28 Dec '10

Author: tkreuzer Date: Tue Dec 28 01:06:06 2010 New Revision: 50180 URL: http://svn.reactos.org/svn/reactos?rev=50180&view=rev Log: [CMAKE] Fix genincdata for amd64 Modified: branches/cmake-bringup/include/asm/genincdata.c branches/cmake-bringup/include/asm/ksamd64.template.h branches/cmake-bringup/include/asm/ksx.template.h Modified: branches/cmake-bringup/include/asm/genincdata.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/asm/genin… ============================================================================== --- branches/cmake-bringup/include/asm/genincdata.c [iso-8859-1] (original) +++ branches/cmake-bringup/include/asm/genincdata.c [iso-8859-1] Tue Dec 28 01:06:06 2010 @@ -3,6 +3,7 @@ /* DDK/IFS/NDK Headers */ #include <excpt.h> +#include <setjmp.h> #include <ntdef.h> #include <ntifs.h> #include <arc/arc.h> @@ -60,6 +61,7 @@ #else #error Your compiler is not supported. #endif + ASMGENDATA Table[] = { Modified: branches/cmake-bringup/include/asm/ksamd64.template.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/asm/ksamd… ============================================================================== --- branches/cmake-bringup/include/asm/ksamd64.template.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/asm/ksamd64.template.h [iso-8859-1] Tue Dec 28 01:06:06 2010 @@ -1,4 +1,3 @@ - HEADER("CR0 flags"), CONSTANT(CR0_PE), @@ -39,7 +38,6 @@ CONSTANT(MACHINE_TYPE_EISA), CONSTANT(MACHINE_TYPE_MCA), -#endif HEADER("EFLAGS"), CONSTANT(EFLAGS_TF_MASK), CONSTANT(EFLAGS_TF_SHIFT), @@ -48,14 +46,14 @@ CONSTANT(EFLAGS_ID_MASK), HEADER("Hypervisor Enlightenment Definitions"), -CONSTANT(HV_MMU_USE_HYPERCALL_FOR_ADDRESS_SWITCH), -CONSTANT(HV_MMU_USE_HYPERCALL_FOR_LOCAL_FLUSH), -CONSTANT(HV_MMU_USE_HYPERCALL_FOR_REMOTE_FLUSH), -CONSTANT(HV_X64_MSR_APIC_EOI), -CONSTANT(HV_APIC_ENLIGHTENED), -CONSTANT(HV_KE_USE_HYPERCALL_FOR_LONG_SPIN_WAIT), -CONSTANT(HV_VIRTUAL_APIC_NO_EOI_REQUIRED_V), -CONSTANT(HvApicFlags), +//CONSTANT(HV_MMU_USE_HYPERCALL_FOR_ADDRESS_SWITCH), +//CONSTANT(HV_MMU_USE_HYPERCALL_FOR_LOCAL_FLUSH), +//CONSTANT(HV_MMU_USE_HYPERCALL_FOR_REMOTE_FLUSH), +//CONSTANT(HV_X64_MSR_APIC_EOI), +//CONSTANT(HV_APIC_ENLIGHTENED), +//CONSTANT(HV_KE_USE_HYPERCALL_FOR_LONG_SPIN_WAIT), +//CONSTANT(HV_VIRTUAL_APIC_NO_EOI_REQUIRED_V), +//CONSTANT(HvApicFlags), HEADER("KDGT selectors"), CONSTANT(KGDT64_NULL), @@ -92,10 +90,9 @@ CONSTANT(MSR_LAST_EXCEPTION_TO), HEADER("Flags for MSR_DEGUG_CTL"), -CONSTANT(MSR_DEBUG_CTL_LBR), -CONSTANT(MSR_DEBUG_CRL_BTF), - -#if 0 +//CONSTANT(MSR_DEBUG_CTL_LBR), +//CONSTANT(MSR_DEBUG_CRL_BTF), + HEADER("Fatal exception codes"), CONSTANT(EXCEPTION_DIVIDED_BY_ZERO), CONSTANT(EXCEPTION_DEBUG), @@ -113,7 +110,6 @@ CONSTANT(EXCEPTION_RESERVED_TRAP), CONSTANT(EXCEPTION_NPX_ERROR), CONSTANT(EXCEPTION_ALIGNMENT_CHECK), -#endif HEADER("Argument Home Address"), OFFSET(P1Home, CONTEXT, P1Home), @@ -187,16 +183,16 @@ SIZE(CONTEXT_FRAME_LENGTH, CONTEXT), HEADER("DISPATCHER_CONTEXT"), -OFFSET(DcControlPc, TYPE, ControlPc), -OFFSET(DcImageBase, TYPE, ImageBase), -OFFSET(DcFunctionEntry, TYPE, FunctionEntry), -OFFSET(DcEstablisherFrame, TYPE, EstablisherFrame), -OFFSET(DcTargetIp, TYPE, TargetIp), -OFFSET(DcContextRecord, TYPE, ContextRecord), -OFFSET(DcLanguageHandler, TYPE, LanguageHandler), -OFFSET(DcHandlerData, TYPE, HandlerData), -OFFSET(DcHistoryTable, TYPE, HistoryTable), -OFFSET(DcScopeIndex, TYPE, ScopeIndex), +OFFSET(DcControlPc, DISPATCHER_CONTEXT, ControlPc), +OFFSET(DcImageBase, DISPATCHER_CONTEXT, ImageBase), +OFFSET(DcFunctionEntry, DISPATCHER_CONTEXT, FunctionEntry), +OFFSET(DcEstablisherFrame, DISPATCHER_CONTEXT, EstablisherFrame), +OFFSET(DcTargetIp, DISPATCHER_CONTEXT, TargetIp), +OFFSET(DcContextRecord, DISPATCHER_CONTEXT, ContextRecord), +OFFSET(DcLanguageHandler, DISPATCHER_CONTEXT, LanguageHandler), +OFFSET(DcHandlerData, DISPATCHER_CONTEXT, HandlerData), +OFFSET(DcHistoryTable, DISPATCHER_CONTEXT, HistoryTable), +OFFSET(DcScopeIndex, DISPATCHER_CONTEXT, ScopeIndex), HEADER("KEXCEPTION_FRAME"), OFFSET(ExP1Home, KEXCEPTION_FRAME, P1Home), @@ -232,38 +228,38 @@ SIZE(KEXCEPTION_FRAME_LENGTH, KEXCEPTION_FRAME), HEADER("JUMP_BUFFER"), -OFFSET(JbFrame, JUMP_BUFFER, Frame), -OFFSET(JbRbx, JUMP_BUFFER, Rbx), -OFFSET(JbRsp, JUMP_BUFFER, Rsp), -OFFSET(JbRbp, JUMP_BUFFER, Rbp), -OFFSET(JbRsi, JUMP_BUFFER, Rsi), -OFFSET(JbRdi, JUMP_BUFFER, Rdi), -OFFSET(JbR12, JUMP_BUFFER, R12), -OFFSET(JbR13, JUMP_BUFFER, R13), -OFFSET(JbR14, JUMP_BUFFER, R14), -OFFSET(JbR15, JUMP_BUFFER, R15), -OFFSET(JbRip, JUMP_BUFFER, Rip), -OFFSET(JbMxCsr, JUMP_BUFFER, MxCsr), -OFFSET(JbFpCsr, JUMP_BUFFER, FpCsr), -OFFSET(JbXmm6, JUMP_BUFFER, Xmm6), -OFFSET(JbXmm7, JUMP_BUFFER, Xmm7), -OFFSET(JbXmm8, JUMP_BUFFER, Xmm8), -OFFSET(JbXmm9, JUMP_BUFFER, Xmm9), -OFFSET(JbXmm10, JUMP_BUFFER, Xmm10), -OFFSET(JbXmm11, JUMP_BUFFER, Xmm11), -OFFSET(JbXmm12, JUMP_BUFFER, Xmm12), -OFFSET(JbXmm13, JUMP_BUFFER, Xmm13), -OFFSET(JbXmm14, JUMP_BUFFER, Xmm14), -OFFSET(JbXmm15, JUMP_BUFFER, Xmm15), - -HEADER("KGDT64"), -OFFSET(KgdtBaseLow, KGDT64, BaseLow), -OFFSET(KgdtBaseMiddle, KGDT64, BaseMiddle), -OFFSET(KgdtBaseHigh, KGDT64, BaseHigh), -OFFSET(KgdtBaseUpper, KGDT64, BaseUpper), -OFFSET(KgdtLimitHigh, KGDT64, LimitHigh), -OFFSET(KgdtLimitLow, KGDT64, LimitLow), -CONSTANT(KGDT_LIMIT_ENCODE_MASK), +OFFSET(JbFrame, _JUMP_BUFFER, Frame), +OFFSET(JbRbx, _JUMP_BUFFER, Rbx), +OFFSET(JbRsp, _JUMP_BUFFER, Rsp), +OFFSET(JbRbp, _JUMP_BUFFER, Rbp), +OFFSET(JbRsi, _JUMP_BUFFER, Rsi), +OFFSET(JbRdi, _JUMP_BUFFER, Rdi), +OFFSET(JbR12, _JUMP_BUFFER, R12), +OFFSET(JbR13, _JUMP_BUFFER, R13), +OFFSET(JbR14, _JUMP_BUFFER, R14), +OFFSET(JbR15, _JUMP_BUFFER, R15), +OFFSET(JbRip, _JUMP_BUFFER, Rip), +//OFFSET(JbMxCsr, _JUMP_BUFFER, MxCsr), // Spare +//OFFSET(JbFpCsr, _JUMP_BUFFER, FpCsr), +OFFSET(JbXmm6, _JUMP_BUFFER, Xmm6), +OFFSET(JbXmm7, _JUMP_BUFFER, Xmm7), +OFFSET(JbXmm8, _JUMP_BUFFER, Xmm8), +OFFSET(JbXmm9, _JUMP_BUFFER, Xmm9), +OFFSET(JbXmm10, _JUMP_BUFFER, Xmm10), +OFFSET(JbXmm11, _JUMP_BUFFER, Xmm11), +OFFSET(JbXmm12, _JUMP_BUFFER, Xmm12), +OFFSET(JbXmm13, _JUMP_BUFFER, Xmm13), +OFFSET(JbXmm14, _JUMP_BUFFER, Xmm14), +OFFSET(JbXmm15, _JUMP_BUFFER, Xmm15), + +HEADER("KGDTENTRY64"), +OFFSET(KgdtBaseLow, KGDTENTRY64, BaseLow), +OFFSET(KgdtBaseMiddle, KGDTENTRY64, Bytes.BaseMiddle), +OFFSET(KgdtBaseHigh, KGDTENTRY64, Bytes.BaseHigh), +OFFSET(KgdtBaseUpper, KGDTENTRY64, BaseUpper), +OFFSET(KgdtLimitHigh, KGDTENTRY64, Bytes.Flags2), +OFFSET(KgdtLimitLow, KGDTENTRY64, LimitLow), +//CONSTANT(KGDT_LIMIT_ENCODE_MASK), HEADER("KPRCB"), OFFSET(PbMxCsr, KPRCB, MxCsr), @@ -286,13 +282,13 @@ OFFSET(PbMajorVersion, KPRCB, MajorVersion), OFFSET(PbBuildType, KPRCB, BuildType), OFFSET(PbCpuVendor, KPRCB, CpuVendor), -OFFSET(PbCoresPerPhysicalProcessor, KPRCB, CoresPerPhysicalProcessor), -OFFSET(PbLogicalProcessorsPerCore, KPRCB, LogicalProcessorsPerCore), +//OFFSET(PbCoresPerPhysicalProcessor, KPRCB, CoresPerPhysicalProcessor), +//OFFSET(PbLogicalProcessorsPerCore, KPRCB, LogicalProcessorsPerCore), OFFSET(PbApicMask, KPRCB, ApicMask), OFFSET(PbCFlushSize, KPRCB, CFlushSize), OFFSET(PbAcpiReserved, KPRCB, AcpiReserved), OFFSET(PbInitialApicId, KPRCB, InitialApicId), -OFFSET(PbStride, KPRCB, Stride), +//OFFSET(PbStride, KPRCB, Stride), OFFSET(PbLockQueue, KPRCB, LockQueue), OFFSET(PbPPLookasideList, KPRCB, PPLookasideList), OFFSET(PbPPNPagedLookasideList, KPRCB, PPNPagedLookasideList), @@ -300,22 +296,22 @@ OFFSET(PbPacketBarrier, KPRCB, PacketBarrier), OFFSET(PbDeferredReadyListHead, KPRCB, DeferredReadyListHead), OFFSET(PbLookasideIrpFloat, KPRCB, LookasideIrpFloat), -OFFSET(PbSystemCalls, KPRCB, SystemCalls), -OFFSET(PbReadOperationCount, KPRCB, ReadOperationCount), -OFFSET(PbWriteOperationCount, KPRCB, WriteOperationCount), -OFFSET(PbOtherOperationCount, KPRCB, OtherOperationCount), -OFFSET(PbReadTransferCount, KPRCB, ReadTransferCount), -OFFSET(PbWriteTransferCount, KPRCB, WriteTransferCount), -OFFSET(PbOtherTransferCount, KPRCB, OtherTransferCount), -OFFSET(PbContextSwitches, KPRCB, ContextSwitches), +//OFFSET(PbSystemCalls, KPRCB, SystemCalls), +//OFFSET(PbReadOperationCount, KPRCB, ReadOperationCount), +//OFFSET(PbWriteOperationCount, KPRCB, WriteOperationCount), +//OFFSET(PbOtherOperationCount, KPRCB, OtherOperationCount), +//OFFSET(PbReadTransferCount, KPRCB, ReadTransferCount), +//OFFSET(PbWriteTransferCount, KPRCB, WriteTransferCount), +//OFFSET(PbOtherTransferCount, KPRCB, OtherTransferCount), +//OFFSET(PbContextSwitches, KPRCB, ContextSwitches), OFFSET(PbTargetSet, KPRCB, TargetSet), OFFSET(PbIpiFrozen, KPRCB, IpiFrozen), OFFSET(PbRequestMailbox, KPRCB, RequestMailbox), OFFSET(PbSenderSummary, KPRCB, SenderSummary), -OFFSET(PbDpcListHead, KPRCB, DpcListHead), -OFFSET(PbDpcLock, KPRCB, DpcLock), -OFFSET(PbDpcQueueDepth, KPRCB, DpcQueueDepth), -OFFSET(PbDpcCount, KPRCB, DpcCount), +//OFFSET(PbDpcListHead, KPRCB, DpcListHead), +//OFFSET(PbDpcLock, KPRCB, DpcLock), +//OFFSET(PbDpcQueueDepth, KPRCB, DpcQueueDepth), +//OFFSET(PbDpcCount, KPRCB, DpcCount), OFFSET(PbDpcStack, KPRCB, DpcStack), OFFSET(PbMaximumDpcQueueDepth, KPRCB, MaximumDpcQueueDepth), OFFSET(PbDpcRequestRate, KPRCB, DpcRequestRate), @@ -345,49 +341,50 @@ OFFSET(PbParentNode, KPRCB, ParentNode), OFFSET(PbMultiThreadProcessorSet, KPRCB, MultiThreadProcessorSet), OFFSET(PbMultiThreadSetMaster, KPRCB, MultiThreadSetMaster), -OFFSET(PbStartCycles, KPRCB, StartCycles), +//OFFSET(PbStartCycles, KPRCB, StartCycles), OFFSET(PbPageColor, KPRCB, PageColor), OFFSET(PbNodeColor, KPRCB, NodeColor), OFFSET(PbNodeShiftedColor, KPRCB,NodeShiftedColor), OFFSET(PbSecondaryColorMask, KPRCB, SecondaryColorMask), OFFSET(PbSleeping, KPRCB, Sleeping), -OFFSET(PbCycleTime, KPRCB, CycleTime), -OFFSET(PbFastReadNoWait, KPRCB, FastReadNoWait), -OFFSET(PbFastReadWait, KPRCB, FastReadWait), -OFFSET(PbFastReadNotPossible, KPRCB, FastReadNotPossible), -OFFSET(PbCopyReadNoWait, KPRCB, CopyReadNoWait), -OFFSET(PbCopyReadWait, KPRCB, CopyReadWait), -OFFSET(PbCopyReadNoWaitMiss, KPRCB, CopyReadNoWaitMiss), -OFFSET(PbAlignmentFixupCount, KPRCB, AlignmentFixupCount), -OFFSET(PbExceptionDispatchCount, KPRCB, ExceptionDispatchCount), +//OFFSET(PbCycleTime, KPRCB, CycleTime), +//OFFSET(PbFastReadNoWait, KPRCB, FastReadNoWait), +//OFFSET(PbFastReadWait, KPRCB, FastReadWait), +//OFFSET(PbFastReadNotPossible, KPRCB, FastReadNotPossible), +//OFFSET(PbCopyReadNoWait, KPRCB, CopyReadNoWait), +//OFFSET(PbCopyReadWait, KPRCB, CopyReadWait), +//OFFSET(PbCopyReadNoWaitMiss, KPRCB, CopyReadNoWaitMiss), +//OFFSET(PbAlignmentFixupCount, KPRCB, AlignmentFixupCount), +//OFFSET(PbExceptionDispatchCount, KPRCB, ExceptionDispatchCount), OFFSET(PbVendorString, KPRCB, VendorString), OFFSET(PbPowerState, KPRCB, PowerState), SIZE(ProcessorBlockLength, KPRCB), HEADER("KPCR"), -OFFSET(PcGdt, KPCR, Gdt), -OFFSET(PcTss, KPCR, Tss), +//OFFSET(PcGdt, KPCR, Gdt), +//OFFSET(PcTss, KPCR, Tss), OFFSET(PcUserRsp, KPCR, UserRsp), OFFSET(PcSelf, KPCR, Self), OFFSET(PcCurrentPrcb, KPCR, CurrentPrcb), OFFSET(PcLockArray, KPCR, LockArray), -OFFSET(PcTeb, KPCR, Teb), -OFFSET(PcIdt, KPCR, Idt), +//OFFSET(PcTeb, KPCR, Teb), +//OFFSET(PcIdt, KPCR, Idt), OFFSET(PcIrql, KPCR, Irql), OFFSET(PcStallScaleFactor, KPCR, StallScaleFactor), OFFSET(PcHalReserved, KPCR, HalReserved), -OFFSET(PcPrcb, KPCR, Prcb), -OFFSET(PcMxCsr, KPCR, MxCsr), -OFFSET(PcNumber, KPCR, Number), -OFFSET(PcInterruptRequest, KPCR, InterruptRequest), -OFFSET(PcIdleHalt, KPCR, IdleHalt), -OFFSET(PcCurrentThread, KPCR, CurrentThread), -OFFSET(PcNextThread, KPCR, NextThread), -OFFSET(PcIdleThread, KPCR, IdleThread), -OFFSET(PcIpiFrozen, KPCR, IpiFrozen), -OFFSET(PcNestingLevel, KPCR, NestingLevel), -OFFSET(PcRspBase, KPCR, RspBase), -OFFSET(PcPrcbLock, KPCR, PrcbLock), +//OFFSET(PcPrcb, KPCR, Prcb), +//OFFSET(PcMxCsr, KPCR, MxCsr), +//OFFSET(PcNumber, KPCR, Number), +//OFFSET(PcInterruptRequest, KPCR, InterruptRequest), +//OFFSET(PcIdleHalt, KPCR, IdleHalt), +//OFFSET(PcCurrentThread, KPCR, CurrentThread), +//OFFSET(PcNextThread, KPCR, NextThread), +//OFFSET(PcIdleThread, KPCR, IdleThread), +//OFFSET(PcIpiFrozen, KPCR, IpiFrozen), +//OFFSET(PcNestingLevel, KPCR, NestingLevel), +//OFFSET(PcRspBase, KPCR, RspBase), +//OFFSET(PcPrcbLock, KPCR, PrcbLock), +#if 0 OFFSET(PcSetMember, KPCR, SetMember), OFFSET(PcCr0, KPCR, Cr0), OFFSET(PcCr2, KPCR, Cr2), @@ -426,31 +423,32 @@ OFFSET(PcSkipTick, KPCR, SkipTick), OFFSET(PcStartCycles, KPCR, StartCycles), SIZE(ProcessorControlRegisterLength, KPCR), +#endif HEADER("KPROCESSOR_STATE"), OFFSET(PsSpecialRegisters, KPROCESSOR_STATE, SpecialRegisters), -OFFSET(PsCr0, KPROCESSOR_STATE, Cr0), -OFFSET(PsCr2, KPROCESSOR_STATE, Cr2), -OFFSET(PsCr3, KPROCESSOR_STATE, Cr3), -OFFSET(PsCr4, KPROCESSOR_STATE, Cr4), -OFFSET(PsKernelDr0, KPROCESSOR_STATE, KernelDr0), -OFFSET(PsKernelDr1, KPROCESSOR_STATE, KernelDr1), -OFFSET(PsKernelDr2, KPROCESSOR_STATE, KernelDr2), -OFFSET(PsKernelDr3, KPROCESSOR_STATE, KernelDr3), -OFFSET(PsKernelDr6, KPROCESSOR_STATE, KernelDr6), -OFFSET(PsKernelDr7, KPROCESSOR_STATE, KernelDr7), -OFFSET(PsGdtr, KPROCESSOR_STATE, Gdtr), -OFFSET(PsIdtr, KPROCESSOR_STATE, Idtr), -OFFSET(PsTr, KPROCESSOR_STATE, Tr), -OFFSET(PsLdtr, KPROCESSOR_STATE, Ldtr), -OFFSET(PsMxCsr, KPROCESSOR_STATE, MxCsr), +OFFSET(PsCr0, KPROCESSOR_STATE, SpecialRegisters.Cr0), +OFFSET(PsCr2, KPROCESSOR_STATE, SpecialRegisters.Cr2), +OFFSET(PsCr3, KPROCESSOR_STATE, SpecialRegisters.Cr3), +OFFSET(PsCr4, KPROCESSOR_STATE, SpecialRegisters.Cr4), +OFFSET(PsKernelDr0, KPROCESSOR_STATE, SpecialRegisters.KernelDr0), +OFFSET(PsKernelDr1, KPROCESSOR_STATE, SpecialRegisters.KernelDr1), +OFFSET(PsKernelDr2, KPROCESSOR_STATE, SpecialRegisters.KernelDr2), +OFFSET(PsKernelDr3, KPROCESSOR_STATE, SpecialRegisters.KernelDr3), +OFFSET(PsKernelDr6, KPROCESSOR_STATE, SpecialRegisters.KernelDr6), +OFFSET(PsKernelDr7, KPROCESSOR_STATE, SpecialRegisters.KernelDr7), +OFFSET(PsGdtr, KPROCESSOR_STATE, SpecialRegisters.Gdtr), +OFFSET(PsIdtr, KPROCESSOR_STATE, SpecialRegisters.Idtr), +OFFSET(PsTr, KPROCESSOR_STATE, SpecialRegisters.Tr), +OFFSET(PsLdtr, KPROCESSOR_STATE, SpecialRegisters.Ldtr), +OFFSET(PsMxCsr, KPROCESSOR_STATE, SpecialRegisters.MxCsr), OFFSET(PsContextFrame, KPROCESSOR_STATE, ContextFrame), -OFFSET(PsDebugControl, KPROCESSOR_STATE, DebugControl), -OFFSET(PsLastBranchToRip, KPROCESSOR_STATE, LastBranchToRip), -OFFSET(PsLastBranchFromRip, KPROCESSOR_STATE, LastBranchFromRip), -OFFSET(PsLastExceptionToRip, KPROCESSOR_STATE, LastExceptionToRip), -OFFSET(PsLastExceptionFromRip, KPROCESSOR_STATE, LastExceptionFromRip), -OFFSET(PsCr8, KPROCESSOR_STATE, Cr8), +OFFSET(PsDebugControl, KPROCESSOR_STATE, SpecialRegisters.DebugControl), +OFFSET(PsLastBranchToRip, KPROCESSOR_STATE, SpecialRegisters.LastBranchToRip), +OFFSET(PsLastBranchFromRip, KPROCESSOR_STATE, SpecialRegisters.LastBranchFromRip), +OFFSET(PsLastExceptionToRip, KPROCESSOR_STATE, SpecialRegisters.LastExceptionToRip), +OFFSET(PsLastExceptionFromRip, KPROCESSOR_STATE, SpecialRegisters.LastExceptionFromRip), +OFFSET(PsCr8, KPROCESSOR_STATE, SpecialRegisters.Cr8), SIZE(ProcessorStateLength, KPROCESSOR_STATE), HEADER("KSTART_FRAME"), @@ -480,7 +478,7 @@ OFFSET(SrMsrSyscallMask, KSPECIAL_REGISTERS, MsrSyscallMask), HEADER("KSYSTEM_TIME"), -OFFSET(StLowTime, KSYSTEM_TIME, LowTime), +OFFSET(StLowTime, KSYSTEM_TIME, LowPart), OFFSET(StHigh1Time, KSYSTEM_TIME, High1Time), OFFSET(StHigh2Time, KSYSTEM_TIME, High2Time), @@ -555,18 +553,18 @@ HEADER("KTIMER_TABLE"), OFFSET(TtEntry, KTIMER_TABLE, TimerEntries), -OFFSET(TtTime, KTIMER_TABLE, Time), -SIZE(TIMER_ENTRY_SIZE, KTIMER_ENTRY), +OFFSET(TtTime, KTIMER_TABLE_ENTRY, Time), +SIZE(TIMER_ENTRY_SIZE, KTIMER_TABLE_ENTRY), SIZE(TIMER_TABLE_SIZE, KTIMER_TABLE), SIZE(KTIMER_TABLE_SIZE, KTIMER_TABLE), HEADER("KTSS"), -OFFSET(TssRsp0, TYPE, Rsp0), -OFFSET(TssRsp1, TYPE, Rsp1), -OFFSET(TssRsp2, TYPE, Rsp2), -OFFSET(TssPanicStack, TYPE, PanicStack), -OFFSET(TssMcaStack, TYPE, McaStack), -OFFSET(TssNmiStack, TYPE, NmiStack), -OFFSET(TssIoMapBase, TYPE, IoMapBase), -SIZE(TssLength, TYPE), - +OFFSET(TssRsp0, KTSS64, Rsp0), +OFFSET(TssRsp1, KTSS64, Rsp1), +OFFSET(TssRsp2, KTSS64, Rsp2), +OFFSET(TssPanicStack, KTSS64, Ist[1]), +OFFSET(TssMcaStack, KTSS64, Ist[2]), +OFFSET(TssNmiStack, KTSS64, Ist[3]), +OFFSET(TssIoMapBase, KTSS64, IoMapBase), +SIZE(TssLength, KTSS64), + Modified: branches/cmake-bringup/include/asm/ksx.template.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/asm/ksx.t… ============================================================================== --- branches/cmake-bringup/include/asm/ksx.template.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/asm/ksx.template.h [iso-8859-1] Tue Dec 28 01:06:06 2010 @@ -498,9 +498,7 @@ OFFSET(PrDirectoryTableBase, KPROCESS, DirectoryTableBase), #ifdef _M_IX86 OFFSET(PrLdtDescriptor, KPROCESS, LdtDescriptor), -#endif OFFSET(PrIopmOffset, KPROCESS, IopmOffset), -#ifdef _M_IX86 OFFSET(PrInt21Descriptor, KPROCESS, Int21Descriptor), OFFSET(PrVdmTrapcHandler, KPROCESS, VdmTrapcHandler), //OFFSET(PrVdmObjects, KPROCESS, VdmObjects),

1 0

[tkreuzer] 50179: [CMAKE] Add a few definitions for amd64
by tkreuzer＠svn.reactos.org 28 Dec '10

28 Dec '10

Author: tkreuzer Date: Tue Dec 28 01:04:55 2010 New Revision: 50179 URL: http://svn.reactos.org/svn/reactos?rev=50179&view=rev Log: [CMAKE] Add a few definitions for amd64 Modified: branches/cmake-bringup/include/ndk/amd64/ketypes.h Modified: branches/cmake-bringup/include/ndk/amd64/ketypes.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/ndk/amd64… ============================================================================== --- branches/cmake-bringup/include/ndk/amd64/ketypes.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/ndk/amd64/ketypes.h [iso-8859-1] Tue Dec 28 01:04:55 2010 @@ -81,6 +81,7 @@ #define CR4_PGE 0x80 #define CR4_FXSR 0x200 #define CR4_XMMEXCPT 0x400 +#define CR4_CHANNELS 0x800 // // EFlags @@ -98,6 +99,39 @@ #define EFLAGS_USER_SANITIZE 0x3F4DD7 #define EFLAG_SIGN 0x8000 #define EFLAG_ZERO 0x4000 +#define EFLAGS_TF_MASK 0x0100 +#define EFLAGS_TF_SHIFT 0x0008 +#define EFLAGS_ID_MASK 0x200000 +#define EFLAGS_IF_MASK 0x0200 +#define EFLAGS_IF_SHIFT 0x0009 + +// +// Machine Specific Registers +// +#define MSR_EFER 0xC0000080 +#define MSR_STAR 0xC0000081 +#define MSR_LSTAR 0xC0000082 +#define MSR_CSTAR 0xC0000083 +#define MSR_SYSCALL_MASK 0xC0000084 +#define MSR_FS_BASE 0xC0000100 +#define MSR_GS_BASE 0xC0000101 +#define MSR_GS_SWAP 0xC0000102 +#define MSR_MCG_STATUS 0x017A +#define MSR_AMD_ACCESS 0x9C5A203A + +// +// Flags in MSR_EFER +// +#define MSR_LMA 0x0400 +#define MSR_LME 0x0100 +#define MSR_SCE 0x0001 +#define MSR_NXE 0x0800 +#define MSR_PAT 0x0277 +#define MSR_DEGUG_CTL 0x01D9 +#define MSR_LAST_BRANCH_FROM 0x01DB +#define MSR_LAST_BRANCH_TO 0x01DC +#define MSR_LAST_EXCEPTION_FROM 0x01DD +#define MSR_LAST_EXCEPTION_TO 0x01DE // // IPI Types @@ -114,6 +148,15 @@ #define PRCB_MAJOR_VERSION 1 #define PRCB_BUILD_DEBUG 1 #define PRCB_BUILD_UNIPROCESSOR 2 + +// +// Service Table +// +#define NUMBER_SERVICE_TABLES 2 +#define SERVICE_NUMBER_MASK 0xFFF +#define SERVICE_TABLE_SHIFT 7 +#define SERVICE_TABLE_MASK 0x20 +#define SERVICE_TABLE_TEST 0x20 // // HAL Variables @@ -143,6 +186,8 @@ #else #define SYNCH_LEVEL (IPI_LEVEL - 2) #endif + +#define NMI_STACK_SIZE 0x2000 // // Trap Frame Definition @@ -863,6 +908,56 @@ UINT64 Return; } KEXCEPTION_FRAME, *PKEXCEPTION_FRAME; +typedef struct _DISPATCHER_CONTEXT +{ + ULONG64 ControlPc; + PVOID ImageBase; + PVOID FunctionEntry; + PVOID EstablisherFrame; + ULONG64 TargetIp; + PVOID ContextRecord; + PVOID LanguageHandler; + PVOID HandlerData; + PVOID HistoryTable; + ULONG ScopeIndex; +} DISPATCHER_CONTEXT, *PDISPATCHER_CONTEXT; + + +typedef struct _KSTART_FRAME +{ + ULONG64 P1Home; + ULONG64 P2Home; + ULONG64 P3Home; + ULONG64 P4Home; + ULONG64 P5Home; + ULONG64 Return; +} KSTART_FRAME, *PKSTART_FRAME; + +typedef struct _KSWITCH_FRAME +{ + ULONG64 P1Home; + ULONG64 P2Home; + ULONG64 P3Home; + ULONG64 P4Home; + ULONG64 P5Home; + ULONG64 ApcBypass; + ULONG64 Rbp; + ULONG64 Return; +} KSWITCH_FRAME, *PKSWITCH_FRAME; + +typedef struct _KTIMER_TABLE_ENTRY +{ + ULONG_PTR Lock; + LIST_ENTRY Entry; + ULARGE_INTEGER Time; +} KTIMER_TABLE_ENTRY, *PKTIMER_TABLE_ENTRY; + +typedef struct _KTIMER_TABLE +{ + KTIMER* TimerExpiry[64]; + KTIMER_TABLE_ENTRY TimerEntries[256]; +} KTIMER_TABLE, *PKTIMER_TABLE; + // // Inline function to get current KPRCB //

1 0

[jgardou] 50178: [CMAKE] - add bootcdregtest target
by jgardou＠svn.reactos.org 27 Dec '10

27 Dec '10

Author: jgardou Date: Mon Dec 27 23:57:37 2010 New Revision: 50178 URL: http://svn.reactos.org/svn/reactos?rev=50178&view=rev Log: [CMAKE] - add bootcdregtest target Modified: branches/cmake-bringup/ros_cd.cmake Modified: branches/cmake-bringup/ros_cd.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ros_cd.cmake?rev=… ============================================================================== --- branches/cmake-bringup/ros_cd.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/ros_cd.cmake [iso-8859-1] Mon Dec 27 23:57:37 2010 @@ -29,58 +29,76 @@ #reactos.cab add_custom_command( - OUTPUT ${REACTOS_BINARY_DIR}/bootcd/reactos/reactos.inf - COMMAND native-cabman -C ${REACTOS_BINARY_DIR}/boot/reactos.dff -L ${REACTOS_BINARY_DIR}/boot/bootcd/reactos -I + OUTPUT ${REACTOS_BINARY_DIR}/boot/reactos.inf + COMMAND native-cabman -C ${REACTOS_BINARY_DIR}/boot/reactos.dff -L ${REACTOS_BINARY_DIR}/boot -I DEPENDS ${REACTOS_BINARY_DIR}/boot/reactos.dff) add_custom_command( - OUTPUT ${REACTOS_BINARY_DIR}/bootcd/reactos/reactos.cab - COMMAND native-cabman -C ${REACTOS_BINARY_DIR}/boot/reactos.dff -RC ${REACTOS_BINARY_DIR}/boot/bootcd/reactos/reactos.inf -L ${REACTOS_BINARY_DIR}/boot/bootcd/reactos -N - DEPENDS ${REACTOS_BINARY_DIR}/bootcd/reactos/reactos.inf) -list(APPEND BOOTCD_FILES ${REACTOS_BINARY_DIR}/bootcd/reactos/reactos.cab) + OUTPUT ${REACTOS_BINARY_DIR}/boot/reactos.cab + COMMAND native-cabman -C ${REACTOS_BINARY_DIR}/boot/reactos.dff -RC ${REACTOS_BINARY_DIR}/boot/reactos.inf -L ${REACTOS_BINARY_DIR}/boot -N + DEPENDS ${REACTOS_BINARY_DIR}/boot/reactos.inf) #bootcd target -set(BOOTCD_DIR "${REACTOS_BINARY_DIR}/boot/bootcd") +macro(create_bootcd_dir BOOTCD_DIR _target) -file(MAKE_DIRECTORY - "${BOOTCD_DIR}" - "${BOOTCD_DIR}/loader" - "${BOOTCD_DIR}/reactos" - "${BOOTCD_DIR}/reactos/system32") + file(MAKE_DIRECTORY + "${BOOTCD_DIR}" + "${BOOTCD_DIR}/loader" + "${BOOTCD_DIR}/reactos" + "${BOOTCD_DIR}/reactos/system32") -file(STRINGS ${REACTOS_BINARY_DIR}/boot/ros_minicd_target.txt MINICD_TARGET_ENTRIES) -foreach(ENTRY ${MINICD_TARGET_ENTRIES}) - string(REGEX REPLACE "^(.*)\t.*\t.*" "\\1" _targetname ${ENTRY}) - string(REGEX REPLACE "^.*\t(.*)\t.*" "\\1" _DIR ${ENTRY}) - string(REGEX REPLACE "^.*\t.*\t(.*)" "\\1"_NAMEONCD ${ENTRY}) - get_target_property(_FILENAME ${_targetname} LOCATION) - set(filename ${BOOTCD_DIR}/${_DIR}/${_NAMEONCD}) - list(APPEND BOOTCD_FILES ${filename}) + file(STRINGS ${REACTOS_BINARY_DIR}/boot/ros_minicd_target.txt MINICD_TARGET_ENTRIES) + foreach(ENTRY ${MINICD_TARGET_ENTRIES}) + string(REGEX REPLACE "^(.*)\t.*\t.*" "\\1" _targetname ${ENTRY}) + string(REGEX REPLACE "^.*\t(.*)\t.*" "\\1" _DIR ${ENTRY}) + string(REGEX REPLACE "^.*\t.*\t(.*)" "\\1"_NAMEONCD ${ENTRY}) + get_target_property(_FILENAME ${_targetname} LOCATION) + set(filename ${BOOTCD_DIR}/${_DIR}/${_NAMEONCD}) + list(APPEND ${_target}_FILES ${filename}) + add_custom_command( + OUTPUT ${filename} + COMMAND ${CMAKE_COMMAND} -E copy ${_FILENAME} ${filename} + DEPENDS ${_targetname}) + endforeach() + + file(STRINGS ${REACTOS_BINARY_DIR}/boot/ros_minicd.txt MINICD_ENTRIES) + foreach(ENTRY ${MINICD_ENTRIES}) + string(REGEX REPLACE "^(.*)\t.*\t.*" "\\1" _FILENAME ${ENTRY}) + string(REGEX REPLACE "^.*\t(.*)\t.*" "\\1" _DIR ${ENTRY}) + string(REGEX REPLACE "^.*\t.*\t(.*)" "\\1"_NAMEONCD ${ENTRY}) + set(filename ${BOOTCD_DIR}/${_DIR}/${_NAMEONCD}) + list(APPEND ${_target}_FILES ${filename}) + add_custom_command( + OUTPUT ${filename} + COMMAND ${CMAKE_COMMAND} -E copy ${_FILENAME} ${filename} + DEPENDS ${_FILENAME}) + endforeach() + add_custom_command( - OUTPUT ${filename} - COMMAND ${CMAKE_COMMAND} -E copy ${_FILENAME} ${BOOTCD_DIR}/${_DIR}/${_NAMEONCD} - DEPENDS ${_targetname}) -endforeach() + OUTPUT ${BOOTCD_DIR}/reactos/reactos.inf ${BOOTCD_DIR}/reactos/reactos.cab + COMMAND ${CMAKE_COMMAND} -E copy ${REACTOS_BINARY_DIR}/boot/reactos.inf ${BOOTCD_DIR}/reactos/reactos.inf + COMMAND ${CMAKE_COMMAND} -E copy ${REACTOS_BINARY_DIR}/boot/reactos.cab ${BOOTCD_DIR}/reactos/reactos.cab + DEPENDS ${REACTOS_BINARY_DIR}/boot/reactos.cab) + list(APPEND ${_target}_FILES ${filename} ${BOOTCD_DIR}/reactos/reactos.inf ${BOOTCD_DIR}/reactos/reactos.cab) +endmacro() -file(STRINGS ${REACTOS_BINARY_DIR}/boot/ros_minicd.txt MINICD_ENTRIES) -foreach(ENTRY ${MINICD_ENTRIES}) - string(REGEX REPLACE "^(.*)\t.*\t.*" "\\1" _FILENAME ${ENTRY}) - string(REGEX REPLACE "^.*\t(.*)\t.*" "\\1" _DIR ${ENTRY}) - string(REGEX REPLACE "^.*\t.*\t(.*)" "\\1"_NAMEONCD ${ENTRY}) - set(filename ${BOOTCD_DIR}/${_DIR}/${_NAMEONCD}) - list(APPEND BOOTCD_FILES ${filename}) - add_custom_command( - OUTPUT ${filename} - COMMAND ${CMAKE_COMMAND} -E copy ${_FILENAME} ${BOOTCD_DIR}/${_DIR}/${_NAMEONCD} - DEPENDS ${_FILENAME}) -endforeach() +create_bootcd_dir(${REACTOS_BINARY_DIR}/boot/bootcd bootcd) +add_custom_target(bootcd + COMMAND native-cdmake -v -j -m -b ${CMAKE_CURRENT_BINARY_DIR}/boot/freeldr/bootsect/isoboot.bin ${BOOTCD_DIR} REACTOS ${REACTOS_BINARY_DIR}/bootcd.iso + DEPENDS ${bootcd_FILES}) +add_dependencies(bootcd dosmbr ext2 fat32 fat isoboot isobtrt vgafonts) +set_directory_properties(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${REACTOS_BINARY_DIR}/bootcd.iso) -add_custom_target(bootcd - COMMAND native-cdmake -v -j -m -b ${CMAKE_CURRENT_BINARY_DIR}/boot/freeldr/bootsect/isoboot.bin ${BOOTCD_DIR} REACTOS ${REACTOS_BINARY_DIR}/minicd.iso - DEPENDS ${BOOTCD_FILES}) - -add_dependencies(bootcd dosmbr ext2 fat32 fat isoboot isobtrt vgafonts) +#bootcdregtest target +create_bootcd_dir(${REACTOS_BINARY_DIR}/boot/bootcdregtest bootcdregtest) +add_custom_command( + OUTPUT ${REACTOS_BINARY_DIR}/boot/bootcdregtest/reactos/unattend.inf + COMMAND ${CMAKE_COMMAND} -E copy ${REACTOS_SOURCE_DIR}/boot/bootdata/bootcdregtest/unattend.inf ${REACTOS_BINARY_DIR}/boot/bootcdregtest/reactos/unattend.inf + DEPENDS ${REACTOS_SOURCE_DIR}/boot/bootdata/bootcdregtest/unattend.inf ${REACTOS_BINARY_DIR}/boot/bootcdregtest) +add_custom_target(bootcdregtest + COMMAND native-cdmake -v -j -m -b ${CMAKE_CURRENT_BINARY_DIR}/boot/freeldr/bootsect/isoboot.bin ${REACTOS_BINARY_DIR}/boot/bootcdregtest REACTOS ${REACTOS_BINARY_DIR}/bootcdregtest.iso + DEPENDS ${REACTOS_BINARY_DIR}/boot/bootcdregtest/reactos/unattend.inf ${bootcdregtest_FILES}) +add_dependencies(bootcdregtest dosmbr ext2 fat32 fat isoboot isobtrt vgafonts) -set_directory_properties(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${REACTOS_BINARY_DIR}/minicd.iso) #livecd target file(MAKE_DIRECTORY

1 0

[jgardou] 50177: [CMAKE] - use already set variable for idl file compilation
by jgardou＠svn.reactos.org 27 Dec '10

27 Dec '10

Author: jgardou Date: Mon Dec 27 23:57:12 2010 New Revision: 50177 URL: http://svn.reactos.org/svn/reactos?rev=50177&view=rev Log: [CMAKE] - use already set variable for idl file compilation Modified: branches/cmake-bringup/CMakeMacros.cmake Modified: branches/cmake-bringup/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeMacros.cmake… ============================================================================== --- branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] Mon Dec 27 23:57:12 2010 @@ -241,15 +241,10 @@ macro(add_idl_interface IDL_FILE) custom_incdefs() - if(ARCH MATCHES i386) - set(platform_flags "-m32 --win32") - elseif(ARCH MATCHES amd64) - set(platform_flags "-m64 --win64") - endif() get_filename_component(FILE ${IDL_FILE} NAME_WE) add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_i.c - COMMAND ${IDL_COMPILER} ${result_incs} ${result_defs} ${platform_flags} -u -U ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_i.c ${CMAKE_CURRENT_SOURCE_DIR}/${IDL_FILE} + COMMAND ${IDL_COMPILER} ${result_incs} ${result_defs} ${IDL_FLAGS} -u -U ${CMAKE_CURRENT_BINARY_DIR}/${FILE}_i.c ${CMAKE_CURRENT_SOURCE_DIR}/${IDL_FILE} DEPENDS ${IDL_FILE}) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${FILE}_i.c PROPERTIES GENERATED TRUE) endmacro()

1 0

[tkreuzer] 50176: [CMAKE] Add support for different architectures to configure script and simplify it a bit
by tkreuzer＠svn.reactos.org 27 Dec '10

27 Dec '10

Author: tkreuzer Date: Mon Dec 27 23:14:50 2010 New Revision: 50176 URL: http://svn.reactos.org/svn/reactos?rev=50176&view=rev Log: [CMAKE] Add support for different architectures to configure script and simplify it a bit Modified: branches/cmake-bringup/configure.cmd Modified: branches/cmake-bringup/configure.cmd URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/configure.cmd?rev… ============================================================================== --- branches/cmake-bringup/configure.cmd [iso-8859-1] (original) +++ branches/cmake-bringup/configure.cmd [iso-8859-1] Mon Dec 27 23:14:50 2010 @@ -4,23 +4,14 @@ set ROS_SOURCE_DIR=%~dp0 rem Detect build environment (Mingw, VS, WDK, ...) -if "%ROS_ARCH%" == "i386" ( - echo Detected RosBE for i386 - set BUILD_ENVIRONMENT=MINGW -) -if "%ROS_ARCH%" == "amd64" ( - echo Detected RosBE for amd64 - set BUILD_ENVIRONMENT=MINGW -) -if "%ROS_ARCH%" == "arm" ( - echo Detected RosBE for arm +if not "%ROS_ARCH%" == "" ( + echo Detected RosBE for %ROS_ARCH% set BUILD_ENVIRONMENT=MINGW ) if not "%DDK_TARGET_OS%" == "" ( - echo Detected DDK/WDK + echo Detected DDK/WDK for %_BUILDARCH% set BUILD_ENVIRONMENT=WDK ) - rem Create directories @@ -45,12 +36,12 @@ cd reactos if "%BUILD_ENVIRONMENT%" == "MINGW" ( - cmake -G "MinGW Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-mingw32.cmake %ROS_SOURCE_DIR% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" + cmake -G "MinGW Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-mingw32.cmake -DARCH=%ROS_ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %ROS_SOURCE_DIR% ) if "%BUILD_ENVIRONMENT%" == "WDK" ( - cmake -G "NMake Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake %ROS_SOURCE_DIR% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" + cmake -G "NMake Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%_BUILDARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %ROS_SOURCE_DIR% ) cd.. rem Create a root makefile -@echo someshit > makefile +rem echo ... > makefile

1 0

[fireball] 50175: [FASTFAT_NEW] - Don't use same name for a local boolean var and global enum. Spotted by Pierre.
by fireball＠svn.reactos.org 27 Dec '10

27 Dec '10

Author: fireball Date: Mon Dec 27 22:02:11 2010 New Revision: 50175 URL: http://svn.reactos.org/svn/reactos?rev=50175&view=rev Log: [FASTFAT_NEW] - Don't use same name for a local boolean var and global enum. Spotted by Pierre. Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] Mon Dec 27 22:02:11 2010 @@ -493,7 +493,7 @@ BOOLEAN OpenDirectory; BOOLEAN IsPagingFile; BOOLEAN OpenTargetDirectory; - BOOLEAN DirectoryFile; + BOOLEAN IsDirectoryFile; BOOLEAN NonDirectoryFile; BOOLEAN NoEaKnowledge; BOOLEAN DeleteOnClose; @@ -609,7 +609,7 @@ Vcb = &((PVOLUME_DEVICE_OBJECT)IrpSp->DeviceObject)->Vcb; /* Get options */ - DirectoryFile = BooleanFlagOn(Options, FILE_DIRECTORY_FILE); + IsDirectoryFile = BooleanFlagOn(Options, FILE_DIRECTORY_FILE); NonDirectoryFile = BooleanFlagOn(Options, FILE_NON_DIRECTORY_FILE); SequentialOnly = BooleanFlagOn(Options, FILE_SEQUENTIAL_ONLY); NoIntermediateBuffering = BooleanFlagOn(Options, FILE_NO_INTERMEDIATE_BUFFERING); @@ -624,17 +624,17 @@ CreateDisposition = (Options >> 24) & 0x000000ff; /* Get Create/Open directory flags based on it */ - CreateDirectory = (BOOLEAN)(DirectoryFile && + CreateDirectory = (BOOLEAN)(IsDirectoryFile && ((CreateDisposition == FILE_CREATE) || (CreateDisposition == FILE_OPEN_IF))); - OpenDirectory = (BOOLEAN)(DirectoryFile && + OpenDirectory = (BOOLEAN)(IsDirectoryFile && ((CreateDisposition == FILE_OPEN) || (CreateDisposition == FILE_OPEN_IF))); /* Validate parameters: directory/nondirectory mismatch and AllocationSize being more than 4GB */ - if ((DirectoryFile && NonDirectoryFile) || + if ((IsDirectoryFile && NonDirectoryFile) || Irp->Overlay.AllocationSize.HighPart != 0) { FatCompleteRequest(IrpContext, Irp, STATUS_INVALID_PARAMETER); @@ -686,9 +686,9 @@ FatDecodeFileObject(RelatedFO, &DecodedVcb, &Fcb, &Ccb) == UserVolumeOpen) { /* Check parameters */ - if (DirectoryFile || OpenTargetDirectory) - { - Status = DirectoryFile ? STATUS_NOT_A_DIRECTORY : STATUS_INVALID_PARAMETER; + if (IsDirectoryFile || OpenTargetDirectory) + { + Status = IsDirectoryFile ? STATUS_NOT_A_DIRECTORY : STATUS_INVALID_PARAMETER; /* Unlock VCB */ FatReleaseVcb(IrpContext, Vcb);

1 0

[tkreuzer] 50174: [CMAKE] unix build fixes for host tools
by tkreuzer＠svn.reactos.org 27 Dec '10

27 Dec '10

Author: tkreuzer Date: Mon Dec 27 21:48:25 2010 New Revision: 50174 URL: http://svn.reactos.org/svn/reactos?rev=50174&view=rev Log: [CMAKE] unix build fixes for host tools Modified: branches/cmake-bringup/tools/geninc/geninc.c branches/cmake-bringup/tools/spec2def/spec2def.c branches/cmake-bringup/tools/xml.cpp Modified: branches/cmake-bringup/tools/geninc/geninc.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/geninc/geni… ============================================================================== --- branches/cmake-bringup/tools/geninc/geninc.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/geninc/geninc.c [iso-8859-1] Mon Dec 27 21:48:25 2010 @@ -6,15 +6,20 @@ #ifdef _WIN32 #define PRIx64 "I64x" +typedef unsigned __int16 uint16_t; +typedef unsigned __int32 uint32_t; +typedef unsigned __int64 uint64_t; #else +#include <stdint.h> #define PRIx64 "llx" +#define _stricmp strcasecmp #endif typedef struct { char Type; char Name[55]; - unsigned __int64 Value; + uint64_t Value; } ASMGENDATA; #define TYPE_END 0 @@ -29,24 +34,24 @@ int i, result = -1; int ms_format = 0; char header[20]; - unsigned __int32 e_lfanew, signature; - unsigned __int16 Machine, NumberOfSections, SizeOfOptionalHeader; + uint32_t e_lfanew, signature; + uint16_t Machine, NumberOfSections, SizeOfOptionalHeader; typedef struct { char Name[8]; - unsigned __int32 VirtualSize; - unsigned __int32 VirtualAddress; - unsigned __int32 RawSize; - unsigned __int32 RawAddress; - unsigned __int32 RelocAddress; - unsigned __int32 LineNumbers; - unsigned __int16 RelocationsNumber; - unsigned __int16 LineNumbersNumber; - unsigned __int32 Characteristics; + uint32_t VirtualSize; + uint32_t VirtualAddress; + uint32_t RawSize; + uint32_t RawAddress; + uint32_t RelocAddress; + uint32_t LineNumbers; + uint16_t RelocationsNumber; + uint16_t LineNumbersNumber; + uint32_t Characteristics; } SECTION; SECTION section; - if (argc >= 4 && stricmp(argv[3], "-ms") == 0) ms_format = 1; + if (argc >= 4 && _stricmp(argv[3], "-ms") == 0) ms_format = 1; /* Open the input file */ input = fopen(argv[1], "rb"); @@ -143,7 +148,7 @@ break; } } - + if (i == NumberOfSections) { fprintf(stderr, "Could not find section.\n"); @@ -171,7 +176,7 @@ fprintf(output, "%s\n", data.Name); continue; - case TYPE_CONSTANT: + case TYPE_CONSTANT: if (ms_format) { fprintf(output, "%s equ 0%"PRIx64"h\n", data.Name, data.Value); @@ -182,7 +187,7 @@ } continue; - case TYPE_HEADER: + case TYPE_HEADER: if (ms_format) { fprintf(output, "\n; %s\n", data.Name); Modified: branches/cmake-bringup/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/spec2def/sp… ============================================================================== --- branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] Mon Dec 27 21:48:25 2010 @@ -2,6 +2,10 @@ #include <stdlib.h> #include <ctype.h> #include <string.h> + +#ifndef _WIN32 +#define _stricmp strcasecmp +#endif typedef struct { @@ -145,14 +149,14 @@ (pexp->uFlags & FL_STUB) == 0) return 0; fprintf(file, "int "); - if (strcmp(pszArchString, "i386") == 0 && + if (strcmp(pszArchString, "i386") == 0 && pexp->nCallingConvention == CC_STDCALL) { fprintf(file, "__stdcall "); } fprintf(file, "%.*s(", pexp->nNameLength, pexp->pcName); - + for (i = 0; i < pexp->nArgCount; i++) { if (i != 0) fprintf(file, ", "); @@ -198,7 +202,7 @@ } } fprintf(file, ");\n"); - + if (pexp->nCallingConvention == CC_STUB) { fprintf(file, "\t__wine_spec_unimplemented_stub(\"%s\", __FUNCTION__);\n", pszDllName); @@ -257,7 +261,7 @@ void OutputHeader_def(FILE *file, char *libname) { - fprintf(file, + fprintf(file, "; File generated automatically, do not edit!\n\n" "LIBRARY %s\n\n" "EXPORTS\n", @@ -283,7 +287,7 @@ fprintf(fileDest, "%.*s", pexp->nNameLength, pexp->pcName); - if ((pexp->nCallingConvention == CC_STDCALL || + if ((pexp->nCallingConvention == CC_STDCALL || pexp->nCallingConvention == CC_FASTCALL) && !no_decoration) { fprintf(fileDest, "@%d", pexp->nStackBytes); @@ -295,19 +299,19 @@ int bAddDecorations = 1; fprintf(fileDest, "="); - + /* No decorations, if switch was passed or this is an external */ if (no_decoration || ScanToken(pexp->pcRedirection, '.')) { bAddDecorations = 0; } - + if (pexp->nCallingConvention == CC_FASTCALL && bAddDecorations) { fprintf(fileDest, "@"); } fprintf(fileDest, "%.*s", pexp->nRedirectionLength, pexp->pcRedirection); - if ((pexp->nCallingConvention == CC_STDCALL || + if ((pexp->nCallingConvention == CC_STDCALL || pexp->nCallingConvention == CC_FASTCALL) && bAddDecorations) { fprintf(fileDest, "@%d", pexp->nStackBytes); @@ -348,7 +352,7 @@ int included; //fprintf(stderr, "info: line %d, pcStart:'%.30s'\n", nLine, pcStart); - + /* Loop all lines */ nLine = 1; for (pcLine = pcStart; *pcLine; pcLine = NextLine(pcLine), nLine++) @@ -358,7 +362,7 @@ exp.nArgCount = 0; exp.uFlags = 0; - //fprintf(stderr, "info: line %d, token:'%d, %.20s'\n", + //fprintf(stderr, "info: line %d, token:'%d, %.20s'\n", // nLine, TokenLength(pcLine), pcLine); /* Skip white spaces */ @@ -368,7 +372,7 @@ if (*pc == ';' || *pc <= '#') continue; if (*pc == 0) return 0; - //fprintf(stderr, "info: line %d, token:'%.*s'\n", + //fprintf(stderr, "info: line %d, token:'%.*s'\n", // nLine, TokenLength(pc), pc); /* Now we should get either an ordinal or @ */ @@ -408,7 +412,7 @@ } else { - fprintf(stderr, "error: line %d, expected type, got '%.*s' %d\n", + fprintf(stderr, "error: line %d, expected type, got '%.*s' %d\n", nLine, TokenLength(pc), pc, *pc); return -11; } @@ -441,7 +445,7 @@ { included = 1; } - + /* Skip to next arch or end */ while (*pc > ',') pc++; } @@ -471,7 +475,7 @@ } else { - fprintf(stderr, "info: ignored option: '%.*s'\n", + fprintf(stderr, "info: ignored option: '%.*s'\n", TokenLength(pc), pc); } @@ -480,7 +484,7 @@ } //fprintf(stderr, "info: Name:'%.10s'\n", pc); - + /* If arch didn't match ours, skip this entry */ if (!included) continue; @@ -507,7 +511,7 @@ fprintf(stderr, "error: line %d, expected '('\n", nLine); return -14; } - + /* Skip whitespaces */ while (*pc == ' ' || *pc == '\t') pc++; Modified: branches/cmake-bringup/tools/xml.cpp URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/xml.cpp?rev… ============================================================================== --- branches/cmake-bringup/tools/xml.cpp [iso-8859-1] (original) +++ branches/cmake-bringup/tools/xml.cpp [iso-8859-1] Mon Dec 27 21:48:25 2010 @@ -25,6 +25,7 @@ #include <direct.h> #include <io.h> #else + #include <stdio.h> #include <sys/stat.h> #include <unistd.h> @@ -101,7 +102,7 @@ void XMLException::SetExceptionV ( const std::string& location, const char* format, va_list args ) { char buffer[1024]; - _vsnprintf(buffer, sizeof(buffer)-1, format, args); + vsnprintf(buffer, sizeof(buffer)-1, format, args); _e = location + ": " + buffer; } @@ -426,14 +427,15 @@ XMLFile::Location() const { int line = 1; - char line_str[10]; + char line_str[13]; const char* p = strchr ( _buf.c_str(), '\n' ); while ( p && p < _p ) { ++line; p = strchr ( p+1, '\n' ); } - return _filename + "(" + itoa(line, line_str, 10) + ")"; + sprintf(line_str, "(%i)", line); + return _filename + line_str; } XMLAttribute::XMLAttribute()

1 0

[pschweitzer] 50173: [FASTFAT] Remove unused vars ~
by pschweitzer＠svn.reactos.org 27 Dec '10

27 Dec '10

Author: pschweitzer Date: Mon Dec 27 21:38:40 2010 New Revision: 50173 URL: http://svn.reactos.org/svn/reactos?rev=50173&view=rev Log: [FASTFAT] Remove unused vars ~ Modified: trunk/reactos/drivers/filesystems/fastfat/rw.c Modified: trunk/reactos/drivers/filesystems/fastfat/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] Mon Dec 27 21:38:40 2010 @@ -123,7 +123,6 @@ PDEVICE_EXTENSION DeviceExt; BOOLEAN First = TRUE; PVFATFCB Fcb; - PVFATCCB Ccb; NTSTATUS Status; ULONG BytesDone; ULONG BytesPerSector; @@ -145,7 +144,6 @@ *LengthRead = 0; - Ccb = (PVFATCCB)IrpContext->FileObject->FsContext2; Fcb = IrpContext->FileObject->FsContext; BytesPerSector = DeviceExt->FatInfo.BytesPerSector; BytesPerCluster = DeviceExt->FatInfo.BytesPerCluster; @@ -328,7 +326,6 @@ { PDEVICE_EXTENSION DeviceExt; PVFATFCB Fcb; - PVFATCCB Ccb; ULONG Count; ULONG FirstCluster; ULONG CurrentCluster; @@ -352,7 +349,6 @@ ASSERT(IrpContext->FileObject); ASSERT(IrpContext->FileObject->FsContext2 != NULL); - Ccb = (PVFATCCB)IrpContext->FileObject->FsContext2; Fcb = IrpContext->FileObject->FsContext; BytesPerCluster = DeviceExt->FatInfo.BytesPerCluster; BytesPerSector = DeviceExt->FatInfo.BytesPerSector;

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