Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 27375: add stdole2.tlb to build
by cwittich＠svn.reactos.org 03 Jul '07

03 Jul '07

Author: cwittich Date: Tue Jul 3 23:11:35 2007 New Revision: 27375 URL: http://svn.reactos.org/svn/reactos?rev=27375&view=rev Log: add stdole2.tlb to build Added: trunk/reactos/dll/win32/stdole2.tlb/stdole2.rbuild Modified: trunk/reactos/dll/win32/win32.rbuild Added: trunk/reactos/dll/win32/stdole2.tlb/stdole2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/stdole2.tlb/stdo… ============================================================================== --- trunk/reactos/dll/win32/stdole2.tlb/stdole2.rbuild (added) +++ trunk/reactos/dll/win32/stdole2.tlb/stdole2.rbuild Tue Jul 3 23:11:35 2007 @@ -1,0 +1,28 @@ +<group> +<module name="std_ole_v2" type="embeddedtypelib"> + <include base="std_ole_v2">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__REACTOS__" /> + <define name="__WINESRC__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <file>std_ole_v2.idl</file> +</module> +<module name="stdole2" type="win32dll" extension=".tlb" installbase="system32" installname="stdole2.tlb"> + <importlibrary definition="stdole2.tlb.spec.def" /> + <include base="stdole2">.</include> + <include base="ReactOS">include/reactos/wine</include> + <dependency>std_ole_v2</dependency> + <define name="__REACTOS__" /> + <define name="__WINESRC__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>kernel32</library> + <file>stdole2.tlb.spec</file> + <file>rsrc.rc</file> +</module> +</group> Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild (original) +++ trunk/reactos/dll/win32/win32.rbuild Tue Jul 3 23:11:35 2007 @@ -244,6 +244,9 @@ <directory name="snmpapi"> <xi:include href="snmpapi/snmpapi.rbuild" /> </directory> +<directory name="stdole2.tlb"> + <xi:include href="stdole2.tlb/stdole2.rbuild" /> +</directory> <directory name="syssetup"> <xi:include href="syssetup/syssetup.rbuild" /> </directory>

1 0

[cwittich] 27374: renamed TypeLib target to EmbeddedTypeLib
by cwittich＠svn.reactos.org 03 Jul '07

03 Jul '07

Author: cwittich Date: Tue Jul 3 23:10:33 2007 New Revision: 27374 URL: http://svn.reactos.org/svn/reactos?rev=27374&view=rev Log: renamed TypeLib target to EmbeddedTypeLib Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h trunk/reactos/tools/rbuild/bootstrap.cpp trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Tue Jul 3 23:10:33 2007 @@ -265,8 +265,8 @@ case IdlHeader: handler = new MingwIdlHeaderModuleHandler ( module ); break; - case TypeLib: - handler = new MingwTypeLibModuleHandler ( module ); + case EmbeddedTypeLib: + handler = new MingwEmbeddedTypeLibModuleHandler ( module ); break; default: throw UnknownModuleTypeException ( @@ -1263,7 +1263,7 @@ } void -MingwModuleHandler::GenerateWidlCommandsTypeLib ( +MingwModuleHandler::GenerateWidlCommandsEmbeddedTypeLib ( const CompilationUnit& compilationUnit, const string& widlflagsMacro ) { @@ -1272,19 +1272,22 @@ string dependencies = filename; dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); - string TypeLibFilename = module.GetTargetName (); - + string basename = GetBasename ( filename ); + string EmbeddedTypeLibFilename = basename + ".tlb"; + fprintf ( fMakefile, "%s: %s $(WIDL_TARGET) | %s\n", GetTargetMacro ( module ).c_str (), dependencies.c_str (), - GetDirectory ( TypeLibFilename ).c_str () ); + GetDirectory ( EmbeddedTypeLibFilename ).c_str () ); fprintf ( fMakefile, "\t$(ECHO_WIDL)\n" ); fprintf ( fMakefile, - "\t%s %s %s -t -T $@ %s\n", + //"\t%s %s %s -t -T $@ %s\n", + "\t%s %s %s -t -T %s %s\n", "$(Q)$(WIDL_TARGET)", GetWidlFlags ( compilationUnit ).c_str (), widlflagsMacro.c_str (), + EmbeddedTypeLibFilename.c_str(), filename.c_str () ); } @@ -1366,8 +1369,8 @@ else if ( module.type == RpcClient ) GenerateWidlCommandsClient ( compilationUnit, widlflagsMacro ); - else if ( module.type == TypeLib ) - GenerateWidlCommandsTypeLib ( compilationUnit, + else if ( module.type == EmbeddedTypeLib ) + GenerateWidlCommandsEmbeddedTypeLib ( compilationUnit, widlflagsMacro ); else // applies also for other module.types which include idl files GenerateWidlCommandsIdlHeader ( compilationUnit, @@ -2492,7 +2495,7 @@ { } -MingwTypeLibModuleHandler::MingwTypeLibModuleHandler ( +MingwEmbeddedTypeLibModuleHandler::MingwEmbeddedTypeLibModuleHandler ( const Module& module_ ) : MingwModuleHandler ( module_ ) @@ -2500,7 +2503,7 @@ } void -MingwTypeLibModuleHandler::Process () +MingwEmbeddedTypeLibModuleHandler::Process () { GenerateRules (); } Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Tue Jul 3 23:10:33 2007 @@ -172,7 +172,7 @@ void GenerateWidlCommandsIdlHeader ( const CompilationUnit& compilationUnit, const std::string& widlflagsMacro ); - void GenerateWidlCommandsTypeLib ( + void GenerateWidlCommandsEmbeddedTypeLib ( const CompilationUnit& compilationUnit, const std::string& widlflagsMacro ); void GenerateWidlCommands ( const CompilationUnit& compilationUnit, @@ -505,10 +505,10 @@ virtual void Process (); }; -class MingwTypeLibModuleHandler : public MingwModuleHandler -{ -public: - MingwTypeLibModuleHandler ( const Module& module ); +class MingwEmbeddedTypeLibModuleHandler : public MingwModuleHandler +{ +public: + MingwEmbeddedTypeLibModuleHandler ( const Module& module ); virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); }; Modified: trunk/reactos/tools/rbuild/bootstrap.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/bootstrap.cpp… ============================================================================== --- trunk/reactos/tools/rbuild/bootstrap.cpp (original) +++ trunk/reactos/tools/rbuild/bootstrap.cpp Tue Jul 3 23:10:33 2007 @@ -68,7 +68,7 @@ case RpcClient: case Alias: case IdlHeader: - case TypeLib: + case EmbeddedTypeLib: return false; } throw InvalidOperationException ( __FILE__, Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp (original) +++ trunk/reactos/tools/rbuild/module.cpp Tue Jul 3 23:10:33 2007 @@ -839,8 +839,8 @@ return Alias; if ( attribute.value == "idlheader" ) return IdlHeader; - if ( attribute.value == "typelib" ) - return TypeLib; + if ( attribute.value == "embeddedtypelib" ) + return EmbeddedTypeLib; throw InvalidAttributeValueException ( location, attribute.name, attribute.value ); @@ -892,7 +892,7 @@ case BootProgram: case IdlHeader: return ""; - case TypeLib: + case EmbeddedTypeLib: return ".tlb"; } throw InvalidOperationException ( __FILE__, @@ -943,7 +943,7 @@ case Alias: case BootProgram: case IdlHeader: - case TypeLib: + case EmbeddedTypeLib: return ""; } throw InvalidOperationException ( __FILE__, @@ -986,7 +986,7 @@ case Alias: case BootProgram: case IdlHeader: - case TypeLib: + case EmbeddedTypeLib: return ""; } throw InvalidOperationException ( __FILE__, @@ -1031,7 +1031,7 @@ case RpcClient: case Alias: case IdlHeader: - case TypeLib: + case EmbeddedTypeLib: return false; } throw InvalidOperationException ( __FILE__, @@ -1063,7 +1063,7 @@ case LiveIso: case IsoRegTest: case LiveIsoRegTest: - case TypeLib: + case EmbeddedTypeLib: return true; case StaticLibrary: case ObjectLibrary: @@ -1565,7 +1565,7 @@ case RpcClient: case Alias: case IdlHeader: - case TypeLib: + case EmbeddedTypeLib: return false; } throw InvalidOperationException ( __FILE__, Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h (original) +++ trunk/reactos/tools/rbuild/rbuild.h Tue Jul 3 23:10:33 2007 @@ -274,7 +274,7 @@ IdlHeader = 23, IsoRegTest = 24, LiveIsoRegTest = 25, - TypeLib = 26 + EmbeddedTypeLib = 26 }; enum HostType

1 0

[cwittich] 27373: Copied remotely
by cwittich＠svn.reactos.org 03 Jul '07

03 Jul '07

Author: cwittich Date: Tue Jul 3 23:09:50 2007 New Revision: 27373 URL: http://svn.reactos.org/svn/reactos?rev=27373&view=rev Log: Copied remotely Added: trunk/reactos/dll/win32/stdole2.tlb/ - copied from r27372, vendor/wine/dlls/stdole2.tlb/current/

1 0

[cwittich] 27372: Copied remotely
by cwittich＠svn.reactos.org 03 Jul '07

03 Jul '07

Author: cwittich Date: Tue Jul 3 23:08:00 2007 New Revision: 27372 URL: http://svn.reactos.org/svn/reactos?rev=27372&view=rev Log: Copied remotely Added: vendor/wine/dlls/stdole2.tlb/Wine-0_9_40/ - copied from r27371, vendor/wine/dlls/stdole2.tlb/current/

1 0

[cwittich] 27371: delete old stdole in vendor dir
by cwittich＠svn.reactos.org 03 Jul '07

03 Jul '07

Author: cwittich Date: Tue Jul 3 23:07:05 2007 New Revision: 27371 URL: http://svn.reactos.org/svn/reactos?rev=27371&view=rev Log: delete old stdole in vendor dir Removed: vendor/wine/dlls/stdole2/

1 0

[cwittich] 27370: stdole2.tlb vendor drop
by cwittich＠svn.reactos.org 03 Jul '07

03 Jul '07

Author: cwittich Date: Tue Jul 3 23:05:33 2007 New Revision: 27370 URL: http://svn.reactos.org/svn/reactos?rev=27370&view=rev Log: stdole2.tlb vendor drop Added: vendor/wine/dlls/stdole2.tlb/ vendor/wine/dlls/stdole2.tlb/current/ vendor/wine/dlls/stdole2.tlb/current/rsrc.rc vendor/wine/dlls/stdole2.tlb/current/std_ole_v2.idl vendor/wine/dlls/stdole2.tlb/current/stdole2.tlb.spec Added: vendor/wine/dlls/stdole2.tlb/current/rsrc.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/stdole2.tlb/current/rsr… ============================================================================== --- vendor/wine/dlls/stdole2.tlb/current/rsrc.rc (added) +++ vendor/wine/dlls/stdole2.tlb/current/rsrc.rc Tue Jul 3 23:05:33 2007 @@ -1,0 +1,31 @@ +/* + * Resource file for stdole2 + * + * Copyright 2005 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winnls.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#include "wine/wine_common_ver.rc" + +1 TYPELIB LOADONCALL DISCARDABLE std_ole_v2.tlb Added: vendor/wine/dlls/stdole2.tlb/current/std_ole_v2.idl URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/stdole2.tlb/current/std… ============================================================================== --- vendor/wine/dlls/stdole2.tlb/current/std_ole_v2.idl (added) +++ vendor/wine/dlls/stdole2.tlb/current/std_ole_v2.idl Tue Jul 3 23:05:33 2007 @@ -1,0 +1,21 @@ +/* + * Copyright (C) 2003 Robert Shearman + * 2005 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include "stdole2.idl" Added: vendor/wine/dlls/stdole2.tlb/current/stdole2.tlb.spec URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/stdole2.tlb/current/std… ============================================================================== --- vendor/wine/dlls/stdole2.tlb/current/stdole2.tlb.spec (added) +++ vendor/wine/dlls/stdole2.tlb/current/stdole2.tlb.spec Tue Jul 3 23:05:33 2007 @@ -1,0 +1,1 @@ +# no exported entry points

1 0

[fireball] 27369: - Add debug prints.
by fireball＠svn.reactos.org 03 Jul '07

03 Jul '07

Author: fireball Date: Tue Jul 3 21:59:35 2007 New Revision: 27369 URL: http://svn.reactos.org/svn/reactos?rev=27369&view=rev Log: - Add debug prints. Modified: trunk/reactos/ntoskrnl/ke/timerobj.c Modified: trunk/reactos/ntoskrnl/ke/timerobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/timerobj.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/timerobj.c (original) +++ trunk/reactos/ntoskrnl/ke/timerobj.c Tue Jul 3 21:59:35 2007 @@ -32,6 +32,8 @@ LONGLONG DueTime; LARGE_INTEGER InterruptTime, SystemTime, DifferenceTime; PKTIMER_TABLE_ENTRY TimerEntry; + + DPRINT("KiInsertTreeTimer(): Timer %p, Interval: %I64d\n", Timer, Interval.QuadPart); /* Convert to relative time if needed */ Timer->Header.Absolute = FALSE; @@ -109,6 +111,8 @@ PLIST_ENTRY ListHead, NextEntry; PKTIMER CurrentTimer; + DPRINT("KiInsertTimerTable(): Timer %p, Hand: %d\n", Timer, Hand); + /* Check if the period is zero */ if (!Timer->Period) Timer->Header.SignalState = FALSE; @@ -156,6 +160,8 @@ PKDPC Dpc = Timer->Dpc; ULONG Period = Timer->Period; LARGE_INTEGER Interval, SystemTime; + + DPRINT("KiSignalTimer(): Timer %p\n", Timer); /* Set default values */ Timer->Header.Inserted = FALSE; @@ -209,6 +215,8 @@ PKTIMER_TABLE_ENTRY TimerEntry; BOOLEAN RequestInterrupt = FALSE; + DPRINT("KiCompleteTimer(): Timer %p, LockQueue: %p\n", Timer, LockQueue); + /* Remove it from the timer list */ if (RemoveEntryList(&Timer->TimerListEntry)) { @@ -257,6 +265,8 @@ ASSERT_TIMER(Timer); ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL); + DPRINT("KeCancelTimer(): Timer %p\n", Timer); + /* Lock the Database and Raise IRQL */ OldIrql = KiAcquireDispatcherLock(); @@ -290,6 +300,9 @@ KeInitializeTimerEx(OUT PKTIMER Timer, IN TIMER_TYPE Type) { + DPRINT("KeInitializeTimerEx(): Timer %p, Type %s\n", + Timer, (Type == NotificationTimer) ? "NotificationTimer" : "SynchronizationTimer"); + /* Initialize the Dispatch Header */ KeInitializeDispatcherHeader(&Timer->Header, TimerNotificationObject + Type, @@ -344,6 +357,9 @@ ASSERT_TIMER(Timer); ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL); + DPRINT("KeSetTimerEx(): Timer %p, DueTime %I64d, Period %d, Dpc %p\n", + Timer, DueTime.QuadPart, Period, Dpc); + /* Lock the Database and Raise IRQL */ OldIrql = KiAcquireDispatcherLock();

1 0

[cwittich] 27368: -added support for TypeLibs
by cwittich＠svn.reactos.org 03 Jul '07

03 Jul '07

Author: cwittich Date: Tue Jul 3 19:27:43 2007 New Revision: 27368 URL: http://svn.reactos.org/svn/reactos?rev=27368&view=rev Log: -added support for TypeLibs Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h trunk/reactos/tools/rbuild/bootstrap.cpp trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Tue Jul 3 19:27:43 2007 @@ -265,6 +265,9 @@ case IdlHeader: handler = new MingwIdlHeaderModuleHandler ( module ); break; + case TypeLib: + handler = new MingwTypeLibModuleHandler ( module ); + break; default: throw UnknownModuleTypeException ( module.node.location, @@ -320,13 +323,17 @@ backend->intermediateDirectory ); return new FileLocation ( backend->intermediateDirectory, NormalizeFilename ( newname ) ); } - else //if ( module.type == IdlHeader ) + else if ( module.type == IdlHeader ) { newname = basename + ".h"; PassThruCacheDirectory ( NormalizeFilename ( newname ), backend->intermediateDirectory ); return new FileLocation ( fileLocation->directory, filename ); } + else + { + return new FileLocation ( fileLocation->directory, filename ); + } } else return new FileLocation ( fileLocation->directory, filename ); @@ -342,8 +349,10 @@ string basename = GetBasename ( filename ); if ( (module.type == RpcServer) || (module.type == RpcClient) ) return GetRpcServerHeaderFilename ( basename ) + " " + GetRpcClientHeaderFilename ( basename ); + else if ( module.type == IdlHeader ) + return GetIdlHeaderFilename ( basename ); else - return GetIdlHeaderFilename ( basename ); + return ""; } else return ""; @@ -1254,6 +1263,32 @@ } void +MingwModuleHandler::GenerateWidlCommandsTypeLib ( + const CompilationUnit& compilationUnit, + const string& widlflagsMacro ) +{ + FileLocation* sourceFileLocation = compilationUnit.GetFilename ( backend->intermediateDirectory ); + string filename = sourceFileLocation->filename; + string dependencies = filename; + dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); + + string TypeLibFilename = module.GetTargetName (); + + fprintf ( fMakefile, + "%s: %s $(WIDL_TARGET) | %s\n", + GetTargetMacro ( module ).c_str (), + dependencies.c_str (), + GetDirectory ( TypeLibFilename ).c_str () ); + fprintf ( fMakefile, "\t$(ECHO_WIDL)\n" ); + fprintf ( fMakefile, + "\t%s %s %s -t -T $@ %s\n", + "$(Q)$(WIDL_TARGET)", + GetWidlFlags ( compilationUnit ).c_str (), + widlflagsMacro.c_str (), + filename.c_str () ); +} + +void MingwModuleHandler::GenerateWidlCommandsClient ( const CompilationUnit& compilationUnit, const string& widlflagsMacro ) @@ -1331,7 +1366,10 @@ else if ( module.type == RpcClient ) GenerateWidlCommandsClient ( compilationUnit, widlflagsMacro ); - else + else if ( module.type == TypeLib ) + GenerateWidlCommandsTypeLib ( compilationUnit, + widlflagsMacro ); + else // applies also for other module.types which include idl files GenerateWidlCommandsIdlHeader ( compilationUnit, widlflagsMacro ); } @@ -2454,6 +2492,20 @@ { } +MingwTypeLibModuleHandler::MingwTypeLibModuleHandler ( + const Module& module_ ) + + : MingwModuleHandler ( module_ ) +{ +} + +void +MingwTypeLibModuleHandler::Process () +{ + GenerateRules (); +} + + void MingwKernelModeDLLModuleHandler::AddImplicitLibraries ( Module& module ) { Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Tue Jul 3 19:27:43 2007 @@ -170,6 +170,9 @@ const CompilationUnit& compilationUnit, const std::string& widlflagsMacro ); void GenerateWidlCommandsIdlHeader ( + const CompilationUnit& compilationUnit, + const std::string& widlflagsMacro ); + void GenerateWidlCommandsTypeLib ( const CompilationUnit& compilationUnit, const std::string& widlflagsMacro ); void GenerateWidlCommands ( const CompilationUnit& compilationUnit, @@ -502,4 +505,12 @@ virtual void Process (); }; +class MingwTypeLibModuleHandler : public MingwModuleHandler +{ +public: + MingwTypeLibModuleHandler ( const Module& module ); + virtual HostType DefaultHost() { return HostFalse; } + virtual void Process (); +}; + #endif /* MINGW_MODULEHANDLER_H */ Modified: trunk/reactos/tools/rbuild/bootstrap.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/bootstrap.cpp… ============================================================================== --- trunk/reactos/tools/rbuild/bootstrap.cpp (original) +++ trunk/reactos/tools/rbuild/bootstrap.cpp Tue Jul 3 19:27:43 2007 @@ -68,6 +68,7 @@ case RpcClient: case Alias: case IdlHeader: + case TypeLib: return false; } throw InvalidOperationException ( __FILE__, Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp (original) +++ trunk/reactos/tools/rbuild/module.cpp Tue Jul 3 19:27:43 2007 @@ -839,6 +839,8 @@ return Alias; if ( attribute.value == "idlheader" ) return IdlHeader; + if ( attribute.value == "typelib" ) + return TypeLib; throw InvalidAttributeValueException ( location, attribute.name, attribute.value ); @@ -890,6 +892,8 @@ case BootProgram: case IdlHeader: return ""; + case TypeLib: + return ".tlb"; } throw InvalidOperationException ( __FILE__, __LINE__ ); @@ -939,6 +943,7 @@ case Alias: case BootProgram: case IdlHeader: + case TypeLib: return ""; } throw InvalidOperationException ( __FILE__, @@ -981,6 +986,7 @@ case Alias: case BootProgram: case IdlHeader: + case TypeLib: return ""; } throw InvalidOperationException ( __FILE__, @@ -1025,6 +1031,7 @@ case RpcClient: case Alias: case IdlHeader: + case TypeLib: return false; } throw InvalidOperationException ( __FILE__, @@ -1056,6 +1063,7 @@ case LiveIso: case IsoRegTest: case LiveIsoRegTest: + case TypeLib: return true; case StaticLibrary: case ObjectLibrary: @@ -1557,6 +1565,7 @@ case RpcClient: case Alias: case IdlHeader: + case TypeLib: return false; } throw InvalidOperationException ( __FILE__, Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h (original) +++ trunk/reactos/tools/rbuild/rbuild.h Tue Jul 3 19:27:43 2007 @@ -273,7 +273,8 @@ ExportDriver = 22, IdlHeader = 23, IsoRegTest = 24, - LiveIsoRegTest = 25 + LiveIsoRegTest = 25, + TypeLib = 26 }; enum HostType

1 0

[fireball] 27367: - Revert changes to CRT which were not supposed to happen at all (26820, 27200:27204), and were incorrect. - Remove artifacts from strtoul/strtoull source code (excessive line breaks).
by fireball＠svn.reactos.org 03 Jul '07

03 Jul '07

Author: fireball Date: Tue Jul 3 19:24:59 2007 New Revision: 27367 URL: http://svn.reactos.org/svn/reactos?rev=27367&view=rev Log: - Revert changes to CRT which were not supposed to happen at all (26820, 27200:27204), and were incorrect. - Remove artifacts from strtoul/strtoull source code (excessive line breaks). Added: trunk/reactos/lib/sdk/libcntpr/math/i386/atan_asm.s - copied unchanged from r27199, trunk/reactos/lib/sdk/libcntpr/math/i386/atan_asm.s trunk/reactos/lib/sdk/libcntpr/math/i386/cos_asm.s - copied unchanged from r27199, trunk/reactos/lib/sdk/libcntpr/math/i386/cos_asm.s trunk/reactos/lib/sdk/libcntpr/math/i386/sin_asm.s - copied unchanged from r27199, trunk/reactos/lib/sdk/libcntpr/math/i386/sin_asm.s trunk/reactos/lib/sdk/libcntpr/math/i386/tan_asm.s - copied unchanged from r27199, trunk/reactos/lib/sdk/libcntpr/math/i386/tan_asm.s Removed: trunk/reactos/lib/sdk/libcntpr/math/i386/trig_asm.s Modified: trunk/reactos/lib/sdk/crt/math/i386/atan_asm.s trunk/reactos/lib/sdk/crt/math/i386/log10_asm.s trunk/reactos/lib/sdk/libcntpr/libcntpr.rbuild trunk/reactos/lib/sdk/libcntpr/string/strtoul.c trunk/reactos/lib/sdk/libcntpr/string/strtoull.c Modified: trunk/reactos/lib/sdk/crt/math/i386/atan_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/atan… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/i386/atan_asm.s (original) +++ trunk/reactos/lib/sdk/crt/math/i386/atan_asm.s Tue Jul 3 19:24:59 2007 @@ -14,6 +14,9 @@ /* FUNCTIONS ***************************************************************/ _atan: - fld qword ptr [esp+4] - fpatan + push ebp + mov ebp,esp + fld qword ptr [ebp+8] + fpatan + pop ebp ret Modified: trunk/reactos/lib/sdk/crt/math/i386/log10_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/log1… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/i386/log10_asm.s (original) +++ trunk/reactos/lib/sdk/crt/math/i386/log10_asm.s Tue Jul 3 19:24:59 2007 @@ -15,8 +15,11 @@ /* FUNCTIONS ***************************************************************/ _log10: - fld qword ptr [esp+4] - fldlg2 - fyl2x + push ebp + mov ebp,esp + fld qword ptr [ebp+8] + fldlg2 + fyl2x + pop ebp ret Modified: trunk/reactos/lib/sdk/libcntpr/libcntpr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/libcntpr.… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/libcntpr.rbuild (original) +++ trunk/reactos/lib/sdk/libcntpr/libcntpr.rbuild Tue Jul 3 19:24:59 2007 @@ -26,18 +26,21 @@ <file>allrem_asm.s</file> <file>allshl_asm.s</file> <file>allshr_asm.s</file> + <file>atan_asm.s</file> <file>aulldiv_asm.s</file> <file>aulldvrm_asm.s</file> <file>aullrem_asm.s</file> <file>aullshr_asm.s</file> <file>ceil_asm.s</file> + <file>cos_asm.s</file> <file>fabs_asm.s</file> <file>floor_asm.s</file> <file>ftol_asm.s</file> <file>log_asm.s</file> <file>pow_asm.s</file> + <file>sin_asm.s</file> <file>sqrt_asm.s</file> - <file>trig_asm.s</file> + <file>tan_asm.s</file> </directory> </if> <file>abs.c</file> Removed: trunk/reactos/lib/sdk/libcntpr/math/i386/trig_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/math/i386… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/math/i386/trig_asm.s (original) +++ trunk/reactos/lib/sdk/libcntpr/math/i386/trig_asm.s (removed) @@ -1,53 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Run-Time Library - * FILE: lib/rtl/i386/trig_asm.s - * PROGRAMER: Aleksey Bragin (aleksey reactos org) - * - */ -.globl _atan -.globl _cos -.globl _sin -.globl _tan - -.intel_syntax noprefix - -/* FUNCTIONS ***************************************************************/ - -_atan: - push ebp - mov ebp,esp - fld qword ptr [ebp+8] - fld1 - fpatan - pop ebp - ret - -_cos: - push ebp - mov ebp,esp - fld qword ptr [ebp+8] - fcos - pop ebp - ret - -_sin: - push ebp - mov ebp,esp - fld qword ptr [ebp+8] - fsin - pop ebp - ret - -_tan: - push ebp - mov ebp,esp - sub esp,4 - fld qword ptr [ebp+8] - fptan - fstp dword ptr [ebp-4] - mov esp,ebp - pop ebp - ret - Modified: trunk/reactos/lib/sdk/libcntpr/string/strtoul.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/string/st… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/string/strtoul.c (original) +++ trunk/reactos/lib/sdk/libcntpr/string/strtoul.c Tue Jul 3 19:24:59 2007 @@ -3,7 +3,6 @@ #include <errno.h> #include <limits.h> #include <ctype.h> - /* * Convert a string to an unsigned long integer. @@ -67,7 +66,6 @@ if (any < 0) { acc = ULONG_MAX; - } else if (neg) acc = -acc; Modified: trunk/reactos/lib/sdk/libcntpr/string/strtoull.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/libcntpr/string/st… ============================================================================== --- trunk/reactos/lib/sdk/libcntpr/string/strtoull.c (original) +++ trunk/reactos/lib/sdk/libcntpr/string/strtoull.c Tue Jul 3 19:24:59 2007 @@ -3,7 +3,6 @@ #include <fcntl.h> #include <limits.h> #include <ctype.h> - unsigned long long strtoull(const char *nptr, char **endptr, int base) @@ -59,7 +58,6 @@ if (any < 0) { acc = ULLONG_MAX; - } else if (neg) acc = -acc; @@ -67,5 +65,3 @@ *endptr = any ? (char *)((size_t)(s - 1)) : (char *)((size_t)nptr); return acc; } - -

1 0

[hpoussin] 27366: Replace tabs by spaces. No code change
by hpoussin＠svn.reactos.org 02 Jul '07

02 Jul '07

Author: hpoussin Date: Tue Jul 3 02:39:11 2007 New Revision: 27366 URL: http://svn.reactos.org/svn/reactos?rev=27366&view=rev Log: Replace tabs by spaces. No code change Modified: trunk/reactos/ntoskrnl/se/semgr.c trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/ntoskrnl/se/semgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/semgr.c?rev=27… ============================================================================== --- trunk/reactos/ntoskrnl/se/semgr.c (original) +++ trunk/reactos/ntoskrnl/se/semgr.c Tue Jul 3 02:39:11 2007 @@ -123,15 +123,15 @@ /* Create '\Security' directory */ RtlInitUnicodeString(&Name, - L"\\Security"); + L"\\Security"); InitializeObjectAttributes(&ObjectAttributes, - &Name, - OBJ_PERMANENT, - 0, - NULL); + &Name, + OBJ_PERMANENT, + 0, + NULL); Status = ZwCreateDirectoryObject(&DirectoryHandle, - DIRECTORY_ALL_ACCESS, - &ObjectAttributes); + DIRECTORY_ALL_ACCESS, + &ObjectAttributes); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to create 'Security' directory!\n"); @@ -140,17 +140,17 @@ /* Create 'LSA_AUTHENTICATION_INITALIZED' event */ RtlInitUnicodeString(&Name, - L"\\LSA_AUTHENTICATION_INITALIZED"); + L"\\LSA_AUTHENTICATION_INITALIZED"); InitializeObjectAttributes(&ObjectAttributes, - &Name, - OBJ_PERMANENT, - DirectoryHandle, - SePublicDefaultSd); + &Name, + OBJ_PERMANENT, + DirectoryHandle, + SePublicDefaultSd); Status = ZwCreateEvent(&EventHandle, - EVENT_ALL_ACCESS, - &ObjectAttributes, - SynchronizationEvent, - FALSE); + EVENT_ALL_ACCESS, + &ObjectAttributes, + SynchronizationEvent, + FALSE); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to create 'LSA_AUTHENTICATION_INITALIZED' event!\n"); @@ -271,170 +271,170 @@ /* Get owner and owner size */ if (SecurityInformation & OWNER_SECURITY_INFORMATION) - { - if (SecurityDescriptor->Owner != NULL) - { - if( SecurityDescriptor->Control & SE_SELF_RELATIVE ) - Owner = (PSID)((ULONG_PTR)SecurityDescriptor->Owner + - (ULONG_PTR)SecurityDescriptor); - else - Owner = (PSID)SecurityDescriptor->Owner; - OwnerLength = ROUND_UP(RtlLengthSid(Owner), 4); - } - Control |= (SecurityDescriptor->Control & SE_OWNER_DEFAULTED); - } + { + if (SecurityDescriptor->Owner != NULL) + { + if( SecurityDescriptor->Control & SE_SELF_RELATIVE ) + Owner = (PSID)((ULONG_PTR)SecurityDescriptor->Owner + + (ULONG_PTR)SecurityDescriptor); + else + Owner = (PSID)SecurityDescriptor->Owner; + OwnerLength = ROUND_UP(RtlLengthSid(Owner), 4); + } + Control |= (SecurityDescriptor->Control & SE_OWNER_DEFAULTED); + } else - { - if (ObjectSd->Owner != NULL) - { - Owner = (PSID)((ULONG_PTR)ObjectSd->Owner + (ULONG_PTR)ObjectSd); - OwnerLength = ROUND_UP(RtlLengthSid(Owner), 4); - } - Control |= (ObjectSd->Control & SE_OWNER_DEFAULTED); - } + { + if (ObjectSd->Owner != NULL) + { + Owner = (PSID)((ULONG_PTR)ObjectSd->Owner + (ULONG_PTR)ObjectSd); + OwnerLength = ROUND_UP(RtlLengthSid(Owner), 4); + } + Control |= (ObjectSd->Control & SE_OWNER_DEFAULTED); + } /* Get group and group size */ if (SecurityInformation & GROUP_SECURITY_INFORMATION) - { - if (SecurityDescriptor->Group != NULL) - { - if( SecurityDescriptor->Control & SE_SELF_RELATIVE ) - Group = (PSID)((ULONG_PTR)SecurityDescriptor->Group + - (ULONG_PTR)SecurityDescriptor); - else - Group = (PSID)SecurityDescriptor->Group; - GroupLength = ROUND_UP(RtlLengthSid(Group), 4); - } - Control |= (SecurityDescriptor->Control & SE_GROUP_DEFAULTED); - } + { + if (SecurityDescriptor->Group != NULL) + { + if( SecurityDescriptor->Control & SE_SELF_RELATIVE ) + Group = (PSID)((ULONG_PTR)SecurityDescriptor->Group + + (ULONG_PTR)SecurityDescriptor); + else + Group = (PSID)SecurityDescriptor->Group; + GroupLength = ROUND_UP(RtlLengthSid(Group), 4); + } + Control |= (SecurityDescriptor->Control & SE_GROUP_DEFAULTED); + } else - { - if (ObjectSd->Group != NULL) - { - Group = (PSID)((ULONG_PTR)ObjectSd->Group + (ULONG_PTR)ObjectSd); - GroupLength = ROUND_UP(RtlLengthSid(Group), 4); - } - Control |= (ObjectSd->Control & SE_GROUP_DEFAULTED); - } + { + if (ObjectSd->Group != NULL) + { + Group = (PSID)((ULONG_PTR)ObjectSd->Group + (ULONG_PTR)ObjectSd); + GroupLength = ROUND_UP(RtlLengthSid(Group), 4); + } + Control |= (ObjectSd->Control & SE_GROUP_DEFAULTED); + } /* Get DACL and DACL size */ if (SecurityInformation & DACL_SECURITY_INFORMATION) - { - if ((SecurityDescriptor->Control & SE_DACL_PRESENT) && - (SecurityDescriptor->Dacl != NULL)) - { - if( SecurityDescriptor->Control & SE_SELF_RELATIVE ) - Dacl = (PACL)((ULONG_PTR)SecurityDescriptor->Dacl + - (ULONG_PTR)SecurityDescriptor); - else - Dacl = (PACL)SecurityDescriptor->Dacl; - - DaclLength = ROUND_UP((ULONG)Dacl->AclSize, 4); - } - Control |= (SecurityDescriptor->Control & (SE_DACL_DEFAULTED | SE_DACL_PRESENT)); - } + { + if ((SecurityDescriptor->Control & SE_DACL_PRESENT) && + (SecurityDescriptor->Dacl != NULL)) + { + if( SecurityDescriptor->Control & SE_SELF_RELATIVE ) + Dacl = (PACL)((ULONG_PTR)SecurityDescriptor->Dacl + + (ULONG_PTR)SecurityDescriptor); + else + Dacl = (PACL)SecurityDescriptor->Dacl; + + DaclLength = ROUND_UP((ULONG)Dacl->AclSize, 4); + } + Control |= (SecurityDescriptor->Control & (SE_DACL_DEFAULTED | SE_DACL_PRESENT)); + } else - { - if ((ObjectSd->Control & SE_DACL_PRESENT) && - (ObjectSd->Dacl != NULL)) - { - Dacl = (PACL)((ULONG_PTR)ObjectSd->Dacl + (ULONG_PTR)ObjectSd); - DaclLength = ROUND_UP((ULONG)Dacl->AclSize, 4); - } - Control |= (ObjectSd->Control & (SE_DACL_DEFAULTED | SE_DACL_PRESENT)); - } + { + if ((ObjectSd->Control & SE_DACL_PRESENT) && + (ObjectSd->Dacl != NULL)) + { + Dacl = (PACL)((ULONG_PTR)ObjectSd->Dacl + (ULONG_PTR)ObjectSd); + DaclLength = ROUND_UP((ULONG)Dacl->AclSize, 4); + } + Control |= (ObjectSd->Control & (SE_DACL_DEFAULTED | SE_DACL_PRESENT)); + } /* Get SACL and SACL size */ if (SecurityInformation & SACL_SECURITY_INFORMATION) - { - if ((SecurityDescriptor->Control & SE_SACL_PRESENT) && - (SecurityDescriptor->Sacl != NULL)) - { - if( SecurityDescriptor->Control & SE_SELF_RELATIVE ) - Sacl = (PACL)((ULONG_PTR)SecurityDescriptor->Sacl + - (ULONG_PTR)SecurityDescriptor); - else - Sacl = (PACL)SecurityDescriptor->Sacl; - SaclLength = ROUND_UP((ULONG)Sacl->AclSize, 4); - } - Control |= (SecurityDescriptor->Control & (SE_SACL_DEFAULTED | SE_SACL_PRESENT)); - } + { + if ((SecurityDescriptor->Control & SE_SACL_PRESENT) && + (SecurityDescriptor->Sacl != NULL)) + { + if( SecurityDescriptor->Control & SE_SELF_RELATIVE ) + Sacl = (PACL)((ULONG_PTR)SecurityDescriptor->Sacl + + (ULONG_PTR)SecurityDescriptor); + else + Sacl = (PACL)SecurityDescriptor->Sacl; + SaclLength = ROUND_UP((ULONG)Sacl->AclSize, 4); + } + Control |= (SecurityDescriptor->Control & (SE_SACL_DEFAULTED | SE_SACL_PRESENT)); + } else - { - if ((ObjectSd->Control & SE_SACL_PRESENT) && - (ObjectSd->Sacl != NULL)) - { - Sacl = (PACL)((ULONG_PTR)ObjectSd->Sacl + (ULONG_PTR)ObjectSd); - SaclLength = ROUND_UP((ULONG)Sacl->AclSize, 4); - } - Control |= (ObjectSd->Control & (SE_SACL_DEFAULTED | SE_SACL_PRESENT)); - } + { + if ((ObjectSd->Control & SE_SACL_PRESENT) && + (ObjectSd->Sacl != NULL)) + { + Sacl = (PACL)((ULONG_PTR)ObjectSd->Sacl + (ULONG_PTR)ObjectSd); + SaclLength = ROUND_UP((ULONG)Sacl->AclSize, 4); + } + Control |= (ObjectSd->Control & (SE_SACL_DEFAULTED | SE_SACL_PRESENT)); + } NewSd = ExAllocatePool(NonPagedPool, - sizeof(SECURITY_DESCRIPTOR) + OwnerLength + GroupLength + - DaclLength + SaclLength); + sizeof(SECURITY_DESCRIPTOR) + OwnerLength + GroupLength + + DaclLength + SaclLength); if (NewSd == NULL) - { - ObDereferenceObject(Object); - return STATUS_INSUFFICIENT_RESOURCES; - } + { + ObDereferenceObject(Object); + return STATUS_INSUFFICIENT_RESOURCES; + } RtlCreateSecurityDescriptor(NewSd, - SECURITY_DESCRIPTOR_REVISION1); + SECURITY_DESCRIPTOR_REVISION1); /* We always build a self-relative descriptor */ NewSd->Control = (USHORT)Control | SE_SELF_RELATIVE; Current = (ULONG_PTR)NewSd + sizeof(SECURITY_DESCRIPTOR); if (OwnerLength != 0) - { - RtlCopyMemory((PVOID)Current, - Owner, - OwnerLength); - NewSd->Owner = (PSID)(Current - (ULONG_PTR)NewSd); - Current += OwnerLength; - } + { + RtlCopyMemory((PVOID)Current, + Owner, + OwnerLength); + NewSd->Owner = (PSID)(Current - (ULONG_PTR)NewSd); + Current += OwnerLength; + } if (GroupLength != 0) - { - RtlCopyMemory((PVOID)Current, - Group, - GroupLength); - NewSd->Group = (PSID)(Current - (ULONG_PTR)NewSd); - Current += GroupLength; - } + { + RtlCopyMemory((PVOID)Current, + Group, + GroupLength); + NewSd->Group = (PSID)(Current - (ULONG_PTR)NewSd); + Current += GroupLength; + } if (DaclLength != 0) - { - RtlCopyMemory((PVOID)Current, - Dacl, - DaclLength); - NewSd->Dacl = (PACL)(Current - (ULONG_PTR)NewSd); - Current += DaclLength; - } + { + RtlCopyMemory((PVOID)Current, + Dacl, + DaclLength); + NewSd->Dacl = (PACL)(Current - (ULONG_PTR)NewSd); + Current += DaclLength; + } if (SaclLength != 0) - { - RtlCopyMemory((PVOID)Current, - Sacl, - SaclLength); - NewSd->Sacl = (PACL)(Current - (ULONG_PTR)NewSd); - Current += SaclLength; - } + { + RtlCopyMemory((PVOID)Current, + Sacl, + SaclLength); + NewSd->Sacl = (PACL)(Current - (ULONG_PTR)NewSd); + Current += SaclLength; + } /* Add the new SD */ Status = ObpAddSecurityDescriptor(NewSd, - &Header->SecurityDescriptor); + &Header->SecurityDescriptor); if (NT_SUCCESS(Status)) - { - /* Remove the old security descriptor */ - ObpRemoveSecurityDescriptor(ObjectSd); - } + { + /* Remove the old security descriptor */ + ObpRemoveSecurityDescriptor(ObjectSd); + } else - { - /* Restore the old security descriptor */ - Header->SecurityDescriptor = ObjectSd; - } + { + /* Restore the old security descriptor */ + Header->SecurityDescriptor = ObjectSd; + } ExFreePool(NewSd); } @@ -449,7 +449,7 @@ { /* Assign the security descriptor to the object header */ Status = ObpAddSecurityDescriptor(SecurityDescriptor, - &Header->SecurityDescriptor); + &Header->SecurityDescriptor); } @@ -571,14 +571,14 @@ */ NTSTATUS STDCALL SeAssignSecurityEx(IN PSECURITY_DESCRIPTOR ParentDescriptor OPTIONAL, - IN PSECURITY_DESCRIPTOR ExplicitDescriptor OPTIONAL, - OUT PSECURITY_DESCRIPTOR *NewDescriptor, - IN GUID *ObjectType OPTIONAL, - IN BOOLEAN IsDirectoryObject, - IN ULONG AutoInheritFlags, - IN PSECURITY_SUBJECT_CONTEXT SubjectContext, - IN PGENERIC_MAPPING GenericMapping, - IN POOL_TYPE PoolType) + IN PSECURITY_DESCRIPTOR ExplicitDescriptor OPTIONAL, + OUT PSECURITY_DESCRIPTOR *NewDescriptor, + IN GUID *ObjectType OPTIONAL, + IN BOOLEAN IsDirectoryObject, + IN ULONG AutoInheritFlags, + IN PSECURITY_SUBJECT_CONTEXT SubjectContext, + IN PGENERIC_MAPPING GenericMapping, + IN POOL_TYPE PoolType) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; @@ -601,12 +601,12 @@ */ NTSTATUS STDCALL SeAssignSecurity(PSECURITY_DESCRIPTOR _ParentDescriptor OPTIONAL, - PSECURITY_DESCRIPTOR _ExplicitDescriptor OPTIONAL, - PSECURITY_DESCRIPTOR *NewDescriptor, - BOOLEAN IsDirectoryObject, - PSECURITY_SUBJECT_CONTEXT SubjectContext, - PGENERIC_MAPPING GenericMapping, - POOL_TYPE PoolType) + PSECURITY_DESCRIPTOR _ExplicitDescriptor OPTIONAL, + PSECURITY_DESCRIPTOR *NewDescriptor, + BOOLEAN IsDirectoryObject, + PSECURITY_SUBJECT_CONTEXT SubjectContext, + PGENERIC_MAPPING GenericMapping, + POOL_TYPE PoolType) { PISECURITY_DESCRIPTOR ParentDescriptor = _ParentDescriptor; PISECURITY_DESCRIPTOR ExplicitDescriptor = _ExplicitDescriptor; @@ -646,23 +646,23 @@ Owner = ExplicitDescriptor->Owner; if (ExplicitDescriptor->Control & SE_SELF_RELATIVE) - { - Owner = (PSID)(((ULONG_PTR)Owner) + (ULONG_PTR)ExplicitDescriptor); - - } + { + Owner = (PSID)(((ULONG_PTR)Owner) + (ULONG_PTR)ExplicitDescriptor); + + } } else { if (Token != NULL) - { - DPRINT("Use token owner sid!\n"); - Owner = Token->UserAndGroups[Token->DefaultOwnerIndex].Sid; - } + { + DPRINT("Use token owner sid!\n"); + Owner = Token->UserAndGroups[Token->DefaultOwnerIndex].Sid; + } else - { - DPRINT("Use default owner sid!\n"); - Owner = SeLocalSystemSid; - } + { + DPRINT("Use default owner sid!\n"); + Owner = SeLocalSystemSid; + } Control |= SE_OWNER_DEFAULTED; } @@ -676,22 +676,22 @@ DPRINT("Use explicit group sid!\n"); Group = ExplicitDescriptor->Group; if (ExplicitDescriptor->Control & SE_SELF_RELATIVE) - { - Group = (PSID)(((ULONG_PTR)Group) + (ULONG_PTR)ExplicitDescriptor); - } + { + Group = (PSID)(((ULONG_PTR)Group) + (ULONG_PTR)ExplicitDescriptor); + } } else { if (Token != NULL) - { - DPRINT("Use token group sid!\n"); - Group = Token->PrimaryGroup; - } + { + DPRINT("Use token group sid!\n"); + Group = Token->PrimaryGroup; + } else - { - DPRINT("Use default group sid!\n"); - Group = SeLocalSystemSid; - } + { + DPRINT("Use default group sid!\n"); + Group = SeLocalSystemSid; + } Control |= SE_OWNER_DEFAULTED; } @@ -707,22 +707,22 @@ DPRINT("Use explicit DACL!\n"); Dacl = ExplicitDescriptor->Dacl; if (Dacl != NULL && (ExplicitDescriptor->Control & SE_SELF_RELATIVE)) - { - Dacl = (PACL)(((ULONG_PTR)Dacl) + (ULONG_PTR)ExplicitDescriptor); - } + { + Dacl = (PACL)(((ULONG_PTR)Dacl) + (ULONG_PTR)ExplicitDescriptor); + } Control |= SE_DACL_PRESENT; } else if (ParentDescriptor != NULL && - (ParentDescriptor->Control & SE_DACL_PRESENT)) + (ParentDescriptor->Control & SE_DACL_PRESENT)) { DPRINT("Use parent DACL!\n"); /* FIXME: Inherit */ Dacl = ParentDescriptor->Dacl; if (Dacl != NULL && (ParentDescriptor->Control & SE_SELF_RELATIVE)) - { - Dacl = (PACL)(((ULONG_PTR)Dacl) + (ULONG_PTR)ParentDescriptor); - } + { + Dacl = (PACL)(((ULONG_PTR)Dacl) + (ULONG_PTR)ParentDescriptor); + } Control |= (SE_DACL_PRESENT | SE_DACL_DEFAULTED); } else if (Token != NULL && Token->DefaultDacl != NULL) @@ -750,22 +750,22 @@ DPRINT("Use explicit SACL!\n"); Sacl = ExplicitDescriptor->Sacl; if (Sacl != NULL && (ExplicitDescriptor->Control & SE_SELF_RELATIVE)) - { - Sacl = (PACL)(((ULONG_PTR)Sacl) + (ULONG_PTR)ExplicitDescriptor); - } + { + Sacl = (PACL)(((ULONG_PTR)Sacl) + (ULONG_PTR)ExplicitDescriptor); + } Control |= SE_SACL_PRESENT; } else if (ParentDescriptor != NULL && - (ParentDescriptor->Control & SE_SACL_PRESENT)) + (ParentDescriptor->Control & SE_SACL_PRESENT)) { DPRINT("Use parent SACL!\n"); /* FIXME: Inherit */ Sacl = ParentDescriptor->Sacl; if (Sacl != NULL && (ParentDescriptor->Control & SE_SELF_RELATIVE)) - { - Sacl = (PACL)(((ULONG_PTR)Sacl) + (ULONG_PTR)ParentDescriptor); - } + { + Sacl = (PACL)(((ULONG_PTR)Sacl) + (ULONG_PTR)ParentDescriptor); + } Control |= (SE_SACL_PRESENT | SE_SACL_DEFAULTED); } @@ -777,14 +777,14 @@ OwnerLength + GroupLength + DaclLength + SaclLength; DPRINT("L: sizeof(SECURITY_DESCRIPTOR) %d OwnerLength %d GroupLength %d DaclLength %d SaclLength %d\n", - sizeof(SECURITY_DESCRIPTOR), - OwnerLength, - GroupLength, - DaclLength, - SaclLength); + sizeof(SECURITY_DESCRIPTOR), + OwnerLength, + GroupLength, + DaclLength, + SaclLength); Descriptor = ExAllocatePool(PagedPool, - Length); + Length); if (Descriptor == NULL) { DPRINT1("ExAlloctePool() failed\n"); @@ -794,7 +794,7 @@ RtlZeroMemory( Descriptor, Length ); RtlCreateSecurityDescriptor(Descriptor, - SECURITY_DESCRIPTOR_REVISION); + SECURITY_DESCRIPTOR_REVISION); Descriptor->Control = (USHORT)Control | SE_SELF_RELATIVE; @@ -803,8 +803,8 @@ if (SaclLength != 0) { RtlCopyMemory((PVOID)Current, - Sacl, - SaclLength); + Sacl, + SaclLength); Descriptor->Sacl = (PACL)((ULONG_PTR)Current - (ULONG_PTR)Descriptor); Current += SaclLength; } @@ -812,8 +812,8 @@ if (DaclLength != 0) { RtlCopyMemory((PVOID)Current, - Dacl, - DaclLength); + Dacl, + DaclLength); Descriptor->Dacl = (PACL)((ULONG_PTR)Current - (ULONG_PTR)Descriptor); Current += DaclLength; } @@ -821,8 +821,8 @@ if (OwnerLength != 0) { RtlCopyMemory((PVOID)Current, - Owner, - OwnerLength); + Owner, + OwnerLength); Descriptor->Owner = (PSID)((ULONG_PTR)Current - (ULONG_PTR)Descriptor); Current += OwnerLength; DPRINT("Owner of %x at %x\n", Descriptor, Descriptor->Owner); @@ -852,7 +852,7 @@ static BOOLEAN SepSidInToken(PACCESS_TOKEN _Token, - PSID Sid) + PSID Sid) { ULONG i; PTOKEN Token = (PTOKEN)_Token; @@ -901,15 +901,15 @@ */ BOOLEAN STDCALL SeAccessCheck(IN PSECURITY_DESCRIPTOR SecurityDescriptor, - IN PSECURITY_SUBJECT_CONTEXT SubjectSecurityContext, - IN BOOLEAN SubjectContextLocked, - IN ACCESS_MASK DesiredAccess, - IN ACCESS_MASK PreviouslyGrantedAccess, - OUT PPRIVILEGE_SET* Privileges, - IN PGENERIC_MAPPING GenericMapping, - IN KPROCESSOR_MODE AccessMode, - OUT PACCESS_MASK GrantedAccess, - OUT PNTSTATUS AccessStatus) + IN PSECURITY_SUBJECT_CONTEXT SubjectSecurityContext, + IN BOOLEAN SubjectContextLocked, + IN ACCESS_MASK DesiredAccess, + IN ACCESS_MASK PreviouslyGrantedAccess, + OUT PPRIVILEGE_SET* Privileges, + IN PGENERIC_MAPPING GenericMapping, + IN KPROCESSOR_MODE AccessMode, + OUT PACCESS_MASK GrantedAccess, + OUT PNTSTATUS AccessStatus) { LUID_AND_ATTRIBUTES Privilege; ACCESS_MASK CurrentAccess, AccessMask; @@ -994,19 +994,19 @@ Token = SubjectSecurityContext->ClientToken ? - SubjectSecurityContext->ClientToken : SubjectSecurityContext->PrimaryToken; + SubjectSecurityContext->ClientToken : SubjectSecurityContext->PrimaryToken; /* Get the DACL */ Status = RtlGetDaclSecurityDescriptor(SecurityDescriptor, - &Present, - &Dacl, - &Defaulted); + &Present, + &Dacl, + &Defaulted); if (!NT_SUCCESS(Status)) { if (SubjectContextLocked == FALSE) - { - SeUnlockSubjectContext(SubjectSecurityContext); - } + { + SeUnlockSubjectContext(SubjectSecurityContext); + } *AccessStatus = Status; return FALSE; @@ -1016,9 +1016,9 @@ if (Present == TRUE && Dacl == NULL) { if (SubjectContextLocked == FALSE) - { - SeUnlockSubjectContext(SubjectSecurityContext); - } + { + SeUnlockSubjectContext(SubjectSecurityContext); + } *GrantedAccess = DesiredAccess; *AccessStatus = STATUS_SUCCESS; @@ -1032,36 +1032,36 @@ Privilege.Attributes = SE_PRIVILEGE_ENABLED; if (SepPrivilegeCheck(Token, - &Privilege, - 1, - PRIVILEGE_SET_ALL_NECESSARY, - AccessMode)) + &Privilege, + 1, + PRIVILEGE_SET_ALL_NECESSARY, + AccessMode)) { CurrentAccess |= WRITE_OWNER; if (DesiredAccess == CurrentAccess) - { - if (SubjectContextLocked == FALSE) - { - SeUnlockSubjectContext(SubjectSecurityContext); - } - - *GrantedAccess = CurrentAccess; - *AccessStatus = STATUS_SUCCESS; - return TRUE; - } + { + if (SubjectContextLocked == FALSE) + { + SeUnlockSubjectContext(SubjectSecurityContext); + } + + *GrantedAccess = CurrentAccess; + *AccessStatus = STATUS_SUCCESS; + return TRUE; + } } /* RULE 3: Check whether the token is the owner */ Status = RtlGetOwnerSecurityDescriptor(SecurityDescriptor, - &Sid, - &Defaulted); + &Sid, + &Defaulted); if (!NT_SUCCESS(Status)) { DPRINT1("RtlGetOwnerSecurityDescriptor() failed (Status %lx)\n", Status); if (SubjectContextLocked == FALSE) - { - SeUnlockSubjectContext(SubjectSecurityContext); - } + { + SeUnlockSubjectContext(SubjectSecurityContext); + } *AccessStatus = Status; return FALSE; @@ -1071,25 +1071,25 @@ { CurrentAccess |= (READ_CONTROL | WRITE_DAC); if (DesiredAccess == CurrentAccess) - { - if (SubjectContextLocked == FALSE) - { - SeUnlockSubjectContext(SubjectSecurityContext); - } - - *GrantedAccess = CurrentAccess; - *AccessStatus = STATUS_SUCCESS; - return TRUE; - } + { + if (SubjectContextLocked == FALSE) + { + SeUnlockSubjectContext(SubjectSecurityContext); + } + + *GrantedAccess = CurrentAccess; + *AccessStatus = STATUS_SUCCESS; + return TRUE; + } } /* Fail if DACL is absent */ if (Present == FALSE) { if (SubjectContextLocked == FALSE) - { - SeUnlockSubjectContext(SubjectSecurityContext); - } + { + SeUnlockSubjectContext(SubjectSecurityContext); + } *GrantedAccess = 0; *AccessStatus = STATUS_ACCESS_DENIED; @@ -1172,13 +1172,13 @@ NTSTATUS STDCALL NtAccessCheck(IN PSECURITY_DESCRIPTOR SecurityDescriptor, - IN HANDLE TokenHandle, - IN ACCESS_MASK DesiredAccess, - IN PGENERIC_MAPPING GenericMapping, - OUT PPRIVILEGE_SET PrivilegeSet, - OUT PULONG ReturnLength, - OUT PACCESS_MASK GrantedAccess, - OUT PNTSTATUS AccessStatus) + IN HANDLE TokenHandle, + IN ACCESS_MASK DesiredAccess, + IN PGENERIC_MAPPING GenericMapping, + OUT PPRIVILEGE_SET PrivilegeSet, + OUT PULONG ReturnLength, + OUT PACCESS_MASK GrantedAccess, + OUT PNTSTATUS AccessStatus) { SECURITY_SUBJECT_CONTEXT SubjectSecurityContext = {0}; KPROCESSOR_MODE PreviousMode; @@ -1198,11 +1198,11 @@ } Status = ObReferenceObjectByHandle(TokenHandle, - TOKEN_QUERY, - SepTokenObjectType, - PreviousMode, - (PVOID*)&Token, - NULL); + TOKEN_QUERY, + SepTokenObjectType, + PreviousMode, + (PVOID*)&Token, + NULL); if (!NT_SUCCESS(Status)) { DPRINT1("Failed to reference token (Status %lx)\n", Status); @@ -1232,15 +1232,15 @@ SeLockSubjectContext(&SubjectSecurityContext); if (SeAccessCheck(SecurityDescriptor, - &SubjectSecurityContext, - TRUE, - DesiredAccess, - 0, - &PrivilegeSet, - GenericMapping, - PreviousMode, - GrantedAccess, - AccessStatus)) + &SubjectSecurityContext, + TRUE, + DesiredAccess, + 0, + &PrivilegeSet, + GenericMapping, + PreviousMode, + GrantedAccess, + AccessStatus)) { Status = *AccessStatus; } Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=27… ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c (original) +++ trunk/reactos/ntoskrnl/se/token.c Tue Jul 3 02:39:11 2007 @@ -26,9 +26,9 @@ ERESOURCE SepTokenLock; static GENERIC_MAPPING SepTokenMapping = {TOKEN_READ, - TOKEN_WRITE, - TOKEN_EXECUTE, - TOKEN_ALL_ACCESS}; + TOKEN_WRITE, + TOKEN_EXECUTE, + TOKEN_ALL_ACCESS}; static const INFORMATION_CLASS_INFO SeTokenInformationClass[] = { @@ -133,7 +133,7 @@ static ULONG RtlLengthSidAndAttributes(ULONG Count, - PSID_AND_ATTRIBUTES Src) + PSID_AND_ATTRIBUTES Src) { ULONG i; ULONG uLength; @@ -151,8 +151,8 @@ NTSTATUS NTAPI SepFindPrimaryGroupAndDefaultOwner(PTOKEN Token, - PSID PrimaryGroup, - PSID DefaultOwner) + PSID PrimaryGroup, + PSID DefaultOwner) { ULONG i; @@ -167,15 +167,15 @@ for (i = 0; i < Token->UserAndGroupCount; i++) { if (DefaultOwner && - RtlEqualSid(Token->UserAndGroups[i].Sid, DefaultOwner)) - { - Token->DefaultOwnerIndex = i; - } + RtlEqualSid(Token->UserAndGroups[i].Sid, DefaultOwner)) + { + Token->DefaultOwnerIndex = i; + } if (RtlEqualSid(Token->UserAndGroups[i].Sid, PrimaryGroup)) - { - Token->PrimaryGroup = Token->UserAndGroups[i].Sid; - } + { + Token->PrimaryGroup = Token->UserAndGroups[i].Sid; + } } if (Token->DefaultOwnerIndex == Token->UserAndGroupCount) @@ -195,12 +195,12 @@ NTSTATUS STDCALL SepDuplicateToken(PTOKEN Token, - POBJECT_ATTRIBUTES ObjectAttributes, - BOOLEAN EffectiveOnly, - TOKEN_TYPE TokenType, - SECURITY_IMPERSONATION_LEVEL Level, - KPROCESSOR_MODE PreviousMode, - PTOKEN* NewAccessToken) + POBJECT_ATTRIBUTES ObjectAttributes, + BOOLEAN EffectiveOnly, + TOKEN_TYPE TokenType, + SECURITY_IMPERSONATION_LEVEL Level, + KPROCESSOR_MODE PreviousMode, + PTOKEN* NewAccessToken) { ULONG uLength; ULONG i; @@ -211,14 +211,14 @@ PAGED_CODE(); Status = ObCreateObject(PreviousMode, - SepTokenObjectType, - ObjectAttributes, - PreviousMode, - NULL, - sizeof(TOKEN), - 0, - 0, - (PVOID*)&AccessToken); + SepTokenObjectType, + ObjectAttributes, + PreviousMode, + NULL, + sizeof(TOKEN), + 0, + 0, + (PVOID*)&AccessToken); if (!NT_SUCCESS(Status)) { DPRINT1("ObCreateObject() failed (Status %lx)\n"); @@ -249,8 +249,8 @@ AccessToken->TokenSource.SourceIdentifier.LowPart = Token->TokenSource.SourceIdentifier.LowPart; AccessToken->TokenSource.SourceIdentifier.HighPart = Token->TokenSource.SourceIdentifier.HighPart; memcpy(AccessToken->TokenSource.SourceName, - Token->TokenSource.SourceName, - sizeof(Token->TokenSource.SourceName)); + Token->TokenSource.SourceName, + sizeof(Token->TokenSource.SourceName)); AccessToken->ExpirationTime.QuadPart = Token->ExpirationTime.QuadPart; AccessToken->UserAndGroupCount = Token->UserAndGroupCount; AccessToken->DefaultOwnerIndex = Token->DefaultOwnerIndex; @@ -261,24 +261,24 @@ AccessToken->UserAndGroups = (PSID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool, - uLength, - TAG('T', 'O', 'K', 'u')); + uLength, + TAG('T', 'O', 'K', 'u')); EndMem = &AccessToken->UserAndGroups[AccessToken->UserAndGroupCount]; Status = RtlCopySidAndAttributesArray(AccessToken->UserAndGroupCount, - Token->UserAndGroups, - uLength, - AccessToken->UserAndGroups, - EndMem, - &EndMem, - &uLength); + Token->UserAndGroups, + uLength, + AccessToken->UserAndGroups, + EndMem, + &EndMem, + &uLength); if (NT_SUCCESS(Status)) { Status = SepFindPrimaryGroupAndDefaultOwner( - AccessToken, - Token->PrimaryGroup, - 0); + AccessToken, + Token->PrimaryGroup, + 0); } if (NT_SUCCESS(Status)) @@ -287,32 +287,32 @@ uLength = AccessToken->PrivilegeCount * sizeof(LUID_AND_ATTRIBUTES); AccessToken->Privileges = - (PLUID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool, - uLength, - TAG('T', 'O', 'K', 'p')); + (PLUID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool, + uLength, + TAG('T', 'O', 'K', 'p')); for (i = 0; i < AccessToken->PrivilegeCount; i++) - { - RtlCopyLuid(&AccessToken->Privileges[i].Luid, - &Token->Privileges[i].Luid); - AccessToken->Privileges[i].Attributes = - Token->Privileges[i].Attributes; - } + { + RtlCopyLuid(&AccessToken->Privileges[i].Luid, + &Token->Privileges[i].Luid); + AccessToken->Privileges[i].Attributes = + Token->Privileges[i].Attributes; + } if ( Token->DefaultDacl ) - { - AccessToken->DefaultDacl = - (PACL) ExAllocatePoolWithTag(PagedPool, - Token->DefaultDacl->AclSize, - TAG('T', 'O', 'K', 'd')); - memcpy(AccessToken->DefaultDacl, - Token->DefaultDacl, - Token->DefaultDacl->AclSize); - } + { + AccessToken->DefaultDacl = + (PACL) ExAllocatePoolWithTag(PagedPool, + Token->DefaultDacl->AclSize, + TAG('T', 'O', 'K', 'd')); + memcpy(AccessToken->DefaultDacl, + Token->DefaultDacl, + Token->DefaultDacl->AclSize); + } else - { - AccessToken->DefaultDacl = 0; - } + { + AccessToken->DefaultDacl = 0; + } } if ( NT_SUCCESS(Status) ) @@ -404,20 +404,20 @@ NTSTATUS STDCALL SeAppendPrivileges( - PACCESS_STATE AccessState, - PPRIVILEGE_SET Privileges - ) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + PACCESS_STATE AccessState, + PPRIVILEGE_SET Privileges + ) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } NTSTATUS STDCALL SeCopyClientToken(PACCESS_TOKEN Token, SECURITY_IMPERSONATION_LEVEL Level, - KPROCESSOR_MODE PreviousMode, - PACCESS_TOKEN* NewToken) + KPROCESSOR_MODE PreviousMode, + PACCESS_TOKEN* NewToken) { NTSTATUS Status; OBJECT_ATTRIBUTES ObjectAttributes; @@ -425,17 +425,17 @@ PAGED_CODE(); InitializeObjectAttributes(&ObjectAttributes, - NULL, - 0, - NULL, - NULL); + NULL, + 0, + NULL, + NULL); Status = SepDuplicateToken(Token, - &ObjectAttributes, - FALSE, - TokenImpersonation, - Level, - PreviousMode, - (PTOKEN*)NewToken); + &ObjectAttributes, + FALSE, + TokenImpersonation, + Level, + PreviousMode, + (PTOKEN*)NewToken); return(Status); } @@ -523,14 +523,14 @@ NTSTATUS STDCALL SeCreateClientSecurityFromSubjectContext( - IN PSECURITY_SUBJECT_CONTEXT SubjectContext, - IN PSECURITY_QUALITY_OF_SERVICE ClientSecurityQos, - IN BOOLEAN ServerIsRemote, - OUT PSECURITY_CLIENT_CONTEXT ClientContext - ) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + IN PSECURITY_SUBJECT_CONTEXT SubjectContext, + IN PSECURITY_QUALITY_OF_SERVICE ClientSecurityQos, + IN BOOLEAN ServerIsRemote, + OUT PSECURITY_CLIENT_CONTEXT ClientContext + ) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } /* @@ -539,16 +539,16 @@ NTSTATUS STDCALL SeFilterToken( - IN PACCESS_TOKEN ExistingToken, - IN ULONG Flags, - IN PTOKEN_GROUPS SidsToDisable OPTIONAL, - IN PTOKEN_PRIVILEGES PrivilegesToDelete OPTIONAL, - IN PTOKEN_GROUPS RestrictedSids OPTIONAL, - OUT PACCESS_TOKEN * FilteredToken - ) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + IN PACCESS_TOKEN ExistingToken, + IN ULONG Flags, + IN PTOKEN_GROUPS SidsToDisable OPTIONAL, + IN PTOKEN_PRIVILEGES PrivilegesToDelete OPTIONAL, + IN PTOKEN_GROUPS RestrictedSids OPTIONAL, + OUT PACCESS_TOKEN * FilteredToken + ) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } /* @@ -557,10 +557,10 @@ VOID STDCALL SeFreePrivileges( - IN PPRIVILEGE_SET Privileges - ) -{ - UNIMPLEMENTED; + IN PPRIVILEGE_SET Privileges + ) +{ + UNIMPLEMENTED; } @@ -570,12 +570,12 @@ NTSTATUS STDCALL SeImpersonateClientEx( - IN PSECURITY_CLIENT_CONTEXT ClientContext, - IN PETHREAD ServerThread OPTIONAL - ) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + IN PSECURITY_CLIENT_CONTEXT ClientContext, + IN PETHREAD ServerThread OPTIONAL + ) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } /* @@ -583,7 +583,7 @@ */ VOID STDCALL SeImpersonateClient(IN PSECURITY_CLIENT_CONTEXT ClientContext, - IN PETHREAD ServerThread OPTIONAL) + IN PETHREAD ServerThread OPTIONAL) { UCHAR b; @@ -602,10 +602,10 @@ ServerThread = PsGetCurrentThread(); } PsImpersonateClient(ServerThread, - ClientContext->ClientToken, - 1, - b, - ClientContext->SecurityQos.ImpersonationLevel); + ClientContext->ClientToken, + 1, + b, + ClientContext->SecurityQos.ImpersonationLevel); } @@ -658,10 +658,10 @@ */ NTSTATUS STDCALL NtQueryInformationToken(IN HANDLE TokenHandle, - IN TOKEN_INFORMATION_CLASS TokenInformationClass, - OUT PVOID TokenInformation, - IN ULONG TokenInformationLength, - OUT PULONG ReturnLength) + IN TOKEN_INFORMATION_CLASS TokenInformationClass, + OUT PVOID TokenInformation, + IN ULONG TokenInformationLength, + OUT PULONG ReturnLength) { union { @@ -693,11 +693,11 @@ } Status = ObReferenceObjectByHandle(TokenHandle, - (TokenInformationClass == TokenSource) ? TOKEN_QUERY_SOURCE : TOKEN_QUERY, - SepTokenObjectType, - PreviousMode, - (PVOID*)&Token, - NULL); + (TokenInformationClass == TokenSource) ? TOKEN_QUERY_SOURCE : TOKEN_QUERY, + SepTokenObjectType, + PreviousMode, + (PVOID*)&Token, + NULL); if (NT_SUCCESS(Status)) { switch (TokenInformationClass) @@ -783,7 +783,7 @@ } _SEH_END; - break; + break; } case TokenPrivileges: @@ -1114,9 +1114,9 @@ } case TokenGroupsAndPrivileges: - DPRINT1("NtQueryInformationToken(TokenGroupsAndPrivileges) not implemented\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; + DPRINT1("NtQueryInformationToken(TokenGroupsAndPrivileges) not implemented\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; case TokenRestrictedSids: { @@ -1160,13 +1160,13 @@ } _SEH_END; - break; + break; } case TokenSandBoxInert: - DPRINT1("NtQueryInformationToken(TokenSandboxInert) not implemented\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; + DPRINT1("NtQueryInformationToken(TokenSandboxInert) not implemented\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; case TokenSessionId: { @@ -1200,9 +1200,9 @@ } default: - DPRINT1("NtQueryInformationToken(%d) invalid information class\n", TokenInformationClass); - Status = STATUS_INVALID_INFO_CLASS; - break; + DPRINT1("NtQueryInformationToken(%d) invalid information class\n", TokenInformationClass); + Status = STATUS_INVALID_INFO_CLASS; + break; } ObDereferenceObject(Token); @@ -1217,13 +1217,13 @@ NTSTATUS STDCALL SeQueryInformationToken( - IN PACCESS_TOKEN Token, - IN TOKEN_INFORMATION_CLASS TokenInformationClass, - OUT PVOID *TokenInformation - ) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + IN PACCESS_TOKEN Token, + IN TOKEN_INFORMATION_CLASS TokenInformationClass, + OUT PVOID *TokenInformation + ) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } /* @@ -1232,9 +1232,9 @@ NTSTATUS STDCALL SeQuerySessionIdToken( - IN PACCESS_TOKEN Token, - IN PULONG pSessionId - ) + IN PACCESS_TOKEN Token, + IN PULONG pSessionId + ) { *pSessionId = ((PTOKEN)Token)->SessionId; return STATUS_SUCCESS; @@ -1248,9 +1248,9 @@ NTSTATUS STDCALL NtSetInformationToken(IN HANDLE TokenHandle, - IN TOKEN_INFORMATION_CLASS TokenInformationClass, - OUT PVOID TokenInformation, - IN ULONG TokenInformationLength) + IN TOKEN_INFORMATION_CLASS TokenInformationClass, + OUT PVOID TokenInformation, + IN ULONG TokenInformationLength) { PTOKEN Token; KPROCESSOR_MODE PreviousMode; @@ -1281,11 +1281,11 @@ } Status = ObReferenceObjectByHandle(TokenHandle, - NeededAccess, - SepTokenObjectType, - PreviousMode, - (PVOID*)&Token, - NULL); + NeededAccess, + SepTokenObjectType, + PreviousMode, + (PVOID*)&Token, + NULL); if (NT_SUCCESS(Status)) { switch (TokenInformationClass) @@ -1539,11 +1539,11 @@ } Status = ObReferenceObjectByHandle(ExistingTokenHandle, - TOKEN_DUPLICATE, - SepTokenObjectType, - PreviousMode, - (PVOID*)&Token, - NULL); + TOKEN_DUPLICATE, + SepTokenObjectType, + PreviousMode, + (PVOID*)&Token, + NULL); if (NT_SUCCESS(Status)) { Status = SepDuplicateToken(Token, @@ -1551,19 +1551,19 @@ EffectiveOnly, TokenType, (QoSPresent ? CapturedSecurityQualityOfService->ImpersonationLevel : SecurityAnonymous), - PreviousMode, - &NewToken); + PreviousMode, + &NewToken); ObDereferenceObject(Token); if (NT_SUCCESS(Status)) { Status = ObInsertObject((PVOID)NewToken, - NULL, - DesiredAccess, - 0, - NULL, - &hToken); + NULL, + DesiredAccess, + 0, + NULL, + &hToken); if (NT_SUCCESS(Status)) { @@ -1590,15 +1590,15 @@ VOID SepAdjustGroups(PACCESS_TOKEN Token, - ULONG a, - BOOLEAN ResetToDefault, - PSID_AND_ATTRIBUTES Groups, - ULONG b, - KPROCESSOR_MODE PreviousMode, - ULONG c, - PULONG d, - PULONG e, - PULONG f) + ULONG a, + BOOLEAN ResetToDefault, + PSID_AND_ATTRIBUTES Groups, + ULONG b, + KPROCESSOR_MODE PreviousMode, + ULONG c, + PULONG d, + PULONG e, + PULONG f) { UNIMPLEMENTED; } @@ -1606,11 +1606,11 @@ NTSTATUS STDCALL NtAdjustGroupsToken(IN HANDLE TokenHandle, - IN BOOLEAN ResetToDefault, - IN PTOKEN_GROUPS NewState, - IN ULONG BufferLength, - OUT PTOKEN_GROUPS PreviousState OPTIONAL, - OUT PULONG ReturnLength) + IN BOOLEAN ResetToDefault, + IN PTOKEN_GROUPS NewState, + IN ULONG BufferLength, + OUT PTOKEN_GROUPS PreviousState OPTIONAL, + OUT PULONG ReturnLength) { #if 0 NTSTATUS Status; @@ -1622,23 +1622,23 @@ PAGED_CODE(); Status = ObReferenceObjectByHandle(TokenHandle, - ?, - SepTokenObjectType, - UserMode, - (PVOID*)&Token, - NULL); + ?, + SepTokenObjectType, + UserMode, + (PVOID*)&Token, + NULL); SepAdjustGroups(Token, - 0, - ResetToDefault, - NewState->Groups, - ?, - PreviousState, - 0, - &a, - &b, - &c); + 0, + ResetToDefault, + NewState->Groups, + ?, + PreviousState, + 0, + &a, + &b, + &c); #else UNIMPLEMENTED; return(STATUS_NOT_IMPLEMENTED); @@ -1649,14 +1649,14 @@ #if 0 NTSTATUS SepAdjustPrivileges(PACCESS_TOKEN Token, - ULONG a, - KPROCESSOR_MODE PreviousMode, - ULONG PrivilegeCount, - PLUID_AND_ATTRIBUTES Privileges, - PTOKEN_PRIVILEGES* PreviousState, - PULONG b, - PULONG c, - PULONG d) + ULONG a, + KPROCESSOR_MODE PreviousMode, + ULONG PrivilegeCount, + PLUID_AND_ATTRIBUTES Privileges, + PTOKEN_PRIVILEGES* PreviousState, + PULONG b, + PULONG c, + PULONG d) { ULONG i; @@ -1665,24 +1665,24 @@ if (Token->PrivilegeCount > 0) { for (i = 0; i < Token->PrivilegeCount; i++) - { - if (PreviousMode != KernelMode) - { - if (Token->Privileges[i]->Attributes & SE_PRIVILEGE_ENABLED == 0) - { - if (a != 0) - { - if (PreviousState != NULL) - { - memcpy(&PreviousState[i], - &Token->Privileges[i], - sizeof(LUID_AND_ATTRIBUTES)); - } - Token->Privileges[i].Attributes &= (~SE_PRIVILEGE_ENABLED); - } - } - } - } + { + if (PreviousMode != KernelMode) + { + if (Token->Privileges[i]->Attributes & SE_PRIVILEGE_ENABLED == 0) + { + if (a != 0) + { + if (PreviousState != NULL) + { + memcpy(&PreviousState[i], + &Token->Privileges[i], + sizeof(LUID_AND_ATTRIBUTES)); + } + Token->Privileges[i].Attributes &= (~SE_PRIVILEGE_ENABLED); + } + } + } + } } if (PreviousMode != KernelMode) @@ -1692,8 +1692,8 @@ else { if (PrivilegeCount <= ?) - { - } + { + } } if ( } @@ -1705,11 +1705,11 @@ */ NTSTATUS STDCALL NtAdjustPrivilegesToken (IN HANDLE TokenHandle, - IN BOOLEAN DisableAllPrivileges, - IN PTOKEN_PRIVILEGES NewState, - IN ULONG BufferLength, - OUT PTOKEN_PRIVILEGES PreviousState OPTIONAL, - OUT PULONG ReturnLength OPTIONAL) + IN BOOLEAN DisableAllPrivileges, + IN PTOKEN_PRIVILEGES NewState, + IN ULONG BufferLength, + OUT PTOKEN_PRIVILEGES PreviousState OPTIONAL, + OUT PULONG ReturnLength OPTIONAL) { // PLUID_AND_ATTRIBUTES Privileges; KPROCESSOR_MODE PreviousMode; @@ -1734,41 +1734,41 @@ // PrivilegeCount = NewState->PrivilegeCount; PreviousMode = KeGetPreviousMode (); // SeCaptureLuidAndAttributesArray(NewState->Privileges, -// PrivilegeCount, -// PreviousMode, -// NULL, -// 0, -// NonPagedPool, -// 1, -// &Privileges, -// &Length); +// PrivilegeCount, +// PreviousMode, +// NULL, +// 0, +// NonPagedPool, +// 1, +// &Privileges, +// &Length); Status = ObReferenceObjectByHandle (TokenHandle, - TOKEN_ADJUST_PRIVILEGES | (PreviousState != NULL ? TOKEN_QUERY : 0), - SepTokenObjectType, - PreviousMode, - (PVOID*)&Token, - NULL); + TOKEN_ADJUST_PRIVILEGES | (PreviousState != NULL ? TOKEN_QUERY : 0), + SepTokenObjectType, + PreviousMode, + (PVOID*)&Token, + NULL); if (!NT_SUCCESS(Status)) { DPRINT1 ("Failed to reference token (Status %lx)\n", Status); // SeReleaseLuidAndAttributesArray(Privileges, -// PreviousMode, -// 0); +// PreviousMode, +// 0); return Status; } #if 0 SepAdjustPrivileges(Token, - 0, - PreviousMode, - PrivilegeCount, - Privileges, - PreviousState, - &a, - &b, - &c); + 0, + PreviousMode, + PrivilegeCount, + Privileges, + PreviousState, + &a, + &b, + &c); #endif PrivilegeCount = (BufferLength - FIELD_OFFSET(TOKEN_PRIVILEGES, Privileges)) / @@ -1781,14 +1781,14 @@ if (DisableAllPrivileges == TRUE) { for (i = 0; i < Token->PrivilegeCount; i++) - { - if (Token->Privileges[i].Attributes != 0) - { - DPRINT ("Attributes differ\n"); - - /* Save current privilege */ - if (PreviousState != NULL) - { + { + if (Token->Privileges[i].Attributes != 0) + { + DPRINT ("Attributes differ\n"); + + /* Save current privilege */ + if (PreviousState != NULL) + { if (k < PrivilegeCount) { PreviousState->PrivilegeCount++; @@ -1803,37 +1803,37 @@ */ } k++; - } - - /* Update current privlege */ - Token->Privileges[i].Attributes &= ~SE_PRIVILEGE_ENABLED; - } - } + } + + /* Update current privlege */ + Token->Privileges[i].Attributes &= ~SE_PRIVILEGE_ENABLED; + } + } Status = STATUS_SUCCESS; } else { Count = 0; for (i = 0; i < Token->PrivilegeCount; i++) - { - for (j = 0; j < NewState->PrivilegeCount; j++) - { - if (Token->Privileges[i].Luid.LowPart == NewState->Privileges[j].Luid.LowPart && - Token->Privileges[i].Luid.HighPart == NewState->Privileges[j].Luid.HighPart) - { - DPRINT ("Found privilege\n"); - - if ((Token->Privileges[i].Attributes & SE_PRIVILEGE_ENABLED) != - (NewState->Privileges[j].Attributes & SE_PRIVILEGE_ENABLED)) - { - DPRINT ("Attributes differ\n"); - DPRINT ("Current attributes %lx desired attributes %lx\n", - Token->Privileges[i].Attributes, - NewState->Privileges[j].Attributes); - - /* Save current privilege */ - if (PreviousState != NULL) - { + { + for (j = 0; j < NewState->PrivilegeCount; j++) + { + if (Token->Privileges[i].Luid.LowPart == NewState->Privileges[j].Luid.LowPart && + Token->Privileges[i].Luid.HighPart == NewState->Privileges[j].Luid.HighPart) + { + DPRINT ("Found privilege\n"); + + if ((Token->Privileges[i].Attributes & SE_PRIVILEGE_ENABLED) != + (NewState->Privileges[j].Attributes & SE_PRIVILEGE_ENABLED)) + { + DPRINT ("Attributes differ\n"); + DPRINT ("Current attributes %lx desired attributes %lx\n", + Token->Privileges[i].Attributes, + NewState->Privileges[j].Attributes); + + /* Save current privilege */ + if (PreviousState != NULL) + { if (k < PrivilegeCount) { PreviousState->PrivilegeCount++; @@ -1848,33 +1848,33 @@ */ } k++; - } - - /* Update current privlege */ - Token->Privileges[i].Attributes &= ~SE_PRIVILEGE_ENABLED; - Token->Privileges[i].Attributes |= - (NewState->Privileges[j].Attributes & SE_PRIVILEGE_ENABLED); - DPRINT ("New attributes %lx\n", - Token->Privileges[i].Attributes); - } + } + + /* Update current privlege */ + Token->Privileges[i].Attributes &= ~SE_PRIVILEGE_ENABLED; + Token->Privileges[i].Attributes |= + (NewState->Privileges[j].Attributes & SE_PRIVILEGE_ENABLED); + DPRINT ("New attributes %lx\n", + Token->Privileges[i].Attributes); + } Count++; - } - } - } + } + } + } Status = Count < NewState->PrivilegeCount ? STATUS_NOT_ALL_ASSIGNED : STATUS_SUCCESS; } if (ReturnLength != NULL) { *ReturnLength = sizeof(TOKEN_PRIVILEGES) + - (sizeof(LUID_AND_ATTRIBUTES) * (k - 1)); + (sizeof(LUID_AND_ATTRIBUTES) * (k - 1)); } ObDereferenceObject (Token); // SeReleaseLuidAndAttributesArray(Privileges, -// PreviousMode, -// 0); +// PreviousMode, +// 0); DPRINT ("NtAdjustPrivilegesToken() done\n"); @@ -1926,14 +1926,14 @@ * Initialize the token */ Status = ObCreateObject(KernelMode, - SepTokenObjectType, - NULL, - KernelMode, - NULL, - sizeof(TOKEN), - 0, - 0, - (PVOID*)&AccessToken); + SepTokenObjectType, + NULL, + KernelMode, + NULL, + sizeof(TOKEN), + 0, + 0, + (PVOID*)&AccessToken); if (!NT_SUCCESS(Status)) { return NULL; @@ -1978,8 +1978,8 @@ AccessToken->UserAndGroups = (PSID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool, - uSize, - TAG('T', 'O', 'K', 'u')); + uSize, + TAG('T', 'O', 'K', 'u')); SidArea = &AccessToken->UserAndGroups[AccessToken->UserAndGroupCount]; i = 0; @@ -2009,9 +2009,9 @@ uSize = AccessToken->PrivilegeCount * sizeof(LUID_AND_ATTRIBUTES); AccessToken->Privileges = - (PLUID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool, - uSize, - TAG('T', 'O', 'K', 'p')); + (PLUID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool, + uSize, + TAG('T', 'O', 'K', 'p')); i = 0; AccessToken->Privileges[i].Attributes = SE_PRIVILEGE_ENABLED_BY_DEFAULT|SE_PRIVILEGE_ENABLED; @@ -2089,8 +2089,8 @@ uSize = (uSize & (~3)) + 8; AccessToken->DefaultDacl = (PACL) ExAllocatePoolWithTag(PagedPool, - uSize, - TAG('T', 'O', 'K', 'd')); + uSize, + TAG('T', 'O', 'K', 'd')); Status = RtlCreateAcl(AccessToken->DefaultDacl, uSize, ACL_REVISION); if ( NT_SUCCESS(Status) ) { @@ -2114,18 +2114,18 @@ NTSTATUS STDCALL NtCreateToken(OUT PHANDLE TokenHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes, - IN TOKEN_TYPE TokenType, - IN PLUID AuthenticationId, - IN PLARGE_INTEGER ExpirationTime, - IN PTOKEN_USER TokenUser, - IN PTOKEN_GROUPS TokenGroups, - IN PTOKEN_PRIVILEGES TokenPrivileges, - IN PTOKEN_OWNER TokenOwner, - IN PTOKEN_PRIMARY_GROUP TokenPrimaryGroup, - IN PTOKEN_DEFAULT_DACL TokenDefaultDacl, - IN PTOKEN_SOURCE TokenSource) + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes, + IN TOKEN_TYPE TokenType, + IN PLUID AuthenticationId, + IN PLARGE_INTEGER ExpirationTime, + IN PTOKEN_USER TokenUser, + IN PTOKEN_GROUPS TokenGroups, + IN PTOKEN_PRIVILEGES TokenPrivileges, + IN PTOKEN_OWNER TokenOwner, + IN PTOKEN_PRIMARY_GROUP TokenPrimaryGroup, + IN PTOKEN_DEFAULT_DACL TokenDefaultDacl, + IN PTOKEN_SOURCE TokenSource) { HANDLE hToken; PTOKEN AccessToken; @@ -2201,14 +2201,14 @@ return(Status); Status = ObCreateObject(PreviousMode, - SepTokenObjectType, - ObjectAttributes, - PreviousMode, - NULL, - sizeof(TOKEN), - 0, - 0, - (PVOID*)&AccessToken); + SepTokenObjectType, + ObjectAttributes, + PreviousMode, + NULL, + sizeof(TOKEN), + 0, + 0, + (PVOID*)&AccessToken); if (!NT_SUCCESS(Status)) { DPRINT1("ObCreateObject() failed (Status %lx)\n"); @@ -2218,10 +2218,10 @@ AccessToken->TokenLock = &SepTokenLock; RtlCopyLuid(&AccessToken->TokenSource.SourceIdentifier, - &TokenSource->SourceIdentifier); + &TokenSource->SourceIdentifier); memcpy(AccessToken->TokenSource.SourceName, - TokenSource->SourceName, - sizeof(TokenSource->SourceName)); + TokenSource->SourceName, + sizeof(TokenSource->SourceName)); RtlCopyLuid(&AccessToken->TokenId, &TokenId); RtlCopyLuid(&AccessToken->AuthenticationId, AuthenticationId); @@ -2250,44 +2250,44 @@ AccessToken->UserAndGroups = (PSID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool, - uLength, - TAG('T', 'O', 'K', 'u')); + uLength, + TAG('T', 'O', 'K', 'u')); EndMem = &AccessToken->UserAndGroups[AccessToken->UserAndGroupCount]; Status = RtlCopySidAndAttributesArray(1, - &TokenUser->User, - uLength, - AccessToken->UserAndGroups, - EndMem, - &EndMem, - &uLength); + &TokenUser->User, + uLength, + AccessToken->UserAndGroups, + EndMem, + &EndMem, + &uLength); if (NT_SUCCESS(Status)) { Status = RtlCopySidAndAttributesArray(TokenGroups->GroupCount, - TokenGroups->Groups, - uLength, - &AccessToken->UserAndGroups[1], - EndMem, - &EndMem, - &uLength); + TokenGroups->Groups, + uLength, + &AccessToken->UserAndGroups[1], + EndMem, + &EndMem, + &uLength); } if (NT_SUCCESS(Status)) { Status = SepFindPrimaryGroupAndDefaultOwner( - AccessToken, - TokenPrimaryGroup->PrimaryGroup, - TokenOwner->Owner); + AccessToken, + TokenPrimaryGroup->PrimaryGroup, + TokenOwner->Owner); } if (NT_SUCCESS(Status)) { uLength = TokenPrivileges->PrivilegeCount * sizeof(LUID_AND_ATTRIBUTES); AccessToken->Privileges = - (PLUID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool, - uLength, - TAG('T', 'O', 'K', 'p')); + (PLUID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool, + uLength, + TAG('T', 'O', 'K', 'p')); if (PreviousMode != KernelMode) { @@ -2314,20 +2314,20 @@ if (NT_SUCCESS(Status)) { AccessToken->DefaultDacl = - (PACL) ExAllocatePoolWithTag(PagedPool, - TokenDefaultDacl->DefaultDacl->AclSize, - TAG('T', 'O', 'K', 'd')); + (PACL) ExAllocatePoolWithTag(PagedPool, + TokenDefaultDacl->DefaultDacl->AclSize, + TAG('T', 'O', 'K', 'd')); memcpy(AccessToken->DefaultDacl, - TokenDefaultDacl->DefaultDacl, - TokenDefaultDacl->DefaultDacl->AclSize); + TokenDefaultDacl->DefaultDacl, + TokenDefaultDacl->DefaultDacl->AclSize); } Status = ObInsertObject ((PVOID)AccessToken, - NULL, - DesiredAccess, - 0, - NULL, - &hToken); + NULL, + DesiredAccess, + 0, + NULL, + &hToken); if (!NT_SUCCESS(Status)) { DPRINT1("ObInsertObject() failed (Status %lx)\n", Status); @@ -2355,7 +2355,7 @@ */ NTSTATUS STDCALL SeQueryAuthenticationIdToken(IN PACCESS_TOKEN Token, - OUT PLUID LogonId) + OUT PLUID LogonId) { PAGED_CODE(); @@ -2396,8 +2396,8 @@ BOOLEAN STDCALL SeTokenIsAdmin( - IN PACCESS_TOKEN Token - ) + IN PACCESS_TOKEN Token + ) { PAGED_CODE(); return (((PTOKEN)Token)->TokenFlags & TOKEN_WRITE_RESTRICTED) != 0; @@ -2409,8 +2409,8 @@ BOOLEAN STDCALL SeTokenIsRestricted( - IN PACCESS_TOKEN Token - ) + IN PACCESS_TOKEN Token + ) { PAGED_CODE(); return (((PTOKEN)Token)->TokenFlags & TOKEN_IS_RESTRICTED) != 0; @@ -2422,8 +2422,8 @@ BOOLEAN STDCALL SeTokenIsWriteRestricted( - IN PACCESS_TOKEN Token - ) + IN PACCESS_TOKEN Token + ) { PAGED_CODE(); return (((PTOKEN)Token)->TokenFlags & TOKEN_HAS_RESTORE_PRIVILEGE) != 0; @@ -2436,11 +2436,11 @@ NTSTATUS STDCALL NtImpersonateAnonymousToken( - IN HANDLE Thread - ) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + IN HANDLE Thread + ) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; }

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