Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 22237: Read EDID information from screen (if possible) in HwGetVideoChildDescriptor. Still doesn't do anything useful with it, but that's a start ; )
by hpoussin＠svn.reactos.org 05 Jun '06

05 Jun '06

Author: hpoussin Date: Mon Jun 5 20:31:24 2006 New Revision: 22237 URL: http://svn.reactos.ru/svn/reactos?rev=22237&view=rev Log: Read EDID information from screen (if possible) in HwGetVideoChildDescriptor. Still doesn't do anything useful with it, but that's a start ;) Added: trunk/reactos/drivers/video/miniport/vbe/edid.c (with props) Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c trunk/reactos/drivers/video/miniport/vbe/vbemp.h trunk/reactos/drivers/video/miniport/vbe/vbemp.rbuild Added: trunk/reactos/drivers/video/miniport/vbe/edid.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/video/miniport/vbe/… ============================================================================== --- trunk/reactos/drivers/video/miniport/vbe/edid.c (added) +++ trunk/reactos/drivers/video/miniport/vbe/edid.c Mon Jun 5 20:31:24 2006 @@ -1,0 +1,251 @@ +/* + * ReactOS VBE EDID management + * + * Copyright (C) 2006 Hervé Poussineau + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + */ + +/* INCLUDES *******************************************************************/ + +#include "vbemp.h" + +/* PUBLIC AND PRIVATE FUNCTIONS ***********************************************/ + +static VOID NTAPI +VBEWriteClockLine( + PVOID HwDeviceExtension, + UCHAR data) +{ + INT10_BIOS_ARGUMENTS BiosRegisters; + PVBE_DEVICE_EXTENSION VBEDeviceExtension = + (PVBE_DEVICE_EXTENSION)HwDeviceExtension; + + VideoPortZeroMemory(&BiosRegisters, sizeof(BiosRegisters)); + BiosRegisters.Eax = VBE_DDC; + BiosRegisters.Ebx = VBE_DDC_WRITE_SCL_CLOCK_LINE; + BiosRegisters.Ecx = data; + VBEDeviceExtension->Int10Interface.Int10CallBios( + VBEDeviceExtension->Int10Interface.Context, + &BiosRegisters); +} + +static VOID NTAPI +VBEWriteDataLine( + PVOID HwDeviceExtension, + UCHAR data) +{ + INT10_BIOS_ARGUMENTS BiosRegisters; + PVBE_DEVICE_EXTENSION VBEDeviceExtension = + (PVBE_DEVICE_EXTENSION)HwDeviceExtension; + + VideoPortZeroMemory(&BiosRegisters, sizeof(BiosRegisters)); + BiosRegisters.Eax = VBE_DDC; + BiosRegisters.Ebx = VBE_DDC_WRITE_SDA_DATA_LINE; + BiosRegisters.Ecx = data; + VBEDeviceExtension->Int10Interface.Int10CallBios( + VBEDeviceExtension->Int10Interface.Context, + &BiosRegisters); +} + +static BOOLEAN NTAPI +VBEReadClockLine( + PVOID HwDeviceExtension) +{ + INT10_BIOS_ARGUMENTS BiosRegisters; + PVBE_DEVICE_EXTENSION VBEDeviceExtension = + (PVBE_DEVICE_EXTENSION)HwDeviceExtension; + + VideoPortZeroMemory(&BiosRegisters, sizeof(BiosRegisters)); + BiosRegisters.Eax = VBE_DDC; + BiosRegisters.Ebx = VBE_DDC_READ_SCL_CLOCK_LINE; + VBEDeviceExtension->Int10Interface.Int10CallBios( + VBEDeviceExtension->Int10Interface.Context, + &BiosRegisters); + + return BiosRegisters.Edx; +} + +static BOOLEAN NTAPI +VBEReadDataLine( + PVOID HwDeviceExtension) +{ + INT10_BIOS_ARGUMENTS BiosRegisters; + PVBE_DEVICE_EXTENSION VBEDeviceExtension = + (PVBE_DEVICE_EXTENSION)HwDeviceExtension; + + VideoPortZeroMemory(&BiosRegisters, sizeof(BiosRegisters)); + BiosRegisters.Eax = VBE_DDC; + BiosRegisters.Ebx = VBE_DDC_READ_SDA_DATA_LINE; + VBEDeviceExtension->Int10Interface.Int10CallBios( + VBEDeviceExtension->Int10Interface.Context, + &BiosRegisters); + + return BiosRegisters.Edx; +} + +static BOOLEAN +VBEReadEdidUsingSCI( + PVOID HwDeviceExtension, + PVBE_EDID Edid) +{ + INT10_BIOS_ARGUMENTS BiosRegisters; + PVBE_DEVICE_EXTENSION VBEDeviceExtension = + (PVBE_DEVICE_EXTENSION)HwDeviceExtension; + DDC_CONTROL DDCControl; + BOOLEAN ret; + + VideoPortDebugPrint(Trace, "VBEMP: VBEReadEdidUsingSCI() called\n"); + + /* + * Check if graphic card support I²C interface + */ + VideoPortZeroMemory(&BiosRegisters, sizeof(BiosRegisters)); + BiosRegisters.Eax = VBE_DDC; + BiosRegisters.Ebx = VBE_DDC_REPORT_CAPABILITIES; + VBEDeviceExtension->Int10Interface.Int10CallBios( + VBEDeviceExtension->Int10Interface.Context, + &BiosRegisters); + if (BiosRegisters.Eax != VBE_SUCCESS) + return FALSE; + VideoPortDebugPrint(Info, "VBEMP: VBE/SCI version %x\n", BiosRegisters.Ecx); + if ((BiosRegisters.Ebx & 0xF) != 0xF) + return FALSE; + + /* + * Enable I²C interface + */ + VideoPortZeroMemory(&BiosRegisters, sizeof(BiosRegisters)); + BiosRegisters.Eax = VBE_DDC; + BiosRegisters.Ebx = VBE_DDC_BEGIN_SCL_SDA_CONTROL; + VBEDeviceExtension->Int10Interface.Int10CallBios( + VBEDeviceExtension->Int10Interface.Context, + &BiosRegisters); + if (BiosRegisters.Eax != VBE_SUCCESS) + return FALSE; + + /* + * Read EDID information + */ + DDCControl.Size = sizeof(DDC_CONTROL); + DDCControl.I2CCallbacks.WriteClockLine = VBEWriteClockLine; + DDCControl.I2CCallbacks.WriteDataLine = VBEWriteDataLine; + DDCControl.I2CCallbacks.ReadClockLine = VBEReadClockLine; + DDCControl.I2CCallbacks.ReadDataLine = VBEReadDataLine; + DDCControl.EdidSegment = 0; + ret = VideoPortDDCMonitorHelper( + HwDeviceExtension, + &DDCControl, + (PUCHAR)&Edid, + sizeof(VBE_EDID)); + + /* + * Disable I²C interface + */ + VideoPortZeroMemory(&BiosRegisters, sizeof(BiosRegisters)); + BiosRegisters.Eax = VBE_DDC; + BiosRegisters.Ebx = VBE_DDC_END_SCL_SDA_CONTROL; + VBEDeviceExtension->Int10Interface.Int10CallBios( + VBEDeviceExtension->Int10Interface.Context, + &BiosRegisters); + /* Ignore the possible error, as we did our best to prevent problems */ + + return ret; +} + +static BOOLEAN +VBEReadEdid( + PVBE_DEVICE_EXTENSION VBEDeviceExtension, + PVBE_EDID Edid) +{ + INT10_BIOS_ARGUMENTS BiosRegisters; + + VideoPortDebugPrint(Trace, "VBEMP: VBEReadEdid() called\n"); + + /* + * Directly read EDID information + */ + VideoPortZeroMemory(&BiosRegisters, sizeof(BiosRegisters)); + BiosRegisters.Eax = VBE_DDC; + BiosRegisters.Ebx = VBE_DDC_READ_EDID; + BiosRegisters.Edx = 1; + BiosRegisters.Edi = VBEDeviceExtension->TrampolineMemoryOffset; + BiosRegisters.SegEs = VBEDeviceExtension->TrampolineMemorySegment; + VBEDeviceExtension->Int10Interface.Int10CallBios( + VBEDeviceExtension->Int10Interface.Context, + &BiosRegisters); + + if (BiosRegisters.Eax != VBE_SUCCESS) + return FALSE; + + /* + * Copy the EDID information to our buffer + */ + VBEDeviceExtension->Int10Interface.Int10ReadMemory( + VBEDeviceExtension->Int10Interface.Context, + VBEDeviceExtension->TrampolineMemorySegment, + VBEDeviceExtension->TrampolineMemoryOffset, + Edid, + sizeof(VBE_EDID)); + + return TRUE; +} + +VP_STATUS NTAPI +VBEGetVideoChildDescriptor( + IN PVOID HwDeviceExtension, + IN PVIDEO_CHILD_ENUM_INFO ChildEnumInfo, + OUT PVIDEO_CHILD_TYPE VideoChildType, + OUT PUCHAR pChildDescriptor, + OUT PULONG UId, + OUT PULONG pUnused) +{ + PVBE_DEVICE_EXTENSION VBEDeviceExtension = + (PVBE_DEVICE_EXTENSION)HwDeviceExtension; + VBE_EDID Edid; + + /* + * We are called very early in device initialization, even before + * VBEInitialize is called. So, our Int10 interface is not set. + * Ignore this call, we will trigger it ourselves later. + */ + if (VBEDeviceExtension->Int10Interface.Size == 0) + return VIDEO_ENUM_NO_MORE_DEVICES; + + /* + * Try to read EDID information using 2 different methods. + */ + if (VBEReadEdid(HwDeviceExtension, &Edid)) + { + VideoPortDebugPrint(Info, "VBEMP: EDID information read directly\n"); + } + else if (VBEReadEdidUsingSCI(HwDeviceExtension, &Edid)) + { + VideoPortDebugPrint(Info, "VBEMP: EDID information read using I²C\n"); + } + else + { + VideoPortDebugPrint(Warn, "VBEMP: Unable to read EDID information\n"); + return VIDEO_ENUM_NO_MORE_DEVICES; + } + + /* + * Process the EDID data. + */ + /* FIXME */ + VideoPortDebugPrint(Error, "VBEMP: Need to parse EDID information\n"); + return VIDEO_ENUM_NO_MORE_DEVICES; +} Propchange: trunk/reactos/drivers/video/miniport/vbe/edid.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/video/miniport/vbe/edid.c ------------------------------------------------------------------------------ svn:keywords = author date id revision Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/video/miniport/vbe/… ============================================================================== --- trunk/reactos/drivers/video/miniport/vbe/vbemp.c (original) +++ trunk/reactos/drivers/video/miniport/vbe/vbemp.c Mon Jun 5 20:31:24 2006 @@ -44,6 +44,7 @@ InitData.HwResetHw = VBEResetHw; InitData.HwGetPowerState = VBEGetPowerState; InitData.HwSetPowerState = VBESetPowerState; + InitData.HwGetVideoChildDescriptor = VBEGetVideoChildDescriptor; InitData.HwDeviceExtensionSize = sizeof(VBE_DEVICE_EXTENSION); return VideoPortInitialize(Context1, Context2, &InitData, NULL); @@ -377,7 +378,7 @@ VBESortModes(VBEDeviceExtension); /* - * Print the supported video modes when NDEBUG is not set. + * Print the supported video modes. */ for (CurrentMode = 0; @@ -389,6 +390,11 @@ VBEDeviceExtension->ModeInfo[CurrentMode].YResolution, VBEDeviceExtension->ModeInfo[CurrentMode].BitsPerPixel); } + + /* + * Enumerate our children. + */ + VideoPortEnumerateChildren(HwDeviceExtension, NULL); return TRUE; } Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/video/miniport/vbe/… ============================================================================== --- trunk/reactos/drivers/video/miniport/vbe/vbemp.h (original) +++ trunk/reactos/drivers/video/miniport/vbe/vbemp.h Mon Jun 5 20:31:24 2006 @@ -71,6 +71,20 @@ #define VBE_AUDIO_INTERFACE_EXTENSIONS 0x4F12 #define VBE_OEM_EXTENSIONS 0x4F13 #define VBE_DISPLAY_DATA_CHANNEL 0x4F14 +#define VBE_DDC 0x4F15 + +/* + * VBE DDC Sub-Functions + */ + +#define VBE_DDC_READ_EDID 0x01 +#define VBE_DDC_REPORT_CAPABILITIES 0x10 +#define VBE_DDC_BEGIN_SCL_SDA_CONTROL 0x11 +#define VBE_DDC_END_SCL_SDA_CONTROL 0x12 +#define VBE_DDC_WRITE_SCL_CLOCK_LINE 0x13 +#define VBE_DDC_WRITE_SDA_DATA_LINE 0x14 +#define VBE_DDC_READ_SCL_CLOCK_LINE 0x15 +#define VBE_DDC_READ_SDA_DATA_LINE 0x16 /* * VBE Video Mode Information Definitions @@ -175,6 +189,11 @@ CHAR Reserved4[189]; } VBE_MODEINFO, *PVBE_MODEINFO; +typedef struct +{ + UCHAR Reserved[128]; +} VBE_EDID, *PVBE_EDID; + #include <poppack.h> typedef struct @@ -196,6 +215,18 @@ USHORT CurrentMode; } VBE_DEVICE_EXTENSION, *PVBE_DEVICE_EXTENSION; +/* edid.c */ + +VP_STATUS NTAPI +VBEGetVideoChildDescriptor( + IN PVOID HwDeviceExtension, + IN PVIDEO_CHILD_ENUM_INFO ChildEnumInfo, + OUT PVIDEO_CHILD_TYPE VideoChildType, + OUT PUCHAR pChildDescriptor, + OUT PULONG UId, + OUT PULONG pUnused); + +/* vbemp.c */ VP_STATUS STDCALL VBEFindAdapter( IN PVOID HwDeviceExtension, Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/video/miniport/vbe/… ============================================================================== --- trunk/reactos/drivers/video/miniport/vbe/vbemp.rbuild (original) +++ trunk/reactos/drivers/video/miniport/vbe/vbemp.rbuild Mon Jun 5 20:31:24 2006 @@ -2,6 +2,7 @@ <include base="vbemp">.</include> <define name="__USE_W32API" /> <library>videoprt</library> + <file>edid.c</file> <file>vbemp.c</file> <file>vbemp.rc</file> </module>

1 0

[tretiakov] 22236: add missing check for null return
by tretiakov＠svn.reactos.org 05 Jun '06

05 Jun '06

Author: tretiakov Date: Mon Jun 5 19:38:04 2006 New Revision: 22236 URL: http://svn.reactos.ru/svn/reactos?rev=22236&view=rev Log: add missing check for null return Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntd… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Mon Jun 5 19:38:04 2006 @@ -999,7 +999,12 @@ hSurface = GDIOBJ_AllocObj(DdHandleTable, GDI_OBJECT_TYPE_DD_SURFACE); pSurface = GDIOBJ_LockObj(DdHandleTable, hSurface, GDI_OBJECT_TYPE_DD_SURFACE); - /* FIXME - Handle pSurface == NULL!!!! */ + + if (!pSurface) + { + GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); + return NULL; + } RtlMoveMemory(&pSurface->Local, puSurfaceLocal, sizeof(DD_SURFACE_LOCAL)); RtlMoveMemory(&pSurface->More, puSurfaceMore, sizeof(DD_SURFACE_MORE));

1 0

[tretiakov] 22235: Add Johannes Anderwald to credits.
by tretiakov＠svn.reactos.org 05 Jun '06

05 Jun '06

Author: tretiakov Date: Mon Jun 5 18:39:09 2006 New Revision: 22235 URL: http://svn.reactos.ru/svn/reactos?rev=22235&view=rev Log: Add Johannes Anderwald to credits. Modified: trunk/reactos/CREDITS Modified: trunk/reactos/CREDITS URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/CREDITS?rev=22235&r1=22234&… ============================================================================== --- trunk/reactos/CREDITS (original) +++ trunk/reactos/CREDITS Mon Jun 5 18:39:09 2006 @@ -31,6 +31,7 @@ Jason Weiler Jean Michault Jim Noeth +Johannes Anderwald <johannes.anderwald(a)student.tugraz.at> Jonathan Wilson <jonwil(a)tpgi.com.au> Jurgen van Gael <jurgen.vangael(a)student.kuleuven.ac.be> KJK::Hyperion <noog(a)libero.it>

1 0

[tretiakov] 22234: [AUDIT] \trunk\reactos\dll\win32\lzexpand (unlocked) No code.
by tretiakov＠svn.reactos.org 05 Jun '06

05 Jun '06

Author: tretiakov Date: Mon Jun 5 18:35:31 2006 New Revision: 22234 URL: http://svn.reactos.ru/svn/reactos?rev=22234&view=rev Log: [AUDIT] \trunk\reactos\dll\win32\lzexpand (unlocked) No code. Modified: trunk/reactos/dll/win32/lzexpand/lz32.def (props changed) trunk/reactos/dll/win32/lzexpand/lz32.rc (props changed) trunk/reactos/dll/win32/lzexpand/lzexpand_main.c (props changed) Propchange: trunk/reactos/dll/win32/lzexpand/lz32.def ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/lzexpand/lz32.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/lzexpand/lzexpand_main.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[tretiakov] 22233: [AUDIT] \trunk\reactos\base\applications\shutdown (unlocked) I looked through code and found no signs of reverse engeneering.
by tretiakov＠svn.reactos.org 05 Jun '06

05 Jun '06

Author: tretiakov Date: Mon Jun 5 18:32:28 2006 New Revision: 22233 URL: http://svn.reactos.ru/svn/reactos?rev=22233&view=rev Log: [AUDIT] \trunk\reactos\base\applications\shutdown (unlocked) I looked through code and found no signs of reverse engeneering. Modified: trunk/reactos/base/applications/shutdown/shutdown.c (props changed) Propchange: trunk/reactos/base/applications/shutdown/shutdown.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[ion] 22232: - Rename ObpCreateTypeObject to ObCreateObjectType and fix definition. The latter is actually exported in NT, and there's no reason not to export it while having our own internally renamed version. - Added stub exports for ObCloseHandle, ObReferenceSecurityDesciptor, ObSetHandleAttributes, ObSetSecurityObjectByPointer so that someday someone can know what needs to be implemented. - Removed ObGetObjectPointerCount. It is not exported in newer OSes and was always undocumented. - Move
by ion＠svn.reactos.org 05 Jun '06

05 Jun '06

Author: ion Date: Mon Jun 5 10:31:42 2006 New Revision: 22232 URL: http://svn.reactos.ru/svn/reactos?rev=22232&view=rev Log: - Rename ObpCreateTypeObject to ObCreateObjectType and fix definition. The latter is actually exported in NT, and there's no reason not to export it while having our own internally renamed version. - Added stub exports for ObCloseHandle, ObReferenceSecurityDesciptor, ObSetHandleAttributes, ObSetSecurityObjectByPointer so that someday someone can know what needs to be implemented. - Removed ObGetObjectPointerCount. It is not exported in newer OSes and was always undocumented. - Move ObQueryObjecctAuditingByHandle to security.c and optimized it not to attach to the system process, as well as to cache the handle table instead of dereferencing the owner process all the time. Modified: trunk/reactos/include/ndk/obfuncs.h trunk/reactos/ntoskrnl/cm/registry.c trunk/reactos/ntoskrnl/ex/callback.c trunk/reactos/ntoskrnl/ex/event.c trunk/reactos/ntoskrnl/ex/evtpair.c trunk/reactos/ntoskrnl/ex/mutant.c trunk/reactos/ntoskrnl/ex/profile.c trunk/reactos/ntoskrnl/ex/sem.c trunk/reactos/ntoskrnl/ex/timer.c trunk/reactos/ntoskrnl/ex/win32k.c trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/io/driver.c trunk/reactos/ntoskrnl/io/iocomp.c trunk/reactos/ntoskrnl/io/iomgr.c trunk/reactos/ntoskrnl/lpc/port.c trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/ntoskrnl.def trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/obinit.c trunk/reactos/ntoskrnl/ob/oblife.c trunk/reactos/ntoskrnl/ob/obname.c trunk/reactos/ntoskrnl/ob/obref.c trunk/reactos/ntoskrnl/ob/security.c trunk/reactos/ntoskrnl/ob/symlink.c trunk/reactos/ntoskrnl/ps/job.c trunk/reactos/ntoskrnl/ps/psmgr.c trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/include/ndk/obfuncs.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/ndk/obfuncs.h?rev=2… ============================================================================== --- trunk/reactos/include/ndk/obfuncs.h (original) +++ trunk/reactos/include/ndk/obfuncs.h Mon Jun 5 10:31:42 2006 @@ -44,6 +44,15 @@ OUT PVOID *Object ); +NTSTATUS +NTAPI +ObCreateObjectType( + IN PUNICODE_STRING TypeName, + IN POBJECT_TYPE_INITIALIZER ObjectTypeInitializer, + IN PVOID Reserved, + OUT POBJECT_TYPE *ObjectType +); + NTKERNELAPI ULONG NTAPI Modified: trunk/reactos/ntoskrnl/cm/registry.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/cm/registry.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/cm/registry.c (original) +++ trunk/reactos/ntoskrnl/cm/registry.c Mon Jun 5 10:31:42 2006 @@ -22,6 +22,7 @@ #pragma alloc_text(INIT, CmInit2) #endif +#define ObGetObjectPointerCount(x) OBJECT_TO_OBJECT_HEADER(x)->PointerCount /* GLOBALS ******************************************************************/ @@ -373,7 +374,7 @@ ObjectTypeInitializer.SecurityProcedure = CmiObjectSecurity; ObjectTypeInitializer.QueryNameProcedure = CmiObjectQueryName; - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &CmiKeyType); + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &CmiKeyType); /* Initialize the hive list */ InitializeListHead(&CmiHiveListHead); Modified: trunk/reactos/ntoskrnl/ex/callback.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ex/callback.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/callback.c (original) +++ trunk/reactos/ntoskrnl/ex/callback.c Mon Jun 5 10:31:42 2006 @@ -97,7 +97,7 @@ ObjectTypeInitializer.GenericMapping = ExpCallbackMapping; ObjectTypeInitializer.PoolType = NonPagedPool; - Status = ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ExCallbackObjectType); + Status = ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExCallbackObjectType); /* Fail if it wasn't created successfully */ if (!NT_SUCCESS(Status)) Modified: trunk/reactos/ntoskrnl/ex/event.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ex/event.c?rev=222… ============================================================================== --- trunk/reactos/ntoskrnl/ex/event.c (original) +++ trunk/reactos/ntoskrnl/ex/event.c Mon Jun 5 10:31:42 2006 @@ -53,7 +53,7 @@ ObjectTypeInitializer.GenericMapping = ExpEventMapping; ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.ValidAccessMask = EVENT_ALL_ACCESS; - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ExEventObjectType); + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExEventObjectType); } /* Modified: trunk/reactos/ntoskrnl/ex/evtpair.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ex/evtpair.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ex/evtpair.c (original) +++ trunk/reactos/ntoskrnl/ex/evtpair.c Mon Jun 5 10:31:42 2006 @@ -49,7 +49,7 @@ ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.ValidAccessMask = EVENT_PAIR_ALL_ACCESS; ObjectTypeInitializer.UseDefaultObject = TRUE; - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ExEventPairObjectType); + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExEventPairObjectType); } NTSTATUS Modified: trunk/reactos/ntoskrnl/ex/mutant.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ex/mutant.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ex/mutant.c (original) +++ trunk/reactos/ntoskrnl/ex/mutant.c Mon Jun 5 10:31:42 2006 @@ -68,7 +68,7 @@ ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.DeleteProcedure = ExpDeleteMutant; ObjectTypeInitializer.ValidAccessMask = MUTANT_ALL_ACCESS; - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ExMutantObjectType); + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExMutantObjectType); } /* Modified: trunk/reactos/ntoskrnl/ex/profile.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ex/profile.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ex/profile.c (original) +++ trunk/reactos/ntoskrnl/ex/profile.c Mon Jun 5 10:31:42 2006 @@ -82,7 +82,7 @@ ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.DeleteProcedure = ExpDeleteProfile; ObjectTypeInitializer.ValidAccessMask = PROFILE_ALL_ACCESS; - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ExProfileObjectType); + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExProfileObjectType); } NTSTATUS Modified: trunk/reactos/ntoskrnl/ex/sem.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ex/sem.c?rev=22232… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sem.c (original) +++ trunk/reactos/ntoskrnl/ex/sem.c Mon Jun 5 10:31:42 2006 @@ -55,7 +55,7 @@ ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.InvalidAttributes = OBJ_OPENLINK; ObjectTypeInitializer.ValidAccessMask = SEMAPHORE_ALL_ACCESS; - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ExSemaphoreObjectType); + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExSemaphoreObjectType); } /* Modified: trunk/reactos/ntoskrnl/ex/timer.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ex/timer.c?rev=222… ============================================================================== --- trunk/reactos/ntoskrnl/ex/timer.c (original) +++ trunk/reactos/ntoskrnl/ex/timer.c Mon Jun 5 10:31:42 2006 @@ -249,7 +249,7 @@ ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.ValidAccessMask = TIMER_ALL_ACCESS; ObjectTypeInitializer.DeleteProcedure = ExpDeleteTimer; - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ExTimerType); + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExTimerType); /* Initialize the Wait List and Lock */ KeInitializeSpinLock(&ExpWakeListLock); Modified: trunk/reactos/ntoskrnl/ex/win32k.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ex/win32k.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ex/win32k.c (original) +++ trunk/reactos/ntoskrnl/ex/win32k.c Mon Jun 5 10:31:42 2006 @@ -137,9 +137,10 @@ ObjectTypeInitializer.OpenProcedure = ExpWinStaObjectOpen; ObjectTypeInitializer.DeleteProcedure = ExpWinStaObjectDelete; ObjectTypeInitializer.ParseProcedure = ExpWinStaObjectParse; - ObpCreateTypeObject(&ObjectTypeInitializer, - &Name, - &ExWindowStationObjectType); + ObCreateObjectType(&Name, + &ObjectTypeInitializer, + NULL, + &ExWindowStationObjectType); /* Create desktop object type */ RtlInitUnicodeString(&Name, L"Desktop"); @@ -147,7 +148,10 @@ ObjectTypeInitializer.OpenProcedure = NULL; ObjectTypeInitializer.DeleteProcedure = ExpDesktopDelete; ObjectTypeInitializer.ParseProcedure = NULL; - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ExDesktopObjectType); + ObCreateObjectType(&Name, + &ObjectTypeInitializer, + NULL, + &ExDesktopObjectType); } /* EOF */ Modified: trunk/reactos/ntoskrnl/include/internal/ob.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/include/internal/o… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ob.h Mon Jun 5 10:31:42 2006 @@ -114,14 +114,6 @@ IN PVOID Context ); -NTSTATUS -STDCALL -ObpCreateTypeObject( - struct _OBJECT_TYPE_INITIALIZER *ObjectTypeInitializer, - PUNICODE_STRING TypeName, - POBJECT_TYPE *ObjectType -); - ULONG NTAPI ObGetObjectHandleCount(PVOID Object); Modified: trunk/reactos/ntoskrnl/io/driver.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/io/driver.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/io/driver.c (original) +++ trunk/reactos/ntoskrnl/io/driver.c Mon Jun 5 10:31:42 2006 @@ -129,7 +129,7 @@ ObjectTypeInitializer.UseDefaultObject = TRUE; ObjectTypeInitializer.DeleteProcedure = IopDeleteDriver; - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &IoDriverObjectType); + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &IoDriverObjectType); InitializeListHead(&DriverReinitListHead); KeInitializeSpinLock(&DriverReinitListLock); Modified: trunk/reactos/ntoskrnl/io/iocomp.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/io/iocomp.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/io/iocomp.c (original) +++ trunk/reactos/ntoskrnl/io/iocomp.c Mon Jun 5 10:31:42 2006 @@ -216,7 +216,7 @@ ObjectTypeInitializer.UseDefaultObject = TRUE; ObjectTypeInitializer.GenericMapping = IopCompletionMapping; ObjectTypeInitializer.DeleteProcedure = IopDeleteIoCompletion; - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &IoCompletionType); + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &IoCompletionType); } NTSTATUS Modified: trunk/reactos/ntoskrnl/io/iomgr.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr.c?rev=222… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr.c Mon Jun 5 10:31:42 2006 @@ -210,16 +210,16 @@ ObjectTypeInitializer.ValidAccessMask = FILE_ALL_ACCESS; ObjectTypeInitializer.UseDefaultObject = TRUE; ObjectTypeInitializer.GenericMapping = IopFileMapping; - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &IoDeviceObjectType); + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &IoDeviceObjectType); /* Do the Adapter Type */ RtlInitUnicodeString(&Name, L"Adapter"); - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &IoAdapterObjectType); + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &IoAdapterObjectType); /* Do the Controller Type */ RtlInitUnicodeString(&Name, L"Controller"); ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(CONTROLLER_OBJECT); - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &IoControllerObjectType); + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &IoControllerObjectType); /* Initialize the File object type */ RtlInitUnicodeString(&Name, L"File"); @@ -230,7 +230,7 @@ ObjectTypeInitializer.SecurityProcedure = IopSecurityFile; ObjectTypeInitializer.QueryNameProcedure = IopQueryNameFile; ObjectTypeInitializer.UseDefaultObject = FALSE; - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &IoFileObjectType); + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &IoFileObjectType); /* * Create the '\Driver' object directory Modified: trunk/reactos/ntoskrnl/lpc/port.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/lpc/port.c?rev=222… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/port.c (original) +++ trunk/reactos/ntoskrnl/lpc/port.c Mon Jun 5 10:31:42 2006 @@ -56,8 +56,8 @@ ObjectTypeInitializer.UseDefaultObject = TRUE; ObjectTypeInitializer.CloseProcedure = LpcpClosePort; ObjectTypeInitializer.DeleteProcedure = LpcpDeletePort; - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &LpcPortObjectType); - + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &LpcPortObjectType); + LpcpNextMessageId = 0; ExInitializeFastMutex (& LpcpLock); Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c (original) +++ trunk/reactos/ntoskrnl/mm/section.c Mon Jun 5 10:31:42 2006 @@ -2202,7 +2202,7 @@ ObjectTypeInitializer.GenericMapping = MmpSectionMapping; ObjectTypeInitializer.DeleteProcedure = MmpDeleteSection; ObjectTypeInitializer.CloseProcedure = MmpCloseSection; - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &MmSectionObjectType); + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &MmSectionObjectType); return(STATUS_SUCCESS); } Modified: trunk/reactos/ntoskrnl/ntoskrnl.def URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.def?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.def (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.def Mon Jun 5 10:31:42 2006 @@ -830,13 +830,20 @@ NtW32Call@20 NtWaitForSingleObject@12 NtWriteFile@36 + +; +; Object Manager ObAssignSecurity@16 ;ObCheckCreateObjectAccess@28 ;ObCheckObjectAccess@20 +;ObCloseHandle@4 ObCreateObject@36 +ObCreateObjectType@16 +ObDereferenceObject@4 ObDereferenceSecurityDescriptor@8 +@ObfDereferenceObject@4 ObFindHandleForObject@20 -ObGetObjectPointerCount@4 +@ObfReferenceObject@4 ObGetObjectSecurity@12 ObInsertObject@24 ObLogSecurityDescriptor@12 @@ -845,14 +852,18 @@ ObOpenObjectByPointer@28 ObQueryNameString@16 ObQueryObjectAuditingByHandle@8 -@ObfDereferenceObject@4 -@ObfReferenceObject@4 ObReferenceObjectByHandle@24 ObReferenceObjectByName@32 ObReferenceObjectByPointer@16 +;ObReferenceSecurityDescriptor@8 ObReleaseObjectSecurity@8 -ObDereferenceObject@4 +;ObSetHandleAttributes@12 ;ObSetSecurityDescriptorInfo@24 +;ObSetSecurityObjectByPointer@12 + +; +; +; ;PfxFindPrefix ;PfxInitialize ;PfxInsertPrefix 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 Mon Jun 5 10:31:42 2006 @@ -592,64 +592,6 @@ return STATUS_UNSUCCESSFUL; } - -/* -* @implemented -*/ -NTSTATUS STDCALL -ObQueryObjectAuditingByHandle(IN HANDLE Handle, - OUT PBOOLEAN GenerateOnClose) -{ - PHANDLE_TABLE_ENTRY HandleEntry; - PEPROCESS Process, CurrentProcess; - KAPC_STATE ApcState; - BOOLEAN AttachedToProcess = FALSE; - NTSTATUS Status = STATUS_SUCCESS; - - PAGED_CODE(); - - DPRINT("ObQueryObjectAuditingByHandle(Handle %p)\n", Handle); - - CurrentProcess = PsGetCurrentProcess(); - - KeEnterCriticalRegion(); - - if(ObIsKernelHandle(Handle, ExGetPreviousMode())) - { - Process = PsInitialSystemProcess; - Handle = ObKernelHandleToHandle(Handle); - - if (Process != CurrentProcess) - { - KeStackAttachProcess(&Process->Pcb, - &ApcState); - AttachedToProcess = TRUE; - } - } - else - Process = CurrentProcess; - - HandleEntry = ExMapHandleToPointer(Process->ObjectTable, - Handle); - if(HandleEntry != NULL) - { - *GenerateOnClose = (HandleEntry->ObAttributes & EX_HANDLE_ENTRY_AUDITONCLOSE) != 0; - - ExUnlockHandleTableEntry(Process->ObjectTable, - HandleEntry); - } - else - Status = STATUS_INVALID_HANDLE; - - if (AttachedToProcess) - { - KeUnstackDetachProcess(&ApcState); - } - - KeLeaveCriticalRegion(); - - return Status; -} /* PUBLIC FUNCTIONS *********************************************************/ ULONG Modified: trunk/reactos/ntoskrnl/ob/obinit.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obinit.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obinit.c (original) +++ trunk/reactos/ntoskrnl/ob/obinit.c Mon Jun 5 10:31:42 2006 @@ -158,7 +158,7 @@ ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.GenericMapping = ObpTypeMapping; ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(OBJECT_TYPE); - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ObTypeObjectType); + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ObTypeObjectType); /* Create the Directory Type */ DPRINT("Creating Directory Type\n"); @@ -170,7 +170,7 @@ ObjectTypeInitializer.MaintainTypeList = FALSE; ObjectTypeInitializer.GenericMapping = ObpDirectoryMapping; ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(OBJECT_DIRECTORY); - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ObDirectoryType); + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ObDirectoryType); /* Create security descriptor */ RtlCreateSecurityDescriptor(&SecurityDescriptor, Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c Mon Jun 5 10:31:42 2006 @@ -549,132 +549,6 @@ return STATUS_SUCCESS; } -NTSTATUS -NTAPI -ObpCreateTypeObject(IN POBJECT_TYPE_INITIALIZER ObjectTypeInitializer, - IN PUNICODE_STRING TypeName, - OUT POBJECT_TYPE *ObjectType) -{ - POBJECT_HEADER Header; - POBJECT_TYPE LocalObjectType; - ULONG HeaderSize; - NTSTATUS Status; - CHAR Tag[4]; - OBP_LOOKUP_CONTEXT Context; - - /* Allocate the Object */ - Status = ObpAllocateObject(NULL, - TypeName, - ObTypeObjectType, - sizeof(OBJECT_TYPE) + sizeof(OBJECT_HEADER), - KernelMode, - (POBJECT_HEADER*)&Header); - if (!NT_SUCCESS(Status)) return Status; - LocalObjectType = (POBJECT_TYPE)&Header->Body; - - /* Check if this is the first Object Type */ - if (!ObTypeObjectType) - { - ObTypeObjectType = LocalObjectType; - Header->Type = ObTypeObjectType; - LocalObjectType->TotalNumberOfObjects = 1; - LocalObjectType->Key = TAG('O', 'b', 'j', 'T'); - } - else - { - /* Set Tag */ - Tag[0] = TypeName->Buffer[0]; - Tag[1] = TypeName->Buffer[1]; - Tag[2] = TypeName->Buffer[2]; - Tag[3] = TypeName->Buffer[3]; - LocalObjectType->Key = *(PULONG)Tag; - } - - /* Set it up */ - LocalObjectType->TypeInfo = *ObjectTypeInitializer; - LocalObjectType->Name = *TypeName; - LocalObjectType->TypeInfo.PoolType = ObjectTypeInitializer->PoolType; - - /* These two flags need to be manually set up */ - Header->Flags |= OB_FLAG_KERNEL_MODE | OB_FLAG_PERMANENT; - - /* Check if we have to maintain a type list */ - if (NtGlobalFlag & FLG_MAINTAIN_OBJECT_TYPELIST) - { - /* Enable support */ - LocalObjectType->TypeInfo.MaintainTypeList = TRUE; - } - - /* Calculate how much space our header'll take up */ - HeaderSize = sizeof(OBJECT_HEADER) + sizeof(OBJECT_HEADER_NAME_INFO) + - (ObjectTypeInitializer->MaintainHandleCount ? - sizeof(OBJECT_HEADER_HANDLE_INFO) : 0); - - /* Check the pool type */ - if (ObjectTypeInitializer->PoolType == NonPagedPool) - { - /* Update the NonPaged Pool charge */ - LocalObjectType->TypeInfo.DefaultNonPagedPoolCharge += HeaderSize; - } - else - { - /* Update the Paged Pool charge */ - LocalObjectType->TypeInfo.DefaultPagedPoolCharge += HeaderSize; - } - - /* All objects types need a security procedure */ - if (!ObjectTypeInitializer->SecurityProcedure) - { - LocalObjectType->TypeInfo.SecurityProcedure = SeDefaultObjectMethod; - } - - /* Select the Wait Object */ - if (LocalObjectType->TypeInfo.UseDefaultObject) - { - /* Add the SYNCHRONIZE access mask since it's waitable */ - LocalObjectType->TypeInfo.ValidAccessMask |= SYNCHRONIZE; - - /* Use the "Default Object", a simple event */ - LocalObjectType->DefaultObject = &ObpDefaultObject; - } - /* The File Object gets an optimized hack so it can be waited on */ - else if ((TypeName->Length == 8) && !(wcscmp(TypeName->Buffer, L"File"))) - { - /* Wait on the File Object's event directly */ - LocalObjectType->DefaultObject = (PVOID)FIELD_OFFSET(FILE_OBJECT, - Event); - } - /* FIXME: When LPC stops sucking, add a hack for Waitable Ports */ - else - { - /* No default Object */ - LocalObjectType->DefaultObject = NULL; - } - - /* Initialize Object Type components */ - ExInitializeResourceLite(&LocalObjectType->Mutex); - InitializeListHead(&LocalObjectType->TypeList); - - /* Check if we're actually creating the directory object itself */ - if (ObpTypeDirectoryObject) - { - /* Insert it into the Object Directory */ - Context.Directory = ObpTypeDirectoryObject; - Context.DirectoryLocked = TRUE; - ObpLookupEntryDirectory(ObpTypeDirectoryObject, - TypeName, - OBJ_CASE_INSENSITIVE, - FALSE, - &Context); - ObpInsertEntryDirectory(ObpTypeDirectoryObject, &Context, Header); - ObReferenceObject(ObpTypeDirectoryObject); - } - - /* Return the object type and creations tatus */ - *ObjectType = LocalObjectType; - return Status; -} - /* PUBLIC FUNCTIONS **********************************************************/ NTSTATUS @@ -761,6 +635,133 @@ return Status; } +NTSTATUS +NTAPI +ObCreateObjectType(IN PUNICODE_STRING TypeName, + IN POBJECT_TYPE_INITIALIZER ObjectTypeInitializer, + IN PVOID Reserved, + OUT POBJECT_TYPE *ObjectType) +{ + POBJECT_HEADER Header; + POBJECT_TYPE LocalObjectType; + ULONG HeaderSize; + NTSTATUS Status; + CHAR Tag[4]; + OBP_LOOKUP_CONTEXT Context; + + /* Allocate the Object */ + Status = ObpAllocateObject(NULL, + TypeName, + ObTypeObjectType, + sizeof(OBJECT_TYPE) + sizeof(OBJECT_HEADER), + KernelMode, + (POBJECT_HEADER*)&Header); + if (!NT_SUCCESS(Status)) return Status; + LocalObjectType = (POBJECT_TYPE)&Header->Body; + + /* Check if this is the first Object Type */ + if (!ObTypeObjectType) + { + ObTypeObjectType = LocalObjectType; + Header->Type = ObTypeObjectType; + LocalObjectType->TotalNumberOfObjects = 1; + LocalObjectType->Key = TAG('O', 'b', 'j', 'T'); + } + else + { + /* Set Tag */ + Tag[0] = TypeName->Buffer[0]; + Tag[1] = TypeName->Buffer[1]; + Tag[2] = TypeName->Buffer[2]; + Tag[3] = TypeName->Buffer[3]; + LocalObjectType->Key = *(PULONG)Tag; + } + + /* Set it up */ + LocalObjectType->TypeInfo = *ObjectTypeInitializer; + LocalObjectType->Name = *TypeName; + LocalObjectType->TypeInfo.PoolType = ObjectTypeInitializer->PoolType; + + /* These two flags need to be manually set up */ + Header->Flags |= OB_FLAG_KERNEL_MODE | OB_FLAG_PERMANENT; + + /* Check if we have to maintain a type list */ + if (NtGlobalFlag & FLG_MAINTAIN_OBJECT_TYPELIST) + { + /* Enable support */ + LocalObjectType->TypeInfo.MaintainTypeList = TRUE; + } + + /* Calculate how much space our header'll take up */ + HeaderSize = sizeof(OBJECT_HEADER) + sizeof(OBJECT_HEADER_NAME_INFO) + + (ObjectTypeInitializer->MaintainHandleCount ? + sizeof(OBJECT_HEADER_HANDLE_INFO) : 0); + + /* Check the pool type */ + if (ObjectTypeInitializer->PoolType == NonPagedPool) + { + /* Update the NonPaged Pool charge */ + LocalObjectType->TypeInfo.DefaultNonPagedPoolCharge += HeaderSize; + } + else + { + /* Update the Paged Pool charge */ + LocalObjectType->TypeInfo.DefaultPagedPoolCharge += HeaderSize; + } + + /* All objects types need a security procedure */ + if (!ObjectTypeInitializer->SecurityProcedure) + { + LocalObjectType->TypeInfo.SecurityProcedure = SeDefaultObjectMethod; + } + + /* Select the Wait Object */ + if (LocalObjectType->TypeInfo.UseDefaultObject) + { + /* Add the SYNCHRONIZE access mask since it's waitable */ + LocalObjectType->TypeInfo.ValidAccessMask |= SYNCHRONIZE; + + /* Use the "Default Object", a simple event */ + LocalObjectType->DefaultObject = &ObpDefaultObject; + } + /* The File Object gets an optimized hack so it can be waited on */ + else if ((TypeName->Length == 8) && !(wcscmp(TypeName->Buffer, L"File"))) + { + /* Wait on the File Object's event directly */ + LocalObjectType->DefaultObject = (PVOID)FIELD_OFFSET(FILE_OBJECT, + Event); + } + /* FIXME: When LPC stops sucking, add a hack for Waitable Ports */ + else + { + /* No default Object */ + LocalObjectType->DefaultObject = NULL; + } + + /* Initialize Object Type components */ + ExInitializeResourceLite(&LocalObjectType->Mutex); + InitializeListHead(&LocalObjectType->TypeList); + + /* Check if we're actually creating the directory object itself */ + if (ObpTypeDirectoryObject) + { + /* Insert it into the Object Directory */ + Context.Directory = ObpTypeDirectoryObject; + Context.DirectoryLocked = TRUE; + ObpLookupEntryDirectory(ObpTypeDirectoryObject, + TypeName, + OBJ_CASE_INSENSITIVE, + FALSE, + &Context); + ObpInsertEntryDirectory(ObpTypeDirectoryObject, &Context, Header); + ObReferenceObject(ObpTypeDirectoryObject); + } + + /* Return the object type and creations tatus */ + *ObjectType = LocalObjectType; + return Status; +} + /*++ * @name NtQueryObject * @implemented NT4 Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c (original) +++ trunk/reactos/ntoskrnl/ob/obname.c Mon Jun 5 10:31:42 2006 @@ -329,7 +329,7 @@ /* PUBLIC FUNCTIONS *********************************************************/ -NTSTATUS +NTSTATUS STDCALL ObQueryNameString(IN PVOID Object, OUT POBJECT_NAME_INFORMATION ObjectNameInfo, Modified: trunk/reactos/ntoskrnl/ob/obref.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obref.c?rev=222… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obref.c (original) +++ trunk/reactos/ntoskrnl/ob/obref.c Mon Jun 5 10:31:42 2006 @@ -68,17 +68,6 @@ } /* PUBLIC FUNCTIONS *********************************************************/ - -ULONG -NTAPI -ObGetObjectPointerCount(PVOID Object) -{ - PAGED_CODE(); - ASSERT(Object); - - /* Get the header and return the pointer count */ - return OBJECT_TO_OBJECT_HEADER(Object)->PointerCount; -} VOID FASTCALL 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 Mon Jun 5 10:31:42 2006 @@ -463,4 +463,69 @@ DPRINT1("ObDereferenceSecurityDescriptor is not implemented!\n"); } +/*++ +* @name ObQueryObjectAuditingByHandle +* @implemented NT5 +* +* The ObDereferenceSecurityDescriptor routine <FILLMEIN> +* +* @param SecurityDescriptor +* <FILLMEIN> +* +* @param Count +* <FILLMEIN> +* +* @return STATUS_SUCCESS or appropriate error value. +* +* @remarks None. +* +*--*/ +NTSTATUS +NTAPI +ObQueryObjectAuditingByHandle(IN HANDLE Handle, + OUT PBOOLEAN GenerateOnClose) +{ + PHANDLE_TABLE_ENTRY HandleEntry; + PVOID HandleTable; + NTSTATUS Status = STATUS_SUCCESS; + PAGED_CODE(); + + /* Check if we're dealing with a kernel handle */ + if (ObIsKernelHandle(Handle, ExGetPreviousMode())) + { + /* Use the kernel table and convert the handle */ + HandleTable = ObpKernelHandleTable; + Handle = ObKernelHandleToHandle(Handle); + } + else + { + /* Use the process's handle table */ + HandleTable = PsGetCurrentProcess()->ObjectTable; + } + + /* Enter a critical region while we touch the handle table */ + KeEnterCriticalRegion(); + + /* Map the handle */ + HandleEntry = ExMapHandleToPointer(HandleTable, Handle); + if(HandleEntry) + { + /* Check if the flag is set */ + *GenerateOnClose = (HandleEntry->ObAttributes & + EX_HANDLE_ENTRY_AUDITONCLOSE) != 0; + + /* Unlock the entry */ + ExUnlockHandleTableEntry(HandleTable, HandleEntry); + } + else + { + /* Otherwise, fail */ + Status = STATUS_INVALID_HANDLE; + } + + /* Leave the critical region and return the status */ + KeLeaveCriticalRegion(); + return Status; +} + /* EOF */ Modified: trunk/reactos/ntoskrnl/ob/symlink.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/symlink.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/symlink.c (original) +++ trunk/reactos/ntoskrnl/ob/symlink.c Mon Jun 5 10:31:42 2006 @@ -194,7 +194,7 @@ ObjectTypeInitializer.UseDefaultObject = TRUE; ObjectTypeInitializer.ParseProcedure = ObpParseSymbolicLink; ObjectTypeInitializer.DeleteProcedure = ObpDeleteSymbolicLink; - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ObSymbolicLinkType); + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ObSymbolicLinkType); } /* PUBLIC FUNCTIONS **********************************************************/ Modified: trunk/reactos/ntoskrnl/ps/job.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ps/job.c?rev=22232… ============================================================================== --- trunk/reactos/ntoskrnl/ps/job.c (original) +++ trunk/reactos/ntoskrnl/ps/job.c Mon Jun 5 10:31:42 2006 @@ -81,7 +81,7 @@ ObjectTypeInitializer.ValidAccessMask = JOB_OBJECT_ALL_ACCESS; ObjectTypeInitializer.UseDefaultObject = TRUE; ObjectTypeInitializer.DeleteProcedure = PiDeleteJob; - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &PsJobType); + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &PsJobType); InitializeListHead(&PsJobListHead); ExInitializeFastMutex(&PsJobListLock); Modified: trunk/reactos/ntoskrnl/ps/psmgr.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ps/psmgr.c?rev=222… ============================================================================== --- trunk/reactos/ntoskrnl/ps/psmgr.c (original) +++ trunk/reactos/ntoskrnl/ps/psmgr.c Mon Jun 5 10:31:42 2006 @@ -122,7 +122,7 @@ ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.ValidAccessMask = THREAD_ALL_ACCESS; ObjectTypeInitializer.DeleteProcedure = PspDeleteThread; - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &PsThreadType); + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &PsThreadType); PsInitializeIdleOrFirstThread(PsInitialSystemProcess, &FirstThread, NULL, KernelMode, TRUE); FirstThread->Tcb.State = Running; @@ -163,7 +163,7 @@ ObjectTypeInitializer.PoolType = NonPagedPool; ObjectTypeInitializer.ValidAccessMask = PROCESS_ALL_ACCESS; ObjectTypeInitializer.DeleteProcedure = PspDeleteProcess; - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &PsProcessType); + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &PsProcessType); InitializeListHead(&PsActiveProcessHead); ExInitializeFastMutex(&PspActiveProcessMutex); Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=222… ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c (original) +++ trunk/reactos/ntoskrnl/se/token.c Mon Jun 5 10:31:42 2006 @@ -591,7 +591,7 @@ ObjectTypeInitializer.ValidAccessMask = TOKEN_ALL_ACCESS; ObjectTypeInitializer.UseDefaultObject = TRUE; ObjectTypeInitializer.DeleteProcedure = SepDeleteToken; - ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &SepTokenObjectType); + ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &SepTokenObjectType); }

1 0

[ion] 22231: - Fixed formatting/commented/annotated ObReferenceObjectByHandle. - Bug fixes: * Remove MAXIMUM_ALLOWED<->GENERIC_ALL conversion, I could find no mention of this in the docs. * Remove GENERIC_ACCESS <-> RtlMapGenericMask conversion, I could find no mention of this in the docs, and this mapping is only required when creating handles, not when referencing pointers. - Optimizations: * Restructure code and remove code which was sometimes duplicated up to 5 times. * Do not attach/detach
by ion＠svn.reactos.org 05 Jun '06

05 Jun '06

Author: ion Date: Mon Jun 5 09:07:44 2006 New Revision: 22231 URL: http://svn.reactos.ru/svn/reactos?rev=22231&view=rev Log: - Fixed formatting/commented/annotated ObReferenceObjectByHandle. - Bug fixes: * Remove MAXIMUM_ALLOWED<->GENERIC_ALL conversion, I could find no mention of this in the docs. * Remove GENERIC_ACCESS <-> RtlMapGenericMask conversion, I could find no mention of this in the docs, and this mapping is only required when creating handles, not when referencing pointers. - Optimizations: * Restructure code and remove code which was sometimes duplicated up to 5 times. * Do not attach/detach from the system process, this isn't required since we're merely getting a kernel pointer from the handle netry. * Directly increase the pointer count instead of calling ObReferenceObject, since we already have the object header in a variable. * Cache ObpKernelHandleTable/Process->ObjectTable and use those directly instead of always de-referencing the process. Modified: trunk/reactos/base/system/smss/client.c trunk/reactos/ntoskrnl/ob/obref.c Modified: trunk/reactos/base/system/smss/client.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/system/smss/client.c?r… ============================================================================== --- trunk/reactos/base/system/smss/client.c (original) +++ trunk/reactos/base/system/smss/client.c Mon Jun 5 09:07:44 2006 @@ -194,6 +194,14 @@ SmpClientDirectory.CandidateClient->ServerProcessId = (ULONG) pbi.UniqueProcessId; } + else + { + LARGE_INTEGER Fixme; + Fixme.QuadPart = -50000000; + DPRINT1("WARNING! UniqueProcess IS A THREAD HANDLE!!!\n"); + NtDelayExecution(FALSE, &Fixme); + DPRINT1("FIXME!\n"); + } } else { Modified: trunk/reactos/ntoskrnl/ob/obref.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obref.c?rev=222… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obref.c (original) +++ trunk/reactos/ntoskrnl/ob/obref.c Mon Jun 5 09:07:44 2006 @@ -127,6 +127,18 @@ ExQueueWorkItem(&ObpReaperWorkItem, DelayedWorkQueue); } } +} + +#ifdef ObDereferenceObject +#undef ObDereferenceObject +#endif + +VOID +NTAPI +ObDereferenceObject(IN PVOID Object) +{ + /* Call the fastcall function */ + ObfDereferenceObject(Object); } NTSTATUS @@ -228,206 +240,165 @@ return Status; } -NTSTATUS STDCALL -ObReferenceObjectByHandle(HANDLE Handle, - ACCESS_MASK DesiredAccess, - POBJECT_TYPE ObjectType, - KPROCESSOR_MODE AccessMode, - PVOID* Object, - POBJECT_HANDLE_INFORMATION HandleInformation) +NTSTATUS +NTAPI +ObReferenceObjectByHandle(IN HANDLE Handle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_TYPE ObjectType, + IN KPROCESSOR_MODE AccessMode, + OUT PVOID* Object, + OUT POBJECT_HANDLE_INFORMATION HandleInformation OPTIONAL) { PHANDLE_TABLE_ENTRY HandleEntry; POBJECT_HEADER ObjectHeader; - PVOID ObjectBody; ACCESS_MASK GrantedAccess; ULONG Attributes; - PEPROCESS CurrentProcess, Process; - BOOLEAN AttachedToProcess = FALSE; - KAPC_STATE ApcState; - + PEPROCESS CurrentProcess; + PVOID HandleTable; + PETHREAD CurrentThread; + NTSTATUS Status; PAGED_CODE(); - DPRINT("ObReferenceObjectByHandle(Handle %p, DesiredAccess %x, " - "ObjectType %p, AccessMode %d, Object %p)\n",Handle,DesiredAccess, - ObjectType,AccessMode,Object); - - if (Handle == NULL) - { - return STATUS_INVALID_HANDLE; - } - - CurrentProcess = PsGetCurrentProcess(); - - /* - * Handle special handle names - */ - if (Handle == NtCurrentProcess() && - (ObjectType == PsProcessType || ObjectType == NULL)) - { + /* Fail immediately if the handle is NULL */ + if (!Handle) return STATUS_INVALID_HANDLE; + + /* Check if the caller wants the current process */ + if ((Handle == NtCurrentProcess()) && + ((ObjectType == PsProcessType) || !(ObjectType))) + { + /* Get the current process */ + CurrentProcess = PsGetCurrentProcess(); + + /* Reference ourselves */ ObReferenceObject(CurrentProcess); - if (HandleInformation != NULL) - { + /* Check if the caller wanted handle information */ + if (HandleInformation) + { + /* Return it */ HandleInformation->HandleAttributes = 0; HandleInformation->GrantedAccess = PROCESS_ALL_ACCESS; } + /* Return the pointer */ *Object = CurrentProcess; - DPRINT("Referencing current process %p\n", CurrentProcess); return STATUS_SUCCESS; } else if (Handle == NtCurrentProcess()) { - CHECKPOINT; - return(STATUS_OBJECT_TYPE_MISMATCH); - } - - if (Handle == NtCurrentThread() && - (ObjectType == PsThreadType || ObjectType == NULL)) - { - PETHREAD CurrentThread = PsGetCurrentThread(); - + /* The caller used this special handle value with a non-process type */ + return STATUS_OBJECT_TYPE_MISMATCH; + } + + /* Check if the caller wants the current thread */ + if ((Handle == NtCurrentThread()) && + ((ObjectType == PsThreadType) || !(ObjectType))) + { + /* Get the current thread */ + CurrentThread = PsGetCurrentThread(); + + /* Reference ourselves */ ObReferenceObject(CurrentThread); - if (HandleInformation != NULL) - { + /* Check if the caller wanted handle information */ + if (HandleInformation) + { + /* Return it */ HandleInformation->HandleAttributes = 0; HandleInformation->GrantedAccess = THREAD_ALL_ACCESS; } + /* Return the pointer */ *Object = CurrentThread; - CHECKPOINT; return STATUS_SUCCESS; } else if (Handle == NtCurrentThread()) { - CHECKPOINT; - return(STATUS_OBJECT_TYPE_MISMATCH); - } - - /* desire as much access rights as possible */ - if (DesiredAccess & MAXIMUM_ALLOWED) - { - DesiredAccess &= ~MAXIMUM_ALLOWED; - DesiredAccess |= GENERIC_ALL; - } - - if(ObIsKernelHandle(Handle, AccessMode)) - { - Process = PsInitialSystemProcess; + /* The caller used this special handle value with a non-thread type */ + return STATUS_OBJECT_TYPE_MISMATCH; + } + + /* Check if this is a kernel handle */ + if (ObIsKernelHandle(Handle, AccessMode)) + { + /* Use the kernel handle table and get the actual handle value */ Handle = ObKernelHandleToHandle(Handle); + HandleTable = ObpKernelHandleTable; } else { - Process = CurrentProcess; - } - + /* Otherwise use this process's handle table */ + HandleTable = PsGetCurrentProcess()->ObjectTable; + } + + /* Enter a critical region while we touch the handle table */ KeEnterCriticalRegion(); - if (Process != CurrentProcess) - { - KeStackAttachProcess(&Process->Pcb, - &ApcState); - AttachedToProcess = TRUE; - } - - HandleEntry = ExMapHandleToPointer(Process->ObjectTable, - Handle); - if (HandleEntry == NULL) - { - if (AttachedToProcess) - { - KeUnstackDetachProcess(&ApcState); - } - KeLeaveCriticalRegion(); - DPRINT("ExMapHandleToPointer() failed for handle 0x%p\n", Handle); - return(STATUS_INVALID_HANDLE); - } - - ObjectHeader = EX_HTE_TO_HDR(HandleEntry); - ObjectBody = &ObjectHeader->Body; - - DPRINT("locked1: ObjectHeader: 0x%p [HT:0x%p]\n", ObjectHeader, Process->ObjectTable); - - if (ObjectType != NULL && ObjectType != ObjectHeader->Type) - { - DPRINT("ObjectType mismatch: %wZ vs %wZ (handle 0x%p)\n", &ObjectType->Name, ObjectHeader->Type ? &ObjectHeader->Type->Name : NULL, Handle); - - ExUnlockHandleTableEntry(Process->ObjectTable, - HandleEntry); - - if (AttachedToProcess) - { - KeUnstackDetachProcess(&ApcState); - } - - KeLeaveCriticalRegion(); - - return(STATUS_OBJECT_TYPE_MISMATCH); - } - - /* map the generic access masks if the caller asks for generic access */ - if (DesiredAccess & GENERIC_ACCESS) - { - RtlMapGenericMask(&DesiredAccess, - &OBJECT_TO_OBJECT_HEADER(ObjectBody)->Type->TypeInfo.GenericMapping); - } - - GrantedAccess = HandleEntry->GrantedAccess; - - /* Unless running as KernelMode, deny access if caller desires more access - rights than the handle can grant */ - if(AccessMode != KernelMode && (~GrantedAccess & DesiredAccess)) - { - ExUnlockHandleTableEntry(Process->ObjectTable, - HandleEntry); - - if (AttachedToProcess) - { - KeUnstackDetachProcess(&ApcState); - } - - KeLeaveCriticalRegion(); - - DPRINT1("GrantedAccess: 0x%x, ~GrantedAccess: 0x%x, DesiredAccess: 0x%x, denied: 0x%x\n", GrantedAccess, ~GrantedAccess, DesiredAccess, ~GrantedAccess & DesiredAccess); - - return(STATUS_ACCESS_DENIED); - } - - ObReferenceObject(ObjectBody); - - Attributes = HandleEntry->ObAttributes & (EX_HANDLE_ENTRY_PROTECTFROMCLOSE | - EX_HANDLE_ENTRY_INHERITABLE | - EX_HANDLE_ENTRY_AUDITONCLOSE); - - ExUnlockHandleTableEntry(Process->ObjectTable, - HandleEntry); - - if (AttachedToProcess) - { - KeUnstackDetachProcess(&ApcState); - } - + /* Get the handle entry */ + HandleEntry = ExMapHandleToPointer(HandleTable, Handle); + if (HandleEntry) + { + /* Get the object header and validate the type*/ + ObjectHeader = EX_HTE_TO_HDR(HandleEntry); + if (!(ObjectType) || (ObjectType == ObjectHeader->Type)) + { + /* Get the granted access and validate it */ + GrantedAccess = HandleEntry->GrantedAccess; + if ((AccessMode == KernelMode) || + !(~GrantedAccess & DesiredAccess)) + { + /* Reference the object directly since we have its header */ + InterlockedIncrement(&ObjectHeader->PointerCount); + + /* Mask out the internal attributes */ + Attributes = HandleEntry->ObAttributes & + (EX_HANDLE_ENTRY_PROTECTFROMCLOSE | + EX_HANDLE_ENTRY_INHERITABLE | + EX_HANDLE_ENTRY_AUDITONCLOSE); + + /* Check if the caller wants handle information */ + if (HandleInformation) + { + /* Fill out the information */ + HandleInformation->HandleAttributes = Attributes; + HandleInformation->GrantedAccess = GrantedAccess; + } + + /* Return the pointer */ + *Object = &ObjectHeader->Body; + + /* Unlock the handle */ + ExUnlockHandleTableEntry(HandleTable, HandleEntry); + + /* Return success */ + KeLeaveCriticalRegion(); + return STATUS_SUCCESS; + } + else + { + /* Requested access failed */ + Status = STATUS_ACCESS_DENIED; + } + } + else + { + /* Invalid object type */ + Status = STATUS_OBJECT_TYPE_MISMATCH; + } + + /* Unlock the entry */ + ExUnlockHandleTableEntry(HandleTable, HandleEntry); + } + else + { + /* Invalid handle */ + Status = STATUS_INVALID_HANDLE; + } + + /* Return failure status */ KeLeaveCriticalRegion(); - - if (HandleInformation != NULL) - { - HandleInformation->HandleAttributes = Attributes; - HandleInformation->GrantedAccess = GrantedAccess; - } - - *Object = ObjectBody; - - return(STATUS_SUCCESS); -} - -#ifdef ObDereferenceObject -#undef ObDereferenceObject -#endif - -VOID STDCALL -ObDereferenceObject(IN PVOID Object) -{ - ObfDereferenceObject(Object); -} + *Object = NULL; + return Status; +} + /* EOF */

1 0

[ion] 22230: - Simplify ObGetObjectPointerCode and ObfReferenceObject. - Fix ObReferenceObjectByPointer to actually work like documented instead of doing random incorrect checks. Also add special case for Symbolic Link objects as documented by Caz Yokoyama at Microsoft.
by ion＠svn.reactos.org 05 Jun '06

05 Jun '06

Author: ion Date: Mon Jun 5 04:32:26 2006 New Revision: 22230 URL: http://svn.reactos.ru/svn/reactos?rev=22230&view=rev Log: - Simplify ObGetObjectPointerCode and ObfReferenceObject. - Fix ObReferenceObjectByPointer to actually work like documented instead of doing random incorrect checks. Also add special case for Symbolic Link objects as documented by Caz Yokoyama at Microsoft. Modified: trunk/reactos/ntoskrnl/ob/obref.c Modified: trunk/reactos/ntoskrnl/ob/obref.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obref.c?rev=222… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obref.c (original) +++ trunk/reactos/ntoskrnl/ob/obref.c Mon Jun 5 04:32:26 2006 @@ -69,34 +69,25 @@ /* PUBLIC FUNCTIONS *********************************************************/ -ULONG STDCALL +ULONG +NTAPI ObGetObjectPointerCount(PVOID Object) { - POBJECT_HEADER Header; - PAGED_CODE(); - ASSERT(Object); - Header = OBJECT_TO_OBJECT_HEADER(Object); - - return Header->PointerCount; -} - -VOID FASTCALL + + /* Get the header and return the pointer count */ + return OBJECT_TO_OBJECT_HEADER(Object)->PointerCount; +} + +VOID +FASTCALL ObfReferenceObject(IN PVOID Object) { - POBJECT_HEADER Header; - ASSERT(Object); - Header = OBJECT_TO_OBJECT_HEADER(Object); - - /* No one should be referencing an object once we are deleting it. */ - if (InterlockedIncrement(&Header->PointerCount) == 1 && !(Header->Flags & OB_FLAG_PERMANENT)) - { - KEBUGCHECK(0); - } - + /* Get the header and increment the reference count */ + InterlockedIncrement(&OBJECT_TO_OBJECT_HEADER(Object)->PointerCount); } VOID @@ -138,7 +129,8 @@ } } -NTSTATUS STDCALL +NTSTATUS +NTAPI ObReferenceObjectByPointer(IN PVOID Object, IN ACCESS_MASK DesiredAccess, IN POBJECT_TYPE ObjectType, @@ -146,55 +138,23 @@ { POBJECT_HEADER Header; - /* NOTE: should be possible to reference an object above APC_LEVEL! */ - - DPRINT("ObReferenceObjectByPointer(Object %x, ObjectType %x)\n", - Object,ObjectType); - + /* Get the header */ Header = OBJECT_TO_OBJECT_HEADER(Object); - if (ObjectType != NULL && Header->Type != ObjectType) - { - DPRINT("Failed %p (type was %x %wZ) should be %x %wZ\n", - Header, - Header->Type, - &OBJECT_HEADER_TO_NAME_INFO(OBJECT_TO_OBJECT_HEADER(Header->Type))->Name, - ObjectType, - &OBJECT_HEADER_TO_NAME_INFO(OBJECT_TO_OBJECT_HEADER(ObjectType))->Name); - return(STATUS_UNSUCCESSFUL); - } - if (Header->Type == PsProcessType) - { - DPRINT("Ref p 0x%x PointerCount %d type %x ", - Object, Header->PointerCount, PsProcessType); - DPRINT("eip %x\n", ((PULONG)&Object)[-1]); - } - if (Header->Type == PsThreadType) - { - DPRINT("Deref t 0x%x with PointerCount %d type %x ", - Object, Header->PointerCount, PsThreadType); - DPRINT("eip %x\n", ((PULONG)&Object)[-1]); - } - - if (Header->PointerCount == 0 && !(Header->Flags & OB_FLAG_PERMANENT)) - { - if (Header->Type == PsProcessType) - { - return STATUS_PROCESS_IS_TERMINATING; - } - if (Header->Type == PsThreadType) - { - return STATUS_THREAD_IS_TERMINATING; - } - return(STATUS_UNSUCCESSFUL); - } - - if (1 == InterlockedIncrement(&Header->PointerCount) && !(Header->Flags & OB_FLAG_PERMANENT)) - { - KEBUGCHECK(0); - } - - return(STATUS_SUCCESS); + /* + * Validate object type if the call is for UserMode. + * NOTE: Unless it's a symbolic link (Caz Yokoyama [MSFT]) + */ + if ((Header->Type != ObjectType) && ((AccessMode != KernelMode) || + (ObjectType == ObSymbolicLinkType))) + { + /* Invalid type */ + return STATUS_OBJECT_TYPE_MISMATCH; + } + + /* Oncrement the reference count and return success */ + InterlockedIncrement(&Header->PointerCount); + return STATUS_SUCCESS; } NTSTATUS

1 0

[ion] 22229: - Formatting/comment fixes.
by ion＠svn.reactos.org 05 Jun '06

05 Jun '06

Author: ion Date: Mon Jun 5 04:16:14 2006 New Revision: 22229 URL: http://svn.reactos.ru/svn/reactos?rev=22229&view=rev Log: - Formatting/comment fixes. Modified: trunk/reactos/ntoskrnl/ob/oblife.c trunk/reactos/ntoskrnl/ob/obname.c Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c Mon Jun 5 04:16:14 2006 @@ -431,7 +431,7 @@ ULONG FinalSize = ObjectSize; ULONG Tag; PAGED_CODE(); - + /* If we don't have an Object Type yet, force NonPaged */ if (!ObjectType) { @@ -443,14 +443,14 @@ PoolType = ObjectType->TypeInfo.PoolType; Tag = ObjectType->Key; } - + /* Check if the Object has a name */ if (ObjectName->Buffer) { FinalSize += sizeof(OBJECT_HEADER_NAME_INFO); HasNameInfo = TRUE; } - + if (ObjectType) { /* Check if the Object maintains handle counts */ @@ -471,7 +471,7 @@ /* Allocate memory for the Object and Header */ Header = ExAllocatePoolWithTag(PoolType, FinalSize, Tag); if (!Header) return STATUS_INSUFFICIENT_RESOURCES; - + /* Initialize Handle Info */ if (HasHandleInfo) { @@ -479,7 +479,7 @@ HandleInfo->SingleEntry.HandleCount = 0; Header = (POBJECT_HEADER)(HandleInfo + 1); } - + /* Initialize the Object Name Info */ if (HasNameInfo) { @@ -488,7 +488,7 @@ NameInfo->Directory = NULL; Header = (POBJECT_HEADER)(NameInfo + 1); } - + /* Initialize Creator Info */ if (HasCreatorInfo) { @@ -498,14 +498,14 @@ InitializeListHead(&CreatorInfo->TypeList); Header = (POBJECT_HEADER)(CreatorInfo + 1); } - + /* Initialize the object header */ RtlZeroMemory(Header, ObjectSize); Header->PointerCount = 1; Header->Type = ObjectType; Header->Flags = OB_FLAG_CREATE_INFO; Header->ObjectCreateInfo = ObjectCreateInfo; - + /* Set the Offsets for the Info */ if (HasHandleInfo) { @@ -540,10 +540,10 @@ /* Set the kernel flag */ Header->Flags |= OB_FLAG_KERNEL_MODE; } - + /* Increase the number of objects of this type */ if (ObjectType) ObjectType->TotalNumberOfObjects++; - + /* Return Header */ *ObjectHeader = Header; return STATUS_SUCCESS; @@ -551,9 +551,9 @@ NTSTATUS NTAPI -ObpCreateTypeObject(POBJECT_TYPE_INITIALIZER ObjectTypeInitializer, - PUNICODE_STRING TypeName, - POBJECT_TYPE *ObjectType) +ObpCreateTypeObject(IN POBJECT_TYPE_INITIALIZER ObjectTypeInitializer, + IN PUNICODE_STRING TypeName, + OUT POBJECT_TYPE *ObjectType) { POBJECT_HEADER Header; POBJECT_TYPE LocalObjectType; @@ -563,15 +563,15 @@ OBP_LOOKUP_CONTEXT Context; /* Allocate the Object */ - Status = ObpAllocateObject(NULL, + Status = ObpAllocateObject(NULL, TypeName, - ObTypeObjectType, + ObTypeObjectType, sizeof(OBJECT_TYPE) + sizeof(OBJECT_HEADER), KernelMode, (POBJECT_HEADER*)&Header); if (!NT_SUCCESS(Status)) return Status; LocalObjectType = (POBJECT_TYPE)&Header->Body; - + /* Check if this is the first Object Type */ if (!ObTypeObjectType) { @@ -581,7 +581,7 @@ LocalObjectType->Key = TAG('O', 'b', 'j', 'T'); } else - { + { /* Set Tag */ Tag[0] = TypeName->Buffer[0]; Tag[1] = TypeName->Buffer[1]; @@ -589,7 +589,7 @@ Tag[3] = TypeName->Buffer[3]; LocalObjectType->Key = *(PULONG)Tag; } - + /* Set it up */ LocalObjectType->TypeInfo = *ObjectTypeInitializer; LocalObjectType->Name = *TypeName; @@ -610,16 +610,18 @@ (ObjectTypeInitializer->MaintainHandleCount ? sizeof(OBJECT_HEADER_HANDLE_INFO) : 0); - /* Update the Pool Charges */ + /* Check the pool type */ if (ObjectTypeInitializer->PoolType == NonPagedPool) { + /* Update the NonPaged Pool charge */ LocalObjectType->TypeInfo.DefaultNonPagedPoolCharge += HeaderSize; } else { + /* Update the Paged Pool charge */ LocalObjectType->TypeInfo.DefaultPagedPoolCharge += HeaderSize; } - + /* All objects types need a security procedure */ if (!ObjectTypeInitializer->SecurityProcedure) { @@ -635,10 +637,12 @@ /* Use the "Default Object", a simple event */ LocalObjectType->DefaultObject = &ObpDefaultObject; } - /* Special system objects get an optimized hack so they can be waited on */ - else if (TypeName->Length == 8 && !wcscmp(TypeName->Buffer, L"File")) - { - LocalObjectType->DefaultObject = (PVOID)FIELD_OFFSET(FILE_OBJECT, Event); + /* The File Object gets an optimized hack so it can be waited on */ + else if ((TypeName->Length == 8) && !(wcscmp(TypeName->Buffer, L"File"))) + { + /* Wait on the File Object's event directly */ + LocalObjectType->DefaultObject = (PVOID)FIELD_OFFSET(FILE_OBJECT, + Event); } /* FIXME: When LPC stops sucking, add a hack for Waitable Ports */ else @@ -651,9 +655,10 @@ ExInitializeResourceLite(&LocalObjectType->Mutex); InitializeListHead(&LocalObjectType->TypeList); - /* Insert it into the Object Directory */ + /* Check if we're actually creating the directory object itself */ if (ObpTypeDirectoryObject) { + /* Insert it into the Object Directory */ Context.Directory = ObpTypeDirectoryObject; Context.DirectoryLocked = TRUE; ObpLookupEntryDirectory(ObpTypeDirectoryObject, @@ -665,6 +670,7 @@ ObReferenceObject(ObpTypeDirectoryObject); } + /* Return the object type and creations tatus */ *ObjectType = LocalObjectType; return Status; } Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c (original) +++ trunk/reactos/ntoskrnl/ob/obname.c Mon Jun 5 04:16:14 2006 @@ -180,12 +180,12 @@ Status = CurrentHeader->Type->TypeInfo.ParseProcedure(CurrentObject, CurrentHeader->Type, AccessState, - ExGetPreviousMode(), // fixme: should be a parameter, since caller decides. + PreviousMode, Attributes, &PathString, &CurrentUs, ParseContext, - NULL, // fixme: where do we get this from? captured OBP? + SecurityQos, &NextObject); current = CurrentUs.Buffer; if (Status == STATUS_REPARSE) @@ -341,89 +341,74 @@ POBJECT_DIRECTORY ParentDirectory; ULONG NameSize; PWCH ObjectName; - NTSTATUS Status; - - DPRINT("ObQueryNameString: %x, %x\n", Object, ObjectNameInfo); /* Get the Kernel Meta-Structures */ ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); LocalInfo = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader); /* Check if a Query Name Procedure is available */ - if (ObjectHeader->Type->TypeInfo.QueryNameProcedure) - { + if (ObjectHeader->Type->TypeInfo.QueryNameProcedure) + { /* Call the procedure */ - DPRINT("Calling Object's Procedure\n"); - Status = ObjectHeader->Type->TypeInfo.QueryNameProcedure(Object, - TRUE, //fixme - ObjectNameInfo, - Length, - ReturnLength); - - /* Return the status */ - return Status; + return ObjectHeader->Type->TypeInfo.QueryNameProcedure(Object, + TRUE, //fixme + ObjectNameInfo, + Length, + ReturnLength); } /* Check if the object doesn't even have a name */ - if (!LocalInfo || !LocalInfo->Name.Buffer) + if (!LocalInfo || !LocalInfo->Name.Buffer) { /* We're returning the name structure */ - DPRINT("Nameless Object\n"); *ReturnLength = sizeof(OBJECT_NAME_INFORMATION); /* Check if we were given enough space */ - if (*ReturnLength > Length) - { - DPRINT1("Not enough buffer space\n"); - return STATUS_INFO_LENGTH_MISMATCH; - } + if (*ReturnLength > Length) return STATUS_INFO_LENGTH_MISMATCH; /* Return an empty buffer */ - ObjectNameInfo->Name.Length = 0; - ObjectNameInfo->Name.MaximumLength = 0; - ObjectNameInfo->Name.Buffer = NULL; - + RtlInitEmptyUnicodeString(&ObjectNameInfo->Name, NULL, 0); return STATUS_SUCCESS; } - /* + /* * Find the size needed for the name. We won't do * this during the Name Creation loop because we want * to let the caller know that the buffer isn't big * enough right at the beginning, not work our way through * and find out at the end */ - if (Object == NameSpaceRoot) + if (Object == NameSpaceRoot) { /* Size of the '\' string */ - DPRINT("Object is Root\n"); NameSize = sizeof(OBJ_NAME_PATH_SEPARATOR); - } - else + } + else { /* Get the Object Directory and add name of Object */ ParentDirectory = LocalInfo->Directory; NameSize = sizeof(OBJ_NAME_PATH_SEPARATOR) + LocalInfo->Name.Length; /* Loop inside the directory to get the top-most one (meaning root) */ - while ((ParentDirectory != NameSpaceRoot) && (ParentDirectory)) + while ((ParentDirectory != NameSpaceRoot) && (ParentDirectory)) { /* Get the Name Information */ - LocalInfo = OBJECT_HEADER_TO_NAME_INFO(OBJECT_TO_OBJECT_HEADER(ParentDirectory)); + LocalInfo = OBJECT_HEADER_TO_NAME_INFO( + OBJECT_TO_OBJECT_HEADER(ParentDirectory)); /* Add the size of the Directory Name */ - if (LocalInfo && LocalInfo->Directory) + if (LocalInfo && LocalInfo->Directory) { /* Size of the '\' string + Directory Name */ - NameSize += sizeof(OBJ_NAME_PATH_SEPARATOR) + LocalInfo->Name.Length; + NameSize += sizeof(OBJ_NAME_PATH_SEPARATOR) + + LocalInfo->Name.Length; /* Move to next parent Directory */ ParentDirectory = LocalInfo->Directory; - } - else + } + else { /* Directory with no name. We append "...\" */ - DPRINT("Nameless Directory\n"); NameSize += sizeof(L"...") + sizeof(OBJ_NAME_PATH_SEPARATOR); break; } @@ -431,17 +416,14 @@ } /* Finally, add the name of the structure and the null char */ - *ReturnLength = NameSize + sizeof(OBJECT_NAME_INFORMATION) + sizeof(UNICODE_NULL); - DPRINT("Final Length: %x\n", *ReturnLength); + *ReturnLength = NameSize + + sizeof(OBJECT_NAME_INFORMATION) + + sizeof(UNICODE_NULL); /* Check if we were given enough space */ - if (*ReturnLength > Length) - { - DPRINT1("Not enough buffer space\n"); - return STATUS_INFO_LENGTH_MISMATCH; - } - - /* + if (*ReturnLength > Length) return STATUS_INFO_LENGTH_MISMATCH; + + /* * Now we will actually create the name. We work backwards because * it's easier to start off from the Name we have and walk up the * parent directories. We use the same logic as Name Length calculation. @@ -450,44 +432,51 @@ ObjectName = (PWCH)((ULONG_PTR)ObjectNameInfo + *ReturnLength); *--ObjectName = UNICODE_NULL; - if (Object == NameSpaceRoot) + /* Check if the object is actually the Root directory */ + if (Object == NameSpaceRoot) { /* This is already the Root Directory, return "\\" */ - DPRINT("Returning Root Dir\n"); *--ObjectName = OBJ_NAME_PATH_SEPARATOR; ObjectNameInfo->Name.Length = (USHORT)NameSize; - ObjectNameInfo->Name.MaximumLength = (USHORT)(NameSize + sizeof(UNICODE_NULL)); + ObjectNameInfo->Name.MaximumLength = (USHORT)(NameSize + + sizeof(UNICODE_NULL)); ObjectNameInfo->Name.Buffer = ObjectName; - return STATUS_SUCCESS; - } - else + } + else { /* Start by adding the Object's Name */ - ObjectName = (PWCH)((ULONG_PTR)ObjectName - LocalInfo->Name.Length); - RtlMoveMemory(ObjectName, LocalInfo->Name.Buffer, LocalInfo->Name.Length); + ObjectName = (PWCH)((ULONG_PTR)ObjectName - + LocalInfo->Name.Length); + RtlMoveMemory(ObjectName, + LocalInfo->Name.Buffer, + LocalInfo->Name.Length); /* Now parse the Parent directories until we reach the top */ ParentDirectory = LocalInfo->Directory; - while ((ParentDirectory != NameSpaceRoot) && (ParentDirectory)) + while ((ParentDirectory != NameSpaceRoot) && (ParentDirectory)) { /* Get the name information */ - LocalInfo = OBJECT_HEADER_TO_NAME_INFO(OBJECT_TO_OBJECT_HEADER(ParentDirectory)); + LocalInfo = OBJECT_HEADER_TO_NAME_INFO( + OBJECT_TO_OBJECT_HEADER(ParentDirectory)); /* Add the "\" */ *(--ObjectName) = OBJ_NAME_PATH_SEPARATOR; /* Add the Parent Directory's Name */ - if (LocalInfo && LocalInfo->Name.Buffer) + if (LocalInfo && LocalInfo->Name.Buffer) { /* Add the name */ - ObjectName = (PWCH)((ULONG_PTR)ObjectName - LocalInfo->Name.Length); - RtlMoveMemory(ObjectName, LocalInfo->Name.Buffer, LocalInfo->Name.Length); + ObjectName = (PWCH)((ULONG_PTR)ObjectName - + LocalInfo->Name.Length); + RtlMoveMemory(ObjectName, + LocalInfo->Name.Buffer, + LocalInfo->Name.Length); /* Move to next parent */ ParentDirectory = LocalInfo->Directory; - } - else + } + else { /* Directory without a name, we add "..." */ DPRINT("Nameless Directory\n"); @@ -499,13 +488,13 @@ /* Add Root Directory Name */ *(--ObjectName) = OBJ_NAME_PATH_SEPARATOR; - DPRINT("Current Buffer: %S\n", ObjectName); ObjectNameInfo->Name.Length = (USHORT)NameSize; - ObjectNameInfo->Name.MaximumLength = (USHORT)(NameSize + sizeof(UNICODE_NULL)); + ObjectNameInfo->Name.MaximumLength = (USHORT)(NameSize + + sizeof(UNICODE_NULL)); ObjectNameInfo->Name.Buffer = ObjectName; - DPRINT("Complete: %wZ\n", ObjectNameInfo); - } - + } + + /* Return success */ return STATUS_SUCCESS; }

1 0

[ion] 22228: - Fix ExChangeHandle not to send NULL but the actual context to the callback function (fix by Thomas Weidenmueller <w3seek@reactos.org>) - Re-implement NtSetInformationObject based on ExChangeHandle and using ObpSetHandleAttributes as a callback. - Re-implement NtQueryObject's ObjectHandleInformation case to simply return the information that's already in HandleAttributes; there is no point in querying for it all over again. - Fix NtSetInformationObject not to allow a user-mode call
by ion＠svn.reactos.org 05 Jun '06

05 Jun '06

Author: ion Date: Mon Jun 5 04:04:36 2006 New Revision: 22228 URL: http://svn.reactos.ru/svn/reactos?rev=22228&view=rev Log: - Fix ExChangeHandle not to send NULL but the actual context to the callback function (fix by Thomas Weidenmueller <w3seek(a)reactos.org>) - Re-implement NtSetInformationObject based on ExChangeHandle and using ObpSetHandleAttributes as a callback. - Re-implement NtQueryObject's ObjectHandleInformation case to simply return the information that's already in HandleAttributes; there is no point in querying for it all over again. - Fix NtSetInformationObject not to allow a user-mode call to modify kernel-mdoe handle attributes. Add FIXME for Inheritance permissions check. - Fix NtQueryObject to properly return OBJ_PERMANENT and OBJ_EXCLUSIVE; these flags are not stored in Handle Attributes. - Fix NtQueryObject not to attempt referencing the handle if the caller specified AllTypesInformation, because then a handle is not needed. Modified: trunk/reactos/ntoskrnl/ex/handle.c trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/oblife.c Modified: trunk/reactos/ntoskrnl/ex/handle.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ex/handle.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ex/handle.c (original) +++ trunk/reactos/ntoskrnl/ex/handle.c Mon Jun 5 04:04:36 2006 @@ -916,7 +916,7 @@ { Ret = ChangeHandleCallback(HandleTable, HandleTableEntry, - NULL); + Context); ExUnlockHandleTableEntry(HandleTable, HandleTableEntry); Modified: trunk/reactos/ntoskrnl/include/internal/ob.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/include/internal/o… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ob.h Mon Jun 5 04:04:36 2006 @@ -8,6 +8,12 @@ #ifndef __INCLUDE_INTERNAL_OBJMGR_H #define __INCLUDE_INTERNAL_OBJMGR_H + +typedef struct _OBP_SET_HANDLE_ATTRIBUTES_CONTEXT +{ + KPROCESSOR_MODE PreviousMode; + OBJECT_HANDLE_ATTRIBUTE_INFORMATION Information; +} OBP_SET_HANDLE_ATTRIBUTES_CONTEXT, *POBP_SET_HANDLE_ATTRIBUTES_CONTEXT; #define GENERIC_ACCESS (GENERIC_READ | \ GENERIC_WRITE | \ @@ -100,18 +106,12 @@ IN PVOID Insert ); -NTSTATUS -NTAPI -ObpQueryHandleAttributes( - HANDLE Handle, - POBJECT_HANDLE_ATTRIBUTE_INFORMATION HandleInfo -); - -NTSTATUS +BOOLEAN NTAPI ObpSetHandleAttributes( - HANDLE Handle, - POBJECT_HANDLE_ATTRIBUTE_INFORMATION HandleInfo + IN PHANDLE_TABLE HandleTable, + IN OUT PHANDLE_TABLE_ENTRY HandleTableEntry, + IN PVOID Context ); NTSTATUS 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 Mon Jun 5 04:04:36 2006 @@ -154,129 +154,51 @@ } } -NTSTATUS +BOOLEAN NTAPI -ObpQueryHandleAttributes(HANDLE Handle, - POBJECT_HANDLE_ATTRIBUTE_INFORMATION HandleInfo) -{ - PHANDLE_TABLE_ENTRY HandleTableEntry; - PEPROCESS Process, CurrentProcess; - KAPC_STATE ApcState; - BOOLEAN AttachedToProcess = FALSE; - NTSTATUS Status = STATUS_SUCCESS; - - PAGED_CODE(); - - DPRINT("ObpQueryHandleAttributes(Handle %p)\n", Handle); - CurrentProcess = PsGetCurrentProcess(); - - KeEnterCriticalRegion(); - - if(ObIsKernelHandle(Handle, ExGetPreviousMode())) - { - Process = PsInitialSystemProcess; - Handle = ObKernelHandleToHandle(Handle); - - if (Process != CurrentProcess) - { - KeStackAttachProcess(&Process->Pcb, - &ApcState); - AttachedToProcess = TRUE; - } - } - else - { - Process = CurrentProcess; - } - - HandleTableEntry = ExMapHandleToPointer(Process->ObjectTable, - Handle); - if (HandleTableEntry != NULL) - { - HandleInfo->Inherit = (HandleTableEntry->ObAttributes & EX_HANDLE_ENTRY_INHERITABLE) != 0; - HandleInfo->ProtectFromClose = (HandleTableEntry->ObAttributes & EX_HANDLE_ENTRY_PROTECTFROMCLOSE) != 0; - - ExUnlockHandleTableEntry(Process->ObjectTable, - HandleTableEntry); - } - else - Status = STATUS_INVALID_HANDLE; - - if (AttachedToProcess) - { - KeUnstackDetachProcess(&ApcState); - } - - KeLeaveCriticalRegion(); - - return Status; -} - -NTSTATUS -NTAPI -ObpSetHandleAttributes(HANDLE Handle, - POBJECT_HANDLE_ATTRIBUTE_INFORMATION HandleInfo) -{ - PHANDLE_TABLE_ENTRY HandleTableEntry; - PEPROCESS Process, CurrentProcess; - KAPC_STATE ApcState; - BOOLEAN AttachedToProcess = FALSE; - NTSTATUS Status = STATUS_SUCCESS; - - PAGED_CODE(); - - DPRINT("ObpSetHandleAttributes(Handle %p)\n", Handle); - CurrentProcess = PsGetCurrentProcess(); - - KeEnterCriticalRegion(); - - if(ObIsKernelHandle(Handle, ExGetPreviousMode())) - { - Process = PsInitialSystemProcess; - Handle = ObKernelHandleToHandle(Handle); - - if (Process != CurrentProcess) - { - KeStackAttachProcess(&Process->Pcb, - &ApcState); - AttachedToProcess = TRUE; - } - } - else - { - Process = CurrentProcess; - } - - HandleTableEntry = ExMapHandleToPointer(Process->ObjectTable, - Handle); - if (HandleTableEntry != NULL) - { - if (HandleInfo->Inherit) - HandleTableEntry->ObAttributes |= EX_HANDLE_ENTRY_INHERITABLE; - else - HandleTableEntry->ObAttributes &= ~EX_HANDLE_ENTRY_INHERITABLE; - - if (HandleInfo->ProtectFromClose) - HandleTableEntry->ObAttributes |= EX_HANDLE_ENTRY_PROTECTFROMCLOSE; - else - HandleTableEntry->ObAttributes &= ~EX_HANDLE_ENTRY_PROTECTFROMCLOSE; - - /* FIXME: Do we need to set anything in the object header??? */ - - ExUnlockHandleTableEntry(Process->ObjectTable, - HandleTableEntry); - } - else - Status = STATUS_INVALID_HANDLE; - - if (AttachedToProcess) - { - KeUnstackDetachProcess(&ApcState); - } - - KeLeaveCriticalRegion(); - - return Status; +ObpSetHandleAttributes(IN PHANDLE_TABLE HandleTable, + IN OUT PHANDLE_TABLE_ENTRY HandleTableEntry, + IN PVOID Context) +{ + POBP_SET_HANDLE_ATTRIBUTES_CONTEXT SetHandleInfo = + (POBP_SET_HANDLE_ATTRIBUTES_CONTEXT)Context; + POBJECT_HEADER ObjectHeader = EX_HTE_TO_HDR(HandleTableEntry); + PAGED_CODE(); + + /* Don't allow operations on kernel objects */ + if ((ObjectHeader->Flags & OB_FLAG_KERNEL_MODE) && + (SetHandleInfo->PreviousMode != KernelMode)) + { + /* Fail */ + return FALSE; + } + + /* Check if making the handle inheritable */ + if (SetHandleInfo->Information.Inherit) + { + /* Set the flag. FIXME: Need to check if this is allowed */ + HandleTableEntry->ObAttributes |= EX_HANDLE_ENTRY_INHERITABLE; + } + else + { + /* Otherwise this implies we're removing the flag */ + HandleTableEntry->ObAttributes &= ~EX_HANDLE_ENTRY_INHERITABLE; + } + + /* Check if making the handle protected */ + if (SetHandleInfo->Information.ProtectFromClose) + { + /* Set the flag */ + HandleTableEntry->ObAttributes |= EX_HANDLE_ENTRY_PROTECTFROMCLOSE; + } + else + { + /* Otherwise, remove it */ + HandleTableEntry->ObAttributes &= ~EX_HANDLE_ENTRY_PROTECTFROMCLOSE; + } + + /* Return success */ + return TRUE; } static NTSTATUS Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c Mon Jun 5 04:04:36 2006 @@ -790,95 +790,157 @@ OUT PULONG ResultLength OPTIONAL) { OBJECT_HANDLE_INFORMATION HandleInfo; - POBJECT_HEADER ObjectHeader; + POBJECT_HEADER ObjectHeader = NULL; + POBJECT_HANDLE_ATTRIBUTE_INFORMATION HandleFlags; + POBJECT_BASIC_INFORMATION BasicInfo; ULONG InfoLength; - PVOID Object; + PVOID Object = NULL; NTSTATUS Status; PAGED_CODE(); - Status = ObReferenceObjectByHandle(ObjectHandle, - 0, - NULL, - KeGetPreviousMode(), - &Object, - &HandleInfo); - if (!NT_SUCCESS (Status)) return Status; - - ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); - + /* FIXME: Needs SEH */ + + /* + * Make sure this isn't a generic type query, since the caller doesn't + * have to give a handle for it + */ + if (ObjectInformationClass != ObjectAllTypesInformation) + { + /* Reference the object */ + Status = ObReferenceObjectByHandle(ObjectHandle, + 0, + NULL, + KeGetPreviousMode(), + &Object, + &HandleInfo); + if (!NT_SUCCESS (Status)) return Status; + + /* Get the object header */ + ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); + } + + /* Check the information class */ switch (ObjectInformationClass) { - case ObjectBasicInformation: - InfoLength = sizeof(OBJECT_BASIC_INFORMATION); - if (Length != sizeof(OBJECT_BASIC_INFORMATION)) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - } - else - { - POBJECT_BASIC_INFORMATION BasicInfo; - + /* Basic info */ + case ObjectBasicInformation: + + /* Validate length */ + InfoLength = sizeof(OBJECT_BASIC_INFORMATION); + if (Length != sizeof(OBJECT_BASIC_INFORMATION)) + { + /* Fail */ + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + /* Fill out the basic information */ BasicInfo = (POBJECT_BASIC_INFORMATION)ObjectInformation; BasicInfo->Attributes = HandleInfo.HandleAttributes; BasicInfo->GrantedAccess = HandleInfo.GrantedAccess; BasicInfo->HandleCount = ObjectHeader->HandleCount; BasicInfo->PointerCount = ObjectHeader->PointerCount; + + /* Permanent/Exclusive Flags are NOT in Handle attributes! */ + if (ObjectHeader->Flags & OB_FLAG_EXCLUSIVE) + { + /* Set the flag */ + BasicInfo->Attributes |= OBJ_EXCLUSIVE; + } + if (ObjectHeader->Flags & OB_FLAG_PERMANENT) + { + /* Set the flag */ + BasicInfo->Attributes |= OBJ_PERMANENT; + } + + /* Copy quota information */ BasicInfo->PagedPoolUsage = 0; /* FIXME*/ BasicInfo->NonPagedPoolUsage = 0; /* FIXME*/ + + /* Copy name information */ BasicInfo->NameInformationLength = 0; /* FIXME*/ BasicInfo->TypeInformationLength = 0; /* FIXME*/ + + /* Copy security information */ BasicInfo->SecurityDescriptorLength = 0; /* FIXME*/ + + /* Check if this is a symlink */ if (ObjectHeader->Type == ObSymbolicLinkType) { + /* Return the creation time */ BasicInfo->CreateTime.QuadPart = ((POBJECT_SYMBOLIC_LINK)Object)->CreationTime.QuadPart; } else { + /* Otherwise return 0 */ BasicInfo->CreateTime.QuadPart = (ULONGLONG)0; } + + /* Break out with success */ Status = STATUS_SUCCESS; - } - break; - - case ObjectNameInformation: - Status = ObQueryNameString(Object, - (POBJECT_NAME_INFORMATION)ObjectInformation, - Length, - &InfoLength); - break; - - case ObjectTypeInformation: - Status = STATUS_NOT_IMPLEMENTED; - break; - - case ObjectAllTypesInformation: - Status = STATUS_NOT_IMPLEMENTED; - break; - - case ObjectHandleInformation: - InfoLength = sizeof (OBJECT_HANDLE_ATTRIBUTE_INFORMATION); - if (Length != sizeof (OBJECT_HANDLE_ATTRIBUTE_INFORMATION)) - { - Status = STATUS_INFO_LENGTH_MISMATCH; - } - else - { - Status = ObpQueryHandleAttributes( - ObjectHandle, - (POBJECT_HANDLE_ATTRIBUTE_INFORMATION)ObjectInformation); - } - break; - - default: - Status = STATUS_INVALID_INFO_CLASS; - break; - } - - ObDereferenceObject (Object); - - if (ResultLength != NULL) *ResultLength = InfoLength; - + break; + + /* Name information */ + case ObjectNameInformation: + + /* Call the helper and break out */ + Status = ObQueryNameString(Object, + (POBJECT_NAME_INFORMATION) + ObjectInformation, + Length, + &InfoLength); + break; + + /* Information about this type */ + case ObjectTypeInformation: + DPRINT1("NOT IMPLEMENTED!\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + + /* Information about all types */ + case ObjectAllTypesInformation: + DPRINT1("NOT IMPLEMENTED!\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + + /* Information about the handle flags */ + case ObjectHandleInformation: + + /* Validate length */ + InfoLength = sizeof (OBJECT_HANDLE_ATTRIBUTE_INFORMATION); + if (Length != sizeof (OBJECT_HANDLE_ATTRIBUTE_INFORMATION)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + /* Get the structure */ + HandleFlags = (POBJECT_HANDLE_ATTRIBUTE_INFORMATION) + ObjectInformation; + + /* Set the flags */ + HandleFlags->Inherit = (HandleInfo.HandleAttributes & + EX_HANDLE_ENTRY_INHERITABLE) != 0; + HandleFlags->ProtectFromClose = (HandleInfo.HandleAttributes & + EX_HANDLE_ENTRY_PROTECTFROMCLOSE) != 0; + + /* Break out with success */ + Status = STATUS_SUCCESS; + break; + + /* Anything else */ + default: + /* Fail it */ + Status = STATUS_INVALID_INFO_CLASS; + break; + } + + /* Derefernece the object if we had referenced it */ + if (Object) ObDereferenceObject (Object); + + /* Return the length and status */ + if (ResultLength) *ResultLength = InfoLength; return Status; } @@ -912,29 +974,66 @@ IN PVOID ObjectInformation, IN ULONG Length) { - PVOID Object; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; + OBP_SET_HANDLE_ATTRIBUTES_CONTEXT Context; + PVOID ObjectTable; + KAPC_STATE ApcState; + BOOLEAN AttachedToProcess = FALSE; PAGED_CODE(); + /* Validate the information class */ if (ObjectInformationClass != ObjectHandleInformation) + { + /* Invalid class */ return STATUS_INVALID_INFO_CLASS; - + } + + /* Validate the length */ if (Length != sizeof (OBJECT_HANDLE_ATTRIBUTE_INFORMATION)) + { + /* Invalid length */ return STATUS_INFO_LENGTH_MISMATCH; - - Status = ObReferenceObjectByHandle(ObjectHandle, - 0, - NULL, - KeGetPreviousMode(), - &Object, - NULL); - if (!NT_SUCCESS (Status)) return Status; - - Status = ObpSetHandleAttributes(ObjectHandle, - (POBJECT_HANDLE_ATTRIBUTE_INFORMATION) - ObjectInformation); - - ObDereferenceObject (Object); + } + + /* Save the previous mode and actual information */ + Context.PreviousMode = ExGetPreviousMode(); + Context.Information = *(POBJECT_HANDLE_ATTRIBUTE_INFORMATION) + ObjectInformation; + + /* Check if this is a kernel handle */ + if (ObIsKernelHandle(ObjectHandle, Context.PreviousMode)) + { + /* Get the actual handle */ + ObjectHandle = ObKernelHandleToHandle(ObjectHandle); + ObjectTable = ObpKernelHandleTable; + + /* Check if we're not in the system process */ + if (PsGetCurrentProcess() != PsInitialSystemProcess) + { + /* Attach to it */ + KeStackAttachProcess(&PsInitialSystemProcess->Pcb, &ApcState); + AttachedToProcess = TRUE; + } + } + else + { + /* Use the current table */ + ObjectTable = PsGetCurrentProcess()->ObjectTable; + } + + /* Change the handle attributes */ + if (!ExChangeHandle(ObjectTable, + ObjectHandle, + ObpSetHandleAttributes, + &Context)) + { + /* Some failure */ + Status = STATUS_ACCESS_DENIED; + } + + /* De-attach if we were attached, and return status */ + if (AttachedToProcess) KeUnstackDetachProcess(&ApcState); return Status; } + /* EOF */

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