Ros-diffs June 2006

ros-diffs@reactos.org

19 participants
595 discussions

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

07 Jun '06

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

1 0

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

07 Jun '06

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

1 0

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

07 Jun '06

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

1 0

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

07 Jun '06

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

1 0

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

07 Jun '06

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

1 0

[ion] 22267: - Final fixes to ObpCreateHandle that I can think of before splitting Create/Increment (might be lacking some security checks or trace/database functionality, but I haven't found any info on the latter, while the former I will stub, but I don't have the skills to imlement (ObAssignObjectSecurity)): * Honour ObjectType passed to the function and fail if it doesn't match. * Use table-based logic instead of process-based logic for Kernel vs User-mode handles (same change that's been do
by ion＠svn.reactos.org 07 Jun '06

07 Jun '06

Author: ion Date: Wed Jun 7 10:15:59 2006 New Revision: 22267 URL: http://svn.reactos.ru/svn/reactos?rev=22267&view=rev Log: - Final fixes to ObpCreateHandle that I can think of before splitting Create/Increment (might be lacking some security checks or trace/database functionality, but I haven't found any info on the latter, while the former I will stub, but I don't have the skills to imlement (ObAssignObjectSecurity)): * Honour ObjectType passed to the function and fail if it doesn't match. * Use table-based logic instead of process-based logic for Kernel vs User-mode handles (same change that's been done all over the place, since it requires only one dereference of the process object). * Do the GENERIC/MAXIMUM_ALLOWED logic directly inside the ACCESS_STATE structure. * This is where we should call the OpenProcedure (acc. to Gl00my), but this kills win32k -- investigate, #ifed out for now. * Increase the object type's number of handles as well. * Set the handle table entry's ObAttributes correctly; the old code seems to have been messing that up. * Honour the AdditionalReferences parameter and do referencing bias if requested. * Honour the ReturnedObject parameter to return the object pointer back to the caller. * Add OBTRACEing to the function. * If we failed because a handle couldn't be allocated, use the distinguied STATUS_INSUFFICIENT_RESOURCES error code instead of the generic STATUS_UNSCUCESFFUL, and backout all the changes we made by calling ObpDecrementHandleCount. 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 Wed Jun 7 10:15:59 2006 @@ -359,7 +359,7 @@ // ObOpenHandle == 1, I'm guessing this is actually the // OpenReason. Also makes sense since this function is shared // by Duplication, Creation and Opening. - IN PVOID ObjectBody, + IN PVOID Object, IN POBJECT_TYPE Type OPTIONAL, IN PACCESS_STATE AccessState, IN ULONG AdditionalReferences, @@ -369,92 +369,162 @@ OUT PHANDLE ReturnedHandle) { HANDLE_TABLE_ENTRY NewEntry; - PEPROCESS Process, CurrentProcess; + PVOID HandleTable; POBJECT_HEADER ObjectHeader; + POBJECT_TYPE ObjectType; HANDLE Handle; KAPC_STATE ApcState; BOOLEAN AttachedToProcess = FALSE; - ACCESS_MASK GrantedAccess; - - PAGED_CODE(); - - DPRINT("ObpCreateHandle(obj %p)\n",ObjectBody); - - ASSERT(ObjectBody); - - CurrentProcess = PsGetCurrentProcess(); - - ObjectHeader = OBJECT_TO_OBJECT_HEADER(ObjectBody); - - /* check that this is a valid kernel pointer */ + + /* Get the object header and type */ + ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); + ObjectType = ObjectHeader->Type; + OBTRACE("OBTRACE - %s - Creating handle for: %p. Reason: %lx. HC LC %lx %lx\n", + __FUNCTION__, + Object, + OpenReason, + ObjectHeader->HandleCount, + ObjectHeader->PointerCount); + + /* Check if the types match */ + if ((Type) && (ObjectType != Type)) + { + /* They don't; fail */ + DPRINT1("Type mismatch: %wZ, %wZ\n", &ObjectType->Name, &Type->Name); + return STATUS_OBJECT_TYPE_MISMATCH; + } + + /* Check if this is a kernel handle */ + if ((HandleAttributes & OBJ_KERNEL_HANDLE) && (AccessMode == KernelMode)) + { + /* Set the handle table */ + HandleTable = ObpKernelHandleTable; + + /* Check if we're not in the system process */ + if (PsGetCurrentProcess() != PsInitialSystemProcess) + { + /* Attach to the system process */ + KeStackAttachProcess(&PsInitialSystemProcess->Pcb, &ApcState); + AttachedToProcess = TRUE; + } + } + else + { + /* Get the current handle table */ + HandleTable = PsGetCurrentProcess()->ObjectTable; + } + + /* Convert MAXIMUM_ALLOWED to GENERIC_ALL */ + if (AccessState->RemainingDesiredAccess & MAXIMUM_ALLOWED) + { + /* Mask out MAXIMUM_ALLOWED and stick GENERIC_ALL instead */ + AccessState->RemainingDesiredAccess &= ~MAXIMUM_ALLOWED; + AccessState->RemainingDesiredAccess |= GENERIC_ALL; + } + + /* Check if we have to map the GENERIC mask */ + if (AccessState->RemainingDesiredAccess & GENERIC_ACCESS) + { + /* Map it to the correct access masks */ + RtlMapGenericMask(&AccessState->RemainingDesiredAccess, + &ObjectType->TypeInfo.GenericMapping); + } + + /* Increase the handle count */ + if(InterlockedIncrement(&ObjectHeader->HandleCount) == 1) + { + /* + * FIXME: Is really needed? Perhaps we should instead take + * advantage of the AddtionalReferences parameter to add the + * bias when required. This might be the source of the mysterious + * ReactOS bug where ObInsertObject *requires* an immediate dereference + * even in a success case. + * Whill have to think more about this when doing the Increment/Create + * split later. + */ + ObReferenceObject(Object); + } + + /* Check if we have an open procedure */ +#if 0 + if (ObjectType->TypeInfo.OpenProcedure) + { + /* Call it */ + ObjectType->TypeInfo.OpenProcedure(OpenReason, + PsGetCurrentProcess(), + Object, + AccessState-> + PreviouslyGrantedAccess, + 0); + } +#endif + + /* Increase total number of handles */ + ObjectType->TotalNumberOfHandles++; + + /* Save the object header (assert its validity too) */ ASSERT((ULONG_PTR)ObjectHeader & EX_HANDLE_ENTRY_LOCKED); - - GrantedAccess = AccessState->RemainingDesiredAccess | - AccessState->PreviouslyGrantedAccess; - if (GrantedAccess & MAXIMUM_ALLOWED) - { - GrantedAccess &= ~MAXIMUM_ALLOWED; - GrantedAccess |= GENERIC_ALL; - } - - if (GrantedAccess & GENERIC_ACCESS) - { - RtlMapGenericMask(&GrantedAccess, - &ObjectHeader->Type->TypeInfo.GenericMapping); - } - NewEntry.Object = ObjectHeader; - if(HandleAttributes & OBJ_INHERIT) - NewEntry.ObAttributes |= EX_HANDLE_ENTRY_INHERITABLE; - else - NewEntry.ObAttributes &= ~EX_HANDLE_ENTRY_INHERITABLE; - NewEntry.GrantedAccess = GrantedAccess; - - if ((HandleAttributes & OBJ_KERNEL_HANDLE) && - ExGetPreviousMode == KernelMode) - { - Process = PsInitialSystemProcess; - if (Process != CurrentProcess) - { - KeStackAttachProcess(&Process->Pcb, - &ApcState); - AttachedToProcess = TRUE; - } - } - else - { - Process = CurrentProcess; - /* mask out the OBJ_KERNEL_HANDLE attribute */ - HandleAttributes &= ~OBJ_KERNEL_HANDLE; - } - - Handle = ExCreateHandle(Process->ObjectTable, - &NewEntry); - - if (AttachedToProcess) - { - KeUnstackDetachProcess(&ApcState); - } - - if(Handle != NULL) - { + + /* Mask out the internal attributes */ + NewEntry.ObAttributes |= HandleAttributes & + (EX_HANDLE_ENTRY_PROTECTFROMCLOSE | + EX_HANDLE_ENTRY_INHERITABLE | + EX_HANDLE_ENTRY_AUDITONCLOSE); + + /* Save the access mask */ + NewEntry.GrantedAccess = AccessState->RemainingDesiredAccess | + AccessState->PreviouslyGrantedAccess; + + /* + * Create the actual handle. We'll need to do this *after* calling + * ObpIncrementHandleCount to make sure that Object Security is valid + * (specified in Gl00my documentation on Ob) + */ + OBTRACE("OBTRACE - %s - Handle Properties: [%p-%lx-%lx]\n", + __FUNCTION__, + NewEntry.Object, NewEntry.ObAttributes & 3, NewEntry.GrantedAccess); + Handle = ExCreateHandle(HandleTable, &NewEntry); + + /* Detach it needed */ + if (AttachedToProcess) KeUnstackDetachProcess(&ApcState); + + /* Check if we got a handle */ + if(Handle) + { + /* Handle extra references */ + while (AdditionalReferences--) + { + /* Increment the count */ + InterlockedIncrement(&ObjectHeader->PointerCount); + } + + /* Check if this was a kernel handle */ if (HandleAttributes & OBJ_KERNEL_HANDLE) { - /* mark the handle value */ + /* Set the kernel handle bit */ Handle = ObMarkHandleAsKernelHandle(Handle); } - if(InterlockedIncrement(&ObjectHeader->HandleCount) == 1) - { - ObReferenceObject(ObjectBody); - } - + /* Return handle and object */ *ReturnedHandle = Handle; - + if (ReturnedObject) *ReturnedObject = Object; + + /* Return success */ + OBTRACE("OBTRACE - %s - Incremented count for: %p. Reason: %lx HC LC %lx %lx\n", + __FUNCTION__, + Object, + OpenReason, + ObjectHeader->HandleCount, + ObjectHeader->PointerCount); return STATUS_SUCCESS; } - return STATUS_UNSUCCESSFUL; + /* Decrement the handle count and fail */ + ObpDecrementHandleCount(&ObjectHeader->Body, + PsGetCurrentProcess(), + NewEntry.GrantedAccess); + return STATUS_INSUFFICIENT_RESOURCES; } /*++

1 0

[ion] 22266: - Change ObpCreateHandle to the one documented and explained in the Gl00my documentation. It also fits the re-factored split create/increment model better, supports open reasons, and allows to do type-checking and extra object referencing from within one routine. - Add code to ObOpenObjectByName to detect the OpenReason. Experimental, since I'm not sure when to clear the flag.
by ion＠svn.reactos.org 07 Jun '06

07 Jun '06

Author: ion Date: Wed Jun 7 09:37:04 2006 New Revision: 22266 URL: http://svn.reactos.ru/svn/reactos?rev=22266&view=rev Log: - Change ObpCreateHandle to the one documented and explained in the Gl00my documentation. It also fits the re-factored split create/increment model better, supports open reasons, and allows to do type-checking and extra object referencing from within one routine. - Add code to ObOpenObjectByName to detect the OpenReason. Experimental, since I'm not sure when to clear the flag. 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 Wed Jun 7 09:37:04 2006 @@ -353,17 +353,20 @@ NTSTATUS NTAPI -ObpCreateHandle(PVOID ObjectBody, - PACCESS_STATE AccessState, - ULONG HandleAttributes, - PHANDLE HandleReturn) - /* - * FUNCTION: Add a handle referencing an object - * ARGUMENTS: - * obj = Object body that the handle should refer to - * RETURNS: The created handle - * NOTE: The handle is valid only in the context of the current process - */ +ObpCreateHandle(IN OB_OPEN_REASON OpenReason, // Gloomy says this is "enables Security" if == 1. + // since this function *has* to call ObpIncrementHandleCount, + // which needs to somehow know the OpenReason, and since + // ObOpenHandle == 1, I'm guessing this is actually the + // OpenReason. Also makes sense since this function is shared + // by Duplication, Creation and Opening. + IN PVOID ObjectBody, + IN POBJECT_TYPE Type OPTIONAL, + IN PACCESS_STATE AccessState, + IN ULONG AdditionalReferences, + IN ULONG HandleAttributes, + IN KPROCESSOR_MODE AccessMode, + OUT PVOID *ReturnedObject, + OUT PHANDLE ReturnedHandle) { HANDLE_TABLE_ENTRY NewEntry; PEPROCESS Process, CurrentProcess; @@ -446,7 +449,7 @@ ObReferenceObject(ObjectBody); } - *HandleReturn = Handle; + *ReturnedHandle = Handle; return STATUS_SUCCESS; } @@ -550,11 +553,13 @@ Ret = (HandleTableEntry->ObAttributes & EX_HANDLE_ENTRY_INHERITABLE) != 0; if(Ret) { + /* Get the object header */ + ObjectHeader = EX_HTE_TO_HDR(HandleTableEntry); + /* Setup the access state */ AccessState.PreviouslyGrantedAccess = HandleTableEntry->GrantedAccess; /* Get the object header and increment the handle and pointer counts */ - ObjectHeader = EX_HTE_TO_HDR(HandleTableEntry); InterlockedIncrement(&ObjectHeader->HandleCount); InterlockedIncrement(&ObjectHeader->PointerCount); } @@ -790,9 +795,11 @@ OBJECT_CREATE_INFORMATION ObjectCreateInfo; NTSTATUS Status; OBP_LOOKUP_CONTEXT Context; + POBJECT_HEADER ObjectHeader; AUX_DATA AuxData; PGENERIC_MAPPING GenericMapping = NULL; ACCESS_STATE AccessState; + OB_OPEN_REASON OpenReason; PAGED_CODE(); /* Capture all the info */ @@ -840,10 +847,28 @@ NULL); if (!NT_SUCCESS(Status)) goto Cleanup; + /* Check if this object has create information */ + ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); + if (ObjectHeader->Flags & OB_FLAG_CREATE_INFO) + { + /* Then we are creating a new handle */ + OpenReason = ObCreateHandle; + } + else + { + /* Otherwise, we are merely opening it */ + OpenReason = ObOpenHandle; + } + /* Create the actual handle now */ - Status = ObpCreateHandle(Object, + Status = ObpCreateHandle(OpenReason, + Object, + ObjectType, PassedAccessState, + 0, ObjectCreateInfo.Attributes, + AccessMode, + NULL, Handle); Cleanup: @@ -910,9 +935,14 @@ } /* Create the handle */ - Status = ObpCreateHandle(Object, + Status = ObpCreateHandle(ObOpenHandle, + Object, + ObjectType, PassedAccessState, + 0, HandleAttributes, + AccessMode, + NULL, Handle); /* Delete the access state */ @@ -924,6 +954,7 @@ /* ROS Hack: Dereference the object and return */ ObDereferenceObject(Object); + /* Return */ OBTRACE("OBTRACE: %s returning Object with PC S: %lx %lx\n", __FUNCTION__, OBJECT_TO_OBJECT_HEADER(Object)->PointerCount, @@ -1128,12 +1159,15 @@ DPRINT("Creating handle\n"); if (Handle != NULL) { - Status = ObpCreateHandle(&Header->Body, - PassedAccessState, - ObjectCreateInfo->Attributes, - Handle); - DPRINT("handle Created: %d. refcount. handlecount %d %d\n", - *Handle, Header->PointerCount, Header->HandleCount); + Status = ObpCreateHandle(ObCreateHandle, + &Header->Body, + NULL, + PassedAccessState, + AdditionalReferences + 1, + ObjectCreateInfo->Attributes, + ExGetPreviousMode(), + NULL, + Handle); } /* We can delete the Create Info now */ @@ -1260,9 +1294,14 @@ DesiredAccess, &ObjectType->TypeInfo.GenericMapping); - Status = ObpCreateHandle(ObjectBody, + Status = ObpCreateHandle(ObDuplicateHandle, + ObjectBody, + ObjectType, PassedAccessState, + 0, HandleAttributes, + PreviousMode, + NULL, &hTarget); if (AttachedToProcess)

1 0

[ion] 22265: - Add some trace macros to monitor handle/pointer counts for fixing regressions/bugs later. - Change ObpCreateHandle to use an ACCESS_STATE structure instead of DesiredAccess. This is to help moving to an updated model where creating and incrementing a handle are 2 operations, so that code can be refactored (similarly to how we now have Delete/Decrement as 2 operations). - Fix functions that were not creating an ACCESS_STATE Structure to create one locally now, or use the one passed
by ion＠svn.reactos.org 07 Jun '06

07 Jun '06

Author: ion Date: Wed Jun 7 09:04:43 2006 New Revision: 22265 URL: http://svn.reactos.ru/svn/reactos?rev=22265&view=rev Log: - Add some trace macros to monitor handle/pointer counts for fixing regressions/bugs later. - Change ObpCreateHandle to use an ACCESS_STATE structure instead of DesiredAccess. This is to help moving to an updated model where creating and incrementing a handle are 2 operations, so that code can be refactored (similarly to how we now have Delete/Decrement as 2 operations). - Fix functions that were not creating an ACCESS_STATE Structure to create one locally now, or use the one passed as a parameter, if available. 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 Wed Jun 7 09:04:43 2006 @@ -18,6 +18,12 @@ #include <internal/debug.h> PHANDLE_TABLE ObpKernelHandleTable = NULL; + +#ifdef _OBDEBUG_ +#define OBTRACE DPRINT1 +#else +#define OBTRACE DPRINT +#endif /* UGLY FUNCTIONS ************************************************************/ @@ -215,6 +221,11 @@ /* Get the object type and header */ ObjectHeader = OBJECT_TO_OBJECT_HEADER(ObjectBody); ObjectType = ObjectHeader->Type; + OBTRACE("OBTRACE - %s - Decrementing count for: %p. HC LC %lx %lx\n", + __FUNCTION__, + ObjectBody, + ObjectHeader->HandleCount, + ObjectHeader->PointerCount); /* FIXME: The process handle count should be in the Handle DB. Investigate */ SystemHandleCount = ObjectHeader->HandleCount; @@ -239,6 +250,11 @@ /* Decrease the total number of handles for this type */ ObjectType->TotalNumberOfHandles--; + OBTRACE("OBTRACE - %s - Decremented count for: %p. HC LC %lx %lx\n", + __FUNCTION__, + ObjectBody, + ObjectHeader->HandleCount, + ObjectHeader->PointerCount); } /*++ @@ -285,6 +301,12 @@ ObjectType = ObjectHeader->Type; Body = &ObjectHeader->Body; GrantedAccess = HandleEntry->GrantedAccess; + OBTRACE("OBTRACE - %s - Deleting handle: %lx for %p. HC LC %lx %lx\n", + __FUNCTION__, + Handle, + Body, + ObjectHeader->HandleCount, + ObjectHeader->PointerCount); /* Check if the object has an Okay To Close procedure */ if (ObjectType->TypeInfo.OkayToCloseProcedure) @@ -316,6 +338,12 @@ /* Now decrement the handle count */ ObpDecrementHandleCount(Body, PsGetCurrentProcess(), GrantedAccess); Status = STATUS_SUCCESS; + OBTRACE("OBTRACE - %s - Deleted handle: %lx for %p. HC LC %lx %lx\n", + __FUNCTION__, + Handle, + Body, + ObjectHeader->HandleCount, + ObjectHeader->PointerCount); } /* Leave the critical region and return the status */ @@ -326,7 +354,7 @@ NTSTATUS NTAPI ObpCreateHandle(PVOID ObjectBody, - ACCESS_MASK GrantedAccess, + PACCESS_STATE AccessState, ULONG HandleAttributes, PHANDLE HandleReturn) /* @@ -343,6 +371,7 @@ HANDLE Handle; KAPC_STATE ApcState; BOOLEAN AttachedToProcess = FALSE; + ACCESS_MASK GrantedAccess; PAGED_CODE(); @@ -357,6 +386,8 @@ /* check that this is a valid kernel pointer */ ASSERT((ULONG_PTR)ObjectHeader & EX_HANDLE_ENTRY_LOCKED); + GrantedAccess = AccessState->RemainingDesiredAccess | + AccessState->PreviouslyGrantedAccess; if (GrantedAccess & MAXIMUM_ALLOWED) { GrantedAccess &= ~MAXIMUM_ALLOWED; @@ -512,12 +543,16 @@ { POBJECT_HEADER ObjectHeader; BOOLEAN Ret = FALSE; + ACCESS_STATE AccessState; PAGED_CODE(); /* Make sure that the handle is inheritable */ Ret = (HandleTableEntry->ObAttributes & EX_HANDLE_ENTRY_INHERITABLE) != 0; if(Ret) { + /* Setup the access state */ + AccessState.PreviouslyGrantedAccess = HandleTableEntry->GrantedAccess; + /* Get the object header and increment the handle and pointer counts */ ObjectHeader = EX_HTE_TO_HDR(HandleTableEntry); InterlockedIncrement(&ObjectHeader->HandleCount); @@ -807,7 +842,7 @@ /* Create the actual handle now */ Status = ObpCreateHandle(Object, - DesiredAccess, + PassedAccessState, ObjectCreateInfo.Attributes, Handle); @@ -825,6 +860,10 @@ Quickie: ObpReleaseCapturedAttributes(&ObjectCreateInfo); if (ObjectName.Buffer) ObpReleaseCapturedName(&ObjectName); + OBTRACE("OBTRACE: %s returning Object with PC S: %lx %lx\n", + __FUNCTION__, + OBJECT_TO_OBJECT_HEADER(Object)->PointerCount, + Status); return Status; } @@ -842,6 +881,8 @@ OUT PHANDLE Handle) { NTSTATUS Status; + ACCESS_STATE AccessState; + AUX_DATA AuxData; PAGED_CODE(); /* Reference the object */ @@ -851,14 +892,42 @@ AccessMode); if (!NT_SUCCESS(Status)) return Status; + /* Check if we didn't get an access state */ + if (!PassedAccessState) + { + /* Use our built-in access state */ + PassedAccessState = &AccessState; + Status = SeCreateAccessState(&AccessState, + &AuxData, + DesiredAccess, + &ObjectType->TypeInfo.GenericMapping); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + ObDereferenceObject(Object); + return Status; + } + } + /* Create the handle */ Status = ObpCreateHandle(Object, - DesiredAccess, + PassedAccessState, HandleAttributes, Handle); + /* Delete the access state */ + if (PassedAccessState == &AccessState) + { + SeDeleteAccessState(PassedAccessState); + } + /* ROS Hack: Dereference the object and return */ ObDereferenceObject(Object); + + OBTRACE("OBTRACE: %s returning Object with PC S: %lx %lx\n", + __FUNCTION__, + OBJECT_TO_OBJECT_HEADER(Object)->PointerCount, + Status); return Status; } @@ -915,6 +984,8 @@ SECURITY_SUBJECT_CONTEXT SubjectContext; OBP_LOOKUP_CONTEXT Context; POBJECT_HEADER_NAME_INFO ObjectNameInfo; + ACCESS_STATE AccessState; + AUX_DATA AuxData; PAGED_CODE(); /* Get the Header and Create Info */ @@ -1030,6 +1101,23 @@ DPRINT("Security Complete\n"); SeReleaseSubjectContext(&SubjectContext); + /* Check if we didn't get an access state */ + if (!PassedAccessState) + { + /* Use our built-in access state */ + PassedAccessState = &AccessState; + Status = SeCreateAccessState(&AccessState, + &AuxData, + DesiredAccess, + &Header->Type->TypeInfo.GenericMapping); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + ObDereferenceObject(Object); + return Status; + } + } + /* Create the Handle */ /* HACKHACK: Because of ROS's incorrect startup, this can be called * without a valid Process until I finalize the startup patch, @@ -1041,7 +1129,7 @@ if (Handle != NULL) { Status = ObpCreateHandle(&Header->Body, - DesiredAccess, + PassedAccessState, ObjectCreateInfo->Attributes, Handle); DPRINT("handle Created: %d. refcount. handlecount %d %d\n", @@ -1076,6 +1164,9 @@ KPROCESSOR_MODE PreviousMode; KAPC_STATE ApcState; NTSTATUS Status = STATUS_SUCCESS; + ACCESS_STATE AccessState; + AUX_DATA AuxData; + PACCESS_STATE PassedAccessState = NULL; PAGED_CODE(); @@ -1162,8 +1253,15 @@ AttachedToProcess = TRUE; } + /* Use our built-in access state */ + PassedAccessState = &AccessState; + Status = SeCreateAccessState(&AccessState, + &AuxData, + DesiredAccess, + &ObjectType->TypeInfo.GenericMapping); + Status = ObpCreateHandle(ObjectBody, - DesiredAccess, + PassedAccessState, HandleAttributes, &hTarget);

1 0

[ion] 22264: - Clone ObpCreateHandle to CmpCreateHandle. I am about to fix its implementation and since Cm* currently abuses Ob I feel it safer to give its own internal function. - Make ObpCreateHandle internal to Ob as it should be. Change NtCreateProcessTokenEx to use ObOpenObjectByPointer, it has no business manually trying to create a handle. Same goes for ExpLoadInitialProcess.
by ion＠svn.reactos.org 07 Jun '06

07 Jun '06

Author: ion Date: Wed Jun 7 05:47:33 2006 New Revision: 22264 URL: http://svn.reactos.ru/svn/reactos?rev=22264&view=rev Log: - Clone ObpCreateHandle to CmpCreateHandle. I am about to fix its implementation and since Cm* currently abuses Ob I feel it safer to give its own internal function. - Make ObpCreateHandle internal to Ob as it should be. Change NtCreateProcessTokenEx to use ObOpenObjectByPointer, it has no business manually trying to create a handle. Same goes for ExpLoadInitialProcess. Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/ps/security.c Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/cm/ntfunc.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/cm/ntfunc.c (original) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c Wed Jun 7 05:47:33 2006 @@ -29,6 +29,106 @@ FAST_MUTEX CmiCallbackLock; /* FUNCTIONS ****************************************************************/ + +NTSTATUS +NTAPI +CmpCreateHandle(PVOID ObjectBody, + ACCESS_MASK GrantedAccess, + ULONG HandleAttributes, + PHANDLE HandleReturn) + /* + * FUNCTION: Add a handle referencing an object + * ARGUMENTS: + * obj = Object body that the handle should refer to + * RETURNS: The created handle + * NOTE: The handle is valid only in the context of the current process + */ +{ + HANDLE_TABLE_ENTRY NewEntry; + PEPROCESS Process, CurrentProcess; + POBJECT_HEADER ObjectHeader; + HANDLE Handle; + KAPC_STATE ApcState; + BOOLEAN AttachedToProcess = FALSE; + + PAGED_CODE(); + + DPRINT("CmpCreateHandle(obj %p)\n",ObjectBody); + + ASSERT(ObjectBody); + + CurrentProcess = PsGetCurrentProcess(); + + ObjectHeader = OBJECT_TO_OBJECT_HEADER(ObjectBody); + + /* check that this is a valid kernel pointer */ + ASSERT((ULONG_PTR)ObjectHeader & EX_HANDLE_ENTRY_LOCKED); + + if (GrantedAccess & MAXIMUM_ALLOWED) + { + GrantedAccess &= ~MAXIMUM_ALLOWED; + GrantedAccess |= GENERIC_ALL; + } + + if (GrantedAccess & GENERIC_ACCESS) + { + RtlMapGenericMask(&GrantedAccess, + &ObjectHeader->Type->TypeInfo.GenericMapping); + } + + NewEntry.Object = ObjectHeader; + if(HandleAttributes & OBJ_INHERIT) + NewEntry.ObAttributes |= EX_HANDLE_ENTRY_INHERITABLE; + else + NewEntry.ObAttributes &= ~EX_HANDLE_ENTRY_INHERITABLE; + NewEntry.GrantedAccess = GrantedAccess; + + if ((HandleAttributes & OBJ_KERNEL_HANDLE) && + ExGetPreviousMode == KernelMode) + { + Process = PsInitialSystemProcess; + if (Process != CurrentProcess) + { + KeStackAttachProcess(&Process->Pcb, + &ApcState); + AttachedToProcess = TRUE; + } + } + else + { + Process = CurrentProcess; + /* mask out the OBJ_KERNEL_HANDLE attribute */ + HandleAttributes &= ~OBJ_KERNEL_HANDLE; + } + + Handle = ExCreateHandle(Process->ObjectTable, + &NewEntry); + + if (AttachedToProcess) + { + KeUnstackDetachProcess(&ApcState); + } + + if(Handle != NULL) + { + if (HandleAttributes & OBJ_KERNEL_HANDLE) + { + /* mark the handle value */ + Handle = ObMarkHandleAsKernelHandle(Handle); + } + + if(InterlockedIncrement(&ObjectHeader->HandleCount) == 1) + { + ObReferenceObject(ObjectBody); + } + + *HandleReturn = Handle; + + return STATUS_SUCCESS; + } + + return STATUS_UNSUCCESSFUL; +} /* * @implemented @@ -291,13 +391,13 @@ goto Cleanup; } - Status = ObpCreateHandle(Object, + Status = CmpCreateHandle(Object, DesiredAccess, ObjectCreateInfo.Attributes, &hKey); if (!NT_SUCCESS(Status)) - DPRINT1("ObpCreateHandle failed Status 0x%x\n", Status); + DPRINT1("CmpCreateHandle failed Status 0x%x\n", Status); PostCreateKeyInfo.Object = NULL; PostCreateKeyInfo.Status = Status; @@ -1361,7 +1461,7 @@ goto openkey_cleanup; } - Status = ObpCreateHandle(Object, + Status = CmpCreateHandle(Object, DesiredAccess, ObjectCreateInfo.Attributes, &hKey); Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=2226… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Wed Jun 7 05:47:33 2006 @@ -426,21 +426,9 @@ { UNICODE_STRING CurrentDirectory; UNICODE_STRING ImagePath = RTL_CONSTANT_STRING(L"\\SystemRoot\\system32\\smss.exe"); - HANDLE SystemProcessHandle; NTSTATUS Status; PRTL_USER_PROCESS_PARAMETERS Params=NULL; RTL_USER_PROCESS_INFORMATION Info; - - /* Create a handle to the process */ - Status = ObpCreateHandle(PsInitialSystemProcess, - PROCESS_CREATE_PROCESS | PROCESS_CREATE_THREAD | PROCESS_QUERY_INFORMATION, - OBJ_KERNEL_HANDLE, - &SystemProcessHandle); - if(!NT_SUCCESS(Status)) - { - DPRINT1("Failed to create a handle for the system process!\n"); - return Status; - } RtlInitUnicodeString(&CurrentDirectory, SharedUserData->NtSystemRoot); @@ -459,7 +447,6 @@ if(!NT_SUCCESS(Status)) { DPRINT1("Failed to create ppb!\n"); - ZwClose(SystemProcessHandle); return Status; } @@ -469,14 +456,13 @@ Params, NULL, NULL, - SystemProcessHandle, + NULL, FALSE, NULL, NULL, &Info); /* Close the handle and free the params */ - ZwClose(SystemProcessHandle); RtlDestroyProcessParameters(Params); if (!NT_SUCCESS(Status)) 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 05:47:33 2006 @@ -68,15 +68,6 @@ NTAPI ObInitSymbolicLinkImplementation( VOID -); - -NTSTATUS -NTAPI -ObpCreateHandle( - PVOID ObjectBody, - ACCESS_MASK GrantedAccess, - ULONG HandleAttributes, - PHANDLE Handle ); NTSTATUS Modified: trunk/reactos/ntoskrnl/ps/security.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ps/security.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/security.c (original) +++ trunk/reactos/ntoskrnl/ps/security.c Wed Jun 7 05:47:33 2006 @@ -97,10 +97,13 @@ &Token); if(NT_SUCCESS(Status)) { - Status = ObpCreateHandle(Token, - DesiredAccess, - HandleAttributes, - &hToken); + Status = ObOpenObjectByPointer(Token, + 0, + NULL, + DesiredAccess, + SepTokenObjectType, + PreviousMode, + &hToken); ObDereferenceObject(Token); if(NT_SUCCESS(Status))

1 0

[jimtabor] 22263: Quick patch.
by jimtabor＠svn.reactos.org 07 Jun '06

07 Jun '06

Author: jimtabor Date: Wed Jun 7 05:45:18 2006 New Revision: 22263 URL: http://svn.reactos.ru/svn/reactos?rev=22263&view=rev Log: Quick patch. Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/obj… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c Wed Jun 7 05:45:18 2006 @@ -3280,12 +3280,11 @@ if (!dc) { SetLastWin32Error(ERROR_INVALID_HANDLE); - } - else - { - Ret = dc->w.charExtra; - if( Set ) dc->w.charExtra = CharExtra; - } + return Ret; + } + Ret = dc->w.charExtra; + if( Set ) dc->w.charExtra = CharExtra; + DC_UnlockDc(dc); return (Ret); }

1 0

← Newer
1
...
44
45
46
47
48
49
50
...
60
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2006