- Ros-dev - ReactOS.org

by James Tabor

The point was made on IRC, if we are having issues, "I'll just have to use arwinss then". This was in reference to the region leak. We see the leak due to the compatibility of ReactOS. We use tools from the "Net" to examine the GDI handle counts. Might I add a point, these tools are written for Windows. ;^) How do we really know that the same leak does not occur with arwinss. Are there tools to measure this? Are there checks in wine to make sure wine does not exceed a limit? So far, from the patches added to arwinss from ReactOS, there are limitations to the use of wine. These same patches have been added to ReactOS after porting wine. Is it safe to assume, we have these same limitations in ReactOS? Can we help that we use wine 24/7 when we sync/port from wine? ReactOS has the same bugs if we do. Over and over this has been the issue in the past. Pick on someone else for this leak, I'm not looking for it anymore, James There was a leak before I started to fix it. Bug 4980

15 years, 7 months

2
2
0 0

Trunk locked

by Aleksey Bragin

Hello, the trunk is locked to find and fix regressions introduced since January, 2010. Members of the bugfixing team are: sir_richard, Physicus, me. If someone else volunteers - please let me know, I will add you to the committers list. WBR, Aleksey Bragin.

15 years, 7 months

3
3
0 0

You have been invited to join Rahul Nagpal

by rahulnagpal1989＠yahoo.com

null PS: If you don't want to join this site, use this link: http://rahulnagpal.webs.com/apps/auth/confirm?inviteID=46885840&hash=8670c0…

15 years, 7 months

2
1
0 0

Regression list

by Olaf Siejka

1. ReactOS fails to boot at first stage, on my real hardware since rev. 45320 with BugCheck 7B (7E recently).

15 years, 7 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [tkreuzer] 45565: [REACTOS] Add asm.h containing macros to make assembly code both GAS and ML compatible at the same time. [NTOS/HAL] Move trap entry points from C into a GAS/ML compatile assembly file (might need fine tuning for ML). The

by Gabriel ilardi

