Ros-diffs May 2005

ros-diffs@reactos.org

26 participants
814 discussions

[ion] 15319: Properly create the Object Type Type and remove previous hacks added

by ion＠svn.reactos.com

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

19 years, 4 months

[gvg] 15318: Don't let msvcrt import itself and fix the resulting problems

by gvg＠svn.reactos.com

Don't let msvcrt import itself and fix the resulting problems Modified: branches/xmlbuildsystem/reactos/lib/crt/crt.xml Modified: branches/xmlbuildsystem/reactos/lib/crt/stdio/vsprintf.c Modified: branches/xmlbuildsystem/reactos/lib/crt/stdio/vswprintf.c Modified: branches/xmlbuildsystem/reactos/lib/crtdll/crtdll.def Modified: branches/xmlbuildsystem/reactos/lib/msvcrt/msvcrt.def Modified: branches/xmlbuildsystem/reactos/lib/msvcrt/msvcrt.xml _____ Modified: branches/xmlbuildsystem/reactos/lib/crt/crt.xml --- branches/xmlbuildsystem/reactos/lib/crt/crt.xml 2005-05-15 17:59:33 UTC (rev 15317) +++ branches/xmlbuildsystem/reactos/lib/crt/crt.xml 2005-05-15 18:10:51 UTC (rev 15318) @@ -24,6 +24,7 @@ </directory> <directory name="ctype"> <file>ctype.c</file> + <file>isalnum.c</file> <file>isascii.c</file> <file>iscntrl.c</file> <file>isgraph.c</file> @@ -51,7 +52,9 @@ <file>abnorter.c</file> <file>exhand2.c</file> <file>matherr.c</file> + <file>seh.s</file> <file>unwind.c</file> + <file>xcptfil.c</file> </directory> <directory name="float"> <file>chgsign.c</file> @@ -211,6 +214,7 @@ <file>thread.c</file> <file>threadid.c</file> <file>threadx.c</file> + <file>wprocess.c</file> </directory> <directory name="search"> <file>lfind.c</file> @@ -246,6 +250,7 @@ <file>fputc.c</file> <file>fputchar.c</file> <file>fputs.c</file> + <file>fputws.c</file> <file>fread.c</file> <file>freopen.c</file> <file>fseek.c</file> @@ -253,6 +258,7 @@ <file>fsopen.c</file> <file>ftell.c</file> <file>fwalk.c</file> + <file>fwprintf.c</file> <file>fwrite.c</file> <file>getc.c</file> <file>getchar.c</file> @@ -265,6 +271,7 @@ <file>putchar.c</file> <file>puts.c</file> <file>putw.c</file> + <file>putwchar.c</file> <file>remove.c</file> <file>rename.c</file> <file>rewind.c</file> @@ -278,12 +285,20 @@ <file>tmpfile.c</file> <file>tmpnam.c</file> <file>ungetc.c</file> + <file>ungetwc.c</file> <file>vfprintf.c</file> <file>vfwprint.c</file> <file>vprintf.c</file> <file>vsprintf.c</file> <file>vswprintf.c</file> + <file>vwprintf.c</file> <file>wfdopen.c</file> + <file>wfopen.c</file> + <file>wfreopen.c</file> + <file>wfsopen.c</file> + <file>wpopen.c</file> + <file>wprintf.c</file> + <file>wremove.c</file> <file>wrename.c</file> <file>wtempnam.c</file> <file>wtmpnam.c</file> _____ Modified: branches/xmlbuildsystem/reactos/lib/crt/stdio/vsprintf.c --- branches/xmlbuildsystem/reactos/lib/crt/stdio/vsprintf.c 2005-05-15 17:59:33 UTC (rev 15317) +++ branches/xmlbuildsystem/reactos/lib/crt/stdio/vsprintf.c 2005-05-15 18:10:51 UTC (rev 15318) @@ -6,7 +6,7 @@ #include <tchar.h> int -crt_vsprintf(_TCHAR *str, const _TCHAR *fmt, va_list ap) +_vstprintf(_TCHAR *str, const _TCHAR *fmt, va_list ap) { FILE f = {0}; int len; @@ -22,7 +22,7 @@ int -crt__vsnprintf(_TCHAR *str, size_t maxlen, const _TCHAR *fmt, va_list ap) +_vsntprintf(_TCHAR *str, size_t maxlen, const _TCHAR *fmt, va_list ap) { FILE f = {0}; int len; _____ Modified: branches/xmlbuildsystem/reactos/lib/crt/stdio/vswprintf.c --- branches/xmlbuildsystem/reactos/lib/crt/stdio/vswprintf.c 2005-05-15 17:59:33 UTC (rev 15317) +++ branches/xmlbuildsystem/reactos/lib/crt/stdio/vswprintf.c 2005-05-15 18:10:51 UTC (rev 15318) @@ -1,40 +1,4 @@ -/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */ #define UNICODE #define _UNICODE -#include <stdio.h> -#include <stdarg.h> -#include <limits.h> -#include <internal/file.h> -#include <tchar.h> -int -crt__vswprintf(_TCHAR *str, const _TCHAR *fmt, va_list ap) -{ - FILE f = {0}; - int len; - - f._flag = _IOWRT|_IOSTRG|_IOBINARY; - f._ptr = (char*)str; - f._cnt = INT_MAX; - f._file = -1; - len = _vftprintf(&f,fmt, ap); - *(_TCHAR*)f._ptr = 0; - return len; -} - - -int -crt__vsnwprintf(_TCHAR *str, size_t maxlen, const _TCHAR *fmt, va_list ap) -{ - FILE f = {0}; - int len; - - f._flag = _IOWRT|_IOSTRG|_IOBINARY; - f._ptr = (char*)str; - f._cnt = maxlen; - f._file = -1; - len = _vftprintf(&f,fmt, ap); - // what if the buffer is full ?? - *(_TCHAR *)f._ptr = 0; - return len; -} +#include "vsprintf.c" _____ Modified: branches/xmlbuildsystem/reactos/lib/crtdll/crtdll.def --- branches/xmlbuildsystem/reactos/lib/crtdll/crtdll.def 2005-05-15 17:59:33 UTC (rev 15317) +++ branches/xmlbuildsystem/reactos/lib/crtdll/crtdll.def 2005-05-15 18:10:51 UTC (rev 15318) @@ -359,8 +359,8 @@ _unlink _unloaddll _utime -_vsnprintf=crt__vsnprintf -_vsnwprintf=crt__vsnwprintf +_vsnprintf +_vsnwprintf _wcsdup _wcsicmp _wcsicoll @@ -541,7 +541,7 @@ vfprintf vfwprintf vprintf -vsprintf=crt_vsprintf +vsprintf vswprintf vwprintf wcscat _____ Modified: branches/xmlbuildsystem/reactos/lib/msvcrt/msvcrt.def --- branches/xmlbuildsystem/reactos/lib/msvcrt/msvcrt.def 2005-05-15 17:59:33 UTC (rev 15317) +++ branches/xmlbuildsystem/reactos/lib/msvcrt/msvcrt.def 2005-05-15 18:10:51 UTC (rev 15318) @@ -555,8 +555,8 @@ _utime64=stub _vscprintf=stub _vscwprintf=stub -_vsnprintf=crt__vsnprintf -_vsnwprintf=crt__vsnwprintf +_vsnprintf +_vsnwprintf _waccess _wasctime _wchdir @@ -815,7 +815,7 @@ vfprintf vfwprintf vprintf -vsprintf=crt_vsprintf +vsprintf vswprintf vwprintf wcscat _____ Modified: branches/xmlbuildsystem/reactos/lib/msvcrt/msvcrt.xml --- branches/xmlbuildsystem/reactos/lib/msvcrt/msvcrt.xml 2005-05-15 17:59:33 UTC (rev 15317) +++ branches/xmlbuildsystem/reactos/lib/msvcrt/msvcrt.xml 2005-05-15 18:10:51 UTC (rev 15318) @@ -1,6 +1,7 @@ <module name="msvcrt" type="win32dll" baseaddress="${BASEADDRESS_MSVCRT}" mangledsymbols="true" installbase="system32" installname="msvcrt.dll"> <linkerflag>-nostartfiles</linkerflag> <linkerflag>--enable-stdcall-fixup</linkerflag> + <linkerflag>-nostdlib</linkerflag> <linkerflag>-lgcc</linkerflag> <importlibrary definition="msvcrt.def" /> <include base="msvcrt">.</include> @@ -14,10 +15,10 @@ <define name="_MSVCRT_LIB_" /> <define name="_MT" /> <library>crt</library> - <library>wine</library> <library>string</library> <library>kernel32</library> <library>ntdll</library> + <library>wine</library> <pch>precomp.h</pch> <file>dllmain.c</file> <file>msvcrt.rc</file>

19 years, 4 months

[ion] 15317: Make Object Type creation compatible with OB 2.0 from the caller's point of view. Use real structures for Object Type and ObjectType Initializer. Added two more hacks that I'll remove in the next commit

by ion＠svn.reactos.com

Make Object Type creation compatible with OB 2.0 from the caller's point of view. Use real structures for Object Type and ObjectType Initializer. Added two more hacks that I'll remove in the next commit Modified: trunk/reactos/include/ddk/pstypes.h Modified: trunk/reactos/ntoskrnl/cm/registry.c Modified: trunk/reactos/ntoskrnl/ex/callback.c Modified: trunk/reactos/ntoskrnl/ex/event.c Modified: trunk/reactos/ntoskrnl/ex/evtpair.c Modified: trunk/reactos/ntoskrnl/ex/mutant.c Modified: trunk/reactos/ntoskrnl/ex/profile.c Modified: trunk/reactos/ntoskrnl/ex/sem.c Modified: trunk/reactos/ntoskrnl/ex/timer.c Modified: trunk/reactos/ntoskrnl/ex/win32k.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h Modified: trunk/reactos/ntoskrnl/include/internal/ob.h Modified: trunk/reactos/ntoskrnl/include/internal/port.h Modified: trunk/reactos/ntoskrnl/io/driver.c Modified: trunk/reactos/ntoskrnl/io/file.c Modified: trunk/reactos/ntoskrnl/io/iocomp.c Modified: trunk/reactos/ntoskrnl/io/iomgr.c Modified: trunk/reactos/ntoskrnl/io/share.c Modified: trunk/reactos/ntoskrnl/ke/wait.c Modified: trunk/reactos/ntoskrnl/lpc/close.c Modified: trunk/reactos/ntoskrnl/lpc/port.c Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/ob/dirobj.c Modified: trunk/reactos/ntoskrnl/ob/handle.c Modified: trunk/reactos/ntoskrnl/ob/namespc.c Modified: trunk/reactos/ntoskrnl/ob/object.c Modified: trunk/reactos/ntoskrnl/ob/security.c Modified: trunk/reactos/ntoskrnl/ob/symlink.c Modified: trunk/reactos/ntoskrnl/ob/wait.c Modified: trunk/reactos/ntoskrnl/ps/cid.c Modified: trunk/reactos/ntoskrnl/ps/job.c Modified: trunk/reactos/ntoskrnl/ps/psmgr.c Modified: trunk/reactos/ntoskrnl/ps/win32.c Modified: trunk/reactos/ntoskrnl/se/token.c _____ Modified: trunk/reactos/include/ddk/pstypes.h --- trunk/reactos/include/ddk/pstypes.h 2005-05-15 16:09:13 UTC (rev 15316) +++ trunk/reactos/include/ddk/pstypes.h 2005-05-15 17:59:33 UTC (rev 15317) @@ -66,48 +66,79 @@ 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 -(*OBJECT_CREATE_ROUTINE)(PVOID ObjectBody, - PVOID Parent, - PWSTR RemainingPath, - struct _OBJECT_ATTRIBUTES* ObjectAttributes); +(*OB_CREATE_METHOD)(PVOID ObjectBody, + PVOID Parent, + PWSTR RemainingPath, + struct _OBJECT_ATTRIBUTES* ObjectAttributes); typedef NTSTATUS STDCALL_FUNC -(*OBJECT_OPEN_ROUTINE)(ULONG Reason, - PVOID ObjectBody, - PEPROCESS Process, - ULONG HandleCount, - ACCESS_MASK GrantedAccess); +(*OB_OPEN_METHOD)(OB_OPEN_REASON Reason, + PVOID ObjectBody, + PEPROCESS Process, + ULONG HandleCount, + ACCESS_MASK GrantedAccess); typedef NTSTATUS STDCALL_FUNC -(*OBJECT_PARSE_ROUTINE)(PVOID Object, - PVOID *NextObject, - PUNICODE_STRING FullPath, - PWSTR *Path, - ULONG Attributes); +(*OB_PARSE_METHOD)(PVOID Object, + PVOID *NextObject, + PUNICODE_STRING FullPath, + PWSTR *Path, + ULONG Attributes); typedef VOID STDCALL_FUNC -(*OBJECT_DELETE_ROUTINE)(PVOID DeletedObject); +(*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 -(*OBJECT_FIND_ROUTINE)(PVOID WinStaObject, - PWSTR Name, - ULONG Attributes); +(*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 { - OBJECT_OPEN_ROUTINE WinStaCreate; - OBJECT_PARSE_ROUTINE WinStaParse; - OBJECT_DELETE_ROUTINE WinStaDelete; - OBJECT_FIND_ROUTINE WinStaFind; - OBJECT_CREATE_ROUTINE DesktopCreate; - OBJECT_DELETE_ROUTINE DesktopDelete; + 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 _____ Modified: trunk/reactos/ntoskrnl/cm/registry.c --- trunk/reactos/ntoskrnl/cm/registry.c 2005-05-15 16:09:13 UTC (rev 15316) +++ trunk/reactos/ntoskrnl/cm/registry.c 2005-05-15 17:59:33 UTC (rev 15317) @@ -331,7 +331,8 @@ if (SetupBoot == FALSE) CmInit2((PCHAR)KeLoaderBlock.CommandLine); } -VOID INIT_FUNCTION +VOID +INIT_FUNCTION CmInitializeRegistry(VOID) { OBJECT_ATTRIBUTES ObjectAttributes; @@ -346,29 +347,26 @@ LARGE_INTEGER DueTime; HANDLE ThreadHandle; CLIENT_ID ThreadId; + OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; + UNICODE_STRING Name; + DPRINT1("Creating Registry Object Type\n"); + /* Initialize the Key object type */ - CmiKeyType = ExAllocatePool(NonPagedPool, sizeof(OBJECT_TYPE)); - ASSERT(CmiKeyType); - CmiKeyType->Tag = TAG('R', 'e', 'g', 'K'); - CmiKeyType->TotalObjects = 0; - CmiKeyType->TotalHandles = 0; - CmiKeyType->PeakObjects = 0; - CmiKeyType->PeakHandles = 0; - CmiKeyType->PagedPoolCharge = 0; - CmiKeyType->NonpagedPoolCharge = sizeof(KEY_OBJECT); - CmiKeyType->Mapping = &CmiKeyMapping; - CmiKeyType->Dump = NULL; - CmiKeyType->Open = NULL; - CmiKeyType->Close = NULL; - CmiKeyType->Delete = CmiObjectDelete; - CmiKeyType->Parse = CmiObjectParse; - CmiKeyType->Security = CmiObjectSecurity; - CmiKeyType->QueryName = CmiObjectQueryName; - CmiKeyType->OkayToClose = NULL; - RtlInitUnicodeString(&CmiKeyType->TypeName, L"Key"); + RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); + RtlInitUnicodeString(&Name, L"Key"); + ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); + ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(KEY_OBJECT); + ObjectTypeInitializer.GenericMapping = CmiKeyMapping; + ObjectTypeInitializer.PoolType = NonPagedPool; + ObjectTypeInitializer.ValidAccessMask = KEY_ALL_ACCESS; + ObjectTypeInitializer.UseDefaultObject = TRUE; + ObjectTypeInitializer.DeleteProcedure = CmiObjectDelete; + ObjectTypeInitializer.ParseProcedure = CmiObjectParse; + ObjectTypeInitializer.SecurityProcedure = CmiObjectSecurity; + ObjectTypeInitializer.QueryNameProcedure = CmiObjectQueryName; - ObpCreateTypeObject (CmiKeyType); + ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &CmiKeyType); /* Initialize the hive list */ InitializeListHead(&CmiHiveListHead); _____ Modified: trunk/reactos/ntoskrnl/ex/callback.c --- trunk/reactos/ntoskrnl/ex/callback.c 2005-05-15 16:09:13 UTC (rev 15316) +++ trunk/reactos/ntoskrnl/ex/callback.c 2005-05-15 17:59:33 UTC (rev 15317) @@ -42,34 +42,22 @@ NTSTATUS Status; UNICODE_STRING DirName; UNICODE_STRING CallbackName; + UNICODE_STRING Name; + OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; HANDLE DirectoryHandle; ULONG i; - /* Allocate memory for Object */ - ExCallbackObjectType = ExAllocatePoolWithTag(NonPagedPool, sizeof(OBJECT_TYPE), CALLBACK_TAG); + /* Initialize the Callback Object type */ + RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); + RtlInitUnicodeString(&Name, L"Callback"); + ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); + ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(_INT_CALLBACK_OBJECT); + ObjectTypeInitializer.GenericMapping = ExpCallbackMapping; + ObjectTypeInitializer.PoolType = NonPagedPool; + ObjectTypeInitializer.UseDefaultObject = TRUE; - /* Initialize name */ - RtlInitUnicodeString(&ExCallbackObjectType->TypeName, L"Callback"); + Status = ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ExCallbackObjectType); - /* Create the Object Type */ - ExCallbackObjectType->Tag = CALLBACK_TAG; - ExCallbackObjectType->TotalObjects = 0; - ExCallbackObjectType->TotalHandles = 0; - ExCallbackObjectType->PeakObjects = 0; - ExCallbackObjectType->PeakHandles = 0; - ExCallbackObjectType->PagedPoolCharge = 0; - ExCallbackObjectType->Dump = NULL; - ExCallbackObjectType->Open = NULL; - ExCallbackObjectType->Close = NULL; - ExCallbackObjectType->Delete = NULL; - ExCallbackObjectType->Parse = NULL; - ExCallbackObjectType->Security = NULL; - ExCallbackObjectType->QueryName = NULL; - ExCallbackObjectType->OkayToClose = NULL; - ExCallbackObjectType->Mapping = &ExpCallbackMapping; - ExCallbackObjectType->NonpagedPoolCharge = sizeof(_INT_CALLBACK_OBJECT); - Status = ObpCreateTypeObject(ExCallbackObjectType); - /* Fail if it wasn't created successfully */ if (!NT_SUCCESS(Status)) { _____ Modified: trunk/reactos/ntoskrnl/ex/event.c --- trunk/reactos/ntoskrnl/ex/event.c 2005-05-15 16:09:13 UTC (rev 15316) +++ trunk/reactos/ntoskrnl/ex/event.c 2005-05-15 17:59:33 UTC (rev 15317) @@ -36,26 +36,21 @@ INIT_FUNCTION ExpInitializeEventImplementation(VOID) { - /* Create the Event Object Type */ - ExEventObjectType = ExAllocatePool(NonPagedPool,sizeof(OBJECT_TYPE)); - RtlInitUnicodeString(&ExEventObjectType->TypeName, L"Event"); - ExEventObjectType->Tag = TAG('E', 'V', 'T', 'T'); - ExEventObjectType->PeakObjects = 0; - ExEventObjectType->PeakHandles = 0; - ExEventObjectType->TotalObjects = 0; - ExEventObjectType->TotalHandles = 0; - ExEventObjectType->PagedPoolCharge = 0; - ExEventObjectType->NonpagedPoolCharge = sizeof(KEVENT); - ExEventObjectType->Mapping = &ExpEventMapping; - ExEventObjectType->Dump = NULL; - ExEventObjectType->Open = NULL; - ExEventObjectType->Close = NULL; - ExEventObjectType->Delete = NULL; - ExEventObjectType->Parse = NULL; - ExEventObjectType->Security = NULL; - ExEventObjectType->QueryName = NULL; - ExEventObjectType->OkayToClose = NULL; - ObpCreateTypeObject(ExEventObjectType); + OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; + UNICODE_STRING Name; + + DPRINT1("Creating Event Object Type\n"); + + /* Create the Event Object Type */ + RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); + RtlInitUnicodeString(&Name, L"Event"); + ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); + ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(KEVENT); + ObjectTypeInitializer.GenericMapping = ExpEventMapping; + ObjectTypeInitializer.PoolType = NonPagedPool; + ObjectTypeInitializer.ValidAccessMask = EVENT_ALL_ACCESS; + ObjectTypeInitializer.UseDefaultObject = TRUE; + ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ExEventObjectType); } /* _____ Modified: trunk/reactos/ntoskrnl/ex/evtpair.c --- trunk/reactos/ntoskrnl/ex/evtpair.c 2005-05-15 16:09:13 UTC (rev 15316) +++ trunk/reactos/ntoskrnl/ex/evtpair.c 2005-05-15 17:59:33 UTC (rev 15317) @@ -33,26 +33,21 @@ INIT_FUNCTION ExpInitializeEventPairImplementation(VOID) { - /* Create the Event Pair Object Type */ - ExEventPairObjectType = ExAllocatePool(NonPagedPool,sizeof(OBJECT_TYPE)); - RtlInitUnicodeString(&ExEventPairObjectType->TypeName, L"EventPair"); - ExEventPairObjectType->Tag = TAG('E', 'v', 'P', 'a'); - ExEventPairObjectType->PeakObjects = 0; - ExEventPairObjectType->PeakHandles = 0; - ExEventPairObjectType->TotalObjects = 0; - ExEventPairObjectType->TotalHandles = 0; - ExEventPairObjectType->PagedPoolCharge = 0; - ExEventPairObjectType->NonpagedPoolCharge = sizeof(KEVENT_PAIR); - ExEventPairObjectType->Mapping = &ExEventPairMapping; - ExEventPairObjectType->Dump = NULL; - ExEventPairObjectType->Open = NULL; - ExEventPairObjectType->Close = NULL; - ExEventPairObjectType->Delete = NULL; - ExEventPairObjectType->Parse = NULL; - ExEventPairObjectType->Security = NULL; - ExEventPairObjectType->QueryName = NULL; - ExEventPairObjectType->OkayToClose = NULL; - ObpCreateTypeObject(ExEventPairObjectType); + OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; + UNICODE_STRING Name; + + DPRINT1("Creating Event Pair Object Type\n"); + + /* Create the Event Pair Object Type */ + RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); + RtlInitUnicodeString(&Name, L"EventPair"); + ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); + ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(KEVENT_PAIR); + ObjectTypeInitializer.GenericMapping = ExEventPairMapping; + ObjectTypeInitializer.PoolType = NonPagedPool; + ObjectTypeInitializer.ValidAccessMask = EVENT_PAIR_ALL_ACCESS; + ObjectTypeInitializer.UseDefaultObject = TRUE; + ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ExEventPairObjectType); } NTSTATUS _____ Modified: trunk/reactos/ntoskrnl/ex/mutant.c --- trunk/reactos/ntoskrnl/ex/mutant.c 2005-05-15 16:09:13 UTC (rev 15316) +++ trunk/reactos/ntoskrnl/ex/mutant.c 2005-05-15 17:59:33 UTC (rev 15317) @@ -49,30 +49,22 @@ INIT_FUNCTION ExpInitializeMutantImplementation(VOID) { + OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; + UNICODE_STRING Name; - /* Allocate the Object Type */ - ExMutantObjectType = ExAllocatePoolWithTag(NonPagedPool, sizeof(OBJECT_TYPE), TAG('M', 't', 'n', 't')); - - /* Create the Object Type */ - RtlInitUnicodeString(&ExMutantObjectType->TypeName, L"Mutant"); - ExMutantObjectType->Tag = TAG('M', 't', 'n', 't'); - ExMutantObjectType->PeakObjects = 0; - ExMutantObjectType->PeakHandles = 0; - ExMutantObjectType->TotalObjects = 0; - ExMutantObjectType->TotalHandles = 0; - ExMutantObjectType->PagedPoolCharge = 0; - ExMutantObjectType->NonpagedPoolCharge = sizeof(KMUTANT); - ExMutantObjectType->Mapping = &ExpMutantMapping; - ExMutantObjectType->Dump = NULL; - ExMutantObjectType->Open = NULL; - ExMutantObjectType->Close = NULL; - ExMutantObjectType->Delete = ExpDeleteMutant; - ExMutantObjectType->Parse = NULL; - ExMutantObjectType->Open = NULL; - ExMutantObjectType->Security = NULL; - ExMutantObjectType->QueryName = NULL; - ExMutantObjectType->OkayToClose = NULL; - ObpCreateTypeObject(ExMutantObjectType); + DPRINT1("Creating Mutant Object Type\n"); + + /* Create the Event Pair Object Type */ + RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); + RtlInitUnicodeString(&Name, L"Mutant"); + ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); + ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(KMUTANT); + ObjectTypeInitializer.GenericMapping = ExpMutantMapping; + ObjectTypeInitializer.PoolType = NonPagedPool; + ObjectTypeInitializer.DeleteProcedure = ExpDeleteMutant; + ObjectTypeInitializer.ValidAccessMask = MUTANT_ALL_ACCESS; + ObjectTypeInitializer.UseDefaultObject = TRUE; + ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ExMutantObjectType); } /* _____ Modified: trunk/reactos/ntoskrnl/ex/profile.c --- trunk/reactos/ntoskrnl/ex/profile.c 2005-05-15 16:09:13 UTC (rev 15316) +++ trunk/reactos/ntoskrnl/ex/profile.c 2005-05-15 17:59:33 UTC (rev 15317) @@ -75,30 +75,25 @@ INIT_FUNCTION ExpInitializeProfileImplementation(VOID) { + OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; + UNICODE_STRING Name; + /* Initialize the Mutex to lock the States */ KeInitializeMutex(&ExpProfileMutex, 0x40); - /* Create the Object Type */ - ExProfileObjectType = ExAllocatePool(NonPagedPool,sizeof(OBJECT_TYPE)); - RtlInitUnicodeString(&ExProfileObjectType->TypeName, L"Profile"); - ExProfileObjectType->Tag = TAG('P', 'R', 'O', 'F'); - ExProfileObjectType->PeakObjects = 0; - ExProfileObjectType->PeakHandles = 0; - ExProfileObjectType->TotalObjects = 0; - ExProfileObjectType->TotalHandles = 0; - ExProfileObjectType->PagedPoolCharge = 0; - ExProfileObjectType->NonpagedPoolCharge = sizeof(EPROFILE); - ExProfileObjectType->Mapping = &ExpProfileMapping; - ExProfileObjectType->Dump = NULL; - ExProfileObjectType->Open = NULL; - ExProfileObjectType->Close = NULL; - ExProfileObjectType->Delete = ExpDeleteProfile; - ExProfileObjectType->Parse = NULL; - ExProfileObjectType->Open = NULL; - ExProfileObjectType->Security = NULL; - ExProfileObjectType->QueryName = NULL; - ExProfileObjectType->OkayToClose = NULL; - ObpCreateTypeObject(ExProfileObjectType); + DPRINT1("Creating Profile Object Type\n"); + + /* Create the Event Pair Object Type */ + RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); + RtlInitUnicodeString(&Name, L"Profile"); + ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); + ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(KPROFILE); + ObjectTypeInitializer.GenericMapping = ExpProfileMapping; + ObjectTypeInitializer.PoolType = NonPagedPool; + ObjectTypeInitializer.DeleteProcedure = ExpDeleteProfile; + ObjectTypeInitializer.ValidAccessMask = STANDARD_RIGHTS_ALL; + ObjectTypeInitializer.UseDefaultObject = TRUE; + ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ExProfileObjectType); } NTSTATUS _____ Modified: trunk/reactos/ntoskrnl/ex/sem.c --- trunk/reactos/ntoskrnl/ex/sem.c 2005-05-15 16:09:13 UTC (rev 15316) +++ trunk/reactos/ntoskrnl/ex/sem.c 2005-05-15 17:59:33 UTC (rev 15317) @@ -34,27 +34,21 @@ INIT_FUNCTION ExpInitializeSemaphoreImplementation(VOID) { + OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; + UNICODE_STRING Name; - /* Create the Semaphore Object */ - ExSemaphoreObjectType = ExAllocatePool(NonPagedPool, sizeof(OBJECT_TYPE)); - RtlInitUnicodeString(&ExSemaphoreObjectType->TypeName, L"Semaphore"); - ExSemaphoreObjectType->Tag = TAG('S', 'E', 'M', 'T'); - ExSemaphoreObjectType->PeakObjects = 0; - ExSemaphoreObjectType->PeakHandles = 0; - ExSemaphoreObjectType->TotalObjects = 0; - ExSemaphoreObjectType->TotalHandles = 0; - ExSemaphoreObjectType->PagedPoolCharge = 0; - ExSemaphoreObjectType->NonpagedPoolCharge = sizeof(KSEMAPHORE); - ExSemaphoreObjectType->Mapping = &ExSemaphoreMapping; - ExSemaphoreObjectType->Dump = NULL; - ExSemaphoreObjectType->Open = NULL; - ExSemaphoreObjectType->Close = NULL; - ExSemaphoreObjectType->Delete = NULL; - ExSemaphoreObjectType->Parse = NULL; - ExSemaphoreObjectType->Security = NULL; - ExSemaphoreObjectType->QueryName = NULL; - ExSemaphoreObjectType->OkayToClose = NULL; - ObpCreateTypeObject(ExSemaphoreObjectType); + DPRINT1("Creating Semaphore Object Type\n"); + + /* Create the Event Pair Object Type */ + RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); + RtlInitUnicodeString(&Name, L"Semaphore"); + ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); + ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(KSEMAPHORE); + ObjectTypeInitializer.GenericMapping = ExSemaphoreMapping; + ObjectTypeInitializer.PoolType = NonPagedPool; + ObjectTypeInitializer.ValidAccessMask = SEMAPHORE_ALL_ACCESS; + ObjectTypeInitializer.UseDefaultObject = TRUE; + ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ExSemaphoreObjectType); } /* _____ Modified: trunk/reactos/ntoskrnl/ex/timer.c --- trunk/reactos/ntoskrnl/ex/timer.c 2005-05-15 16:09:13 UTC (rev 15316) +++ trunk/reactos/ntoskrnl/ex/timer.c 2005-05-15 17:59:33 UTC (rev 15317) @@ -223,32 +223,22 @@ INIT_FUNCTION ExpInitializeTimerImplementation(VOID) { - DPRINT("ExpInitializeTimerImplementation()\n"); + OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; + UNICODE_STRING Name; - /* Allocate Memory for the Timer */ - ExTimerType = ExAllocatePool(NonPagedPool, sizeof(OBJECT_TYPE)); + DPRINT1("Creating Timer Object Type\n"); + + /* Create the Event Pair Object Type */ + RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); + RtlInitUnicodeString(&Name, L"Timer"); + ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); + ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(KTIMER); + ObjectTypeInitializer.GenericMapping = ExpTimerMapping; + ObjectTypeInitializer.PoolType = NonPagedPool; + ObjectTypeInitializer.ValidAccessMask = TIMER_ALL_ACCESS; + ObjectTypeInitializer.UseDefaultObject = TRUE; + ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ExTimerType); - /* Create the Executive Timer Object */ - RtlInitUnicodeString(&ExTimerType->TypeName, L"Timer"); - ExTimerType->Tag = TAG('T', 'I', 'M', 'T'); - ExTimerType->PeakObjects = 0; - ExTimerType->PeakHandles = 0; - ExTimerType->TotalObjects = 0; - ExTimerType->TotalHandles = 0; - ExTimerType->PagedPoolCharge = 0; - ExTimerType->NonpagedPoolCharge = sizeof(ETIMER); - ExTimerType->Mapping = &ExpTimerMapping; - ExTimerType->Dump = NULL; - ExTimerType->Open = NULL; - ExTimerType->Close = NULL; - ExTimerType->Delete = ExpDeleteTimer; - ExTimerType->Parse = NULL; - ExTimerType->Security = NULL; - ExTimerType->Open = NULL; - ExTimerType->QueryName = NULL; - ExTimerType->OkayToClose = NULL; - ObpCreateTypeObject(ExTimerType); - /* Initialize the Wait List and Lock */ KeInitializeSpinLock(&ExpWakeListLock); InitializeListHead(&ExpWakeList); _____ Modified: trunk/reactos/ntoskrnl/ex/win32k.c --- trunk/reactos/ntoskrnl/ex/win32k.c 2005-05-15 16:09:13 UTC (rev 15316) +++ trunk/reactos/ntoskrnl/ex/win32k.c 2005-05-15 17:59:33 UTC (rev 15317) @@ -39,12 +39,12 @@ DESKTOP_READOBJECTS | DESKTOP_SWITCHDESKTOP | DESKTOP_WRITEOBJECTS }; -OBJECT_OPEN_ROUTINE ExpWindowStationObjectOpen = NULL; -OBJECT_PARSE_ROUTINE ExpWindowStationObjectParse = NULL; -OBJECT_DELETE_ROUTINE ExpWindowStationObjectDelete = NULL; -OBJECT_FIND_ROUTINE ExpWindowStationObjectFind = NULL; -OBJECT_CREATE_ROUTINE ExpDesktopObjectCreate = NULL; -OBJECT_DELETE_ROUTINE ExpDesktopObjectDelete = NULL; +OB_OPEN_METHOD ExpWindowStationObjectOpen = NULL; +OB_PARSE_METHOD ExpWindowStationObjectParse = NULL; +OB_DELETE_METHOD ExpWindowStationObjectDelete = NULL; +OB_FIND_METHOD ExpWindowStationObjectFind = NULL; +OB_CREATE_METHOD ExpDesktopObjectCreate = NULL; +OB_DELETE_METHOD ExpDesktopObjectDelete = NULL; /* FUNCTIONS ****************************************************************/ @@ -126,48 +126,33 @@ INIT_FUNCTION ExpWin32kInit(VOID) { - /* Create window station object type */ - ExWindowStationObjectType = ExAllocatePool(NonPagedPool, sizeof(OBJECT_TYPE)); - ExWindowStationObjectType->Tag = TAG('W', 'I', 'N', 'S'); - ExWindowStationObjectType->TotalObjects = 0; - ExWindowStationObjectType->TotalHandles = 0; - ExWindowStationObjectType->PeakObjects = 0; - ExWindowStationObjectType->PeakHandles = 0; - ExWindowStationObjectType->PagedPoolCharge = 0; - ExWindowStationObjectType->NonpagedPoolCharge = sizeof(WINSTATION_OBJECT); - ExWindowStationObjectType->Mapping = &ExpWindowStationMapping; - ExWindowStationObjectType->Dump = NULL; - ExWindowStationObjectType->Open = ExpWinStaObjectOpen; - ExWindowStationObjectType->Close = NULL; - ExWindowStationObjectType->Delete = ExpWinStaObjectDelete; - ExWindowStationObjectType->Parse = ExpWinStaObjectParse; - ExWindowStationObjectType->Security = NULL; - ExWindowStationObjectType->QueryName = NULL; - ExWindowStationObjectType->OkayToClose = NULL; - RtlInitUnicodeString(&ExWindowStationObjectType->TypeName, L"WindowStation"); - ObpCreateTypeObject(ExWindowStationObjectType); + OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; + UNICODE_STRING Name; + DPRINT1("Creating window station Object Type\n"); + + /* Create the window station Object Type */ + RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); + RtlInitUnicodeString(&Name, L"WindowStation"); + ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); + ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(WINSTATION_OBJECT); + ObjectTypeInitializer.GenericMapping = ExpWindowStationMapping; + ObjectTypeInitializer.PoolType = NonPagedPool; + ObjectTypeInitializer.UseDefaultObject = TRUE; + ObjectTypeInitializer.OpenProcedure = ExpWinStaObjectOpen; + ObjectTypeInitializer.DeleteProcedure = ExpWinStaObjectDelete; + ObjectTypeInitializer.ParseProcedure = ExpWinStaObjectParse; + ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ExWindowStationObjectType); + /* Create desktop object type */ - ExDesktopObjectType = ExAllocatePool(NonPagedPool, sizeof(OBJECT_TYPE)); - ExDesktopObjectType->Tag = TAG('D', 'E', 'S', 'K'); - ExDesktopObjectType->TotalObjects = 0; - ExDesktopObjectType->TotalHandles = 0; - ExDesktopObjectType->PeakObjects = 0; - ExDesktopObjectType->PeakHandles = 0; - ExDesktopObjectType->PagedPoolCharge = 0; - ExDesktopObjectType->NonpagedPoolCharge = sizeof(DESKTOP_OBJECT); - ExDesktopObjectType->Mapping = &ExpDesktopMapping; - ExDesktopObjectType->Dump = NULL; - ExDesktopObjectType->Open = NULL; - ExDesktopObjectType->Close = NULL; - ExDesktopObjectType->Delete = ExpDesktopDelete; - ExDesktopObjectType->Parse = NULL; - ExDesktopObjectType->Security = NULL; - ExDesktopObjectType->QueryName = NULL; - ExDesktopObjectType->OkayToClose = NULL; + RtlInitUnicodeString(&Name, L"Desktop"); + ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(DESKTOP_OBJECT); + ObjectTypeInitializer.GenericMapping = ExpDesktopMapping; + ObjectTypeInitializer.OpenProcedure = NULL; + ObjectTypeInitializer.DeleteProcedure = ExpDesktopDelete; + ObjectTypeInitializer.ParseProcedure = NULL; - RtlInitUnicodeString(&ExDesktopObjectType->TypeName, L"Desktop"); - ObpCreateTypeObject(ExDesktopObjectType); + ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ExDesktopObjectType); } /* EOF */ _____ Modified: trunk/reactos/ntoskrnl/include/internal/io.h --- trunk/reactos/ntoskrnl/include/internal/io.h 2005-05-15 16:09:13 UTC (rev 15316) +++ trunk/reactos/ntoskrnl/include/internal/io.h 2005-05-15 17:59:33 UTC (rev 15317) @@ -42,6 +42,7 @@ #define IO_METHOD_FROM_CTL_CODE(ctlCode) (ctlCode&0x00000003) struct _DEVICE_OBJECT_POWER_EXTENSION; +extern POBJECT_TYPE IoCompletionType; /* This is like the IRP Overlay so we can optimize its insertion */ typedef struct _IO_COMPLETION_PACKET _____ Modified: trunk/reactos/ntoskrnl/include/internal/ob.h --- trunk/reactos/ntoskrnl/include/internal/ob.h 2005-05-15 16:09:13 UTC (rev 15316) +++ trunk/reactos/ntoskrnl/include/internal/ob.h 2005-05-15 17:59:33 UTC (rev 15317) @@ -16,15 +16,6 @@ struct _EPROCESS; -typedef enum _OB_OPEN_REASON -{ - ObCreateHandle, - ObOpenHandle, - ObDuplicateHandle, - ObInheritHandle, - ObMaxOpenReason -} OB_OPEN_REASON; - typedef struct { CSHORT Type; @@ -33,121 +24,46 @@ 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 { - /* - * PURPOSE: Tag to be used when allocating objects of this type - */ - ULONG Tag; - - /* - * PURPOSE: Name of the type - */ - UNICODE_STRING TypeName; - - /* - * PURPOSE: Total number of objects of this type - */ - ULONG TotalObjects; - - /* - * PURPOSE: Total number of handles of this type - */ - ULONG TotalHandles; - - /* - * PURPOSE: Peak objects of this type - */ - ULONG PeakObjects; - - /* - * PURPOSE: Peak handles of this type - */ - ULONG PeakHandles; - - /* - * PURPOSE: Paged pool charge - */ - ULONG PagedPoolCharge; - - /* - * PURPOSE: Nonpaged pool charge - */ - ULONG NonpagedPoolCharge; - - /* - * PURPOSE: Mapping of generic access rights - */ - PGENERIC_MAPPING Mapping; - - /* - * PURPOSE: Dumps the object - * NOTE: To be defined - */ - VOID STDCALL_FUNC (*Dump)(VOID); - - /* - * PURPOSE: Called to close an object if OkayToClose returns true - */ - VOID STDCALL_FUNC (*Close)(PVOID ObjectBody, - ULONG HandleCount); - - /* - * PURPOSE: Called to delete an object when the last reference is removed - */ - VOID STDCALL_FUNC (*Delete)(PVOID ObjectBody); - - /* - * PURPOSE: Called when an open attempts to open a file apparently - * residing within the object - * RETURNS - * STATUS_SUCCESS NextObject was found - * STATUS_UNSUCCESSFUL NextObject not found - * STATUS_REPARSE Path changed, restart parsing the path - */ - NTSTATUS STDCALL_FUNC (*Parse)(PVOID ParsedObject, - PVOID *NextObject, - PUNICODE_STRING FullPath, - PWSTR *Path, - ULONG Attributes); - - /* - * PURPOSE: Called to set, query, delete or assign a security-descriptor - * to the object - * RETURNS - * STATUS_SUCCESS NextObject was found - */ - NTSTATUS STDCALL_FUNC (*Security)(PVOID ObjectBody, - SECURITY_OPERATION_CODE OperationCode, - SECURITY_INFORMATION SecurityInformation, - PSECURITY_DESCRIPTOR SecurityDescriptor, - PULONG BufferLength); - - /* - * PURPOSE: Called to query the name of the object - * RETURNS - * STATUS_SUCCESS NextObject was found - */ - NTSTATUS STDCALL_FUNC (*QueryName)(PVOID ObjectBody, - POBJECT_NAME_INFORMATION ObjectNameInfo, - ULONG Length, - PULONG ReturnLength); - - /* - * PURPOSE: Called when a process asks to close the object - */ - VOID STDCALL_FUNC (*OkayToClose)(VOID); - - NTSTATUS STDCALL_FUNC (*Open)(OB_OPEN_REASON Reason, - PVOID ObjectBody, - PEPROCESS Process, - ULONG HandleCount, - ACCESS_MASK GrantedAccess); + 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 @@ -281,7 +197,9 @@ POBJECT_HANDLE_ATTRIBUTE_INFORMATION HandleInfo); NTSTATUS -ObpCreateTypeObject(POBJECT_TYPE ObjectType); +ObpCreateTypeObject(POBJECT_TYPE_INITIALIZER ObjectTypeInitializer, + PUNICODE_STRING TypeName, + POBJECT_TYPE *ObjectType); ULONG ObGetObjectHandleCount(PVOID Object); _____ Modified: trunk/reactos/ntoskrnl/include/internal/port.h --- trunk/reactos/ntoskrnl/include/internal/port.h 2005-05-15 16:09:13 UTC (rev 15316) +++ trunk/reactos/ntoskrnl/include/internal/port.h 2005-05-15 17:59:33 UTC (rev 15317) @@ -98,10 +98,10 @@ /* Code in ntoskrnl/lpc/close.h */ VOID STDCALL -NiClosePort (PVOID ObjectBody, +LpcpClosePort (PVOID ObjectBody, ULONG HandleCount); VOID STDCALL -NiDeletePort (IN PVOID ObjectBody); +LpcpDeletePort (IN PVOID ObjectBody); /* Code in ntoskrnl/lpc/queue.c */ _____ Modified: trunk/reactos/ntoskrnl/io/driver.c --- trunk/reactos/ntoskrnl/io/driver.c 2005-05-15 16:09:13 UTC (rev 15316) +++ trunk/reactos/ntoskrnl/io/driver.c 2005-05-15 17:59:33 UTC (rev 15317) @@ -85,30 +85,26 @@ /* PRIVATE FUNCTIONS **********************************************************/ -VOID INIT_FUNCTION +VOID +INIT_FUNCTION IopInitDriverImplementation(VOID) { - /* Register the process object type */ - IoDriverObjectType = ExAllocatePool(NonPagedPool, sizeof(OBJECT_TYPE)); - IoDriverObjectType->Tag = TAG('D', 'R', 'V', 'R'); - IoDriverObjectType->TotalObjects = 0; - IoDriverObjectType->TotalHandles = 0; - IoDriverObjectType->PeakObjects = 0; - IoDriverObjectType->PeakHandles = 0; - IoDriverObjectType->PagedPoolCharge = 0; - IoDriverObjectType->NonpagedPoolCharge = sizeof(DRIVER_OBJECT); - IoDriverObjectType->Dump = NULL; - IoDriverObjectType->Open = NULL; - IoDriverObjectType->Close = NULL; - IoDriverObjectType->Delete = IopDeleteDriver; - IoDriverObjectType->Parse = NULL; - IoDriverObjectType->Security = NULL; - IoDriverObjectType->QueryName = NULL; - IoDriverObjectType->OkayToClose = NULL; - RtlInitUnicodeString(&IoDriverObjectType->TypeName, L"Driver"); + OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; + UNICODE_STRING Name; - ObpCreateTypeObject(IoDriverObjectType); + DPRINT1("Creating Registry Object Type\n"); + + /* Initialize the Driver object type */ + RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); + RtlInitUnicodeString(&Name, L"Driver"); + ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); + ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(DRIVER_OBJECT); + ObjectTypeInitializer.PoolType = NonPagedPool; + ObjectTypeInitializer.UseDefaultObject = TRUE; + ObjectTypeInitializer.DeleteProcedure = IopDeleteDriver; + ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &IoDriverObjectType); + InitializeListHead(&DriverReinitListHead); KeInitializeSpinLock(&DriverReinitListLock); DriverReinitTailEntry = NULL; _____ Modified: trunk/reactos/ntoskrnl/io/file.c --- trunk/reactos/ntoskrnl/io/file.c 2005-05-15 16:09:13 UTC (rev 15316) +++ trunk/reactos/ntoskrnl/io/file.c 2005-05-15 17:59:33 UTC (rev 15317) @@ -776,7 +776,7 @@ } } RtlMapGenericMask(&DesiredAccess, - BODY_TO_HEADER(FileObject)->ObjectType->Mapping); + &BODY_TO_HEADER(FileObject)->ObjectType->TypeInfo.GenericMapping); Status = ObInsertObject ((PVOID)FileObject, NULL, @@ -2695,7 +2695,7 @@ /* Reference the Port */ Status = ObReferenceObjectByHandle(CompletionInfo->IoCompletionHandle, IO_COMPLETION_MODIFY_STATE, - ExIoCompletionType, + IoCompletionType, PreviousMode, (PVOID*)&Queue, NULL); _____ Modified: trunk/reactos/ntoskrnl/io/iocomp.c --- trunk/reactos/ntoskrnl/io/iocomp.c 2005-05-15 16:09:13 UTC (rev 15316) +++ trunk/reactos/ntoskrnl/io/iocomp.c 2005-05-15 17:59:33 UTC (rev 15317) @@ -15,11 +15,11 @@ #define IOC_TAG TAG('I', 'O', 'C', 'T') -POBJECT_TYPE ExIoCompletionType; +POBJECT_TYPE IoCompletionType; NPAGED_LOOKASIDE_LIST IoCompletionPacketLookaside; -static GENERIC_MAPPING ExIoCompletionMapping = +static GENERIC_MAPPING IopCompletionMapping = { STANDARD_RIGHTS_READ | IO_COMPLETION_QUERY_STATE, STANDARD_RIGHTS_WRITE | IO_COMPLETION_MODIFY_STATE, @@ -27,7 +27,7 @@ IO_COMPLETION_ALL_ACCESS }; -static const INFORMATION_CLASS_INFO ExIoCompletionInfoClass[] = { +static const INFORMATION_CLASS_INFO IoCompletionInfoClass[] = { /* IoCompletionBasicInformation */ ICI_SQ_SAME( sizeof(IO_COMPLETION_BASIC_INFORMATION), sizeof(ULONG), ICIF_QUERY ), @@ -203,25 +203,22 @@ FASTCALL IopInitIoCompletionImplementation(VOID) { - /* Create the IO Completion Type */ - ExIoCompletionType = ExAllocatePool(NonPagedPool, sizeof(OBJECT_TYPE)); - RtlInitUnicodeString(&ExIoCompletionType->TypeName, L"IoCompletion"); - ExIoCompletionType->Tag = IOC_TAG; - ExIoCompletionType->PeakObjects = 0; - ExIoCompletionType->PeakHandles = 0; - ExIoCompletionType->TotalObjects = 0; - ExIoCompletionType->TotalHandles = 0; - ExIoCompletionType->PagedPoolCharge = 0; - ExIoCompletionType->NonpagedPoolCharge = sizeof(KQUEUE); - ExIoCompletionType->Mapping = &ExIoCompletionMapping; - ExIoCompletionType->Dump = NULL; - ExIoCompletionType->Open = NULL; - ExIoCompletionType->Close = NULL; - ExIoCompletionType->Delete = IopDeleteIoCompletion; - ExIoCompletionType->Parse = NULL; - ExIoCompletionType->Security = NULL; - ExIoCompletionType->QueryName = NULL; - ExIoCompletionType->OkayToClose = NULL; + OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; + UNICODE_STRING Name; + + DPRINT1("Creating IoCompletion Object Type\n"); + + /* Initialize the Driver object type */ + RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); + RtlInitUnicodeString(&Name, L"IoCompletion"); + ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); + ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(KQUEUE); + ObjectTypeInitializer.PoolType = NonPagedPool; + ObjectTypeInitializer.ValidAccessMask = IO_COMPLETION_ALL_ACCESS; + ObjectTypeInitializer.UseDefaultObject = TRUE; + ObjectTypeInitializer.GenericMapping = IopCompletionMapping; + ObjectTypeInitializer.DeleteProcedure = IopDeleteIoCompletion; + ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &IoCompletionType); } NTSTATUS @@ -258,7 +255,7 @@ /* Create the Object */ Status = ObCreateObject(PreviousMode, - ExIoCompletionType, + IoCompletionType, ObjectAttributes, PreviousMode, NULL, @@ -330,7 +327,7 @@ /* Open the Object */ Status = ObOpenObjectByName(ObjectAttributes, - ExIoCompletionType, + IoCompletionType, NULL, PreviousMode, DesiredAccess, @@ -369,7 +366,7 @@ /* Check buffers and parameters */ DefaultQueryInfoBufferCheck(IoCompletionInformationClass, - ExIoCompletionInfoClass, + IoCompletionInfoClass, IoCompletionInformation, IoCompletionInformationLength, ResultLength, @@ -384,7 +381,7 @@ /* Get the Object */ Status = ObReferenceObjectByHandle(IoCompletionHandle, IO_COMPLETION_QUERY_STATE, - ExIoCompletionType, + IoCompletionType, PreviousMode, [truncated at 1000 lines; 1142 more skipped]

19 years, 4 months

[chorns] 15316: svn:ignore maintenance

by chorns＠svn.reactos.com

svn:ignore maintenance Property changes on: branches/xmlbuildsystem/reactos ___________________________________________________________________ Name: svn:ignore - *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.zip *.iso *.cab *.bat obj-* output-* doxy-doc Makefile.auto cd + *.sys *.exe *.dll *.cpl *.a *.o *.d *.coff *.dsp *.dsw *.aps *.ncb *.opt *.sym *.plg *.bak *.zip *.iso *.cab *.bat *.log makefile.auto config.xml obj-* output-* doxy-doc cd reactos

19 years, 4 months

[chorns] 15315: Generate proxy makefiles

by chorns＠svn.reactos.com

Generate proxy makefiles Deleted: branches/xmlbuildsystem/reactos/apps/utils/net/arp/makefile Deleted: branches/xmlbuildsystem/reactos/apps/utils/net/finger/makefile Deleted: branches/xmlbuildsystem/reactos/apps/utils/net/ftp/makefile Deleted: branches/xmlbuildsystem/reactos/apps/utils/net/ipconfig/makefile Deleted: branches/xmlbuildsystem/reactos/apps/utils/net/netstat/makefile Deleted: branches/xmlbuildsystem/reactos/apps/utils/net/ping/makefile Deleted: branches/xmlbuildsystem/reactos/apps/utils/net/route/makefile Deleted: branches/xmlbuildsystem/reactos/apps/utils/net/telnet/Makefile Deleted: branches/xmlbuildsystem/reactos/apps/utils/net/whois/makefile Deleted: branches/xmlbuildsystem/reactos/boot/freeldr/bootsect/Makefile Deleted: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/Makefile Deleted: branches/xmlbuildsystem/reactos/drivers/bus/acpi/makefile Deleted: branches/xmlbuildsystem/reactos/drivers/bus/isapnp/makefile Deleted: branches/xmlbuildsystem/reactos/drivers/bus/pci/makefile Deleted: branches/xmlbuildsystem/reactos/drivers/bus/serenum/makefile Deleted: branches/xmlbuildsystem/reactos/drivers/dd/beep/makefile Deleted: branches/xmlbuildsystem/reactos/drivers/dd/blue/makefile Deleted: branches/xmlbuildsystem/reactos/drivers/dd/bootvid/Makefile Deleted: branches/xmlbuildsystem/reactos/drivers/dd/debugout/makefile Deleted: branches/xmlbuildsystem/reactos/drivers/dd/mpu401/makefile Deleted: branches/xmlbuildsystem/reactos/drivers/dd/null/makefile Deleted: branches/xmlbuildsystem/reactos/drivers/dd/parallel/makefile Deleted: branches/xmlbuildsystem/reactos/drivers/dd/ramdrv/makefile Deleted: branches/xmlbuildsystem/reactos/drivers/dd/serial/makefile Deleted: branches/xmlbuildsystem/reactos/drivers/dd/sndblst/makefile Deleted: branches/xmlbuildsystem/reactos/drivers/dd/sound/makefile Deleted: branches/xmlbuildsystem/reactos/drivers/fs/cdfs/makefile Deleted: branches/xmlbuildsystem/reactos/drivers/fs/fs_rec/makefile Deleted: branches/xmlbuildsystem/reactos/drivers/fs/ms/Makefile Deleted: branches/xmlbuildsystem/reactos/drivers/fs/mup/makefile Deleted: branches/xmlbuildsystem/reactos/drivers/fs/np/Makefile Deleted: branches/xmlbuildsystem/reactos/drivers/fs/ntfs/makefile Deleted: branches/xmlbuildsystem/reactos/drivers/fs/vfat/makefile Deleted: branches/xmlbuildsystem/reactos/drivers/input/i8042prt/makefile Deleted: branches/xmlbuildsystem/reactos/drivers/input/kbdclass/makefile Deleted: branches/xmlbuildsystem/reactos/drivers/input/mouclass/makefile Deleted: branches/xmlbuildsystem/reactos/drivers/input/sermouse/makefile Deleted: branches/xmlbuildsystem/reactos/drivers/lib/bzip2/Makefile Deleted: branches/xmlbuildsystem/reactos/drivers/lib/csq/MAKEFILE Deleted: branches/xmlbuildsystem/reactos/drivers/lib/ip/makefile Deleted: branches/xmlbuildsystem/reactos/drivers/lib/oskittcp/makefile Deleted: branches/xmlbuildsystem/reactos/drivers/net/afd/makefile Deleted: branches/xmlbuildsystem/reactos/drivers/net/dd/ne2000/Makefile Deleted: branches/xmlbuildsystem/reactos/drivers/net/dd/pcnet/Makefile Deleted: branches/xmlbuildsystem/reactos/drivers/net/ndis/Makefile Deleted: branches/xmlbuildsystem/reactos/drivers/net/npf/Makefile Deleted: branches/xmlbuildsystem/reactos/drivers/net/tcpip/makefile Deleted: branches/xmlbuildsystem/reactos/drivers/net/tdi/Makefile Deleted: branches/xmlbuildsystem/reactos/drivers/net/wshtcpip/makefile Deleted: branches/xmlbuildsystem/reactos/drivers/storage/atapi/makefile Deleted: branches/xmlbuildsystem/reactos/drivers/storage/cdrom/makefile Deleted: branches/xmlbuildsystem/reactos/drivers/storage/class2/makefile Deleted: branches/xmlbuildsystem/reactos/drivers/storage/disk/makefile Deleted: branches/xmlbuildsystem/reactos/drivers/storage/diskdump/Makefile Deleted: branches/xmlbuildsystem/reactos/drivers/storage/floppy/Makefile Deleted: branches/xmlbuildsystem/reactos/drivers/storage/scsiport/makefile Deleted: branches/xmlbuildsystem/reactos/drivers/video/displays/framebuf/makefile Deleted: branches/xmlbuildsystem/reactos/drivers/video/displays/vga/makefile Deleted: branches/xmlbuildsystem/reactos/drivers/video/miniport/vbe/makefile Deleted: branches/xmlbuildsystem/reactos/drivers/video/miniport/vga/makefile Deleted: branches/xmlbuildsystem/reactos/drivers/video/miniport/xboxvmp/Makefile Deleted: branches/xmlbuildsystem/reactos/drivers/video/videoprt/Makefile Deleted: branches/xmlbuildsystem/reactos/hal/hal/Makefile Deleted: branches/xmlbuildsystem/reactos/hal/halx86/mp/Makefile Deleted: branches/xmlbuildsystem/reactos/hal/halx86/up/Makefile Deleted: branches/xmlbuildsystem/reactos/hal/halx86/xbox/Makefile Deleted: branches/xmlbuildsystem/reactos/lib/acledit/Makefile Deleted: branches/xmlbuildsystem/reactos/lib/aclui/Makefile Deleted: branches/xmlbuildsystem/reactos/lib/adns/Makefile Deleted: branches/xmlbuildsystem/reactos/lib/advapi32/makefile Deleted: branches/xmlbuildsystem/reactos/lib/advpack/Makefile Deleted: branches/xmlbuildsystem/reactos/lib/cabinet/Makefile Deleted: branches/xmlbuildsystem/reactos/lib/cards/Makefile Deleted: branches/xmlbuildsystem/reactos/lib/comctl32/makefile Deleted: branches/xmlbuildsystem/reactos/lib/comdlg32/makefile Deleted: branches/xmlbuildsystem/reactos/lib/cpl/access/Makefile Deleted: branches/xmlbuildsystem/reactos/lib/cpl/appwiz/Makefile Deleted: branches/xmlbuildsystem/reactos/lib/cpl/control/Makefile Deleted: branches/xmlbuildsystem/reactos/lib/cpl/desk/Makefile Deleted: branches/xmlbuildsystem/reactos/lib/cpl/intl/makefile Deleted: branches/xmlbuildsystem/reactos/lib/cpl/main/makefile Deleted: branches/xmlbuildsystem/reactos/lib/cpl/ncpa/Makefile Deleted: branches/xmlbuildsystem/reactos/lib/cpl/sysdm/Makefile Deleted: branches/xmlbuildsystem/reactos/lib/cpl/timedate/makefile Deleted: branches/xmlbuildsystem/reactos/lib/crt/makefile Deleted: branches/xmlbuildsystem/reactos/lib/crtdll/makefile Deleted: branches/xmlbuildsystem/reactos/lib/dbghelp/Makefile Deleted: branches/xmlbuildsystem/reactos/lib/devenum/makefile Deleted: branches/xmlbuildsystem/reactos/lib/dinput/Makefile Deleted: branches/xmlbuildsystem/reactos/lib/dinput8/Makefile Deleted: branches/xmlbuildsystem/reactos/lib/dnsapi/Makefile Deleted: branches/xmlbuildsystem/reactos/lib/dsound/Makefile Deleted: branches/xmlbuildsystem/reactos/lib/dxdiagn/makefile Deleted: branches/xmlbuildsystem/reactos/lib/dxguid/makefile Deleted: branches/xmlbuildsystem/reactos/lib/epsapi/makefile Deleted: branches/xmlbuildsystem/reactos/lib/expat/Makefile Deleted: branches/xmlbuildsystem/reactos/lib/fmifs/makefile Deleted: branches/xmlbuildsystem/reactos/lib/freetype/Makefile Deleted: branches/xmlbuildsystem/reactos/lib/fslib/Makefile Deleted: branches/xmlbuildsystem/reactos/lib/fslib/vfatlib/Makefile [truncated at 100 lines; 111 more skipped] _____ Deleted: branches/xmlbuildsystem/reactos/apps/utils/net/arp/makefile --- branches/xmlbuildsystem/reactos/apps/utils/net/arp/makefile 2005-05-15 15:51:58 UTC (rev 15314) +++ branches/xmlbuildsystem/reactos/apps/utils/net/arp/makefile 2005-05-15 15:56:06 UTC (rev 15315) @@ -1,19 +0,0 @@ -PATH_TO_TOP = ../../../.. - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = arp - -TARGET_INSTALLDIR = system32 - -TARGET_CFLAGS = -D__USE_W32API - -TARGET_SDKLIBS = user32.a snmpapi.a - -TARGET_OBJECTS = $(TARGET_NAME).o - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk _____ Deleted: branches/xmlbuildsystem/reactos/apps/utils/net/finger/makefile --- branches/xmlbuildsystem/reactos/apps/utils/net/finger/makefile 2005-05-15 15:51:58 UTC (rev 15314) +++ branches/xmlbuildsystem/reactos/apps/utils/net/finger/makefile 2005-05-15 15:56:06 UTC (rev 15315) @@ -1,24 +0,0 @@ -PATH_TO_TOP = ../../../.. - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = finger - -TARGET_SDKLIBS = ws2_32.a - -TARGET_INSTALLDIR = system32 - -TARGET_CFLAGS = -D__USE_W32_SOCKETS - -TARGET_OBJECTS = $(TARGET_NAME).o \ - err.o \ - getopt.o \ - net.o - -TARGET_GCCLIBS = iberty - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk _____ Deleted: branches/xmlbuildsystem/reactos/apps/utils/net/ftp/makefile --- branches/xmlbuildsystem/reactos/apps/utils/net/ftp/makefile 2005-05-15 15:51:58 UTC (rev 15314) +++ branches/xmlbuildsystem/reactos/apps/utils/net/ftp/makefile 2005-05-15 15:56:06 UTC (rev 15315) @@ -1,29 +0,0 @@ -PATH_TO_TOP = ../../../.. - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = ftp - -TARGET_INSTALLDIR = system32 - -TARGET_CFLAGS = -D__USE_W32API - -TARGET_SDKLIBS = ws2_32.a iphlpapi.a -# ntdll.a - -TARGET_OBJECTS = \ - cmds.o \ - cmdtab.o \ - domacro.o \ - fake.o \ - ftp.o \ - main.o \ - ruserpass.o - -TARGET_GCCLIBS = - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk _____ Deleted: branches/xmlbuildsystem/reactos/apps/utils/net/ipconfig/makefile --- branches/xmlbuildsystem/reactos/apps/utils/net/ipconfig/makefile 2005-05-15 15:51:58 UTC (rev 15314) +++ branches/xmlbuildsystem/reactos/apps/utils/net/ipconfig/makefile 2005-05-15 15:56:06 UTC (rev 15315) @@ -1,19 +0,0 @@ -PATH_TO_TOP = ../../../.. - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = ipconfig - -TARGET_INSTALLDIR = system32 - -TARGET_CFLAGS = -D__USE_W32API - -TARGET_SDKLIBS = user32.a iphlpapi.a - -TARGET_OBJECTS = $(TARGET_NAME).o - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk _____ Deleted: branches/xmlbuildsystem/reactos/apps/utils/net/netstat/makefile --- branches/xmlbuildsystem/reactos/apps/utils/net/netstat/makefile 2005-05-15 15:51:58 UTC (rev 15314) +++ branches/xmlbuildsystem/reactos/apps/utils/net/netstat/makefile 2005-05-15 15:56:06 UTC (rev 15315) @@ -1,22 +0,0 @@ -PATH_TO_TOP = ../../../.. - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = netstat - -TARGET_INSTALLDIR = system32 - -TARGET_CFLAGS = \ - -D__USE_W32API \ - -D_WIN32_IE=0x600 \ - -D_WIN32_WINNT=0x501 - -TARGET_SDKLIBS = user32.a snmpapi.a iphlpapi.a ws2_32.a - -TARGET_OBJECTS = $(TARGET_NAME).o - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk _____ Deleted: branches/xmlbuildsystem/reactos/apps/utils/net/ping/makefile --- branches/xmlbuildsystem/reactos/apps/utils/net/ping/makefile 2005-05-15 15:51:58 UTC (rev 15314) +++ branches/xmlbuildsystem/reactos/apps/utils/net/ping/makefile 2005-05-15 15:56:06 UTC (rev 15315) @@ -1,19 +0,0 @@ -PATH_TO_TOP = ../../../.. - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = ping - -TARGET_INSTALLDIR = system32 - -TARGET_CFLAGS = -D__USE_W32API -D__USE_W32_SOCKETS - -TARGET_SDKLIBS = ws2_32.a - -TARGET_OBJECTS = $(TARGET_NAME).o - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk _____ Deleted: branches/xmlbuildsystem/reactos/apps/utils/net/route/makefile --- branches/xmlbuildsystem/reactos/apps/utils/net/route/makefile 2005-05-15 15:51:58 UTC (rev 15314) +++ branches/xmlbuildsystem/reactos/apps/utils/net/route/makefile 2005-05-15 15:56:06 UTC (rev 15315) @@ -1,19 +0,0 @@ -PATH_TO_TOP = ../../../.. - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = route - -TARGET_INSTALLDIR = system32 - -TARGET_SDKLIBS = ws2_32.a iphlpapi.a ntdll.a - -TARGET_OBJECTS = $(TARGET_NAME).o - -TARGET_CFLAGS = -D__USE_W32API - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk _____ Deleted: branches/xmlbuildsystem/reactos/apps/utils/net/telnet/Makefile --- branches/xmlbuildsystem/reactos/apps/utils/net/telnet/Makefile 2005-05-15 15:51:58 UTC (rev 15314) +++ branches/xmlbuildsystem/reactos/apps/utils/net/telnet/Makefile 2005-05-15 15:56:06 UTC (rev 15315) @@ -1,41 +0,0 @@ -PATH_TO_TOP = ../../../.. - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = telnet - -TARGET_INSTALLDIR = system32 - -TARGET_SDKLIBS = ws2_32.a - -TARGET_CPPFLAGS = -D__REACTOS__ -D__USE_W32API -Wall - -TARGET_GCCLIBS = stdc++ - -TARGET_OBJECTS = \ - src/ansiprsr.o \ - src/keytrans.o \ - src/tcharmap.o \ - src/tconsole.o \ - src/tkeydef.o \ - src/tkeymap.o \ - src/tmapldr.o \ - src/tmouse.o \ - src/tnclass.o \ - src/tnclip.o \ - src/tncon.o \ - src/tnconfig.o \ - src/tnerror.o \ - src/tnetwork.o \ - src/tnmain.o \ - src/tnmisc.o \ - src/tscript.o \ - src/tscroll.o \ - src/ttelhndl.o - - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk _____ Deleted: branches/xmlbuildsystem/reactos/apps/utils/net/whois/makefile --- branches/xmlbuildsystem/reactos/apps/utils/net/whois/makefile 2005-05-15 15:51:58 UTC (rev 15314) +++ branches/xmlbuildsystem/reactos/apps/utils/net/whois/makefile 2005-05-15 15:56:06 UTC (rev 15315) @@ -1,19 +0,0 @@ -PATH_TO_TOP = ../../../.. - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = whois - -TARGET_INSTALLDIR = system32 - -TARGET_SDKLIBS = ws2_32.a - -TARGET_OBJECTS = $(TARGET_NAME).o - -TARGET_GCCLIBS = iberty - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk _____ Deleted: branches/xmlbuildsystem/reactos/boot/freeldr/bootsect/Makefile --- branches/xmlbuildsystem/reactos/boot/freeldr/bootsect/Makefile 2005-05-15 15:51:58 UTC (rev 15314) +++ branches/xmlbuildsystem/reactos/boot/freeldr/bootsect/Makefile 2005-05-15 15:56:06 UTC (rev 15315) @@ -1,32 +0,0 @@ -# -# FreeLoader -# Copyright (C) 1999, 2000, 2001 Brian Palmer <brianp(a)sginet.com> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program 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 General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# - -PATH_TO_TOP = ../../.. - -include ../rules.mak - -BOOTCD_DIR = $(PATH_TO_TOP)/../bootcd - -.PHONY : clean bootcd - -ifeq ($(ARCH),powerpc) -include Makefile.powerpc -else -include Makefile.i386 -endif _____ Deleted: branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/Makefile --- branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/Makefile 2005-05-15 15:51:58 UTC (rev 15314) +++ branches/xmlbuildsystem/reactos/boot/freeldr/freeldr/Makefile 2005-05-15 15:56:06 UTC (rev 15315) @@ -1,299 +0,0 @@ -# -# FreeLoader -# Copyright (C) 1998-2002 Brian Palmer <brianp(a)sginet.com> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program 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 General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# - -PATH_TO_TOP = ../../.. - -include ../rules.mak - -TARGET = i386 -ifeq ($(DEBUG),) -# Debugging information on (bigger binary) -#DEBUG = yes -# Debugging information off (smaller binary) -DEBUG = no -endif - -SRCDIR = . - -BOOTCD_DIR = $(PATH_TO_TOP)/bootcd - -TOOLSDIR = $(SRCDIR)/../tools - -DEPTOOL = $(subst /,$(SEP),$(FREELDR_TOOLS_PATH))$(SEP)deptool -TOOLS = $(DEPTOOL) - -preall : all - -.PHONY: BUILD_TOOLS -BUILD_TOOLS: - @$(MAKE) --no-print-directory -C $(FREELDR_TOOLS_PATH) - -############################################# - -.PHONY : clean -clean: - @-$(RM) $(ALL_OBJS) - @-$(RM) $(ALL_OBJS:.o=.d) - @-$(RM) freeldr.exe - @-$(RM) freeldr.sys - @-$(RM) freeldr.map - @-$(RM) setupldr.exe - @-$(RM) setupldr.sys - @-$(RM) setupldr.map - @$(MAKE) --no-print-directory -C $(FREELDR_TOOLS_PATH) - @echo freeldr: Clean ALL done. - -############################################# - -.PHONY : bootcd -bootcd : bootcd_dirs setup_loader boot_loader - -.PHONY : bootcd_dirs -bootcd_dirs: - $(MKDIR) $(BOOTCD_DIR) - $(MKDIR) $(BOOTCD_DIR)/disk - $(MKDIR) $(BOOTCD_DIR)/disk/reactos - $(MKDIR) $(BOOTCD_DIR)/disk/install - $(MKDIR) $(BOOTCD_DIR)/disk/bootdisk - $(MKDIR) $(BOOTCD_DIR)/disk/loader - -.PHONY : boot_loader -boot_loader : freeldr.sys - $(CP) freeldr.sys $(BOOTCD_DIR)/disk/loader/freeldr.sys - $(CP) ../freeldr.ini $(BOOTCD_DIR)/disk/loader/freeldr.ini - -.PHONY : setup_loader -setup_loader : setupldr.sys - $(CP) setupldr.sys $(BOOTCD_DIR)/disk/loader/setupldr.sys - - -COMPILER_OPTIONS = -Wall -Werror -nostdlib -ffreestanding -fno-builtin -fno-inline \ - -fno-zero-initialized-in-bss -O1 -MD -# FreeLoader does not use any of the standard libraries, includes, or built-in functions - -ifeq ($(DEBUG),yes) -COMPILER_DEBUG_DEFINES = -DDEBUG -else -COMPILER_DEBUG_DEFINES = -endif - -COMPILER_DEFINES = -D__$(TARGET)__ $(COMPILER_DEBUG_DEFINES) - -COMPILER_INCLUDES = -I$(SRCDIR)/include -I$(PATH_TO_TOP)/w32api/include -I$(PATH_TO_TOP)/include -I$(PATH_TO_TOP)/ntoskrnl/include - -CFLAGS = $(COMPILER_OPTIONS) \ - $(COMPILER_DEFINES) \ - $(COMPILER_INCLUDES) - -LINKER_OPTIONS = -N -Ttext=0x8000 - -LFLAGS = $(LINKER_OPTIONS) - -ifeq ($(HOST),mingw32-linux) - NASMFLAGS = -f win32 -else - NASMFLAGS = -f elf -endif - -# fathelp.o must come first in the link line because it contains bootsector helper code -# arch.o must come second in the link line because it contains the startup code -ARCH_I386_OBJS = fathelp.o \ - arch.o \ - i386idt.o \ - i386trap.o \ - i386cpu.o \ - i386pnp.o \ - boot.o \ - linux.o \ - mb.o \ - i386rtl.o \ - i386vid.o \ - drvmap.o \ - int386.o \ - i386disk.o \ - portio.o \ - hardware.o \ - hwacpi.o \ - hwapm.o \ - hwcpu.o \ - hwpci.o \ - archmach.o \ - machpc.o \ - machxbox.o \ - pccons.o \ - pcdisk.o \ - pcmem.o \ - pcrtc.o \ - pcvideo.o \ - xboxcons.o \ - xboxdisk.o \ - xboxfont.o \ - xboxhw.o \ - xboxmem.o \ - xboxrtc.o \ - xboxvideo.o \ - _alloca.o # For Mingw32 builds - -ARCH_OBJS = $(addprefix i386/,$(ARCH_I386_OBJS)) - -RTL_OBJS = print.o \ - stdlib.o \ - string.o \ - list.o \ - memcmp.o \ - memcpy.o \ - memmove.o \ - memset.o - -FS_OBJS = fs.o \ - fat.o \ - iso.o \ - ext2.o \ - ntfs.o \ - fsrec.o - -UI_OBJS = tui.o \ - tuimenu.o \ - ui.o \ - gui.o - -REACTOS_OBJS = arcname.o \ - binhive.o \ - registry.o - -COMM_OBJS = rs232.o - -DISK_OBJS = disk.o \ - partition.o - -MM_OBJS = mm.o \ - meminit.o - -CACHE_OBJS = cache.o \ - blocklist.o - -INIFILE_OBJS = inifile.o \ - ini_init.o \ - parse.o - -INFFILE_OBJS = inffile.o - -VIDEO_OBJS = video.o \ - fade.o \ - palette.o \ - pixel.o \ - bank.o - -# libgcc2.o contains code (__udivdi3, __umoddi3) necessary to do -# 64-bit division on the i386 (and other 32-bit) architectures -# This code was taken from the GCC v3.1 source -MATH_OBJS = libgcc2.o - -BASE_OBJS = freeldr.o \ - debug.o \ - multiboot.o \ - version.o \ - cmdline.o \ - machine.o - -FREELDR_OBJS = bootmgr.o \ - drivemap.o \ - miscboot.o \ - options.o \ - linuxboot.o \ - oslist.o \ - custom.o - -ROSLDR_OBJS = reactos.o - -SETUPLDR_OBJS = setupldr.o - -COMMON_OBJS = $(addprefix arch/,$(ARCH_OBJS)) \ - $(addprefix rtl/,$(RTL_OBJS)) \ - $(addprefix fs/,$(FS_OBJS)) \ - $(addprefix ui/,$(UI_OBJS)) \ - $(addprefix reactos/,$(REACTOS_OBJS)) \ - $(addprefix comm/,$(COMM_OBJS)) \ - $(addprefix disk/,$(DISK_OBJS)) \ - $(addprefix mm/,$(MM_OBJS)) \ - $(addprefix cache/,$(CACHE_OBJS)) \ - $(addprefix video/,$(VIDEO_OBJS)) \ - $(addprefix math/,$(MATH_OBJS)) \ - $(BASE_OBJS) - -SPECIAL_OBJS = $(addprefix inifile/,$(INIFILE_OBJS)) \ - $(addprefix inffile/,$(INFFILE_OBJS)) \ - $(FREELDR_OBJS) \ - $(addprefix reactos/,$(ROSLDR_OBJS)) \ - $(addprefix reactos/,$(SETUPLDR_OBJS)) - -F_OBJS = $(COMMON_OBJS) \ - $(addprefix inifile/,$(INIFILE_OBJS)) \ - $(addprefix reactos/,$(ROSLDR_OBJS)) \ - $(FREELDR_OBJS) - -S_OBJS = $(COMMON_OBJS) \ - $(addprefix inifile/,$(INIFILE_OBJS)) \ - $(addprefix inffile/,$(INFFILE_OBJS)) \ - $(addprefix reactos/,$(SETUPLDR_OBJS)) - - -ALL_OBJS = $(COMMON_OBJS) \ - $(SPECIAL_OBJS) - - -all : freeldr.sys setupldr.sys - @echo freeldr: Make ALL done. - - -freeldr.sys : $(ALL_OBJS) $(PATH_TO_TOP)/dk/w32/lib/librossym.a - @echo freeldr: LINKING $@ - @$(LD) $(LFLAGS) -o freeldr.exe $(F_OBJS) $(PATH_TO_TOP)/dk/w32/lib/librossym.a -ifeq ($(FULL_MAP),yes) - @$(OBJDUMP) -d -S freeldr.exe > freeldr.map -else - @$(NM) --numeric-sort freeldr.exe > freeldr.map -endif - @$(OBJCOPY) -O binary freeldr.exe freeldr.sys - - -setupldr.sys : $(ALL_OBJS) - @echo freeldr: LINKING $@ - @$(LD) $(LFLAGS) -Map setupldr.map -o setupldr.exe $(S_OBJS) -ifeq ($(FULL_MAP),yes) - @$(OBJDUMP) -d -S setupldr.exe > setupldr.map -else - @$(NM) --numeric-sort setupldr.exe > setupldr.map -endif - @$(OBJCOPY) -O binary setupldr.exe setupldr.sys - - -%.o :: %.c - @echo freeldr: Compiling $* - @$(CC) $(CFLAGS) -o $@ -c $< - @$(DEPTOOL) $*.d - -%.o :: %.S - @echo freeldr: Assembling $* - @$(CC) $(CFLAGS) -o $@ -c $< - @$(DEPTOOL) $*.d - -%.o :: %.asm - @echo freeldr: Assembling $* - @$(NASM_CMD) $(NASMFLAGS) -o $@ $< _____ Deleted: branches/xmlbuildsystem/reactos/drivers/bus/acpi/makefile --- branches/xmlbuildsystem/reactos/drivers/bus/acpi/makefile 2005-05-15 15:51:58 UTC (rev 15314) +++ branches/xmlbuildsystem/reactos/drivers/bus/acpi/makefile 2005-05-15 15:56:06 UTC (rev 15315) @@ -1,151 +0,0 @@ -# $Id$ - -PATH_TO_TOP = ../../.. - -TARGET_TYPE = driver - -TARGET_NAME = acpi - -TARGET_CFLAGS = -I./include -I./ospm/include - -TARGET_DDKLIBS = ntoskrnl.a - -OBJECTS_OSPM_BUSMGR = \ - ospm/busmgr/bm.o \ - ospm/busmgr/bmnotify.o \ - ospm/busmgr/bmpm.o \ - ospm/busmgr/bmpower.o \ - ospm/busmgr/bmrequest.o \ - ospm/busmgr/bmsearch.o \ - ospm/busmgr/bmutils.o \ - ospm/busmgr/bmxface.o - -OBJECTS_OSPM = \ - $(OBJECTS_OSPM_BUSMGR) \ - ospm/acpienum.o \ - ospm/acpisys.o \ - ospm/bn.o \ - ospm/fdo.o \ - ospm/osl.o \ - ospm/pdo.o - -OBJECTS_DISPATCHER = \ - dispatcher/dsfield.o \ - dispatcher/dsmethod.o \ - dispatcher/dsmthdat.o \ - dispatcher/dsobject.o \ - dispatcher/dsopcode.o \ - dispatcher/dsutils.o \ - dispatcher/dswexec.o \ - dispatcher/dswload.o \ - dispatcher/dswscope.o \ - dispatcher/dswstate.o - -OBJECTS_EVENTS = \ - events/evevent.o \ - events/evmisc.o \ - events/evregion.o \ - events/evrgnini.o \ - events/evsci.o \ - events/evxface.o \ - events/evxfevnt.o \ - events/evxfregn.o - -OBJECTS_EXECUTER = \ - executer/amconfig.o \ - executer/amconvrt.o \ - executer/amcreate.o \ - executer/amdump.o \ - executer/amdyadic.o \ - executer/amfield.o \ - executer/amfldio.o \ - executer/ammisc.o \ - executer/ammonad.o \ - executer/ammutex.o \ - executer/amnames.o \ - executer/amprep.o \ - executer/amregion.o \ - executer/amresnte.o \ - executer/amresolv.o \ - executer/amresop.o \ - executer/amstore.o \ - executer/amstoren.o \ - executer/amstorob.o \ - executer/amsystem.o \ - executer/amutils.o \ - executer/amxface.o - -OBJECTS_HARDWARE = \ - hardware/hwacpi.o \ - hardware/hwgpe.o \ - hardware/hwregs.o \ - hardware/hwsleep.o \ - hardware/hwtimer.o - -OBJECTS_NAMESPACE = \ - namespace/nsaccess.o \ - namespace/nsalloc.o \ - namespace/nseval.o \ - namespace/nsinit.o \ - namespace/nsload.o \ - namespace/nsnames.o \ - namespace/nsobject.o \ - namespace/nssearch.o \ - namespace/nsutils.o \ - namespace/nswalk.o \ - namespace/nsxfname.o \ - namespace/nsxfobj.o - -OBJECTS_PARSER = \ - parser/psargs.o \ - parser/psopcode.o \ - parser/psparse.o \ - parser/psscope.o \ - parser/pstree.o \ - parser/psutils.o \ - parser/pswalk.o \ - parser/psxface.o - -OBJECTS_RESOURCE = \ - resource/rsaddr.o \ - resource/rscalc.o \ - resource/rscreate.o \ - resource/rsdump.o \ - resource/rsio.o \ - resource/rsirq.o \ - resource/rslist.o \ - resource/rsmemory.o \ - resource/rsmisc.o \ - resource/rsutils.o \ - resource/rsxface.o - -OBJECTS_TABLES = \ - tables/tbconvrt.o \ - tables/tbget.o \ - tables/tbinstal.o \ - tables/tbutils.o \ - tables/tbxface.o \ - tables/tbxfroot.o - -OBJECTS_UTILS = \ - utils/cmalloc.o \ - utils/cmclib.o \ - utils/cmcopy.o \ - utils/cmdebug.o \ - utils/cmdelete.o \ - utils/cmeval.o \ - utils/cmglobal.o \ - utils/cminit.o \ - utils/cmobject.o \ - utils/cmutils.o \ - utils/cmxface.o - -TARGET_OBJECTS = \ - $(OBJECTS_OSPM) $(OBJECTS_DISPATCHER) $(OBJECTS_EVENTS) \ - $(OBJECTS_EXECUTER) $(OBJECTS_HARDWARE) $(OBJECTS_NAMESPACE) \ - $(OBJECTS_PARSER) $(OBJECTS_RESOURCE) $(OBJECTS_TABLES) \ - $(OBJECTS_UTILS) - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk _____ Deleted: branches/xmlbuildsystem/reactos/drivers/bus/isapnp/makefile --- branches/xmlbuildsystem/reactos/drivers/bus/isapnp/makefile 2005-05-15 15:51:58 UTC (rev 15314) +++ branches/xmlbuildsystem/reactos/drivers/bus/isapnp/makefile 2005-05-15 15:56:06 UTC (rev 15315) @@ -1,15 +0,0 @@ -# $Id$ - -PATH_TO_TOP = ../../.. - -TARGET_TYPE = driver - -TARGET_NAME = isapnp - -TARGET_OBJECTS = isapnp.o - -TARGET_CFLAGS = -Werror -Wall - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk _____ Deleted: branches/xmlbuildsystem/reactos/drivers/bus/pci/makefile --- branches/xmlbuildsystem/reactos/drivers/bus/pci/makefile 2005-05-15 15:51:58 UTC (rev 15314) +++ branches/xmlbuildsystem/reactos/drivers/bus/pci/makefile 2005-05-15 15:56:06 UTC (rev 15315) @@ -1,15 +0,0 @@ -# $Id$ - -PATH_TO_TOP = ../../.. - -TARGET_TYPE = driver - -TARGET_NAME = pci - -TARGET_CFLAGS = -Wall -Werror - -TARGET_OBJECTS = fdo.o pci.o pdo.o - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk _____ Deleted: branches/xmlbuildsystem/reactos/drivers/bus/serenum/makefile --- branches/xmlbuildsystem/reactos/drivers/bus/serenum/makefile 2005-05-15 15:51:58 UTC (rev 15314) +++ branches/xmlbuildsystem/reactos/drivers/bus/serenum/makefile 2005-05-15 15:56:06 UTC (rev 15315) @@ -1,20 +0,0 @@ -# $Id: makefile 12852 2005-01-06 13:58:04Z mf $ - -PATH_TO_TOP = ../../.. - -TARGET_TYPE = driver - -TARGET_NAME = serenum - -TARGET_CFLAGS = -Wall -Werror -D__USE_W32API - -TARGET_OBJECTS = \ - detect.o \ - fdo.o \ - misc.o \ - pdo.o \ - serenum.o - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk _____ Deleted: branches/xmlbuildsystem/reactos/drivers/dd/beep/makefile --- branches/xmlbuildsystem/reactos/drivers/dd/beep/makefile 2005-05-15 15:51:58 UTC (rev 15314) +++ branches/xmlbuildsystem/reactos/drivers/dd/beep/makefile 2005-05-15 15:56:06 UTC (rev 15315) @@ -1,15 +0,0 @@ -# $Id$ - -PATH_TO_TOP = ../../.. - -TARGET_TYPE = driver - -TARGET_NAME = beep - -TARGET_OBJECTS = beep.o - -TARGET_CFLAGS = -Wall -Werror - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk _____ Deleted: branches/xmlbuildsystem/reactos/drivers/dd/blue/makefile --- branches/xmlbuildsystem/reactos/drivers/dd/blue/makefile 2005-05-15 15:51:58 UTC (rev 15314) +++ branches/xmlbuildsystem/reactos/drivers/dd/blue/makefile 2005-05-15 15:56:06 UTC (rev 15315) @@ -1,20 +0,0 @@ -# $Id$ - -PATH_TO_TOP = ../../.. - -TARGET_BOOTSTRAP = yes - -TARGET_TYPE = driver - -TARGET_NAME = blue - -TARGET_OBJECTS = blue.o - -TARGET_CFLAGS = -Wall -Werror - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -DEP_OBJECTS := $(TARGET_OBJECTS) -include $(PATH_TO_TOP)/tools/depend.mk _____ Deleted: branches/xmlbuildsystem/reactos/drivers/dd/bootvid/Makefile --- branches/xmlbuildsystem/reactos/drivers/dd/bootvid/Makefile 2005-05-15 15:51:58 UTC (rev 15314) +++ branches/xmlbuildsystem/reactos/drivers/dd/bootvid/Makefile 2005-05-15 15:56:06 UTC (rev 15315) @@ -1,15 +0,0 @@ -# $Id$ - -PATH_TO_TOP = ../../.. - -TARGET_TYPE = driver - -TARGET_NAME = bootvid - -TARGET_OBJECTS = bootvid.o pixelsup_i386.o - -TARGET_CFLAGS = -Wall -Werror - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk _____ Deleted: branches/xmlbuildsystem/reactos/drivers/dd/debugout/makefile --- branches/xmlbuildsystem/reactos/drivers/dd/debugout/makefile 2005-05-15 15:51:58 UTC (rev 15314) +++ branches/xmlbuildsystem/reactos/drivers/dd/debugout/makefile 2005-05-15 15:56:06 UTC (rev 15315) @@ -1,15 +0,0 @@ -# $Id$ - -PATH_TO_TOP = ../../.. - -TARGET_TYPE = driver - -TARGET_NAME = debugout - -TARGET_OBJECTS = debugout.o - -TARGET_CFLAGS = -Wall -Werror - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk _____ Deleted: branches/xmlbuildsystem/reactos/drivers/dd/mpu401/makefile --- branches/xmlbuildsystem/reactos/drivers/dd/mpu401/makefile 2005-05-15 15:51:58 UTC (rev 15314) +++ branches/xmlbuildsystem/reactos/drivers/dd/mpu401/makefile 2005-05-15 15:56:06 UTC (rev 15315) @@ -1,22 +0,0 @@ -# $Id$ - -PATH_TO_TOP = ../../.. - -TARGET_BOOTSTRAP = yes - -TARGET_TYPE = driver - -TARGET_NAME = mpu401 - -TARGET_OBJECTS = mpu401.o \ - portio.o \ - settings.o - -TARGET_CFLAGS = -Wall -Werror - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -DEP_OBJECTS := $(TARGET_OBJECTS) -include $(PATH_TO_TOP)/tools/depend.mk _____ Deleted: branches/xmlbuildsystem/reactos/drivers/dd/null/makefile --- branches/xmlbuildsystem/reactos/drivers/dd/null/makefile 2005-05-15 15:51:58 UTC (rev 15314) +++ branches/xmlbuildsystem/reactos/drivers/dd/null/makefile 2005-05-15 15:56:06 UTC (rev 15315) @@ -1,17 +0,0 @@ -# $Id$ - -PATH_TO_TOP = ../../.. - -include $(PATH_TO_TOP)/rules.mak - -TARGET_TYPE = driver - -TARGET_NAME = null - -TARGET_OBJECTS = null.o - -TARGET_CFLAGS = -Wall -Werror -D__USE_W32API - -TARGET_LIBS = $(SDK_PATH_LIB)/libpseh.a - -include $(TOOLS_PATH)/helper.mk _____ Deleted: branches/xmlbuildsystem/reactos/drivers/dd/parallel/makefile --- branches/xmlbuildsystem/reactos/drivers/dd/parallel/makefile 2005-05-15 15:51:58 UTC (rev 15314) +++ branches/xmlbuildsystem/reactos/drivers/dd/parallel/makefile 2005-05-15 15:56:06 UTC (rev 15315) @@ -1,13 +0,0 @@ -# $Id$ - -PATH_TO_TOP = ../../.. - -TARGET_TYPE = driver - -TARGET_NAME = parallel - -TARGET_OBJECTS = parallel.o - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk _____ Deleted: branches/xmlbuildsystem/reactos/drivers/dd/ramdrv/makefile --- branches/xmlbuildsystem/reactos/drivers/dd/ramdrv/makefile 2005-05-15 15:51:58 UTC (rev 15314) +++ branches/xmlbuildsystem/reactos/drivers/dd/ramdrv/makefile 2005-05-15 15:56:06 UTC (rev 15315) @@ -1,21 +0,0 @@ -# $Id$ - -# $Id$ - -PATH_TO_TOP = ../../.. - -TARGET_TYPE = driver - -TARGET_NAME = ramdrv - -TARGET_OBJECTS = ramdrv.o - -TARGET_DDKLIBS = unbzip2.a - -TARGET_NORC = yes - -TARGET_CFLAGS=-I../../../ntoskrnl/include -g - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk _____ Deleted: branches/xmlbuildsystem/reactos/drivers/dd/serial/makefile --- branches/xmlbuildsystem/reactos/drivers/dd/serial/makefile 2005-05-15 15:51:58 UTC (rev 15314) +++ branches/xmlbuildsystem/reactos/drivers/dd/serial/makefile 2005-05-15 15:56:06 UTC (rev 15315) [truncated at 1000 lines; 8033 more skipped]

19 years, 4 months

[chorns] 15314: Remove unused file

by chorns＠svn.reactos.com

Remove unused file Deleted: branches/xmlbuildsystem/reactos/lib/shell32/cdrom.ico _____ Deleted: branches/xmlbuildsystem/reactos/lib/shell32/cdrom.ico (Binary files differ)

19 years, 4 months

[chorns] 15313: Install rpcrt4.dll, samlib.dll, and setup.exe

by chorns＠svn.reactos.com

Install rpcrt4.dll, samlib.dll, and setup.exe Modified: branches/xmlbuildsystem/reactos/lib/rpcrt4/rpcrt4.xml Modified: branches/xmlbuildsystem/reactos/lib/samlib/samlib.xml Modified: branches/xmlbuildsystem/reactos/subsys/system/setup/setup.xml _____ Modified: branches/xmlbuildsystem/reactos/lib/rpcrt4/rpcrt4.xml --- branches/xmlbuildsystem/reactos/lib/rpcrt4/rpcrt4.xml 2005-05-15 14:18:45 UTC (rev 15312) +++ branches/xmlbuildsystem/reactos/lib/rpcrt4/rpcrt4.xml 2005-05-15 14:30:35 UTC (rev 15313) @@ -1,4 +1,4 @@ -<module name="rpcrt4" type="win32dll" baseaddress="${BASEADDRESS_RPCRT4}" warnings="true"> +<module name="rpcrt4" type="win32dll" baseaddress="${BASEADDRESS_RPCRT4}" installbase="system32" installname="rpcrt4.dll" warnings="true"> <importlibrary definition="rpcrt4.spec.def" /> <include base="rpcrt4">.</include> <include base="ReactOS">include/wine</include> _____ Modified: branches/xmlbuildsystem/reactos/lib/samlib/samlib.xml --- branches/xmlbuildsystem/reactos/lib/samlib/samlib.xml 2005-05-15 14:18:45 UTC (rev 15312) +++ branches/xmlbuildsystem/reactos/lib/samlib/samlib.xml 2005-05-15 14:30:35 UTC (rev 15313) @@ -1,4 +1,4 @@ -<module name="samlib" type="win32dll" baseaddress="${BASEADDRESS_SAMLIB}"> +<module name="samlib" type="win32dll" baseaddress="${BASEADDRESS_SAMLIB}" installbase="system32" installname="samlib.dll"> <importlibrary definition="samlib.def" /> <include base="samlib">.</include> <define name="_DISABLE_TIDENTS" /> _____ Modified: branches/xmlbuildsystem/reactos/subsys/system/setup/setup.xml --- branches/xmlbuildsystem/reactos/subsys/system/setup/setup.xml 2005-05-15 14:18:45 UTC (rev 15312) +++ branches/xmlbuildsystem/reactos/subsys/system/setup/setup.xml 2005-05-15 14:30:35 UTC (rev 15313) @@ -1,4 +1,4 @@ -<module name="setup" type="win32gui"> +<module name="setup" type="win32gui" installbase="system32" installname="setup.exe"> <include base="setup">.</include> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x0400</define>

19 years, 4 months

[chorns] 15312: Overwrite registry only if the source files change

by chorns＠svn.reactos.com

Overwrite registry only if the source files change Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-05-15 13:59:57 UTC (rev 15311) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-05-15 14:18:45 UTC (rev 15312) @@ -913,10 +913,12 @@ vector<string> vInstallTargetFiles; GetInstallTargetFiles ( vInstallTargetFiles ); string installTargetFiles = v2s ( vInstallTargetFiles, 5 ); + string registryTargetFiles = GetRegistryTargetFiles (); fprintf ( fMakefile, - "install: %s install_registry\n", - installTargetFiles.c_str () ); + "install: %s %s\n", + installTargetFiles.c_str (), + registryTargetFiles.c_str () ); OutputNonModuleInstallTargets (); OutputModuleInstallTargets (); OutputRegistryInstallTarget ();

19 years, 4 months

[hbirr] 15311: Don't push an already freed irp to the list (in IoFreeIrp).

by hbirr＠svn.reactos.com

Don't push an already freed irp to the list (in IoFreeIrp). Modified: trunk/reactos/ntoskrnl/io/irp.c _____ Modified: trunk/reactos/ntoskrnl/io/irp.c --- trunk/reactos/ntoskrnl/io/irp.c 2005-05-15 13:57:03 UTC (rev 15310) +++ trunk/reactos/ntoskrnl/io/irp.c 2005-05-15 13:59:57 UTC (rev 15311) @@ -1282,11 +1282,15 @@ /* All lists failed, use the pool */ List->L.FreeMisses++; ExFreePool(Irp); + Irp = NULL; } } /* The free was within dhe Depth */ - InterlockedPushEntrySList(&List->L.ListHead, (PSINGLE_LIST_ENTRY)Irp); + if (Irp) + { + InterlockedPushEntrySList(&List->L.ListHead, (PSINGLE_LIST_ENTRY)Irp); + } } DPRINT("Free done\n");

19 years, 4 months

[chorns] 15310: Re-insert makefile code for non-DLLs which was removed by accident

by chorns＠svn.reactos.com

Re-insert makefile code for non-DLLs which was removed by accident 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 13:21:54 UTC (rev 15309) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-05-15 13:57:03 UTC (rev 15310) @@ -1262,6 +1262,15 @@ } void +MingwModuleHandler::GenerateRunRsymCode () const +{ + fprintf ( fMakefile, + "\t$(ECHO_RSYM)\n" ); + fprintf ( fMakefile, + "\t$(Q)$(RSYM_TARGET) $@ $@\n\n" ); +} + +void MingwModuleHandler::GenerateLinkerCommand ( const string& dependencies, const string& linker, @@ -1331,17 +1340,6 @@ fprintf ( fMakefile, "\t-@${rm} %s 2>$(NUL)\n", temp_exp.c_str () ); - - GenerateCleanObjectsAsYouGoCode (); - - GenerateBuildMapCode (); - - GenerateBuildNonSymbolStrippedCode (); - - fprintf ( fMakefile, - "\t$(ECHO_RSYM)\n" ); - fprintf ( fMakefile, - "\t$(Q)$(RSYM_TARGET) $@ $@\n\n" ); } else { @@ -1353,9 +1351,12 @@ objectsMacro.c_str (), libsMacro.c_str (), GetLinkerMacro ().c_str () ); + } - GenerateCleanObjectsAsYouGoCode (); - } + GenerateBuildMapCode (); + GenerateBuildNonSymbolStrippedCode (); + GenerateRunRsymCode (); + GenerateCleanObjectsAsYouGoCode (); } void _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-05-15 13:21:54 UTC (rev 15309) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-05-15 13:57:03 UTC (rev 15310) @@ -87,6 +87,7 @@ std::string GetLibsMacro () const; std::string GetLinkerMacro () const; void GenerateCleanObjectsAsYouGoCode () const; + void GenerateRunRsymCode () const; void GenerateLinkerCommand ( const std::string& dependencies, const std::string& linker, const std::string& linkerParameters,

19 years, 4 months

← Newer
1
...
37
38
39
40
41
42
43
...
82
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2005