Ros-diffs December 2013

ros-diffs@reactos.org

13 participants
308 discussions

[aandrejevic] 61269: [FAST486] The LDT can be loaded with a NULL descriptor. That invalidates the LDT but doesn't cause any exception.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sat Dec 14 02:30:42 2013 New Revision: 61269 URL: http://svn.reactos.org/svn/reactos?rev=61269&view=rev Log: [FAST486] The LDT can be loaded with a NULL descriptor. That invalidates the LDT but doesn't cause any exception. Modified: branches/ntvdm/lib/fast486/opgroups.c Modified: branches/ntvdm/lib/fast486/opgroups.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opgroups.c?re… ============================================================================== --- branches/ntvdm/lib/fast486/opgroups.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/opgroups.c [iso-8859-1] Sat Dec 14 02:30:42 2013 @@ -1798,8 +1798,8 @@ if (GET_SEGMENT_INDEX(Selector) == 0) { - Fast486Exception(State, FAST486_EXCEPTION_GP); - return FALSE; + RtlZeroMemory(&State->Ldtr, sizeof(State->Ldtr)); + return TRUE; } if (!GdtEntry.Present)

10 years, 9 months

[aandrejevic] 61268: [FAST486] Fix the emulation of the Local Descriptor Table.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sat Dec 14 02:13:01 2013 New Revision: 61268 URL: http://svn.reactos.org/svn/reactos?rev=61268&view=rev Log: [FAST486] Fix the emulation of the Local Descriptor Table. Modified: branches/ntvdm/include/reactos/libs/fast486/fast486.h branches/ntvdm/lib/fast486/common.inl branches/ntvdm/lib/fast486/opgroups.c Modified: branches/ntvdm/include/reactos/libs/fast486/fast486.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/libs/fast… ============================================================================== --- branches/ntvdm/include/reactos/libs/fast486/fast486.h [iso-8859-1] (original) +++ branches/ntvdm/include/reactos/libs/fast486/fast486.h [iso-8859-1] Sat Dec 14 02:13:01 2013 @@ -81,6 +81,7 @@ #define FAST486_IDT_INT_GATE_32 0xE #define FAST486_IDT_TRAP_GATE_32 0xF +#define FAST486_LDT_SIGNATURE 0x02 #define FAST486_TSS_SIGNATURE 0x09 #define FAST486_PREFIX_SEG (1 << 0) @@ -261,6 +262,13 @@ USHORT Selector; ULONG Base; ULONG Limit; +} FAST486_LDT_REG; + +typedef struct +{ + USHORT Selector; + ULONG Base; + ULONG Limit; BOOLEAN Busy; } FAST486_TASK_REG, *PFAST486_TASK_REG; @@ -302,10 +310,10 @@ ULONG Reserved : 2; ULONG Granularity : 1; ULONG BaseHigh : 8; -} FAST486_TSS_DESCRIPTOR, *PFAST486_TSS_DESCRIPTOR; +} FAST486_SYSTEM_DESCRIPTOR, *PFAST486_SYSTEM_DESCRIPTOR; /* Verify the structure size */ -C_ASSERT(sizeof(FAST486_TSS_DESCRIPTOR) == sizeof(ULONGLONG)); +C_ASSERT(sizeof(FAST486_SYSTEM_DESCRIPTOR) == sizeof(ULONGLONG)); typedef struct { @@ -467,7 +475,8 @@ FAST486_SEG_REG SegmentRegs[FAST486_NUM_SEG_REGS]; FAST486_REG InstPtr, SavedInstPtr; FAST486_FLAGS_REG Flags; - FAST486_TABLE_REG Gdtr, Idtr, Ldtr; + FAST486_TABLE_REG Gdtr, Idtr; + FAST486_LDT_REG Ldtr; FAST486_TASK_REG TaskReg; UCHAR Cpl; ULONG ControlRegisters[FAST486_NUM_CTRL_REGS]; Modified: branches/ntvdm/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/common.inl?re… ============================================================================== --- branches/ntvdm/lib/fast486/common.inl [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/common.inl [iso-8859-1] Sat Dec 14 02:13:01 2013 @@ -420,7 +420,7 @@ else { /* Make sure the LDT contains the entry */ - if (GET_SEGMENT_INDEX(Selector) >= (State->Ldtr.Size + 1)) + if (GET_SEGMENT_INDEX(Selector) >= (State->Ldtr.Limit + 1)) { Fast486ExceptionWithErrorCode(State, FAST486_EXCEPTION_GP, Selector); return FALSE; @@ -428,7 +428,7 @@ /* Read the LDT */ if (!Fast486ReadLinearMemory(State, - State->Ldtr.Address + State->Ldtr.Base + GET_SEGMENT_INDEX(Selector), &GdtEntry, sizeof(GdtEntry))) Modified: branches/ntvdm/lib/fast486/opgroups.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opgroups.c?re… ============================================================================== --- branches/ntvdm/lib/fast486/opgroups.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/opgroups.c [iso-8859-1] Sat Dec 14 02:13:01 2013 @@ -1702,10 +1702,8 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeGroup0F00) { - UCHAR TableReg[6]; FAST486_MOD_REG_RM ModRegRm; BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; - FAST486_SEG_REGS Segment = FAST486_REG_DS; NO_LOCK_PREFIX(); TOGGLE_ADSIZE(AddressSize); @@ -1716,36 +1714,23 @@ return FALSE; } - /* Check for the segment override */ - if (State->PrefixFlags & FAST486_PREFIX_SEG) - { - /* Use the override segment instead */ - Segment = State->SegmentOverride; - } - /* Check which operation this is */ switch (ModRegRm.Register) { /* SLDT */ case 0: { - if (!ModRegRm.Memory) - { - /* The second operand must be a memory location */ + /* Not recognized in real mode or virtual 8086 mode */ + if (!(State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PE) + || State->Flags.Vm) + { Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } - - /* Fill the 6-byte table register */ - RtlCopyMemory(TableReg, &State->Ldtr.Size, sizeof(USHORT)); - RtlCopyMemory(&TableReg[sizeof(USHORT)], &State->Ldtr.Address, sizeof(ULONG)); - - /* Store the LDTR */ - return Fast486WriteMemory(State, - Segment, - ModRegRm.MemoryAddress, - TableReg, - sizeof(TableReg)); + } + + return Fast486WriteModrmWordOperands(State, + &ModRegRm, + FALSE, + State->Ldtr.Selector); } /* STR */ @@ -1767,6 +1752,16 @@ /* LLDT */ case 2: { + USHORT Selector; + FAST486_SYSTEM_DESCRIPTOR GdtEntry; + + /* Not recognized in real mode or virtual 8086 mode */ + if (!(State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PE) + || State->Flags.Vm) + { + Fast486Exception(State, FAST486_EXCEPTION_UD); + } + /* This is a privileged instruction */ if (Fast486GetCurrentPrivLevel(State) != 0) { @@ -1774,28 +1769,57 @@ return FALSE; } - if (!ModRegRm.Memory) - { - /* The second operand must be a memory location */ - Fast486Exception(State, FAST486_EXCEPTION_UD); - return FALSE; - } - - /* Read the new LDTR */ - if (!Fast486ReadMemory(State, - Segment, - ModRegRm.MemoryAddress, - FALSE, - TableReg, - sizeof(TableReg))) - { - /* Exception occurred */ - return FALSE; - } - - /* Load the new LDT */ - State->Ldtr.Size = *((PUSHORT)TableReg); - State->Ldtr.Address = *((PULONG)&TableReg[sizeof(USHORT)]); + if (!Fast486ReadModrmWordOperands(State, + &ModRegRm, + NULL, + &Selector)) + { + /* Exception occurred */ + return FALSE; + } + + /* Make sure the GDT contains the entry */ + if (GET_SEGMENT_INDEX(Selector) >= (State->Gdtr.Size + 1)) + { + Fast486ExceptionWithErrorCode(State, FAST486_EXCEPTION_GP, Selector); + return FALSE; + } + + /* Read the GDT */ + if (!Fast486ReadLinearMemory(State, + State->Gdtr.Address + + GET_SEGMENT_INDEX(Selector), + &GdtEntry, + sizeof(GdtEntry))) + { + /* Exception occurred */ + return FALSE; + } + + if (GET_SEGMENT_INDEX(Selector) == 0) + { + Fast486Exception(State, FAST486_EXCEPTION_GP); + return FALSE; + } + + if (!GdtEntry.Present) + { + Fast486ExceptionWithErrorCode(State, FAST486_EXCEPTION_NP, Selector); + return FALSE; + } + + if (GdtEntry.Signature != FAST486_LDT_SIGNATURE) + { + /* This is not a LDT descriptor */ + Fast486ExceptionWithErrorCode(State, FAST486_EXCEPTION_GP, Selector); + return FALSE; + } + + /* Update the LDTR */ + State->Ldtr.Selector = Selector; + State->Ldtr.Base = GdtEntry.Base | (GdtEntry.BaseMid << 16) | (GdtEntry.BaseHigh << 24); + State->Ldtr.Limit = GdtEntry.Limit | (GdtEntry.LimitHigh << 16); + if (GdtEntry.Granularity) State->Ldtr.Limit <<= 12; return TRUE; } @@ -1804,7 +1828,7 @@ case 3: { USHORT Selector; - FAST486_TSS_DESCRIPTOR GdtEntry; + FAST486_SYSTEM_DESCRIPTOR GdtEntry; /* Not recognized in real mode or virtual 8086 mode */ if (!(State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PE) @@ -1930,7 +1954,7 @@ else { /* Make sure the LDT contains the entry */ - if (GET_SEGMENT_INDEX(Selector) >= (State->Ldtr.Size + 1)) + if (GET_SEGMENT_INDEX(Selector) >= (State->Ldtr.Limit + 1)) { /* Clear ZF */ State->Flags.Zf = FALSE; @@ -1939,7 +1963,7 @@ /* Read the LDT */ if (!Fast486ReadLinearMemory(State, - State->Ldtr.Address + State->Ldtr.Base + GET_SEGMENT_INDEX(Selector), &GdtEntry, sizeof(GdtEntry)))

10 years, 9 months

[hbelusca] 61267: [NTVDM]: VGA: Fix VGA_DAC_TO_COLOR macro (/me looks at [TheFlash]... :) )

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Dec 13 23:14:33 2013 New Revision: 61267 URL: http://svn.reactos.org/svn/reactos?rev=61267&view=rev Log: [NTVDM]: VGA: Fix VGA_DAC_TO_COLOR macro (/me looks at [TheFlash]... :) ) Modified: branches/ntvdm/subsystems/ntvdm/vga.h Modified: branches/ntvdm/subsystems/ntvdm/vga.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/vga.h?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/vga.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/vga.h [iso-8859-1] Fri Dec 13 23:14:33 2013 @@ -22,7 +22,7 @@ #define VGA_BITMAP_INFO_SIZE (sizeof(BITMAPINFOHEADER) + 2 * (VGA_PALETTE_SIZE / 3)) #define VGA_MINIMUM_WIDTH 400 #define VGA_MINIMUM_HEIGHT 300 -#define VGA_DAC_TO_COLOR(x) (((x) << 2) | ((x) >> 6)) +#define VGA_DAC_TO_COLOR(x) (((x) << 2) | ((x) >> 4)) #define VGA_COLOR_TO_DAC(x) ((x) >> 2)

10 years, 9 months