Hi Timo, This commit introduces a crash for me in vbox at the end of 1st stage: (base/setup/usetup/bootsup.c:2060) No or unknown boot loader found (ntoskrnl/io/iomgr/file.c:420) Using IopParseDevice() hack. Requested invalid attributes: 9 (ntoskrnl/io/iomgr/file.c:420) Using IopParseDevice() hack. Requested invalid attributes: 9 (ntoskrnl/io/iomgr/file.c:420) Using IopParseDevice() hack. Requested invalid attributes: 116 (ntoskrnl/ps/thread.c:119) PS: Unhandled Kernel Mode Exception Pointers = 0xFA264718 (ntoskrnl/ps/thread.c:126) Code c0000005 Addr 80107DBE Info0 00000000 Info1 00000020 Info2 00000000 Info3 00000020 *** Fatal System Error: 0x0000007e (0xC0000005,0x80107DBE,0xFA264BFC,0xFA26483C) [7hPuTTYEntered debugger on embedded INT3 at 0x0008:0x808dc124. kdb:> bt Eip: <ntoskrnl.exe:dc125 (lib/rtl/i386/debug_asm.S:42 (RtlpBreakWithStatusInstruction))> Frames: <ntoskrnl.exe:a3a7 (ntoskrnl/ke/bug.c:1110 (KeBugCheckWithTf@24))> <ntoskrnl.exe:a4e2 (ntoskrnl/ke/bug.c:1448 (KeBugCheckEx@20))> <ntoskrnl.exe:cbccb (ntoskrnl/ps/thread.c:159 (_SEHExcept.33686))> <ntoskrnl.exe:cbcdc (ntoskrnl/ps/thread.c:159 (_SEHExcept.33686))> <ntoskrnl.exe:d984b (lib/pseh/i386/framebased-gcchack.c:132 (_SEH2FrameHandler))> <ntoskrnl.exe:dbb98 (lib/rtl/i386/except_asm.s:188 (RtlpExecuteHandler2@20))> <ntoskrnl.exe:dbb6c (lib/rtl/i386/except_asm.s:153 (RtlpExecuteHandler@20))> <ntoskrnl.exe:325a (ntoskrnl/ke/i386/exp.c:938 (KiDispatchException@20))> <ntoskrnl.exe:36e3 (ntoskrnl/ke/i386/exp.c:1144 (KiDispatchExceptionFromTrapFrame@28))> <ntoskrnl.exe:67e0 (ntoskrnl/ke/i386/traphdlr.c:1181 (@KiTrap0EHandler@4))> <00000000> kdb:> Gabriel. > Date: Wed, 10 Feb 2010 23:24:59 +0000 > To: ros-diffs(a)reactos.org > From: tkreuzer(a)svn.reactos.org > Subject: [ros-diffs] [tkreuzer] 45565: [REACTOS] Add asm.h containing macros to make assembly code both GAS and ML compatible at the same time. [NTOS/HAL] Move trap entry points from C into a GAS/ML compatile assembly file (might need fine tuning for ML). The entries are generated by a shared assembly macro TRAP_ENTRY. Removed KiTrapStub, KiIsV8086TrapSafe, KiIsUserTrapSafe, KiSetSaneSegments, removed segment handling from KiEnter*Trap. [NTOS] Make KiFastCallEntryHandler and KiSystemServiceHandler FASTCALL and pass the systemcall number in TrapFrame->Eax [HAL] Use _setjmp/longjmp instead of saving a trapframe in HalpBiosCall > > Author: tkreuzer > Date: Thu Feb 11 00:24:59 2010 > New Revision: 45565 > > URL: http://svn.reactos.org/svn/reactos?rev=45565&view=rev > Log: > [REACTOS] Add asm.h containing macros to make assembly code both GAS and ML compatible at the same time. > [NTOS/HAL] Move trap entry points from C into a GAS/ML compatile assembly file (might need fine tuning for ML). The entries are generated by a shared assembly macro TRAP_ENTRY. Removed KiTrapStub, KiIsV8086TrapSafe, KiIsUserTrapSafe, KiSetSaneSegments, removed segment handling from KiEnter*Trap. > [NTOS] Make KiFastCallEntryHandler and KiSystemServiceHandler FASTCALL and pass the systemcall number in TrapFrame->Eax > [HAL] Use _setjmp/longjmp instead of saving a trapframe in HalpBiosCall > > Added: > trunk/reactos/hal/halx86/generic/trap.S (with props) > trunk/reactos/include/reactos/asm.h (with props) > Modified: > trunk/reactos/hal/halx86/generic/bios.c > trunk/reactos/hal/halx86/generic/pic.c > trunk/reactos/hal/halx86/generic/systimer.S > trunk/reactos/hal/halx86/generic/timer.c > trunk/reactos/hal/halx86/hal.rbuild > trunk/reactos/hal/halx86/hal_generic.rbuild > trunk/reactos/hal/halx86/halmps.rbuild > trunk/reactos/hal/halx86/halxbox.rbuild > trunk/reactos/hal/halx86/mp/apic.c > trunk/reactos/include/ndk/i386/asm.h > trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S > trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S > trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S > trunk/reactos/ntoskrnl/include/internal/trap_x.h > trunk/reactos/ntoskrnl/ke/i386/irqobj.c > trunk/reactos/ntoskrnl/ke/i386/trap.s > trunk/reactos/ntoskrnl/ke/i386/traphdlr.c > trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S > > Modified: trunk/reactos/hal/halx86/generic/bios.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bios.c?… > ============================================================================== > --- trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] (original) > +++ trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] Thu Feb 11 00:24:59 2010 > @@ -12,6 +12,9 @@ > #include <hal.h> > #define NDEBUG > #include <debug.h> > +#include <setjmp.h> > + > +void HalpTrap0D(); > > /* GLOBALS ********************************************************************/ > > @@ -46,6 +49,9 @@ > > /* Where the real mode code ends */ > extern PVOID HalpRealModeEnd; > + > +/* Context saved for return from v86 mode */ > +jmp_buf HalpSavedContext; > > /* REAL MODE CODE AND STACK START HERE ****************************************/ > > @@ -230,60 +236,44 @@ > while (TRUE); > } > > -KiTrap(HalpTrap0D, 0); > - > VOID > DECLSPEC_NORETURN > -HalpTrap06(VOID) > -{ > - PKTRAP_FRAME TrapFrame; > - > +HalpTrap06() > +{ > /* Restore ES/DS to known good values first */ > Ke386SetEs(KGDT_R3_DATA | RPL_MASK); > Ke386SetDs(KGDT_R3_DATA | RPL_MASK); > - > - /* Read trap frame address */ > - TrapFrame = (PKTRAP_FRAME)HalpSavedEsp; > - > - /* Restore segments from the trap frame */ > - Ke386SetGs(TrapFrame->SegGs); > - Ke386SetFs(TrapFrame->SegFs); > - Ke386SetEs(TrapFrame->SegEs); > - Ke386SetDs(TrapFrame->SegDs); > - > - /* Restore EFlags */ > - __writeeflags(TrapFrame->EFlags); > - > - /* Exit the V86 mode trap frame */ > - KiCallReturn(TrapFrame); > + > + /* Restore the stack */ > + KeGetPcr()->TSS->Esp0 = HalpSavedEsp0; > + > + /* Return back to where we left */ > + longjmp(HalpSavedContext, 1); > + UNREACHABLE; > } > > /* V8086 ENTER ****************************************************************/ > > VOID > -FASTCALL > -DECLSPEC_NORETURN > -HalpBiosCallHandler(IN PKTRAP_FRAME TrapFrame) > +NTAPI > +HalpBiosCall() > { > /* Must be volatile so it doesn't get optimized away! */ > volatile KTRAP_FRAME V86TrapFrame; > ULONG_PTR StackOffset, CodeOffset; > > - /* Fill out the quick-n-dirty trap frame */ > - TrapFrame->EFlags = __readeflags(); > - TrapFrame->SegGs = Ke386GetGs(); > - TrapFrame->SegFs = Ke386GetFs(); > - TrapFrame->SegEs = Ke386GetEs(); > - TrapFrame->SegDs = Ke386GetDs(); > - > - /* Our stack (the frame) */ > - HalpSavedEsp = (ULONG_PTR)TrapFrame; > + /* Save the context, check for return */ > + if (_setjmp(HalpSavedContext)) > + { > + /* Returned from v86 */ > + return; > + } > > /* Kill alignment faults */ > __writecr0(__readcr0() & ~CR0_AM); > > /* Set new stack address */ > - KeGetPcr()->TSS->Esp0 = HalpSavedEsp - sizeof(FX_SAVE_AREA); > + KeGetPcr()->TSS->Esp0 = (ULONG)&V86TrapFrame - 0x20 - sizeof(FX_SAVE_AREA); > > /* Compute segmented IP and SP offsets */ > StackOffset = (ULONG_PTR)&HalpRealModeEnd - 4 - (ULONG_PTR)HalpRealModeStart; > @@ -304,8 +294,6 @@ > KiDirectTrapReturn((PKTRAP_FRAME)&V86TrapFrame); > } > > -KiTrampoline(HalpBiosCall, KI_PUSH_FAKE_ERROR_CODE | KI_NONVOLATILES_ONLY); > - > /* FUNCTIONS ******************************************************************/ > > VOID > > Modified: trunk/reactos/hal/halx86/generic/pic.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/pic.c?r… > ============================================================================== > --- trunk/reactos/hal/halx86/generic/pic.c [iso-8859-1] (original) > +++ trunk/reactos/hal/halx86/generic/pic.c [iso-8859-1] Thu Feb 11 00:24:59 2010 > @@ -1335,4 +1335,3 @@ > } > } > > -KiTrap(HalpApcInterrupt, KI_SOFTWARE_TRAP); > > Modified: trunk/reactos/hal/halx86/generic/systimer.S > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/systime… > ============================================================================== > --- trunk/reactos/hal/halx86/generic/systimer.S [iso-8859-1] (original) > +++ trunk/reactos/hal/halx86/generic/systimer.S [iso-8859-1] Thu Feb 11 00:24:59 2010 > @@ -8,7 +8,6 @@ > /* INCLUDES ******************************************************************/ > > #include <asm.h> > -#include <internal/i386/asmmacro.S> > .intel_syntax noprefix > > /* GLOBALS *******************************************************************/ > > Modified: trunk/reactos/hal/halx86/generic/timer.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/timer.c… > ============================================================================== > --- trunk/reactos/hal/halx86/generic/timer.c [iso-8859-1] (original) > +++ trunk/reactos/hal/halx86/generic/timer.c [iso-8859-1] Thu Feb 11 00:24:59 2010 > @@ -161,8 +161,6 @@ > KiEoiHelper(TrapFrame); > } > > -KiTrap(HalpClockInterrupt, KI_PUSH_FAKE_ERROR_CODE); > -KiTrap(HalpProfileInterrupt, KI_PUSH_FAKE_ERROR_CODE); > > /* PUBLIC FUNCTIONS ***********************************************************/ > > > Added: trunk/reactos/hal/halx86/generic/trap.S > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/trap.S?… > ============================================================================== > --- trunk/reactos/hal/halx86/generic/trap.S (added) > +++ trunk/reactos/hal/halx86/generic/trap.S [iso-8859-1] Thu Feb 11 00:24:59 2010 > @@ -1,0 +1,23 @@ > +/* > + * FILE: ntoskrnl/ke/i386/trap.S > + * COPYRIGHT: See COPYING in the top level directory > + * PURPOSE: System Traps, Entrypoints and Exitpoints > + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) > + * NOTE: See asmmacro.S for the shared entry/exit code. > + */ > + > +/* INCLUDES ******************************************************************/ > + > +#include <reactos/asm.h> > +#include <ndk/i386/asm.h> > +#include <internal/i386/asmmacro.S> > + > +.code32 > +.text > + > +TRAP_ENTRY HalpTrap0D, 0 > +TRAP_ENTRY HalpApcInterrupt, KI_SOFTWARE_TRAP > +TRAP_ENTRY HalpClockInterrupt, KI_PUSH_FAKE_ERROR_CODE > +TRAP_ENTRY HalpProfileInterrupt, KI_PUSH_FAKE_ERROR_CODE > + > + > > Propchange: trunk/reactos/hal/halx86/generic/trap.S > ------------------------------------------------------------------------------ > svn:eol-style = native > > Modified: trunk/reactos/hal/halx86/hal.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal.rbuild?rev=… > ============================================================================== > --- trunk/reactos/hal/halx86/hal.rbuild [iso-8859-1] (original) > +++ trunk/reactos/hal/halx86/hal.rbuild [iso-8859-1] Thu Feb 11 00:24:59 2010 > @@ -10,6 +10,7 @@ > <library>hal_generic</library> > <library>hal_generic_up</library> > <library>ntoskrnl</library> > + <library>libcntpr</library> > <directory name="up"> > <file>halinit_up.c</file> > <file>halup.rc</file> > > Modified: trunk/reactos/hal/halx86/hal_generic.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic.rbu… > ============================================================================== > --- trunk/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] (original) > +++ trunk/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] Thu Feb 11 00:24:59 2010 > @@ -28,6 +28,7 @@ > <file>sysinfo.c</file> > <file>systimer.S</file> > <file>timer.c</file> > + <file>trap.S</file> > <file>usage.c</file> > </directory> > <directory name="include"> > > Modified: trunk/reactos/hal/halx86/halmps.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halmps.rbuild?r… > ============================================================================== > --- trunk/reactos/hal/halx86/halmps.rbuild [iso-8859-1] (original) > +++ trunk/reactos/hal/halx86/halmps.rbuild [iso-8859-1] Thu Feb 11 00:24:59 2010 > @@ -11,6 +11,7 @@ > <library>hal_generic</library> > <library>hal_generic_mp</library> > <library>ntoskrnl</library> > + <library>libcntpr</library> > <directory name="mp"> > <file>mps.S</file> > <file>mpsboot.asm</file> > > Modified: trunk/reactos/hal/halx86/halxbox.rbuild > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halxbox.rbuild?… > ============================================================================== > --- trunk/reactos/hal/halx86/halxbox.rbuild [iso-8859-1] (original) > +++ trunk/reactos/hal/halx86/halxbox.rbuild [iso-8859-1] Thu Feb 11 00:24:59 2010 > @@ -10,6 +10,7 @@ > <library>hal_generic</library> > <library>hal_generic_up</library> > <library>ntoskrnl</library> > + <library>libcntpr</library> > <directory name="xbox"> > <file>halinit_xbox.c</file> > <file>part_xbox.c</file> > > Modified: trunk/reactos/hal/halx86/mp/apic.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/apic.c?rev=4… > ============================================================================== > --- trunk/reactos/hal/halx86/mp/apic.c [iso-8859-1] (original) > +++ trunk/reactos/hal/halx86/mp/apic.c [iso-8859-1] Thu Feb 11 00:24:59 2010 > @@ -1110,4 +1110,25 @@ > > #endif > > +VOID > +FASTCALL > +DECLSPEC_NORETURN > +HalpApcInterruptHandler(IN PKTRAP_FRAME TrapFrame) > +{ > + /* Set up a fake INT Stack */ > + TrapFrame->EFlags = __readeflags(); > + TrapFrame->SegCs = KGDT_R0_CODE; > + TrapFrame->Eip = TrapFrame->Eax; > + > + /* Build the trap frame */ > + KiEnterInterruptTrap(TrapFrame); > + > + /* unimplemented */ > + UNIMPLEMENTED; > + > + /* Exit the interrupt */ > + KiEoiHelper(TrapFrame); > + > +} > + > /* EOF */ > > Modified: trunk/reactos/include/ndk/i386/asm.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/asm.h?rev… > ============================================================================== > --- trunk/reactos/include/ndk/i386/asm.h [iso-8859-1] (original) > +++ trunk/reactos/include/ndk/i386/asm.h [iso-8859-1] Thu Feb 11 00:24:59 2010 > @@ -248,10 +248,12 @@ > #define KINTERRUPT_SERVICE_CONTEXT 0x10 > #define KINTERRUPT_TICK_COUNT 0x18 > #define KINTERRUPT_ACTUAL_LOCK 0x1C > +#define KINTERRUPT_DISPATCH_ADDRESS 0x20 > #define KINTERRUPT_VECTOR 0x24 > #define KINTERRUPT_IRQL 0x28 > #define KINTERRUPT_SYNCHRONIZE_IRQL 0x29 > #define KINTERRUPT_DISPATCH_COUNT 0x38 > +#define KINTERRUPT_DISPATCH_CODE 0x3C > > // > // KGDTENTRY Offsets > > Added: trunk/reactos/include/reactos/asm.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/asm.h?rev=… > ============================================================================== > --- trunk/reactos/include/reactos/asm.h (added) > +++ trunk/reactos/include/reactos/asm.h [iso-8859-1] Thu Feb 11 00:24:59 2010 > @@ -1,0 +1,190 @@ > +/* > + * COPYRIGHT: See COPYING in the top level directory > + * PROJECT: ReactOS Kernel > + * FILE: ntoskrnl/include/amd64/asmmacro.S > + * PURPOSE: ASM macros for for GAS and MASM/ML64 > + * PROGRAMMERS: Timo Kreuzer (timo.kreuzer(a)reactos.org) > + */ > + > +#ifdef _MSC_VER > + > +/* Allow ".name" identifiers */ > +OPTION DOTNAME > + > +.586 > +.MODEL FLAT > + > +/* Hex numbers need to be in 01ABh format */ > +#define HEX(x) 0##x##h > + > +/* Macro values need to be marked */ > +#define VAL(x) x > + > +/* MASM/ML doesn't want explicit [rip] addressing */ > +rip = 0 > + > +/* Due to MASM's reverse syntax, we are forced to use a precompiler macro */ > +#define MACRO(name, ...) name MACRO __VA_ARGS__ > + > +/* To avoid reverse syntax we provide a new macro .PROC, replacing PROC... */ > +.PROC MACRO name > + name PROC FRAME > + _name: > +ENDM > + > +/* ... and .ENDP, replacing ENDP */ > +.ENDP MACRO name > + name ENDP > +ENDM > + > +/* MASM doesn't have an ASCII macro */ > +.ASCII MACRO text > + DB text > +ENDM > + > +/* MASM doesn't have an ASCIZ macro */ > +.ASCIZ MACRO text > + DB text, 0 > +ENDM > + > +.text MACRO > +ENDM > + > +.code64 MACRO > + .code > +ENDM > + > +.code32 MACRO > + .code > +ENDM > + > +UNIMPLEMENTED MACRO name > +ENDM > + > +/* We need this to distinguish repeat from macros */ > +#define ENDR ENDM > + > +#else /***********************************************************************/ > + > +/* Force intel syntax */ > +.intel_syntax noprefix > +.code64 > + > +.altmacro > + > +/* Hex numbers need to be in 0x1AB format */ > +#define HEX(x) 0x##x > + > +/* Macro values need to be marked */ > +#define VAL(x) \x > + > +/* Due to MASM's reverse syntax, we are forced to use a precompiler macro */ > +#define MACRO(...) .macro __VA_ARGS__ > +#define ENDM .endm > + > +/* To avoid reverse syntax we provide a new macro .PROC, replacing PROC... */ > +.macro .PROC name > + .func \name > + \name: > + .cfi_startproc > + .equ cfa_current_offset, -8 > +.endm > + > +/* ... and .ENDP, replacing ENDP */ > +.macro .ENDP name > + .cfi_endproc > + .endfunc > +.endm > + > +/* MASM compatible PUBLIC */ > +.macro PUBLIC symbol > + .global \symbol > +.endm > + > +/* MASM compatible ALIGN */ > +#define ALIGN .align > + > +/* MASM compatible REPEAT, additional ENDR */ > +#define REPEAT .rept > +#define ENDR .endr > + > +/* MASM compatible EXTERN */ > +.macro EXTERN name > +.endm > + > +/* MASM needs an END tag */ > +#define END > + > +.macro .MODEL model > +.endm > + > +.macro .code > + .text > +.endm > + > +/* Macros for x64 stack unwind OPs */ > + > +.macro .allocstack size > + .cfi_adjust_cfa_offset \size > + .set cfa_current_offset, cfa_current_offset - \size > +.endm > + > +code = 1 > +.macro .pushframe param=0 > + .if (\param) > + .cfi_adjust_cfa_offset 0x30 > + .set cfa_current_offset, cfa_current_offset - 0x30 > + .else > + .cfi_adjust_cfa_offset 0x28 > + .set cfa_current_offset, cfa_current_offset - 0x28 > + .endif > +.endm > + > +.macro .pushreg reg > + .cfi_adjust_cfa_offset 8 > + .equ cfa_current_offset, cfa_current_offset - 8 > + .cfi_offset \reg, cfa_current_offset > +.endm > + > +.macro .savereg reg, offset > + // checkme!!! > + .cfi_offset \reg, \offset > +.endm > + > +.macro .savexmm128 reg, offset > + // checkme!!! > + .cfi_offset \reg, \offset > +.endm > + > +.macro .setframe reg, offset > + .cfi_def_cfa reg, \offset > + .equ cfa_current_offset, \offset > +.endm > + > +.macro .endprolog > +.endm > + > +.macro UNIMPLEMENTED2 file, line, func > + > + jmp 3f > +1: .asciz "\func" > +2: .asciz \file > +3: > + sub rsp, 0x20 > + lea rcx, MsgUnimplemented[rip] > + lea rdx, 1b[rip] > + lea r8, 2b[rip] > + mov r9, \line > + call DbgPrint > + add rsp, 0x20 > +.endm > +#define UNIMPLEMENTED UNIMPLEMENTED2 __FILE__, __LINE__, > + > +/* MASM/ML uses ".if" for runtime conditionals, and "if" for compile time > + conditionals. We therefore use "if", too. .if shouldn't be used at all */ > +#define if .if > +#define endif .endif > +#define else .else > +#define elseif .elseif > + > +#endif > > Propchange: trunk/reactos/include/reactos/asm.h > ------------------------------------------------------------------------------ > svn:eol-style = native > > Modified: trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/i386/fastinter… > ============================================================================== > --- trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S [iso-8859-1] Thu Feb 11 00:24:59 2010 > @@ -7,11 +7,15 @@ > */ > > /* INCLUDES ******************************************************************/ > + > +#include <reactos/asm.h> > #include <ndk/asm.h> > #include <internal/i386/asmmacro.S> > -.intel_syntax noprefix > > /* FUNCTIONS ****************************************************************/ > + > +.code32 > +.text > > /* > * NOTE: These functions must obey the following rules: > > Modified: trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/i386/interlck_… > ============================================================================== > --- trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S [iso-8859-1] Thu Feb 11 00:24:59 2010 > @@ -7,11 +7,15 @@ > */ > > /* INCLUDES ******************************************************************/ > + > +#include <reactos/asm.h> > #include <ndk/asm.h> > #include <internal/i386/asmmacro.S> > -.intel_syntax noprefix > > /* FUNCTIONS ****************************************************************/ > + > +.code32 > +.text > > /* > * NOTE: These functions must obey the following rules: > > Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… > ============================================================================== > --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S [iso-8859-1] Thu Feb 11 00:24:59 2010 > @@ -4,17 +4,12 @@ > * FILE: ntoskrnl/include/i386/asmmacro.S > * PURPOSE: Assembly Macros for Spinlocks and common Trap Code > * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) > + * Timo Kreuzer (timo.kreuzer(a)reactos.org) > */ > > -/* INCLUDES ******************************************************************/ > - > -#include <ndk/asm.h> > - > // Arguments for idt > -#define INT_32_DPL0 0x8E00 > -#define INT_32_DPL3 0xEE00 > - > -.intel_syntax noprefix > +#define INT_32_DPL0 HEX(08E00) > +#define INT_32_DPL3 HEX(0EE00) > > // > // These macros are inlined equivalents of KiAcquire/ReleaseSpinlock, that is, > @@ -30,7 +25,7 @@ > // #IFDEF CONFIG_SMP > // .spin > // <any necessary steps to be able to jump back safely> > -/ SPIN_ON_LOCK(reg, .BeginYourFunction) > +// SPIN_ON_LOCK(reg, .BeginYourFunction) > // #ENDIF > // > #ifdef CONFIG_SMP > @@ -64,74 +59,139 @@ > // > // @remark None. > // > -.macro idt Handler, Bits > +MACRO(idt, Handler, Bits) > .long \Handler > .short \Bits > .short KGDT_R0_CODE > -.endm > +ENDM > > -// > -// @name GENERATE_IDT_STUB > -// > -// This macro creates an IDT entry for an unexpected interrupt handler. > -// > -// @param None. > -// > -// @remark None. > -// > -.macro GENERATE_IDT_STUB Number > -idt _KiUnexpectedInterrupt&Number, INT_32_DPL0 > -.endm > > -// > -// @name GENERATE_IDT_STUBS > -// > -// This macro creates unexpected interrupt IDT entries. > -// > -// @param None. > -// > -// @remark None. > -// > -.altmacro > -.macro GENERATE_IDT_STUBS > -.set i, 0 > -.rept 208 > - GENERATE_IDT_STUB %i > - .set i, i + 1 > -.endr > -.endm > +KI_PUSH_FAKE_ERROR_CODE = HEX(0001) > +KI_UNUSED = HEX(0002) > +KI_NONVOLATILES_ONLY = HEX(0004) > +KI_FAST_SYSTEM_CALL = HEX(0008) > +KI_SOFTWARE_TRAP = HEX(0010) > +KI_HARDWARE_INT = HEX(0020) > +KI_DONT_SAVE_SEGS = HEX(0100) > > -// > -// @name GENERATE_INT_HANDLER > -// > -// This macro creates an unexpected interrupt handler. > -// > -// @param None. > -// > -// @remark None. > -// > -.macro GENERATE_INT_HANDLER Number > -.func KiUnexpectedInterrupt&Number > -_KiUnexpectedInterrupt&Number: > - mov eax, PRIMARY_VECTOR_BASE + Number > - jmp _KiEndUnexpectedRange@0 > -.endfunc > -.endm > +MACRO(KiEnterTrap, Flags) > + LOCAL kernel_trap > + LOCAL not_v86_trap > + LOCAL set_sane_segs > > -// > -// @name GENERATE_INT_HANDLERS > -// > -// This macro creates the unexpected interrupt handlers. > -// > -// @param None. > -// > -// @remark None. > -// > -.altmacro > -.macro GENERATE_INT_HANDLERS > -.set i, 0 > -.rept 208 > - GENERATE_INT_HANDLER %i > - .set i, i + 1 > -.endr > -.endm > + /* Check what kind of trap frame this trap requires */ > + if (Flags AND KI_FAST_SYSTEM_CALL) > + > + /* SYSENTER requires us to build a complete ring transition trap frame */ > + FrameSize = KTRAP_FRAME_V86_ES > + > + /* Fixup fs. cx is free to clobber */ > + mov cx, KGDT_R0_PCR > + mov fs, cx > + > + /* Get pointer to the TSS */ > + mov ecx, fs:[KPCR_TSS] > + > + /* Get a stack pointer */ > + mov esp, [ecx + KTSS_ESP0] > + > + elseif (Flags AND KI_SOFTWARE_TRAP) > + > + /* Software traps need a complete non-ring transition trap frame */ > + FrameSize = KTRAP_FRAME_ESP > + > + /* Software traps need to get their EIP from the caller's frame */ > + pop eax > + > + elseif (Flags AND KI_PUSH_FAKE_ERROR_CODE) > + > + /* If the trap doesn't have an error code, we'll make space for it */ > + FrameSize = KTRAP_FRAME_EIP > + > + else > + > + /* The trap already has an error code, so just make space for the rest */ > + FrameSize = KTRAP_FRAME_ERROR_CODE > + > + endif > + > + /* Save nonvolatile registers */ > + mov [esp - FrameSize + KTRAP_FRAME_EBP], ebp > + mov [esp - FrameSize + KTRAP_FRAME_EBX], ebx > + mov [esp - FrameSize + KTRAP_FRAME_ESI], esi > + mov [esp - FrameSize + KTRAP_FRAME_EDI], edi > + > + /* Save eax for system calls, for use by the C handler */ > + mov [esp - FrameSize + KTRAP_FRAME_EAX], eax > + > + /* Does the caller want nonvolatiles only? */ > + if ((Flags AND KI_NONVOLATILES_ONLY) == 0) > + /* Otherwise, save the volatiles as well */ > + mov [esp - FrameSize + KTRAP_FRAME_ECX], ecx > + mov [esp - FrameSize + KTRAP_FRAME_EDX], edx > + endif > + > + /* Save segment registers? */ > + if ((Flags AND KI_DONT_SAVE_SEGS) == 0) > + > + /* Check for V86 mode */ > + test byte ptr [esp - FrameSize + KTRAP_FRAME_EFLAGS + 2], (EFLAGS_V86_MASK >> 16) > + jz not_v86_trap > + > + /* Restore V8086 segments into Protected Mode segments */ > + mov eax, [esp - FrameSize + KTRAP_FRAME_V86_DS] > + mov ecx, [esp - FrameSize + KTRAP_FRAME_V86_ES] > + mov [esp - FrameSize + KTRAP_FRAME_DS], eax > + mov [esp - FrameSize + KTRAP_FRAME_ES], ecx > + mov eax, [esp - FrameSize + KTRAP_FRAME_V86_FS] > + mov ecx, [esp - FrameSize + KTRAP_FRAME_V86_GS] > + mov [esp - FrameSize + KTRAP_FRAME_FS], eax > + mov [esp - FrameSize + KTRAP_FRAME_GS], ecx > + jmp set_sane_segs > + > + not_v86_trap: > + > + /* Save segment selectors */ > + mov eax, ds > + mov ecx, es > + mov [esp - FrameSize + KTRAP_FRAME_DS], eax > + mov [esp - FrameSize + KTRAP_FRAME_ES], ecx > + mov eax, fs > + mov ecx, gs > + mov [esp - FrameSize + KTRAP_FRAME_FS], eax > + mov [esp - FrameSize + KTRAP_FRAME_GS], ecx > + > + endif > + > +set_sane_segs: > + /* Load correct data segments */ > + mov ax, KGDT_R3_DATA OR RPL_MASK > + mov ds, ax > + mov es, ax > + > + /* Fast system calls have fs already fixed */ > + if ((Flags AND KI_FAST_SYSTEM_CALL) == 0) > + /* Otherwise fix fs now */ > + mov ax, KGDT_R0_PCR > + mov fs, ax > + endif > + > + /* Make space for this frame */ > + sub esp, FrameSize > + > + /* Clear direction flag */ > + cld > + > + /* Set parameter 1 (ECX) to point to the frame */ > + mov ecx, esp > + > +ENDM > + > +MACRO(TRAP_ENTRY, Trap, Flags) > +EXTERN @&Trap&Handler@4 :PROC > + PUBLIC _&Trap > + _&Trap: > + KiEnterTrap Flags > + jmp @&Trap&Handler@4 > +ENDM > + > > Modified: trunk/reactos/ntoskrnl/include/internal/trap_x.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… > ============================================================================== > --- trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] Thu Feb 11 00:24:59 2010 > @@ -196,68 +196,6 @@ > asm volatile(".byte 0xC4\n.byte 0xC4\n"); > } > > -// > -// Returns whether or not this is a V86 trap by checking the EFLAGS field. > -// > -// FIXME: GCC 4.5 Can Improve this with "goto labels" > -// > -BOOLEAN > -FORCEINLINE > -KiIsV8086TrapSafe(IN PKTRAP_FRAME TrapFrame) > -{ > - BOOLEAN Result; > - > - /* > - * The check MUST be done this way, as we guarantee that no DS/ES/FS segment > - * is used (since it might be garbage). > - * > - * Instead, we use the SS segment which is guaranteed to be correct. Because > - * operate in 32-bit flat mode, this works just fine. > - */ > - asm volatile > - ( > - "testl $%c[f], %%ss:%1\n" > - "setnz %0\n" > - : "=a"(Result) > - : "m"(TrapFrame->EFlags), > - [f] "i"(EFLAGS_V86_MASK) > - ); > - > - /* If V86 flag was set */ > - return Result; > -} > - > -// > -// Returns whether or not this is a user-mode trap by checking the SegCs field. > -// > -// FIXME: GCC 4.5 Can Improve this with "goto labels" > -// > -BOOLEAN > -FORCEINLINE > -KiIsUserTrapSafe(IN PKTRAP_FRAME TrapFrame) > -{ > - BOOLEAN Result; > - > - /* > - * The check MUST be done this way, as we guarantee that no DS/ES/FS segment > - * is used (since it might be garbage). > - * > - * Instead, we use the SS segment which is guaranteed to be correct. Because > - * operate in 32-bit flat mode, this works just fine. > - */ > - asm volatile > - ( > - "cmp $%c[f], %%ss:%1\n" > - "setnz %0\n" > - : "=a"(Result) > - : "m"(TrapFrame->SegCs), > - [f] "i"(KGDT_R0_CODE) > - ); > - > - /* If V86 flag was set */ > - return Result; > -} > - > VOID > FORCEINLINE > KiUserSystemCall(IN PKTRAP_FRAME TrapFrame) > @@ -279,30 +217,6 @@ > : > : "r"(TrapFrame->SegCs) > ); > -} > - > -VOID > -FORCEINLINE > -KiSetSaneSegments(IN PKTRAP_FRAME TrapFrame) > -{ > - ULONG Ds, Es; > - > - /* > - * We really have to get a good DS/ES first before touching any data. > - * > - * These two reads will either go in a register (with optimizations ON) or > - * a stack variable (which is on SS:ESP, guaranteed to be good/valid). > - * > - * Because the assembly is marked volatile, the order of instructions is > - * as-is, otherwise the optimizer could simply get rid of our DS/ES. > - * > - */ > - Ds = Ke386GetDs(); > - Es = Ke386GetEs(); > - Ke386SetDs(KGDT_R3_DATA | RPL_MASK); > - Ke386SetEs(KGDT_R3_DATA | RPL_MASK); > - TrapFrame->SegDs = Ds; > - TrapFrame->SegEs = Es; > } > > // > @@ -643,17 +557,9 @@ > FORCEINLINE > KiEnterV86Trap(IN PKTRAP_FRAME TrapFrame) > { > - /* Load correct registers */ > - Ke386SetFs(KGDT_R0_PCR); > - Ke386SetDs(KGDT_R3_DATA | RPL_MASK); > - Ke386SetEs(KGDT_R3_DATA | RPL_MASK); > - > /* Save exception list */ > TrapFrame->ExceptionList = KeGetPcr()->Tib.ExceptionList; > > - /* Clear direction flag */ > - Ke386ClearDirectionFlag(); > - > /* Save DR7 and check for debugging */ > TrapFrame->Dr7 = __readdr(7); > if (__builtin_expect(TrapFrame->Dr7 & ~DR7_RESERVED_MASK, 0)) > @@ -670,40 +576,10 @@ > FORCEINLINE > KiEnterInterruptTrap(IN PKTRAP_FRAME TrapFrame) > { > - /* Check for V86 mode, otherwise check for ring 3 code */ > - if (__builtin_expect(KiIsV8086TrapSafe(TrapFrame), 0)) > - { > - /* Set correct segments */ > - Ke386SetDs(KGDT_R3_DATA | RPL_MASK); > - Ke386SetEs(KGDT_R3_DATA | RPL_MASK); > - Ke386SetFs(KGDT_R0_PCR); > - > - /* Restore V8086 segments into Protected Mode segments */ > - TrapFrame->SegFs = TrapFrame->V86Fs; > - TrapFrame->SegGs = TrapFrame->V86Gs; > - TrapFrame->SegDs = TrapFrame->V86Ds; > - TrapFrame->SegEs = TrapFrame->V86Es; > - } > - else if (__builtin_expect(KiIsUserTrapSafe(TrapFrame), 1)) /* Ring 3 is more common */ > - { > - /* Switch to sane segments */ > - KiSetSaneSegments(TrapFrame); > - > - /* Save FS/GS */ > - TrapFrame->SegFs = Ke386GetFs(); > - TrapFrame->SegGs = Ke386GetGs(); > - > - /* Set correct FS */ > - Ke386SetFs(KGDT_R0_PCR); > - } > - > /* Save exception list and terminate it */ > TrapFrame->ExceptionList = KeGetPcr()->Tib.ExceptionList; > KeGetPcr()->Tib.ExceptionList = EXCEPTION_CHAIN_END; > > - /* Clear direction flag */ > - Ke386ClearDirectionFlag(); > - > /* Flush DR7 and check for debugging */ > TrapFrame->Dr7 = 0; > if (__builtin_expect(KeGetCurrentThread()->DispatcherHeader.DebugActive & 0xFF, 0)) > @@ -723,29 +599,8 @@ > FORCEINLINE > KiEnterTrap(IN PKTRAP_FRAME TrapFrame) > { > - /* Switch to sane segments */ > - KiSetSaneSegments(TrapFrame); > - > - /* Now we can save the other segments and then switch to the correct FS */ > - TrapFrame->SegFs = Ke386GetFs(); > - TrapFrame->SegGs = Ke386GetGs(); > - Ke386SetFs(KGDT_R0_PCR); > - > /* Save exception list */ > TrapFrame->ExceptionList = KeGetPcr()->Tib.ExceptionList; > - > - /* Check for V86 mode */ > - if (__builtin_expect(TrapFrame->EFlags & EFLAGS_V86_MASK, 0)) > - { > - /* Restore V8086 segments into Protected Mode segments */ > - TrapFrame->SegFs = TrapFrame->V86Fs; > - TrapFrame->SegGs = TrapFrame->V86Gs; > - TrapFrame->SegDs = TrapFrame->V86Ds; > - TrapFrame->SegEs = TrapFrame->V86Es; > - } > - > - /* Clear direction flag */ > - Ke386ClearDirectionFlag(); > > /* Flush DR7 and check for debugging */ > TrapFrame->Dr7 = 0; > @@ -759,130 +614,4 @@ > KiFillTrapFrameDebug(TrapFrame); > } > > -// > -// Generates a Trap Prolog Stub for the given name > -// > -#define KI_PUSH_FAKE_ERROR_CODE 0x1 > -#define KI_UNUSED 0x2 > -#define KI_NONVOLATILES_ONLY 0x4 > -#define KI_FAST_SYSTEM_CALL 0x8 > -#define KI_SOFTWARE_TRAP 0x10 > -#define KI_HARDWARE_INT 0x20 > -#define KiTrap(x, y) VOID DECLSPEC_NORETURN x(VOID) { KiTrapStub(y, x##Handler); UNREACHABLE; } > -#define KiTrampoline(x, y) VOID DECLSPEC_NOINLINE x(VOID) { KiTrapStub(y, x##Handler); } > - > -// > -// Trap Prolog Stub > -// > -VOID > -FORCEINLINE > -KiTrapStub(IN ULONG Flags, > - IN PVOID Handler) > -{ > - ULONG FrameSize; > - > - /* Is this a fast system call? They don't have a stack! */ > - if (Flags & KI_FAST_SYSTEM_CALL) __asm__ __volatile__ > - ( > - "movl %%ss:%c[t], %%esp\n" > - "movl %c[e](%%esp), %%esp\n" > - : > - : [e] "i"(FIELD_OFFSET(KTSS, Esp0)), > - [t] "i"(&PCR->TSS) > - : "%esp" > - ); > - > - /* Check what kind of trap frame this trap requires */ > - if (Flags & KI_SOFTWARE_TRAP) > - { > - /* Software traps need a complete non-ring transition trap frame */ > - FrameSize = FIELD_OFFSET(KTRAP_FRAME, HardwareEsp); > - } > - else if (Flags & KI_FAST_SYSTEM_CALL) > - { > - /* SYSENTER requires us to build a complete ring transition trap frame */ > - FrameSize = FIELD_OFFSET(KTRAP_FRAME, V86Es); > - > - /* And it only preserves nonvolatile registers */ > - Flags |= KI_NONVOLATILES_ONLY; > - } > - else if (Flags & KI_PUSH_FAKE_ERROR_CODE) > - { > - /* If the trap doesn't have an error code, we'll make space for it */ > - FrameSize = FIELD_OFFSET(KTRAP_FRAME, Eip); > - } > - else > - { > - /* The trap already has an error code, so just make space for the rest */ > - FrameSize = FIELD_OFFSET(KTRAP_FRAME, ErrCode); > - } > - > - /* Software traps need to get their EIP from the caller's frame */ > - if (Flags & KI_SOFTWARE_TRAP) __asm__ __volatile__ ("popl %%eax\n":::"%esp"); > - > - /* Save nonvolatile registers */ > - __asm__ __volatile__ > - ( > - /* EBX, ESI, EDI and EBP are saved */ > - "movl %%ebp, %c[p](%%esp)\n" > - "movl %%ebx, %c[b](%%esp)\n" > - "movl %%esi, %c[s](%%esp)\n" > - "movl %%edi, %c[i](%%esp)\n" > - : > - : [b] "i"(- FrameSize + FIELD_OFFSET(KTRAP_FRAME, Ebx)), > - [s] "i"(- FrameSize + FIELD_OFFSET(KTRAP_FRAME, Esi)), > - [i] "i"(- FrameSize + FIELD_OFFSET(KTRAP_FRAME, Edi)), > - [p] "i"(- FrameSize + FIELD_OFFSET(KTRAP_FRAME, Ebp)) > - : "%esp" > - ); > - > - /* Does the caller want nonvolatiles only? */ > - if (!(Flags & KI_NONVOLATILES_ONLY)) __asm__ __volatile__ > - ( > - /* Otherwise, save the volatiles as well */ > - "movl %%eax, %c[a](%%esp)\n" > - "movl %%ecx, %c[c](%%esp)\n" > - "movl %%edx, %c[d](%%esp)\n" > - : > - : [a] "i"(- FrameSize + FIELD_OFFSET(KTRAP_FRAME, Eax)), > - [c] "i"(- FrameSize + FIELD_OFFSET(KTRAP_FRAME, Ecx)), > - [d] "i"(- FrameSize + FIELD_OFFSET(KTRAP_FRAME, Edx)) > - : "%esp" > - ); > - > - /* Now set parameter 1 (ECX) to point to the frame */ > - __asm__ __volatile__ ("movl %%esp, %%ecx\n":::"%esp"); > - > - /* Now go ahead and make space for this frame */ > - __asm__ __volatile__ ("subl $%c[e],%%esp\n":: [e] "i"(FrameSize) : "%esp"); > - __asm__ __volatile__ ("subl $%c[e],%%ecx\n":: [e] "i"(FrameSize) : "%ecx"); > - > - /* > - * For hardware interrupts, set parameter 2 (EDX) to hold KINTERRUPT. > - * This code will be dynamically patched when an interrupt is registered! > - */ > - if (Flags & KI_HARDWARE_INT) __asm__ __volatile__ > - ( > - ".globl _KiInterruptTemplate2ndDispatch\n_KiInterruptTemplate2ndDispatch:\n" > - "movl $0, %%edx\n" > - ".globl _KiInterruptTemplateObject\n_KiInterruptTemplateObject:\n" > - ::: "%edx" > - ); > - > - /* Now jump to the C handler */ > - if (Flags & KI_HARDWARE_INT)__asm__ __volatile__ > - ( > - /* > - * For hardware interrupts, use an absolute JMP instead of a relative JMP > - * since the position of this code is arbitrary in memory, and therefore > - * the compiler-generated offset will not be correct. > - */ > - "jmp *%0\n" > - ".globl _KiInterruptTemplateDispatch\n_KiInterruptTemplateDispatch:\n" > - : > - : "a"(Handler) > - ); > - else __asm__ __volatile__ ("jmp %c[x]\n":: [x] "i"(Handler)); > -} > - > #endif > > Modified: trunk/reactos/ntoskrnl/ke/i386/irqobj.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/irqobj.c?… > ============================================================================== > --- trunk/reactos/ntoskrnl/ke/i386/irqobj.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ke/i386/irqobj.c [iso-8859-1] Thu Feb 11 00:24:59 2010 > @@ -233,7 +233,7 @@ > KIRQL OldIrql; > BOOLEAN Handled; > PLIST_ENTRY NextEntry, ListHead; > - > + > /* Increase interrupt count */ > KeGetCurrentPrcb()->InterruptCount++; > > @@ -299,7 +299,7 @@ > /* Now call the epilogue code */ > KiExitInterrupt(TrapFrame, OldIrql, TRUE); > } > - } > +} > > VOID > FASTCALL > @@ -313,8 +313,6 @@ > ((PKI_INTERRUPT_DISPATCH*)Interrupt->DispatchAddress)(TrapFrame, Interrupt); > } > > -KiTrap(KiInterruptTemplate, KI_PUSH_FAKE_ERROR_CODE | KI_HARDWARE_INT); > -KiTrap(KiUnexpectedInterruptTail, KI_PUSH_FAKE_ERROR_CODE); > > /* PUBLIC FUNCTIONS **********************************************************/ > > > Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… > ============================================================================== > --- trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] Thu Feb 11 00:24:59 2010 > @@ -3,19 +3,33 @@ > * COPYRIGHT: See COPYING in the top level directory > * PURPOSE: System Traps, Entrypoints and Exitpoints > * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) > + * Timo Kreuzer (timo.kreuzer(a)reactos.org) > * NOTE: See asmmacro.S for the shared entry/exit code. > */ > > /* INCLUDES ******************************************************************/ > > -#include <asm.h> > +#include <reactos/asm.h> > +#include <ndk/i386/asm.h> > #include <internal/i386/asmmacro.S> > -.intel_syntax noprefix > + > +MACRO(GENERATE_IDT_STUB, Number) > +idt _KiUnexpectedInterrupt&Number, INT_32_DPL0 > +ENDM > + > +MACRO(GENERATE_INT_HANDLER, Number) > +.func KiUnexpectedInterrupt&Number > +_KiUnexpectedInterrupt&Number: > + mov eax, PRIMARY_VECTOR_BASE + Number > + jmp _KiEndUnexpectedRange@0 > +.endfunc > +ENDM > > /* GLOBALS *******************************************************************/ > > .data > -.globl _KiIdt > + > +PUBLIC _KiIdt > _KiIdt: > /* This is the Software Interrupt Table that we handle in this file: */ > idt _KiTrap00, INT_32_DPL0 /* INT 00: Divide Error (#DE) */ > @@ -47,26 +61,86 @@ > idt _KiDebugService, INT_32_DPL3 /* INT 2D: Debug Service Handler */ > idt _KiSystemService, INT_32_DPL3 /* INT 2E: System Call Service Handler */ > idt _KiTrap0F, INT_32_DPL0 /* INT 2F: RESERVED */ > -GENERATE_IDT_STUBS /* INT 30-FF: UNEXPECTED INTERRUPTS */ > +i = 0 > +.rept 208 > + GENERATE_IDT_STUB %i > + i = i + 1 > +.endr > > -.globl _KiIdtDescriptor > +PUBLIC _KiIdtDescriptor > _KiIdtDescriptor: > .short 0 > .short 0x7FF > .long _KiIdt > > -.globl _KiUnexpectedEntrySize > +PUBLIC _KiUnexpectedEntrySize > _KiUnexpectedEntrySize: > .long _KiUnexpectedInterrupt1 - _KiUnexpectedInterrupt0 > > +/******************************************************************************/ > +.code32 > .text > -/* HARDWARE INTERRUPT HANDLERS ************************************************/ > > -.globl _KiStartUnexpectedRange@0 > +TRAP_ENTRY KiTrap00, KI_PUSH_FAKE_ERROR_CODE > +TRAP_ENTRY KiTrap01, KI_PUSH_FAKE_ERROR_CODE > +TRAP_ENTRY KiTrap03, KI_PUSH_FAKE_ERROR_CODE > +TRAP_ENTRY KiTrap04, KI_PUSH_FAKE_ERROR_CODE > +TRAP_ENTRY KiTrap05, KI_PUSH_FAKE_ERROR_CODE > +TRAP_ENTRY KiTrap06, KI_PUSH_FAKE_ERROR_CODE > +TRAP_ENTRY KiTrap07, KI_PUSH_FAKE_ERROR_CODE > +TRAP_ENTRY KiTrap08, 0 > +TRAP_ENTRY KiTrap09, KI_PUSH_FAKE_ERROR_CODE > +TRAP_ENTRY KiTrap0A, 0 > +TRAP_ENTRY KiTrap0B, 0 > +TRAP_ENTRY KiTrap0C, 0 > +TRAP_ENTRY KiTrap0D, 0 > +TRAP_ENTRY KiTrap0E, 0 > +TRAP_ENTRY KiTrap0F, KI_PUSH_FAKE_ERROR_CODE > +TRAP_ENTRY KiTrap10, KI_PUSH_FAKE_ERROR_CODE > +TRAP_ENTRY KiTrap11, KI_PUSH_FAKE_ERROR_CODE > +TRAP_ENTRY KiTrap13, KI_PUSH_FAKE_ERROR_CODE > +TRAP_ENTRY KiGetTickCount, KI_PUSH_FAKE_ERROR_CODE > +TRAP_ENTRY KiCallbackReturn, KI_PUSH_FAKE_ERROR_CODE > +TRAP_ENTRY KiRaiseAssertion, KI_PUSH_FAKE_ERROR_CODE > +TRAP_ENTRY KiDebugService, KI_PUSH_FAKE_ERROR_CODE > +TRAP_ENTRY KiUnexpectedInterruptTail, KI_PUSH_FAKE_ERROR_CODE > + > +ALIGN 4 > +EXTERN @KiInterruptTemplateHandler@8 > +PUBLIC _KiInterruptTemplate > +_KiInterruptTemplate: > + KiEnterTrap KI_PUSH_FAKE_ERROR_CODE > +PUBLIC _KiInterruptTemplate2ndDispatch > +_KiInterruptTemplate2ndDispatch: > + mov edx, 0 > +PUBLIC _KiInterruptTemplateObject > +_KiInterruptTemplateObject: > + mov eax, offset @KiInterruptTemplateHandler@8 > + jmp eax > +PUBLIC _KiInterruptTemplateDispatch > +_KiInterruptTemplateDispatch: > + > +EXTERN @KiSystemServiceHandler@8:PROC > +PUBLIC _KiSystemService > +_KiSystemService: > + KiEnterTrap (KI_PUSH_FAKE_ERROR_CODE OR KI_NONVOLATILES_ONLY OR KI_DONT_SAVE_SEGS) > + jmp @KiSystemServiceHandler@8 > + > +EXTERN @KiFastCallEntryHandler@8:PROC > +PUBLIC _KiFastCallEntry > +_KiFastCallEntry: > + KiEnterTrap (KI_FAST_SYSTEM_CALL OR KI_NONVOLATILES_ONLY OR KI_DONT_SAVE_SEGS) > + jmp @KiFastCallEntryHandler@8 > + > +PUBLIC _KiStartUnexpectedRange@0 > _KiStartUnexpectedRange@0: > - > -GENERATE_INT_HANDLERS > - > -.globl _KiEndUnexpectedRange@0 > +i = 0 > +.rept 208 > + GENERATE_INT_HANDLER %i > + i = i + 1 > +.endr > +PUBLIC _KiEndUnexpectedRange@0 > _KiEndUnexpectedRange@0: > jmp _KiUnexpectedInterruptTail > + > +END > > Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… > ============================================================================== > --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Thu Feb 11 00:24:59 2010 > @@ -53,7 +53,15 @@ > return ((TrapFrame->EFlags & EFLAGS_V86_MASK) || > ((KiUserTrap(TrapFrame)) && (PsGetCurrentProcess()->VdmObjects))); > } > - > + > +BOOLEAN > +FORCEINLINE > +KiV86Trap(IN PKTRAP_FRAME TrapFrame) > +{ > + /* Check if the V8086 flag is on */ > + return ((TrapFrame->EFlags & EFLAGS_V86_MASK) != 0); > +} > + > /* TRAP EXIT CODE *************************************************************/ > > VOID > @@ -223,7 +231,7 @@ > DataOffset, > TrapFrame); > } > - > + > /* Check for invalid operation */ > if (Error & FSW_INVALID_OPERATION) > { > @@ -540,7 +548,7 @@ > KIRQL OldIrql; > > /* Check for V86 GPF */ > - if (__builtin_expect(KiIsV8086TrapSafe(TrapFrame), 1)) > + if (__builtin_expect(KiV86Trap(TrapFrame), 1)) > { > /* Enter V86 trap */ > KiEnterV86Trap(TrapFrame); > @@ -800,7 +808,7 @@ > KIRQL OldIrql; > > /* Check for V86 GPF */ > - if (__builtin_expect(KiIsV8086TrapSafe(TrapFrame), 1)) > + if (__builtin_expect(KiV86Trap(TrapFrame), 1)) > { > /* Enter V86 trap */ > KiEnterV86Trap(TrapFrame); > @@ -845,7 +853,7 @@ > > /* Check for user-mode GPF */ > if (KiUserTrap(TrapFrame)) > - { > + { > /* Should not be VDM */ > ASSERT(KiVdmTrap(TrapFrame) == FALSE); > > @@ -1502,19 +1510,13 @@ > } > > VOID > -__attribute__((regparm(3))) > -DECLSPEC_NORETURN > -KiFastCallEntryHandler(IN ULONG ServiceNumber, > - IN PVOID Arguments, > - IN PKTRAP_FRAME TrapFrame) > +FASTCALL > +DECLSPEC_NORETURN > +KiFastCallEntryHandler(IN PKTRAP_FRAME TrapFrame, > + IN PVOID Arguments) > { > PKTHREAD Thread; > - > - /* Fixup segments */ > - Ke386SetFs(KGDT_R0_PCR); > - Ke386SetDs(KGDT_R3_DATA | RPL_MASK); > - Ke386SetEs(KGDT_R3_DATA | RPL_MASK); > - > + > /* Set up a fake INT Stack and enable interrupts */ > TrapFrame->HardwareSegSs = KGDT_R3_DATA | RPL_MASK; > TrapFrame->HardwareEsp = (ULONG_PTR)Arguments; > @@ -1531,7 +1533,7 @@ > > /* Call the shared handler (inline) */ > KiSystemCallHandler(TrapFrame, > - ServiceNumber, > + TrapFrame->Eax, > Arguments, > Thread, > UserMode, > @@ -1540,64 +1542,28 @@ > } > > VOID > -__attribute__((regparm(3))) > -DECLSPEC_NORETURN > -KiSystemServiceHandler(IN ULONG ServiceNumber, > - IN PVOID Arguments, > - IN PKTRAP_FRAME TrapFrame) > -{ > - USHORT SegFs; > +FASTCALL > +DECLSPEC_NORETURN > +KiSystemServiceHandler(IN PKTRAP_FRAME TrapFrame, > + IN PVOID Arguments) > +{ > PKTHREAD Thread; > > - /* Save and fixup FS */ > - SegFs = Ke386GetFs(); > - Ke386SetFs(KGDT_R0_PCR); > - > /* Get the current thread */ > Thread = KeGetCurrentThread(); > > /* Chain trap frames */ > TrapFrame->Edx = (ULONG_PTR)Thread->TrapFrame; > > - /* Clear direction flag */ > - Ke386ClearDirectionFlag(); > - > /* Call the shared handler (inline) */ > KiSystemCallHandler(TrapFrame, > - ServiceNumber, > + TrapFrame->Eax, > Arguments, > Thread, > KiUserTrap(TrapFrame), > Thread->PreviousMode, > - SegFs); > -} > - > -/* CPU AND SOFTWARE TRAPS *****************************************************/ > - > -KiTrap(KiTrap00, KI_PUSH_FAKE_ERROR_CODE); > -KiTrap(KiTrap01, KI_PUSH_FAKE_ERROR_CODE); > -KiTrap(KiTrap03, KI_PUSH_FAKE_ERROR_CODE); > -KiTrap(KiTrap04, KI_PUSH_FAKE_ERROR_CODE); > -KiTrap(KiTrap05, KI_PUSH_FAKE_ERROR_CODE); > -KiTrap(KiTrap06, KI_PUSH_FAKE_ERROR_CODE); > -KiTrap(KiTrap07, KI_PUSH_FAKE_ERROR_CODE); > -KiTrap(KiTrap08, 0); > -KiTrap(KiTrap09, KI_PUSH_FAKE_ERROR_CODE); > -KiTrap(KiTrap0A, 0); > -KiTrap(KiTrap0B, 0); > -KiTrap(KiTrap0C, 0); > -KiTrap(KiTrap0D, 0); > -KiTrap(KiTrap0E, 0); > -KiTrap(KiTrap0F, KI_PUSH_FAKE_ERROR_CODE); > -KiTrap(KiTrap10, KI_PUSH_FAKE_ERROR_CODE); > -KiTrap(KiTrap11, KI_PUSH_FAKE_ERROR_CODE); > -KiTrap(KiTrap13, KI_PUSH_FAKE_ERROR_CODE); > -KiTrap(KiGetTickCount, KI_PUSH_FAKE_ERROR_CODE); > -KiTrap(KiCallbackReturn, KI_PUSH_FAKE_ERROR_CODE); > -KiTrap(KiRaiseAssertion, KI_PUSH_FAKE_ERROR_CODE); > -KiTrap(KiDebugService, KI_PUSH_FAKE_ERROR_CODE); > -KiTrap(KiSystemService, KI_PUSH_FAKE_ERROR_CODE | KI_NONVOLATILES_ONLY); > -KiTrap(KiFastCallEntry, KI_FAST_SYSTEM_CALL); > + TrapFrame->SegFs); > +} > > /* > * @implemented > > Modified: trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/usercall_… > ============================================================================== > --- trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S [iso-8859-1] Thu Feb 11 00:24:59 2010 > @@ -8,11 +8,14 @@ > > /* INCLUDES ******************************************************************/ > > -#include <asm.h> > +#include <reactos/asm.h> > +#include <ndk/i386/asm.h> > #include <internal/i386/asmmacro.S> > -.intel_syntax noprefix > > /* FUNCTIONS ****************************************************************/ > + > +.code32 > +.text > > .globl _KiGetUserModeStackAddress@0 > .func KiGetUserModeStackAddress@0 > > _________________________________________________________________ Tutto lo spazio che ti serve, lo trovi su Hotmail http://www.windowslive.it/hotmail/SpazioDisponibile.aspx

15 years, 7 months

1
0
0 0

FLISOL 2010

by Raúl Avila Catalá

Hi for all the ReactOS community, soon brings near to him the FLISOL2010 and want to take the CD that appears in the ReactOS page, since the discharge from tub makes to him impossible for the limited bandwidth that has in the island... Please if some interested party in collaborating, it need a CD that it contains the operative system ( in Spanish ), the source code of ReactOS and some manuals ( in Spanish )... I, will make oneself responsible for make copy them and distribute it for the happening, in order that the Cuban community that has not access to the Internet can obtain " the alternative of Windows ". They can me write directly to my address of post: raul08012(a)cha.jovenclub.cu R++

15 years, 7 months

10
19
0 0

[HAL]: Regression in Real Hardware relates to HAL changes

by victor martinez

Hi, One big regression has been detected due to the HAL changes: Scenario: Real Hardware. One CDROM attached to IDE in Slave Mode in its own. What happens: It bugchecks since 45324.Latest working revision known 45319. DebugLog: http://www.reactos.org/paste/index.php/6511/ Reporter: Caemyr. Suspicious revisions in the range (45319-45324): 45320: [HAL]: Rewrite IRQL handling. (sir_richard) 45324: [HAL]: fix HalEndSystemInterrupt prototype.(spetreolle) Also there are users reporting problems(maybe not related) with CDRom under Vbox. Please look at it. Thanks :) PS: Sorry for double posting.But i prefer this in a new thread. _________________________________________________________________ Los auténticos Hotmail y Messenger en tu Blackberry con Movistar. ¡Descárgatelos ya! http://serviciosmoviles.es.msn.com/messenger/blackberry.aspx

15 years, 7 months

1
0
0 0

RosBE 1.5 is here - Mandatory update!

by Colin Finck

Hi folks, Finally, the new version 1.5 of the ReactOS Build Environment has been finished. The new releases for Windows and Unix are available at http://reactos.org/wiki/Build_Environment. With the new version, we're finally moving to newer toolchain versions (Binutils 2.20.51-20091222, GCC 4.4.3). These allow us to get rid of many old hacks, but also require some new modifications to the source. Unfortunately, these changes are incompatible to our current build environment, so the update to 1.5 is mandatory. I've also taken the chance to get rid of some other hacks, which had required a united TRUNK and RosBE update (like calling the makefile "makefile.auto" instead of "makefile-i386.auto" just for the i386 architecture). The patch for these changes is available at http://www.reactos.org/bugzilla/show_bug.cgi?id=4810 and was tested and improved for months now. I've been told to commit it very soon to not delay the migration to RosBE 1.5 once again. Therefore, please prepare yourselves with the new RosBE as soon as possible. Best regards, Colin

15 years, 7 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [sir_richard] 45525: [MISC]: Build fixes to sync up with latest changes. [SETUPLDR]: Do not build on ARM. On a side note, I offer a bountry for "if ARCH != ARM" support in .rbuild files, instead of only allowing ==.

by Hervé Poussineau

Hi, sir_richard(a)svn.reactos.org a écrit : > Author: sir_richard > Date: Tue Feb 9 04:05:49 2010 > New Revision: 45525 > > URL: http://svn.reactos.org/svn/reactos?rev=45525&view=rev > Log: > [MISC]: Build fixes to sync up with latest changes. > [SETUPLDR]: Do not build on ARM. On a side note, I offer a bountry for "if ARCH != ARM" support in .rbuild files, instead of only allowing ==. > I think <ifnot property="ARCH" value="arm"> ... </ifnot> will fit your needs Hervé

15 years, 7 months

1
0
0 0

Trap handler rewrite

by Timo Kreuzer

No doubt the new code is a huge advantage over the old code. Still there are some issues in my opinion. Currently the trap handlers are generated inside C code by a macro called KiTrap(), located in trap_x.h. This macro creates a C function, that uses KiTrapStub inline function to create the actual entry stub. KiTrapStub is 90% pure gcc inline assembly. At the end it does a jmp to the real C handler. Most C handlers will start processing with an inline function KiEnterTrap, which is C code with inline assembly functions like KiSetSaneSegments, Ke386GetFs. KiTrap06Handler/Trap0DHandler are exceptions, they use KiIsV8086TrapSafe to determine in inline assembly if we have a v86 trap. In this case KiEnterV86Trap is used instead of KiEnterTrap. KiTrap02 is also an exception, it's a pure C handler Now what's wrong? 1.) The gcc inline assembly is very compiler specific and MSVC unfriendly. The old method using GAS specific asm files was at least linkable with MSVC code. The new code needs porting. 2.) The current C code makes assumptions about what the compiler will do, ignoring the ABI, which requires that you do not change ds/es in C code, not even temporarily and that the direction flag is clear on function entry. The compiler might at any place use ds/es for whatever it likes. It must be a valid flat segment. Only using stack variables might work on the current gcc, but might fail on other compilers. A good example would be MSVC's use of __security_cookie, which is referenced on function entry through ds. I remember that not having cleared the direction flag in a trap handler caused strange random bugs in the past, we should avoid making this mistake again. KiTrapStub even changes esp inside C code (in cases where the function is entered without valid esp) Suggested modifications: Implement the trap entry functions in a pure assembly file, using assembly macros which would combine KiTrapStub and the segment handling part of KiEnterTrap. Trap exit could possibly be done this way as well. On the amd64 branch the C handlers return a status value back to the assembly stub, but a jump or call could be done as well. It would be possible to use ML for these assembly files as well. This works fine in the amd64 branch. Also strictly stick to C ABI instead of using compiler extensions and making assumptions about how the compiler works. It would improve portability, make the code safe and also more readable. And we would not really add more assembly, just move the current inline assembly to a pure assembly file. Possible performance disadvantages: I don't see any. We might end up with a jmp or call instruction more, but we can possibly safe this somewhere else. And maybe finally someone deletes the disgusting Ke386SetDs()... ;-) Regards, Timo

15 years, 7 months

2
1
0 0

Fwd: Mail delivery failed: returning message to sender

by Andrew Faulds

Hmm... either his email address is invalid, the server is playing up or it filters out UK addresses... ---------- Forwarded message ---------- From: Mail Delivery System <Mailer-Daemon(a)jovenclub.cu> Date: Fri, Feb 5, 2010 at 6:58 PM Subject: Mail delivery failed: returning message to sender To: ajfweb(a)googlemail.com This message was created automatically by mail delivery software. A message that you sent could not be delivered to one or more of its recipients. This is a permanent error. The following address(es) failed: cl2raul(a)cha.jovenclub.cu SMTP error from remote mail server after RCPT TO:< cl2raul(a)cha.jovenclub.cu>: host 192.168.54.3 [192.168.54.3]: 550 5.1.1 <cl2raul(a)cha.jovenclub.cu>: Recipient address rejected: User unknown in local recipient table ------ This is a copy of the message, including all the headers. ------ Return-path: <ajfweb(a)googlemail.com> Received: from [192.168.250.1] (helo=mx1.jovenclub.cu) by tinored.jovenclub.cu with esmtp (Exim 4.63) (envelope-from <ajfweb(a)googlemail.com>) id 1NdTNq-000HgO-6D for cl2raul(a)cha.jovenclub.cu; Fri, 05 Feb 2010 18:58:26 +0000 Received: from mailnull by mx1.jovenclub.cu with spam-scanned (Exim 4.63 (FreeBSD)) (envelope-from <ajfweb(a)googlemail.com>) id 1NdTNq-000IDE-7k for cl2raul(a)cha.jovenclub.cu; Fri, 05 Feb 2010 18:58:28 +0000 X-Spam-Checker-Version: SpamAssassin 3.1.6 (2006-10-03) on mx1.jovenclub.cu X-Spam-Level: X-Spam-Status: No, score=-1.2 required=4.0 tests=ALL_TRUSTED,HTML_MESSAGE, MAILTO_TO_SPAM_ADDR autolearn=ham version=3.1.6 Received: from mail-pz0-f182.google.com ([209.85.222.182]) by mx1.jovenclub.cu with esmtp (Exim 4.63 (FreeBSD)) (envelope-from <ajfweb(a)googlemail.com>) id 1NdTNn-000ICP-09 for cl2raul(a)cha.jovenclub.cu; Fri, 05 Feb 2010 18:58:26 +0000 Received: by pzk12 with SMTP id 12so4356424pzk.13 for <cl2raul(a)cha.jovenclub.cu>; Fri, 05 Feb 2010 10:58:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :from:date:message-id:subject:to:content-type; bh=Qjk7GMbRPg6inIkmDQ9DobZkrya+x133yYcrqGKOV/s=; b=E7Ib+hPZq0DnQoANH+Nm+wXSRntTlNmh6rFqQQzQl9/mUB4U/lfGq2/2DAeL/3CSi4 qDexVPr9cJgfYJQgbrWenSF0AStaHKKPXnx8cLdXbgmTKuS/NxH3vp1wTE1PJmWwEA71 1OWpVC6onFv/M3rFvazpXkBl5Qj7IJk1wr7Hw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :content-type; b=iY13PwPYzh1Na4Qq70qyWEjChhA0VmqlvPgD9zjgwXB+PtIWJzISeq/Fa928RmuhLb y1mOwDTK3ucwm6AZ03TdGRwUV87eHbPn8AW16r8gdvIbzn6cPg8g+p6dBk9B9jP5YrCv hQY2IrCYgkLpRmsV1iyzmhxm0EJ4NDBHnP3Gc= MIME-Version: 1.0 Received: by 10.141.90.15 with SMTP id s15mr2119324rvl.137.1265396333097; Fri, 05 Feb 2010 10:58:53 -0800 (PST) In-Reply-To: < 41245.192.168.54.4.1265395610.squirrel(a)webmail.cha.jovenclub.cu> References: <41245.192.168.54.4.1265395610.squirrel(a)webmail.cha.jovenclub.cu > From: Andrew Faulds <ajfweb(a)googlemail.com> Date: Fri, 5 Feb 2010 18:58:33 +0000 Message-ID: <bac4c08c1002051058i494abe2oe655dd2a5ab4c9f1(a)mail.gmail.com> Subject: Re: [ros-dev] FLISOL 2010 To: cl2raul(a)cha.jovenclub.cu, ReactOS Development List <ros-dev(a)reactos.org> Content-Type: multipart/alternative; boundary=000e0cd1124eef34f0047edf0ac2 --000e0cd1124eef34f0047edf0ac2 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Please do bear in mind ReactOS is in ALPHA, i.e. not suitable for normal use. If you want such a CD, my advice would be to download the debug version of reactos from the website and source code then burn the two files (the ISO and the zip file) to a CD. ReactOS has one CD if I remember correctly, that does all languages (If I'm wrong please correct me) Also, AFAIK ReactOS has no manuals, it has SOME documentation in the wiki, but overall it lacks much documentation. 2010/2/5 Ra=FAl Avila Catal=E1 <raul08012(a)cha.jovenclub.cu> > Hi for all the ReactOS community, soon brings near to him the FLISOL2010 > and want to take the CD that appears in the ReactOS page, since the > discharge from tub makes to him impossible for the limited bandwidth that > has in the island... > > Please if some interested party in collaborating, it need a CD that it > contains the operative system ( in Spanish ), the source code of ReactOS > and some manuals ( in Spanish )... > > I, will make oneself responsible for make copy them and distribute it for > the happening, in order that the Cuban community that has not access to > the Internet can obtain " the alternative of Windows ". > > They can me write directly to my address of post: > raul08012(a)cha.jovenclub.cu > > > R++ > > > _______________________________________________ > Ros-dev mailing list > Ros-dev(a)reactos.org > http://www.reactos.org/mailman/listinfo/ros-dev > --000e0cd1124eef34f0047edf0ac2 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Please do bear in mind ReactOS is in ALPHA, i.e. not suitable for normal us= e. If you want such a CD, my advice would be to download the debug versi= on of reactos from the website and source code then burn the two files (the= ISO and the zip file) to a CD. ReactOS has one CD if I remember correctly, that does all languages (If= I'm wrong please correct me) Also, AFAIK ReactOS has no manuals= , it has SOME documentation in the wiki, but overall it lacks much document= ation. <div class=3D"gmail_quote">2010/2/5 Ra=FAl Avila Catal=E1 <<a href=3D"mailto:raul08012@cha.jovenclub.cu">raul08012(a)cha.jovenc= lub.cu</a>> <blockquote class=3D"gmail_quote" style=3D"margin:= 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left= : 1ex;"> Hi for all the ReactOS community, soon brings near to him the FLISOL2010<br= > and want to take the CD that appears in the ReactOS page, since the discharge from tub makes to him impossible for the limited bandwidth that<b= r> has in the island... Please if some interested party in collaborating, it need a CD that it contains the operative system ( in Spanish ), the source code of ReactOS<br= > and some manuals ( in Spanish )... I, will make oneself responsible for make copy them and distribute it for<b= r> the happening, in order that the Cuban community that has not access to the Internet can obtain " the alternative of Windows ". They can me write directly to my address of post: <a href=3D"mailto:raul080= 12(a)cha.jovenclub.cu">raul08012(a)cha.jovenclub.cu</a> R++ _______________________________________________ Ros-dev mailing list <a href=3D"mailto:Ros-dev@reactos.org">Ros-dev(a)reactos.org</a> <a href=3D"http://www.reactos.org/mailman/listinfo/ros-dev" target=3D"_blan= k">http://www.reactos.org/mailman/listinfo/ros-dev</a> </blockquote></div> --000e0cd1124eef34f0047edf0ac2--

