Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 22277: - Fixup some comments and add Eric Kohl's name to this file, since he had worked on some of the original calls. - Minor/trivial fixes to some Object Security APIs that were left in the dark: * Use PagedPool instead of NonPagedPool memory, and also tag the allocation for debugging. * Send needed data to the security procedure instead of NULL/0, including the Generic Mapping, and the actual Security Decriptor. * Only un-assign the descriptor in case of failure, not all the time (the w
by ion＠svn.reactos.org 08 Jun '06

08 Jun '06

Author: ion Date: Thu Jun 8 06:36:12 2006 New Revision: 22277 URL: http://svn.reactos.ru/svn/reactos?rev=22277&view=rev Log: - Fixup some comments and add Eric Kohl's name to this file, since he had worked on some of the original calls. - Minor/trivial fixes to some Object Security APIs that were left in the dark: * Use PagedPool instead of NonPagedPool memory, and also tag the allocation for debugging. * Send needed data to the security procedure instead of NULL/0, including the Generic Mapping, and the actual Security Decriptor. * Only un-assign the descriptor in case of failure, not all the time (the whole point of the API is to assign it!) * Tell the caller that memory was NOT allocated if we failed to get the security descriptor. Modified: trunk/reactos/ntoskrnl/ob/security.c Modified: trunk/reactos/ntoskrnl/ob/security.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/security.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ob/security.c (original) +++ trunk/reactos/ntoskrnl/ob/security.c Thu Jun 8 06:36:12 2006 @@ -4,6 +4,7 @@ * FILE: ntoskrnl/ob/security.c * PURPOSE: SRM Interface of the Object Manager * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) +* Eric Kohl */ /* INCLUDES *****************************************************************/ @@ -65,12 +66,15 @@ NewDescriptor, NULL, NULL, - NonPagedPool, - NULL); - - /* Release the new security descriptor */ - SeDeassignSecurity(&NewDescriptor); - + PagedPool, + &Type->TypeInfo.GenericMapping); + if (!NT_SUCCESS(Status)) + { + /* Release the new security descriptor */ + SeDeassignSecurity(&NewDescriptor); + } + + /* Return to caller */ return Status; } @@ -101,61 +105,70 @@ OUT PBOOLEAN MemoryAllocated) { POBJECT_HEADER Header; + POBJECT_TYPE Type; ULONG Length; NTSTATUS Status; PAGED_CODE(); + /* Get the object header and type */ Header = OBJECT_TO_OBJECT_HEADER(Object); - if (Header->Type == NULL) return STATUS_UNSUCCESSFUL; - - if (Header->Type->TypeInfo.SecurityProcedure == NULL) - { + Type = Header->Type; + + /* Check if the object uses default security */ + if (Type->TypeInfo.SecurityProcedure == SeDefaultObjectMethod) + { + /* Reference the descriptor and return it */ ObpReferenceCachedSecurityDescriptor(Header->SecurityDescriptor); *SecurityDescriptor = Header->SecurityDescriptor; + + /* Tell the caller that we didn't have to allocate anything */ *MemoryAllocated = FALSE; return STATUS_SUCCESS; } /* Get the security descriptor size */ Length = 0; - Status = Header->Type->TypeInfo.SecurityProcedure(Object, - QuerySecurityDescriptor, - OWNER_SECURITY_INFORMATION | - GROUP_SECURITY_INFORMATION | - DACL_SECURITY_INFORMATION | - SACL_SECURITY_INFORMATION, - NULL, - &Length, - NULL, - NonPagedPool, - NULL); + Status = Type->TypeInfo.SecurityProcedure(Object, + QuerySecurityDescriptor, + OWNER_SECURITY_INFORMATION | + GROUP_SECURITY_INFORMATION | + DACL_SECURITY_INFORMATION | + SACL_SECURITY_INFORMATION, + NULL, + &Length, + &Header->SecurityDescriptor, + PagedPool, + &Type->TypeInfo.GenericMapping); if (Status != STATUS_BUFFER_TOO_SMALL) return Status; /* Allocate security descriptor */ - *SecurityDescriptor = ExAllocatePool(NonPagedPool, Length); - if (*SecurityDescriptor == NULL) return STATUS_INSUFFICIENT_RESOURCES; + *SecurityDescriptor = ExAllocatePoolWithTag(PagedPool, + Length, + TAG('O', 'b', 'S', 'q')); + if (!(*SecurityDescriptor)) return STATUS_INSUFFICIENT_RESOURCES; /* Query security descriptor */ - Status = Header->Type->TypeInfo.SecurityProcedure(Object, - QuerySecurityDescriptor, - OWNER_SECURITY_INFORMATION | - GROUP_SECURITY_INFORMATION | - DACL_SECURITY_INFORMATION | - SACL_SECURITY_INFORMATION, - *SecurityDescriptor, - &Length, - NULL, - NonPagedPool, - NULL); + *MemoryAllocated = TRUE; + Status = Type->TypeInfo.SecurityProcedure(Object, + QuerySecurityDescriptor, + OWNER_SECURITY_INFORMATION | + GROUP_SECURITY_INFORMATION | + DACL_SECURITY_INFORMATION | + SACL_SECURITY_INFORMATION, + *SecurityDescriptor, + &Length, + &Header->SecurityDescriptor, + PagedPool, + &Type->TypeInfo.GenericMapping); if (!NT_SUCCESS(Status)) { + /* Free the descriptor and tell the caller we failed */ ExFreePool(*SecurityDescriptor); - return Status; - } - - *MemoryAllocated = TRUE; - - return STATUS_SUCCESS; + *MemoryAllocated = FALSE; + } + + /* Return status */ + return Status; } /*++ @@ -182,14 +195,18 @@ { PAGED_CODE(); - if (SecurityDescriptor == NULL) return; - + /* Nothing to do in this case */ + if (!SecurityDescriptor) return; + + /* Check if we had allocated it from memory */ if (MemoryAllocated) { + /* Free it */ ExFreePool(SecurityDescriptor); } else { + /* Otherwise this means we used an internal descriptor */ ObpDereferenceCachedSecurityDescriptor(SecurityDescriptor); } }

