Ros-diffs June 2006

ros-diffs@reactos.org

19 participants
595 discussions

[greatlrd] 22252: implement datatype I32 for *printf string version we have a *printf for files as well now 29 fails in wine test msvcrt printf
by greatlrd＠svn.reactos.org 06 Jun '06

06 Jun '06

Author: greatlrd Date: Wed Jun 7 01:42:42 2006 New Revision: 22252 URL: http://svn.reactos.ru/svn/reactos?rev=22252&view=rev Log: implement datatype I32 for *printf string version we have a *printf for files as well now 29 fails in wine test msvcrt printf Modified: trunk/reactos/lib/rtl/sprintf.c trunk/reactos/lib/rtl/swprintf.c Modified: trunk/reactos/lib/rtl/sprintf.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/rtl/sprintf.c?rev=22252… ============================================================================== --- trunk/reactos/lib/rtl/sprintf.c (original) +++ trunk/reactos/lib/rtl/sprintf.c Wed Jun 7 01:42:42 2006 @@ -459,7 +459,10 @@ } else if (*fmt == 'I' && *(fmt+1) == '6' && *(fmt+2) == '4') { qualifier = *fmt; fmt += 3; - } + } else if (*fmt == 'I' && *(fmt+1) == '3' && *(fmt+2) == '2') { + qualifier = 'l'; + fmt += 3; + } /* default base */ base = 10; Modified: trunk/reactos/lib/rtl/swprintf.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/rtl/swprintf.c?rev=2225… ============================================================================== --- trunk/reactos/lib/rtl/swprintf.c (original) +++ trunk/reactos/lib/rtl/swprintf.c Wed Jun 7 01:42:42 2006 @@ -457,7 +457,10 @@ } else if (*fmt == L'I' && *(fmt+1) == L'6' && *(fmt+2) == L'4') { qualifier = *fmt; fmt += 3; - } + } else if (*fmt == L'I' && *(fmt+1) == L'3' && *(fmt+2) == L'2') { + qualifier = L'l'; + fmt += 3; + } /* default base */ base = 10;

1 0

[janderwald] 22251: tag wine 0.9.14. powrprof
by janderwald＠svn.reactos.org 06 Jun '06

06 Jun '06

Author: janderwald Date: Wed Jun 7 01:39:16 2006 New Revision: 22251 URL: http://svn.reactos.ru/svn/reactos?rev=22251&view=rev Log: tag wine 0.9.14. powrprof Added: vendor/wine/dlls/powrprof/Wine_0_9_14/ - copied from r22250, vendor/wine/dlls/powrprof/current/

1 0

[janderwald] 22250:
by janderwald＠svn.reactos.org 06 Jun '06

06 Jun '06

Author: janderwald Date: Wed Jun 7 01:32:43 2006 New Revision: 22250 URL: http://svn.reactos.ru/svn/reactos?rev=22250&view=rev Log: (empty) Added: vendor/wine/dlls/powrprof/ vendor/wine/dlls/powrprof/current/ vendor/wine/dlls/powrprof/current/dlls/ vendor/wine/dlls/powrprof/current/dlls/powrprof/ vendor/wine/dlls/powrprof/current/dlls/powrprof/powrprof.c vendor/wine/dlls/powrprof/current/dlls/powrprof/powrprof.spec Added: vendor/wine/dlls/powrprof/current/dlls/powrprof/powrprof.c URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/powrprof/current/dlls/po… ============================================================================== --- vendor/wine/dlls/powrprof/current/dlls/powrprof/powrprof.c (added) +++ vendor/wine/dlls/powrprof/current/dlls/powrprof/powrprof.c Wed Jun 7 01:32:43 2006 @@ -1,0 +1,344 @@ +/* + * Copyright (C) 2005 Benjamin Cutler + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + + +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winnt.h" +#include "winreg.h" +#include "winternl.h" +#include "powrprof.h" +#include "wine/debug.h" +#include "wine/unicode.h" + +WINE_DEFAULT_DEBUG_CHANNEL(powrprof); + +/* Notes to implementors: + * #1: The native implementation of these functions attempted to read in + * registry entries that I was unable to locate on any of the Windows + * machines I checked, but I only had desktops available, so maybe + * laptop users will have better luck. They return FNF errors because + * that's what the native DLL was returning during my tests. + * #2: These functions call NtPowerInformation but I don't know what they + * do with the results, and NtPowerInformation doesn't do much in WINE yet + * anyway. + * #3: Since I can't get several other functions working (see note #1), + * implementing these functions is going to have to wait until somebody can + * cobble together some sane test input. */ + +static const WCHAR szPowerCfgSubKey[] = { 'S', 'o', 'f', 't', 'w', 'a', 'r', 'e', + '\\', 'M', 'i', 'c', 'r', 'o', 's', 'o', 'f', 't', '\\', 'W', 'i', + 'n', 'd', 'o', 'w', 's', '\\', 'C', 'u', 'r', 'r', 'e', 'n', 't', + 'V', 'e', 'r', 's', 'i', 'o', 'n', '\\', 'C', 'o', 'n', 't', 'r', + 'o', 'l', 's', ' ', 'F', 'o', 'l', 'd', 'e', 'r', '\\', 'P', 'o', + 'w', 'e', 'r', 'C', 'f', 'g', 0 }; +static const WCHAR szSemaphoreName[] = { 'P', 'o', 'w', 'e', 'r', 'P', 'r', 'o', + 'f', 'i', 'l', 'e', 'R', 'e', 'g', 'i', 's', 't', 'r', 'y', 'S', + 'e', 'm', 'a', 'p', 'h', 'o', 'r', 'e', 0 }; +static const WCHAR szDiskMax[] = { 'D', 'i', 's', 'k', 'S', 'p', 'i', 'n', 'd', + 'o', 'w', 'n', 'M', 'a', 'x', 0 }; +static const WCHAR szDiskMin[] = { 'D', 'i', 's', 'k', 'S', 'p', 'i', 'n', 'd', + 'o', 'w', 'n', 'M', 'i', 'n', 0 }; +static const WCHAR szLastID[] = { 'L', 'a', 's', 't', 'I', 'D', 0 }; +static HANDLE PPRegSemaphore = NULL; + +NTSTATUS WINAPI CallNtPowerInformation( + POWER_INFORMATION_LEVEL InformationLevel, + PVOID lpInputBuffer, ULONG nInputBufferSize, + PVOID lpOutputBuffer, ULONG nOutputBufferSize) +{ + return NtPowerInformation(InformationLevel, lpInputBuffer, + nInputBufferSize, lpOutputBuffer, nOutputBufferSize); +} + +BOOLEAN WINAPI CanUserWritePwrScheme(VOID) +{ + HKEY hKey = NULL; + LONG r; + BOOLEAN bSuccess = TRUE; + + TRACE("()\n"); + + r = RegOpenKeyExW(HKEY_LOCAL_MACHINE, szPowerCfgSubKey, 0, KEY_READ | KEY_WRITE, &hKey); + + if (r != ERROR_SUCCESS) { + TRACE("RegOpenKeyEx failed: %ld\n", r); + bSuccess = FALSE; + } + + SetLastError(r); + RegCloseKey(hKey); + return bSuccess; +} + +BOOLEAN WINAPI DeletePwrScheme(UINT uiIndex) +{ + /* FIXME: See note #1 */ + FIXME("(%d) stub!\n", uiIndex); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; +} + +BOOLEAN WINAPI EnumPwrSchemes(PWRSCHEMESENUMPROC lpfnPwrSchemesEnumProc, + LPARAM lParam) +{ + /* FIXME: See note #1 */ + FIXME("(%p, %ld) stub!\n", lpfnPwrSchemesEnumProc, lParam); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; +} + +BOOLEAN WINAPI GetActivePwrScheme(PUINT puiID) +{ + /* FIXME: See note #1 */ + FIXME("(%p) stub!\n", puiID); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; +} + +BOOLEAN WINAPI GetCurrentPowerPolicies( + PGLOBAL_POWER_POLICY pGlobalPowerPolicy, + PPOWER_POLICY pPowerPolicy) +{ + /* FIXME: See note #2 */ + SYSTEM_POWER_POLICY ACPower, DCPower; + + FIXME("(%p, %p) stub!\n", pGlobalPowerPolicy, pPowerPolicy); + + NtPowerInformation(SystemPowerPolicyAc, 0, 0, &ACPower, sizeof(SYSTEM_POWER_POLICY)); + NtPowerInformation(SystemPowerPolicyDc, 0, 0, &DCPower, sizeof(SYSTEM_POWER_POLICY)); + + return FALSE; +} + +BOOLEAN WINAPI GetPwrCapabilities( + PSYSTEM_POWER_CAPABILITIES lpSystemPowerCapabilities) +{ + NTSTATUS r; + + TRACE("(%p)\n", lpSystemPowerCapabilities); + + r = NtPowerInformation(SystemPowerCapabilities, 0, 0, lpSystemPowerCapabilities, sizeof(SYSTEM_POWER_CAPABILITIES)); + + SetLastError(RtlNtStatusToDosError(r)); + + return r == STATUS_SUCCESS; +} + +BOOLEAN WINAPI GetPwrDiskSpindownRange(PUINT RangeMax, PUINT RangeMin) +{ + HKEY hKey; + BYTE lpValue[40]; + LONG r; + DWORD cbValue = sizeof(lpValue); + + TRACE("(%p, %p)\n", RangeMax, RangeMin); + + if (RangeMax == NULL || RangeMin == NULL) { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + SetLastError(ERROR_SUCCESS); + + WaitForSingleObject(PPRegSemaphore, INFINITE); + + r = RegOpenKeyExW(HKEY_LOCAL_MACHINE, szPowerCfgSubKey, 0, KEY_READ, &hKey); + if (r != ERROR_SUCCESS) { + TRACE("RegOpenKeyEx failed: %ld\n", r); + TRACE("Using defaults: 3600, 3\n"); + *RangeMax = 3600; + *RangeMin = 3; + ReleaseSemaphore(PPRegSemaphore, 1, NULL); + return TRUE; + } + + r = RegQueryValueExW(hKey, szDiskMax, 0, 0, lpValue, &cbValue); + if (r != ERROR_SUCCESS) { + TRACE("Couldn't open DiskSpinDownMax: %ld\n", r); + TRACE("Using default: 3600\n"); + *RangeMax = 3600; + } else { + *RangeMax = atoiW((LPCWSTR)lpValue); + } + + cbValue = sizeof(lpValue); + + r = RegQueryValueExW(hKey, szDiskMin, 0, 0, lpValue, &cbValue); + if (r != ERROR_SUCCESS) { + TRACE("Couldn't open DiskSpinDownMin: %ld\n", r); + TRACE("Using default: 3\n"); + *RangeMin = 3; + } else { + *RangeMin = atoiW((LPCWSTR)lpValue); + } + + RegCloseKey(hKey); + + ReleaseSemaphore(PPRegSemaphore, 1, NULL); + + return TRUE; +} + +BOOLEAN WINAPI IsAdminOverrideActive(PADMINISTRATOR_POWER_POLICY p) +{ + FIXME("( %p) stub!\n", p); + return FALSE; +} + +BOOLEAN WINAPI IsPwrHibernateAllowed(VOID) +{ + /* FIXME: See note #2 */ + SYSTEM_POWER_CAPABILITIES PowerCaps; + FIXME("() stub!\n"); + NtPowerInformation(SystemPowerCapabilities, NULL, 0, &PowerCaps, sizeof(PowerCaps)); + return FALSE; +} + +BOOLEAN WINAPI IsPwrShutdownAllowed(VOID) +{ + /* FIXME: See note #2 */ + SYSTEM_POWER_CAPABILITIES PowerCaps; + FIXME("() stub!\n"); + NtPowerInformation(SystemPowerCapabilities, NULL, 0, &PowerCaps, sizeof(PowerCaps)); + return FALSE; +} + +BOOLEAN WINAPI IsPwrSuspendAllowed(VOID) +{ + /* FIXME: See note #2 */ + SYSTEM_POWER_CAPABILITIES PowerCaps; + FIXME("() stub!\n"); + NtPowerInformation(SystemPowerCapabilities, NULL, 0, &PowerCaps, sizeof(PowerCaps)); + return FALSE; +} + +BOOLEAN WINAPI ReadGlobalPwrPolicy(PGLOBAL_POWER_POLICY pGlobalPowerPolicy) +{ + /* FIXME: See note #1 */ + FIXME("(%p) stub!\n", pGlobalPowerPolicy); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; +} + +BOOLEAN WINAPI ReadProcessorPwrScheme(UINT uiID, + PMACHINE_PROCESSOR_POWER_POLICY pMachineProcessorPowerPolicy) +{ + /* FIXME: See note #1 */ + FIXME("(%d, %p) stub!\n", uiID, pMachineProcessorPowerPolicy); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; +} + +BOOLEAN WINAPI ReadPwrScheme(UINT uiID, + PPOWER_POLICY pPowerPolicy) +{ + /* FIXME: See note #1 */ + FIXME("(%d, %p) stub!\n", uiID, pPowerPolicy); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; +} + +BOOLEAN WINAPI SetActivePwrScheme(UINT uiID, + PGLOBAL_POWER_POLICY lpGlobalPowerPolicy, + PPOWER_POLICY lpPowerPolicy) +{ + /* FIXME: See note #1 */ + FIXME("(%d, %p, %p) stub!\n", uiID, lpGlobalPowerPolicy, lpPowerPolicy); + SetLastError(ERROR_FILE_NOT_FOUND); + return FALSE; +} + +BOOLEAN WINAPI SetSuspendState(BOOLEAN Hibernate, BOOLEAN ForceCritical, + BOOLEAN DisableWakeEvent) +{ + /* FIXME: I have NO idea how you're supposed to call NtInitiatePowerAction + * here, because it's not a documented function that I can find */ + FIXME("(%d, %d, %d) stub!\n", Hibernate, ForceCritical, DisableWakeEvent); + return TRUE; +} + +BOOLEAN WINAPI WriteGlobalPwrPolicy(PGLOBAL_POWER_POLICY pGlobalPowerPolicy) +{ + /* FIXME: See note #3 */ + FIXME("(%p) stub!\n", pGlobalPowerPolicy); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOLEAN WINAPI WriteProcessorPwrScheme(UINT ID, + PMACHINE_PROCESSOR_POWER_POLICY pMachineProcessorPowerPolicy) +{ + /* FIXME: See note #3 */ + FIXME("(%d, %p) stub!\n", ID, pMachineProcessorPowerPolicy); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOLEAN WINAPI WritePwrScheme(PUINT puiID, LPWSTR lpszName, LPWSTR lpszDescription, + PPOWER_POLICY pPowerPolicy) +{ + /* FIXME: See note #3 */ + FIXME("(%p, %s, %s, %p) stub!\n", puiID, debugstr_w(lpszName), debugstr_w(lpszDescription), pPowerPolicy); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + FIXME("(%p, %ld, %p) not fully implemented\n", hinstDLL, fdwReason, lpvReserved); + + switch(fdwReason) { + case DLL_PROCESS_ATTACH: { + + HKEY hKey; + LONG r; + + DisableThreadLibraryCalls(hinstDLL); + + r = RegOpenKeyExW(HKEY_LOCAL_MACHINE, szPowerCfgSubKey, 0, KEY_READ | KEY_WRITE, &hKey); + + if (r != ERROR_SUCCESS) { + TRACE("Couldn't open registry key HKLM\\%s, using some sane(?) defaults\n", debugstr_w(szPowerCfgSubKey)); + } else { + BYTE lpValue[40]; + DWORD cbValue = sizeof(lpValue); + r = RegQueryValueExW(hKey, szLastID, 0, 0, lpValue, &cbValue); + if (r != ERROR_SUCCESS) { + TRACE("Couldn't open registry entry HKLM\\%s\\LastID, using some sane(?) defaults\n", debugstr_w(szPowerCfgSubKey)); + } + RegCloseKey(hKey); + } + + PPRegSemaphore = CreateSemaphoreW(NULL, 1, 1, szSemaphoreName); + if (PPRegSemaphore == NULL) { + ERR("Couldn't create Semaphore: %ld\n", GetLastError()); + return FALSE; + } + break; + } + case DLL_PROCESS_DETACH: + CloseHandle(PPRegSemaphore); + break; + } + return TRUE; +} Added: vendor/wine/dlls/powrprof/current/dlls/powrprof/powrprof.spec URL: http://svn.reactos.ru/svn/reactos/vendor/wine/dlls/powrprof/current/dlls/po… ============================================================================== --- vendor/wine/dlls/powrprof/current/dlls/powrprof/powrprof.spec (added) +++ vendor/wine/dlls/powrprof/current/dlls/powrprof/powrprof.spec Wed Jun 7 01:32:43 2006 @@ -1,0 +1,20 @@ +@ stdcall CallNtPowerInformation (long ptr long ptr long) +@ stdcall CanUserWritePwrScheme () +@ stdcall DeletePwrScheme (long) +@ stdcall EnumPwrSchemes (ptr long) +@ stdcall GetActivePwrScheme (ptr) +@ stdcall GetCurrentPowerPolicies (ptr ptr) +@ stdcall GetPwrCapabilities (ptr) +@ stdcall GetPwrDiskSpindownRange (ptr ptr) +@ stdcall IsAdminOverrideActive (ptr) +@ stdcall IsPwrHibernateAllowed () +@ stdcall IsPwrShutdownAllowed () +@ stdcall IsPwrSuspendAllowed () +@ stdcall ReadGlobalPwrPolicy (ptr) +@ stdcall ReadProcessorPwrScheme (long ptr) +@ stdcall ReadPwrScheme (long ptr) +@ stdcall SetActivePwrScheme (long ptr ptr) +@ stdcall SetSuspendState (long long long) +@ stdcall WriteGlobalPwrPolicy (ptr) +@ stdcall WriteProcessorPwrScheme (long ptr) +@ stdcall WritePwrScheme (ptr str str ptr)

1 0

[ion] 22249: - Formatting/name/comment/declaration/calling convention changes. - Make ObpCreateHandleTable return NTSTATUS instead of VOID, so that it can return STATUS_INSUFFIENT_RESOURCES if the handle table couldn't be allocated.
by ion＠svn.reactos.org 06 Jun '06

06 Jun '06

Author: ion Date: Wed Jun 7 01:02:55 2006 New Revision: 22249 URL: http://svn.reactos.ru/svn/reactos?rev=22249&view=rev Log: - Formatting/name/comment/declaration/calling convention changes. - Make ObpCreateHandleTable return NTSTATUS instead of VOID, so that it can return STATUS_INSUFFIENT_RESOURCES if the handle table couldn't be allocated. Modified: trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ps/process.c trunk/reactos/ntoskrnl/ps/psmgr.c 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 Wed Jun 7 01:02:55 2006 @@ -42,25 +42,33 @@ BOOLEAN NTAPI -ObpDeleteEntryDirectory(POBP_LOOKUP_CONTEXT Context); +ObpDeleteEntryDirectory( + IN POBP_LOOKUP_CONTEXT Context +); BOOLEAN NTAPI -ObpInsertEntryDirectory(IN POBJECT_DIRECTORY Parent, - IN POBP_LOOKUP_CONTEXT Context, - IN POBJECT_HEADER ObjectHeader); +ObpInsertEntryDirectory( + IN POBJECT_DIRECTORY Parent, + IN POBP_LOOKUP_CONTEXT Context, + IN POBJECT_HEADER ObjectHeader +); PVOID NTAPI -ObpLookupEntryDirectory(IN POBJECT_DIRECTORY Directory, - IN PUNICODE_STRING Name, - IN ULONG Attributes, - IN UCHAR SearchShadow, - IN POBP_LOOKUP_CONTEXT Context); - -VOID -NTAPI -ObInitSymbolicLinkImplementation(VOID); +ObpLookupEntryDirectory( + IN POBJECT_DIRECTORY Directory, + IN PUNICODE_STRING Name, + IN ULONG Attributes, + IN UCHAR SearchShadow, + IN POBP_LOOKUP_CONTEXT Context +); + +VOID +NTAPI +ObInitSymbolicLinkImplementation( + VOID +); NTSTATUS NTAPI @@ -73,21 +81,15 @@ NTSTATUS NTAPI -ObpParseDirectory( - PVOID Object, - PVOID * NextObject, - PUNICODE_STRING FullPath, - PWSTR * Path, - ULONG Attributes, - POBP_LOOKUP_CONTEXT Context -); - -VOID -NTAPI -ObCreateHandleTable( - struct _EPROCESS* Parent, - BOOLEAN Inherit, - struct _EPROCESS* Process +ObpCreateHandleTable( + IN PEPROCESS Parent, + IN PEPROCESS Process +); + +VOID +NTAPI +ObKillProcess( + IN PEPROCESS Process ); NTSTATUS @@ -137,10 +139,10 @@ ObpGetHandleCountByHandleTable(PHANDLE_TABLE HandleTable); VOID -STDCALL +NTAPI ObQueryDeviceMapInformation( - PEPROCESS Process, - PPROCESS_DEVICEMAP_INFORMATION DeviceMapInfo + IN PEPROCESS Process, + OUT PPROCESS_DEVICEMAP_INFORMATION DeviceMapInfo ); VOID @@ -149,10 +151,6 @@ IN PVOID ObjectBody, IN BOOLEAN Permanent ); - -VOID -STDCALL -ObKillProcess(PEPROCESS Process); VOID FASTCALL 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 Wed Jun 7 01:02:55 2006 @@ -323,315 +323,6 @@ return Status; } -/*++ -* @name ObpSetHandleAttributes -* -* The ObpSetHandleAttributes routine <FILLMEIN> -* -* @param HandleTable -* <FILLMEIN>. -* -* @param HandleTableEntry -* <FILLMEIN>. -* -* @param Context -* <FILLMEIN>. -* -* @return <FILLMEIN>. -* -* @remarks None. -* -*--*/ -BOOLEAN -NTAPI -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; -} - -NTSTATUS -NTAPI -ObDuplicateObject(PEPROCESS SourceProcess, - PEPROCESS TargetProcess, - HANDLE SourceHandle, - PHANDLE TargetHandle, - ACCESS_MASK DesiredAccess, - ULONG HandleAttributes, - ULONG Options) -{ - PHANDLE_TABLE_ENTRY SourceHandleEntry; - HANDLE_TABLE_ENTRY NewHandleEntry; - BOOLEAN AttachedToProcess = FALSE; - PVOID ObjectBody; - POBJECT_HEADER ObjectHeader; - ULONG NewHandleCount; - HANDLE NewTargetHandle; - PEPROCESS CurrentProcess; - KAPC_STATE ApcState; - NTSTATUS Status = STATUS_SUCCESS; - - PAGED_CODE(); - - if(SourceProcess == NULL || - ObIsKernelHandle(SourceHandle, ExGetPreviousMode())) - { - SourceProcess = PsInitialSystemProcess; - SourceHandle = ObKernelHandleToHandle(SourceHandle); - } - - CurrentProcess = PsGetCurrentProcess(); - - KeEnterCriticalRegion(); - - if (SourceProcess != CurrentProcess) - { - KeStackAttachProcess(&SourceProcess->Pcb, - &ApcState); - AttachedToProcess = TRUE; - } - SourceHandleEntry = ExMapHandleToPointer(SourceProcess->ObjectTable, - SourceHandle); - if (SourceHandleEntry == NULL) - { - if (AttachedToProcess) - { - KeUnstackDetachProcess(&ApcState); - } - - KeLeaveCriticalRegion(); - return STATUS_INVALID_HANDLE; - } - - ObjectHeader = EX_HTE_TO_HDR(SourceHandleEntry); - ObjectBody = &ObjectHeader->Body; - - NewHandleEntry.Object = SourceHandleEntry->Object; - if(HandleAttributes & OBJ_INHERIT) - NewHandleEntry.ObAttributes |= EX_HANDLE_ENTRY_INHERITABLE; - else - NewHandleEntry.ObAttributes &= ~EX_HANDLE_ENTRY_INHERITABLE; - NewHandleEntry.GrantedAccess = ((Options & DUPLICATE_SAME_ACCESS) ? - SourceHandleEntry->GrantedAccess : - DesiredAccess); - if (Options & DUPLICATE_SAME_ACCESS) - { - NewHandleEntry.GrantedAccess = SourceHandleEntry->GrantedAccess; - } - else - { - if (DesiredAccess & GENERIC_ACCESS) - { - RtlMapGenericMask(&DesiredAccess, - &ObjectHeader->Type->TypeInfo.GenericMapping); - } - NewHandleEntry.GrantedAccess = DesiredAccess; - } - - /* reference the object so it doesn't get deleted after releasing the lock - and before creating a new handle for it */ - ObReferenceObject(ObjectBody); - - /* increment the handle count of the object, it should always be >= 2 because - we're holding a handle lock to this object! if the new handle count was - 1 here, we're in big trouble... it would've been safe to increment and - check the handle count without using interlocked functions because the - entry is locked, which means the handle count can't change. */ - NewHandleCount = InterlockedIncrement(&ObjectHeader->HandleCount); - ASSERT(NewHandleCount >= 2); - - ExUnlockHandleTableEntry(SourceProcess->ObjectTable, - SourceHandleEntry); - - if (AttachedToProcess) - { - KeUnstackDetachProcess(&ApcState); - AttachedToProcess = FALSE; - } - - if (TargetProcess != CurrentProcess) - { - KeStackAttachProcess(&TargetProcess->Pcb, - &ApcState); - AttachedToProcess = TRUE; - } - - /* attempt to create the new handle */ - NewTargetHandle = ExCreateHandle(TargetProcess->ObjectTable, - &NewHandleEntry); - if (AttachedToProcess) - { - KeUnstackDetachProcess(&ApcState); - AttachedToProcess = FALSE; - } - - if (NewTargetHandle != NULL) - { - if (Options & DUPLICATE_CLOSE_SOURCE) - { - if (SourceProcess != CurrentProcess) - { - KeStackAttachProcess(&SourceProcess->Pcb, - &ApcState); - AttachedToProcess = TRUE; - } - - /* delete the source handle */ - ObpDeleteHandle(SourceHandle); - - if (AttachedToProcess) - { - KeUnstackDetachProcess(&ApcState); - } - } - - ObDereferenceObject(ObjectBody); - - *TargetHandle = NewTargetHandle; - } - else - { - /* decrement the handle count we previously incremented, but don't call the - closing procedure because we're not closing a handle! */ - if(InterlockedDecrement(&ObjectHeader->HandleCount) == 0) - { - ObDereferenceObject(ObjectBody); - } - - ObDereferenceObject(ObjectBody); - Status = STATUS_UNSUCCESSFUL; - } - - KeLeaveCriticalRegion(); - - return Status; -} - -static VOID STDCALL -SweepHandleCallback(PHANDLE_TABLE HandleTable, - PVOID Object, - ULONG GrantedAccess, - PVOID Context) -{ - POBJECT_HEADER ObjectHeader; - PVOID ObjectBody; - - PAGED_CODE(); - - ObjectHeader = EX_OBJ_TO_HDR(Object); - ObjectBody = &ObjectHeader->Body; - - ObpDecrementHandleCount(ObjectBody, PsGetCurrentProcess(), GrantedAccess); -} - -static BOOLEAN STDCALL -DuplicateHandleCallback(PHANDLE_TABLE HandleTable, - PHANDLE_TABLE_ENTRY HandleTableEntry, - PVOID Context) -{ - POBJECT_HEADER ObjectHeader; - BOOLEAN Ret = FALSE; - - PAGED_CODE(); - - Ret = (HandleTableEntry->ObAttributes & EX_HANDLE_ENTRY_INHERITABLE) != 0; - if(Ret) - { - ObjectHeader = EX_HTE_TO_HDR(HandleTableEntry); - if(InterlockedIncrement(&ObjectHeader->HandleCount) == 1) - { - ObReferenceObject(&ObjectHeader->Body); - } - } - - return Ret; -} - -VOID -NTAPI -ObCreateHandleTable(PEPROCESS Parent, - BOOLEAN Inherit, - PEPROCESS Process) - /* - * FUNCTION: Creates a handle table for a process - * ARGUMENTS: - * Parent = Parent process (or NULL if this is the first process) - * Inherit = True if the process should inherit its parent's handles - * Process = Process whose handle table is to be created - */ -{ - PAGED_CODE(); - - DPRINT("ObCreateHandleTable(Parent %x, Inherit %d, Process %x)\n", - Parent,Inherit,Process); - if(Parent != NULL) - { - Process->ObjectTable = ExDupHandleTable(Process, - DuplicateHandleCallback, - NULL, - Parent->ObjectTable); - } - else - { - Process->ObjectTable = ExCreateHandleTable(Process); - } -} - - -VOID -STDCALL -ObKillProcess(PEPROCESS Process) -{ - PAGED_CODE(); - - /* FIXME - Temporary hack: sweep and destroy here, needs to be fixed!!! */ - ExSweepHandleTable(Process->ObjectTable, - SweepHandleCallback, - Process); - ExDestroyHandleTable(Process->ObjectTable); - Process->ObjectTable = NULL; -} - - NTSTATUS NTAPI ObpCreateHandle(PVOID ObjectBody, @@ -730,6 +421,321 @@ } return STATUS_UNSUCCESSFUL; +} + +/*++ +* @name ObpSetHandleAttributes +* +* The ObpSetHandleAttributes routine <FILLMEIN> +* +* @param HandleTable +* <FILLMEIN>. +* +* @param HandleTableEntry +* <FILLMEIN>. +* +* @param Context +* <FILLMEIN>. +* +* @return <FILLMEIN>. +* +* @remarks None. +* +*--*/ +BOOLEAN +NTAPI +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; +} + +VOID +NTAPI +ObpCloseHandleCallback(IN PHANDLE_TABLE HandleTable, + IN PVOID Object, + IN ULONG GrantedAccess, + IN PVOID Context) +{ + PAGED_CODE(); + + /* Simply decrement the handle count */ + ObpDecrementHandleCount(&EX_OBJ_TO_HDR(Object)->Body, + PsGetCurrentProcess(), + GrantedAccess); +} + +BOOLEAN +NTAPI +ObpDuplicateHandleCallback(IN PHANDLE_TABLE HandleTable, + IN PHANDLE_TABLE_ENTRY HandleTableEntry, + IN PVOID Context) +{ + POBJECT_HEADER ObjectHeader; + BOOLEAN Ret = FALSE; + PAGED_CODE(); + + /* Make sure that the handle is inheritable */ + Ret = (HandleTableEntry->ObAttributes & EX_HANDLE_ENTRY_INHERITABLE) != 0; + if(Ret) + { + /* Get the object header and increment the handle and pointer counts */ + ObjectHeader = EX_HTE_TO_HDR(HandleTableEntry); + InterlockedIncrement(&ObjectHeader->HandleCount); + InterlockedIncrement(&ObjectHeader->PointerCount); + } + + /* Return duplication result */ + return Ret; +} + +NTSTATUS +NTAPI +ObpCreateHandleTable(IN PEPROCESS Parent, + IN PEPROCESS Process) +{ + PHANDLE_TABLE HandleTable; + PAGED_CODE(); + + /* Check if we have a parent */ + if (Parent) + { + /* Duplicate the parent's */ + HandleTable = ExDupHandleTable(Process, + ObpDuplicateHandleCallback, + NULL, + Parent->ObjectTable); + } + else + { + /* Create a new one */ + HandleTable = ExCreateHandleTable(Process); + } + + /* Now write it and make sure we got one */ + Process->ObjectTable = HandleTable; + if (!HandleTable) return STATUS_INSUFFICIENT_RESOURCES; + + /* If we got here then the table was created OK */ + return STATUS_SUCCESS; +} + +VOID +NTAPI +ObKillProcess(IN PEPROCESS Process) +{ + PAGED_CODE(); + + /* Enter a critical region */ + KeEnterCriticalRegion(); + + /* Sweep the handle table to close all handles */ + ExSweepHandleTable(Process->ObjectTable, + ObpCloseHandleCallback, + Process); + + /* Destroy the table and leave the critical region */ + ExDestroyHandleTable(Process->ObjectTable); + KeLeaveCriticalRegion(); + + /* Clear the object table */ + Process->ObjectTable = NULL; +} + +NTSTATUS +NTAPI +ObDuplicateObject(PEPROCESS SourceProcess, + PEPROCESS TargetProcess, + HANDLE SourceHandle, + PHANDLE TargetHandle, + ACCESS_MASK DesiredAccess, + ULONG HandleAttributes, + ULONG Options) +{ + PHANDLE_TABLE_ENTRY SourceHandleEntry; + HANDLE_TABLE_ENTRY NewHandleEntry; + BOOLEAN AttachedToProcess = FALSE; + PVOID ObjectBody; + POBJECT_HEADER ObjectHeader; + ULONG NewHandleCount; + HANDLE NewTargetHandle; + PEPROCESS CurrentProcess; + KAPC_STATE ApcState; + NTSTATUS Status = STATUS_SUCCESS; + + PAGED_CODE(); + + if(SourceProcess == NULL || + ObIsKernelHandle(SourceHandle, ExGetPreviousMode())) + { + SourceProcess = PsInitialSystemProcess; + SourceHandle = ObKernelHandleToHandle(SourceHandle); + } + + CurrentProcess = PsGetCurrentProcess(); + + KeEnterCriticalRegion(); + + if (SourceProcess != CurrentProcess) + { + KeStackAttachProcess(&SourceProcess->Pcb, + &ApcState); + AttachedToProcess = TRUE; + } + SourceHandleEntry = ExMapHandleToPointer(SourceProcess->ObjectTable, + SourceHandle); + if (SourceHandleEntry == NULL) + { + if (AttachedToProcess) + { + KeUnstackDetachProcess(&ApcState); + } + + KeLeaveCriticalRegion(); + return STATUS_INVALID_HANDLE; + } + + ObjectHeader = EX_HTE_TO_HDR(SourceHandleEntry); + ObjectBody = &ObjectHeader->Body; + + NewHandleEntry.Object = SourceHandleEntry->Object; + if(HandleAttributes & OBJ_INHERIT) + NewHandleEntry.ObAttributes |= EX_HANDLE_ENTRY_INHERITABLE; + else + NewHandleEntry.ObAttributes &= ~EX_HANDLE_ENTRY_INHERITABLE; + NewHandleEntry.GrantedAccess = ((Options & DUPLICATE_SAME_ACCESS) ? + SourceHandleEntry->GrantedAccess : + DesiredAccess); + if (Options & DUPLICATE_SAME_ACCESS) + { + NewHandleEntry.GrantedAccess = SourceHandleEntry->GrantedAccess; + } + else + { + if (DesiredAccess & GENERIC_ACCESS) + { + RtlMapGenericMask(&DesiredAccess, + &ObjectHeader->Type->TypeInfo.GenericMapping); + } + NewHandleEntry.GrantedAccess = DesiredAccess; + } + + /* reference the object so it doesn't get deleted after releasing the lock + and before creating a new handle for it */ + ObReferenceObject(ObjectBody); + + /* increment the handle count of the object, it should always be >= 2 because + we're holding a handle lock to this object! if the new handle count was + 1 here, we're in big trouble... it would've been safe to increment and + check the handle count without using interlocked functions because the + entry is locked, which means the handle count can't change. */ + NewHandleCount = InterlockedIncrement(&ObjectHeader->HandleCount); + ASSERT(NewHandleCount >= 2); + + ExUnlockHandleTableEntry(SourceProcess->ObjectTable, + SourceHandleEntry); + + if (AttachedToProcess) + { + KeUnstackDetachProcess(&ApcState); + AttachedToProcess = FALSE; + } + + if (TargetProcess != CurrentProcess) + { + KeStackAttachProcess(&TargetProcess->Pcb, + &ApcState); + AttachedToProcess = TRUE; + } + + /* attempt to create the new handle */ + NewTargetHandle = ExCreateHandle(TargetProcess->ObjectTable, + &NewHandleEntry); + if (AttachedToProcess) + { + KeUnstackDetachProcess(&ApcState); + AttachedToProcess = FALSE; + } + + if (NewTargetHandle != NULL) + { + if (Options & DUPLICATE_CLOSE_SOURCE) + { + if (SourceProcess != CurrentProcess) + { + KeStackAttachProcess(&SourceProcess->Pcb, + &ApcState); + AttachedToProcess = TRUE; + } + + /* delete the source handle */ + ObpDeleteHandle(SourceHandle); + + if (AttachedToProcess) + { + KeUnstackDetachProcess(&ApcState); + } + } + + ObDereferenceObject(ObjectBody); + + *TargetHandle = NewTargetHandle; + } + else + { + /* decrement the handle count we previously incremented, but don't call the + closing procedure because we're not closing a handle! */ + if(InterlockedDecrement(&ObjectHeader->HandleCount) == 0) + { + ObDereferenceObject(ObjectBody); + } + + ObDereferenceObject(ObjectBody); + Status = STATUS_UNSUCCESSFUL; + } + + KeLeaveCriticalRegion(); + + return Status; } /* PUBLIC FUNCTIONS *********************************************************/ Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c (original) +++ trunk/reactos/ntoskrnl/ps/process.c Wed Jun 7 01:02:55 2006 @@ -340,7 +340,7 @@ /* Create or Clone the Handle Table */ DPRINT("Initialzing Process Handle Table\n"); - ObCreateHandleTable(pParentProcess, InheritObjectTable, Process); + ObpCreateHandleTable(pParentProcess, Process); DPRINT("Handle Table: %x\n", Process->ObjectTable); /* Set Process's Directory Base */ 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 Wed Jun 7 01:02:55 2006 @@ -303,7 +303,7 @@ process a PID */ PsInitClientIDManagment(); - ObCreateHandleTable(NULL, FALSE, PsInitialSystemProcess); + ObpCreateHandleTable(NULL, PsInitialSystemProcess); ObpKernelHandleTable = PsInitialSystemProcess->ObjectTable; CidEntry.Object = PsInitialSystemProcess;

1 0

[janderwald] 22248: add missing NtPowerInformation to def
by janderwald＠svn.reactos.org 06 Jun '06

06 Jun '06

Author: janderwald Date: Wed Jun 7 01:02:30 2006 New Revision: 22248 URL: http://svn.reactos.ru/svn/reactos?rev=22248&view=rev Log: add missing NtPowerInformation to def Modified: trunk/reactos/dll/ntdll/def/ntdll.def Modified: trunk/reactos/dll/ntdll/def/ntdll.def URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.def?rev… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.def (original) +++ trunk/reactos/dll/ntdll/def/ntdll.def Wed Jun 7 01:02:30 2006 @@ -155,6 +155,7 @@ NtOpenThreadToken@16 NtOpenTimer@12 NtPlugPlayControl@12 +NtPowerInformation@20 NtPrivilegeCheck@12 NtPrivilegedServiceAuditAlarm@20 NtPrivilegeObjectAuditAlarm@24

1 0

[greatlrd] 22247: fixing 2 more fualt in msvcrt *printf api
by greatlrd＠svn.reactos.org 06 Jun '06

06 Jun '06

Author: greatlrd Date: Tue Jun 6 16:45:05 2006 New Revision: 22247 URL: http://svn.reactos.ru/svn/reactos?rev=22247&view=rev Log: fixing 2 more fualt in msvcrt *printf api Modified: trunk/reactos/lib/rtl/sprintf.c trunk/reactos/lib/rtl/swprintf.c Modified: trunk/reactos/lib/rtl/sprintf.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/rtl/sprintf.c?rev=22247… ============================================================================== --- trunk/reactos/lib/rtl/sprintf.c (original) +++ trunk/reactos/lib/rtl/sprintf.c Tue Jun 6 16:45:05 2006 @@ -115,12 +115,12 @@ size--; } } + if (type & SPECIAL) { if (base == 16) size -= 2; - else if (base == 8) - size--; - } + + } i = 0; if ((num == 0) && (precision !=0)) tmp[i++] = '0'; @@ -141,20 +141,18 @@ *buf = sign; ++buf; } + if (type & SPECIAL) { - if (base==8) { + if (base==16) { if (buf <= end) *buf = '0'; ++buf; - } else if (base==16) { - if (buf <= end) - *buf = '0'; - ++buf; if (buf <= end) *buf = digits[33]; ++buf; } } + if (!(type & LEFT)) { while (size-- > 0) { if (buf <= end) @@ -177,6 +175,7 @@ *buf = ' '; ++buf; } + return buf; } Modified: trunk/reactos/lib/rtl/swprintf.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/rtl/swprintf.c?rev=2224… ============================================================================== --- trunk/reactos/lib/rtl/swprintf.c (original) +++ trunk/reactos/lib/rtl/swprintf.c Tue Jun 6 16:45:05 2006 @@ -115,12 +115,11 @@ size--; } } + if (type & SPECIAL) { if (base == 16) size -= 2; - else if (base == 8) - size--; - } + } i = 0; if ((num == 0) && (precision !=0)) tmp[i++] = L'0'; @@ -141,12 +140,9 @@ *buf = sign; ++buf; } + if (type & SPECIAL) { - if (base==8) { - if (buf <= end) - *buf = L'0'; - ++buf; - } else if (base==16) { + if (base==16) { if (buf <= end) *buf = L'0'; ++buf; @@ -177,6 +173,8 @@ *buf = L' '; ++buf; } + + return buf; }

1 0

[ion] 22246: - Add function documentation header to ObpDeleteHandle, comment and re-format the function, and simplify the code to reduce some code duplication. - Call the OkayToClose Procedure, if one is present, to allow the object owner a chance to disallow closing this handle. I believe this is required for properly protecting Winsta/Desktop handles (instead of using the regular protection mode, since that one can be bypassed). Thomas, get to work!
by ion＠svn.reactos.org 06 Jun '06

06 Jun '06

Author: ion Date: Tue Jun 6 10:12:09 2006 New Revision: 22246 URL: http://svn.reactos.ru/svn/reactos?rev=22246&view=rev Log: - Add function documentation header to ObpDeleteHandle, comment and re-format the function, and simplify the code to reduce some code duplication. - Call the OkayToClose Procedure, if one is present, to allow the object owner a chance to disallow closing this handle. I believe this is required for properly protecting Winsta/Desktop handles (instead of using the regular protection mode, since that one can be bypassed). Thomas, get to work! Modified: trunk/reactos/include/ndk/obtypes.h trunk/reactos/ntoskrnl/ob/obhandle.c Modified: trunk/reactos/include/ndk/obtypes.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/ndk/obtypes.h?rev=2… ============================================================================== --- trunk/reactos/include/ndk/obtypes.h (original) +++ trunk/reactos/include/ndk/obtypes.h Tue Jun 6 10:12:09 2006 @@ -230,7 +230,9 @@ typedef NTSTATUS (NTAPI *OB_OKAYTOCLOSE_METHOD)( - VOID + IN PEPROCESS Process OPTIONAL, + IN PVOID Object, + IN HANDLE Handle ); #else 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 Tue Jun 6 10:12:09 2006 @@ -241,54 +241,86 @@ ObjectType->TotalNumberOfHandles--; } -static NTSTATUS +/*++ +* @name ObpDeleteHandle +* +* The ObpDeleteHandle routine <FILLMEIN> +* +* @param Handle +* <FILLMEIN>. +* +* @return <FILLMEIN>. +* +* @remarks None. +* +*--*/ +NTSTATUS +NTAPI ObpDeleteHandle(HANDLE Handle) { PHANDLE_TABLE_ENTRY HandleEntry; PVOID Body; + POBJECT_TYPE ObjectType; POBJECT_HEADER ObjectHeader; PHANDLE_TABLE ObjectTable; ACCESS_MASK GrantedAccess; - - PAGED_CODE(); - - DPRINT("ObpDeleteHandle(Handle %p)\n",Handle); - + NTSTATUS Status = STATUS_INVALID_HANDLE; + PAGED_CODE(); + + /* + * Get the object table of the current process/ + * NOTE: We might actually be attached to the system process + */ ObjectTable = PsGetCurrentProcess()->ObjectTable; + /* Enter a critical region while touching the handle locks */ KeEnterCriticalRegion(); - HandleEntry = ExMapHandleToPointer(ObjectTable, - Handle); - if(HandleEntry != NULL) - { - if(HandleEntry->ObAttributes & EX_HANDLE_ENTRY_PROTECTFROMCLOSE) - { - ExUnlockHandleTableEntry(ObjectTable, - HandleEntry); - - KeLeaveCriticalRegion(); - - return STATUS_HANDLE_NOT_CLOSABLE; - } - + /* Get the entry for this handle */ + HandleEntry = ExMapHandleToPointer(ObjectTable, Handle); + if(HandleEntry) + { + /* Get the object data */ ObjectHeader = EX_HTE_TO_HDR(HandleEntry); + ObjectType = ObjectHeader->Type; Body = &ObjectHeader->Body; GrantedAccess = HandleEntry->GrantedAccess; - /* destroy and unlock the handle entry */ - ExDestroyHandleByEntry(ObjectTable, - HandleEntry, - Handle); - + /* Check if the object has an Okay To Close procedure */ + if (ObjectType->TypeInfo.OkayToCloseProcedure) + { + /* Call it and check if it's not letting us close it */ + if (!ObjectType->TypeInfo.OkayToCloseProcedure(PsGetCurrentProcess(), + Body, + Handle)) + { + /* Fail */ + ExUnlockHandleTableEntry(ObjectTable, HandleEntry); + KeLeaveCriticalRegion(); + return STATUS_HANDLE_NOT_CLOSABLE; + } + } + + /* The callback allowed us to close it, but does the handle itself? */ + if(HandleEntry->ObAttributes & EX_HANDLE_ENTRY_PROTECTFROMCLOSE) + { + /* Fail */ + ExUnlockHandleTableEntry(ObjectTable, HandleEntry); + KeLeaveCriticalRegion(); + return STATUS_HANDLE_NOT_CLOSABLE; + } + + /* Destroy and unlock the handle entry */ + ExDestroyHandleByEntry(ObjectTable, HandleEntry, Handle); + + /* Now decrement the handle count */ ObpDecrementHandleCount(Body, PsGetCurrentProcess(), GrantedAccess); - - KeLeaveCriticalRegion(); - - return STATUS_SUCCESS; - } + Status = STATUS_SUCCESS; + } + + /* Leave the critical region and return the status */ KeLeaveCriticalRegion(); - return STATUS_INVALID_HANDLE; + return Status; } /*++

1 0

[ion] 22245: - Documented ObpDeleteNameCheck and ObpSetPermanentObject - Added function documentation header for ObpDecrementHandleCount and ObpSetHandleAttributes - Modified ObpDecrementHandleCount to accept Process and GrantedAccess paraemters since the definition for the Close Procedure Callback requires them (and we were currently sending NULL). Also send 0 for process handle count, since we don't yet parse/support per-process handle databases. - Minor optimization: All objects have an objec
by ion＠svn.reactos.org 06 Jun '06

06 Jun '06

Author: ion Date: Tue Jun 6 09:49:28 2006 New Revision: 22245 URL: http://svn.reactos.ru/svn/reactos?rev=22245&view=rev Log: - Documented ObpDeleteNameCheck and ObpSetPermanentObject - Added function documentation header for ObpDecrementHandleCount and ObpSetHandleAttributes - Modified ObpDecrementHandleCount to accept Process and GrantedAccess paraemters since the definition for the Close Procedure Callback requires them (and we were currently sending NULL). Also send 0 for process handle count, since we don't yet parse/support per-process handle databases. - Minor optimization: All objects have an object type, don't actually check if the object has one when decrementing a handle. - Minor accounting fix: Decrement the total number of handles for the object type whose handle count is being decreased. 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 Tue Jun 6 09:49:28 2006 @@ -19,8 +19,64 @@ PHANDLE_TABLE ObpKernelHandleTable = NULL; +/* UGLY FUNCTIONS ************************************************************/ + +ULONG +NTAPI +ObpGetHandleCountByHandleTable(PHANDLE_TABLE HandleTable) +{ + return HandleTable->HandleCount; +} + +VOID +ObpGetNextHandleByProcessCount(PSYSTEM_HANDLE_TABLE_ENTRY_INFO pshi, + PEPROCESS Process, + int Count) +{ + ULONG P; + // KIRQL oldIrql; + + // pshi->HandleValue; + + /* + This will never work with ROS! M$, I guess uses 0 -> 65535. + Ros uses 0 -> 4294967295! + */ + + P = (ULONG) Process->UniqueProcessId; + pshi->UniqueProcessId = (USHORT) P; + + // KeAcquireSpinLock( &Process->HandleTable.ListLock, &oldIrql ); + + // pshi->GrantedAccess; + // pshi->Object; + // pshi->TypeIndex; + // pshi->HandleAttributes; + + // KeReleaseSpinLock( &Process->HandleTable.ListLock, oldIrql ); + + return; +} + /* PRIVATE FUNCTIONS *********************************************************/ +/*++ +* @name ObpDeleteNameCheck +* +* The ObpDeleteNameCheck routine checks if a named object should be +* removed from the object directory namespace. +* +* @param Object +* Pointer to the object to check for possible removal. +* +* @return None. +* +* @remarks An object is removed if the following 4 criteria are met: +* 1) The object has 0 handles open +* 2) The object is in the directory namespace and has a name +* 3) The object is not permanent +* +*--*/ VOID NTAPI ObpDeleteNameCheck(IN PVOID Object) @@ -88,17 +144,19 @@ /*++ * @name ObpSetPermanentObject * -* The ObpSetPermanentObject routine <FILLMEIN> +* The ObpSetPermanentObject routine makes an sets or clears the permanent +* flag of an object, thus making it either permanent or temporary. * * @param ObjectBody -* <FILLMEIN> +* Pointer to the object to make permanent or temporary. * * @param Permanent -* <FILLMEIN> +* Flag specifying which operation to perform. * * @return None. * -* @remarks None. +* @remarks If the object is being made temporary, then it will be checked +* as a candidate for immediate removal from the namespace. * *--*/ VOID @@ -125,63 +183,133 @@ } } -ULONG +/*++ +* @name ObpDecrementHandleCount +* +* The ObpDecrementHandleCount routine <FILLMEIN> +* +* @param ObjectBody +* <FILLMEIN>. +* +* @param Process +* <FILLMEIN>. +* +* @param GrantedAccess +* <FILLMEIN>. +* +* @return None. +* +* @remarks None. +* +*--*/ +VOID NTAPI -ObpGetHandleCountByHandleTable(PHANDLE_TABLE HandleTable) -{ - return HandleTable->HandleCount; -} - -VOID -ObpGetNextHandleByProcessCount(PSYSTEM_HANDLE_TABLE_ENTRY_INFO pshi, - PEPROCESS Process, - int Count) -{ - ULONG P; - // KIRQL oldIrql; - - // pshi->HandleValue; - - /* - This will never work with ROS! M$, I guess uses 0 -> 65535. - Ros uses 0 -> 4294967295! - */ - - P = (ULONG) Process->UniqueProcessId; - pshi->UniqueProcessId = (USHORT) P; - - // KeAcquireSpinLock( &Process->HandleTable.ListLock, &oldIrql ); - - // pshi->GrantedAccess; - // pshi->Object; - // pshi->TypeIndex; - // pshi->HandleAttributes; - - // KeReleaseSpinLock( &Process->HandleTable.ListLock, oldIrql ); - - return; -} -static VOID -ObpDecrementHandleCount(PVOID ObjectBody) -{ - POBJECT_HEADER ObjectHeader = OBJECT_TO_OBJECT_HEADER(ObjectBody); - LONG NewHandleCount = InterlockedDecrement(&ObjectHeader->HandleCount); - DPRINT("Header: %x\n", ObjectHeader); - DPRINT("NewHandleCount: %x\n", NewHandleCount); - DPRINT("OBJECT_HEADER_TO_NAME_INFO: %x\n", OBJECT_HEADER_TO_NAME_INFO(ObjectHeader)); - - if ((ObjectHeader->Type != NULL) && - (ObjectHeader->Type->TypeInfo.CloseProcedure != NULL)) - { - /* the handle count should be decremented but we pass the previous value - to the callback */ - ObjectHeader->Type->TypeInfo.CloseProcedure(NULL, ObjectBody, 0, NewHandleCount + 1, NewHandleCount + 1); +ObpDecrementHandleCount(IN PVOID ObjectBody, + IN PEPROCESS Process, + IN ACCESS_MASK GrantedAccess) +{ + POBJECT_HEADER ObjectHeader; + POBJECT_TYPE ObjectType; + LONG SystemHandleCount, ProcessHandleCount; + + /* Get the object type and header */ + ObjectHeader = OBJECT_TO_OBJECT_HEADER(ObjectBody); + ObjectType = ObjectHeader->Type; + + /* FIXME: The process handle count should be in the Handle DB. Investigate */ + SystemHandleCount = ObjectHeader->HandleCount; + ProcessHandleCount = 0; + + /* Decrement the handle count */ + InterlockedDecrement(&ObjectHeader->HandleCount); + + /* Check if we have a close procedure */ + if (ObjectType->TypeInfo.CloseProcedure) + { + /* Call it */ + ObjectType->TypeInfo.CloseProcedure(Process, + ObjectBody, + GrantedAccess, + ProcessHandleCount, + SystemHandleCount); } /* Check if we should delete the object */ ObpDeleteNameCheck(ObjectBody); -} - + + /* Decrease the total number of handles for this type */ + ObjectType->TotalNumberOfHandles--; +} + +static NTSTATUS +ObpDeleteHandle(HANDLE Handle) +{ + PHANDLE_TABLE_ENTRY HandleEntry; + PVOID Body; + POBJECT_HEADER ObjectHeader; + PHANDLE_TABLE ObjectTable; + ACCESS_MASK GrantedAccess; + + PAGED_CODE(); + + DPRINT("ObpDeleteHandle(Handle %p)\n",Handle); + + ObjectTable = PsGetCurrentProcess()->ObjectTable; + + KeEnterCriticalRegion(); + + HandleEntry = ExMapHandleToPointer(ObjectTable, + Handle); + if(HandleEntry != NULL) + { + if(HandleEntry->ObAttributes & EX_HANDLE_ENTRY_PROTECTFROMCLOSE) + { + ExUnlockHandleTableEntry(ObjectTable, + HandleEntry); + + KeLeaveCriticalRegion(); + + return STATUS_HANDLE_NOT_CLOSABLE; + } + + ObjectHeader = EX_HTE_TO_HDR(HandleEntry); + Body = &ObjectHeader->Body; + GrantedAccess = HandleEntry->GrantedAccess; + + /* destroy and unlock the handle entry */ + ExDestroyHandleByEntry(ObjectTable, + HandleEntry, + Handle); + + ObpDecrementHandleCount(Body, PsGetCurrentProcess(), GrantedAccess); + + KeLeaveCriticalRegion(); + + return STATUS_SUCCESS; + } + KeLeaveCriticalRegion(); + return STATUS_INVALID_HANDLE; +} + +/*++ +* @name ObpSetHandleAttributes +* +* The ObpSetHandleAttributes routine <FILLMEIN> +* +* @param HandleTable +* <FILLMEIN>. +* +* @param HandleTableEntry +* <FILLMEIN>. +* +* @param Context +* <FILLMEIN>. +* +* @return <FILLMEIN>. +* +* @remarks None. +* +*--*/ BOOLEAN NTAPI ObpSetHandleAttributes(IN PHANDLE_TABLE HandleTable, @@ -227,54 +355,6 @@ /* Return success */ return TRUE; -} - -static NTSTATUS -ObpDeleteHandle(HANDLE Handle) -{ - PHANDLE_TABLE_ENTRY HandleEntry; - PVOID Body; - POBJECT_HEADER ObjectHeader; - PHANDLE_TABLE ObjectTable; - - PAGED_CODE(); - - DPRINT("ObpDeleteHandle(Handle %p)\n",Handle); - - ObjectTable = PsGetCurrentProcess()->ObjectTable; - - KeEnterCriticalRegion(); - - HandleEntry = ExMapHandleToPointer(ObjectTable, - Handle); - if(HandleEntry != NULL) - { - if(HandleEntry->ObAttributes & EX_HANDLE_ENTRY_PROTECTFROMCLOSE) - { - ExUnlockHandleTableEntry(ObjectTable, - HandleEntry); - - KeLeaveCriticalRegion(); - - return STATUS_HANDLE_NOT_CLOSABLE; - } - - ObjectHeader = EX_HTE_TO_HDR(HandleEntry); - Body = &ObjectHeader->Body; - - /* destroy and unlock the handle entry */ - ExDestroyHandleByEntry(ObjectTable, - HandleEntry, - Handle); - - ObpDecrementHandleCount(Body); - - KeLeaveCriticalRegion(); - - return STATUS_SUCCESS; - } - KeLeaveCriticalRegion(); - return STATUS_INVALID_HANDLE; } NTSTATUS @@ -448,7 +528,7 @@ ObjectHeader = EX_OBJ_TO_HDR(Object); ObjectBody = &ObjectHeader->Body; - ObpDecrementHandleCount(ObjectBody); + ObpDecrementHandleCount(ObjectBody, PsGetCurrentProcess(), GrantedAccess); } static BOOLEAN STDCALL

1 0

[ion] 22244: - Make sure callers of NtMakeTemporaryObject have DELETE privileges, otherwise they could end up illegaly killing objects (in certain situations) - Make sure callers of NtMakePermanentObject have SeCreatePermanentPrivilege. - Implement ObpDeleteNameCheck as described in Gl00my's Ob Documentation (using such documentation falls under US Reverse Engineering Law - Clean rooming). - Remove duplicated code in ObpDecrementHandleCount and ObpSetPermanentObject and have them use ObpDeleteNa
by ion＠svn.reactos.org 06 Jun '06

06 Jun '06

Author: ion Date: Tue Jun 6 08:52:08 2006 New Revision: 22244 URL: http://svn.reactos.ru/svn/reactos?rev=22244&view=rev Log: - Make sure callers of NtMakeTemporaryObject have DELETE privileges, otherwise they could end up illegaly killing objects (in certain situations) - Make sure callers of NtMakePermanentObject have SeCreatePermanentPrivilege. - Implement ObpDeleteNameCheck as described in Gl00my's Ob Documentation (using such documentation falls under US Reverse Engineering Law - Clean rooming). - Remove duplicated code in ObpDecrementHandleCount and ObpSetPermanentObject and have them use ObpDeleteNameCheck instead. - Fixes thanks to using this routine: * Name-check is now properly done. * The keep-alive reference is now deleted when going from permanent->temporary object. * The parent directory is now dereferenced and cleared when deleting the object. * The security procedure is now called to delete the SD, and the name buffer is freed. - Remove ObGetObjectHandleCount, it's not a public function. Modified: trunk/reactos/ntoskrnl/cm/registry.c trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/ob/obhandle.c 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 Tue Jun 6 08:52:08 2006 @@ -23,6 +23,7 @@ #endif #define ObGetObjectPointerCount(x) OBJECT_TO_OBJECT_HEADER(x)->PointerCount +#define ObGetObjectHandleCount(x) OBJECT_TO_OBJECT_HEADER(x)->HandleCount /* GLOBALS ******************************************************************/ 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 Tue Jun 6 08:52:08 2006 @@ -114,9 +114,11 @@ IN PVOID Context ); -ULONG -NTAPI -ObGetObjectHandleCount(PVOID Object); +VOID +NTAPI +ObpDeleteNameCheck( + IN PVOID Object +); NTSTATUS NTAPI 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 Tue Jun 6 08:52:08 2006 @@ -21,6 +21,70 @@ /* PRIVATE FUNCTIONS *********************************************************/ +VOID +NTAPI +ObpDeleteNameCheck(IN PVOID Object) +{ + POBJECT_HEADER ObjectHeader; + OBP_LOOKUP_CONTEXT Context; + POBJECT_HEADER_NAME_INFO ObjectNameInfo; + POBJECT_TYPE ObjectType; + + /* Get object structures */ + ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); + ObjectNameInfo = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader); + ObjectType = ObjectHeader->Type; + + /* + * Check if the handle count is 0, if the object is named, + * and if the object isn't a permanent object. + */ + if (!(ObjectHeader->HandleCount) && + (ObjectNameInfo) && + (ObjectNameInfo->Name.Length) && + !(ObjectHeader->Flags & OB_FLAG_PERMANENT)) + { + /* Make sure it's still inserted */ + Context.Directory = ObjectNameInfo->Directory; + Context.DirectoryLocked = TRUE; + Object = ObpLookupEntryDirectory(ObjectNameInfo->Directory, + &ObjectNameInfo->Name, + 0, + FALSE, + &Context); + if (Object) + { + /* First delete it from the directory */ + ObpDeleteEntryDirectory(&Context); + + /* Now check if we have a security callback */ + if (ObjectType->TypeInfo.SecurityRequired) + { + /* Call it */ + ObjectType->TypeInfo.SecurityProcedure(Object, + DeleteSecurityDescriptor, + 0, + NULL, + NULL, + &ObjectHeader-> + SecurityDescriptor, + ObjectType-> + TypeInfo.PoolType, + NULL); + } + + /* Free the name */ + ExFreePool(ObjectNameInfo->Name.Buffer); + RtlInitEmptyUnicodeString(&ObjectNameInfo->Name, NULL, 0); + + /* Clear the current directory and de-reference it */ + ObDereferenceObject(ObjectNameInfo->Directory); + ObDereferenceObject(Object); + ObjectNameInfo->Directory = NULL; + } + } +} + /*++ * @name ObpSetPermanentObject * @@ -43,32 +107,21 @@ IN BOOLEAN Permanent) { POBJECT_HEADER ObjectHeader; - OBP_LOOKUP_CONTEXT Context; - + + /* Get the header */ ObjectHeader = OBJECT_TO_OBJECT_HEADER(ObjectBody); - ASSERT (ObjectHeader->PointerCount > 0); if (Permanent) { + /* Set it to permanent */ ObjectHeader->Flags |= OB_FLAG_PERMANENT; } else { + /* Remove the flag */ ObjectHeader->Flags &= ~OB_FLAG_PERMANENT; - if (ObjectHeader->HandleCount == 0 && - OBJECT_HEADER_TO_NAME_INFO(ObjectHeader)->Directory) - { - /* Make sure it's still inserted */ - Context.Directory = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader)->Directory; - Context.DirectoryLocked = TRUE; - if (ObpLookupEntryDirectory(OBJECT_HEADER_TO_NAME_INFO(ObjectHeader)->Directory, - &OBJECT_HEADER_TO_NAME_INFO(ObjectHeader)->Name, - 0, - FALSE, - &Context)) - { - ObpDeleteEntryDirectory(&Context); - } - } + + /* Check if we should delete the object now */ + ObpDeleteNameCheck(ObjectBody); } } @@ -113,7 +166,6 @@ { POBJECT_HEADER ObjectHeader = OBJECT_TO_OBJECT_HEADER(ObjectBody); LONG NewHandleCount = InterlockedDecrement(&ObjectHeader->HandleCount); - OBP_LOOKUP_CONTEXT Context; DPRINT("Header: %x\n", ObjectHeader); DPRINT("NewHandleCount: %x\n", NewHandleCount); DPRINT("OBJECT_HEADER_TO_NAME_INFO: %x\n", OBJECT_HEADER_TO_NAME_INFO(ObjectHeader)); @@ -126,32 +178,8 @@ ObjectHeader->Type->TypeInfo.CloseProcedure(NULL, ObjectBody, 0, NewHandleCount + 1, NewHandleCount + 1); } - if(NewHandleCount == 0) - { - if(OBJECT_HEADER_TO_NAME_INFO(ObjectHeader) && - OBJECT_HEADER_TO_NAME_INFO(ObjectHeader)->Directory != NULL && - !(ObjectHeader->Flags & OB_FLAG_PERMANENT)) - { - /* delete the object from the namespace when the last handle got closed. - Only do this if it's actually been inserted into the namespace and - if it's not a permanent object. */ - - /* Make sure it's still inserted */ - Context.Directory = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader)->Directory; - Context.DirectoryLocked = TRUE; - if (ObpLookupEntryDirectory(OBJECT_HEADER_TO_NAME_INFO(ObjectHeader)->Directory, - &OBJECT_HEADER_TO_NAME_INFO(ObjectHeader)->Name, - 0, - FALSE, - &Context)) - { - ObpDeleteEntryDirectory(&Context); - } - } - - /* remove the keep-alive reference */ - ObDereferenceObject(ObjectBody); - } + /* Check if we should delete the object */ + ObpDeleteNameCheck(ObjectBody); } BOOLEAN @@ -593,20 +621,6 @@ } /* PUBLIC FUNCTIONS *********************************************************/ - -ULONG -NTAPI -ObGetObjectHandleCount(PVOID Object) -{ - POBJECT_HEADER Header; - - PAGED_CODE(); - - ASSERT(Object); - Header = OBJECT_TO_OBJECT_HEADER(Object); - - return Header->HandleCount; -} NTSTATUS NTAPI @@ -1162,18 +1176,18 @@ NTSTATUS Status; PAGED_CODE(); + /* Reference the object for DELETE access */ Status = ObReferenceObjectByHandle(ObjectHandle, - 0, + DELETE, NULL, KeGetPreviousMode(), &ObjectBody, NULL); if (Status != STATUS_SUCCESS) return Status; - ObpSetPermanentObject (ObjectBody, FALSE); - + /* Set it as temporary and dereference it */ + ObpSetPermanentObject(ObjectBody, FALSE); ObDereferenceObject(ObjectBody); - return STATUS_SUCCESS; } @@ -1197,20 +1211,26 @@ { PVOID ObjectBody; NTSTATUS Status; - PAGED_CODE(); - + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + PAGED_CODE(); + + /* Make sure that the caller has SeCreatePermanentPrivilege */ + Status = SeSinglePrivilegeCheck(SeCreatePermanentPrivilege, + PreviousMode); + if (!NT_SUCCESS(Status)) return STATUS_PRIVILEGE_NOT_HELD; + + /* Reference the object */ Status = ObReferenceObjectByHandle(ObjectHandle, 0, NULL, - KeGetPreviousMode(), + PreviousMode, &ObjectBody, NULL); if (Status != STATUS_SUCCESS) return Status; - ObpSetPermanentObject (ObjectBody, TRUE); - + /* Set it as permanent and dereference it */ + ObpSetPermanentObject(ObjectBody, TRUE); ObDereferenceObject(ObjectBody); - return STATUS_SUCCESS; } /* EOF */

1 0

[ion] 22243: - Fix bug in IoCreateFile which my (correct) ObReferenceObjectByHandle bugfix patch uncovered. Bootcd/installation works again.
by ion＠svn.reactos.org 06 Jun '06

06 Jun '06

Author: ion Date: Tue Jun 6 06:07:55 2006 New Revision: 22243 URL: http://svn.reactos.ru/svn/reactos?rev=22243&view=rev Log: - Fix bug in IoCreateFile which my (correct) ObReferenceObjectByHandle bugfix patch uncovered. Bootcd/installation works again. Modified: trunk/reactos/ntoskrnl/io/file.c Modified: trunk/reactos/ntoskrnl/io/file.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/io/file.c?rev=2224… ============================================================================== --- trunk/reactos/ntoskrnl/io/file.c (original) +++ trunk/reactos/ntoskrnl/io/file.c Tue Jun 6 06:07:55 2006 @@ -946,7 +946,7 @@ Status = ObReferenceObjectByHandle(LocalHandle, DesiredAccess, NULL, - AccessMode, + KernelMode, (PVOID*)&DeviceObject, NULL); ZwClose(LocalHandle);

1 0

← Newer
1
...
46
47
48
49
50
51
52
...
60
Older →

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 June 2006