15 years, 7 months

1
0
0 0

Debugging at the next level...

by Timo Kreuzer

Source level debugging thanks to MSVC and pdb files. Only the line numbers seem to be a bit off.

15 years, 7 months

4
3
0 0

ros-amd64-bringup! Surprise! No Region Leaks!

by James Tabor

Since this is true and the ros-amd64-bringup tree is up to date with the region and WND code I committed without the assumed fixes to the region leaks in my working tree,,,,,,,,,,, Also to note I was looking for a ghost,,,,, wasting my TIME!,,,, Is it possible to build ros-amd64-bringup in 32 bit mode? So,,,,, I can continue my work and commit my updates to head knowing I'm not the FFFf ff uf problem! FYFI: I just finished a point to point compare and the only differences are kernel changes! Thanks, James

15 years, 7 months

3
5
0 0

Re: [ros-dev] [ros-diffs] [tkreuzer] 45433: [NTOS] On MSVC implement _lgdt, __sgdt, __lldt, __sldt, __ltr and __str as assembly functions, because there is no inline assembly. The MSVC/ML64 built kernel now boots and WinDbg connects.

by Steven Edwards

On Thu, Feb 4, 2010 at 10:05 PM, <tkreuzer(a)svn.reactos.org> wrote: > Author: tkreuzer > Date: Fri Feb 5 04:05:51 2010 > New Revision: 45433 > > URL: http://svn.reactos.org/svn/reactos?rev=45433&view=rev > Log: > [NTOS] > On MSVC implement _lgdt, __sgdt, __lldt, __sldt, __ltr and __str as assembly functions, because there is no inline assembly. > The MSVC/ML64 built kernel now boots and WinDbg connects. And there was much rejoicing ;) -- Steven Edwards "There is one thing stronger than all the armies in the world, and that is an idea whose time has come." - Victor Hugo

