Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 20807: Don't release dispatcher lock in ExpBoostThread, we want to re-acquire it instead.
by ion＠svn.reactos.org 12 Jan '06

12 Jan '06

Don't release dispatcher lock in ExpBoostThread, we want to re-acquire it instead. Modified: trunk/reactos/ntoskrnl/ex/resource.c _____ Modified: trunk/reactos/ntoskrnl/ex/resource.c --- trunk/reactos/ntoskrnl/ex/resource.c 2006-01-12 17:43:07 UTC (rev 20806) +++ trunk/reactos/ntoskrnl/ex/resource.c 2006-01-12 17:52:51 UTC (rev 20807) @@ -567,8 +567,8 @@ /* Update the kernel state */ KiSetPriorityThread(OwnerThread, 14, &Released); - /* Release Lock if needed */ - if (!Released) KeReleaseDispatcherDatabaseLockFromDpcLevel(); + /* Reacquire lock if it got releases */ + if (Released) KeAcquireDispatcherDatabaseLockFromDpcLevel(); /* Make sure we're still at dispatch */ ASSERT(KeGetCurrentIrql() >= DISPATCH_LEVEL);

1 0

[ion] 20806: Temporaily disable kernel stack deletion so head is usable again
by ion＠svn.reactos.org 12 Jan '06

12 Jan '06

Temporaily disable kernel stack deletion so head is usable again Modified: trunk/reactos/ntoskrnl/ps/kill.c _____ Modified: trunk/reactos/ntoskrnl/ps/kill.c --- trunk/reactos/ntoskrnl/ps/kill.c 2006-01-12 17:30:27 UTC (rev 20805) +++ trunk/reactos/ntoskrnl/ps/kill.c 2006-01-12 17:43:07 UTC (rev 20806) @@ -194,7 +194,7 @@ if(Thread->Tcb.Win32Thread != NULL) ExFreePool (Thread->Tcb.Win32Thread); /* Release the Kernel Stack */ - MmDeleteKernelStack((PVOID)Thread->Tcb.StackLimit, FALSE); + //MmDeleteKernelStack((PVOID)Thread->Tcb.StackLimit, FALSE); /* Dereference the Process */ ObDereferenceObject(Process);

1 0

[weiden] 20805: use a default security descriptor for the group policy events
by weiden＠svn.reactos.org 12 Jan '06

12 Jan '06

use a default security descriptor for the group policy events Modified: trunk/reactos/lib/userenv/gpolicy.c Modified: trunk/reactos/lib/userenv/internal.h Modified: trunk/reactos/lib/userenv/misc.c _____ Modified: trunk/reactos/lib/userenv/gpolicy.c --- trunk/reactos/lib/userenv/gpolicy.c 2006-01-12 06:15:21 UTC (rev 20804) +++ trunk/reactos/lib/userenv/gpolicy.c 2006-01-12 17:30:27 UTC (rev 20805) @@ -249,7 +249,7 @@ static HANDLE CreateGPEvent(IN BOOL bMachine, - IN PVOID lpSecurityDescriptor) + IN PSECURITY_DESCRIPTOR lpSecurityDescriptor) { HANDLE hEvent; SECURITY_ATTRIBUTES SecurityAttributes; @@ -258,7 +258,7 @@ SecurityAttributes.lpSecurityDescriptor = lpSecurityDescriptor; SecurityAttributes.bInheritHandle = FALSE; - hEvent = CreateEventW((lpSecurityDescriptor != NULL ? &SecurityAttributes : NULL), + hEvent = CreateEventW(&SecurityAttributes, TRUE, FALSE, (bMachine ? szMachineGPApplied : szLocalGPApplied)); @@ -271,7 +271,7 @@ IN BOOL bMachine) { PGP_NOTIFY Notify; - PVOID lpSecurityDescriptor = NULL; + PSECURITY_DESCRIPTOR lpSecurityDescriptor = NULL; BOOL Ret = FALSE; EnterCriticalSection(&GPNotifyLock); @@ -292,7 +292,11 @@ /* create or open the machine group policy event */ if (hMachineGPAppliedEvent == NULL) { - lpSecurityDescriptor = CreateDefaultSD(); + lpSecurityDescriptor = CreateDefaultSecurityDescriptor(); + if (lpSecurityDescriptor == NULL) + { + goto Cleanup; + } hMachineGPAppliedEvent = CreateGPEvent(TRUE, lpSecurityDescriptor); @@ -307,7 +311,11 @@ { if (lpSecurityDescriptor == NULL) { - lpSecurityDescriptor = CreateDefaultSD(); + lpSecurityDescriptor = CreateDefaultSecurityDescriptor(); + if (lpSecurityDescriptor == NULL) + { + goto Cleanup; + } } hLocalGPAppliedEvent = CreateGPEvent(FALSE, _____ Modified: trunk/reactos/lib/userenv/internal.h --- trunk/reactos/lib/userenv/internal.h 2006-01-12 06:15:21 UTC (rev 20804) +++ trunk/reactos/lib/userenv/internal.h 2006-01-12 17:30:27 UTC (rev 20805) @@ -77,8 +77,8 @@ GetUserSidFromToken (HANDLE hToken, PUNICODE_STRING SidString); -PVOID -CreateDefaultSD(VOID); +PSECURITY_DESCRIPTOR +CreateDefaultSecurityDescriptor(VOID); /* profile.c */ BOOL _____ Modified: trunk/reactos/lib/userenv/misc.c --- trunk/reactos/lib/userenv/misc.c 2006-01-12 06:15:21 UTC (rev 20804) +++ trunk/reactos/lib/userenv/misc.c 2006-01-12 17:30:27 UTC (rev 20805) @@ -30,6 +30,8 @@ #define NDEBUG #include <debug.h> +static SID_IDENTIFIER_AUTHORITY LocalSystemAuthority = {SECURITY_NT_AUTHORITY}; +static SID_IDENTIFIER_AUTHORITY WorldAuthority = {SECURITY_WORLD_SID_AUTHORITY}; /* FUNCTIONS ***************************************************************/ @@ -116,11 +118,149 @@ return TRUE; } -PVOID -CreateDefaultSD(VOID) +PSECURITY_DESCRIPTOR +CreateDefaultSecurityDescriptor(VOID) { - /* FIXME - create a default security descriptor */ - return NULL; + PSID LocalSystemSid = NULL; + PSID AdministratorsSid = NULL; + PSID EveryoneSid = NULL; + PACL Dacl; + DWORD DaclSize; + PSECURITY_DESCRIPTOR pSD = NULL; + + /* create the SYSTEM, Administrators and Everyone SIDs */ + if (!AllocateAndInitializeSid(&LocalSystemAuthority, + 1, + SECURITY_LOCAL_SYSTEM_RID, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + &LocalSystemSid) || + !AllocateAndInitializeSid(&LocalSystemAuthority, + 2, + SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, + 0, + 0, + 0, + 0, + 0, + 0, + &AdministratorsSid) || + !AllocateAndInitializeSid(&WorldAuthority, + 1, + SECURITY_WORLD_RID, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + &EveryoneSid)) + { + DPRINT1("Failed initializing the SIDs for the default security descriptor (0x%p, 0x%p, 0x%p)\n", + LocalSystemSid, AdministratorsSid, EveryoneSid); + goto Cleanup; + } + + /* allocate the security descriptor and DACL */ + DaclSize = sizeof(ACL) + + ((GetLengthSid(LocalSystemSid) + + GetLengthSid(AdministratorsSid) + + GetLengthSid(EveryoneSid)) + + (3 * FIELD_OFFSET(ACCESS_ALLOWED_ACE, + SidStart))); + + pSD = (PSECURITY_DESCRIPTOR)LocalAlloc(LMEM_FIXED, + (SIZE_T)DaclSize + sizeof(SECURITY_DESCRIPTOR)); + if (pSD == NULL) + { + DPRINT1("Failed to allocate the default security descriptor and ACL\n"); + goto Cleanup; + } + + if (!InitializeSecurityDescriptor(pSD, + SECURITY_DESCRIPTOR_REVISION)) + { + DPRINT1("Failed to initialize the default security descriptor\n"); + goto Cleanup; + } + + /* initialize and build the DACL */ + Dacl = (PACL)((ULONG_PTR)pSD + sizeof(SECURITY_DESCRIPTOR)); + if (!InitializeAcl(Dacl, + (DWORD)DaclSize, + ACL_REVISION)) + { + DPRINT1("Failed to initialize the DACL of the default security descriptor\n"); + goto Cleanup; + } + + /* add the SYSTEM Ace */ + if (!AddAccessAllowedAce(Dacl, + ACL_REVISION, + GENERIC_ALL, + LocalSystemSid)) + { + DPRINT1("Failed to add the SYSTEM ACE\n"); + goto Cleanup; + } + + /* add the Administrators Ace */ + if (!AddAccessAllowedAce(Dacl, + ACL_REVISION, + GENERIC_ALL, + AdministratorsSid)) + { + DPRINT1("Failed to add the Administrators ACE\n"); + goto Cleanup; + } + + /* add the Everyone Ace */ + if (!AddAccessAllowedAce(Dacl, + ACL_REVISION, + GENERIC_EXECUTE, + EveryoneSid)) + { + DPRINT1("Failed to add the Everyone ACE\n"); + goto Cleanup; + } + + /* set the DACL */ + if (!SetSecurityDescriptorDacl(pSD, + TRUE, + Dacl, + FALSE)) + { + DPRINT1("Failed to set the DACL of the default security descriptor\n"); + +Cleanup: + if (pSD != NULL) + { + LocalFree((HLOCAL)pSD); + pSD = NULL; + } + } + + if (LocalSystemSid != NULL) + { + FreeSid(LocalSystemSid); + } + if (AdministratorsSid != NULL) + { + FreeSid(AdministratorsSid); + } + if (EveryoneSid != NULL) + { + FreeSid(EveryoneSid); + } + + return pSD; } /* Dynamic DLL loading interface **********************************************/

1 0

[jimtabor] 20804: Clean up warning for SafeIconImage might be uninitialized in LoadImageW.
by jimtabor＠svn.reactos.org 12 Jan '06

12 Jan '06

Clean up warning for SafeIconImage might be uninitialized in LoadImageW. Modified: trunk/reactos/lib/user32/windows/bitmap.c _____ Modified: trunk/reactos/lib/user32/windows/bitmap.c --- trunk/reactos/lib/user32/windows/bitmap.c 2006-01-12 06:08:42 UTC (rev 20803) +++ trunk/reactos/lib/user32/windows/bitmap.c 2006-01-12 06:15:21 UTC (rev 20804) @@ -93,7 +93,7 @@ ULONG ColorBits; PVOID Data; CURSORICONDIRENTRY* dirEntry; - ICONIMAGE* SafeIconImage; + ICONIMAGE* SafeIconImage = NULL; GRPCURSORICONDIR* IconResDir; INT id; ICONIMAGE *ResIcon;

1 0

[sedwards] 20803: remove the libxml2 docs. They are wasting space
by sedwards＠svn.reactos.org 12 Jan '06

12 Jan '06

remove the libxml2 docs. They are wasting space Deleted: trunk/reactos/lib/libxml2/doc/

1 0

[weiden] 20802: implemented GetModuleHandleExA/W(), LdrAddRefDll() and RtlPcToFileHeader() (untested)
by weiden＠svn.reactos.org 12 Jan '06

12 Jan '06

implemented GetModuleHandleExA/W(), LdrAddRefDll() and RtlPcToFileHeader() (untested) Modified: trunk/reactos/include/ndk/ldrtypes.h Modified: trunk/reactos/include/ndk/umfuncs.h Modified: trunk/reactos/lib/kernel32/misc/ldr.c Modified: trunk/reactos/lib/kernel32/misc/stubs.c Modified: trunk/reactos/lib/ntdll/def/ntdll.def Modified: trunk/reactos/lib/ntdll/ldr/utils.c _____ Modified: trunk/reactos/include/ndk/ldrtypes.h --- trunk/reactos/include/ndk/ldrtypes.h 2006-01-12 01:16:57 UTC (rev 20801) +++ trunk/reactos/include/ndk/ldrtypes.h 2006-01-12 04:31:37 UTC (rev 20802) @@ -106,4 +106,9 @@ ULONG Language; } LDR_RESOURCE_INFO, *PLDR_RESOURCE_INFO; +// +// LdrAddRef Flags +// +#define LDR_PIN_MODULE 0x00000001 + #endif _____ Modified: trunk/reactos/include/ndk/umfuncs.h --- trunk/reactos/include/ndk/umfuncs.h 2006-01-12 01:16:57 UTC (rev 20801) +++ trunk/reactos/include/ndk/umfuncs.h 2006-01-12 04:31:37 UTC (rev 20802) @@ -161,8 +161,16 @@ // // Loader Functions // + NTSTATUS NTAPI +LdrAddRefDll( + IN ULONG Flags, + IN PVOID BaseAddress +); + +NTSTATUS +NTAPI LdrDisableThreadCalloutsForDll( IN PVOID BaseAddress ); @@ -210,6 +218,13 @@ OUT PVOID *BaseAddress OPTIONAL ); +PVOID +NTAPI +RtlPcToFileHeader( + IN PVOID PcValue, + PVOID* BaseOfImage +); + PIMAGE_BASE_RELOCATION NTAPI LdrProcessRelocationBlock( _____ Modified: trunk/reactos/lib/kernel32/misc/ldr.c --- trunk/reactos/lib/kernel32/misc/ldr.c 2006-01-12 01:16:57 UTC (rev 20801) +++ trunk/reactos/lib/kernel32/misc/ldr.c 2006-01-12 04:31:37 UTC (rev 20802) @@ -483,6 +483,129 @@ /* * @implemented */ +BOOL +STDCALL +GetModuleHandleExW(IN DWORD dwFlags, + IN LPCWSTR lpModuleName OPTIONAL, + OUT HMODULE* phModule) +{ + HMODULE hModule; + NTSTATUS Status; + BOOL Ret = FALSE; + + if (phModule == NULL || + ((dwFlags & (GET_MODULE_HANDLE_EX_FLAG_PIN | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT)) == + (GET_MODULE_HANDLE_EX_FLAG_PIN | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT))) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (lpModuleName == NULL) + { + hModule = NtCurrentPeb()->ImageBaseAddress; + } + else + { + if (dwFlags & GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS) + { + hModule = (HMODULE)RtlPcToFileHeader((PVOID)lpModuleName, + (PVOID*)&hModule); + if (hModule == NULL) + { + SetLastErrorByStatus(STATUS_DLL_NOT_FOUND); + } + } + else + { + hModule = GetModuleHandleW(lpModuleName); + } + } + + if (hModule != NULL) + { + if (!(dwFlags & GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT)) + { + Status = LdrAddRefDll((dwFlags & GET_MODULE_HANDLE_EX_FLAG_PIN) ? LDR_PIN_MODULE : 0, + hModule); + + if (NT_SUCCESS(Status)) + { + Ret = TRUE; + } + else + { + SetLastErrorByStatus(Status); + hModule = NULL; + } + } + else + Ret = TRUE; + } + + *phModule = hModule; + return Ret; +} + +/* + * @implemented + */ +BOOL +STDCALL +GetModuleHandleExA(IN DWORD dwFlags, + IN LPCSTR lpModuleName OPTIONAL, + OUT HMODULE* phModule) +{ + UNICODE_STRING UnicodeName; + ANSI_STRING ModuleName; + LPCWSTR lpModuleNameW; + NTSTATUS Status; + BOOL Ret; + + if (dwFlags & GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS) + { + lpModuleNameW = (LPCWSTR)lpModuleName; + } + else + { + RtlInitAnsiString(&ModuleName, + (LPSTR)lpModuleName); + + /* convert ansi (or oem) string to unicode */ + if (bIsFileApiAnsi) + Status = RtlAnsiStringToUnicodeString(&UnicodeName, + &ModuleName, + TRUE); + else + Status = RtlOemStringToUnicodeString(&UnicodeName, + &ModuleName, + TRUE); + + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return FALSE; + } + + lpModuleNameW = UnicodeName.Buffer; + } + + Ret = GetModuleHandleExW(dwFlags, + lpModuleNameW, + phModule); + + if (!(dwFlags & GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS)) + { + RtlFreeUnicodeString(&UnicodeName); + } + + return Ret; +} + + +/* + * @implemented + */ DWORD STDCALL LoadModule ( _____ Modified: trunk/reactos/lib/kernel32/misc/stubs.c --- trunk/reactos/lib/kernel32/misc/stubs.c 2006-01-12 01:16:57 UTC (rev 20801) +++ trunk/reactos/lib/kernel32/misc/stubs.c 2006-01-12 04:31:37 UTC (rev 20802) @@ -1087,28 +1087,11 @@ return 0; } - - /* * @unimplemented */ BOOL STDCALL -GetModuleHandleExW( - DWORD dwFlags, - LPCWSTR lpModuleName, - HMODULE* phModule - ) -{ - STUB; - return 0; -} - -/* - * @unimplemented - */ -BOOL -STDCALL GetVolumePathNameW( LPCWSTR lpszFileName, LPWSTR lpszVolumePathName, @@ -1286,28 +1269,11 @@ return 0; } - - /* * @unimplemented */ BOOL STDCALL -GetModuleHandleExA( - DWORD dwFlags, - LPCSTR lpModuleName, - HMODULE* phModule - ) -{ - STUB; - return 0; -} - -/* - * @unimplemented - */ -BOOL -STDCALL GetVolumeNameForVolumeMountPointA( LPCSTR lpszVolumeMountPoint, LPSTR lpszVolumeName, _____ Modified: trunk/reactos/lib/ntdll/def/ntdll.def --- trunk/reactos/lib/ntdll/def/ntdll.def 2006-01-12 01:16:57 UTC (rev 20801) +++ trunk/reactos/lib/ntdll/def/ntdll.def 2006-01-12 04:31:37 UTC (rev 20802) @@ -35,6 +35,7 @@ KiUserCallbackDispatcher@12 KiUserExceptionDispatcher@8 LdrAccessResource@16 +LdrAddRefDll@8 LdrDisableThreadCalloutsForDll@4 LdrEnumResources@20 LdrFindEntryForAddress@8 @@ -576,7 +577,7 @@ RtlOemStringToUnicodeString@12 RtlOemToUnicodeN@20 RtlOpenCurrentUser@8 -;RtlPcToFileHeader +RtlPcToFileHeader@8 RtlPinAtomInAtomTable@8 RtlPrefixString@12 RtlPrefixUnicodeString@12 _____ Modified: trunk/reactos/lib/ntdll/ldr/utils.c --- trunk/reactos/lib/ntdll/ldr/utils.c 2006-01-12 01:16:57 UTC (rev 20801) +++ trunk/reactos/lib/ntdll/ldr/utils.c 2006-01-12 04:31:37 UTC (rev 20802) @@ -2135,7 +2135,7 @@ { /* ?????????????????? */ } - else if (LoadCount == 1) + else if (!(Module->Flags & LDRP_STATIC_LINK) && LoadCount == 1) { BoundImportDescriptor = (PIMAGE_BOUND_IMPORT_DESCRIPTOR) RtlImageDirectoryEntryToData(Module->DllBase, @@ -2207,7 +2207,11 @@ if (Unload) { - LdrpDetachProcess(FALSE); + if (!(Module->Flags & LDRP_STATIC_LINK)) + { + LdrpDetachProcess(FALSE); + } + RtlLeaveCriticalSection (NtCurrentPeb()->LoaderLock); } return STATUS_SUCCESS; @@ -2316,10 +2320,87 @@ return STATUS_DLL_NOT_FOUND; } +/* + * @implemented + */ +NTSTATUS NTAPI +LdrAddRefDll(IN ULONG Flags, + IN PVOID BaseAddress) +{ + PLIST_ENTRY ModuleListHead; + PLIST_ENTRY Entry; + PLDR_DATA_TABLE_ENTRY Module; + NTSTATUS Status; + if (Flags & ~(LDR_PIN_MODULE)) + { + return STATUS_INVALID_PARAMETER; + } + + Status = STATUS_DLL_NOT_FOUND; + RtlEnterCriticalSection (NtCurrentPeb()->LoaderLock); + ModuleListHead = &NtCurrentPeb()->Ldr->InLoadOrderModuleList; + Entry = ModuleListHead->Flink; + while (Entry != ModuleListHead) + { + Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InLoadOrderModuleList); + + if (Module->DllBase == BaseAddress) + { + if (Flags & LDR_PIN_MODULE) + { + Module->Flags |= LDRP_STATIC_LINK; + } + else + { + LdrpIncrementLoadCount(Module, + FALSE); + } + Status = STATUS_SUCCESS; + break; + } + Entry = Entry->Flink; + } + RtlLeaveCriticalSection (NtCurrentPeb()->LoaderLock); + return Status; +} + /* * @implemented */ +PVOID NTAPI +RtlPcToFileHeader(IN PVOID PcValue, + PVOID* BaseOfImage) +{ + PLIST_ENTRY ModuleListHead; + PLIST_ENTRY Entry; + PLDR_DATA_TABLE_ENTRY Module; + PVOID ImageBase = NULL; + + RtlEnterCriticalSection (NtCurrentPeb()->LoaderLock); + ModuleListHead = &NtCurrentPeb()->Ldr->InLoadOrderModuleList; + Entry = ModuleListHead->Flink; + while (Entry != ModuleListHead) + { + Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InLoadOrderModuleList); + + if ((ULONG_PTR)PcValue >= (ULONG_PTR)Module->DllBase && + (ULONG_PTR)PcValue < (ULONG_PTR)Module->DllBase + Module->SizeOfImage) + { + ImageBase = Module->DllBase; + break; + } + Entry = Entry->Flink; + } + RtlLeaveCriticalSection (NtCurrentPeb()->LoaderLock); + + *BaseOfImage = ImageBase; + return ImageBase; +} + +/* + * @implemented + */ NTSTATUS NTAPI LdrGetProcedureAddress (IN PVOID BaseAddress, IN PANSI_STRING Name,

1 0

[ion] 20801: - Add the ktrap_frame hack back because it's still missing parts until it can be removed. Sorry for not noticing earlier and breaking boot, it only happens on vmware (I guess due to the way it handles the CPU differently).
by ion＠svn.reactos.org 12 Jan '06

12 Jan '06

- Add the ktrap_frame hack back because it's still missing parts until it can be removed. Sorry for not noticing earlier and breaking boot, it only happens on vmware (I guess due to the way it handles the CPU differently). Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S Modified: trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S _____ Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S --- trunk/reactos/ntoskrnl/ke/i386/syscall.S 2006-01-12 00:46:35 UTC (rev 20800) +++ trunk/reactos/ntoskrnl/ke/i386/syscall.S 2006-01-12 01:16:57 UTC (rev 20801) @@ -470,14 +470,22 @@ ja RestoreAll // ==================== END IF FULL RESTORE NEEDED ====================// +//badbadbad + add esp, 0x30 + pop gs + pop es + pop ds + add esp, 0x14 +//badbadbad + /* Restore FS */ RestoreFs: - lea esp, [ebp+KTRAP_FRAME_FS] + //lea esp, [ebp+KTRAP_FRAME_FS] pop fs CommonStackClean: /* Skip debug information and unsaved registers */ - lea esp, [ebp+KTRAP_FRAME_EDI] + //lea esp, [ebp+KTRAP_FRAME_EDI] pop edi pop esi pop ebx _____ Modified: trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S --- trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S 2006-01-12 00:46:35 UTC (rev 20800) +++ trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S 2006-01-12 01:16:57 UTC (rev 20801) @@ -185,6 +185,11 @@ lea esi, [edx+KTRAP_FRAME_FS] rep movsd + /* TODO: Ugly hack because of some missing logic in syscall.s */ + mov dword ptr [esp+KTRAP_FRAME_GS], 0 + mov dword ptr [esp+KTRAP_FRAME_DS], KGDT_R3_DATA + RPL_MASK + mov dword ptr [esp+KTRAP_FRAME_ES], KGDT_R3_DATA + RPL_MASK + /* FIXME: Copy debug registers if needed */ /* Get user-mode dispatcher address and set it as EIP */

1 0

[ion] 20800: - Remove deprecated file.
by ion＠svn.reactos.org 12 Jan '06

12 Jan '06

- Remove deprecated file. Deleted: trunk/reactos/ntoskrnl/ke/i386/stkswitch.S Modified: trunk/reactos/ntoskrnl/ntoskrnl.xml _____ Deleted: trunk/reactos/ntoskrnl/ke/i386/stkswitch.S --- trunk/reactos/ntoskrnl/ke/i386/stkswitch.S 2006-01-12 00:30:02 UTC (rev 20799) +++ trunk/reactos/ntoskrnl/ke/i386/stkswitch.S 2006-01-12 00:46:35 UTC (rev 20800) @@ -1,61 +0,0 @@ -/* - * FILE: ntoskrnl/ke/i386/tskswitch.S - * PURPOSE: Microkernel thread support - * PROGRAMMER: David Welch (welch(a)cwcom.net) - * UPDATE HISTORY: - * Created 09/10/00 - */ - -/* INCLUDES ******************************************************************/ -#include <ndk/asm.h> - -/* FUNCTIONS ****************************************************************/ - -/* - * FUNCTION: KeStackSwitchAndRet - * PURPOSE: Switch to a new stack and return from the first frame on - * the new stack which was assumed to a stdcall function with - * 8 bytes of arguments and which saved edi, esi and ebx. - */ -.globl _KeStackSwitchAndRet@4 -_KeStackSwitchAndRet@4: - pushl %ebp - movl %esp, %ebp - - cli - - movl 8(%ebp), %esp - - sti - - popl %edi - popl %esi - popl %ebx - - popl %ebp - ret $8 - -.globl _KePushAndStackSwitchAndSysRet@8 -_KePushAndStackSwitchAndSysRet@8: - pushl %ebp - movl %esp, %ebp - - pushl %ebx - pushl %esi - pushl %edi - - cli - - pushl 8(%ebp) - - movl %fs:KPCR_CURRENT_THREAD, %ebx - movl %esp, KTHREAD_CALLBACK_STACK(%ebx) - movl 12(%ebp), %esp - - sti - - push $0 - call _KeLowerIrql@4 - - jmp _KiServiceExit - _____ Modified: trunk/reactos/ntoskrnl/ntoskrnl.xml --- trunk/reactos/ntoskrnl/ntoskrnl.xml 2006-01-12 00:30:02 UTC (rev 20799) +++ trunk/reactos/ntoskrnl/ntoskrnl.xml 2006-01-12 00:46:35 UTC (rev 20800) @@ -35,7 +35,6 @@ <file>irqhand.s</file> <file>kernel.c</file> <file>ldt.c</file> - <file>stkswitch.S</file> <file>syscall.S</file> <file>thread.c</file> <file>tlbflush.S</file>

1 0

[weiden] 20799: remove unused $Id tags
by weiden＠svn.reactos.org 12 Jan '06

12 Jan '06

remove unused $Id tags Modified: trunk/reactos/lib/authz/authz.c Modified: trunk/reactos/lib/authz/clictx.c Modified: trunk/reactos/lib/authz/resman.c _____ Modified: trunk/reactos/lib/authz/authz.c --- trunk/reactos/lib/authz/authz.c 2006-01-12 00:23:47 UTC (rev 20798) +++ trunk/reactos/lib/authz/authz.c 2006-01-12 00:30:02 UTC (rev 20799) @@ -1,6 +1,6 @@ /* * ReactOS Authorization Framework - * Copyright (C) 2005 ReactOS Team + * Copyright (C) 2005 - 2006 ReactOS Team * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,8 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: aclui.c 18173 2005-09-30 18:54:48Z weiden $ - * +/* * PROJECT: ReactOS Authorization Framework * FILE: lib/authz/authz.c * PURPOSE: Authorization Framework _____ Modified: trunk/reactos/lib/authz/clictx.c --- trunk/reactos/lib/authz/clictx.c 2006-01-12 00:23:47 UTC (rev 20798) +++ trunk/reactos/lib/authz/clictx.c 2006-01-12 00:30:02 UTC (rev 20799) @@ -16,8 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: aclui.c 18173 2005-09-30 18:54:48Z weiden $ - * +/* * PROJECT: ReactOS Authorization Framework * FILE: lib/authz/clictx.c * PURPOSE: Authorization Framework _____ Modified: trunk/reactos/lib/authz/resman.c --- trunk/reactos/lib/authz/resman.c 2006-01-12 00:23:47 UTC (rev 20798) +++ trunk/reactos/lib/authz/resman.c 2006-01-12 00:30:02 UTC (rev 20799) @@ -16,8 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: aclui.c 18173 2005-09-30 18:54:48Z weiden $ - * +/* * PROJECT: ReactOS Authorization Framework * FILE: lib/authz/resman.c * PURPOSE: Authorization Framework

1 0

[weiden] 20798: partial implementation of AuthzInitializeContextFromSid(), AuthzGetInformationFromContext() and AuthzFreeContext()
by weiden＠svn.reactos.org 12 Jan '06

12 Jan '06

partial implementation of AuthzInitializeContextFromSid(), AuthzGetInformationFromContext() and AuthzFreeContext() Modified: trunk/reactos/lib/authz/authz.c Modified: trunk/reactos/lib/authz/authz.xml Added: trunk/reactos/lib/authz/clictx.c Modified: trunk/reactos/lib/authz/precomp.h Modified: trunk/reactos/lib/authz/resman.c _____ Modified: trunk/reactos/lib/authz/authz.c --- trunk/reactos/lib/authz/authz.c 2006-01-12 00:19:35 UTC (rev 20797) +++ trunk/reactos/lib/authz/authz.c 2006-01-12 00:23:47 UTC (rev 20798) @@ -122,19 +122,6 @@ AUTHZAPI BOOL WINAPI -AuthzFreeContext(IN AUTHZ_CLIENT_CONTEXT_HANDLE AuthzClientContext) -{ - UNIMPLEMENTED; - return FALSE; -} - - -/* - * @unimplemented - */ -AUTHZAPI -BOOL -WINAPI AuthzFreeHandle(IN AUTHZ_ACCESS_CHECK_RESULTS_HANDLE AuthzHandle) { UNIMPLEMENTED; @@ -148,23 +135,6 @@ AUTHZAPI BOOL WINAPI -AuthzGetInformationFromContext(IN AUTHZ_CLIENT_CONTEXT_HANDLE hAuthzClientContext, - IN AUTHZ_CONTEXT_INFORMATION_CLASS InfoClass, - IN DWORD BufferSize, - OUT PDWORD pSizeRequired, - OUT PVOID Buffer) -{ - UNIMPLEMENTED; - return FALSE; -} - - -/* - * @unimplemented - */ -AUTHZAPI -BOOL -WINAPI AuthzInitializeContextFromAuthzContext(IN DWORD flags, IN AUTHZ_CLIENT_CONTEXT_HANDLE AuthzHandle, IN PLARGE_INTEGER ExpirationTime, @@ -183,25 +153,6 @@ AUTHZAPI BOOL WINAPI -AuthzInitializeContextFromSid(IN DWORD Flags, - IN PSID UserSid, - IN AUTHZ_RESOURCE_MANAGER_HANDLE AuthzResourceManager, - IN PLARGE_INTEGER pExpirationTime, - IN LUID Identifier, - IN PVOID DynamicGroupArgs, - OUT PAUTHZ_CLIENT_CONTEXT_HANDLE pAuthzClientContext) -{ - UNIMPLEMENTED; - return FALSE; -} - - -/* - * @unimplemented - */ -AUTHZAPI -BOOL -WINAPI AuthzInitializeContextFromToken(IN DWORD Flags, IN HANDLE TokenHandle, IN AUTHZ_RESOURCE_MANAGER_HANDLE AuthzResourceManager, _____ Modified: trunk/reactos/lib/authz/authz.xml --- trunk/reactos/lib/authz/authz.xml 2006-01-12 00:19:35 UTC (rev 20797) +++ trunk/reactos/lib/authz/authz.xml 2006-01-12 00:23:47 UTC (rev 20798) @@ -11,6 +11,7 @@ <library>kernel32</library> <library>advapi32</library> <file>authz.c</file> + <file>clictx.c</file> <file>resman.c</file> <file>authz.rc</file> <pch>precomp.h</pch> _____ Added: trunk/reactos/lib/authz/clictx.c --- trunk/reactos/lib/authz/clictx.c 2006-01-12 00:19:35 UTC (rev 20797) +++ trunk/reactos/lib/authz/clictx.c 2006-01-12 00:23:47 UTC (rev 20798) @@ -0,0 +1,233 @@ +/* + * ReactOS Authorization Framework + * Copyright (C) 2005 - 2006 ReactOS Team + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +/* $Id: aclui.c 18173 2005-09-30 18:54:48Z weiden $ + * + * PROJECT: ReactOS Authorization Framework + * FILE: lib/authz/clictx.c + * PURPOSE: Authorization Framework + * PROGRAMMER: Thomas Weidenmueller <w3seek(a)reactos.com> + * + * UPDATE HISTORY: + * 10/07/2005 Created + */ +#include <precomp.h> + + +/* + * @unimplemented + */ +AUTHZAPI +BOOL +WINAPI +AuthzInitializeContextFromSid(IN DWORD Flags, + IN PSID UserSid, + IN AUTHZ_RESOURCE_MANAGER_HANDLE AuthzResourceManager, + IN PLARGE_INTEGER pExpirationTime, + IN LUID Identifier, + IN PVOID DynamicGroupArgs, + OUT PAUTHZ_CLIENT_CONTEXT_HANDLE pAuthzClientContext) +{ + BOOL Ret = FALSE; + + if (AuthzResourceManager != NULL && pExpirationTime != NULL && pAuthzClientContext != NULL && + UserSid != NULL && IsValidSid(UserSid) && !(Flags & (AUTHZ_SKIP_TOKEN_GROUPS | AUTHZ_REQUIRE_S4U_LOGON))) + { + PAUTHZ_CLIENT_CONTEXT ClientCtx; + //PAUTHZ_RESMAN ResMan = (PAUTHZ_RESMAN)AuthzResourceManager; + + VALIDATE_RESMAN_HANDLE(AuthzResourceManager); + + ClientCtx = (PAUTHZ_CLIENT_CONTEXT)LocalAlloc(LMEM_FIXED, + sizeof(AUTHZ_CLIENT_CONTEXT)); + if (ClientCtx != NULL) + { + DWORD SidLen; + + /* initialize the client context structure */ +#if DBG + ClientCtx->Tag = CLIENTCTX_TAG; +#endif + + /* simply copy the SID */ + SidLen = GetLengthSid(UserSid); + ClientCtx->UserSid = (PSID)LocalAlloc(LMEM_FIXED, + SidLen); + if (ClientCtx->UserSid == NULL) + { + LocalFree((HLOCAL)ClientCtx); + goto FailNoMemory; + } + CopySid(SidLen, + ClientCtx->UserSid, + UserSid); + + ClientCtx->AuthzResourceManager = AuthzResourceManager; + ClientCtx->Luid = Identifier; + ClientCtx->ExpirationTime.QuadPart = (pExpirationTime != NULL ? pExpirationTime->QuadPart : 0); + ClientCtx->ServerContext = NULL; /* FIXME */ + ClientCtx->DynamicGroupArgs = DynamicGroupArgs; + + /* return the client context handle */ + *pAuthzClientContext = (AUTHZ_CLIENT_CONTEXT_HANDLE)ClientCtx; + Ret = TRUE; + } + else + { +FailNoMemory: + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + } + } + else + SetLastError(ERROR_INVALID_PARAMETER); + + return Ret; +} + + +/* + * @unimplemented + */ +AUTHZAPI +BOOL +WINAPI +AuthzGetInformationFromContext(IN AUTHZ_CLIENT_CONTEXT_HANDLE hAuthzClientContext, + IN AUTHZ_CONTEXT_INFORMATION_CLASS InfoClass, + IN DWORD BufferSize, + OUT PDWORD pSizeRequired, + OUT PVOID Buffer) +{ + BOOL Ret = FALSE; + + if (hAuthzClientContext != NULL && pSizeRequired != NULL) + { + PAUTHZ_CLIENT_CONTEXT ClientCtx = (PAUTHZ_CLIENT_CONTEXT)hAuthzClientContext; + + VALIDATE_CLIENTCTX_HANDLE(hAuthzClientContext); + + switch (InfoClass) + { + case AuthzContextInfoUserSid: + { + DWORD SidLen = GetLengthSid(ClientCtx->UserSid); + *pSizeRequired = SidLen; + if (BufferSize < SidLen) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + } + else + { + Ret = CopySid(SidLen, + (PSID)Buffer, + ClientCtx->UserSid); + } + break; + } + + case AuthzContextInfoGroupsSids: + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + break; + + case AuthzContextInfoRestrictedSids: + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + break; + + case AuthzContextInfoPrivileges: + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + break; + + case AuthzContextInfoExpirationTime: + *pSizeRequired = sizeof(LARGE_INTEGER); + if (BufferSize < sizeof(LARGE_INTEGER) || Buffer == NULL) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + } + else + { + *((PLARGE_INTEGER)Buffer) = ClientCtx->ExpirationTime; + Ret = TRUE; + } + break; + + case AuthzContextInfoServerContext: + *pSizeRequired = sizeof(AUTHZ_CLIENT_CONTEXT_HANDLE); + if (BufferSize < sizeof(AUTHZ_CLIENT_CONTEXT_HANDLE) || Buffer == NULL) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + } + else + { + *((PAUTHZ_CLIENT_CONTEXT_HANDLE)Buffer) = ClientCtx->ServerContext; + Ret = TRUE; + } + break; + + case AuthzContextInfoIdentifier: + *pSizeRequired = sizeof(LUID); + if (BufferSize < sizeof(LUID) || Buffer == NULL) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + } + else + { + *((PLUID)Buffer) = ClientCtx->Luid; + Ret = TRUE; + } + break; + + default: + SetLastError(ERROR_INVALID_PARAMETER); + break; + } + } + else + SetLastError(ERROR_INVALID_PARAMETER); + + return Ret; +} + + +/* + * @implemented + */ +AUTHZAPI +BOOL +WINAPI +AuthzFreeContext(IN AUTHZ_CLIENT_CONTEXT_HANDLE AuthzClientContext) +{ + BOOL Ret = FALSE; + + if (AuthzClientContext != NULL) + { + PAUTHZ_CLIENT_CONTEXT ClientCtx = (PAUTHZ_CLIENT_CONTEXT)AuthzClientContext; + + VALIDATE_CLIENTCTX_HANDLE(AuthzClientContext); + + if (ClientCtx->UserSid != NULL) + { + LocalFree((HLOCAL)ClientCtx->UserSid); + } + + LocalFree((HLOCAL)ClientCtx); + Ret = TRUE; + } + else + SetLastError(ERROR_INVALID_PARAMETER); + + return Ret; +} Property changes on: trunk/reactos/lib/authz/clictx.c ___________________________________________________________________ Name: svn:keywords + author date revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/authz/precomp.h --- trunk/reactos/lib/authz/precomp.h 2006-01-12 00:19:35 UTC (rev 20797) +++ trunk/reactos/lib/authz/precomp.h 2006-01-12 00:23:47 UTC (rev 20798) @@ -1,3 +1,6 @@ +#ifndef __AUTHZ_PRECOMP_H +#define __AUTHZ_PRECOMP_H + #define _AUTHZ_ #include <windows.h> #include <authz.h> @@ -14,19 +17,54 @@ #if DBG #define RESMAN_TAG 0x89ABCDEF -#define VALID_RESMAN_HANDLE(handle) ASSERT(((PAUTHZ_RESMAN)handle)->Tag == RESMAN_TAG) +#define CLIENTCTX_TAG 0x789ABCDE +#define VALIDATE_RESMAN_HANDLE(handle) ASSERT(((PAUTHZ_RESMAN)handle)->Tag == RESMAN_TAG) +#define VALIDATE_CLIENTCTX_HANDLE(handle) ASSERT(((PAUTHZ_CLIENT_CONTEXT)handle)->Tag == CLIENTCTX_TAG) #ifndef ASSERT #define ASSERT(cond) if (!(cond)) { DbgPrint("%s:%i: ASSERTION %s failed!\n", __FILE__, __LINE__, #cond ); } #endif #else -#define VALID_RESMAN_HANDLE(handle) +#define VALIDATE_RESMAN_HANDLE(handle) +#define VALIDATE_CLIENTCTX_HANDLE(handle) #ifndef ASSERT #define ASSERT(cond) #endif #endif +typedef struct _AUTHZ_RESMAN +{ +#if DBG + DWORD Tag; +#endif + PFN_AUTHZ_DYNAMIC_ACCESS_CHECK pfnAccessCheck; + PFN_AUTHZ_COMPUTE_DYNAMIC_GROUPS pfnComputeDynamicGroups; + PFN_AUTHZ_FREE_DYNAMIC_GROUPS pfnFreeDynamicGroups; + + DWORD flags; + PSID UserSid; + LUID AuthenticationId; + + WCHAR ResourceManagerName[1]; +} AUTHZ_RESMAN, *PAUTHZ_RESMAN; + +typedef struct _AUTHZ_CLIENT_CONTEXT +{ +#if DBG + DWORD Tag; +#endif + + PSID UserSid; + + AUTHZ_RESOURCE_MANAGER_HANDLE AuthzResourceManager; + LUID Luid; + LARGE_INTEGER ExpirationTime; + AUTHZ_CLIENT_CONTEXT_HANDLE ServerContext; + PVOID DynamicGroupArgs; +} AUTHZ_CLIENT_CONTEXT, *PAUTHZ_CLIENT_CONTEXT; + +#endif /* __AUTHZ_PRECOMP_H */ /* EOF */ _____ Modified: trunk/reactos/lib/authz/resman.c --- trunk/reactos/lib/authz/resman.c 2006-01-12 00:19:35 UTC (rev 20797) +++ trunk/reactos/lib/authz/resman.c 2006-01-12 00:23:47 UTC (rev 20798) @@ -1,6 +1,6 @@ /* * ReactOS Authorization Framework - * Copyright (C) 2005 ReactOS Team + * Copyright (C) 2005 - 2006 ReactOS Team * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -28,23 +28,7 @@ */ #include <precomp.h> -typedef struct _AUTHZ_RESMAN -{ -#if DBG - DWORD Tag; -#endif - PFN_AUTHZ_DYNAMIC_ACCESS_CHECK pfnAccessCheck; - PFN_AUTHZ_COMPUTE_DYNAMIC_GROUPS pfnComputeDynamicGroups; - PFN_AUTHZ_FREE_DYNAMIC_GROUPS pfnFreeDynamicGroups; - - DWORD flags; - PSID UserSid; - LUID AuthenticationId; - - WCHAR ResourceManagerName[1]; -} AUTHZ_RESMAN, *PAUTHZ_RESMAN; - static BOOL AuthzpQueryToken(IN OUT PAUTHZ_RESMAN ResMan, IN HANDLE hToken) @@ -248,7 +232,7 @@ { PAUTHZ_RESMAN ResMan = (PAUTHZ_RESMAN)AuthzResourceManager; - VALID_RESMAN_HANDLE(AuthzResourceManager); + VALIDATE_RESMAN_HANDLE(AuthzResourceManager); if (!(ResMan->flags & AUTHZ_RM_FLAG_NO_AUDIT)) {

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs