Ros-diffs March 2008

ros-diffs@reactos.org

22 participants
269 discussions

by navaraf＠svn.reactos.org

Author: navaraf Date: Sat Mar 8 12:08:52 2008 New Revision: 32608 URL: http://svn.reactos.org/svn/reactos?rev=3D32608&view=3Drev Log: Fix the build. Modified: trunk/irc/TechBot/TechBot.Library/TechBot.Library.csproj Modified: trunk/irc/TechBot/TechBot.Library/TechBot.Library.csproj URL: http://svn.reactos.org/svn/reactos/trunk/irc/TechBot/TechBot.Library/T= echBot.Library.csproj?rev=3D32608&r1=3D32607&r2=3D32608&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/irc/TechBot/TechBot.Library/TechBot.Library.csproj (original) +++ trunk/irc/TechBot/TechBot.Library/TechBot.Library.csproj Sat Mar 8 12:= 08:52 2008 @@ -47,7 +47,7 @@ <Compile Include=3D"ErrorCommand.cs" /> <Compile Include=3D"HelpCommand.cs" /> <Compile Include=3D"HresultCommand.cs" /> - <Compile Include=3D"ICommand.cs" /> + <Compile Include=3D"Command.cs" /> <Compile Include=3D"IrcService.cs" /> <Compile Include=3D"MessageContext.cs" /> <Compile Include=3D"NtStatusCommand.cs" />

16 years, 9 months

[fireball] 32607: - Pass cache manager callbacks structure at every CcInitializeCacheMap() call, it's mandatory.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Mar 8 11:35:32 2008 New Revision: 32607 URL: http://svn.reactos.org/svn/reactos?rev=3D32607&view=3Drev Log: - Pass cache manager callbacks structure at every CcInitializeCacheMap() ca= ll, it's mandatory. Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.c trunk/reactos/drivers/filesystems/cdfs/cdfs.h trunk/reactos/drivers/filesystems/cdfs/fcb.c trunk/reactos/drivers/filesystems/cdfs/fsctl.c trunk/reactos/drivers/filesystems/cdfs/rw.c Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/c= dfs/cdfs.c?rev=3D32607&r1=3D32606&r2=3D32607&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/cdfs/cdfs.c (original) +++ trunk/reactos/drivers/filesystems/cdfs/cdfs.c Sat Mar 8 11:35:32 2008 @@ -33,7 +33,7 @@ #define NDEBUG #include <debug.h> = -/* FUNCTIONS *************************************************************= ***/ +/* GLOBALS ***************************************************************= ***/ = PCDFS_GLOBAL_DATA CdfsGlobalData; = @@ -98,9 +98,41 @@ = DriverObject->DriverUnload =3D NULL; = + /* Cache manager */ + CdfsGlobalData->CacheMgrCallbacks.AcquireForLazyWrite =3D CdfsAcquireFor= LazyWrite; + CdfsGlobalData->CacheMgrCallbacks.ReleaseFromLazyWrite =3D CdfsReleaseFr= omLazyWrite; + CdfsGlobalData->CacheMgrCallbacks.AcquireForReadAhead =3D CdfsAcquireFor= LazyWrite; + CdfsGlobalData->CacheMgrCallbacks.ReleaseFromReadAhead =3D CdfsReleaseFr= omLazyWrite; + IoRegisterFileSystem(DeviceObject); DeviceObject->Flags &=3D ~DO_DEVICE_INITIALIZING; = return(STATUS_SUCCESS); } = + +BOOLEAN NTAPI +CdfsAcquireForLazyWrite(IN PVOID Context, + IN BOOLEAN Wait) +{ + PFCB Fcb =3D (PFCB)Context; + ASSERT(Fcb); + DPRINT("CdfsAcquireForLazyWrite(): Fcb %p\n", Fcb); + + if (!ExAcquireResourceExclusiveLite(&(Fcb->MainResource), Wait)) + { + DPRINT("CdfsAcquireForLazyWrite(): ExReleaseResourceLite failed.\n"); + return FALSE; + } + return TRUE; +} + +VOID NTAPI +CdfsReleaseFromLazyWrite(IN PVOID Context) +{ + PFCB Fcb =3D (PFCB)Context; + ASSERT(Fcb); + DPRINT("CdfsReleaseFromLazyWrite(): Fcb %p\n", Fcb); + + ExReleaseResourceLite(&(Fcb->MainResource)); +} Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/c= dfs/cdfs.h?rev=3D32607&r1=3D32606&r2=3D32607&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/cdfs/cdfs.h (original) +++ trunk/reactos/drivers/filesystems/cdfs/cdfs.h Sat Mar 8 11:35:32 2008 @@ -178,6 +178,7 @@ { FSRTL_COMMON_FCB_HEADER RFCB; SECTION_OBJECT_POINTERS SectionObjectPointers; + ERESOURCE MainResource; ERESOURCE PagingIoResource; = PFILE_OBJECT FileObject; @@ -188,8 +189,6 @@ WCHAR *ObjectName; /* point on filename (250 chars max) in PathName */ WCHAR PathName[MAX_PATH]; /* path+filename 260 max */ WCHAR ShortNameBuffer[13]; - - ERESOURCE MainResource; = LIST_ENTRY FcbListEntry; struct _FCB* ParentFcb; @@ -233,6 +232,7 @@ PDRIVER_OBJECT DriverObject; PDEVICE_OBJECT DeviceObject; ULONG Flags; + CACHE_MANAGER_CALLBACKS CacheMgrCallbacks; } CDFS_GLOBAL_DATA, *PCDFS_GLOBAL_DATA; = extern PCDFS_GLOBAL_DATA CdfsGlobalData; @@ -418,4 +418,11 @@ DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath); = +BOOLEAN NTAPI +CdfsAcquireForLazyWrite(IN PVOID Context, + IN BOOLEAN Wait); + +VOID NTAPI +CdfsReleaseFromLazyWrite(IN PVOID Context); + #endif //CDFS_H Modified: trunk/reactos/drivers/filesystems/cdfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/c= dfs/fcb.c?rev=3D32607&r1=3D32606&r2=3D32607&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/cdfs/fcb.c (original) +++ trunk/reactos/drivers/filesystems/cdfs/fcb.c Sat Mar 8 11:35:32 2008 @@ -245,8 +245,8 @@ CcInitializeCacheMap(FileObject, (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), FALSE, - NULL, - NULL); + &(CdfsGlobalData->CacheMgrCallbacks), + Fcb); = ObDereferenceObject(FileObject); Fcb->Flags |=3D FCB_CACHE_INITIALIZED; @@ -430,8 +430,8 @@ CcInitializeCacheMap(FileObject, (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), FALSE, - NULL, - NULL); + &(CdfsGlobalData->CacheMgrCallbacks), + Fcb); Fcb->Flags |=3D FCB_CACHE_INITIALIZED; } = Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/c= dfs/fsctl.c?rev=3D32607&r1=3D32606&r2=3D32607&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/cdfs/fsctl.c (original) +++ trunk/reactos/drivers/filesystems/cdfs/fsctl.c Sat Mar 8 11:35:32 2008 @@ -402,8 +402,8 @@ CcInitializeCacheMap(DeviceExt->StreamFileObject, (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), TRUE, - NULL, - NULL); + &(CdfsGlobalData->CacheMgrCallbacks), + Fcb); = ExInitializeResourceLite(&DeviceExt->VcbResource); ExInitializeResourceLite(&DeviceExt->DirResource); Modified: trunk/reactos/drivers/filesystems/cdfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/c= dfs/rw.c?rev=3D32607&r1=3D32606&r2=3D32607&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/cdfs/rw.c (original) +++ trunk/reactos/drivers/filesystems/cdfs/rw.c Sat Mar 8 11:35:32 2008 @@ -85,8 +85,8 @@ CcInitializeCacheMap(FileObject, (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), FALSE, - NULL, - NULL); + &(CdfsGlobalData->CacheMgrCallbacks), + Fcb); } = FileOffset.QuadPart =3D (LONGLONG)ReadOffset;

16 years, 9 months

[fireball] 32606: - Remove ugly hack from gdiobj.c, official sorry to Timo Kreuzer, his changes were perfect! - Temporary disable MPW thread shutdown and forcing page flush, since it results in memory corruption.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Mar 7 21:49:38 2008 New Revision: 32606 URL: http://svn.reactos.org/svn/reactos?rev=3D32606&view=3Drev Log: - Remove ugly hack from gdiobj.c, official sorry to Timo Kreuzer, his chang= es were perfect! - Temporary disable MPW thread shutdown and forcing page flush, since it re= sults in memory corruption. Modified: trunk/reactos/ntoskrnl/mm/mminit.c trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?= rev=3D32606&r1=3D32605&r2=3D32606&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/mm/mminit.c (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c Fri Mar 7 21:49:38 2008 @@ -73,6 +73,7 @@ NTAPI MiShutdownMemoryManager(VOID) { +#if 0 ULONG PagesWritten; PETHREAD Thread; = @@ -100,6 +101,7 @@ There will be no other chance to do this later, since filesystems are going to be shut down. */ CcRosFlushDirtyPages(128, &PagesWritten); +#endif } = VOID Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/objects/gdiobj.c?rev=3D32606&r1=3D32605&r2=3D32606&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Fri Mar 7 21:49= :38 2008 @@ -1318,16 +1318,6 @@ { POBJ Object =3D Entry->KernelData; = - /* HACK: Introduced very recently, probably by Timo's chan= ges */ - if ((ULONG_PTR)Object < 0x80000000) - { - DPRINT1("KernelData is invalid (%p) for Entry %p!!!\n", - Object, Entry); - - /* Hopefully someone is going to solve this issue */ - return; - } - PrevThread =3D Object->Tid; if (Object->cExclusiveLock =3D=3D 0 || PrevThread =3D=3D T= hread) {

16 years, 9 months

[fireball] 32605: - One leftover from 32604.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Mar 7 20:15:14 2008 New Revision: 32605 URL: http://svn.reactos.org/svn/reactos?rev=3D32605&view=3Drev Log: - One leftover from 32604. Modified: trunk/reactos/drivers/filesystems/cdfs/rw.c Modified: trunk/reactos/drivers/filesystems/cdfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/c= dfs/rw.c?rev=3D32605&r1=3D32604&r2=3D32605&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/cdfs/rw.c (original) +++ trunk/reactos/drivers/filesystems/cdfs/rw.c Fri Mar 7 20:15:14 2008 @@ -82,15 +82,11 @@ = if (FileObject->PrivateCacheMap =3D=3D NULL) { -#ifdef ROS_USE_CC_AND_FS - CcRosInitializeFileCache(FileObject, PAGE_SIZE); -#else CcInitializeCacheMap(FileObject, (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), FALSE, NULL, NULL); -#endif } = FileOffset.QuadPart =3D (LONGLONG)ReadOffset;

16 years, 9 months

[fireball] 32604: - There is no reason for CDFS to use CcRos-specific functions, it ends up with the same CcRosInit/Uninit with the same CacheSegmentSize = PAGE_SIZE. However, CDFS is probably still hardly compatible with a real NT kernel.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Mar 7 18:38:43 2008 New Revision: 32604 URL: http://svn.reactos.org/svn/reactos?rev=3D32604&view=3Drev Log: - There is no reason for CDFS to use CcRos-specific functions, it ends up w= ith the same CcRosInit/Uninit with the same CacheSegmentSize =3D PAGE_SIZE.= However, CDFS is probably still hardly compatible with a real NT kernel. Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.h trunk/reactos/drivers/filesystems/cdfs/cleanup.c trunk/reactos/drivers/filesystems/cdfs/fcb.c trunk/reactos/drivers/filesystems/cdfs/fsctl.c trunk/reactos/ntoskrnl/cc/fs.c Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/c= dfs/cdfs.h?rev=3D32604&r1=3D32603&r2=3D32604&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/cdfs/cdfs.h (original) +++ trunk/reactos/drivers/filesystems/cdfs/cdfs.h Fri Mar 7 18:38:43 2008 @@ -5,8 +5,6 @@ #include <ntddk.h> #include <ntddcdrm.h> #include <ccros.h> - -#define USE_ROS_CC_AND_FS = #define CDFS_BASIC_SECTOR 2048 #define CDFS_PRIMARY_DESCRIPTOR_LOCATION 16 Modified: trunk/reactos/drivers/filesystems/cdfs/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/c= dfs/cleanup.c?rev=3D32604&r1=3D32603&r2=3D32604&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/cdfs/cleanup.c (original) +++ trunk/reactos/drivers/filesystems/cdfs/cleanup.c Fri Mar 7 18:38:43 20= 08 @@ -51,11 +51,7 @@ /* Uninitialize file cache if initialized for this file object. */ if (FileObject->SectionObjectPointer && FileObject->SectionObjectPointer= ->SharedCacheMap) { -#ifdef USE_ROS_CC_AND_FS - CcRosReleaseFileCache (FileObject); -#else CcUninitializeCacheMap (FileObject, NULL, NULL); -#endif } = return STATUS_SUCCESS; Modified: trunk/reactos/drivers/filesystems/cdfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/c= dfs/fcb.c?rev=3D32604&r1=3D32603&r2=3D32604&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/cdfs/fcb.c (original) +++ trunk/reactos/drivers/filesystems/cdfs/fcb.c Fri Mar 7 18:38:43 2008 @@ -241,22 +241,12 @@ Fcb->FileObject =3D FileObject; Fcb->DevExt =3D Vcb; = -#ifdef USE_ROS_AND_FS - Status =3D CcRosInitializeFileCache(FileObject, - PAGE_SIZE); - if (!NT_SUCCESS(Status)) - { - DbgPrint("CcRosInitializeFileCache failed\n"); - KEBUGCHECK(0); - } -#else Status =3D STATUS_SUCCESS; CcInitializeCacheMap(FileObject, (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), FALSE, NULL, NULL); -#endif = ObDereferenceObject(FileObject); Fcb->Flags |=3D FCB_CACHE_INITIALIZED; @@ -437,22 +427,11 @@ = if (CdfsFCBIsDirectory(Fcb)) { -#ifdef USE_ROS_CC_AND_FS - NTSTATUS Status; - Status =3D CcRosInitializeFileCache(FileObject, - PAGE_SIZE); - if (!NT_SUCCESS(Status)) - { - DbgPrint("CcRosInitializeFileCache failed\n"); - KEBUGCHECK(0); - } -#else CcInitializeCacheMap(FileObject, (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), FALSE, NULL, NULL); -#endif Fcb->Flags |=3D FCB_CACHE_INITIALIZED; } = Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/c= dfs/fsctl.c?rev=3D32604&r1=3D32603&r2=3D32604&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/drivers/filesystems/cdfs/fsctl.c (original) +++ trunk/reactos/drivers/filesystems/cdfs/fsctl.c Fri Mar 7 18:38:43 2008 @@ -398,21 +398,13 @@ = Fcb->Entry.ExtentLocationL =3D 0; Fcb->Entry.DataLengthL =3D (DeviceExt->CdInfo.VolumeSpaceSize + DeviceEx= t->CdInfo.VolumeOffset) * BLOCKSIZE; -#ifdef USE_ROS_CC_AND_FS - Status =3D CcRosInitializeFileCache(DeviceExt->StreamFileObject, - PAGE_SIZE); - if (!NT_SUCCESS (Status)) - { - DbgPrint("CcRosInitializeFileCache failed\n"); - goto ByeBye; - } -#else + CcInitializeCacheMap(DeviceExt->StreamFileObject, (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), TRUE, NULL, NULL); -#endif + ExInitializeResourceLite(&DeviceExt->VcbResource); ExInitializeResourceLite(&DeviceExt->DirResource); = Modified: trunk/reactos/ntoskrnl/cc/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/fs.c?rev= =3D32604&r1=3D32603&r2=3D32604&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/ntoskrnl/cc/fs.c (original) +++ trunk/reactos/ntoskrnl/cc/fs.c Fri Mar 7 18:38:43 2008 @@ -87,7 +87,12 @@ IN PVOID LazyWriterContext ) { - CcRosInitializeFileCache(FileObject, VACB_MAPPING_GRANULARITY); + ASSERT(FileObject); + ASSERT(FileSizes); + + /* Call old ROS cache init function */ + CcRosInitializeFileCache(FileObject, + PAGE_SIZE/*VACB_MAPPING_GRANULARITY*/); } = /*

16 years, 9 months

[fireball] 32603: - UGLY HACK dedicated to Timo Kreuzer: Please, fix this issue. Happens only in 2nd stage during shutdown.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Mar 7 18:13:02 2008 New Revision: 32603 URL: http://svn.reactos.org/svn/reactos?rev=3D32603&view=3Drev Log: - UGLY HACK dedicated to Timo Kreuzer: Please, fix this issue. Happens only= in 2nd stage during shutdown. Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3= 2k/objects/gdiobj.c?rev=3D32603&r1=3D32602&r2=3D32603&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Fri Mar 7 18:13= :02 2008 @@ -1318,6 +1318,16 @@ { POBJ Object =3D Entry->KernelData; = + /* HACK: Introduced very recently, probably by Timo's chan= ges */ + if ((ULONG_PTR)Object < 0x80000000) + { + DPRINT1("KernelData is invalid (%p) for Entry %p!!!\n", + Object, Entry); + + /* Hopefully someone is going to solve this issue */ + return; + } + PrevThread =3D Object->Tid; if (Object->cExclusiveLock =3D=3D 0 || PrevThread =3D=3D T= hread) {

16 years, 9 months

[janderwald] 32602: - load boot.ini into listbox

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Mar 7 17:48:07 2008 New Revision: 32602 URL: http://svn.reactos.org/svn/reactos?rev=3D32602&view=3Drev Log: - load boot.ini into listbox Modified: trunk/reactos/base/applications/msconfig/freeldrpage.c Modified: trunk/reactos/base/applications/msconfig/freeldrpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msc= onfig/freeldrpage.c?rev=3D32602&r1=3D32601&r2=3D32602&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/base/applications/msconfig/freeldrpage.c (original) +++ trunk/reactos/base/applications/msconfig/freeldrpage.c Fri Mar 7 17:48= :07 2008 @@ -12,9 +12,103 @@ HWND hFreeLdrPage; HWND hFreeLdrDialog; = +typedef struct +{ + ULONG TimeOut; + WCHAR szDefaultOS[512]; + ULONG szDefaultPos; + ULONG OSConfigurationCount; + BOOL UseBootIni; +}FREELDR_SETTINGS; + +static FREELDR_SETTINGS Settings =3D { 0, {0}, 0 }; + + +BOOL +LoadBootIni(WCHAR * szDrive, HWND hDlg) +{ + WCHAR szBuffer[512]; + HWND hDlgCtrl; + FILE * file; + UINT length; + LRESULT pos; + + wcscpy(szBuffer, szDrive); + wcscat(szBuffer, L"boot.ini"); + = + file =3D _wfopen(szBuffer, L"rt"); + if (!file) + return FALSE; + = + hDlgCtrl =3D GetDlgItem(hDlg, IDC_LIST_BOX); + + while(!feof(file)) + { + if (fgetws(szBuffer, sizeof(szBuffer) / sizeof(WCHAR), file)) + { + length =3D wcslen(szBuffer); + while(szBuffer[length] < 14) //FIXME remove line feeds + szBuffer[length--] =3D 0; + + pos =3D SendMessageW(hDlgCtrl, LB_ADDSTRING, 0, (LPARAM)szBuff= er); + + + if (szBuffer[0] =3D=3D L'[') + continue; + + if (!wcsncmp(szBuffer, L"timeout=3D", 8)) + { + Settings.TimeOut =3D _wtoi(&szBuffer[8]); + continue; + } + + if (!wcsncmp(szBuffer, L"default=3D", 8)) + { + wcscpy(Settings.szDefaultOS, &szBuffer[8]); + continue; + } + if (pos !=3D LB_ERR) + SendMessage(hDlgCtrl, LB_SETITEMDATA, pos, 1); // indicate= that this item is an boot entry + Settings.OSConfigurationCount++; + } + } + + fclose(file); + Settings.UseBootIni =3D TRUE; + + pos =3D SendMessageW(hDlgCtrl, LB_FINDSTRING, 3, (LPARAM)Settings.szDef= aultOS); + if (pos !=3D LB_ERR) + { + Settings.szDefaultPos =3D pos; + SendMessage(hDlgCtrl, LB_SETCURSEL, pos, 0); + } + + SetDlgItemInt(hDlg, IDC_TXT_BOOT_TIMEOUT, Settings.TimeOut, FALSE); + if (Settings.OSConfigurationCount < 2) + { + EnableWindow(GetDlgItem(hDlg, IDC_BTN_SET_DEFAULT_BOOT), FALSE); + EnableWindow(GetDlgItem(hDlg, IDC_BTN_MOVE_UP_BOOT_OPTION), FALSE); + EnableWindow(GetDlgItem(hDlg, IDC_BTN_MOVE_DOWN_BOOT_OPTION), FALS= E); + } + return TRUE; +} + + +BOOL +InitializeDialog(HWND hDlg) +{ + // FIXME + // find real boot drive and handle freeldr configuration ini + return LoadBootIni(L"C:\\", hDlg); +} + + + INT_PTR CALLBACK FreeLdrPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { + LRESULT pos; + UNREFERENCED_PARAMETER(lParam); UNREFERENCED_PARAMETER(wParam); = @@ -22,7 +116,25 @@ case WM_INITDIALOG: hFreeLdrDialog =3D hDlg; SetWindowPos(hDlg, NULL, 10, 32, 0, 0, SWP_NOACTIVATE | SWP_NOOWNE= RZORDER | SWP_NOSIZE | SWP_NOZORDER); + InitializeDialog(hDlg); return TRUE; + case WM_COMMAND: + switch(HIWORD(wParam)) + { + case LBN_SELCHANGE: + pos =3D SendMessage((HWND)lParam, LB_GETCURSEL, 0, 0); + if (pos !=3D LB_ERR) + { + LPARAM res =3D SendMessage((HWND)lParam, LB_GETITEMDAT= A, pos, 0); + if (!res) //line is not a default one + SendMessage((HWND)lParam, LB_SETCURSEL, Settings.s= zDefaultPos, 0); + else + Settings.szDefaultPos =3D pos; + + + } + break; + } } return 0; }