1 0

[ion] 22276: - Split ObpCreateHandle into two distinct operations: Incrementing and Creating (like we have Delete/Decrement). No code additions, just splitting. - Because of the split, we can now directly only do an Increment when duplicating the handle, since we don't need to create a brand new one. Also, when inheriting, we can now properly do an increment as well, instead of simply manually increasing the handle count (because for each inherited handle, access checks and openprocedure should'
by ion＠svn.reactos.org 07 Jun '06

07 Jun '06

Author: ion Date: Thu Jun 8 03:59:15 2006 New Revision: 22276 URL: http://svn.reactos.ru/svn/reactos?rev=22276&view=rev Log: - Split ObpCreateHandle into two distinct operations: Incrementing and Creating (like we have Delete/Decrement). No code additions, just splitting. - Because of the split, we can now directly only do an Increment when duplicating the handle, since we don't need to create a brand new one. Also, when inheriting, we can now properly do an increment as well, instead of simply manually increasing the handle count (because for each inherited handle, access checks and openprocedure should've still been called). Modified: trunk/reactos/ntoskrnl/ob/obhandle.c Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Thu Jun 8 03:59:15 2006 @@ -349,6 +349,108 @@ /* Leave the critical region and return the status */ KeLeaveCriticalRegion(); return Status; +} + +NTSTATUS +NTAPI +ObpIncrementHandleCount(IN PVOID Object, + IN PACCESS_STATE AccessState, + IN KPROCESSOR_MODE AccessMode, + IN ULONG HandleAttributes, + IN PEPROCESS Process, + IN OB_OPEN_REASON OpenReason) +{ + POBJECT_HEADER ObjectHeader; + POBJECT_TYPE ObjectType; + ULONG ProcessHandleCount; + + /* Get the object header and type */ + ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); + ObjectType = ObjectHeader->Type; + OBTRACE("OBTRACE - %s - Incrementing count for: %p. Reason: %lx. HC LC %lx %lx\n", + __FUNCTION__, + Object, + OpenReason, + ObjectHeader->HandleCount, + ObjectHeader->PointerCount); + + /* Check if we're opening an existing handle */ + if (OpenReason == ObOpenHandle) + { + /* + * FIXME: Do validation as described in Chapter 8 + * of Windows Internals 4th. + */ +#if 0 + if (!ObCheckObjectAccess(Object, + AccessState, + TRUE, + AccessMode, + &Status)) + { + return Status; + } +#endif + } + else if (OpenReason == ObCreateHandle) + { + /* Convert MAXIMUM_ALLOWED to GENERIC_ALL */ + if (AccessState->RemainingDesiredAccess & MAXIMUM_ALLOWED) + { + /* Mask out MAXIMUM_ALLOWED and stick GENERIC_ALL instead */ + AccessState->RemainingDesiredAccess &= ~MAXIMUM_ALLOWED; + AccessState->RemainingDesiredAccess |= GENERIC_ALL; + } + + /* Check if we have to map the GENERIC mask */ + if (AccessState->RemainingDesiredAccess & GENERIC_ACCESS) + { + /* Map it to the correct access masks */ + RtlMapGenericMask(&AccessState->RemainingDesiredAccess, + &ObjectType->TypeInfo.GenericMapping); + } + } + + /* Increase the handle count */ + if(InterlockedIncrement(&ObjectHeader->HandleCount) == 1) + { + /* + * FIXME: Is really needed? Perhaps we should instead take + * advantage of the AddtionalReferences parameter to add the + * bias when required. This might be the source of the mysterious + * ReactOS bug where ObInsertObject *requires* an immediate dereference + * even in a success case. + * Will have to think more about this when doing the Increment/Create + * split later. + */ + ObReferenceObject(Object); + } + + /* FIXME: Use the Handle Database */ + ProcessHandleCount = 0; + + /* Check if we have an open procedure */ + if (ObjectType->TypeInfo.OpenProcedure) + { +#if 0 + /* Call it */ + ObjectType->TypeInfo.OpenProcedure(OpenReason, + Process, + Object, + AccessState->PreviouslyGrantedAccess, + ProcessHandleCount); +#endif + } + + /* Increase total number of handles */ + ObjectType->TotalNumberOfHandles++; + OBTRACE("OBTRACE - %s - Incremented count for: %p. Reason: %lx HC LC %lx %lx\n", + __FUNCTION__, + Object, + OpenReason, + ObjectHeader->HandleCount, + ObjectHeader->PointerCount); + return STATUS_SUCCESS; } NTSTATUS @@ -369,12 +471,14 @@ OUT PHANDLE ReturnedHandle) { HANDLE_TABLE_ENTRY NewEntry; - PVOID HandleTable; POBJECT_HEADER ObjectHeader; - POBJECT_TYPE ObjectType; HANDLE Handle; KAPC_STATE ApcState; BOOLEAN AttachedToProcess = FALSE; + POBJECT_TYPE ObjectType; + PVOID HandleTable; + NTSTATUS Status; + PAGED_CODE(); /* Get the object header and type */ ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); @@ -414,53 +518,22 @@ HandleTable = PsGetCurrentProcess()->ObjectTable; } - /* Convert MAXIMUM_ALLOWED to GENERIC_ALL */ - if (AccessState->RemainingDesiredAccess & MAXIMUM_ALLOWED) - { - /* Mask out MAXIMUM_ALLOWED and stick GENERIC_ALL instead */ - AccessState->RemainingDesiredAccess &= ~MAXIMUM_ALLOWED; - AccessState->RemainingDesiredAccess |= GENERIC_ALL; - } - - /* Check if we have to map the GENERIC mask */ - if (AccessState->RemainingDesiredAccess & GENERIC_ACCESS) - { - /* Map it to the correct access masks */ - RtlMapGenericMask(&AccessState->RemainingDesiredAccess, - &ObjectType->TypeInfo.GenericMapping); - } - - /* Increase the handle count */ - if(InterlockedIncrement(&ObjectHeader->HandleCount) == 1) + /* Increment the handle count */ + Status = ObpIncrementHandleCount(Object, + AccessState, + AccessMode, + HandleAttributes, + PsGetCurrentProcess(), + OpenReason); + if (!NT_SUCCESS(Status)) { /* - * FIXME: Is really needed? Perhaps we should instead take - * advantage of the AddtionalReferences parameter to add the - * bias when required. This might be the source of the mysterious - * ReactOS bug where ObInsertObject *requires* an immediate dereference - * even in a success case. - * Whill have to think more about this when doing the Increment/Create - * split later. + * We failed (meaning security failure, according to NT Internals) + * detach and return */ - ObReferenceObject(Object); - } - - /* Check if we have an open procedure */ -#if 0 - if (ObjectType->TypeInfo.OpenProcedure) - { - /* Call it */ - ObjectType->TypeInfo.OpenProcedure(OpenReason, - PsGetCurrentProcess(), - Object, - AccessState-> - PreviouslyGrantedAccess, - 0); - } -#endif - - /* Increase total number of handles */ - ObjectType->TotalNumberOfHandles++; + if (AttachedToProcess) KeUnstackDetachProcess(&ApcState); + return Status; + } /* Save the object header (assert its validity too) */ ASSERT((ULONG_PTR)ObjectHeader & EX_HANDLE_ENTRY_LOCKED); @@ -472,7 +545,7 @@ EX_HANDLE_ENTRY_INHERITABLE | EX_HANDLE_ENTRY_AUDITONCLOSE); - /* Save the access mask */ + /* Save the access mask */ NewEntry.GrantedAccess = AccessState->RemainingDesiredAccess | AccessState->PreviouslyGrantedAccess; @@ -486,11 +559,11 @@ NewEntry.Object, NewEntry.ObAttributes & 3, NewEntry.GrantedAccess); Handle = ExCreateHandle(HandleTable, &NewEntry); - /* Detach it needed */ + /* Detach if needed */ if (AttachedToProcess) KeUnstackDetachProcess(&ApcState); - /* Check if we got a handle */ - if(Handle) + /* Make sure we got a handle */ + if (Handle) { /* Handle extra references */ while (AdditionalReferences--) @@ -509,18 +582,15 @@ /* Return handle and object */ *ReturnedHandle = Handle; if (ReturnedObject) *ReturnedObject = Object; - - /* Return success */ - OBTRACE("OBTRACE - %s - Incremented count for: %p. Reason: %lx HC LC %lx %lx\n", + OBTRACE("OBTRACE - %s - Returning Handle: %lx HC LC %lx %lx\n", __FUNCTION__, - Object, - OpenReason, + Handle, ObjectHeader->HandleCount, ObjectHeader->PointerCount); return STATUS_SUCCESS; } - /* Decrement the handle count and fail */ + /* Decrement the handle count and detach */ ObpDecrementHandleCount(&ObjectHeader->Body, PsGetCurrentProcess(), NewEntry.GrantedAccess); @@ -617,6 +687,7 @@ POBJECT_HEADER ObjectHeader; BOOLEAN Ret = FALSE; ACCESS_STATE AccessState; + NTSTATUS Status; PAGED_CODE(); /* Make sure that the handle is inheritable */ @@ -629,9 +700,23 @@ /* Setup the access state */ AccessState.PreviouslyGrantedAccess = HandleTableEntry->GrantedAccess; - /* Get the object header and increment the handle and pointer counts */ - InterlockedIncrement(&ObjectHeader->HandleCount); - InterlockedIncrement(&ObjectHeader->PointerCount); + /* Call the shared routine for incrementing handles */ + Status = ObpIncrementHandleCount(&ObjectHeader->Body, + &AccessState, + KernelMode, + HandleTableEntry->ObAttributes, + PsGetCurrentProcess(), + ObInheritHandle); + if (!NT_SUCCESS(Status)) + { + /* Return failure */ + Ret = FALSE; + } + else + { + /* Otherwise increment the pointer count */ + InterlockedIncrement(&ObjectHeader->PointerCount); + } } /* Return duplication result */ @@ -1364,15 +1449,13 @@ DesiredAccess, &ObjectType->TypeInfo.GenericMapping); - Status = ObpCreateHandle(ObDuplicateHandle, - ObjectBody, - ObjectType, - PassedAccessState, - 0, - HandleAttributes, - PreviousMode, - NULL, - &hTarget); + /* Add a new handle */ + Status = ObpIncrementHandleCount(ObjectBody, + PassedAccessState, + PreviousMode, + HandleAttributes, + PsGetCurrentProcess(), + ObDuplicateHandle); if (AttachedToProcess) {

