Ros-diffs January 2006

ros-diffs@reactos.org

23 participants
586 discussions

Start a nNew thread

[sedwards] 20803: remove the libxml2 docs. They are wasting space

by sedwards＠svn.reactos.org

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

18 years, 8 months

[weiden] 20802: implemented GetModuleHandleExA/W(), LdrAddRefDll() and RtlPcToFileHeader() (untested)

by weiden＠svn.reactos.org

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,

18 years, 8 months

[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

- 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 */

18 years, 8 months

[ion] 20800: - Remove deprecated file.

by ion＠svn.reactos.org

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

18 years, 8 months

[weiden] 20799: remove unused $Id tags

by weiden＠svn.reactos.org

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

18 years, 8 months

[weiden] 20798: partial implementation of AuthzInitializeContextFromSid(), AuthzGetInformationFromContext() and AuthzFreeContext()

by weiden＠svn.reactos.org

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)) {

18 years, 8 months

[weiden] 20797: minor fixes and use a .spec file

by weiden＠svn.reactos.org

minor fixes and use a .spec file Modified: trunk/reactos/lib/aclui/aclui.c Deleted: trunk/reactos/lib/aclui/aclui.def Added: trunk/reactos/lib/aclui/aclui.spec Modified: trunk/reactos/lib/aclui/aclui.xml Modified: trunk/reactos/lib/aclui/aclui_Hu.rc Modified: trunk/reactos/lib/aclui/precomp.h Modified: trunk/reactos/lib/aclui/sidcache.c _____ Modified: trunk/reactos/lib/aclui/aclui.c --- trunk/reactos/lib/aclui/aclui.c 2006-01-12 00:13:45 UTC (rev 20796) +++ trunk/reactos/lib/aclui/aclui.c 2006-01-12 00:19:35 UTC (rev 20797) @@ -342,6 +342,27 @@ return lpDisplayString; } +static LPWSTR +GetPrincipalAccountNameString(IN PPRINCIPAL_LISTITEM PrincipalListItem) +{ + LPWSTR lpDisplayString = NULL; + + if (PrincipalListItem->SidReqResult != NULL) + { + LoadAndFormatString(hDllInstance, + IDS_USERFORMAT, + &lpDisplayString, + PrincipalListItem->SidReqResult->AccountName); + } + else + { + ConvertSidToStringSid((PSID)(PrincipalListItem + 1), + &lpDisplayString); + } + + return lpDisplayString; +} + static VOID CreatePrincipalListItem(OUT LVITEM *li, IN PSECURITY_PAGE sp, @@ -543,7 +564,7 @@ LPWSTR szLabel; LPWSTR szDisplayString; - szDisplayString = GetPrincipalDisplayString(Selected); + szDisplayString = GetPrincipalAccountNameString(Selected); if (LoadAndFormatString(hDllInstance, IDS_PERMISSIONS_FOR, &szLabel, _____ Deleted: trunk/reactos/lib/aclui/aclui.def --- trunk/reactos/lib/aclui/aclui.def 2006-01-12 00:13:45 UTC (rev 20796) +++ trunk/reactos/lib/aclui/aclui.def 2006-01-12 00:19:35 UTC (rev 20797) @@ -1,22 +0,0 @@ -LIBRARY aclui.dll - -EXPORTS -CreateSecurityPage@4 @1 -EditSecurity@8 @2 -;ACLUI.3 -;ACLUI.4 -;ACLUI.5 -;ACLUI.6 -;ACLUI.7 -;ACLUI.8 -;ACLUI.9 -;ACLUI.10 -;ACLUI.11 -;ACLUI.12 -;ACLUI.13 -;ACLUI.14 -;ACLUI.15 -IID_ISecurityInformation @16 DATA - - -; EOF _____ Added: trunk/reactos/lib/aclui/aclui.spec --- trunk/reactos/lib/aclui/aclui.spec 2006-01-12 00:13:45 UTC (rev 20796) +++ trunk/reactos/lib/aclui/aclui.spec 2006-01-12 00:19:35 UTC (rev 20797) @@ -0,0 +1,5 @@ +# aclui.dll exports + + 1 stdcall CreateSecurityPage(ptr) + 2 stdcall EditSecurity(ptr ptr) +16 extern IID_ISecurityInformation \ No newline at end of file Property changes on: trunk/reactos/lib/aclui/aclui.spec ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/aclui/aclui.xml --- trunk/reactos/lib/aclui/aclui.xml 2006-01-12 00:13:45 UTC (rev 20796) +++ trunk/reactos/lib/aclui/aclui.xml 2006-01-12 00:19:35 UTC (rev 20797) @@ -1,5 +1,5 @@ <module name="aclui" type="win32dll" baseaddress="${BASEADDRESS_ACLUI}" installbase="system32" installname="aclui.dll"> - <importlibrary definition="aclui.def" /> + <importlibrary definition="aclui.spec.def" /> <include base="aclui">.</include> <define name="UNICODE" /> <define name="_UNICODE" /> @@ -22,5 +22,6 @@ <file>misc.c</file> <file>sidcache.c</file> <file>aclui.rc</file> + <file>aclui.spec</file> <pch>precomp.h</pch> </module> _____ Modified: trunk/reactos/lib/aclui/aclui_Hu.rc --- trunk/reactos/lib/aclui/aclui_Hu.rc 2006-01-12 00:13:45 UTC (rev 20796) +++ trunk/reactos/lib/aclui/aclui_Hu.rc 2006-01-12 00:19:35 UTC (rev 20797) @@ -1,35 +1,35 @@ -/* - * Hungarian resources for aclui - * - * Copyright 2005 Robert Horvath - Hungarian translation - talley at cubeclub.hu -*/ -LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL - -IDD_SECPAGE DIALOGEX 0, 0, 227, 215 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_CAPTION -CAPTION "Biztonsßg" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "&Csoport vagy felhasznßl¾ nevek:", -1, 7, 7, 105, 8 - CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 17, 213, 66, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE - PUSHBUTTON "H&ozzßadßs...", IDC_ADD_PRINCIPAL, 116, 87, 50, 14 - PUSHBUTTON "&T÷rlÚs", IDC_REMOVE_PRINCIPAL, 170, 87, 50, 14 - LTEXT "", IDC_LABEL_PERMISSIONS_FOR, 7, 107, 105, 8, SS_LEFT | SS_NOPREFIX - LTEXT "EngedÚlyez", IDC_LABEL_ALLOW, 135, 107, 32, 8, SS_CENTER - LTEXT "Tiltßs", IDC_LABEL_DENY, 176, 107, 32, 8, SS_CENTER - CONTROL "", IDC_ACE_CHECKLIST, "CHECKLIST_ACLUI", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 117, 213, 72, WS_EX_CLIENTEDGE - LTEXT "Tovßbbi beßllÝtßsok megtekintÚsÚhez kattints a Tovßbbi beßllÝtßsok gombra.", IDC_LABEL_ADVANCED, 7, 194, 153, 16, SS_LEFT - PUSHBUTTON "&Tovßbbi beßllÝtßsok", IDC_ADVANCED, 165, 194, 55, 14 -END - -STRINGTABLE DISCARDABLE -{ - IDS_PSP_TITLE "%1 engedÚlye" - IDS_UNKNOWN "Ismeretlen" - IDS_SPECIAL_PERMISSIONS "K³l÷nleges engedÚlyek" - IDS_PERMISSIONS_FOR "%1 engedÚlye" - IDS_PERMISSIONS "EngedÚlyek" - IDS_USERDOMAINFORMAT "%1 (%2\\%3)" - IDS_USERFORMAT "%1" -} - +/* + * Hungarian resources for aclui + * + * Copyright 2005 Robert Horvath - Hungarian translation - talley at cubeclub.hu +*/ +LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL + +IDD_SECPAGE DIALOGEX 0, 0, 227, 215 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "Biztonsßg" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "&Csoport vagy felhasznßl¾ nevek:", -1, 7, 7, 105, 8 + CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 17, 213, 66, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE + PUSHBUTTON "H&ozzßadßs...", IDC_ADD_PRINCIPAL, 116, 87, 50, 14 + PUSHBUTTON "&T÷rlÚs", IDC_REMOVE_PRINCIPAL, 170, 87, 50, 14 + LTEXT "", IDC_LABEL_PERMISSIONS_FOR, 7, 107, 105, 8, SS_LEFT | SS_NOPREFIX + LTEXT "EngedÚlyez", IDC_LABEL_ALLOW, 135, 107, 32, 8, SS_CENTER + LTEXT "Tiltßs", IDC_LABEL_DENY, 176, 107, 32, 8, SS_CENTER + CONTROL "", IDC_ACE_CHECKLIST, "CHECKLIST_ACLUI", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 117, 213, 72, WS_EX_CLIENTEDGE + LTEXT "Tovßbbi beßllÝtßsok megtekintÚsÚhez kattints a Tovßbbi beßllÝtßsok gombra.", IDC_LABEL_ADVANCED, 7, 194, 153, 16, SS_LEFT + PUSHBUTTON "&Tovßbbi beßllÝtßsok", IDC_ADVANCED, 165, 194, 55, 14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_PSP_TITLE "%1 engedÚlye" + IDS_UNKNOWN "Ismeretlen" + IDS_SPECIAL_PERMISSIONS "K³l÷nleges engedÚlyek" + IDS_PERMISSIONS_FOR "%1 engedÚlye" + IDS_PERMISSIONS "EngedÚlyek" + IDS_USERDOMAINFORMAT "%1 (%2\\%3)" + IDS_USERFORMAT "%1" +} + Property changes on: trunk/reactos/lib/aclui/aclui_Hu.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/aclui/precomp.h --- trunk/reactos/lib/aclui/precomp.h 2006-01-12 00:13:45 UTC (rev 20796) +++ trunk/reactos/lib/aclui/precomp.h 2006-01-12 00:19:35 UTC (rev 20797) @@ -62,6 +62,9 @@ SI_ACCESS DefaultAccess; HANDLE SidCacheMgr; + LONG SidLookupsPending; + BOOL Initializing : 1; + LPCWSTR ServerName; } SECURITY_PAGE, *PSECURITY_PAGE; _____ Modified: trunk/reactos/lib/aclui/sidcache.c --- trunk/reactos/lib/aclui/sidcache.c 2006-01-12 00:13:45 UTC (rev 20796) +++ trunk/reactos/lib/aclui/sidcache.c 2006-01-12 00:19:35 UTC (rev 20797) @@ -583,8 +583,7 @@ scm = HeapAlloc(Heap, 0, FIELD_OFFSET(SIDCACHEMGR, - SystemName[0]) + - ((wcslen(SystemName) + 1) * sizeof(WCHAR))); + SystemName[wcslen(SystemName) + 1])); if (scm != NULL) { /* zero the static part of the structure */

18 years, 8 months

[weiden] 20796: fixed uninitialized variable warning

by weiden＠svn.reactos.org

fixed uninitialized variable warning Modified: trunk/reactos/ntoskrnl/ke/usercall.c _____ Modified: trunk/reactos/ntoskrnl/ke/usercall.c --- trunk/reactos/ntoskrnl/ke/usercall.c 2006-01-12 00:11:14 UTC (rev 20795) +++ trunk/reactos/ntoskrnl/ke/usercall.c 2006-01-12 00:13:45 UTC (rev 20796) @@ -40,7 +40,7 @@ { ULONG_PTR NewStack, OldStack; PULONG UserEsp; - NTSTATUS CallbackStatus; + NTSTATUS CallbackStatus = STATUS_SUCCESS; PEXCEPTION_REGISTRATION_RECORD ExceptionList; DPRINT("KeUserModeCallback(RoutineIndex %d, Argument %X, ArgumentLength %d)\n", RoutineIndex, Argument, ArgumentLength);

18 years, 8 months

[weiden] 20795: Fix code assuming that the Reg* functions set the last error code

by weiden＠svn.reactos.org

Fix code assuming that the Reg* functions set the last error code Modified: trunk/reactos/lib/userenv/desktop.c Modified: trunk/reactos/lib/userenv/environment.c Modified: trunk/reactos/lib/userenv/misc.c Modified: trunk/reactos/lib/userenv/precomp.h Modified: trunk/reactos/lib/userenv/profile.c Modified: trunk/reactos/lib/userenv/registry.c Modified: trunk/reactos/lib/userenv/setup.c Modified: trunk/reactos/lib/userenv/userenv.xml _____ Modified: trunk/reactos/lib/userenv/desktop.c --- trunk/reactos/lib/userenv/desktop.c 2006-01-11 23:54:44 UTC (rev 20794) +++ trunk/reactos/lib/userenv/desktop.c 2006-01-12 00:11:14 UTC (rev 20795) @@ -41,29 +41,34 @@ DWORD dwLength; DWORD dwType; HKEY hKey; + LONG Error; DPRINT ("GetDesktopPath() called\n"); - if (RegOpenKeyExW (HKEY_CURRENT_USER, - L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders", - 0, - KEY_ALL_ACCESS, - &hKey)) + Error = RegOpenKeyExW (HKEY_CURRENT_USER, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders", + 0, + KEY_ALL_ACCESS, + &hKey); + if (Error != ERROR_SUCCESS) { DPRINT1 ("RegOpenKeyExW() failed\n"); + SetLastError((DWORD)Error); return FALSE; } dwLength = MAX_PATH * sizeof(WCHAR); - if (RegQueryValueExW (hKey, - bCommonPath ? L"Common Desktop" : L"Desktop", - 0, - &dwType, - (LPBYTE)szPath, - &dwLength)) + Error = RegQueryValueExW (hKey, + bCommonPath ? L"Common Desktop" : L"Desktop", + 0, + &dwType, + (LPBYTE)szPath, + &dwLength); + if (Error != ERROR_SUCCESS) { DPRINT1 ("RegQueryValueExW() failed\n"); RegCloseKey (hKey); + SetLastError((DWORD)Error); return FALSE; } @@ -94,29 +99,34 @@ DWORD dwLength; DWORD dwType; HKEY hKey; + LONG Error; DPRINT ("GetProgramsPath() called\n"); - if (RegOpenKeyExW (HKEY_CURRENT_USER, - L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders", - 0, - KEY_ALL_ACCESS, - &hKey)) + Error = RegOpenKeyExW (HKEY_CURRENT_USER, + L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\User Shell Folders", + 0, + KEY_ALL_ACCESS, + &hKey); + if (Error != ERROR_SUCCESS) { DPRINT1 ("RegOpenKeyExW() failed\n"); + SetLastError((DWORD)Error); return FALSE; } dwLength = MAX_PATH * sizeof(WCHAR); - if (RegQueryValueExW (hKey, - bCommonPath ? L"Common Programs" : L"Programs", - 0, - &dwType, - (LPBYTE)szPath, - &dwLength)) + Error = RegQueryValueExW (hKey, + bCommonPath ? L"Common Programs" : L"Programs", + 0, + &dwType, + (LPBYTE)szPath, + &dwLength); + if (Error != ERROR_SUCCESS) { DPRINT1 ("RegQueryValueExW() failed\n"); RegCloseKey (hKey); + SetLastError((DWORD)Error); return FALSE; } _____ Modified: trunk/reactos/lib/userenv/environment.c --- trunk/reactos/lib/userenv/environment.c 2006-01-11 23:54:44 UTC (rev 20794) +++ trunk/reactos/lib/userenv/environment.c 2006-01-12 00:11:14 UTC (rev 20795) @@ -169,6 +169,7 @@ { UNICODE_STRING SidString; HKEY hKey; + LONG Error; if (!GetUserSidFromToken (hToken, &SidString)) @@ -177,14 +178,16 @@ return NULL; } - if (RegOpenKeyExW (HKEY_USERS, - SidString.Buffer, - 0, - KEY_ALL_ACCESS, - &hKey)) + Error = RegOpenKeyExW (HKEY_USERS, + SidString.Buffer, + 0, + KEY_ALL_ACCESS, + &hKey); + if (Error != ERROR_SUCCESS) { - DPRINT1 ("RegOpenKeyExW() failed (Error %ld)\n", GetLastError()); + DPRINT1 ("RegOpenKeyExW() failed (Error %ld)\n", Error); RtlFreeUnicodeString (&SidString); + SetLastError((DWORD)Error); return NULL; } @@ -209,32 +212,37 @@ DWORD i; LPWSTR lpValueName; LPWSTR lpValueData; + LONG Error; - if (RegOpenKeyExW (hKey, - lpSubKeyName, - 0, - KEY_ALL_ACCESS, - &hEnvKey)) + Error = RegOpenKeyExW (hKey, + lpSubKeyName, + 0, + KEY_ALL_ACCESS, + &hEnvKey); + if (Error != ERROR_SUCCESS) { - DPRINT1 ("RegOpenKeyExW() failed (Error %ld)\n", GetLastError()); + DPRINT1 ("RegOpenKeyExW() failed (Error %ld)\n", Error); + SetLastError((DWORD)Error); return FALSE; } - if (RegQueryInfoKey (hEnvKey, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - &dwValues, - &dwMaxValueNameLength, - &dwMaxValueDataLength, - NULL, - NULL)) + Error = RegQueryInfoKey (hEnvKey, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + &dwValues, + &dwMaxValueNameLength, + &dwMaxValueDataLength, + NULL, + NULL); + if (Error != ERROR_SUCCESS) { - DPRINT1 ("RegQueryInforKey() failed (Error %ld)\n", GetLastError()); + DPRINT1 ("RegQueryInforKey() failed (Error %ld)\n", Error); RegCloseKey (hEnvKey); + SetLastError((DWORD)Error); return FALSE; } @@ -314,13 +322,17 @@ DPRINT("CreateEnvironmentBlock() called\n"); if (lpEnvironment == NULL) - return FALSE; + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } Status = RtlCreateEnvironment ((BOOLEAN)bInherit, (PWSTR*)lpEnvironment); if (!NT_SUCCESS (Status)) { DPRINT1 ("RtlCreateEnvironment() failed (Status %lx)\n", Status); + SetLastError (RtlNtStatusToDosError (Status)); return FALSE; } @@ -390,7 +402,10 @@ DPRINT ("DestroyEnvironmentBlock() called\n"); if (lpEnvironment == NULL) - return FALSE; + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } RtlDestroyEnvironment (lpEnvironment); _____ Modified: trunk/reactos/lib/userenv/misc.c --- trunk/reactos/lib/userenv/misc.c 2006-01-11 23:54:44 UTC (rev 20794) +++ trunk/reactos/lib/userenv/misc.c 2006-01-12 00:11:14 UTC (rev 20795) @@ -91,6 +91,7 @@ if (!NT_SUCCESS (Status)) { LocalFree ((HLOCAL)SidBuffer); + SetLastError (RtlNtStatusToDosError (Status)); return FALSE; } @@ -103,7 +104,10 @@ LocalFree ((HLOCAL)SidBuffer); if (!NT_SUCCESS (Status)) - return FALSE; + { + SetLastError (RtlNtStatusToDosError (Status)); + return FALSE; + } DPRINT ("SidString.Length: %lu\n", SidString->Length); DPRINT ("SidString.MaximumLength: %lu\n", SidString->MaximumLength); _____ Modified: trunk/reactos/lib/userenv/precomp.h --- trunk/reactos/lib/userenv/precomp.h 2006-01-11 23:54:44 UTC (rev 20794) +++ trunk/reactos/lib/userenv/precomp.h 2006-01-12 00:11:14 UTC (rev 20795) @@ -4,6 +4,7 @@ #define NTOS_MODE_USER #include <ndk/ntndk.h> #include <userenv.h> +#include <sddl.h> #include <shlobj.h> #include "internal.h" _____ Modified: trunk/reactos/lib/userenv/profile.c --- trunk/reactos/lib/userenv/profile.c 2006-01-11 23:54:44 UTC (rev 20794) +++ trunk/reactos/lib/userenv/profile.c 2006-01-12 00:11:14 UTC (rev 20795) @@ -66,6 +66,7 @@ if (wcslen(lpName) + wcslen(lpszPostfix) >= dwMaxLength) { DPRINT1("Error: buffer overflow\n"); + SetLastError(ERROR_BUFFER_OVERFLOW); return FALSE; } @@ -109,35 +110,39 @@ WCHAR szUserProfilePath[MAX_PATH]; WCHAR szDefaultUserPath[MAX_PATH]; WCHAR szBuffer[MAX_PATH]; - UNICODE_STRING SidString; + LPWSTR SidString; DWORD dwLength; DWORD dwDisposition; HKEY hKey; - NTSTATUS Status; + LONG Error; DPRINT("CreateUserProfileW() called\n"); - if (RegOpenKeyExW (HKEY_LOCAL_MACHINE, - L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList", - 0, - KEY_ALL_ACCESS, - &hKey)) + Error = RegOpenKeyExW (HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList", + 0, + KEY_ALL_ACCESS, + &hKey); + if (Error != ERROR_SUCCESS) { - DPRINT1("Error: %lu\n", GetLastError()); + DPRINT1("Error: %lu\n", Error); + SetLastError((DWORD)Error); return FALSE; } /* Get profiles path */ dwLength = MAX_PATH * sizeof(WCHAR); - if (RegQueryValueExW (hKey, - L"ProfilesDirectory", - NULL, - NULL, - (LPBYTE)szRawProfilesPath, - &dwLength)) + Error = RegQueryValueExW (hKey, + L"ProfilesDirectory", + NULL, + NULL, + (LPBYTE)szRawProfilesPath, + &dwLength); + if (Error != ERROR_SUCCESS) { - DPRINT1("Error: %lu\n", GetLastError()); + DPRINT1("Error: %lu\n", Error); RegCloseKey (hKey); + SetLastError((DWORD)Error); return FALSE; } @@ -153,15 +158,17 @@ /* Get default user path */ dwLength = MAX_PATH * sizeof(WCHAR); - if (RegQueryValueExW (hKey, - L"DefaultUserProfile", - NULL, - NULL, - (LPBYTE)szBuffer, - &dwLength)) + Error = RegQueryValueExW (hKey, + L"DefaultUserProfile", + NULL, + NULL, + (LPBYTE)szBuffer, + &dwLength); + if (Error != ERROR_SUCCESS) { - DPRINT1("Error: %lu\n", GetLastError()); + DPRINT1("Error: %lu\n", Error); RegCloseKey (hKey); + SetLastError((DWORD)Error); return FALSE; } @@ -173,7 +180,7 @@ if (!AppendSystemPostfix (szUserProfilePath, MAX_PATH)) { DPRINT1("AppendSystemPostfix() failed\n", GetLastError()); - RtlFreeUnicodeString (&SidString); + LocalFree ((HLOCAL)SidString); RegCloseKey (hKey); return FALSE; } @@ -200,30 +207,32 @@ } /* Add profile to profile list */ - Status = RtlConvertSidToUnicodeString (&SidString, Sid, TRUE); - if (!NT_SUCCESS(Status)) + if (!ConvertSidToStringSidW (Sid, + &SidString)) { - DPRINT1("Status: %lx\n", Status); + DPRINT1("Error: %lu\n", GetLastError()); return FALSE; } wcscpy (szBuffer, L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList\\"); - wcscat (szBuffer, SidString.Buffer); + wcscat (szBuffer, SidString); /* Create user profile key */ - if (RegCreateKeyExW (HKEY_LOCAL_MACHINE, - szBuffer, - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_ALL_ACCESS, - NULL, - &hKey, - &dwDisposition)) + Error = RegCreateKeyExW (HKEY_LOCAL_MACHINE, + szBuffer, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_ALL_ACCESS, + NULL, + &hKey, + &dwDisposition); + if (Error != ERROR_SUCCESS) { - DPRINT1("Error: %lu\n", GetLastError()); - RtlFreeUnicodeString (&SidString); + DPRINT1("Error: %lu\n", Error); + LocalFree ((HLOCAL)SidString); + SetLastError((DWORD)Error); return FALSE; } @@ -234,36 +243,40 @@ if (!AppendSystemPostfix (szBuffer, MAX_PATH)) { DPRINT1("AppendSystemPostfix() failed\n", GetLastError()); - RtlFreeUnicodeString (&SidString); + LocalFree ((HLOCAL)SidString); RegCloseKey (hKey); return FALSE; } /* Set 'ProfileImagePath' value (non-expanded) */ - if (RegSetValueExW (hKey, - L"ProfileImagePath", - 0, - REG_EXPAND_SZ, - (LPBYTE)szBuffer, - (wcslen (szBuffer) + 1) * sizeof(WCHAR))) + Error = RegSetValueExW (hKey, + L"ProfileImagePath", + 0, + REG_EXPAND_SZ, + (LPBYTE)szBuffer, + (wcslen (szBuffer) + 1) * sizeof(WCHAR)); + if (Error != ERROR_SUCCESS) { - DPRINT1("Error: %lu\n", GetLastError()); - RtlFreeUnicodeString (&SidString); + DPRINT1("Error: %lu\n", Error); + LocalFree ((HLOCAL)SidString); RegCloseKey (hKey); + SetLastError((DWORD)Error); return FALSE; } /* Set 'Sid' value */ - if (RegSetValueExW (hKey, - L"Sid", - 0, - REG_BINARY, - Sid, - RtlLengthSid (Sid))) + Error = RegSetValueExW (hKey, + L"Sid", + 0, + REG_BINARY, + Sid, + GetLengthSid (Sid)); + if (Error != ERROR_SUCCESS) { - DPRINT1("Error: %lu\n", GetLastError()); - RtlFreeUnicodeString (&SidString); + DPRINT1("Error: %lu\n", Error); + LocalFree ((HLOCAL)SidString); RegCloseKey (hKey); + SetLastError((DWORD)Error); return FALSE; } @@ -274,27 +287,29 @@ wcscat (szBuffer, L"\\ntuser.dat"); /* Create new user hive */ - if (RegLoadKeyW (HKEY_USERS, - SidString.Buffer, - szBuffer)) + Error = RegLoadKeyW (HKEY_USERS, + SidString, + szBuffer); + if (Error != ERROR_SUCCESS) { - DPRINT1("Error: %lu\n", GetLastError()); - RtlFreeUnicodeString (&SidString); + DPRINT1("Error: %lu\n", Error); + LocalFree ((HLOCAL)SidString); + SetLastError((DWORD)Error); return FALSE; } /* Initialize user hive */ - if (!CreateUserHive (SidString.Buffer, szUserProfilePath)) + if (!CreateUserHive (SidString, szUserProfilePath)) { DPRINT1("Error: %lu\n", GetLastError()); - RtlFreeUnicodeString (&SidString); + LocalFree ((HLOCAL)SidString); return FALSE; } RegUnLoadKeyW (HKEY_USERS, - SidString.Buffer); + SidString); - RtlFreeUnicodeString (&SidString); + LocalFree ((HLOCAL)SidString); DPRINT("CreateUserProfileW() done\n"); @@ -342,28 +357,33 @@ WCHAR szBuffer[MAX_PATH]; DWORD dwLength; HKEY hKey; + LONG Error; - if (RegOpenKeyExW (HKEY_LOCAL_MACHINE, - L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList", - 0, - KEY_READ, - &hKey)) + Error = RegOpenKeyExW (HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList", + 0, + KEY_READ, + &hKey); + if (Error != ERROR_SUCCESS) { - DPRINT1("Error: %lu\n", GetLastError()); + DPRINT1("Error: %lu\n", Error); + SetLastError((DWORD)Error); return FALSE; } /* Get profiles path */ dwLength = sizeof(szBuffer); - if (RegQueryValueExW (hKey, - L"ProfilesDirectory", - NULL, - NULL, - (LPBYTE)szBuffer, - &dwLength)) + Error = RegQueryValueExW (hKey, + L"ProfilesDirectory", + NULL, + NULL, + (LPBYTE)szBuffer, + &dwLength); + if (Error != ERROR_SUCCESS) { - DPRINT1("Error: %lu\n", GetLastError()); + DPRINT1("Error: %lu\n", Error); RegCloseKey (hKey); + SetLastError((DWORD)Error); return FALSE; } @@ -379,15 +399,17 @@ /* Get 'AllUsersProfile' name */ dwLength = sizeof(szBuffer); - if (RegQueryValueExW (hKey, - L"AllUsersProfile", - NULL, - NULL, - (LPBYTE)szBuffer, - &dwLength)) + Error = RegQueryValueExW (hKey, + L"AllUsersProfile", + NULL, + NULL, + (LPBYTE)szBuffer, + &dwLength); + if (Error != ERROR_SUCCESS) { - DPRINT1("Error: %lu\n", GetLastError()); + DPRINT1("Error: %lu\n", Error); RegCloseKey (hKey); + SetLastError((DWORD)Error); return FALSE; } @@ -455,28 +477,33 @@ WCHAR szBuffer[MAX_PATH]; DWORD dwLength; HKEY hKey; + LONG Error; - if (RegOpenKeyExW (HKEY_LOCAL_MACHINE, - L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList", - 0, - KEY_READ, - &hKey)) + Error = RegOpenKeyExW (HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList", + 0, + KEY_READ, + &hKey); + if (Error != ERROR_SUCCESS) { - DPRINT1("Error: %lu\n", GetLastError()); + DPRINT1("Error: %lu\n", Error); + SetLastError((DWORD)Error); return FALSE; } /* Get profiles path */ dwLength = sizeof(szBuffer); - if (RegQueryValueExW (hKey, - L"ProfilesDirectory", - NULL, - NULL, - (LPBYTE)szBuffer, - &dwLength)) + Error = RegQueryValueExW (hKey, + L"ProfilesDirectory", + NULL, + NULL, + (LPBYTE)szBuffer, + &dwLength); + if (Error != ERROR_SUCCESS) { - DPRINT1("Error: %lu\n", GetLastError()); + DPRINT1("Error: %lu\n", Error); RegCloseKey (hKey); + SetLastError((DWORD)Error); return FALSE; } @@ -492,15 +519,17 @@ /* Get 'DefaultUserProfile' name */ dwLength = sizeof(szBuffer); - if (RegQueryValueExW (hKey, - L"DefaultUserProfile", - NULL, - NULL, - (LPBYTE)szBuffer, - &dwLength)) + Error = RegQueryValueExW (hKey, + L"DefaultUserProfile", + NULL, + NULL, + (LPBYTE)szBuffer, + &dwLength); + if (Error != ERROR_SUCCESS) { - DPRINT1("Error: %lu\n", GetLastError()); + DPRINT1("Error: %lu\n", Error); RegCloseKey (hKey); + SetLastError((DWORD)Error); return FALSE; } @@ -568,28 +597,33 @@ WCHAR szBuffer[MAX_PATH]; DWORD dwLength; HKEY hKey; + LONG Error; - if (RegOpenKeyExW (HKEY_LOCAL_MACHINE, - L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList", - 0, - KEY_READ, - &hKey)) + Error = RegOpenKeyExW (HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList", + 0, + KEY_READ, + &hKey); + if (Error != ERROR_SUCCESS) { - DPRINT1("Error: %lu\n", GetLastError()); + DPRINT1("Error: %lu\n", Error); + SetLastError((DWORD)Error); return FALSE; } /* Get profiles path */ dwLength = sizeof(szBuffer); - if (RegQueryValueExW (hKey, - L"ProfilesDirectory", - NULL, - NULL, - (LPBYTE)szBuffer, - &dwLength)) + Error = RegQueryValueExW (hKey, + L"ProfilesDirectory", + NULL, + NULL, + (LPBYTE)szBuffer, + &dwLength); + if (Error != ERROR_SUCCESS) { - DPRINT1("Error: %lu\n", GetLastError()); + DPRINT1("Error: %lu\n", Error); RegCloseKey (hKey); + SetLastError((DWORD)Error); return FALSE; } @@ -668,6 +702,7 @@ WCHAR szImagePath[MAX_PATH]; DWORD dwLength; HKEY hKey; + LONG Error; if (!GetUserSidFromToken (hToken, &SidString)) @@ -687,26 +722,30 @@ DPRINT ("KeyName: '%S'\n", szKeyName); - if (RegOpenKeyExW (HKEY_LOCAL_MACHINE, - szKeyName, - 0, - KEY_ALL_ACCESS, - &hKey)) + Error = RegOpenKeyExW (HKEY_LOCAL_MACHINE, + szKeyName, + 0, + KEY_ALL_ACCESS, + &hKey); + if (Error != ERROR_SUCCESS) { - DPRINT1 ("Error: %lu\n", GetLastError()); + DPRINT1 ("Error: %lu\n", Error); + SetLastError((DWORD)Error); return FALSE; } dwLength = sizeof(szRawImagePath); - if (RegQueryValueExW (hKey, - L"ProfileImagePath", - NULL, - NULL, - (LPBYTE)szRawImagePath, - &dwLength)) + Error = RegQueryValueExW (hKey, + L"ProfileImagePath", + NULL, + NULL, + (LPBYTE)szRawImagePath, + &dwLength); + if (Error != ERROR_SUCCESS) { - DPRINT1 ("Error: %lu\n", GetLastError()); + DPRINT1 ("Error: %lu\n", Error); RegCloseKey (hKey); + SetLastError((DWORD)Error); return FALSE; } @@ -792,6 +831,7 @@ { WCHAR szUserHivePath[MAX_PATH]; UNICODE_STRING SidString; + LONG Error; DWORD dwLength = sizeof(szUserHivePath) / sizeof(szUserHivePath[0]); DPRINT ("LoadUserProfileW() called\n"); @@ -842,23 +882,27 @@ DPRINT ("SidString: '%wZ'\n", &SidString); - if (RegLoadKeyW (HKEY_USERS, - SidString.Buffer, - szUserHivePath)) + Error = RegLoadKeyW (HKEY_USERS, + SidString.Buffer, + szUserHivePath); + if (Error != ERROR_SUCCESS) { - DPRINT1 ("RegLoadKeyW() failed (Error %ld)\n", GetLastError()); + DPRINT1 ("RegLoadKeyW() failed (Error %ld)\n", Error); RtlFreeUnicodeString (&SidString); + SetLastError((DWORD)Error); return FALSE; } - if (RegOpenKeyExW (HKEY_USERS, - SidString.Buffer, - 0, - KEY_ALL_ACCESS, - (PHKEY)&lpProfileInfo->hProfile)) + Error = RegOpenKeyExW (HKEY_USERS, + SidString.Buffer, + 0, + KEY_ALL_ACCESS, + (PHKEY)&lpProfileInfo->hProfile); + if (Error != ERROR_SUCCESS) { - DPRINT1 ("RegOpenKeyExW() failed (Error %ld)\n", GetLastError()); + DPRINT1 ("RegOpenKeyExW() failed (Error %ld)\n", Error); RtlFreeUnicodeString (&SidString); + SetLastError((DWORD)Error); return FALSE; } @@ -875,6 +919,7 @@ HANDLE hProfile) { UNICODE_STRING SidString; + LONG Error; DPRINT ("UnloadUserProfile() called\n"); @@ -896,11 +941,13 @@ DPRINT ("SidString: '%wZ'\n", &SidString); - if (RegUnLoadKeyW (HKEY_USERS, - SidString.Buffer)) + Error = RegUnLoadKeyW (HKEY_USERS, + SidString.Buffer); + if (Error != ERROR_SUCCESS) { - DPRINT1 ("RegUnLoadKeyW() failed (Error %ld)\n", GetLastError()); + DPRINT1 ("RegUnLoadKeyW() failed (Error %ld)\n", Error); RtlFreeUnicodeString (&SidString); + SetLastError((DWORD)Error); return FALSE; } _____ Modified: trunk/reactos/lib/userenv/registry.c --- trunk/reactos/lib/userenv/registry.c 2006-01-11 23:54:44 UTC (rev 20794) +++ trunk/reactos/lib/userenv/registry.c 2006-01-12 00:11:14 UTC (rev 20795) @@ -37,6 +37,21 @@ CopyKey (HKEY hDstKey, HKEY hSrcKey) { + LONG Error; + +#if (_WIN32_WINNT >= 0x0600) + Error = RegCopyTreeW(hSrcKey, + NULL, + hDstKey); + if (Error != ERROR_SUCCESS) + { + SetLastError((DWORD)Error); + return FALSE; + } + + return TRUE; + +#else FILETIME LastWrite; DWORD dwSubKeys; DWORD dwValues; @@ -56,20 +71,22 @@ DPRINT ("CopyKey() called \n"); - if (RegQueryInfoKey (hSrcKey, - NULL, - NULL, - NULL, - &dwSubKeys, - &dwMaxSubKeyNameLength, - NULL, - &dwValues, - &dwMaxValueNameLength, - &dwMaxValueLength, - NULL, - NULL)) + Error = RegQueryInfoKey (hSrcKey, + NULL, + NULL, + NULL, + &dwSubKeys, + &dwMaxSubKeyNameLength, + NULL, + &dwValues, + &dwMaxValueNameLength, + &dwMaxValueLength, + NULL, + NULL); + if (Error != ERROR_SUCCESS) { - DPRINT1 ("RegQueryInfoKey() failed (Error %lu)\n", GetLastError ()); + DPRINT1 ("RegQueryInfoKey() failed (Error %lu)\n", Error); + SetLastError((DWORD)Error); return FALSE; } @@ -88,56 +105,63 @@ if (lpNameBuffer == NULL) { DPRINT1("Buffer allocation failed\n"); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } for (i = 0; i < dwSubKeys; i++) { dwSubKeyNameLength = dwMaxSubKeyNameLength; - if (RegEnumKeyExW (hSrcKey, - i, - lpNameBuffer, - &dwSubKeyNameLength, - NULL, - NULL, - NULL, - &LastWrite)) + Error = RegEnumKeyExW (hSrcKey, + i, + lpNameBuffer, + &dwSubKeyNameLength, + NULL, + NULL, + NULL, + &LastWrite); + if (Error != ERROR_SUCCESS) { - DPRINT1 ("Subkey enumeration failed (Error %lu)\n", GetLastError()); + DPRINT1 ("Subkey enumeration failed (Error %lu)\n", Error); HeapFree (GetProcessHeap (), 0, lpNameBuffer); + SetLastError((DWORD)Error); return FALSE; } - if (RegCreateKeyExW (hDstKey, - lpNameBuffer, - 0, - NULL, - REG_OPTION_NON_VOLATILE, - KEY_WRITE, - NULL, - &hDstSubKey, - &dwDisposition)) + Error = RegCreateKeyExW (hDstKey, + lpNameBuffer, + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_WRITE, + NULL, + &hDstSubKey, + &dwDisposition); + if (Error != ERROR_SUCCESS) { - DPRINT1 ("Subkey creation failed (Error %lu)\n", GetLastError()); + DPRINT1 ("Subkey creation failed (Error %lu)\n", Error); HeapFree (GetProcessHeap (), 0, lpNameBuffer); + SetLastError((DWORD)Error); return FALSE; } - if (RegOpenKeyExW (hSrcKey, - lpNameBuffer, - 0, - KEY_READ, - &hSrcSubKey)) + Error = RegOpenKeyExW (hSrcKey, + lpNameBuffer, + 0, + KEY_READ, + &hSrcSubKey); + if (Error != ERROR_SUCCESS) { - DPRINT1 ("Error: %lu\n", GetLastError()); + DPRINT1 ("Error: %lu\n", Error); RegCloseKey (hDstSubKey); HeapFree (GetProcessHeap (), 0, lpNameBuffer); + SetLastError((DWORD)Error); return FALSE; } @@ -171,6 +195,7 @@ if (lpNameBuffer == NULL) { DPRINT1 ("Buffer allocation failed\n"); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } @@ -183,6 +208,7 @@ HeapFree (GetProcessHeap (), 0, lpNameBuffer); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } @@ -190,39 +216,43 @@ { dwValueNameLength = dwMaxValueNameLength; dwValueLength = dwMaxValueLength; - if (RegEnumValueW (hSrcKey, - i, - lpNameBuffer, - &dwValueNameLength, - NULL, - &dwType, - lpDataBuffer, - &dwValueLength)) + Error = RegEnumValueW (hSrcKey, + i, + lpNameBuffer, + &dwValueNameLength, + NULL, + &dwType, [truncated at 1000 lines; 587 more skipped]

18 years, 8 months

[ion] 20794: - Rewrite usermode callbacks. These changes should greatly optimize graphic operations. After these changes, my "idle" CPU Usage in taskmgr went from 7-8% to 4-5%, while on the performace page, from 15-18% to 10-13%:

by ion＠svn.reactos.org

- Rewrite usermode callbacks. These changes should greatly optimize graphic operations. After these changes, my "idle" CPU Usage in taskmgr went from 7-8% to 4-5%, while on the performace page, from 15-18% to 10-13%: * Do not use ugly and messy code to create linked stacks and other such resource-wasting steps. Use our newly implemented 60KB stack support and MmGrowKernelStack when needed. * Write all the low-level code in assembly instead of relying on structures and hodgepodge code. * Add debugging/detection features for invalid calls, such as invalid IRQL, APCs being disabled, invalid previous mode detection (this allowed me to fix the KWAIT_BLOCK bug today). * Finally fix the last (I hope) remaning trap frame bug issue related to V86 mode bias. One of the "hacks" in syscall.S has already been removed and I can now do the promised cleanup. * Allow some failulre cases in callbacks (not all implemented) and extend stack space for future use of SEH in the ntdll dispatcher. * Fix win32k to use callbacks properly: the system fills out *Result and *ResultLength, not the caller. * Use SEH (ProbeForWrite) in callbacks to detect invalid user-mode memory. * Save NPX State and ExceptionList across callbacks (I think this wasn't fully properly done in all cases). Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S Modified: trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S Modified: trunk/reactos/ntoskrnl/ke/usercall.c Modified: trunk/reactos/ntoskrnl/ke/wait.c Modified: trunk/reactos/ntoskrnl/ps/psmgr.c Modified: trunk/reactos/ntoskrnl/ps/win32.c Modified: trunk/reactos/subsys/win32k/ntuser/callback.c _____ Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S --- trunk/reactos/ntoskrnl/ke/i386/syscall.S 2006-01-11 23:22:15 UTC (rev 20793) +++ trunk/reactos/ntoskrnl/ke/i386/syscall.S 2006-01-11 23:54:44 UTC (rev 20794) @@ -470,23 +470,14 @@ ja RestoreAll // ==================== END IF FULL RESTORE NEEDED ====================// - /* Skip debug information and unsaved registers */ - //badbadbad - add esp, 0x30 - pop gs - pop es - pop ds - add esp, 0x14 -//badbadbad - /* Restore FS */ RestoreFs: - //lea esp, [ebp+KTRAP_FRAME_FS] <= BUG IN WIN32K CALLBACKS! STACK GETS SMASHED + lea esp, [ebp+KTRAP_FRAME_FS] pop fs CommonStackClean: /* Skip debug information and unsaved registers */ - //lea esp, [ebp+KTRAP_FRAME_EDI] <= BUG IN WIN32K CALLBACKS! STACK GETS SMASHED + 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-11 23:22:15 UTC (rev 20793) +++ trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S 2006-01-11 23:54:44 UTC (rev 20794) @@ -248,9 +248,9 @@ * @remark This call MUST be paired with KeUserModeCallback. * *--*/ -.globl _NtCallbackReturn2@12 -.func NtCallbackReturn2@12 -_NtCallbackReturn2@12: +.globl _NtCallbackReturn@12 +.func NtCallbackReturn@12 +_NtCallbackReturn@12: /* Get the current thread and make sure we have a callback stack */ mov eax, fs:[KPCR_CURRENT_THREAD] _____ Modified: trunk/reactos/ntoskrnl/ke/usercall.c --- trunk/reactos/ntoskrnl/ke/usercall.c 2006-01-11 23:22:15 UTC (rev 20793) +++ trunk/reactos/ntoskrnl/ke/usercall.c 2006-01-11 23:54:44 UTC (rev 20794) @@ -3,7 +3,6 @@ * PROJECT: ReactOS kernel * FILE: ntoskrnl/ke/usercall.c * PURPOSE: User-Mode callbacks. Portable part. - * * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) */ @@ -13,149 +12,21 @@ #define NDEBUG #include <internal/debug.h> -#if defined (ALLOC_PRAGMA) -#pragma alloc_text(INIT, PsInitialiseW32Call) -#endif - -/* FUNCTIONS *****************************************************************/ - -#if ALEX_CB_REWRITE - NTSTATUS STDCALL -KiSwitchToUserMode(IN PVOID *OutputBuffer, - IN PULONG OutputLength); +KiCallUserMode( + IN PVOID *OutputBuffer, + IN PULONG OutputLength +); -#else +PULONG +STDCALL +KiGetUserModeStackAddress( + VOID +); -typedef struct _NTW32CALL_SAVED_STATE -{ - ULONG_PTR SavedStackLimit; - PVOID SavedStackBase; - PVOID SavedInitialStack; - PVOID CallerResult; - PULONG CallerResultLength; - PNTSTATUS CallbackStatus; - PKTRAP_FRAME SavedTrapFrame; - PVOID SavedCallbackStack; - PVOID SavedExceptionStack; -} NTW32CALL_SAVED_STATE, *PNTW32CALL_SAVED_STATE; +/* FUNCTIONS *****************************************************************/ -typedef struct -{ - PVOID BaseAddress; - LIST_ENTRY ListEntry; -} NTW32CALL_CALLBACK_STACK, *PNTW32CALL_CALLBACK_STACK; - -KSPIN_LOCK CallbackStackListLock; -static LIST_ENTRY CallbackStackListHead; - -VOID -INIT_FUNCTION -NTAPI -PsInitialiseW32Call(VOID) -{ - InitializeListHead(&CallbackStackListHead); - KeInitializeSpinLock(&CallbackStackListLock); -} - -VOID STATIC -PsFreeCallbackStackPage(PVOID Context, MEMORY_AREA* MemoryArea, PVOID Address, - PFN_TYPE Page, SWAPENTRY SwapEntry, - BOOLEAN Dirty) -{ - ASSERT(SwapEntry == 0); - if (Page != 0) - { - MmReleasePageMemoryConsumer(MC_NPPOOL, Page); - } -} - -VOID STATIC -PsFreeCallbackStack(PVOID StackLimit) -{ - MmLockAddressSpace(MmGetKernelAddressSpace()); - MmFreeMemoryAreaByPtr(MmGetKernelAddressSpace(), - StackLimit, - PsFreeCallbackStackPage, - NULL); - MmUnlockAddressSpace(MmGetKernelAddressSpace()); -} - -VOID -PsFreeCallbackStacks(VOID) -{ - PLIST_ENTRY CurrentListEntry; - PNTW32CALL_CALLBACK_STACK Current; - - while (!IsListEmpty(&CallbackStackListHead)) - { - CurrentListEntry = RemoveHeadList(&CallbackStackListHead); - Current = CONTAINING_RECORD(CurrentListEntry, NTW32CALL_CALLBACK_STACK, - ListEntry); - PsFreeCallbackStack(Current->BaseAddress); - ExFreePool(Current); - } -} - -PVOID STATIC -PsAllocateCallbackStack(ULONG StackSize) -{ - PVOID KernelStack = NULL; - NTSTATUS Status; - PMEMORY_AREA StackArea; - ULONG i, j; - PHYSICAL_ADDRESS BoundaryAddressMultiple; - PPFN_TYPE Pages = alloca(sizeof(PFN_TYPE) * (StackSize /PAGE_SIZE)); - - - BoundaryAddressMultiple.QuadPart = 0; - StackSize = PAGE_ROUND_UP(StackSize); - MmLockAddressSpace(MmGetKernelAddressSpace()); - Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_KERNEL_STACK, - &KernelStack, - StackSize, - PAGE_READWRITE, - &StackArea, - FALSE, - 0, - BoundaryAddressMultiple); - MmUnlockAddressSpace(MmGetKernelAddressSpace()); - if (!NT_SUCCESS(Status)) - { - DPRINT("Failed to create thread stack\n"); - return(NULL); - } - for (i = 0; i < (StackSize / PAGE_SIZE); i++) - { - Status = MmRequestPageMemoryConsumer(MC_NPPOOL, TRUE, &Pages[i]); - if (!NT_SUCCESS(Status)) - { - for (j = 0; j < i; j++) - { - MmReleasePageMemoryConsumer(MC_NPPOOL, Pages[j]); - } - return(NULL); - } - } - Status = MmCreateVirtualMapping(NULL, - KernelStack, - PAGE_READWRITE, - Pages, - StackSize / PAGE_SIZE); - if (!NT_SUCCESS(Status)) - { - for (i = 0; i < (StackSize / PAGE_SIZE); i++) - { - MmReleasePageMemoryConsumer(MC_NPPOOL, Pages[i]); - } - return(NULL); - } - return(KernelStack); -} -#endif - /* * @implemented */ @@ -167,92 +38,63 @@ OUT PVOID *Result, OUT PULONG ResultLength) { - PETHREAD Thread; - PVOID NewStack; - ULONG_PTR StackSize; - PKTRAP_FRAME NewFrame; - PULONG UserEsp; - KIRQL oldIrql; - NTSTATUS CallbackStatus; - NTW32CALL_SAVED_STATE SavedState; - PNTW32CALL_CALLBACK_STACK AssignedStack; + ULONG_PTR NewStack, OldStack; + PULONG UserEsp; + NTSTATUS CallbackStatus; + PEXCEPTION_REGISTRATION_RECORD ExceptionList; + DPRINT("KeUserModeCallback(RoutineIndex %d, Argument %X, ArgumentLength %d)\n", + RoutineIndex, Argument, ArgumentLength); + ASSERT(KeGetCurrentThread()->ApcState.KernelApcInProgress == FALSE); + ASSERT(KeGetPreviousMode() == UserMode); - PAGED_CODE(); + /* Get the current user-mode stack */ + UserEsp = KiGetUserModeStackAddress(); + OldStack = *UserEsp; - DPRINT("KeUserModeCallback(RoutineIndex %d, Argument %X, ArgumentLength %d)\n", - RoutineIndex, Argument, ArgumentLength); + /* Enter a SEH Block */ + _SEH_TRY + { + /* Calculate and align the stack size */ + NewStack = (OldStack - ArgumentLength) & ~3; - Thread = PsGetCurrentThread(); + /* Make sure it's writable */ + ProbeForWrite((PVOID)(NewStack - 6 * sizeof(ULONG_PTR)), + ArgumentLength + 6 * sizeof(ULONG_PTR), + sizeof(CHAR)); - /* Set up the new kernel and user environment. */ - StackSize = (ULONG_PTR)Thread->Tcb.StackBase - Thread->Tcb.StackLimit; - KeAcquireSpinLock(&CallbackStackListLock, &oldIrql); - if (IsListEmpty(&CallbackStackListHead)) - { - KeReleaseSpinLock(&CallbackStackListLock, oldIrql); - NewStack = PsAllocateCallbackStack(StackSize); - AssignedStack = ExAllocatePool(NonPagedPool, - sizeof(NTW32CALL_CALLBACK_STACK)); - AssignedStack->BaseAddress = NewStack; - } - else - { - PLIST_ENTRY StackEntry; + /* Copy the buffer into the stack */ + RtlCopyMemory((PVOID)NewStack, Argument, ArgumentLength); - StackEntry = RemoveHeadList(&CallbackStackListHead); - KeReleaseSpinLock(&CallbackStackListLock, oldIrql); - AssignedStack = CONTAINING_RECORD(StackEntry, NTW32CALL_CALLBACK_STACK, - ListEntry); - NewStack = AssignedStack->BaseAddress; - RtlZeroMemory(NewStack, StackSize); - } - /* FIXME: Need to check whether we were interrupted from v86 mode. */ - RtlCopyMemory((char*)NewStack + StackSize - sizeof(KTRAP_FRAME) - sizeof(FX_SAVE_AREA), - Thread->Tcb.TrapFrame, sizeof(KTRAP_FRAME) - (4 * sizeof(ULONG))); - NewFrame = (PKTRAP_FRAME)((char*)NewStack + StackSize - sizeof(KTRAP_FRAME) - sizeof(FX_SAVE_AREA)); - /* We need the stack pointer to remain 4-byte aligned */ - NewFrame->HardwareEsp -= (((ArgumentLength + 3) & (~ 0x3)) + (4 * sizeof(ULONG))); - NewFrame->Eip = (ULONG)KeUserCallbackDispatcher; - UserEsp = (PULONG)NewFrame->HardwareEsp; - UserEsp[0] = 0; /* Return address. */ - UserEsp[1] = RoutineIndex; - UserEsp[2] = (ULONG)&UserEsp[4]; - UserEsp[3] = ArgumentLength; - RtlCopyMemory((PVOID)&UserEsp[4], Argument, ArgumentLength); + /* Write the arguments */ + NewStack -= 24; + *(PULONG)NewStack = 0; + *(PULONG)(NewStack + 4) = RoutineIndex; + *(PULONG)(NewStack + 8) = (NewStack + 24); + *(PULONG)(NewStack + 12) = ArgumentLength; - /* Switch to the new environment and return to user-mode. */ - KeRaiseIrql(HIGH_LEVEL, &oldIrql); - SavedState.SavedStackLimit = Thread->Tcb.StackLimit; - SavedState.SavedStackBase = Thread->Tcb.StackBase; - SavedState.SavedInitialStack = Thread->Tcb.InitialStack; - SavedState.CallerResult = Result; - SavedState.CallerResultLength = ResultLength; - SavedState.CallbackStatus = &CallbackStatus; - SavedState.SavedTrapFrame = Thread->Tcb.TrapFrame; - SavedState.SavedCallbackStack = Thread->Tcb.CallbackStack; - SavedState.SavedExceptionStack = (PVOID)KeGetCurrentKPCR()->TSS->Esp0; - if ((Thread->Tcb.NpxState & NPX_STATE_VALID) && - &Thread->Tcb != KeGetCurrentPrcb()->NpxThread) + /* Save the exception list */ + ExceptionList = KeGetCurrentThread()->Teb->Tib.ExceptionList; + + /* Jump to user mode */ + *UserEsp = NewStack; + CallbackStatus = KiCallUserMode(Result, ResultLength); + + /* FIXME: Handle user-mode exception status */ + + /* Restore exception list */ + KeGetCurrentThread()->Teb->Tib.ExceptionList = ExceptionList; + } + _SEH_HANDLE { - RtlCopyMemory((char*)NewStack + StackSize - sizeof(FX_SAVE_AREA), - (char*)SavedState.SavedInitialStack - sizeof(FX_SAVE_AREA), - sizeof(FX_SAVE_AREA)); + CallbackStatus = _SEH_GetExceptionCode(); } - Thread->Tcb.InitialStack = Thread->Tcb.StackBase = (char*)NewStack + StackSize; - Thread->Tcb.StackLimit = (ULONG)NewStack; - Thread->Tcb.KernelStack = (char*)NewStack + StackSize - sizeof(KTRAP_FRAME) - sizeof(FX_SAVE_AREA); - KeGetCurrentKPCR()->TSS->Esp0 = (ULONG)Thread->Tcb.InitialStack - sizeof(FX_SAVE_AREA) - 0x10; - KePushAndStackSwitchAndSysRet((ULONG)&SavedState, Thread->Tcb.KernelStack); + _SEH_END; - /* - * The callback return will have already restored most of the state we - * modified. - */ - KeLowerIrql(DISPATCH_LEVEL); - KeAcquireSpinLockAtDpcLevel(&CallbackStackListLock); - InsertTailList(&CallbackStackListHead, &AssignedStack->ListEntry); - KeReleaseSpinLock(&CallbackStackListLock, PASSIVE_LEVEL); - return(CallbackStatus); + /* FIXME: Flush GDI Batch */ + + /* Restore stack and return */ + *UserEsp = OldStack; + return CallbackStatus; } /* EOF */ _____ Modified: trunk/reactos/ntoskrnl/ke/wait.c --- trunk/reactos/ntoskrnl/ke/wait.c 2006-01-11 23:22:15 UTC (rev 20793) +++ trunk/reactos/ntoskrnl/ke/wait.c 2006-01-11 23:54:44 UTC (rev 20794) @@ -680,7 +680,7 @@ /* Release & Return */ DPRINT("Returning, %x. Status: %d\n. We did not wait.", - KeGetCurrentThread(), WaitStatus); + KeGetCurrentThread(), WaitStatus); KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql); return WaitStatus; } _____ Modified: trunk/reactos/ntoskrnl/ps/psmgr.c --- trunk/reactos/ntoskrnl/ps/psmgr.c 2006-01-11 23:22:15 UTC (rev 20793) +++ trunk/reactos/ntoskrnl/ps/psmgr.c 2006-01-11 23:54:44 UTC (rev 20794) @@ -78,7 +78,6 @@ PsInitProcessManagment(); PsInitThreadManagment(); PsInitIdleThread(); - PsInitialiseW32Call(); } VOID _____ Modified: trunk/reactos/ntoskrnl/ps/win32.c --- trunk/reactos/ntoskrnl/ps/win32.c 2006-01-11 23:22:15 UTC (rev 20793) +++ trunk/reactos/ntoskrnl/ps/win32.c 2006-01-11 23:54:44 UTC (rev 20794) @@ -212,89 +212,4 @@ return(CallbackStatus); } -#ifndef ALEX_CB_REWRITE -NTSTATUS STDCALL -NtCallbackReturn (PVOID Result, - ULONG ResultLength, - NTSTATUS Status) -{ - PULONG OldStack; - PETHREAD Thread; - PNTSTATUS CallbackStatus; - PULONG CallerResultLength; - PVOID* CallerResult; - PVOID InitialStack; - PVOID StackBase; - ULONG_PTR StackLimit; - KIRQL oldIrql; - PNTW32CALL_SAVED_STATE State; - PKTRAP_FRAME SavedTrapFrame; - PVOID SavedCallbackStack; - PVOID SavedExceptionStack; - - PAGED_CODE(); - - Thread = PsGetCurrentThread(); - if (Thread->Tcb.CallbackStack == NULL) - { - return(STATUS_NO_CALLBACK_ACTIVE); - } - - OldStack = (PULONG)Thread->Tcb.CallbackStack; - - /* - * Get the values that NtW32Call left on the inactive stack for us. - */ - State = (PNTW32CALL_SAVED_STATE)OldStack[0]; - CallbackStatus = State->CallbackStatus; - CallerResultLength = State->CallerResultLength; - CallerResult = State->CallerResult; - InitialStack = State->SavedInitialStack; - StackBase = State->SavedStackBase; - StackLimit = State->SavedStackLimit; - SavedTrapFrame = State->SavedTrapFrame; - SavedCallbackStack = State->SavedCallbackStack; - SavedExceptionStack = State->SavedExceptionStack; - - /* - * Copy the callback status and the callback result to NtW32Call - */ - *CallbackStatus = Status; - if (CallerResult != NULL && CallerResultLength != NULL) - { - if (Result == NULL) - { - *CallerResultLength = 0; - } - else - { - *CallerResultLength = min(ResultLength, *CallerResultLength); - RtlCopyMemory(*CallerResult, Result, *CallerResultLength); - } - } - - /* - * Restore the old stack. - */ - KeRaiseIrql(HIGH_LEVEL, &oldIrql); - if ((Thread->Tcb.NpxState & NPX_STATE_VALID) && - &Thread->Tcb != KeGetCurrentPrcb()->NpxThread) - { - RtlCopyMemory((char*)InitialStack - sizeof(FX_SAVE_AREA), - (char*)Thread->Tcb.InitialStack - sizeof(FX_SAVE_AREA), - sizeof(FX_SAVE_AREA)); - } - Thread->Tcb.InitialStack = InitialStack; - Thread->Tcb.StackBase = StackBase; - Thread->Tcb.StackLimit = StackLimit; - Thread->Tcb.TrapFrame = SavedTrapFrame; - Thread->Tcb.CallbackStack = SavedCallbackStack; - KeGetCurrentKPCR()->TSS->Esp0 = (ULONG)SavedExceptionStack; - KeStackSwitchAndRet((PVOID)(OldStack + 1)); - - /* Should never return. */ - KEBUGCHECK(0); - return(STATUS_UNSUCCESSFUL); -} -#endif /* EOF */ _____ Modified: trunk/reactos/subsys/win32k/ntuser/callback.c --- trunk/reactos/subsys/win32k/ntuser/callback.c 2006-01-11 23:22:15 UTC (rev 20793) +++ trunk/reactos/subsys/win32k/ntuser/callback.c 2006-01-11 23:54:44 UTC (rev 20794) @@ -182,7 +182,7 @@ Arguments->wParam = wParam; Arguments->lParam = lParam; Arguments->lParamBufferSize = lParamBufferSize; - ResultPointer = Arguments; + ResultPointer = NULL; ResultLength = ArgumentLength; UserLeaveCo(); @@ -193,6 +193,9 @@ &ResultPointer, &ResultLength); + /* Simulate old behaviour: copy into our local buffer */ + RtlMoveMemory(Arguments, ResultPointer, ArgumentLength); + UserEnterCo(); if (!NT_SUCCESS(Status)) @@ -224,7 +227,7 @@ PVOID ResultPointer; ULONG ResultLength; - ResultPointer = &Result; + ResultPointer = NULL; ResultLength = sizeof(LRESULT); UserLeaveCo(); @@ -235,6 +238,9 @@ &ResultPointer, &ResultLength); + /* Simulate old behaviour: copy into our local buffer */ + Result = *(LRESULT*)ResultPointer; + UserEnterCo(); if (!NT_SUCCESS(Status)) @@ -253,7 +259,7 @@ ULONG ResultLength; BOOL DefaultCursor = TRUE; - ResultPointer = &Result; + ResultPointer = NULL; ResultLength = sizeof(LRESULT); UserLeaveCo(); @@ -264,6 +270,9 @@ &ResultPointer, &ResultLength); + /* Simulate old behaviour: copy into our local buffer */ + Result = *(LRESULT*)ResultPointer; + UserEnterCo(); if (!NT_SUCCESS(Status)) @@ -384,7 +393,7 @@ break; } - ResultPointer = &Result; + ResultPointer = NULL; ResultLength = sizeof(LRESULT); UserLeaveCo(); @@ -395,6 +404,9 @@ &ResultPointer, &ResultLength); + /* Simulate old behaviour: copy into our local buffer */ + Result = *(LRESULT*)ResultPointer; + UserEnterCo(); IntCbFreeMemory(Argument);

18 years, 8 months

← Newer
1
...
26
27
28
29
30
31
32
...
59
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2006