16 years, 9 months

[hpoussin] 32601: Precompiled headers can depend of generated files

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Fri Mar 7 16:06:06 2008 New Revision: 32601 URL: http://svn.reactos.org/svn/reactos?rev=3D32601&view=3Drev Log: Precompiled headers can depend of generated files Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/= mingw/modulehandler.cpp?rev=3D32601&r1=3D32600&r2=3D32601&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Fri Mar 7 1= 6:06:06 2008 @@ -1820,9 +1820,10 @@ if ( rpcDependencies.size () > 0 ) dependencies +=3D " " + v2s ( backend, rpcDependencies, 5 ); fprintf ( fMakefile, - "%s: %s | %s\n", + "%s: %s ${%s_precondition} | %s\n", backend->GetFullName ( *pchFilename ).c_str(), dependencies.c_str(), + module.name.c_str (), backend->GetFullPath ( *pchFilename ).c_str() ); fprintf ( fMakefile, "\t$(ECHO_PCH)\n" ); fprintf ( fMakefile,

16 years, 9 months

[hpoussin] 32600: .mc files shouldn't depend of the whole module precondition. This removes a circular dependency

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Fri Mar 7 15:44:18 2008 New Revision: 32600 URL: http://svn.reactos.org/svn/reactos?rev=3D32600&view=3Drev Log: .mc files shouldn't depend of the whole module precondition. This removes a circular dependency Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/= mingw/modulehandler.cpp?rev=3D32600&r1=3D32599&r2=3D32600&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Fri Mar 7 1= 5:44:18 2008 @@ -1273,7 +1273,7 @@ "\t-@${rm} $(TEMPORARY)$(SEP)$(module_name).$(source_na= me_noext).res.tmp 2>$(NUL)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_= noext)_$(module_name).coff", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); -Rule wmcRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t).rc $(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext).h= : $(WMC_TARGET) $(source) ${$(module_name)_precondition}\n" +Rule wmcRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t).rc $(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext).h= : $(WMC_TARGET) $(source)\n" "\t$(ECHO_WMC)\n" "\t$(Q)$(WMC_TARGET) -i -H $(INTERMEDIATE)$(SEP)include$(SE= P)reactos$(SEP)$(source_name_noext).h -o $(INTERMEDIATE)$(SEP)$(source_dir)= $(SEP)$(source_name_noext).rc $(source)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noex= t).rc", "$(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext= ).h", NULL );

16 years, 9 months

[cfinck] 32599: Update two includes to not rely on target headers anymore

by cfinck＠svn.reactos.org

Author: cfinck Date: Fri Mar 7 15:10:03 2008 New Revision: 32599 URL: http://svn.reactos.org/svn/reactos?rev=3D32599&view=3Drev Log: Update two includes to not rely on target headers anymore Modified: trunk/reactos/tools/widl/typelib_struct.h Modified: trunk/reactos/tools/widl/typelib_struct.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/typelib_st= ruct.h?rev=3D32599&r1=3D32598&r2=3D32599&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/reactos/tools/widl/typelib_struct.h (original) +++ trunk/reactos/tools/widl/typelib_struct.h Fri Mar 7 15:10:03 2008 @@ -302,7 +302,7 @@ * */ = -#include "pshpack1.h" +#include <host/pshpack1.h> = typedef struct { /*00*/ DWORD SLTG_magic; /* 0x47544c53 =3D=3D "SLTG" */ @@ -599,7 +599,7 @@ WORD typeofarray */ = -#include "poppack.h" +#include <host/poppack.h> = /*---------------------------END------------------------------------------= --*/ #endif

16 years, 9 months

← Newer
1
...
18
19
20
21
22
23
24
...
27
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 March 2008