Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 64744: [NTFS] Also return the index of the entry which was found
by pschweitzer＠svn.reactos.org 14 Oct '14

14 Oct '14

Author: pschweitzer Date: Tue Oct 14 20:34:38 2014 New Revision: 64744 URL: http://svn.reactos.org/svn/reactos?rev=64744&view=rev Log: [NTFS] Also return the index of the entry which was found Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] Tue Oct 14 20:34:38 2014 @@ -486,7 +486,7 @@ NtfsFindMftRecord(PDEVICE_EXTENSION Vcb, ULONGLONG MFTIndex, PUNICODE_STRING FileName, - ULONG FirstEntry, + PULONG FirstEntry, BOOLEAN DirSearch, ULONGLONG *OutMFTIndex, PWSTR OutName) @@ -545,9 +545,10 @@ while (IndexEntry < IndexEntryEnd && !(IndexEntry->Flags & NTFS_INDEX_ENTRY_END)) { - if (CurrentEntry >= FirstEntry && CompareFileName(FileName, IndexEntry, DirSearch)) + if (CurrentEntry >= *FirstEntry && CompareFileName(FileName, IndexEntry, DirSearch)) { *OutMFTIndex = IndexEntry->Data.Directory.IndexedFile; + *FirstEntry = CurrentEntry; RtlCopyMemory(OutName, IndexEntry->FileName.Name, IndexEntry->FileName.NameLength); OutName[IndexEntry->FileName.NameLength / sizeof(WCHAR)] = UNICODE_NULL; ExFreePoolWithTag(IndexRecord, TAG_NTFS); @@ -632,10 +633,11 @@ while (IndexEntry < IndexEntryEnd && !(IndexEntry->Flags & NTFS_INDEX_ENTRY_END)) { - if (CurrentEntry >= FirstEntry && CompareFileName(FileName, IndexEntry, DirSearch)) + if (CurrentEntry >= *FirstEntry && CompareFileName(FileName, IndexEntry, DirSearch)) { DPRINT("File found\n"); *OutMFTIndex = IndexEntry->Data.Directory.IndexedFile; + *FirstEntry = CurrentEntry; RtlCopyMemory(OutName, IndexEntry->FileName.Name, IndexEntry->FileName.NameLength); OutName[IndexEntry->FileName.NameLength / sizeof(WCHAR)] = UNICODE_NULL; ExFreePoolWithTag(BitmapData, TAG_NTFS); @@ -678,6 +680,7 @@ UNICODE_STRING Current, Remaining, Found; NTSTATUS Status; WCHAR FoundName[MAX_PATH + 1]; + ULONG FirstEntry = 0; DPRINT1("NtfsLookupFileAt(%p, %wZ, %p, %p, %I64x)\n", Vcb, PathName, FileRecord, DataContext, CurrentMFTIndex); @@ -687,7 +690,7 @@ { DPRINT1("Lookup: %wZ\n", &Current); - Status = NtfsFindMftRecord(Vcb, CurrentMFTIndex, &Current, 0, FALSE, &CurrentMFTIndex, FoundName); + Status = NtfsFindMftRecord(Vcb, CurrentMFTIndex, &Current, &FirstEntry, FALSE, &CurrentMFTIndex, FoundName); if (!NT_SUCCESS(Status)) { return Status; @@ -739,7 +742,7 @@ NTSTATUS NtfsFindFileAt(PDEVICE_EXTENSION Vcb, PUNICODE_STRING SearchPattern, - ULONG FirstEntry, + PULONG FirstEntry, PFILE_RECORD_HEADER *FileRecord, PNTFS_ATTR_CONTEXT *DataContext, PULONGLONG MFTIndex, @@ -749,7 +752,7 @@ NTSTATUS Status; WCHAR FoundName[MAX_PATH + 1]; - DPRINT1("NtfsFindFileAt(%p, %wZ, %p, %p, %I64x)\n", Vcb, SearchPattern, FileRecord, DataContext, CurrentMFTIndex); + DPRINT1("NtfsFindFileAt(%p, %wZ, %p, %p, %p, %p, %I64x)\n", Vcb, SearchPattern, FirstEntry, FileRecord, DataContext, MFTIndex, CurrentMFTIndex); Status = NtfsFindMftRecord(Vcb, CurrentMFTIndex, SearchPattern, FirstEntry, TRUE, &CurrentMFTIndex, FoundName); if (!NT_SUCCESS(Status)) Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Tue Oct 14 20:34:38 2014 @@ -657,7 +657,7 @@ NTSTATUS NtfsFindFileAt(PDEVICE_EXTENSION Vcb, PUNICODE_STRING SearchPattern, - ULONG FirstEntry, + PULONG FirstEntry, PFILE_RECORD_HEADER *FileRecord, PNTFS_ATTR_CONTEXT *DataContext, PULONGLONG MFTIndex,

1 0

[pschweitzer] 64743: [NTFS] - Also make NtfsFindMftRecord() return the name of the record it found - Implement support for entry enumeration (from 0 or not) in NtfsFindMftRecord() - Experimental fi...
by pschweitzer＠svn.reactos.org 14 Oct '14

14 Oct '14

