Ros-diffs

ros-diffs@reactos.org

81390 discussions

[chorns] 15328: Add missing file
by chorns＠svn.reactos.com 16 May '05

16 May '05

Add missing file Modified: branches/xmlbuildsystem/reactos/drivers/dd/serial/serial.xml _____ Modified: branches/xmlbuildsystem/reactos/drivers/dd/serial/serial.xml --- branches/xmlbuildsystem/reactos/drivers/dd/serial/serial.xml 2005-05-15 23:43:28 UTC (rev 15327) +++ branches/xmlbuildsystem/reactos/drivers/dd/serial/serial.xml 2005-05-16 00:02:09 UTC (rev 15328) @@ -13,5 +13,6 @@ <file>pnp.c</file> <file>power.c</file> <file>rw.c</file> + <file>serial.c</file> <file>serial.rc</file> </module>

1 0

[chorns] 15327: Depend on generated RPC headers
by chorns＠svn.reactos.com 15 May '05

15 May '05

Depend on generated RPC headers Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-05-15 23:24:11 UTC (rev 15326) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-05-15 23:43:28 UTC (rev 15327) @@ -1003,6 +1003,12 @@ { return file.switches; } + +string +MingwModuleHandler::GetRpcServerHeaderFilename ( string basename ) const +{ + return basename + "_s.h"; +} void MingwModuleHandler::GenerateWidlCommandsServer ( @@ -1019,7 +1025,7 @@ backend->intermediateDirectory ); CLEAN_FILE(generatedHeaderFilename); */ - string generatedHeaderFilename = basename + "_s.h"; + string generatedHeaderFilename = GetRpcServerHeaderFilename ( basename ); CLEAN_FILE(generatedHeaderFilename); string generatedServerFilename = PassThruCacheDirectory ( @@ -1044,6 +1050,12 @@ file.name.c_str () ); } +string +MingwModuleHandler::GetRpcClientHeaderFilename ( string basename ) const +{ + return basename + "_c.h"; +} + void MingwModuleHandler::GenerateWidlCommandsClient ( const File& file, @@ -1059,7 +1071,7 @@ backend->intermediateDirectory ); CLEAN_FILE(generatedHeaderFilename); */ - string generatedHeaderFilename = basename + "_c.h"; + string generatedHeaderFilename = GetRpcClientHeaderFilename ( basename ); CLEAN_FILE(generatedHeaderFilename); string generatedClientFilename = PassThruCacheDirectory ( @@ -1582,6 +1594,34 @@ } void +MingwModuleHandler::GetRpcHeaderDependencies ( + string_list& dependencies ) const +{ + for ( size_t i = 0; i < module.non_if_data.libraries.size (); i++ ) + { + Library& library = *module.non_if_data.libraries[i]; + if ( library.imported_module->type == RpcServer || + library.imported_module->type == RpcClient ) + { + + for ( size_t j = 0; j < library.imported_module->non_if_data.files.size (); j++ ) + { + File& file = *library.imported_module->non_if_data.files[j]; + string extension = GetExtension ( file.name ); + if ( extension == ".idl" || extension == ".IDL" ) + { + string basename = GetBasename ( file.name ); + if ( library.imported_module->type == RpcServer ) + dependencies.push_back ( GetRpcServerHeaderFilename ( basename ) ); + if ( library.imported_module->type == RpcClient ) + dependencies.push_back ( GetRpcClientHeaderFilename ( basename ) ); + } + } + } + } +} + +void MingwModuleHandler::GenerateOtherMacros () { cflagsMacro = ssprintf ("%s_CFLAGS", module.name.c_str ()); @@ -1597,9 +1637,9 @@ module.non_if_data, &module.linkerFlags ); + string_list s; if ( module.importLibrary ) { - string_list s; const vector<File*>& files = module.non_if_data.files; for ( size_t i = 0; i < files.size (); i++ ) { @@ -1608,19 +1648,20 @@ if ( extension == ".spec" || extension == ".SPEC" ) GetSpecObjectDependencies ( s, file.name ); } - if ( s.size () > 0 ) - { - fprintf ( - fMakefile, - "%s +=", - linkDepsMacro.c_str() ); - for ( size_t i = 0; i < s.size(); i++ ) - fprintf ( fMakefile, - " %s", - s[i].c_str () ); - fprintf ( fMakefile, "\n" ); - } } + GetRpcHeaderDependencies ( s ); + if ( s.size () > 0 ) + { + fprintf ( + fMakefile, + "%s +=", + linkDepsMacro.c_str() ); + for ( size_t i = 0; i < s.size(); i++ ) + fprintf ( fMakefile, + " %s", + s[i].c_str () ); + fprintf ( fMakefile, "\n" ); + } string globalCflags = "-g"; if ( backend->usePipe ) _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-05-15 23:24:11 UTC (rev 15326) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-05-15 23:43:28 UTC (rev 15327) @@ -177,6 +177,9 @@ void GenerateBuildMapCode (); void GenerateBuildNonSymbolStrippedCode (); void CleanupFileVector ( std::vector<File*>& sourceFiles ); + void GetRpcHeaderDependencies ( string_list& dependencies ) const; + std::string GetRpcServerHeaderFilename ( std::string basename ) const; + std::string GetRpcClientHeaderFilename ( std::string basename ) const; public: const Module& module; string_list clean_files;

1 0

[ion] 15326: Fix build, clean up headers, add public stuff to public headers
by ion＠svn.reactos.com 15 May '05

15 May '05

Fix build, clean up headers, add public stuff to public headers Modified: trunk/reactos/include/ddk/obfuncs.h Modified: trunk/reactos/include/ddk/psfuncs.h Modified: trunk/reactos/include/ddk/pstypes.h Modified: trunk/reactos/ntoskrnl/include/internal/ob.h Modified: trunk/reactos/ntoskrnl/include/internal/ps.h Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/include/ddk/obfuncs.h --- trunk/reactos/include/ddk/obfuncs.h 2005-05-15 22:13:08 UTC (rev 15325) +++ trunk/reactos/include/ddk/obfuncs.h 2005-05-15 23:24:11 UTC (rev 15326) @@ -2,6 +2,121 @@ #define _INCLUDE_DDK_OBFUNCS_H /* OBJECT MANAGER ************************************************************/ +typedef enum _OB_OPEN_REASON +{ + ObCreateHandle, + ObOpenHandle, + ObDuplicateHandle, + ObInheritHandle, + ObMaxOpenReason +} OB_OPEN_REASON; + +/* TEMPORARY HACK */ +typedef NTSTATUS STDCALL_FUNC +(*OB_CREATE_METHOD)(PVOID ObjectBody, + PVOID Parent, + PWSTR RemainingPath, + struct _OBJECT_ATTRIBUTES* ObjectAttributes); + +/* Object Callbacks */ +typedef NTSTATUS STDCALL_FUNC +(*OB_OPEN_METHOD)(OB_OPEN_REASON Reason, + PVOID ObjectBody, + PEPROCESS Process, + ULONG HandleCount, + ACCESS_MASK GrantedAccess); + +typedef NTSTATUS STDCALL_FUNC +(*OB_PARSE_METHOD)(PVOID Object, + PVOID *NextObject, + PUNICODE_STRING FullPath, + PWSTR *Path, + ULONG Attributes); + +typedef VOID STDCALL_FUNC +(*OB_DELETE_METHOD)(PVOID DeletedObject); + +typedef VOID STDCALL_FUNC +(*OB_CLOSE_METHOD)(PVOID ClosedObject, ULONG HandleCount); + +typedef VOID STDCALL_FUNC +(*OB_DUMP_METHOD)(VOID); + +typedef NTSTATUS STDCALL_FUNC +(*OB_OKAYTOCLOSE_METHOD)(VOID); + +typedef NTSTATUS STDCALL_FUNC +(*OB_QUERYNAME_METHOD)(PVOID ObjectBody, + POBJECT_NAME_INFORMATION ObjectNameInfo, + ULONG Length, + PULONG ReturnLength); + +typedef PVOID STDCALL_FUNC +(*OB_FIND_METHOD)(PVOID WinStaObject, + PWSTR Name, + ULONG Attributes); + +typedef NTSTATUS STDCALL_FUNC +(*OB_SECURITY_METHOD)(PVOID ObjectBody, + SECURITY_OPERATION_CODE OperationCode, + SECURITY_INFORMATION SecurityInformation, + PSECURITY_DESCRIPTOR SecurityDescriptor, + PULONG BufferLength); + +typedef struct _OBJECT_CREATE_INFORMATION +{ + ULONG Attributes; + HANDLE RootDirectory; + PVOID ParseContext; + KPROCESSOR_MODE ProbeMode; + ULONG PagedPoolCharge; + ULONG NonPagedPoolCharge; + ULONG SecurityDescriptorCharge; + PSECURITY_DESCRIPTOR SecurityDescriptor; + PSECURITY_QUALITY_OF_SERVICE SecurityQos; + SECURITY_QUALITY_OF_SERVICE SecurityQualityOfService; +} OBJECT_CREATE_INFORMATION, *POBJECT_CREATE_INFORMATION; + +typedef struct _OBJECT_TYPE_INITIALIZER +{ + WORD Length; + UCHAR UseDefaultObject; + UCHAR CaseInsensitive; + ULONG InvalidAttributes; + GENERIC_MAPPING GenericMapping; + ULONG ValidAccessMask; + UCHAR SecurityRequired; + UCHAR MaintainHandleCount; + UCHAR MaintainTypeList; + POOL_TYPE PoolType; + ULONG DefaultPagedPoolCharge; + ULONG DefaultNonPagedPoolCharge; + OB_DUMP_METHOD DumpProcedure; + OB_OPEN_METHOD OpenProcedure; + OB_CLOSE_METHOD CloseProcedure; + OB_DELETE_METHOD DeleteProcedure; + OB_PARSE_METHOD ParseProcedure; + OB_SECURITY_METHOD SecurityProcedure; + OB_QUERYNAME_METHOD QueryNameProcedure; + OB_OKAYTOCLOSE_METHOD OkayToCloseProcedure; +} OBJECT_TYPE_INITIALIZER, *POBJECT_TYPE_INITIALIZER; + +typedef struct _OBJECT_TYPE +{ + ERESOURCE Mutex; /* Used to lock the Object Type */ + LIST_ENTRY TypeList; /* Links all the Types Together for Debugging */ + UNICODE_STRING Name; /* Name of the Type */ + PVOID DefaultObject; /* What Object to use during a Wait (ie, FileObjects wait on FileObject->Event) */ + ULONG Index; /* Index of this Type in the Object Directory */ + ULONG TotalNumberOfObjects; /* Total number of objects of this type */ + ULONG TotalNumberOfHandles; /* Total number of handles of this type */ + ULONG HighWaterNumberOfObjects; /* Peak number of objects of this type */ + ULONG HighWaterNumberOfHandles; /* Peak number of handles of this type */ + OBJECT_TYPE_INITIALIZER TypeInfo; /* Information captured during type creation */ + ULONG Key; /* Key to use when allocating objects of this type */ + ERESOURCE ObjectLocks[4]; /* Locks for locking the Objects */ +} OBJECT_TYPE; + NTSTATUS STDCALL ObAssignSecurity(IN PACCESS_STATE AccessState, IN PSECURITY_DESCRIPTOR SecurityDescriptor, _____ Modified: trunk/reactos/include/ddk/psfuncs.h --- trunk/reactos/include/ddk/psfuncs.h 2005-05-15 22:13:08 UTC (rev 15325) +++ trunk/reactos/include/ddk/psfuncs.h 2005-05-15 23:24:11 UTC (rev 15326) @@ -356,11 +356,12 @@ PVOID Win32Thread ); +struct _W32_OBJECT_CALLBACK; VOID STDCALL STDCALL PsEstablishWin32Callouts (PW32_PROCESS_CALLBACK W32ProcessCallback, PW32_THREAD_CALLBACK W32ThreadCallback, - PW32_OBJECT_CALLBACK W32ObjectCallback, + struct _W32_OBJECT_CALLBACK *W32ObjectCallback, PVOID Param4, ULONG W32ThreadSize, ULONG W32ProcessSize); _____ Modified: trunk/reactos/include/ddk/pstypes.h --- trunk/reactos/include/ddk/pstypes.h 2005-05-15 22:13:08 UTC (rev 15325) +++ trunk/reactos/include/ddk/pstypes.h 2005-05-15 23:24:11 UTC (rev 15326) @@ -66,81 +66,7 @@ typedef NTSTATUS STDCALL_FUNC (*PW32_THREAD_CALLBACK)(struct _ETHREAD *Thread, BOOLEAN Create); - -typedef enum _OB_OPEN_REASON -{ - ObCreateHandle, - ObOpenHandle, - ObDuplicateHandle, - ObInheritHandle, - ObMaxOpenReason -} OB_OPEN_REASON; - -/* - * Callbacks used for Win32 objects... this define won't be needed after the Object Manager - * rewrite -- Alex - */ - -/* TEMPORARY HACK */ -typedef NTSTATUS STDCALL_FUNC -(*OB_CREATE_METHOD)(PVOID ObjectBody, - PVOID Parent, - PWSTR RemainingPath, - struct _OBJECT_ATTRIBUTES* ObjectAttributes); - -typedef NTSTATUS STDCALL_FUNC -(*OB_OPEN_METHOD)(OB_OPEN_REASON Reason, - PVOID ObjectBody, - PEPROCESS Process, - ULONG HandleCount, - ACCESS_MASK GrantedAccess); - -typedef NTSTATUS STDCALL_FUNC -(*OB_PARSE_METHOD)(PVOID Object, - PVOID *NextObject, - PUNICODE_STRING FullPath, - PWSTR *Path, - ULONG Attributes); -typedef VOID STDCALL_FUNC -(*OB_DELETE_METHOD)(PVOID DeletedObject); - -typedef VOID STDCALL_FUNC -(*OB_CLOSE_METHOD)(PVOID ClosedObject, ULONG HandleCount); - -typedef VOID STDCALL_FUNC -(*OB_DUMP_METHOD)(VOID); - -typedef NTSTATUS STDCALL_FUNC -(*OB_OKAYTOCLOSE_METHOD)(VOID); - -typedef NTSTATUS STDCALL_FUNC -(*OB_QUERYNAME_METHOD)(PVOID ObjectBody, - POBJECT_NAME_INFORMATION ObjectNameInfo, - ULONG Length, - PULONG ReturnLength); - -typedef PVOID STDCALL_FUNC -(*OB_FIND_METHOD)(PVOID WinStaObject, - PWSTR Name, - ULONG Attributes); - -typedef NTSTATUS STDCALL_FUNC -(*OB_SECURITY_METHOD)(PVOID ObjectBody, - SECURITY_OPERATION_CODE OperationCode, - SECURITY_INFORMATION SecurityInformation, - PSECURITY_DESCRIPTOR SecurityDescriptor, - PULONG BufferLength); - -typedef struct _W32_OBJECT_CALLBACK { - OB_OPEN_METHOD WinStaCreate; - OB_PARSE_METHOD WinStaParse; - OB_DELETE_METHOD WinStaDelete; - OB_FIND_METHOD WinStaFind; - OB_CREATE_METHOD DesktopCreate; - OB_DELETE_METHOD DesktopDelete; -} W32_OBJECT_CALLBACK, *PW32_OBJECT_CALLBACK; - typedef struct _STACK_INFORMATION { PVOID BaseAddress; _____ Modified: trunk/reactos/ntoskrnl/include/internal/ob.h --- trunk/reactos/ntoskrnl/include/internal/ob.h 2005-05-15 22:13:08 UTC (rev 15325) +++ trunk/reactos/ntoskrnl/include/internal/ob.h 2005-05-15 23:24:11 UTC (rev 15326) @@ -24,46 +24,6 @@ typedef PVOID POBJECT; -typedef struct _OBJECT_TYPE_INITIALIZER -{ - WORD Length; - UCHAR UseDefaultObject; - UCHAR CaseInsensitive; - ULONG InvalidAttributes; - GENERIC_MAPPING GenericMapping; - ULONG ValidAccessMask; - UCHAR SecurityRequired; - UCHAR MaintainHandleCount; - UCHAR MaintainTypeList; - POOL_TYPE PoolType; - ULONG DefaultPagedPoolCharge; - ULONG DefaultNonPagedPoolCharge; - OB_DUMP_METHOD DumpProcedure; - OB_OPEN_METHOD OpenProcedure; - OB_CLOSE_METHOD CloseProcedure; - OB_DELETE_METHOD DeleteProcedure; - OB_PARSE_METHOD ParseProcedure; - OB_SECURITY_METHOD SecurityProcedure; - OB_QUERYNAME_METHOD QueryNameProcedure; - OB_OKAYTOCLOSE_METHOD OkayToCloseProcedure; -} OBJECT_TYPE_INITIALIZER, *POBJECT_TYPE_INITIALIZER; - -typedef struct _OBJECT_TYPE -{ - ERESOURCE Mutex; /* Used to lock the Object Type */ - LIST_ENTRY TypeList; /* Links all the Types Together for Debugging */ - UNICODE_STRING Name; /* Name of the Type */ - PVOID DefaultObject; /* What Object to use during a Wait (ie, FileObjects wait on FileObject->Event) */ - ULONG Index; /* Index of this Type in the Object Directory */ - ULONG TotalNumberOfObjects; /* Total number of objects of this type */ - ULONG TotalNumberOfHandles; /* Total number of handles of this type */ - ULONG HighWaterNumberOfObjects; /* Peak number of objects of this type */ - ULONG HighWaterNumberOfHandles; /* Peak number of handles of this type */ - OBJECT_TYPE_INITIALIZER TypeInfo; /* Information captured during type creation */ - ULONG Key; /* Key to use when allocating objects of this type */ - ERESOURCE ObjectLocks[4]; /* Locks for locking the Objects */ -} OBJECT_TYPE; - typedef struct _OBJECT_HEADER /* * PURPOSE: Header for every object managed by the object manager _____ Modified: trunk/reactos/ntoskrnl/include/internal/ps.h --- trunk/reactos/ntoskrnl/include/internal/ps.h 2005-05-15 22:13:08 UTC (rev 15325) +++ trunk/reactos/ntoskrnl/include/internal/ps.h 2005-05-15 23:24:11 UTC (rev 15326) @@ -55,6 +55,15 @@ #define FSRTL_FAST_IO_TOP_LEVEL_IRP (0x04) #define FSRTL_MAX_TOP_LEVEL_IRP_FLAG (0x04) +typedef struct _W32_OBJECT_CALLBACK { + OB_OPEN_METHOD WinStaCreate; + OB_PARSE_METHOD WinStaParse; + OB_DELETE_METHOD WinStaDelete; + OB_FIND_METHOD WinStaFind; + OB_CREATE_METHOD DesktopCreate; + OB_DELETE_METHOD DesktopDelete; +} W32_OBJECT_CALLBACK, *PW32_OBJECT_CALLBACK; + #ifndef __USE_W32API typedef struct { _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-05-15 22:13:08 UTC (rev 15325) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-05-15 23:24:11 UTC (rev 15326) @@ -8447,8 +8447,123 @@ -/** Object manager routines **/ +/** Object manager **/ +typedef enum _OB_OPEN_REASON +{ + ObCreateHandle, + ObOpenHandle, + ObDuplicateHandle, + ObInheritHandle, + ObMaxOpenReason +} OB_OPEN_REASON; + +/* TEMPORARY HACK */ +typedef NTSTATUS +(DDKAPI *OB_CREATE_METHOD)(PVOID ObjectBody, + PVOID Parent, + PWSTR RemainingPath, + struct _OBJECT_ATTRIBUTES* ObjectAttributes); + +/* Object Callbacks */ +typedef NTSTATUS +(DDKAPI *OB_OPEN_METHOD)(OB_OPEN_REASON Reason, + PVOID ObjectBody, + PEPROCESS Process, + ULONG HandleCount, + ACCESS_MASK GrantedAccess); + +typedef NTSTATUS +(DDKAPI *OB_PARSE_METHOD)(PVOID Object, + PVOID *NextObject, + PUNICODE_STRING FullPath, + PWSTR *Path, + ULONG Attributes); + +typedef VOID +(DDKAPI *OB_DELETE_METHOD)(PVOID DeletedObject); + +typedef VOID +(DDKAPI *OB_CLOSE_METHOD)(PVOID ClosedObject, ULONG HandleCount); + +typedef VOID +(DDKAPI *OB_DUMP_METHOD)(VOID); + +typedef NTSTATUS +(DDKAPI *OB_OKAYTOCLOSE_METHOD)(VOID); + +typedef NTSTATUS +(DDKAPI *OB_QUERYNAME_METHOD)(PVOID ObjectBody, + POBJECT_NAME_INFORMATION ObjectNameInfo, + ULONG Length, + PULONG ReturnLength); + +typedef PVOID +(DDKAPI *OB_FIND_METHOD)(PVOID WinStaObject, + PWSTR Name, + ULONG Attributes); + +typedef NTSTATUS +(DDKAPI *OB_SECURITY_METHOD)(PVOID ObjectBody, + SECURITY_OPERATION_CODE OperationCode, + SECURITY_INFORMATION SecurityInformation, + PSECURITY_DESCRIPTOR SecurityDescriptor, + PULONG BufferLength); + +typedef struct _OBJECT_CREATE_INFORMATION +{ + ULONG Attributes; + HANDLE RootDirectory; + PVOID ParseContext; + KPROCESSOR_MODE ProbeMode; + ULONG PagedPoolCharge; + ULONG NonPagedPoolCharge; + ULONG SecurityDescriptorCharge; + PSECURITY_DESCRIPTOR SecurityDescriptor; + PSECURITY_QUALITY_OF_SERVICE SecurityQos; + SECURITY_QUALITY_OF_SERVICE SecurityQualityOfService; +} OBJECT_CREATE_INFORMATION, *POBJECT_CREATE_INFORMATION; + +typedef struct _OBJECT_TYPE_INITIALIZER +{ + WORD Length; + UCHAR UseDefaultObject; + UCHAR CaseInsensitive; + ULONG InvalidAttributes; + GENERIC_MAPPING GenericMapping; + ULONG ValidAccessMask; + UCHAR SecurityRequired; + UCHAR MaintainHandleCount; + UCHAR MaintainTypeList; + POOL_TYPE PoolType; + ULONG DefaultPagedPoolCharge; + ULONG DefaultNonPagedPoolCharge; + OB_DUMP_METHOD DumpProcedure; + OB_OPEN_METHOD OpenProcedure; + OB_CLOSE_METHOD CloseProcedure; + OB_DELETE_METHOD DeleteProcedure; + OB_PARSE_METHOD ParseProcedure; + OB_SECURITY_METHOD SecurityProcedure; + OB_QUERYNAME_METHOD QueryNameProcedure; + OB_OKAYTOCLOSE_METHOD OkayToCloseProcedure; +} OBJECT_TYPE_INITIALIZER, *POBJECT_TYPE_INITIALIZER; + +typedef struct _OBJECT_TYPE +{ + ERESOURCE Mutex; /* Used to lock the Object Type */ + LIST_ENTRY TypeList; /* Links all the Types Together for Debugging */ + UNICODE_STRING Name; /* Name of the Type */ + PVOID DefaultObject; /* What Object to use during a Wait (ie, FileObjects wait on FileObject->Event) */ + ULONG Index; /* Index of this Type in the Object Directory */ + ULONG TotalNumberOfObjects; /* Total number of objects of this type */ + ULONG TotalNumberOfHandles; /* Total number of handles of this type */ + ULONG HighWaterNumberOfObjects; /* Peak number of objects of this type */ + ULONG HighWaterNumberOfHandles; /* Peak number of handles of this type */ + OBJECT_TYPE_INITIALIZER TypeInfo; /* Information captured during type creation */ + ULONG Key; /* Key to use when allocating objects of this type */ + ERESOURCE ObjectLocks[4]; /* Locks for locking the Objects */ +} OBJECT_TYPE; + NTOSAPI NTSTATUS DDKAPI

1 0

[chorns] 15325: Remove unused file
by chorns＠svn.reactos.com 15 May '05

15 May '05

Remove unused file Deleted: branches/xmlbuildsystem/reactos/lib/kernel32/tests/Makefile _____ Deleted: branches/xmlbuildsystem/reactos/lib/kernel32/tests/Makefile --- branches/xmlbuildsystem/reactos/lib/kernel32/tests/Makefile 2005-05-15 22:07:07 UTC (rev 15324) +++ branches/xmlbuildsystem/reactos/lib/kernel32/tests/Makefile 2005-05-15 22:13:08 UTC (rev 15325) @@ -1,5 +0,0 @@ -# This file is automatically generated. - -TOP = ..\..\.. -DEFAULT = kernel32_test -include $(TOP)/proxy.mak

1 0

[chorns] 15324: Build and run tests
by chorns＠svn.reactos.com 15 May '05

15 May '05

Build and run tests Modified: branches/xmlbuildsystem/reactos/lib/kernel32/include/kernel32.h Modified: branches/xmlbuildsystem/reactos/lib/kernel32/kernel32.xml Modified: branches/xmlbuildsystem/reactos/lib/kernel32/mem/heap.c Modified: branches/xmlbuildsystem/reactos/lib/kernel32/tests/Makefile Modified: branches/xmlbuildsystem/reactos/lib/kernel32/tests/kernel32.xml Modified: branches/xmlbuildsystem/reactos/lib/kernel32/tests/stubs.xml Modified: branches/xmlbuildsystem/reactos/regtests/regtests/regtests.def Modified: branches/xmlbuildsystem/reactos/regtests/shared/regtests.c Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/functiontest.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/testsupportcode.cpp _____ Modified: branches/xmlbuildsystem/reactos/lib/kernel32/include/kernel32.h --- branches/xmlbuildsystem/reactos/lib/kernel32/include/kernel32.h 2005-05-15 21:41:22 UTC (rev 15323) +++ branches/xmlbuildsystem/reactos/lib/kernel32/include/kernel32.h 2005-05-15 22:07:07 UTC (rev 15324) @@ -66,9 +66,8 @@ DWORD FilenameW2A_FitOrFail(LPSTR DestA, INT destLen, LPCWSTR SourceW, INT sourceLen); DWORD FilenameU2A_FitOrFail(LPSTR DestA, INT destLen, PUNICODE_STRING SourceU); +#define HeapAlloc RtlAllocateHeap +#define HeapFree RtlFreeHeap - - - #endif /* ndef _KERNEL32_INCLUDE_KERNEL32_H */ _____ Modified: branches/xmlbuildsystem/reactos/lib/kernel32/kernel32.xml --- branches/xmlbuildsystem/reactos/lib/kernel32/kernel32.xml 2005-05-15 21:41:22 UTC (rev 15323) +++ branches/xmlbuildsystem/reactos/lib/kernel32/kernel32.xml 2005-05-15 22:07:07 UTC (rev 15324) @@ -1,19 +1,3 @@ -<module name="kernel32" type="win32dll" baseaddress="${BASEADDRESS_KERNEL32}" installbase="system32" installname="kernel32.dll"> - <importlibrary definition="kernel32.def" /> - <include base="kernel32">.</include> - <include base="kernel32">include</include> - <define name="_DISABLE_TIDENTS" /> - <define name="_SEH_NO_NATIVE_NLG" /> - <define name="WINVER">0x0500</define> - <library>kernel32_base</library> - <library>pseh</library> - <library>rosrtl</library> - <library>ntdll</library> - <linkerflag>-lgcc</linkerflag> - <linkerflag>-nostartfiles</linkerflag> - <linkerflag>-nostdlib</linkerflag> - <file>kernel32.rc</file> -</module> <module name="kernel32_base" type="objectlibrary"> <include base="kernel32_base">.</include> <include base="kernel32_base">include</include> @@ -120,8 +104,22 @@ <file>tls.c</file> </directory> </module> - \ No newline at end of file _____ Modified: branches/xmlbuildsystem/reactos/lib/kernel32/mem/heap.c --- branches/xmlbuildsystem/reactos/lib/kernel32/mem/heap.c 2005-05-15 21:41:22 UTC (rev 15323) +++ branches/xmlbuildsystem/reactos/lib/kernel32/mem/heap.c 2005-05-15 22:07:07 UTC (rev 15324) @@ -32,17 +32,6 @@ #define NDEBUG #include "../include/debug.h" -PVOID WINAPI HeapAlloc(HANDLE hHeap, DWORD dwFlags, DWORD dwBytes) -{ - return RtlAllocateHeap(hHeap, dwFlags, dwBytes); -} - -BOOL WINAPI HeapFree(HANDLE hHeap, DWORD dwFlags, LPVOID lpMem) -{ - return RtlFreeHeap(hHeap, dwFlags, lpMem); -} - - /********************************************************************* * HeapCreate -- KERNEL32 * *********************************************************************/ _____ Modified: branches/xmlbuildsystem/reactos/lib/kernel32/tests/Makefile --- branches/xmlbuildsystem/reactos/lib/kernel32/tests/Makefile 2005-05-15 21:41:22 UTC (rev 15323) +++ branches/xmlbuildsystem/reactos/lib/kernel32/tests/Makefile 2005-05-15 22:07:07 UTC (rev 15324) @@ -1,23 +1,5 @@ -# $Id$ +# This file is automatically generated. -PATH_TO_TOP = ../../.. - -TARGET_TYPE = test - -TARGET_NAME = regtests - -TARGET_LIBPATH = . - -TARGET_CFLAGS = -I$(REGTESTS_PATH_INC) - -TARGET_LIBS = ../kernel32.a - --include Makefile.tests - -TARGET_OBJECTS = \ - setup.o \ - $(addprefix tests/, $(TESTS)) - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk +TOP = ..\..\.. +DEFAULT = kernel32_test +include $(TOP)/proxy.mak _____ Modified: branches/xmlbuildsystem/reactos/lib/kernel32/tests/kernel32.xml --- branches/xmlbuildsystem/reactos/lib/kernel32/tests/kernel32.xml 2005-05-15 21:41:22 UTC (rev 15323) +++ branches/xmlbuildsystem/reactos/lib/kernel32/tests/kernel32.xml 2005-05-15 22:07:07 UTC (rev 15324) @@ -3,11 +3,13 @@ <define name="_DISABLE_TIDENTS" /> <define name="_SEH_NO_NATIVE_NLG" /> <define name="WINVER">0x0500</define> + <library>rtshared</library> + <library>regtests</library> <library>kernel32_base</library> <library>pseh</library> <library>rosrtl</library> <library>ntdll</library> - <library>rtshared</library> + <library>msvcrt</library> <linkerflag>-lgcc</linkerflag> <linkerflag>-nostartfiles</linkerflag> <linkerflag>-nostdlib</linkerflag> _____ Modified: branches/xmlbuildsystem/reactos/lib/kernel32/tests/stubs.xml --- branches/xmlbuildsystem/reactos/lib/kernel32/tests/stubs.xml 2005-05-15 21:41:22 UTC (rev 15323) +++ branches/xmlbuildsystem/reactos/lib/kernel32/tests/stubs.xml 2005-05-15 22:07:07 UTC (rev 15324) @@ -8,7 +8,6 @@ <symbol newname="RtlFreeHeap">HeapFree@12</symbol> <symbol>LdrAccessResource@16</symbol> <symbol>LdrDisableThreadCalloutsForDll@4</symbol> - <symbol>LdrDisableThreadCalloutsForDll@4</symbol> <symbol>LdrFindResource_U@16</symbol> <symbol>LdrLoadDll@16</symbol> <symbol>LdrShutdownProcess@0</symbol> _____ Modified: branches/xmlbuildsystem/reactos/regtests/regtests/regtests.def --- branches/xmlbuildsystem/reactos/regtests/regtests/regtests.def 2005-05-15 21:41:22 UTC (rev 15323) +++ branches/xmlbuildsystem/reactos/regtests/regtests/regtests.def 2005-05-15 22:07:07 UTC (rev 15324) @@ -7,4 +7,3 @@ _CreateThread@24 _TerminateThread@8 _WaitForSingleObject@8 - _____ Modified: branches/xmlbuildsystem/reactos/regtests/shared/regtests.c --- branches/xmlbuildsystem/reactos/regtests/shared/regtests.c 2005-05-15 21:41:22 UTC (rev 15323) +++ branches/xmlbuildsystem/reactos/regtests/shared/regtests.c 2005-05-15 22:07:07 UTC (rev 15324) @@ -60,11 +60,11 @@ if (_Result != TS_OK) { - sprintf(OutputBuffer, "ROSREGTEST: |%s| Status: Failed (%s)\n", TestName, Buffer); + sprintf(OutputBuffer, "[%s] Failed (%s)\n", TestName, Buffer); } else { - sprintf(OutputBuffer, "ROSREGTEST: |%s| Status: Success\n", TestName); + sprintf(OutputBuffer, "[%s] Success\n", TestName); } if (OutputRoutine != NULL) { @@ -137,7 +137,7 @@ if (hThread == NULL) { sprintf(OutputBuffer, - "ROSREGTEST: |%s| Status: Failed (CreateThread failed: 0x%x)\n", + "[%s] Failed (CreateThread failed: 0x%x)\n", Name, (unsigned int)GetLastError()); } else if (_WaitForSingleObject(hThread, TimeOut) == WAIT_TIMEOUT) @@ -145,12 +145,12 @@ if (!_TerminateThread(hThread, 0)) { sprintf(OutputBuffer, - "ROSREGTEST: |%s| Status: Failed (Test timed out - %d ms, TerminateThread failed: 0x%x)\n", + "[%s] Failed (Test timed out - %d ms, TerminateThread failed: 0x%x)\n", Name, (int)TimeOut, (unsigned int)GetLastError()); } else { - sprintf(OutputBuffer, "ROSREGTEST: |%s| Status: Failed (Test timed out - %d ms)\n", Name, (int)TimeOut); + sprintf(OutputBuffer, "[%s] Failed (Test timed out - %d ms)\n", Name, (int)TimeOut); } } else _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-05-15 21:41:22 UTC (rev 15323) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-05-15 22:07:07 UTC (rev 15324) @@ -280,6 +280,7 @@ GenerateAllTarget ( v ); GenerateInitTarget (); + GenerateRegTestsRunTarget (); for ( i = 0; i < iend; i++ ) v[i]->GenerateOtherMacros(); @@ -559,6 +560,18 @@ } void +MingwBackend::GenerateRegTestsRunTarget () const +{ + fprintf ( fMakefile, + "REGTESTS_RUN_TARGET = regtests.dll\n" ); + fprintf ( fMakefile, + "$(REGTESTS_RUN_TARGET):\n" ); + fprintf ( fMakefile, + "\t$(cp) $(REGTESTS_TARGET) $(REGTESTS_RUN_TARGET)\n" ); + fprintf ( fMakefile, "\n" ); +} + +void MingwBackend::GenerateXmlBuildFilesMacro() const { fprintf ( fMakefile, _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-05-15 21:41:22 UTC (rev 15323) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-05-15 22:07:07 UTC (rev 15324) @@ -77,6 +77,7 @@ void GenerateAllTarget ( const std::vector<MingwModuleHandler*>& handlers ) const; std::string GetBuildToolDependencies () const; void GenerateInitTarget () const; + void GenerateRegTestsRunTarget () const; void GenerateXmlBuildFilesMacro() const; std::string GetBin2ResExecutable (); void UnpackWineResources (); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-05-15 21:41:22 UTC (rev 15323) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-05-15 22:07:07 UTC (rev 15324) @@ -349,16 +349,15 @@ } void -MingwModuleHandler::GetSourceFilenames ( - string_list& list, - bool includeGeneratedFiles ) const +MingwModuleHandler::GetSourceFilenames ( string_list& list, + bool includeGeneratedFiles ) const { size_t i; const vector<File*>& files = module.non_if_data.files; for ( i = 0; i < files.size (); i++ ) { - if ( includeGeneratedFiles || !IsGeneratedFile ( *files[i] ) ) + if ( includeGeneratedFiles || !files[i]->IsGeneratedFile () ) { list.push_back ( GetActualSourceFilename ( files[i]->name ) ); @@ -379,7 +378,7 @@ for ( j = 0; j < files.size (); j++ ) { File& file = *files[j]; - if ( includeGeneratedFiles || !IsGeneratedFile ( file ) ) + if ( includeGeneratedFiles || !file.IsGeneratedFile () ) { list.push_back ( GetActualSourceFilename ( file.name ) ); @@ -737,6 +736,18 @@ } void +MingwModuleHandler::CleanupFileVector ( vector<File*>& sourceFiles ) +{ + for (size_t i = 0; i < sourceFiles.size (); i++) + delete sourceFiles[i]; +} + +void +MingwModuleHandler::GetModuleSpecificSourceFiles ( vector<File*>& sourceFiles ) +{ +} + +void MingwModuleHandler::GenerateObjectMacros ( const char* assignmentOperation, const IfableData& data, @@ -806,6 +817,19 @@ "endif\n\n" ); } } + + vector<File*> sourceFiles; + GetModuleSpecificSourceFiles ( sourceFiles ); + for ( i = 0; i < sourceFiles.size (); i++ ) + { + fprintf ( + fMakefile, + "%s += %s\n", + objectsMacro.c_str(), + GetObjectFilename ( + sourceFiles[i]->name, NULL ).c_str () ); + } + CleanupFileVector ( sourceFiles ); } void @@ -1362,12 +1386,13 @@ void MingwModuleHandler::GeneratePhonyTarget() const { - string targetMacro ( GetTargetMacro(module) ); - fprintf ( fMakefile, ".PHONY: %s\n\n", + string targetMacro ( GetTargetMacro ( module ) ); + fprintf ( fMakefile, + ".PHONY: %s\n\n", targetMacro.c_str ()); fprintf ( fMakefile, "%s: | %s\n", targetMacro.c_str (), - GetDirectory(GetTargetFilename(module,NULL)).c_str () ); + GetDirectory ( GetTargetFilename ( module, NULL ) ).c_str () ); } void @@ -1407,6 +1432,20 @@ windresflagsMacro, widlflagsMacro ); } + + vector<File*> sourceFiles; + GetModuleSpecificSourceFiles ( sourceFiles ); + for ( i = 0; i < sourceFiles.size (); i++ ) + { + GenerateCommands ( *sourceFiles[i], + cc, + cppc, + cflagsMacro, + nasmflagsMacro, + windresflagsMacro, + widlflagsMacro ); + } + CleanupFileVector ( sourceFiles ); } void @@ -1665,25 +1704,32 @@ // generate phony target for module name fprintf ( fMakefile, ".PHONY: %s\n", module.name.c_str () ); + string dependencies = GetTargetMacro ( module ); + if ( module.type == Test ) + dependencies += " $(REGTESTS_RUN_TARGET)"; fprintf ( fMakefile, "%s: %s\n\n", module.name.c_str (), - GetTargetMacro ( module ).c_str () ); + dependencies.c_str () ); + if ( module.type == Test ) + { + fprintf ( fMakefile, + "\t%s\n", + targetMacro.c_str ()); + } if ( !ReferenceObjects ( module ) ) { string ar_target ( GenerateArchiveTarget ( ar, objectsMacro ) ); if ( targetMacro != ar_target ) - { CLEAN_FILE ( ar_target ); - } } GenerateObjectFileTargets ( cc, - cppc, - cflagsMacro, - nasmflagsMacro, - windresflagsMacro, - widlflagsMacro ); + cppc, + cflagsMacro, + nasmflagsMacro, + windresflagsMacro, + widlflagsMacro ); } void @@ -2830,6 +2876,15 @@ } void +MingwTestModuleHandler::GetModuleSpecificSourceFiles ( vector<File*>& sourceFiles ) +{ + string basePath = "$(INTERMEDIATE)" SSEP + module.GetBasePath (); + sourceFiles.push_back ( new File ( basePath + SSEP "_hooks.c", false, "" ) ); + sourceFiles.push_back ( new File ( basePath + SSEP "_stubs.S", false, "" ) ); + sourceFiles.push_back ( new File ( basePath + SSEP "_startup.c", false, "" ) ); +} + +void MingwTestModuleHandler::GenerateTestModuleTarget () { string targetMacro ( GetTargetMacro ( module ) ); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-05-15 21:41:22 UTC (rev 15323) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-05-15 22:07:07 UTC (rev 15324) @@ -63,6 +63,7 @@ void GenerateInstallTarget () const; static bool ReferenceObjects ( const Module& module ); protected: + virtual void GetModuleSpecificSourceFiles ( std::vector<File*>& sourceFiles ); std::string GetWorkingDirectory () const; std::string GetBasename ( const std::string& filename ) const; std::string GetActualSourceFilename ( const std::string& filename ) const; @@ -73,7 +74,8 @@ string_list& targets ); void GetModuleDependencies ( string_list& dependencies ); std::string GetAllDependencies () const; - void GetSourceFilenames ( string_list& list, bool includeGeneratedFiles = true ) const; + void GetSourceFilenames ( string_list& list, + bool includeGeneratedFiles ) const; void GetSourceFilenamesWithoutGeneratedFiles ( string_list& list ) const; std::string GetObjectFilename ( const std::string& sourceFilename, string_list* pclean_files ) const; @@ -174,6 +176,7 @@ static std::string RemoveVariables ( std::string path); void GenerateBuildMapCode (); void GenerateBuildNonSymbolStrippedCode (); + void CleanupFileVector ( std::vector<File*>& sourceFiles ); public: const Module& module; string_list clean_files; @@ -389,6 +392,8 @@ MingwTestModuleHandler ( const Module& module ); virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); +protected: + virtual void GetModuleSpecificSourceFiles ( std::vector<File*>& sourceFiles ); private: void GenerateTestModuleTarget (); }; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-05-15 21:41:22 UTC (rev 15323) +++ branches/xmlbuildsystem/reactos/tools/rbuild/module.cpp 2005-05-15 22:07:07 UTC (rev 15324) @@ -79,6 +79,16 @@ } string +GetFilename ( const string& filename ) +{ + size_t index = filename.find_last_of ( CSEP ); + if ( index == string::npos ) + return filename; + else + return filename.substr ( index + 1, filename.length () - index ); +} + +string NormalizeFilename ( const string& filename ) { if ( filename == "" ) @@ -731,7 +741,14 @@ { } +bool +File::IsGeneratedFile () const +{ + string extension = GetExtension ( name ); + return ( extension == ".spec" || extension == ".SPEC" ); +} + Library::Library ( const XMLElement& _node, const Module& _module, const string& _name ) _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h --- branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-05-15 21:41:22 UTC (rev 15323) +++ branches/xmlbuildsystem/reactos/tools/rbuild/rbuild.h 2005-05-15 22:07:07 UTC (rev 15324) @@ -218,6 +218,8 @@ bool HasFileWithExtension ( const IfableData&, const std::string& extension ) const; void InvokeModule () const; void ProcessXML (); + void GetSourceFilenames ( string_list& list, + bool includeGeneratedFiles ) const; private: std::string GetDefaultModuleExtension () const; std::string GetDefaultModuleEntrypoint () const; @@ -282,6 +284,7 @@ std::string _switches ); void ProcessXML(); + bool IsGeneratedFile () const; }; @@ -468,6 +471,16 @@ const StubbedComponent& component, int* stubIndex ); void WriteStubsFile ( Module& module ); + std::string GetStartupFilename ( Module& module ); + std::string GetTestDispatcherName ( std::string filename ); + bool IsTestFile ( std::string& filename ) const; + void GetSourceFilenames ( string_list& list, + Module& module ) const; + char* WriteTestDispatcherPrototypesToStartupFile ( char* buffer, + Module& module ); + char* WriteRegisterTestsFunctionToStartupFile ( char* buffer, + Module& module ); + void WriteStartupFile ( Module& module ); }; @@ -689,6 +702,9 @@ GetDirectory ( const std::string& filename ); extern std::string +GetFilename ( const std::string& filename ); + +extern std::string NormalizeFilename ( const std::string& filename ); #endif /* __RBUILD_H */ _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/tests/functiontest.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/tests/functiontest.cpp 2005-05-15 21:41:22 UTC (rev 15323) +++ branches/xmlbuildsystem/reactos/tools/rbuild/tests/functiontest.cpp 2005-05-15 22:07:07 UTC (rev 15324) @@ -6,4 +6,6 @@ { string fixedupFilename = NormalizeFilename ( "." SSEP "dir1" SSEP "dir2" SSEP ".." SSEP "filename.txt" ); ARE_EQUAL ( "dir1" SSEP "filename.txt", fixedupFilename ); + ARE_EQUAL ( "file.txt", GetFilename ( "file.txt" ) ); + ARE_EQUAL ( "file.txt", GetFilename ( "dir" SSEP "file.txt" ) ); } _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/testsupportcode.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/testsupportcode.cpp 2005-05-15 21:41:22 UTC (rev 15323) +++ branches/xmlbuildsystem/reactos/tools/rbuild/testsupportcode.cpp 2005-05-15 22:07:07 UTC (rev 15324) @@ -46,6 +46,7 @@ WriteHooksFile ( module ); WriteStubsFile ( module ); + WriteStartupFile ( module ); } string @@ -188,3 +189,160 @@ free ( buf ); } + +string +TestSupportCode::GetStartupFilename ( Module& module ) +{ + return NormalizeFilename ( Environment::GetIntermediatePath () + SSEP + module.GetBasePath () + SSEP + "_startup.c" ); +} + +string +TestSupportCode::GetTestDispatcherName ( string filename ) +{ + string filenamePart = ReplaceExtension ( GetFilename ( filename ), "" ); + if ( filenamePart.length () > 0 ) + filenamePart[0] = toupper ( filenamePart[0] ); + for ( size_t i = 1; i < filenamePart.length (); i++ ) + { + filenamePart[i] = tolower ( filenamePart[i] ); + } + return filenamePart + "Test"; +} + +bool +TestSupportCode::IsTestFile ( string& filename ) const +{ + if ( stricmp ( GetFilename ( filename ).c_str (), "setup.c" ) == 0 ) + return false; + return true; +} + +void +TestSupportCode::GetSourceFilenames ( string_list& list, + Module& module ) const +{ + size_t i; + + const vector<File*>& files = module.non_if_data.files; + for ( i = 0; i < files.size (); i++ ) + { + if ( !files[i]->IsGeneratedFile () && IsTestFile ( files[i]->name ) ) + list.push_back ( files[i]->name ); + } + // intentionally make a copy so that we can append more work in + // the middle of processing without having to go recursive + vector<If*> v = module.non_if_data.ifs; + for ( i = 0; i < v.size (); i++ ) + { + size_t j; + If& rIf = *v[i]; + // check for sub-ifs to add to list + const vector<If*>& ifs = rIf.data.ifs; + for ( j = 0; j < ifs.size (); j++ ) + v.push_back ( ifs[j] ); + const vector<File*>& files = rIf.data.files; + for ( j = 0; j < files.size (); j++ ) + { + File& file = *files[j]; + if ( !file.IsGeneratedFile () && IsTestFile ( file.name ) ) + { + list.push_back ( file.name ); + } + } + } +} + +char* +TestSupportCode::WriteTestDispatcherPrototypesToStartupFile ( char* buffer, + Module& module ) +{ + string_list files; + GetSourceFilenames ( files, + module ); + for ( size_t i = 0; i < files.size (); i++ ) + { + buffer = buffer + sprintf ( buffer, + "extern void %s(int Command, char *Buffer);\n", + GetTestDispatcherName ( files[i] ).c_str () ); + } + buffer = buffer + sprintf ( buffer, "\n" ); + return buffer; +} + +char* +TestSupportCode::WriteRegisterTestsFunctionToStartupFile ( char* buffer, + Module& module ) +{ + buffer = buffer + sprintf ( buffer, + "extern void AddTest(TestRoutine Routine);\n" ); + buffer = buffer + sprintf ( buffer, + "\n" ); + + buffer = buffer + sprintf ( buffer, + "void\n" ); + buffer = buffer + sprintf ( buffer, + "RegisterTests()\n" ); + buffer = buffer + sprintf ( buffer, + "{\n" ); + + string_list files; + GetSourceFilenames ( files, + module ); + for ( size_t i = 0; i < files.size (); i++ ) + { + buffer = buffer + sprintf ( buffer, + "AddTest((TestRoutine)%s);\n", + GetTestDispatcherName ( files[i]).c_str () ); + } + buffer = buffer + sprintf ( buffer, + "}\n" ); + buffer = buffer + sprintf ( buffer, "\n" ); + return buffer; +} + +void +TestSupportCode::WriteStartupFile ( Module& module ) +{ + char* buf; + char* s; + + buf = (char*) malloc ( 50*1024 ); + if ( buf == NULL ) + throw OutOfMemoryException (); + + s = buf; + s = s + sprintf ( s, "/* This file is automatically generated. */\n" ); + s = s + sprintf ( s, "\n" ); + s = s + sprintf ( s, "#include <windows.h>\n" ); + s = s + sprintf ( s, "#include \"regtests.h\"\n" ); + s = s + sprintf ( s, "\n" ); + s = WriteTestDispatcherPrototypesToStartupFile ( s, + module ); + s = WriteRegisterTestsFunctionToStartupFile ( s, + module ); + s = s + sprintf ( s, "\n" ); + s = s + sprintf ( s, "void\n" ); + s = s + sprintf ( s, "ConsoleWrite(char *Buffer)\n" ); + s = s + sprintf ( s, "{\n" ); + s = s + sprintf ( s, " printf(Buffer);\n" ); + s = s + sprintf ( s, "}\n" ); + s = s + sprintf ( s, "\n" ); + s = s + sprintf ( s, "int\n" ); + s = s + sprintf ( s, "mainCRTStartup(HANDLE hInstance,\n" ); + s = s + sprintf ( s, " HANDLE hPrevInstance,\n" ); + s = s + sprintf ( s, " LPSTR lpszCmdParam,\n" ); + s = s + sprintf ( s, " int nCmdShow)\n" ); + s = s + sprintf ( s, "{\n" ); + s = s + sprintf ( s, " InitializeTests();\n" ); + s = s + sprintf ( s, " RegisterTests();\n" ); + s = s + sprintf ( s, " SetupOnce();\n" ); + s = s + sprintf ( s, " PerformTests(ConsoleWrite, NULL);\n" ); + s = s + sprintf ( s, " _ExitProcess(0);\n" ); + s = s + sprintf ( s, " return 0;\n" ); + s = s + sprintf ( s, "}\n" ); + s = s + sprintf ( s, "\n" ); + + FileSupportCode::WriteIfChanged ( buf, GetStartupFilename ( module ) ); + + free ( buf ); +}

1 0

[ea] 15323: Make gcc 3.4.2 compile.
by ea＠svn.reactos.com 15 May '05

15 May '05

Make gcc 3.4.2 compile. Modified: trunk/reactos/lib/crt/stdlib/splitp.c _____ Modified: trunk/reactos/lib/crt/stdlib/splitp.c --- trunk/reactos/lib/crt/stdlib/splitp.c 2005-05-15 21:39:10 UTC (rev 15322) +++ trunk/reactos/lib/crt/stdlib/splitp.c 2005-05-15 21:41:22 UTC (rev 15323) @@ -8,9 +8,9 @@ */ void _tsplitpath(const _TCHAR* path, _TCHAR* drive, _TCHAR* dir, _TCHAR* fname, _TCHAR* ext) { - _TCHAR* tmp_drive; - _TCHAR* tmp_dir; - _TCHAR* tmp_ext; + _TCHAR* tmp_drive = NULL; + _TCHAR* tmp_dir = NULL; + _TCHAR* tmp_ext = NULL; tmp_drive = (_TCHAR*)_tcschr(path,':'); if (drive)

1 0

[ea] 15322: Correct a comment.
by ea＠svn.reactos.com 15 May '05

15 May '05

Correct a comment. Modified: trunk/reactos/ntoskrnl/lpc/port.c _____ Modified: trunk/reactos/ntoskrnl/lpc/port.c --- trunk/reactos/ntoskrnl/lpc/port.c 2005-05-15 21:28:44 UTC (rev 15321) +++ trunk/reactos/ntoskrnl/lpc/port.c 2005-05-15 21:39:10 UTC (rev 15322) @@ -40,7 +40,7 @@ DPRINT1("Creating Port Object Type\n"); - /* Create the window station Object Type */ + /* Create the Port Object Type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); RtlInitUnicodeString(&Name, L"Port"); ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer);

1 0

[gvg] 15321: Handle case where a directory contains a '." but the
by gvg＠svn.reactos.com 15 May '05

15 May '05

Handle case where a directory contains a '." but the filename doesn't (i.e. has no extension) Modified: trunk/reactos/lib/crt/stdlib/splitp.c _____ Modified: trunk/reactos/lib/crt/stdlib/splitp.c --- trunk/reactos/lib/crt/stdlib/splitp.c 2005-05-15 21:11:37 UTC (rev 15320) +++ trunk/reactos/lib/crt/stdlib/splitp.c 2005-05-15 21:28:44 UTC (rev 15321) @@ -44,8 +44,9 @@ } } - tmp_ext = (_TCHAR*)_tcsrchr(path,'.'); - if (!tmp_ext) + /* If the dot is before the last dir separator, it's part + * of a directory name, not the start of the extension */ + if (!tmp_ext || tmp_ext < tmp_dir) { tmp_ext = (_TCHAR*)path+_tcslen(path); }

1 0

[greatlrd] 15320: change from atoi to sprintf
by greatlrd＠svn.reactos.com 15 May '05

15 May '05

change from atoi to sprintf linux does not support itoa Modified: trunk/reactos/tools/cdmake/cdmake.c _____ Modified: trunk/reactos/tools/cdmake/cdmake.c --- trunk/reactos/tools/cdmake/cdmake.c 2005-05-15 19:40:57 UTC (rev 15319) +++ trunk/reactos/tools/cdmake/cdmake.c 2005-05-15 21:11:37 UTC (rev 15320) @@ -617,8 +617,8 @@ // max 255 times for equal short filename if (filename_counter>255) error_exit ( "'%s' is a duplicate file name, aborting...", filename ); d->name_on_cd[8] = '~'; - memset(&d->name_on_cd[9],0,5); - itoa(filename_counter, &d->name_on_cd[9],10); + memset(&d->name_on_cd[9],0,5); + sprintf(&d->name_on_cd[9],"%d",filename_counter); filename_counter++; }

1 0

[ion] 15319: Properly create the Object Type Type and remove previous hacks added
by ion＠svn.reactos.com 15 May '05

15 May '05

Properly create the Object Type Type and remove previous hacks added Modified: trunk/reactos/ntoskrnl/include/internal/ob.h Modified: trunk/reactos/ntoskrnl/ob/namespc.c Modified: trunk/reactos/ntoskrnl/ob/object.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/ob.h --- trunk/reactos/ntoskrnl/include/internal/ob.h 2005-05-15 18:10:51 UTC (rev 15318) +++ trunk/reactos/ntoskrnl/include/internal/ob.h 2005-05-15 19:40:57 UTC (rev 15319) @@ -115,16 +115,6 @@ LARGE_INTEGER CreateTime; } SYMLINK_OBJECT, *PSYMLINK_OBJECT; - -typedef struct _TYPE_OBJECT -{ - CSHORT Type; - CSHORT Size; - - /* pointer to object type data */ - POBJECT_TYPE ObjectType; -} TYPE_OBJECT, *PTYPE_OBJECT; - /* * Enumeration of object types */ @@ -197,6 +187,7 @@ POBJECT_HANDLE_ATTRIBUTE_INFORMATION HandleInfo); NTSTATUS +STDCALL ObpCreateTypeObject(POBJECT_TYPE_INITIALIZER ObjectTypeInitializer, PUNICODE_STRING TypeName, POBJECT_TYPE *ObjectType); _____ Modified: trunk/reactos/ntoskrnl/ob/namespc.c --- trunk/reactos/ntoskrnl/ob/namespc.c 2005-05-15 18:10:51 UTC (rev 15318) +++ trunk/reactos/ntoskrnl/ob/namespc.c 2005-05-15 19:40:57 UTC (rev 15319) @@ -21,9 +21,11 @@ POBJECT_TYPE ObTypeObjectType = NULL; PDIRECTORY_OBJECT NameSpaceRoot = NULL; +PDIRECTORY_OBJECT ObpTypeDirectoryObject = NULL; /* FIXME: Move this somewhere else once devicemap support is in */ PDEVICE_MAP ObSystemDeviceMap = NULL; + static GENERIC_MAPPING ObpDirectoryMapping = { STANDARD_RIGHTS_READ|DIRECTORY_QUERY|DIRECTORY_TRAVERSE, STANDARD_RIGHTS_WRITE|DIRECTORY_CREATE_OBJECT|DIRECTORY_CREATE_SUBDIRECT ORY, @@ -36,6 +38,13 @@ STANDARD_RIGHTS_EXECUTE, 0x000F0001}; +NTSTATUS +STDCALL +ObpAllocateObject(POBJECT_ATTRIBUTES ObjectAttributes, + POBJECT_TYPE ObjectType, + ULONG ObjectSize, + POBJECT_HEADER *ObjectHeader); + /* FUNCTIONS **************************************************************/ /* @@ -367,193 +376,152 @@ return STATUS_SUCCESS; } -/* HACKS FOR COMPATIBILITY. TEMPORARY */ -NTSTATUS -ObpCreateInitTypeObject(POBJECT_TYPE ObjectType) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - WCHAR NameString[120]; - PTYPE_OBJECT TypeObject = NULL; - UNICODE_STRING Name; - NTSTATUS Status; - - DPRINT("ObpCreateTypeObject(ObjectType: %wZ)\n", &ObjectType->Name); - wcscpy(NameString, L"\\ObjectTypes\\"); - wcscat(NameString, ObjectType->Name.Buffer); - RtlInitUnicodeString(&Name, - NameString); - - InitializeObjectAttributes(&ObjectAttributes, - &Name, - OBJ_PERMANENT, - NULL, - NULL); - Status = ObCreateObject(KernelMode, - ObTypeObjectType, - &ObjectAttributes, - KernelMode, - NULL, - sizeof(TYPE_OBJECT), - 0, - 0, - (PVOID*)&TypeObject); - if (NT_SUCCESS(Status)) - { - TypeObject->ObjectType = ObjectType; - } - - return(STATUS_SUCCESS); -} - -VOID INIT_FUNCTION +VOID +INIT_FUNCTION ObInit(VOID) -/* - * FUNCTION: Initialize the object manager namespace - */ { - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING Name; - SECURITY_DESCRIPTOR SecurityDescriptor; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING Name; + SECURITY_DESCRIPTOR SecurityDescriptor; + OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; - /* Initialize the security descriptor cache */ - ObpInitSdCache(); + /* Initialize the security descriptor cache */ + ObpInitSdCache(); - /* HACKS FOR COMPATIBILITY. TEMPORARY */ - /* create 'directory' object type */ - ObDirectoryType = ExAllocatePool(NonPagedPool,sizeof(OBJECT_TYPE)); - RtlZeroMemory(ObDirectoryType, sizeof(OBJECT_TYPE)); - ObDirectoryType->TypeInfo.DefaultNonPagedPoolCharge = sizeof(DIRECTORY_OBJECT); - ObDirectoryType->TypeInfo.GenericMapping = ObpDirectoryMapping; - ObDirectoryType->TypeInfo.ParseProcedure = ObpParseDirectory; - ObDirectoryType->TypeInfo.OpenProcedure = ObpCreateDirectory; + /* Create the Type Type */ + DPRINT1("Creating Type Type\n"); + RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); + RtlInitUnicodeString(&Name, L"Type"); + ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); + ObjectTypeInitializer.ValidAccessMask = OBJECT_TYPE_ALL_ACCESS; + ObjectTypeInitializer.UseDefaultObject = TRUE; + ObjectTypeInitializer.MaintainTypeList = TRUE; + ObjectTypeInitializer.PoolType = NonPagedPool; + ObjectTypeInitializer.GenericMapping = ObpTypeMapping; + ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(OBJECT_TYPE); + ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ObTypeObjectType); + + /* Create the Directory Type */ + DPRINT1("Creating Directory Type\n"); + RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); + RtlInitUnicodeString(&Name, L"Directory"); + ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); + ObjectTypeInitializer.ValidAccessMask = DIRECTORY_ALL_ACCESS; + ObjectTypeInitializer.UseDefaultObject = FALSE; + ObjectTypeInitializer.OpenProcedure = ObpCreateDirectory; + ObjectTypeInitializer.ParseProcedure = ObpParseDirectory; + ObjectTypeInitializer.MaintainTypeList = FALSE; + ObjectTypeInitializer.GenericMapping = ObpDirectoryMapping; + ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(DIRECTORY_OBJECT); + ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ObDirectoryType); - RtlInitUnicodeString(&ObDirectoryType->Name, - L"Directory"); + /* Create security descriptor */ + RtlCreateSecurityDescriptor(&SecurityDescriptor, + SECURITY_DESCRIPTOR_REVISION1); + RtlSetOwnerSecurityDescriptor(&SecurityDescriptor, + SeAliasAdminsSid, + FALSE); + RtlSetGroupSecurityDescriptor(&SecurityDescriptor, + SeLocalSystemSid, + FALSE); + RtlSetDaclSecurityDescriptor(&SecurityDescriptor, + TRUE, + SePublicDefaultDacl, + FALSE); - /* HACKS FOR COMPATIBILITY. TEMPORARY */ - /* create 'type' object type*/ - ObTypeObjectType = ExAllocatePool(NonPagedPool,sizeof(OBJECT_TYPE)); - RtlZeroMemory(ObTypeObjectType, sizeof(OBJECT_TYPE)); - ObTypeObjectType->TypeInfo.DefaultNonPagedPoolCharge = sizeof(TYPE_OBJECT); - ObTypeObjectType->TypeInfo.GenericMapping = ObpTypeMapping; + /* Create root directory */ + DPRINT1("Creating Root Directory\n"); + InitializeObjectAttributes(&ObjectAttributes, + NULL, + OBJ_PERMANENT, + NULL, + &SecurityDescriptor); + ObCreateObject(KernelMode, + ObDirectoryType, + &ObjectAttributes, + KernelMode, + NULL, + sizeof(DIRECTORY_OBJECT), + 0, + 0, + (PVOID*)&NameSpaceRoot); + /* Create '\ObjectTypes' directory */ + RtlInitUnicodeString(&Name, L"\\ObjectTypes"); + InitializeObjectAttributes(&ObjectAttributes, + &Name, + OBJ_PERMANENT, + NULL, + &SecurityDescriptor); + ObCreateObject(KernelMode, + ObDirectoryType, + &ObjectAttributes, + KernelMode, + NULL, + sizeof(DIRECTORY_OBJECT), + 0, + 0, + (PVOID*)&ObpTypeDirectoryObject); + + /* Insert the two objects we already created but couldn't add */ + /* NOTE: Uses TypeList & Creator Info in OB 2.0 */ + ObpAddEntryDirectory(ObpTypeDirectoryObject, BODY_TO_HEADER(ObTypeObjectType), L"Type"); + ObpAddEntryDirectory(ObpTypeDirectoryObject, BODY_TO_HEADER(ObDirectoryType), L"Directory"); - RtlInitUnicodeString(&ObTypeObjectType->Name, - L"ObjectType"); + /* Create 'symbolic link' object type */ + ObInitSymbolicLinkImplementation(); - /* Create security descriptor */ - RtlCreateSecurityDescriptor(&SecurityDescriptor, - SECURITY_DESCRIPTOR_REVISION1); - - RtlSetOwnerSecurityDescriptor(&SecurityDescriptor, - SeAliasAdminsSid, - FALSE); - - RtlSetGroupSecurityDescriptor(&SecurityDescriptor, - SeLocalSystemSid, - FALSE); - - RtlSetDaclSecurityDescriptor(&SecurityDescriptor, - TRUE, - SePublicDefaultDacl, - FALSE); - - /* Create root directory */ - InitializeObjectAttributes(&ObjectAttributes, - NULL, - OBJ_PERMANENT, - NULL, - &SecurityDescriptor); - ObCreateObject(KernelMode, - ObDirectoryType, - &ObjectAttributes, - KernelMode, - NULL, - sizeof(DIRECTORY_OBJECT), - 0, - 0, - (PVOID*)&NameSpaceRoot); - - /* Create '\ObjectTypes' directory */ - RtlRosInitUnicodeStringFromLiteral(&Name, - L"\\ObjectTypes"); - InitializeObjectAttributes(&ObjectAttributes, - &Name, - OBJ_PERMANENT, - NULL, - &SecurityDescriptor); - ObCreateObject(KernelMode, - ObDirectoryType, - &ObjectAttributes, - KernelMode, - NULL, - sizeof(DIRECTORY_OBJECT), - 0, - 0, - NULL); - - /* HACKS FOR COMPATIBILITY. TEMPORARY */ - ObpCreateInitTypeObject(ObDirectoryType); - ObpCreateInitTypeObject(ObTypeObjectType); - - /* Create 'symbolic link' object type */ - ObInitSymbolicLinkImplementation(); - - /* FIXME: Hack Hack! */ - ObSystemDeviceMap = ExAllocatePoolWithTag(NonPagedPool, sizeof(*ObSystemDeviceMap), TAG('O', 'b', 'D', 'm')); - RtlZeroMemory(ObSystemDeviceMap, sizeof(*ObSystemDeviceMap)); + /* FIXME: Hack Hack! */ + ObSystemDeviceMap = ExAllocatePoolWithTag(NonPagedPool, sizeof(*ObSystemDeviceMap), TAG('O', 'b', 'D', 'm')); + RtlZeroMemory(ObSystemDeviceMap, sizeof(*ObSystemDeviceMap)); } - NTSTATUS +STDCALL ObpCreateTypeObject(POBJECT_TYPE_INITIALIZER ObjectTypeInitializer, PUNICODE_STRING TypeName, POBJECT_TYPE *ObjectType) { - OBJECT_ATTRIBUTES ObjectAttributes; - WCHAR NameString[120]; - PTYPE_OBJECT TypeObject = NULL; + POBJECT_HEADER Header; POBJECT_TYPE LocalObjectType; - UNICODE_STRING Name; NTSTATUS Status; DPRINT("ObpCreateTypeObject(ObjectType: %wZ)\n", TypeName); - /* Set up the Name */ - wcscpy(NameString, L"\\ObjectTypes\\"); - wcscat(NameString, TypeName->Buffer); - RtlInitUnicodeString(&Name, NameString); + /* Allocate the Object */ + Status = ObpAllocateObject(NULL, + ObTypeObjectType, + OBJECT_ALLOC_SIZE(sizeof(OBJECT_TYPE)), + &Header); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ObpAllocateObject failed!\n"); + return Status; + } - /* Allocate the Object Type */ - LocalObjectType = ExAllocatePool(NonPagedPool, sizeof(OBJECT_TYPE)); + LocalObjectType = HEADER_TO_BODY(Header); + /* Check if this is the first Object Type */ + if (!ObTypeObjectType) + { + ObTypeObjectType = LocalObjectType; + Header->ObjectType = ObTypeObjectType; + } + + /* FIXME: Generate Tag */ + /* Set it up */ LocalObjectType->TypeInfo = *ObjectTypeInitializer; LocalObjectType->Name = *TypeName; - /* FIXME: Generate Tag */ - - /* Create the Object Type Type (WRONG, it shoudl be OBJECT_TYPE itself!) */ - InitializeObjectAttributes(&ObjectAttributes, - &Name, - OBJ_PERMANENT, - NULL, - NULL); - Status = ObCreateObject(KernelMode, - ObTypeObjectType, - &ObjectAttributes, - KernelMode, - NULL, - sizeof(TYPE_OBJECT), - 0, - 0, - (PVOID*)&TypeObject); - if (NT_SUCCESS(Status)) + /* Insert it into the Object Directory */ + if (ObpTypeDirectoryObject) { - TypeObject->ObjectType = LocalObjectType; - *ObjectType = LocalObjectType; + ObpAddEntryDirectory(ObpTypeDirectoryObject, Header, TypeName->Buffer); + ObReferenceObject(ObpTypeDirectoryObject); } - + + *ObjectType = LocalObjectType; return Status; } _____ Modified: trunk/reactos/ntoskrnl/ob/object.c --- trunk/reactos/ntoskrnl/ob/object.c 2005-05-15 18:10:51 UTC (rev 15318) +++ trunk/reactos/ntoskrnl/ob/object.c 2005-05-15 19:40:57 UTC (rev 15319) @@ -637,6 +637,57 @@ return Status; } +NTSTATUS +STDCALL +ObpAllocateObject(POBJECT_ATTRIBUTES ObjectAttributes, + POBJECT_TYPE ObjectType, + ULONG ObjectSize, + POBJECT_HEADER *ObjectHeader) +{ + POBJECT_HEADER Header; + POOL_TYPE PoolType; + ULONG Tag; + + /* If we don't have an Object Type yet, force NonPaged */ + DPRINT("ObpAllocateObject\n"); + if (!ObjectType) + { + PoolType = NonPagedPool; + Tag = TAG('O', 'b', 'j', 'T'); + } + else + { + PoolType = ObjectType->TypeInfo.PoolType; + Tag = ObjectType->Key; + } + + /* Allocate memory for the Object */ + Header = (POBJECT_HEADER)ExAllocatePoolWithTag(PoolType, ObjectSize, Tag); + if (!Header) { + DPRINT1("Not enough memory!\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Initialize the object header */ + RtlZeroMemory(Header, ObjectSize); + DPRINT("Initalizing header %p\n", Header); + Header->HandleCount = 0; + Header->RefCount = 1; + Header->ObjectType = ObjectType; + if (ObjectAttributes && ObjectAttributes->Attributes & OBJ_PERMANENT) + { + Header->Permanent = TRUE; + } + if (ObjectAttributes && ObjectAttributes->Attributes & OBJ_INHERIT) + { + Header->Inherit = TRUE; + } + RtlInitUnicodeString(&Header->Name, NULL); + + /* Return Header */ + *ObjectHeader = Header; + return STATUS_SUCCESS; +} /********************************************************************** * NAME EXPORTED @@ -666,7 +717,7 @@ UNICODE_STRING RemainingPath; POBJECT_HEADER Header; POBJECT_HEADER ParentHeader = NULL; - NTSTATUS Status = 0; + NTSTATUS Status; BOOLEAN ObjectAttached = FALSE; PWCHAR NamePtr; PSECURITY_DESCRIPTOR NewSecurityDescriptor = NULL; @@ -738,45 +789,18 @@ { RtlInitUnicodeString(&RemainingPath, NULL); } - - DPRINT("Allocating memory\n"); - Header = (POBJECT_HEADER)ExAllocatePoolWithTag(NonPagedPool, - OBJECT_ALLOC_SIZE(ObjectSize), - Type->Key); - if (Header == NULL) { - DPRINT1("Not enough memory!\n"); - return STATUS_INSUFFICIENT_RESOURCES; - } - - RtlZeroMemory(Header, OBJECT_ALLOC_SIZE(ObjectSize)); - - /* Initialize the object header */ - DPRINT("Initalizing header 0x%x (%wZ)\n", Header, &Type->TypeName); - Header->HandleCount = 0; - Header->RefCount = 1; - Header->ObjectType = Type; - if (ObjectAttributes != NULL && - ObjectAttributes->Attributes & OBJ_PERMANENT) + + /* Allocate the Object */ + Status = ObpAllocateObject(ObjectAttributes, + Type, + OBJECT_ALLOC_SIZE(ObjectSize), + &Header); + if (!NT_SUCCESS(Status)) { - Header->Permanent = TRUE; + DPRINT1("ObpAllocateObject failed!\n"); + return Status; } - else - { - Header->Permanent = FALSE; - } - if (ObjectAttributes != NULL && - ObjectAttributes->Attributes & OBJ_INHERIT) - { - Header->Inherit = TRUE; - } - else - { - Header->Inherit = FALSE; - } - - RtlInitUnicodeString(&(Header->Name),NULL); - DPRINT("Getting Parent and adding entry\n"); if (ParentHeader != NULL && ParentHeader->ObjectType == ObDirectoryType &&

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