Author: mbosma
Date: Thu Dec 28 19:27:36 2006
New Revision: 25233
URL:
http://svn.reactos.org/svn/reactos?rev=25233&view=rev
Log:
Merge to state of 0.3.1 branch.
Modified:
branches/cache_manager_rewrite/mm/anonmem.c
branches/cache_manager_rewrite/mm/drvlck.c
branches/cache_manager_rewrite/mm/elf.inc.h
branches/cache_manager_rewrite/mm/marea.c
branches/cache_manager_rewrite/mm/mm.c
branches/cache_manager_rewrite/mm/mminit.c
branches/cache_manager_rewrite/mm/ncache.c
branches/cache_manager_rewrite/mm/npool.c
branches/cache_manager_rewrite/mm/pagefile.c
branches/cache_manager_rewrite/mm/pe.c
branches/cache_manager_rewrite/mm/pool.c
branches/cache_manager_rewrite/mm/ppool.c
branches/cache_manager_rewrite/mm/process.c
branches/cache_manager_rewrite/mm/region.c
branches/cache_manager_rewrite/mm/virtual.c
branches/cache_manager_rewrite/vfat/blockdev.c
branches/cache_manager_rewrite/vfat/cleanup.c
branches/cache_manager_rewrite/vfat/close.c
branches/cache_manager_rewrite/vfat/create.c
branches/cache_manager_rewrite/vfat/direntry.c
branches/cache_manager_rewrite/vfat/fastio.c
branches/cache_manager_rewrite/vfat/fat.c
branches/cache_manager_rewrite/vfat/fcb.c
branches/cache_manager_rewrite/vfat/flush.c
branches/cache_manager_rewrite/vfat/iface.c
branches/cache_manager_rewrite/vfat/misc.c
branches/cache_manager_rewrite/vfat/rw.c
branches/cache_manager_rewrite/vfat/string.c
branches/cache_manager_rewrite/vfat/volume.c
Modified: branches/cache_manager_rewrite/mm/anonmem.c
URL:
http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/anonme…
==============================================================================
--- branches/cache_manager_rewrite/mm/anonmem.c (original)
+++ branches/cache_manager_rewrite/mm/anonmem.c Thu Dec 28 19:27:36 2006
@@ -434,7 +434,7 @@
return(STATUS_SUCCESS);
}
-VOID STATIC
+VOID static
MmModifyAttributes(PMADDRESS_SPACE AddressSpace,
PVOID BaseAddress,
ULONG RegionSize,
@@ -765,7 +765,7 @@
return(STATUS_SUCCESS);
}
-VOID STATIC
+VOID static
MmFreeVirtualMemoryPage(PVOID Context,
MEMORY_AREA* MemoryArea,
PVOID Address,
Modified: branches/cache_manager_rewrite/mm/drvlck.c
URL:
http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/drvlck…
==============================================================================
--- branches/cache_manager_rewrite/mm/drvlck.c (original)
+++ branches/cache_manager_rewrite/mm/drvlck.c Thu Dec 28 19:27:36 2006
@@ -39,8 +39,7 @@
VOID STDCALL
MmLockPagableSectionByHandle(IN PVOID ImageSectionHandle)
{
- // MmLockMemoryArea((MEMORY_AREA *)ImageSectionHandle);
- DPRINT1("MmLockPagableSectionByHandle is unimplemented\n");
+ UNIMPLEMENTED;
}
@@ -75,15 +74,19 @@
*/
VOID STDCALL
MmUnlockPagableImageSection(IN PVOID ImageSectionHandle)
-{}
-
+{
+ UNIMPLEMENTED;
+}
/*
* @unimplemented
*/
-VOID STDCALL
+PVOID STDCALL
MmPageEntireDriver(IN PVOID AddressWithinSection)
-{}
+{
+ UNIMPLEMENTED;
+ return NULL;
+}
/*
@@ -91,6 +94,8 @@
*/
VOID STDCALL
MmResetDriverPaging(IN PVOID AddressWithinSection)
-{}
+{
+ UNIMPLEMENTED;
+}
/* EOF */
Modified: branches/cache_manager_rewrite/mm/elf.inc.h
URL:
http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/elf.in…
==============================================================================
--- branches/cache_manager_rewrite/mm/elf.inc.h (original)
+++ branches/cache_manager_rewrite/mm/elf.inc.h Thu Dec 28 19:27:36 2006
@@ -172,12 +172,12 @@
IN ULONG DataType
)
{
- PBYTE p;
+ PUCHAR p;
if(DataType == ELF_TARG_DATA)
return Input;
- p = (PBYTE)&Input;
+ p = (PUCHAR)&Input;
switch(DataType)
{
@@ -195,12 +195,12 @@
IN ULONG DataType
)
{
- PBYTE p;
+ PUCHAR p;
if(DataType == ELF_TARG_DATA)
return Input;
- p = (PBYTE)&Input;
+ p = (PUCHAR)&Input;
switch(DataType)
{
@@ -218,12 +218,12 @@
IN ULONG DataType
)
{
- PBYTE p;
+ PUCHAR p;
if(DataType == ELF_TARG_DATA)
return Input;
- p = (PBYTE)&Input;
+ p = (PUCHAR)&Input;
switch(DataType)
{
@@ -241,12 +241,12 @@
IN ULONG DataType
)
{
- PBYTE p;
+ PUCHAR p;
ULONG64 nSafeInput;
RtlRetrieveUlonglong(&nSafeInput, Input);
- p = (PBYTE)&nSafeInput;
+ p = (PUCHAR)&nSafeInput;
switch(DataType)
{
@@ -264,7 +264,7 @@
IN ULONG DataType
)
{
- PBYTE p;
+ PUCHAR p;
ULONG nSafeInput;
union
{
@@ -277,7 +277,7 @@
if(DataType == ELF_TARG_DATA)
return nSafeInput;
- p = (PBYTE)&nSafeInput;
+ p = (PUCHAR)&nSafeInput;
switch(DataType)
{
@@ -294,10 +294,7 @@
if(Number == 0)
return FALSE;
- while((Number % 2) == 0)
- Number /= 2;
-
- return Number == 1;
+ return (Number & (Number - 1)) == 0;
}
static __inline Elf_Addr ElfFmtpModPow2
Modified: branches/cache_manager_rewrite/mm/marea.c
URL:
http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/marea.…
==============================================================================
--- branches/cache_manager_rewrite/mm/marea.c (original)
+++ branches/cache_manager_rewrite/mm/marea.c Thu Dec 28 19:27:36 2006
@@ -947,9 +947,9 @@
PMEMORY_AREA MemoryArea;
DPRINT("MmCreateMemoryArea(Type %d, BaseAddress %p, "
- "*BaseAddress %p, Length %p, Attributes %x, TopDown: %x, "
+ "*BaseAddress %p, Length %p, AllocationFlags %x, "
"FixedAddress %x, Result %p)\n",
- Type, BaseAddress, *BaseAddress, Length, Attributes, TopDown,
+ Type, BaseAddress, *BaseAddress, Length, AllocationFlags,
FixedAddress, Result);
MmVerifyMemoryAreas(AddressSpace);
Modified: branches/cache_manager_rewrite/mm/mm.c
URL:
http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/mm.c?r…
==============================================================================
--- branches/cache_manager_rewrite/mm/mm.c (original)
+++ branches/cache_manager_rewrite/mm/mm.c Thu Dec 28 19:27:36 2006
@@ -110,6 +110,7 @@
*/
if (Mode != KernelMode)
{
+ DPRINT1("MmAccessFault(Mode %d, Address %x)\n", Mode, Address);
DbgPrint("%s:%d\n",__FILE__,__LINE__);
return(STATUS_UNSUCCESSFUL);
}
@@ -331,21 +332,21 @@
/*
* @unimplemented
*/
-DWORD STDCALL
-MmAdjustWorkingSetSize (DWORD Unknown0,
- DWORD Unknown1,
- DWORD Unknown2)
+ULONG STDCALL
+MmAdjustWorkingSetSize (ULONG Unknown0,
+ ULONG Unknown1,
+ ULONG Unknown2)
{
UNIMPLEMENTED;
return (0);
}
-DWORD
+ULONG
STDCALL
MmDbgTranslatePhysicalAddress (
- DWORD Unknown0,
- DWORD Unknown1
+ ULONG Unknown0,
+ ULONG Unknown1
)
{
UNIMPLEMENTED;
Modified: branches/cache_manager_rewrite/mm/mminit.c
URL:
http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/mminit…
==============================================================================
--- branches/cache_manager_rewrite/mm/mminit.c (original)
+++ branches/cache_manager_rewrite/mm/mminit.c Thu Dec 28 19:27:36 2006
@@ -29,16 +29,12 @@
static BOOLEAN IsThisAnNtAsSystem = FALSE;
-MM_SYSTEM_SIZE MmSystemSize = MmSmallSystem;
+MM_SYSTEMSIZE MmSystemSize = MmSmallSystem;
PHYSICAL_ADDRESS MmSharedDataPagePhysicalAddress;
PVOID MiNonPagedPoolStart;
ULONG MiNonPagedPoolLength;
-
-extern ULONG init_stack;
-extern ULONG init_stack_top;
-extern ULONG trap_stack;
VOID INIT_FUNCTION NTAPI MmInitVirtualMemory(ULONG_PTR LastKernelAddress, ULONG
KernelLength);
@@ -62,7 +58,7 @@
/*
* @implemented
*/
-MM_SYSTEM_SIZE STDCALL MmQuerySystemSize(VOID)
+MM_SYSTEMSIZE STDCALL MmQuerySystemSize(VOID)
{
return(MmSystemSize);
}
@@ -384,7 +380,6 @@
MmInitGlobalKernelPageDirectory();
DbgPrint("Used memory %dKb\n", (MmStats.NrTotalPages * PAGE_SIZE) / 1024);
- DPRINT1("Kernel Stack Limits. InitTop = 0x%x, Init = 0x%x\n",
init_stack_top, init_stack);
LastKernelAddress = (ULONG_PTR)MmInitializePageList(
FirstKrnlPhysAddr,
@@ -395,10 +390,6 @@
AddressRangeCount);
kernel_len = LastKrnlPhysAddr - FirstKrnlPhysAddr;
- /* Unmap the guard pages from the initial stacks */
- MmDeleteVirtualMapping(NULL, (PVOID)(init_stack - PAGE_SIZE), FALSE, NULL, NULL);
- MmDeleteVirtualMapping(NULL, (PVOID)(trap_stack - PAGE_SIZE), FALSE, NULL, NULL);
-
/*
* Unmap low memory
*/
@@ -482,7 +473,7 @@
}
-VOID STATIC
+VOID static
MiFreeInitMemoryPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address,
PFN_TYPE Page, SWAPENTRY SwapEntry,
BOOLEAN Dirty)
Modified: branches/cache_manager_rewrite/mm/ncache.c
URL:
http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/ncache…
==============================================================================
--- branches/cache_manager_rewrite/mm/ncache.c (original)
+++ branches/cache_manager_rewrite/mm/ncache.c Thu Dec 28 19:27:36 2006
@@ -84,7 +84,7 @@
return ((PVOID)Result);
}
-VOID STATIC
+VOID static
MmFreeNonCachedPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address,
PFN_TYPE Page, SWAPENTRY SwapEntry,
BOOLEAN Dirty)
Modified: branches/cache_manager_rewrite/mm/npool.c
URL:
http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/npool.…
==============================================================================
--- branches/cache_manager_rewrite/mm/npool.c (original)
+++ branches/cache_manager_rewrite/mm/npool.c Thu Dec 28 19:27:36 2006
@@ -95,7 +95,7 @@
#define HDR_FREE_SIZE ROUND_UP(sizeof(HDR_FREE), MM_POOL_ALIGNMENT)
-#if defined(NPOOL_REDZONE_CHECK) || #defined(NPOOL_REDZONE_CHECK_FULL)
+#if defined(NPOOL_REDZONE_CHECK) || defined(NPOOL_REDZONE_CHECK_FULL)
#define HDR_USED_SIZE ROUND_UP(sizeof(HDR_USED) + NPOOL_REDZONE_SIZE, MM_POOL_ALIGNMENT)
#else
#define HDR_USED_SIZE ROUND_UP(sizeof(HDR_USED), MM_POOL_ALIGNMENT)
@@ -760,7 +760,7 @@
#endif /* TAG_STATISTICS_TRACKING */
#if defined(TAG_STATISTICS_TRACKING)
-VOID STATIC
+VOID static
MiDumpTagStats(ULONG CurrentTag, ULONG CurrentNrBlocks, ULONG CurrentSize)
{
CHAR c1, c2, c3, c4;
@@ -1106,7 +1106,7 @@
#endif
#if 0
-STATIC VOID
+static VOID
free_pages(HDR_FREE* blk)
{
ULONG start;
@@ -1154,7 +1154,7 @@
*/
{
HDR_FREE* current;
- BOOL UpdatePrevPtr = FALSE;
+ BOOLEAN UpdatePrevPtr = FALSE;
DPRINT("add_to_free_list (%d)\n", blk->hdr.Size);
@@ -1469,10 +1469,10 @@
#if defined(NPOOL_REDZONE_CHECK) || defined(NPOOL_REDZONE_CHECK_FULL)
void check_redzone_header(HDR_USED* hdr)
{
- PBYTE LoZone = (PBYTE)((ULONG_PTR)hdr + HDR_USED_SIZE - NPOOL_REDZONE_SIZE);
- PBYTE HiZone = (PBYTE)((ULONG_PTR)hdr + HDR_USED_SIZE + hdr->UserSize);
- BOOL LoOK = TRUE;
- BOOL HiOK = TRUE;
+ PUCHAR LoZone = (PUCHAR)((ULONG_PTR)hdr + HDR_USED_SIZE - NPOOL_REDZONE_SIZE);
+ PUCHAR HiZone = (PUCHAR)((ULONG_PTR)hdr + HDR_USED_SIZE + hdr->UserSize);
+ BOOLEAN LoOK = TRUE;
+ BOOLEAN HiOK = TRUE;
ULONG i;
CHAR c[5];
Modified: branches/cache_manager_rewrite/mm/pagefile.c
URL:
http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/pagefi…
==============================================================================
--- branches/cache_manager_rewrite/mm/pagefile.c (original)
+++ branches/cache_manager_rewrite/mm/pagefile.c Thu Dec 28 19:27:36 2006
@@ -149,7 +149,7 @@
}
}
-LARGE_INTEGER STATIC
+LARGE_INTEGER static
MmGetOffsetPageFile(PRETRIEVAL_POINTERS_BUFFER RetrievalPointers, LARGE_INTEGER Offset)
{
/* Simple binary search */
@@ -498,7 +498,7 @@
return(0);
}
-STATIC PRETRIEVEL_DESCRIPTOR_LIST FASTCALL
+static PRETRIEVEL_DESCRIPTOR_LIST FASTCALL
MmAllocRetrievelDescriptorList(ULONG Pairs)
{
ULONG Size;
@@ -551,7 +551,7 @@
if (!(TrapFrame->EFlags & (1 << 17)))
{
memcpy(&Headers->TrapFrame, TrapFrame,
- sizeof(KTRAP_FRAME) - (4 * sizeof(DWORD)));
+ sizeof(KTRAP_FRAME) - (4 * sizeof(ULONG)));
}
else
{
Modified: branches/cache_manager_rewrite/mm/pe.c
URL:
http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/pe.c?r…
==============================================================================
--- branches/cache_manager_rewrite/mm/pe.c (original)
+++ branches/cache_manager_rewrite/mm/pe.c Thu Dec 28 19:27:36 2006
@@ -103,12 +103,8 @@
static __inline BOOLEAN IsPowerOf2(IN ULONG Number)
{
if(Number == 0)
- return FALSE;
-
- while((Number % 2) == 0)
- Number /= 2;
-
- return Number == 1;
+ return FALSE;
+ return (Number & (Number - 1)) == 0;
}
static __inline ULONG ModPow2(IN ULONG Address, IN ULONG Alignment)
Modified: branches/cache_manager_rewrite/mm/pool.c
URL:
http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/pool.c…
==============================================================================
--- branches/cache_manager_rewrite/mm/pool.c (original)
+++ branches/cache_manager_rewrite/mm/pool.c Thu Dec 28 19:27:36 2006
@@ -22,7 +22,7 @@
/* FUNCTIONS ***************************************************************/
-STATIC PVOID STDCALL
+static PVOID STDCALL
EiAllocatePool(POOL_TYPE PoolType,
ULONG NumberOfBytes,
ULONG Tag,
@@ -213,6 +213,7 @@
/*
* @implemented
*/
+#undef ExFreePool
VOID STDCALL
ExFreePool(IN PVOID Block)
{
Modified: branches/cache_manager_rewrite/mm/ppool.c
URL:
http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/ppool.…
==============================================================================
--- branches/cache_manager_rewrite/mm/ppool.c (original)
+++ branches/cache_manager_rewrite/mm/ppool.c Thu Dec 28 19:27:36 2006
@@ -11,13 +11,9 @@
/* INCLUDES *****************************************************************/
-#ifdef PPOOL_UMODE_TEST
-#include "ppool_umode.h"
-#else//PPOOL_UMODE_TEST
#include <ntoskrnl.h>
#define NDEBUG
#include <internal/debug.h>
-#endif//PPOOL_UMODE_TEST
#if defined (ALLOC_PRAGMA)
#pragma alloc_text(INIT, MmInitializePagedPool)
@@ -34,7 +30,7 @@
#define R_PRINT_ADDRESS(addr) KeRosPrintAddress(addr)
#define R_PANIC() KeBugCheck(0)
#define R_DEBUG DbgPrint
-#define R_GET_STACK_FRAMES(ptr,cnt) KeRosGetStackFrames(ptr,cnt)
+#define R_GET_STACK_FRAMES(ptr,cnt) RtlWalkFrameChain((PVOID*)ptr,cnt, 0)
#include "rpoolmgr.h"
@@ -138,7 +134,7 @@
char* trash[COUNT];
int AllocSize[] = { 15, 31, 63, 127, 255, 511, 1023, 2047 };
const int ALLOCS = sizeof(AllocSize) / sizeof(0[AllocSize]);
- DWORD dwStart;
+ ULONG dwStart;
MmPagedPoolSize = 1*1024*1024;
MmPagedPoolBase = malloc ( MmPagedPoolSize );
Modified: branches/cache_manager_rewrite/mm/process.c
URL:
http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/proces…
==============================================================================
--- branches/cache_manager_rewrite/mm/process.c (original)
+++ branches/cache_manager_rewrite/mm/process.c Thu Dec 28 19:27:36 2006
@@ -17,7 +17,7 @@
extern ULONG NtMinorVersion;
extern ULONG NtOSCSDVersion;
extern ULONG NtGlobalFlag;
-extern MM_SYSTEM_SIZE MmSystemSize;
+extern MM_SYSTEMSIZE MmSystemSize;
#define MM_HIGHEST_VAD_ADDRESS \
(PVOID)((ULONG_PTR)MM_HIGHEST_USER_ADDRESS - (16 * PAGE_SIZE))
Modified: branches/cache_manager_rewrite/mm/region.c
URL:
http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/region…
==============================================================================
--- branches/cache_manager_rewrite/mm/region.c (original)
+++ branches/cache_manager_rewrite/mm/region.c Thu Dec 28 19:27:36 2006
@@ -16,7 +16,7 @@
/* FUNCTIONS *****************************************************************/
-VOID STATIC
+VOID static
InsertAfterEntry(PLIST_ENTRY Previous,
PLIST_ENTRY Entry)
/*
@@ -31,7 +31,7 @@
Previous->Flink = Entry;
}
-PMM_REGION STATIC
+PMM_REGION static
MmSplitRegion(PMM_REGION InitialRegion, PVOID InitialBaseAddress,
PVOID StartAddress, ULONG Length, ULONG NewType,
ULONG NewProtect, PMADDRESS_SPACE AddressSpace,
Modified: branches/cache_manager_rewrite/mm/virtual.c
URL:
http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/virtua…
==============================================================================
--- branches/cache_manager_rewrite/mm/virtual.c (original)
+++ branches/cache_manager_rewrite/mm/virtual.c Thu Dec 28 19:27:36 2006
@@ -104,7 +104,7 @@
NumberOfBytesLocked,
ObReferenceObjectByHandle,
MmCreateMdl,
- ObfDereferenceObject,
+ (PVOID)ObfDereferenceObject,
MmProbeAndLockPages,
ExFreePool);
}
Modified: branches/cache_manager_rewrite/vfat/blockdev.c
URL:
http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/bloc…
==============================================================================
--- branches/cache_manager_rewrite/vfat/blockdev.c (original)
+++ branches/cache_manager_rewrite/vfat/blockdev.c Thu Dec 28 19:27:36 2006
@@ -4,7 +4,6 @@
* FILE: drivers/fs/vfat/blockdev.c
* PURPOSE: Temporary sector reading support
* PROGRAMMER: David Welch (welch(a)cwcom.net)
- * Hartmut Birr
* UPDATE HISTORY:
*/
Modified: branches/cache_manager_rewrite/vfat/cleanup.c
URL:
http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/clea…
==============================================================================
--- branches/cache_manager_rewrite/vfat/cleanup.c (original)
+++ branches/cache_manager_rewrite/vfat/cleanup.c Thu Dec 28 19:27:36 2006
@@ -4,7 +4,6 @@
* FILE: drivers/fs/vfat/cleanup.c
* PURPOSE: VFAT Filesystem
* PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com)
- * Hartmut Birr
*/
/* INCLUDES *****************************************************************/
Modified: branches/cache_manager_rewrite/vfat/close.c
URL:
http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/clos…
==============================================================================
--- branches/cache_manager_rewrite/vfat/close.c (original)
+++ branches/cache_manager_rewrite/vfat/close.c Thu Dec 28 19:27:36 2006
@@ -68,7 +68,7 @@
{
vfatDestroyCCB(pCcb);
}
- CHECKPOINT;
+
return Status;
}
Modified: branches/cache_manager_rewrite/vfat/create.c
URL:
http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/crea…
==============================================================================
--- branches/cache_manager_rewrite/vfat/create.c (original)
+++ branches/cache_manager_rewrite/vfat/create.c Thu Dec 28 19:27:36 2006
@@ -21,7 +21,6 @@
* FILE: drivers/fs/vfat/create.c
* PURPOSE: VFAT Filesystem
* PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com)
- * Hartmut Birr
*/
/* INCLUDES *****************************************************************/
Modified: branches/cache_manager_rewrite/vfat/direntry.c
URL:
http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/dire…
==============================================================================
--- branches/cache_manager_rewrite/vfat/direntry.c (original)
+++ branches/cache_manager_rewrite/vfat/direntry.c Thu Dec 28 19:27:36 2006
@@ -5,7 +5,6 @@
* PROJECT: ReactOS kernel
* PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com)
* Rex Jolliff (rex(a)lvcablemodem.com)
- * Hartmut Birr
* Herve Poussineau (reactos(a)poussine.freesurf.fr)
*/
@@ -23,7 +22,7 @@
if (pDeviceExt->FatInfo.FatType == FAT32)
{
cluster = pFatDirEntry->Fat.FirstCluster |
- (pFatDirEntry->Fat.FirstClusterHigh << 16);
+ (pFatDirEntry->Fat.FirstClusterHigh << 16);
}
else if (pDeviceExt->Flags & VCB_IS_FATX)
{
Modified: branches/cache_manager_rewrite/vfat/fastio.c
URL:
http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/fast…
==============================================================================
--- branches/cache_manager_rewrite/vfat/fastio.c (original)
+++ branches/cache_manager_rewrite/vfat/fastio.c Thu Dec 28 19:27:36 2006
@@ -4,7 +4,6 @@
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
* PROGRAMMER: Herve Poussineau (hpoussin(a)reactos.org)
- * Hartmut Birr
*/
#define NDEBUG
Modified: branches/cache_manager_rewrite/vfat/fat.c
URL:
http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/fat.…
==============================================================================
--- branches/cache_manager_rewrite/vfat/fat.c (original)
+++ branches/cache_manager_rewrite/vfat/fat.c Thu Dec 28 19:27:36 2006
@@ -4,7 +4,6 @@
* FILE: drivers/fs/vfat/fat.c
* PURPOSE: VFAT Filesystem
* PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com)
- * Hartmut Birr
*
*/
Modified: branches/cache_manager_rewrite/vfat/fcb.c
URL:
http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/fcb.…
==============================================================================
--- branches/cache_manager_rewrite/vfat/fcb.c (original)
+++ branches/cache_manager_rewrite/vfat/fcb.c Thu Dec 28 19:27:36 2006
@@ -5,7 +5,6 @@
* PROJECT: ReactOS kernel
* PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com)
* Rex Jolliff (rex(a)lvcablemodem.com)
-* Hartmut Birr
* Herve Poussineau (reactos(a)poussine.freesurf.fr)
*/
@@ -605,13 +604,6 @@
while (TRUE)
{
- DPRINT ("loop : vfatDirFindFile(File:%wZ)\n", FileToFindU);
- DPRINT ("loop : Dir Path:%wZ\n", &pDirectoryFCB->PathNameU);
-
- if (pDirectoryFCB->FileObject == NULL)
- {
- return STATUS_OBJECT_NAME_NOT_FOUND;
- }
status = pDeviceExt->GetNextDirEntry(&Context,
&Page,
pDirectoryFCB,
Modified: branches/cache_manager_rewrite/vfat/flush.c
URL:
http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/flus…
==============================================================================
--- branches/cache_manager_rewrite/vfat/flush.c (original)
+++ branches/cache_manager_rewrite/vfat/flush.c Thu Dec 28 19:27:36 2006
@@ -3,7 +3,7 @@
* PROJECT: ReactOS kernel
* FILE: drivers/fs/vfat/flush.c
* PURPOSE: VFAT Filesystem
- * PROGRAMMER: Hartmut Birr
+ * PROGRAMMER:
*/
/* INCLUDES *****************************************************************/
Modified: branches/cache_manager_rewrite/vfat/iface.c
URL:
http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/ifac…
==============================================================================
--- branches/cache_manager_rewrite/vfat/iface.c (original)
+++ branches/cache_manager_rewrite/vfat/iface.c Thu Dec 28 19:27:36 2006
@@ -21,7 +21,6 @@
* FILE: drivers/fs/vfat/iface.c
* PURPOSE: VFAT Filesystem
* PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com)
- * Hartmut Birr
*/
/* INCLUDES *****************************************************************/
Modified: branches/cache_manager_rewrite/vfat/misc.c
URL:
http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/misc…
==============================================================================
--- branches/cache_manager_rewrite/vfat/misc.c (original)
+++ branches/cache_manager_rewrite/vfat/misc.c Thu Dec 28 19:27:36 2006
@@ -3,7 +3,7 @@
* PROJECT: ReactOS kernel
* FILE: drivers/fs/vfat/misc.c
* PURPOSE: VFAT Filesystem
- * PROGRAMMER: Hartmut Birr
+ * PROGRAMMER:
*
*/
Modified: branches/cache_manager_rewrite/vfat/rw.c
URL:
http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/rw.c…
==============================================================================
--- branches/cache_manager_rewrite/vfat/rw.c (original)
+++ branches/cache_manager_rewrite/vfat/rw.c Thu Dec 28 19:27:36 2006
@@ -4,7 +4,6 @@
* FILE: drivers/fs/vfat/rw.c
* PURPOSE: VFAT Filesystem
* PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com)
- * Hartmut Birr
*
*/
Modified: branches/cache_manager_rewrite/vfat/string.c
URL:
http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/stri…
==============================================================================
--- branches/cache_manager_rewrite/vfat/string.c (original)
+++ branches/cache_manager_rewrite/vfat/string.c Thu Dec 28 19:27:36 2006
@@ -4,7 +4,6 @@
* FILE: drivers/fs/vfat/string.c
* PURPOSE: VFAT Filesystem
* PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com)
- * Hartmut Birr
*
*/
Modified: branches/cache_manager_rewrite/vfat/volume.c
URL:
http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/vfat/volu…
==============================================================================
--- branches/cache_manager_rewrite/vfat/volume.c (original)
+++ branches/cache_manager_rewrite/vfat/volume.c Thu Dec 28 19:27:36 2006
@@ -4,7 +4,6 @@
* FILE: drivers/fs/vfat/volume.c
* PURPOSE: VFAT Filesystem
* PROGRAMMER: Jason Filby (jasonfilby(a)yahoo.com)
- * Hartmut Birr
* Herve Poussineau (reactos(a)poussine.freesurf.fr)
*/