Author: pschweitzer Date: Tue Oct 14 19:11:49 2014 New Revision: 64743 URL: http://svn.reactos.org/svn/reactos?rev=64743&view=rev Log: [NTFS] - Also make NtfsFindMftRecord() return the name of the record it found - Implement support for entry enumeration (from 0 or not) in NtfsFindMftRecord() - Experimental fix in NtfsLookupFileAt(), look for the attribute using the name of the record, and not the full path - Implement NtfsFindFileAt() which is used to look for a file/directory using WC in a given directory Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] Tue Oct 14 19:11:49 2014 @@ -488,7 +488,8 @@ PUNICODE_STRING FileName, ULONG FirstEntry, BOOLEAN DirSearch, - ULONGLONG *OutMFTIndex) + ULONGLONG *OutMFTIndex, + PWSTR OutName) { PFILE_RECORD_HEADER MftRecord; //ULONG Magic; @@ -504,6 +505,7 @@ ULONG RecordOffset; ULONG IndexBlockSize; NTSTATUS Status; + ULONG CurrentEntry = 0; MftRecord = ExAllocatePoolWithTag(NonPagedPool, Vcb->NtfsInfo.BytesPerFileRecord, @@ -543,14 +545,18 @@ while (IndexEntry < IndexEntryEnd && !(IndexEntry->Flags & NTFS_INDEX_ENTRY_END)) { - if (CompareFileName(FileName, IndexEntry, DirSearch)) + if (CurrentEntry >= FirstEntry && CompareFileName(FileName, IndexEntry, DirSearch)) { *OutMFTIndex = IndexEntry->Data.Directory.IndexedFile; + RtlCopyMemory(OutName, IndexEntry->FileName.Name, IndexEntry->FileName.NameLength); + OutName[IndexEntry->FileName.NameLength / sizeof(WCHAR)] = UNICODE_NULL; ExFreePoolWithTag(IndexRecord, TAG_NTFS); ExFreePoolWithTag(MftRecord, TAG_NTFS); return STATUS_SUCCESS; } - IndexEntry = (PINDEX_ENTRY_ATTRIBUTE)((PCHAR)IndexEntry + IndexEntry->Length); + + ++CurrentEntry; + IndexEntry = (PINDEX_ENTRY_ATTRIBUTE)((PCHAR)IndexEntry + IndexEntry->Length); } if (IndexRoot->Header.Flags & INDEX_ROOT_LARGE) @@ -626,16 +632,20 @@ while (IndexEntry < IndexEntryEnd && !(IndexEntry->Flags & NTFS_INDEX_ENTRY_END)) { - if (CompareFileName(FileName, IndexEntry, DirSearch)) + if (CurrentEntry >= FirstEntry && CompareFileName(FileName, IndexEntry, DirSearch)) { DPRINT("File found\n"); *OutMFTIndex = IndexEntry->Data.Directory.IndexedFile; + RtlCopyMemory(OutName, IndexEntry->FileName.Name, IndexEntry->FileName.NameLength); + OutName[IndexEntry->FileName.NameLength / sizeof(WCHAR)] = UNICODE_NULL; ExFreePoolWithTag(BitmapData, TAG_NTFS); ExFreePoolWithTag(IndexRecord, TAG_NTFS); ExFreePoolWithTag(MftRecord, TAG_NTFS); ReleaseAttributeContext(IndexAllocationCtx); return STATUS_SUCCESS; } + + ++CurrentEntry; IndexEntry = (PINDEX_ENTRY_ATTRIBUTE)((PCHAR)IndexEntry + IndexEntry->Length); } @@ -665,8 +675,9 @@ PULONGLONG MFTIndex, ULONGLONG CurrentMFTIndex) { - UNICODE_STRING Current, Remaining; + UNICODE_STRING Current, Remaining, Found; NTSTATUS Status; + WCHAR FoundName[MAX_PATH + 1]; DPRINT1("NtfsLookupFileAt(%p, %wZ, %p, %p, %I64x)\n", Vcb, PathName, FileRecord, DataContext, CurrentMFTIndex); @@ -676,7 +687,7 @@ { DPRINT1("Lookup: %wZ\n", &Current); - Status = NtfsFindMftRecord(Vcb, CurrentMFTIndex, &Current, 0, FALSE, &CurrentMFTIndex); + Status = NtfsFindMftRecord(Vcb, CurrentMFTIndex, &Current, 0, FALSE, &CurrentMFTIndex, FoundName); if (!NT_SUCCESS(Status)) { return Status; @@ -688,22 +699,24 @@ *FileRecord = ExAllocatePoolWithTag(NonPagedPool, Vcb->NtfsInfo.BytesPerFileRecord, TAG_NTFS); if (*FileRecord == NULL) { - DPRINT("NtfsLookupFile: Can't allocate MFT record\n"); + DPRINT("NtfsLookupFileAt: Can't allocate MFT record\n"); return STATUS_INSUFFICIENT_RESOURCES; } Status = ReadFileRecord(Vcb, CurrentMFTIndex, *FileRecord); if (!NT_SUCCESS(Status)) { - DPRINT("NtfsLookupFile: Can't read MFT record\n"); + DPRINT("NtfsLookupFileAt: Can't read MFT record\n"); ExFreePoolWithTag(FileRecord, TAG_NTFS); return Status; } - Status = FindAttribute(Vcb, *FileRecord, AttributeData, PathName, DataContext); + RtlInitUnicodeString(&Found, FoundName); + + Status = FindAttribute(Vcb, *FileRecord, AttributeData, &Found, DataContext); if (!NT_SUCCESS(Status)) { - DPRINT("NtfsLookupFile: Can't find data attribute\n"); + DPRINT("NtfsLookupFileAt: Can't find data attribute\n"); ExFreePoolWithTag(FileRecord, TAG_NTFS); return Status; } @@ -722,4 +735,56 @@ { return NtfsLookupFileAt(Vcb, PathName, FileRecord, DataContext, MFTIndex, NTFS_FILE_ROOT); } + +NTSTATUS +NtfsFindFileAt(PDEVICE_EXTENSION Vcb, + PUNICODE_STRING SearchPattern, + ULONG FirstEntry, + PFILE_RECORD_HEADER *FileRecord, + PNTFS_ATTR_CONTEXT *DataContext, + PULONGLONG MFTIndex, + ULONGLONG CurrentMFTIndex) +{ + UNICODE_STRING Found; + NTSTATUS Status; + WCHAR FoundName[MAX_PATH + 1]; + + DPRINT1("NtfsFindFileAt(%p, %wZ, %p, %p, %I64x)\n", Vcb, SearchPattern, FileRecord, DataContext, CurrentMFTIndex); + + Status = NtfsFindMftRecord(Vcb, CurrentMFTIndex, SearchPattern, FirstEntry, TRUE, &CurrentMFTIndex, FoundName); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + *FileRecord = ExAllocatePoolWithTag(NonPagedPool, Vcb->NtfsInfo.BytesPerFileRecord, TAG_NTFS); + if (*FileRecord == NULL) + { + DPRINT("NtfsFindFileAt: Can't allocate MFT record\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + Status = ReadFileRecord(Vcb, CurrentMFTIndex, *FileRecord); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtfsFindFileAt: Can't read MFT record\n"); + ExFreePoolWithTag(FileRecord, TAG_NTFS); + return Status; + } + + RtlInitUnicodeString(&Found, FoundName); + + Status = FindAttribute(Vcb, *FileRecord, AttributeData, &Found, DataContext); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtfsFindFileAt: Can't find data attribute\n"); + ExFreePoolWithTag(FileRecord, TAG_NTFS); + return Status; + } + + *MFTIndex = CurrentMFTIndex; + + return STATUS_SUCCESS; +} + /* EOF */ Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Tue Oct 14 19:11:49 2014 @@ -654,6 +654,15 @@ PULONGLONG MFTIndex, ULONGLONG CurrentMFTIndex); +NTSTATUS +NtfsFindFileAt(PDEVICE_EXTENSION Vcb, + PUNICODE_STRING SearchPattern, + ULONG FirstEntry, + PFILE_RECORD_HEADER *FileRecord, + PNTFS_ATTR_CONTEXT *DataContext, + PULONGLONG MFTIndex, + ULONGLONG CurrentMFTIndex); + /* misc.c */ BOOLEAN

1 0

[pschweitzer] 64742: [NTFS] - Prepare (only prototype so far) NtfsFindMftRecord() for directory search & enumeration with WC. - Modify CompareFileName() so that comparisons can be done with or with...
by pschweitzer＠svn.reactos.org 14 Oct '14

14 Oct '14

Author: pschweitzer Date: Tue Oct 14 18:41:38 2014 New Revision: 64742 URL: http://svn.reactos.org/svn/reactos?rev=64742&view=rev Log: [NTFS] - Prepare (only prototype so far) NtfsFindMftRecord() for directory search & enumeration with WC. - Modify CompareFileName() so that comparisons can be done with or without WC. - Fix NtfsLookupFileAt() accordingly Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c Modified: trunk/reactos/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/mft.c [iso-8859-1] Tue Oct 14 18:41:38 2014 @@ -462,7 +462,8 @@ BOOLEAN CompareFileName(PUNICODE_STRING FileName, - PINDEX_ENTRY_ATTRIBUTE IndexEntry) + PINDEX_ENTRY_ATTRIBUTE IndexEntry, + BOOLEAN DirSearch) { UNICODE_STRING EntryName; @@ -470,12 +471,24 @@ EntryName.Length = EntryName.MaximumLength = IndexEntry->FileName.NameLength; - return (RtlCompareUnicodeString(FileName, &EntryName, !!(IndexEntry->FileName.NameType != NTFS_FILE_NAME_POSIX)) == TRUE); + if (DirSearch) + { + return FsRtlIsNameInExpression(FileName, &EntryName, (IndexEntry->FileName.NameType != NTFS_FILE_NAME_POSIX), NULL); + } + else + { + return (RtlCompareUnicodeString(FileName, &EntryName, (IndexEntry->FileName.NameType != NTFS_FILE_NAME_POSIX)) == TRUE); + } } NTSTATUS -NtfsFindMftRecord(PDEVICE_EXTENSION Vcb, ULONGLONG MFTIndex, PUNICODE_STRING FileName, ULONGLONG *OutMFTIndex) +NtfsFindMftRecord(PDEVICE_EXTENSION Vcb, + ULONGLONG MFTIndex, + PUNICODE_STRING FileName, + ULONG FirstEntry, + BOOLEAN DirSearch, + ULONGLONG *OutMFTIndex) { PFILE_RECORD_HEADER MftRecord; //ULONG Magic; @@ -530,7 +543,7 @@ while (IndexEntry < IndexEntryEnd && !(IndexEntry->Flags & NTFS_INDEX_ENTRY_END)) { - if (CompareFileName(FileName, IndexEntry)) + if (CompareFileName(FileName, IndexEntry, DirSearch)) { *OutMFTIndex = IndexEntry->Data.Directory.IndexedFile; ExFreePoolWithTag(IndexRecord, TAG_NTFS); @@ -613,7 +626,7 @@ while (IndexEntry < IndexEntryEnd && !(IndexEntry->Flags & NTFS_INDEX_ENTRY_END)) { - if (CompareFileName(FileName, IndexEntry)) + if (CompareFileName(FileName, IndexEntry, DirSearch)) { DPRINT("File found\n"); *OutMFTIndex = IndexEntry->Data.Directory.IndexedFile; @@ -663,7 +676,7 @@ { DPRINT1("Lookup: %wZ\n", &Current); - Status = NtfsFindMftRecord(Vcb, CurrentMFTIndex, &Current, &CurrentMFTIndex); + Status = NtfsFindMftRecord(Vcb, CurrentMFTIndex, &Current, 0, FALSE, &CurrentMFTIndex); if (!NT_SUCCESS(Status)) { return Status;

1 0

[hbelusca] 64741: [NTVDM] - Call CpuUnsimulate in EmulatorTerminate so that we really stop the CPU, before stopping the rest of the VM. - We can reset CpuRunning to TRUE in CpuSimulate *only* if th...
by hbelusca＠svn.reactos.org 14 Oct '14

14 Oct '14

Author: hbelusca Date: Tue Oct 14 00:14:56 2014 New Revision: 64741 URL: http://svn.reactos.org/svn/reactos?rev=64741&view=rev Log: [NTVDM] - Call CpuUnsimulate in EmulatorTerminate so that we really stop the CPU, before stopping the rest of the VM. - We can reset CpuRunning to TRUE in CpuSimulate *only* if the VM is still running AND the CpuCallLevel is strictly positive (>=1 means, CPU halted or running; ==0 means, CPU stopped). Modified: trunk/reactos/subsystems/ntvdm/cpu/cpu.c trunk/reactos/subsystems/ntvdm/cpu/cpu.h trunk/reactos/subsystems/ntvdm/emulator.c Modified: trunk/reactos/subsystems/ntvdm/cpu/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/cpu/cpu.c… ============================================================================== --- trunk/reactos/subsystems/ntvdm/cpu/cpu.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/cpu/cpu.c [iso-8859-1] Tue Oct 14 00:14:56 2014 @@ -37,9 +37,7 @@ /* No more than 'MaxCpuCallLevel' recursive CPU calls are allowed */ static const INT MaxCpuCallLevel = 32; -static INT CpuCallLevel = 0; - -// BOOLEAN VdmRunning = TRUE; +static INT CpuCallLevel = 0; // == 0: CPU stopped; >= 1: CPU running or halted #if 0 LPCWSTR ExceptionName[] = @@ -131,10 +129,10 @@ DPRINT("CpuSimulate <-- Level %d\n", CpuCallLevel); CpuCallLevel--; - if (CpuCallLevel < 0) CpuCallLevel = 0; + if (!VdmRunning || CpuCallLevel < 0) CpuCallLevel = 0; /* This takes into account for reentrance */ - CpuRunning = TRUE; + if (VdmRunning && (CpuCallLevel > 0)) CpuRunning = TRUE; } VOID CpuUnsimulate(VOID) @@ -147,14 +145,6 @@ { CpuUnsimulate(); } - -#if 0 -VOID EmulatorTerminate(VOID) -{ - /* Stop the VDM */ - VdmRunning = FALSE; -} -#endif /* PUBLIC FUNCTIONS ***********************************************************/ Modified: trunk/reactos/subsystems/ntvdm/cpu/cpu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/cpu/cpu.h… ============================================================================== --- trunk/reactos/subsystems/ntvdm/cpu/cpu.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/cpu/cpu.h [iso-8859-1] Tue Oct 14 00:14:56 2014 @@ -55,7 +55,6 @@ }; #endif extern FAST486_STATE EmulatorContext; -// extern BOOLEAN VdmRunning; /* FUNCTIONS ******************************************************************/ Modified: trunk/reactos/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/emulator.… ============================================================================== --- trunk/reactos/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/emulator.c [iso-8859-1] Tue Oct 14 00:14:56 2014 @@ -177,6 +177,7 @@ VOID EmulatorTerminate(VOID) { /* Stop the VDM */ + CpuUnsimulate(); // Halt the CPU VdmRunning = FALSE; }

1 0

[hbelusca] 64740: [FAST486]: Rename fast486dbg.c to debug.c as per opular demand :P
by hbelusca＠svn.reactos.org 13 Oct '14

13 Oct '14

Author: hbelusca Date: Mon Oct 13 22:08:08 2014 New Revision: 64740 URL: http://svn.reactos.org/svn/reactos?rev=64740&view=rev Log: [FAST486]: Rename fast486dbg.c to debug.c as per opular demand :P Added: trunk/reactos/lib/fast486/debug.c - copied unchanged from r64739, trunk/reactos/lib/fast486/fast486dbg.c Removed: trunk/reactos/lib/fast486/fast486dbg.c Modified: trunk/reactos/lib/fast486/CMakeLists.txt Modified: trunk/reactos/lib/fast486/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/CMakeLists.txt… ============================================================================== --- trunk/reactos/lib/fast486/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/CMakeLists.txt [iso-8859-1] Mon Oct 13 22:08:08 2014 @@ -2,8 +2,8 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/fast486) list(APPEND SOURCE + debug.c fast486.c - fast486dbg.c opcodes.c opgroups.c extraops.c Removed: trunk/reactos/lib/fast486/fast486dbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fast486dbg.c?r… ============================================================================== --- trunk/reactos/lib/fast486/fast486dbg.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fast486dbg.c (removed) @@ -1,266 +0,0 @@ -/* - * Fast486 386/486 CPU Emulation Library - * fast486dbg.c - * - * Copyright (C) 2014 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> - * - * 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 the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -/* INCLUDES *******************************************************************/ - -#include <windef.h> - -// #define NDEBUG -#include <debug.h> - -#include <fast486.h> -#include "common.h" -#include "opcodes.h" -#include "fpu.h" - -/* DEFINES ********************************************************************/ - -typedef enum -{ - FAST486_STEP_INTO, - FAST486_STEP_OVER, - FAST486_STEP_OUT, - FAST486_CONTINUE -} FAST486_EXEC_CMD; - -/* PRIVATE FUNCTIONS **********************************************************/ - -#if 0 -static inline VOID -NTAPI -Fast486ExecutionControl(PFAST486_STATE State, FAST486_EXEC_CMD Command) -{ - UCHAR Opcode; - FAST486_OPCODE_HANDLER_PROC CurrentHandler; - INT ProcedureCallCount = 0; - - /* Main execution loop */ - do - { -NextInst: - /* Check if this is a new instruction */ - if (State->PrefixFlags == 0) State->SavedInstPtr = State->InstPtr; - - /* Perform an instruction fetch */ - if (!Fast486FetchByte(State, &Opcode)) - { - /* Exception occurred */ - State->PrefixFlags = 0; - continue; - } - - // TODO: Check for CALL/RET to update ProcedureCallCount. - - /* Call the opcode handler */ - CurrentHandler = Fast486OpcodeHandlers[Opcode]; - CurrentHandler(State, Opcode); - - /* If this is a prefix, go to the next instruction immediately */ - if (CurrentHandler == Fast486OpcodePrefix) goto NextInst; - - /* A non-prefix opcode has been executed, reset the prefix flags */ - State->PrefixFlags = 0; - - /* - * Check if there is an interrupt to execute, or a hardware interrupt signal - * while interrupts are enabled. - */ - if (State->IntStatus == FAST486_INT_EXECUTE) - { - /* Perform the interrupt */ - Fast486PerformInterrupt(State, State->PendingIntNum); - - /* Clear the interrupt status */ - State->IntStatus = FAST486_INT_NONE; - } - else if (State->Flags.If && (State->IntStatus == FAST486_INT_SIGNAL) - && (State->IntAckCallback != NULL)) - { - /* Acknowledge the interrupt to get the number */ - State->PendingIntNum = State->IntAckCallback(State); - - /* Set the interrupt status to execute on the next instruction */ - State->IntStatus = FAST486_INT_EXECUTE; - } - else if (State->IntStatus == FAST486_INT_DELAYED) - { - /* Restore the old state */ - State->IntStatus = FAST486_INT_EXECUTE; - } - } - while ((Command == FAST486_CONTINUE) || - (Command == FAST486_STEP_OVER && ProcedureCallCount > 0) || - (Command == FAST486_STEP_OUT && ProcedureCallCount >= 0)); -} -#else -VOID -NTAPI -Fast486ExecutionControl(PFAST486_STATE State, FAST486_EXEC_CMD Command); -#endif - -/* PUBLIC FUNCTIONS ***********************************************************/ - -VOID -NTAPI -Fast486DumpState(PFAST486_STATE State) -{ - DbgPrint("\nFast486DumpState -->\n"); - DbgPrint("\nCPU currently executing in %s mode at %04X:%08X\n", - (State->ControlRegisters[0] & FAST486_CR0_PE) ? "protected" : "real", - State->SegmentRegs[FAST486_REG_CS].Selector, - State->InstPtr.Long); - DbgPrint("\nGeneral purpose registers:\n" - "EAX = %08X\tECX = %08X\tEDX = %08X\tEBX = %08X\n" - "ESP = %08X\tEBP = %08X\tESI = %08X\tEDI = %08X\n", - State->GeneralRegs[FAST486_REG_EAX].Long, - State->GeneralRegs[FAST486_REG_ECX].Long, - State->GeneralRegs[FAST486_REG_EDX].Long, - State->GeneralRegs[FAST486_REG_EBX].Long, - State->GeneralRegs[FAST486_REG_ESP].Long, - State->GeneralRegs[FAST486_REG_EBP].Long, - State->GeneralRegs[FAST486_REG_ESI].Long, - State->GeneralRegs[FAST486_REG_EDI].Long); - DbgPrint("\nSegment registers:\n" - "ES = %04X (Base: %08X, Limit: %08X, Dpl: %u)\n" - "CS = %04X (Base: %08X, Limit: %08X, Dpl: %u)\n" - "SS = %04X (Base: %08X, Limit: %08X, Dpl: %u)\n" - "DS = %04X (Base: %08X, Limit: %08X, Dpl: %u)\n" - "FS = %04X (Base: %08X, Limit: %08X, Dpl: %u)\n" - "GS = %04X (Base: %08X, Limit: %08X, Dpl: %u)\n", - State->SegmentRegs[FAST486_REG_ES].Selector, - State->SegmentRegs[FAST486_REG_ES].Base, - State->SegmentRegs[FAST486_REG_ES].Limit, - State->SegmentRegs[FAST486_REG_ES].Dpl, - State->SegmentRegs[FAST486_REG_CS].Selector, - State->SegmentRegs[FAST486_REG_CS].Base, - State->SegmentRegs[FAST486_REG_CS].Limit, - State->SegmentRegs[FAST486_REG_CS].Dpl, - State->SegmentRegs[FAST486_REG_SS].Selector, - State->SegmentRegs[FAST486_REG_SS].Base, - State->SegmentRegs[FAST486_REG_SS].Limit, - State->SegmentRegs[FAST486_REG_SS].Dpl, - State->SegmentRegs[FAST486_REG_DS].Selector, - State->SegmentRegs[FAST486_REG_DS].Base, - State->SegmentRegs[FAST486_REG_DS].Limit, - State->SegmentRegs[FAST486_REG_DS].Dpl, - State->SegmentRegs[FAST486_REG_FS].Selector, - State->SegmentRegs[FAST486_REG_FS].Base, - State->SegmentRegs[FAST486_REG_FS].Limit, - State->SegmentRegs[FAST486_REG_FS].Dpl, - State->SegmentRegs[FAST486_REG_GS].Selector, - State->SegmentRegs[FAST486_REG_GS].Base, - State->SegmentRegs[FAST486_REG_GS].Limit, - State->SegmentRegs[FAST486_REG_GS].Dpl); - DbgPrint("\nFlags: %08X (%s %s %s %s %s %s %s %s %s %s %s %s %s) Iopl: %u\n", - State->Flags.Long, - State->Flags.Cf ? "CF" : "cf", - State->Flags.Pf ? "PF" : "pf", - State->Flags.Af ? "AF" : "af", - State->Flags.Zf ? "ZF" : "zf", - State->Flags.Sf ? "SF" : "sf", - State->Flags.Tf ? "TF" : "tf", - State->Flags.If ? "IF" : "if", - State->Flags.Df ? "DF" : "df", - State->Flags.Of ? "OF" : "of", - State->Flags.Nt ? "NT" : "nt", - State->Flags.Rf ? "RF" : "rf", - State->Flags.Vm ? "VM" : "vm", - State->Flags.Ac ? "AC" : "ac", - State->Flags.Iopl); - DbgPrint("\nControl Registers:\n" - "CR0 = %08X\tCR2 = %08X\tCR3 = %08X\n", - State->ControlRegisters[FAST486_REG_CR0], - State->ControlRegisters[FAST486_REG_CR2], - State->ControlRegisters[FAST486_REG_CR3]); - DbgPrint("\nDebug Registers:\n" - "DR0 = %08X\tDR1 = %08X\tDR2 = %08X\n" - "DR3 = %08X\tDR4 = %08X\tDR5 = %08X\n", - State->DebugRegisters[FAST486_REG_DR0], - State->DebugRegisters[FAST486_REG_DR1], - State->DebugRegisters[FAST486_REG_DR2], - State->DebugRegisters[FAST486_REG_DR3], - State->DebugRegisters[FAST486_REG_DR4], - State->DebugRegisters[FAST486_REG_DR5]); - -#ifndef FAST486_NO_FPU - DbgPrint("\nFPU Registers:\n" - "ST0 = %04X%016llX\tST1 = %04X%016llX\n" - "ST2 = %04X%016llX\tST3 = %04X%016llX\n" - "ST4 = %04X%016llX\tST5 = %04X%016llX\n" - "ST6 = %04X%016llX\tST7 = %04X%016llX\n" - "Status: %04X\tControl: %04X\tTag: %04X\n", - FPU_ST(0).Exponent | ((USHORT)FPU_ST(0).Sign << 15), - FPU_ST(0).Mantissa, - FPU_ST(1).Exponent | ((USHORT)FPU_ST(1).Sign << 15), - FPU_ST(1).Mantissa, - FPU_ST(2).Exponent | ((USHORT)FPU_ST(2).Sign << 15), - FPU_ST(2).Mantissa, - FPU_ST(3).Exponent | ((USHORT)FPU_ST(3).Sign << 15), - FPU_ST(3).Mantissa, - FPU_ST(4).Exponent | ((USHORT)FPU_ST(4).Sign << 15), - FPU_ST(4).Mantissa, - FPU_ST(5).Exponent | ((USHORT)FPU_ST(5).Sign << 15), - FPU_ST(5).Mantissa, - FPU_ST(6).Exponent | ((USHORT)FPU_ST(6).Sign << 15), - FPU_ST(6).Mantissa, - FPU_ST(7).Exponent | ((USHORT)FPU_ST(7).Sign << 15), - FPU_ST(7).Mantissa, - State->FpuStatus, - State->FpuControl, - State->FpuTag); -#endif - - DbgPrint("\n<-- Fast486DumpState\n\n"); -} - -VOID -NTAPI -Fast486Continue(PFAST486_STATE State) -{ - /* Call the internal function */ - Fast486ExecutionControl(State, FAST486_CONTINUE); -} - -VOID -NTAPI -Fast486StepInto(PFAST486_STATE State) -{ - /* Call the internal function */ - Fast486ExecutionControl(State, FAST486_STEP_INTO); -} - -VOID -NTAPI -Fast486StepOver(PFAST486_STATE State) -{ - /* Call the internal function */ - Fast486ExecutionControl(State, FAST486_STEP_OVER); -} - -VOID -NTAPI -Fast486StepOut(PFAST486_STATE State) -{ - /* Call the internal function */ - Fast486ExecutionControl(State, FAST486_STEP_OUT); -} - -/* EOF */