[dgorbachev] 61266: [CMAKE] Use -ffat-lto-objects option for LTCG builds. GCC 4.9 now defaults to slim LTO, which (owing to linker bug #13557) fails with undefined reference errors. [LWIP] Compile ...

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Fri Dec 13 17:50:57 2013 New Revision: 61266 URL: http://svn.reactos.org/svn/reactos?rev=61266&view=rev Log: [CMAKE] Use -ffat-lto-objects option for LTCG builds. GCC 4.9 now defaults to slim LTO, which (owing to linker bug #13557) fails with undefined reference errors. [LWIP] Compile with -fno-builtin-malloc -fno-builtin-free. GCC bug #56578. Modified: trunk/reactos/cmake/gcc.cmake trunk/reactos/lib/drivers/lwip/CMakeLists.txt Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=61266&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Fri Dec 13 17:50:57 2013 @@ -92,7 +92,7 @@ # Link-time code generation if(LTCG) - add_compile_flags("-flto -Wno-error=clobbered") + add_compile_flags("-flto -ffat-lto-objects") endif() if(ARCH STREQUAL "i386") Modified: trunk/reactos/lib/drivers/lwip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/CMakeList… ============================================================================== --- trunk/reactos/lib/drivers/lwip/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/CMakeLists.txt [iso-8859-1] Fri Dec 13 17:50:57 2013 @@ -60,4 +60,7 @@ add_dependencies(lwip bugcodes) if(NOT MSVC) allow_warnings(lwip) + if(LTCG) + add_compile_flags("-fno-builtin-malloc -fno-builtin-free") + endif() endif()

10 years, 9 months

[dgorbachev] 61265: [CMAKE][INCLUDE] - In DPRINT1(), ASSERT(), etc. - print relative (to REACTOS_SOURCE_DIR) paths to reduce debug log spam. - Unify GCC and MSVC versions of _WARN() macro.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Fri Dec 13 17:50:49 2013 New Revision: 61265 URL: http://svn.reactos.org/svn/reactos?rev=61265&view=rev Log: [CMAKE][INCLUDE] - In DPRINT1(), ASSERT(), etc. - print relative (to REACTOS_SOURCE_DIR) paths to reduce debug log spam. - Unify GCC and MSVC versions of _WARN() macro. Added: trunk/reactos/include/reactos/builddir.h.cmake (with props) Modified: trunk/reactos/include/reactos/debug.h trunk/reactos/include/reactos/version.cmake Added: trunk/reactos/include/reactos/builddir.h.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/builddir.h… ============================================================================== --- trunk/reactos/include/reactos/builddir.h.cmake (added) +++ trunk/reactos/include/reactos/builddir.h.cmake [iso-8859-1] Fri Dec 13 17:50:49 2013 @@ -0,0 +1,14 @@ +/* Do not edit - Machine generated */ + +#pragma once + +#define REACTOS_SOURCE_DIR "@REACTOS_SOURCE_DIR@" +#define REACTOS_BINARY_DIR "@REACTOS_BINARY_DIR@" + +#if defined(__GNUC__) && defined(__OPTIMIZE__) +#define __RELFILE__ \ + (!__builtin_strncmp(__FILE__, REACTOS_SOURCE_DIR, sizeof(REACTOS_SOURCE_DIR) - 1) \ + ? __FILE__ + sizeof(REACTOS_SOURCE_DIR) : __FILE__) +#endif + +/* EOF */ Propchange: trunk/reactos/include/reactos/builddir.h.cmake ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/reactos/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/debug.h?re… ============================================================================== --- trunk/reactos/include/reactos/debug.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/debug.h [iso-8859-1] Fri Dec 13 17:50:49 2013 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: include/internal/debug.h + * FILE: include/reactos/debug.h * PURPOSE: Useful debugging macros * PROGRAMMERS: David Welch (welch(a)mcmail.com) * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) @@ -12,8 +12,13 @@ * to disable debugging macros. */ -#ifndef __INTERNAL_DEBUG -#define __INTERNAL_DEBUG +#pragma once + +#include <builddir.h> + +#if !defined(__RELFILE__) +#define __RELFILE__ __FILE__ +#endif /* Define DbgPrint/DbgPrintEx/RtlAssert unless the NDK is used */ #if !defined(_RTLFUNCS_H) && !defined(_NTDDK_) @@ -63,7 +68,7 @@ #ifndef assert #if DBG && !defined(NASSERT) -#define assert(x) if (!(x)) { RtlAssert((PVOID)#x, (PVOID)__FILE__, __LINE__, ""); } +#define assert(x) if (!(x)) { RtlAssert((PVOID)#x, (PVOID)__RELFILE__, __LINE__, ""); } #else #define assert(x) ((VOID) 0) #endif @@ -71,7 +76,7 @@ #ifndef ASSERT #if DBG && !defined(NASSERT) -#define ASSERT(x) if (!(x)) { RtlAssert((PVOID)#x, (PVOID)__FILE__, __LINE__, ""); } +#define ASSERT(x) if (!(x)) { RtlAssert((PVOID)#x, (PVOID)__RELFILE__, __LINE__, ""); } #else #define ASSERT(x) ((VOID) 0) #endif @@ -79,14 +84,14 @@ #ifndef ASSERTMSG #if DBG && !defined(NASSERT) -#define ASSERTMSG(m, x) if (!(x)) { RtlAssert((PVOID)#x, __FILE__, __LINE__, m); } +#define ASSERTMSG(m, x) if (!(x)) { RtlAssert((PVOID)#x, __RELFILE__, __LINE__, m); } #else #define ASSERTMSG(m, x) ((VOID) 0) #endif #endif /* For internal purposes only */ -#define __NOTICE(level, fmt, ...) DbgPrint(#level ": %s at %s:%d " fmt, __FUNCTION__, __FILE__, __LINE__, ##__VA_ARGS__) +#define __NOTICE(level, fmt, ...) DbgPrint(#level ": %s at %s:%d " fmt, __FUNCTION__, __RELFILE__, __LINE__, ##__VA_ARGS__) /* Print stuff only on Debug Builds*/ #define DPFLTR_DEFAULT_ID -1 @@ -94,16 +99,16 @@ /* These are always printed */ #define DPRINT1(fmt, ...) do { \ - if (DbgPrint("(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__)) \ - DbgPrint("(%s:%d) DbgPrint() failed!\n", __FILE__, __LINE__); \ + if (DbgPrint("(%s:%d) " fmt, __RELFILE__, __LINE__, ##__VA_ARGS__)) \ + DbgPrint("(%s:%d) DbgPrint() failed!\n", __RELFILE__, __LINE__); \ } while (0) /* These are printed only if NDEBUG is NOT defined */ #ifndef NDEBUG #define DPRINT(fmt, ...) do { \ - if (DbgPrint("(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__)) \ - DbgPrint("(%s:%d) DbgPrint() failed!\n", __FILE__, __LINE__); \ + if (DbgPrint("(%s:%d) " fmt, __RELFILE__, __LINE__, ##__VA_ARGS__)) \ + DbgPrint("(%s:%d) DbgPrint() failed!\n", __RELFILE__, __LINE__); \ } while (0) #else @@ -114,15 +119,15 @@ #define UNIMPLEMENTED __NOTICE(WARNING, "is UNIMPLEMENTED!\n"); - #define ERR_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_ERROR_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) - #define WARN_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_WARNING_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) - #define TRACE_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_TRACE_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) - #define INFO_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_INFO_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) - - #define ERR__(ch, fmt, ...) DbgPrintEx(ch, DPFLTR_ERROR_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) - #define WARN__(ch, fmt, ...) DbgPrintEx(ch, DPFLTR_WARNING_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) - #define TRACE__(ch, fmt, ...) DbgPrintEx(ch, DPFLTR_TRACE_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) - #define INFO__(ch, fmt, ...) DbgPrintEx(ch, DPFLTR_INFO_LEVEL, "(%s:%d) " fmt, __FILE__, __LINE__, ##__VA_ARGS__) + #define ERR_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_ERROR_LEVEL, "(%s:%d) " fmt, __RELFILE__, __LINE__, ##__VA_ARGS__) + #define WARN_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_WARNING_LEVEL, "(%s:%d) " fmt, __RELFILE__, __LINE__, ##__VA_ARGS__) + #define TRACE_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_TRACE_LEVEL, "(%s:%d) " fmt, __RELFILE__, __LINE__, ##__VA_ARGS__) + #define INFO_(ch, fmt, ...) DbgPrintEx(DPFLTR_##ch##_ID, DPFLTR_INFO_LEVEL, "(%s:%d) " fmt, __RELFILE__, __LINE__, ##__VA_ARGS__) + + #define ERR__(ch, fmt, ...) DbgPrintEx(ch, DPFLTR_ERROR_LEVEL, "(%s:%d) " fmt, __RELFILE__, __LINE__, ##__VA_ARGS__) + #define WARN__(ch, fmt, ...) DbgPrintEx(ch, DPFLTR_WARNING_LEVEL, "(%s:%d) " fmt, __RELFILE__, __LINE__, ##__VA_ARGS__) + #define TRACE__(ch, fmt, ...) DbgPrintEx(ch, DPFLTR_TRACE_LEVEL, "(%s:%d) " fmt, __RELFILE__, __LINE__, ##__VA_ARGS__) + #define INFO__(ch, fmt, ...) DbgPrintEx(ch, DPFLTR_INFO_LEVEL, "(%s:%d) " fmt, __RELFILE__, __LINE__, ##__VA_ARGS__) #else /* not DBG */ @@ -234,14 +239,10 @@ #define __STRING__(x) __STRING2__(x) #define __STRLINE__ __STRING__(__LINE__) -#define __TOKENPASTE2__(x, y) x ## y -#define __TOKENPASTE__(x, y) __TOKENPASTE2__(x, y) - -#ifdef _MSC_VER +#if !defined(_MSC_VER) && !defined(__pragma) +#define __pragma(x) _Pragma(#x) +#endif + #define _WARN(msg) __pragma(message("WARNING! Line " __STRLINE__ ": " msg)) -#else -#define _WARN1(_func1, _func2, _msg) void __attribute__((warning (_msg))) _func1(void); void __attribute__((used)) _func2(void) { _func1(); } -#define _WARN(_msg) _WARN1(__TOKENPASTE__(__warn_func1__, __LINE__), __TOKENPASTE__(__warn_func2__, __LINE__), _msg) -#endif - -#endif /* __INTERNAL_DEBUG */ + +/* EOF */ Modified: trunk/reactos/include/reactos/version.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/version.cm… ============================================================================== --- trunk/reactos/include/reactos/version.cmake [iso-8859-1] (original) +++ trunk/reactos/include/reactos/version.cmake [iso-8859-1] Fri Dec 13 17:50:49 2013 @@ -65,3 +65,4 @@ configure_file(include/reactos/version.h.cmake ${REACTOS_BINARY_DIR}/include/reactos/version.h) configure_file(include/reactos/buildno.h.cmake ${REACTOS_BINARY_DIR}/include/reactos/buildno.h) +configure_file(include/reactos/builddir.h.cmake ${REACTOS_BINARY_DIR}/include/reactos/builddir.h)

10 years, 9 months

[aandrejevic] 61264: [FAST486] Implement the extended opcode group 0x0F, 0x00 (SLDT, STR, LLDT, LTR, VERR, VERW).

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Fri Dec 13 03:32:41 2013 New Revision: 61264 URL: http://svn.reactos.org/svn/reactos?rev=61264&view=rev Log: [FAST486] Implement the extended opcode group 0x0F, 0x00 (SLDT, STR, LLDT, LTR, VERR, VERW). Modified: branches/ntvdm/include/reactos/libs/fast486/fast486.h branches/ntvdm/lib/fast486/common.c branches/ntvdm/lib/fast486/extraops.c branches/ntvdm/lib/fast486/opgroups.c branches/ntvdm/lib/fast486/opgroups.h Modified: branches/ntvdm/include/reactos/libs/fast486/fast486.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/libs/fast… ============================================================================== --- branches/ntvdm/include/reactos/libs/fast486/fast486.h [iso-8859-1] (original) +++ branches/ntvdm/include/reactos/libs/fast486/fast486.h [iso-8859-1] Fri Dec 13 03:32:41 2013 @@ -81,6 +81,8 @@ #define FAST486_IDT_INT_GATE_32 0xE #define FAST486_IDT_TRAP_GATE_32 0xF +#define FAST486_TSS_SIGNATURE 0x09 + #define FAST486_PREFIX_SEG (1 << 0) #define FAST486_PREFIX_OPSIZE (1 << 1) #define FAST486_PREFIX_ADSIZE (1 << 2) @@ -254,6 +256,14 @@ ULONG Base; } FAST486_SEG_REG, *PFAST486_SEG_REG; +typedef struct +{ + USHORT Selector; + ULONG Base; + ULONG Limit; + BOOLEAN Busy; +} FAST486_TASK_REG, *PFAST486_TASK_REG; + #pragma pack(push, 1) typedef struct @@ -278,6 +288,24 @@ /* Verify the structure size */ C_ASSERT(sizeof(FAST486_GDT_ENTRY) == sizeof(ULONGLONG)); + +typedef struct +{ + ULONG Limit : 16; + ULONG Base : 16; + ULONG BaseMid : 8; + ULONG Signature : 5; + ULONG Dpl : 2; + ULONG Present : 1; + ULONG LimitHigh : 4; + ULONG Avl : 1; + ULONG Reserved : 2; + ULONG Granularity : 1; + ULONG BaseHigh : 8; +} FAST486_TSS_DESCRIPTOR, *PFAST486_TSS_DESCRIPTOR; + +/* Verify the structure size */ +C_ASSERT(sizeof(FAST486_TSS_DESCRIPTOR) == sizeof(ULONGLONG)); typedef struct { @@ -439,7 +467,8 @@ FAST486_SEG_REG SegmentRegs[FAST486_NUM_SEG_REGS]; FAST486_REG InstPtr, SavedInstPtr; FAST486_FLAGS_REG Flags; - FAST486_TABLE_REG Gdtr, Idtr, Ldtr, Tss; + FAST486_TABLE_REG Gdtr, Idtr, Ldtr; + FAST486_TASK_REG TaskReg; UCHAR Cpl; ULONG ControlRegisters[FAST486_NUM_CTRL_REGS]; ULONG DebugRegisters[FAST486_NUM_DBG_REGS]; Modified: branches/ntvdm/lib/fast486/common.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/common.c?rev=… ============================================================================== --- branches/ntvdm/lib/fast486/common.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/common.c [iso-8859-1] Fri Dec 13 03:32:41 2013 @@ -178,7 +178,7 @@ { /* Read the TSS */ if (!Fast486ReadLinearMemory(State, - State->Tss.Address, + State->TaskReg.Base, &Tss, sizeof(Tss))) { Modified: branches/ntvdm/lib/fast486/extraops.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/extraops.c?re… ============================================================================== --- branches/ntvdm/lib/fast486/extraops.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/extraops.c [iso-8859-1] Fri Dec 13 03:32:41 2013 @@ -37,7 +37,7 @@ FAST486_OPCODE_HANDLER_PROC Fast486ExtendedHandlers[FAST486_NUM_OPCODE_HANDLERS] = { - NULL, // TODO: OPCODE 0x00 NOT IMPLEMENTED + Fast486OpcodeGroup0F00, Fast486OpcodeGroup0F01, NULL, // TODO: OPCODE 0x02 NOT IMPLEMENTED NULL, // TODO: OPCODE 0x03 NOT IMPLEMENTED Modified: branches/ntvdm/lib/fast486/opgroups.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opgroups.c?re… ============================================================================== --- branches/ntvdm/lib/fast486/opgroups.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/opgroups.c [iso-8859-1] Fri Dec 13 03:32:41 2013 @@ -1700,6 +1700,288 @@ return TRUE; } +FAST486_OPCODE_HANDLER(Fast486OpcodeGroup0F00) +{ + UCHAR TableReg[6]; + FAST486_MOD_REG_RM ModRegRm; + BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; + FAST486_SEG_REGS Segment = FAST486_REG_DS; + + NO_LOCK_PREFIX(); + TOGGLE_ADSIZE(AddressSize); + + if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + /* Check for the segment override */ + if (State->PrefixFlags & FAST486_PREFIX_SEG) + { + /* Use the override segment instead */ + Segment = State->SegmentOverride; + } + + /* Check which operation this is */ + switch (ModRegRm.Register) + { + /* SLDT */ + case 0: + { + if (!ModRegRm.Memory) + { + /* The second operand must be a memory location */ + Fast486Exception(State, FAST486_EXCEPTION_UD); + return FALSE; + } + + /* Fill the 6-byte table register */ + RtlCopyMemory(TableReg, &State->Ldtr.Size, sizeof(USHORT)); + RtlCopyMemory(&TableReg[sizeof(USHORT)], &State->Ldtr.Address, sizeof(ULONG)); + + /* Store the LDTR */ + return Fast486WriteMemory(State, + Segment, + ModRegRm.MemoryAddress, + TableReg, + sizeof(TableReg)); + } + + /* STR */ + case 1: + { + /* Not recognized in real mode or virtual 8086 mode */ + if (!(State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PE) + || State->Flags.Vm) + { + Fast486Exception(State, FAST486_EXCEPTION_UD); + } + + return Fast486WriteModrmWordOperands(State, + &ModRegRm, + FALSE, + State->TaskReg.Selector); + } + + /* LLDT */ + case 2: + { + /* This is a privileged instruction */ + if (Fast486GetCurrentPrivLevel(State) != 0) + { + Fast486Exception(State, FAST486_EXCEPTION_GP); + return FALSE; + } + + if (!ModRegRm.Memory) + { + /* The second operand must be a memory location */ + Fast486Exception(State, FAST486_EXCEPTION_UD); + return FALSE; + } + + /* Read the new LDTR */ + if (!Fast486ReadMemory(State, + Segment, + ModRegRm.MemoryAddress, + FALSE, + TableReg, + sizeof(TableReg))) + { + /* Exception occurred */ + return FALSE; + } + + /* Load the new LDT */ + State->Ldtr.Size = *((PUSHORT)TableReg); + State->Ldtr.Address = *((PULONG)&TableReg[sizeof(USHORT)]); + + return TRUE; + } + + /* LTR */ + case 3: + { + USHORT Selector; + FAST486_TSS_DESCRIPTOR GdtEntry; + + /* Not recognized in real mode or virtual 8086 mode */ + if (!(State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PE) + || State->Flags.Vm) + { + Fast486Exception(State, FAST486_EXCEPTION_UD); + } + + /* This is a privileged instruction */ + if (Fast486GetCurrentPrivLevel(State) != 0) + { + Fast486Exception(State, FAST486_EXCEPTION_GP); + return FALSE; + } + + if (!Fast486ReadModrmWordOperands(State, + &ModRegRm, + NULL, + &Selector)) + { + /* Exception occurred */ + return FALSE; + } + + /* Make sure the GDT contains the entry */ + if (GET_SEGMENT_INDEX(Selector) >= (State->Gdtr.Size + 1)) + { + Fast486ExceptionWithErrorCode(State, FAST486_EXCEPTION_GP, Selector); + return FALSE; + } + + /* Read the GDT */ + if (!Fast486ReadLinearMemory(State, + State->Gdtr.Address + + GET_SEGMENT_INDEX(Selector), + &GdtEntry, + sizeof(GdtEntry))) + { + /* Exception occurred */ + return FALSE; + } + + if (GET_SEGMENT_INDEX(Selector) == 0) + { + Fast486Exception(State, FAST486_EXCEPTION_GP); + return FALSE; + } + + if (!GdtEntry.Present) + { + Fast486ExceptionWithErrorCode(State, FAST486_EXCEPTION_NP, Selector); + return FALSE; + } + + if (GdtEntry.Signature != FAST486_TSS_SIGNATURE) + { + /* This is not a TSS descriptor */ + Fast486ExceptionWithErrorCode(State, FAST486_EXCEPTION_GP, Selector); + return FALSE; + } + + /* Update the TR */ + State->TaskReg.Selector = Selector; + State->TaskReg.Base = GdtEntry.Base | (GdtEntry.BaseMid << 16) | (GdtEntry.BaseHigh << 24); + State->TaskReg.Limit = GdtEntry.Limit | (GdtEntry.LimitHigh << 16); + if (GdtEntry.Granularity) State->TaskReg.Limit <<= 12; + State->TaskReg.Busy = TRUE; + + return TRUE; + } + + /* VERR/VERW */ + case 4: + case 5: + { + USHORT Selector; + FAST486_GDT_ENTRY GdtEntry; + + /* Not recognized in real mode or virtual 8086 mode */ + if (!(State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PE) + || State->Flags.Vm) + { + Fast486Exception(State, FAST486_EXCEPTION_UD); + } + + /* This is a privileged instruction */ + if (Fast486GetCurrentPrivLevel(State) != 0) + { + Fast486Exception(State, FAST486_EXCEPTION_GP); + return FALSE; + } + + if (!Fast486ReadModrmWordOperands(State, + &ModRegRm, + NULL, + &Selector)) + { + /* Exception occurred */ + return FALSE; + } + + if (!(Selector & SEGMENT_TABLE_INDICATOR)) + { + /* Make sure the GDT contains the entry */ + if (GET_SEGMENT_INDEX(Selector) >= (State->Gdtr.Size + 1)) + { + /* Clear ZF */ + State->Flags.Zf = FALSE; + return TRUE; + } + + /* Read the GDT */ + if (!Fast486ReadLinearMemory(State, + State->Gdtr.Address + + GET_SEGMENT_INDEX(Selector), + &GdtEntry, + sizeof(GdtEntry))) + { + /* Exception occurred */ + return FALSE; + } + } + else + { + /* Make sure the LDT contains the entry */ + if (GET_SEGMENT_INDEX(Selector) >= (State->Ldtr.Size + 1)) + { + /* Clear ZF */ + State->Flags.Zf = FALSE; + return TRUE; + } + + /* Read the LDT */ + if (!Fast486ReadLinearMemory(State, + State->Ldtr.Address + + GET_SEGMENT_INDEX(Selector), + &GdtEntry, + sizeof(GdtEntry))) + { + /* Exception occurred */ + return FALSE; + } + } + + /* Set ZF if it is valid and accessible */ + State->Flags.Zf = GdtEntry.Present // must be present + && GdtEntry.SystemType // must be a segment + && (((ModRegRm.Register == 4) + /* code segments are only readable if the RW bit is set */ + && (!GdtEntry.Executable || GdtEntry.ReadWrite)) + || ((ModRegRm.Register == 5) + /* code segments are never writable, data segments are writable when RW is set */ + && (!GdtEntry.Executable && GdtEntry.ReadWrite))) + /* + * for segments other than conforming code segments, + * both RPL and CPL must be less than or equal to DPL + */ + && ((!GdtEntry.Executable || !GdtEntry.DirConf) + && ((GET_SEGMENT_RPL(Selector) <= GdtEntry.Dpl) + && (Fast486GetCurrentPrivLevel(State) <= GdtEntry.Dpl))) + /* for conforming code segments, DPL must be less than or equal to CPL */ + && ((GdtEntry.Executable && GdtEntry.DirConf) + && (GdtEntry.Dpl <= Fast486GetCurrentPrivLevel(State))); + + + return TRUE; + } + + /* Invalid */ + default: + { + Fast486Exception(State, FAST486_EXCEPTION_UD); + return FALSE; + } + } +} + FAST486_OPCODE_HANDLER(Fast486OpcodeGroup0F01) { UCHAR TableReg[6]; Modified: branches/ntvdm/lib/fast486/opgroups.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opgroups.h?re… ============================================================================== --- branches/ntvdm/lib/fast486/opgroups.h [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/opgroups.h [iso-8859-1] Fri Dec 13 03:32:41 2013 @@ -42,6 +42,7 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeGroupF7); FAST486_OPCODE_HANDLER(Fast486OpcodeGroupFE); FAST486_OPCODE_HANDLER(Fast486OpcodeGroupFF); +FAST486_OPCODE_HANDLER(Fast486OpcodeGroup0F00); FAST486_OPCODE_HANDLER(Fast486OpcodeGroup0F01); FAST486_OPCODE_HANDLER(Fast486OpcodeGroup0FB9); FAST486_OPCODE_HANDLER(Fast486OpcodeGroup0FBA);

10 years, 9 months

[hbelusca] 61263: [NTVDM] - Add/fix few comments; - Don't forget to redisable access to AC registers after modifying them in int 10h. Usurp, please retest Rescue Rover 2 :) - Make EmulatorGet/Set/C...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Dec 12 20:09:24 2013 New Revision: 61263 URL: http://svn.reactos.org/svn/reactos?rev=61263&view=rev Log: [NTVDM] - Add/fix few comments; - Don't forget to redisable access to AC registers after modifying them in int 10h. Usurp, please retest Rescue Rover 2 :) - Make EmulatorGet/Set/ClearFlag internal functions only and use set/get<FLAG> instead. Modified: branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/emulator.c branches/ntvdm/subsystems/ntvdm/registers.c branches/ntvdm/subsystems/ntvdm/registers.h Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Thu Dec 12 20:09:24 2013 @@ -260,7 +260,7 @@ &VideoMode_40x25_text, /* Mode 01h */ // 16 color &VideoMode_80x25_text, /* Mode 02h */ // 16 color (mono) &VideoMode_80x25_text, /* Mode 03h */ // 16 color - &VideoMode_320x200_4color, /* Mode 04h */ + &VideoMode_320x200_4color, /* Mode 04h */ // 4 color &VideoMode_320x200_4color, /* Mode 05h */ // same (m) &VideoMode_640x200_2color, /* Mode 06h */ // 640*200 2 color NULL, /* Mode 07h */ // MDA monochrome text 80*25 @@ -274,8 +274,8 @@ NULL, /* Mode 0Fh */ // EGA 640*350 mono &VideoMode_640x350_16color, /* Mode 10h */ // EGA 640*350 16 color &VideoMode_640x480_2color, /* Mode 11h */ // VGA 640*480 mono - &VideoMode_640x480_16color, /* Mode 12h */ - &VideoMode_320x200_256color, /* Mode 13h */ + &VideoMode_640x480_16color, /* Mode 12h */ // VGA + &VideoMode_320x200_256color, /* Mode 13h */ // VGA }; /* PRIVATE FUNCTIONS **********************************************************/ @@ -385,7 +385,7 @@ if (Registers == NULL) return FALSE; - /* Clear interrupts */ + /* Disable interrupts */ setIF(0); /* @@ -453,7 +453,7 @@ VgaReadPort(VGA_INSTAT1_READ); // Put the AC register into index state VgaWritePort(VGA_AC_INDEX, 0x20); - /* Set interrupts */ + /* Enable interrupts */ setIF(1); return TRUE; @@ -702,7 +702,7 @@ else { /* No key available. Set the handler CF to repeat the BOP */ - EmulatorSetFlag(EMULATOR_FLAG_CF); + setCF(1); // CharacterData = 0xFFFF; } @@ -1079,6 +1079,9 @@ /* Write the data */ VgaWritePort(VGA_AC_WRITE, getBH()); + /* Enable screen and disable palette access */ + VgaReadPort(VGA_INSTAT1_READ); // Put the AC register into index state + VgaWritePort(VGA_AC_INDEX, 0x20); break; } @@ -1092,6 +1095,9 @@ /* Write the data */ VgaWritePort(VGA_AC_WRITE, getBH()); + /* Enable screen and disable palette access */ + VgaReadPort(VGA_INSTAT1_READ); // Put the AC register into index state + VgaWritePort(VGA_AC_INDEX, 0x20); break; } @@ -1116,6 +1122,9 @@ VgaWritePort(VGA_AC_INDEX, VGA_AC_OVERSCAN_REG); VgaWritePort(VGA_AC_WRITE, Buffer[VGA_AC_PAL_F_REG + 1]); + /* Enable screen and disable palette access */ + VgaReadPort(VGA_INSTAT1_READ); // Put the AC register into index state + VgaWritePort(VGA_AC_INDEX, 0x20); break; } @@ -1129,6 +1138,9 @@ /* Read the data */ setBH(VgaReadPort(VGA_AC_READ)); + /* Enable screen and disable palette access */ + VgaReadPort(VGA_INSTAT1_READ); // Put the AC register into index state + VgaWritePort(VGA_AC_INDEX, 0x20); break; } @@ -1142,6 +1154,9 @@ /* Read the data */ setBH(VgaReadPort(VGA_AC_READ)); + /* Enable screen and disable palette access */ + VgaReadPort(VGA_INSTAT1_READ); // Put the AC register into index state + VgaWritePort(VGA_AC_INDEX, 0x20); break; } @@ -1166,6 +1181,9 @@ VgaWritePort(VGA_AC_INDEX, VGA_AC_OVERSCAN_REG); Buffer[VGA_AC_PAL_F_REG + 1] = VgaReadPort(VGA_AC_READ); + /* Enable screen and disable palette access */ + VgaReadPort(VGA_INSTAT1_READ); // Put the AC register into index state + VgaWritePort(VGA_AC_INDEX, 0x20); break; } Modified: branches/ntvdm/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] Thu Dec 12 20:09:24 2013 @@ -111,7 +111,7 @@ NULL /* TODO: Use a TLB */); /* Enable interrupts */ - EmulatorSetFlag(EMULATOR_FLAG_IF); + setIF(1); return TRUE; } Modified: branches/ntvdm/subsystems/ntvdm/registers.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/register… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/registers.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/registers.c [iso-8859-1] Thu Dec 12 20:09:24 2013 @@ -15,17 +15,17 @@ /* PUBLIC FUNCTIONS ***********************************************************/ -BOOLEAN EmulatorGetFlag(ULONG Flag) +static inline BOOLEAN EmulatorGetFlag(ULONG Flag) { return (EmulatorContext.Flags.Long & Flag) ? TRUE : FALSE; } -VOID EmulatorSetFlag(ULONG Flag) +static inline VOID EmulatorSetFlag(ULONG Flag) { EmulatorContext.Flags.Long |= Flag; } -VOID EmulatorClearFlag(ULONG Flag) +static inline VOID EmulatorClearFlag(ULONG Flag) { EmulatorContext.Flags.Long &= ~Flag; } Modified: branches/ntvdm/subsystems/ntvdm/registers.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/register… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/registers.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/registers.h [iso-8859-1] Thu Dec 12 20:09:24 2013 @@ -11,9 +11,6 @@ /* INCLUDES *******************************************************************/ -BOOLEAN EmulatorGetFlag(ULONG Flag); -VOID EmulatorSetFlag(ULONG Flag); -VOID EmulatorClearFlag(ULONG Flag); VOID EmulatorSetStack(WORD Segment, DWORD Offset);

10 years, 9 months

[dgorbachev] 61262: Update FreeLdr linker script file. Remove unused files.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Thu Dec 12 16:52:49 2013 New Revision: 61262 URL: http://svn.reactos.org/svn/reactos?rev=61262&view=rev Log: Update FreeLdr linker script file. Remove unused files. Removed: trunk/reactos/boot/freeldr/freeldr/freeldr_amd64.lds trunk/reactos/boot/freeldr/freeldr/freeldr_arm.lds trunk/reactos/global.lds trunk/reactos/ntoskrnl/ntoskrnl_amd64.lds trunk/reactos/ntoskrnl/ntoskrnl_arm.lds trunk/reactos/ntoskrnl/ntoskrnl_i386.lds trunk/reactos/ntoskrnl/ntoskrnl_powerpc.lds Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_i386.lds Removed: trunk/reactos/boot/freeldr/freeldr/freeldr_amd64.lds URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_amd64.lds [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_amd64.lds (removed) @@ -1,57 +0,0 @@ -OUTPUT_FORMAT(pei-x86-64) -ENTRY(_mainCRTStartup) -SECTIONS -{ - .text __image_base__ + __section_alignment__ : - { - __text_start__ = .; - *(.init) - *(.text) - *(SORT(.text$*)) - *(.glue_7t) - *(.glue_7) - ___CTOR_LIST__ = .; __CTOR_LIST__ = . ; - LONG (-1); *(.ctors); *(.ctor); LONG (0); - ___DTOR_LIST__ = .; __DTOR_LIST__ = . ; - LONG (-1); *(.dtors); *(.dtor); LONG (0); - *(.fini) - /* ??? Why is .gcc_exc here? */ - *(.gcc_exc) - __text_end__ = .; - *(.gcc_except_table) - } - init BLOCK(__section_alignment__) : - { - __init_start__ = . ; - *(init) - __init_end__ = . ; - } - .data BLOCK(__section_alignment__) : - { - __data_start__ = . ; - *(.data) - *(.data2) - *(SORT(.data$*)) - __data_end__ = . ; - __bss_start__ = . ; - *(.bss) - *(COMMON) - __bss_end__ = . ; - } - .rdata BLOCK(__section_alignment__) : - { - *(.rdata) - *(SORT(.rdata$*)) - *(.eh_frame) - } - .stab BLOCK(__section_alignment__) (NOLOAD) : - { - [ .stab ] - } - .stabstr BLOCK(__section_alignment__) (NOLOAD) : - { - [ .stabstr ] - } - -} - Removed: trunk/reactos/boot/freeldr/freeldr/freeldr_arm.lds URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_arm.lds [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_arm.lds (removed) @@ -1,54 +0,0 @@ -OUTPUT_FORMAT(pei-arm-wince-little) -SECTIONS -{ - .text __image_base__ + __section_alignment__ : - { - __text_start__ = .; - *(.init) - *(.text) - *(SORT(.text$*)) - *(.glue_7t) - *(.glue_7) - ___CTOR_LIST__ = .; __CTOR_LIST__ = . ; - LONG (-1); *(.ctors); *(.ctor); LONG (0); - ___DTOR_LIST__ = .; __DTOR_LIST__ = . ; - LONG (-1); *(.dtors); *(.dtor); LONG (0); - *(.fini) - /* ??? Why is .gcc_exc here? */ - *(.gcc_exc) - __text_end__ = .; - *(.gcc_except_table) - } - init BLOCK(__section_alignment__) : - { - __init_start__ = . ; - *(init) - __init_end__ = . ; - } - .data BLOCK(__section_alignment__) : - { - __data_start__ = . ; - *(.data) - *(.data2) - *(SORT(.data$*)) - __data_end__ = . ; - __bss_start__ = . ; - *(.bss) - *(COMMON) - __bss_end__ = . ; - } - .rdata BLOCK(__section_alignment__) : - { - *(.rdata) - *(SORT(.rdata$*)) - *(.eh_frame) - } - /DISCARD/ : - { - [ .stab ] - [ .stabstr ] - *(.reloc) - } - -} - Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_i386.lds URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_i386.lds [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_i386.lds [iso-8859-1] Thu Dec 12 16:52:49 2013 @@ -23,15 +23,6 @@ __bss_end__ = . ; } - .stab BLOCK(__section_alignment__) (NOLOAD) : - { - *(.stab) - } - .stabstr BLOCK(__section_alignment__) (NOLOAD) : - { - *(.stabstr) - } - /* DWARF debug sections. Symbols in the DWARF debugging sections are relative to the beginning of the section. Unlike other targets that fake this by putting the @@ -41,73 +32,141 @@ { *(.debug_aranges) } + .zdebug_aranges BLOCK(__section_alignment__) (NOLOAD) : + { + *(.zdebug_aranges) + } .debug_pubnames BLOCK(__section_alignment__) (NOLOAD) : { *(.debug_pubnames) } + .zdebug_pubnames BLOCK(__section_alignment__) (NOLOAD) : + { + *(.zdebug_pubnames) + } .debug_pubtypes BLOCK(__section_alignment__) (NOLOAD) : { *(.debug_pubtypes) + } + .zdebug_pubtypes BLOCK(__section_alignment__) (NOLOAD) : + { + *(.zdebug_pubtypes) } /* DWARF 2. */ .debug_info BLOCK(__section_alignment__) (NOLOAD) : { *(.debug_info .gnu.linkonce.wi.*) } + .zdebug_info BLOCK(__section_alignment__) (NOLOAD) : + { + *(.zdebug_info .zdebug.gnu.linkonce.wi.*) + } .debug_abbrev BLOCK(__section_alignment__) (NOLOAD) : { *(.debug_abbrev) + } + .zdebug_abbrev BLOCK(__section_alignment__) (NOLOAD) : + { + *(.zdebug_abbrev) } .debug_line BLOCK(__section_alignment__) (NOLOAD) : { *(.debug_line) } + .zdebug_line BLOCK(__section_alignment__) (NOLOAD) : + { + *(.zdebug_line) + } .debug_frame BLOCK(__section_alignment__) (NOLOAD) : { *(.debug_frame*) + } + .zdebug_frame BLOCK(__section_alignment__) (NOLOAD) : + { + *(.zdebug_frame*) } .debug_str BLOCK(__section_alignment__) (NOLOAD) : { *(.debug_str) } + .zdebug_str BLOCK(__section_alignment__) (NOLOAD) : + { + *(.zdebug_str) + } .debug_loc BLOCK(__section_alignment__) (NOLOAD) : { *(.debug_loc) } + .zdebug_loc BLOCK(__section_alignment__) (NOLOAD) : + { + *(.zdebug_loc) + } .debug_macinfo BLOCK(__section_alignment__) (NOLOAD) : { *(.debug_macinfo) + } + .zdebug_macinfo BLOCK(__section_alignment__) (NOLOAD) : + { + *(.zdebug_macinfo) } /* SGI/MIPS DWARF 2 extensions. */ .debug_weaknames BLOCK(__section_alignment__) (NOLOAD) : { *(.debug_weaknames) } + .zdebug_weaknames BLOCK(__section_alignment__) (NOLOAD) : + { + *(.zdebug_weaknames) + } .debug_funcnames BLOCK(__section_alignment__) (NOLOAD) : { *(.debug_funcnames) + } + .zdebug_funcnames BLOCK(__section_alignment__) (NOLOAD) : + { + *(.zdebug_funcnames) } .debug_typenames BLOCK(__section_alignment__) (NOLOAD) : { *(.debug_typenames) } + .zdebug_typenames BLOCK(__section_alignment__) (NOLOAD) : + { + *(.zdebug_typenames) + } .debug_varnames BLOCK(__section_alignment__) (NOLOAD) : { *(.debug_varnames) } + .zdebug_varnames BLOCK(__section_alignment__) (NOLOAD) : + { + *(.zdebug_varnames) + } .debug_macro BLOCK(__section_alignment__) (NOLOAD) : { *(.debug_macro) + } + .zdebug_macro BLOCK(__section_alignment__) (NOLOAD) : + { + *(.zdebug_macro) } /* DWARF 3. */ .debug_ranges BLOCK(__section_alignment__) (NOLOAD) : { *(.debug_ranges) } + .zdebug_ranges BLOCK(__section_alignment__) (NOLOAD) : + { + *(.zdebug_ranges) + } /* DWARF 4. */ .debug_types BLOCK(__section_alignment__) (NOLOAD) : { *(.debug_types .gnu.linkonce.wt.*) + } + .zdebug_types BLOCK(__section_alignment__) (NOLOAD) : + { + *(.zdebug_types .gnu.linkonce.wt.*) } /DISCARD/ : Removed: trunk/reactos/global.lds URL: http://svn.reactos.org/svn/reactos/trunk/reactos/global.lds?rev=61261 ============================================================================== --- trunk/reactos/global.lds [iso-8859-1] (original) +++ trunk/reactos/global.lds (removed) @@ -1,103 +0,0 @@ -OUTPUT_FORMAT(pei-i386) -SECTIONS -{ - .text __image_base__ + __section_alignment__ : - { - __text_start__ = .; - *(.init) - *(.text) - *(SORT(.text$*)) - *(.glue_7t) - *(.glue_7) - *(.jcr) - ___CTOR_LIST__ = .; __CTOR_LIST__ = . ; - LONG (-1);*(.ctors); *(.ctor); *(SORT(.ctors.*)); LONG (0); - ___DTOR_LIST__ = .; __DTOR_LIST__ = . ; - LONG (-1);*(.dtors); *(.dtor); *(SORT(.dtors.*)); LONG (0); - *(.fini) - *(.gcc_exc) - __text_end__ = .; - *(.gcc_except_table) - } - init BLOCK(__section_alignment__) : - { - __init_start__ = . ; - *(init) - __init_end__ = . ; - } - .data BLOCK(__section_alignment__) : - { - __data_start__ = . ; - *(.data) - *(.data2) - *(SORT(.data$*)) - __data_end__ = . ; - __bss_start__ = . ; - *(.bss) - *(COMMON) - __bss_end__ = . ; - *(SORT(.CRT$*)) - } - .rdata BLOCK(__section_alignment__) : - { - *(.rdata) - *(SORT(.rdata$*)) - *(.eh_frame) - } - .edata BLOCK(__section_alignment__) : { *(.edata) } - .idata BLOCK(__section_alignment__) : - { - /* This cannot currently be handled with grouped sections. - See pe.em:sort_sections. */ - SORT(*)(.idata$2) - SORT(*)(.idata$3) - /* These zeroes mark the end of the import list. */ - LONG (0); LONG (0); LONG (0); LONG (0); LONG (0); - SORT(*)(.idata$4) - SORT(*)(.idata$5) - SORT(*)(.idata$6) - SORT(*)(.idata$7) - } - .tls BLOCK(__section_alignment__) : - { - *(.tls) - *(.tls$) - *(SORT(.tls$*)) - } - /DISCARD/ : - { - *(.debug$S) - *(.debug$T) - *(.debug$F) - *(.drectve) - *(.debug_loc) - *(.debug_ranges) - *(.debug_aranges) - *(.debug_str) - *(.debug_frame) - *(.debug_pubnames) - *(.debug_pubtypes) - *(.gnu.linkonce.wt.*) - } - .rsrc BLOCK(__section_alignment__) : - { - *(.rsrc) - *(SORT(.rsrc$*)) - } - .reloc BLOCK(__section_alignment__) : - { - *(.reloc) - } - .debug_info BLOCK(__section_alignment__) (NOLOAD) : - { - [ .debug_info ] - } - .debug_abbrev BLOCK(__section_alignment__) (NOLOAD) : - { - [ .debug_abbrev ] - } - .debug_line BLOCK(__section_alignment__) (NOLOAD) : - { - [ .debug_line ] - } -} Removed: trunk/reactos/ntoskrnl/ntoskrnl_amd64.lds URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl_amd64.ld… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl_amd64.lds [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl_amd64.lds (removed) @@ -1,174 +0,0 @@ -OUTPUT_FORMAT(pei-x86-64) -ENTRY(_mainCRTStartup) -SECTIONS -{ - .text __image_base__ + __section_alignment__ : - { - __text_start__ = .; - *(.init) - *(.text) - *(SORT(.text$*)) - *(.glue_7t) - *(.glue_7) - ___CTOR_LIST__ = .; __CTOR_LIST__ = . ; - LONG (-1); *(.ctors); *(.ctor); LONG (0); - ___DTOR_LIST__ = .; __DTOR_LIST__ = . ; - LONG (-1); *(.dtors); *(.dtor); LONG (0); - *(.fini) - /* ??? Why is .gcc_exc here? */ - *(.gcc_exc) - __text_end__ = .; - *(.gcc_except_table) - } - init BLOCK(__section_alignment__) : - { - __init_start__ = . ; - *(init) - __init_end__ = . ; - } - /* The Cygwin32 library uses a section to avoid copying certain data - on fork. This used to be named ".data". The linker used - to include this between __data_start__ and __data_end__, but that - breaks building the cygwin32 dll. Instead, we name the section - ".data_cygwin_nocopy" and explictly include it after __data_end__. */ - .data BLOCK(__section_alignment__) : - { - __data_start__ = . ; - *(.data) - *(.data2) - *(SORT(.data$*)) - __data_end__ = . ; - *(.data_cygwin_nocopy) - } - .rdata BLOCK(__section_alignment__) : - { - *(.rdata) - *(SORT(.rdata$*)) - /* For some reason mingw likes to merge it here. I don't! */ - /* *(.eh_frame) */ - } - .edata BLOCK(__section_alignment__) : - { - *(.edata) - } - /DISCARD/ : - { - *(.debug$S) - *(.debug$T) - *(.debug$F) - *(.drectve) - } - - .idata BLOCK(__section_alignment__) : - { - /* This cannot currently be handled with grouped sections. - See pe.em:sort_sections. */ - SORT(*)(.idata$2) - SORT(*)(.idata$3) - /* These zeroes mark the end of the import list. */ - LONG (0); LONG (0); LONG (0); LONG (0); LONG (0); - SORT(*)(.idata$4) - SORT(*)(.idata$5) - SORT(*)(.idata$6) - SORT(*)(.idata$7) - } - .CRT BLOCK(__section_alignment__) : - { - *(SORT(.CRT$*)) - } - .rsrc BLOCK(__section_alignment__) : - { - *(.rsrc) - *(SORT(.rsrc$*)) - } - .bss BLOCK(__section_alignment__) : - { - __bss_start__ = . ; - *(.bss) - *(COMMON) - __bss_end__ = . ; - } - .reloc BLOCK(__section_alignment__) : - { - *(.reloc) - /* These zeroes mark the end of the reloc section. */ - LONG (0); LONG (0); LONG (0); LONG (0); LONG (0); - } - .stab BLOCK(__section_alignment__) (NOLOAD) : - { - [ .stab ] - } - .stabstr BLOCK(__section_alignment__) (NOLOAD) : - { - [ .stabstr ] - } - /* DWARF debug sections. - Symbols in the DWARF debugging sections are relative to the beginning - of the section. Unlike other targets that fake this by putting the - section VMA at 0, the PE format will not allow it. */ - /* DWARF 1.1 and DWARF 2. */ - .debug_aranges BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_aranges) - } - .debug_pubnames BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_pubnames) - } - /* DWARF 2. */ - .debug_info BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_info) *(.gnu.linkonce.wi.*) - } - .debug_abbrev BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_abbrev) - } - .debug_line BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_line) - } - .debug_frame BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_frame) - } - .debug_str BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_str) - } - .debug_loc BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_loc) - } - .debug_macinfo BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_macinfo) - } - /* SGI/MIPS DWARF 2 extensions. */ - .debug_weaknames BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_weaknames) - } - .debug_funcnames BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_funcnames) - } - .debug_typenames BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_typenames) - } - .debug_varnames BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_varnames) - } - /* DWARF 3. */ - .debug_ranges BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_ranges) - } - .eh_frame BLOCK(__section_alignment__) : - { - *(.eh_frame) - } -} - Removed: trunk/reactos/ntoskrnl/ntoskrnl_arm.lds URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl_arm.lds?… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl_arm.lds [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl_arm.lds (removed) @@ -1,105 +0,0 @@ -OUTPUT_FORMAT(pei-arm-wince-little) -ENTRY(_mainCRTStartup) -SECTIONS -{ - .text __image_base__ + __section_alignment__ : - { - __text_start__ = .; - *(.init) - *(.text) - *(SORT(.text$*)) - *(.glue_7t) - *(.glue_7) - ___CTOR_LIST__ = .; __CTOR_LIST__ = . ; - LONG (-1); *(.ctors); *(.ctor); LONG (0); - ___DTOR_LIST__ = .; __DTOR_LIST__ = . ; - LONG (-1); *(.dtors); *(.dtor); LONG (0); - *(.fini) - /* ??? Why is .gcc_exc here? */ - *(.gcc_exc) - __text_end__ = .; - *(.gcc_except_table) - } - init BLOCK(__section_alignment__) : - { - __init_start__ = . ; - *(init) - __init_end__ = . ; - } - /* The Cygwin32 library uses a section to avoid copying certain data - on fork. This used to be named ".data". The linker used - to include this between __data_start__ and __data_end__, but that - breaks building the cygwin32 dll. Instead, we name the section - ".data_cygwin_nocopy" and explictly include it after __data_end__. */ - .data BLOCK(__section_alignment__) : - { - __data_start__ = . ; - *(.data) - *(.data2) - *(SORT(.data$*)) - __data_end__ = . ; - *(.data_cygwin_nocopy) - } - .rdata BLOCK(__section_alignment__) : - { - *(.rdata) - *(SORT(.rdata$*)) - *(.eh_frame) - } - .edata BLOCK(__section_alignment__) : - { - *(.edata) - } - /DISCARD/ : - { - *(.debug$S) - *(.debug$T) - *(.debug$F) - *(.drectve) - } - - .idata BLOCK(__section_alignment__) : - { - /* This cannot currently be handled with grouped sections. - See pe.em:sort_sections. */ - SORT(*)(.idata$2) - SORT(*)(.idata$3) - /* These zeroes mark the end of the import list. */ - LONG (0); LONG (0); LONG (0); LONG (0); LONG (0); - SORT(*)(.idata$4) - SORT(*)(.idata$5) - SORT(*)(.idata$6) - SORT(*)(.idata$7) - } - .CRT BLOCK(__section_alignment__) : - { - *(SORT(.CRT$*)) - } - .rsrc BLOCK(__section_alignment__) : - { - *(.rsrc) - *(SORT(.rsrc$*)) - } - .bss BLOCK(__section_alignment__) : - { - __bss_start__ = . ; - *(.bss) - *(COMMON) - __bss_end__ = . ; - } - .reloc BLOCK(__section_alignment__) : - { - *(.reloc) - /* These zeroes mark the end of the reloc section. */ - LONG (0); LONG (0); LONG (0); LONG (0); LONG (0); - } - .stab BLOCK(__section_alignment__) (NOLOAD) : - { - [ .stab ] - } - .stabstr BLOCK(__section_alignment__) (NOLOAD) : - { - [ .stabstr ] - } -} - Removed: trunk/reactos/ntoskrnl/ntoskrnl_i386.lds URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl_i386.lds… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl_i386.lds [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl_i386.lds (removed) @@ -1,150 +0,0 @@ -SECTIONS -{ - .text __image_base__ + __section_alignment__ : - { - *(.text) - *(SORT(.text*)) - } - - .data BLOCK(__section_alignment__) : - { - *(.data) - *(SORT(.data*)) - } - - .rdata BLOCK(__section_alignment__) : - { - *(.rdata) - *(SORT(.rdata*)) - *(.eh_frame) - } - - .edata BLOCK(__section_alignment__) : - { - *(.edata) - } - - /DISCARD/ : - { - *(.drectve) - *(.gnu.lto_*) - } - - .idata BLOCK(__section_alignment__) : - { - /* This cannot currently be handled with grouped sections. - See pe.em:sort_sections. */ - SORT(*)(.idata$2) - SORT(*)(.idata$3) - /* These zeroes mark the end of the import list. */ - LONG (0); LONG (0); LONG (0); LONG (0); LONG (0); - SORT(*)(.idata$4) - SORT(*)(.idata$5) - SORT(*)(.idata$6) - SORT(*)(.idata$7) - } - - .rsrc BLOCK(__section_alignment__) : - { - *(.rsrc) - *(SORT(.rsrc$*)) - } - - .bss BLOCK(__section_alignment__) : - { - *(.bss) - *(COMMON) - } - - .reloc BLOCK(__section_alignment__) : - { - *(.reloc) - } - - .stab BLOCK(__section_alignment__) (NOLOAD) : - { - *(.stab) - } - .stabstr BLOCK(__section_alignment__) (NOLOAD) : - { - *(.stabstr) - } - - /* DWARF debug sections. - Symbols in the DWARF debugging sections are relative to the beginning - of the section. Unlike other targets that fake this by putting the - section VMA at 0, the PE format will not allow it. */ - /* DWARF 1.1 and DWARF 2. */ - .debug_aranges BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_aranges) - } - .debug_pubnames BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_pubnames) - } - .debug_pubtypes BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_pubtypes) - } - /* DWARF 2. */ - .debug_info BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_info .gnu.linkonce.wi.*) - } - .debug_abbrev BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_abbrev) - } - .debug_line BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_line) - } - .debug_frame BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_frame*) - } - .debug_str BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_str) - } - .debug_loc BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_loc) - } - .debug_macinfo BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_macinfo) - } - /* SGI/MIPS DWARF 2 extensions. */ - .debug_weaknames BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_weaknames) - } - .debug_funcnames BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_funcnames) - } - .debug_typenames BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_typenames) - } - .debug_varnames BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_varnames) - } - .debug_macro BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_macro) - } - /* DWARF 3. */ - .debug_ranges BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_ranges) - } - /* DWARF 4. */ - .debug_types BLOCK(__section_alignment__) (NOLOAD) : - { - *(.debug_types .gnu.linkonce.wt.*) - } -} Removed: trunk/reactos/ntoskrnl/ntoskrnl_powerpc.lds URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl_powerpc.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl_powerpc.lds [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl_powerpc.lds (removed) @@ -1,57 +0,0 @@ -/* Default linker script, for normal executables */ -OUTPUT_FORMAT("elf32-powerpc", "elf32-powerpc", - "elf32-powerpc") -OUTPUT_ARCH(powerpc:common) -SECTIONS -{ - .text : - { - __text_start__ = .; - *(.text) - *(init) - *(INIT) - __text_end__ = .; - } - .data : - { - *(.data) - *(.data2) - *(.rdata) - *(.sdata) - *(.pdata) - } - .rodata : - { - *(.rodata*) - *(.got2) - *(.eh_frame) - } - .idata : - { - *(.idata$2) - SORT(*)(.idata$3) - LONG(0); LONG(0); LONG(0); LONG(0); LONG(0); - SORT(*)(.idata$4) - SORT(*)(.idata$5) - SORT(*)(.idata$6) - SORT(*)(.idata$7) - } - .edata : - { - *(.edata) - } - .bss : - { - *(.sbss) - *(.bss) - *(COMMON) - } - .rsrc : - { - *(.rsrc) - } - .rela : - { - *(.rela.*) - } -}

10 years, 9 months

[ekohl] 61261: [FASTFAT] Fix coding style and indentation in remaining files. No code changes!

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu Dec 12 13:51:50 2013 New Revision: 61261 URL: http://svn.reactos.org/svn/reactos?rev=61261&view=rev Log: [FASTFAT] Fix coding style and indentation in remaining files. No code changes! Modified: trunk/reactos/drivers/filesystems/fastfat/create.c trunk/reactos/drivers/filesystems/fastfat/fsctl.c trunk/reactos/drivers/filesystems/fastfat/misc.c trunk/reactos/drivers/filesystems/fastfat/vfat.h Modified: trunk/reactos/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] Thu Dec 12 13:51:50 2013 @@ -272,7 +272,7 @@ return Status; } - while(TRUE) + while (TRUE) { Status = DeviceExt->GetNextDirEntry(&Context, &Page, Parent, DirContext, First); First = FALSE; @@ -380,7 +380,7 @@ FALSE); if (!NT_SUCCESS(Status)) { - DPRINT ("Status %lx\n", Status); + DPRINT("Status %lx\n", Status); *ParentFcb = NULL; return Status; } @@ -395,14 +395,14 @@ DPRINT("Checking for existing FCB in memory\n"); Status = vfatGetFCBForFile(DeviceExt, ParentFcb, &Fcb, PathNameU); - if (!NT_SUCCESS (Status)) + if (!NT_SUCCESS(Status)) { DPRINT ("Could not make a new FCB, status: %x\n", Status); return Status; } if (Fcb->Flags & FCB_DELETE_PENDING) { - vfatReleaseFCB (DeviceExt, Fcb); + vfatReleaseFCB(DeviceExt, Fcb); return STATUS_DELETE_PENDING; } @@ -418,7 +418,7 @@ Status = vfatAttachFCBToFileObject(DeviceExt, Fcb, FileObject); if (!NT_SUCCESS(Status)) { - vfatReleaseFCB (DeviceExt, Fcb); + vfatReleaseFCB(DeviceExt, Fcb); } return Status; } @@ -446,7 +446,7 @@ ULONG Attributes; /* Unpack the various parameters. */ - Stack = IoGetCurrentIrpStackLocation (Irp); + Stack = IoGetCurrentIrpStackLocation(Irp); RequestedDisposition = ((Stack->Parameters.Create.Options >> 24) & 0xff); RequestedOptions = Stack->Parameters.Create.Options & FILE_VALID_OPTION_FLAGS; PagingFileCreate = (Stack->Flags & SL_OPEN_PAGING_FILE) ? TRUE : FALSE; Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] Thu Dec 12 13:51:50 2013 @@ -338,557 +338,578 @@ return Status; } -static NTSTATUS -VfatMountDevice(PDEVICE_EXTENSION DeviceExt, - PDEVICE_OBJECT DeviceToMount) /* * FUNCTION: Mounts the device */ +static +NTSTATUS +VfatMountDevice( + PDEVICE_EXTENSION DeviceExt, + PDEVICE_OBJECT DeviceToMount) { - NTSTATUS Status; - BOOLEAN RecognizedFS; - - DPRINT("Mounting VFAT device...\n"); - - Status = VfatHasFileSystem(DeviceToMount, &RecognizedFS, &DeviceExt->FatInfo); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - DPRINT("MountVfatdev %u, PAGE_SIZE = %d\n", DeviceExt->FatInfo.BytesPerCluster, PAGE_SIZE); - - - return(STATUS_SUCCESS); + NTSTATUS Status; + BOOLEAN RecognizedFS; + + DPRINT("Mounting VFAT device...\n"); + + Status = VfatHasFileSystem(DeviceToMount, &RecognizedFS, &DeviceExt->FatInfo); + if (!NT_SUCCESS(Status)) + { + return Status; + } + DPRINT("MountVfatdev %u, PAGE_SIZE = %d\n", DeviceExt->FatInfo.BytesPerCluster, PAGE_SIZE); + + return STATUS_SUCCESS; } -static NTSTATUS -VfatMount (PVFAT_IRP_CONTEXT IrpContext) /* * FUNCTION: Mount the filesystem */ +static +NTSTATUS +VfatMount( + PVFAT_IRP_CONTEXT IrpContext) { - PDEVICE_OBJECT DeviceObject = NULL; - PDEVICE_EXTENSION DeviceExt = NULL; - BOOLEAN RecognizedFS; - NTSTATUS Status; - PVFATFCB Fcb = NULL; - PVFATFCB VolumeFcb = NULL; - PVFATCCB Ccb = NULL; - PDEVICE_OBJECT DeviceToMount; - PVPB Vpb; - UNICODE_STRING NameU = RTL_CONSTANT_STRING(L"\\$$Fat$$"); - UNICODE_STRING VolumeNameU = RTL_CONSTANT_STRING(L"\\$$Volume$$"); - ULONG HashTableSize; - ULONG eocMark; - FATINFO FatInfo; - - DPRINT("VfatMount(IrpContext %p)\n", IrpContext); - - ASSERT(IrpContext); - - if (IrpContext->DeviceObject != VfatGlobalData->DeviceObject) - { - Status = STATUS_INVALID_DEVICE_REQUEST; - goto ByeBye; - } - - DeviceToMount = IrpContext->Stack->Parameters.MountVolume.DeviceObject; - Vpb = IrpContext->Stack->Parameters.MountVolume.Vpb; - - Status = VfatHasFileSystem (DeviceToMount, &RecognizedFS, &FatInfo); - if (!NT_SUCCESS(Status)) - { - goto ByeBye; - } - - if (RecognizedFS == FALSE) - { - DPRINT("VFAT: Unrecognized Volume\n"); - Status = STATUS_UNRECOGNIZED_VOLUME; - goto ByeBye; - } - - /* Use prime numbers for the table size */ - if (FatInfo.FatType == FAT12) - { - HashTableSize = 4099; // 4096 = 4 * 1024 - } - else if (FatInfo.FatType == FAT16 || - FatInfo.FatType == FATX16) - { - HashTableSize = 16411; // 16384 = 16 * 1024 - } - else - { - HashTableSize = 65537; // 65536 = 64 * 1024; - } - HashTableSize = FCB_HASH_TABLE_SIZE; - DPRINT("VFAT: Recognized volume\n"); - Status = IoCreateDevice(VfatGlobalData->DriverObject, - ROUND_UP(sizeof (DEVICE_EXTENSION), sizeof(ULONG)) + sizeof(HASHENTRY*) * HashTableSize, - NULL, - FILE_DEVICE_DISK_FILE_SYSTEM, - DeviceToMount->Characteristics, - FALSE, - &DeviceObject); - if (!NT_SUCCESS(Status)) - { - goto ByeBye; - } - - DeviceObject->Flags = DeviceObject->Flags | DO_DIRECT_IO; - DeviceExt = (PVOID) DeviceObject->DeviceExtension; - RtlZeroMemory(DeviceExt, ROUND_UP(sizeof(DEVICE_EXTENSION), sizeof(ULONG)) + sizeof(HASHENTRY*) * HashTableSize); - DeviceExt->FcbHashTable = (HASHENTRY**)((ULONG_PTR)DeviceExt + ROUND_UP(sizeof(DEVICE_EXTENSION), sizeof(ULONG))); - DeviceExt->HashTableSize = HashTableSize; - - /* use same vpb as device disk */ - DeviceObject->Vpb = Vpb; - DeviceToMount->Vpb = Vpb; - - Status = VfatMountDevice(DeviceExt, DeviceToMount); - if (!NT_SUCCESS(Status)) - { - /* FIXME: delete device object */ - goto ByeBye; - } - - DPRINT("BytesPerSector: %u\n", DeviceExt->FatInfo.BytesPerSector); - DPRINT("SectorsPerCluster: %u\n", DeviceExt->FatInfo.SectorsPerCluster); - DPRINT("FATCount: %u\n", DeviceExt->FatInfo.FATCount); - DPRINT("FATSectors: %u\n", DeviceExt->FatInfo.FATSectors); - DPRINT("RootStart: %u\n", DeviceExt->FatInfo.rootStart); - DPRINT("DataStart: %u\n", DeviceExt->FatInfo.dataStart); - if (DeviceExt->FatInfo.FatType == FAT32) - { - DPRINT("RootCluster: %u\n", DeviceExt->FatInfo.RootCluster); - } - - switch (DeviceExt->FatInfo.FatType) - { - case FAT12: - DeviceExt->GetNextCluster = FAT12GetNextCluster; - DeviceExt->FindAndMarkAvailableCluster = FAT12FindAndMarkAvailableCluster; - DeviceExt->WriteCluster = FAT12WriteCluster; - DeviceExt->CleanShutBitMask = 0; - break; - - case FAT16: - case FATX16: - DeviceExt->GetNextCluster = FAT16GetNextCluster; - DeviceExt->FindAndMarkAvailableCluster = FAT16FindAndMarkAvailableCluster; - DeviceExt->WriteCluster = FAT16WriteCluster; - DeviceExt->CleanShutBitMask = 0x8000; - break; - - case FAT32: - case FATX32: - DeviceExt->GetNextCluster = FAT32GetNextCluster; - DeviceExt->FindAndMarkAvailableCluster = FAT32FindAndMarkAvailableCluster; - DeviceExt->WriteCluster = FAT32WriteCluster; - DeviceExt->CleanShutBitMask = 0x80000000; - break; - } - - if (DeviceExt->FatInfo.FatType == FATX16 - || DeviceExt->FatInfo.FatType == FATX32) - { - DeviceExt->Flags |= VCB_IS_FATX; - DeviceExt->GetNextDirEntry = FATXGetNextDirEntry; - DeviceExt->BaseDateYear = 2000; - } - else - { - DeviceExt->GetNextDirEntry = FATGetNextDirEntry; - DeviceExt->BaseDateYear = 1980; - } - - DeviceExt->StorageDevice = DeviceToMount; - DeviceExt->StorageDevice->Vpb->DeviceObject = DeviceObject; - DeviceExt->StorageDevice->Vpb->RealDevice = DeviceExt->StorageDevice; - DeviceExt->StorageDevice->Vpb->Flags |= VPB_MOUNTED; - DeviceObject->StackSize = DeviceExt->StorageDevice->StackSize + 1; - DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; - - DPRINT("FsDeviceObject %p\n", DeviceObject); - - /* Initialize this resource early ... it's used in VfatCleanup */ - ExInitializeResourceLite(&DeviceExt->DirResource); - - DeviceExt->FATFileObject = IoCreateStreamFileObject(NULL, DeviceExt->StorageDevice); - Fcb = vfatNewFCB(DeviceExt, &NameU); - if (Fcb == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto ByeBye; - } - Ccb = ExAllocateFromNPagedLookasideList(&VfatGlobalData->CcbLookasideList); - if (Ccb == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto ByeBye; - } - - RtlZeroMemory(Ccb, sizeof (VFATCCB)); - DeviceExt->FATFileObject->FsContext = Fcb; - DeviceExt->FATFileObject->FsContext2 = Ccb; - DeviceExt->FATFileObject->SectionObjectPointer = &Fcb->SectionObjectPointers; - DeviceExt->FATFileObject->PrivateCacheMap = NULL; - DeviceExt->FATFileObject->Vpb = DeviceObject->Vpb; - Fcb->FileObject = DeviceExt->FATFileObject; - - Fcb->Flags |= FCB_IS_FAT; - - Fcb->RFCB.FileSize.QuadPart = DeviceExt->FatInfo.FATSectors * DeviceExt->FatInfo.BytesPerSector; - Fcb->RFCB.ValidDataLength = Fcb->RFCB.FileSize; - Fcb->RFCB.AllocationSize = Fcb->RFCB.FileSize; - - CcInitializeCacheMap(DeviceExt->FATFileObject, - (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), - TRUE, - &VfatGlobalData->CacheMgrCallbacks, - Fcb); - - DeviceExt->LastAvailableCluster = 2; - ExInitializeResourceLite(&DeviceExt->FatResource); - - InitializeListHead(&DeviceExt->FcbListHead); - - VolumeFcb = vfatNewFCB(DeviceExt, &VolumeNameU); - if (VolumeFcb == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto ByeBye; - } - VolumeFcb->Flags = FCB_IS_VOLUME; - VolumeFcb->RFCB.FileSize.QuadPart = DeviceExt->FatInfo.Sectors * DeviceExt->FatInfo.BytesPerSector; - VolumeFcb->RFCB.ValidDataLength = VolumeFcb->RFCB.FileSize; - VolumeFcb->RFCB.AllocationSize = VolumeFcb->RFCB.FileSize; - DeviceExt->VolumeFcb = VolumeFcb; - - ExAcquireResourceExclusiveLite(&VfatGlobalData->VolumeListLock, TRUE); - InsertHeadList(&VfatGlobalData->VolumeListHead, &DeviceExt->VolumeListEntry); - ExReleaseResourceLite(&VfatGlobalData->VolumeListLock); - - /* read serial number */ - DeviceObject->Vpb->SerialNumber = DeviceExt->FatInfo.VolumeID; - - /* read volume label */ - ReadVolumeLabel(DeviceExt, DeviceObject->Vpb); - - /* read clean shutdown bit status */ - Status = GetNextCluster(DeviceExt, 1, &eocMark); - if (NT_SUCCESS(Status)) - { - if (eocMark & DeviceExt->CleanShutBitMask) - { - /* unset clean shutdown bit */ - eocMark &= ~DeviceExt->CleanShutBitMask; - WriteCluster(DeviceExt, 1, eocMark); - VolumeFcb->Flags |= VCB_CLEAR_DIRTY; - } - } - VolumeFcb->Flags |= VCB_IS_DIRTY; - - FsRtlNotifyVolumeEvent(DeviceExt->FATFileObject, FSRTL_VOLUME_MOUNT); - - Status = STATUS_SUCCESS; + PDEVICE_OBJECT DeviceObject = NULL; + PDEVICE_EXTENSION DeviceExt = NULL; + BOOLEAN RecognizedFS; + NTSTATUS Status; + PVFATFCB Fcb = NULL; + PVFATFCB VolumeFcb = NULL; + PVFATCCB Ccb = NULL; + PDEVICE_OBJECT DeviceToMount; + PVPB Vpb; + UNICODE_STRING NameU = RTL_CONSTANT_STRING(L"\\$$Fat$$"); + UNICODE_STRING VolumeNameU = RTL_CONSTANT_STRING(L"\\$$Volume$$"); + ULONG HashTableSize; + ULONG eocMark; + FATINFO FatInfo; + + DPRINT("VfatMount(IrpContext %p)\n", IrpContext); + + ASSERT(IrpContext); + + if (IrpContext->DeviceObject != VfatGlobalData->DeviceObject) + { + Status = STATUS_INVALID_DEVICE_REQUEST; + goto ByeBye; + } + + DeviceToMount = IrpContext->Stack->Parameters.MountVolume.DeviceObject; + Vpb = IrpContext->Stack->Parameters.MountVolume.Vpb; + + Status = VfatHasFileSystem(DeviceToMount, &RecognizedFS, &FatInfo); + if (!NT_SUCCESS(Status)) + { + goto ByeBye; + } + + if (RecognizedFS == FALSE) + { + DPRINT("VFAT: Unrecognized Volume\n"); + Status = STATUS_UNRECOGNIZED_VOLUME; + goto ByeBye; + } + + /* Use prime numbers for the table size */ + if (FatInfo.FatType == FAT12) + { + HashTableSize = 4099; // 4096 = 4 * 1024 + } + else if (FatInfo.FatType == FAT16 || + FatInfo.FatType == FATX16) + { + HashTableSize = 16411; // 16384 = 16 * 1024 + } + else + { + HashTableSize = 65537; // 65536 = 64 * 1024; + } + HashTableSize = FCB_HASH_TABLE_SIZE; + DPRINT("VFAT: Recognized volume\n"); + Status = IoCreateDevice(VfatGlobalData->DriverObject, + ROUND_UP(sizeof (DEVICE_EXTENSION), sizeof(ULONG)) + sizeof(HASHENTRY*) * HashTableSize, + NULL, + FILE_DEVICE_DISK_FILE_SYSTEM, + DeviceToMount->Characteristics, + FALSE, + &DeviceObject); + if (!NT_SUCCESS(Status)) + { + goto ByeBye; + } + + DeviceObject->Flags = DeviceObject->Flags | DO_DIRECT_IO; + DeviceExt = (PVOID) DeviceObject->DeviceExtension; + RtlZeroMemory(DeviceExt, ROUND_UP(sizeof(DEVICE_EXTENSION), sizeof(ULONG)) + sizeof(HASHENTRY*) * HashTableSize); + DeviceExt->FcbHashTable = (HASHENTRY**)((ULONG_PTR)DeviceExt + ROUND_UP(sizeof(DEVICE_EXTENSION), sizeof(ULONG))); + DeviceExt->HashTableSize = HashTableSize; + + /* use same vpb as device disk */ + DeviceObject->Vpb = Vpb; + DeviceToMount->Vpb = Vpb; + + Status = VfatMountDevice(DeviceExt, DeviceToMount); + if (!NT_SUCCESS(Status)) + { + /* FIXME: delete device object */ + goto ByeBye; + } + + DPRINT("BytesPerSector: %u\n", DeviceExt->FatInfo.BytesPerSector); + DPRINT("SectorsPerCluster: %u\n", DeviceExt->FatInfo.SectorsPerCluster); + DPRINT("FATCount: %u\n", DeviceExt->FatInfo.FATCount); + DPRINT("FATSectors: %u\n", DeviceExt->FatInfo.FATSectors); + DPRINT("RootStart: %u\n", DeviceExt->FatInfo.rootStart); + DPRINT("DataStart: %u\n", DeviceExt->FatInfo.dataStart); + if (DeviceExt->FatInfo.FatType == FAT32) + { + DPRINT("RootCluster: %u\n", DeviceExt->FatInfo.RootCluster); + } + + switch (DeviceExt->FatInfo.FatType) + { + case FAT12: + DeviceExt->GetNextCluster = FAT12GetNextCluster; + DeviceExt->FindAndMarkAvailableCluster = FAT12FindAndMarkAvailableCluster; + DeviceExt->WriteCluster = FAT12WriteCluster; + DeviceExt->CleanShutBitMask = 0; + break; + + case FAT16: + case FATX16: + DeviceExt->GetNextCluster = FAT16GetNextCluster; + DeviceExt->FindAndMarkAvailableCluster = FAT16FindAndMarkAvailableCluster; + DeviceExt->WriteCluster = FAT16WriteCluster; + DeviceExt->CleanShutBitMask = 0x8000; + break; + + case FAT32: + case FATX32: + DeviceExt->GetNextCluster = FAT32GetNextCluster; + DeviceExt->FindAndMarkAvailableCluster = FAT32FindAndMarkAvailableCluster; + DeviceExt->WriteCluster = FAT32WriteCluster; + DeviceExt->CleanShutBitMask = 0x80000000; + break; + } + + if (DeviceExt->FatInfo.FatType == FATX16 || + DeviceExt->FatInfo.FatType == FATX32) + { + DeviceExt->Flags |= VCB_IS_FATX; + DeviceExt->GetNextDirEntry = FATXGetNextDirEntry; + DeviceExt->BaseDateYear = 2000; + } + else + { + DeviceExt->GetNextDirEntry = FATGetNextDirEntry; + DeviceExt->BaseDateYear = 1980; + } + + DeviceExt->StorageDevice = DeviceToMount; + DeviceExt->StorageDevice->Vpb->DeviceObject = DeviceObject; + DeviceExt->StorageDevice->Vpb->RealDevice = DeviceExt->StorageDevice; + DeviceExt->StorageDevice->Vpb->Flags |= VPB_MOUNTED; + DeviceObject->StackSize = DeviceExt->StorageDevice->StackSize + 1; + DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; + + DPRINT("FsDeviceObject %p\n", DeviceObject); + + /* Initialize this resource early ... it's used in VfatCleanup */ + ExInitializeResourceLite(&DeviceExt->DirResource); + + DeviceExt->FATFileObject = IoCreateStreamFileObject(NULL, DeviceExt->StorageDevice); + Fcb = vfatNewFCB(DeviceExt, &NameU); + if (Fcb == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto ByeBye; + } + + Ccb = ExAllocateFromNPagedLookasideList(&VfatGlobalData->CcbLookasideList); + if (Ccb == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto ByeBye; + } + + RtlZeroMemory(Ccb, sizeof (VFATCCB)); + DeviceExt->FATFileObject->FsContext = Fcb; + DeviceExt->FATFileObject->FsContext2 = Ccb; + DeviceExt->FATFileObject->SectionObjectPointer = &Fcb->SectionObjectPointers; + DeviceExt->FATFileObject->PrivateCacheMap = NULL; + DeviceExt->FATFileObject->Vpb = DeviceObject->Vpb; + Fcb->FileObject = DeviceExt->FATFileObject; + + Fcb->Flags |= FCB_IS_FAT; + + Fcb->RFCB.FileSize.QuadPart = DeviceExt->FatInfo.FATSectors * DeviceExt->FatInfo.BytesPerSector; + Fcb->RFCB.ValidDataLength = Fcb->RFCB.FileSize; + Fcb->RFCB.AllocationSize = Fcb->RFCB.FileSize; + + CcInitializeCacheMap(DeviceExt->FATFileObject, + (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), + TRUE, + &VfatGlobalData->CacheMgrCallbacks, + Fcb); + + DeviceExt->LastAvailableCluster = 2; + ExInitializeResourceLite(&DeviceExt->FatResource); + + InitializeListHead(&DeviceExt->FcbListHead); + + VolumeFcb = vfatNewFCB(DeviceExt, &VolumeNameU); + if (VolumeFcb == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto ByeBye; + } + + VolumeFcb->Flags = FCB_IS_VOLUME; + VolumeFcb->RFCB.FileSize.QuadPart = DeviceExt->FatInfo.Sectors * DeviceExt->FatInfo.BytesPerSector; + VolumeFcb->RFCB.ValidDataLength = VolumeFcb->RFCB.FileSize; + VolumeFcb->RFCB.AllocationSize = VolumeFcb->RFCB.FileSize; + DeviceExt->VolumeFcb = VolumeFcb; + + ExAcquireResourceExclusiveLite(&VfatGlobalData->VolumeListLock, TRUE); + InsertHeadList(&VfatGlobalData->VolumeListHead, &DeviceExt->VolumeListEntry); + ExReleaseResourceLite(&VfatGlobalData->VolumeListLock); + + /* read serial number */ + DeviceObject->Vpb->SerialNumber = DeviceExt->FatInfo.VolumeID; + + /* read volume label */ + ReadVolumeLabel(DeviceExt, DeviceObject->Vpb); + + /* read clean shutdown bit status */ + Status = GetNextCluster(DeviceExt, 1, &eocMark); + if (NT_SUCCESS(Status)) + { + if (eocMark & DeviceExt->CleanShutBitMask) + { + /* unset clean shutdown bit */ + eocMark &= ~DeviceExt->CleanShutBitMask; + WriteCluster(DeviceExt, 1, eocMark); + VolumeFcb->Flags |= VCB_CLEAR_DIRTY; + } + } + + VolumeFcb->Flags |= VCB_IS_DIRTY; + + FsRtlNotifyVolumeEvent(DeviceExt->FATFileObject, FSRTL_VOLUME_MOUNT); + + Status = STATUS_SUCCESS; + ByeBye: - - if (!NT_SUCCESS(Status)) - { - // cleanup - if (DeviceExt && DeviceExt->FATFileObject) - ObDereferenceObject (DeviceExt->FATFileObject); - if (Fcb) - vfatDestroyFCB(Fcb); - if (Ccb) - vfatDestroyCCB(Ccb); - if (DeviceObject) - IoDeleteDevice(DeviceObject); - if (VolumeFcb) - vfatDestroyFCB(VolumeFcb); - } - return Status; + if (!NT_SUCCESS(Status)) + { + /* Cleanup */ + if (DeviceExt && DeviceExt->FATFileObject) + ObDereferenceObject (DeviceExt->FATFileObject); + if (Fcb) + vfatDestroyFCB(Fcb); + if (Ccb) + vfatDestroyCCB(Ccb); + if (DeviceObject) + IoDeleteDevice(DeviceObject); + if (VolumeFcb) + vfatDestroyFCB(VolumeFcb); + } + + return Status; } -static NTSTATUS -VfatVerify (PVFAT_IRP_CONTEXT IrpContext) /* * FUNCTION: Verify the filesystem */ +static +NTSTATUS +VfatVerify( + PVFAT_IRP_CONTEXT IrpContext) { - PDEVICE_OBJECT DeviceToVerify; - NTSTATUS Status = STATUS_SUCCESS; - FATINFO FatInfo; - BOOLEAN RecognizedFS; - PDEVICE_EXTENSION DeviceExt = IrpContext->DeviceExt; - - DPRINT("VfatVerify(IrpContext %p)\n", IrpContext); - - DeviceToVerify = IrpContext->Stack->Parameters.VerifyVolume.DeviceObject; - Status = VfatBlockDeviceIoControl(DeviceToVerify, - IOCTL_DISK_CHECK_VERIFY, - NULL, - 0, - NULL, - 0, - TRUE); - DeviceToVerify->Flags &= ~DO_VERIFY_VOLUME; - if (!NT_SUCCESS(Status) && Status != STATUS_VERIFY_REQUIRED) - { - DPRINT("VfatBlockDeviceIoControl() failed (Status %lx)\n", Status); - Status = STATUS_WRONG_VOLUME; - } - else - { - Status = VfatHasFileSystem(DeviceToVerify, &RecognizedFS, &FatInfo); - if (!NT_SUCCESS(Status) || RecognizedFS == FALSE) - { - Status = STATUS_WRONG_VOLUME; - } - else if (sizeof(FATINFO) == RtlCompareMemory(&FatInfo, &DeviceExt->FatInfo, sizeof(FATINFO))) - { - /* - * FIXME: - * Preformated floppy disks have very often a serial number of 0000:0000. - * We should calculate a crc sum over the sectors from the root directory as secondary volume number. - * Each write to the root directory must update this crc sum. - */ - - } - else - { - Status = STATUS_WRONG_VOLUME; - } - } - - return Status; + PDEVICE_OBJECT DeviceToVerify; + NTSTATUS Status = STATUS_SUCCESS; + FATINFO FatInfo; + BOOLEAN RecognizedFS; + PDEVICE_EXTENSION DeviceExt = IrpContext->DeviceExt; + + DPRINT("VfatVerify(IrpContext %p)\n", IrpContext); + + DeviceToVerify = IrpContext->Stack->Parameters.VerifyVolume.DeviceObject; + Status = VfatBlockDeviceIoControl(DeviceToVerify, + IOCTL_DISK_CHECK_VERIFY, + NULL, + 0, + NULL, + 0, + TRUE); + DeviceToVerify->Flags &= ~DO_VERIFY_VOLUME; + if (!NT_SUCCESS(Status) && Status != STATUS_VERIFY_REQUIRED) + { + DPRINT("VfatBlockDeviceIoControl() failed (Status %lx)\n", Status); + Status = STATUS_WRONG_VOLUME; + } + else + { + Status = VfatHasFileSystem(DeviceToVerify, &RecognizedFS, &FatInfo); + if (!NT_SUCCESS(Status) || RecognizedFS == FALSE) + { + Status = STATUS_WRONG_VOLUME; + } + else if (sizeof(FATINFO) == RtlCompareMemory(&FatInfo, &DeviceExt->FatInfo, sizeof(FATINFO))) + { + /* + * FIXME: + * Preformated floppy disks have very often a serial number of 0000:0000. + * We should calculate a crc sum over the sectors from the root directory as secondary volume number. + * Each write to the root directory must update this crc sum. + */ + } + else + { + Status = STATUS_WRONG_VOLUME; + } + } + + return Status; } -static NTSTATUS -VfatGetVolumeBitmap(PVFAT_IRP_CONTEXT IrpContext) +static +NTSTATUS +VfatGetVolumeBitmap( + PVFAT_IRP_CONTEXT IrpContext) { - DPRINT("VfatGetVolumeBitmap (IrpContext %p)\n", IrpContext); - - return STATUS_INVALID_DEVICE_REQUEST; + DPRINT("VfatGetVolumeBitmap (IrpContext %p)\n", IrpContext); + return STATUS_INVALID_DEVICE_REQUEST; } -static NTSTATUS -VfatGetRetrievalPointers(PVFAT_IRP_CONTEXT IrpContext) +static +NTSTATUS +VfatGetRetrievalPointers( + PVFAT_IRP_CONTEXT IrpContext) { - PIO_STACK_LOCATION Stack; - LARGE_INTEGER Vcn; - PRETRIEVAL_POINTERS_BUFFER RetrievalPointers; - PFILE_OBJECT FileObject; - ULONG MaxExtentCount; - PVFATFCB Fcb; - PDEVICE_EXTENSION DeviceExt; - ULONG FirstCluster; - ULONG CurrentCluster; - ULONG LastCluster; - NTSTATUS Status; - - DPRINT("VfatGetRetrievalPointers(IrpContext %p)\n", IrpContext); - - DeviceExt = IrpContext->DeviceExt; - FileObject = IrpContext->FileObject; - Stack = IrpContext->Stack; - if (Stack->Parameters.DeviceIoControl.InputBufferLength < sizeof(STARTING_VCN_INPUT_BUFFER) || - Stack->Parameters.DeviceIoControl.Type3InputBuffer == NULL) - { - return STATUS_INVALID_PARAMETER; - } - if (IrpContext->Irp->UserBuffer == NULL || - Stack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(RETRIEVAL_POINTERS_BUFFER)) - { - return STATUS_BUFFER_TOO_SMALL; - } - - Fcb = FileObject->FsContext; - - ExAcquireResourceSharedLite(&Fcb->MainResource, TRUE); - - Vcn = ((PSTARTING_VCN_INPUT_BUFFER)Stack->Parameters.DeviceIoControl.Type3InputBuffer)->StartingVcn; - RetrievalPointers = IrpContext->Irp->UserBuffer; - - MaxExtentCount = ((Stack->Parameters.DeviceIoControl.OutputBufferLength - sizeof(RetrievalPointers->ExtentCount) - sizeof(RetrievalPointers->StartingVcn)) / sizeof(RetrievalPointers->Extents[0])); - - - if (Vcn.QuadPart >= Fcb->RFCB.AllocationSize.QuadPart / DeviceExt->FatInfo.BytesPerCluster) - { - Status = STATUS_INVALID_PARAMETER; - goto ByeBye; - } - - CurrentCluster = FirstCluster = vfatDirEntryGetFirstCluster(DeviceExt, &Fcb->entry); - Status = OffsetToCluster(DeviceExt, FirstCluster, - Vcn.u.LowPart * DeviceExt->FatInfo.BytesPerCluster, - &CurrentCluster, FALSE); - if (!NT_SUCCESS(Status)) - { - goto ByeBye; - } - - RetrievalPointers->StartingVcn = Vcn; - RetrievalPointers->ExtentCount = 0; - RetrievalPointers->Extents[0].Lcn.u.HighPart = 0; - RetrievalPointers->Extents[0].Lcn.u.LowPart = CurrentCluster - 2; - LastCluster = 0; - while (CurrentCluster != 0xffffffff && RetrievalPointers->ExtentCount < MaxExtentCount) - { - - LastCluster = CurrentCluster; - Status = NextCluster(DeviceExt, CurrentCluster, &CurrentCluster, FALSE); - Vcn.QuadPart++; - if (!NT_SUCCESS(Status)) - { - goto ByeBye; - } - - if (LastCluster + 1 != CurrentCluster) - { - RetrievalPointers->Extents[RetrievalPointers->ExtentCount].NextVcn = Vcn; - RetrievalPointers->ExtentCount++; - if (RetrievalPointers->ExtentCount < MaxExtentCount) - { - RetrievalPointers->Extents[RetrievalPointers->ExtentCount].Lcn.u.HighPart = 0; - RetrievalPointers->Extents[RetrievalPointers->ExtentCount].Lcn.u.LowPart = CurrentCluster - 2; - } - } - } - - IrpContext->Irp->IoStatus.Information = sizeof(RETRIEVAL_POINTERS_BUFFER) + (sizeof(RetrievalPointers->Extents[0]) * (RetrievalPointers->ExtentCount - 1)); - Status = STATUS_SUCCESS; + PIO_STACK_LOCATION Stack; + LARGE_INTEGER Vcn; + PRETRIEVAL_POINTERS_BUFFER RetrievalPointers; + PFILE_OBJECT FileObject; + ULONG MaxExtentCount; + PVFATFCB Fcb; + PDEVICE_EXTENSION DeviceExt; + ULONG FirstCluster; + ULONG CurrentCluster; + ULONG LastCluster; + NTSTATUS Status; + + DPRINT("VfatGetRetrievalPointers(IrpContext %p)\n", IrpContext); + + DeviceExt = IrpContext->DeviceExt; + FileObject = IrpContext->FileObject; + Stack = IrpContext->Stack; + if (Stack->Parameters.DeviceIoControl.InputBufferLength < sizeof(STARTING_VCN_INPUT_BUFFER) || + Stack->Parameters.DeviceIoControl.Type3InputBuffer == NULL) + { + return STATUS_INVALID_PARAMETER; + } + + if (IrpContext->Irp->UserBuffer == NULL || + Stack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(RETRIEVAL_POINTERS_BUFFER)) + { + return STATUS_BUFFER_TOO_SMALL; + } + + Fcb = FileObject->FsContext; + + ExAcquireResourceSharedLite(&Fcb->MainResource, TRUE); + + Vcn = ((PSTARTING_VCN_INPUT_BUFFER)Stack->Parameters.DeviceIoControl.Type3InputBuffer)->StartingVcn; + RetrievalPointers = IrpContext->Irp->UserBuffer; + + MaxExtentCount = ((Stack->Parameters.DeviceIoControl.OutputBufferLength - sizeof(RetrievalPointers->ExtentCount) - sizeof(RetrievalPointers->StartingVcn)) / sizeof(RetrievalPointers->Extents[0])); + + if (Vcn.QuadPart >= Fcb->RFCB.AllocationSize.QuadPart / DeviceExt->FatInfo.BytesPerCluster) + { + Status = STATUS_INVALID_PARAMETER; + goto ByeBye; + } + + CurrentCluster = FirstCluster = vfatDirEntryGetFirstCluster(DeviceExt, &Fcb->entry); + Status = OffsetToCluster(DeviceExt, FirstCluster, + Vcn.u.LowPart * DeviceExt->FatInfo.BytesPerCluster, + &CurrentCluster, FALSE); + if (!NT_SUCCESS(Status)) + { + goto ByeBye; + } + + RetrievalPointers->StartingVcn = Vcn; + RetrievalPointers->ExtentCount = 0; + RetrievalPointers->Extents[0].Lcn.u.HighPart = 0; + RetrievalPointers->Extents[0].Lcn.u.LowPart = CurrentCluster - 2; + LastCluster = 0; + while (CurrentCluster != 0xffffffff && RetrievalPointers->ExtentCount < MaxExtentCount) + { + LastCluster = CurrentCluster; + Status = NextCluster(DeviceExt, CurrentCluster, &CurrentCluster, FALSE); + Vcn.QuadPart++; + if (!NT_SUCCESS(Status)) + { + goto ByeBye; + } + + if (LastCluster + 1 != CurrentCluster) + { + RetrievalPointers->Extents[RetrievalPointers->ExtentCount].NextVcn = Vcn; + RetrievalPointers->ExtentCount++; + if (RetrievalPointers->ExtentCount < MaxExtentCount) + { + RetrievalPointers->Extents[RetrievalPointers->ExtentCount].Lcn.u.HighPart = 0; + RetrievalPointers->Extents[RetrievalPointers->ExtentCount].Lcn.u.LowPart = CurrentCluster - 2; + } + } + } + + IrpContext->Irp->IoStatus.Information = sizeof(RETRIEVAL_POINTERS_BUFFER) + (sizeof(RetrievalPointers->Extents[0]) * (RetrievalPointers->ExtentCount - 1)); + Status = STATUS_SUCCESS; ByeBye: - ExReleaseResourceLite(&Fcb->MainResource); - - return Status; + ExReleaseResourceLite(&Fcb->MainResource); + + return Status; } -static NTSTATUS -VfatMoveFile(PVFAT_IRP_CONTEXT IrpContext) +static +NTSTATUS +VfatMoveFile( + PVFAT_IRP_CONTEXT IrpContext) { - DPRINT("VfatMoveFile(IrpContext %p)\n", IrpContext); - - return STATUS_INVALID_DEVICE_REQUEST; + DPRINT("VfatMoveFile(IrpContext %p)\n", IrpContext); + return STATUS_INVALID_DEVICE_REQUEST; } -static NTSTATUS -VfatIsVolumeDirty(PVFAT_IRP_CONTEXT IrpContext) +static +NTSTATUS +VfatIsVolumeDirty( + PVFAT_IRP_CONTEXT IrpContext) { - PULONG Flags; - - DPRINT("VfatIsVolumeDirty(IrpContext %p)\n", IrpContext); - - if (IrpContext->Stack->Parameters.FileSystemControl.OutputBufferLength != sizeof(ULONG)) - return STATUS_INVALID_BUFFER_SIZE; - else if (!IrpContext->Irp->AssociatedIrp.SystemBuffer) - return STATUS_INVALID_USER_BUFFER; - - Flags = (PULONG)IrpContext->Irp->AssociatedIrp.SystemBuffer; - *Flags = 0; - - if (IrpContext->DeviceExt->VolumeFcb->Flags & VCB_IS_DIRTY - && !(IrpContext->DeviceExt->VolumeFcb->Flags & VCB_CLEAR_DIRTY)) - { - *Flags |= VOLUME_IS_DIRTY; - } - - return STATUS_SUCCESS; + PULONG Flags; + + DPRINT("VfatIsVolumeDirty(IrpContext %p)\n", IrpContext); + + if (IrpContext->Stack->Parameters.FileSystemControl.OutputBufferLength != sizeof(ULONG)) + return STATUS_INVALID_BUFFER_SIZE; + else if (!IrpContext->Irp->AssociatedIrp.SystemBuffer) + return STATUS_INVALID_USER_BUFFER; + + Flags = (PULONG)IrpContext->Irp->AssociatedIrp.SystemBuffer; + *Flags = 0; + + if ((IrpContext->DeviceExt->VolumeFcb->Flags & VCB_IS_DIRTY) && + !(IrpContext->DeviceExt->VolumeFcb->Flags & VCB_CLEAR_DIRTY)) + { + *Flags |= VOLUME_IS_DIRTY; + } + + return STATUS_SUCCESS; } -static NTSTATUS -VfatMarkVolumeDirty(PVFAT_IRP_CONTEXT IrpContext) +static +NTSTATUS +VfatMarkVolumeDirty( + PVFAT_IRP_CONTEXT IrpContext) { - ULONG eocMark; - PDEVICE_EXTENSION DeviceExt; - NTSTATUS Status = STATUS_SUCCESS; - - DPRINT("VfatMarkVolumeDirty(IrpContext %p)\n", IrpContext); - DeviceExt = IrpContext->DeviceExt; - - if (!(DeviceExt->VolumeFcb->Flags & VCB_IS_DIRTY)) - { - Status = GetNextCluster(DeviceExt, 1, &eocMark); - if (NT_SUCCESS(Status)) - { - /* unset clean shutdown bit */ - eocMark &= ~DeviceExt->CleanShutBitMask; - Status = WriteCluster(DeviceExt, 1, eocMark); - } - } - - DeviceExt->VolumeFcb->Flags &= ~VCB_CLEAR_DIRTY; - - return Status; + ULONG eocMark; + PDEVICE_EXTENSION DeviceExt; + NTSTATUS Status = STATUS_SUCCESS; + + DPRINT("VfatMarkVolumeDirty(IrpContext %p)\n", IrpContext); + DeviceExt = IrpContext->DeviceExt; + + if (!(DeviceExt->VolumeFcb->Flags & VCB_IS_DIRTY)) + { + Status = GetNextCluster(DeviceExt, 1, &eocMark); + if (NT_SUCCESS(Status)) + { + /* unset clean shutdown bit */ + eocMark &= ~DeviceExt->CleanShutBitMask; + Status = WriteCluster(DeviceExt, 1, eocMark); + } + } + + DeviceExt->VolumeFcb->Flags &= ~VCB_CLEAR_DIRTY; + + return Status; } -NTSTATUS VfatFileSystemControl(PVFAT_IRP_CONTEXT IrpContext) /* * FUNCTION: File system control */ +NTSTATUS +VfatFileSystemControl( + PVFAT_IRP_CONTEXT IrpContext) { - - NTSTATUS Status; - - DPRINT("VfatFileSystemControl(IrpContext %p)\n", IrpContext); - - ASSERT(IrpContext); - ASSERT(IrpContext->Irp); - ASSERT(IrpContext->Stack); - - IrpContext->Irp->IoStatus.Information = 0; - - switch (IrpContext->MinorFunction) - { - case IRP_MN_KERNEL_CALL: - case IRP_MN_USER_FS_REQUEST: - switch(IrpContext->Stack->Parameters.DeviceIoControl.IoControlCode) - { - case FSCTL_GET_VOLUME_BITMAP: - Status = VfatGetVolumeBitmap(IrpContext); - break; - case FSCTL_GET_RETRIEVAL_POINTERS: - Status = VfatGetRetrievalPointers(IrpContext); - break; - case FSCTL_MOVE_FILE: - Status = VfatMoveFile(IrpContext); - break; - case FSCTL_IS_VOLUME_DIRTY: - Status = VfatIsVolumeDirty(IrpContext); - break; - case FSCTL_MARK_VOLUME_DIRTY: - Status = VfatMarkVolumeDirty(IrpContext); - break; - default: - Status = STATUS_INVALID_DEVICE_REQUEST; - } - break; - - case IRP_MN_MOUNT_VOLUME: - Status = VfatMount(IrpContext); - break; - - case IRP_MN_VERIFY_VOLUME: - DPRINT("VFATFS: IRP_MN_VERIFY_VOLUME\n"); - Status = VfatVerify(IrpContext); - break; - - default: - DPRINT("VFAT FSC: MinorFunction %u\n", IrpContext->MinorFunction); - Status = STATUS_INVALID_DEVICE_REQUEST; - break; - } - - IrpContext->Irp->IoStatus.Status = Status; - - IoCompleteRequest (IrpContext->Irp, IO_NO_INCREMENT); - VfatFreeIrpContext(IrpContext); - return (Status); + NTSTATUS Status; + + DPRINT("VfatFileSystemControl(IrpContext %p)\n", IrpContext); + + ASSERT(IrpContext); + ASSERT(IrpContext->Irp); + ASSERT(IrpContext->Stack); + + IrpContext->Irp->IoStatus.Information = 0; + + switch (IrpContext->MinorFunction) + { + case IRP_MN_KERNEL_CALL: + case IRP_MN_USER_FS_REQUEST: + switch(IrpContext->Stack->Parameters.DeviceIoControl.IoControlCode) + { + case FSCTL_GET_VOLUME_BITMAP: + Status = VfatGetVolumeBitmap(IrpContext); + break; + + case FSCTL_GET_RETRIEVAL_POINTERS: + Status = VfatGetRetrievalPointers(IrpContext); + break; + + case FSCTL_MOVE_FILE: + Status = VfatMoveFile(IrpContext); + break; + + case FSCTL_IS_VOLUME_DIRTY: + Status = VfatIsVolumeDirty(IrpContext); + break; + + case FSCTL_MARK_VOLUME_DIRTY: + Status = VfatMarkVolumeDirty(IrpContext); + break; + + default: + Status = STATUS_INVALID_DEVICE_REQUEST; + } + break; + + case IRP_MN_MOUNT_VOLUME: + Status = VfatMount(IrpContext); + break; + + case IRP_MN_VERIFY_VOLUME: + DPRINT("VFATFS: IRP_MN_VERIFY_VOLUME\n"); + Status = VfatVerify(IrpContext); + break; + + default: + DPRINT("VFAT FSC: MinorFunction %u\n", IrpContext->MinorFunction); + Status = STATUS_INVALID_DEVICE_REQUEST; + break; + } + + IrpContext->Irp->IoStatus.Status = Status; + + IoCompleteRequest(IrpContext->Irp, IO_NO_INCREMENT); + VfatFreeIrpContext(IrpContext); + return Status; } Modified: trunk/reactos/drivers/filesystems/fastfat/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/misc.c [iso-8859-1] Thu Dec 12 13:51:50 2013 @@ -159,12 +159,12 @@ { Status = STATUS_INSUFFICIENT_RESOURCES; Irp->IoStatus.Status = Status; - IoCompleteRequest (Irp, IO_NO_INCREMENT); + IoCompleteRequest(Irp, IO_NO_INCREMENT); } else { FsRtlEnterFileSystem(); - Status = VfatDispatchRequest (IrpContext); + Status = VfatDispatchRequest(IrpContext); FsRtlExitFileSystem(); } return Status; Modified: trunk/reactos/drivers/filesystems/fastfat/vfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] Thu Dec 12 13:51:50 2013 @@ -15,94 +15,94 @@ #include <pshpack1.h> struct _BootSector { - unsigned char magic0, res0, magic1; - unsigned char OEMName[8]; - unsigned short BytesPerSector; - unsigned char SectorsPerCluster; - unsigned short ReservedSectors; - unsigned char FATCount; - unsigned short RootEntries, Sectors; - unsigned char Media; - unsigned short FATSectors, SectorsPerTrack, Heads; - unsigned long HiddenSectors, SectorsHuge; - unsigned char Drive, Res1, Sig; - unsigned long VolumeID; - unsigned char VolumeLabel[11], SysType[8]; - unsigned char Res2[448]; - unsigned short Signatur1; + unsigned char magic0, res0, magic1; + unsigned char OEMName[8]; + unsigned short BytesPerSector; + unsigned char SectorsPerCluster; + unsigned short ReservedSectors; + unsigned char FATCount; + unsigned short RootEntries, Sectors; + unsigned char Media; + unsigned short FATSectors, SectorsPerTrack, Heads; + unsigned long HiddenSectors, SectorsHuge; + unsigned char Drive, Res1, Sig; + unsigned long VolumeID; + unsigned char VolumeLabel[11], SysType[8]; + unsigned char Res2[448]; + unsigned short Signatur1; }; struct _BootSector32 { - unsigned char magic0, res0, magic1; // 0 - unsigned char OEMName[8]; // 3 - unsigned short BytesPerSector; // 11 - unsigned char SectorsPerCluster; // 13 - unsigned short ReservedSectors; // 14 - unsigned char FATCount; // 16 - unsigned short RootEntries, Sectors; // 17 - unsigned char Media; // 21 - unsigned short FATSectors, SectorsPerTrack, Heads; // 22 - unsigned long HiddenSectors, SectorsHuge; // 28 - unsigned long FATSectors32; // 36 - unsigned short ExtFlag; // 40 - unsigned short FSVersion; // 42 - unsigned long RootCluster; // 44 - unsigned short FSInfoSector; // 48 - unsigned short BootBackup; // 50 - unsigned char Res3[12]; // 52 - unsigned char Drive; // 64 - unsigned char Res4; // 65 - unsigned char ExtBootSignature; // 66 - unsigned long VolumeID; // 67 - unsigned char VolumeLabel[11], SysType[8]; // 71 - unsigned char Res2[420]; // 90 - unsigned short Signature1; // 510 + unsigned char magic0, res0, magic1; // 0 + unsigned char OEMName[8]; // 3 + unsigned short BytesPerSector; // 11 + unsigned char SectorsPerCluster; // 13 + unsigned short ReservedSectors; // 14 + unsigned char FATCount; // 16 + unsigned short RootEntries, Sectors; // 17 + unsigned char Media; // 21 + unsigned short FATSectors, SectorsPerTrack, Heads; // 22 + unsigned long HiddenSectors, SectorsHuge; // 28 + unsigned long FATSectors32; // 36 + unsigned short ExtFlag; // 40 + unsigned short FSVersion; // 42 + unsigned long RootCluster; // 44 + unsigned short FSInfoSector; // 48 + unsigned short BootBackup; // 50 + unsigned char Res3[12]; // 52 + unsigned char Drive; // 64 + unsigned char Res4; // 65 + unsigned char ExtBootSignature; // 66 + unsigned long VolumeID; // 67 + unsigned char VolumeLabel[11], SysType[8]; // 71 + unsigned char Res2[420]; // 90 + unsigned short Signature1; // 510 }; struct _BootSectorFatX { - unsigned char SysType[4]; // 0 - unsigned long VolumeID; // 4 - unsigned long SectorsPerCluster; // 8 - unsigned short FATCount; // 12 - unsigned long Unknown; // 14 - unsigned char Unused[4078]; // 18 + unsigned char SysType[4]; // 0 + unsigned long VolumeID; // 4 + unsigned long SectorsPerCluster; // 8 + unsigned short FATCount; // 12 + unsigned long Unknown; // 14 + unsigned char Unused[4078]; // 18 }; struct _FsInfoSector { - unsigned long ExtBootSignature2; // 0 - unsigned char Res6[480]; // 4 - unsigned long FSINFOSignature; // 484 - unsigned long FreeCluster; // 488 - unsigned long NextCluster; // 492 - unsigned char Res7[12]; // 496 - unsigned long Signatur2; // 508 + unsigned long ExtBootSignature2; // 0 + unsigned char Res6[480]; // 4 + unsigned long FSINFOSignature; // 484 + unsigned long FreeCluster; // 488 + unsigned long NextCluster; // 492 + unsigned char Res7[12]; // 496 + unsigned long Signatur2; // 508 }; typedef struct _BootSector BootSector; struct _FATDirEntry { - union - { - struct { unsigned char Filename[8], Ext[3]; }; - unsigned char ShortName[11]; - }; - unsigned char Attrib; - unsigned char lCase; - unsigned char CreationTimeMs; - unsigned short CreationTime,CreationDate,AccessDate; - union - { - unsigned short FirstClusterHigh; // FAT32 - unsigned short ExtendedAttributes; // FAT12/FAT16 - }; - unsigned short UpdateTime; //time create/update - unsigned short UpdateDate; //date create/update - unsigned short FirstCluster; - unsigned long FileSize; + union + { + struct { unsigned char Filename[8], Ext[3]; }; + unsigned char ShortName[11]; + }; + unsigned char Attrib; + unsigned char lCase; + unsigned char CreationTimeMs; + unsigned short CreationTime,CreationDate,AccessDate; + union + { + unsigned short FirstClusterHigh; // FAT32 + unsigned short ExtendedAttributes; // FAT12/FAT16 + }; + unsigned short UpdateTime; //time create/update + unsigned short UpdateDate; //date create/update + unsigned short FirstCluster; + unsigned long FileSize; }; #define FAT_EAFILE "EA DATA. SF" @@ -111,62 +111,62 @@ struct _EAFileHeader { - unsigned short Signature; // ED - unsigned short Unknown[15]; - unsigned short EASetTable[240]; + unsigned short Signature; // ED + unsigned short Unknown[15]; + unsigned short EASetTable[240]; }; typedef struct _EASetHeader FAT_EA_SET_HEADER, *PFAT_EA_SET_HEADER; struct _EASetHeader { - unsigned short Signature; // EA - unsigned short Offset; // relative offset, same value as in the EASetTable - unsigned short Unknown1[2]; - char TargetFileName[12]; - unsigned short Unknown2[3]; - unsigned int EALength; - // EA Header + unsigned short Signature; // EA + unsigned short Offset; // relative offset, same value as in the EASetTable + unsigned short Unknown1[2]; + char TargetFileName[12]; + unsigned short Unknown2[3]; + unsigned int EALength; + // EA Header }; typedef struct _EAHeader FAT_EA_HEADER, *PFAT_EA_HEADER; struct _EAHeader { - unsigned char Unknown; - unsigned char EANameLength; - unsigned short EAValueLength; - // Name Data - // Value Data + unsigned char Unknown; + unsigned char EANameLength; + unsigned short EAValueLength; + // Name Data + // Value Data }; typedef struct _FATDirEntry FAT_DIR_ENTRY, *PFAT_DIR_ENTRY; struct _FATXDirEntry { - unsigned char FilenameLength; // 0 - unsigned char Attrib; // 1 - unsigned char Filename[42]; // 2 - unsigned long FirstCluster; // 44 - unsigned long FileSize; // 48 - unsigned short UpdateTime; // 52 - unsigned short UpdateDate; // 54 - unsigned short CreationTime; // 56 - unsigned short CreationDate; // 58 - unsigned short AccessTime; // 60 - unsigned short AccessDate; // 62 + unsigned char FilenameLength; // 0 + unsigned char Attrib; // 1 + unsigned char Filename[42]; // 2 + unsigned long FirstCluster; // 44 + unsigned long FileSize; // 48 + unsigned short UpdateTime; // 52 + unsigned short UpdateDate; // 54 + unsigned short CreationTime; // 56 + unsigned short CreationDate; // 58 + unsigned short AccessTime; // 60 + unsigned short AccessDate; // 62 }; struct _slot { - unsigned char id; // sequence number for slot - WCHAR name0_4[5]; // first 5 characters in name - unsigned char attr; // attribute byte - unsigned char reserved; // always 0 - unsigned char alias_checksum; // checksum for 8.3 alias - WCHAR name5_10[6]; // 6 more characters in name - unsigned char start[2]; // starting cluster number - WCHAR name11_12[2]; // last 2 characters in name + unsigned char id; // sequence number for slot + WCHAR name0_4[5]; // first 5 characters in name + unsigned char attr; // attribute byte + unsigned char reserved; // always 0 + unsigned char alias_checksum; // checksum for 8.3 alias + WCHAR name5_10[6]; // 6 more characters in name + unsigned char start[2]; // starting cluster number + WCHAR name11_12[2]; // last 2 characters in name }; typedef struct _slot slot; @@ -199,8 +199,8 @@ union _DIR_ENTRY { - FAT_DIR_ENTRY Fat; - FATX_DIR_ENTRY FatX; + FAT_DIR_ENTRY Fat; + FATX_DIR_ENTRY FatX; }; typedef union _DIR_ENTRY DIR_ENTRY, *PDIR_ENTRY; @@ -221,21 +221,21 @@ typedef struct { - ULONG VolumeID; - ULONG FATStart; - ULONG FATCount; - ULONG FATSectors; - ULONG rootDirectorySectors; - ULONG rootStart; - ULONG dataStart; - ULONG RootCluster; - ULONG SectorsPerCluster; - ULONG BytesPerSector; - ULONG BytesPerCluster; - ULONG NumberOfClusters; - ULONG FatType; - ULONG Sectors; - BOOLEAN FixedMedia; + ULONG VolumeID; + ULONG FATStart; + ULONG FATCount; + ULONG FATSectors; + ULONG rootDirectorySectors; + ULONG rootStart; + ULONG dataStart; + ULONG RootCluster; + ULONG SectorsPerCluster; + ULONG BytesPerSector; + ULONG BytesPerCluster; + ULONG NumberOfClusters; + ULONG FatType; + ULONG Sectors; + BOOLEAN FixedMedia; } FATINFO, *PFATINFO; struct _VFATFCB; @@ -243,9 +243,9 @@ typedef struct _HASHENTRY { - ULONG Hash; - struct _VFATFCB* self; - struct _HASHENTRY* next; + ULONG Hash; + struct _VFATFCB* self; + struct _HASHENTRY* next; } HASHENTRY; @@ -261,49 +261,49 @@ typedef struct DEVICE_EXTENSION { - ERESOURCE DirResource; - ERESOURCE FatResource; - - KSPIN_LOCK FcbListLock; - LIST_ENTRY FcbListHead; - ULONG HashTableSize; - struct _HASHENTRY** FcbHashTable; - - PDEVICE_OBJECT StorageDevice; - PFILE_OBJECT FATFileObject; - FATINFO FatInfo; - ULONG LastAvailableCluster; - ULONG AvailableClusters; - BOOLEAN AvailableClustersValid; - ULONG Flags; - struct _VFATFCB * VolumeFcb; - - /* Pointers to functions for manipulating FAT. */ - PGET_NEXT_CLUSTER GetNextCluster; - PFIND_AND_MARK_AVAILABLE_CLUSTER FindAndMarkAvailableCluster; - PWRITE_CLUSTER WriteCluster; - ULONG CleanShutBitMask; - - /* Pointers to functions for manipulating directory entries. */ - PGET_NEXT_DIR_ENTRY GetNextDirEntry; - - ULONG BaseDateYear; - - LIST_ENTRY VolumeListEntry; + ERESOURCE DirResource; + ERESOURCE FatResource; + + KSPIN_LOCK FcbListLock; + LIST_ENTRY FcbListHead; + ULONG HashTableSize; + struct _HASHENTRY **FcbHashTable; + + PDEVICE_OBJECT StorageDevice; + PFILE_OBJECT FATFileObject; + FATINFO FatInfo; + ULONG LastAvailableCluster; + ULONG AvailableClusters; + BOOLEAN AvailableClustersValid; + ULONG Flags; + struct _VFATFCB *VolumeFcb; + + /* Pointers to functions for manipulating FAT. */ + PGET_NEXT_CLUSTER GetNextCluster; + PFIND_AND_MARK_AVAILABLE_CLUSTER FindAndMarkAvailableCluster; + PWRITE_CLUSTER WriteCluster; + ULONG CleanShutBitMask; + + /* Pointers to functions for manipulating directory entries. */ + PGET_NEXT_DIR_ENTRY GetNextDirEntry; + + ULONG BaseDateYear; + + LIST_ENTRY VolumeListEntry; } DEVICE_EXTENSION, VCB, *PVCB; typedef struct { - PDRIVER_OBJECT DriverObject; - PDEVICE_OBJECT DeviceObject; - ULONG Flags; - ERESOURCE VolumeListLock; - LIST_ENTRY VolumeListHead; - NPAGED_LOOKASIDE_LIST FcbLookasideList; - NPAGED_LOOKASIDE_LIST CcbLookasideList; - NPAGED_LOOKASIDE_LIST IrpContextLookasideList; - FAST_IO_DISPATCH FastIoDispatch; - CACHE_MANAGER_CALLBACKS CacheMgrCallbacks; + PDRIVER_OBJECT DriverObject; + PDEVICE_OBJECT DeviceObject; + ULONG Flags; + ERESOURCE VolumeListLock; + LIST_ENTRY VolumeListHead; + NPAGED_LOOKASIDE_LIST FcbLookasideList; + NPAGED_LOOKASIDE_LIST CcbLookasideList; + NPAGED_LOOKASIDE_LIST IrpContextLookasideList; + FAST_IO_DISPATCH FastIoDispatch; + CACHE_MANAGER_CALLBACKS CacheMgrCallbacks; } VFAT_GLOBAL_DATA, *PVFAT_GLOBAL_DATA; extern PVFAT_GLOBAL_DATA VfatGlobalData; @@ -318,90 +318,90 @@ typedef struct _VFATFCB { - /* FCB header required by ROS/NT */ - FSRTL_COMMON_FCB_HEADER RFCB; - SECTION_OBJECT_POINTERS SectionObjectPointers; - ERESOURCE MainResource; - ERESOURCE PagingIoResource; - /* end FCB header required by ROS/NT */ - - /* directory entry for this file or directory */ - DIR_ENTRY entry; - - /* Pointer to attributes in entry */ - PUCHAR Attributes; - - /* long file name, points into PathNameBuffer */ - UNICODE_STRING LongNameU; - - /* short file name */ - UNICODE_STRING ShortNameU; - - /* directory name, points into PathNameBuffer */ - UNICODE_STRING DirNameU; - - /* path + long file name 260 max*/ - UNICODE_STRING PathNameU; - - /* buffer for PathNameU */ - PWCHAR PathNameBuffer; - - /* buffer for ShortNameU */ - WCHAR ShortNameBuffer[13]; - - /* */ - LONG RefCount; - - /* List of FCB's for this volume */ - LIST_ENTRY FcbListEntry; - - /* pointer to the parent fcb */ - struct _VFATFCB* parentFcb; - - /* Flags for the fcb */ - ULONG Flags; - - /* pointer to the file object which has initialized the fcb */ - PFILE_OBJECT FileObject; - - /* Directory index for the short name entry */ - ULONG dirIndex; - - /* Directory index where the long name starts */ - ULONG startIndex; - - /* Share access for the file object */ - SHARE_ACCESS FCBShareAccess; - - /* Incremented on IRP_MJ_CREATE, decremented on IRP_MJ_CLEANUP */ - ULONG OpenHandleCount; - - /* Entry into the hash table for the path + long name */ - HASHENTRY Hash; - - /* Entry into the hash table for the path + short name */ - HASHENTRY ShortHash; - - /* List of byte-range locks for this file */ - FILE_LOCK FileLock; - - /* - * Optimalization: caching of last read/write cluster+offset pair. Can't - * be in VFATCCB because it must be reset everytime the allocated clusters - * change. - */ - FAST_MUTEX LastMutex; - ULONG LastCluster; - ULONG LastOffset; + /* FCB header required by ROS/NT */ + FSRTL_COMMON_FCB_HEADER RFCB; + SECTION_OBJECT_POINTERS SectionObjectPointers; + ERESOURCE MainResource; + ERESOURCE PagingIoResource; + /* end FCB header required by ROS/NT */ + + /* directory entry for this file or directory */ + DIR_ENTRY entry; + + /* Pointer to attributes in entry */ + PUCHAR Attributes; + + /* long file name, points into PathNameBuffer */ + UNICODE_STRING LongNameU; + + /* short file name */ + UNICODE_STRING ShortNameU; + + /* directory name, points into PathNameBuffer */ + UNICODE_STRING DirNameU; + + /* path + long file name 260 max*/ + UNICODE_STRING PathNameU; + + /* buffer for PathNameU */ + PWCHAR PathNameBuffer; + + /* buffer for ShortNameU */ + WCHAR ShortNameBuffer[13]; + + /* */ + LONG RefCount; + + /* List of FCB's for this volume */ + LIST_ENTRY FcbListEntry; + + /* pointer to the parent fcb */ + struct _VFATFCB *parentFcb; + + /* Flags for the fcb */ + ULONG Flags; + + /* pointer to the file object which has initialized the fcb */ + PFILE_OBJECT FileObject; + + /* Directory index for the short name entry */ + ULONG dirIndex; + + /* Directory index where the long name starts */ + ULONG startIndex; + + /* Share access for the file object */ + SHARE_ACCESS FCBShareAccess; + + /* Incremented on IRP_MJ_CREATE, decremented on IRP_MJ_CLEANUP */ + ULONG OpenHandleCount; + + /* Entry into the hash table for the path + long name */ + HASHENTRY Hash; + + /* Entry into the hash table for the path + short name */ + HASHENTRY ShortHash; + + /* List of byte-range locks for this file */ + FILE_LOCK FileLock; + + /* + * Optimalization: caching of last read/write cluster+offset pair. Can't + * be in VFATCCB because it must be reset everytime the allocated clusters + * change. + */ + FAST_MUTEX LastMutex; + ULONG LastCluster; + ULONG LastOffset; } VFATFCB, *PVFATFCB; typedef struct _VFATCCB { - LARGE_INTEGER CurrentByteOffset; - /* for DirectoryControl */ - ULONG Entry; - /* for DirectoryControl */ - UNICODE_STRING SearchPattern; + LARGE_INTEGER CurrentByteOffset; + /* for DirectoryControl */ + ULONG Entry; + /* for DirectoryControl */ + UNICODE_STRING SearchPattern; } VFATCCB, *PVFATCCB; #define TAG_CCB 'BCCV' @@ -413,17 +413,17 @@ typedef struct __DOSTIME { - USHORT Second:5; - USHORT Minute:6; - USHORT Hour:5; + USHORT Second:5; + USHORT Minute:6; + USHORT Hour:5; } DOSTIME, *PDOSTIME; typedef struct __DOSDATE { - USHORT Day:5; - USHORT Month:4; - USHORT Year:7; + USHORT Day:5; + USHORT Month:4; + USHORT Year:7; } DOSDATE, *PDOSDATE; @@ -432,352 +432,522 @@ typedef struct { - PIRP Irp; - PDEVICE_OBJECT DeviceObject; - PDEVICE_EXTENSION DeviceExt; - ULONG Flags; - WORK_QUEUE_ITEM WorkQueueItem; - PIO_STACK_LOCATION Stack; - UCHAR MajorFunction; - UCHAR MinorFunction; - PFILE_OBJECT FileObject; - ULONG RefCount; - KEVENT Event; + PIRP Irp; + PDEVICE_OBJECT DeviceObject; + PDEVICE_EXTENSION DeviceExt; + ULONG Flags; + WORK_QUEUE_ITEM WorkQueueItem; + PIO_STACK_LOCATION Stack; + UCHAR MajorFunction; + UCHAR MinorFunction; + PFILE_OBJECT FileObject; + ULONG RefCount; + KEVENT Event; } VFAT_IRP_CONTEXT, *PVFAT_IRP_CONTEXT; typedef struct _VFAT_DIRENTRY_CONTEXT { - ULONG StartIndex; - ULONG DirIndex; - DIR_ENTRY DirEntry; - UNICODE_STRING LongNameU; - UNICODE_STRING ShortNameU; + ULONG StartIndex; + ULONG DirIndex; + DIR_ENTRY DirEntry; + UNICODE_STRING LongNameU; + UNICODE_STRING ShortNameU; } VFAT_DIRENTRY_CONTEXT, *PVFAT_DIRENTRY_CONTEXT; -/* ------------------------------------------------------ shutdown.c */ - -DRIVER_DISPATCH VfatShutdown; -NTSTATUS NTAPI VfatShutdown (PDEVICE_OBJECT DeviceObject, - PIRP Irp); - -/* -------------------------------------------------------- volume.c */ - -NTSTATUS VfatQueryVolumeInformation (PVFAT_IRP_CONTEXT IrpContext); - -NTSTATUS VfatSetVolumeInformation (PVFAT_IRP_CONTEXT IrpContext); - -/* ------------------------------------------------------ blockdev.c */ - -NTSTATUS VfatReadDisk(IN PDEVICE_OBJECT pDeviceObject, - IN PLARGE_INTEGER ReadOffset, - IN ULONG ReadLength, - IN PUCHAR Buffer, - IN BOOLEAN Override); - -NTSTATUS VfatReadDiskPartial (IN PVFAT_IRP_CONTEXT IrpContext, - IN PLARGE_INTEGER ReadOffset, - IN ULONG ReadLength, - IN ULONG BufferOffset, - IN BOOLEAN Wait); - -NTSTATUS VfatWriteDiskPartial(IN PVFAT_IRP_CONTEXT IrpContext, - IN PLARGE_INTEGER WriteOffset, - IN ULONG WriteLength, - IN ULONG BufferOffset, - IN BOOLEAN Wait); - -NTSTATUS VfatBlockDeviceIoControl (IN PDEVICE_OBJECT DeviceObject, - IN ULONG CtlCode, - IN PVOID InputBuffer, - IN ULONG InputBufferSize, - IN OUT PVOID OutputBuffer, - IN OUT PULONG pOutputBufferSize, - IN BOOLEAN Override); - -/* ----------------------------------------------------------- dir.c */ - -NTSTATUS VfatDirectoryControl (PVFAT_IRP_CONTEXT); - -BOOLEAN FsdDosDateTimeToSystemTime (PDEVICE_EXTENSION DeviceExt, - USHORT DosDate, - USHORT DosTime, - PLARGE_INTEGER SystemTime); - -BOOLEAN FsdSystemTimeToDosDateTime (PDEVICE_EXTENSION DeviceExt, - PLARGE_INTEGER SystemTime, - USHORT *pDosDate, - USHORT *pDosTime); - -/* -------------------------------------------------------- create.c */ - -NTSTATUS VfatCreate (PVFAT_IRP_CONTEXT IrpContext); - -NTSTATUS FindFile (PDEVICE_EXTENSION DeviceExt, - PVFATFCB Parent, - PUNICODE_STRING FileToFindU, - PVFAT_DIRENTRY_CONTEXT DirContext, - BOOLEAN First); - -VOID vfat8Dot3ToString (PFAT_DIR_ENTRY pEntry, - PUNICODE_STRING NameU); - -NTSTATUS ReadVolumeLabel(PDEVICE_EXTENSION DeviceExt, - PVPB Vpb); - -/* --------------------------------------------------------- close.c */ - -NTSTATUS VfatClose (PVFAT_IRP_CONTEXT IrpContext); - -NTSTATUS VfatCloseFile(PDEVICE_EXTENSION DeviceExt, - PFILE_OBJECT FileObject); - -/* ------------------------------------------------------- cleanup.c */ - -NTSTATUS VfatCleanup (PVFAT_IRP_CONTEXT IrpContext); - -/* --------------------------------------------------------- fastio.c */ - -VOID -VfatInitFastIoRoutines(PFAST_IO_DISPATCH FastIoDispatch); - -BOOLEAN NTAPI -VfatAcquireForLazyWrite(IN PVOID Context, - IN BOOLEAN Wait); - -VOID NTAPI -VfatReleaseFromLazyWrite(IN PVOID Context); - -BOOLEAN NTAPI -VfatAcquireForReadAhead(IN PVOID Context, - IN BOOLEAN Wait); - -VOID NTAPI -VfatReleaseFromReadAhead(IN PVOID Context); - -/* --------------------------------------------------------- fsctl.c */ - -NTSTATUS VfatFileSystemControl (PVFAT_IRP_CONTEXT IrpContext); - -/* --------------------------------------------------------- finfo.c */ - -NTSTATUS VfatQueryInformation (PVFAT_IRP_CONTEXT IrpContext); - -NTSTATUS VfatSetInformation (PVFAT_IRP_CONTEXT IrpContext); - -NTSTATUS -VfatSetAllocationSizeInformation(PFILE_OBJECT FileObject, - PVFATFCB Fcb, - PDEVICE_EXTENSION DeviceExt, - PLARGE_INTEGER AllocationSize); - -/* --------------------------------------------------------- iface.c */ - -NTSTATUS NTAPI DriverEntry (PDRIVER_OBJECT DriverObject, - PUNICODE_STRING RegistryPath); - -/* --------------------------------------------------------- dirwr.c */ - -NTSTATUS VfatAddEntry (PDEVICE_EXTENSION DeviceExt, - PUNICODE_STRING PathNameU, - PVFATFCB* Fcb, - PVFATFCB ParentFcb, - ULONG RequestedOptions, - UCHAR ReqAttr); - -NTSTATUS VfatUpdateEntry (PVFATFCB pFcb); - -NTSTATUS VfatDelEntry(PDEVICE_EXTENSION, PVFATFCB); +/* blockdev.c */ + +NTSTATUS +VfatReadDisk( + IN PDEVICE_OBJECT pDeviceObject, + IN PLARGE_INTEGER ReadOffset, + IN ULONG ReadLength, + IN PUCHAR Buffer, + IN BOOLEAN Override); + +NTSTATUS +VfatReadDiskPartial( + IN PVFAT_IRP_CONTEXT IrpContext, + IN PLARGE_INTEGER ReadOffset, + IN ULONG ReadLength, + IN ULONG BufferOffset, + IN BOOLEAN Wait); + +NTSTATUS +VfatWriteDiskPartial( + IN PVFAT_IRP_CONTEXT IrpContext, + IN PLARGE_INTEGER WriteOffset, + IN ULONG WriteLength, + IN ULONG BufferOffset, + IN BOOLEAN Wait); + +NTSTATUS +VfatBlockDeviceIoControl( + IN PDEVICE_OBJECT DeviceObject, + IN ULONG CtlCode, + IN PVOID InputBuffer, + IN ULONG InputBufferSize, + IN OUT PVOID OutputBuffer, + IN OUT PULONG pOutputBufferSize, + IN BOOLEAN Override); + +/* cleanup.c */ + +NTSTATUS +VfatCleanup( + PVFAT_IRP_CONTEXT IrpContext); + +/* close.c */ + +NTSTATUS +VfatClose( + PVFAT_IRP_CONTEXT IrpContext); + +NTSTATUS +VfatCloseFile( + PDEVICE_EXTENSION DeviceExt, + PFILE_OBJECT FileObject); + +/* create.c */ + +NTSTATUS +VfatCreate( + PVFAT_IRP_CONTEXT IrpContext); + +NTSTATUS +FindFile( + PDEVICE_EXTENSION DeviceExt, + PVFATFCB Parent, + PUNICODE_STRING FileToFindU, + PVFAT_DIRENTRY_CONTEXT DirContext, + BOOLEAN First); + +VOID +vfat8Dot3ToString( + PFAT_DIR_ENTRY pEntry, + PUNICODE_STRING NameU); + +NTSTATUS +ReadVolumeLabel( + PDEVICE_EXTENSION DeviceExt, + PVPB Vpb); + +/* dir.c */ + +NTSTATUS +VfatDirectoryControl( + PVFAT_IRP_CONTEXT IrpContext); BOOLEAN -vfatFindDirSpace(PDEVICE_EXTENSION DeviceExt, - PVFATFCB pDirFcb, - ULONG nbSlots, - PULONG start); - -/* -------------------------------------------------------- string.c */ - -VOID -vfatSplitPathName(PUNICODE_STRING PathNameU, - PUNICODE_STRING DirNameU, - PUNICODE_STRING FileNameU); - -BOOLEAN vfatIsLongIllegal(WCHAR c); - -BOOLEAN wstrcmpjoki (PWSTR s1, - PWSTR s2); - -/* ----------------------------------------------------------- fat.c */ - -NTSTATUS FAT12GetNextCluster(PDEVICE_EXTENSION DeviceExt, - ULONG CurrentCluster, - PULONG NextCluster); - -NTSTATUS FAT12FindAndMarkAvailableCluster(PDEVICE_EXTENSION DeviceExt, - PULONG Cluster); - -NTSTATUS FAT12WriteCluster(PDEVICE_EXTENSION DeviceExt, - ULONG ClusterToWrite, - ULONG NewValue, - PULONG OldValue); - -NTSTATUS FAT16GetNextCluster(PDEVICE_EXTENSION DeviceExt, - ULONG CurrentCluster, - PULONG NextCluster); - -NTSTATUS FAT16FindAndMarkAvailableCluster(PDEVICE_EXTENSION DeviceExt, - PULONG Cluster); - -NTSTATUS FAT16WriteCluster(PDEVICE_EXTENSION DeviceExt, - ULONG ClusterToWrite, - ULONG NewValue, - PULONG OldValue); - -NTSTATUS FAT32GetNextCluster(PDEVICE_EXTENSION DeviceExt, - ULONG CurrentCluster, - PULONG NextCluster); - -NTSTATUS FAT32FindAndMarkAvailableCluster(PDEVICE_EXTENSION DeviceExt, - PULONG Cluster); - -NTSTATUS FAT32WriteCluster(PDEVICE_EXTENSION DeviceExt, - ULONG ClusterToWrite, - ULONG NewValue, - PULONG OldValue); - -NTSTATUS OffsetToCluster (PDEVICE_EXTENSION DeviceExt, - ULONG FirstCluster, - ULONG FileOffset, - PULONG Cluster, - BOOLEAN Extend); - -ULONGLONG ClusterToSector (PDEVICE_EXTENSION DeviceExt, - ULONG Cluster); - -NTSTATUS GetNextCluster (PDEVICE_EXTENSION DeviceExt, - ULONG CurrentCluster, - PULONG NextCluster); - -NTSTATUS GetNextClusterExtend (PDEVICE_EXTENSION DeviceExt, - ULONG CurrentCluster, - PULONG NextCluster); - -NTSTATUS CountAvailableClusters (PDEVICE_EXTENSION DeviceExt, - PLARGE_INTEGER Clusters); - -NTSTATUS -WriteCluster(PDEVICE_EXTENSION DeviceExt, - ULONG ClusterToWrite, - ULONG NewValue); - -/* ------------------------------------------------------ direntry.c */ - -ULONG vfatDirEntryGetFirstCluster (PDEVICE_EXTENSION pDeviceExt, - PDIR_ENTRY pDirEntry); - -BOOLEAN VfatIsDirectoryEmpty(PVFATFCB Fcb); - -NTSTATUS FATGetNextDirEntry(PVOID * pContext, - PVOID * pPage, - IN PVFATFCB pDirFcb, - IN PVFAT_DIRENTRY_CONTEXT DirContext, - BOOLEAN First); - -NTSTATUS FATXGetNextDirEntry(PVOID * pContext, - PVOID * pPage, - IN PVFATFCB pDirFcb, - IN PVFAT_DIRENTRY_CONTEXT DirContext, - BOOLEAN First); - -/* ----------------------------------------------------------- fcb.c */ - -PVFATFCB vfatNewFCB (PDEVICE_EXTENSION pVCB, - PUNICODE_STRING pFileNameU); - -VOID vfatDestroyFCB (PVFATFCB pFCB); - -VOID vfatDestroyCCB(PVFATCCB pCcb); - -VOID vfatGrabFCB (PDEVICE_EXTENSION pVCB, - PVFATFCB pFCB); - -VOID vfatReleaseFCB (PDEVICE_EXTENSION pVCB, - PVFATFCB pFCB); - -VOID vfatAddFCBToTable (PDEVICE_EXTENSION pVCB, - PVFATFCB pFCB); - -PVFATFCB vfatGrabFCBFromTable (PDEVICE_EXTENSION pDeviceExt, - PUNICODE_STRING pFileNameU); - -PVFATFCB vfatMakeRootFCB (PDEVICE_EXTENSION pVCB); - -PVFATFCB vfatOpenRootFCB (PDEVICE_EXTENSION pVCB); - -BOOLEAN vfatFCBIsDirectory (PVFATFCB FCB); - -BOOLEAN vfatFCBIsRoot(PVFATFCB FCB); - -NTSTATUS vfatAttachFCBToFileObject (PDEVICE_EXTENSION vcb, - PVFATFCB fcb, - PFILE_OBJECT fileObject); - -NTSTATUS vfatDirFindFile (PDEVICE_EXTENSION pVCB, - PVFATFCB parentFCB, - PUNICODE_STRING FileToFindU, - PVFATFCB * fileFCB); - -NTSTATUS vfatGetFCBForFile (PDEVICE_EXTENSION pVCB, - PVFATFCB *pParentFCB, - PVFATFCB *pFCB, - PUNICODE_STRING pFileNameU); - -NTSTATUS vfatMakeFCBFromDirEntry (PVCB vcb, - PVFATFCB directoryFCB, - PVFAT_DIRENTRY_CONTEXT DirContext, - PVFATFCB * fileFCB); - -/* ------------------------------------------------------------ rw.c */ - -NTSTATUS VfatRead (PVFAT_IRP_CONTEXT IrpContext); - -NTSTATUS VfatWrite (PVFAT_IRP_CONTEXT IrpContext); - -NTSTATUS NextCluster(PDEVICE_EXTENSION DeviceExt, - ULONG FirstCluster, - PULONG CurrentCluster, - BOOLEAN Extend); - -/* ----------------------------------------------------------- misc.c */ - -NTSTATUS VfatQueueRequest(PVFAT_IRP_CONTEXT IrpContext); - -PVFAT_IRP_CONTEXT VfatAllocateIrpContext(PDEVICE_OBJECT DeviceObject, - PIRP Irp); - -VOID VfatFreeIrpContext(PVFAT_IRP_CONTEXT IrpContext); - -DRIVER_DISPATCH VfatBuildRequest; -NTSTATUS NTAPI VfatBuildRequest (PDEVICE_OBJECT DeviceObject, - PIRP Irp); - -PVOID VfatGetUserBuffer(IN PIRP); - -NTSTATUS VfatLockUserBuffer(IN PIRP, IN ULONG, - IN LOCK_OPERATION); - -NTSTATUS -VfatSetExtendedAttributes(PFILE_OBJECT FileObject, - PVOID Ea, - ULONG EaLength); -/* ------------------------------------------------------------- flush.c */ - -NTSTATUS VfatFlush(PVFAT_IRP_CONTEXT IrpContext); - -NTSTATUS VfatFlushVolume(PDEVICE_EXTENSION DeviceExt, PVFATFCB VolumeFcb); - -/* --------------------------------------------------------------- pnp.c */ - -NTSTATUS VfatPnp(PVFAT_IRP_CONTEXT IrpContext); +FsdDosDateTimeToSystemTime( + PDEVICE_EXTENSION DeviceExt, + USHORT DosDate, + USHORT DosTime, + PLARGE_INTEGER SystemTime); + +BOOLEAN +FsdSystemTimeToDosDateTime( + PDEVICE_EXTENSION DeviceExt, + PLARGE_INTEGER SystemTime, + USHORT *pDosDate, + USHORT *pDosTime); + +/* direntry.c */ + +ULONG +vfatDirEntryGetFirstCluster( + PDEVICE_EXTENSION pDeviceExt, + PDIR_ENTRY pDirEntry); + +BOOLEAN +VfatIsDirectoryEmpty( + PVFATFCB Fcb); + +NTSTATUS +FATGetNextDirEntry( + PVOID *pContext, + PVOID *pPage, + IN PVFATFCB pDirFcb, + IN PVFAT_DIRENTRY_CONTEXT DirContext, + BOOLEAN First); + +NTSTATUS +FATXGetNextDirEntry( + PVOID *pContext, + PVOID *pPage, + IN PVFATFCB pDirFcb, + IN PVFAT_DIRENTRY_CONTEXT DirContext, + BOOLEAN First); + +/* dirwr.c */ + +NTSTATUS +VfatAddEntry( + PDEVICE_EXTENSION DeviceExt, + PUNICODE_STRING PathNameU, + PVFATFCB* Fcb, + PVFATFCB ParentFcb, + ULONG RequestedOptions, + UCHAR ReqAttr); + +NTSTATUS +VfatUpdateEntry( + PVFATFCB pFcb); + +NTSTATUS +VfatDelEntry( + PDEVICE_EXTENSION, + PVFATFCB); + +BOOLEAN +vfatFindDirSpace( + PDEVICE_EXTENSION DeviceExt, + PVFATFCB pDirFcb, + ULONG nbSlots, + PULONG start); + +/* ea.h */ + +NTSTATUS +VfatSetExtendedAttributes( + PFILE_OBJECT FileObject, + PVOID Ea, + ULONG EaLength); + +/* fastio.c */ + +VOID +VfatInitFastIoRoutines( + PFAST_IO_DISPATCH FastIoDispatch); + +BOOLEAN +NTAPI +VfatAcquireForLazyWrite( + IN PVOID Context, + IN BOOLEAN Wait); + +VOID +NTAPI +VfatReleaseFromLazyWrite( + IN PVOID Context); + +BOOLEAN +NTAPI +VfatAcquireForReadAhead( + IN PVOID Context, + IN BOOLEAN Wait); + +VOID +NTAPI +VfatReleaseFromReadAhead( + IN PVOID Context); + +/* fat.c */ + +NTSTATUS +FAT12GetNextCluster( + PDEVICE_EXTENSION DeviceExt, + ULONG CurrentCluster, + PULONG NextCluster); + +NTSTATUS +FAT12FindAndMarkAvailableCluster( + PDEVICE_EXTENSION DeviceExt, + PULONG Cluster); + +NTSTATUS +FAT12WriteCluster( + PDEVICE_EXTENSION DeviceExt, + ULONG ClusterToWrite, + ULONG NewValue, + PULONG OldValue); + +NTSTATUS +FAT16GetNextCluster( + PDEVICE_EXTENSION DeviceExt, + ULONG CurrentCluster, + PULONG NextCluster); + +NTSTATUS +FAT16FindAndMarkAvailableCluster( + PDEVICE_EXTENSION DeviceExt, + PULONG Cluster); + +NTSTATUS +FAT16WriteCluster( + PDEVICE_EXTENSION DeviceExt, + ULONG ClusterToWrite, + ULONG NewValue, + PULONG OldValue); + +NTSTATUS +FAT32GetNextCluster( + PDEVICE_EXTENSION DeviceExt, + ULONG CurrentCluster, + PULONG NextCluster); + +NTSTATUS +FAT32FindAndMarkAvailableCluster( + PDEVICE_EXTENSION DeviceExt, + PULONG Cluster); + +NTSTATUS +FAT32WriteCluster( + PDEVICE_EXTENSION DeviceExt, + ULONG ClusterToWrite, + ULONG NewValue, + PULONG OldValue); + +NTSTATUS +OffsetToCluster( + PDEVICE_EXTENSION DeviceExt, + ULONG FirstCluster, + ULONG FileOffset, + PULONG Cluster, + BOOLEAN Extend); + +ULONGLONG +ClusterToSector( + PDEVICE_EXTENSION DeviceExt, + ULONG Cluster); + +NTSTATUS +GetNextCluster( + PDEVICE_EXTENSION DeviceExt, + ULONG CurrentCluster, + PULONG NextCluster); + +NTSTATUS +GetNextClusterExtend( + PDEVICE_EXTENSION DeviceExt, + ULONG CurrentCluster, + PULONG NextCluster); + +NTSTATUS +CountAvailableClusters( + PDEVICE_EXTENSION DeviceExt, + PLARGE_INTEGER Clusters); + +NTSTATUS +WriteCluster( + PDEVICE_EXTENSION DeviceExt, + ULONG ClusterToWrite, + ULONG NewValue); + +/* fcb.c */ + +PVFATFCB +vfatNewFCB( + PDEVICE_EXTENSION pVCB, + PUNICODE_STRING pFileNameU); + +VOID +vfatDestroyFCB( + PVFATFCB pFCB); + +VOID +vfatDestroyCCB( + PVFATCCB pCcb); + +VOID +vfatGrabFCB( + PDEVICE_EXTENSION pVCB, + PVFATFCB pFCB); + +VOID +vfatReleaseFCB( + PDEVICE_EXTENSION pVCB, + PVFATFCB pFCB); + +VOID +vfatAddFCBToTable( + PDEVICE_EXTENSION pVCB, + PVFATFCB pFCB); + +PVFATFCB +vfatGrabFCBFromTable( + PDEVICE_EXTENSION pDeviceExt, + PUNICODE_STRING pFileNameU); + +PVFATFCB +vfatMakeRootFCB( + PDEVICE_EXTENSION pVCB); + +PVFATFCB +vfatOpenRootFCB( + PDEVICE_EXTENSION pVCB); + +BOOLEAN +vfatFCBIsDirectory( + PVFATFCB FCB); + +BOOLEAN +vfatFCBIsRoot( + PVFATFCB FCB); + +NTSTATUS +vfatAttachFCBToFileObject( + PDEVICE_EXTENSION vcb, + PVFATFCB fcb, + PFILE_OBJECT fileObject); + +NTSTATUS +vfatDirFindFile( + PDEVICE_EXTENSION pVCB, + PVFATFCB parentFCB, + PUNICODE_STRING FileToFindU, + PVFATFCB *fileFCB); + +NTSTATUS +vfatGetFCBForFile( + PDEVICE_EXTENSION pVCB, + PVFATFCB *pParentFCB, + PVFATFCB *pFCB, + PUNICODE_STRING pFileNameU); + +NTSTATUS +vfatMakeFCBFromDirEntry( + PVCB vcb, + PVFATFCB directoryFCB, + PVFAT_DIRENTRY_CONTEXT DirContext, + PVFATFCB *fileFCB); + +/* finfo.c */ + +NTSTATUS +VfatQueryInformation( + PVFAT_IRP_CONTEXT IrpContext); + +NTSTATUS +VfatSetInformation( + PVFAT_IRP_CONTEXT IrpContext); + +NTSTATUS +VfatSetAllocationSizeInformation( + PFILE_OBJECT FileObject, + PVFATFCB Fcb, + PDEVICE_EXTENSION DeviceExt, + PLARGE_INTEGER AllocationSize); + +/* flush.c */ + +NTSTATUS +VfatFlush( + PVFAT_IRP_CONTEXT IrpContext); + +NTSTATUS +VfatFlushVolume( + PDEVICE_EXTENSION DeviceExt, + PVFATFCB VolumeFcb); + +/* fsctl.c */ + +NTSTATUS +VfatFileSystemControl( + PVFAT_IRP_CONTEXT IrpContext); + +/* iface.c */ + +NTSTATUS +NTAPI +DriverEntry( + PDRIVER_OBJECT DriverObject, + PUNICODE_STRING RegistryPath); + + +/* misc.c */ + +NTSTATUS +VfatQueueRequest( + PVFAT_IRP_CONTEXT IrpContext); + +PVFAT_IRP_CONTEXT +VfatAllocateIrpContext( + PDEVICE_OBJECT DeviceObject, + PIRP Irp); + +VOID +VfatFreeIrpContext( + PVFAT_IRP_CONTEXT IrpContext); + +DRIVER_DISPATCH +VfatBuildRequest; + +NTSTATUS +NTAPI +VfatBuildRequest( + PDEVICE_OBJECT DeviceObject, + PIRP Irp); + +PVOID +VfatGetUserBuffer( + IN PIRP); + +NTSTATUS +VfatLockUserBuffer( + IN PIRP, + IN ULONG, + IN LOCK_OPERATION); + +/* pnp.c */ + +NTSTATUS +VfatPnp( + PVFAT_IRP_CONTEXT IrpContext); + +/* rw.c */ + +NTSTATUS +VfatRead( + PVFAT_IRP_CONTEXT IrpContext); + +NTSTATUS +VfatWrite( + PVFAT_IRP_CONTEXT IrpContext); + +NTSTATUS +NextCluster( + PDEVICE_EXTENSION DeviceExt, + ULONG FirstCluster, + PULONG CurrentCluster, + BOOLEAN Extend); + +/* shutdown.c */ + +DRIVER_DISPATCH +VfatShutdown; + +NTSTATUS +NTAPI +VfatShutdown( + PDEVICE_OBJECT DeviceObject, + PIRP Irp); + +/* string.c */ + +VOID +vfatSplitPathName( + PUNICODE_STRING PathNameU, + PUNICODE_STRING DirNameU, + PUNICODE_STRING FileNameU); + +BOOLEAN +vfatIsLongIllegal( + WCHAR c); + +BOOLEAN +wstrcmpjoki( + PWSTR s1, + PWSTR s2); + +/* volume.c */ + +NTSTATUS +VfatQueryVolumeInformation( + PVFAT_IRP_CONTEXT IrpContext); + +NTSTATUS +VfatSetVolumeInformation( + PVFAT_IRP_CONTEXT IrpContext); /* EOF */

10 years, 9 months

[ekohl] 61260: [FASTFAT] Fail, if we try to overwrite an eixting read-only file.

by ekohl＠svn.reactos.org

Author: ekohl Date: Wed Dec 11 11:42:44 2013 New Revision: 61260 URL: http://svn.reactos.org/svn/reactos?rev=61260&view=rev Log: [FASTFAT] Fail, if we try to overwrite an eixting read-only file. Modified: trunk/reactos/drivers/filesystems/fastfat/create.c Modified: trunk/reactos/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] Wed Dec 11 11:42:44 2013 @@ -349,6 +349,7 @@ PDEVICE_EXTENSION DeviceExt, PUNICODE_STRING PathNameU, PFILE_OBJECT FileObject, + ULONG RequestedDisposition, PVFATFCB *ParentFcb) { PVFATFCB Fcb; @@ -404,6 +405,15 @@ vfatReleaseFCB (DeviceExt, Fcb); return STATUS_DELETE_PENDING; } + + /* Fail, if we try to overwrite a read-only file */ + if ((*Fcb->Attributes & FILE_ATTRIBUTE_READONLY) && + (RequestedDisposition == FILE_OVERWRITE)) + { + vfatReleaseFCB(DeviceExt, Fcb); + return STATUS_ACCESS_DENIED; + } + DPRINT("Attaching FCB to fileObject\n"); Status = vfatAttachFCBToFileObject(DeviceExt, Fcb, FileObject); if (!NT_SUCCESS(Status)) @@ -519,7 +529,7 @@ } /* Try opening the file. */ - Status = VfatOpenFile(DeviceExt, &PathNameU, FileObject, &ParentFcb); + Status = VfatOpenFile(DeviceExt, &PathNameU, FileObject, RequestedDisposition, &ParentFcb); /* * If the directory containing the file to open doesn't exist then

10 years, 9 months

← Newer
1
...
18
19
20
21
22
23
24
...
31
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 December 2013