Ros-diffs January 2005

ros-diffs@reactos.org

28 participants
703 discussions

[hbirr] 12684: - Set the page protection for the section header.
by hbirr＠svn.reactos.com 01 Jan '05

01 Jan '05

- Set the page protection for the section header. Modified: trunk/reactos/ntoskrnl/ldr/loader.c _____ Modified: trunk/reactos/ntoskrnl/ldr/loader.c --- trunk/reactos/ntoskrnl/ldr/loader.c 2005-01-01 10:54:48 UTC (rev 12683) +++ trunk/reactos/ntoskrnl/ldr/loader.c 2005-01-01 10:57:39 UTC (rev 12684) @@ -1,4 +1,4 @@ -/* $Id: loader.c,v 1.152 2004/12/24 17:06:59 navaraf Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -870,6 +870,7 @@ return Status; } + MmSetPageProtect(NULL, DriverBase, PAGE_READONLY); /* Set the protections for the various parts of the driver */ for (Idx = 0; Idx < PENtHeaders->FileHeader.NumberOfSections; Idx++) { @@ -1077,6 +1078,7 @@ } /* Set the page protection for the virtual sections */ + MmSetPageProtect(NULL, DriverBase, PAGE_READONLY); for (Idx = 0; Idx < PENtHeaders->FileHeader.NumberOfSections; Idx++) { ULONG Characteristics = PESectionHeaders[Idx].Characteristics;

1 0

[hbirr] 12683: - Fixed ROUND_UP.
by hbirr＠svn.reactos.com 01 Jan '05

01 Jan '05

- Fixed ROUND_UP. - Simplified ROUND_DOWN. Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h _____ Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h 2005-01-01 08:43:02 UTC (rev 12682) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h 2005-01-01 10:54:48 UTC (rev 12683) @@ -66,8 +66,8 @@ typedef U16 *PU16; typedef U32 *PU32; -#define ROUND_UP(N, S) ((N) + (S) - ((N) % (S))) -#define ROUND_DOWN(N, S) ((N) - ((N) % (S))) +#define ROUND_UP(N, S) (((N) + (S) - 1) & ~((S) - 1)) +#define ROUND_DOWN(N, S) ((N) & ~((S) - 1)) #define PACKED __attribute__((packed))

1 0

[ion] 12682: Fix DMA_OPERATIONS to use stdcall.
by ion＠svn.reactos.com 01 Jan '05

01 Jan '05

Fix DMA_OPERATIONS to use stdcall. Modified: trunk/reactos/include/ddk/iotypes.h Modified: trunk/reactos/ntoskrnl/io/pnpdma.c _____ Modified: trunk/reactos/include/ddk/iotypes.h --- trunk/reactos/include/ddk/iotypes.h 2005-01-01 08:20:47 UTC (rev 12681) +++ trunk/reactos/include/ddk/iotypes.h 2005-01-01 08:43:02 UTC (rev 12682) @@ -1196,18 +1196,18 @@ SCATTER_GATHER_ELEMENT Elements[1]; } SCATTER_GATHER_LIST, *PSCATTER_GATHER_LIST; -typedef VOID (*PPUT_DMA_ADAPTER)( +typedef VOID STDCALL (*PPUT_DMA_ADAPTER)( PDMA_ADAPTER DmaAdapter ); -typedef PVOID (*PALLOCATE_COMMON_BUFFER)( +typedef PVOID STDCALL (*PALLOCATE_COMMON_BUFFER)( IN PDMA_ADAPTER DmaAdapter, IN ULONG Length, OUT PPHYSICAL_ADDRESS LogicalAddress, IN BOOLEAN CacheEnabled ); -typedef VOID (*PFREE_COMMON_BUFFER)( +typedef VOID STDCALL (*PFREE_COMMON_BUFFER)( IN PDMA_ADAPTER DmaAdapter, IN ULONG Length, IN PHYSICAL_ADDRESS LogicalAddress, @@ -1215,7 +1215,7 @@ IN BOOLEAN CacheEnabled ); -typedef NTSTATUS (*PALLOCATE_ADAPTER_CHANNEL)( +typedef NTSTATUS STDCALL (*PALLOCATE_ADAPTER_CHANNEL)( IN PDMA_ADAPTER DmaAdapter, IN PDEVICE_OBJECT DeviceObject, IN ULONG NumberOfMapRegisters, @@ -1223,7 +1223,7 @@ IN PVOID Context ); -typedef BOOLEAN (*PFLUSH_ADAPTER_BUFFERS)( +typedef BOOLEAN STDCALL (*PFLUSH_ADAPTER_BUFFERS)( IN PDMA_ADAPTER DmaAdapter, IN PMDL Mdl, IN PVOID MapRegisterBase, @@ -1232,17 +1232,17 @@ IN BOOLEAN WriteToDevice ); -typedef VOID (*PFREE_ADAPTER_CHANNEL)( +typedef VOID STDCALL (*PFREE_ADAPTER_CHANNEL)( IN PDMA_ADAPTER DmaAdapter ); -typedef VOID (*PFREE_MAP_REGISTERS)( +typedef VOID STDCALL (*PFREE_MAP_REGISTERS)( IN PDMA_ADAPTER DmaAdapter, PVOID MapRegisterBase, ULONG NumberOfMapRegisters ); -typedef PHYSICAL_ADDRESS (*PMAP_TRANSFER)( +typedef PHYSICAL_ADDRESS STDCALL (*PMAP_TRANSFER)( IN PDMA_ADAPTER DmaAdapter, IN PMDL Mdl, IN PVOID MapRegisterBase, @@ -1251,22 +1251,22 @@ IN BOOLEAN WriteToDevice ); -typedef ULONG (*PGET_DMA_ALIGNMENT)( +typedef ULONG STDCALL (*PGET_DMA_ALIGNMENT)( IN PDMA_ADAPTER DmaAdapter ); -typedef ULONG (*PREAD_DMA_COUNTER)( +typedef ULONG STDCALL (*PREAD_DMA_COUNTER)( IN PDMA_ADAPTER DmaAdapter ); -typedef VOID (*PDRIVER_LIST_CONTROL)( +typedef VOID STDCALL (*PDRIVER_LIST_CONTROL)( IN struct _DEVICE_OBJECT *DeviceObject, IN struct _IRP *Irp, IN PSCATTER_GATHER_LIST ScatterGather, IN PVOID Context ); -typedef NTSTATUS (*PGET_SCATTER_GATHER_LIST)( +typedef NTSTATUS STDCALL (*PGET_SCATTER_GATHER_LIST)( IN PDMA_ADAPTER DmaAdapter, IN PDEVICE_OBJECT DeviceObject, IN PMDL Mdl, @@ -1277,7 +1277,7 @@ IN BOOLEAN WriteToDevice ); -typedef VOID (*PPUT_SCATTER_GATHER_LIST)( +typedef VOID STDCALL (*PPUT_SCATTER_GATHER_LIST)( IN PDMA_ADAPTER DmaAdapter, IN PSCATTER_GATHER_LIST ScatterGather, IN BOOLEAN WriteToDevice _____ Modified: trunk/reactos/ntoskrnl/io/pnpdma.c --- trunk/reactos/ntoskrnl/io/pnpdma.c 2005-01-01 08:20:47 UTC (rev 12681) +++ trunk/reactos/ntoskrnl/io/pnpdma.c 2005-01-01 08:43:02 UTC (rev 12682) @@ -1,4 +1,4 @@ -/* $Id: pnpdma.c,v 1.9 2004/10/23 17:32:51 navaraf Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -31,6 +31,7 @@ /* FUNCTIONS *****************************************************************/ VOID +STDCALL IopPutDmaAdapter( PDMA_ADAPTER DmaAdapter) { @@ -40,6 +41,7 @@ PVOID +STDCALL IopAllocateCommonBuffer( IN PDMA_ADAPTER DmaAdapter, IN ULONG Length, @@ -54,6 +56,7 @@ VOID +STDCALL IopFreeCommonBuffer( IN PDMA_ADAPTER DmaAdapter, IN ULONG Length, @@ -69,6 +72,7 @@ NTSTATUS +STDCALL IopAllocateAdapterChannel( IN PDMA_ADAPTER DmaAdapter, IN PDEVICE_OBJECT DeviceObject, @@ -84,6 +88,7 @@ BOOLEAN +STDCALL IopFlushAdapterBuffers( IN PDMA_ADAPTER DmaAdapter, IN PMDL Mdl, @@ -100,6 +105,7 @@ VOID +STDCALL IopFreeAdapterChannel( IN PDMA_ADAPTER DmaAdapter) { @@ -109,6 +115,7 @@ VOID +STDCALL IopFreeMapRegisters( IN PDMA_ADAPTER DmaAdapter, PVOID MapRegisterBase, @@ -122,6 +129,7 @@ PHYSICAL_ADDRESS +STDCALL IopMapTransfer( IN PDMA_ADAPTER DmaAdapter, IN PMDL Mdl, @@ -138,6 +146,7 @@ ULONG +STDCALL IopGetDmaAlignment( IN PDMA_ADAPTER DmaAdapter) { @@ -148,6 +157,7 @@ ULONG +STDCALL IopReadDmaCounter( IN PDMA_ADAPTER DmaAdapter) { @@ -157,6 +167,7 @@ NTSTATUS +STDCALL IopGetScatterGatherList( IN PDMA_ADAPTER DmaAdapter, IN PDEVICE_OBJECT DeviceObject, @@ -174,15 +185,16 @@ VOID +STDCALL IopPutScatterGatherList( IN PDMA_ADAPTER DmaAdapter, IN PSCATTER_GATHER_LIST ScatterGather, IN BOOLEAN WriteToDevice) { + DPRINT("IopPutScatterGatherList\n"); /* FIXME */ } - /* * @implemented */

1 0

[ion] 12681: Fix more old cruft.
by ion＠svn.reactos.com 01 Jan '05

01 Jan '05

Fix more old cruft. Modified: trunk/reactos/include/ddk/iotypes.h Modified: trunk/reactos/ntoskrnl/io/driver.c Modified: trunk/reactos/ntoskrnl/io/fs.c Modified: trunk/reactos/ntoskrnl/io/irp.c _____ Modified: trunk/reactos/include/ddk/iotypes.h --- trunk/reactos/include/ddk/iotypes.h 2005-01-01 07:01:47 UTC (rev 12680) +++ trunk/reactos/include/ddk/iotypes.h 2005-01-01 08:20:47 UTC (rev 12681) @@ -1,4 +1,4 @@ -/* $Id: iotypes.h,v 1.73 2004/12/30 18:30:04 ion Exp $ +/* $Id$ * */ @@ -85,6 +85,10 @@ struct _IO_STATUS_BLOCK* IoStatusBlock, ULONG Reserved); +typedef VOID (NTAPI *PDRIVER_FS_NOTIFICATION) ( + IN struct _DEVICE_OBJECT* DeviceObject, + IN BOOLEAN DriverActive +); /* STRUCTURE TYPES ***********************************************************/ @@ -886,7 +890,7 @@ } FAST_IO_DISPATCH_TABLE, * PFAST_IO_DISPATCH_TABLE; #endif -#define IO_DRIVER_OBJECT 4L +#define IO_TYPE_DRIVER 4L #define DRVO_UNLOAD_INVOKED 0x1L #define DRVO_LEGACY_DRIVER 0x2L #define DRVO_BUILTIN_DRIVER 0x4L _____ Modified: trunk/reactos/ntoskrnl/io/driver.c --- trunk/reactos/ntoskrnl/io/driver.c 2005-01-01 07:01:47 UTC (rev 12680) +++ trunk/reactos/ntoskrnl/io/driver.c 2005-01-01 08:20:47 UTC (rev 12681) @@ -1,4 +1,4 @@ -/* $Id: driver.c,v 1.58 2004/12/30 18:30:05 ion Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -1643,7 +1643,7 @@ /* Set up the Object */ RtlZeroMemory(DriverObject, ObjectSize); - DriverObject->Type = IO_DRIVER_OBJECT; + DriverObject->Type = IO_TYPE_DRIVER; DriverObject->Size = sizeof(DRIVER_OBJECT); DriverObject->Flags = DRVO_BUILTIN_DRIVER; DriverObject->DriverExtension = (PDRIVER_EXTENSION)(DriverObject + 1); _____ Modified: trunk/reactos/ntoskrnl/io/fs.c --- trunk/reactos/ntoskrnl/io/fs.c 2005-01-01 07:01:47 UTC (rev 12680) +++ trunk/reactos/ntoskrnl/io/fs.c 2005-01-01 08:20:47 UTC (rev 12681) @@ -27,7 +27,7 @@ { LIST_ENTRY FsChangeNotifyList; PDRIVER_OBJECT DriverObject; - PFSDNOTIFICATIONPROC FSDNotificationProc; + PDRIVER_FS_NOTIFICATION FSDNotificationProc; } FS_CHANGE_NOTIFY_ENTRY, *PFS_CHANGE_NOTIFY_ENTRY; /* GLOBALS ******************************************************************/ @@ -730,7 +730,7 @@ */ NTSTATUS STDCALL IoRegisterFsRegistrationChange(IN PDRIVER_OBJECT DriverObject, - IN PFSDNOTIFICATIONPROC FSDNotificationProc) + IN PDRIVER_FS_NOTIFICATION FSDNotificationProc) { PFS_CHANGE_NOTIFY_ENTRY Entry; @@ -756,7 +756,7 @@ */ VOID STDCALL IoUnregisterFsRegistrationChange(IN PDRIVER_OBJECT DriverObject, - IN PFSDNOTIFICATIONPROC FSDNotificationProc) + IN PDRIVER_FS_NOTIFICATION FSDNotificationProc) { PFS_CHANGE_NOTIFY_ENTRY ChangeEntry; PLIST_ENTRY Entry; _____ Modified: trunk/reactos/ntoskrnl/io/irp.c --- trunk/reactos/ntoskrnl/io/irp.c 2005-01-01 07:01:47 UTC (rev 12680) +++ trunk/reactos/ntoskrnl/io/irp.c 2005-01-01 08:20:47 UTC (rev 12681) @@ -1,4 +1,4 @@ -/* $Id: irp.c,v 1.72 2004/12/26 21:18:34 gvg Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -212,7 +212,9 @@ return DriverObject->MajorFunction[Param->MajorFunction](DeviceObject, Irp); } - +#ifdef IoCallDriver +#undef IoCallDriver +#endif /* * @implemented */ @@ -277,7 +279,9 @@ return(Irp); } - +#ifdef IoCompleteRequest +#undef IoCompleteRequest +#endif /* * @implemented */ @@ -326,7 +330,7 @@ */ if (Irp->CurrentLocation < Irp->StackCount - 1) { - IoSetPreviousIrpStackLocation(Irp); + IoSkipCurrentIrpStackLocation(Irp); DeviceObject = IoGetCurrentIrpStackLocation(Irp)->DeviceObject; } else

1 0

[arty] 12680: Use host compiler to build bin2c
by arty＠svn.reactos.com 01 Jan '05

01 Jan '05

Use host compiler to build bin2c Modified: trunk/reactos/boot/freeldr/tools/Makefile _____ Modified: trunk/reactos/boot/freeldr/tools/Makefile --- trunk/reactos/boot/freeldr/tools/Makefile 2005-01-01 04:55:11 UTC (rev 12679) +++ trunk/reactos/boot/freeldr/tools/Makefile 2005-01-01 07:01:47 UTC (rev 12680) @@ -31,7 +31,7 @@ %$(EXE_POSTFIX): %.c @echo ===================================================== Compiling $* - @$(CC) -Wall -O3 -o $@ $< + @$(HOST_CC) -Wall -O3 -o $@ $< .PHONY : clean

1 0

[ion] 12679: Fix work item enumaration values.
by ion＠svn.reactos.com 01 Jan '05

01 Jan '05

Fix work item enumaration values. Modified: trunk/reactos/include/ddk/defines.h Modified: trunk/reactos/include/ddk/exfuncs.h Modified: trunk/reactos/include/ddk/extypes.h Modified: trunk/reactos/ntoskrnl/ex/time.c Modified: trunk/reactos/ntoskrnl/ex/work.c _____ Modified: trunk/reactos/include/ddk/defines.h --- trunk/reactos/include/ddk/defines.h 2005-01-01 04:05:42 UTC (rev 12678) +++ trunk/reactos/include/ddk/defines.h 2005-01-01 04:55:11 UTC (rev 12679) @@ -18,16 +18,6 @@ #define NR_PRIORITY_LEVELS (32) /* - * PURPOSE: Type of queue to insert a work item in - */ -enum -{ - CriticalWorkQueue, - DelayedWorkQueue, - HyperCriticalWorkQueue, -}; - -/* * Types of memory to allocate */ enum _____ Modified: trunk/reactos/include/ddk/exfuncs.h --- trunk/reactos/include/ddk/exfuncs.h 2005-01-01 04:05:42 UTC (rev 12678) +++ trunk/reactos/include/ddk/exfuncs.h 2005-01-01 04:55:11 UTC (rev 12679) @@ -699,7 +699,7 @@ IN PVOID OwnerPointer ); -VOID +ULONG STDCALL ExSetTimerResolution ( IN ULONG DesiredTime, _____ Modified: trunk/reactos/include/ddk/extypes.h --- trunk/reactos/include/ddk/extypes.h 2005-01-01 04:05:42 UTC (rev 12678) +++ trunk/reactos/include/ddk/extypes.h 2005-01-01 04:55:11 UTC (rev 12679) @@ -1,11 +1,17 @@ -/* $Id: extypes.h,v 1.25 2004/10/22 22:49:00 weiden Exp $ */ +/* $Id$ */ #ifndef __INCLUDE_DDK_EXTYPES_H #define __INCLUDE_DDK_EXTYPES_H typedef ULONG INTERLOCKED_RESULT; -typedef ULONG WORK_QUEUE_TYPE; +typedef enum _WORK_QUEUE_TYPE { + CriticalWorkQueue, + DelayedWorkQueue, + HyperCriticalWorkQueue, + MaximumWorkQueue +} WORK_QUEUE_TYPE; + typedef ULONG_PTR ERESOURCE_THREAD, *PERESOURCE_THREAD; typedef struct _OWNER_ENTRY _____ Modified: trunk/reactos/ntoskrnl/ex/time.c --- trunk/reactos/ntoskrnl/ex/time.c 2005-01-01 04:05:42 UTC (rev 12678) +++ trunk/reactos/ntoskrnl/ex/time.c 2005-01-01 04:55:11 UTC (rev 12679) @@ -1,4 +1,4 @@ -/* $Id: time.c,v 1.28 2004/12/05 00:20:22 navaraf Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -228,7 +228,7 @@ /* * @unimplemented */ -VOID +ULONG STDCALL ExSetTimerResolution ( IN ULONG DesiredTime, _____ Modified: trunk/reactos/ntoskrnl/ex/work.c --- trunk/reactos/ntoskrnl/ex/work.c 2005-01-01 04:05:42 UTC (rev 12678) +++ trunk/reactos/ntoskrnl/ex/work.c 2005-01-01 04:55:11 UTC (rev 12679) @@ -1,4 +1,4 @@ -/* $Id: work.c,v 1.24 2004/12/24 02:09:12 gdalsnes Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -172,6 +172,9 @@ &WorkItem->List ); break; + + default: + break; } }

1 0

[ion] 12678: Use PROCESSOR_FEATURE_MAX instead of PROCESSOR_FEATURES_MAX. The latter is not official and a useless ducpliate. Use LARGE_INTEGER instead of TIME in ex/sysinfo.c
by ion＠svn.reactos.com 01 Jan '05

01 Jan '05

Use PROCESSOR_FEATURE_MAX instead of PROCESSOR_FEATURES_MAX. The latter is not official and a useless ducpliate. Use LARGE_INTEGER instead of TIME in ex/sysinfo.c Modified: trunk/reactos/include/napi/shared_data.h Modified: trunk/reactos/lib/kernel32/misc/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/init.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c _____ Modified: trunk/reactos/include/napi/shared_data.h --- trunk/reactos/include/napi/shared_data.h 2005-01-01 02:08:13 UTC (rev 12677) +++ trunk/reactos/include/napi/shared_data.h 2005-01-01 04:05:42 UTC (rev 12678) @@ -13,8 +13,6 @@ #define PF_PAE_ENABLED 9 #define PF_XMMI64_INSTRUCTIONS_AVAILABLE 10 -#define PROCESSOR_FEATURES_MAX 64 - typedef enum _ALTERNATIVE_ARCHITECTURE_TYPE { StandardDesign, _____ Modified: trunk/reactos/lib/kernel32/misc/sysinfo.c --- trunk/reactos/lib/kernel32/misc/sysinfo.c 2005-01-01 02:08:13 UTC (rev 12677) +++ trunk/reactos/lib/kernel32/misc/sysinfo.c 2005-01-01 04:05:42 UTC (rev 12678) @@ -1,4 +1,4 @@ -/* $Id: sysinfo.c,v 1.14 2004/09/21 22:08:18 weiden Exp $ +/* $Id$ * * reactos/lib/kernel32/misc/sysinfo.c * @@ -157,7 +157,7 @@ BOOL STDCALL IsProcessorFeaturePresent(DWORD ProcessorFeature) { - if (ProcessorFeature >= PROCESSOR_FEATURES_MAX) + if (ProcessorFeature >= PROCESSOR_FEATURE_MAX) return(FALSE); return((BOOL)SharedUserData->ProcessorFeatures[ProcessorFeature]); _____ Modified: trunk/reactos/ntoskrnl/ex/init.c --- trunk/reactos/ntoskrnl/ex/init.c 2005-01-01 02:08:13 UTC (rev 12677) +++ trunk/reactos/ntoskrnl/ex/init.c 2005-01-01 04:05:42 UTC (rev 12678) @@ -55,7 +55,7 @@ BOOLEAN STDCALL ExIsProcessorFeaturePresent(IN ULONG ProcessorFeature) { - if (ProcessorFeature >= PROCESSOR_FEATURES_MAX) + if (ProcessorFeature >= PROCESSOR_FEATURE_MAX) return(FALSE); return(SharedUserData->ProcessorFeatures[ProcessorFeature]); _____ Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c --- trunk/reactos/ntoskrnl/ex/sysinfo.c 2005-01-01 02:08:13 UTC (rev 12677) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c 2005-01-01 04:05:42 UTC (rev 12678) @@ -1,4 +1,4 @@ -/* $Id: sysinfo.c,v 1.62 2004/12/16 22:36:09 gvg Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -723,7 +723,7 @@ = (PSYSTEM_PROCESSORTIME_INFO) Buffer; ULONG i; - TIME CurrentTime; + LARGE_INTEGER CurrentTime; PKPCR Pcr; *ReqSize = KeNumberProcessors * sizeof (SYSTEM_PROCESSORTIME_INFO);

1 0

[ion] 12677: Use proper name for the NtSetInformationKey Info classes/structures, as well as add new XP+ class/structure
by ion＠svn.reactos.com 01 Jan '05

01 Jan '05

Use proper name for the NtSetInformationKey Info classes/structures, as well as add new XP+ class/structure Modified: trunk/reactos/include/ddk/cmtypes.h Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c _____ Modified: trunk/reactos/include/ddk/cmtypes.h --- trunk/reactos/include/ddk/cmtypes.h 2005-01-01 01:53:48 UTC (rev 12676) +++ trunk/reactos/include/ddk/cmtypes.h 2005-01-01 02:08:13 UTC (rev 12677) @@ -49,17 +49,21 @@ /* key set information class */ -typedef enum _KEY_SET_INFORMATION_CLASS -{ - KeyLastWriteTimeInformation +typedef enum _KEY_SET_INFORMATION_CLASS { + KeyWriteTimeInformation, + KeyUserFlagsInformation, + MaxKeySetInfoClass } KEY_SET_INFORMATION_CLASS; -typedef struct _KEY_LAST_WRITE_TIME_INFORMATION -{ - LARGE_INTEGER LastWriteTime; -} KEY_LAST_WRITE_TIME_INFORMATION, *PKEY_LAST_WRITE_TIME_INFORMATION; +typedef struct _KEY_WRITE_TIME_INFORMATION { + LARGE_INTEGER LastWriteTime; +} KEY_WRITE_TIME_INFORMATION, *PKEY_WRITE_TIME_INFORMATION; +typedef struct _KEY_USER_FLAGS_INFORMATION { + ULONG UserFlags; +} KEY_USER_FLAGS_INFORMATION, *PKEY_USER_FLAGS_INFORMATION; + /* key value information class */ typedef enum _KEY_VALUE_INFORMATION_CLASS _____ Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c --- trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-01-01 01:53:48 UTC (rev 12676) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-01-01 02:08:13 UTC (rev 12677) @@ -2054,10 +2054,10 @@ PKEY_OBJECT KeyObject; NTSTATUS Status; - if (KeyInformationClass != KeyLastWriteTimeInformation) + if (KeyInformationClass != KeyWriteTimeInformation) return STATUS_INVALID_INFO_CLASS; - if (KeyInformationLength != sizeof (KEY_LAST_WRITE_TIME_INFORMATION)) + if (KeyInformationLength != sizeof (KEY_WRITE_TIME_INFORMATION)) return STATUS_INFO_LENGTH_MISMATCH; /* Verify that the handle is valid and is a registry key */ @@ -2080,7 +2080,7 @@ VERIFY_KEY_OBJECT(KeyObject); KeyObject->KeyCell->LastWriteTime.QuadPart = - ((PKEY_LAST_WRITE_TIME_INFORMATION)KeyInformation)->LastWriteTime.QuadPa rt; + ((PKEY_WRITE_TIME_INFORMATION)KeyInformation)->LastWriteTime.QuadPart; CmiMarkBlockDirty (KeyObject->RegistryHive, KeyObject->KeyCellOffset);

1 0

[ekohl] 12676: Don't start services until the control pipe issues are fixed.
by ekohl＠svn.reactos.com 01 Jan '05

01 Jan '05

Don't start services until the control pipe issues are fixed. Modified: trunk/reactos/subsys/system/services/database.c _____ Modified: trunk/reactos/subsys/system/services/database.c --- trunk/reactos/subsys/system/services/database.c 2005-01-01 01:51:05 UTC (rev 12675) +++ trunk/reactos/subsys/system/services/database.c 2005-01-01 01:53:48 UTC (rev 12676) @@ -1,4 +1,4 @@ -/* $Id: database.c,v 1.19 2004/10/10 21:00:59 navaraf Exp $ +/* $Id$ * * service control manager * @@ -521,13 +521,15 @@ ScmStartService(PSERVICE Service, PSERVICE_GROUP Group) { +#if 0 RTL_QUERY_REGISTRY_TABLE QueryTable[3]; PROCESS_INFORMATION ProcessInformation; STARTUPINFOW StartupInfo; UNICODE_STRING ImagePath; - NTSTATUS Status; ULONG Type; BOOL Result; +#endif + NTSTATUS Status; DPRINT("ScmStartService() called\n"); @@ -544,6 +546,7 @@ } else { +#if 0 RtlInitUnicodeString(&ImagePath, NULL); /* Get service data */ @@ -653,9 +656,13 @@ CloseHandle(ProcessInformation.hProcess); } } +#endif + Status = STATUS_SUCCESS; } +#if 0 Done: +#endif if (NT_SUCCESS(Status)) { if (Group != NULL)

1 0

[ion] 12675: Fix my previous NtDelayExecution patch. Fix Cc function prototypes which were incorrect, and remove useless file.
by ion＠svn.reactos.com 01 Jan '05

01 Jan '05

Fix my previous NtDelayExecution patch. Fix Cc function prototypes which were incorrect, and remove useless file. Modified: trunk/reactos/include/ddk/ccfuncs.h Modified: trunk/reactos/include/defines.h Modified: trunk/reactos/include/ntos/ntdef.h Modified: trunk/reactos/lib/kernel32/process/proc.c Modified: trunk/reactos/ntoskrnl/Makefile Modified: trunk/reactos/ntoskrnl/cc/cacheman.c Modified: trunk/reactos/ntoskrnl/cc/copy.c Deleted: trunk/reactos/ntoskrnl/cc/misc.c Modified: trunk/reactos/ntoskrnl/cc/pin.c _____ Modified: trunk/reactos/include/ddk/ccfuncs.h --- trunk/reactos/include/ddk/ccfuncs.h 2005-01-01 01:11:54 UTC (rev 12674) +++ trunk/reactos/include/ddk/ccfuncs.h 2005-01-01 01:51:05 UTC (rev 12675) @@ -1,7 +1,7 @@ #ifndef _NTOS_CCFUNCS_H #define _NTOS_CCFUNCS_H -/* $Id: ccfuncs.h,v 1.10 2004/08/21 20:18:07 tamlin Exp $ */ +/* $Id$ */ #ifdef __cplusplus extern "C" { @@ -62,7 +62,7 @@ IN BOOLEAN Retrying ); -BOOLEAN +VOID STDCALL CcFastCopyRead ( IN PFILE_OBJECT FileObject, @@ -73,11 +73,11 @@ OUT PIO_STATUS_BLOCK IoStatus ); -BOOLEAN +VOID STDCALL CcFastCopyWrite ( IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, + IN ULONG FileOffset, IN ULONG Length, IN PVOID Buffer ); @@ -191,7 +191,7 @@ IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Length, - IN BOOLEAN Wait, + IN ULONG Flags, OUT PVOID * Bcb ); @@ -201,7 +201,7 @@ IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Length, - IN BOOLEAN Wait, + IN ULONG Flags, OUT PVOID * Bcb, OUT PVOID * Buffer ); @@ -223,7 +223,7 @@ IN PLARGE_INTEGER FileOffset, IN ULONG Length, IN BOOLEAN Zero, - IN BOOLEAN Wait, + IN ULONG Flags, OUT PVOID * Bcb, OUT PVOID * Buffer ); @@ -251,7 +251,7 @@ IN PVOID Bcb ); -VOID +PVOID STDCALL CcRemapBcb ( IN PVOID Bcb _____ Modified: trunk/reactos/include/defines.h --- trunk/reactos/include/defines.h 2005-01-01 01:11:54 UTC (rev 12674) +++ trunk/reactos/include/defines.h 2005-01-01 01:51:05 UTC (rev 12675) @@ -2243,7 +2243,6 @@ #define WAIT_IO_COMPLETION (0xc0L) #define WAIT_ABANDONED (0x80L) #define WAIT_FAILED (0xffffffffL) -#define MAXIMUM_WAIT_OBJECTS (0x40) #define MAXIMUM_SUSPEND_COUNT (0x7f) /* MultiByteToWideChar */ _____ Modified: trunk/reactos/include/ntos/ntdef.h --- trunk/reactos/include/ntos/ntdef.h 2005-01-01 01:11:54 UTC (rev 12674) +++ trunk/reactos/include/ntos/ntdef.h 2005-01-01 01:51:05 UTC (rev 12675) @@ -11,7 +11,7 @@ #ifndef __INCLUDE_NTDEF_H #define __INCLUDE_NTDEF_H -#ifndef _USE_W32API +#ifndef __USE_W32API #define MAXIMUM_WAIT_OBJECTS (64) #endif _____ Modified: trunk/reactos/lib/kernel32/process/proc.c --- trunk/reactos/lib/kernel32/process/proc.c 2005-01-01 01:11:54 UTC (rev 12674) +++ trunk/reactos/lib/kernel32/process/proc.c 2005-01-01 01:51:05 UTC (rev 12675) @@ -1,4 +1,4 @@ -/* $Id: proc.c,v 1.72 2004/11/05 12:26:55 ekohl Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries @@ -447,7 +447,7 @@ SleepEx(DWORD dwMilliseconds, BOOL bAlertable) { - TIME Interval; + LARGE_INTEGER Interval; NTSTATUS errCode; if (dwMilliseconds != INFINITE) _____ Modified: trunk/reactos/ntoskrnl/Makefile --- trunk/reactos/ntoskrnl/Makefile 2005-01-01 01:11:54 UTC (rev 12674) +++ trunk/reactos/ntoskrnl/Makefile 2005-01-01 01:51:05 UTC (rev 12675) @@ -356,7 +356,6 @@ cc/fs.o \ cc/pin.o \ cc/mdl.o \ - cc/misc.o \ cc/view.o # Kernel Debugger Support (Kd) _____ Modified: trunk/reactos/ntoskrnl/cc/cacheman.c --- trunk/reactos/ntoskrnl/cc/cacheman.c 2005-01-01 01:11:54 UTC (rev 12674) +++ trunk/reactos/ntoskrnl/cc/cacheman.c 2005-01-01 01:51:05 UTC (rev 12675) @@ -60,7 +60,7 @@ /* * @unimplemented */ -VOID +PVOID STDCALL CcRemapBcb ( IN PVOID Bcb _____ Modified: trunk/reactos/ntoskrnl/cc/copy.c --- trunk/reactos/ntoskrnl/cc/copy.c 2005-01-01 01:11:54 UTC (rev 12674) +++ trunk/reactos/ntoskrnl/cc/copy.c 2005-01-01 01:51:05 UTC (rev 12675) @@ -1,4 +1,4 @@ -/* $Id: copy.c,v 1.32 2004/12/30 18:30:05 ion Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -556,34 +556,31 @@ /* * @unimplemented */ -BOOLEAN +VOID STDCALL CcFastCopyRead ( - IN PFILE_OBJECT FileObject, - IN ULONG FileOffset, - IN ULONG Length, - IN ULONG PageCount, - OUT PVOID Buffer, - OUT PIO_STATUS_BLOCK IoStatus + IN PFILE_OBJECT FileObject, + IN ULONG FileOffset, + IN ULONG Length, + IN ULONG PageCount, + OUT PVOID Buffer, + OUT PIO_STATUS_BLOCK IoStatus ) { UNIMPLEMENTED; - return FALSE; } /* * @unimplemented */ -BOOLEAN +VOID STDCALL -CcFastCopyWrite ( - IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length, - IN PVOID Buffer - ) +CcFastCopyWrite( + IN PFILE_OBJECT FileObject, + IN ULONG FileOffset, + IN ULONG Length, + IN PVOID Buffer) { UNIMPLEMENTED; - return FALSE; } /* _____ Deleted: trunk/reactos/ntoskrnl/cc/misc.c --- trunk/reactos/ntoskrnl/cc/misc.c 2005-01-01 01:11:54 UTC (rev 12674) +++ trunk/reactos/ntoskrnl/cc/misc.c 2005-01-01 01:51:05 UTC (rev 12675) @@ -1,11 +0,0 @@ -/* INCLUDES ******************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <internal/debug.h> - -/* GLOBALS *******************************************************************/ - -#define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) -#define ROUND_DOWN(N, S) (((N) % (S)) ? ROUND_UP(N, S) - S : N) - _____ Modified: trunk/reactos/ntoskrnl/cc/pin.c --- trunk/reactos/ntoskrnl/cc/pin.c 2005-01-01 01:11:54 UTC (rev 12674) +++ trunk/reactos/ntoskrnl/cc/pin.c 2005-01-01 01:51:05 UTC (rev 12675) @@ -1,4 +1,4 @@ -/* $Id: pin.c,v 1.18 2004/10/22 20:11:11 ekohl Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -117,7 +117,7 @@ IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Length, - IN BOOLEAN Wait, + IN ULONG Flags, OUT PVOID * Bcb ) { @@ -134,14 +134,14 @@ IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Length, - IN BOOLEAN Wait, + IN ULONG Flags, OUT PVOID * Bcb, OUT PVOID * Buffer ) { - if (CcMapData(FileObject, FileOffset, Length, Wait, Bcb, Buffer)) + if (CcMapData(FileObject, FileOffset, Length, Flags, Bcb, Buffer)) { - if (CcPinMappedData(FileObject, FileOffset, Length, Wait, Bcb)) + if (CcPinMappedData(FileObject, FileOffset, Length, Flags, Bcb)) return TRUE; else CcUnpinData(Bcb); @@ -159,7 +159,7 @@ IN PLARGE_INTEGER FileOffset, IN ULONG Length, IN BOOLEAN Zero, - IN BOOLEAN Wait, + IN ULONG Flags, OUT PVOID * Bcb, OUT PVOID * Buffer ) @@ -172,7 +172,7 @@ * For now calling CcPinRead is better than returning error or * just having UNIMPLEMENTED here. */ - return CcPinRead(FileObject, FileOffset, Length, Wait, Bcb, Buffer); + return CcPinRead(FileObject, FileOffset, Length, Flags, Bcb, Buffer); } /*

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2005