1 0

[hbelusca] 64739: [FAST486] - Add doc for INT instructions, - Move debug functions to an appropriate file.
by hbelusca＠svn.reactos.org 13 Oct '14

13 Oct '14

Author: hbelusca Date: Mon Oct 13 21:49:01 2014 New Revision: 64739 URL: http://svn.reactos.org/svn/reactos?rev=64739&view=rev Log: [FAST486] - Add doc for INT instructions, - Move debug functions to an appropriate file. Added: trunk/reactos/lib/fast486/fast486dbg.c - copied, changed from r64701, trunk/reactos/lib/fast486/fast486.c Modified: trunk/reactos/lib/fast486/CMakeLists.txt trunk/reactos/lib/fast486/fast486.c trunk/reactos/lib/fast486/opcodes.c Modified: trunk/reactos/lib/fast486/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/CMakeLists.txt… ============================================================================== --- trunk/reactos/lib/fast486/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/CMakeLists.txt [iso-8859-1] Mon Oct 13 21:49:01 2014 @@ -3,6 +3,7 @@ list(APPEND SOURCE fast486.c + fast486dbg.c opcodes.c opgroups.c extraops.c Modified: trunk/reactos/lib/fast486/fast486.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fast486.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/fast486.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fast486.c [iso-8859-1] Mon Oct 13 21:49:01 2014 @@ -43,7 +43,7 @@ /* PRIVATE FUNCTIONS **********************************************************/ -static inline VOID +VOID NTAPI Fast486ExecutionControl(PFAST486_STATE State, FAST486_EXEC_CMD Command) { @@ -279,151 +279,6 @@ VOID NTAPI -Fast486DumpState(PFAST486_STATE State) -{ - DbgPrint("\nFast486DumpState -->\n"); - DbgPrint("\nCPU currently executing in %s mode at %04X:%08X\n", - (State->ControlRegisters[0] & FAST486_CR0_PE) ? "protected" : "real", - State->SegmentRegs[FAST486_REG_CS].Selector, - State->InstPtr.Long); - DbgPrint("\nGeneral purpose registers:\n" - "EAX = %08X\tECX = %08X\tEDX = %08X\tEBX = %08X\n" - "ESP = %08X\tEBP = %08X\tESI = %08X\tEDI = %08X\n", - State->GeneralRegs[FAST486_REG_EAX].Long, - State->GeneralRegs[FAST486_REG_ECX].Long, - State->GeneralRegs[FAST486_REG_EDX].Long, - State->GeneralRegs[FAST486_REG_EBX].Long, - State->GeneralRegs[FAST486_REG_ESP].Long, - State->GeneralRegs[FAST486_REG_EBP].Long, - State->GeneralRegs[FAST486_REG_ESI].Long, - State->GeneralRegs[FAST486_REG_EDI].Long); - DbgPrint("\nSegment registers:\n" - "ES = %04X (Base: %08X, Limit: %08X, Dpl: %u)\n" - "CS = %04X (Base: %08X, Limit: %08X, Dpl: %u)\n" - "SS = %04X (Base: %08X, Limit: %08X, Dpl: %u)\n" - "DS = %04X (Base: %08X, Limit: %08X, Dpl: %u)\n" - "FS = %04X (Base: %08X, Limit: %08X, Dpl: %u)\n" - "GS = %04X (Base: %08X, Limit: %08X, Dpl: %u)\n", - State->SegmentRegs[FAST486_REG_ES].Selector, - State->SegmentRegs[FAST486_REG_ES].Base, - State->SegmentRegs[FAST486_REG_ES].Limit, - State->SegmentRegs[FAST486_REG_ES].Dpl, - State->SegmentRegs[FAST486_REG_CS].Selector, - State->SegmentRegs[FAST486_REG_CS].Base, - State->SegmentRegs[FAST486_REG_CS].Limit, - State->SegmentRegs[FAST486_REG_CS].Dpl, - State->SegmentRegs[FAST486_REG_SS].Selector, - State->SegmentRegs[FAST486_REG_SS].Base, - State->SegmentRegs[FAST486_REG_SS].Limit, - State->SegmentRegs[FAST486_REG_SS].Dpl, - State->SegmentRegs[FAST486_REG_DS].Selector, - State->SegmentRegs[FAST486_REG_DS].Base, - State->SegmentRegs[FAST486_REG_DS].Limit, - State->SegmentRegs[FAST486_REG_DS].Dpl, - State->SegmentRegs[FAST486_REG_FS].Selector, - State->SegmentRegs[FAST486_REG_FS].Base, - State->SegmentRegs[FAST486_REG_FS].Limit, - State->SegmentRegs[FAST486_REG_FS].Dpl, - State->SegmentRegs[FAST486_REG_GS].Selector, - State->SegmentRegs[FAST486_REG_GS].Base, - State->SegmentRegs[FAST486_REG_GS].Limit, - State->SegmentRegs[FAST486_REG_GS].Dpl); - DbgPrint("\nFlags: %08X (%s %s %s %s %s %s %s %s %s %s %s %s %s) Iopl: %u\n", - State->Flags.Long, - State->Flags.Cf ? "CF" : "cf", - State->Flags.Pf ? "PF" : "pf", - State->Flags.Af ? "AF" : "af", - State->Flags.Zf ? "ZF" : "zf", - State->Flags.Sf ? "SF" : "sf", - State->Flags.Tf ? "TF" : "tf", - State->Flags.If ? "IF" : "if", - State->Flags.Df ? "DF" : "df", - State->Flags.Of ? "OF" : "of", - State->Flags.Nt ? "NT" : "nt", - State->Flags.Rf ? "RF" : "rf", - State->Flags.Vm ? "VM" : "vm", - State->Flags.Ac ? "AC" : "ac", - State->Flags.Iopl); - DbgPrint("\nControl Registers:\n" - "CR0 = %08X\tCR2 = %08X\tCR3 = %08X\n", - State->ControlRegisters[FAST486_REG_CR0], - State->ControlRegisters[FAST486_REG_CR2], - State->ControlRegisters[FAST486_REG_CR3]); - DbgPrint("\nDebug Registers:\n" - "DR0 = %08X\tDR1 = %08X\tDR2 = %08X\n" - "DR3 = %08X\tDR4 = %08X\tDR5 = %08X\n", - State->DebugRegisters[FAST486_REG_DR0], - State->DebugRegisters[FAST486_REG_DR1], - State->DebugRegisters[FAST486_REG_DR2], - State->DebugRegisters[FAST486_REG_DR3], - State->DebugRegisters[FAST486_REG_DR4], - State->DebugRegisters[FAST486_REG_DR5]); - -#ifndef FAST486_NO_FPU - DbgPrint("\nFPU Registers:\n" - "ST0 = %04X%016llX\tST1 = %04X%016llX\n" - "ST2 = %04X%016llX\tST3 = %04X%016llX\n" - "ST4 = %04X%016llX\tST5 = %04X%016llX\n" - "ST6 = %04X%016llX\tST7 = %04X%016llX\n" - "Status: %04X\tControl: %04X\tTag: %04X\n", - FPU_ST(0).Exponent | ((USHORT)FPU_ST(0).Sign << 15), - FPU_ST(0).Mantissa, - FPU_ST(1).Exponent | ((USHORT)FPU_ST(1).Sign << 15), - FPU_ST(1).Mantissa, - FPU_ST(2).Exponent | ((USHORT)FPU_ST(2).Sign << 15), - FPU_ST(2).Mantissa, - FPU_ST(3).Exponent | ((USHORT)FPU_ST(3).Sign << 15), - FPU_ST(3).Mantissa, - FPU_ST(4).Exponent | ((USHORT)FPU_ST(4).Sign << 15), - FPU_ST(4).Mantissa, - FPU_ST(5).Exponent | ((USHORT)FPU_ST(5).Sign << 15), - FPU_ST(5).Mantissa, - FPU_ST(6).Exponent | ((USHORT)FPU_ST(6).Sign << 15), - FPU_ST(6).Mantissa, - FPU_ST(7).Exponent | ((USHORT)FPU_ST(7).Sign << 15), - FPU_ST(7).Mantissa, - State->FpuStatus, - State->FpuControl, - State->FpuTag); -#endif - - DbgPrint("\n<-- Fast486DumpState\n\n"); -} - -VOID -NTAPI -Fast486Continue(PFAST486_STATE State) -{ - /* Call the internal function */ - Fast486ExecutionControl(State, FAST486_CONTINUE); -} - -VOID -NTAPI -Fast486StepInto(PFAST486_STATE State) -{ - /* Call the internal function */ - Fast486ExecutionControl(State, FAST486_STEP_INTO); -} - -VOID -NTAPI -Fast486StepOver(PFAST486_STATE State) -{ - /* Call the internal function */ - Fast486ExecutionControl(State, FAST486_STEP_OVER); -} - -VOID -NTAPI -Fast486StepOut(PFAST486_STATE State) -{ - /* Call the internal function */ - Fast486ExecutionControl(State, FAST486_STEP_OUT); -} - -VOID -NTAPI Fast486Interrupt(PFAST486_STATE State, UCHAR Number) { /* Set the interrupt status and the number */ Copied: trunk/reactos/lib/fast486/fast486dbg.c (from r64701, trunk/reactos/lib/fast486/fast486.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fast486dbg.c?p… ============================================================================== --- trunk/reactos/lib/fast486/fast486.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fast486dbg.c [iso-8859-1] Mon Oct 13 21:49:01 2014 @@ -1,6 +1,6 @@ /* * Fast486 386/486 CPU Emulation Library - * fast486.c + * fast486dbg.c * * Copyright (C) 2014 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> * @@ -43,6 +43,7 @@ /* PRIVATE FUNCTIONS **********************************************************/ +#if 0 static inline VOID NTAPI Fast486ExecutionControl(PFAST486_STATE State, FAST486_EXEC_CMD Command) @@ -109,173 +110,13 @@ (Command == FAST486_STEP_OVER && ProcedureCallCount > 0) || (Command == FAST486_STEP_OUT && ProcedureCallCount >= 0)); } - -/* DEFAULT CALLBACKS **********************************************************/ - -static VOID -NTAPI -Fast486MemReadCallback(PFAST486_STATE State, ULONG Address, PVOID Buffer, ULONG Size) -{ - UNREFERENCED_PARAMETER(State); - - RtlMoveMemory(Buffer, (PVOID)Address, Size); -} - -static VOID -NTAPI -Fast486MemWriteCallback(PFAST486_STATE State, ULONG Address, PVOID Buffer, ULONG Size) -{ - UNREFERENCED_PARAMETER(State); - - RtlMoveMemory((PVOID)Address, Buffer, Size); -} - -static VOID -NTAPI -Fast486IoReadCallback(PFAST486_STATE State, ULONG Port, PVOID Buffer, ULONG DataCount, UCHAR DataSize) -{ - UNREFERENCED_PARAMETER(State); - UNREFERENCED_PARAMETER(Port); - UNREFERENCED_PARAMETER(Buffer); - UNREFERENCED_PARAMETER(DataCount); - UNREFERENCED_PARAMETER(DataSize); -} - -static VOID -NTAPI -Fast486IoWriteCallback(PFAST486_STATE State, ULONG Port, PVOID Buffer, ULONG DataCount, UCHAR DataSize) -{ - UNREFERENCED_PARAMETER(State); - UNREFERENCED_PARAMETER(Port); - UNREFERENCED_PARAMETER(Buffer); - UNREFERENCED_PARAMETER(DataCount); - UNREFERENCED_PARAMETER(DataSize); -} - -static VOID -NTAPI -Fast486IdleCallback(PFAST486_STATE State) -{ - UNREFERENCED_PARAMETER(State); -} - -static VOID -NTAPI -Fast486BopCallback(PFAST486_STATE State, UCHAR BopCode) -{ - UNREFERENCED_PARAMETER(State); - UNREFERENCED_PARAMETER(BopCode); -} - -static UCHAR -NTAPI -Fast486IntAckCallback(PFAST486_STATE State) -{ - UNREFERENCED_PARAMETER(State); - - /* Return something... */ - return 0; -} +#else +VOID +NTAPI +Fast486ExecutionControl(PFAST486_STATE State, FAST486_EXEC_CMD Command); +#endif /* PUBLIC FUNCTIONS ***********************************************************/ - -VOID -NTAPI -Fast486Initialize(PFAST486_STATE State, - FAST486_MEM_READ_PROC MemReadCallback, - FAST486_MEM_WRITE_PROC MemWriteCallback, - FAST486_IO_READ_PROC IoReadCallback, - FAST486_IO_WRITE_PROC IoWriteCallback, - FAST486_IDLE_PROC IdleCallback, - FAST486_BOP_PROC BopCallback, - FAST486_INT_ACK_PROC IntAckCallback, - PULONG Tlb) -{ - /* Set the callbacks (or use default ones if some are NULL) */ - State->MemReadCallback = (MemReadCallback ? MemReadCallback : Fast486MemReadCallback ); - State->MemWriteCallback = (MemWriteCallback ? MemWriteCallback : Fast486MemWriteCallback); - State->IoReadCallback = (IoReadCallback ? IoReadCallback : Fast486IoReadCallback ); - State->IoWriteCallback = (IoWriteCallback ? IoWriteCallback : Fast486IoWriteCallback ); - State->IdleCallback = (IdleCallback ? IdleCallback : Fast486IdleCallback ); - State->BopCallback = (BopCallback ? BopCallback : Fast486BopCallback ); - State->IntAckCallback = (IntAckCallback ? IntAckCallback : Fast486IntAckCallback ); - - /* Set the TLB (if given) */ - State->Tlb = Tlb; - - /* Reset the CPU */ - Fast486Reset(State); -} - -VOID -NTAPI -Fast486Reset(PFAST486_STATE State) -{ - FAST486_SEG_REGS i; - - FAST486_MEM_READ_PROC MemReadCallback = State->MemReadCallback; - FAST486_MEM_WRITE_PROC MemWriteCallback = State->MemWriteCallback; - FAST486_IO_READ_PROC IoReadCallback = State->IoReadCallback; - FAST486_IO_WRITE_PROC IoWriteCallback = State->IoWriteCallback; - FAST486_IDLE_PROC IdleCallback = State->IdleCallback; - FAST486_BOP_PROC BopCallback = State->BopCallback; - FAST486_INT_ACK_PROC IntAckCallback = State->IntAckCallback; - PULONG Tlb = State->Tlb; - - /* Clear the entire structure */ - RtlZeroMemory(State, sizeof(*State)); - - /* Initialize the registers */ - State->Flags.AlwaysSet = 1; - State->InstPtr.LowWord = 0xFFF0; - - /* Set the CPL to 0 */ - State->Cpl = 0; - - /* Initialize segments */ - for (i = 0; i < FAST486_NUM_SEG_REGS; i++) - { - State->SegmentRegs[i].Selector = 0; - State->SegmentRegs[i].Base = 0; - State->SegmentRegs[i].Limit = 0xFFFF; - State->SegmentRegs[i].Present = TRUE; - State->SegmentRegs[i].ReadWrite = TRUE; - State->SegmentRegs[i].Executable = FALSE; - State->SegmentRegs[i].DirConf = FALSE; - State->SegmentRegs[i].SystemType = 1; // Segment descriptor - State->SegmentRegs[i].Dpl = 0; - State->SegmentRegs[i].Size = FALSE; // 16-bit - } - - /* Initialize the code segment */ - State->SegmentRegs[FAST486_REG_CS].Executable = TRUE; - State->SegmentRegs[FAST486_REG_CS].Selector = 0xF000; - State->SegmentRegs[FAST486_REG_CS].Base = 0xFFFF0000; - - /* Initialize the IDT */ - State->Idtr.Size = 0x3FF; - State->Idtr.Address = 0; - -#ifndef FAST486_NO_FPU - /* Initialize CR0 */ - State->ControlRegisters[FAST486_REG_CR0] |= FAST486_CR0_ET; - - /* Initialize the FPU control and tag registers */ - State->FpuControl.Value = FAST486_FPU_DEFAULT_CONTROL; - State->FpuStatus.Value = 0; - State->FpuTag = 0xFFFF; -#endif - - /* Restore the callbacks and TLB */ - State->MemReadCallback = MemReadCallback; - State->MemWriteCallback = MemWriteCallback; - State->IoReadCallback = IoReadCallback; - State->IoWriteCallback = IoWriteCallback; - State->IdleCallback = IdleCallback; - State->BopCallback = BopCallback; - State->IntAckCallback = IntAckCallback; - State->Tlb = Tlb; -} VOID NTAPI @@ -422,61 +263,4 @@ Fast486ExecutionControl(State, FAST486_STEP_OUT); } -VOID -NTAPI -Fast486Interrupt(PFAST486_STATE State, UCHAR Number) -{ - /* Set the interrupt status and the number */ - State->IntStatus = FAST486_INT_EXECUTE; - State->PendingIntNum = Number; -} - -VOID -NTAPI -Fast486InterruptSignal(PFAST486_STATE State) -{ - /* Set the interrupt status */ - State->IntStatus = FAST486_INT_SIGNAL; -} - -VOID -NTAPI -Fast486ExecuteAt(PFAST486_STATE State, USHORT Segment, ULONG Offset) -{ - /* Load the new CS */ - if (!Fast486LoadSegment(State, FAST486_REG_CS, Segment)) - { - /* An exception occurred, let the handler execute instead */ - return; - } - - /* Set the new IP */ - State->InstPtr.Long = Offset; -} - -VOID -NTAPI -Fast486SetStack(PFAST486_STATE State, USHORT Segment, ULONG Offset) -{ - /* Load the new SS */ - if (!Fast486LoadSegment(State, FAST486_REG_SS, Segment)) - { - /* An exception occurred, let the handler execute instead */ - return; - } - - /* Set the new SP */ - State->GeneralRegs[FAST486_REG_ESP].Long = Offset; -} - -VOID -NTAPI -Fast486SetSegment(PFAST486_STATE State, - FAST486_SEG_REGS Segment, - USHORT Selector) -{ - /* Call the internal function */ - Fast486LoadSegment(State, Segment, Selector); -} - /* EOF */ Modified: trunk/reactos/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opcodes.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] Mon Oct 13 21:49:01 2014 @@ -4630,14 +4630,14 @@ switch (Opcode) { - case 0xCC: + case 0xCC: // INT 3 { /* This is the INT3 instruction */ IntNum = 3; break; } - case 0xCD: + case 0xCD: // INT xx { /* Fetch the interrupt number */ if (!Fast486FetchByte(State, &IntNum)) @@ -4649,7 +4649,7 @@ break; } - case 0xCE: + case 0xCE: // INTO { /* Don't do anything if OF is cleared */ if (!State->Flags.Of) return TRUE;