15 years, 7 months

1
0
0 0

Kernel Crash per Rev 45401

by James Tabor

Seems to be very common. *** Fatal System Error: 0x0000007f (0x00000008,0x00000000,0x00000000,0x00000000) Entered debugger on embedded INT3 at 0x0008:0x808c6708. kdb:> bt Eip: <ntoskrnl.exe:c6709 (lib/rtl/i386/debug_asm.S:42 (RtlpBreakWithStatusInstruction))> Frames: <ntoskrnl.exe:9e6d (ntoskrnl/ke/bug.c:1110 (KeBugCheckWithTf@24))> <ntoskrnl.exe:35d7 (ntoskrnl/ke/i386/exp.c:1170 (KeRaiseUserException@4))> <ntoskrnl.exe:60cb (ntoskrnl/ke/i386/traphdlr.c:741 (@KiTrap09Handler@4))> <00000000> kdb:>

15 years, 7 months

1
0
0 0

would You try to implement The Microsoft Active Accessibility standarts to The Reactos?

by Mgr. Janusz Chmiel

Dear core developers of Reactos, I Am very nicely surpriced by The fact, that so complex project like developing new operating system from scratch based on Windows XP kernel and API functions calls exists. I tried to install The Reactos and i can tell You, that even visually impaired user can install Reactos to The empty computer harddrive without need to even make unattended installation. I was able to successfully install Reactos operating system to my computer. I Am now solving issue, how to install The driver for my sound cart when many functions of Reactos are for now only accessible with mouse. So please, if Reactos device manager is reporting, That The sound device is working correctly, but only multimedia adapter list item is presenting my Soundmax integrated digital audio sound cart, it do not means, that Reactos can automatically use this eevice without need to add The driver? I tried to install The driver by using The setup program provided with The driver, i unfortunately have got a error message, that setup has occurred an error and must be closed. Please check, if another instance of setup is not active. By using add new hardware wizard, could i install The driver by specifiing The exact location for this driver? It is The WDM based driver for Soundmax digital integrated audio, which is build in The motherboard of The IBM Thinkpat 2668. I would like to know, if Microsoft Active accessibility standards could be implemented on The future during developing Reactos. I found out, that oleacc.dll is being presented and is The part of The Reactos installation. But i do not know, if You could implement MSAA standarts, because knowing The API functions and The object methods and properties will not be probably enough to ensure, that MSAA standarts would work. I would like to test some screen reader, which is based on using API calls and by using MSAA calls, but i do not know, if it is implemented. My problems is now to add sound cart driver to test this. I Am advanced user with some advanced system administration knowledge, i know Windows operating systems starting with Windows for Workgroups 3.11 to Windows XP Professional. I can use Linux distributions to copy some needed files to The partition, where Reactos has been installed. I can even find necessary debug logs and send them as AN E-mails by using Linux distribution. Linux distro could help me in The situations, when Reactos can not give me some feetback. Installing sound driver manually by using registry editor is not easy task and i can not perform it without screen reader support. I Am surpriced by The stability of Reactos. Eventhough some API calls are not awailable for now, The kernel is very stable and i have never got some crash dialog Window informing me, that application has crashed, sorry for any problems. If You would try to think about implementation of MSAA, many visually impaired users would be very very glad because of it. And later, what about triing to implement some hod keys for controlling The user interface and for controlling The Explorer? Thank you very much, i Am ready for debugging and testing The Reactos. PS: I have never able to install and run Windows XP so quickly, without using Nlite program, which is able to modifi setup.sif file and some other files on Windows XP installation CD, i would never been able to perform The installation of commercial Windows XP myself. Only with Reactos, i could perform this without stress and without need to use some other external utility. I AM also very very glad, that Reactos is even able to work as a live CD. And here are some links for downloading freeware or opensource screen readers, which are fully compatible with Windows Xp and are not based on Display chaining manager DCM, which is too complex to implement even on future for You. Those screen readers are based on using API calls and on using MSAA standarts. Unfortunately, NVDA will not work, because some important libraryes are not The part of The installation of Reactos. It is probably wrong idea triing to mix original libraries from Microsoft with Yours operating system, because i think, that it could cause some confuses and often crashes. Because i can really constructively cooperate with You, i will send You The list of libraryes, on which NVDA screen reader is depend on. And here is The direct link for downloading latest stable version of NVDA, which do not have to be installed, You can only unzip it and place it on some directory on Yours Reactos installation. http://www.nvda-project.org/download/releases/nvda_2009.1_portable.exe I Am recommending You to join to The NVDA development mailing list. YOu will need to have YOur sound drivers properly configured. NVDA screen reader is by The default triing to load included Espeak speech synthesizer, which is The part of NVDA package. This speech synthesizer is written by using Microsoft Visual C++ express 2005, and The original source code of this speech synthesizer variant for WIndows has been modified so this synthesizer is not working like The SAPI5 compatible speech synthesizer, but like a Activex library, which can be called from NVDA. Espeak will very probably depend on wdmaud.drv and NVDA is also using winmm.dll library. The list of dlls, which NVDA is using will be sended on The separate E-mail. PS: Please, try to allow visually impaired computer users to use freeware and fully functional operating system, which is based on standarts of WIndows XP and 2003. If MSAA standarts are too complex to develope from scrath for You to prevent random crashes while using Yours future new dlls, which would come out from this standarts, i will understand it. You are working on very, very complex project while using legally obtained technical information from various sources. PS: I know, that it is not possible to use products, which are developed by Microsoft on other operating system, that on original operating system from Microsoft, so triing to donwload WIndows Internet Explorer 8.0 and triing to use it with Reactos will probably not be legal. But if it is so, never mind. There is Mozilla Firefox WEB browser, which is working with NVDA screen reader very nicely, and also Opera WEB browser is able to provide some accessibility support for visually impaired computer users. And Openoffice ORG is also working very nicely. But for now, i would atleast like to try, if NVDA can speak atleast somethink or if many API calls are not presented. Thank You for cooperation with me. With kindness regards. Janusz Chmiel

15 years, 7 months

4
6
0 0

SVN server

by Aleksey Bragin

Hi, we're upgrading the SVN server currently, which should finish shortly. It's in readonly state until the upgrade finishes. WBR, Aleksey Bragin.

15 years, 7 months

1
1
0 0

[ros-diffs] [evb] 45403: -

by James Tabor

My best guess or 45402 but~ the test bot is dead, I hope this is leading somewhere good and fast!

15 years, 7 months

1
0
0 0

The list of DLLS, on which NVDA screen reader is strictly depend

by Mgr. Janusz Chmiel

Dear developers of Reactos, As i promised in my previous E-mail, i AM sending You The list of dlls, on which NVDA screen reader is strictly depend and without them will not work. Thank You for any feetback provided. OLEAUT32.dll - C:\WINDOWS\system32\OLEAUT32.dll USER32.dll - C:\WINDOWS\system32\USER32.dll POWRPROF.dll - C:\WINDOWS\system32\POWRPROF.dll SHELL32.dll - C:\WINDOWS\system32\SHELL32.dll ole32.dll - C:\WINDOWS\system32\ole32.dll WINMM.dll - C:\WINDOWS\system32\WINMM.dll WSOCK32.dll - C:\WINDOWS\system32\WSOCK32.dll COMDLG32.dll - C:\WINDOWS\system32\COMDLG32.dll ADVAPI32.dll - C:\WINDOWS\system32\ADVAPI32.dll msvcrt.dll - C:\WINDOWS\system32\msvcrt.dll WS2_32.DLL - C:\WINDOWS\system32\WS2_32.DLL GDI32.dll - C:\WINDOWS\system32\GDI32.dll VERSION.dll - C:\WINDOWS\system32\VERSION.dll KERNEL32.dll - C:\WINDOWS\system32\KERNEL32.dll COMCTL32.dll - C:\WINDOWS\system32\COMCTL32.dll RPCRT4.dll - C:\WINDOWS\system32\RPCRT4.dll Extracting all API calls from NVDA source code written in Python will not be easy task, and extracting those calls from source code written in C language for several helper libraryes will not be asy to.

15 years, 7 months

3
3
0 0

RosBE 1.5 Release Candidates

by Colin Finck

Hello everybody, After some more updates, fixes and strange problems, Daniel and I finally released new RCs of RosBE-Windows and RosBE-Unix 1.5. Daniel published a changelog for the Windows version at http://dreimer.de.vu. The Unix version fixes building problems on many hosts, especially 64-bit ones. Like RosBE-Windows, it also includes updated tools such as GCC 4.4.3. Besides, all supplied libraries are guaranteed to contain STABS+ symbols useful for debugging with e.g. GDB. Finally, make/makex now reports the correct return value instead of always 0 :-) You can download RosBE-Windows 1.5-RC4 and RosBE-Unix 1.5-RC2 at http://reactos.colinfinck.de. Please test out both of them using the latest code patch at http://www.reactos.org/bugzilla/show_bug.cgi?id=4810, so that we can move to RosBE 1.5 and GCC 4.4.x soon. For the Unix version, I'm especially looking for testers using non-Linux operating systems such as Mac OS X or FreeBSD. Current RosBE works well on them, but the previous RC made problems. Best regards, Colin

15 years, 7 months

3
2
0 0

Trap0D while not in V86 mode

by Kamil Hornicek

posting as requested in r45348.. (hal/halx86/generic/bios.c:228) HAL: Trap0D while not in V86 mode DbgEbp: 0 DbgEip: 0 DbgArgMark: 0 DbgArgPointer: 0 TempSegCs: 0 TempEsp: 0 Dr0: 0 Dr1: 0 Dr2: 0 Dr3: 0 Dr6: 0 Dr7: 0 SegGs: 0 SegEs: 0 SegDs: 0 Edx: 2697 Ecx: eba5aa34 Eax: 0 PreviousPreviousMode: 0 ExceptionList: eba5ad80 SegFs: 0 Edi: 7000 Esi: 8436a Ebx: eba5aa34 Ebp: eba5aa30 ErrCode: 0 Eip: 80604a80 SegCs: 8 EFlags: 13086 HardwareEsp: 0 HardwareSegSs: a000 V86Es: eba5ad48 V86Ds: 0 V86Fs: 0 V86Gs: 0

15 years, 7 months

1
0
0 0

r45321: STABS+ and -g* option change

by Sylvain Petreolle

This change keeps the ability to plug GDB into ReactOS and fixes libxlst. It also fixes bootcd with Rosbe 1.5 trunk builds. With -g0 enabled in RosBE-Unix 1.5 instead of STABS+, previous builds of bootcd used to fail to allocate memory and crash. Kind regards, Sylvain Petreolle

15 years, 7 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [sir_richard] 45297: [PERF]: Not in any way a scientific number you should bet the farm on, but we do now count the number of cycles at the very first instruction of kernel initialization, at the moment SMSS initializes the registry (when

by Ged Murphy

This is really interesting. It'd be great to have this up in testman somehow. -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of sir_richard(a)svn.reactos.org Sent: 28 January 2010 15:51 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [sir_richard] 45297: [PERF]: Not in any way a scientific number you should bet the farm on, but we do now count the number of cycles at the very first instruction of kernel initialization, at the moment SMSS initializes the registry (when we c Author: sir_richard Date: Thu Jan 28 16:51:18 2010 New Revision: 45297 URL: http://svn.reactos.org/svn/reactos?rev=45297&view=rev Log: [PERF]: Not in any way a scientific number you should bet the farm on, but we do now count the number of cycles at the very first instruction of kernel initialization, at the moment SMSS initializes the registry (when we call kernel initialization complete), and at the moment there have been 12 processes created (10 without counting idle/system), which is a bit less than a normal GUI boot. We also display the number if interrupts, system calls, and context switches it took to get us there. A purely comparative number, perhaps worthy for inclusion in testman/regression tests? Modified: trunk/reactos/ntoskrnl/config/ntapi.c trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/ke/i386/kiinit.c trunk/reactos/ntoskrnl/ps/process.c Modified: trunk/reactos/ntoskrnl/config/ntapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/ntapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] Thu Jan 28 16:51:18 2010 @@ -890,6 +890,14 @@ /* Always do this as kernel mode */ if (KeGetPreviousMode() == UserMode) return ZwInitializeRegistry(Flag); + /* Enough of the system has booted by now */ + BootCyclesEnd = __rdtsc(); + DPRINT1("Boot took %I64d cycles!\n", BootCyclesEnd - BootCycles); + DPRINT1("Interrupts: %d System Calls: %d Context Switches: %d\n", + KeGetCurrentPrcb()->InterruptCount, + KeGetCurrentPrcb()->KeSystemCalls, + KeGetContextSwitches(KeGetCurrentPrcb())); + /* Validate flag */ if (Flag > CM_BOOT_FLAG_MAX) return STATUS_INVALID_PARAMETER; Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Thu Jan 28 16:51:18 2010 @@ -139,6 +139,8 @@ extern ULONG KiFreezeFlag; extern ULONG KiDPCTimeout; extern PGDI_BATCHFLUSH_ROUTINE KeGdiFlushUserBatch; +extern ULONGLONG BootCycles, BootCyclesEnd; +extern ULONG ProcessCount; /* MACROS *************************************************************************/ Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] Thu Jan 28 16:51:18 2010 @@ -24,6 +24,10 @@ /* Spinlocks used only on X86 */ KSPIN_LOCK KiFreezeExecutionLock; KSPIN_LOCK Ki486CompatibilityLock; + +/* Perf */ +ULONG ProcessCount; +ULONGLONG BootCycles, BootCyclesEnd; /* FUNCTIONS *****************************************************************/ @@ -683,6 +687,9 @@ PKTSS Tss; PKIPCR Pcr; + /* Boot cycles timestamp */ + BootCycles = __rdtsc(); + /* Check if we are being booted from FreeLDR */ if (!((ULONG_PTR)LoaderBlock & 0x80000000)) KiRosPrepareForSystemStartup((PROS_LOADER_PARAMETER_BLOCK)LoaderBlock); Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] Thu Jan 28 16:51:18 2010 @@ -843,6 +843,18 @@ /* Run the Notification Routines */ PspRunCreateProcessNotifyRoutines(Process, TRUE); + + /* If 12 processes have been created, enough of user-mode is ready */ + if (++ProcessCount == 12) + { + /* Enough of the system has booted by now */ + BootCyclesEnd = __rdtsc(); + DPRINT1("User Boot took %I64d cycles!\n", BootCyclesEnd - BootCycles); + DPRINT1("Interrupts: %d System Calls: %d Context Switches: %d\n", + KeGetCurrentPrcb()->InterruptCount, + KeGetCurrentPrcb()->KeSystemCalls, + KeGetContextSwitches(KeGetCurrentPrcb())); + } CleanupWithRef: /*

15 years, 7 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [mkupfer] 45302: this log message left intentionally non-descriptive

by Ged Murphy

This is a bad idea. Ignoring the fact that the code is a serious crash hazard, you've now got a public place which needs to be kept current. I bet I can name at least 10 developers which aren't on this list. On Thu, Jan 28, 2010 at 10:18 PM, <mkupfer(a)svn.reactos.org> wrote: > Author: mkupfer > Date: Thu Jan 28 23:18:31 2010 > New Revision: 45302 > > URL: http://svn.reactos.org/svn/reactos?rev=45302&view=rev > Log: > this log message left intentionally non-descriptive > > Modified: > trunk/reactos/dll/cpl/sysdm/general.c > trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc > trunk/reactos/dll/cpl/sysdm/lang/en-US.rc > trunk/reactos/dll/cpl/sysdm/resource.h > > Modified: trunk/reactos/dll/cpl/sysdm/general.c > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/general.c?re… > > ============================================================================== > --- trunk/reactos/dll/cpl/sysdm/general.c [iso-8859-1] (original) > +++ trunk/reactos/dll/cpl/sysdm/general.c [iso-8859-1] Thu Jan 28 23:18:31 > 2010 > @@ -12,6 +12,9 @@ > > #include "precomp.h" > > +#define ANIM_STEP 2 > +#define ANIM_TIME 50 > + > typedef struct _IMGINFO > { > HBITMAP hBitmap; > @@ -19,6 +22,7 @@ > INT cySource; > } IMGINFO, *PIMGINFO; > > +PIMGINFO pImgInfo = NULL; > > void > ShowLastWin32Error(HWND hWndOwner) > @@ -70,6 +74,124 @@ > } > } > > +LRESULT CALLBACK RosImageProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM > lParam) > +{ > + static UINT timerid = 0, top = 0, offset; > + static HBITMAP hBitmap2; > + RECT r; > + NONCLIENTMETRICS ncm; > + HFONT hfont; > + BITMAP bitmap; > + HDC dc, sdc; > + TCHAR devtext[2048]; > + switch (uMsg) > + { > + case WM_LBUTTONDBLCLK: > + if (wParam & (MK_CONTROL | MK_SHIFT)) > + { > + if (timerid == 0) > + { > + top = 0; // set top > + > + // build new bitmap > + GetObject(pImgInfo->hBitmap, > sizeof(BITMAP), &bitmap); > + dc = > CreateCompatibleDC(GetDC(NULL)); > + sdc = CreateCompatibleDC(dc); > + ncm.cbSize = > sizeof(NONCLIENTMETRICS); > + > SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), > &ncm, 0); > + > + hfont = > CreateFontIndirect(&ncm.lfMessageFont); > + SelectObject(dc, hfont); > + SetRect(&r, 0, 0, 0, 0); > + LoadString(hApplet, IDS_DEVS, > devtext, sizeof(devtext) / sizeof(TCHAR)); > + DrawText(dc, devtext, -1, &r, > DT_CALCRECT); > + hBitmap2 = > CreateBitmap(pImgInfo->cxSource, (2 * pImgInfo->cySource) + (r.bottom + 1 - > r.top), bitmap.bmPlanes, bitmap.bmBitsPixel, NULL); > + SelectObject(sdc, > pImgInfo->hBitmap); > + SelectObject(dc, hBitmap2); > + offset = 0; > + BitBlt(dc, 0, offset, > bitmap.bmWidth, bitmap.bmHeight, sdc, 0, 0, SRCCOPY); > + offset += bitmap.bmHeight; > + > + SetRect(&r, 0, offset, > bitmap.bmWidth, offset + (r.bottom - r.top) + 1); > + FillRect(dc, &r, > GetSysColorBrush(COLOR_3DFACE)); > + SetBkMode(dc, TRANSPARENT); > + OffsetRect(&r, 1, 1); > + SetTextColor(dc, > GetSysColor(COLOR_BTNSHADOW)); > + DrawText(dc, devtext, -1, &r, > DT_CENTER); > + OffsetRect(&r, -1, -1); > + SetTextColor(dc, > GetSysColor(COLOR_WINDOWTEXT)); > + DrawText(dc, devtext, -1, &r, > DT_CENTER); > + offset += r.bottom - r.top; > + > + BitBlt(dc, 0, offset, > bitmap.bmWidth, bitmap.bmHeight, sdc, 0, 0, SRCCOPY); > + offset += bitmap.bmHeight; > + DeleteDC(sdc); > + DeleteDC(dc); > + > + timerid = SetTimer(hwnd, 1, > ANIM_TIME, NULL); > + } > + } > + break; > + case WM_LBUTTONDOWN: > + if (timerid) > + { > + KillTimer(hwnd, timerid); > + top = 0; > + timerid = 0; > + DeleteObject(hBitmap2); > + InvalidateRect(hwnd, NULL, FALSE); > + } > + break; > + case WM_TIMER: > + top += ANIM_STEP; > + if (top > offset - pImgInfo->cySource) > + { > + KillTimer(hwnd, timerid); > + top = 0; > + timerid = 0; > + DeleteObject(hBitmap2); > + } > + InvalidateRect(hwnd, NULL, FALSE); > + break; > + case WM_PAINT: > + { > + PAINTSTRUCT PS; > + HDC hdcMem, hdc; > + LONG left; > + if (wParam != 0) > + { > + hdc = (HDC)wParam; > + } else > + { > + hdc = BeginPaint(hwnd,&PS); > + } > + GetClientRect(hwnd,&PS.rcPaint); > + > + /* position image in center of dialog */ > + left = (PS.rcPaint.right - pImgInfo->cxSource) / 2; > + hdcMem = CreateCompatibleDC(hdc); > + > + if (hdcMem != NULL) > + { > + SelectObject(hdcMem, timerid ? hBitmap2 : > pImgInfo->hBitmap); > + BitBlt(hdc, > + left, > + PS.rcPaint.top, > + PS.rcPaint.right - PS.rcPaint.left, > + PS.rcPaint.top + pImgInfo->cySource, > + hdcMem, > + 0, > + top, > + SRCCOPY); > + DeleteDC(hdcMem); > + } > + if (wParam == 0) > + EndPaint(hwnd,&PS); > + break; > + } > + } > + return TRUE; > +} > > static VOID > SetRegTextData(HWND hwnd, > @@ -372,12 +494,9 @@ > WPARAM wParam, > LPARAM lParam) > { > - PIMGINFO pImgInfo; > > UNREFERENCED_PARAMETER(lParam); > UNREFERENCED_PARAMETER(wParam); > - > - pImgInfo = (PIMGINFO)GetWindowLongPtr(hwndDlg, DWLP_USER); > > switch (uMsg) > { > @@ -389,9 +508,8 @@ > return FALSE; > } > > - SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pImgInfo); > - > InitImageInfo(pImgInfo); > + SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_ROSIMG), GWL_WNDPROC, > (LONG)RosImageProc); > GetSystemInformation(hwndDlg); > break; > > > Modified: trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/de-DE.r… > > ============================================================================== > --- trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc [iso-8859-1] (original) > +++ trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc [iso-8859-1] Thu Jan 28 > 23:18:31 2010 > @@ -289,4 +289,5 @@ > IDS_USERPROFILE_TYPE "Typ" > IDS_USERPROFILE_STATUS "Status" > IDS_USERPROFILE_MODIFIED "Geändert" > -END > + IDS_DEVS "\nReactOS Team\n\nProjektkoordinator\n\nAleksey > Bragin\n\nEntwicklerteam\n\nAleksey Bragin\nAndrew Greenwood\nAndrey > Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel > Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervé > Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes > Anderwald\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc > Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre > Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas > Blümel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin > Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper > Hornstrup\nDavid Welch\nEmanuele Aliberti\nGé van Geldorp\nGregor > Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert > Dickenson\nRex Jolliff\nVizzini \n\nRelease Verantwortliche\n\nColin > Finck\nZ98\n\nWebseitenteam\n\nColin Finck\nJaix Bly\nKlemens > Friedl\nZ98\n\nMedienteam\n\nMindflyer\nWierd_W\n\nweiterer Dank geht > an\n\nalle Mitwirkenden\nWine Team\n\n" > +END > > Modified: trunk/reactos/dll/cpl/sysdm/lang/en-US.rc > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/en-US.r… > > ============================================================================== > --- trunk/reactos/dll/cpl/sysdm/lang/en-US.rc [iso-8859-1] (original) > +++ trunk/reactos/dll/cpl/sysdm/lang/en-US.rc [iso-8859-1] Thu Jan 28 > 23:18:31 2010 > @@ -284,4 +284,5 @@ > IDS_USERPROFILE_TYPE "Type" > IDS_USERPROFILE_STATUS "Status" > IDS_USERPROFILE_MODIFIED "Modified" > -END > + IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey > Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey > Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel > Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervé > Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes > Anderwald\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc > Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre > Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas > Blümel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin > Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper > Hornstrup\nDavid Welch\nEmanuele Aliberti\nGé van Geldorp\nGregor > Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert > Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin > Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens > Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go > to\n\nall Contributers\nWine Team\n\n" > +END > > Modified: trunk/reactos/dll/cpl/sysdm/resource.h > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/resource.h?r… > > ============================================================================== > --- trunk/reactos/dll/cpl/sysdm/resource.h [iso-8859-1] (original) > +++ trunk/reactos/dll/cpl/sysdm/resource.h [iso-8859-1] Thu Jan 28 23:18:31 > 2010 > @@ -156,5 +156,6 @@ > #define RC_LICENSE 1502 > #define RTDATA 1503 > > +#define IDS_DEVS 2000 > > #endif /* __CPL_RESOURCE_H */ > > >

15 years, 7 months

3
2
0 0

ARM port: SWI call numbering

by Theo Markettos

I wonder if I could get in touch with the folks doing the ARM port... Executive summary: From a look at the code I think ARM ReactOS uses SWIs (syscalls) numbered from zero. There's a de-facto ARM standard that splits up SWI numbering so different OSs get allocated different numbering ranges. It would be handy if ReactOS could pick one that doesn't clash with other OSs. I wondered if the ARM port folks might consider changing SWI base at some point. For more details, a brief history lesson. The ARM1 and ARM2 chips were originally developed at Acorn Computers in 1983-7. The first ARM machine was the Archimedes, launched by Acorn in 1987. The Archimedes was supplied with Arthur, which in 1988 became RISC OS, a co-operatively multitasking OS. RISC OS is still around and runs on modern hardware such as the BeagleBoard - see http://www.riscosopen.org/ SWI instructions on the ARM have a 24 bit 'comment' field. As originally envisaged this would hold the syscall number, a bit like INT on x86 and TRAP on 68k. Acorn for their OSs (and there were no other ARM OSs at the time) chose a numbering scheme where bits 20-23 denote the OS. For the ones I know about: 23--20 0000 RISC OS 1000 RISC iX (4.3 BSD ported to ARM2/3) 1001 Formerly Linux (they've now don't use the comment field) 1111 ARM's OS independent routines And NetBSD use another value that I forget. The advantage of having non-overlapping SWI bases is that it allows cross-platform execution of binaries (a bit like WINE in effect, though I don't know the details of how WINE works). So it means RISC OS code (of which there is lots) could run on ReactOS, or vice versa, if somebody writes a syscall implementation for the other platform. So I wondered if there was any interest in making sure the syscall numbers didn't clash with other OSs? From what I see in: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/usercall.c… it looks like your SWIs are numbered from zero, which is a clash. If you were interested in changing, do you have any idea how many SWIs you might use? RISC OS uses hundreds of thousands (SWIs are used as the interface to DLL-like code), but if you were to only need, say, 2^16 that might save the number space a bit. Thoughts? Comments? Flames? Thanks Theo

15 years, 7 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-dev