1 0

[hpoussin] 22275: Some 64 fixes
by hpoussin＠svn.reactos.org 07 Jun '06

07 Jun '06

Author: hpoussin Date: Wed Jun 7 21:33:57 2006 New Revision: 22275 URL: http://svn.reactos.ru/svn/reactos?rev=22275&view=rev Log: Some 64 fixes Modified: trunk/reactos/drivers/input/sermouse/detect.c trunk/reactos/drivers/input/sermouse/fdo.c trunk/reactos/drivers/input/sermouse/sermouse.h Modified: trunk/reactos/drivers/input/sermouse/detect.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/input/sermouse/dete… ============================================================================== --- trunk/reactos/drivers/input/sermouse/detect.c (original) +++ trunk/reactos/drivers/input/sermouse/detect.c Wed Jun 7 21:33:57 2006 @@ -20,9 +20,9 @@ IN PDEVICE_OBJECT DeviceObject, IN ULONG CtlCode, IN PVOID InputBuffer OPTIONAL, - IN ULONG InputBufferSize, + IN ULONG_PTR InputBufferSize, IN OUT PVOID OutputBuffer OPTIONAL, - IN OUT PULONG OutputBufferSize) + IN OUT PULONG_PTR OutputBufferSize) { KEVENT Event; PIRP Irp; @@ -106,7 +106,7 @@ IN PDEVICE_OBJECT LowerDevice, OUT PUCHAR Buffer, IN ULONG BufferSize, - OUT PULONG FilledBytes) + OUT PULONG_PTR FilledBytes) { PIRP Irp; IO_STATUS_BLOCK ioStatus; @@ -160,7 +160,7 @@ ULONG Command; SERIAL_TIMEOUTS Timeouts; SERIAL_LINE_CONTROL LCR; - ULONG i, Count = 0; + ULONG_PTR i, Count = 0; UCHAR Buffer[16]; SERMOUSE_MOUSE_TYPE MouseType = mtNone; NTSTATUS Status; Modified: trunk/reactos/drivers/input/sermouse/fdo.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/input/sermouse/fdo.… ============================================================================== --- trunk/reactos/drivers/input/sermouse/fdo.c (original) +++ trunk/reactos/drivers/input/sermouse/fdo.c Wed Jun 7 21:33:57 2006 @@ -139,7 +139,7 @@ { ULONG MinorFunction; PIO_STACK_LOCATION Stack; - ULONG Information = 0; + ULONG_PTR Information = 0; NTSTATUS Status; Stack = IoGetCurrentIrpStackLocation(Irp); Modified: trunk/reactos/drivers/input/sermouse/sermouse.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/input/sermouse/serm… ============================================================================== --- trunk/reactos/drivers/input/sermouse/sermouse.h (original) +++ trunk/reactos/drivers/input/sermouse/sermouse.h Wed Jun 7 21:33:57 2006 @@ -54,7 +54,7 @@ typedef struct _SERMOUSE_DRIVER_EXTENSION { - ULONG NumberOfButtons; + USHORT NumberOfButtons; } SERMOUSE_DRIVER_EXTENSION, *PSERMOUSE_DRIVER_EXTENSION; typedef struct _SERMOUSE_DEVICE_EXTENSION