1 0

[akhaldi] 64738: [CRT] * Update fwrite(). * Fixes some msvcrt:file tests. CORE-8540
by akhaldi＠svn.reactos.org 13 Oct '14

13 Oct '14

Author: akhaldi Date: Mon Oct 13 19:48:08 2014 New Revision: 64738 URL: http://svn.reactos.org/svn/reactos?rev=64738&view=rev Log: [CRT] * Update fwrite(). * Fixes some msvcrt:file tests. CORE-8540 Modified: trunk/reactos/lib/sdk/crt/stdio/file.c Modified: trunk/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/file.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Mon Oct 13 19:48:08 2014 @@ -2972,28 +2972,46 @@ _lock_file(file); while(wrcnt) { +#ifndef __REACTOS__ + if(file->_cnt < 0) { + WARN("negative file->_cnt value in %p\n", file); + file->_flag |= MSVCRT__IOERR; + break; + } else +#endif if(file->_cnt) { - int pcnt=((unsigned)file->_cnt>wrcnt)? wrcnt: file->_cnt; + int pcnt=(file->_cnt>wrcnt)? wrcnt: file->_cnt; memcpy(file->_ptr, ptr, pcnt); file->_cnt -= pcnt; file->_ptr += pcnt; written += pcnt; wrcnt -= pcnt; ptr = (const char*)ptr + pcnt; - } else if(!file->_bufsiz && (file->_flag & _IONBF)) { - if(!(file->_flag & _IOWRT)) { - if(file->_flag & _IORW) - file->_flag |= _IOWRT; - else - break; - } - - if(_write(file->_file, ptr, wrcnt) <= 0) { + } else if((file->_flag & _IONBF) + || ((file->_flag & (_IOMYBUF | _USERBUF)) && wrcnt >= file->_bufsiz) + || (!(file->_flag & (_IOMYBUF | _USERBUF)) && wrcnt >= MSVCRT_INTERNAL_BUFSIZ)) { + size_t pcnt; + int bufsiz; + + if(file->_flag & _IONBF) + bufsiz = 1; + else if(!(file->_flag & (_IOMYBUF | _USERBUF))) + bufsiz = MSVCRT_INTERNAL_BUFSIZ; + else + bufsiz = file->_bufsiz; + + pcnt = (wrcnt / bufsiz) * bufsiz; + + if(flush_buffer(file) == EOF) + break; + + if(_write(file->_file, ptr, pcnt) <= 0) { file->_flag |= _IOERR; break; } - written += wrcnt; - wrcnt = 0; + written += pcnt; + wrcnt -= pcnt; + ptr = (const char*)ptr + pcnt; } else { if(_flsbuf(*(const char*)ptr, file) == EOF) break;

1 0

[hbelusca] 64737: [NTVDM]: it is always interesting to dump the full CPU state when an exception occurs.
by hbelusca＠svn.reactos.org 13 Oct '14

13 Oct '14

Author: hbelusca Date: Mon Oct 13 18:51:40 2014 New Revision: 64737 URL: http://svn.reactos.org/svn/reactos?rev=64737&view=rev Log: [NTVDM]: it is always interesting to dump the full CPU state when an exception occurs. Modified: trunk/reactos/subsystems/ntvdm/emulator.c Modified: trunk/reactos/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/emulator.… ============================================================================== --- trunk/reactos/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/emulator.c [iso-8859-1] Mon Oct 13 18:51:40 2014 @@ -166,6 +166,8 @@ Opcode[7], Opcode[8], Opcode[9]); + + Fast486DumpState(&EmulatorContext); /* Stop the VDM */ EmulatorTerminate();

1 0

[jgardou] 64736: [ADVAPI32_APITESTS] - Add a few tests for DuplicateTokenEx
by jgardou＠svn.reactos.org 13 Oct '14

13 Oct '14

Author: jgardou Date: Mon Oct 13 18:49:09 2014 New Revision: 64736 URL: http://svn.reactos.org/svn/reactos?rev=64736&view=rev Log: [ADVAPI32_APITESTS] - Add a few tests for DuplicateTokenEx Added: trunk/rostests/apitests/advapi32/DuplicateTokenEx.c (with props) Modified: trunk/rostests/apitests/advapi32/CMakeLists.txt trunk/rostests/apitests/advapi32/testlist.c Modified: trunk/rostests/apitests/advapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/CMakeLi… ============================================================================== --- trunk/rostests/apitests/advapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/advapi32/CMakeLists.txt [iso-8859-1] Mon Oct 13 18:49:09 2014 @@ -1,6 +1,7 @@ list(APPEND SOURCE CreateService.c + DuplicateTokenEx.c HKEY_CLASSES_ROOT.c LockDatabase.c QueryServiceConfig2.c Added: trunk/rostests/apitests/advapi32/DuplicateTokenEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/Duplica… ============================================================================== --- trunk/rostests/apitests/advapi32/DuplicateTokenEx.c (added) +++ trunk/rostests/apitests/advapi32/DuplicateTokenEx.c [iso-8859-1] Mon Oct 13 18:49:09 2014 @@ -0,0 +1,63 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for DupicateTokenEx + * PROGRAMMER: JÃ©rÃ´me Gardou <jerome.gardou(a)reactos.org> + */ + +#include <apitest.h> +#include <winbase.h> +#include <rtlfuncs.h> + +#define ok_luid_equal(Luid, Expected) \ + ok(RtlEqualLuid((Luid), (Expected)), "Got wrong LUID %08lx%08lx, expected (%08lx%08lx).\n", \ + (Luid)->HighPart, (Luid)->LowPart, (Expected)->HighPart, (Expected)->LowPart) +#define ok_luid_notequal(Luid, Comparand) \ + ok(!RtlEqualLuid((Luid), (Comparand)), "LUID is %08lx%08lx and should not be.\n", \ + (Luid)->HighPart, (Luid)->LowPart) + +START_TEST(DuplicateTokenEx) +{ + HANDLE ProcessToken, TokenDup; + TOKEN_STATISTICS ProcessTokenStats, TokenDupStats; + BOOL Result; + DWORD ReturnLength; + + /* Get the current process token */ + Result = OpenProcessToken(GetCurrentProcess(), TOKEN_DUPLICATE | TOKEN_QUERY, &ProcessToken); + ok(Result, "OpenProcessToken failed. GLE: %lu.\n", GetLastError()); + /* And its statistics */ + Result = GetTokenInformation(ProcessToken, + TokenStatistics, + &ProcessTokenStats, + sizeof(ProcessTokenStats), + &ReturnLength); + ok(Result, "GetTokenInformation failed. GLE: %lu.\n", GetLastError()); + ok_size_t(ReturnLength, sizeof(ProcessTokenStats)); + + /* Duplicate it as primary token with the same access rights. */ + Result = DuplicateTokenEx(ProcessToken, 0, NULL, SecurityImpersonation, TokenPrimary, &TokenDup); + ok(Result, "DuplicateTokenEx failed. GLE: %lu.\n", GetLastError()); + /* Get the stats */ + Result = GetTokenInformation(TokenDup, + TokenStatistics, + &TokenDupStats, + sizeof(ProcessTokenStats), + &ReturnLength); + ok(Result, "GetTokenInformation failed. GLE: %lu.\n", GetLastError()); + ok_size_t(ReturnLength, sizeof(ProcessTokenStats)); + /* And test them */ + ok_luid_notequal(&TokenDupStats.TokenId, &ProcessTokenStats.TokenId); + ok_luid_equal(&TokenDupStats.AuthenticationId, &ProcessTokenStats.AuthenticationId); + ok(TokenDupStats.TokenType == TokenPrimary, "Duplicate token type is %d.\n", TokenDupStats.TokenType); + ok(TokenDupStats.ImpersonationLevel == SecurityImpersonation, + "Duplicate token impersonation level is %d.\n", TokenDupStats.ImpersonationLevel); + ok_dec(TokenDupStats.DynamicCharged, ProcessTokenStats.DynamicCharged); + ok_dec(TokenDupStats.DynamicAvailable, ProcessTokenStats.DynamicAvailable); + ok_dec(TokenDupStats.GroupCount, ProcessTokenStats.GroupCount); + ok_dec(TokenDupStats.PrivilegeCount, ProcessTokenStats.PrivilegeCount); + ok_luid_equal(&TokenDupStats.ModifiedId, &ProcessTokenStats.ModifiedId); + + CloseHandle(ProcessToken); + CloseHandle(TokenDup); +} Propchange: trunk/rostests/apitests/advapi32/DuplicateTokenEx.c ------------------------------------------------------------------------------ charset = UTF-8 Propchange: trunk/rostests/apitests/advapi32/DuplicateTokenEx.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/apitests/advapi32/DuplicateTokenEx.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/rostests/apitests/advapi32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/advapi32/testlis… ============================================================================== --- trunk/rostests/apitests/advapi32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/advapi32/testlist.c [iso-8859-1] Mon Oct 13 18:49:09 2014 @@ -4,6 +4,7 @@ #include <apitest.h> extern void func_CreateService(void); +extern void func_DuplicateTokenEx(void); extern void func_HKEY_CLASSES_ROOT(void); extern void func_LockDatabase(void); extern void func_QueryServiceConfig2(void); @@ -14,6 +15,7 @@ const struct test winetest_testlist[] = { { "CreateService", func_CreateService }, + { "DuplicateTokenEx", func_DuplicateTokenEx }, { "HKEY_CLASSES_ROOT", func_HKEY_CLASSES_ROOT }, { "LockDatabase" , func_LockDatabase }, { "QueryServiceConfig2", func_QueryServiceConfig2 },

1 0

[jgardou] 64735: [NTOS/SE] - Use the authentication ID to determine if a token represents a child of the current process. CORE-8631 #resolve #comment the installer now works fine, but chrome fails ...
by jgardou＠svn.reactos.org 13 Oct '14

13 Oct '14

Author: jgardou Date: Mon Oct 13 18:47:44 2014 New Revision: 64735 URL: http://svn.reactos.org/svn/reactos?rev=64735&view=rev Log: [NTOS/SE] - Use the authentication ID to determine if a token represents a child of the current process. CORE-8631 #resolve #comment the installer now works fine, but chrome fails to start Modified: trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=64… ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] Mon Oct 13 18:47:44 2014 @@ -571,13 +571,13 @@ ProcessToken = PsReferencePrimaryToken(PsGetCurrentProcess()); /* Get the ID */ - ProcessLuid = ProcessToken->TokenId; + ProcessLuid = ProcessToken->AuthenticationId; /* Dereference the token */ ObFastDereferenceObject(&PsGetCurrentProcess()->Token, ProcessToken); /* Get our LUID */ - CallerLuid = Token->TokenId; + CallerLuid = Token->AuthenticationId; /* Compare the LUIDs */ if (RtlEqualLuid(&CallerLuid, &ProcessLuid)) *IsChild = TRUE;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs