Ros-diffs January 2006

ros-diffs@reactos.org

23 participants
586 discussions

[hbirr] 20943: Removed my name from the hall of fame. Since it seems, that parts of ReactOS are implemented by ripping code from Windows, it isn't longer honourable to find my name inside the sources of ReactOS.

by hbirr＠svn.reactos.org

Removed my name from the hall of fame. Since it seems, that parts of ReactOS are implemented by ripping code from Windows, it isn't longer honourable to find my name inside the sources of ReactOS. Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/loader.c Modified: trunk/reactos/drivers/fs/cdfs/cleanup.c Modified: trunk/reactos/drivers/fs/vfat/blockdev.c Modified: trunk/reactos/drivers/fs/vfat/cleanup.c Modified: trunk/reactos/drivers/fs/vfat/close.c Modified: trunk/reactos/drivers/fs/vfat/create.c Modified: trunk/reactos/drivers/fs/vfat/direntry.c Modified: trunk/reactos/drivers/fs/vfat/fastio.c Modified: trunk/reactos/drivers/fs/vfat/fat.c Modified: trunk/reactos/drivers/fs/vfat/fcb.c Modified: trunk/reactos/drivers/fs/vfat/finfo.c Modified: trunk/reactos/drivers/fs/vfat/flush.c Modified: trunk/reactos/drivers/fs/vfat/iface.c Modified: trunk/reactos/drivers/fs/vfat/misc.c Modified: trunk/reactos/drivers/fs/vfat/rw.c Modified: trunk/reactos/drivers/fs/vfat/string.c Modified: trunk/reactos/drivers/fs/vfat/volume.c Modified: trunk/reactos/drivers/storage/atapi/atapi.c Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c Modified: trunk/reactos/lib/fslib/vfatxlib/fatx.c Modified: trunk/reactos/lib/fslib/vfatxlib/vfatxlib.c Modified: trunk/reactos/lib/ntdll/ldr/utils.c Modified: trunk/reactos/ntoskrnl/cc/copy.c Modified: trunk/reactos/ntoskrnl/cc/pin.c Modified: trunk/reactos/ntoskrnl/io/irp.c Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c Modified: trunk/reactos/ntoskrnl/ke/i386/irq.c Modified: trunk/reactos/ntoskrnl/ke/ipi.c Modified: trunk/reactos/ntoskrnl/mm/anonmem.c Modified: trunk/reactos/ntoskrnl/mm/marea.c Modified: trunk/reactos/ntoskrnl/mm/npool.c Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/rtl/misc.c Modified: trunk/reactos/subsys/system/cmd/cmd.c Modified: trunk/reactos/subsys/system/cmd/del.c Modified: trunk/reactos/subsys/system/usetup/partlist.c _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c 2006-01-17 22:41:39 UTC (rev 20942) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c 2006-01-17 23:11:13 UTC (rev 20943) @@ -4,7 +4,6 @@ * FILE: boot/freeldr/freeldr/multiboot.c * PURPOSE: ReactOS Loader * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) - * Hartmut Birr - SMP/PAE Code */ #include <freeldr.h> _____ Modified: trunk/reactos/boot/freeldr/freeldr/reactos/loader.c --- trunk/reactos/boot/freeldr/freeldr/reactos/loader.c 2006-01-17 22:41:39 UTC (rev 20942) +++ trunk/reactos/boot/freeldr/freeldr/reactos/loader.c 2006-01-17 23:11:13 UTC (rev 20943) @@ -2,7 +2,6 @@ * FreeLoader * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> * Copyright (C) 2005 Alex Ionescu <alex(a)relsoft.net> - * Copyright (C) 2005 Hartmut Birr <hartmut.birr(a)gmx.de> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by _____ Modified: trunk/reactos/drivers/fs/cdfs/cleanup.c --- trunk/reactos/drivers/fs/cdfs/cleanup.c 2006-01-17 22:41:39 UTC (rev 20942) +++ trunk/reactos/drivers/fs/cdfs/cleanup.c 2006-01-17 23:11:13 UTC (rev 20943) @@ -22,7 +22,7 @@ * PROJECT: ReactOS kernel * FILE: services/fs/cdfs/cleanup.c * PURPOSE: CDROM (ISO 9660) filesystem driver - * PROGRAMMER: Hartmut Birr + * PROGRAMMER: * UPDATE HISTORY: */ _____ Modified: trunk/reactos/drivers/fs/vfat/blockdev.c --- trunk/reactos/drivers/fs/vfat/blockdev.c 2006-01-17 22:41:39 UTC (rev 20942) +++ trunk/reactos/drivers/fs/vfat/blockdev.c 2006-01-17 23:11:13 UTC (rev 20943) @@ -4,7 +4,6 @@ * FILE: drivers/fs/vfat/blockdev.c * PURPOSE: Temporary sector reading support * PROGRAMMER: David Welch (welch(a)cwcom.net) - * Hartmut Birr * UPDATE HISTORY: */ _____ Modified: trunk/reactos/drivers/fs/vfat/cleanup.c --- trunk/reactos/drivers/fs/vfat/cleanup.c 2006-01-17 22:41:39 UTC (rev 20942) +++ trunk/reactos/drivers/fs/vfat/cleanup.c 2006-01-17 23:11:13 UTC (rev 20943) @@ -4,7 +4,6 @@ * FILE: drivers/fs/vfat/cleanup.c * PURPOSE: VFAT Filesystem * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) - * Hartmut Birr */ /* INCLUDES *****************************************************************/ _____ Modified: trunk/reactos/drivers/fs/vfat/close.c --- trunk/reactos/drivers/fs/vfat/close.c 2006-01-17 22:41:39 UTC (rev 20942) +++ trunk/reactos/drivers/fs/vfat/close.c 2006-01-17 23:11:13 UTC (rev 20943) @@ -4,7 +4,6 @@ * FILE: drivers/fs/vfat/close.c * PURPOSE: VFAT Filesystem * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) - * Hartmut Birr */ /* INCLUDES *****************************************************************/ _____ Modified: trunk/reactos/drivers/fs/vfat/create.c --- trunk/reactos/drivers/fs/vfat/create.c 2006-01-17 22:41:39 UTC (rev 20942) +++ trunk/reactos/drivers/fs/vfat/create.c 2006-01-17 23:11:13 UTC (rev 20943) @@ -21,7 +21,6 @@ * FILE: drivers/fs/vfat/create.c * PURPOSE: VFAT Filesystem * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) - * Hartmut Birr */ /* INCLUDES *****************************************************************/ _____ Modified: trunk/reactos/drivers/fs/vfat/direntry.c --- trunk/reactos/drivers/fs/vfat/direntry.c 2006-01-17 22:41:39 UTC (rev 20942) +++ trunk/reactos/drivers/fs/vfat/direntry.c 2006-01-17 23:11:13 UTC (rev 20943) @@ -5,7 +5,6 @@ * PROJECT: ReactOS kernel * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) * Rex Jolliff (rex(a)lvcablemodem.com) - * Hartmut Birr * Herve Poussineau (reactos(a)poussine.freesurf.fr) */ _____ Modified: trunk/reactos/drivers/fs/vfat/fastio.c --- trunk/reactos/drivers/fs/vfat/fastio.c 2006-01-17 22:41:39 UTC (rev 20942) +++ trunk/reactos/drivers/fs/vfat/fastio.c 2006-01-17 23:11:13 UTC (rev 20943) @@ -4,7 +4,6 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PROGRAMMER: Herve Poussineau (hpoussin(a)reactos.org) - * Hartmut Birr */ #define NDEBUG _____ Modified: trunk/reactos/drivers/fs/vfat/fat.c --- trunk/reactos/drivers/fs/vfat/fat.c 2006-01-17 22:41:39 UTC (rev 20942) +++ trunk/reactos/drivers/fs/vfat/fat.c 2006-01-17 23:11:13 UTC (rev 20943) @@ -4,7 +4,6 @@ * FILE: drivers/fs/vfat/fat.c * PURPOSE: VFAT Filesystem * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) - * Hartmut Birr * */ _____ Modified: trunk/reactos/drivers/fs/vfat/fcb.c --- trunk/reactos/drivers/fs/vfat/fcb.c 2006-01-17 22:41:39 UTC (rev 20942) +++ trunk/reactos/drivers/fs/vfat/fcb.c 2006-01-17 23:11:13 UTC (rev 20943) @@ -5,7 +5,6 @@ * PROJECT: ReactOS kernel * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) * Rex Jolliff (rex(a)lvcablemodem.com) -* Hartmut Birr * Herve Poussineau (reactos(a)poussine.freesurf.fr) */ _____ Modified: trunk/reactos/drivers/fs/vfat/finfo.c --- trunk/reactos/drivers/fs/vfat/finfo.c 2006-01-17 22:41:39 UTC (rev 20942) +++ trunk/reactos/drivers/fs/vfat/finfo.c 2006-01-17 23:11:13 UTC (rev 20943) @@ -4,7 +4,6 @@ * FILE: drivers/fs/vfat/finfo.c * PURPOSE: VFAT Filesystem * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) - * Hartmut Birr * Herve Poussineau (reactos(a)poussine.freesurf.fr) * */ _____ Modified: trunk/reactos/drivers/fs/vfat/flush.c --- trunk/reactos/drivers/fs/vfat/flush.c 2006-01-17 22:41:39 UTC (rev 20942) +++ trunk/reactos/drivers/fs/vfat/flush.c 2006-01-17 23:11:13 UTC (rev 20943) @@ -3,7 +3,7 @@ * PROJECT: ReactOS kernel * FILE: drivers/fs/vfat/flush.c * PURPOSE: VFAT Filesystem - * PROGRAMMER: Hartmut Birr + * PROGRAMMER: */ /* INCLUDES *****************************************************************/ _____ Modified: trunk/reactos/drivers/fs/vfat/iface.c --- trunk/reactos/drivers/fs/vfat/iface.c 2006-01-17 22:41:39 UTC (rev 20942) +++ trunk/reactos/drivers/fs/vfat/iface.c 2006-01-17 23:11:13 UTC (rev 20943) @@ -21,7 +21,6 @@ * FILE: drivers/fs/vfat/iface.c * PURPOSE: VFAT Filesystem * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) - * Hartmut Birr */ /* INCLUDES *****************************************************************/ _____ Modified: trunk/reactos/drivers/fs/vfat/misc.c --- trunk/reactos/drivers/fs/vfat/misc.c 2006-01-17 22:41:39 UTC (rev 20942) +++ trunk/reactos/drivers/fs/vfat/misc.c 2006-01-17 23:11:13 UTC (rev 20943) @@ -3,7 +3,7 @@ * PROJECT: ReactOS kernel * FILE: drivers/fs/vfat/misc.c * PURPOSE: VFAT Filesystem - * PROGRAMMER: Hartmut Birr + * PROGRAMMER: * */ _____ Modified: trunk/reactos/drivers/fs/vfat/rw.c --- trunk/reactos/drivers/fs/vfat/rw.c 2006-01-17 22:41:39 UTC (rev 20942) +++ trunk/reactos/drivers/fs/vfat/rw.c 2006-01-17 23:11:13 UTC (rev 20943) @@ -4,7 +4,6 @@ * FILE: drivers/fs/vfat/rw.c * PURPOSE: VFAT Filesystem * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) - * Hartmut Birr * */ _____ Modified: trunk/reactos/drivers/fs/vfat/string.c --- trunk/reactos/drivers/fs/vfat/string.c 2006-01-17 22:41:39 UTC (rev 20942) +++ trunk/reactos/drivers/fs/vfat/string.c 2006-01-17 23:11:13 UTC (rev 20943) @@ -4,7 +4,6 @@ * FILE: drivers/fs/vfat/string.c * PURPOSE: VFAT Filesystem * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) - * Hartmut Birr * */ _____ Modified: trunk/reactos/drivers/fs/vfat/volume.c --- trunk/reactos/drivers/fs/vfat/volume.c 2006-01-17 22:41:39 UTC (rev 20942) +++ trunk/reactos/drivers/fs/vfat/volume.c 2006-01-17 23:11:13 UTC (rev 20943) @@ -4,7 +4,6 @@ * FILE: drivers/fs/vfat/volume.c * PURPOSE: VFAT Filesystem * PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com) - * Hartmut Birr * Herve Poussineau (reactos(a)poussine.freesurf.fr) */ _____ Modified: trunk/reactos/drivers/storage/atapi/atapi.c --- trunk/reactos/drivers/storage/atapi/atapi.c 2006-01-17 22:41:39 UTC (rev 20942) +++ trunk/reactos/drivers/storage/atapi/atapi.c 2006-01-17 23:11:13 UTC (rev 20943) @@ -23,7 +23,6 @@ * FILE: drivers/storage/atapi/atapi.c * PURPOSE: ATAPI miniport driver * PROGRAMMERS: Eric Kohl (ekohl(a)rz-online.de) - * Hartmut Birr * REVISIONS: * 09-09-2001 Created */ _____ Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c --- trunk/reactos/drivers/storage/scsiport/scsiport.c 2006-01-17 22:41:39 UTC (rev 20942) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c 2006-01-17 23:11:13 UTC (rev 20943) @@ -23,7 +23,6 @@ * FILE: services/storage/scsiport/scsiport.c * PURPOSE: SCSI port driver * PROGRAMMER: Eric Kohl (ekohl(a)rz-online.de) - * Hartmut Birr */ /* INCLUDES *****************************************************************/ _____ Modified: trunk/reactos/lib/fslib/vfatxlib/fatx.c --- trunk/reactos/lib/fslib/vfatxlib/fatx.c 2006-01-17 22:41:39 UTC (rev 20942) +++ trunk/reactos/lib/fslib/vfatxlib/fatx.c 2006-01-17 23:11:13 UTC (rev 20943) @@ -3,7 +3,7 @@ * PROJECT: ReactOS VFATX filesystem library * FILE: fatx.c * PURPOSE: Fatx support - * PROGRAMMERS: Hartmut Birr + * PROGRAMMERS: * REVISIONS: */ #include "vfatxlib.h" _____ Modified: trunk/reactos/lib/fslib/vfatxlib/vfatxlib.c --- trunk/reactos/lib/fslib/vfatxlib/vfatxlib.c 2006-01-17 22:41:39 UTC (rev 20942) +++ trunk/reactos/lib/fslib/vfatxlib/vfatxlib.c 2006-01-17 23:11:13 UTC (rev 20943) @@ -3,7 +3,7 @@ * PROJECT: ReactOS VFATx filesystem library * FILE: vfatxlib.c * PURPOSE: Main API - * PROGRAMMERS: Hartmut Birr + * PROGRAMMERS: * REVISIONS: * CSH 05/04-2003 Created */ _____ Modified: trunk/reactos/lib/ntdll/ldr/utils.c --- trunk/reactos/lib/ntdll/ldr/utils.c 2006-01-17 22:41:39 UTC (rev 20942) +++ trunk/reactos/lib/ntdll/ldr/utils.c 2006-01-17 23:11:13 UTC (rev 20943) @@ -6,7 +6,6 @@ * PURPOSE: Process startup for PE executables * PROGRAMMERS: Jean Michault * Rex Jolliff (rex(a)lvcablemodem.com) - * Hartmut Birr */ /* _____ Modified: trunk/reactos/ntoskrnl/cc/copy.c --- trunk/reactos/ntoskrnl/cc/copy.c 2006-01-17 22:41:39 UTC (rev 20942) +++ trunk/reactos/ntoskrnl/cc/copy.c 2006-01-17 23:11:13 UTC (rev 20943) @@ -5,7 +5,7 @@ * FILE: ntoskrnl/cc/copy.c * PURPOSE: Implements cache managers copy interface * - * PROGRAMMERS: Hartmut Birr + * PROGRAMMERS: */ /* INCLUDES ******************************************************************/ _____ Modified: trunk/reactos/ntoskrnl/cc/pin.c --- trunk/reactos/ntoskrnl/cc/pin.c 2006-01-17 22:41:39 UTC (rev 20942) +++ trunk/reactos/ntoskrnl/cc/pin.c 2006-01-17 23:11:13 UTC (rev 20943) @@ -5,7 +5,7 @@ * FILE: ntoskrnl/cc/pin.c * PURPOSE: Implements cache managers pinning interface * - * PROGRAMMERS: Hartmut Birr + * PROGRAMMERS: */ /* INCLUDES ******************************************************************/ _____ Modified: trunk/reactos/ntoskrnl/io/irp.c --- trunk/reactos/ntoskrnl/io/irp.c 2006-01-17 22:41:39 UTC (rev 20942) +++ trunk/reactos/ntoskrnl/io/irp.c 2006-01-17 23:11:13 UTC (rev 20943) @@ -4,8 +4,7 @@ * FILE: ntoskrnl/io/irp.c * PURPOSE: Handle IRPs * - * PROGRAMMERS: Hartmut Birr - * Alex Ionescu (alex(a)relsoft.net) + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) * David Welch (welch(a)mcmail.com) */ _____ Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c --- trunk/reactos/ntoskrnl/ke/i386/exp.c 2006-01-17 22:41:39 UTC (rev 20942) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c 2006-01-17 23:11:13 UTC (rev 20943) @@ -508,7 +508,6 @@ * in the early boot phase in apic mode (using the smp build). I've looked to the linux * sources. Linux does ignore this exception. * - * Hartmut Birr */ DPRINT1("Ignoring P6 Local APIC Spurious Interrupt Bug...\n"); return(0); _____ Modified: trunk/reactos/ntoskrnl/ke/i386/irq.c --- trunk/reactos/ntoskrnl/ke/i386/irq.c 2006-01-17 22:41:39 UTC (rev 20942) +++ trunk/reactos/ntoskrnl/ke/i386/irq.c 2006-01-17 23:11:13 UTC (rev 20943) @@ -6,7 +6,6 @@ * PURPOSE: IRQ handling * * PROGRAMMERS: David Welch (welch(a)mcmail.com) - * Hartmut Birr */ /* _____ Modified: trunk/reactos/ntoskrnl/ke/ipi.c --- trunk/reactos/ntoskrnl/ke/ipi.c 2006-01-17 22:41:39 UTC (rev 20942) +++ trunk/reactos/ntoskrnl/ke/ipi.c 2006-01-17 23:11:13 UTC (rev 20943) @@ -6,7 +6,6 @@ * PURPOSE: IPI Routines (Inter-Processor Interrupts). NT5+ * * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) - * Hartmut Birr */ /* INCLUDES *****************************************************************/ _____ Modified: trunk/reactos/ntoskrnl/mm/anonmem.c --- trunk/reactos/ntoskrnl/mm/anonmem.c 2006-01-17 22:41:39 UTC (rev 20942) +++ trunk/reactos/ntoskrnl/mm/anonmem.c 2006-01-17 23:11:13 UTC (rev 20943) @@ -22,7 +22,6 @@ * PURPOSE: Implementing anonymous memory. * * PROGRAMMERS: David Welch - * Hartmut Birr * Casper Hornstrup * KJK::Hyperion * Ge van Geldorp _____ Modified: trunk/reactos/ntoskrnl/mm/marea.c --- trunk/reactos/ntoskrnl/mm/marea.c 2006-01-17 22:41:39 UTC (rev 20942) +++ trunk/reactos/ntoskrnl/mm/marea.c 2006-01-17 23:11:13 UTC (rev 20943) @@ -26,7 +26,6 @@ * Eric Kohl * Philip Susi * Casper Hornstrup - * Hartmut Birr * Eric Kohl * Ge van Geldorp * Royce Mitchell III _____ Modified: trunk/reactos/ntoskrnl/mm/npool.c --- trunk/reactos/ntoskrnl/mm/npool.c 2006-01-17 22:41:39 UTC (rev 20942) +++ trunk/reactos/ntoskrnl/mm/npool.c 2006-01-17 23:11:13 UTC (rev 20943) @@ -8,7 +8,6 @@ * PROGRAMMERS: David Welch (welch(a)cwcom.net) * Iwan Fatahi (i_fatahi(a)hotmail.com) * Robert Bergkvist (fragdance(a)hotmail.com) - * Hartmut Birr */ /* INCLUDES ****************************************************************/ _____ Modified: trunk/reactos/ntoskrnl/mm/section.c --- trunk/reactos/ntoskrnl/mm/section.c 2006-01-17 22:41:39 UTC (rev 20942) +++ trunk/reactos/ntoskrnl/mm/section.c 2006-01-17 23:11:13 UTC (rev 20943) @@ -26,7 +26,6 @@ * Eric Kohl * Emanuele Aliberti * Eugene Ingerman - * Hartmut Birr * Casper Hornstrup * KJK::Hyperion * Guido de Jong _____ Modified: trunk/reactos/ntoskrnl/rtl/misc.c --- trunk/reactos/ntoskrnl/rtl/misc.c 2006-01-17 22:41:39 UTC (rev 20942) +++ trunk/reactos/ntoskrnl/rtl/misc.c 2006-01-17 23:11:13 UTC (rev 20943) @@ -5,7 +5,7 @@ * FILE: ntoskrnl/rtl/misc.c * PURPOSE: Various functions * - * PROGRAMMERS: Hartmut Birr + * PROGRAMMERS: */ /* INCLUDES *****************************************************************/ _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2006-01-17 22:41:39 UTC (rev 20942) +++ trunk/reactos/subsys/system/cmd/cmd.c 2006-01-17 23:11:13 UTC (rev 20943) @@ -122,7 +122,7 @@ * 30-Apr-2004 (Filip Navara <xnavara(a)volny.cz>) * Make MakeSureDirectoryPathExistsEx unicode safe. * - * 28-Mai-2004 (Hartmut Birr) + * 28-Mai-2004 * Removed MakeSureDirectoryPathExistsEx. * Use the current directory if GetTempPath fails. * _____ Modified: trunk/reactos/subsys/system/cmd/del.c --- trunk/reactos/subsys/system/cmd/del.c 2006-01-17 22:41:39 UTC (rev 20942) +++ trunk/reactos/subsys/system/cmd/del.c 2006-01-17 23:11:13 UTC (rev 20943) @@ -39,7 +39,7 @@ * 22-Jun-2005 (Brandon Turner <turnerb7(a)msu.edu>) * Implemented /A example "del /A:H /A:-R *.exe -ping.exe" * -* 07-Aug-2005 (Hartmut Birr) +* 07-Aug-2005 * Removed the exclusive deletion (see two comments above) because '-' is a valid file name character. * Optimized the recursive deletion in directories. * Preload some nice strings. _____ Modified: trunk/reactos/subsys/system/usetup/partlist.c --- trunk/reactos/subsys/system/usetup/partlist.c 2006-01-17 22:41:39 UTC (rev 20942) +++ trunk/reactos/subsys/system/usetup/partlist.c 2006-01-17 23:11:13 UTC (rev 20943) @@ -23,7 +23,6 @@ * PURPOSE: Partition list functions * PROGRAMMER: Eric Kohl * Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * Hartmut Birr */ #include <usetup.h>

18 years, 8 months

[ion] 20942: - Use MmUserProbeAddress in the system call handler to verify the parametes we got from user-mode are valid and return STATUS_ACCESS_VIOLATION if the check fails.

by ion＠svn.reactos.org

- Use MmUserProbeAddress in the system call handler to verify the parametes we got from user-mode are valid and return STATUS_ACCESS_VIOLATION if the check fails. - Handle failure after PsConvertToGuiThread and return STATUS_INVALID_SYSTEM_SERVICE and/or FALSE and/or -1 on failure. - Made MCE/XMMI interrupts unexpected on-boot. - Removed KiTrapUnknown and used KiTrap0F (15) instead, which is the generic unexpected handler. Modified: trunk/reactos/include/ndk/asm.h Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s _____ Modified: trunk/reactos/include/ndk/asm.h --- trunk/reactos/include/ndk/asm.h 2006-01-17 22:34:20 UTC (rev 20941) +++ trunk/reactos/include/ndk/asm.h 2006-01-17 22:41:39 UTC (rev 20942) @@ -357,10 +357,12 @@ // NTSTATUS and Bugcheck Codes // #ifdef __ASM__ +#define STATUS_ACCESS_VIOLATION 0xC0000005 #define STATUS_INVALID_SYSTEM_SERVICE 0xC000001C #define STATUS_NO_CALLBACK_ACTIVE 0xC0000258 -#define APC_INDEX_MISMATCH 1 +#define APC_INDEX_MISMATCH 0x01 #define IRQL_GT_ZERO_AT_SYSTEM_SERVICE 0x4A +#define UNEXPECTED_KERNEL_MODE_TRAP 0x7F #endif // _____ Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s --- trunk/reactos/ntoskrnl/ke/i386/trap.s 2006-01-17 22:34:20 UTC (rev 20941) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s 2006-01-17 22:41:39 UTC (rev 20942) @@ -16,8 +16,6 @@ * FIXMEs: * - Figure out why ES/DS gets messed up in VMWare, when doing KiServiceExit only, * and only when called from user-mode, and returning to user-mode. - * - Use MmProbe when copying arguments to syscall. - * - Handle failure after PsConvertToGuiThread. * - Figure out what the DEBUGEIP hack is for and how it can be moved away. * - Add DR macro/save and VM macro/save. * - Implement KiCallbackReturn, KiGetTickCount, KiRaiseAssertion. @@ -43,22 +41,22 @@ idt _KiTrap12, INT_32_DPL0 /* INT 0C: Stack Fault Exception (#SS) */ idt _KiTrap13, INT_32_DPL0 /* INT 0D: General Protection (#GP) */ idt _KiTrap14, INT_32_DPL0 /* INT 0E: Page-Fault Exception (#PF) */ -idt _KiTrap15, INT_32_DPL0 /* INT 0F: RESERVED */ +idt _KiTrap15, INT_32_DPL0 /* INT 0F: RESERVED [FIXME: HBIRR HACK] */ idt _KiTrap16, INT_32_DPL0 /* INT 10: x87 FPU Error (#MF) */ idt _KiTrap17, INT_32_DPL0 /* INT 11: Align Check Exception (#AC) */ -idt _KiTrap18, INT_32_DPL0 /* INT 12: Machine Check Exception (#MC)*/ -idt _KiTrap19, INT_32_DPL0 /* INT 13: SIMD FPU Exception (#XF) */ +idt _KiTrap0F, INT_32_DPL0 /* INT 12: Machine Check Exception (#MC)*/ +idt _KiTrap0F, INT_32_DPL0 /* INT 13: SIMD FPU Exception (#XF) */ .rept 22 -idt _KiTrapUnknown, INT_32_DPL0 /* INT 14-29: UNDEFINED INTERRUPTS */ +idt _KiTrap0F, INT_32_DPL0 /* INT 14-29: UNDEFINED INTERRUPTS */ .endr idt _KiGetTickCount, INT_32_DPL3 /* INT 2A: Get Tick Count Handler */ idt _KiCallbackReturn, INT_32_DPL3 /* INT 2B: User-Mode Callback Return */ idt _KiRaiseAssertion, INT_32_DPL3 /* INT 2C: Debug Assertion Handler */ idt _KiDebugService, INT_32_DPL3 /* INT 2D: Debug Service Handler */ idt _KiSystemService, INT_32_DPL3 /* INT 2E: System Call Service Handler */ -idt _KiTrapUnknown, INT_32_DPL0 /* INT 2F: RESERVED */ +idt _KiTrap0F, INT_32_DPL0 /* INT 2F: RESERVED */ .rept 220 -idt _KiTrapUnknown, INT_32_DPL0 /* INT 30-FF: UNDEFINED INTERRUPTS */ +idt _KiTrap0F, INT_32_DPL0 /* INT 30-FF: UNDEFINED INTERRUPTS */ .endr /* System call entrypoints: */ @@ -271,33 +269,28 @@ /* Allocate space on our stack */ sub esp, ecx - /* - * Copy the arguments from the user stack to our stack - * FIXME: This needs to be probed with MmSystemRangeStart - */ + /* Set the size of the arguments and the destination */ shr ecx, 2 mov edi, esp + + /* Make sure we're within the User Probe Address */ + cmp esi, _MmUserProbeAddress + jnb AccessViolation + +CopyParams: + /* Copy the parameters */ rep movsd #ifdef DBG - - /* Make sure this isn't a user-mode call at elevated IRQL */ - test byte ptr [ebp+KTRAP_FRAME_CS], MODE_MASK - jz SkipCheck - call _KeGetCurrentIrql@0 - or al, al - jnz InvalidIrql - /* * The following lines are for the benefit of GDB. It will see the return * address of the "call ebx" below, find the last label before it and * thinks that that's the start of the function. It will then check to see - * if it starts with a standard function prolog (push ebp, mov ebp,esp). + * if it starts with a standard function prolog (push ebp, mov ebp,esp1). * When that standard function prolog is not found, it will stop the * stack backtrace. Since we do want to backtrace into usermode, let's * make GDB happy and create a standard prolog. */ -SkipCheck: KiSystemService: push ebp mov ebp,esp @@ -307,10 +300,11 @@ /* Do the System Call */ call ebx +AfterSysCall: #ifdef DBG /* Make sure the user-mode call didn't return at elevated IRQL */ test byte ptr [ebp+KTRAP_FRAME_CS], MODE_MASK - jz SkipCheck2 + jz SkipCheck mov esi, eax /* We need to save the syscall's return val */ call _KeGetCurrentIrql@0 or al, al @@ -329,7 +323,7 @@ jnz InvalidIndex #endif -SkipCheck2: +SkipCheck: /* Deallocate the kernel stack frame */ mov esp, ebp @@ -363,7 +357,7 @@ KiBBTUnexpectedRange: /* If this isn't a Win32K call, fail */ - cmp ecx, 0x10 + cmp ecx, SERVICE_TABLE_TEST jne InvalidCall /* Set up Win32K Table */ @@ -371,7 +365,10 @@ push ebx call _PsConvertToGuiThread@0 - /* FIXME: Handle failure */ + /* Check return code */ + or eax, eax + + /* Restore registers */ pop eax pop edx @@ -379,15 +376,53 @@ mov ebp, esp mov [esi+KTHREAD_TRAP_FRAME], ebp - /* Try the Call again */ - jmp SharedCode + /* Try the Call again, if we suceeded */ + jz SharedCode + /* + * The Shadow Table should have a special byte table which tells us + * whether we should return FALSE, -1 or STATUS_INVALID_SYSTEM_SERVICE. + */ + + /* Get the table limit and base */ + lea edx, _KeServiceDescriptorTableShadow + SERVICE_TABLE_TEST + mov ecx, [edx+SERVICE_DESCRIPTOR_LIMIT] + mov edx, [edx+SERVICE_DESCRIPTOR_BASE] + + /* Get the table address and add our index into the array */ + lea edx, [edx+ecx*4] + and eax, SERVICE_NUMBER_MASK + add edx, eax + + /* Find out what we should return */ + movsx eax, byte ptr [edx] + or eax, eax + + /* Return either 0 or -1, we've set it in EAX */ + jle KeReturnFromSystemCall + + /* Set STATUS_INVALID_SYSTEM_SERVICE */ + mov eax, STATUS_INVALID_SYSTEM_SERVICE + jmp KeReturnFromSystemCall + InvalidCall: /* Invalid System Call */ mov eax, STATUS_INVALID_SYSTEM_SERVICE jmp KeReturnFromSystemCall +AccessViolation: + + /* Check if this came from kernel-mode */ + test byte ptr [ebp+KTRAP_FRAME_CS], MODE_MASK + + /* It's fine, go ahead with it */ + jz CopyParams + + /* Caller sent invalid parameters, fail here */ + mov eax, STATUS_ACCESS_VIOLATION + jmp AfterSysCall + BadStack: /* Restore ESP0 stack */ @@ -974,57 +1009,34 @@ jne _Kei386EoiHelper@0 jmp _KiV86Complete -_KiTrap18: +_KiTrap0F: /* Push error code */ push 0 /* Enter trap */ - TRAP_PROLOG(18) + TRAP_PROLOG(15) + sti - /* Call the C exception handler */ - push 18 - push ebp - call _KiTrapHandler - add esp, 8 + /* Raise a fatal exception */ + mov eax, 15 + jmp _KiSystemFatalException - /* Check for v86 recovery */ - cmp eax, 1 +.func KiSystemFatalException +_KiSystemFatalException: - /* Return to caller */ - jne _Kei386EoiHelper@0 - jmp _KiV86Complete - -_KiTrap19: - /* Push error code */ - push 0 - - /* Enter trap */ - TRAP_PROLOG(19) - - /* Call the C exception handler */ - push 19 + /* Push the trap frame */ push ebp - call _KiTrapHandler - add esp, 8 - /* Check for v86 recovery */ - cmp eax, 1 - - /* Return to caller */ - jne _Kei386EoiHelper@0 - jmp _KiV86Complete - -_KiTrapUnknown: - /* Push error code */ + /* Push empty parameters */ push 0 + push 0 + push 0 - /* Enter trap */ - TRAP_PROLOG(255) + /* Push trap number and bugcheck code */ + push eax + push UNEXPECTED_KERNEL_MODE_TRAP + call _KeBugCheckWithTf@24 + ret +.endfunc - /* Check for v86 recovery */ - cmp eax, 1 - /* Return to caller */ - jne _Kei386EoiHelper@0 - jmp _KiV86Complete -

18 years, 8 months

[ion] 20941: * Implement 3 out of 4 486-compatible ExInterlocked functions which use spinlock instead of cmpxhcg8. Code not yet tested and this code path is not made hot (enabled) yet.

by ion＠svn.reactos.org

* Implement 3 out of 4 486-compatible ExInterlocked functions which use spinlock instead of cmpxhcg8. Code not yet tested and this code path is not made hot (enabled) yet. Modified: trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S _____ Modified: trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S --- trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S 2006-01-17 20:12:18 UTC (rev 20940) +++ trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S 2006-01-17 22:34:20 UTC (rev 20941) @@ -679,4 +679,182 @@ mov eax, edx ret +/*** Non-586 functions ***/ + +/*PSINGLE_LIST_ENTRY + *NTAPI + *ExfInterlockedPopEntrySList(IN PSINGLE_LIST_ENTRY ListHead, + * IN PKSPIN_LOCK Lock) + */ +.global @ExfInterlockedPopEntrySList@8 +@ExfInterlockedPopEntrySList@8: + + /* Save flags */ +.starta: + pushfd + + /* Disable interrupts */ + cli + + /* Acquire lock */ + ACQUIRE_SPINLOCK(edx, .spina) + + /* Get the next link and check if it's empty */ + mov eax, [ecx] + or eax, eax + jz 1f + + /* Get address of the next link and store it */ + push [eax] + pop [ecx] + + /* Decrement list depth */ + dec dword ptr [ecx+4] + +1: +#ifdef CONFIG_SMP + /* Release spinlock */ + RELEASE_SPINLOCK(edx) +#endif + + /* Restore flags and return */ + popfd + ret 0 + +#ifdef CONFIG_SMP +.spina: + /* Restore flags and spin */ + popfd + SPIN_ON_LOCK(edx, .starta) +#endif + +/*PSINGLE_LIST_ENTRY + *NTAPI + *ExInterlockedPushEntrySList(IN PSINGLE_LIST_ENTRY ListHead, + * IN PSINGLE_LIST_ENTRY ListEntry, + * IN PKSPIN_LOCK Lock) + */ +.global @ExfInterlockedPushEntrySList@12 +@ExfInterlockedPushEntrySList@12: + + /* Save flags */ +.startb: + pushfd + + /* Disable interrupts */ + cli + + /* Acquire lock */ +#ifndef CONFIG_SMP + mov eax, [esp+8] + ACQUIRE_SPINLOCK(eax, .spinb) +#endif + + /* Get the next link and check if it's empty */ + push [ecx] + + /* Get address of the next link and store it */ + pop [edx] + mov [ecx], edx + + /* Increment list depth */ + inc dword ptr [ecx+4] + +#ifdef CONFIG_SMP + /* Release spinlock */ + RELEASE_SPINLOCK(eax) +#endif + + /* Restore flags and return */ + popfd + ret 0 + +#ifdef CONFIG_SMP +.spinb: + /* Restore flags and spin */ + popfd + SPIN_ON_LOCK(eax, .startb) +#endif + +/*PVOID + *FASTCALL + *ExpInterlockedCompareExchange64(IN PLONGLONG Destination, + * IN PLONGLONG Exchange, + * IN PLONGLONG Comperand, + * IN PKSPIN_LOCK Lock) + */ +.global @ExpInterlockedCompareExchange64@16 +@ExpInterlockedCompareExchange64@16: + + /* Save registers */ + push ebp + push ebp + + /* Get desination pointer, exchange value and comperand value/address */ + mov ebp, ecx + mov ebx, [edx] + mov ecx, [edx+4] + mov edx, [esp+12] + mov eax, [edx] + mov edx, [edx+4] + +#ifdef CONFIG_SMP + /* Save ESI so we can store KSPINLOCK in it */ + push esi + + /* Save flags and lock, and disable interrupts */ + pushfd + mov esi, [esp+24] + cli + + /* Acquire the spinlock */ + ACQUIRE_SPINLOCK(esi, .spinc) +#else + /* Save flags and disable interrupts */ + pushfd + cli +#endif + + /* Compare bottom */ + cmp eax, [ebp] + jne NoMatch + + /* Compare top */ + cmp edx, [ebp+4] + jne NoMatch + + /* Save new value */ + mov [ebp], ebx + mov [ebp+4], ecx + +AfterSave: +#ifdef CONFIG_SMP + /* Release lock, restore volatiles and flags */ + RELEASE_SPINLOCK(esi) + popfd + pop esi +#else + popfd +#endif + + /* Restore the other volatiles and return */ + pop ebp + pop ebx + + /* Return */ + ret 8 + +NoMatch: + /* Return the current value */ + mov eax, [ebp] + mov edx, [ebp+4] + jmp AfterSave + +#ifdef CONFIG_SMP +.spinc: + /* Restore flags and spin */ + popfd + pushfd + SPIN_ON_LOCK(esi, .startc) +#endif /* EOF */

18 years, 8 months

[gedmurphy] 20940: A bit of work towards populating the properties dialog. (untested)

by gedmurphy＠svn.reactos.org

A bit of work towards populating the properties dialog. (untested) Modified: trunk/reactos/subsys/system/servman/En.rc Modified: trunk/reactos/subsys/system/servman/propsheet.c Modified: trunk/reactos/subsys/system/servman/query.c Modified: trunk/reactos/subsys/system/servman/resource.h Modified: trunk/reactos/subsys/system/servman/servman.c Modified: trunk/reactos/subsys/system/servman/servman.h _____ Modified: trunk/reactos/subsys/system/servman/En.rc --- trunk/reactos/subsys/system/servman/En.rc 2006-01-17 17:29:23 UTC (rev 20939) +++ trunk/reactos/subsys/system/servman/En.rc 2006-01-17 20:12:18 UTC (rev 20940) @@ -83,7 +83,7 @@ CONTROL "",IDC_DISP_NAME,"Static",0x50001000,70,29,176,12 CONTROL "",IDC_DESCRIPTION,"Static",0x50201000,70,46,176,22 CONTROL "Path to executable:",IDC_STATIC,"Static",0x50000000,6,73,82,9 - CONTROL "",IDC_STATIC,"Static",0x50001000,6,86,238,12 + CONTROL "",IDC_EXEPATH,"Static",0x50001000,6,86,238,12 CONTROL "Startup type:",IDC_STATIC,"Static",0x50000000,6,108,53,11 CONTROL "",IDC_START_TYPE,"ComboBox",0x50010003,70,107,176,11 CONTROL "Service status:",IDC_STATIC,"Static",0x50000000,4,138,53,11 @@ -97,6 +97,20 @@ CONTROL "",IDC_START_PARAM,"Static",0x50001000,70,199,176,11 END +IDD_DLG_DEPEND DIALOGEX 6,6,253,225 +CAPTION "Dependencies" +FONT 8,"MS Sans Serif",0,0 +STYLE 0x10CF0000 +BEGIN + CONTROL "",IDC_DEPEND_TREE1,"SysTreeView32",0x50010007,8,70,236,68,0x00000200 + CONTROL "",IDC_DEPEND_TREE2,"SysTreeView32",0x50010007,8,151,234,67,0x00000200 + CONTROL "Some services depend on other services, system drivers and load order groups. If a system component is stopped or it is not running properly, dependant services can be affected.",IDC_STATIC,"Static",0x50000000,8,7,238,26 + CONTROL "This service depends on the following components",IDC_STATIC,"Static",0x50000000,8,57,236,9 + CONTROL "",IDC_DEPEND_SERVICE,"Static",0x50000000,8,38,236,13 +END + + + IDB_BUTTONS BITMAP "res/toolbar.bmp" STRINGTABLE DISCARDABLE _____ Modified: trunk/reactos/subsys/system/servman/propsheet.c --- trunk/reactos/subsys/system/servman/propsheet.c 2006-01-17 17:29:23 UTC (rev 20939) +++ trunk/reactos/subsys/system/servman/propsheet.c 2006-01-17 20:12:18 UTC (rev 20940) @@ -4,13 +4,77 @@ * FILE: subsys/system/servman/propsheet.c * PURPOSE: Property dialog box message handler * COPYRIGHT: Copyright 2005 Ged Murphy <gedmurphy(a)gmail.com> - * + * */ #include "servman.h" +extern ENUM_SERVICE_STATUS_PROCESS *pServiceStatus; extern HINSTANCE hInstance; +extern HWND hListView; +extern INT SelectedItem; + +typedef struct _PROP_DLG_INFO +{ + LPTSTR lpServiceName; + LPTSTR lpDisplayName; + LPTSTR lpDescription; + LPTSTR lpPathToExe; + DWORD dwStartupType; + DWORD dwServiceStatus; + LPTSTR lpStartParams; +} PROP_DLG_INFO, *PPROP_DLG_INFO; + + + + +VOID GetDlgInfo(HWND hwndDlg) +{ + HKEY hKey; + ENUM_SERVICE_STATUS_PROCESS *Service = NULL; + LVITEM item; + PROP_DLG_INFO DlgInfo; + LPCTSTR Path = _T("System\\CurrentControlSet\\Services\\%s"); + TCHAR buf[300]; + + item.mask = LVIF_PARAM; + item.iItem = SelectedItem; + SendMessage(hListView, LVM_GETITEM, 0, (LPARAM)&item); + + /* copy pointer to selected service */ + Service = (ENUM_SERVICE_STATUS_PROCESS *)item.lParam; + + /* open the registry key for the service */ + _sntprintf(buf, 300, Path, Service->lpServiceName); + RegOpenKeyEx(HKEY_LOCAL_MACHINE, + buf, + 0, + KEY_READ, + &hKey); + + /* set the service name */ + DlgInfo.lpServiceName = Service->lpServiceName; + SendDlgItemMessageW(hwndDlg, IDC_SERV_NAME, WM_SETTEXT, 0, (LPARAM)DlgInfo.lpServiceName); + + /* set the display name */ + DlgInfo.lpDisplayName = Service->lpDisplayName; + SendDlgItemMessageW(hwndDlg, IDC_DISP_NAME, WM_SETTEXT, 0, (LPARAM)DlgInfo.lpDisplayName); + + /* set the description */ + if (GetDescription(hKey, &DlgInfo.lpDescription)) + SendDlgItemMessageW(hwndDlg, IDC_DESCRIPTION, WM_SETTEXT, 0, (LPARAM)DlgInfo.lpDescription); + + /* set the executable path */ + if (GetExecutablePath(&DlgInfo.lpPathToExe)) + SendDlgItemMessageW(hwndDlg, IDC_EXEPATH, WM_SETTEXT, 0, (LPARAM)DlgInfo.lpPathToExe); + + + + +} + + #ifdef _MSC_VER #pragma warning(disable : 4100) #endif @@ -25,6 +89,7 @@ switch (uMsg) { case WM_INITDIALOG: + GetDlgInfo(hwndDlg); break; @@ -60,6 +125,52 @@ + + +INT_PTR CALLBACK +DependanciesPageProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + + switch (uMsg) + { + case WM_INITDIALOG: + + break; + + case WM_COMMAND: + switch(LOWORD(wParam)) + { + case IDC_START: + break; + + case IDC_STOP: + + break; + } + break; + + case WM_DESTROY: + break; + + case WM_NOTIFY: + { + LPNMHDR lpnm = (LPNMHDR)lParam; + + switch (lpnm->code) + + default: + break; + } + break; + } + + return FALSE; +} + + static VOID InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc) { @@ -73,10 +184,10 @@ LONG APIENTRY -PropSheets(HWND hwnd) +OpenPropSheet(HWND hwnd) { PROPSHEETHEADER psh; - PROPSHEETPAGE psp[1]; + PROPSHEETPAGE psp[2]; TCHAR Caption[256]; LoadString(hInstance, IDS_PROP_SHEET, Caption, sizeof(Caption) / sizeof(TCHAR)); @@ -93,9 +204,10 @@ psh.ppsp = psp; InitPropSheetPage(&psp[0], IDD_DLG_GENERAL, GeneralPageProc); - //logon - //recovery - //dependancies + //InitPropSheetPage(&psp[1], IDD_DLG_GENERAL, LogonPageProc); + //InitPropSheetPage(&psp[2], IDD_DLG_GENERAL, RecoveryPageProc); + InitPropSheetPage(&psp[1], IDD_DLG_DEPEND, DependanciesPageProc); + return (LONG)(PropertySheet(&psh) != -1); } _____ Modified: trunk/reactos/subsys/system/servman/query.c --- trunk/reactos/subsys/system/servman/query.c 2006-01-17 17:29:23 UTC (rev 20939) +++ trunk/reactos/subsys/system/servman/query.c 2006-01-17 20:12:18 UTC (rev 20940) @@ -13,37 +13,67 @@ extern HWND hListView; extern HWND hStatus; -/* Stores the service array */ +/* Stores the complete services array */ ENUM_SERVICE_STATUS_PROCESS *pServiceStatus = NULL; -/* free service array */ +/* Free service array */ VOID FreeMemory(VOID) { HeapFree(GetProcessHeap(), 0, pServiceStatus); } -VOID GetData(VOID) +/* Retrives the service description from the registry */ +BOOL GetDescription(HKEY hKey, LPTSTR *retDescription) { - LVITEM item; - UINT sel; - TCHAR buf[200]; - sel = ListView_GetHotItem(hListView); + LPTSTR Description = NULL; + DWORD dwValueSize = 0; + LONG ret = RegQueryValueEx(hKey, + _T("Description"), + NULL, + NULL, + NULL, + &dwValueSize); + if (ret != ERROR_SUCCESS && ret != ERROR_FILE_NOT_FOUND && ret != ERROR_INVALID_HANDLE) + { + RegCloseKey(hKey); + return FALSE; + } - ZeroMemory(&item, sizeof(LV_ITEM)); + if (ret != ERROR_FILE_NOT_FOUND) + { + Description = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwValueSize); + if (Description == NULL) + { + RegCloseKey(hKey); + return FALSE; + } - item.mask = LVIF_TEXT; - item.iItem = sel; - item.iSubItem = 0; - item.pszText = buf; - item.cchTextMax = 200; + if(RegQueryValueEx(hKey, + _T("Description"), + NULL, + NULL, + (LPBYTE)Description, + &dwValueSize)) + { + HeapFree(GetProcessHeap(), 0, Description); + RegCloseKey(hKey); + return FALSE; + } + } - ListView_GetItem(hListView, &item); + /* copy pointer over */ + *retDescription = Description; + return TRUE; +} - //DisplayString(sel); - DisplayString(item.pszText); + +BOOL GetExecutablePath(LPTSTR *ExePath) +{ + + return FALSE; } @@ -79,12 +109,10 @@ /* assign the image to the list view */ ListView_SetImageList(hListView, hSmall, LVSIL_SMALL); - for (Index = 0; Index < NumServices; Index++) { HKEY hKey = NULL; LPTSTR Description = NULL; - LONG ret; LPTSTR LogOnAs = NULL; DWORD StartUp = 0; DWORD dwValueSize; @@ -102,48 +130,25 @@ /* set the display name */ - ZeroMemory(&item, sizeof(LV_ITEM)); - item.mask = LVIF_TEXT; + ZeroMemory(&item, sizeof(LVITEM)); + item.mask = LVIF_TEXT | LVIF_PARAM; item.pszText = pServiceStatus[Index].lpDisplayName; + + /* Set a pointer for each service so we can query it later. + * Not all services are added to the list, so we can't query + * the item number as they become out of sync with the array */ + item.lParam = (LPARAM)&pServiceStatus[Index]; + item.iItem = ListView_GetItemCount(hListView); item.iItem = ListView_InsertItem(hListView, &item); + /* set the description */ - dwValueSize = 0; - ret = RegQueryValueEx(hKey, - _T("Description"), - NULL, - NULL, - NULL, - &dwValueSize); - if (ret != ERROR_SUCCESS && ret != ERROR_FILE_NOT_FOUND && ret != ERROR_INVALID_HANDLE) - { - RegCloseKey(hKey); - continue; - } - if (ret != ERROR_FILE_NOT_FOUND) + if (GetDescription(hKey, &Description)) { - Description = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwValueSize); - if (Description == NULL) - { - RegCloseKey(hKey); - return FALSE; - } - if(RegQueryValueEx(hKey, - _T("Description"), - NULL, - NULL, - (LPBYTE)Description, - &dwValueSize)) - { - HeapFree(GetProcessHeap(), 0, Description); - RegCloseKey(hKey); - continue; - } - item.pszText = Description; item.iSubItem = 1; SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); @@ -152,7 +157,6 @@ } - /* set the status */ if (pServiceStatus[Index].ServiceStatusProcess.dwCurrentState == SERVICE_RUNNING) @@ -253,6 +257,9 @@ SendMessage(hStatus, SB_SETTEXT, 0, (LPARAM)buf); } + /* turn redraw flag on. It's turned off initially via the LBS_NOREDRAW flag */ + SendMessage (hListView, WM_SETREDRAW, TRUE, 0) ; + return TRUE; } _____ Modified: trunk/reactos/subsys/system/servman/resource.h --- trunk/reactos/subsys/system/servman/resource.h 2006-01-17 17:29:23 UTC (rev 20939) +++ trunk/reactos/subsys/system/servman/resource.h 2006-01-17 20:12:18 UTC (rev 20940) @@ -26,12 +26,14 @@ #define ID_VIEW_CUSTOMIZE 4021 #define ID_ABOUT 4031 +/* List view columns */ #define IDS_FIRSTCOLUMN 1 #define IDS_SECONDCOLUMN 2 #define IDS_THIRDCOLUMN 3 #define IDS_FOURTHCOLUMN 4 #define IDS_FITHCOLUMN 5 +/* tooltips */ #define IDS_TOOLTIP_PROP 6000 #define IDS_TOOLTIP_REFRESH 6001 #define IDS_TOOLTIP_EXPORT 6002 @@ -52,6 +54,7 @@ #define IDI_SM_ICON 50 #define IDB_BUTTONS 51 +/* toolbar buttons */ #define TBICON_PROP 0 #define TBICON_REFRESH 1 #define TBICON_EXPORT 2 @@ -63,11 +66,13 @@ #define TBICON_HELP 8 #define TBICON_EXIT 9 +/* properties dialog */ #define IDS_PROP_SHEET 10000 #define IDD_DLG_GENERAL 10001 #define IDC_SERV_NAME 10041 #define IDC_DISP_NAME 10051 #define IDC_DESCRIPTION 10061 +#define IDC_EXEPATH 10062 #define IDC_START_TYPE 10101 #define IDC_SERV_STATUS 10121 #define IDC_START 10131 @@ -75,3 +80,9 @@ #define IDC_PAUSE 10151 #define IDC_RESUME 10161 #define IDC_START_PARAM 10191 + +#define IDD_DLG_DEPEND 20001 +#define IDC_DEPEND_TREE1 20002 +#define IDC_DEPEND_TREE2 20003 +#define IDC_DEPEND_SERVICE 20004 + _____ Modified: trunk/reactos/subsys/system/servman/servman.c --- trunk/reactos/subsys/system/servman/servman.c 2006-01-17 17:29:23 UTC (rev 20939) +++ trunk/reactos/subsys/system/servman/servman.c 2006-01-17 20:12:18 UTC (rev 20940) @@ -17,6 +17,7 @@ HWND hStatus; HWND hTool; HMENU hShortcutMenu; +INT SelectedItem; LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) @@ -100,15 +101,16 @@ /* ======================== Create List View ============================== */ - hListView = CreateWindow(WC_LISTVIEW, - NULL, - WS_CHILD | WS_VISIBLE | LVS_REPORT | WS_BORDER | - LVS_EDITLABELS | LVS_SORTASCENDING, - 0, 0, 0, 0, /* sized via WM_SIZE */ - hwnd, - (HMENU) IDC_SERVLIST, - hInstance, - NULL); + hListView = CreateWindowEx(0, + WC_LISTVIEW, + NULL, + WS_CHILD | WS_VISIBLE | LVS_REPORT | WS_BORDER | + LBS_NOTIFY | LVS_SORTASCENDING | LBS_NOREDRAW, + 0, 0, 0, 0, /* sized via WM_SIZE */ + hwnd, + (HMENU) IDC_SERVLIST, + hInstance, + NULL); if (hListView == NULL) MessageBox(hwnd, _T("Could not create List View."), _T("Error"), MB_OK | MB_ICONERROR); @@ -227,23 +229,29 @@ case WM_NOTIFY: { - LPNMITEMACTIVATE item; + NMHDR* nm = (NMHDR*) lParam; - - switch (((LPNMHDR) lParam)->code) + switch (nm->code) { case NM_DBLCLK: - item = (LPNMITEMACTIVATE) lParam; - PropSheets(hwnd); + OpenPropSheet(hwnd); break; + case LVN_ITEMCHANGED: + { + LPNMLISTVIEW pnmv = (LPNMLISTVIEW) lParam; + + SelectedItem = pnmv->iItem; + + } + break; + case TTN_GETDISPINFO: { LPTOOLTIPTEXT lpttt; UINT idButton; lpttt = (LPTOOLTIPTEXT) lParam; - //lpttt->hinst = hInstance; /* Specify the resource identifier of the descriptive * text for the given button. */ @@ -300,16 +308,6 @@ } break; - case WM_CLOSE: - FreeMemory(); /* free the service array */ - DestroyMenu(hShortcutMenu); - DestroyWindow(hwnd); - break; - - case WM_DESTROY: - PostQuitMessage(0); - break; - case WM_CONTEXTMENU: { int xPos, yPos; @@ -323,10 +321,11 @@ break; case WM_COMMAND: + switch(LOWORD(wParam)) { case ID_PROP: - PropSheets(hwnd); + OpenPropSheet(hwnd); break; case ID_REFRESH: @@ -376,6 +375,16 @@ } break; + case WM_CLOSE: + FreeMemory(); /* free the service array */ + DestroyMenu(hShortcutMenu); + DestroyWindow(hwnd); + break; + + case WM_DESTROY: + PostQuitMessage(0); + break; + default: return DefWindowProc(hwnd, msg, wParam, lParam); } _____ Modified: trunk/reactos/subsys/system/servman/servman.h --- trunk/reactos/subsys/system/servman/servman.h 2006-01-17 17:29:23 UTC (rev 20939) +++ trunk/reactos/subsys/system/servman/servman.h 2006-01-17 20:12:18 UTC (rev 20940) @@ -16,15 +16,16 @@ BOOL CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); -BOOL Start(LPCTSTR ServiceName, LPCTSTR *ServiceArgs, INT ArgCount); +BOOL Start(LPCTSTR, LPCTSTR, INT); VOID GetError(DWORD); VOID FreeMemory(VOID); VOID DisplayString(PTCHAR); -VOID GetData(VOID); +BOOL GetDescription(HKEY, LPTSTR *); +BOOL GetExecutablePath(LPTSTR *); -LONG APIENTRY PropSheets(HWND hwnd); +LONG APIENTRY OpenPropSheet(HWND); DWORD GetServiceList(VOID);

18 years, 8 months

[ion] 20939: - Delete deprecated file.

by ion＠svn.reactos.org

- Delete deprecated file. Deleted: trunk/reactos/ntoskrnl/ke/i386/idt.c _____ Deleted: trunk/reactos/ntoskrnl/ke/i386/idt.c --- trunk/reactos/ntoskrnl/ke/i386/idt.c 2006-01-17 17:28:41 UTC (rev 20938) +++ trunk/reactos/ntoskrnl/ke/i386/idt.c 2006-01-17 17:29:23 UTC (rev 20939) @@ -1,33 +0,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/ke/i386/idt.c - * PURPOSE: IDT managment - * - * PROGRAMMERS: David Welch (welch(a)cwcom.net) - */ - -/* INCLUDES *****************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <internal/debug.h> - -/* GLOBALS *******************************************************************/ - -IDT_DESCRIPTOR KiIdt[256]; - -#include <pshpack1.h> - -struct -{ - USHORT Length; - ULONG Base; -} KiIdtDescriptor = {256 * 8, (ULONG)KiIdt}; - -#include <poppack.h> - -/* FUNCTIONS *****************************************************************/ - -

18 years, 8 months

[ion] 20938: - Use static IDT entries generated through a macro, instead of dynamically allocating them each boot. Note that we do not store them in an i386 compatible format, but much like NT, swap the bits so that our macro can more clearly define each entry.

by ion＠svn.reactos.org

- Use static IDT entries generated through a macro, instead of dynamically allocating them each boot. Note that we do not store them in an i386 compatible format, but much like NT, swap the bits so that our macro can more clearly define each entry. Modified: trunk/reactos/include/ndk/i386/ketypes.h Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c Modified: trunk/reactos/ntoskrnl/ke/i386/irq.c Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s Modified: trunk/reactos/ntoskrnl/ntoskrnl.xml _____ Modified: trunk/reactos/include/ndk/i386/ketypes.h --- trunk/reactos/include/ndk/i386/ketypes.h 2006-01-17 16:39:50 UTC (rev 20937) +++ trunk/reactos/include/ndk/i386/ketypes.h 2006-01-17 17:28:41 UTC (rev 20938) @@ -440,11 +440,10 @@ ULONG IrrActive; /* 2C */ ULONG IDR; /* 30 */ PVOID KdVersionBlock; /* 34 */ + PKIDTENTRY IDT; /* 38 */ #ifdef _REACTOS_ - PUSHORT IDT; /* 38 */ PUSHORT GDT; /* 3C */ #else - PKIDTENTRY IDT; /* 38 */ PKGDTENTRY GDT; /* 3C */ #endif struct _KTSS *TSS; /* 40 */ _____ Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S 2006-01-17 16:39:50 UTC (rev 20937) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S 2006-01-17 17:28:41 UTC (rev 20938) @@ -22,6 +22,10 @@ #define DoNotRestoreSegments 0 #define DoNotRestoreVolatiles 0 +// Arguments for idt +#define INT_32_DPL0 0x8E00 +#define INT_32_DPL3 0xEE00 + .intel_syntax noprefix // @@ -69,6 +73,22 @@ // @remark ebp = PKTRAP_FRAME. // edi/ebx = Have been saved and can be used. // +.macro idt Handler, Bits + .long \Handler + .short \Bits + .short KGDT_R0_CODE +.endm + +// +// @name SET_TF_DEBUG_HEADER +// +// This macro sets up the debug header in the trap frame. +// +// @param None. +// +// @remark ebp = PKTRAP_FRAME. +// edi/ebx = Have been saved and can be used. +// .macro SET_TF_DEBUG_HEADER /* Get the Debug Trap Frame EBP/EIP */ mov ebx, [ebp+KTRAP_FRAME_EBP] _____ Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h --- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h 2006-01-17 16:39:50 UTC (rev 20937) +++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h 2006-01-17 17:28:41 UTC (rev 20938) @@ -46,8 +46,6 @@ } IDT_DESCRIPTOR, GDT_DESCRIPTOR; #include <poppack.h> - -extern IDT_DESCRIPTOR KiIdt[256]; //extern GDT_DESCRIPTOR KiGdt[256]; /* _____ Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c --- trunk/reactos/ntoskrnl/ke/i386/exp.c 2006-01-17 16:39:50 UTC (rev 20937) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c 2006-01-17 17:28:41 UTC (rev 20938) @@ -9,6 +9,14 @@ * Skywing (skywing(a)valhallalegends.com) */ +/* + * FIXMES: + * - Clean up file (remove all stack functions and use RtlWalkFrameChain/RtlCaptureStackBacktrace) + * - Sanitize some context fields. + * - Add PSEH handler when an exception occurs in an exception (KiCopyExceptionRecord). + * - Forward exceptions to user-mode debugger. + */ + /* INCLUDES *****************************************************************/ #include <ntoskrnl.h> @@ -20,20 +28,14 @@ #pragma alloc_text(INIT, KeInitExceptions) #endif - -/* - * FIXMES: - * - Clean up file. - * - Sanitize some context fields. - * - Add PSEH handler when an exception occurs in an exception (KiCopyExceptionRecord). - * - Implement official stack trace functions (exported) and remove stuff here. - * - Forward exceptions to user-mode debugger. - */ - VOID NTAPI -Ki386AdjustEsp0(IN PKTRAP_FRAME TrapFrame); +Ki386AdjustEsp0( + IN PKTRAP_FRAME TrapFrame +); +extern KIDTENTRY KiIdt[]; + /* GLOBALS *****************************************************************/ #define FLAG_IF (1<<9) @@ -45,31 +47,6 @@ # define ARRAY_SIZE(x) (sizeof (x) / sizeof (x[0])) #endif -extern void KiSystemService(void); -extern void KiDebugService(void); - -extern VOID KiTrap0(VOID); -extern VOID KiTrap1(VOID); -extern VOID KiTrap2(VOID); -extern VOID KiTrap3(VOID); -extern VOID KiTrap4(VOID); -extern VOID KiTrap5(VOID); -extern VOID KiTrap6(VOID); -extern VOID KiTrap7(VOID); -extern VOID KiTrap8(VOID); -extern VOID KiTrap9(VOID); -extern VOID KiTrap10(VOID); -extern VOID KiTrap11(VOID); -extern VOID KiTrap12(VOID); -extern VOID KiTrap13(VOID); -extern VOID KiTrap14(VOID); -extern VOID KiTrap15(VOID); -extern VOID KiTrap16(VOID); -extern VOID KiTrap17(VOID); -extern VOID KiTrap18(VOID); -extern VOID KiTrap19(VOID); -extern VOID KiTrapUnknown(VOID); - extern ULONG init_stack; extern ULONG init_stack_top; @@ -388,8 +365,8 @@ DbgPrint("{"); if (StackRepeatLength[i] == 0) { - for(;;); - } + for(;;); +} for (j = 0; j < StackRepeatLength[i]; j++) { KeRosPrintAddress(StackTrace[i + j]); @@ -1168,83 +1145,24 @@ return Count; } -static void -set_system_call_gate(unsigned int sel, unsigned int func) -{ - DPRINT("sel %x %d\n",sel,sel); - KiIdt[sel].a = (((int)func)&0xffff) + - (KGDT_R0_CODE << 16); - KiIdt[sel].b = 0xef00 + (((int)func)&0xffff0000); - DPRINT("idt[sel].b %x\n",KiIdt[sel].b); -} - -static void set_interrupt_gate(unsigned int sel, unsigned int func) -{ - DPRINT("set_interrupt_gate(sel %d, func %x)\n",sel,func); - KiIdt[sel].a = (((int)func)&0xffff) + - (KGDT_R0_CODE << 16); - KiIdt[sel].b = 0x8e00 + (((int)func)&0xffff0000); -} - -static void set_trap_gate(unsigned int sel, unsigned int func, unsigned int dpl) -{ - DPRINT("set_trap_gate(sel %d, func %x, dpl %d)\n",sel, func, dpl); - ASSERT(dpl <= 3); - KiIdt[sel].a = (((int)func)&0xffff) + - (KGDT_R0_CODE << 16); - KiIdt[sel].b = 0x8f00 + (dpl << 13) + (((int)func)&0xffff0000); -} - -static void -set_task_gate(unsigned int sel, unsigned task_sel) -{ - KiIdt[sel].a = task_sel << 16; - KiIdt[sel].b = 0x8500; -} - VOID INIT_FUNCTION NTAPI KeInitExceptions(VOID) -/* - * FUNCTION: Initalize CPU exception handling - */ { - int i; + ULONG i; + USHORT FlippedSelector; - DPRINT("KeInitExceptions()\n"); + /* Loop the IDT */ + for (i = 0; i <= MAXIMUM_IDTVECTOR; i ++) + { + /* Save the current Selector */ + FlippedSelector = KiIdt[i].Selector; - /* - * Set up the other gates - */ - set_trap_gate(0, (ULONG)KiTrap0, 0); - set_trap_gate(1, (ULONG)KiTrap1, 0); - set_trap_gate(2, (ULONG)KiTrap2, 0); - set_trap_gate(3, (ULONG)KiTrap3, 3); - set_trap_gate(4, (ULONG)KiTrap4, 0); - set_trap_gate(5, (ULONG)KiTrap5, 0); - set_trap_gate(6, (ULONG)KiTrap6, 0); - set_trap_gate(7, (ULONG)KiTrap7, 0); - set_task_gate(8, KGDT_DF_TSS); - set_trap_gate(9, (ULONG)KiTrap9, 0); - set_trap_gate(10, (ULONG)KiTrap10, 0); - set_trap_gate(11, (ULONG)KiTrap11, 0); - set_trap_gate(12, (ULONG)KiTrap12, 0); - set_trap_gate(13, (ULONG)KiTrap13, 0); - set_interrupt_gate(14, (ULONG)KiTrap14); - set_trap_gate(15, (ULONG)KiTrap15, 0); - set_trap_gate(16, (ULONG)KiTrap16, 0); - set_trap_gate(17, (ULONG)KiTrap17, 0); - set_trap_gate(18, (ULONG)KiTrap18, 0); - set_trap_gate(19, (ULONG)KiTrap19, 0); - - for (i = 20; i < 256; i++) - { - set_trap_gate(i,(int)KiTrapUnknown, 0); - } - - set_system_call_gate(0x2d,(int)KiDebugService); - set_system_call_gate(0x2e,(int)KiSystemService); + /* Flip Selector and Extended Offset */ + KiIdt[i].Selector = KiIdt[i].ExtendedOffset; + KiIdt[i].ExtendedOffset = FlippedSelector; + } } VOID _____ Modified: trunk/reactos/ntoskrnl/ke/i386/irq.c --- trunk/reactos/ntoskrnl/ke/i386/irq.c 2006-01-17 16:39:50 UTC (rev 20937) +++ trunk/reactos/ntoskrnl/ke/i386/irq.c 2006-01-17 17:28:41 UTC (rev 20938) @@ -131,6 +131,7 @@ #endif #define TAG_ISR_LOCK TAG('I', 'S', 'R', 'L') +extern IDT_DESCRIPTOR KiIdt[256]; /* FUNCTIONS ****************************************************************/ _____ Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c --- trunk/reactos/ntoskrnl/ke/i386/kernel.c 2006-01-17 16:39:50 UTC (rev 20937) +++ trunk/reactos/ntoskrnl/ke/i386/kernel.c 2006-01-17 17:28:41 UTC (rev 20938) @@ -31,7 +31,7 @@ ULONG KeI386FxsrPresent = 0; extern PVOID Ki386InitialStackArray[MAXIMUM_PROCESSORS]; extern ULONG IdleProcessorMask; - +extern KIDTENTRY KiIdt[256]; static VOID INIT_FUNCTION Ki386GetCpuId(VOID); #if defined (ALLOC_PRAGMA) @@ -309,7 +309,7 @@ KPCR->Irql = SYNCH_LEVEL; KPCR->NtTib.Self = &KPCR->NtTib; KPCR->GDT = KiBootGdt; - KPCR->IDT = (PUSHORT)KiIdt; + KPCR->IDT = KiIdt; KPCR->TSS = &KiBootTss; KPCR->Number = 0; KPCR->SetMember = 1 << 0; _____ Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s --- trunk/reactos/ntoskrnl/ke/i386/trap.s 2006-01-17 16:39:50 UTC (rev 20937) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s 2006-01-17 17:28:41 UTC (rev 20938) @@ -20,44 +20,52 @@ * - Handle failure after PsConvertToGuiThread. * - Figure out what the DEBUGEIP hack is for and how it can be moved away. * - Add DR macro/save and VM macro/save. - * - Add .func .endfunc to everything that doesn't have it yet. * - Implement KiCallbackReturn, KiGetTickCount, KiRaiseAssertion. */ /* GLOBALS ******************************************************************/ +.globl _KiIdt +_KiIdt: /* This is the Software Interrupt Table that we handle in this file: */ -.globl _KiTrap0 /* INT 0: Divide Error (#DE) */ -.globl _KiTrap1 /* INT 1: Debug Exception (#DB) */ -.globl _KiTrap2 /* INT 2: NMI Interrupt */ -.globl _KiTrap3 /* INT 3: Breakpoint Exception (#BP) */ -.globl _KiTrap4 /* INT 4: Overflow Exception (#OF) */ -.globl _KiTrap5 /* INT 5: BOUND Range Exceeded (#BR) */ -.globl _KiTrap6 /* INT 6: Invalid Opcode Code (#UD) */ -.globl _KiTrap7 /* INT 7: Device Not Available (#NM) */ -.globl _KiTrap8 /* INT 8: Double Fault Exception (#DF) */ -.globl _KiTrap9 /* INT 9: RESERVED */ -.globl _KiTrap10 /* INT 10: Invalid TSS Exception (#TS) */ -.globl _KiTrap11 /* INT 11: Segment Not Present (#NP) */ -.globl _KiTrap12 /* INT 12: Stack Fault Exception (#SS) */ -.globl _KiTrap13 /* INT 13: General Protection (#GP) */ -.globl _KiTrap14 /* INT 14: Page-Fault Exception (#PF) */ -.globl _KiTrap15 /* INT 15: RESERVED */ -.globl _KiTrap16 /* INT 16: x87 FPU Error (#MF) */ -.globl _KiTrap17 /* INT 17: Align Check Exception (#AC) */ -.globl _KiTrap18 /* INT 18: Machine Check Exception (#MC)*/ -.globl _KiTrap19 /* INT 19: SIMD FPU Exception (#XF) */ -.globl _KiTrapUnknown /* INT 20-30: UNDEFINED INTERRUPTS */ -.globl _KiDebugService /* INT 31: Get Tick Count Handler */ -.globl _KiCallbackReturn /* INT 32: User-Mode Callback Return */ -.globl _KiRaiseAssertion /* INT 33: Debug Assertion Handler */ -.globl _KiDebugService /* INT 34: Debug Service Handler */ -.globl _KiSystemService /* INT 35: System Call Service Handler */ +idt _KiTrap0, INT_32_DPL0 /* INT 00: Divide Error (#DE) */ +idt _KiTrap1, INT_32_DPL0 /* INT 01: Debug Exception (#DB) */ +idt _KiTrap2, INT_32_DPL0 /* INT 02: NMI Interrupt */ +idt _KiTrap3, INT_32_DPL3 /* INT 03: Breakpoint Exception (#BP) */ +idt _KiTrap4, INT_32_DPL3 /* INT 04: Overflow Exception (#OF) */ +idt _KiTrap5, INT_32_DPL0 /* INT 05: BOUND Range Exceeded (#BR) */ +idt _KiTrap6, INT_32_DPL0 /* INT 06: Invalid Opcode Code (#UD) */ +idt _KiTrap7, INT_32_DPL0 /* INT 07: Device Not Available (#NM) */ +idt _KiTrap8, INT_32_DPL0 /* INT 08: Double Fault Exception (#DF) */ +idt _KiTrap9, INT_32_DPL0 /* INT 09: RESERVED */ +idt _KiTrap10, INT_32_DPL0 /* INT 0A: Invalid TSS Exception (#TS) */ +idt _KiTrap11, INT_32_DPL0 /* INT 0B: Segment Not Present (#NP) */ +idt _KiTrap12, INT_32_DPL0 /* INT 0C: Stack Fault Exception (#SS) */ +idt _KiTrap13, INT_32_DPL0 /* INT 0D: General Protection (#GP) */ +idt _KiTrap14, INT_32_DPL0 /* INT 0E: Page-Fault Exception (#PF) */ +idt _KiTrap15, INT_32_DPL0 /* INT 0F: RESERVED */ +idt _KiTrap16, INT_32_DPL0 /* INT 10: x87 FPU Error (#MF) */ +idt _KiTrap17, INT_32_DPL0 /* INT 11: Align Check Exception (#AC) */ +idt _KiTrap18, INT_32_DPL0 /* INT 12: Machine Check Exception (#MC)*/ +idt _KiTrap19, INT_32_DPL0 /* INT 13: SIMD FPU Exception (#XF) */ +.rept 22 +idt _KiTrapUnknown, INT_32_DPL0 /* INT 14-29: UNDEFINED INTERRUPTS */ +.endr +idt _KiGetTickCount, INT_32_DPL3 /* INT 2A: Get Tick Count Handler */ +idt _KiCallbackReturn, INT_32_DPL3 /* INT 2B: User-Mode Callback Return */ +idt _KiRaiseAssertion, INT_32_DPL3 /* INT 2C: Debug Assertion Handler */ +idt _KiDebugService, INT_32_DPL3 /* INT 2D: Debug Service Handler */ +idt _KiSystemService, INT_32_DPL3 /* INT 2E: System Call Service Handler */ +idt _KiTrapUnknown, INT_32_DPL0 /* INT 2F: RESERVED */ +.rept 220 +idt _KiTrapUnknown, INT_32_DPL0 /* INT 30-FF: UNDEFINED INTERRUPTS */ +.endr -/* We also handle LSTAR Entry */ +/* System call entrypoints: */ .globl _KiFastCallEntry +.globl _KiSystemService -/* And special system-defined software traps */ +/* And special system-defined software traps: */ .globl _NtRaiseException@12 .globl _NtContinue@8 @@ -66,8 +74,18 @@ .globl _KiServiceExit2 /* Exit from syscall with complete frame*/ .globl _Kei386EoiHelper@0 /* Exit from interrupt or H/W trap */ +.globl _KiIdtDescriptor +_KiIdtDescriptor: + .short 0x800 + .long _KiIdt + /* FUNCTIONS ****************************************************************/ +_KiGetTickCount: +_KiCallbackReturn: +_KiRaiseAssertion: + int 3 + .func KiSystemService _KiSystemService: @@ -473,6 +491,7 @@ /* Not yet supported */ int 3 +.func KiDebugService _KiDebugService: /* Push error code */ @@ -526,7 +545,9 @@ /* Exit through common routine */ jmp _Kei386EoiHelper@0 +.endfunc +.func NtRaiseException@12 _NtRaiseException@12: /* NOTE: We -must- be called by Zw* to have the right frame! */ @@ -571,7 +592,9 @@ /* Restore debug registers too */ jmp _KiServiceExit +.endfunc +.func NtContinue@8 _NtContinue@8: /* NOTE: We -must- be called by Zw* to have the right frame! */ @@ -619,6 +642,7 @@ pop ebp mov esp, ebp jmp _KiServiceExit +.endfunc _KiTrap0: /* Push error code */ @@ -780,6 +804,7 @@ jne _Kei386EoiHelper@0 jmp _KiV86Complete +.globl _KiTrap8 _KiTrap8: call _KiDoubleFaultHandler iret _____ Modified: trunk/reactos/ntoskrnl/ntoskrnl.xml --- trunk/reactos/ntoskrnl/ntoskrnl.xml 2006-01-17 16:39:50 UTC (rev 20937) +++ trunk/reactos/ntoskrnl/ntoskrnl.xml 2006-01-17 17:28:41 UTC (rev 20938) @@ -30,7 +30,6 @@ <file>exp.c</file> <file>fpu.c</file> <file>gdt.c</file> - <file>idt.c</file> <file>irq.c</file> <file>irqhand.s</file> <file>kernel.c</file>

18 years, 8 months

[gedmurphy] 20937: program files should use a separate a resource from directories.

by gedmurphy＠svn.reactos.org

program files should use a separate a resource from directories. Modified: trunk/reactos/subsys/system/explorer/explorer-en.rc Modified: trunk/reactos/subsys/system/explorer/res/apps.ico Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp _____ Modified: trunk/reactos/subsys/system/explorer/explorer-en.rc --- trunk/reactos/subsys/system/explorer/explorer-en.rc 2006-01-17 06:36:35 UTC (rev 20936) +++ trunk/reactos/subsys/system/explorer/explorer-en.rc 2006-01-17 16:39:50 UTC (rev 20937) @@ -333,7 +333,7 @@ IDS_LAUNCH "Run..." IDS_START_HELP "Help" IDS_SEARCH_FILES "Search..." - IDS_DOCUMENTS "Documents" + IDS_DOCUMENTS "My Documents" IDS_FAVORITES "Favorites" IDS_PROGRAMS "Programs" IDS_SETTINGS "Settings" _____ Modified: trunk/reactos/subsys/system/explorer/res/apps.ico (Binary files differ) _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp --- trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2006-01-17 06:36:35 UTC (rev 20936) +++ trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2006-01-17 16:39:50 UTC (rev 20937) @@ -1101,7 +1101,7 @@ ICON_ID icon_id; if (entry->_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - icon_id = ICID_FOLDER; + icon_id = ICID_APPS; else icon_id = (ICON_ID)/*@@*/ entry->_icon_id; @@ -1113,7 +1113,7 @@ ICON_ID icon_id; if (entry->_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - icon_id = ICID_FOLDER; + icon_id = ICID_APPS; else icon_id = (ICON_ID)/*@@*/ entry->_icon_id;

18 years, 8 months

[ion] 20936: - Move some assembly functions around in better suited locations.

by ion＠svn.reactos.org

- Move some assembly functions around in better suited locations. - Merge syscall.S and trap.S into trap.S, and nicely document the software interrupt table that we service, as well as special cases. Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.S Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S Deleted: trunk/reactos/ntoskrnl/ke/i386/syscall.S Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s Modified: trunk/reactos/ntoskrnl/ntoskrnl.xml _____ Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.S --- trunk/reactos/ntoskrnl/ke/i386/cpu.S 2006-01-17 05:54:35 UTC (rev 20935) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.S 2006-01-17 06:36:35 UTC (rev 20936) @@ -46,3 +46,26 @@ mov cr3, eax ret .endfunc + +.globl _KiCoprocessorError@0 +.func KiCoprocessorError@0 +_KiCoprocessorError@0: + + /* Get the NPX Thread's Initial stack */ + mov eax, [fs:KPCR_NPX_THREAD] + mov eax, [eax+KTHREAD_INITIAL_STACK] + + /* Make space for the FPU Save area */ + sub eax, SIZEOF_FX_SAVE_AREA + + /* Set the CR0 State */ + mov dword ptr [eax+FN_CR0_NPX_STATE], 8 + + /* Update it */ + mov eax, cr0 + or eax, 8 + mov cr0, eax + + /* Return to caller */ + ret +.endfunc _____ Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S 2006-01-17 05:54:35 UTC (rev 20935) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S 2006-01-17 06:36:35 UTC (rev 20936) @@ -329,3 +329,37 @@ add esp, 4 * 4 ret +.globl _Ki386AdjustEsp0@4 +.func Ki386AdjustEsp0@4 +_Ki386AdjustEsp0@4: + + /* Get the current thread */ + mov eax, [fs:KPCR_CURRENT_THREAD] + + /* Get trap frame and stack */ + mov edx, [esp+4] + mov eax, [eax+KTHREAD_INITIAL_STACK] + + /* Check if V86 */ + test dword ptr [edx+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK + jnz 1f + + /* Bias the stack */ + sub eax, KTRAP_FRAME_V86_GS - KTRAP_FRAME_SS + +1: + /* Skip FX Save Area */ + sub eax, SIZEOF_FX_SAVE_AREA + + /* Disable interrupts */ + pushf + cli + + /* Adjust ESP0 */ + mov edx, [fs:KPCR_TSS] + mov ss:[edx+KTSS_ESP0], eax + + /* Enable interrupts and return */ + popf + ret 4 +.endfunc _____ Deleted: trunk/reactos/ntoskrnl/ke/i386/syscall.S --- trunk/reactos/ntoskrnl/ke/i386/syscall.S 2006-01-17 05:54:35 UTC (rev 20935) +++ trunk/reactos/ntoskrnl/ke/i386/syscall.S 2006-01-17 06:36:35 UTC (rev 20936) @@ -1,584 +0,0 @@ -/* - * FILE: ntoskrnl/ke/i386/syscall.S - * COPYRIGHT: See COPYING in the top level directory - * PURPOSE: System Call Handler - * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) - */ - -#include <asm.h> -#include <internal/i386/asmmacro.S> - -.globl _KiServiceExit -.globl _KiServiceExit2 -.globl _KiFastCallEntry -.globl _KiSystemService -.globl _KiDebugService -.globl _Kei386EoiHelper@0 -.globl _NtRaiseException@12 -.globl _NtContinue@8 -.intel_syntax noprefix - -/* - * FIXMEs: - * - Figure out why ES/DS gets messed up in VMWare, when doing KiServiceExit only, - * and only when called from user-mode, and returning to user-mode. - * - Merge with trap.S and document all traps. - * - Use MmProbe when copying arguments to syscall. - * - Add DR macro/save and VM macro/save. - * - Implement KiCallbackReturn, KiGetTickCount, KiRaiseAssertion - */ - -/* FUNCTIONS ***************************************************************/ - -.func KiSystemService -_KiSystemService: - - /* Enter the shared system call prolog */ - SYSCALL_PROLOG - - /* Jump to the actual handler */ - jmp SharedCode -.endfunc - -BadStack: - - /* Restore ESP0 stack */ - mov ecx, [fs:KPCR_TSS] - mov esp, ss:[ecx+KTSS_ESP0] - - /* Generate V86M Stack for Trap 6 */ - push 0 - push 0 - push 0 - push 0 - - /* Generate interrupt stack for Trap 6 */ - push KGDT_R3_DATA + RPL_MASK - push 0 - push 0x20202 - push KGDT_R3_CODE + RPL_MASK - push 0 - jmp _KiTrap6 - -.func KiFastCallEntry -_KiFastCallEntry: - - /* Set FS to PCR */ - mov ecx, KGDT_R0_PCR - mov fs, cx - - /* Set DS/ES to Kernel Selector */ - mov ecx, KGDT_R0_DATA - mov ds, cx - mov es, cx - - /* Set the current stack to Kernel Stack */ - mov ecx, [fs:KPCR_TSS] - mov esp, ss:[ecx+KTSS_ESP0] - - /* Set up a fake INT Stack. */ - push KGDT_R3_DATA + RPL_MASK - push edx /* Ring 3 SS:ESP */ - pushf /* Ring 3 EFLAGS */ - push 2 /* Ring 0 EFLAGS */ - add edx, 8 /* Skip user parameter list */ - popf /* Set our EFLAGS */ - or dword ptr [esp], EFLAGS_INTERRUPT_MASK /* Re-enable IRQs in EFLAGS, to fake INT */ - push KGDT_R3_CODE + RPL_MASK - push KUSER_SHARED_SYSCALL_RET - - /* Setup the Trap Frame stack */ - push 0 - push ebp - push ebx - push esi - push edi - push KGDT_R3_TEB + RPL_MASK - - /* Save pointer to our PCR */ - mov ebx, [fs:KPCR_SELF] - - /* Get a pointer to the current thread */ - mov esi, [ebx+KPCR_CURRENT_THREAD] - - /* Set the exception handler chain terminator */ - push [ebx+KPCR_EXCEPTION_LIST] - mov dword ptr [ebx+KPCR_EXCEPTION_LIST], -1 - - /* Use the thread's stack */ - mov ebp, [esi+KTHREAD_INITIAL_STACK] - - /* Push previous mode */ - push UserMode - - /* Skip the other registers */ - sub esp, 0x48 - - /* Hack: it seems that on VMWare someone damages ES/DS on exit. Investigate! */ - mov dword ptr [esp+KTRAP_FRAME_DS], KGDT_R3_DATA + RPL_MASK - mov dword ptr [esp+KTRAP_FRAME_ES], KGDT_R3_DATA + RPL_MASK - - /* Make space for us on the stack */ - sub ebp, 0x29C - - /* Write the previous mode */ - mov byte ptr [esi+KTHREAD_PREVIOUS_MODE], UserMode - - /* Sanity check */ - cmp ebp, esp - jnz BadStack - - /* Flush DR7 */ - and dword ptr [ebp+KTRAP_FRAME_DR7], 0 - - /* Check if the thread was being debugged */ - test byte ptr [esi+KTHREAD_DEBUG_ACTIVE], 0xFF - - /* Set the thread's trap frame */ - mov [esi+KTHREAD_TRAP_FRAME], ebp - - /* Save DR registers if needed */ - //jnz Dr_FastCallDrSave - - /* Set the trap frame debug header */ - SET_TF_DEBUG_HEADER - -#ifdef DBG // FIXME: Is this for GDB? Can it be moved in the stub? - /* - * We want to know the address from where the syscall stub was called. - * If PrevMode is KernelMode, that address is stored in our own (kernel) - * stack, at location KTRAP_FRAME_ESP. - * If we're coming from UserMode, we load the usermode stack pointer - * and go back two frames (first frame is the syscall stub, second call - * is the caller of the stub). - */ - mov edi, [ebp+KTRAP_FRAME_ESP] - test byte ptr [esi+KTHREAD_PREVIOUS_MODE], 0x01 - jz PrevWasKernelMode - mov edi, [edi+4] -PrevWasKernelMode: - mov [ebp+KTRAP_FRAME_DEBUGEIP], edi -#endif - - /* Enable interrupts */ - sti - -SharedCode: - - /* - * Find out which table offset to use. Converts 0x1124 into 0x10. - * The offset is related to the Table Index as such: Offset = TableIndex x 10 - */ - mov edi, eax - shr edi, SERVICE_TABLE_SHIFT - and edi, SERVICE_TABLE_MASK - mov ecx, edi - - /* Now add the thread's base system table to the offset */ - add edi, [esi+KTHREAD_SERVICE_TABLE] - - /* Get the true syscall ID and check it */ - mov ebx, eax - and eax, SERVICE_NUMBER_MASK - cmp eax, [edi+SERVICE_DESCRIPTOR_LIMIT] - - /* Invalid ID, try to load Win32K Table */ - jnb KiBBTUnexpectedRange - -#if 0 // <== Disabled for two reasons: We don't save TEB in 0x18, but KPCR. - // <== We don't have a KeGdiFlushUserBatch callback yet (needs to be - // sent through the PsInitializeWin32Callouts structure) - /* Check if this was Win32K */ - cmp ecx, SERVICE_TABLE_TEST - jnz NotWin32K - - /* Get the TEB */ - mov ecx, [fs:KPCR_TEB] - - /* Check if we should flush the User Batch */ - xor ebx, ebx - or ebx, [ecx+TEB_GDI_BATCH_COUNT] - jz NoWin32K - - /* Flush it */ - push edx - push eax - call [_KeGdiFlushUserBatch] - pop eax - pop edx -#endif - -NotWin32K: - /* Increase total syscall count */ - inc dword ptr fs:[KPCR_SYSTEM_CALLS] - -#ifdef DBG - /* Increase per-syscall count */ - mov ecx, [edi+SERVICE_DESCRIPTOR_COUNT] - jecxz NoCountTable - inc dword ptr [ecx+eax*4] -#endif - - /* Users's current stack frame pointer is source */ -NoCountTable: - mov esi, edx - - /* Allocate room for argument list from kernel stack */ - mov ebx, [edi+SERVICE_DESCRIPTOR_NUMBER] - xor ecx, ecx - mov cl, [eax+ebx] - - /* Get pointer to function */ - mov edi, [edi+SERVICE_DESCRIPTOR_BASE] - mov ebx, [edi+eax*4] - - /* Allocate space on our stack */ - sub esp, ecx - - /* - * Copy the arguments from the user stack to our stack - * FIXME: This needs to be probed with MmSystemRangeStart - */ - shr ecx, 2 - mov edi, esp - rep movsd - -#ifdef DBG - - /* Make sure this isn't a user-mode call at elevated IRQL */ - test byte ptr [ebp+KTRAP_FRAME_CS], MODE_MASK - jz SkipCheck - call _KeGetCurrentIrql@0 - or al, al - jnz InvalidIrql - - /* - * The following lines are for the benefit of GDB. It will see the return - * address of the "call ebx" below, find the last label before it and - * thinks that that's the start of the function. It will then check to see - * if it starts with a standard function prolog (push ebp, mov ebp,esp). - * When that standard function prolog is not found, it will stop the - * stack backtrace. Since we do want to backtrace into usermode, let's - * make GDB happy and create a standard prolog. - */ -SkipCheck: -KiSystemService: - push ebp - mov ebp,esp - pop ebp -#endif - - /* Do the System Call */ - call ebx - -#ifdef DBG - /* Make sure the user-mode call didn't return at elevated IRQL */ - test byte ptr [ebp+KTRAP_FRAME_CS], MODE_MASK - jz SkipCheck2 - mov esi, eax /* We need to save the syscall's return val */ - call _KeGetCurrentIrql@0 - or al, al - jnz InvalidIrql - mov eax, esi /* Restore it */ - - /* Get our temporary current thread pointer for sanity check */ - mov ecx, fs:[KPCR_CURRENT_THREAD] - - /* Make sure that we are not attached and that APCs are not disabled */ - mov dl, [ecx+KTHREAD_APC_STATE_INDEX] - or dl, dl - jnz InvalidIndex - mov edx, [ecx+KTHREAD_COMBINED_APC_DISABLE] - or edx, edx - jnz InvalidIndex -#endif - -SkipCheck2: - - /* Deallocate the kernel stack frame */ - mov esp, ebp - -KeReturnFromSystemCall: - - /* Get the Current Thread */ - mov ecx, [fs:KPCR_CURRENT_THREAD] - - /* Restore the old trap frame pointer */ - mov edx, [ebp+KTRAP_FRAME_EDX] - mov [ecx+KTHREAD_TRAP_FRAME], edx -.endfunc - -.func KiServiceExit -_KiServiceExit: - /* Disable interrupts */ - cli - - /* Check for, and deliver, User-Mode APCs if needed */ - CHECK_FOR_APC_DELIVER 1 - - /* Hack for VMWare: Sometimes ES/DS seem to be invalid when returning to user-mode. Investigate! */ - mov es, [ebp+KTRAP_FRAME_ES] - mov ds, [ebp+KTRAP_FRAME_DS] - - /* Exit and cleanup */ - TRAP_EPILOG FromSystemCall, DoRestorePreviousMode, DoNotRestoreSegments, DoNotRestoreVolatiles, DoRestoreEverything -.endfunc - -KiBBTUnexpectedRange: - - /* If this isn't a Win32K call, fail */ - cmp ecx, 0x10 - jne InvalidCall - - /* Set up Win32K Table */ - push edx - push ebx - call _PsConvertToGuiThread@0 - - /* FIXME: Handle failure */ - pop eax - pop edx - - /* Reset trap frame address */ - mov ebp, esp - mov [esi+KTHREAD_TRAP_FRAME], ebp - - /* Try the Call again */ - jmp SharedCode - -InvalidCall: - - /* Invalid System Call */ - mov eax, STATUS_INVALID_SYSTEM_SERVICE - jmp KeReturnFromSystemCall - -#ifdef DBG -InvalidIrql: - /* Save current IRQL */ - push fs:[KPCR_IRQL] - - /* Set us at passive */ - mov dword ptr fs:[KPCR_IRQL], 0 - cli - - /* Bugcheck */ - push 0 - push 0 - push eax - push ebx - push IRQL_GT_ZERO_AT_SYSTEM_SERVICE - call _KeBugCheckEx@20 - -InvalidIndex: - - /* Get the index and APC state */ - movzx eax, byte ptr [ecx+KTHREAD_APC_STATE_INDEX] - mov edx, [ecx+KTHREAD_COMBINED_APC_DISABLE] - - /* Bugcheck */ - push 0 - push edx - push eax - push ebx - push APC_INDEX_MISMATCH - call _KeBugCheckEx@20 - ret -#endif - -.func KiServiceExit2 -_KiServiceExit2: - - /* Disable interrupts */ - cli - - /* Check for, and deliver, User-Mode APCs if needed */ - CHECK_FOR_APC_DELIVER 0 - - /* Exit and cleanup */ - TRAP_EPILOG NotFromSystemCall, DoRestorePreviousMode, DoRestoreSegments, DoRestoreVolatiles, DoNotRestoreEverything -.endfunc - -.func Kei386EoiHelper@0 -_Kei386EoiHelper@0: - - /* Disable interrupts */ - cli - - /* Check for, and deliver, User-Mode APCs if needed */ - CHECK_FOR_APC_DELIVER 0 - - /* Exit and cleanup */ - TRAP_EPILOG NotFromSystemCall, DoNotRestorePreviousMode, DoRestoreSegments, DoRestoreVolatiles, DoNotRestoreEverything -.endfunc - -V86_Exit: - /* Move to EDX position */ - add esp, KTRAP_FRAME_EDX - - /* Restore volatiles */ - pop edx - pop ecx - pop eax - - /* Move to non-volatiles */ - lea esp, [ebp+KTRAP_FRAME_EDI] - pop edi - pop esi - pop ebx - pop ebp - - /* Skip error code and return */ - add esp, 4 - iret - -AbiosExit: - /* Not yet supported */ - int 3 - -_KiDebugService: - - /* Push error code */ - push 0 - - /* Enter trap */ - TRAP_PROLOG(kids) - - /* Increase EIP so we skip the INT3 */ - //inc dword ptr [ebp+KTRAP_FRAME_EIP] - - /* Call debug service dispatcher */ - mov eax, [ebp+KTRAP_FRAME_EAX] - mov ecx, [ebp+KTRAP_FRAME_ECX] - mov edx, [ebp+KTRAP_FRAME_EAX] - - /* Check for V86 mode */ - test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK - jnz NotUserMode - - /* Check if this is kernel or user-mode */ - test byte ptr [ebp+KTRAP_FRAME_CS], 1 - jz CallDispatch - cmp word ptr [ebp+KTRAP_FRAME_CS], KGDT_R3_CODE + RPL_MASK - jnz NotUserMode - - /* Re-enable interrupts */ -VdmProc: - sti - - /* Call the debug routine */ -CallDispatch: - mov esi, ecx - mov edi, edx - mov edx, eax - mov ecx, 3 - push edi - push esi - push edx - call _KdpServiceDispatcher@12 - -NotUserMode: - - /* Get the current process */ - mov ebx, [fs:KPCR_CURRENT_THREAD] - mov ebx, [ebx+KTHREAD_APCSTATE_PROCESS] - - /* Check if this is a VDM Process */ - //cmp dword ptr [ebx+KPROCESS_VDM_OBJECTS], 0 - //jz VdmProc - - /* Exit through common routine */ - jmp _Kei386EoiHelper@0 - -_NtRaiseException@12: - - /* NOTE: We -must- be called by Zw* to have the right frame! */ - /* Push the stack frame */ - push ebp - - /* Get the current thread and restore its trap frame */ - mov ebx, [fs:KPCR_CURRENT_THREAD] - mov edx, [ebp+KTRAP_FRAME_EDX] - mov [ebx+KTHREAD_TRAP_FRAME], edx - - /* Set up stack frame */ - mov ebp, esp - - /* Get the Trap Frame in EBX */ - mov ebx, [ebp+0] - - /* Get the exception list and restore */ - mov eax, [ebx+KTRAP_FRAME_EXCEPTION_LIST] - mov [fs:KPCR_EXCEPTION_LIST], eax - - /* Get the parameters */ - mov edx, [ebp+16] /* Search frames */ - mov ecx, [ebp+12] /* Context */ - mov eax, [ebp+8] /* Exception Record */ - - /* Raise the exception */ - push edx - push ebx - push 0 - push ecx - push eax - call _KiRaiseException@20 - - /* Restore trap frame in EBP */ - pop ebp - mov esp, ebp - - /* Check the result */ - or eax, eax - jz _KiServiceExit2 - - /* Restore debug registers too */ - jmp _KiServiceExit - -_NtContinue@8: - - /* NOTE: We -must- be called by Zw* to have the right frame! */ - /* Push the stack frame */ - push ebp - - /* Get the current thread and restore its trap frame */ - mov ebx, [fs:KPCR_CURRENT_THREAD] - mov edx, [ebp+KTRAP_FRAME_EDX] - mov [ebx+KTHREAD_TRAP_FRAME], edx - - /* Set up stack frame */ - mov ebp, esp - - /* Save the parameters */ - mov eax, [ebp+0] - mov ecx, [ebp+8] - - /* Call KiContinue */ - push eax - push 0 - push ecx - call _KiContinue@12 - - /* Check if we failed (bad context record) */ - or eax, eax - jnz Error - - /* Check if test alert was requested */ - cmp dword ptr [ebp+12], 0 - je DontTest - - /* Test alert for the thread */ - mov al, [ebx+KTHREAD_PREVIOUS_MODE] - push eax - call _KeTestAlertThread@4 - -DontTest: - /* Return to previous context */ - pop ebp - mov esp, ebp - jmp _KiServiceExit2 - -Error: - pop ebp - mov esp, ebp - jmp _KiServiceExit - _____ Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s --- trunk/reactos/ntoskrnl/ke/i386/trap.s 2006-01-17 05:54:35 UTC (rev 20935) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s 2006-01-17 06:36:35 UTC (rev 20936) @@ -1,31 +1,625 @@ /* - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/ke/i386/trap.s - * PURPOSE: Exception handlers - * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + * FILE: ntoskrnl/ke/i386/trap.S + * COPYRIGHT: See COPYING in the top level directory + * PURPOSE: System Traps, Entrypoints and Exitpoints + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + * NOTE: See asmmacro.S for the shared entry/exit code. */ /* INCLUDES ******************************************************************/ #include <asm.h> #include <internal/i386/asmmacro.S> +.intel_syntax noprefix -/* NOTES: - * Why not share the epilogue? - * 1) An extra jmp is expensive (jmps are very costly) - * 2) Eventually V86 exit should be handled through ABIOS, and we - * handle ABIOS exit in the shared trap exit code already. - * Why not share the KiTrapHandler call? - * 1) Would make using the trap-prolog macro much harder. - * 2) Eventually some of these traps might be re-implemented in assembly - * to improve speed and depend less on the compiler and/or use features - * not present as C keywords. When that happens, less traps will use the - * shared C handler, so the shared-code would need to be un-shared. - */ +/* + * FIXMEs: + * - Figure out why ES/DS gets messed up in VMWare, when doing KiServiceExit only, + * and only when called from user-mode, and returning to user-mode. + * - Use MmProbe when copying arguments to syscall. + * - Handle failure after PsConvertToGuiThread. + * - Figure out what the DEBUGEIP hack is for and how it can be moved away. + * - Add DR macro/save and VM macro/save. + * - Add .func .endfunc to everything that doesn't have it yet. + * - Implement KiCallbackReturn, KiGetTickCount, KiRaiseAssertion. + */ -/* FUNCTIONS *****************************************************************/ +/* GLOBALS ******************************************************************/ -.globl _KiTrap0 +/* This is the Software Interrupt Table that we handle in this file: */ +.globl _KiTrap0 /* INT 0: Divide Error (#DE) */ +.globl _KiTrap1 /* INT 1: Debug Exception (#DB) */ +.globl _KiTrap2 /* INT 2: NMI Interrupt */ +.globl _KiTrap3 /* INT 3: Breakpoint Exception (#BP) */ +.globl _KiTrap4 /* INT 4: Overflow Exception (#OF) */ +.globl _KiTrap5 /* INT 5: BOUND Range Exceeded (#BR) */ +.globl _KiTrap6 /* INT 6: Invalid Opcode Code (#UD) */ +.globl _KiTrap7 /* INT 7: Device Not Available (#NM) */ +.globl _KiTrap8 /* INT 8: Double Fault Exception (#DF) */ +.globl _KiTrap9 /* INT 9: RESERVED */ +.globl _KiTrap10 /* INT 10: Invalid TSS Exception (#TS) */ +.globl _KiTrap11 /* INT 11: Segment Not Present (#NP) */ +.globl _KiTrap12 /* INT 12: Stack Fault Exception (#SS) */ +.globl _KiTrap13 /* INT 13: General Protection (#GP) */ +.globl _KiTrap14 /* INT 14: Page-Fault Exception (#PF) */ +.globl _KiTrap15 /* INT 15: RESERVED */ +.globl _KiTrap16 /* INT 16: x87 FPU Error (#MF) */ +.globl _KiTrap17 /* INT 17: Align Check Exception (#AC) */ +.globl _KiTrap18 /* INT 18: Machine Check Exception (#MC)*/ +.globl _KiTrap19 /* INT 19: SIMD FPU Exception (#XF) */ +.globl _KiTrapUnknown /* INT 20-30: UNDEFINED INTERRUPTS */ +.globl _KiDebugService /* INT 31: Get Tick Count Handler */ +.globl _KiCallbackReturn /* INT 32: User-Mode Callback Return */ +.globl _KiRaiseAssertion /* INT 33: Debug Assertion Handler */ +.globl _KiDebugService /* INT 34: Debug Service Handler */ +.globl _KiSystemService /* INT 35: System Call Service Handler */ + +/* We also handle LSTAR Entry */ +.globl _KiFastCallEntry + +/* And special system-defined software traps */ +.globl _NtRaiseException@12 +.globl _NtContinue@8 + +/* We implement the following trap exit points: */ +.globl _KiServiceExit /* Exit from syscall */ +.globl _KiServiceExit2 /* Exit from syscall with complete frame*/ +.globl _Kei386EoiHelper@0 /* Exit from interrupt or H/W trap */ + +/* FUNCTIONS ****************************************************************/ + +.func KiSystemService +_KiSystemService: + + /* Enter the shared system call prolog */ + SYSCALL_PROLOG + + /* Jump to the actual handler */ + jmp SharedCode +.endfunc + +.func KiFastCallEntry +_KiFastCallEntry: + + /* Set FS to PCR */ + mov ecx, KGDT_R0_PCR + mov fs, cx + + /* Set DS/ES to Kernel Selector */ + mov ecx, KGDT_R0_DATA + mov ds, cx + mov es, cx + + /* Set the current stack to Kernel Stack */ + mov ecx, [fs:KPCR_TSS] + mov esp, ss:[ecx+KTSS_ESP0] + + /* Set up a fake INT Stack. */ + push KGDT_R3_DATA + RPL_MASK + push edx /* Ring 3 SS:ESP */ + pushf /* Ring 3 EFLAGS */ + push 2 /* Ring 0 EFLAGS */ + add edx, 8 /* Skip user parameter list */ + popf /* Set our EFLAGS */ + or dword ptr [esp], EFLAGS_INTERRUPT_MASK /* Re-enable IRQs in EFLAGS, to fake INT */ + push KGDT_R3_CODE + RPL_MASK + push KUSER_SHARED_SYSCALL_RET + + /* Setup the Trap Frame stack */ + push 0 + push ebp + push ebx + push esi + push edi + push KGDT_R3_TEB + RPL_MASK + + /* Save pointer to our PCR */ + mov ebx, [fs:KPCR_SELF] + + /* Get a pointer to the current thread */ + mov esi, [ebx+KPCR_CURRENT_THREAD] + + /* Set the exception handler chain terminator */ + push [ebx+KPCR_EXCEPTION_LIST] + mov dword ptr [ebx+KPCR_EXCEPTION_LIST], -1 + + /* Use the thread's stack */ + mov ebp, [esi+KTHREAD_INITIAL_STACK] + + /* Push previous mode */ + push UserMode + + /* Skip the other registers */ + sub esp, 0x48 + + /* Hack: it seems that on VMWare someone damages ES/DS on exit. Investigate! */ + mov dword ptr [esp+KTRAP_FRAME_DS], KGDT_R3_DATA + RPL_MASK + mov dword ptr [esp+KTRAP_FRAME_ES], KGDT_R3_DATA + RPL_MASK + + /* Make space for us on the stack */ + sub ebp, 0x29C + + /* Write the previous mode */ + mov byte ptr [esi+KTHREAD_PREVIOUS_MODE], UserMode + + /* Sanity check */ + cmp ebp, esp + jnz BadStack + + /* Flush DR7 */ + and dword ptr [ebp+KTRAP_FRAME_DR7], 0 + + /* Check if the thread was being debugged */ + test byte ptr [esi+KTHREAD_DEBUG_ACTIVE], 0xFF + + /* Set the thread's trap frame */ + mov [esi+KTHREAD_TRAP_FRAME], ebp + + /* Save DR registers if needed */ + //jnz Dr_FastCallDrSave + + /* Set the trap frame debug header */ + SET_TF_DEBUG_HEADER + +#ifdef DBG // FIXME: Is this for GDB? Can it be moved in the stub? + /* + * We want to know the address from where the syscall stub was called. + * If PrevMode is KernelMode, that address is stored in our own (kernel) + * stack, at location KTRAP_FRAME_ESP. + * If we're coming from UserMode, we load the usermode stack pointer + * and go back two frames (first frame is the syscall stub, second call + * is the caller of the stub). + */ + mov edi, [ebp+KTRAP_FRAME_ESP] + test byte ptr [esi+KTHREAD_PREVIOUS_MODE], 0x01 + jz PrevWasKernelMode + mov edi, [edi+4] +PrevWasKernelMode: + mov [ebp+KTRAP_FRAME_DEBUGEIP], edi +#endif + + /* Enable interrupts */ + sti + +SharedCode: + + /* + * Find out which table offset to use. Converts 0x1124 into 0x10. + * The offset is related to the Table Index as such: Offset = TableIndex x 10 + */ + mov edi, eax + shr edi, SERVICE_TABLE_SHIFT + and edi, SERVICE_TABLE_MASK + mov ecx, edi + + /* Now add the thread's base system table to the offset */ + add edi, [esi+KTHREAD_SERVICE_TABLE] + + /* Get the true syscall ID and check it */ + mov ebx, eax + and eax, SERVICE_NUMBER_MASK + cmp eax, [edi+SERVICE_DESCRIPTOR_LIMIT] + + /* Invalid ID, try to load Win32K Table */ + jnb KiBBTUnexpectedRange + +#if 0 // <== Disabled for two reasons: We don't save TEB in 0x18, but KPCR. + // <== We don't have a KeGdiFlushUserBatch callback yet (needs to be + // sent through the PsInitializeWin32Callouts structure) + /* Check if this was Win32K */ + cmp ecx, SERVICE_TABLE_TEST + jnz NotWin32K + + /* Get the TEB */ + mov ecx, [fs:KPCR_TEB] + + /* Check if we should flush the User Batch */ + xor ebx, ebx + or ebx, [ecx+TEB_GDI_BATCH_COUNT] + jz NoWin32K + + /* Flush it */ + push edx + push eax + call [_KeGdiFlushUserBatch] + pop eax + pop edx +#endif + +NotWin32K: + /* Increase total syscall count */ + inc dword ptr fs:[KPCR_SYSTEM_CALLS] + +#ifdef DBG + /* Increase per-syscall count */ + mov ecx, [edi+SERVICE_DESCRIPTOR_COUNT] + jecxz NoCountTable + inc dword ptr [ecx+eax*4] +#endif + + /* Users's current stack frame pointer is source */ +NoCountTable: + mov esi, edx + + /* Allocate room for argument list from kernel stack */ + mov ebx, [edi+SERVICE_DESCRIPTOR_NUMBER] + xor ecx, ecx + mov cl, [eax+ebx] + + /* Get pointer to function */ + mov edi, [edi+SERVICE_DESCRIPTOR_BASE] + mov ebx, [edi+eax*4] + + /* Allocate space on our stack */ + sub esp, ecx + + /* + * Copy the arguments from the user stack to our stack + * FIXME: This needs to be probed with MmSystemRangeStart + */ + shr ecx, 2 + mov edi, esp + rep movsd + +#ifdef DBG + + /* Make sure this isn't a user-mode call at elevated IRQL */ + test byte ptr [ebp+KTRAP_FRAME_CS], MODE_MASK + jz SkipCheck + call _KeGetCurrentIrql@0 + or al, al + jnz InvalidIrql + + /* + * The following lines are for the benefit of GDB. It will see the return + * address of the "call ebx" below, find the last label before it and + * thinks that that's the start of the function. It will then check to see + * if it starts with a standard function prolog (push ebp, mov ebp,esp). + * When that standard function prolog is not found, it will stop the + * stack backtrace. Since we do want to backtrace into usermode, let's + * make GDB happy and create a standard prolog. + */ +SkipCheck: +KiSystemService: + push ebp + mov ebp,esp + pop ebp +#endif + + /* Do the System Call */ + call ebx + +#ifdef DBG + /* Make sure the user-mode call didn't return at elevated IRQL */ + test byte ptr [ebp+KTRAP_FRAME_CS], MODE_MASK + jz SkipCheck2 + mov esi, eax /* We need to save the syscall's return val */ + call _KeGetCurrentIrql@0 + or al, al + jnz InvalidIrql + mov eax, esi /* Restore it */ + + /* Get our temporary current thread pointer for sanity check */ + mov ecx, fs:[KPCR_CURRENT_THREAD] + + /* Make sure that we are not attached and that APCs are not disabled */ + mov dl, [ecx+KTHREAD_APC_STATE_INDEX] + or dl, dl + jnz InvalidIndex + mov edx, [ecx+KTHREAD_COMBINED_APC_DISABLE] + or edx, edx + jnz InvalidIndex +#endif + +SkipCheck2: + [truncated at 1000 lines; 538 more skipped]

18 years, 8 months

[ion] 20935: - Implement SYSCALL_PROLOG for the main handler and the three fast-system calls (ints 2b, 2c, 2d) which are not yet implemented.

by ion＠svn.reactos.org

- Implement SYSCALL_PROLOG for the main handler and the three fast-system calls (ints 2b, 2c, 2d) which are not yet implemented. - Document the macros. Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S _____ Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S 2006-01-17 05:22:00 UTC (rev 20934) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S 2006-01-17 05:54:35 UTC (rev 20935) @@ -234,16 +234,124 @@ SET_TF_DEBUG_HEADER // -// @name TRAP_EPILOG +// @name SYSCALL_PROLOG // -// This macro creates a standard trap entry prologue. -// It should be used for entry into any kernel trap (KiTrapXx), but not for -// system calls, which require special handling. +// This macro creates a system call entry prologue. +// It should be used for entry into any fast-system call (KiGetTickCount, +// KiCallbackReturn, KiRaiseAssertion) and the generic system call handler +// (KiSystemService) // // @param Label -// Identifying name of the caller function; will be used to append -// to the name V86 and DR helper functions, which must already exist. +// Unique label identifying the name of the caller function; will be +// used to append to the name of the DR helper function, which must +// already exist. // +// @remark None. +// +.macro SYSCALL_PROLOG + /* Create a trap frame */ + push 0 + push ebp + push ebx + push esi + push edi + push fs + + /* Load PCR Selector into fs */ + mov ebx, KGDT_R0_PCR + mov fs, bx + + /* Get a pointer to the current thread */ + mov esi, [fs:KPCR_CURRENT_THREAD] + + /* Save the previous exception list */ + push [fs:KPCR_EXCEPTION_LIST] + + /* Set the exception handler chain terminator */ + mov dword ptr [fs:KPCR_EXCEPTION_LIST], -1 + + /* Save the old previous mode */ + push ss:[esi+KTHREAD_PREVIOUS_MODE] + + /* Skip the other registers */ + sub esp, 0x48 + + /* Hack: it seems that on VMWare someone damages ES/DS on exit. Investigate! */ + mov [esp+KTRAP_FRAME_DS], ds + mov [esp+KTRAP_FRAME_ES], es + + /* Set the new previous mode based on the saved CS selector */ + mov ebx, [esp+0x6C] + and ebx, 1 + mov byte ptr ss:[esi+KTHREAD_PREVIOUS_MODE], bl + + /* Go on the Kernel stack frame */ + mov ebp, esp + + /* Save the old trap frame pointer where EDX would be saved */ + mov ebx, [esi+KTHREAD_TRAP_FRAME] + mov [ebp+KTRAP_FRAME_EDX], ebx + + /* Flush DR7 */ + and dword ptr [ebp+KTRAP_FRAME_DR7], 0 + + /* Check if the thread was being debugged */ + test byte ptr [esi+KTHREAD_DEBUG_ACTIVE], 0xFF + + /* Set the thread's trap frame and clear direction flag */ + mov [esi+KTHREAD_TRAP_FRAME], ebp + cld + + /* Save DR registers if needed */ + //jnz Dr_kss_&Label + + /* Set the trap frame debug header */ + SET_TF_DEBUG_HEADER + +#ifdef DBG // FIXME: Is this for GDB? Can it be moved in the stub? + /* + * We want to know the address from where the syscall stub was called. + * If PrevMode is KernelMode, that address is stored in our own (kernel) + * stack, at location KTRAP_FRAME_ESP. + * If we're coming from UserMode, we load the usermode stack pointer + * and go back two frames (first frame is the syscall stub, second call + * is the caller of the stub). + */ + mov edi, [ebp+KTRAP_FRAME_ESP] + test byte ptr [esi+KTHREAD_PREVIOUS_MODE], 0x01 + jz 0f + mov edi, [edi+4] +0: + mov [ebp+KTRAP_FRAME_DEBUGEIP], edi +#endif + + /* Enable interrupts */ + sti +.endm + +// +// @name TRAP_EPILOG +// +// This macro creates an epilogue for leaving any system trap. +// It is used for exiting system calls, exceptions, interrupts and generic +// traps. +// +// @param SystemCall +// Specifies whether this trap will exit a system call. If so, special +// code will be assembled to potentially use SYSEXIT instead of IRETD. +// +// @param RestorePreviousMode +// Specifies if the previous mode should be restored. +// +// @param RestoreSegments +// Specifies if the segment registers should be restored. +// +// @param RestoreVolatiles +// Specifies if the volatile registers should be restored. +// +// @param RestoreAllRegs +// Specifies if volatiles and segments should both be restored. +// // @remark // .macro TRAP_EPILOG SystemCall, RestorePreviousMode, RestoreSegments, RestoreVolatiles, RestoreAllRegs _____ Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S --- trunk/reactos/ntoskrnl/ke/i386/syscall.S 2006-01-17 05:22:00 UTC (rev 20934) +++ trunk/reactos/ntoskrnl/ke/i386/syscall.S 2006-01-17 05:54:35 UTC (rev 20935) @@ -13,22 +13,33 @@ .globl _KiFastCallEntry .globl _KiSystemService .globl _KiDebugService +.globl _Kei386EoiHelper@0 +.globl _NtRaiseException@12 +.globl _NtContinue@8 .intel_syntax noprefix /* * FIXMEs: * - Figure out why ES/DS gets messed up in VMWare, when doing KiServiceExit only, * and only when called from user-mode, and returning to user-mode. - * - Implement SYSCALL_PROLOG macro. + * - Merge with trap.S and document all traps. + * - Use MmProbe when copying arguments to syscall. + * - Add DR macro/save and VM macro/save. + * - Implement KiCallbackReturn, KiGetTickCount, KiRaiseAssertion */ - /*** This file is a mess; it is being worked on. Please contact Alex: - *** alex(a)relsoft.net if you want to make any changes to it before this - *** message goes away - */ - /* FUNCTIONS ***************************************************************/ +.func KiSystemService +_KiSystemService: + + /* Enter the shared system call prolog */ + SYSCALL_PROLOG + + /* Jump to the actual handler */ + jmp SharedCode +.endfunc + BadStack: /* Restore ESP0 stack */ @@ -123,68 +134,12 @@ /* Check if the thread was being debugged */ test byte ptr [esi+KTHREAD_DEBUG_ACTIVE], 0xFF - /* Jump to shared code or DR Save */ - //jnz Dr_FastCallDrSave - jmp SharedCode -.endfunc - -.func KiSystemService -_KiSystemService: - -// ==================== COMMON SYSTEM CALL CODE ============// - /* Create a trap frame */ - push 0 - push ebp - push ebx - push esi - push edi - push fs - - /* Load PCR Selector into fs */ - mov ebx, KGDT_R0_PCR - mov fs, bx - - /* Get a pointer to the current thread */ - mov esi, [fs:KPCR_CURRENT_THREAD] - - /* Save the previous exception list */ - push [fs:KPCR_EXCEPTION_LIST] - - /* Set the exception handler chain terminator */ - mov dword ptr [fs:KPCR_EXCEPTION_LIST], -1 - - /* Save the old previous mode */ - push ss:[esi+KTHREAD_PREVIOUS_MODE] - - /* Skip the other registers */ - sub esp, 0x48 - - /* Hack: it seems that on VMWare someone damages ES/DS on exit. Investigate! */ - mov [esp+KTRAP_FRAME_DS], ds - mov [esp+KTRAP_FRAME_ES], es - - /* Set the new previous mode based on the saved CS selector */ - mov ebx, [esp+0x6C] - and ebx, 1 - mov byte ptr ss:[esi+KTHREAD_PREVIOUS_MODE], bl - - /* Go on the Kernel stack frame */ - mov ebp, esp - - /* Save the old trap frame pointer where EDX would be saved */ - mov ebx, [esi+KTHREAD_TRAP_FRAME] - mov [ebp+KTRAP_FRAME_EDX], ebx - - /* Flush DR7 */ - and dword ptr [ebp+KTRAP_FRAME_DR7], 0 - - /* Check if the thread was being debugged */ - test byte ptr [esi+KTHREAD_DEBUG_ACTIVE], 0xFF - //jnz Dr_kss_a - -SharedCode: + /* Set the thread's trap frame */ mov [esi+KTHREAD_TRAP_FRAME], ebp + /* Save DR registers if needed */ + //jnz Dr_FastCallDrSave + /* Set the trap frame debug header */ SET_TF_DEBUG_HEADER @@ -208,7 +163,7 @@ /* Enable interrupts */ sti -CheckValidCall: +SharedCode: /* * Find out which table offset to use. Converts 0x1124 into 0x10. @@ -389,14 +344,14 @@ mov [esi+KTHREAD_TRAP_FRAME], ebp /* Try the Call again */ - jmp CheckValidCall + jmp SharedCode InvalidCall: /* Invalid System Call */ mov eax, STATUS_INVALID_SYSTEM_SERVICE jmp KeReturnFromSystemCall - + #ifdef DBG InvalidIrql: /* Save current IRQL */ @@ -443,7 +398,6 @@ TRAP_EPILOG NotFromSystemCall, DoRestorePreviousMode, DoRestoreSegments, DoRestoreVolatiles, DoNotRestoreEverything .endfunc -.globl _Kei386EoiHelper@0 .func Kei386EoiHelper@0 _Kei386EoiHelper@0: @@ -535,7 +489,6 @@ /* Exit through common routine */ jmp _Kei386EoiHelper@0 -.globl _NtRaiseException@12 _NtRaiseException@12: /* NOTE: We -must- be called by Zw* to have the right frame! */ @@ -581,7 +534,6 @@ /* Restore debug registers too */ jmp _KiServiceExit -.globl _NtContinue@8 _NtContinue@8: /* NOTE: We -must- be called by Zw* to have the right frame! */

18 years, 8 months

[ion] 20934: - Implement first version of trap exit macro. Currently missing documentation, and the parameters could probably be simplified.

by ion＠svn.reactos.org

- Implement first version of trap exit macro. Currently missing documentation, and the parameters could probably be simplified. Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S _____ Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S 2006-01-17 05:05:35 UTC (rev 20933) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S 2006-01-17 05:22:00 UTC (rev 20934) @@ -1,13 +1,27 @@ /* * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnlinclude/i386/asmmacro.S - * PURPOSE: Assembly Macros for Spinlocks and common Trap Code (TODO) + * PROJECT: ReactOS Kernel + * FILE: ntoskrnl/include/i386/asmmacro.S + * PURPOSE: Assembly Macros for Spinlocks and common Trap Code * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) */ /* INCLUDES ******************************************************************/ + #include <ndk/asm.h> + +// Arguments for TRAP_EPILOG +#define FromSystemCall 1 +#define DoRestorePreviousMode 1 +#define DoRestoreEverything 1 +#define DoRestoreSegments 1 +#define DoRestoreVolatiles 1 +#define NotFromSystemCall 0 +#define DoNotRestorePreviousMode 0 +#define DoNotRestoreEverything 0 +#define DoNotRestoreSegments 0 +#define DoNotRestoreVolatiles 0 + .intel_syntax noprefix // @@ -219,5 +233,228 @@ /* Set the Trap Frame Debug Header */ \ SET_TF_DEBUG_HEADER +// +// @name TRAP_EPILOG +// +// This macro creates a standard trap entry prologue. +// It should be used for entry into any kernel trap (KiTrapXx), but not for +// system calls, which require special handling. +// +// @param Label +// Identifying name of the caller function; will be used to append +// to the name V86 and DR helper functions, which must already exist. +// +// @remark +// +.macro TRAP_EPILOG SystemCall, RestorePreviousMode, RestoreSegments, RestoreVolatiles, RestoreAllRegs +#ifdef DBG + /* Assert the flags */ + pushfd + pop edx + test edx, EFLAGS_INTERRUPT_MASK + jnz 1f + /* Assert the stack */ + cmp esp, ebp + jnz 1f + /* Assert the trap frame */ +0: + //sub dword ptr [esp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00 + //jnz 2f + + /* Assert FS */ + mov bx, fs + cmp bx, KGDT_R0_PCR + jnz 1f + + /* Assert exception list */ + cmp dword ptr fs:[KPCR_EXCEPTION_LIST], 0 + jnz 4f +2: + add dword ptr [esp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00 +1: + int 3 + jmp 0b +4: +#endif + + /* Get exception list */ + mov edx, [esp+KTRAP_FRAME_EXCEPTION_LIST] + +#ifdef DBG + /* Assert the saved exception list */ + or edx, edx + jnz 5f + int 3 +5: +#endif + + /* Restore it */ + mov [fs:KPCR_EXCEPTION_LIST], edx + +.if \RestorePreviousMode + /* Get previous mode */ + mov ecx, [esp+KTRAP_FRAME_PREVIOUS_MODE] + +#ifdef DBG + /* Assert the saved previous mode */ + cmp ecx, -1 + jnz 6f + int 3 +6: +#endif + + /* Restore the previous mode */ + mov esi, [fs:KPCR_CURRENT_THREAD] + mov byte ptr [esi+KTHREAD_PREVIOUS_MODE], cl +.endif + + /* Check for V86 */ + test dword ptr [esp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK + jnz V86_Exit + + /* Check if the frame was edited */ + test word ptr [esp+KTRAP_FRAME_CS], FRAME_EDITED + jz 7f + +.ifeq \RestoreAllRegs + /* Check the old mode */ + cmp word ptr [esp+KTRAP_FRAME_CS], KGDT_R3_CODE + RPL_MASK + bt word ptr [esp+KTRAP_FRAME_CS], 0 + cmc + ja 8f +.endif + +.if \RestoreVolatiles + /* Restore volatiles */ + mov edx, [esp+KTRAP_FRAME_EDX] + mov ecx, [esp+KTRAP_FRAME_ECX] + mov eax, [esp+KTRAP_FRAME_EAX] +.endif + + /* Check if we were called from kernel mode */ + cmp dword ptr [ebp+KTRAP_FRAME_CS], KGDT_R0_CODE + jz 9f + +.if \RestoreSegments + /* Restore segment registers */ + lea esp, [ebp+KTRAP_FRAME_GS] + pop gs + pop es + pop ds +.endif + + /* Restore FS */ +3: + lea esp, [ebp+KTRAP_FRAME_FS] + pop fs + +9: + /* Skip debug information and unsaved registers */ + lea esp, [ebp+KTRAP_FRAME_EDI] + pop edi + pop esi + pop ebx + pop ebp + + /* Check for ABIOS */ + cmp word ptr [esp+8], 0x80 + ja AbiosExit + + /* Pop error code */ + add esp, 4 + +.if \SystemCall + /* Check if previous CS is from user-mode */ + test dword ptr [esp+4], 1 + + /* It is, so use Fast Exit */ + jnz FastExit + + /* Jump back to stub */ + pop edx + pop ecx + popf + jmp edx + +.ret: +.endif + iret + +.if \SystemCall +FastExit: + /* Is SYSEXIT Supported/Wanted? */ + cmp dword ptr ss:[_KiFastSystemCallDisable], 0 + jnz .ret + test dword ptr [esp+8], EFLAGS_TF + jnz .ret + + /* Restore FS to TIB */ + mov ecx, KGDT_R3_TEB + RPL_MASK + mov fs, ecx + + /* We will be cleaning up the stack ourselves */ + pop edx /* New Ring 3 EIP */ + add esp, 4 /* Skip Ring 3 DS */ + and dword ptr [esp], 0xfffffdff /* Remove EFLAGS_INTERRUPT_MASK from EFLAGS */ + popf /* Restore old EFLAGS */ + pop ecx /* Old Ring 3 SS:ESP */ + + /* + * At this point: + * ECX points to the old User Stack. + * EDX points to the instruction to execute in usermode after the sysenter + */ + sti + sysexit +.endif + +8: + /* Restore EAX */ + mov eax, [esp+KTRAP_FRAME_EAX] + + /* Skip registers */ + add esp, 0x30 + + /* Restore segments and volatiles */ + pop gs + pop es + pop ds + pop edx + pop ecx + + /* Jump back to mainline code */ + jmp 3b + +7: + /* Restore real CS value */ + mov ebx, [esp+KTRAP_FRAME_TEMPCS] + mov [esp+KTRAP_FRAME_CS], ebx + + /* + * If ESP was modified, then a special interrupt exit stack + * must be created to "update" ESP's value in a legal manner + */ + mov ebx, [esp+KTRAP_FRAME_TEMPESP] + sub ebx, 0xC + mov [esp+KTRAP_FRAME_ERROR_CODE], ebx + + /* Copy Interrupt Stack */ + mov esi, [esp+KTRAP_FRAME_EFLAGS] + mov [ebx+8], esi + mov esi, [esp+KTRAP_FRAME_CS] + mov [ebx+4], esi + mov esi, [esp+KTRAP_FRAME_EIP] + mov [ebx], esi + + /* Return */ + add esp, KTRAP_FRAME_EDI + pop edi + pop esi + pop ebx + pop ebp + mov esp, [esp] + iret +.endm + _____ Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S --- trunk/reactos/ntoskrnl/ke/i386/syscall.S 2006-01-17 05:05:35 UTC (rev 20933) +++ trunk/reactos/ntoskrnl/ke/i386/syscall.S 2006-01-17 05:22:00 UTC (rev 20934) @@ -16,59 +16,10 @@ .intel_syntax noprefix /* - * There are 3 main types of Trap Entries: <= Move this to asmmacro.S - * - * - System Calls - * - TODO - * - * - Exceptions - * - TODO - * - * - Interrupts - * - TODO - */ - -/* - * There are 3 main types of Trap Exits: <= Correct some things and move to asmmacro.S - * - * - KiServiceExit - * - Clear interrupt flag - * - Common User APC Dispatching - * - Common exit code; segments and volatiles are not restored - * You use this for System Call return, when volatiles are irrelevant. - * (NtContinue, NtRaiseException, KiCallUserMode and all System Call returns) - * - * - KiServiceExit2 - * - Clear interrupt flag - * - Common User APC Dispatching - * - Common exit code; the entire frame is restored. - * You use this when volatiles and other registers need to be restored. - * For example, if debugging is active (NtContinue, NtRaiseException). - * - * - Kei386EoiHelper - * - Clear interrupt flag - * - Common User APC Dispatching - * - Common exit code; the entire frame is restored but *NOT* the Previous Mode - * You use this in the same context as KiServiceExit2, but when the Previous Mode - * should be tampered with. Clearly, as its name suggests, this routine is mostly - * useful for End Of Interrupts. - * Note that this routine is EXPORTED. - * Note that this routine must called by a JMP, not a CALL. - */ - -/* - * The common exit code has 3 modes of operation: - * - Whether or not to restore segments - * - Whether or not to restore volatiles - * - Whether or not to restore the previous mode - * All these are exemplified by the 3 trap exits shown above - */ - - /* * FIXMEs: * - Figure out why ES/DS gets messed up in VMWare, when doing KiServiceExit only, * and only when called from user-mode, and returning to user-mode. - * - Use macros and merge with trap.s nicely + * - Implement SYSCALL_PROLOG macro. */ /*** This file is a mess; it is being worked on. Please contact Alex: @@ -101,7 +52,6 @@ .func KiFastCallEntry _KiFastCallEntry: -// ==================== UNIQUE SYSENTER STUB. DO NOT DUPLICATE ============// /* Set FS to PCR */ mov ecx, KGDT_R0_PCR mov fs, cx @@ -181,7 +131,7 @@ .func KiSystemService _KiSystemService: -// ==================== UNIQUE SYSCALL TRAP ENTRY DO NOT DUPLICATE ============// +// ==================== COMMON SYSTEM CALL CODE ============// /* Create a trap frame */ push 0 push ebp @@ -205,7 +155,7 @@ /* Save the old previous mode */ push ss:[esi+KTHREAD_PREVIOUS_MODE] - + /* Skip the other registers */ sub esp, 0x48 @@ -415,162 +365,38 @@ mov es, [ebp+KTRAP_FRAME_ES] mov ds, [ebp+KTRAP_FRAME_DS] -// ========================= COMMON TRAP EXIT CODE ===================// -#ifdef DBG - /* Assert the flags */ - pushfd - pop edx - test edx, EFLAGS_INTERRUPT_MASK - jnz InvalidExitState + /* Exit and cleanup */ + TRAP_EPILOG FromSystemCall, DoRestorePreviousMode, DoNotRestoreSegments, DoNotRestoreVolatiles, DoRestoreEverything +.endfunc - /* Assert the stack */ - cmp esp, ebp - jnz InvalidExitState +KiBBTUnexpectedRange: - /* Assert the trap frame */ -StateCheckDone: - sub dword ptr [esp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00 - jnz InvalidTrapFrame + /* If this isn't a Win32K call, fail */ + cmp ecx, 0x10 + jne InvalidCall - /* Assert FS */ - mov bx, fs - cmp bx, KGDT_R0_PCR - jnz InvalidFs + /* Set up Win32K Table */ + push edx + push ebx + call _PsConvertToGuiThread@0 - /* Assert exception list */ - cmp dword ptr fs:[KPCR_EXCEPTION_LIST], 0 - jnz ExceptionListOK - -InvalidFs: - push -1 - call _KeBugCheck@4 - -InvalidTrapFrame: - add dword ptr [esp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00 - -InvalidExitState: - int 3 - jmp StateCheckDone - -ExceptionListOK: -#endif - - /* Get exception list */ - mov edx, [esp+KTRAP_FRAME_EXCEPTION_LIST] - -#ifdef DBG - /* Assert the saved exception list */ - or edx, edx - jnz ListOk - int 3 - -ListOk: -#endif - - /* Restore it */ - mov [fs:KPCR_EXCEPTION_LIST], edx - -// ==================== ONLY IF PREVIOUS MODE NEEDED ==================// - /* Get previous mode */ - mov ecx, [esp+KTRAP_FRAME_PREVIOUS_MODE] - -#ifdef DBG - /* Assert the saved previous mode */ - cmp ecx, -1 - jnz ModeOk - int 3 - -ModeOk: -#endif - - /* Restore the previous mode */ - mov esi, [fs:KPCR_CURRENT_THREAD] - mov byte ptr [esi+KTHREAD_PREVIOUS_MODE], cl -// ==================== END IF PREVIOUS MODE NEEDED ===================// - - /* Check for V86 */ - test dword ptr [esp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK - jnz V86_Exit - - /* Check if the frame was edited */ - test word ptr [esp+KTRAP_FRAME_CS], FRAME_EDITED - jz EditedFrame - -// ==================== ONLY IF FULL RESTORE NEEDED ===================// - /* Check the old mode */ - cmp word ptr [esp+KTRAP_FRAME_CS], KGDT_R3_CODE + RPL_MASK - bt word ptr [esp+KTRAP_FRAME_CS], 0 - cmc - ja RestoreAll - cmp dword ptr [ebp+KTRAP_FRAME_CS], KGDT_R0_CODE - jz CommonStackClean -// ==================== END IF FULL RESTORE NEEDED ====================// - - /* Restore FS */ -RestoreFs: - lea esp, [ebp+KTRAP_FRAME_FS] - pop fs - -CommonStackClean: - /* Skip debug information and unsaved registers */ - lea esp, [ebp+KTRAP_FRAME_EDI] - pop edi - pop esi - pop ebx - pop ebp - - /* Check for ABIOS */ - cmp word ptr [esp+8], 0x80 - ja AbiosExit - -AbiosReturn: - /* Pop error code */ - add esp, 4 - - /* Check if previous CS is from user-mode */ - test dword ptr [esp+4], 1 - - /* It is, so use Fast Exit */ - jnz FastRet - - /* Jump back to stub */ + /* FIXME: Handle failure */ + pop eax pop edx - pop ecx - popf - jmp edx -IntRet: + /* Reset trap frame address */ + mov ebp, esp + mov [esi+KTHREAD_TRAP_FRAME], ebp - iret + /* Try the Call again */ + jmp CheckValidCall -FastRet: - /* Is SYSEXIT Supported/Wanted? */ - cmp dword ptr ss:[_KiFastSystemCallDisable], 0 - jnz IntRet - test dword ptr [esp+8], EFLAGS_TF - jnz IntRet +InvalidCall: - /* Restore FS to TIB */ - mov ecx, KGDT_R3_TEB + RPL_MASK - mov fs, ecx + /* Invalid System Call */ + mov eax, STATUS_INVALID_SYSTEM_SERVICE + jmp KeReturnFromSystemCall - /* We will be cleaning up the stack ourselves */ - pop edx /* New Ring 3 EIP */ - add esp, 4 /* Skip Ring 3 DS */ -/* and dword ptr [esp], ~EFLAGS_INTERRUPT_MASK Line below is equivalent to this, - but older binutils versions don't understand ~ */ - and dword ptr [esp], 0xfffffdff /* Remove IRQ hack from EFLAGS */ - popf /* Restore old EFLAGS */ - pop ecx /* Old Ring 3 SS:ESP */ - - /* - * At this point: - * ECX points to the old User Stack. - * EDX points to the instruction to execute in usermode after the sysenter - */ - sti - sysexit - #ifdef DBG InvalidIrql: /* Save current IRQL */ @@ -604,106 +430,6 @@ ret #endif -V86_Exit: - /* Move to EDX position */ - add esp, KTRAP_FRAME_EDX - - /* Restore volatiles */ - pop edx - pop ecx - pop eax - - /* Move to non-volatiles */ - lea esp, [ebp+KTRAP_FRAME_EDI] - pop edi - pop esi - pop ebx - pop ebp - - /* Skip error code and return */ - add esp, 4 - iret - -AbiosExit: - /* Not yet supported */ - int 3 - -RestoreAll: - /* Restore EAX */ - mov eax, [esp+KTRAP_FRAME_EAX] - - /* Skip registers */ - add esp, 0x30 - - /* Restore segments and volatiles */ - pop gs - pop es - pop ds - pop edx - pop ecx - - /* Jump back to mainline code */ - jmp RestoreFs - -EditedFrame: - /* Restore real CS value */ - mov ebx, [esp+KTRAP_FRAME_TEMPCS] - mov [esp+KTRAP_FRAME_CS], ebx - - /* - * If ESP was modified, then a special interrupt exit stack - * must be created to "update" ESP's value in a legal manner - */ - mov ebx, [esp+KTRAP_FRAME_TEMPESP] - sub ebx, 0xC - mov [esp+KTRAP_FRAME_ERROR_CODE], ebx - - /* Copy Interrupt Stack */ - mov esi, [esp+KTRAP_FRAME_EFLAGS] - mov [ebx+8], esi - mov esi, [esp+KTRAP_FRAME_CS] - mov [ebx+4], esi - mov esi, [esp+KTRAP_FRAME_EIP] - mov [ebx], esi - - /* Return */ - add esp, KTRAP_FRAME_EDI - pop edi - pop esi - pop ebx - pop ebp - mov esp, [esp] - iret - -KiBBTUnexpectedRange: - - /* If this isn't a Win32K call, fail */ - cmp ecx, 0x10 - jne InvalidCall - - /* Set up Win32K Table */ - push edx - push ebx - call _PsConvertToGuiThread@0 - - /* FIXME: Handle failure */ - pop eax - pop edx - - /* Reset trap frame address */ - mov ebp, esp - mov [esi+KTHREAD_TRAP_FRAME], ebp - - /* Try the Call again */ - jmp CheckValidCall - -InvalidCall: - - /* Invalid System Call */ - mov eax, STATUS_INVALID_SYSTEM_SERVICE - jmp KeReturnFromSystemCall -.endfunc - .func KiServiceExit2 _KiServiceExit2: @@ -713,155 +439,48 @@ /* Check for, and deliver, User-Mode APCs if needed */ CHECK_FOR_APC_DELIVER 0 -#ifdef DBG - /* Assert the flags */ - pushfd - pop edx - test edx, EFLAGS_INTERRUPT_MASK - jnz InvalidExitState2 + /* Exit and cleanup */ + TRAP_EPILOG NotFromSystemCall, DoRestorePreviousMode, DoRestoreSegments, DoRestoreVolatiles, DoNotRestoreEverything +.endfunc - /* Assert the stack */ - cmp esp, ebp - jnz InvalidExitState2 +.globl _Kei386EoiHelper@0 +.func Kei386EoiHelper@0 +_Kei386EoiHelper@0: - /* Assert the trap frame */ -StateCheckDone2: - sub dword ptr [esp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00 - jnz InvalidTrapFrame2 + /* Disable interrupts */ + cli - /* Assert FS */ - mov bx, fs - cmp bx, KGDT_R0_PCR - jnz InvalidFs2 + /* Check for, and deliver, User-Mode APCs if needed */ + CHECK_FOR_APC_DELIVER 0 - /* Assert exception list */ - cmp dword ptr fs:[KPCR_EXCEPTION_LIST], 0 - jnz ExceptionListOK2 + /* Exit and cleanup */ + TRAP_EPILOG NotFromSystemCall, DoNotRestorePreviousMode, DoRestoreSegments, DoRestoreVolatiles, DoNotRestoreEverything +.endfunc -InvalidFs2: - push -1 - call _KeBugCheck@4 +V86_Exit: + /* Move to EDX position */ + add esp, KTRAP_FRAME_EDX -InvalidTrapFrame2: - add dword ptr [esp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00 - -InvalidExitState2: - int 3 - jmp StateCheckDone2 - -ExceptionListOK2: -#endif - - /* Get exception list */ - mov edx, [esp+KTRAP_FRAME_EXCEPTION_LIST] - -#ifdef DBG - /* Assert the saved exception list */ - or edx, edx - jnz ListOk2 - int 3 - -ListOk2: -#endif - - /* Restore it */ - mov [fs:KPCR_EXCEPTION_LIST], edx - -// ==================== ONLY IF PREVIOUS MODE NEEDED ==================// - /* Get previous mode */ - mov ecx, [esp+KTRAP_FRAME_PREVIOUS_MODE] - -#ifdef DBG - /* Assert the saved previous mode */ - cmp ecx, -1 - jnz ModeOk2 - int 3 - -ModeOk2: -#endif - - /* Restore previous mode */ - mov esi, [fs:KPCR_CURRENT_THREAD] - mov byte ptr [esi+KTHREAD_PREVIOUS_MODE], cl - - /* Check for V86 */ - test dword ptr [esp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK - jnz V86_Exit - - /* Check if the frame was edited */ - test word ptr [esp+KTRAP_FRAME_CS], FRAME_EDITED - jz EditedFrame2 - /* Restore volatiles */ - mov edx, [esp+KTRAP_FRAME_EDX] - mov ecx, [esp+KTRAP_FRAME_ECX] - mov eax, [esp+KTRAP_FRAME_EAX] + pop edx + pop ecx + pop eax - /* Check if it was kernel */ - cmp word ptr [ebp+KTRAP_FRAME_CS], KGDT_R0_CODE - jz CommonStackClean2 - - /* Skip registers */ - lea esp, [ebp+KTRAP_FRAME_GS] - - /* Restore segments and volatiles */ - pop gs - pop es - pop ds - lea esp, [ebp+KTRAP_FRAME_FS] - pop fs - -CommonStackClean2: - /* Skip debug information and unsaved registers */ + /* Move to non-volatiles */ lea esp, [ebp+KTRAP_FRAME_EDI] pop edi pop esi pop ebx pop ebp - /* Check for ABIOS */ - cmp word ptr [esp+8], 0x80 - ja AbiosExit - - /* Pop error code and return */ + /* Skip error code and return */ add esp, 4 iret -EditedFrame2: - /* Restore real CS value */ - mov ebx, [esp+KTRAP_FRAME_TEMPCS] - mov [esp+KTRAP_FRAME_CS], ebx +AbiosExit: + /* Not yet supported */ + int 3 - /* - * If ESP was modified, then a special interrupt exit stack - * must be created to "update" ESP's value in a legal manner - */ - mov ebx, [esp+KTRAP_FRAME_TEMPESP] - sub ebx, 0xC - mov [esp+KTRAP_FRAME_ERROR_CODE], ebx - - /* Copy Interrupt Stack */ - mov esi, [esp+KTRAP_FRAME_EFLAGS] - mov [ebx+8], esi - mov esi, [esp+KTRAP_FRAME_CS] - mov [ebx+4], esi - mov esi, [esp+KTRAP_FRAME_EIP] - mov [ebx], esi - - /* Restore volatiles */ - mov eax, [esp+KTRAP_FRAME_EAX] - mov edx, [esp+KTRAP_FRAME_EDX] - mov ecx, [esp+KTRAP_FRAME_ECX] - - /* Return */ - add esp, KTRAP_FRAME_EDI - pop edi - pop esi - pop ebx - pop ebp - mov esp, [esp] - iret - _KiDebugService: /* Push error code */ @@ -915,151 +534,7 @@ /* Exit through common routine */ jmp _Kei386EoiHelper@0 -.endfunc -.globl _Kei386EoiHelper@0 -.func Kei386EoiHelper@0 -_Kei386EoiHelper@0: - - /* Disable interrupts */ - cli - - /* Check for, and deliver, User-Mode APCs if needed */ - CHECK_FOR_APC_DELIVER 0 - -#ifdef DBG - /* Assert the flags */ - pushfd - pop edx - test edx, EFLAGS_INTERRUPT_MASK - jnz InvalidExitState3 - - /* Assert the stack */ - cmp esp, ebp - jnz InvalidExitState3 - - /* Assert the trap frame */ -StateCheckDone3: - //sub dword ptr [esp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00 - //jnz InvalidTrapFrame3 - - /* Assert FS */ - mov bx, fs - cmp bx, KGDT_R0_PCR - jnz InvalidFs3 - - /* Assert exception list */ - cmp dword ptr fs:[KPCR_EXCEPTION_LIST], 0 - jnz ExceptionListOK3 - -InvalidFs3: - push -1 - call _KeBugCheck@4 - -InvalidTrapFrame3: - add dword ptr [esp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00 - -InvalidExitState3: - int 3 - jmp StateCheckDone3 - -ExceptionListOK3: -#endif - - /* Get exception list */ - mov edx, [esp+KTRAP_FRAME_EXCEPTION_LIST] - -#ifdef DBG - /* Assert the saved exception list */ - or edx, edx - jnz ListOk3 - int 3 - -ListOk3: -#endif - - /* Restore exception list */ - mov [fs:KPCR_EXCEPTION_LIST], edx - - /* Check for V86 */ - test dword ptr [esp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK - jnz V86_Exit - - /* Check if the frame was edited */ - test word ptr [esp+KTRAP_FRAME_CS], FRAME_EDITED - jz EditedFrame3 - - /* Restore volatiles */ - mov edx, [esp+KTRAP_FRAME_EDX] - mov ecx, [esp+KTRAP_FRAME_ECX] - mov eax, [esp+KTRAP_FRAME_EAX] - - /* Check if it was kernel */ - cmp word ptr [ebp+KTRAP_FRAME_CS], KGDT_R0_CODE - jz CommonStackClean3 - - /* Skip registers */ - lea esp, [ebp+KTRAP_FRAME_GS] - - /* Restore segments and volatiles */ - pop gs - pop es - pop ds - lea esp, [ebp+KTRAP_FRAME_FS] - pop fs - -CommonStackClean3: - /* Skip debug information and unsaved registers */ - lea esp, [ebp+KTRAP_FRAME_EDI] - pop edi - pop esi - pop ebx - pop ebp - - /* Check for ABIOS */ - cmp word ptr [esp+8], 0x80 - ja AbiosExit - - /* Pop error code and return */ - add esp, 4 - iret - -EditedFrame3: - /* Restore real CS value */ - mov ebx, [esp+KTRAP_FRAME_TEMPCS] - mov [esp+KTRAP_FRAME_CS], ebx - - /* - * If ESP was modified, then a special interrupt exit stack - * must be created to "update" ESP's value in a legal manner - */ - mov ebx, [esp+KTRAP_FRAME_TEMPESP] - sub ebx, 0xC - mov [esp+KTRAP_FRAME_ERROR_CODE], ebx - - /* Copy Interrupt Stack */ - mov esi, [esp+KTRAP_FRAME_EFLAGS] - mov [ebx+8], esi - mov esi, [esp+KTRAP_FRAME_CS] - mov [ebx+4], esi - mov esi, [esp+KTRAP_FRAME_EIP] - mov [ebx], esi - - /* Restore volatiles */ - mov eax, [esp+KTRAP_FRAME_EAX] - mov edx, [esp+KTRAP_FRAME_EDX] - mov ecx, [esp+KTRAP_FRAME_ECX] - - /* Return */ - add esp, KTRAP_FRAME_EDI - pop edi - pop esi - pop ebx - pop ebp - mov esp, [esp] - iret -.endfunc - .globl _NtRaiseException@12 _NtRaiseException@12:

18 years, 8 months

← Newer
1
...
12
13
14
15
16
17
18
...
59
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2006