Ros-diffs

ros-diffs@reactos.org

81390 discussions

[weiden] 13235: 1. fixed prototypes of NtSetSystemTime and NtQuerySystemTime and made them handle passed buffers securely
by weiden＠svn.reactos.com 23 Jan '05

23 Jan '05

1. fixed prototypes of NtSetSystemTime and NtQuerySystemTime and made them handle passed buffers securely 2. check for the SeSystemtimePrivilege privilege in NtSetSystemTime() 3. write debug messages when privileges are missing Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c Modified: trunk/reactos/ntoskrnl/ex/profile.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/time.c Modified: trunk/reactos/ntoskrnl/ob/symlink.c Modified: trunk/reactos/ntoskrnl/ps/process.c _____ Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c --- trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-01-23 22:42:31 UTC (rev 13234) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-01-23 23:02:19 UTC (rev 13235) @@ -1638,7 +1638,7 @@ KeyCell->Flags |= REG_KEY_LINK_CELL; } - NtQuerySystemTime (&KeyCell->LastWriteTime); + ZwQuerySystemTime (&KeyCell->LastWriteTime); CmiMarkBlockDirty (RegistryHive, KeyObject->KeyCellOffset); ExReleaseResourceLite(&CmiRegistryLock); @@ -1683,7 +1683,7 @@ KeyObject->KeyCellOffset, ValueName); - NtQuerySystemTime (&KeyObject->KeyCell->LastWriteTime); + ZwQuerySystemTime (&KeyObject->KeyCell->LastWriteTime); CmiMarkBlockDirty (KeyObject->RegistryHive, KeyObject->KeyCellOffset); /* Release hive lock */ _____ Modified: trunk/reactos/ntoskrnl/ex/profile.c --- trunk/reactos/ntoskrnl/ex/profile.c 2005-01-23 22:42:31 UTC (rev 13234) +++ trunk/reactos/ntoskrnl/ex/profile.c 2005-01-23 23:02:19 UTC (rev 13235) @@ -178,6 +178,7 @@ if(!SeSinglePrivilegeCheck(SeSystemProfilePrivilege, PreviousMode)) { + DPRINT1("NtCreateProfile: Caller requires the SeSystemProfilePrivilege privilege!\n"); return STATUS_PRIVILEGE_NOT_HELD; } } _____ Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c --- trunk/reactos/ntoskrnl/ex/sysinfo.c 2005-01-23 22:42:31 UTC (rev 13234) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c 2005-01-23 23:02:19 UTC (rev 13235) @@ -154,6 +154,7 @@ RtlReleaseCapturedUnicodeString(&WName, PreviousMode, FALSE); + DPRINT1("NtQuerySystemEnvironmentValue: Caller requires the SeSystemEnvironmentPrivilege privilege!\n"); return STATUS_PRIVILEGE_NOT_HELD; } @@ -295,6 +296,7 @@ } else { + DPRINT1("NtSetSystemEnvironmentValue: Caller requires the SeSystemEnvironmentPrivilege privilege!\n"); Status = STATUS_PRIVILEGE_NOT_HELD; } _____ Modified: trunk/reactos/ntoskrnl/ex/time.c --- trunk/reactos/ntoskrnl/ex/time.c 2005-01-23 22:42:31 UTC (rev 13234) +++ trunk/reactos/ntoskrnl/ex/time.c 2005-01-23 23:02:19 UTC (rev 13235) @@ -142,28 +142,57 @@ * RETURNS: Status */ NTSTATUS STDCALL -NtSetSystemTime(IN PLARGE_INTEGER UnsafeNewSystemTime, - OUT PLARGE_INTEGER UnsafeOldSystemTime OPTIONAL) +NtSetSystemTime(IN PLARGE_INTEGER SystemTime, + OUT PLARGE_INTEGER PreviousTime OPTIONAL) { LARGE_INTEGER OldSystemTime; LARGE_INTEGER NewSystemTime; LARGE_INTEGER LocalTime; TIME_FIELDS TimeFields; - NTSTATUS Status; - - /* FIXME: Check for SeSystemTimePrivilege */ - - Status = MmCopyFromCaller(&NewSystemTime, UnsafeNewSystemTime, - sizeof(NewSystemTime)); - if (!NT_SUCCESS(Status)) + KPROCESSOR_MODE PreviousMode; + NTSTATUS Status = STATUS_SUCCESS; + + PreviousMode = ExGetPreviousMode(); + + if(PreviousMode != KernelMode) + { + _SEH_TRY { + ProbeForRead(SystemTime, + sizeof(LARGE_INTEGER), + sizeof(ULONG)); + NewSystemTime = *SystemTime; + if(PreviousTime != NULL) + { + ProbeForWrite(PreviousTime, + sizeof(LARGE_INTEGER), + sizeof(ULONG)); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(!NT_SUCCESS(Status)) + { return Status; } + } + + if(!SeSinglePrivilegeCheck(SeSystemtimePrivilege, + PreviousMode)) + { + DPRINT1("NtSetSystemTime: Caller requires the SeSystemtimePrivilege privilege!\n"); + return STATUS_PRIVILEGE_NOT_HELD; + } + + if(PreviousTime != NULL) + { + KeQuerySystemTime(&OldSystemTime); + } - if (UnsafeOldSystemTime != NULL) - { - KeQuerySystemTime(&OldSystemTime); - } ExSystemTimeToLocalTime(&NewSystemTime, &LocalTime); RtlTimeToTimeFields(&LocalTime, @@ -173,15 +202,18 @@ /* Set system time */ KiSetSystemTime(&NewSystemTime); - if (UnsafeOldSystemTime != NULL) + if(PreviousTime != NULL) + { + _SEH_TRY { - Status = MmCopyToCaller(UnsafeOldSystemTime, &OldSystemTime, - sizeof(OldSystemTime)); - if (!NT_SUCCESS(Status)) - { - return Status; - } + *PreviousTime = OldSystemTime; } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } return STATUS_SUCCESS; } @@ -194,19 +226,38 @@ * time of day in the standard time format. */ NTSTATUS STDCALL -NtQuerySystemTime(OUT PLARGE_INTEGER UnsafeCurrentTime) +NtQuerySystemTime(OUT PLARGE_INTEGER SystemTime) { - LARGE_INTEGER CurrentTime; - NTSTATUS Status; + KPROCESSOR_MODE PreviousMode; + NTSTATUS Status = STATUS_SUCCESS; - KeQuerySystemTime(&CurrentTime); - Status = MmCopyToCaller(UnsafeCurrentTime, &CurrentTime, - sizeof(CurrentTime)); - if (!NT_SUCCESS(Status)) + PreviousMode = ExGetPreviousMode(); + + if(PreviousMode != KernelMode) + { + _SEH_TRY { - return(Status); + ProbeForRead(SystemTime, + sizeof(LARGE_INTEGER), + sizeof(ULONG)); + + /* it's safe to pass the pointer directly to KeQuerySystemTime as it's just + a basic copy to these pointer, if it raises an exception nothing dangerous + can happen! */ + KeQuerySystemTime(SystemTime); } - return STATUS_SUCCESS; + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + else + { + KeQuerySystemTime(SystemTime); + } + + return Status; } _____ Modified: trunk/reactos/ntoskrnl/ob/symlink.c --- trunk/reactos/ntoskrnl/ob/symlink.c 2005-01-23 22:42:31 UTC (rev 13234) +++ trunk/reactos/ntoskrnl/ob/symlink.c 2005-01-23 23:02:19 UTC (rev 13235) @@ -256,7 +256,7 @@ DPRINT("DeviceName %S\n", SymbolicLink->TargetName.Buffer); - NtQuerySystemTime (&SymbolicLink->CreateTime); + ZwQuerySystemTime (&SymbolicLink->CreateTime); DPRINT("%s() = STATUS_SUCCESS\n",__FUNCTION__); ObDereferenceObject(SymbolicLink); _____ Modified: trunk/reactos/ntoskrnl/ps/process.c --- trunk/reactos/ntoskrnl/ps/process.c 2005-01-23 22:42:31 UTC (rev 13234) +++ trunk/reactos/ntoskrnl/ps/process.c 2005-01-23 23:02:19 UTC (rev 13235) @@ -1932,6 +1932,7 @@ if(!SeSinglePrivilegeCheck(SeTcbPrivilege, PreviousMode)) { + DPRINT1("NtSetInformationProcess: Caller requires the SeTcbPrivilege privilege for setting ProcessSessionInformation!\n"); /* can't set the session id, bail! */ Status = STATUS_PRIVILEGE_NOT_HELD; break;

1 0

[ea] 13234: ObjectBody->Permanent setting cleaned.
by ea＠svn.reactos.com 23 Jan '05

23 Jan '05

ObjectBody->Permanent setting cleaned. Modified: trunk/reactos/ntoskrnl/include/internal/ob.h Modified: trunk/reactos/ntoskrnl/ob/ntobj.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/ob.h --- trunk/reactos/ntoskrnl/include/internal/ob.h 2005-01-23 22:25:11 UTC (rev 13233) +++ trunk/reactos/ntoskrnl/include/internal/ob.h 2005-01-23 22:42:31 UTC (rev 13234) @@ -297,6 +297,10 @@ STDCALL ObQueryDeviceMapInformation(PEPROCESS Process, PPROCESS_DEVICEMAP_INFORMATION DeviceMapInfo); +VOID FASTCALL +ObpSetPermanentObject (IN PVOID ObjectBody, IN BOOLEAN Permanent); + + /* Security descriptor cache functions */ NTSTATUS _____ Modified: trunk/reactos/ntoskrnl/ob/ntobj.c --- trunk/reactos/ntoskrnl/ob/ntobj.c 2005-01-23 22:25:11 UTC (rev 13233) +++ trunk/reactos/ntoskrnl/ob/ntobj.c 2005-01-23 22:42:31 UTC (rev 13234) @@ -207,8 +207,25 @@ /********************************************************************** + * NAME PRIVATE + * ObpSetPermanentObject/2 + * + * DESCRIPTION + * Fast general purpose routine to set an object's permanent + * attribute, given a pointer to the object's body. + */ +VOID FASTCALL +ObpSetPermanentObject (IN PVOID ObjectBody, IN BOOLEAN Permanent) +{ + POBJECT_HEADER ObjectHeader; + + ObjectHeader = BODY_TO_HEADER(ObjectBody); + ObjectHeader->Permanent = Permanent; +} + +/********************************************************************** * NAME EXPORTED - * ObMakeTemporaryObject + * ObMakeTemporaryObject/1 * * DESCRIPTION * @@ -223,10 +240,7 @@ VOID STDCALL ObMakeTemporaryObject(IN PVOID ObjectBody) { - POBJECT_HEADER ObjectHeader; - - ObjectHeader = BODY_TO_HEADER(ObjectBody); - ObjectHeader->Permanent = FALSE; + ObpSetPermanentObject (ObjectBody, FALSE); } @@ -245,25 +259,23 @@ NTSTATUS STDCALL NtMakeTemporaryObject(IN HANDLE ObjectHandle) { - POBJECT_HEADER ObjectHeader; - PVOID Object; + PVOID ObjectBody; NTSTATUS Status; Status = ObReferenceObjectByHandle(ObjectHandle, 0, NULL, (KPROCESSOR_MODE)KeGetPreviousMode(), - &Object, + &ObjectBody, NULL); if (Status != STATUS_SUCCESS) { return Status; } - ObjectHeader = BODY_TO_HEADER(Object); - ObjectHeader->Permanent = FALSE; + ObpSetPermanentObject (ObjectBody, FALSE); - ObDereferenceObject(Object); + ObDereferenceObject(ObjectBody); return STATUS_SUCCESS; } @@ -271,7 +283,7 @@ /********************************************************************** * NAME EXPORTED - * NtMakePermanentObject + * NtMakePermanentObject/1 * * DESCRIPTION * @@ -286,25 +298,23 @@ NTSTATUS STDCALL NtMakePermanentObject(IN HANDLE ObjectHandle) { - POBJECT_HEADER ObjectHeader; - PVOID Object; + PVOID ObjectBody; NTSTATUS Status; Status = ObReferenceObjectByHandle(ObjectHandle, 0, NULL, (KPROCESSOR_MODE)KeGetPreviousMode(), - &Object, + &ObjectBody, NULL); if (Status != STATUS_SUCCESS) { return Status; } - ObjectHeader = BODY_TO_HEADER(Object); - ObjectHeader->Permanent = TRUE; + ObpSetPermanentObject (ObjectBody, TRUE); - ObDereferenceObject(Object); + ObDereferenceObject(ObjectBody); return STATUS_SUCCESS; }

1 0

[gvg] 13233: Fix typo
by gvg＠svn.reactos.com 23 Jan '05

23 Jan '05

Fix typo Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/include/internal/safe.h Modified: trunk/reactos/ntoskrnl/rtl/capture.c _____ Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c --- trunk/reactos/ntoskrnl/ex/sysinfo.c 2005-01-23 22:09:27 UTC (rev 13232) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c 2005-01-23 22:25:11 UTC (rev 13233) @@ -151,7 +151,7 @@ if(!SeSinglePrivilegeCheck(SeSystemEnvironmentPrivilege, PreviousMode)) { - RtlRelaseCapturedUnicodeString(&WName, + RtlReleaseCapturedUnicodeString(&WName, PreviousMode, FALSE); return STATUS_PRIVILEGE_NOT_HELD; @@ -161,7 +161,7 @@ * convert the value name to ansi */ Status = RtlUnicodeStringToAnsiString(&AName, &WName, TRUE); - RtlRelaseCapturedUnicodeString(&WName, + RtlReleaseCapturedUnicodeString(&WName, PreviousMode, FALSE); if(!NT_SUCCESS(Status)) @@ -298,12 +298,12 @@ Status = STATUS_PRIVILEGE_NOT_HELD; } - RtlRelaseCapturedUnicodeString(&CapturedValue, + RtlReleaseCapturedUnicodeString(&CapturedValue, PreviousMode, FALSE); } - RtlRelaseCapturedUnicodeString(&CapturedName, + RtlReleaseCapturedUnicodeString(&CapturedName, PreviousMode, FALSE); } _____ Modified: trunk/reactos/ntoskrnl/include/internal/safe.h --- trunk/reactos/ntoskrnl/include/internal/safe.h 2005-01-23 22:09:27 UTC (rev 13232) +++ trunk/reactos/ntoskrnl/include/internal/safe.h 2005-01-23 22:25:11 UTC (rev 13233) @@ -17,8 +17,8 @@ IN PUNICODE_STRING UnsafeSrc); VOID -RtlRelaseCapturedUnicodeString(IN PUNICODE_STRING CapturedString, - IN KPROCESSOR_MODE CurrentMode, - IN BOOLEAN CaptureIfKernel); +RtlReleaseCapturedUnicodeString(IN PUNICODE_STRING CapturedString, + IN KPROCESSOR_MODE CurrentMode, + IN BOOLEAN CaptureIfKernel); #endif /* __NTOSKRNL_INCLUDE_INTERNAL_SAFE_Hb */ _____ Modified: trunk/reactos/ntoskrnl/rtl/capture.c --- trunk/reactos/ntoskrnl/rtl/capture.c 2005-01-23 22:09:27 UTC (rev 13232) +++ trunk/reactos/ntoskrnl/rtl/capture.c 2005-01-23 22:25:11 UTC (rev 13233) @@ -133,9 +133,9 @@ } VOID -RtlRelaseCapturedUnicodeString(IN PUNICODE_STRING CapturedString, - IN KPROCESSOR_MODE CurrentMode, - IN BOOLEAN CaptureIfKernel) +RtlReleaseCapturedUnicodeString(IN PUNICODE_STRING CapturedString, + IN KPROCESSOR_MODE CurrentMode, + IN BOOLEAN CaptureIfKernel) { if(CurrentMode != KernelMode || CaptureIfKernel ) {

1 0

[weiden] 13232: fixed semaphore functions to securely access buffers and some minor fixes
by weiden＠svn.reactos.com 23 Jan '05

23 Jan '05

fixed semaphore functions to securely access buffers and some minor fixes Modified: trunk/reactos/include/ntos/zw.h Modified: trunk/reactos/ntoskrnl/ex/sem.c Modified: trunk/reactos/ntoskrnl/ob/object.c _____ Modified: trunk/reactos/include/ntos/zw.h --- trunk/reactos/include/ntos/zw.h 2005-01-23 21:26:27 UTC (rev 13231) +++ trunk/reactos/include/ntos/zw.h 2005-01-23 22:09:27 UTC (rev 13232) @@ -2205,7 +2205,7 @@ NTSTATUS STDCALL NtOpenSemaphore( - IN HANDLE SemaphoreHandle, + OUT PHANDLE SemaphoreHandle, IN ACCESS_MASK DesiredAcces, IN POBJECT_ATTRIBUTES ObjectAttributes ); @@ -3108,7 +3108,7 @@ STDCALL NtQuerySystemEnvironmentValue( IN PUNICODE_STRING VariableName, - OUT PWSTR ValueBuffer, + OUT PWCHAR ValueBuffer, IN ULONG ValueBufferLength, OUT PULONG ReturnLength OPTIONAL ); @@ -3117,7 +3117,7 @@ STDCALL ZwQuerySystemEnvironmentValue( IN PUNICODE_STRING VariableName, - OUT PWSTR ValueBuffer, + OUT PWCHAR ValueBuffer, IN ULONG ValueBufferLength, OUT PULONG ReturnLength OPTIONAL ); _____ Modified: trunk/reactos/ntoskrnl/ex/sem.c --- trunk/reactos/ntoskrnl/ex/sem.c 2005-01-23 21:26:27 UTC (rev 13231) +++ trunk/reactos/ntoskrnl/ex/sem.c 2005-01-23 22:09:27 UTC (rev 13232) @@ -25,6 +25,11 @@ STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE | SEMAPHORE_QUERY_STATE, SEMAPHORE_ALL_ACCESS}; +static const INFORMATION_CLASS_INFO ExSemaphoreInfoClass[] = +{ + ICI_SQ_SAME( sizeof(SEMAPHORE_BASIC_INFORMATION), sizeof(ULONG), ICIF_QUERY ), /* SemaphoreBasicInformation */ +}; + /* FUNCTIONS *****************************************************************/ NTSTATUS STDCALL @@ -73,6 +78,9 @@ ObpCreateTypeObject(ExSemaphoreObjectType); } +/* + * @implemented + */ NTSTATUS STDCALL NtCreateSemaphore(OUT PHANDLE SemaphoreHandle, IN ACCESS_MASK DesiredAccess, @@ -81,58 +89,135 @@ IN LONG MaximumCount) { PKSEMAPHORE Semaphore; - NTSTATUS Status; + HANDLE hSemaphore; + KPROCESSOR_MODE PreviousMode; + NTSTATUS Status = STATUS_SUCCESS; + + PreviousMode = ExGetPreviousMode(); + + if(PreviousMode == UserMode) + { + _SEH_TRY + { + ProbeForWrite(SemaphoreHandle, + sizeof(HANDLE), + sizeof(ULONG)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; - Status = ObCreateObject(ExGetPreviousMode(), + if(!NT_SUCCESS(Status)) + { + return Status; + } + } + + Status = ObCreateObject(PreviousMode, ExSemaphoreObjectType, ObjectAttributes, - ExGetPreviousMode(), + PreviousMode, NULL, sizeof(KSEMAPHORE), 0, 0, (PVOID*)&Semaphore); if (!NT_SUCCESS(Status)) + { + KeInitializeSemaphore(Semaphore, + InitialCount, + MaximumCount); + + Status = ObInsertObject ((PVOID)Semaphore, + NULL, + DesiredAccess, + 0, + NULL, + &hSemaphore); + + ObDereferenceObject(Semaphore); + + if(NT_SUCCESS(Status)) { - return(Status); + _SEH_TRY + { + *SemaphoreHandle = hSemaphore; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; } + } - KeInitializeSemaphore(Semaphore, - InitialCount, - MaximumCount); - - Status = ObInsertObject ((PVOID)Semaphore, - NULL, - DesiredAccess, - 0, - NULL, - SemaphoreHandle); - - ObDereferenceObject(Semaphore); - return Status; } +/* + * @implemented + */ NTSTATUS STDCALL -NtOpenSemaphore(IN HANDLE SemaphoreHandle, +NtOpenSemaphore(OUT PHANDLE SemaphoreHandle, IN ACCESS_MASK DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes) { - NTSTATUS Status; + HANDLE hSemaphore; + KPROCESSOR_MODE PreviousMode; + NTSTATUS Status = STATUS_SUCCESS; + + PreviousMode = ExGetPreviousMode(); + + if(PreviousMode == UserMode) + { + _SEH_TRY + { + ProbeForWrite(SemaphoreHandle, + sizeof(HANDLE), + sizeof(ULONG)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(!NT_SUCCESS(Status)) + { + return Status; + } + } Status = ObOpenObjectByName(ObjectAttributes, ExSemaphoreObjectType, NULL, - UserMode, + PreviousMode, DesiredAccess, NULL, - SemaphoreHandle); + &hSemaphore); + if(NT_SUCCESS(Status)) + { + _SEH_TRY + { + *SemaphoreHandle = hSemaphore; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } return Status; } +/* + * @implemented + */ NTSTATUS STDCALL NtQuerySemaphore(IN HANDLE SemaphoreHandle, IN SEMAPHORE_INFORMATION_CLASS SemaphoreInformationClass, @@ -140,62 +225,132 @@ IN ULONG SemaphoreInformationLength, OUT PULONG ReturnLength OPTIONAL) { - PSEMAPHORE_BASIC_INFORMATION Info; PKSEMAPHORE Semaphore; - NTSTATUS Status; + KPROCESSOR_MODE PreviousMode; + NTSTATUS Status = STATUS_SUCCESS; - Info = (PSEMAPHORE_BASIC_INFORMATION)SemaphoreInformation; + PreviousMode = ExGetPreviousMode(); - if (SemaphoreInformationClass > SemaphoreBasicInformation) - return STATUS_INVALID_INFO_CLASS; + DefaultQueryInfoBufferCheck(SemaphoreInformationClass, + ExSemaphoreInfoClass, + SemaphoreInformation, + SemaphoreInformationLength, + ReturnLength, + PreviousMode, + &Status); + if(!NT_SUCCESS(Status)) + { + DPRINT1("NtQueryEvent() failed, Status: 0x%x\n", Status); + return Status; + } - if (SemaphoreInformationLength < sizeof(SEMAPHORE_BASIC_INFORMATION)) - return STATUS_INFO_LENGTH_MISMATCH; - Status = ObReferenceObjectByHandle(SemaphoreHandle, - SEMAPHORE_QUERY_STATE, + EVENT_QUERY_STATE, ExSemaphoreObjectType, - UserMode, + PreviousMode, (PVOID*)&Semaphore, NULL); - if (!NT_SUCCESS(Status)) - return Status; + if(NT_SUCCESS(Status)) + { + switch(SemaphoreInformationClass) + { + case SemaphoreBasicInformation: + { + PSEMAPHORE_BASIC_INFORMATION BasicInfo = (PSEMAPHORE_BASIC_INFORMATION)SemaphoreInformation; - Info->CurrentCount = KeReadStateSemaphore(Semaphore); - Info->MaximumCount = Semaphore->Limit; + _SEH_TRY + { + BasicInfo->CurrentCount = KeReadStateSemaphore(Semaphore); + BasicInfo->MaximumCount = Semaphore->Limit; - if (ReturnLength != NULL) - *ReturnLength = sizeof(SEMAPHORE_BASIC_INFORMATION); + if(ReturnLength != NULL) + { + *ReturnLength = sizeof(SEMAPHORE_BASIC_INFORMATION); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + break; + } - ObDereferenceObject(Semaphore); + default: + Status = STATUS_NOT_IMPLEMENTED; + break; + } - return STATUS_SUCCESS; + ObDereferenceObject(Semaphore); + } + + return Status; } + +/* + * @implemented + */ NTSTATUS STDCALL NtReleaseSemaphore(IN HANDLE SemaphoreHandle, IN LONG ReleaseCount, OUT PLONG PreviousCount OPTIONAL) { + KPROCESSOR_MODE PreviousMode; PKSEMAPHORE Semaphore; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; + PreviousMode = ExGetPreviousMode(); + + if(PreviousCount != NULL && PreviousMode == UserMode) + { + _SEH_TRY + { + ProbeForWrite(PreviousCount, + sizeof(LONG), + sizeof(ULONG)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(!NT_SUCCESS(Status)) + { + return Status; + } + } + Status = ObReferenceObjectByHandle(SemaphoreHandle, SEMAPHORE_MODIFY_STATE, ExSemaphoreObjectType, - UserMode, + PreviousMode, (PVOID*)&Semaphore, NULL); - if (!NT_SUCCESS(Status)) + if (NT_SUCCESS(Status)) + { + LONG PrevCount = KeReleaseSemaphore(Semaphore, + IO_NO_INCREMENT, + ReleaseCount, + FALSE); + ObDereferenceObject(Semaphore); + + if(PreviousCount != NULL) { - return(Status); + _SEH_TRY + { + *PreviousCount = PrevCount; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; } - KeReleaseSemaphore(Semaphore, - IO_NO_INCREMENT, - ReleaseCount, - FALSE); - ObDereferenceObject(Semaphore); - return(STATUS_SUCCESS); + } + + return Status; } /* EOF */ _____ Modified: trunk/reactos/ntoskrnl/ob/object.c --- trunk/reactos/ntoskrnl/ob/object.c 2005-01-23 21:26:27 UTC (rev 13231) +++ trunk/reactos/ntoskrnl/ob/object.c 2005-01-23 22:09:27 UTC (rev 13232) @@ -169,7 +169,7 @@ { ProbeForRead(OriginalCopy.Buffer, OriginalCopy.Length, - sizeof(ULONG)); + sizeof(WCHAR)); } } _SEH_HANDLE

1 0

[ion] 13231: Fix svn:ignore problems and remove alignment hacks
by ion＠svn.reactos.com 23 Jan '05

23 Jan '05

Fix svn:ignore problems and remove alignment hacks Modified: trunk/reactos/ntoskrnl/ob/object.c Modified: trunk/reactos/ntoskrnl/ps/process.c Property changes on: trunk/reactos/drivers/usb/miniport ___________________________________________________________________ Name: svn:ignore + *.d *.a *.o *.bin *.dll *.lib *.coff *.sym *.tmp *.gch *.pch *.map Property changes on: trunk/reactos/drivers/usb/miniport/usbehci ___________________________________________________________________ Name: svn:ignore + *.d *.a *.o *.bin *.dll *.lib *.coff *.sym *.tmp *.gch *.pch *.map *.sys Property changes on: trunk/reactos/drivers/usb/miniport/usbohci ___________________________________________________________________ Name: svn:ignore + *.d *.a *.o *.bin *.dll *.lib *.coff *.sym *.tmp *.gch *.pch *.map *.sys Property changes on: trunk/reactos/drivers/usb/miniport/usbuhci ___________________________________________________________________ Name: svn:ignore + *.d *.a *.o *.bin *.dll *.lib *.coff *.sym *.tmp *.gch *.pch *.map *.sys Property changes on: trunk/reactos/drivers/usb/usbhub ___________________________________________________________________ Name: svn:ignore + *.d *.a *.o *.bin *.dll *.lib *.coff *.sym *.tmp *.gch *.pch *.map *.sys Property changes on: trunk/reactos/drivers/usb/usbport ___________________________________________________________________ Name: svn:ignore + *.d *.a *.o *.bin *.dll *.lib *.coff *.sym *.tmp *.gch *.pch *.map *.sys _____ Modified: trunk/reactos/ntoskrnl/ob/object.c --- trunk/reactos/ntoskrnl/ob/object.c 2005-01-23 21:19:24 UTC (rev 13230) +++ trunk/reactos/ntoskrnl/ob/object.c 2005-01-23 21:26:27 UTC (rev 13231) @@ -608,7 +608,7 @@ { ProbeForRead(ObjectAttributes, sizeof(OBJECT_ATTRIBUTES), - sizeof(USHORT)); /*FIXME: HACK! kernel32/file/file.c:~734 is having a weird stack */ + sizeof(ULONG)); } _SEH_HANDLE { _____ Modified: trunk/reactos/ntoskrnl/ps/process.c --- trunk/reactos/ntoskrnl/ps/process.c 2005-01-23 21:19:24 UTC (rev 13230) +++ trunk/reactos/ntoskrnl/ps/process.c 2005-01-23 21:26:27 UTC (rev 13231) @@ -40,33 +40,33 @@ ICI_SQ_SAME( sizeof(IO_COUNTERS), sizeof(ULONG), ICIF_QUERY ), /* ProcessIoCounters */ ICI_SQ_SAME( sizeof(VM_COUNTERS), sizeof(ULONG), ICIF_QUERY ), /* ProcessVmCounters */ ICI_SQ_SAME( sizeof(KERNEL_USER_TIMES), sizeof(ULONG), ICIF_QUERY ), /* ProcessTimes */ - ICI_SQ_SAME( sizeof(KPRIORITY), sizeof(USHORT), ICIF_SET ), /* ProcessBasePriority */ + ICI_SQ_SAME( sizeof(KPRIORITY), sizeof(ULONG), ICIF_SET ), /* ProcessBasePriority */ ICI_SQ_SAME( sizeof(ULONG), sizeof(ULONG), ICIF_SET ), /* ProcessRaisePriority */ ICI_SQ_SAME( sizeof(HANDLE), sizeof(ULONG), ICIF_QUERY | ICIF_SET ), /* ProcessDebugPort */ ICI_SQ_SAME( sizeof(HANDLE), sizeof(ULONG), ICIF_SET ), /* ProcessExceptionPort */ - ICI_SQ_SAME( sizeof(PROCESS_ACCESS_TOKEN), sizeof(USHORT), ICIF_SET ), /* ProcessAccessToken */ - ICI_SQ_SAME( 0 /* FIXME */, sizeof(USHORT), ICIF_QUERY | ICIF_SET ), /* ProcessLdtInformation */ - ICI_SQ_SAME( 0 /* FIXME */, sizeof(USHORT), ICIF_SET ), /* ProcessLdtSize */ - ICI_SQ_SAME( sizeof(ULONG), sizeof(USHORT), ICIF_QUERY | ICIF_SET ), /* ProcessDefaultHardErrorMode */ - ICI_SQ_SAME( 0 /* FIXME */, sizeof(USHORT), ICIF_SET ), /* ProcessIoPortHandlers */ + ICI_SQ_SAME( sizeof(PROCESS_ACCESS_TOKEN), sizeof(ULONG), ICIF_SET ), /* ProcessAccessToken */ + ICI_SQ_SAME( 0 /* FIXME */, sizeof(ULONG), ICIF_QUERY | ICIF_SET ), /* ProcessLdtInformation */ + ICI_SQ_SAME( 0 /* FIXME */, sizeof(ULONG), ICIF_SET ), /* ProcessLdtSize */ + ICI_SQ_SAME( sizeof(ULONG), sizeof(ULONG), ICIF_QUERY | ICIF_SET ), /* ProcessDefaultHardErrorMode */ + ICI_SQ_SAME( 0 /* FIXME */, sizeof(ULONG), ICIF_SET ), /* ProcessIoPortHandlers */ ICI_SQ_SAME( sizeof(POOLED_USAGE_AND_LIMITS), sizeof(ULONG), ICIF_QUERY ), /* ProcessPooledUsageAndLimits */ ICI_SQ_SAME( sizeof(PROCESS_WS_WATCH_INFORMATION), sizeof(ULONG), ICIF_QUERY | ICIF_SET ), /* ProcessWorkingSetWatch */ - ICI_SQ_SAME( 0 /* FIXME */, sizeof(USHORT), ICIF_SET ), /* ProcessUserModeIOPL */ - ICI_SQ_SAME( sizeof(BOOLEAN), sizeof(USHORT), ICIF_SET ), /* ProcessEnableAlignmentFaultFixup */ - ICI_SQ_SAME( sizeof(PROCESS_PRIORITY_CLASS), sizeof(USHORT), ICIF_SET ), /* ProcessPriorityClass */ + ICI_SQ_SAME( 0 /* FIXME */, sizeof(ULONG), ICIF_SET ), /* ProcessUserModeIOPL */ + ICI_SQ_SAME( sizeof(BOOLEAN), sizeof(ULONG), ICIF_SET ), /* ProcessEnableAlignmentFaultFixup */ + ICI_SQ_SAME( sizeof(PROCESS_PRIORITY_CLASS), sizeof(USHORT), ICIF_SET ), /* ProcessPriorityClass */ ICI_SQ_SAME( sizeof(ULONG), sizeof(ULONG), ICIF_QUERY ), /* ProcessWx86Information */ ICI_SQ_SAME( sizeof(ULONG), sizeof(ULONG), ICIF_QUERY ), /* ProcessHandleCount */ - ICI_SQ_SAME( sizeof(KAFFINITY), sizeof(USHORT), ICIF_SET ), /* ProcessAffinityMask */ + ICI_SQ_SAME( sizeof(KAFFINITY), sizeof(ULONG), ICIF_SET ), /* ProcessAffinityMask */ ICI_SQ_SAME( sizeof(ULONG), sizeof(ULONG), ICIF_QUERY | ICIF_SET ), /* ProcessPriorityBoost */ ICI_SQ(/*Q*/ sizeof(((PPROCESS_DEVICEMAP_INFORMATION)0x0)->Query), /* ProcessDeviceMap */ /*S*/ sizeof(((PPROCESS_DEVICEMAP_INFORMATION)0x0)->Set), - /*Q*/ sizeof(USHORT), - /*S*/ sizeof(USHORT), + /*Q*/ sizeof(ULONG), + /*S*/ sizeof(ULONG), ICIF_QUERY | ICIF_SET ), - ICI_SQ_SAME( sizeof(PROCESS_SESSION_INFORMATION), sizeof(USHORT), ICIF_QUERY | ICIF_SET ), /* ProcessSessionInformation */ - ICI_SQ_SAME( sizeof(BOOLEAN), sizeof(USHORT), ICIF_SET ), /* ProcessForegroundInformation */ + ICI_SQ_SAME( sizeof(PROCESS_SESSION_INFORMATION), sizeof(ULONG), ICIF_QUERY | ICIF_SET ), /* ProcessSessionInformation */ + ICI_SQ_SAME( sizeof(BOOLEAN), sizeof(ULONG), ICIF_SET ), /* ProcessForegroundInformation */ ICI_SQ_SAME( sizeof(ULONG), sizeof(ULONG), ICIF_QUERY ), /* ProcessWow64Information */ ICI_SQ_SAME( sizeof(UNICODE_STRING), sizeof(ULONG), ICIF_QUERY | ICIF_SIZE_VARIABLE), /* ProcessImageFileName */ }; Property changes on: trunk/reactos/subsys/system/msiexec ___________________________________________________________________ Name: svn:ignore - *.o *.d *.exe *.coff *.sym *.map + *.d *.a *.o *.bin *.dll *.lib *.coff *.sym *.tmp *.gch *.pch *.map *.exe

1 0

[gvg] 13230: Nt -> Zw fixes
by gvg＠svn.reactos.com 23 Jan '05

23 Jan '05

Nt -> Zw fixes Modified: trunk/reactos/ntoskrnl/ps/locale.c _____ Modified: trunk/reactos/ntoskrnl/ps/locale.c --- trunk/reactos/ntoskrnl/ps/locale.c 2005-01-23 20:58:28 UTC (rev 13229) +++ trunk/reactos/ntoskrnl/ps/locale.c 2005-01-23 21:19:24 UTC (rev 13230) @@ -65,7 +65,7 @@ OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = NtOpenKey(&KeyHandle, + Status = ZwOpenKey(&KeyHandle, KEY_QUERY_VALUE, &ObjectAttributes); if (NT_SUCCESS(Status)) @@ -73,7 +73,7 @@ /* Read system locale */ RtlRosInitUnicodeStringFromLiteral(&ValueName, L"Default"); - Status = NtQueryValueKey(KeyHandle, + Status = ZwQueryValueKey(KeyHandle, &ValueName, KeyValuePartialInformation, ValueBuffer, @@ -98,7 +98,7 @@ /* Read install language id */ RtlRosInitUnicodeStringFromLiteral(&ValueName, L"InstallLanguage"); - Status = NtQueryValueKey(KeyHandle, + Status = ZwQueryValueKey(KeyHandle, &ValueName, KeyValuePartialInformation, ValueBuffer, @@ -120,7 +120,7 @@ } } - NtClose(KeyHandle); + ZwClose(KeyHandle); } } @@ -161,12 +161,12 @@ OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = NtOpenKey(&KeyHandle, + Status = ZwOpenKey(&KeyHandle, KEY_QUERY_VALUE, &ObjectAttributes); if (NT_SUCCESS(Status)) { - Status = NtQueryValueKey(KeyHandle, + Status = ZwQueryValueKey(KeyHandle, &ValueName, KeyValuePartialInformation, ValueBuffer, @@ -187,7 +187,7 @@ PsDefaultThreadLocaleId = (LCID)LocaleValue; } } - NtClose(KeyHandle); + ZwClose(KeyHandle); } PsDefaultThreadLocaleInitialized = TRUE; @@ -280,14 +280,14 @@ OBJ_CASE_INSENSITIVE, UserKey, NULL); - Status = NtOpenKey(&KeyHandle, + Status = ZwOpenKey(&KeyHandle, KEY_SET_VALUE, &ObjectAttributes); if (!NT_SUCCESS(Status)) { if (UserKey != NULL) { - NtClose(UserKey); + ZwClose(UserKey); } return(Status); } @@ -306,17 +306,17 @@ } ValueLength = (ValueLength + 1) * sizeof(WCHAR); - Status = NtSetValueKey(KeyHandle, + Status = ZwSetValueKey(KeyHandle, &ValueName, 0, REG_SZ, ValueBuffer, ValueLength); - NtClose(KeyHandle); + ZwClose(KeyHandle); if (UserKey != NULL) { - NtClose(UserKey); + ZwClose(UserKey); } if (!NT_SUCCESS(Status)) @@ -378,7 +378,7 @@ OBJ_CASE_INSENSITIVE, UserKey, NULL); - Status = NtOpenKey(&KeyHandle, + Status = ZwOpenKey(&KeyHandle, KEY_QUERY_VALUE, &ObjectAttributes); if (!NT_SUCCESS(Status)) @@ -389,15 +389,15 @@ ValueInfo = (PKEY_VALUE_PARTIAL_INFORMATION)ValueBuffer; - Status = NtQueryValueKey(KeyHandle, + Status = ZwQueryValueKey(KeyHandle, &ValueName, KeyValuePartialInformation, ValueBuffer, VALUE_BUFFER_SIZE, &ValueLength); - NtClose(KeyHandle); - NtClose(UserKey); + ZwClose(KeyHandle); + ZwClose(UserKey); if (!NT_SUCCESS(Status) || ValueInfo->Type != REG_SZ) { @@ -471,12 +471,12 @@ UserHandle, NULL); - Status = NtOpenKey(&KeyHandle, + Status = ZwOpenKey(&KeyHandle, KEY_SET_VALUE, &ObjectAttributes); if (!NT_SUCCESS(Status)) { - NtClose(UserHandle); + ZwClose(UserHandle); return Status; } @@ -485,15 +485,15 @@ (ULONG)LanguageId); ValueLength = (ValueLength + 1) * sizeof(WCHAR); - Status = NtSetValueKey(KeyHandle, + Status = ZwSetValueKey(KeyHandle, &ValueName, 0, REG_SZ, ValueBuffer, ValueLength); - NtClose(KeyHandle); - NtClose(UserHandle); + ZwClose(KeyHandle); + ZwClose(UserHandle); return Status; }

1 0

[weiden] 13229: get rid of the reactos-only RTL_REGISTRY_ENUM flag and added more debug messages to ease debugging failures
by weiden＠svn.reactos.com 23 Jan '05

23 Jan '05

get rid of the reactos-only RTL_REGISTRY_ENUM flag and added more debug messages to ease debugging failures Modified: trunk/reactos/include/ntos/rtl.h Modified: trunk/reactos/lib/rtl/registry.c Modified: trunk/reactos/ntoskrnl/cm/import.c Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnproot.c _____ Modified: trunk/reactos/include/ntos/rtl.h --- trunk/reactos/include/ntos/rtl.h 2005-01-23 20:57:45 UTC (rev 13228) +++ trunk/reactos/include/ntos/rtl.h 2005-01-23 20:58:28 UTC (rev 13229) @@ -458,8 +458,7 @@ #define RTL_REGISTRY_WINDOWS_NT 3 #define RTL_REGISTRY_DEVICEMAP 4 #define RTL_REGISTRY_USER 5 -#define RTL_REGISTRY_ENUM 6 /* ReactOS specific: Used internally in kernel only */ -#define RTL_REGISTRY_MAXIMUM 7 +#define RTL_REGISTRY_MAXIMUM 6 #define RTL_REGISTRY_HANDLE 0x40000000 #define RTL_REGISTRY_OPTIONAL 0x80000000 _____ Modified: trunk/reactos/lib/rtl/registry.c --- trunk/reactos/lib/rtl/registry.c 2005-01-23 20:57:45 UTC (rev 13228) +++ trunk/reactos/lib/rtl/registry.c 2005-01-23 20:58:28 UTC (rev 13229) @@ -51,6 +51,13 @@ 0, FALSE, DUPLICATE_SAME_ACCESS); +#ifndef NDEBUG + if(!NT_SUCCESS(Status)) + { + DPRINT("ZwDuplicateObject() failed! Status: 0x%x\n", Status); + } +#endif + return(Status); } @@ -58,18 +65,20 @@ RelativeTo &= ~RTL_REGISTRY_OPTIONAL; if (RelativeTo >= RTL_REGISTRY_MAXIMUM) + { + DPRINT("Invalid relative flag, parameter invalid!\n"); return(STATUS_INVALID_PARAMETER); + } KeyName.Length = 0; - KeyName.MaximumLength = MAX_PATH; + KeyName.MaximumLength = sizeof(KeyBuffer); KeyName.Buffer = KeyBuffer; KeyBuffer[0] = 0; switch (RelativeTo) { case RTL_REGISTRY_ABSOLUTE: - RtlAppendUnicodeToString(&KeyName, - L"\\"); + /* nothing to prefix! */ break; case RTL_REGISTRY_SERVICES: @@ -102,16 +111,8 @@ RtlAppendUnicodeToString (&KeyName, L"\\"); break; - - /* ReactOS specific */ - case RTL_REGISTRY_ENUM: - RtlAppendUnicodeToString(&KeyName, - L"\\Registry\\Machine\\System\\CurrentControlSet\\Enum\\"); - break; } - DPRINT("KeyName %wZ\n", &KeyName); - if (Path[0] == L'\\' && RelativeTo != RTL_REGISTRY_ABSOLUTE) { Path++; @@ -127,7 +128,7 @@ NULL, NULL); - if (Create == TRUE) + if (Create) { Status = ZwCreateKey(KeyHandle, KEY_ALL_ACCESS, @@ -144,6 +145,13 @@ &ObjectAttributes); } +#ifndef NDEBUG + if(!NT_SUCCESS(Status)) + { + DPRINT("%s failed! Status: 0x%x\n", (Create ? "ZwCreateKey" : "ZwOpenKey"), Status); + } +#endif + return(Status); } @@ -876,7 +884,10 @@ TRUE, &KeyHandle); if (!NT_SUCCESS(Status)) + { + DPRINT("RtlpGetRegistryHandle() failed! Status: 0x%x\n", Status); return(Status); + } RtlInitUnicodeString(&Name, ValueName); @@ -887,9 +898,13 @@ ValueType, ValueData, ValueLength); - if (NT_SUCCESS(Status)) - ZwClose(KeyHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ZwSetValueKey() failed! Status: 0x%x\n", Status); + } + ZwClose(KeyHandle); + return(Status); } _____ Modified: trunk/reactos/ntoskrnl/cm/import.c --- trunk/reactos/ntoskrnl/cm/import.c 2005-01-23 20:57:45 UTC (rev 13228) +++ trunk/reactos/ntoskrnl/cm/import.c 2005-01-23 20:58:28 UTC (rev 13229) @@ -242,7 +242,8 @@ &Disposition); if (!NT_SUCCESS(Status)) { - return FALSE; + DPRINT1("NtCreateKey() failed, status: 0x%x\n", Status); + return FALSE; } NtClose (HardwareKey); @@ -263,7 +264,8 @@ &Disposition); if (!NT_SUCCESS(Status)) { - return FALSE; + DPRINT1("NtCreateKey() failed, status: 0x%x\n", Status); + return FALSE; } NtClose (HardwareKey); @@ -284,7 +286,8 @@ &Disposition); if (!NT_SUCCESS(Status)) { - return FALSE; + DPRINT1("NtCreateKey() failed, status: 0x%x\n", Status); + return FALSE; } NtClose (HardwareKey); @@ -305,7 +308,8 @@ &Disposition); if (!NT_SUCCESS(Status)) { - return FALSE; + DPRINT1("NtCreateKey() failed, status: 0x%x\n", Status); + return FALSE; } NtClose (HardwareKey); _____ Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c --- trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-01-23 20:57:45 UTC (rev 13228) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c 2005-01-23 20:58:28 UTC (rev 13229) @@ -77,6 +77,7 @@ CmiKeyType); if (!NT_SUCCESS(Status)) { + DPRINT("ObFindObject failed, Status: 0x%x\n", Status); return(Status); } @@ -89,6 +90,7 @@ { ObDereferenceObject(Object); RtlFreeUnicodeString(&RemainingPath); + DPRINT("Object marked for delete!\n"); return(STATUS_UNSUCCESSFUL); } @@ -101,7 +103,7 @@ TRUE, KeyHandle); - DPRINT("Status %x\n", Status); + DPRINT("ObCreateHandle failed Status 0x%x\n", Status); ObDereferenceObject(Object); RtlFreeUnicodeString(&RemainingPath); return Status; @@ -118,6 +120,7 @@ { ObDereferenceObject(Object); RtlFreeUnicodeString(&RemainingPath); + DPRINT1("NtCreateKey() can't create trees! (found \'\\\' in remaining path: \"%wZ\"!)\n", &RemainingPath); return STATUS_OBJECT_NAME_NOT_FOUND; } @@ -134,6 +137,7 @@ (PVOID*)&KeyObject); if (!NT_SUCCESS(Status)) { + DPRINT1("ObCreateObject() failed!\n"); return(Status); } @@ -147,6 +151,7 @@ { ObDereferenceObject(KeyObject); RtlFreeUnicodeString(&RemainingPath); + DPRINT1("ObInsertObject() failed!\n"); return(Status); } @@ -965,7 +970,7 @@ ObjectAttributes ? ObjectAttributes->ObjectName : NULL); PreviousMode = ExGetPreviousMode(); - + if(PreviousMode != KernelMode) { _SEH_TRY _____ Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c --- trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-01-23 20:57:45 UTC (rev 13228) +++ trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-01-23 20:58:28 UTC (rev 13229) @@ -1378,6 +1378,13 @@ if (!IopDeviceNodeHasFlag(DeviceNode, DNF_DISABLED)) { + WCHAR RegKeyBuffer[MAX_PATH]; + UNICODE_STRING RegKey; + + RegKey.Length = 0; + RegKey.MaximumLength = sizeof(RegKeyBuffer); + RegKey.Buffer = RegKeyBuffer; + /* * Retrieve configuration from Enum key */ @@ -1391,9 +1398,12 @@ QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT; QueryTable[0].EntryContext = Service; - Status = RtlQueryRegistryValues(RTL_REGISTRY_ENUM, - DeviceNode->InstancePath.Buffer, QueryTable, NULL, NULL); + RtlAppendUnicodeToString(&RegKey, L"\\Registry\\Machine\\System\\CurrentControlSet\\Enum\\"); + RtlAppendUnicodeStringToString(&RegKey, &DeviceNode->InstancePath); + Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, + RegKey.Buffer, QueryTable, NULL, NULL); + if (!NT_SUCCESS(Status)) { DPRINT("RtlQueryRegistryValues() failed (Status %x)\n", Status); _____ Modified: trunk/reactos/ntoskrnl/io/pnproot.c --- trunk/reactos/ntoskrnl/io/pnproot.c 2005-01-23 20:57:45 UTC (rev 13228) +++ trunk/reactos/ntoskrnl/io/pnproot.c 2005-01-23 20:58:28 UTC (rev 13229) @@ -409,7 +409,8 @@ DeviceDesc = &Device->DeviceDescription; - wcscpy(KeyName, ENUM_NAME_ROOT); + wcscpy(KeyName, L"\\Registry\\Machine\\System\\CurrentControlSet\\Enum\\"); + wcscat(KeyName, ENUM_NAME_ROOT); wcscat(KeyName, L"\\"); wcscat(KeyName, Device->ServiceName.Buffer); wcscat(KeyName, L"\\"); @@ -426,7 +427,7 @@ QueryTable[0].EntryContext = DeviceDesc; Status = RtlQueryRegistryValues( - RTL_REGISTRY_ENUM, + RTL_REGISTRY_ABSOLUTE, KeyName, QueryTable, NULL,

1 0

[gvg] 13228: Make gdb stack trace back to usermode work again
by gvg＠svn.reactos.com 23 Jan '05

23 Jan '05

Make gdb stack trace back to usermode work again Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S _____ Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S --- trunk/reactos/ntoskrnl/ke/i386/syscall.S 2005-01-23 20:48:19 UTC (rev 13227) +++ trunk/reactos/ntoskrnl/ke/i386/syscall.S 2005-01-23 20:57:45 UTC (rev 13228) @@ -97,12 +97,12 @@ #ifdef DBG /* Trick gdb 6 into backtracing over the system call */ - pushl 4(%ebp) /* DebugEIP */ // + 0x74 - pushl (%ebp) /* DebugEBP */ // + 0x78 + mov 0x6c(%esp), %ebx + pushl 4(%ebx) /* DebugEIP */ // + 0x74 #else pushl 0x60(%esp) /* DebugEIP */ // + 0x74 +#endif pushl %ebp /* DebugEBP */ // + 0x78 -#endif /* Load the segment registers */ sti @@ -121,6 +121,16 @@ movl %ebp, KTHREAD_TRAP_FRAME(%esi) CheckValidCall: + +#ifdef DBG + /* + * GDB thinks the function starts here and + * wants a standard prolog, so let's give it + */ + pushl %ebp + movl %esp,%ebp + popl %ebp +#endif /* * Find out which table offset to use. Converts 0x1124 into 0x10. @@ -141,16 +151,6 @@ /* Invalid ID, try to load Win32K Table */ jnb KiBBTUnexpectedRange - -#ifdef DBG - /* - * GDB thinks the function starts here and - * wants a standard prolog, so let's give it - */ - pushl %ebp - movl %esp,%ebp - popl %ebp -#endif /* Users's current stack frame pointer is source */ movl %edx, %esi

1 0

[weiden] 13226: the system process should be called "System", not "SYSTEM"
by weiden＠svn.reactos.com 23 Jan '05

23 Jan '05

the system process should be called "System", not "SYSTEM" Modified: trunk/reactos/ntoskrnl/ps/process.c _____ Modified: trunk/reactos/ntoskrnl/ps/process.c --- trunk/reactos/ntoskrnl/ps/process.c 2005-01-23 12:47:42 UTC (rev 13225) +++ trunk/reactos/ntoskrnl/ps/process.c 2005-01-23 18:18:08 UTC (rev 13226) @@ -383,7 +383,7 @@ InitializeListHead(&PsInitialSystemProcess->ThreadListHead); KeReleaseSpinLock(&PsProcessListLock, oldIrql); - strcpy(PsInitialSystemProcess->ImageFileName, "SYSTEM"); + strcpy(PsInitialSystemProcess->ImageFileName, "System"); SepCreateSystemProcessToken(PsInitialSystemProcess); }

1 0

[chorns] 13225: Add documentation
by chorns＠svn.reactos.com 23 Jan '05

23 Jan '05

Add documentation Added: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.txt _____ Added: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.txt --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.txt 2005-01-23 11:01:51 UTC (rev 13224) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.txt 2005-01-23 12:47:42 UTC (rev 13225) @@ -0,0 +1,387 @@ +ReactOS Build System Documentation +================================== + +Building ReactOS +---------------- +To generate GNU make makefiles for building ReactOS do the following: + + 1) Go to the top-level reactos directory + 2) Run the command: mingw32-make -C tools\reactos + 3) Run the command: tools\rbuild\rbuild mingw + +This will generate Makefile.auto in the current directory. Now run the following command: + + mingw32-make -f Makefile.auto + +This will start building ReactOS. + +To build a bootable CD run the following command: + + mingw32-make -f Makefile.auto bootcd + +This will create ReactOS.iso in the top-level reactos directory. + + +Top-level XML Build File +------------------------ +The top-level xml build file (ReactOS.xml) is processed by rbuild. The following is an example of how it could look like: + +<?xml version="1.0"?> +<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> +<project name="ReactOS" makefile="Makefile.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="config.xml"> + <xi:fallback> + <xi:include href="config.template.xml" /> + </xi:fallback> + </xi:include> + + <define name="_M_IX86" /> + <if property="DBG" value="1"> + <define name="DBG" value="1" /> + <property name="DBG_OR_KDBG" value="true" /> + </if> + + <include base="ReactOS">include</include> + + <directory name="boot"> + <xi:include href="boot/boot.xml" /> + </directory> + + <module name="bootcd" type="iso"> + </module> +</project> + + +xi:include +---------- +It is possible to split an xml build file over several files. The include element in the xi namespace is used to accomplish this. + +Syntax: + <xi:include href="config.xml"> + <xi:fallback> + <xi:include href="config.template.xml" /> + </xi:fallback> + </xi:include> + +Attributes: + href - Name of xml build file to include. The filename is relative to the location of the current xml build file. + +Value: + None. + +Elements: + xi:fallback + + +xi:fallback +----------- +This element is used to provide the name of an alternate file that is to be included if the first include file did not exists. + +Attributes: + None. + +Value: + None. + +Elements: + xi:include. + + +Project element +--------------- +There can be one project per top-level XML build file. A project can only be defined in a top-level xml build file. + +Syntax: + <project name="ReactOS" makefile="Makefile.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> + ... + </project> + +Attributes: + name - Name of the project. + makefile - Filename of the GNU makefile that is to be created. + +Value: + None. + +Elements: + define, directory, if, include, module, property + + +Module element +-------------- +There can be zero or more modules per xml build file. + +Syntax: + <module name="msvcrt" type="win32dll" extension=".dll" entrypoint="_DllMain@12" mangledsymbols="true"> + ... + </module> + +Attributes: + name - Name of the module. Also the base name of the generated file if such file is generated for the particular module type. + type - Type of module. See below for an explanation of module types. + extension - Extension of the generated file if such file is generated for the particular module type. + entrypoint - Entrypoint for the generated file if such file is generated for the particular module type. + mangledsymbols - Controls wether or not to pass --kill-at to dlltool. If this attribute has the value false then --kill-at is passed to dlltool. If the value is true, then --kill-at is not passed to dlltool. If the generated file exports C++ classes then this need to be true. + +Value: + None. + +Elements: + define, dependency, directory, file, if, importlibrary, include, invoke, library, property. + + +Module types +------------ +The module type determines the actions that is to be carried out to process the module. The defined module types are seen below: + buildtool - Builds a tool that can be run (invoked) when building ReactOS. Default extension is .exe when building on Windows and nothing when building on Linux. The entrypoint module attribute is not applicable for this module type. + staticlibrary - Builds a static library containing object files that can be linked together with other modules. Default extension is .a. The entrypoint module attribute is not applicable for this module type. + objectlibrary - Builds object files that can be linked together with other modules. Default extension is .o. The entrypoint module attribute is not applicable for this module type. + kernel - Builds ntoskrnl.exe. Default extension is .exe. Default entrypoint is _NtProcessStartup. + kernelmodedll - Builds a kernel-mode DLL. Default extension is .dll. Default entrypoint is _DriverEntry@8. + kernelmodedriver - Builds a kernel-mode driver. Default extension is .sys. Default entrypoint is _DriverEntry@8. + nativedll - Builds a native DLL. Default extension is .dll. Default entrypoint is _DllMainCRTStartup@12. + win32dll - Builds a Win32 DLL. Default extension is .dll. Default entrypoint is _DllMain@12. + win32gui - Builds a Win32 GUI executable. Default extension is .exe. Default entrypoint is _WinMainCRTStartup. + bootloader - Builds a bootloader. The extension and entrypoint module attributes are not applicable for this module type. + bootsector - Builds one or more bootsector binaries. The extension and entrypoint module attributes are not applicable for this module type. + iso - Builds a bootable CD. The extension and entrypoint module attributes are not applicable for this module type + + +Define element +-------------- +A define element specifies the name and (optionally) value of a define for the C/C++ compiler and resource compiler. + +Syntax: + <define name="WINVER">0x501</define> + +Attributes: + name - Name of define. + +Value: + Value of define. The value is optional. + +Elements: + None. + + +Dependency element +------------------ +A dependency element specifies the name of a module (usually of type buildtool) that is to be processed before the current module. + +Syntax: + <dependency>OtherModule</dependency> + +Attributes: + None. + +Value: + Name of module. + +Elements: + None. + + +Directory element +----------------- +A directory element specifies the name of a subdirectory. + +Syntax: + <directory name="MyDirectory"> + ... + </directory> + +Attributes: + name - Name of directory. + +Value: + None. + +Elements: + directory, file, if, property. + + +File element +------------ +A file element specifies the name of a file that is to be processed. + +Syntax: + <file>MyFile.c</file> + +Attributes: + None. + +Value: + Name of file. + +Elements: + None. + + +If element +---------- +An if element allows for conditional processing of other elements. + +Syntax: + <if property="DBG" value="1"> + ... + </if> + +Attributes: + property - Name of the property that is to be evaluated. + value - Value to compare to the value of the property. If the property has the specified value, then the subelements are processed. + +Value: + None. + +Elements: + define, directory, file, if, include, property. + + +Importlibrary element +--------------------- +An importlibrary element specifies that an import library should be generated which other modules can use to link with the current module. + +Syntax: + <importlibrary definition="MyModule.def" /> + +Attributes: + definition - Filename of definition file (.def) used to generate the import library. The filename is relative to the current module. + +Value: + None. + +Elements: + None. + + +Include element +--------------- +An include element specifies an include directory for the C/C++ compiler and resource compiler. + +Syntax: + <include base="MyLibraryModule">include</include> + +Attributes: + base - Module or project which the value of this element is relative to. This attribute is optional. If left out, the include directory is relative to the position of the top-level xml build file. + +Value: + Relative include directory. + +Elements: + None. + + +Invoke element +-------------- +An invoke element specifies the name of a module which is to be executed before the current module is processed. + +Syntax: + <invoke module="wmc"> + <input> + <inputfile>ntoskrnl.mc</inputfile> + </input> + <output> + <outputfile switches="-H">../include/reactos/bugcodes.h</outputfile> + <outputfile switches="-o">bugcodes.rc</outputfile> + </output> + </invoke> + +Attributes: + None. + +Value: + Name of the module to execute. + +Elements: + input, output. + + +Input element +------------- +An input element specifies a group of filenames that is to be passed as parameters to a build tool. Input filename parameters are located after output filename parameters on the command line. + +Attributes: + None. + +Value: + None. + +Elements: + inputfile. + + +Inputfile element +----------------- +An inputfile element specifies a filename that is to be passed as a parameter to a build tool. + +Attributes: + switches - Switches that is passed as parameters just before the filename. This attribute is optional. + +Value: + Name of file that is to be passed as a parameter to the build tool. + +Elements: + None. + + +Output element +-------------- +An output element specifies a group of filenames that is to be passed as parameters to a build tool. Output filename parameters are located before input filename parameters on the command line. + +Attributes: + None. + +Value: + None. + +Elements: + outputfile. + + +Outputfile element +------------------ +An outputfile element specifies a filename that is to be passed as a parameter to a build tool. + +Attributes: + switches - Switches that is passed as parameters just before the filename. This attribute is optional. + +Value: + Name of file that is to be passed as a parameter to the build tool. + +Elements: + None. + + +Library +------- +An importlibrary element specifies the name of another module which is to be linked with the current module. + +Syntax: + <library>MyLibraryModule</library> + +Attributes: + None. + +Value: + Name of the module to link with. + +Elements: + None. + + +Property +-------- +A property element specifies the name and value of a property that can be used for conditional processing of the xml build file. + +Syntax: + <property name="mypropertyname" value="mypropertyvalue" /> + +Attributes: + name - Name of property. + value - Value of property. + +Value: + None. + +Elements: + None.

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