Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 57456: [REGEDIT - Fix comment headers. - Improve error-displaying function and add another one (to be used later on). - Clear a part of code.
by hbelusca＠svn.reactos.org 01 Oct '12

01 Oct '12

Author: hbelusca Date: Mon Oct 1 23:16:43 2012 New Revision: 57456 URL: http://svn.reactos.org/svn/reactos?rev=57456&view=rev Log: [REGEDIT - Fix comment headers. - Improve error-displaying function and add another one (to be used later on). - Clear a part of code. Modified: trunk/reactos/base/applications/regedit/error.c trunk/reactos/base/applications/regedit/main.h trunk/reactos/base/applications/regedit/regedit.c trunk/reactos/base/applications/regedit/regproc.c trunk/reactos/base/applications/regedit/settings.c Modified: trunk/reactos/base/applications/regedit/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/error.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/error.c [iso-8859-1] Mon Oct 1 23:16:43 2012 @@ -1,14 +1,76 @@ +/* + * Regedit errors, warnings, informations displaying + * + * Copyright (C) 2010 Adam Kachwalla <geekdundee(a)gmail.com> + * Copyright (C) 2012 HermÃ¨s BÃ©lusca - MaÃ¯to <hermes.belusca(a)sfr.fr> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + #include <regedit.h> -void ErrorMessageBox(HWND hWnd, LPCTSTR title, DWORD code) + +int ErrorMessageBox(HWND hWnd, LPCTSTR lpTitle, DWORD dwErrorCode, ...) { - LPTSTR lpMsgBuf; - DWORD status; - static const TCHAR fallback[] = TEXT("Error displaying error message.\n"); - status = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, - NULL, code, 0, (LPTSTR)&lpMsgBuf, 0, NULL); - if (!status) - lpMsgBuf = (LPTSTR)fallback; - MessageBox(hWnd, lpMsgBuf, title, MB_OK | MB_ICONERROR); - if (lpMsgBuf != fallback) - LocalFree(lpMsgBuf); + int iRet = 0; + LPTSTR lpMsgBuf = NULL; + DWORD Status = 0; + + va_list args = NULL; + va_start(args, dwErrorCode); + + Status = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, + NULL, + dwErrorCode, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPTSTR)&lpMsgBuf, + 0, + &args); + + va_end(args); + + iRet = MessageBox(hWnd, (Status && lpMsgBuf ? lpMsgBuf : TEXT("Error displaying error message.\n")), lpTitle, MB_OK | MB_ICONERROR); + + if (lpMsgBuf) LocalFree(lpMsgBuf); + + /* Return the MessageBox information */ + return iRet; } + +int InfoMessageBox(HWND hWnd, UINT uType, LPCTSTR lpTitle, LPCTSTR lpMessage, ...) +{ + int iRet = 0; + LPTSTR lpMsgBuf = NULL; + DWORD Status = 0; + + va_list args = NULL; + va_start(args, lpMessage); + + Status = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING, + lpMessage, + 0, + 0, + (LPTSTR)&lpMsgBuf, + 0, + &args); + + va_end(args); + + iRet = MessageBox(hWnd, (Status && lpMsgBuf ? lpMsgBuf : TEXT("Error displaying error message.\n")), lpTitle, uType); + + if (lpMsgBuf) LocalFree(lpMsgBuf); + + /* Return the MessageBox information */ + return iRet; +} Modified: trunk/reactos/base/applications/regedit/main.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/main.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/main.h [iso-8859-1] Mon Oct 1 23:16:43 2012 @@ -94,7 +94,8 @@ extern LPCTSTR get_root_key_name(HKEY hRootKey); /* error.c */ -extern void ErrorMessageBox(HWND hWnd, LPCTSTR title, DWORD code); +extern int ErrorMessageBox(HWND hWnd, LPCTSTR lpTitle, DWORD dwErrorCode, ...); +extern int InfoMessageBox(HWND hWnd, UINT uType, LPCTSTR lpTitle, LPCTSTR lpMessage, ...); /* find.c */ extern void FindDialog(HWND hWnd); Modified: trunk/reactos/base/applications/regedit/regedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regedit.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/regedit.c [iso-8859-1] Mon Oct 1 23:16:43 2012 @@ -1,7 +1,7 @@ /* * Windows regedit.exe registry editor implementation. * - * Copyright 2002 Andriy Palamarchuk + * Copyright (C) 2002 Andriy Palamarchuk * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -258,11 +258,12 @@ { if (chu == L'S') { + /* Silence dialogs */ silent = TRUE; } else if (chu == L'V') { - /* ignore these switches */ + /* Ignore this switch */ } else { @@ -323,14 +324,21 @@ if (*s && action == ACTION_UNDEF) { - TCHAR szTitle[256], szText[256]; - LoadString(hInst, IDS_APP_TITLE, szTitle, COUNT_OF(szTitle)); - LoadString(hInst, IDS_IMPORT_PROMPT, szText, COUNT_OF(szText)); - /* request import confirmation */ - if (silent || MessageBox(NULL, szText, szTitle, MB_YESNO) == IDYES) + if (!silent) + { + TCHAR szTitle[256], szText[256]; + LoadString(hInst, IDS_APP_TITLE, szTitle, COUNT_OF(szTitle)); + LoadString(hInst, IDS_IMPORT_PROMPT, szText, COUNT_OF(szText)); + /* request import confirmation */ + if (MessageBox(NULL, szText, szTitle, MB_YESNO) == IDYES) + action = ACTION_ADD; + else + return TRUE; + } + else + { action = ACTION_ADD; - else - return TRUE; + } } if (action == ACTION_UNDEF) return FALSE; Modified: trunk/reactos/base/applications/regedit/regproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/regproc.c [iso-8859-1] Mon Oct 1 23:16:43 2012 @@ -2,9 +2,9 @@ * Registry processing routines. Routines, common for registry * processing frontends. * - * Copyright 1999 Sylvain St-Germain - * Copyright 2002 Andriy Palamarchuk - * Copyright 2008 Alexander N. S?rnes <alex(a)thehandofagony.com> + * Copyright (C) 1999 Sylvain St-Germain + * Copyright (C) 2002 Andriy Palamarchuk + * Copyright (C) 2008 Alexander N. SÃ¸rnes <alex(a)thehandofagony.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public Modified: trunk/reactos/base/applications/regedit/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/settings.c [iso-8859-1] Mon Oct 1 23:16:43 2012 @@ -1,23 +1,23 @@ /* -* regedit (settings.c) -* -* Copyright 2012 Edijs Kolesnikovics <terminedijs(a)yahoo.com> -* Copyright 2012 Grégori Macário Harbs <mysoft64bits at gmail dot com> -* -* This library is free software; you can redistribute it and/or -* modify it under the terms of the GNU Lesser General Public -* License as published by the Free Software Foundation; either -* version 2.1 of the License, or (at your option) any later version. -* -* This library is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this library; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ + * Regedit settings + * + * Copyright (C) 2012 Edijs Kolesnikovics <terminedijs(a)yahoo.com> + * Copyright (C) 2012 Grégori Macário Harbs <mysoft64bits at gmail dot com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ #include <regedit.h>

1 0

[tkreuzer] 57455: [WIN32K] Sorry forgot to commit this file
by tkreuzer＠svn.reactos.org 01 Oct '12

01 Oct '12

Author: tkreuzer Date: Mon Oct 1 23:10:10 2012 New Revision: 57455 URL: http://svn.reactos.org/svn/reactos?rev=57455&view=rev Log: [WIN32K] Sorry forgot to commit this file Modified: trunk/reactos/win32ss/user/ntuser/ntuser.c Modified: trunk/reactos/win32ss/user/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntuser… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] Mon Oct 1 23:10:10 2012 @@ -20,6 +20,7 @@ BOOL gbInitialized; HINSTANCE hModClient = NULL; BOOL ClientPfnInit = FALSE; +PEPROCESS gpepCSRSS; /* PRIVATE FUNCTIONS *********************************************************/ @@ -46,7 +47,7 @@ gpsi->atomIconProp = IntAddGlobalAtom(L"SysIC", TRUE); gpsi->atomFrostedWindowProp = IntAddGlobalAtom(L"SysFrostedWindow", TRUE); - + AtomWndObj = IntAddGlobalAtom(L"SysWNDO", TRUE); AtomLayer = IntAddGlobalAtom(L"SysLayer", TRUE); AtomFlashWndState = IntAddGlobalAtom(L"FlashWState", TRUE); @@ -176,6 +177,9 @@ return STATUS_UNSUCCESSFUL; } + /* Save EPROCESS of CSRSS */ + gpepCSRSS = PsGetCurrentProcess(); + // Initialize Power Request List. // Initialize Media Change. // InitializeGreCSRSS();

1 0

[tkreuzer] 57454: [NTOSKRNL] Implement Kdbg CLI callbacks. These callbacks can be registered from external modules and allow to process kdbg commands. [WIN32K] Implement kdbg callbacks for gdi: "gd...
by tkreuzer＠svn.reactos.org 01 Oct '12

01 Oct '12

Author: tkreuzer Date: Mon Oct 1 23:06:32 2012 New Revision: 57454 URL: http://svn.reactos.org/svn/reactos?rev=57454&view=rev Log: [NTOSKRNL] Implement Kdbg CLI callbacks. These callbacks can be registered from external modules and allow to process kdbg commands. [WIN32K] Implement kdbg callbacks for gdi: "gdi!dumpht <type>" dumps the handle table, "gdi!handle <x>" dumps information about a handle. CORE-6650 #resolve Added: trunk/reactos/include/reactos/kdros.h (with props) Modified: trunk/reactos/ntoskrnl/include/internal/kd.h trunk/reactos/ntoskrnl/kd/kdmain.c trunk/reactos/ntoskrnl/kdbg/kdb_cli.c trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c trunk/reactos/win32ss/gdi/ntgdi/gdidebug.h trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h trunk/reactos/win32ss/user/ntuser/main.c Added: trunk/reactos/include/reactos/kdros.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/kdros.h?re… ============================================================================== --- trunk/reactos/include/reactos/kdros.h (added) +++ trunk/reactos/include/reactos/kdros.h [iso-8859-1] Mon Oct 1 23:06:32 2012 @@ -1,0 +1,65 @@ + + + +#pragma once + +#if 0 + +VOID +FORCEINLINE +KdRosDumpAllThreads(VOID) +{ + KdSystemDebugControl(' soR', (PVOID)DumpAllThreads, 0, 0, 0, 0, 0); +} + +VOID +FORCEINLINE +KdRosDumpUserThreads(VOID) +{ + KdSystemDebugControl(' soR', (PVOID)DumpUserThreads, 0, 0, 0, 0, 0); +} + +VOID +FORCEINLINE +KdRosDumpArmPfnDatabase(VOID) +{ + KdSystemDebugControl(' soR', (PVOID)KdSpare3, 0, 0, 0, 0, 0); +} +#endif + +VOID +FORCEINLINE +KdRosSetDebugCallback( + ULONG Id, + PVOID Callback) +{ + KdSystemDebugControl('CsoR', Callback, Id, 0, 0, 0, 0); +} + +VOID +FORCEINLINE +KdRosDumpStackFrames( + ULONG Count, + PULONG_PTR Backtrace) +{ + KdSystemDebugControl('DsoR', Backtrace, Count, 0, 0, 0, 0); +} + +#if KDBG +VOID +FORCEINLINE +KdRosRegisterCliCallback( + PVOID Callback) +{ + KdSystemDebugControl('RbdK', Callback, FALSE, 0, 0, 0, 0); +} + +VOID +FORCEINLINE +KdRosDeregisterCliCallback( + PVOID Callback) +{ + KdSystemDebugControl('RbdK', Callback, TRUE, 0, 0, 0, 0); +} +#endif + Propchange: trunk/reactos/include/reactos/kdros.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/ntoskrnl/include/internal/kd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/kd.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/kd.h [iso-8859-1] Mon Oct 1 23:06:32 2012 @@ -67,6 +67,21 @@ #ifdef __NTOSKRNL__ #if defined(KDBG) || DBG + +#if KDBG +typedef +BOOLEAN +(NTAPI *PKDBG_CLI_ROUTINE)( + IN PCHAR Command, + IN ULONG Argc, + IN PCH Argv[]); + +BOOLEAN +NTAPI +KdbRegisterCliCallback( + PVOID Callback, + BOOLEAN Deregister); +#endif VOID KdbSymProcessSymbols( Modified: trunk/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdmain.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] Mon Oct 1 23:06:32 2012 @@ -97,7 +97,15 @@ KeRosDumpStackFrames((PULONG)Buffer1, Buffer1Length); break; } -#endif + +#if KDBG + /* Register KDBG CLI callback */ + case 'RbdK': + { + Result = KdbRegisterCliCallback(Buffer1, Buffer1Length); + } +#endif /* KDBG */ +#endif /* DBG */ default: HalDisplayString ("Invalid debug service call!\n"); break; Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_cli.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] Mon Oct 1 23:06:32 2012 @@ -96,6 +96,7 @@ /* GLOBALS *******************************************************************/ +static PKDBG_CLI_ROUTINE KdbCliCallbacks[10]; static BOOLEAN KdbUseIntelSyntax = FALSE; /* Set to TRUE for intel syntax */ static BOOLEAN KdbBreakOnModuleLoad = FALSE; /* Set to TRUE to break into KDB when a module is loaded */ @@ -3266,6 +3267,82 @@ } } + +BOOLEAN +NTAPI +KdbRegisterCliCallback( + PVOID Callback, + BOOLEAN Deregister) +{ + ULONG i; + + /* Loop all entries */ + for (i = 0; i < _countof(KdbCliCallbacks); i++) + { + /* Check if deregistering was requested */ + if (Deregister) + { + /* Check if this entry is the one that was registered */ + if (KdbCliCallbacks[i] == Callback) + { + /* Delete it and report success */ + KdbCliCallbacks[i] = NULL; + return TRUE; + } + } + else + { + /* Check if this entry is free */ + if (KdbCliCallbacks[i] == NULL) + { + /* Set it and and report success */ + KdbCliCallbacks[i] = Callback; + return TRUE; + } + } + } + + /* Unsuccessful */ + return FALSE; +} + +/*! \brief Invokes registered CLI callbacks until one of them handled the + * Command. + * + * \param Command - Command line to parse and execute if possible. + * \param Argc - Number of arguments in Argv + * \param Argv - Array of strings, each of them containing one argument. + * + * \return TRUE, if the command was handled, FALSE if it was not handled. + */ +static +BOOLEAN +KdbpInvokeCliCallbacks( + IN PCHAR Command, + IN ULONG Argc, + IN PCH Argv[]) +{ + ULONG i; + + /* Loop all entries */ + for (i = 0; i < _countof(KdbCliCallbacks); i++) + { + /* Check if this entry is registered */ + if (KdbCliCallbacks[i]) + { + /* Invoke the callback and check if it handled the command */ + if (KdbCliCallbacks[i](Command, Argc, Argv)) + { + return TRUE; + } + } + } + + /* None of the callbacks handled the command */ + return FALSE; +} + + /*!\brief Parses command line and executes command if found * * \param Command Command line to parse and execute if possible. @@ -3280,6 +3357,7 @@ ULONG i; PCHAR p; ULONG Argc; + // FIXME: for what do we need a 1024 characters command line and 256 tokens? static PCH Argv[256]; static CHAR OrigCommand[1024]; @@ -3318,6 +3396,12 @@ { return KdbDebuggerCommands[i].Fn(Argc, Argv); } + } + + /* Now invoke the registered callbacks */ + if (KdbpInvokeCliCallbacks(Command, Argc, Argv)) + { + return TRUE; } KdbpPrint("Command '%s' is unknown.\n", OrigCommand); Modified: trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdidbg.c [iso-8859-1] Mon Oct 1 23:06:32 2012 @@ -118,7 +118,7 @@ VOID NTAPI -DbgDumpGdiHandleTable(void) +DbgDumpGdiHandleTableWithBT(void) { static int leak_reported = 0; int i, j, idx, nTraces = 0; @@ -729,6 +729,36 @@ return ret; } -#endif + +#if KDBG + +BOOLEAN +NTAPI +DbgGdiKdbgCliCallback( + IN PCHAR pszCommand, + IN ULONG argc, + IN PCH argv[]) +{ + + if (stricmp(argv[0], "gdi!dumpht") == 0) + { + DbgDumpGdiHandleTable(argc - 1, argv + 1); + } + else if (stricmp(argv[0], "gdi!handle") == 0) + { + DbgDumpHandleInfo(argv[1]); + } + else + { + /* Not handled */ + return FALSE; + } + + return TRUE; +} + +#endif // KDBG + +#endif // DBG /* EOF */ Modified: trunk/reactos/win32ss/gdi/ntgdi/gdidebug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdidebug… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdidebug.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdidebug.h [iso-8859-1] Mon Oct 1 23:06:32 2012 @@ -28,6 +28,15 @@ } data; } LOGENTRY, *PLOGENTRY; +#if KDBG +BOOLEAN +NTAPI +DbgGdiKdbgCliCallback( + IN PCHAR Command, + IN ULONG Argc, + IN PCH Argv[]); +#endif + #if DBG_ENABLE_EVENT_LOGGING VOID NTAPI DbgDumpEventList(PSLIST_HEADER pslh); VOID NTAPI DbgLogEvent(PSLIST_HEADER pslh, LOG_EVENT_TYPE nEventType, LPARAM lParam); @@ -44,7 +53,7 @@ #endif -VOID NTAPI DbgDumpGdiHandleTable(VOID); +VOID NTAPI DbgDumpGdiHandleTableWithBT(VOID); ULONG NTAPI DbgCaptureStackBackTace(PVOID* pFrames, ULONG nFramesToCapture); BOOL NTAPI DbgGdiHTIntegrityCheck(VOID); VOID NTAPI DbgDumpLockedGdiHandles(VOID); Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdiobj.c [iso-8859-1] Mon Oct 1 23:06:32 2012 @@ -1341,4 +1341,170 @@ return TRUE; } +#if DBG && KDBG +static const char * gpszObjectTypes[] = +{ + "FREE", "DC", "UNUSED1", "UNUSED2", "RGN", "SURF", "CLIENTOBJ", "PATH", + "PAL", "ICMLCS", "LFONT", "RFONT", "PFE", "PFT", "ICMCXF", "SPRITE", + "BRUSH", "UMPD", "UNUSED4", "SPACE", "UNUSED5", "META", "EFSTATE", + "BMFD", "VTFD", "TTFD", "RC", "TEMP", "DRVOBJ", "DCIOBJ", "SPOOL", + "RESERVED", "ALL" +}; + +extern PEPROCESS gpepCSRSS;; + +VOID +NTAPI +DbgDumpGdiHandleTable(ULONG argc, char *argv[]) +{ + ULONG i; + UCHAR Objt, jReqestedType; + PENTRY pentry; + POBJ pobj; + KAPC_STATE ApcState; + + /* No CSRSS, no handle table */ + if (!gpepCSRSS) return; + KeStackAttachProcess(&gpepCSRSS->Pcb, &ApcState); + + if (argc == 0) + { + USHORT Counts[GDIObjType_MAX_TYPE + 2] = {0}; + + /* Loop all possibly used entries in the handle table */ + for (i = RESERVE_ENTRIES_COUNT; i < gulFirstUnused; i++) + { + if (MmIsAddressValid(&gpentHmgr[i])) + { + Objt = gpentHmgr[i].Objt & 0x1F; + Counts[Objt]++; + } + } + + DbgPrint("Type Count\n"); + DbgPrint("-------------------\n"); + for (i = 0; i <= GDIObjType_MAX_TYPE; i++) + { + DbgPrint("%02x %-9s %d\n", + i, gpszObjectTypes[i], Counts[i]); + } + DbgPrint("\n"); + } + else + { + /* Loop all object types */ + for (i = 0; i <= GDIObjType_MAX_TYPE + 1; i++) + { + /* Check if this object type was requested */ + if (stricmp(argv[0], gpszObjectTypes[i]) == 0) + { + jReqestedType = i; + break; + } + } + + /* Check if we didn't find it yet */ + if (i > GDIObjType_MAX_TYPE) + { + /* Try if it's a number */ + i = atoi(argv[0]); + + /* Check for "0" */ + if ((i > GDIObjType_MAX_TYPE) || + ((i == 0) && (stricmp(argv[0], "0") == 0))) + { + DbgPrint("Unknown object type: %s\n", argv[0]); + goto leave; + } + + jReqestedType = i; + } + + /* Print header */ + DbgPrint("Index Handle Type ThreadId cLocks ulRefCount\n"); + DbgPrint("----------------------------------------------------\n"); + + /* Loop all possibly used entries in the handle table */ + for (i = RESERVE_ENTRIES_COUNT; i < gulFirstUnused; i++) + { + /* Get the entry and the object */ + pentry = &gpentHmgr[i]; + + if (!MmIsAddressValid(pentry)) continue; + + pobj = pentry->einfo.pobj; + Objt = pentry->Objt & 0x1F; + + if ((jReqestedType == GDIObjType_MAX_TYPE + 1) || + (Objt == jReqestedType)) + { + DbgPrint("%04lx %p %-9s 0x%06lx %-7ld ", + i, pobj->hHmgr, gpszObjectTypes[Objt], + pobj->dwThreadId, pobj->cExclusiveLock); + if (MmIsAddressValid(&gpaulRefCount[i])) + DbgPrint("0x%06lx\n", gpaulRefCount[i]); + else + DbgPrint("????????\n"); + } + } + } + +leave: + KeUnstackDetachProcess(&ApcState); +} + +VOID +NTAPI +DbgDumpHandleInfo(char *argv) +{ + ULONG_PTR ulObject; + BASEOBJECT *pobj; + ENTRY *pentry; + USHORT usIndex; + char *endptr; + KAPC_STATE ApcState; + + /* Skip optional '0x' prefix */ + if ((argv[0] == '0') && ((argv[1] == 'x') || (argv[1] == 'X'))) + argv += 2; + + /* Make a number from the string (hex) */ + ulObject = strtol(argv, &endptr, 16); + if (*endptr != '\0') + return; + + /* No CSRSS, no handle table */ + if (!gpepCSRSS) return; + KeStackAttachProcess(&gpepCSRSS->Pcb, &ApcState); + + usIndex = ulObject & 0xFFFF; + pentry = &gpentHmgr[usIndex]; + + if (MmIsAddressValid(pentry)) + { + pobj = pentry->einfo.pobj; + + DbgPrint("GDI handle=%p, type=%s, index=0x%lx, pentry=%p.\n", + ulObject, gpszObjectTypes[(ulObject >> 16) & 0x1f], + usIndex, pentry); + DbgPrint(" ENTRY = {.pobj = %p, ObjectOwner = 0x%lx, FullUnique = 0x%04x,\n" + " Objt=0x%02x, Flags = 0x%02x, pUser = 0x%p}\n", + pentry->einfo.pobj, pentry->ObjectOwner.ulObj, pentry->FullUnique, + pentry->Objt, pentry->Flags, pentry->pUser); + DbgPrint(" BASEOBJECT = {hHmgr = %p, dwThreadId = 0x%lx,\n" + " cExclusiveLock = %ld, BaseFlags = 0x%lx}\n", + pobj->hHmgr, pobj->dwThreadId, + pobj->cExclusiveLock, pobj->BaseFlags); + if (MmIsAddressValid(&gpaulRefCount[usIndex])) + DbgPrint(" gpaulRefCount[idx] = %ld\n", gpaulRefCount[usIndex]); + } + else + { + DbgPrint("Coudn't access ENTRY. Probably paged out.\n"); + } + + KeUnstackDetachProcess(&ApcState); +} +#endif // DBG && KDBG + /* EOF */ Modified: trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/gdiobj.h [iso-8859-1] Mon Oct 1 23:06:32 2012 @@ -180,3 +180,15 @@ PGDIOBJ NTAPI GDIOBJ_ShareLockObj(HGDIOBJ hObj, DWORD ObjectType); PVOID NTAPI GDI_MapHandleTable(PEPROCESS Process); +#if DBG && KDBG +VOID +NTAPI +DbgDumpGdiHandleTable( + ULONG argc, + char *argv[]); + +VOID +NTAPI +DbgDumpHandleInfo( + char *argv); +#endif Modified: trunk/reactos/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Mon Oct 1 23:06:32 2012 @@ -11,6 +11,7 @@ #define NDEBUG #include <debug.h> +#include <kdros.h> HANDLE hModuleWin; @@ -87,6 +88,9 @@ #if DBG DbgInitDebugChannels(); +#if KDBG + KdRosRegisterCliCallback(DbgGdiKdbgCliCallback); +#endif #endif TRACE_CH(UserProcess,"Allocated ppi 0x%p for PID:0x%lx\n", ppiCurrent, HandleToUlong(Process->UniqueProcessId)); @@ -408,7 +412,7 @@ TRACE_CH(UserThread,"Attached Thread ptiTo is getting switched!\n"); UserAttachThreadInput(ptiFrom, ptiCurrent, FALSE); } - + // ptiFrom if (ptiCurrent->pqAttach && ptiCurrent->MessageQueue) {

1 0

[hbelusca] 57453: [REGEDIT] - Update informative messages CORE-6239 Patch by Edijs Kolesnikovičs (1/2)
by hbelusca＠svn.reactos.org 01 Oct '12

01 Oct '12

Author: hbelusca Date: Mon Oct 1 22:00:38 2012 New Revision: 57453 URL: http://svn.reactos.org/svn/reactos?rev=57453&view=rev Log: [REGEDIT] - Update informative messages CORE-6239 Patch by Edijs Kolesnikovičs (1/2) Modified: trunk/reactos/base/applications/regedit/framewnd.c trunk/reactos/base/applications/regedit/lang/bg-BG.rc trunk/reactos/base/applications/regedit/lang/cs-CZ.rc trunk/reactos/base/applications/regedit/lang/de-DE.rc trunk/reactos/base/applications/regedit/lang/el-GR.rc trunk/reactos/base/applications/regedit/lang/en-US.rc trunk/reactos/base/applications/regedit/lang/es-ES.rc trunk/reactos/base/applications/regedit/lang/fr-FR.rc trunk/reactos/base/applications/regedit/lang/hu-HU.rc trunk/reactos/base/applications/regedit/lang/id-ID.rc trunk/reactos/base/applications/regedit/lang/it-IT.rc trunk/reactos/base/applications/regedit/lang/ja-JP.rc trunk/reactos/base/applications/regedit/lang/ko-KR.rc trunk/reactos/base/applications/regedit/lang/nl-NL.rc trunk/reactos/base/applications/regedit/lang/no-NO.rc trunk/reactos/base/applications/regedit/lang/pl-PL.rc trunk/reactos/base/applications/regedit/lang/pt-BR.rc trunk/reactos/base/applications/regedit/lang/pt-PT.rc trunk/reactos/base/applications/regedit/lang/ro-RO.rc trunk/reactos/base/applications/regedit/lang/ru-RU.rc trunk/reactos/base/applications/regedit/lang/sk-SK.rc trunk/reactos/base/applications/regedit/lang/sl-SI.rc trunk/reactos/base/applications/regedit/lang/sv-SE.rc trunk/reactos/base/applications/regedit/lang/th-TH.rc trunk/reactos/base/applications/regedit/lang/uk-UA.rc trunk/reactos/base/applications/regedit/lang/zh-CN.rc trunk/reactos/base/applications/regedit/lang/zh-TW.rc trunk/reactos/base/applications/regedit/regedit.c trunk/reactos/base/applications/regedit/resource.h Modified: trunk/reactos/base/applications/regedit/framewnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/framewnd.c [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -469,7 +469,7 @@ { /* Show successful import */ LoadString(hInst, IDS_APP_TITLE, szTitle, COUNT_OF(szTitle)); - LoadString(hInst, IDS_IMPORTED_OK, szText, COUNT_OF(szText)); + LoadString(hInst, IDS_IMPORT_OK, szText, COUNT_OF(szText)); MessageBox(NULL, szText, szTitle, MB_OK); bRet = TRUE; } Modified: trunk/reactos/base/applications/regedit/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/bg-BG.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -449,8 +449,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "ÐÐ° Ð±ÑÐ´Ð°Ñ Ð»Ð¸ Ð´Ð¾Ð±Ð°Ð²ÐµÐ½Ð¸ Ð´Ð°Ð½Ð½Ð¸ÑÐµ Ð² ÑÐµÐ³Ð¸ÑÑÑÑÐ°?" - IDS_IMPORTED_OK "Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸ÑÑÐ° ÑÐ° Ð´Ð¾Ð±Ð°Ð²ÐµÐ½Ð¸ Ð² ÑÐµÐ³Ð¸ÑÑÑÑÐ°" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/cs-CZ.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -434,8 +434,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "PÅidat data do registru?" - IDS_IMPORTED_OK "Data pÅidÃ¡na do registru." + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/de-DE.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -434,8 +434,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Add the data to the registry?" - IDS_IMPORTED_OK "Information added to the registry" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/el-GR.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -434,8 +434,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Add the data to the registry?" - IDS_IMPORTED_OK "Information added to the registry" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/en-US.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -434,8 +434,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Add the data the registry?" - IDS_IMPORTED_OK "Information added to the registry" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/es-ES.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -437,8 +437,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Agregar los datos al registro?" - IDS_IMPORTED_OK "La informaciÃ³n ha sido agregada al registro" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/fr-FR.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -430,8 +430,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Voulez-vous ajouter des informations dans le Registre ?" - IDS_IMPORTED_OK "Les informations ont bien Ã©tÃ© ajoutÃ©es dans le Registre." + IDS_IMPORT_PROMPT "L'ajout d'informations peut involontairement modifier ou supprimer des valeurs et endommager le fonctionnement de composants. Si vous n'Ãªtes pas sÃ»r de la source de ces informations dans '%1', ne les ajoutez pas au Registre.\n\nÃtes-vous sÃ»r de vouloir continuer ?" + IDS_IMPORT_OK "Les clÃ©s et valeurs contenues dans '%1' ont Ã©tÃ© correctement ajoutÃ©es au Registre." + IDS_IMPORT_ERROR "Impossible dâimporter '%1' Ã la suite dâune erreur lors de la lecture de ce fichier. Il sâagit dâune erreur disque, ou le fichier est endommagÃ©." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/hu-HU.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -435,8 +435,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Add the data to the registry?" - IDS_IMPORTED_OK "Information added to the registry" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/id-ID.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -433,8 +433,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Add the data to the registry?" - IDS_IMPORTED_OK "Information added to the registry" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/it-IT.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -436,8 +436,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Aggiungere l'informazione al registro?" - IDS_IMPORTED_OK "L'informazione Ã¨ stata aggiunta al registro" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/ja-JP.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -434,8 +434,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Add the data to the registry?" - IDS_IMPORTED_OK "Information added to the registry" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/ko-KR.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -419,8 +419,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Add the data to the registry?" - IDS_IMPORTED_OK "Information added to the registry" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/nl-NL.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -434,8 +434,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Add the data to the registry?" - IDS_IMPORTED_OK "Information added to the registry" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/no-NO.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -434,8 +434,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Add the data to the registry?" - IDS_IMPORTED_OK "Information added to the registry" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/pl-PL.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -441,8 +441,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Czy dodaÄ dane do rejestru?" - IDS_IMPORTED_OK "Dane dopisane do rejestru" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/pt-BR.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -435,8 +435,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Add the data to the registry?" - IDS_IMPORTED_OK "Information added to the registry" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/pt-PT.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -436,8 +436,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Add the data to the registry?" - IDS_IMPORTED_OK "Information added to the registry" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/ro-RO.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -432,8 +432,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "AdÄugaÈi data Ã®n registru?" - IDS_IMPORTED_OK "InformaÈia adÄugatÄ Ã®n registru" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/ru-RU.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -431,8 +431,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ Ð´Ð°Ð½Ð½ÑÐµ Ð² ÑÐµÐµÑÑÑ?" - IDS_IMPORTED_OK "ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð° Ð² ÑÐµÐµÑÑÑ" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/sk-SK.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -419,8 +419,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Add the data to the registry?" - IDS_IMPORTED_OK "Information added to the registry" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/sl-SI.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -434,8 +434,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Add the data to the registry?" - IDS_IMPORTED_OK "Information added to the registry" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/sv-SE.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -434,8 +434,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Add the data to the registry?" - IDS_IMPORTED_OK "Information added to the registry" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/th-TH.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -434,8 +434,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "Add the data to the registry?" - IDS_IMPORTED_OK "Information added to the registry" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/uk-UA.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -435,8 +435,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "ÐÐ¾Ð´Ð°ÑÐ¸ Ð´Ð°Ð½Ñ Ð´Ð¾ ÑÐµÑÑÑÑÑ?" - IDS_IMPORTED_OK "ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÑ Ð±ÑÐ»Ð° Ð´Ð¾Ð´Ð°Ð½Ð° Ð´Ð¾ ÑÐµÑÑÑÑÑ" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/zh-CN.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -434,8 +434,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "å¢å èµæå°æ³¨åè¡¨?" - IDS_IMPORTED_OK "èµæå·²è¢«å å°æ³¨åè¡¨" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/zh-TW.rc [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -435,8 +435,9 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_IMPORT_PROMPT "æ°å¢è³æè³ç»éï¼" - IDS_IMPORTED_OK "è³æå·²è¢«æ°å¢è³ç»é" + IDS_IMPORT_PROMPT "Adding information can unintentionally change or delete values and cause components to stop working correctly. If you do not trust the source of this information in '%1', do not add it to registry.\n\nAre you sure you want to continue?" + IDS_IMPORT_OK "The keys and values contained in '%1' have been successfully added to the registry." + IDS_IMPORT_ERROR "Cannot import '%1': Error opening the file. There may be a disk, file system error or file may not exist." END STRINGTABLE DISCARDABLE Modified: trunk/reactos/base/applications/regedit/regedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regedit.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/regedit.c [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -164,7 +164,7 @@ import_registry_file(fp); get_file_name(&s, filename); LoadString(hInst, IDS_APP_TITLE, szTitle, COUNT_OF(szTitle)); - LoadString(hInst, IDS_IMPORTED_OK, szText, COUNT_OF(szText)); + LoadString(hInst, IDS_IMPORT_OK, szText, COUNT_OF(szText)); /* show successful import */ if (!silent) MessageBox(NULL, szText, szTitle, MB_OK); Modified: trunk/reactos/base/applications/regedit/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/resource.h [iso-8859-1] Mon Oct 1 22:00:38 2012 @@ -190,55 +190,56 @@ #define IDS_GOTO_SUGGESTED_KEY 31128 #define IDS_IMPORT_PROMPT 31129 -#define IDS_IMPORTED_OK 31130 - -#define IDS_FINISHEDFIND 31131 - -#define IDS_BUSNUMBER 31132 -#define IDS_INTERFACE 31133 - -#define IDS_DMA_CHANNEL 31134 -#define IDS_DMA_PORT 31135 -#define IDS_INTERRUPT_VECTOR 31136 -#define IDS_INTERRUPT_LEVEL 31137 -#define IDS_INTERRUPT_AFFINITY 31138 -#define IDS_INTERRUPT_TYPE 31139 -#define IDS_MEMORY_ADDRESS 31140 -#define IDS_MEMORY_LENGTH 31141 -#define IDS_MEMORY_ACCESS 31142 -#define IDS_PORT_ADDRESS 31143 -#define IDS_PORT_LENGTH 31144 -#define IDS_PORT_ACCESS 31145 -#define IDS_SPECIFIC_RESERVED1 31146 -#define IDS_SPECIFIC_RESERVED2 31147 -#define IDS_SPECIFIC_DATASIZE 31148 - -#define IDS_PORT_PORT_IO 31149 -#define IDS_PORT_MEMORY_IO 31150 -#define IDS_INTERRUPT_EDGE_SENSITIVE 31151 -#define IDS_INTERRUPT_LEVEL_SENSITIVE 31152 -#define IDS_MEMORY_READ_ONLY 31153 -#define IDS_MEMORY_WRITE_ONLY 31154 -#define IDS_MEMORY_READ_WRITE 31155 - -#define IDS_BUS_UNDEFINED 31156 -#define IDS_BUS_INTERNAL 31157 -#define IDS_BUS_ISA 31158 -#define IDS_BUS_EISA 31159 -#define IDS_BUS_MICROCHANNEL 31160 -#define IDS_BUS_TURBOCHANNEL 31161 -#define IDS_BUS_PCIBUS 31162 -#define IDS_BUS_VMEBUS 31163 -#define IDS_BUS_NUBUS 31164 -#define IDS_BUS_PCMCIABUS 31165 -#define IDS_BUS_CBUS 31166 -#define IDS_BUS_MPIBUS 31167 -#define IDS_BUS_MPSABUS 31168 -#define IDS_BUS_PROCESSORINTERNAL 31169 -#define IDS_BUS_INTERNALPOWERBUS 31170 -#define IDS_BUS_PNPISABUS 31171 -#define IDS_BUS_PNPBUS 31172 -#define IDS_BUS_UNKNOWNTYPE 31173 +#define IDS_IMPORT_OK 31130 +#define IDS_IMPORT_ERROR 31131 + +#define IDS_FINISHEDFIND 31132 + +#define IDS_BUSNUMBER 31133 +#define IDS_INTERFACE 31134 + +#define IDS_DMA_CHANNEL 31135 +#define IDS_DMA_PORT 31136 +#define IDS_INTERRUPT_VECTOR 31137 +#define IDS_INTERRUPT_LEVEL 31138 +#define IDS_INTERRUPT_AFFINITY 31139 +#define IDS_INTERRUPT_TYPE 31140 +#define IDS_MEMORY_ADDRESS 31141 +#define IDS_MEMORY_LENGTH 31142 +#define IDS_MEMORY_ACCESS 31143 +#define IDS_PORT_ADDRESS 31144 +#define IDS_PORT_LENGTH 31145 +#define IDS_PORT_ACCESS 31146 +#define IDS_SPECIFIC_RESERVED1 31147 +#define IDS_SPECIFIC_RESERVED2 31148 +#define IDS_SPECIFIC_DATASIZE 31149 + +#define IDS_PORT_PORT_IO 31150 +#define IDS_PORT_MEMORY_IO 31151 +#define IDS_INTERRUPT_EDGE_SENSITIVE 31152 +#define IDS_INTERRUPT_LEVEL_SENSITIVE 31153 +#define IDS_MEMORY_READ_ONLY 31154 +#define IDS_MEMORY_WRITE_ONLY 31155 +#define IDS_MEMORY_READ_WRITE 31156 + +#define IDS_BUS_UNDEFINED 31157 +#define IDS_BUS_INTERNAL 31158 +#define IDS_BUS_ISA 31159 +#define IDS_BUS_EISA 31160 +#define IDS_BUS_MICROCHANNEL 31161 +#define IDS_BUS_TURBOCHANNEL 31162 +#define IDS_BUS_PCIBUS 31163 +#define IDS_BUS_VMEBUS 31164 +#define IDS_BUS_NUBUS 31165 +#define IDS_BUS_PCMCIABUS 31166 +#define IDS_BUS_CBUS 31167 +#define IDS_BUS_MPIBUS 31168 +#define IDS_BUS_MPSABUS 31169 +#define IDS_BUS_PROCESSORINTERNAL 31170 +#define IDS_BUS_INTERNALPOWERBUS 31171 +#define IDS_BUS_PNPISABUS 31172 +#define IDS_BUS_PNPBUS 31173 +#define IDS_BUS_UNKNOWNTYPE 31174 #define IDD_EDIT_STRING 2000 #define IDC_VALUE_NAME 2001

1 0

[hpoussin] 57452: [LSASRV] Add missing breaks (addendum to r57391)
by hpoussin＠svn.reactos.org 01 Oct '12

01 Oct '12

Author: hpoussin Date: Mon Oct 1 19:24:07 2012 New Revision: 57452 URL: http://svn.reactos.org/svn/reactos?rev=57452&view=rev Log: [LSASRV] Add missing breaks (addendum to r57391) Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Mon Oct 1 19:24:07 2012 @@ -259,6 +259,7 @@ case PolicyAuditLogInformation: /* 1 */ Status = LsarQueryAuditLog(PolicyHandle, PolicyInformation); + break; case PolicyAuditEventsInformation: /* 2 */ Status = LsarQueryAuditEvents(PolicyHandle, @@ -273,6 +274,7 @@ case PolicyPdAccountInformation: /* 4 */ Status = LsarQueryPdAccount(PolicyHandle, PolicyInformation); + break; case PolicyAccountDomainInformation: /* 5 */ Status = LsarQueryAccountDomain(PolicyHandle, @@ -287,6 +289,7 @@ case PolicyReplicaSourceInformation: /* 7 */ Status = LsarQueryReplicaSource(PolicyHandle, PolicyInformation); + break; case PolicyDefaultQuotaInformation: /* 8 */ Status = LsarQueryDefaultQuota(PolicyHandle,

1 0

[ekohl] 57451: [LSASRV] LsarOpenSecret: Do not check the granted access of the policy handle and return the proper status code.
by ekohl＠svn.reactos.org 01 Oct '12

01 Oct '12

Author: ekohl Date: Mon Oct 1 10:24:19 2012 New Revision: 57451 URL: http://svn.reactos.org/svn/reactos?rev=57451&view=rev Log: [LSASRV] LsarOpenSecret: Do not check the granted access of the policy handle and return the proper status code. Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Mon Oct 1 10:24:19 2012 @@ -1219,7 +1219,7 @@ /* Validate the PolicyHandle */ Status = LsapValidateDbObject(PolicyHandle, LsaDbPolicyObject, - POLICY_CREATE_SECRET, + 0, &PolicyObject); if (!NT_SUCCESS(Status)) { @@ -1251,7 +1251,7 @@ *SecretHandle = (LSAPR_HANDLE)SecretObject; } - return STATUS_SUCCESS; + return Status; }

1 0

[ion] 57450: [RTL]: Reformat, rewrite, comment, and fix when relevant the Rtl*SecurityDescriptor* APIs, as well as fix one wrong prototype and implement some unimplemented ones.
by ion＠svn.reactos.org 01 Oct '12

01 Oct '12

Author: ion Date: Mon Oct 1 03:02:12 2012 New Revision: 57450 URL: http://svn.reactos.org/svn/reactos?rev=57450&view=rev Log: [RTL]: Reformat, rewrite, comment, and fix when relevant the Rtl*SecurityDescriptor* APIs, as well as fix one wrong prototype and implement some unimplemented ones. Modified: trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/include/psdk/winnt.h trunk/reactos/lib/rtl/sd.c Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Mon Oct 1 03:02:12 2012 @@ -1240,7 +1240,7 @@ NTAPI RtlCopySecurityDescriptor( IN PSECURITY_DESCRIPTOR pSourceSecurityDescriptor, - OUT PSECURITY_DESCRIPTOR pDestinationSecurityDescriptor + OUT PSECURITY_DESCRIPTOR *pDestinationSecurityDescriptor ); NTSYSAPI Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Mon Oct 1 03:02:12 2012 @@ -1875,20 +1875,22 @@ #define SERVICE_ERROR_NORMAL 1 #define SERVICE_ERROR_SEVERE 2 #define SERVICE_ERROR_CRITICAL 3 -#define SE_OWNER_DEFAULTED 1 -#define SE_GROUP_DEFAULTED 2 -#define SE_DACL_PRESENT 4 -#define SE_DACL_DEFAULTED 8 -#define SE_SACL_PRESENT 16 -#define SE_SACL_DEFAULTED 32 -#define SE_DACL_AUTO_INHERIT_REQ 256 -#define SE_SACL_AUTO_INHERIT_REQ 512 -#define SE_DACL_AUTO_INHERITED 1024 -#define SE_SACL_AUTO_INHERITED 2048 -#define SE_DACL_PROTECTED 4096 -#define SE_SACL_PROTECTED 8192 -#define SE_RM_CONTROL_VALID 0x4000 -#define SE_SELF_RELATIVE 0x8000 +#define SE_OWNER_DEFAULTED 0x0001 +#define SE_GROUP_DEFAULTED 0x0002 +#define SE_DACL_PRESENT 0x0004 +#define SE_DACL_DEFAULTED 0x0008 +#define SE_SACL_PRESENT 0x0010 +#define SE_SACL_DEFAULTED 0x0020 +#define SE_DACL_UNTRUSTED 0x0040 +#define SE_SERVER_SECURITY 0x0080 +#define SE_DACL_AUTO_INHERIT_REQ 0x0100 +#define SE_SACL_AUTO_INHERIT_REQ 0x0200 +#define SE_DACL_AUTO_INHERITED 0x0400 +#define SE_SACL_AUTO_INHERITED 0x0800 +#define SE_DACL_PROTECTED 0x1000 +#define SE_SACL_PROTECTED 0x2000 +#define SE_RM_CONTROL_VALID 0x4000 +#define SE_SELF_RELATIVE 0x8000 #define SECURITY_DESCRIPTOR_MIN_LENGTH 20 #define SECURITY_DESCRIPTOR_REVISION 1 #define SECURITY_DESCRIPTOR_REVISION1 1 Modified: trunk/reactos/lib/rtl/sd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/sd.c?rev=57450&r1=… ============================================================================== --- trunk/reactos/lib/rtl/sd.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/sd.c [iso-8859-1] Mon Oct 1 03:02:12 2012 @@ -9,244 +9,148 @@ /* INCLUDES *****************************************************************/ #include <rtl.h> - +#include "../../ntoskrnl/include/internal/se.h" #define NDEBUG #include <debug.h> - -/* FUNCTIONS ***************************************************************/ - -static VOID -RtlpQuerySecurityDescriptorPointers(IN PISECURITY_DESCRIPTOR SecurityDescriptor, - OUT PSID *Owner OPTIONAL, - OUT PSID *Group OPTIONAL, - OUT PACL *Sacl OPTIONAL, - OUT PACL *Dacl OPTIONAL) -{ - if (SecurityDescriptor->Control & SE_SELF_RELATIVE) - { - PISECURITY_DESCRIPTOR_RELATIVE RelSD = (PISECURITY_DESCRIPTOR_RELATIVE)SecurityDescriptor; - if (Owner != NULL) - { - *Owner = ((RelSD->Owner != 0) ? (PSID)((ULONG_PTR)RelSD + RelSD->Owner) : NULL); - } - - if (Group != NULL) - { - *Group = ((RelSD->Group != 0) ? (PSID)((ULONG_PTR)RelSD + RelSD->Group) : NULL); - } - if (Sacl != NULL) - { - *Sacl = (((RelSD->Control & SE_SACL_PRESENT) && (RelSD->Sacl != 0)) ? - (PSID)((ULONG_PTR)RelSD + RelSD->Sacl) : NULL); - } - if (Dacl != NULL) - { - *Dacl = (((RelSD->Control & SE_DACL_PRESENT) && (RelSD->Dacl != 0)) ? - (PSID)((ULONG_PTR)RelSD + RelSD->Dacl) : NULL); - } +/* PRIVATE FUNCTIONS **********************************************************/ + +BOOLEAN +NTAPI +RtlpValidateSDOffsetAndSize(IN ULONG Offset, + IN ULONG Length, + IN ULONG MinLength, + OUT PULONG MaxLength) +{ + /* Assume failure */ + *MaxLength = 0; + + /* Reject out of bounds lengths */ + if (Offset < sizeof(SECURITY_DESCRIPTOR_RELATIVE)) return FALSE; + if (Offset >= Length) return FALSE; + + /* Reject insufficient lengths */ + if ((Length - Offset) < MinLength) return FALSE; + + /* Reject unaligned offsets */ + if (ALIGN_DOWN(Offset, ULONG) != Offset) return FALSE; + + /* Return length that is safe to read */ + *MaxLength = Length - Offset; + return TRUE; +} + +VOID +NTAPI +RtlpQuerySecurityDescriptor(IN PISECURITY_DESCRIPTOR SecurityDescriptor, + OUT PSID *Owner, + OUT PULONG OwnerSize, + OUT PSID *PrimaryGroup, + OUT PULONG PrimaryGroupSize, + OUT PACL *Dacl, + OUT PULONG DaclSize, + OUT PACL *Sacl, + OUT PULONG SaclSize) +{ + PAGED_CODE_RTL(); + + /* Get the owner */ + *Owner = SepGetOwnerFromDescriptor(SecurityDescriptor); + if (*Owner) + { + /* There's an owner, so align the size */ + *OwnerSize = ROUND_UP(RtlLengthSid(*Owner), sizeof(ULONG)); } else { - if (Owner != NULL) - { - *Owner = SecurityDescriptor->Owner; - } - if (Group != NULL) - { - *Group = SecurityDescriptor->Group; - } - if (Sacl != NULL) - { - *Sacl = ((SecurityDescriptor->Control & SE_SACL_PRESENT) ? SecurityDescriptor->Sacl : NULL); - } - if (Dacl != NULL) - { - *Dacl = ((SecurityDescriptor->Control & SE_DACL_PRESENT) ? SecurityDescriptor->Dacl : NULL); - } - } -} - -static VOID -RtlpQuerySecurityDescriptor(PISECURITY_DESCRIPTOR SecurityDescriptor, - PSID* Owner, - PULONG OwnerLength, - PSID* Group, - PULONG GroupLength, - PACL* Dacl, - PULONG DaclLength, - PACL* Sacl, - PULONG SaclLength) -{ - RtlpQuerySecurityDescriptorPointers(SecurityDescriptor, - Owner, - Group, - Sacl, - Dacl); - - if (Owner != NULL) - { - *OwnerLength = ((*Owner != NULL) ? ROUND_UP(RtlLengthSid(*Owner), 4) : 0); - } - - if (Group != NULL) - { - *GroupLength = ((*Group != NULL) ? ROUND_UP(RtlLengthSid(*Group), 4) : 0); - } - - if (Dacl != NULL) - { - *DaclLength = ((*Dacl != NULL) ? ROUND_UP((*Dacl)->AclSize, 4) : 0); - } - - if (Sacl != NULL) - { - *SaclLength = ((*Sacl != NULL) ? ROUND_UP((*Sacl)->AclSize, 4) : 0); - } -} - - -/* - * @implemented - */ -NTSTATUS -NTAPI -RtlCreateSecurityDescriptor(OUT PSECURITY_DESCRIPTOR SecurityDescriptor, + /* No owner, no size */ + *OwnerSize = 0; + } + + /* Get the group */ + *PrimaryGroup = SepGetGroupFromDescriptor(SecurityDescriptor); + if (*PrimaryGroup) + { + /* There's a group, so align the size */ + *PrimaryGroupSize = ROUND_UP(RtlLengthSid(*PrimaryGroup), sizeof(ULONG)); + } + else + { + /* No group, no size */ + *PrimaryGroupSize = 0; + } + + /* Get the DACL */ + *Dacl = SepGetDaclFromDescriptor(SecurityDescriptor); + if (*Dacl) + { + /* There's a DACL, align the size */ + *DaclSize = ROUND_UP((*Dacl)->AclSize, sizeof(ULONG)); + } + else + { + /* No DACL, no size */ + *DaclSize = 0; + } + + /* Get the SACL */ + *Sacl = SepGetSaclFromDescriptor(SecurityDescriptor); + if (*Sacl) + { + /* There's a SACL, align the size */ + *SaclSize = ROUND_UP((*Sacl)->AclSize, sizeof(ULONG)); + } + else + { + /* No SACL, no size */ + *SaclSize = 0; + } +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + +/* + * @implemented + */ +NTSTATUS +NTAPI +RtlCreateSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor, IN ULONG Revision) { - PISECURITY_DESCRIPTOR pSD = (PISECURITY_DESCRIPTOR)SecurityDescriptor; - - PAGED_CODE_RTL(); - - if (Revision != SECURITY_DESCRIPTOR_REVISION1) - { - return STATUS_UNKNOWN_REVISION; - } - - pSD->Revision = SECURITY_DESCRIPTOR_REVISION1; - pSD->Sbz1 = 0; - pSD->Control = 0; - pSD->Owner = NULL; - pSD->Group = NULL; - pSD->Sacl = NULL; - pSD->Dacl = NULL; - - return STATUS_SUCCESS; -} - - -/* - * @implemented - */ -NTSTATUS -NTAPI -RtlCopySecurityDescriptor(IN PSECURITY_DESCRIPTOR pSourceSecurityDescriptor, - OUT PSECURITY_DESCRIPTOR pDestinationSecurityDescriptor) -{ - PSID Owner = NULL, Group = NULL; - PACL Dacl = NULL, Sacl = NULL; - BOOLEAN Defaulted, Present; - DWORD OwnerLength, GroupLength; - PISECURITY_DESCRIPTOR srcSD = pSourceSecurityDescriptor; - PISECURITY_DESCRIPTOR destSD = pDestinationSecurityDescriptor; - - if (srcSD->Revision != SECURITY_DESCRIPTOR_REVISION) - return STATUS_UNKNOWN_REVISION; - - /* Copy non relative dependent data */ - destSD->Revision = srcSD->Revision; - destSD->Sbz1 = srcSD->Sbz1; - destSD->Control = srcSD->Control; - - /* Read relative data */ - RtlGetOwnerSecurityDescriptor(srcSD, &Owner, &Defaulted); - OwnerLength = RtlLengthSid(Owner); - RtlGetGroupSecurityDescriptor(srcSD, &Group, &Defaulted); - GroupLength = RtlLengthSid(Group); - RtlGetDaclSecurityDescriptor(srcSD, &Present, &Dacl, &Defaulted); - RtlGetSaclSecurityDescriptor(srcSD, &Present, &Sacl, &Defaulted); - - if (srcSD->Control & SE_SELF_RELATIVE) - { - destSD->Owner = srcSD->Owner; - RtlCopySid(OwnerLength, (LPBYTE)destSD + (DWORD_PTR)destSD->Owner, Owner); - - destSD->Group = srcSD->Group; - RtlCopySid(GroupLength, (LPBYTE)destSD + (DWORD_PTR)destSD->Group, Group); - - if (srcSD->Control & SE_DACL_PRESENT) - { - destSD->Dacl = srcSD->Dacl; - - if (srcSD->Dacl != NULL && RtlValidAcl(srcSD->Dacl)) - { - RtlCopyMemory(((LPBYTE)destSD + (DWORD_PTR)destSD->Dacl), Dacl, Dacl->AclSize); - } - } - - if (srcSD->Control & SE_SACL_PRESENT) - { - destSD->Sacl = srcSD->Sacl; - - if (srcSD->Sacl != NULL && RtlValidAcl(srcSD->Sacl)) - { - RtlCopyMemory(((LPBYTE)destSD + (DWORD_PTR)destSD->Sacl), Sacl, Sacl->AclSize); - } - } - } - else - { - RtlCopySid(OwnerLength, destSD->Owner, Owner); - RtlCopySid(GroupLength, destSD->Group, Group); - - if (srcSD->Control & SE_DACL_PRESENT) - { - destSD->Dacl = RtlAllocateHeap(RtlGetProcessHeap(), 0, Dacl->AclSize); - - if (srcSD->Dacl != NULL && RtlValidAcl(srcSD->Dacl)) - { - RtlCopyMemory(destSD->Dacl, Dacl, Dacl->AclSize); - } - } - - if (srcSD->Control & SE_SACL_PRESENT) - { - destSD->Sacl = RtlAllocateHeap(RtlGetProcessHeap(), 0, Sacl->AclSize); - - if (srcSD->Sacl != NULL && RtlValidAcl(srcSD->Sacl)) - { - RtlCopyMemory(destSD->Sacl, Sacl, Sacl->AclSize); - } - } - } - - return STATUS_SUCCESS; -} - - -NTSTATUS -NTAPI -RtlCreateSecurityDescriptorRelative(OUT PISECURITY_DESCRIPTOR_RELATIVE SecurityDescriptor, + PISECURITY_DESCRIPTOR Sd = (PISECURITY_DESCRIPTOR)SecurityDescriptor; + PAGED_CODE_RTL(); + + /* Fail on invalid revisions */ + if (Revision != SECURITY_DESCRIPTOR_REVISION) return STATUS_UNKNOWN_REVISION; + + /* Setup an empty SD */ + RtlZeroMemory(Sd, sizeof(*Sd)); + Sd->Revision = SECURITY_DESCRIPTOR_REVISION; + + /* All good */ + return STATUS_SUCCESS; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +RtlCreateSecurityDescriptorRelative(IN PISECURITY_DESCRIPTOR_RELATIVE SecurityDescriptor, IN ULONG Revision) { PAGED_CODE_RTL(); - if (Revision != SECURITY_DESCRIPTOR_REVISION1) - { - return STATUS_UNKNOWN_REVISION; - } - - SecurityDescriptor->Revision = SECURITY_DESCRIPTOR_REVISION1; - SecurityDescriptor->Sbz1 = 0; - SecurityDescriptor->Control = SE_SELF_RELATIVE; - SecurityDescriptor->Owner = 0; - SecurityDescriptor->Group = 0; - SecurityDescriptor->Sacl = 0; - SecurityDescriptor->Dacl = 0; - - return STATUS_SUCCESS; -} - + /* Fail on invalid revisions */ + if (Revision != SECURITY_DESCRIPTOR_REVISION) return STATUS_UNKNOWN_REVISION; + + /* Setup an empty SD */ + RtlZeroMemory(SecurityDescriptor, sizeof(*SecurityDescriptor)); + SecurityDescriptor->Revision = SECURITY_DESCRIPTOR_REVISION; + + /* All good */ + return STATUS_SUCCESS; +} /* * @implemented @@ -255,46 +159,36 @@ NTAPI RtlLengthSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor) { + PISECURITY_DESCRIPTOR Sd; PSID Owner, Group; PACL Sacl, Dacl; ULONG Length; - - PAGED_CODE_RTL(); - - if (((PISECURITY_DESCRIPTOR)SecurityDescriptor)->Control & SE_SELF_RELATIVE) + PAGED_CODE_RTL(); + + /* Start with the initial length of the SD itself */ + Sd = (PISECURITY_DESCRIPTOR)SecurityDescriptor; + if (Sd->Control & SE_SELF_RELATIVE) + { Length = sizeof(SECURITY_DESCRIPTOR_RELATIVE); + } else + { Length = sizeof(SECURITY_DESCRIPTOR); - - RtlpQuerySecurityDescriptorPointers((PISECURITY_DESCRIPTOR)SecurityDescriptor, - &Owner, - &Group, - &Sacl, - &Dacl); - - if (Owner != NULL) - { - Length += ROUND_UP(RtlLengthSid(Owner), 4); - } - - if (Group != NULL) - { - Length += ROUND_UP(RtlLengthSid(Group), 4); - } - - if (Dacl != NULL) - { - Length += ROUND_UP(Dacl->AclSize, 4); - } - - if (Sacl != NULL) - { - Length += ROUND_UP(Sacl->AclSize, 4); - } - + } + + /* Add the length of the individual subcomponents */ + Owner = SepGetOwnerFromDescriptor(Sd); + if (Owner) Length += ROUND_UP(RtlLengthSid(Owner), sizeof(ULONG)); + Group = SepGetGroupFromDescriptor(Sd); + if (Group) Length += ROUND_UP(RtlLengthSid(Group), sizeof(ULONG)); + Dacl = SepGetDaclFromDescriptor(Sd); + if (Dacl) Length += ROUND_UP(Dacl->AclSize, sizeof(ULONG)); + Sacl = SepGetSaclFromDescriptor(Sd); + if (Sacl) Length += ROUND_UP(Sacl->AclSize, sizeof(ULONG)); + + /* Return the final length */ return Length; } - /* * @implemented @@ -306,34 +200,99 @@ OUT PACL* Dacl, OUT PBOOLEAN DaclDefaulted) { - PISECURITY_DESCRIPTOR pSD = (PISECURITY_DESCRIPTOR)SecurityDescriptor; - - PAGED_CODE_RTL(); - - if (pSD->Revision != SECURITY_DESCRIPTOR_REVISION1) - { - return STATUS_UNKNOWN_REVISION; - } - - if (!(pSD->Control & SE_DACL_PRESENT)) - { - *DaclPresent = FALSE; - return STATUS_SUCCESS; - } - - *DaclPresent = TRUE; - - RtlpQuerySecurityDescriptorPointers(pSD, - NULL, - NULL, - NULL, - Dacl); - - *DaclDefaulted = ((pSD->Control & SE_DACL_DEFAULTED) != 0); - - return STATUS_SUCCESS; -} - + PISECURITY_DESCRIPTOR Sd = (PISECURITY_DESCRIPTOR)SecurityDescriptor; + PAGED_CODE_RTL(); + + /* Fail on invalid revisions */ + if (Sd->Revision != SECURITY_DESCRIPTOR_REVISION) return STATUS_UNKNOWN_REVISION; + + /* Is there a DACL? */ + *DaclPresent = Sd->Control & SE_DACL_PRESENT; + if (*DaclPresent) + { + /* Yes, return it, and check if defaulted */ + *Dacl = SepGetDaclFromDescriptor(Sd); + *DaclDefaulted = Sd->Control & SE_DACL_DEFAULTED; + } + + /* All good */ + return STATUS_SUCCESS; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +RtlGetSaclSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor, + OUT PBOOLEAN SaclPresent, + OUT PACL* Sacl, + OUT PBOOLEAN SaclDefaulted) +{ + PISECURITY_DESCRIPTOR Sd = (PISECURITY_DESCRIPTOR)SecurityDescriptor; + PAGED_CODE_RTL(); + + /* Fail on invalid revisions */ + if (Sd->Revision != SECURITY_DESCRIPTOR_REVISION) return STATUS_UNKNOWN_REVISION; + + /* Is there a SACL? */ + *SaclPresent = Sd->Control & SE_SACL_PRESENT; + if (*SaclPresent) + { + /* Yes, return it, and check if defaulted */ + *Sacl = SepGetSaclFromDescriptor(Sd); + *SaclDefaulted = Sd->Control & SE_SACL_DEFAULTED; + } + + /* All good */ + return STATUS_SUCCESS; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +RtlGetOwnerSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor, + OUT PSID* Owner, + OUT PBOOLEAN OwnerDefaulted) +{ + PISECURITY_DESCRIPTOR Sd = (PISECURITY_DESCRIPTOR)SecurityDescriptor; + PAGED_CODE_RTL(); + + /* Fail on invalid revision */ + if (Sd->Revision != SECURITY_DESCRIPTOR_REVISION) return STATUS_UNKNOWN_REVISION; + + /* Get the owner and if defaulted */ + *Owner = SepGetOwnerFromDescriptor(Sd); + *OwnerDefaulted = Sd->Control & SE_OWNER_DEFAULTED; + + /* All good */ + return STATUS_SUCCESS; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +RtlGetGroupSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor, + OUT PSID* Group, + OUT PBOOLEAN GroupDefaulted) +{ + PISECURITY_DESCRIPTOR Sd = (PISECURITY_DESCRIPTOR)SecurityDescriptor; + PAGED_CODE_RTL(); + + /* Fail on invalid revision */ + if (Sd->Revision != SECURITY_DESCRIPTOR_REVISION) return STATUS_UNKNOWN_REVISION; + + /* Get the group and if defaulted */ + *Group = SepGetGroupFromDescriptor(Sd); + *GroupDefaulted = Sd->Control & SE_GROUP_DEFAULTED; + + /* All good */ + return STATUS_SUCCESS; +} /* * @implemented @@ -345,74 +304,73 @@ IN PACL Dacl, IN BOOLEAN DaclDefaulted) { - PISECURITY_DESCRIPTOR pSD = (PISECURITY_DESCRIPTOR)SecurityDescriptor; - - PAGED_CODE_RTL(); - - if (pSD->Revision != SECURITY_DESCRIPTOR_REVISION1) - { - return STATUS_UNKNOWN_REVISION; - } - - if (pSD->Control & SE_SELF_RELATIVE) - { - return STATUS_BAD_DESCRIPTOR_FORMAT; - } - + PISECURITY_DESCRIPTOR Sd = (PISECURITY_DESCRIPTOR)SecurityDescriptor; + PAGED_CODE_RTL(); + + /* Fail on invalid revision */ + if (Sd->Revision != SECURITY_DESCRIPTOR_REVISION) return STATUS_UNKNOWN_REVISION; + + /* Fail on relative descriptors */ + if (Sd->Control & SE_SELF_RELATIVE) return STATUS_INVALID_SECURITY_DESCR; + + /* Is there a DACL? */ if (!DaclPresent) { - pSD->Control = pSD->Control & ~(SE_DACL_PRESENT); + /* Caller is destroying the DACL, unset the flag and we're done */ + Sd->Control = Sd->Control & ~SE_DACL_PRESENT; return STATUS_SUCCESS; } - pSD->Dacl = Dacl; - pSD->Control |= SE_DACL_PRESENT; - pSD->Control &= ~(SE_DACL_DEFAULTED); - - if (DaclDefaulted) - { - pSD->Control |= SE_DACL_DEFAULTED; - } - - return STATUS_SUCCESS; -} - - -/* - * @implemented - */ -BOOLEAN -NTAPI -RtlValidSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor) -{ - PISECURITY_DESCRIPTOR pSD = (PISECURITY_DESCRIPTOR)SecurityDescriptor; - PSID Owner, Group; - PACL Sacl, Dacl; - - PAGED_CODE_RTL(); - - if (pSD->Revision != SECURITY_DESCRIPTOR_REVISION1) - { - return FALSE; - } - - RtlpQuerySecurityDescriptorPointers(pSD, - &Owner, - &Group, - &Sacl, - &Dacl); - - if ((Owner != NULL && !RtlValidSid(Owner)) || - (Group != NULL && !RtlValidSid(Group)) || - (Sacl != NULL && !RtlValidAcl(Sacl)) || - (Dacl != NULL && !RtlValidAcl(Dacl))) - { - return FALSE; - } - - return TRUE; -} - + /* Caller is setting a new DACL, set the pointer and flag */ + Sd->Dacl = Dacl; + Sd->Control |= SE_DACL_PRESENT; + + /* Set if defaulted */ + Sd->Control &= ~SE_DACL_DEFAULTED; + if (DaclDefaulted) Sd->Control |= SE_DACL_DEFAULTED; + + /* All good */ + return STATUS_SUCCESS; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +RtlSetSaclSecurityDescriptor(IN OUT PSECURITY_DESCRIPTOR SecurityDescriptor, + IN BOOLEAN SaclPresent, + IN PACL Sacl, + IN BOOLEAN SaclDefaulted) +{ + PISECURITY_DESCRIPTOR Sd = (PISECURITY_DESCRIPTOR)SecurityDescriptor; + PAGED_CODE_RTL(); + + /* Fail on invalid revision */ + if (Sd->Revision != SECURITY_DESCRIPTOR_REVISION) return STATUS_UNKNOWN_REVISION; + + /* Fail on relative descriptors */ + if (Sd->Control & SE_SELF_RELATIVE) return STATUS_INVALID_SECURITY_DESCR; + + /* Is there a SACL? */ + if (!SaclPresent) + { + /* Caller is clearing the SACL, unset the flag and we're done */ + Sd->Control = Sd->Control & ~SE_SACL_PRESENT; + return STATUS_SUCCESS; + } + + /* Caller is setting a new SACL, set it and the flag */ + Sd->Sacl = Sacl; + Sd->Control |= SE_SACL_PRESENT; + + /* Set if defaulted */ + Sd->Control &= ~SE_SACL_DEFAULTED; + if (SaclDefaulted) Sd->Control |= SE_SACL_DEFAULTED; + + /* All good */ + return STATUS_SUCCESS; +} /* * @implemented @@ -423,61 +381,25 @@ IN PSID Owner, IN BOOLEAN OwnerDefaulted) { - PISECURITY_DESCRIPTOR pSD = (PISECURITY_DESCRIPTOR)SecurityDescriptor; - - PAGED_CODE_RTL(); - - if (pSD->Revision != SECURITY_DESCRIPTOR_REVISION1) - { - return STATUS_UNKNOWN_REVISION; - } - - if (pSD->Control & SE_SELF_RELATIVE) - { - return STATUS_BAD_DESCRIPTOR_FORMAT; - } - - pSD->Owner = Owner; - pSD->Control &= ~(SE_OWNER_DEFAULTED); - - if (OwnerDefaulted) - { - pSD->Control |= SE_OWNER_DEFAULTED; - } - - return STATUS_SUCCESS; -} - - -/* - * @implemented - */ -NTSTATUS -NTAPI -RtlGetOwnerSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor, - OUT PSID* Owner, - OUT PBOOLEAN OwnerDefaulted) -{ - PISECURITY_DESCRIPTOR pSD = (PISECURITY_DESCRIPTOR)SecurityDescriptor; - - PAGED_CODE_RTL(); - - if (pSD->Revision != SECURITY_DESCRIPTOR_REVISION1) - { - return STATUS_UNKNOWN_REVISION; - } - - RtlpQuerySecurityDescriptorPointers(pSD, - Owner, - NULL, - NULL, - NULL); - - *OwnerDefaulted = ((pSD->Control & SE_OWNER_DEFAULTED) != 0); - - return STATUS_SUCCESS; -} - + PISECURITY_DESCRIPTOR Sd = (PISECURITY_DESCRIPTOR)SecurityDescriptor; + PAGED_CODE_RTL(); + + /* Fail on invalid revision */ + if (Sd->Revision != SECURITY_DESCRIPTOR_REVISION) return STATUS_UNKNOWN_REVISION; + + /* Fail on relative descriptors */ + if (Sd->Control & SE_SELF_RELATIVE) return STATUS_INVALID_SECURITY_DESCR; + + /* Owner being set or cleared */ + Sd->Owner = Owner; + + /* Set if defaulted */ + Sd->Control &= ~SE_OWNER_DEFAULTED; + if (OwnerDefaulted) Sd->Control |= SE_OWNER_DEFAULTED; + + /* All good */ + return STATUS_SUCCESS; +} /* * @implemented @@ -488,86 +410,184 @@ IN PSID Group, IN BOOLEAN GroupDefaulted) { - PISECURITY_DESCRIPTOR pSD = (PISECURITY_DESCRIPTOR)SecurityDescriptor; - - PAGED_CODE_RTL(); - - if (pSD->Revision != SECURITY_DESCRIPTOR_REVISION1) - { - return STATUS_UNKNOWN_REVISION; - } - - if (pSD->Control & SE_SELF_RELATIVE) - { - return STATUS_BAD_DESCRIPTOR_FORMAT; - } - - pSD->Group = Group; - pSD->Control &= ~(SE_GROUP_DEFAULTED); - if (GroupDefaulted) - { - pSD->Control |= SE_GROUP_DEFAULTED; - } - - return STATUS_SUCCESS; -} - - -/* - * @implemented - */ -NTSTATUS -NTAPI -RtlGetGroupSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor, - OUT PSID* Group, - OUT PBOOLEAN GroupDefaulted) -{ - PISECURITY_DESCRIPTOR pSD = (PISECURITY_DESCRIPTOR)SecurityDescriptor; - - PAGED_CODE_RTL(); - - if (pSD->Revision != SECURITY_DESCRIPTOR_REVISION1) - { - return STATUS_UNKNOWN_REVISION; - } - - RtlpQuerySecurityDescriptorPointers(pSD, - NULL, - Group, - NULL, - NULL); - - *GroupDefaulted = ((pSD->Control & SE_GROUP_DEFAULTED) ? TRUE : FALSE); - - return STATUS_SUCCESS; -} - - -/* - * @implemented - */ -NTSTATUS -NTAPI -RtlMakeSelfRelativeSD(IN PSECURITY_DESCRIPTOR AbsoluteSD, - OUT PSECURITY_DESCRIPTOR SelfRelativeSD, - IN OUT PULONG BufferLength) -{ - PSID Owner; - PSID Group; - PACL Sacl; - PACL Dacl; - ULONG OwnerLength; - ULONG GroupLength; - ULONG SaclLength; - ULONG DaclLength; - ULONG TotalLength; - ULONG_PTR Current; - PISECURITY_DESCRIPTOR pAbsSD = (PISECURITY_DESCRIPTOR)AbsoluteSD; - PISECURITY_DESCRIPTOR_RELATIVE pRelSD = (PISECURITY_DESCRIPTOR_RELATIVE)SelfRelativeSD; - - PAGED_CODE_RTL(); - - RtlpQuerySecurityDescriptor(pAbsSD, + PISECURITY_DESCRIPTOR Sd = (PISECURITY_DESCRIPTOR)SecurityDescriptor; + PAGED_CODE_RTL(); + + /* Fail on invalid revision */ + if (Sd->Revision != SECURITY_DESCRIPTOR_REVISION) return STATUS_UNKNOWN_REVISION; + + /* Fail on relative descriptors */ + if (Sd->Control & SE_SELF_RELATIVE) return STATUS_INVALID_SECURITY_DESCR; + + /* Group being set or cleared */ + Sd->Group = Group; + + /* Set if defaulted */ + Sd->Control &= ~SE_GROUP_DEFAULTED; + if (GroupDefaulted) Sd->Control |= SE_GROUP_DEFAULTED; + + /* All good */ + return STATUS_SUCCESS; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +RtlGetControlSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor, + OUT PSECURITY_DESCRIPTOR_CONTROL Control, + OUT PULONG Revision) +{ + PISECURITY_DESCRIPTOR Sd = (PISECURITY_DESCRIPTOR)SecurityDescriptor; + PAGED_CODE_RTL(); + + /* Read current revision, even if invalid */ + *Revision = Sd->Revision; + + /* Fail on invalid revision */ + if (Sd->Revision != SECURITY_DESCRIPTOR_REVISION) return STATUS_UNKNOWN_REVISION; + + /* Read current control */ + *Control = Sd->Control; + + /* All good */ + return STATUS_SUCCESS; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +RtlSetControlSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor, + IN SECURITY_DESCRIPTOR_CONTROL ControlBitsOfInterest, + IN SECURITY_DESCRIPTOR_CONTROL ControlBitsToSet) +{ + PISECURITY_DESCRIPTOR Sd = (PISECURITY_DESCRIPTOR)SecurityDescriptor; + + /* Check for invalid bits */ + if ((ControlBitsOfInterest & ~(SE_DACL_UNTRUSTED | + SE_SERVER_SECURITY | + SE_DACL_AUTO_INHERIT_REQ | + SE_SACL_AUTO_INHERIT_REQ | + SE_DACL_AUTO_INHERITED | + SE_SACL_AUTO_INHERITED | + SE_DACL_PROTECTED | + SE_SACL_PROTECTED)) || + (ControlBitsToSet & ~ControlBitsOfInterest)) + { + /* Fail */ + return STATUS_INVALID_PARAMETER; + } + + /* Zero the 'bits of interest' */ + Sd->Control &= ~ControlBitsOfInterest; + + /* Set the 'bits to set' */ + Sd->Control |= (ControlBitsToSet & ControlBitsOfInterest); + + /* All good */ + return STATUS_SUCCESS; +} + +/* + * @implemented + */ +BOOLEAN +NTAPI +RtlGetSecurityDescriptorRMControl(IN PSECURITY_DESCRIPTOR SecurityDescriptor, + OUT PUCHAR RMControl) +{ + PISECURITY_DESCRIPTOR Sd = (PISECURITY_DESCRIPTOR)SecurityDescriptor; + PAGED_CODE_RTL(); + + /* Check if there's no valid RM control */ + if (!(Sd->Control & SE_RM_CONTROL_VALID)) + { + /* Fail and return nothing */ + *RMControl = 0; + return FALSE; + } + + /* Return it, ironically the member is "should be zero" */ + *RMControl = Sd->Sbz1; + return TRUE; +} + +/* + * @implemented + */ +VOID +NTAPI +RtlSetSecurityDescriptorRMControl(IN PSECURITY_DESCRIPTOR SecurityDescriptor, + IN PUCHAR RMControl) +{ + PISECURITY_DESCRIPTOR Sd = (PISECURITY_DESCRIPTOR)SecurityDescriptor; + PAGED_CODE_RTL(); + + /* RM Control is being cleared or set */ + if (!RMControl) + { + /* Clear it */ + Sd->Control &= ~SE_RM_CONTROL_VALID; + Sd->Sbz1 = 0; + } + else + { + /* Set it */ + Sd->Control |= SE_RM_CONTROL_VALID; + Sd->Sbz1 = *RMControl; + } +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +RtlSetAttributesSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor, + IN SECURITY_DESCRIPTOR_CONTROL Control, + OUT PULONG Revision) +{ + PISECURITY_DESCRIPTOR Sd = (PISECURITY_DESCRIPTOR)SecurityDescriptor; + PAGED_CODE_RTL(); + + /* Always return revision, even if invalid */ + *Revision = Sd->Revision; + + /* Fail on invalid revision */ + if (Sd->Revision != SECURITY_DESCRIPTOR_REVISION) return STATUS_UNKNOWN_REVISION; + + /* Mask out flags which are not attributes */ + Control &= ~SE_DACL_UNTRUSTED | + SE_SERVER_SECURITY | + SE_DACL_AUTO_INHERIT_REQ | + SE_SACL_AUTO_INHERIT_REQ | + SE_DACL_AUTO_INHERITED | + SE_SACL_AUTO_INHERITED | + SE_DACL_PROTECTED | + SE_SACL_PROTECTED; + + /* Call the newer API */ + return RtlSetControlSecurityDescriptor(SecurityDescriptor, Control, Control); +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +RtlCopySecurityDescriptor(IN PSECURITY_DESCRIPTOR pSourceSecurityDescriptor, + OUT PSECURITY_DESCRIPTOR *pDestinationSecurityDescriptor) +{ + PSID Owner, Group; + PACL Dacl, Sacl; + DWORD OwnerLength, GroupLength, DaclLength, SaclLength, TotalLength; + PISECURITY_DESCRIPTOR Sd = pSourceSecurityDescriptor; + + /* Get all the components */ + RtlpQuerySecurityDescriptor(Sd, &Owner, &OwnerLength, &Group, @@ -577,60 +597,25 @@ &Sacl, &SaclLength); - TotalLength = sizeof(SECURITY_DESCRIPTOR_RELATIVE) + OwnerLength + GroupLength + SaclLength + DaclLength; - if (*BufferLength < TotalLength) - { - *BufferLength = TotalLength; - return STATUS_BUFFER_TOO_SMALL; - } - - RtlZeroMemory(pRelSD, - TotalLength); - - pRelSD->Revision = pAbsSD->Revision; - pRelSD->Sbz1 = pAbsSD->Sbz1; - pRelSD->Control = pAbsSD->Control | SE_SELF_RELATIVE; - - Current = (ULONG_PTR)(pRelSD + 1); - - if (SaclLength != 0) - { - RtlCopyMemory((PVOID)Current, - Sacl, - SaclLength); - pRelSD->Sacl = (ULONG)((ULONG_PTR)Current - (ULONG_PTR)pRelSD); - Current += SaclLength; - } - - if (DaclLength != 0) - { - RtlCopyMemory((PVOID)Current, - Dacl, - DaclLength); - pRelSD->Dacl = (ULONG)((ULONG_PTR)Current - (ULONG_PTR)pRelSD); - Current += DaclLength; - } - - if (OwnerLength != 0) - { - RtlCopyMemory((PVOID)Current, - Owner, - OwnerLength); - pRelSD->Owner = (ULONG)((ULONG_PTR)Current - (ULONG_PTR)pRelSD); - Current += OwnerLength; - } - - if (GroupLength != 0) - { - RtlCopyMemory((PVOID)Current, - Group, - GroupLength); - pRelSD->Group = (ULONG)((ULONG_PTR)Current - (ULONG_PTR)pRelSD); - } - - return STATUS_SUCCESS; -} - + /* Add up their lengths */ + TotalLength = sizeof(SECURITY_DESCRIPTOR_RELATIVE) + + OwnerLength + + GroupLength + + DaclLength + + SaclLength; + + /* Allocate a copy */ + *pDestinationSecurityDescriptor = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + TotalLength); + if (*pDestinationSecurityDescriptor == NULL) return STATUS_NO_MEMORY; + + /* Copy the old in the new */ + RtlCopyMemory(*pDestinationSecurityDescriptor, Sd, TotalLength); + + /* All good */ + return STATUS_SUCCESS; +} /* * @implemented @@ -641,164 +626,113 @@ IN OUT PSECURITY_DESCRIPTOR SelfRelativeSecurityDescriptor, IN PULONG BufferLength) { - PISECURITY_DESCRIPTOR pAbsSD = (PISECURITY_DESCRIPTOR)AbsoluteSecurityDescriptor; - - PAGED_CODE_RTL(); - - if (pAbsSD->Control & SE_SELF_RELATIVE) - { - return STATUS_BAD_DESCRIPTOR_FORMAT; - } - - return RtlMakeSelfRelativeSD(AbsoluteSecurityDescriptor, - SelfRelativeSecurityDescriptor, - BufferLength); -} - - -/* - * @implemented - */ -NTSTATUS -NTAPI -RtlGetControlSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor, - OUT PSECURITY_DESCRIPTOR_CONTROL Control, - OUT PULONG Revision) -{ - PISECURITY_DESCRIPTOR pSD = (PISECURITY_DESCRIPTOR)SecurityDescriptor; - - PAGED_CODE_RTL(); - - *Revision = pSD->Revision; - - if (pSD->Revision != SECURITY_DESCRIPTOR_REVISION1) - { - return STATUS_UNKNOWN_REVISION; - } - - *Control = pSD->Control; - - return STATUS_SUCCESS; -} - - -/* - * @implemented - */ -NTSTATUS -NTAPI -RtlSetControlSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor, - IN SECURITY_DESCRIPTOR_CONTROL ControlBitsOfInterest, - IN SECURITY_DESCRIPTOR_CONTROL ControlBitsToSet) -{ - SECURITY_DESCRIPTOR_CONTROL const immutable - = SE_OWNER_DEFAULTED | SE_GROUP_DEFAULTED - | SE_DACL_PRESENT | SE_DACL_DEFAULTED - | SE_SACL_PRESENT | SE_SACL_DEFAULTED - | SE_RM_CONTROL_VALID | SE_SELF_RELATIVE; - PISECURITY_DESCRIPTOR pSD = (PISECURITY_DESCRIPTOR)SecurityDescriptor; - - PAGED_CODE_RTL(); - - if (pSD->Revision != SECURITY_DESCRIPTOR_REVISION1) - { - return STATUS_UNKNOWN_REVISION; - } - - if ((ControlBitsOfInterest | ControlBitsToSet) & immutable) - return STATUS_INVALID_PARAMETER; - - /* Zero the 'bits of interest' */ - pSD->Control &= ~ControlBitsOfInterest; - - /* Set the 'bits to set' */ - pSD->Control |= (ControlBitsToSet & ControlBitsOfInterest); - - return STATUS_SUCCESS; -} - - -/* - * @implemented - */ -NTSTATUS -NTAPI -RtlGetSaclSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor, - OUT PBOOLEAN SaclPresent, - OUT PACL *Sacl, - OUT PBOOLEAN SaclDefaulted) -{ - PISECURITY_DESCRIPTOR pSD = (PISECURITY_DESCRIPTOR)SecurityDescriptor; - - PAGED_CODE_RTL(); - - if (pSD->Revision != SECURITY_DESCRIPTOR_REVISION1) - { - return STATUS_UNKNOWN_REVISION; - } - - if (!(pSD->Control & SE_SACL_PRESENT)) - { - *SaclPresent = FALSE; - return STATUS_SUCCESS; - } - - *SaclPresent = TRUE; - - RtlpQuerySecurityDescriptorPointers(pSD, - NULL, - NULL, - Sacl, - NULL); - - *SaclDefaulted = ((pSD->Control & SE_SACL_DEFAULTED) ? TRUE : FALSE); - - return STATUS_SUCCESS; -} - - -/* - * @implemented - */ -NTSTATUS -NTAPI -RtlSetSaclSecurityDescriptor(IN OUT PSECURITY_DESCRIPTOR SecurityDescriptor, - IN BOOLEAN SaclPresent, - IN PACL Sacl, - IN BOOLEAN SaclDefaulted) -{ - PISECURITY_DESCRIPTOR pSD = (PISECURITY_DESCRIPTOR)SecurityDescriptor; - - PAGED_CODE_RTL(); - - if (pSD->Revision != SECURITY_DESCRIPTOR_REVISION1) - { - return STATUS_UNKNOWN_REVISION; - } - - if (pSD->Control & SE_SELF_RELATIVE) - { - return STATUS_BAD_DESCRIPTOR_FORMAT; - } - - if (!SaclPresent) - { - pSD->Control &= ~(SE_SACL_PRESENT); - return STATUS_SUCCESS; - } - - pSD->Sacl = Sacl; - pSD->Control |= SE_SACL_PRESENT; - pSD->Control &= ~(SE_SACL_DEFAULTED); - - if (SaclDefaulted) - { - pSD->Control |= SE_SACL_DEFAULTED; - } - - return STATUS_SUCCESS; -} - + PISECURITY_DESCRIPTOR Sd = (PISECURITY_DESCRIPTOR)AbsoluteSecurityDescriptor; + PAGED_CODE_RTL(); + + /* Can't already be relative */ + if (Sd->Control & SE_SELF_RELATIVE) return STATUS_BAD_DESCRIPTOR_FORMAT; + + /* Call the other API */ + return RtlMakeSelfRelativeSD(AbsoluteSecurityDescriptor, + SelfRelativeSecurityDescriptor, + BufferLength); +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +RtlMakeSelfRelativeSD(IN PSECURITY_DESCRIPTOR AbsoluteSD, + OUT PSECURITY_DESCRIPTOR SelfRelativeSD, + IN OUT PULONG BufferLength) +{ + PSID Owner, Group; + PACL Sacl, Dacl; + ULONG OwnerLength, GroupLength, SaclLength, DaclLength, TotalLength; + ULONG_PTR Current; + PISECURITY_DESCRIPTOR Sd = (PISECURITY_DESCRIPTOR)AbsoluteSD; + PISECURITY_DESCRIPTOR_RELATIVE RelSd = (PISECURITY_DESCRIPTOR_RELATIVE)SelfRelativeSD; + PAGED_CODE_RTL(); + + /* Query all components */ + RtlpQuerySecurityDescriptor(Sd, + &Owner, + &OwnerLength, + &Group, + &GroupLength, + &Dacl, + &DaclLength, + &Sacl, + &SaclLength); + + /* Calculate final length */ + TotalLength = sizeof(SECURITY_DESCRIPTOR_RELATIVE) + + OwnerLength + + GroupLength + + SaclLength + + DaclLength; + + /* Is there enough space? */ + if (*BufferLength < TotalLength) + { + /* Nope, return how much is needed */ + *BufferLength = TotalLength; + return STATUS_BUFFER_TOO_SMALL; + } + + /* Start fresh */ + RtlZeroMemory(RelSd, TotalLength); + + /* Copy the header fields */ + RtlCopyMemory(RelSd, + Sd, + FIELD_OFFSET(SECURITY_DESCRIPTOR_RELATIVE, Owner)); + + /* Set the current copy pointer */ + Current = (ULONG_PTR)(RelSd + 1); + + /* Is there a SACL? */ + if (SaclLength) + { + /* Copy it */ + RtlCopyMemory((PVOID)Current, Sacl, SaclLength); + RelSd->Sacl = (ULONG_PTR)Current - (ULONG_PTR)RelSd; + Current += SaclLength; + } + + /* Is there a DACL? */ + if (DaclLength) + { + /* Copy it */ + RtlCopyMemory((PVOID)Current, Dacl, DaclLength); + RelSd->Dacl = (ULONG_PTR)Current - (ULONG_PTR)RelSd; + Current += DaclLength; + } + + /* Is there an owner? */ + if (OwnerLength) + { + /* Copy it */ + RtlCopyMemory((PVOID)Current, Owner, OwnerLength); + RelSd->Owner = (ULONG_PTR)Current - (ULONG_PTR)RelSd; + Current += OwnerLength; + } + + /* Is there a group? */ + if (GroupLength) + { + /* Copy it */ + RtlCopyMemory((PVOID)Current, Group, GroupLength); + RelSd->Group = (ULONG_PTR)Current - (ULONG_PTR)RelSd; + } + + /* Mark it as relative */ + RelSd->Control |= SE_SELF_RELATIVE; + + /* All good */ + return STATUS_SUCCESS; +} /* * @implemented @@ -817,30 +751,18 @@ IN PSID PrimaryGroup, IN PULONG PrimaryGroupSize) { - PISECURITY_DESCRIPTOR pAbsSD = (PISECURITY_DESCRIPTOR)AbsoluteSD; - PISECURITY_DESCRIPTOR pRelSD = (PISECURITY_DESCRIPTOR)SelfRelativeSD; - ULONG OwnerLength; - ULONG GroupLength; - ULONG DaclLength; - ULONG SaclLength; - PSID pOwner; - PSID pGroup; - PACL pDacl; - PACL pSacl; - - PAGED_CODE_RTL(); - - if (pRelSD->Revision != SECURITY_DESCRIPTOR_REVISION1) - { - return STATUS_UNKNOWN_REVISION; - } - - if (!(pRelSD->Control & SE_SELF_RELATIVE)) - { - return STATUS_BAD_DESCRIPTOR_FORMAT; - } - - RtlpQuerySecurityDescriptor(pRelSD, + PISECURITY_DESCRIPTOR Sd = (PISECURITY_DESCRIPTOR)AbsoluteSD; + PISECURITY_DESCRIPTOR RelSd = (PISECURITY_DESCRIPTOR)SelfRelativeSD; + ULONG OwnerLength, GroupLength, DaclLength, SaclLength; + PSID pOwner, pGroup; + PACL pDacl, pSacl; + PAGED_CODE_RTL(); + + /* Must be relative, otherwiise fail */ + if (!(RelSd->Control & SE_SELF_RELATIVE)) return STATUS_BAD_DESCRIPTOR_FORMAT; + + /* Get all the components */ + RtlpQuerySecurityDescriptor(RelSd, &pOwner, &OwnerLength, &pGroup, @@ -850,11 +772,16 @@ &pSacl, &SaclLength); - if (OwnerLength > *OwnerSize || - GroupLength > *PrimaryGroupSize || - DaclLength > *DaclSize || - SaclLength > *SaclSize) - { + /* Fail if there's not enough space */ + if (!(Sd) || + (sizeof(SECURITY_DESCRIPTOR) > *AbsoluteSDSize) || + (OwnerLength > *OwnerSize) || + (GroupLength > *PrimaryGroupSize) || + (DaclLength > *DaclSize) || + (SaclLength > *SaclSize)) + { + /* Return how much space is needed for each components */ + *AbsoluteSDSize = sizeof(SECURITY_DESCRIPTOR); *OwnerSize = OwnerLength; *PrimaryGroupSize = GroupLength; *DaclSize = DaclLength; @@ -862,27 +789,51 @@ return STATUS_BUFFER_TOO_SMALL; } - RtlCopyMemory(Owner, pOwner, OwnerLength); - RtlCopyMemory(PrimaryGroup, pGroup, GroupLength); - RtlCopyMemory(Dacl, pDacl, DaclLength); - RtlCopyMemory(Sacl, pSacl, SaclLength); - - pAbsSD->Revision = pRelSD->Revision; - pAbsSD->Sbz1 = pRelSD->Sbz1; - pAbsSD->Control = pRelSD->Control & ~SE_SELF_RELATIVE; - pAbsSD->Owner = Owner; - pAbsSD->Group = PrimaryGroup; - pAbsSD->Dacl = Dacl; - pAbsSD->Sacl = Sacl; - - *OwnerSize = OwnerLength; - *PrimaryGroupSize = GroupLength; - *DaclSize = DaclLength; - *SaclSize = SaclLength; - - return STATUS_SUCCESS; -} - + /* Copy the header fields */ + RtlMoveMemory(Sd, RelSd, sizeof(SECURITY_DESCRIPTOR_RELATIVE)); + + /* Wipe out the pointers and the relative flag */ + Sd->Owner = NULL; + Sd->Group = NULL; + Sd->Sacl = NULL; + Sd->Dacl = NULL; + Sd->Control &= ~SE_SELF_RELATIVE; + + /* Is there an owner? */ + if (pOwner) + { + /* Copy it */ + RtlMoveMemory(Owner, pOwner, RtlLengthSid(pOwner)); + Sd->Owner = Owner; + } + + /* Is there a group? */ + if (pGroup) + { + /* Copy it */ + RtlMoveMemory(PrimaryGroup, pGroup, RtlLengthSid(pGroup)); + Sd->Group = PrimaryGroup; + } + + /* Is there a DACL? */ + if (pDacl) + { + /* Copy it */ + RtlMoveMemory(Dacl, pDacl, pDacl->AclSize); + Sd->Dacl = Dacl; + } + + /* Is there a SACL? */ + if (pSacl) + { + /* Copy it */ + RtlMoveMemory(Sacl, pSacl, pSacl->AclSize); + Sd->Sacl = Sacl; + } + + /* All good */ + return STATUS_SUCCESS; +} /* * @implemented @@ -892,47 +843,26 @@ RtlSelfRelativeToAbsoluteSD2(IN OUT PSECURITY_DESCRIPTOR SelfRelativeSD, OUT PULONG BufferSize) { - PISECURITY_DESCRIPTOR pAbsSD = (PISECURITY_DESCRIPTOR)SelfRelativeSD; - PISECURITY_DESCRIPTOR_RELATIVE pRelSD = (PISECURITY_DESCRIPTOR_RELATIVE)SelfRelativeSD; -#ifdef _WIN64 + PISECURITY_DESCRIPTOR Sd = (PISECURITY_DESCRIPTOR)SelfRelativeSD; + PISECURITY_DESCRIPTOR_RELATIVE RelSd = (PISECURITY_DESCRIPTOR_RELATIVE)SelfRelativeSD; PVOID DataStart, DataEnd; - ULONG DataSize; LONG MoveDelta; - ULONG OwnerLength; - ULONG GroupLength; - ULONG DaclLength; - ULONG SaclLength; -#endif - PSID pOwner; - PSID pGroup; - PACL pDacl; - PACL pSacl; - - PAGED_CODE_RTL(); - - if (SelfRelativeSD == NULL) - { - return STATUS_INVALID_PARAMETER_1; - } - - if (BufferSize == NULL) - { - return STATUS_INVALID_PARAMETER_2; - } - - if (pRelSD->Revision != SECURITY_DESCRIPTOR_REVISION1) - { - return STATUS_UNKNOWN_REVISION; - } - - if (!(pRelSD->Control & SE_SELF_RELATIVE)) - { - return STATUS_BAD_DESCRIPTOR_FORMAT; - } - -#ifdef _WIN64 - - RtlpQuerySecurityDescriptor((PISECURITY_DESCRIPTOR)pRelSD, + ULONG DataSize, OwnerLength, GroupLength, DaclLength, SaclLength; + PSID pOwner, pGroup; + PACL pDacl, pSacl; + PAGED_CODE_RTL(); + + /* Need input */ + if (!RelSd) return STATUS_INVALID_PARAMETER_1; + + /* Need to know how much space we have */ + if (!BufferSize) return STATUS_INVALID_PARAMETER_2; + + /* Input must be relative */ + if (!(RelSd->Control & SE_SELF_RELATIVE)) return STATUS_BAD_DESCRIPTOR_FORMAT; + + /* Query all the component sizes */ + RtlpQuerySecurityDescriptor(Sd, &pOwner, &OwnerLength, &pGroup, @@ -942,272 +872,334 @@ &pSacl, &SaclLength); - /* calculate the start and end of the data area, we simply just move the - data by the difference between the size of the relative and absolute - security descriptor structure */ + /* + * Check if there's a difference in structure layout between relatiev and + * absolute descriptors. On 32-bit, there won't be, since an offset is the + * same size as a pointer (32-bit), but on 64-bit, the offsets remain 32-bit + * as they are not SIZE_T, but ULONG, while the pointers now become 64-bit + * and thus the structure is different */ + MoveDelta = sizeof(SECURITY_DESCRIPTOR) - sizeof(SECURITY_DESCRIPTOR_RELATIVE); + if (!MoveDelta) + { + /* So on 32-bit, simply clear the flag... */ + Sd->Control &= ~SE_SELF_RELATIVE; + + /* Ensure we're *really* on 32-bit */ + ASSERT(sizeof(Sd->Owner) == sizeof(RelSd->Owner)); + ASSERT(sizeof(Sd->Group) == sizeof(RelSd->Group)); + ASSERT(sizeof(Sd->Sacl) == sizeof(RelSd->Sacl)); + ASSERT(sizeof(Sd->Dacl) == sizeof(RelSd->Dacl)); + + /* And simply set pointers where there used to be offsets */ + Sd->Owner = pOwner; + Sd->Group = pGroup; + Sd->Sacl = pSacl; + Sd->Dacl = pDacl; + return STATUS_SUCCESS; + } + + /* + * Calculate the start and end of the data area, we simply just move the + * data by the difference between the size of the relative and absolute + * security descriptor structure + */ DataStart = pOwner; DataEnd = (PVOID)((ULONG_PTR)pOwner + OwnerLength); - if (pGroup != NULL) - { - if (((ULONG_PTR)pGroup < (ULONG_PTR)DataStart) || DataStart == NULL) + + /* Is there a group? */ + if (pGroup) + { + /* Is the group higher than where we started? */ + if (((ULONG_PTR)pGroup < (ULONG_PTR)DataStart) || !DataStart) + { + /* Update the start pointer */ DataStart = pGroup; - - if (((ULONG_PTR)pGroup + GroupLength > (ULONG_PTR)DataEnd) || DataEnd == NULL) + } + + /* Is the group beyond where we ended? */ + if (((ULONG_PTR)pGroup + GroupLength > (ULONG_PTR)DataEnd) || !DataEnd) + { + /* Update the end pointer */ DataEnd = (PVOID)((ULONG_PTR)pGroup + GroupLength); - } - if (pDacl != NULL) - { - if (((ULONG_PTR)pDacl < (ULONG_PTR)DataStart) || DataStart == NULL) + } + } + + /* Is there a DACL? */ + if (pDacl) + { + /* Is the DACL higher than where we started? */ + if (((ULONG_PTR)pDacl < (ULONG_PTR)DataStart) || !DataStart) + { + /* Update the start pointer */ DataStart = pDacl; - - if (((ULONG_PTR)pDacl + DaclLength > (ULONG_PTR)DataEnd) || DataEnd == NULL) + } + + /* Is the DACL beyond where we ended? */ + if (((ULONG_PTR)pDacl + DaclLength > (ULONG_PTR)DataEnd) || !DataEnd) + { + /* Update the end pointer */ DataEnd = (PVOID)((ULONG_PTR)pDacl + DaclLength); - } - if (pSacl != NULL) - { - if (((ULONG_PTR)pSacl < (ULONG_PTR)DataStart) || DataStart == NULL) + } + } + + /* Is there a SACL? */ + if (pSacl) + { + /* Is the SACL higher than where we started? */ + if (((ULONG_PTR)pSacl < (ULONG_PTR)DataStart) || !DataStart) + { + /* Update the start pointer */ DataStart = pSacl; - - if (((ULONG_PTR)pSacl + SaclLength > (ULONG_PTR)DataEnd) || DataEnd == NULL) + } + + /* Is the SACL beyond where we ended? */ + if (((ULONG_PTR)pSacl + SaclLength > (ULONG_PTR)DataEnd) || !DataEnd) + { + /* Update the end pointer */ DataEnd = (PVOID)((ULONG_PTR)pSacl + SaclLength); - } - + } + } + + /* Sanity check */ ASSERT((ULONG_PTR)DataEnd >= (ULONG_PTR)DataStart); + /* Now compute the difference between relative and absolute */ DataSize = (ULONG)((ULONG_PTR)DataEnd - (ULONG_PTR)DataStart); + /* Is the new buffer large enough for this difference? */ if (*BufferSize < sizeof(SECURITY_DESCRIPTOR) + DataSize) { + /* Nope, bail out */ *BufferSize = sizeof(SECURITY_DESCRIPTOR) + DataSize; return STATUS_BUFFER_TOO_SMALL; } - if (DataSize != 0) - { - /* if DataSize != 0 ther must be at least one SID or ACL in the security - descriptor! Also the data area must be located somewhere after the - end of the SECURITY_DESCRIPTOR_RELATIVE structure */ + /* Is there anything actually to copy? */ + if (DataSize) + { + /* + * There must be at least one SID or ACL in the security descriptor! + * Also the data area must be located somewhere after the end of the + * SECURITY_DESCRIPTOR_RELATIVE structure + */ ASSERT(DataStart != NULL); - ASSERT((ULONG_PTR)DataStart >= (ULONG_PTR)(pRelSD + 1)); - - /* it's time to move the data */ - RtlMoveMemory((PVOID)(pAbsSD + 1), + ASSERT((ULONG_PTR)DataStart >= (ULONG_PTR)(RelSd + 1)); + + /* It's time to move the data */ + RtlMoveMemory((PVOID)(Sd + 1), DataStart, DataSize); - - MoveDelta = (LONG)((LONG_PTR)(pAbsSD + 1) - (LONG_PTR)DataStart); - - /* adjust the pointers if neccessary */ - if (pOwner != NULL) - pAbsSD->Owner = (PSID)((LONG_PTR)pOwner + MoveDelta); - else - pAbsSD->Owner = NULL; - - if (pGroup != NULL) - pAbsSD->Group = (PSID)((LONG_PTR)pGroup + MoveDelta); - else - pAbsSD->Group = NULL; - - if (pSacl != NULL) - pAbsSD->Sacl = (PACL)((LONG_PTR)pSacl + MoveDelta); - else - pAbsSD->Sacl = NULL; - - if (pDacl != NULL) - pAbsSD->Dacl = (PACL)((LONG_PTR)pDacl + MoveDelta); - else - pAbsSD->Dacl = NULL; + } + + /* Is there an owner? */ + if (pOwner) + { + /* Set the pointer to the relative position */ + Sd->Owner = (PSID)((LONG_PTR)pOwner + MoveDelta); } else { - /* all pointers must be NULL! */ - ASSERT(pOwner == NULL); - ASSERT(pGroup == NULL); - ASSERT(pSacl == NULL); - ASSERT(pDacl == NULL); - - pAbsSD->Owner = NULL; - pAbsSD->Group = NULL; - pAbsSD->Sacl = NULL; - pAbsSD->Dacl = NULL; - } - - /* clear the self-relative flag */ - pAbsSD->Control &= ~SE_SELF_RELATIVE; - -#else - - RtlpQuerySecurityDescriptorPointers((PISECURITY_DESCRIPTOR)pRelSD, - &pOwner, - &pGroup, - &pSacl, - &pDacl); - - /* clear the self-relative flag and simply convert the offsets to pointers */ - pAbsSD->Control &= ~SE_SELF_RELATIVE; - pAbsSD->Owner = pOwner; - pAbsSD->Group = pGroup; - pAbsSD->Sacl = pSacl; - pAbsSD->Dacl = pDacl; - -#endif - - return STATUS_SUCCESS; -} - - -/* - * @implemented - */ -BOOLEAN NTAPI + /* No owner, clear the pointer */ + Sd->Owner = NULL; + } + + /* Is there a group */ + if (pGroup) + { + /* Set the pointer to the relative position */ + Sd->Group = (PSID)((LONG_PTR)pGroup + MoveDelta); + } + else + { + /* No group, clear the pointer */ + Sd->Group = NULL; + } + + /* Is there a SACL? */ + if (pSacl) + { + /* Set the pointer to the relative position */ + Sd->Sacl = (PACL)((LONG_PTR)pSacl + MoveDelta); + } + else + { + /* No SACL, clear the pointer */ + Sd->Sacl = NULL; + } + + /* Is there a DACL? */ + if (pDacl) + { + /* Set the pointer to the relative position */ + Sd->Dacl = (PACL)((LONG_PTR)pDacl + MoveDelta); + } + else + { + /* No DACL, clear the pointer */ + Sd->Dacl = NULL; + } + + /* Clear the self-relative flag */ + Sd->Control &= ~SE_SELF_RELATIVE; + + /* All good */ + return STATUS_SUCCESS; +} + +/* + * @implemented + */ +BOOLEAN +NTAPI +RtlValidSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptor) +{ + PISECURITY_DESCRIPTOR Sd = (PISECURITY_DESCRIPTOR)SecurityDescriptor; + PSID Owner, Group; + PACL Sacl, Dacl; + PAGED_CODE_RTL(); + + _SEH2_TRY + { + /* Fail on bad revisions */ + if (Sd->Revision != SECURITY_DESCRIPTOR_REVISION) return FALSE; + + /* Owner SID must be valid if present */ + Owner = SepGetOwnerFromDescriptor(Sd); + if ((Owner) && (!RtlValidSid(Owner))) return FALSE; + + /* Group SID must be valid if present */ + Group = SepGetGroupFromDescriptor(Sd); + if ((Owner) && (!RtlValidSid(Group))) return FALSE; + + /* DACL must be valid if present */ + Dacl = SepGetDaclFromDescriptor(Sd); + if ((Dacl) && (!RtlValidAcl(Dacl))) return FALSE; + + /* SACL must be valid if present */ + Sacl = SepGetSaclFromDescriptor(Sd); + if ((Sacl) && (!RtlValidAcl(Sacl))) return FALSE; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Access fault, bail out */ + return FALSE; + } + _SEH2_END; + + /* All good */ + return TRUE; +} + +/* + * @implemented + */ +BOOLEAN +NTAPI RtlValidRelativeSecurityDescriptor(IN PSECURITY_DESCRIPTOR SecurityDescriptorInput, IN ULONG SecurityDescriptorLength, IN SECURITY_INFORMATION RequiredInformation) { - PISECURITY_DESCRIPTOR pSD = (PISECURITY_DESCRIPTOR)SecurityDescriptorInput; - PSID Owner; - PSID Group; - - PAGED_CODE_RTL(); - - if (SecurityDescriptorLength < sizeof(SECURITY_DESCRIPTOR_RELATIVE) || - pSD->Revision != SECURITY_DESCRIPTOR_REVISION1 || - !(pSD->Control & SE_SELF_RELATIVE)) - { - return FALSE; - } - - if (pSD->Owner != 0) - { - Owner = (PSID)((ULONG_PTR)pSD->Owner + (ULONG_PTR)pSD); - if (!RtlValidSid(Owner)) - { - return FALSE; - } - } - else if (RequiredInformation & OWNER_SECURITY_INFORMATION) - { - return FALSE; - } - - if (pSD->Group != 0) - { - Group = (PSID)((ULONG_PTR)pSD->Group + (ULONG_PTR)pSD); - if (!RtlValidSid(Group)) - { - return FALSE; - } - } - else if (RequiredInformation & GROUP_SECURITY_INFORMATION) - { - return FALSE; - } - - if (pSD->Control & SE_DACL_PRESENT) - { - if (pSD->Dacl != 0 && - !RtlValidAcl((PACL)((ULONG_PTR)pSD->Dacl + (ULONG_PTR)pSD))) - { - return FALSE; - } - } - else if (RequiredInformation & DACL_SECURITY_INFORMATION) - { - return FALSE; - } - - if (pSD->Control & SE_SACL_PRESENT) - { - if (pSD->Sacl != 0 && - !RtlValidAcl((PACL)((ULONG_PTR)pSD->Sacl + (ULONG_PTR)pSD))) - { - return FALSE; - } - } - else if (RequiredInformation & SACL_SECURITY_INFORMATION) - { - return FALSE; - } - - return TRUE; -} - - -/* - * @implemented - */ -BOOLEAN -NTAPI -RtlGetSecurityDescriptorRMControl(IN PSECURITY_DESCRIPTOR SecurityDescriptor, - OUT PUCHAR RMControl) -{ - PISECURITY_DESCRIPTOR pSD = (PISECURITY_DESCRIPTOR)SecurityDescriptor; - - PAGED_CODE_RTL(); - - if (!(pSD->Control & SE_RM_CONTROL_VALID)) - { - *RMControl = 0; + PISECURITY_DESCRIPTOR_RELATIVE Sd = (PISECURITY_DESCRIPTOR_RELATIVE)SecurityDescriptorInput; + PSID Owner, Group; + PACL Dacl, Sacl; + ULONG Length; + PAGED_CODE_RTL(); + + /* Note that Windows allows no DACL/SACL even if RequiredInfo wants it */ + + /* Do we have enough space, is the revision vaild, and is this SD relative? */ + if ((SecurityDescriptorLength < sizeof(SECURITY_DESCRIPTOR_RELATIVE)) || + (Sd->Revision != SECURITY_DESCRIPTOR_REVISION) || + !(Sd->Control & SE_SELF_RELATIVE)) + { + /* Nope, bail out */ return FALSE; } - *RMControl = pSD->Sbz1; - + /* Is there an owner? */ + if (Sd->Owner) + { + /* Try to access it */ + if (!RtlpValidateSDOffsetAndSize(Sd->Owner, + SecurityDescriptorLength, + sizeof(SID), + &Length)) + { + /* It's beyond the buffer, fail */ + return FALSE; + } + + /* Read the owner, check if it's valid and if the buffer contains it */ + Owner = (PSID)((ULONG_PTR)Sd->Owner + (ULONG_PTR)Sd); + if (!RtlValidSid(Owner) || (Length < RtlLengthSid(Owner))) return FALSE; + } + else if (RequiredInformation & OWNER_SECURITY_INFORMATION) + { + /* No owner but the caller expects one, fail */ + return FALSE; + } + + /* Is there a group? */ + if (Sd->Group) + { + /* Try to access it */ + if (!RtlpValidateSDOffsetAndSize(Sd->Group, + SecurityDescriptorLength, + sizeof(SID), + &Length)) + { + /* It's beyond the buffer, fail */ + return FALSE; + } + + /* Read the group, check if it's valid and if the buffer contains it */ + Group = (PSID)((ULONG_PTR)Sd->Owner + (ULONG_PTR)Sd); + if (!RtlValidSid(Group) || (Length < RtlLengthSid(Group))) return FALSE; + } + else if (RequiredInformation & GROUP_SECURITY_INFORMATION) + { + /* No group, but the caller expects one, fail */ + return FALSE; + } + + /* Is there a DACL? */ + if (Sd->Control & SE_DACL_PRESENT) + { + /* Try to access it */ + if (!RtlpValidateSDOffsetAndSize(Sd->Dacl, + SecurityDescriptorLength, + sizeof(ACL), + &Length)) + { + /* It's beyond the buffer, fail */ + return FALSE; + } + + /* Read the DACL, check if it's valid and if the buffer contains it */ + Dacl = (PSID)((ULONG_PTR)Sd->Dacl + (ULONG_PTR)Sd); + if (!(RtlValidAcl(Dacl)) || (Length < Dacl->AclSize)) return FALSE; + } + + /* Is there a SACL? */ + if (Sd->Control & SE_SACL_PRESENT) + { + /* Try to access it */ + if (!RtlpValidateSDOffsetAndSize(Sd->Sacl, + SecurityDescriptorLength, + sizeof(ACL), + &Length)) + { + /* It's beyond the buffer, fail */ + return FALSE; + } + + /* Read the SACL, check if it's valid and if the buffer contains it */ + Sacl = (PSID)((ULONG_PTR)Sd->Sacl + (ULONG_PTR)Sd); + if (!(RtlValidAcl(Sacl)) || (Length < Sacl->AclSize)) return FALSE; + } + + /* All good */ return TRUE; } - -/* - * @implemented - */ -VOID -NTAPI -RtlSetSecurityDescriptorRMControl(IN OUT PSECURITY_DESCRIPTOR SecurityDescriptor, - IN PUCHAR RMControl) -{ - PISECURITY_DESCRIPTOR pSD = (PISECURITY_DESCRIPTOR)SecurityDescriptor; - - PAGED_CODE_RTL(); - - if (RMControl == NULL) - { - pSD->Control &= ~SE_RM_CONTROL_VALID; - pSD->Sbz1 = 0; - } - else - { - pSD->Control |= SE_RM_CONTROL_VALID; - pSD->Sbz1 = *RMControl; - } -} - - -/* - * @implemented - */ -NTSTATUS -NTAPI -RtlSetAttributesSecurityDescriptor(IN OUT PSECURITY_DESCRIPTOR SecurityDescriptor, - IN SECURITY_DESCRIPTOR_CONTROL Control, - OUT PULONG Revision) -{ - PISECURITY_DESCRIPTOR pSD = (PISECURITY_DESCRIPTOR)SecurityDescriptor; - - PAGED_CODE_RTL(); - - *Revision = pSD->Revision; - - if (pSD->Revision != SECURITY_DESCRIPTOR_REVISION1) - return STATUS_UNKNOWN_REVISION; - - Control &= - ~(SE_OWNER_DEFAULTED | SE_GROUP_DEFAULTED | SE_DACL_PRESENT | - SE_DACL_DEFAULTED | SE_SACL_PRESENT | SE_SACL_DEFAULTED | - SE_RM_CONTROL_VALID | SE_SELF_RELATIVE); - - return RtlSetControlSecurityDescriptor(SecurityDescriptor, - Control, - Control); -} - /* EOF */

1 0

[ekohl] 57449: [LSASRV] Get rid of the ugly container object code. Let LsapCreateDbObject and LsapOpenDbObject handle container objects instead.
by ekohl＠svn.reactos.org 30 Sep '12

30 Sep '12

Author: ekohl Date: Sun Sep 30 23:50:30 2012 New Revision: 57449 URL: http://svn.reactos.org/svn/reactos?rev=57449&view=rev Log: [LSASRV] Get rid of the ugly container object code. Let LsapCreateDbObject and LsapOpenDbObject handle container objects instead. Modified: trunk/reactos/dll/win32/lsasrv/database.c trunk/reactos/dll/win32/lsasrv/lsarpc.c trunk/reactos/dll/win32/lsasrv/lsasrv.h Modified: trunk/reactos/dll/win32/lsasrv/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/database.… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/database.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/database.c [iso-8859-1] Sun Sep 30 23:50:30 2012 @@ -283,6 +283,7 @@ /* Open the 'Policy' object */ Status = LsapOpenDbObject(NULL, + NULL, L"Policy", LsaDbPolicyObject, 0, @@ -427,6 +428,7 @@ NTSTATUS LsapCreateDbObject(IN PLSA_DB_OBJECT ParentObject, + IN LPWSTR ContainerName, IN LPWSTR ObjectName, IN LSA_DB_OBJECT_TYPE ObjectType, IN ACCESS_MASK DesiredAccess, @@ -436,7 +438,8 @@ OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING KeyName; HANDLE ParentKeyHandle; - HANDLE ObjectKeyHandle; + HANDLE ContainerKeyHandle = NULL; + HANDLE ObjectKeyHandle = NULL; NTSTATUS Status; if (DbObject == NULL) @@ -447,25 +450,73 @@ else ParentKeyHandle = ParentObject->KeyHandle; - RtlInitUnicodeString(&KeyName, - ObjectName); - - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - ParentKeyHandle, - NULL); - - Status = NtCreateKey(&ObjectKeyHandle, - KEY_ALL_ACCESS, - &ObjectAttributes, - 0, - NULL, - 0, - NULL); - if (!NT_SUCCESS(Status)) - { - return Status; + if (ContainerName != NULL) + { + /* Open the container key */ + RtlInitUnicodeString(&KeyName, + ContainerName); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + ParentKeyHandle, + NULL); + + Status = NtOpenKey(&ContainerKeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Open the object key */ + RtlInitUnicodeString(&KeyName, + ObjectName); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + ContainerKeyHandle, + NULL); + + Status = NtCreateKey(&ObjectKeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes, + 0, + NULL, + 0, + NULL); + + NtClose(ContainerKeyHandle); + + if (!NT_SUCCESS(Status)) + { + return Status; + } + } + else + { + RtlInitUnicodeString(&KeyName, + ObjectName); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + ParentKeyHandle, + NULL); + + Status = NtCreateKey(&ObjectKeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes, + 0, + NULL, + 0, + NULL); + if (!NT_SUCCESS(Status)) + { + return Status; + } } NewObject = RtlAllocateHeap(RtlGetProcessHeap(), @@ -495,6 +546,7 @@ NTSTATUS LsapOpenDbObject(IN PLSA_DB_OBJECT ParentObject, + IN LPWSTR ContainerName, IN LPWSTR ObjectName, IN LSA_DB_OBJECT_TYPE ObjectType, IN ACCESS_MASK DesiredAccess, @@ -504,7 +556,8 @@ OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING KeyName; HANDLE ParentKeyHandle; - HANDLE ObjectKeyHandle; + HANDLE ContainerKeyHandle = NULL; + HANDLE ObjectKeyHandle = NULL; NTSTATUS Status; if (DbObject == NULL) @@ -515,26 +568,71 @@ else ParentKeyHandle = ParentObject->KeyHandle; - RtlInitUnicodeString(&KeyName, - ObjectName); - - InitializeObjectAttributes(&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - ParentKeyHandle, - NULL); - - Status = NtOpenKey(&ObjectKeyHandle, - KEY_ALL_ACCESS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - return Status; + if (ContainerName != NULL) + { + /* Open the container key */ + RtlInitUnicodeString(&KeyName, + ContainerName); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + ParentKeyHandle, + NULL); + + Status = NtOpenKey(&ContainerKeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Open the object key */ + RtlInitUnicodeString(&KeyName, + ObjectName); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + ContainerKeyHandle, + NULL); + + Status = NtOpenKey(&ObjectKeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes); + + NtClose(ContainerKeyHandle); + + if (!NT_SUCCESS(Status)) + { + return Status; + } + } + else + { + /* Open the object key */ + RtlInitUnicodeString(&KeyName, + ObjectName); + + InitializeObjectAttributes(&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + ParentKeyHandle, + NULL); + + Status = NtOpenKey(&ObjectKeyHandle, + KEY_ALL_ACCESS, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + return Status; + } } NewObject = RtlAllocateHeap(RtlGetProcessHeap(), - 0, - sizeof(LSA_DB_OBJECT)); + 0, + sizeof(LSA_DB_OBJECT)); if (NewObject == NULL) { NtClose(ObjectKeyHandle); Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Sun Sep 30 23:50:30 2012 @@ -183,6 +183,7 @@ RtlEnterCriticalSection(&PolicyHandleTableLock); Status = LsapOpenDbObject(NULL, + NULL, L"Policy", LsaDbPolicyObject, DesiredAccess, @@ -435,7 +436,6 @@ LSAPR_HANDLE *AccountHandle) { PLSA_DB_OBJECT PolicyObject; - PLSA_DB_OBJECT AccountsObject = NULL; PLSA_DB_OBJECT AccountObject = NULL; LPWSTR SidString = NULL; NTSTATUS Status = STATUS_SUCCESS; @@ -455,18 +455,6 @@ return Status; } - /* Open the Accounts object */ - Status = LsapOpenDbObject(PolicyObject, - L"Accounts", - LsaDbContainerObject, - 0, - &AccountsObject); - if (!NT_SUCCESS(Status)) - { - ERR("LsapCreateDbObject (Accounts) failed (Status 0x%08lx)\n", Status); - goto done; - } - /* Create SID string */ if (!ConvertSidToStringSid((PSID)AccountSid, &SidString)) @@ -477,14 +465,15 @@ } /* Create the Account object */ - Status = LsapCreateDbObject(AccountsObject, + Status = LsapCreateDbObject(PolicyObject, + L"Accounts", SidString, LsaDbAccountObject, DesiredAccess, &AccountObject); if (!NT_SUCCESS(Status)) { - ERR("LsapCreateDbObject (Account) failed (Status 0x%08lx)\n", Status); + ERR("LsapCreateDbObject failed (Status 0x%08lx)\n", Status); goto done; } @@ -507,9 +496,6 @@ { *AccountHandle = (LSAPR_HANDLE)AccountObject; } - - if (AccountsObject != NULL) - LsapCloseDbObject(AccountsObject); return STATUS_SUCCESS; } @@ -750,7 +736,6 @@ LSAPR_HANDLE *SecretHandle) { PLSA_DB_OBJECT PolicyObject; - PLSA_DB_OBJECT SecretsObject = NULL; PLSA_DB_OBJECT SecretObject = NULL; LARGE_INTEGER Time; NTSTATUS Status = STATUS_SUCCESS; @@ -766,18 +751,6 @@ return Status; } - /* Open the Secrets object */ - Status = LsapOpenDbObject(PolicyObject, - L"Secrets", - LsaDbContainerObject, - 0, - &SecretsObject); - if (!NT_SUCCESS(Status)) - { - ERR("LsapCreateDbObject (Secrets) failed (Status 0x%08lx)\n", Status); - goto done; - } - /* Get the current time */ Status = NtQuerySystemTime(&Time); if (!NT_SUCCESS(Status)) @@ -787,14 +760,15 @@ } /* Create the Secret object */ - Status = LsapCreateDbObject(SecretsObject, + Status = LsapCreateDbObject(PolicyObject, + L"Secrets", SecretName->Buffer, LsaDbSecretObject, DesiredAccess, &SecretObject); if (!NT_SUCCESS(Status)) { - ERR("LsapCreateDbObject (Secret) failed (Status 0x%08lx)\n", Status); + ERR("LsapCreateDbObject failed (Status 0x%08lx)\n", Status); goto done; } @@ -826,9 +800,6 @@ *SecretHandle = (LSAPR_HANDLE)SecretObject; } - if (SecretsObject != NULL) - LsapCloseDbObject(SecretsObject); - return STATUS_SUCCESS; } @@ -841,7 +812,6 @@ LSAPR_HANDLE *AccountHandle) { PLSA_DB_OBJECT PolicyObject; - PLSA_DB_OBJECT AccountsObject = NULL; PLSA_DB_OBJECT AccountObject = NULL; LPWSTR SidString = NULL; NTSTATUS Status = STATUS_SUCCESS; @@ -861,18 +831,6 @@ return Status; } - /* Open the Accounts object */ - Status = LsapOpenDbObject(PolicyObject, - L"Accounts", - LsaDbContainerObject, - 0, - &AccountsObject); - if (!NT_SUCCESS(Status)) - { - ERR("LsapOpenDbObject (Accounts) failed (Status 0x%08lx)\n", Status); - goto done; - } - /* Create SID string */ if (!ConvertSidToStringSid((PSID)AccountSid, &SidString)) @@ -883,14 +841,15 @@ } /* Create the Account object */ - Status = LsapOpenDbObject(AccountsObject, + Status = LsapOpenDbObject(PolicyObject, + L"Accounts", SidString, LsaDbAccountObject, DesiredAccess, &AccountObject); if (!NT_SUCCESS(Status)) { - ERR("LsapOpenDbObject (Account) failed (Status 0x%08lx)\n", Status); + ERR("LsapOpenDbObject failed (Status 0x%08lx)\n", Status); goto done; } @@ -913,9 +872,6 @@ { *AccountHandle = (LSAPR_HANDLE)AccountObject; } - - if (AccountsObject != NULL) - LsapCloseDbObject(AccountsObject); return Status; } @@ -1257,7 +1213,6 @@ LSAPR_HANDLE *SecretHandle) { PLSA_DB_OBJECT PolicyObject; - PLSA_DB_OBJECT SecretsObject = NULL; PLSA_DB_OBJECT SecretObject = NULL; NTSTATUS Status = STATUS_SUCCESS; @@ -1272,27 +1227,16 @@ return Status; } - /* Open the Secrets object */ + /* Create the secret object */ Status = LsapOpenDbObject(PolicyObject, L"Secrets", - LsaDbContainerObject, - 0, - &SecretsObject); - if (!NT_SUCCESS(Status)) - { - ERR("LsapCreateDbObject (Secrets) failed (Status 0x%08lx)\n", Status); - goto done; - } - - /* Create the secret object */ - Status = LsapOpenDbObject(SecretsObject, SecretName->Buffer, LsaDbSecretObject, DesiredAccess, &SecretObject); if (!NT_SUCCESS(Status)) { - ERR("LsapOpenDbObject (Secret) failed (Status 0x%08lx)\n", Status); + ERR("LsapOpenDbObject failed (Status 0x%08lx)\n", Status); goto done; } @@ -1306,9 +1250,6 @@ { *SecretHandle = (LSAPR_HANDLE)SecretObject; } - - if (SecretsObject != NULL) - LsapCloseDbObject(SecretsObject); return STATUS_SUCCESS; } Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.h?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] Sun Sep 30 23:50:30 2012 @@ -33,7 +33,6 @@ typedef enum _LSA_DB_OBJECT_TYPE { LsaDbIgnoreObject, - LsaDbContainerObject, LsaDbPolicyObject, LsaDbAccountObject, LsaDbDomainObject, @@ -71,6 +70,7 @@ NTSTATUS LsapCreateDbObject(IN PLSA_DB_OBJECT ParentObject, + IN LPWSTR ContainerName, IN LPWSTR ObjectName, IN LSA_DB_OBJECT_TYPE HandleType, IN ACCESS_MASK DesiredAccess, @@ -78,6 +78,7 @@ NTSTATUS LsapOpenDbObject(IN PLSA_DB_OBJECT ParentObject, + IN LPWSTR ContainerName, IN LPWSTR ObjectName, IN LSA_DB_OBJECT_TYPE ObjectType, IN ACCESS_MASK DesiredAccess,

1 0

[ekohl] 57448: [LSASRV] - Validate Account SIDs in LsarCreateAccount and LsarOpenAccount. - LsarOpenAccount: Do not check the granted access of the policy handle. - LsarOpenAccount: Return the prop...
by ekohl＠svn.reactos.org 30 Sep '12

30 Sep '12

Author: ekohl Date: Sun Sep 30 22:41:34 2012 New Revision: 57448 URL: http://svn.reactos.org/svn/reactos?rev=57448&view=rev Log: [LSASRV] - Validate Account SIDs in LsarCreateAccount and LsarOpenAccount. - LsarOpenAccount: Do not check the granted access of the policy handle. - LsarOpenAccount: Return the proper status code. Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Sun Sep 30 22:41:34 2012 @@ -440,6 +440,10 @@ LPWSTR SidString = NULL; NTSTATUS Status = STATUS_SUCCESS; + /* Validate the AccountSid */ + if (!RtlValidSid(AccountSid)) + return STATUS_INVALID_PARAMETER; + /* Validate the PolicyHandle */ Status = LsapValidateDbObject(PolicyHandle, LsaDbPolicyObject, @@ -842,10 +846,14 @@ LPWSTR SidString = NULL; NTSTATUS Status = STATUS_SUCCESS; + /* Validate the AccountSid */ + if (!RtlValidSid(AccountSid)) + return STATUS_INVALID_PARAMETER; + /* Validate the PolicyHandle */ Status = LsapValidateDbObject(PolicyHandle, LsaDbPolicyObject, - POLICY_CREATE_ACCOUNT, + 0, &PolicyObject); if (!NT_SUCCESS(Status)) { @@ -861,7 +869,7 @@ &AccountsObject); if (!NT_SUCCESS(Status)) { - ERR("LsapCreateDbObject (Accounts) failed (Status 0x%08lx)\n", Status); + ERR("LsapOpenDbObject (Accounts) failed (Status 0x%08lx)\n", Status); goto done; } @@ -909,7 +917,7 @@ if (AccountsObject != NULL) LsapCloseDbObject(AccountsObject); - return STATUS_SUCCESS; + return Status; }

1 0

[rmessiant] 57447: [DISKPART] - Correct command processing following the first command in interactive mode. - Correct invocation of command-specific help functions.
by rmessiant＠svn.reactos.org 30 Sep '12

30 Sep '12

Author: rmessiant Date: Sun Sep 30 22:25:26 2012 New Revision: 57447 URL: http://svn.reactos.org/svn/reactos?rev=57447&view=rev Log: [DISKPART] - Correct command processing following the first command in interactive mode. - Correct invocation of command-specific help functions. Modified: trunk/reactos/base/system/diskpart/help.c trunk/reactos/base/system/diskpart/interpreter.c Modified: trunk/reactos/base/system/diskpart/help.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/help.… ============================================================================== --- trunk/reactos/base/system/diskpart/help.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/help.c [iso-8859-1] Sun Sep 30 22:25:26 2012 @@ -84,7 +84,7 @@ /* Scan internal command table */ for (cmdptr = cmds; cmdptr->name; cmdptr++) { - if (_wcsicmp(argv[0], cmdptr->name) == 0 && cmdptr->help != NULL) + if (_wcsicmp(argv[1], cmdptr->name) == 0 && cmdptr->help != NULL) { cmdptr->help(argc, argv); return TRUE; Modified: trunk/reactos/base/system/diskpart/interpreter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/inter… ============================================================================== --- trunk/reactos/base/system/diskpart/interpreter.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/interpreter.c [iso-8859-1] Sun Sep 30 22:25:26 2012 @@ -156,6 +156,7 @@ while (bRun == TRUE) { + args_count = 0; memset(args_vector, 0, sizeof(args_vector)); /* shown just before the input where the user places commands */

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