1 0

[hpoussin] 22274: Replace STDCALL by NTAPI Some 64 bits fixes
by hpoussin＠svn.reactos.org 07 Jun '06

07 Jun '06

Author: hpoussin Date: Wed Jun 7 21:31:43 2006 New Revision: 22274 URL: http://svn.reactos.ru/svn/reactos?rev=22274&view=rev Log: Replace STDCALL by NTAPI Some 64 bits fixes Modified: trunk/reactos/drivers/bus/serenum/detect.c trunk/reactos/drivers/bus/serenum/fdo.c trunk/reactos/drivers/bus/serenum/misc.c trunk/reactos/drivers/bus/serenum/serenum.c trunk/reactos/drivers/bus/serenum/serenum.h Modified: trunk/reactos/drivers/bus/serenum/detect.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/bus/serenum/detect.… ============================================================================== --- trunk/reactos/drivers/bus/serenum/detect.c (original) +++ trunk/reactos/drivers/bus/serenum/detect.c Wed Jun 7 21:31:43 2006 @@ -17,9 +17,9 @@ IN PDEVICE_OBJECT DeviceObject, IN ULONG CtlCode, IN PVOID InputBuffer OPTIONAL, - IN ULONG InputBufferSize, + IN ULONG_PTR InputBufferSize, IN OUT PVOID OutputBuffer OPTIONAL, - IN OUT PULONG OutputBufferSize) + IN OUT PULONG_PTR OutputBufferSize) { KEVENT Event; PIRP Irp; @@ -103,7 +103,7 @@ IN PDEVICE_OBJECT LowerDevice, OUT PUCHAR Buffer, IN ULONG BufferSize, - OUT PULONG FilledBytes) + OUT PULONG_PTR FilledBytes) { PIRP Irp; IO_STATUS_BLOCK ioStatus; @@ -258,8 +258,8 @@ { UCHAR Buffer[256]; ULONG BaudRate; - ULONG TotalBytesReceived = 0; - ULONG Size; + ULONG_PTR TotalBytesReceived = 0; + ULONG_PTR Size; ULONG Msr, Purge; ULONG i; BOOLEAN BufferContainsBeginId = FALSE; Modified: trunk/reactos/drivers/bus/serenum/fdo.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/bus/serenum/fdo.c?r… ============================================================================== --- trunk/reactos/drivers/bus/serenum/fdo.c (original) +++ trunk/reactos/drivers/bus/serenum/fdo.c Wed Jun 7 21:31:43 2006 @@ -10,7 +10,7 @@ #define NDEBUG #include "serenum.h" -NTSTATUS STDCALL +NTSTATUS NTAPI SerenumAddDevice( IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT Pdo) @@ -68,7 +68,7 @@ return STATUS_SUCCESS; } -static NTSTATUS STDCALL +static NTSTATUS NTAPI SerenumFdoStartDevice( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) Modified: trunk/reactos/drivers/bus/serenum/misc.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/bus/serenum/misc.c?… ============================================================================== --- trunk/reactos/drivers/bus/serenum/misc.c (original) +++ trunk/reactos/drivers/bus/serenum/misc.c Wed Jun 7 21:31:43 2006 @@ -86,7 +86,7 @@ return Status; } -static NTSTATUS STDCALL +static NTSTATUS NTAPI ForwardIrpAndWaitCompletion( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -128,7 +128,7 @@ return Status; } -NTSTATUS STDCALL +NTSTATUS NTAPI ForwardIrpToLowerDeviceAndForget( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) @@ -147,7 +147,7 @@ return IoCallDriver(LowerDevice, Irp); } -NTSTATUS STDCALL +NTSTATUS NTAPI ForwardIrpToAttachedFdoAndForget( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) @@ -166,7 +166,7 @@ return IoCallDriver(Fdo, Irp); } -NTSTATUS STDCALL +NTSTATUS NTAPI ForwardIrpAndForget( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) Modified: trunk/reactos/drivers/bus/serenum/serenum.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/bus/serenum/serenum… ============================================================================== --- trunk/reactos/drivers/bus/serenum/serenum.c (original) +++ trunk/reactos/drivers/bus/serenum/serenum.c Wed Jun 7 21:31:43 2006 @@ -11,7 +11,7 @@ #define INITGUID #include "serenum.h" -static NTSTATUS STDCALL +static NTSTATUS NTAPI SerenumPnp( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) @@ -22,13 +22,13 @@ return SerenumPdoPnp(DeviceObject, Irp); } -static VOID STDCALL +static VOID NTAPI DriverUnload(IN PDRIVER_OBJECT DriverObject) { // nothing to do here yet } -static NTSTATUS STDCALL +static NTSTATUS NTAPI IrpStub( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) @@ -90,7 +90,7 @@ /* * Standard DriverEntry method. */ -NTSTATUS STDCALL +NTSTATUS NTAPI DriverEntry( IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegPath) Modified: trunk/reactos/drivers/bus/serenum/serenum.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/bus/serenum/serenum… ============================================================================== --- trunk/reactos/drivers/bus/serenum/serenum.h (original) +++ trunk/reactos/drivers/bus/serenum/serenum.h Wed Jun 7 21:31:43 2006 @@ -15,8 +15,6 @@ #if defined(__GNUC__) #include <debug.h> #elif defined(_MSC_VER) - #define STDCALL - #define DPRINT1 DbgPrint("(%s:%d) ", __FILE__, __LINE__), DbgPrint #define CHECKPOINT1 DbgPrint("(%s:%d)\n", __FILE__, __LINE__) #define DPRINT DPRINT1 @@ -88,7 +86,7 @@ /************************************ fdo.c */ -NTSTATUS STDCALL +NTSTATUS NTAPI SerenumAddDevice( IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT Pdo); @@ -110,17 +108,17 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -NTSTATUS STDCALL +NTSTATUS NTAPI ForwardIrpToLowerDeviceAndForget( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -NTSTATUS STDCALL +NTSTATUS NTAPI ForwardIrpToAttachedFdoAndForget( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -NTSTATUS STDCALL +NTSTATUS NTAPI ForwardIrpAndForget( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); @@ -134,7 +132,7 @@ /************************************ serenum.c */ -NTSTATUS STDCALL +NTSTATUS NTAPI DriverEntry( IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegPath);

1 0

[hpoussin] 22273: Allocate buffer for system directory on heap instead of stack
by hpoussin＠svn.reactos.org 07 Jun '06

07 Jun '06

Author: hpoussin Date: Wed Jun 7 21:30:06 2006 New Revision: 22273 URL: http://svn.reactos.ru/svn/reactos?rev=22273&view=rev Log: Allocate buffer for system directory on heap instead of stack Modified: trunk/reactos/dll/win32/setupapi/devinst.c Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c Wed Jun 7 21:30:06 2006 @@ -409,9 +409,6 @@ DWORD i; BOOL ret = FALSE; - TRACE("%s %p 0x%x 0x%x\n", - debugstr_w(SectionName), PlatformInfo, ProductType, SuiteMask); - static const WCHAR ExtensionPlatformNone[] = {'.',0}; static const WCHAR ExtensionPlatformNT[] = {'.','N','T',0}; static const WCHAR ExtensionPlatformWindows[] = {'.','W','i','n',0}; @@ -423,6 +420,9 @@ static const WCHAR ExtensionArchitecturemips[] = {'m','i','p','s',0}; static const WCHAR ExtensionArchitectureppc[] = {'p','p','c',0}; static const WCHAR ExtensionArchitecturex86[] = {'x','8','6',0}; + + TRACE("%s %p 0x%x 0x%x\n", + debugstr_w(SectionName), PlatformInfo, ProductType, SuiteMask); *ScorePlatform = *ScoreMajorVersion = *ScoreMinorVersion = *ScoreProductType = *ScoreSuiteMask = 0; @@ -3198,12 +3198,20 @@ } else { - WCHAR Windir[MAX_PATH + 1 + strlenW(InfDirectory)]; + LPWSTR Windir; UINT ret; + + Windir = MyMalloc((MAX_PATH + 1 + strlenW(InfDirectory)) * sizeof(WCHAR)); + if (!Windir) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } ret = GetSystemWindowsDirectoryW(Windir, MAX_PATH); if (ret == 0 || ret > MAX_PATH) { + MyFree(Windir); SetLastError(ERROR_GEN_FAILURE); return FALSE; } @@ -3221,6 +3229,7 @@ /* The file is in another place */ *IsOEMLocation = TRUE; } + MyFree(Windir); } return TRUE; }

1 0

[hpoussin] 22272: - Implement DecryptFileA - Fix some stubs - Remove dead code
by hpoussin＠svn.reactos.org 07 Jun '06

07 Jun '06

Author: hpoussin Date: Wed Jun 7 21:26:25 2006 New Revision: 22272 URL: http://svn.reactos.ru/svn/reactos?rev=22272&view=rev Log: - Implement DecryptFileA - Fix some stubs - Remove dead code Modified: trunk/reactos/dll/win32/advapi32/sec/sec.c trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/dll/win32/advapi32/sec/sec.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sec.… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/sec.c (original) +++ trunk/reactos/dll/win32/advapi32/sec/sec.c Wed Jun 7 21:26:25 2006 @@ -527,35 +527,54 @@ */ BOOL WINAPI DecryptFileW(LPCWSTR lpFileName, DWORD dwReserved) { + DPRINT1("%s(%S) not implemented!\n", __FUNCTION__, lpFileName); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/* + * @implemented + */ +BOOL WINAPI DecryptFileA(LPCSTR lpFileName, DWORD dwReserved) +{ + UNICODE_STRING FileName; + NTSTATUS Status; + BOOL ret = FALSE; + + FileName.Buffer = NULL; + + Status = RtlCreateUnicodeStringFromAsciiz(&FileName, lpFileName); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + goto cleanup; + } + ret = DecryptFileW(FileName.Buffer, dwReserved); + +cleanup: + if (FileName.Buffer != NULL) + RtlFreeUnicodeString(&FileName); + return ret; +} + +/* + * @unimplemented + */ +BOOL WINAPI EncryptFileW(LPCWSTR lpFileName) +{ DPRINT1("%s() not implemented!\n", __FUNCTION__); - return ERROR_CALL_NOT_IMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; } /* * @unimplemented */ -BOOL WINAPI DecryptFileA(LPCSTR lpFileName, DWORD dwReserved) +BOOL WINAPI EncryptFileA(LPCSTR lpFileName) { DPRINT1("%s() not implemented!\n", __FUNCTION__); - return ERROR_CALL_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ -BOOL WINAPI EncryptFileW(LPCWSTR lpFileName) -{ - DPRINT1("%s() not implemented!\n", __FUNCTION__); - return ERROR_CALL_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ -BOOL WINAPI EncryptFileA(LPCSTR lpFileName) -{ - DPRINT1("%s() not implemented!\n", __FUNCTION__); - return ERROR_CALL_NOT_IMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; } BOOL WINAPI ConvertSecurityDescriptorToStringSecurityDescriptorW( @@ -566,7 +585,8 @@ PULONG pulong) { DPRINT1("%s() not implemented!\n", __FUNCTION__); - return ERROR_CALL_NOT_IMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; } BOOL WINAPI ConvertSecurityDescriptorToStringSecurityDescriptorA( @@ -577,7 +597,8 @@ PULONG pulong) { DPRINT1("%s() not implemented!\n", __FUNCTION__); - return ERROR_CALL_NOT_IMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; } /* EOF */ Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/advapi32/service/… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c Wed Jun 7 21:26:25 2006 @@ -1374,7 +1374,7 @@ (unsigned int*)&hService); if (dwError != ERROR_SUCCESS) { - DPRINT1("ScmrOpenServiceW() failed (Error %lu)\n", dwError); + DPRINT("ScmrOpenServiceW() failed (Error %lu)\n", dwError); SetLastError(dwError); return NULL; } @@ -1923,27 +1923,6 @@ DWORD dwNumServiceArgs, LPCSTR *lpServiceArgVectors) { -#if 0 - DWORD dwError; - - DPRINT("StartServiceA()\n"); - - HandleBind(); - - /* Call to services.exe using RPC */ - dwError = ScmrStartServiceA(BindingHandle, - hService, - dwNumServiceArgs, - lpServiceArgVectors); - if (dwError != ERROR_SUCCESS) - { - DPRINT1("ScmrStartServiceA() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return FALSE; - } - - return TRUE; -#endif LPSTR lpBuffer; LPSTR lpStr; DWORD dwError; @@ -2000,27 +1979,6 @@ DWORD dwNumServiceArgs, LPCWSTR *lpServiceArgVectors) { -#if 0 - DWORD dwError; - - DPRINT("StartServiceW()\n"); - - HandleBind(); - - /* Call to services.exe using RPC */ - dwError = ScmrStartServiceW(BindingHandle, - hService, - dwNumServiceArgs, - lpServiceArgVectors); - if (dwError != ERROR_SUCCESS) - { - DPRINT1("ScmrStartServiceW() failed (Error %lu)\n", dwError); - SetLastError(dwError); - return FALSE; - } - - return TRUE; -#endif LPWSTR lpBuffer; LPWSTR lpStr; DWORD dwError;

1 0

[hpoussin] 22271: - Implement FileEncryptionStatusA - Fix FileEncryptionStatusW prototype - Fix EncryptionDisable stub
by hpoussin＠svn.reactos.org 07 Jun '06

07 Jun '06

Author: hpoussin Date: Wed Jun 7 21:24:49 2006 New Revision: 22271 URL: http://svn.reactos.ru/svn/reactos?rev=22271&view=rev Log: - Implement FileEncryptionStatusA - Fix FileEncryptionStatusW prototype - Fix EncryptionDisable stub Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt.c Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/cr… ============================================================================== --- trunk/reactos/dll/win32/advapi32/crypt/crypt.c (original) +++ trunk/reactos/dll/win32/advapi32/crypt/crypt.c Wed Jun 7 21:24:49 2006 @@ -1981,25 +1981,42 @@ * @unimplemented */ BOOL WINAPI FileEncryptionStatusW ( - LPCWSTR lpcwstr, - LPDWORD lpdword + LPCWSTR lpFileName, + LPDWORD lpStatus ) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); - return ERROR_CALL_NOT_IMPLEMENTED; + DPRINT1("%s(%S) not implemented!\n", __FUNCTION__, lpFileName); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; } /* - * @unimplemented + * @implemented */ BOOL WINAPI FileEncryptionStatusA ( - LPCSTR lpcstr, - LPDWORD lpdword + LPCSTR lpFileName, + LPDWORD lpStatus ) { - DPRINT1("%s() not implemented!\n", __FUNCTION__); - return ERROR_CALL_NOT_IMPLEMENTED; + UNICODE_STRING FileName; + NTSTATUS Status; + BOOL ret = FALSE; + + FileName.Buffer = NULL; + + Status = RtlCreateUnicodeStringFromAsciiz(&FileName, lpFileName); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + goto cleanup; + } + ret = FileEncryptionStatusW(FileName.Buffer, lpStatus); + +cleanup: + if (FileName.Buffer != NULL) + RtlFreeUnicodeString(&FileName); + return ret; } /* @@ -2048,7 +2065,8 @@ ) { DPRINT1("%s() not implemented!\n", __FUNCTION__); - return ERROR_CALL_NOT_IMPLEMENTED; -} - - + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +

1 0

[fireball] 22270: Add missing debug.h/NDEBUG construction, fixes compiling without CU
by fireball＠svn.reactos.org 07 Jun '06

07 Jun '06

Author: fireball Date: Wed Jun 7 17:08:28 2006 New Revision: 22270 URL: http://svn.reactos.ru/svn/reactos?rev=22270&view=rev Log: Add missing debug.h/NDEBUG construction, fixes compiling without CU Modified: trunk/reactos/base/system/smss/print.c Modified: trunk/reactos/base/system/smss/print.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/system/smss/print.c?re… ============================================================================== --- trunk/reactos/base/system/smss/print.c (original) +++ trunk/reactos/base/system/smss/print.c Wed Jun 7 17:08:28 2006 @@ -25,6 +25,8 @@ */ #include "smss.h" +#define NDEBUG +#include <debug.h> VOID STDCALL DisplayString(LPCWSTR lpwString) {

1 0

[fireball] 22269: [AUDIT] base/system/smss.exe - Unlock simple and trivial functions - Unlock unimplemented funcs and non-code things
by fireball＠svn.reactos.org 07 Jun '06

07 Jun '06

Author: fireball Date: Wed Jun 7 17:06:40 2006 New Revision: 22269 URL: http://svn.reactos.ru/svn/reactos?rev=22269&view=rev Log: [AUDIT] base/system/smss.exe - Unlock simple and trivial functions - Unlock unimplemented funcs and non-code things Modified: trunk/reactos/base/system/smss/initheap.c (props changed) trunk/reactos/base/system/smss/initmv.c (props changed) trunk/reactos/base/system/smss/initreg.c (props changed) trunk/reactos/base/system/smss/print.c (props changed) trunk/reactos/base/system/smss/smss.h (props changed) trunk/reactos/base/system/smss/smss.rc (props changed) Propchange: trunk/reactos/base/system/smss/initheap.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/smss/initmv.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/smss/initreg.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/smss/print.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/smss/smss.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/smss/smss.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[fireball] 22268: Fix a typo in Internet Time tab. Spotted by hand.of.omega@gmail.com. Fixes bug 1562
by fireball＠svn.reactos.org 07 Jun '06

07 Jun '06

Author: fireball Date: Wed Jun 7 14:57:40 2006 New Revision: 22268 URL: http://svn.reactos.ru/svn/reactos?rev=22268&view=rev Log: Fix a typo in Internet Time tab. Spotted by hand.of.omega(a)gmail.com. Fixes bug 1562 Modified: trunk/reactos/dll/cpl/timedate/En.rc Modified: trunk/reactos/dll/cpl/timedate/En.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/cpl/timedate/En.rc?rev=… ============================================================================== --- trunk/reactos/dll/cpl/timedate/En.rc (original) +++ trunk/reactos/dll/cpl/timedate/En.rc Wed Jun 7 14:57:40 2006 @@ -48,7 +48,7 @@ PUSHBUTTON "Update Now", IDC_UPDATEBUTTON, 187, 22, 49, 14 LTEXT "", IDC_SUCSYNC, 12, 54, 214, 23 LTEXT "", IDC_NEXTSYNC, 12, 96, 137, 12 - LTEXT "Synchronazation can only occur when your computer is connected to the internet.", -1, 12, 114, 225, 25 + LTEXT "Synchronization can only occur when your computer is connected to the internet.", -1, 12, 114, 225, 25 END

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs