Ros-diffs May 2006

ros-diffs@reactos.org

19 participants
377 discussions

[sedwards] 22046: add directories for the comming wine tests

by sedwards＠svn.reactos.org

Author: sedwards Date: Fri May 26 00:24:16 2006 New Revision: 22046 URL: http://svn.reactos.ru/svn/reactos?rev=22046&view=rev Log: add directories for the comming wine tests Added: trunk/reactos/regtests/winetests/advpack/ trunk/reactos/regtests/winetests/cabinet/ trunk/reactos/regtests/winetests/crypt32/ trunk/reactos/regtests/winetests/d3d8/ trunk/reactos/regtests/winetests/d3d9/ trunk/reactos/regtests/winetests/ddraw/ trunk/reactos/regtests/winetests/dinput/ trunk/reactos/regtests/winetests/dnsapi/ trunk/reactos/regtests/winetests/dsound/ trunk/reactos/regtests/winetests/gdi/ trunk/reactos/regtests/winetests/iphlpapi/ trunk/reactos/regtests/winetests/kernel/ trunk/reactos/regtests/winetests/lz32/ trunk/reactos/regtests/winetests/mapi32/ trunk/reactos/regtests/winetests/mlang/ trunk/reactos/regtests/winetests/msacm32/ trunk/reactos/regtests/winetests/mscms/ trunk/reactos/regtests/winetests/mshtml/ trunk/reactos/regtests/winetests/msi/ trunk/reactos/regtests/winetests/msvcrtd/ trunk/reactos/regtests/winetests/msxml3/ trunk/reactos/regtests/winetests/netapi32/ trunk/reactos/regtests/winetests/ole32/ trunk/reactos/regtests/winetests/oleaut32/ trunk/reactos/regtests/winetests/quartz/ trunk/reactos/regtests/winetests/riched20/ trunk/reactos/regtests/winetests/rpcrt4/ trunk/reactos/regtests/winetests/rsabase/ trunk/reactos/regtests/winetests/rsaenh/ trunk/reactos/regtests/winetests/secur32/ trunk/reactos/regtests/winetests/shdocvw/ trunk/reactos/regtests/winetests/urlmon/ trunk/reactos/regtests/winetests/user/ trunk/reactos/regtests/winetests/usp10/ trunk/reactos/regtests/winetests/wininet/ trunk/reactos/regtests/winetests/winmm/ trunk/reactos/regtests/winetests/winspool/ trunk/reactos/regtests/winetests/winspool.drv/ trunk/reactos/regtests/winetests/ws2_32/

18 years, 3 months

[ion] 22045: - Remove ROS-internal object macros and use the public ones in obtypes.h instead.

by ion＠svn.reactos.org

Author: ion Date: Fri May 26 00:14:09 2006 New Revision: 22045 URL: http://svn.reactos.ru/svn/reactos?rev=22045&view=rev Log: - Remove ROS-internal object macros and use the public ones in obtypes.h instead. Modified: trunk/reactos/ntoskrnl/cm/regobj.c trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/io/file.c trunk/reactos/ntoskrnl/ob/obdir.c trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/obinit.c trunk/reactos/ntoskrnl/ob/oblife.c trunk/reactos/ntoskrnl/ob/obname.c trunk/reactos/ntoskrnl/ob/obref.c trunk/reactos/ntoskrnl/ob/security.c trunk/reactos/ntoskrnl/ob/wait.c trunk/reactos/ntoskrnl/se/semgr.c Modified: trunk/reactos/ntoskrnl/cm/regobj.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/cm/regobj.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regobj.c (original) +++ trunk/reactos/ntoskrnl/cm/regobj.c Fri May 26 00:14:09 2006 @@ -515,7 +515,7 @@ else { /* KeyObject is the root key */ - Status = ObQueryNameString (HEADER_TO_OBJECT_NAME(BODY_TO_HEADER(KeyObject))->Directory, + Status = ObQueryNameString (OBJECT_HEADER_TO_NAME_INFO(OBJECT_TO_OBJECT_HEADER(KeyObject))->Directory, ObjectNameInfo, Length, ReturnLength); Modified: trunk/reactos/ntoskrnl/include/internal/ob.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/include/internal/o… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ob.h Fri May 26 00:14:09 2006 @@ -13,20 +13,6 @@ GENERIC_WRITE | \ GENERIC_EXECUTE | \ GENERIC_ALL) - -#define BODY_TO_HEADER(objbdy) \ - CONTAINING_RECORD((objbdy), OBJECT_HEADER, Body) - -#define HEADER_TO_OBJECT_NAME(objhdr) ((POBJECT_HEADER_NAME_INFO) \ - (!(objhdr)->NameInfoOffset ? NULL: ((PCHAR)(objhdr) - (objhdr)->NameInfoOffset))) - -#define HEADER_TO_HANDLE_INFO(objhdr) ((POBJECT_HEADER_HANDLE_INFO) \ - (!(objhdr)->HandleInfoOffset ? NULL: ((PCHAR)(objhdr) - (objhdr)->HandleInfoOffset))) - -#define HEADER_TO_CREATOR_INFO(objhdr) ((POBJECT_HEADER_CREATOR_INFO) \ - (!((objhdr)->Flags & OB_FLAG_CREATOR_INFO) ? NULL: ((PCHAR)(objhdr) - sizeof(OBJECT_HEADER_CREATOR_INFO)))) - -#define OBJECT_ALLOC_SIZE(ObjectSize) ((ObjectSize)+sizeof(OBJECT_HEADER)) #define KERNEL_HANDLE_FLAG (1 << ((sizeof(HANDLE) * 8) - 1)) #define ObIsKernelHandle(Handle, ProcessorMode) \ @@ -44,14 +30,6 @@ extern POBJECT_DIRECTORY NameSpaceRoot; extern POBJECT_DIRECTORY ObpTypeDirectoryObject; extern PHANDLE_TABLE ObpKernelHandleTable; - -typedef NTSTATUS -(NTAPI *OB_ROS_CREATE_METHOD)( - PVOID ObjectBody, - PVOID Parent, - PWSTR RemainingPath, - struct _OBJECT_ATTRIBUTES* ObjectAttributes -); BOOLEAN NTAPI Modified: trunk/reactos/ntoskrnl/io/file.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/io/file.c?rev=2204… ============================================================================== --- trunk/reactos/ntoskrnl/io/file.c (original) +++ trunk/reactos/ntoskrnl/io/file.c Fri May 26 00:14:09 2006 @@ -63,14 +63,14 @@ return(STATUS_SUCCESS); } - ParentObjectType = BODY_TO_HEADER(Parent)->Type; + ParentObjectType = OBJECT_TO_OBJECT_HEADER(Parent)->Type; if (ParentObjectType != IoDeviceObjectType && ParentObjectType != IoFileObjectType) { DPRINT("Parent [%wZ] is a %S which is neither a file type nor a device type ; remaining path = %S\n", - &HEADER_TO_OBJECT_NAME(BODY_TO_HEADER(Parent))->Name, - BODY_TO_HEADER(Parent)->Type->Name.Buffer, + &OBJECT_HEADER_TO_NAME_INFO(OBJECT_TO_OBJECT_HEADER(Parent))->Name, + OBJECT_TO_OBJECT_HEADER(Parent)->Type->Name.Buffer, RemainingPath); return(STATUS_UNSUCCESSFUL); } @@ -954,7 +954,7 @@ { return Status; } - if (BODY_TO_HEADER(DeviceObject)->Type != IoDeviceObjectType) + if (OBJECT_TO_OBJECT_HEADER(DeviceObject)->Type != IoDeviceObjectType) { ObDereferenceObject (DeviceObject); return STATUS_OBJECT_NAME_COLLISION; @@ -1022,7 +1022,7 @@ } } RtlMapGenericMask(&DesiredAccess, - &BODY_TO_HEADER(FileObject)->Type->TypeInfo.GenericMapping); + &OBJECT_TO_OBJECT_HEADER(FileObject)->Type->TypeInfo.GenericMapping); Status = ObInsertObject ((PVOID)FileObject, NULL, Modified: trunk/reactos/ntoskrnl/ob/obdir.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obdir.c?rev=220… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obdir.c (original) +++ trunk/reactos/ntoskrnl/ob/obdir.c Fri May 26 00:14:09 2006 @@ -64,7 +64,7 @@ NewEntry->HashValue = Context->HashValue; /* Get the Object Name Information */ - HeaderNameInfo = HEADER_TO_OBJECT_NAME(ObjectHeader); + HeaderNameInfo = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader); /* Get the Allocated entry */ AllocatedEntry = &Parent->HashBuckets[Context->HashIndex]; @@ -184,10 +184,10 @@ if (CurrentEntry->HashValue == HashValue) { /* Make sure that it has a name */ - ASSERT(BODY_TO_HEADER(CurrentEntry->Object)->NameInfoOffset != 0); + ASSERT(OBJECT_TO_OBJECT_HEADER(CurrentEntry->Object)->NameInfoOffset != 0); /* Get the name information */ - HeaderNameInfo = HEADER_TO_OBJECT_NAME(BODY_TO_HEADER(CurrentEntry->Object)); + HeaderNameInfo = OBJECT_HEADER_TO_NAME_INFO(OBJECT_TO_OBJECT_HEADER(CurrentEntry->Object)); /* Do the names match? */ if ((Name->Length == HeaderNameInfo->Name.Length) && Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Fri May 26 00:14:09 2006 @@ -45,7 +45,7 @@ POBJECT_HEADER ObjectHeader; OBP_LOOKUP_CONTEXT Context; - ObjectHeader = BODY_TO_HEADER(ObjectBody); + ObjectHeader = OBJECT_TO_OBJECT_HEADER(ObjectBody); ASSERT (ObjectHeader->PointerCount > 0); if (Permanent) { @@ -55,13 +55,13 @@ { ObjectHeader->Flags &= ~OB_FLAG_PERMANENT; if (ObjectHeader->HandleCount == 0 && - HEADER_TO_OBJECT_NAME(ObjectHeader)->Directory) + OBJECT_HEADER_TO_NAME_INFO(ObjectHeader)->Directory) { /* Make sure it's still inserted */ - Context.Directory = HEADER_TO_OBJECT_NAME(ObjectHeader)->Directory; + Context.Directory = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader)->Directory; Context.DirectoryLocked = TRUE; - if (ObpLookupEntryDirectory(HEADER_TO_OBJECT_NAME(ObjectHeader)->Directory, - &HEADER_TO_OBJECT_NAME(ObjectHeader)->Name, + if (ObpLookupEntryDirectory(OBJECT_HEADER_TO_NAME_INFO(ObjectHeader)->Directory, + &OBJECT_HEADER_TO_NAME_INFO(ObjectHeader)->Name, 0, FALSE, &Context)) @@ -111,12 +111,12 @@ static VOID ObpDecrementHandleCount(PVOID ObjectBody) { - POBJECT_HEADER ObjectHeader = BODY_TO_HEADER(ObjectBody); + POBJECT_HEADER ObjectHeader = OBJECT_TO_OBJECT_HEADER(ObjectBody); LONG NewHandleCount = InterlockedDecrement(&ObjectHeader->HandleCount); OBP_LOOKUP_CONTEXT Context; DPRINT("Header: %x\n", ObjectHeader); DPRINT("NewHandleCount: %x\n", NewHandleCount); - DPRINT("HEADER_TO_OBJECT_NAME: %x\n", HEADER_TO_OBJECT_NAME(ObjectHeader)); + DPRINT("OBJECT_HEADER_TO_NAME_INFO: %x\n", OBJECT_HEADER_TO_NAME_INFO(ObjectHeader)); if ((ObjectHeader->Type != NULL) && (ObjectHeader->Type->TypeInfo.CloseProcedure != NULL)) @@ -128,8 +128,8 @@ if(NewHandleCount == 0) { - if(HEADER_TO_OBJECT_NAME(ObjectHeader) && - HEADER_TO_OBJECT_NAME(ObjectHeader)->Directory != NULL && + if(OBJECT_HEADER_TO_NAME_INFO(ObjectHeader) && + OBJECT_HEADER_TO_NAME_INFO(ObjectHeader)->Directory != NULL && !(ObjectHeader->Flags & OB_FLAG_PERMANENT)) { /* delete the object from the namespace when the last handle got closed. @@ -137,10 +137,10 @@ if it's not a permanent object. */ /* Make sure it's still inserted */ - Context.Directory = HEADER_TO_OBJECT_NAME(ObjectHeader)->Directory; + Context.Directory = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader)->Directory; Context.DirectoryLocked = TRUE; - if (ObpLookupEntryDirectory(HEADER_TO_OBJECT_NAME(ObjectHeader)->Directory, - &HEADER_TO_OBJECT_NAME(ObjectHeader)->Name, + if (ObpLookupEntryDirectory(OBJECT_HEADER_TO_NAME_INFO(ObjectHeader)->Directory, + &OBJECT_HEADER_TO_NAME_INFO(ObjectHeader)->Name, 0, FALSE, &Context)) @@ -599,7 +599,7 @@ CurrentProcess = PsGetCurrentProcess(); - ObjectHeader = BODY_TO_HEADER(ObjectBody); + ObjectHeader = OBJECT_TO_OBJECT_HEADER(ObjectBody); /* check that this is a valid kernel pointer */ ASSERT((ULONG_PTR)ObjectHeader & EX_HANDLE_ENTRY_LOCKED); @@ -739,7 +739,7 @@ PAGED_CODE(); ASSERT(Object); - Header = BODY_TO_HEADER(Object); + Header = OBJECT_TO_OBJECT_HEADER(Object); return Header->HandleCount; } @@ -935,9 +935,9 @@ PAGED_CODE(); /* Get the Header and Create Info */ - Header = BODY_TO_HEADER(Object); + Header = OBJECT_TO_OBJECT_HEADER(Object); ObjectCreateInfo = Header->ObjectCreateInfo; - ObjectNameInfo = HEADER_TO_OBJECT_NAME(Header); + ObjectNameInfo = OBJECT_HEADER_TO_NAME_INFO(Header); /* First try to find the Object */ if (ObjectNameInfo && ObjectNameInfo->Name.Buffer) @@ -961,7 +961,7 @@ if (FoundObject) { DPRINT("Getting header: %x\n", FoundObject); - FoundHeader = BODY_TO_HEADER(FoundObject); + FoundHeader = OBJECT_TO_OBJECT_HEADER(FoundObject); } if (FoundHeader && RemainingPath.Buffer == NULL) @@ -986,7 +986,7 @@ PWSTR BufferPos = RemainingPath.Buffer; ULONG Delta = 0; - ObjectNameInfo = HEADER_TO_OBJECT_NAME(Header); + ObjectNameInfo = OBJECT_HEADER_TO_NAME_INFO(Header); if (BufferPos[0] == L'\\') { Modified: trunk/reactos/ntoskrnl/ob/obinit.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obinit.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obinit.c (original) +++ trunk/reactos/ntoskrnl/ob/obinit.c Fri May 26 00:14:09 2006 @@ -147,20 +147,20 @@ Context.Directory = ObpTypeDirectoryObject; Context.DirectoryLocked = TRUE; if (!ObpLookupEntryDirectory(ObpTypeDirectoryObject, - &HEADER_TO_OBJECT_NAME(BODY_TO_HEADER(ObTypeObjectType))->Name, + &OBJECT_HEADER_TO_NAME_INFO(OBJECT_TO_OBJECT_HEADER(ObTypeObjectType))->Name, OBJ_CASE_INSENSITIVE, FALSE, &Context)) { - ObpInsertEntryDirectory(ObpTypeDirectoryObject, &Context, BODY_TO_HEADER(ObTypeObjectType)); + ObpInsertEntryDirectory(ObpTypeDirectoryObject, &Context, OBJECT_TO_OBJECT_HEADER(ObTypeObjectType)); } if (!ObpLookupEntryDirectory(ObpTypeDirectoryObject, - &HEADER_TO_OBJECT_NAME(BODY_TO_HEADER(ObDirectoryType))->Name, + &OBJECT_HEADER_TO_NAME_INFO(OBJECT_TO_OBJECT_HEADER(ObDirectoryType))->Name, OBJ_CASE_INSENSITIVE, FALSE, &Context)) { - ObpInsertEntryDirectory(ObpTypeDirectoryObject, &Context, BODY_TO_HEADER(ObDirectoryType)); + ObpInsertEntryDirectory(ObpTypeDirectoryObject, &Context, OBJECT_TO_OBJECT_HEADER(ObDirectoryType)); } /* Create 'symbolic link' object type */ Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c Fri May 26 00:14:09 2006 @@ -56,11 +56,11 @@ ObpRemoveSecurityDescriptor(Header->SecurityDescriptor); } - if (HEADER_TO_OBJECT_NAME(Header)) - { - if(HEADER_TO_OBJECT_NAME(Header)->Name.Buffer) - { - ExFreePool(HEADER_TO_OBJECT_NAME(Header)->Name.Buffer); + if (OBJECT_HEADER_TO_NAME_INFO(Header)) + { + if(OBJECT_HEADER_TO_NAME_INFO(Header)->Name.Buffer) + { + ExFreePool(OBJECT_HEADER_TO_NAME_INFO(Header)->Name.Buffer); } } if (Header->ObjectCreateInfo) @@ -70,15 +70,15 @@ } /* To find the header, walk backwards from how we allocated */ - if ((CreatorInfo = HEADER_TO_CREATOR_INFO(Header))) + if ((CreatorInfo = OBJECT_HEADER_TO_CREATOR_INFO(Header))) { HeaderLocation = CreatorInfo; } - if ((NameInfo = HEADER_TO_OBJECT_NAME(Header))) + if ((NameInfo = OBJECT_HEADER_TO_NAME_INFO(Header))) { HeaderLocation = NameInfo; } - if ((HandleInfo = HEADER_TO_HANDLE_INFO(Header))) + if ((HandleInfo = OBJECT_HEADER_TO_HANDLE_INFO(Header))) { HeaderLocation = HandleInfo; } @@ -557,7 +557,7 @@ Status = ObpAllocateObject(NULL, TypeName, ObTypeObjectType, - OBJECT_ALLOC_SIZE(sizeof(OBJECT_TYPE)), + sizeof(OBJECT_TYPE) + sizeof(OBJECT_HEADER), (POBJECT_HEADER*)&Header); if (!NT_SUCCESS(Status)) { @@ -686,10 +686,10 @@ POBJECT_CREATE_INFORMATION ObjectCreateInfo; UNICODE_STRING ObjectName; POBJECT_HEADER Header; - + DPRINT("ObCreateObject(Type %p ObjectAttributes %p, Object %p)\n", Type, ObjectAttributes, Object); - + /* Allocate a Buffer for the Object Create Info */ DPRINT("Allocating Create Buffer\n"); ObjectCreateInfo = ExAllocatePoolWithTag(NonPagedPool, @@ -703,17 +703,16 @@ Type, ObjectCreateInfo, &ObjectName); - + if (NT_SUCCESS(Status)) { /* Allocate the Object */ DPRINT("Allocating: %wZ\n", &ObjectName); Status = ObpAllocateObject(ObjectCreateInfo, &ObjectName, - Type, - OBJECT_ALLOC_SIZE(ObjectSize), + Type, + ObjectSize + sizeof(OBJECT_HEADER), &Header); - if (NT_SUCCESS(Status)) { /* Return the Object */ @@ -723,13 +722,13 @@ /* Return to caller, leave the Capture Info Alive for ObInsert */ return Status; } - + /* Release the Capture Info, we don't need it */ DPRINT1("Allocation failed\n"); ObpReleaseCapturedAttributes(ObjectCreateInfo); if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); } - + /* We failed, so release the Buffer */ DPRINT1("Capture failed\n"); ExFreePool(ObjectCreateInfo); @@ -785,7 +784,7 @@ &HandleInfo); if (!NT_SUCCESS (Status)) return Status; - ObjectHeader = BODY_TO_HEADER(Object); + ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); switch (ObjectInformationClass) { Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c (original) +++ trunk/reactos/ntoskrnl/ob/obname.c Fri May 26 00:14:09 2006 @@ -110,7 +110,7 @@ while (TRUE) { - CurrentHeader = BODY_TO_HEADER(CurrentObject); + CurrentHeader = OBJECT_TO_OBJECT_HEADER(CurrentObject); /* Loop as long as we're dealing with a directory */ while (CurrentHeader->Type == ObDirectoryType) @@ -164,7 +164,7 @@ } ObDereferenceObject(CurrentObject); CurrentObject = NextObject; - CurrentHeader = BODY_TO_HEADER(CurrentObject); + CurrentHeader = OBJECT_TO_OBJECT_HEADER(CurrentObject); } if (CurrentHeader->Type->TypeInfo.ParseProcedure == NULL) @@ -236,8 +236,8 @@ DPRINT("ObQueryNameString: %x, %x\n", Object, ObjectNameInfo); /* Get the Kernel Meta-Structures */ - ObjectHeader = BODY_TO_HEADER(Object); - LocalInfo = HEADER_TO_OBJECT_NAME(ObjectHeader); + ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); + LocalInfo = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader); /* Check if a Query Name Procedure is available */ if (ObjectHeader->Type->TypeInfo.QueryNameProcedure) @@ -299,7 +299,7 @@ while ((ParentDirectory != NameSpaceRoot) && (ParentDirectory)) { /* Get the Name Information */ - LocalInfo = HEADER_TO_OBJECT_NAME(BODY_TO_HEADER(ParentDirectory)); + LocalInfo = OBJECT_HEADER_TO_NAME_INFO(OBJECT_TO_OBJECT_HEADER(ParentDirectory)); /* Add the size of the Directory Name */ if (LocalInfo && LocalInfo->Directory) @@ -336,7 +336,7 @@ * it's easier to start off from the Name we have and walk up the * parent directories. We use the same logic as Name Length calculation. */ - LocalInfo = HEADER_TO_OBJECT_NAME(ObjectHeader); + LocalInfo = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader); ObjectName = (PWCH)((ULONG_PTR)ObjectNameInfo + *ReturnLength); *--ObjectName = UNICODE_NULL; @@ -362,7 +362,7 @@ while ((ParentDirectory != NameSpaceRoot) && (ParentDirectory)) { /* Get the name information */ - LocalInfo = HEADER_TO_OBJECT_NAME(BODY_TO_HEADER(ParentDirectory)); + LocalInfo = OBJECT_HEADER_TO_NAME_INFO(OBJECT_TO_OBJECT_HEADER(ParentDirectory)); /* Add the "\" */ *(--ObjectName) = OBJ_NAME_PATH_SEPARATOR; Modified: trunk/reactos/ntoskrnl/ob/obref.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obref.c?rev=220… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obref.c (original) +++ trunk/reactos/ntoskrnl/ob/obref.c Fri May 26 00:14:09 2006 @@ -77,7 +77,7 @@ PAGED_CODE(); ASSERT(Object); - Header = BODY_TO_HEADER(Object); + Header = OBJECT_TO_OBJECT_HEADER(Object); return Header->PointerCount; } @@ -89,7 +89,7 @@ ASSERT(Object); - Header = BODY_TO_HEADER(Object); + Header = OBJECT_TO_OBJECT_HEADER(Object); /* No one should be referencing an object once we are deleting it. */ if (InterlockedIncrement(&Header->PointerCount) == 1 && !(Header->Flags & OB_FLAG_PERMANENT)) @@ -110,7 +110,7 @@ ASSERT(Object); /* Extract the object header. */ - Header = BODY_TO_HEADER(Object); + Header = OBJECT_TO_OBJECT_HEADER(Object); Permanent = Header->Flags & OB_FLAG_PERMANENT; /* @@ -142,16 +142,16 @@ DPRINT("ObReferenceObjectByPointer(Object %x, ObjectType %x)\n", Object,ObjectType); - Header = BODY_TO_HEADER(Object); + Header = OBJECT_TO_OBJECT_HEADER(Object); if (ObjectType != NULL && Header->Type != ObjectType) { DPRINT("Failed %p (type was %x %wZ) should be %x %wZ\n", Header, Header->Type, - &HEADER_TO_OBJECT_NAME(BODY_TO_HEADER(Header->Type))->Name, + &OBJECT_HEADER_TO_NAME_INFO(OBJECT_TO_OBJECT_HEADER(Header->Type))->Name, ObjectType, - &HEADER_TO_OBJECT_NAME(BODY_TO_HEADER(ObjectType))->Name); + &OBJECT_HEADER_TO_NAME_INFO(OBJECT_TO_OBJECT_HEADER(ObjectType))->Name); return(STATUS_UNSUCCESSFUL); } if (Header->Type == PsProcessType) @@ -409,7 +409,7 @@ if (DesiredAccess & GENERIC_ACCESS) { RtlMapGenericMask(&DesiredAccess, - &BODY_TO_HEADER(ObjectBody)->Type->TypeInfo.GenericMapping); + &OBJECT_TO_OBJECT_HEADER(ObjectBody)->Type->TypeInfo.GenericMapping); } GrantedAccess = HandleEntry->GrantedAccess; Modified: trunk/reactos/ntoskrnl/ob/security.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/security.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ob/security.c (original) +++ trunk/reactos/ntoskrnl/ob/security.c Fri May 26 00:14:09 2006 @@ -105,7 +105,7 @@ NTSTATUS Status; PAGED_CODE(); - Header = BODY_TO_HEADER(Object); + Header = OBJECT_TO_OBJECT_HEADER(Object); if (Header->Type == NULL) return STATUS_UNSUCCESSFUL; if (Header->Type->TypeInfo.SecurityProcedure == NULL) @@ -267,7 +267,7 @@ if (NT_SUCCESS(Status)) { - Header = BODY_TO_HEADER(Object); + Header = OBJECT_TO_OBJECT_HEADER(Object); ASSERT(Header->Type != NULL); Status = Header->Type->TypeInfo.SecurityProcedure( @@ -376,7 +376,7 @@ if (NT_SUCCESS(Status)) { - Header = BODY_TO_HEADER(Object); + Header = OBJECT_TO_OBJECT_HEADER(Object); ASSERT(Header->Type != NULL); Status = Header->Type->TypeInfo.SecurityProcedure( Modified: trunk/reactos/ntoskrnl/ob/wait.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/wait.c?rev=2204… ============================================================================== --- trunk/reactos/ntoskrnl/ob/wait.c (original) +++ trunk/reactos/ntoskrnl/ob/wait.c Fri May 26 00:14:09 2006 @@ -335,7 +335,7 @@ if (NT_SUCCESS(Status)) { /* Get the Waitable Object */ - WaitableObject = BODY_TO_HEADER(Object)->Type->DefaultObject; + WaitableObject = OBJECT_TO_OBJECT_HEADER(Object)->Type->DefaultObject; /* Is it an offset for internal objects? */ if (IsPointerOffset(WaitableObject)) @@ -452,7 +452,7 @@ } /* Get the real waitable object */ - WaitableObject = BODY_TO_HEADER(WaitObj)->Type->DefaultObject; + WaitableObject = OBJECT_TO_OBJECT_HEADER(WaitObj)->Type->DefaultObject; /* Handle internal offset */ if (IsPointerOffset(WaitableObject)) @@ -463,7 +463,7 @@ } /* Check Signal Object Type */ - Type = BODY_TO_HEADER(WaitObj)->Type; + Type = OBJECT_TO_OBJECT_HEADER(WaitObj)->Type; if (Type == ExEventObjectType) { /* Set the Event */ Modified: trunk/reactos/ntoskrnl/se/semgr.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/se/semgr.c?rev=220… ============================================================================== --- trunk/reactos/ntoskrnl/se/semgr.c (original) +++ trunk/reactos/ntoskrnl/se/semgr.c Fri May 26 00:14:09 2006 @@ -212,7 +212,7 @@ PISECURITY_DESCRIPTOR ObjectSd; PISECURITY_DESCRIPTOR NewSd; PISECURITY_DESCRIPTOR SecurityDescriptor = _SecurityDescriptor; - POBJECT_HEADER Header = BODY_TO_HEADER(Object); + POBJECT_HEADER Header = OBJECT_TO_OBJECT_HEADER(Object); PSID Owner = 0; PSID Group = 0; PACL Dacl = 0;

18 years, 3 months

[ion] 22044: - Convert all Win32k Object callback functions to the correct NT prototypes. - Get rid of ROS-internal WIN32_CALLOUT_DATA and use the real WIN32_CALLOUTS_FPNS type. - Get rid of the callout.h hack.

by ion＠svn.reactos.org

Author: ion Date: Fri May 26 00:03:13 2006 New Revision: 22044 URL: http://svn.reactos.ru/svn/reactos?rev=22044&view=rev Log: - Convert all Win32k Object callback functions to the correct NT prototypes. - Get rid of ROS-internal WIN32_CALLOUT_DATA and use the real WIN32_CALLOUTS_FPNS type. - Get rid of the callout.h hack. Removed: trunk/reactos/include/reactos/win32k/callout.h Modified: trunk/reactos/include/ndk/pstypes.h trunk/reactos/ntoskrnl/ex/win32k.c trunk/reactos/ntoskrnl/ps/win32.c trunk/reactos/subsystems/win32/win32k/include/desktop.h trunk/reactos/subsystems/win32/win32k/include/winsta.h trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=2… ============================================================================== --- trunk/reactos/include/ndk/pstypes.h (original) +++ trunk/reactos/include/ndk/pstypes.h Fri May 26 00:03:13 2006 @@ -334,7 +334,7 @@ struct _WIN32_POWERSTATE_PARAMETERS; struct _WIN32_JOBCALLOUT_PARAMETERS; struct _WIN32_OPENMETHOD_PARAMETERS; -struct _WIN32_OKTOCLOSEMETHOD_PARAMETERS; +struct _WIN32_OKAYTOCLOSEMETHOD_PARAMETERS; struct _WIN32_CLOSEMETHOD_PARAMETERS; struct _WIN32_DELETEMETHOD_PARAMETERS; struct _WIN32_PARSEMETHOD_PARAMETERS; @@ -342,69 +342,82 @@ // // Win32K Process and Thread Callbacks // -typedef NTSTATUS +typedef +NTSTATUS (NTAPI *PKWIN32_PROCESS_CALLOUT)( struct _EPROCESS *Process, BOOLEAN Create ); -typedef NTSTATUS +typedef +NTSTATUS (NTAPI *PKWIN32_THREAD_CALLOUT)( struct _ETHREAD *Thread, PSW32THREADCALLOUTTYPE Type ); -typedef NTSTATUS +typedef +NTSTATUS (NTAPI *PKWIN32_GLOBALATOMTABLE_CALLOUT)( VOID ); -typedef NTSTATUS +typedef +NTSTATUS (NTAPI *PKWIN32_POWEREVENT_CALLOUT)( struct _WIN32_POWEREVENT_PARAMETERS *Parameters ); -typedef NTSTATUS +typedef +NTSTATUS (NTAPI *PKWIN32_POWERSTATE_CALLOUT)( struct _WIN32_POWERSTATE_PARAMETERS *Parameters ); -typedef NTSTATUS +typedef +NTSTATUS (NTAPI *PKWIN32_JOB_CALLOUT)( struct _WIN32_JOBCALLOUT_PARAMETERS *Parameters ); -typedef NTSTATUS +typedef +NTSTATUS (NTAPI *PGDI_BATCHFLUSH_ROUTINE)( VOID ); -typedef NTSTATUS +typedef +NTSTATUS (NTAPI *PKWIN32_OPENMETHOD_CALLOUT)( struct _WIN32_OPENMETHOD_PARAMETERS *Parameters ); -typedef NTSTATUS +typedef +NTSTATUS (NTAPI *PKWIN32_OKTOCLOSEMETHOD_CALLOUT)( - struct _WIN32_OKTOCLOSEMETHOD_PARAMETERS *Parameters + struct _WIN32_OKAYTOCLOSEMETHOD_PARAMETERS *Parameters ); -typedef NTSTATUS +typedef +NTSTATUS (NTAPI *PKWIN32_CLOSEMETHOD_CALLOUT)( struct _WIN32_CLOSEMETHOD_PARAMETERS *Parameters ); -typedef NTSTATUS +typedef +VOID (NTAPI *PKWIN32_DELETEMETHOD_CALLOUT)( struct _WIN32_DELETEMETHOD_PARAMETERS *Parameters ); -typedef NTSTATUS +typedef +NTSTATUS (NTAPI *PKWIN32_PARSEMETHOD_CALLOUT)( struct _WIN32_PARSEMETHOD_PARAMETERS *Parameters ); -typedef NTSTATUS +typedef +NTSTATUS (NTAPI *PKWIN32_WIN32DATACOLLECTION_CALLOUT)( struct _EPROCESS *Process, PVOID Callback, Removed: trunk/reactos/include/reactos/win32k/callout.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/reactos/win32k/call… ============================================================================== --- trunk/reactos/include/reactos/win32k/callout.h (original) +++ trunk/reactos/include/reactos/win32k/callout.h (removed) @@ -1,18 +1,0 @@ -#ifndef _CALLOUT_ -#define _CALLOUT_ - -#include <internal/ob.h> - -typedef struct _W32_CALLOUT_DATA -{ - PKWIN32_PROCESS_CALLOUT W32ProcessCallout; - PKWIN32_THREAD_CALLOUT W32ThreadCallout; - OB_OPEN_METHOD DesktopOpen; - OB_DELETE_METHOD DesktopDelete; - OB_DELETE_METHOD WinStaDelete; - OB_PARSE_METHOD WinStaParse; - OB_OPEN_METHOD WinStaOpen; - OB_PARSE_METHOD DesktopParse; -} W32_CALLOUT_DATA, *PW32_CALLOUT_DATA; - -#endif Modified: trunk/reactos/ntoskrnl/ex/win32k.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ex/win32k.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ex/win32k.c (original) +++ trunk/reactos/ntoskrnl/ex/win32k.c Fri May 26 00:03:13 2006 @@ -19,7 +19,7 @@ POBJECT_TYPE ExWindowStationObjectType = NULL; POBJECT_TYPE ExDesktopObjectType = NULL; -static GENERIC_MAPPING ExpWindowStationMapping = +GENERIC_MAPPING ExpWindowStationMapping = { STANDARD_RIGHTS_READ, STANDARD_RIGHTS_WRITE, @@ -27,7 +27,7 @@ STANDARD_RIGHTS_REQUIRED }; -static GENERIC_MAPPING ExpDesktopMapping = +GENERIC_MAPPING ExpDesktopMapping = { STANDARD_RIGHTS_READ, STANDARD_RIGHTS_WRITE, @@ -35,11 +35,10 @@ STANDARD_RIGHTS_REQUIRED }; -OB_OPEN_METHOD ExpWindowStationObjectOpen = NULL; -OB_PARSE_METHOD ExpWindowStationObjectParse = NULL; -OB_DELETE_METHOD ExpWindowStationObjectDelete = NULL; -OB_PARSE_METHOD ExpDesktopObjectParse = NULL; -OB_DELETE_METHOD ExpDesktopObjectDelete = NULL; +PKWIN32_OPENMETHOD_CALLOUT ExpWindowStationObjectOpen = NULL; +PKWIN32_PARSEMETHOD_CALLOUT ExpWindowStationObjectParse = NULL; +PKWIN32_DELETEMETHOD_CALLOUT ExpWindowStationObjectDelete = NULL; +PKWIN32_DELETEMETHOD_CALLOUT ExpDesktopObjectDelete = NULL; /* FUNCTIONS ****************************************************************/ @@ -51,20 +50,30 @@ ACCESS_MASK GrantedAccess, ULONG HandleCount) { + WIN32_OPENMETHOD_PARAMETERS Parameters; + + /* Fill out the callback structure */ + Parameters.OpenReason = Reason; + Parameters.Process = Process; + Parameters.Object = ObjectBody; + Parameters.GrantedAccess = GrantedAccess; + Parameters.HandleCount = HandleCount; + /* Call the Registered Callback */ - return ExpWindowStationObjectOpen(Reason, - Process, - ObjectBody, - GrantedAccess, - HandleCount); + return ExpWindowStationObjectOpen(&Parameters); } VOID STDCALL ExpWinStaObjectDelete(PVOID DeletedObject) { + WIN32_DELETEMETHOD_PARAMETERS Parameters; + + /* Fill out the callback structure */ + Parameters.Object = DeletedObject; + /* Call the Registered Callback */ - ExpWindowStationObjectDelete(DeletedObject); + ExpWindowStationObjectDelete(&Parameters); } NTSTATUS @@ -80,24 +89,34 @@ IN PSECURITY_QUALITY_OF_SERVICE SecurityQos OPTIONAL, OUT PVOID *Object) { + WIN32_PARSEMETHOD_PARAMETERS Parameters; + + /* Fill out the callback structure */ + Parameters.ParseObject = ParseObject; + Parameters.ObjectType = ObjectType; + Parameters.AccessState = AccessState; + Parameters.AccessMode = AccessMode; + Parameters.Attributes = Attributes; + Parameters.CompleteName = CompleteName; + Parameters.RemainingName = RemainingName; + Parameters.Context = Context; + Parameters.SecurityQos = SecurityQos; + Parameters.Object = Object; + /* Call the Registered Callback */ - return ExpWindowStationObjectParse(ParseObject, - ObjectType, - AccessState, - AccessMode, - Attributes, - CompleteName, - RemainingName, - Context, - SecurityQos, - Object); + return ExpWindowStationObjectParse(&Parameters); } VOID STDCALL ExpDesktopDelete(PVOID DeletedObject) { + WIN32_DELETEMETHOD_PARAMETERS Parameters; + + /* Fill out the callback structure */ + Parameters.Object = DeletedObject; + /* Call the Registered Callback */ - ExpDesktopObjectDelete(DeletedObject); + ExpDesktopObjectDelete(&Parameters); } VOID Modified: trunk/reactos/ntoskrnl/ps/win32.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ps/win32.c?rev=220… ============================================================================== --- trunk/reactos/ntoskrnl/ps/win32.c (original) +++ trunk/reactos/ntoskrnl/ps/win32.c Fri May 26 00:03:13 2006 @@ -13,18 +13,15 @@ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> -#include <win32k/callout.h> /* GLOBALS ******************************************************************/ static PKWIN32_PROCESS_CALLOUT PspWin32ProcessCallback = NULL; static PKWIN32_THREAD_CALLOUT PspWin32ThreadCallback = NULL; - -extern OB_OPEN_METHOD ExpWindowStationObjectOpen; -extern OB_PARSE_METHOD ExpWindowStationObjectParse; -extern OB_DELETE_METHOD ExpWindowStationObjectDelete; -extern OB_PARSE_METHOD ExpDesktopObjectParse; -extern OB_DELETE_METHOD ExpDesktopObjectDelete; +extern PKWIN32_OPENMETHOD_CALLOUT ExpWindowStationObjectOpen; +extern PKWIN32_PARSEMETHOD_CALLOUT ExpWindowStationObjectParse; +extern PKWIN32_DELETEMETHOD_CALLOUT ExpWindowStationObjectDelete; +extern PKWIN32_DELETEMETHOD_CALLOUT ExpDesktopObjectDelete; #ifndef ALEX_CB_REWRITE typedef struct _NTW32CALL_SAVED_STATE @@ -55,16 +52,14 @@ */ VOID STDCALL -PsEstablishWin32Callouts(PWIN32_CALLOUTS_FPNS calloutData) -{ - PW32_CALLOUT_DATA CalloutData = (PW32_CALLOUT_DATA)calloutData; - PspWin32ProcessCallback = CalloutData->W32ProcessCallout; - PspWin32ThreadCallback = CalloutData->W32ThreadCallout; - ExpWindowStationObjectOpen = CalloutData->WinStaOpen; - ExpWindowStationObjectParse = CalloutData->WinStaParse; - ExpWindowStationObjectDelete = CalloutData->WinStaDelete; - ExpDesktopObjectParse = CalloutData->DesktopParse; - ExpDesktopObjectDelete = CalloutData->DesktopDelete; +PsEstablishWin32Callouts(PWIN32_CALLOUTS_FPNS CalloutData) +{ + PspWin32ProcessCallback = CalloutData->ProcessCallout; + PspWin32ThreadCallback = CalloutData->ThreadCallout; + ExpWindowStationObjectOpen = CalloutData->WindowStationOpenProcedure; + ExpWindowStationObjectParse = CalloutData->WindowStationParseProcedure; + ExpWindowStationObjectDelete = CalloutData->WindowStationDeleteProcedure; + ExpDesktopObjectDelete = CalloutData->DesktopDeleteProcedure; } NTSTATUS Modified: trunk/reactos/subsystems/win32/win32k/include/desktop.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/inc… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/desktop.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/desktop.h Fri May 26 00:03:13 2006 @@ -61,7 +61,7 @@ OUT PVOID *Object); VOID STDCALL -IntDesktopObjectDelete(PVOID DeletedObject); +IntDesktopObjectDelete(PWIN32_DELETEMETHOD_PARAMETERS Parameters); VOID FASTCALL IntGetDesktopWorkArea(PDESKTOP_OBJECT Desktop, PRECT Rect); Modified: trunk/reactos/subsystems/win32/win32k/include/winsta.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/inc… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/winsta.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/winsta.h Fri May 26 00:03:13 2006 @@ -54,32 +54,14 @@ NTSTATUS STDCALL -IntWinStaObjectOpen(IN OB_OPEN_REASON Reason, - IN PEPROCESS Process OPTIONAL, - IN PVOID ObjectBody, - IN ACCESS_MASK GrantedAccess, - IN ULONG HandleCount); +IntWinStaObjectOpen(PWIN32_OPENMETHOD_PARAMETERS Parameters); VOID STDCALL -IntWinStaObjectDelete(PVOID DeletedObject); - -PVOID STDCALL -IntWinStaObjectFind(PVOID Object, - PWSTR Name, - ULONG Attributes); +IntWinStaObjectDelete(PWIN32_DELETEMETHOD_PARAMETERS Parameters); NTSTATUS STDCALL -IntWinStaObjectParse(IN PVOID ParseObject, - IN PVOID ObjectType, - IN OUT PACCESS_STATE AccessState, - IN KPROCESSOR_MODE AccessMode, - IN ULONG Attributes, - IN OUT PUNICODE_STRING CompleteName, - IN OUT PUNICODE_STRING RemainingName, - IN OUT PVOID Context OPTIONAL, - IN PSECURITY_QUALITY_OF_SERVICE SecurityQos OPTIONAL, - OUT PVOID *Object); +IntWinStaObjectParse(PWIN32_PARSEMETHOD_PARAMETERS Parameters); NTSTATUS FASTCALL IntValidateWindowStationHandle( Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/mai… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c Fri May 26 00:03:13 2006 @@ -23,7 +23,6 @@ #include <w32k.h> #include <include/napi.h> -#include <win32k/callout.h> #define NDEBUG #include <debug.h> @@ -360,7 +359,7 @@ { NTSTATUS Status; BOOLEAN Result; - W32_CALLOUT_DATA CalloutData; + WIN32_CALLOUTS_FPNS CalloutData; PVOID GlobalUserHeapBase = NULL; /* @@ -381,13 +380,12 @@ /* * Register Object Manager Callbacks */ - CalloutData.WinStaOpen = IntWinStaObjectOpen; - CalloutData.WinStaParse = IntWinStaObjectParse; - CalloutData.WinStaDelete = IntWinStaObjectDelete; - CalloutData.DesktopParse = IntDesktopObjectParse; - CalloutData.DesktopDelete = IntDesktopObjectDelete; - CalloutData.W32ProcessCallout = Win32kProcessCallback; - CalloutData.W32ThreadCallout = Win32kThreadCallback; + CalloutData.WindowStationOpenProcedure = IntWinStaObjectOpen; + CalloutData.WindowStationParseProcedure = IntWinStaObjectParse; + CalloutData.WindowStationDeleteProcedure = IntWinStaObjectDelete; + CalloutData.DesktopDeleteProcedure = IntDesktopObjectDelete; + CalloutData.ProcessCallout = Win32kProcessCallback; + CalloutData.ThreadCallout = Win32kThreadCallback; /* * Register our per-process and per-thread structures. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c Fri May 26 00:03:13 2006 @@ -93,7 +93,6 @@ PUNICODE_STRING DesktopName; /* Set the list pointers and loop the window station */ - DPRINT1("Creating desktop(%wZ)\n", RemainingName); ListHead = &WinStaObject->DesktopListHead; NextEntry = ListHead->Flink; while (NextEntry != ListHead) @@ -174,9 +173,9 @@ } VOID STDCALL -IntDesktopObjectDelete(PVOID DeletedObject) -{ - PDESKTOP_OBJECT Desktop = (PDESKTOP_OBJECT)DeletedObject; +IntDesktopObjectDelete(PWIN32_DELETEMETHOD_PARAMETERS Parameters) +{ + PDESKTOP_OBJECT Desktop = (PDESKTOP_OBJECT)Parameters->Object; DPRINT("Deleting desktop (0x%X)\n", Desktop); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Fri May 26 00:03:13 2006 @@ -96,15 +96,11 @@ NTSTATUS STDCALL -IntWinStaObjectOpen(OB_OPEN_REASON Reason, - PEPROCESS Process, - PVOID ObjectBody, - ACCESS_MASK GrantedAccess, - ULONG HandleCount) -{ - PWINSTATION_OBJECT WinSta = (PWINSTATION_OBJECT)ObjectBody; - NTSTATUS Status; - +IntWinStaObjectOpen(PWIN32_OPENMETHOD_PARAMETERS Parameters) +{ + PWINSTATION_OBJECT WinSta = (PWINSTATION_OBJECT)Parameters->Object; + OB_OPEN_REASON Reason = Parameters->OpenReason; + NTSTATUS Status; if (Reason == ObCreateHandle) { @@ -125,9 +121,9 @@ } VOID STDCALL -IntWinStaObjectDelete(PVOID DeletedObject) -{ - PWINSTATION_OBJECT WinSta = (PWINSTATION_OBJECT)DeletedObject; +IntWinStaObjectDelete(PWIN32_DELETEMETHOD_PARAMETERS Parameters) +{ + PWINSTATION_OBJECT WinSta = (PWINSTATION_OBJECT)Parameters->Object; DPRINT("Deleting window station (0x%X)\n", WinSta); @@ -138,27 +134,18 @@ NTSTATUS STDCALL -IntWinStaObjectParse(IN PVOID Object, - IN PVOID ObjectType, - IN OUT PACCESS_STATE AccessState, - IN KPROCESSOR_MODE AccessMode, - IN ULONG Attributes, - IN OUT PUNICODE_STRING FullPath, - IN OUT PUNICODE_STRING RemainingName, - IN OUT PVOID Context OPTIONAL, - IN PSECURITY_QUALITY_OF_SERVICE SecurityQos OPTIONAL, - OUT PVOID *NextObject) -{ - DPRINT("Object (0x%X) Path (0x%X) *Path (%wZ)\n", Object, RemainingName, RemainingName); +IntWinStaObjectParse(PWIN32_PARSEMETHOD_PARAMETERS Parameters) +{ + PUNICODE_STRING RemainingName = Parameters->RemainingName; /* Assume we don't find anything */ - *NextObject = NULL; + *Parameters->Object = NULL; /* Check for an empty name */ if (!RemainingName->Length) { /* Make sure this is a window station, can't parse a desktop now */ - if (ObjectType != ExWindowStationObjectType) + if (Parameters->ObjectType != ExWindowStationObjectType) { /* Fail */ return STATUS_OBJECT_TYPE_MISMATCH; @@ -191,19 +178,19 @@ * FIXME: ROS Sends the wrong Object Type. The parsed object's type * should be sent, not the parsed parent's. */ - if (ObjectType == ExWindowStationObjectType) + if (Parameters->ObjectType == ExWindowStationObjectType) { /* Then call the desktop parse routine */ - return IntDesktopObjectParse(Object, - ObjectType, - AccessState, - AccessMode, - Attributes, - FullPath, + return IntDesktopObjectParse(Parameters->ParseObject, + Parameters->ObjectType, + Parameters->AccessState, + Parameters->AccessMode, + Parameters->Attributes, + Parameters->CompleteName, RemainingName, - Context, - SecurityQos, - NextObject); + Parameters->Context, + Parameters->SecurityQos, + Parameters->Object); } /* Should hopefully never get here */

18 years, 3 months

[fireball] 22043: [AUDIT] kernel32.dll - Remove locks from Wine code, and from simple stub or forward type of functions - Add file headers to all files (except shared completely with Wine) - Mark a pair of functions as shared with Wine (to be changed later when adding correct function headers)

by fireball＠svn.reactos.org

Author: fireball Date: Thu May 25 23:50:19 2006 New Revision: 22043 URL: http://svn.reactos.ru/svn/reactos?rev=22043&view=rev Log: [AUDIT] kernel32.dll - Remove locks from Wine code, and from simple stub or forward type of functions - Add file headers to all files (except shared completely with Wine) - Mark a pair of functions as shared with Wine (to be changed later when adding correct function headers) Modified: trunk/reactos/dll/win32/kernel32/file/volume.c trunk/reactos/dll/win32/kernel32/mem/isbad.c (contents, props changed) trunk/reactos/dll/win32/kernel32/mem/local.c (props changed) trunk/reactos/dll/win32/kernel32/misc/error.c trunk/reactos/dll/win32/kernel32/misc/lang.c trunk/reactos/dll/win32/kernel32/misc/muldiv.c trunk/reactos/dll/win32/kernel32/misc/nls.c trunk/reactos/dll/win32/kernel32/misc/perfcnt.c trunk/reactos/dll/win32/kernel32/misc/recovery.c trunk/reactos/dll/win32/kernel32/misc/sysinfo.c trunk/reactos/dll/win32/kernel32/misc/timerqueue.c trunk/reactos/dll/win32/kernel32/misc/toolhelp.c Modified: trunk/reactos/dll/win32/kernel32/file/volume.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/kernel32/file/vol… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/volume.c (original) +++ trunk/reactos/dll/win32/kernel32/file/volume.c Thu May 25 23:50:19 2006 @@ -82,6 +82,7 @@ /* * @implemented */ +/* Synced to Wine-? */ DWORD STDCALL GetLogicalDriveStringsA(DWORD nBufferLength, LPSTR lpBuffer) @@ -119,6 +120,7 @@ /* * @implemented */ +/* Synced to Wine-? */ DWORD STDCALL GetLogicalDriveStringsW(DWORD nBufferLength, LPWSTR lpBuffer) @@ -154,6 +156,7 @@ /* * @implemented */ +/* Synced to Wine-? */ DWORD STDCALL GetLogicalDrives(VOID) { Modified: trunk/reactos/dll/win32/kernel32/mem/isbad.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/isba… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/isbad.c (original) +++ trunk/reactos/dll/win32/kernel32/mem/isbad.c Thu May 25 23:50:19 2006 @@ -1,10 +1,16 @@ /* $Id$ * - * lib/kernel32/mem/isbad.c - * - * ReactOS Operating System - * - */ + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: dll/win32/kernel32/mem/isbad.c + * PURPOSE: + * PROGRAMMER: Ariadne ( ariadne(a)xs4all.nl) + * Ge van Geldorp + * Filip Navara + * UPDATE HISTORY: + * Created 03/10/99 + */ + #include <k32.h> #define NDEBUG Propchange: trunk/reactos/dll/win32/kernel32/mem/isbad.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/mem/local.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/dll/win32/kernel32/misc/error.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/err… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/error.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/error.c Thu May 25 23:50:19 2006 @@ -1,8 +1,15 @@ /* $Id$ * - * reactos/lib/kernel32/misc/error.c - * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: dll/win32/kernel32/misc/error.c + * PURPOSE: Environment functions + * PROGRAMMER: Emanuele Aliberti + * Thomas Weidenmueller + * UPDATE HISTORY: + * Created 05/10/98 */ + #include <k32.h> @@ -15,11 +22,9 @@ */ VOID STDCALL -SetLastError ( - DWORD dwErrorCode - ) +SetLastError (DWORD dwErrorCode) { - NtCurrentTeb ()->LastErrorValue = (ULONG) dwErrorCode; + NtCurrentTeb ()->LastErrorValue = (ULONG) dwErrorCode; } @@ -30,7 +35,7 @@ STDCALL GetLastError (VOID) { - return (DWORD) (NtCurrentTeb ()->LastErrorValue); + return (DWORD) (NtCurrentTeb ()->LastErrorValue); } Modified: trunk/reactos/dll/win32/kernel32/misc/lang.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/lan… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/lang.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/lang.c Thu May 25 23:50:19 2006 @@ -1,9 +1,18 @@ -/* - * PROJECT: ReactOS user mode libraries - * LICENSE: GPL - See COPYING in the top level directory - * FILE: reactos/lib/kernel32/misc/lang.c - * PURPOSE: - * PROGRAMMERS: ??? +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: dll/win32/kernel32/file/lang.c + * PURPOSE: National Laguage Support related funcs + * PROGRAMMER: Thomas Weidenmueller + * Gunnar Andre Dalsnes + * Aleksey Bragin + * Eric Kohl + * Alex Ionescu + * Richard Campbell + * James Tabor + * UPDATE HISTORY: + * Created 21/09/2003 */ #include <k32.h> @@ -792,6 +801,7 @@ /* * @implemented */ +/* Synced to Wine-20102004 */ int STDCALL CompareStringA ( Modified: trunk/reactos/dll/win32/kernel32/misc/muldiv.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/mul… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/muldiv.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/muldiv.c Thu May 25 23:50:19 2006 @@ -1,6 +1,15 @@ /* $Id$ * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: dll/win32/kernel32/misc/muldiv.c + * PURPOSE: + * PROGRAMMER: Casper S. Hornstrup + * Gunnar Andre Dalsnes + * UPDATE HISTORY: + * Created 06/12/2002 */ + #include <k32.h> Modified: trunk/reactos/dll/win32/kernel32/misc/nls.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/nls… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/nls.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/nls.c Thu May 25 23:50:19 2006 @@ -1,24 +1,15 @@ -/* - * ReactOS Kernel - * Copyright (C) 2004 ReactOS Team - * - * 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. - */ -/** - * @brief National Language Support. - * @author Filip Navara +/* $Id$ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: dll/win32/kernel32/misc/nls.c + * PURPOSE: National Language Support + * PROGRAMMER: Filip Navara + * Hartmut Birr + * Gunnar Andre Dalsnes + * Thomas Weidenmueller + * UPDATE HISTORY: + * Created 24/08/2004 */ /* INCLUDES *******************************************************************/ Modified: trunk/reactos/dll/win32/kernel32/misc/perfcnt.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/per… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/perfcnt.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/perfcnt.c Thu May 25 23:50:19 2006 @@ -1,23 +1,6 @@ -/* - * ReactOS kernel - * Copyright (C) 2003 ReactOS Team - * - * 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. - */ /* $Id$ */ /* + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/kernel32/misc/perfcnt.c * PURPOSE: Performance counter Modified: trunk/reactos/dll/win32/kernel32/misc/recovery.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/rec… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/recovery.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/recovery.c Thu May 25 23:50:19 2006 @@ -1,24 +1,4 @@ -/* - * ReactOS kernel - * Copyright (C) 2005 ReactOS Team - * - * 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. - */ /* $Id$ - * - * KERNEL32.DLL application recovery functions * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries Modified: trunk/reactos/dll/win32/kernel32/misc/sysinfo.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/sys… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/sysinfo.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/sysinfo.c Thu May 25 23:50:19 2006 @@ -1,8 +1,17 @@ /* $Id$ * - * reactos/lib/kernel32/misc/sysinfo.c - * - */ + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: dll/win32/kernel32/misc/sysinfo.c + * PURPOSE: SystemInfo functions + * PROGRAMMER: Emanuele Aliberti + * Christoph von Wittich + * Thomas Weidenmueller + * Gunnar Andre Dalsnes + * UPDATE HISTORY: + * 2000-04-26 created + */ + #include <k32.h> #define NDEBUG Modified: trunk/reactos/dll/win32/kernel32/misc/timerqueue.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/tim… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/timerqueue.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/timerqueue.c Thu May 25 23:50:19 2006 @@ -1,27 +1,9 @@ -/* - * ReactOS kernel - * Copyright (C) 2004 ReactOS Team - * - * 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. - */ /* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * PURPOSE: Timer Queue functions - * FILE: lib/kernel32/misc/timerqueue.c + * FILE: dll/win32/kernel32/misc/timerqueue.c * PROGRAMER: Thomas Weidenmueller <w3seek(a)reactos.com> */ Modified: trunk/reactos/dll/win32/kernel32/misc/toolhelp.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/too… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/toolhelp.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/toolhelp.c Thu May 25 23:50:19 2006 @@ -1,28 +1,8 @@ -/* - * ReactOS kernel - * Copyright (C) 2004 ReactOS Team - * - * 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. - */ /* $Id$ - * - * KERNEL32.DLL toolhelp functions * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * FILE: lib/kernel32/misc/toolhelp.c + * FILE: dll/win32/kernel32/misc/toolhelp.c * PURPOSE: Toolhelp functions * PROGRAMMER: Thomas Weidenmueller <w3seek(a)reactos.com> * Robert Dickenson (robd(a)mok.lvcm.com)

18 years, 3 months

[sedwards] 22042: started syncing to Wine-0.9.14

by sedwards＠svn.reactos.org

Author: sedwards Date: Thu May 25 23:43:52 2006 New Revision: 22042 URL: http://svn.reactos.ru/svn/reactos?rev=22042&view=rev Log: started syncing to Wine-0.9.14 Modified: trunk/reactos/tools/unicode/cpmap.pl trunk/reactos/tools/unicode/cptable.c trunk/reactos/tools/unicode/defaults trunk/reactos/tools/unicode/fold.c trunk/reactos/tools/unicode/mbtowc.c trunk/reactos/tools/unicode/sortkey.c trunk/reactos/tools/unicode/string.c trunk/reactos/tools/unicode/utf8.c trunk/reactos/tools/unicode/wctomb.c trunk/reactos/tools/unicode/wine/unicode.h trunk/reactos/tools/unicode/wine_unicode.def Modified: trunk/reactos/tools/unicode/cpmap.pl URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/unicode/cpmap.pl?rev=… ============================================================================== --- trunk/reactos/tools/unicode/cpmap.pl (original) +++ trunk/reactos/tools/unicode/cpmap.pl Thu May 25 23:43:52 2006 @@ -16,7 +16,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA # # base directory for ftp.unicode.org files Modified: trunk/reactos/tools/unicode/cptable.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/unicode/cptable.c?rev… ============================================================================== --- trunk/reactos/tools/unicode/cptable.c (original) +++ trunk/reactos/tools/unicode/cptable.c Thu May 25 23:43:52 2006 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <stdlib.h> @@ -156,7 +156,7 @@ static int cmp_codepage( const void *codepage, const void *entry ) { - return *(unsigned int *)codepage - (*(const union cptable *const *)entry)->info.codepage; + return *(const unsigned int *)codepage - (*(const union cptable *const *)entry)->info.codepage; } Modified: trunk/reactos/tools/unicode/defaults URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/unicode/defaults?rev=… ============================================================================== --- trunk/reactos/tools/unicode/defaults (original) +++ trunk/reactos/tools/unicode/defaults Thu May 25 23:43:52 2006 @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA # # NOTES: # Modified: trunk/reactos/tools/unicode/fold.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/unicode/fold.c?rev=22… ============================================================================== --- trunk/reactos/tools/unicode/fold.c (original) +++ trunk/reactos/tools/unicode/fold.c Thu May 25 23:43:52 2006 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include "wine/unicode.h" Modified: trunk/reactos/tools/unicode/mbtowc.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/unicode/mbtowc.c?rev=… ============================================================================== --- trunk/reactos/tools/unicode/mbtowc.c (original) +++ trunk/reactos/tools/unicode/mbtowc.c Thu May 25 23:43:52 2006 @@ -15,14 +15,12 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <string.h> #include "wine/unicode.h" - -typedef unsigned char uchar; /* get the decomposition of a Unicode char */ static int get_decomposition( WCHAR src, WCHAR *dst, unsigned int dstlen ) @@ -260,25 +258,25 @@ { if (flags & MB_ERR_INVALID_CHARS) { - if (check_invalid_chars_sbcs( &table->sbcs, (const uchar*)src, srclen )) return -2; + if (check_invalid_chars_sbcs( &table->sbcs, src, srclen )) return -2; } if (!(flags & MB_COMPOSITE)) { if (!dstlen) return srclen; - return mbstowcs_sbcs( &table->sbcs, (const uchar*)src, srclen, dst, dstlen ); - } - return mbstowcs_sbcs_decompose( &table->sbcs, (const uchar*)src, srclen, dst, dstlen ); + return mbstowcs_sbcs( &table->sbcs, src, srclen, dst, dstlen ); + } + return mbstowcs_sbcs_decompose( &table->sbcs, src, srclen, dst, dstlen ); } else /* mbcs */ { if (flags & MB_ERR_INVALID_CHARS) { - if (check_invalid_chars_dbcs( &table->dbcs, (const uchar*)src, srclen )) return -2; + if (check_invalid_chars_dbcs( &table->dbcs, src, srclen )) return -2; } if (!(flags & MB_COMPOSITE)) - return mbstowcs_dbcs( &table->dbcs, (const uchar*)src, srclen, dst, dstlen ); + return mbstowcs_dbcs( &table->dbcs, src, srclen, dst, dstlen ); else - return mbstowcs_dbcs_decompose( &table->dbcs, (const uchar*)src, srclen, dst, dstlen ); + return mbstowcs_dbcs_decompose( &table->dbcs, src, srclen, dst, dstlen ); } } Modified: trunk/reactos/tools/unicode/sortkey.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/unicode/sortkey.c?rev… ============================================================================== --- trunk/reactos/tools/unicode/sortkey.c (original) +++ trunk/reactos/tools/unicode/sortkey.c Thu May 25 23:43:52 2006 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include "wine/unicode.h" Modified: trunk/reactos/tools/unicode/string.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/unicode/string.c?rev=… ============================================================================== --- trunk/reactos/tools/unicode/string.c (original) +++ trunk/reactos/tools/unicode/string.c Thu May 25 23:43:52 2006 @@ -15,14 +15,198 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <limits.h> #include <stdio.h> -#include <ctype.h> #include "wine/unicode.h" + +extern const WCHAR wine_casemap_lower[]; +extern const WCHAR wine_casemap_upper[]; +extern const unsigned short wine_wctype_table[]; + +int wine_is_dbcs_leadbyte( const union cptable *table, unsigned char ch ) +{ + return (table->info.char_size == 2) && (table->dbcs.cp2uni_leadbytes[ch]); +} + +WCHAR tolowerW( WCHAR ch ) +{ + return ch + wine_casemap_lower[wine_casemap_lower[ch >> 8] + (ch & 0xff)]; +} + +WCHAR toupperW( WCHAR ch ) +{ + return ch + wine_casemap_upper[wine_casemap_upper[ch >> 8] + (ch & 0xff)]; +} + +/* the character type contains the C1_* flags in the low 12 bits */ +/* and the C2_* type in the high 4 bits */ +unsigned short get_char_typeW( WCHAR ch ) +{ + return wine_wctype_table[wine_wctype_table[ch >> 8] + (ch & 0xff)]; +} + +int iscntrlW( WCHAR wc ) +{ + return get_char_typeW(wc) & C1_CNTRL; +} + +int ispunctW( WCHAR wc ) +{ + return get_char_typeW(wc) & C1_PUNCT; +} + +int isspaceW( WCHAR wc ) +{ + return get_char_typeW(wc) & C1_SPACE; +} + +int isdigitW( WCHAR wc ) +{ + return get_char_typeW(wc) & C1_DIGIT; +} + +int isxdigitW( WCHAR wc ) +{ + return get_char_typeW(wc) & C1_XDIGIT; +} + +int islowerW( WCHAR wc ) +{ + return get_char_typeW(wc) & C1_LOWER; +} + +int isupperW( WCHAR wc ) +{ + return get_char_typeW(wc) & C1_UPPER; +} + +int isalnumW( WCHAR wc ) +{ + return get_char_typeW(wc) & (C1_ALPHA|C1_DIGIT|C1_LOWER|C1_UPPER); +} + +int isalphaW( WCHAR wc ) +{ + return get_char_typeW(wc) & (C1_ALPHA|C1_LOWER|C1_UPPER); +} + +int isgraphW( WCHAR wc ) +{ + return get_char_typeW(wc) & (C1_ALPHA|C1_PUNCT|C1_DIGIT|C1_LOWER|C1_UPPER); +} + +int isprintW( WCHAR wc ) +{ + return get_char_typeW(wc) & (C1_ALPHA|C1_BLANK|C1_PUNCT|C1_DIGIT|C1_LOWER|C1_UPPER); +} + +unsigned int strlenW( const WCHAR *str ) +{ + const WCHAR *s = str; + while (*s) s++; + return s - str; +} + +WCHAR *strcpyW( WCHAR *dst, const WCHAR *src ) +{ + WCHAR *p = dst; + while ((*p++ = *src++)); + return dst; +} + +int strcmpW( const WCHAR *str1, const WCHAR *str2 ) +{ + while (*str1 && (*str1 == *str2)) { str1++; str2++; } + return *str1 - *str2; +} + +int strncmpW( const WCHAR *str1, const WCHAR *str2, int n ) +{ + if (n <= 0) return 0; + while ((--n > 0) && *str1 && (*str1 == *str2)) { str1++; str2++; } + return *str1 - *str2; +} + +WCHAR *strcatW( WCHAR *dst, const WCHAR *src ) +{ + strcpyW( dst + strlenW(dst), src ); + return dst; +} + +WCHAR *strchrW( const WCHAR *str, WCHAR ch ) +{ + do { if (*str == ch) return (WCHAR *)str; } while (*str++); + return NULL; +} + +WCHAR *strrchrW( const WCHAR *str, WCHAR ch ) +{ + WCHAR *ret = NULL; + do { if (*str == ch) ret = (WCHAR *)str; } while (*str++); + return ret; +} + +WCHAR *strpbrkW( const WCHAR *str, const WCHAR *accept ) +{ + for ( ; *str; str++) if (strchrW( accept, *str )) return (WCHAR *)str; + return NULL; +} + +size_t strspnW( const WCHAR *str, const WCHAR *accept ) +{ + const WCHAR *ptr; + for (ptr = str; *ptr; ptr++) if (!strchrW( accept, *ptr )) break; + return ptr - str; +} + +size_t strcspnW( const WCHAR *str, const WCHAR *reject ) +{ + const WCHAR *ptr; + for (ptr = str; *ptr; ptr++) if (strchrW( reject, *ptr )) break; + return ptr - str; +} + +WCHAR *strlwrW( WCHAR *str ) +{ + WCHAR *ret = str; + while ((*str = tolowerW(*str))) str++; + return ret; +} + +WCHAR *struprW( WCHAR *str ) +{ + WCHAR *ret = str; + while ((*str = toupperW(*str))) str++; + return ret; +} + +WCHAR *memchrW( const WCHAR *ptr, WCHAR ch, size_t n ) +{ + const WCHAR *end; + for (end = ptr + n; ptr < end; ptr++) if (*ptr == ch) return (WCHAR *)ptr; + return NULL; +} + +WCHAR *memrchrW( const WCHAR *ptr, WCHAR ch, size_t n ) +{ + const WCHAR *end, *ret = NULL; + for (end = ptr + n; ptr < end; ptr++) if (*ptr == ch) ret = ptr; + return (WCHAR *)ret; +} + +long int atolW( const WCHAR *str ) +{ + return strtolW( str, (WCHAR **)0, 10 ); +} + +int atoiW( const WCHAR *str ) +{ + return (int)atolW( str ); +} int strcmpiW( const WCHAR *str1, const WCHAR *str2 ) { Modified: trunk/reactos/tools/unicode/utf8.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/unicode/utf8.c?rev=22… ============================================================================== --- trunk/reactos/tools/unicode/utf8.c (original) +++ trunk/reactos/tools/unicode/utf8.c Thu May 25 23:43:52 2006 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <string.h> Modified: trunk/reactos/tools/unicode/wctomb.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/unicode/wctomb.c?rev=… ============================================================================== --- trunk/reactos/tools/unicode/wctomb.c (original) +++ trunk/reactos/tools/unicode/wctomb.c Thu May 25 23:43:52 2006 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include <string.h> Modified: trunk/reactos/tools/unicode/wine/unicode.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/unicode/wine/unicode.… ============================================================================== --- trunk/reactos/tools/unicode/wine/unicode.h (original) +++ trunk/reactos/tools/unicode/wine/unicode.h Thu May 25 23:43:52 2006 @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #ifndef __WINE_UNICODE_H @@ -95,18 +95,18 @@ extern int vsprintfW( WCHAR *str, const WCHAR *format, va_list valist ); extern int vsnprintfW( WCHAR *str, size_t len, const WCHAR *format, va_list valist ); -static inline int is_dbcs_leadbyte( const union cptable *table, unsigned char ch ) +extern inline int wine_is_dbcs_leadbyte( const union cptable *table, unsigned char ch ) { return (table->info.char_size == 2) && (table->dbcs.cp2uni_leadbytes[ch]); } -static inline WCHAR tolowerW( WCHAR ch ) +extern inline WCHAR tolowerW( WCHAR ch ) { extern WINE_UNICODE_API const WCHAR wine_casemap_lower[]; return ch + wine_casemap_lower[wine_casemap_lower[ch >> 8] + (ch & 0xff)]; } -static inline WCHAR toupperW( WCHAR ch ) +extern inline WCHAR toupperW( WCHAR ch ) { extern WINE_UNICODE_API const WCHAR wine_casemap_upper[]; return ch + wine_casemap_upper[wine_casemap_upper[ch >> 8] + (ch & 0xff)]; @@ -114,177 +114,172 @@ /* the character type contains the C1_* flags in the low 12 bits */ /* and the C2_* type in the high 4 bits */ -static inline unsigned short get_char_typeW( WCHAR ch ) +extern inline unsigned short get_char_typeW( WCHAR ch ) { extern WINE_UNICODE_API const unsigned short wine_wctype_table[]; return wine_wctype_table[wine_wctype_table[ch >> 8] + (ch & 0xff)]; } -inline static int iscntrlW( WCHAR wc ) +extern inline int iscntrlW( WCHAR wc ) { return get_char_typeW(wc) & C1_CNTRL; } -inline static int ispunctW( WCHAR wc ) +extern inline int ispunctW( WCHAR wc ) { return get_char_typeW(wc) & C1_PUNCT; } -inline static int isspaceW( WCHAR wc ) +extern inline int isspaceW( WCHAR wc ) { return get_char_typeW(wc) & C1_SPACE; } -inline static int isdigitW( WCHAR wc ) +extern inline int isdigitW( WCHAR wc ) { return get_char_typeW(wc) & C1_DIGIT; } -inline static int isxdigitW( WCHAR wc ) +extern inline int isxdigitW( WCHAR wc ) { return get_char_typeW(wc) & C1_XDIGIT; } -inline static int islowerW( WCHAR wc ) +extern inline int islowerW( WCHAR wc ) { return get_char_typeW(wc) & C1_LOWER; } -inline static int isupperW( WCHAR wc ) +extern inline int isupperW( WCHAR wc ) { return get_char_typeW(wc) & C1_UPPER; } -inline static int isalnumW( WCHAR wc ) +extern inline int isalnumW( WCHAR wc ) { return get_char_typeW(wc) & (C1_ALPHA|C1_DIGIT|C1_LOWER|C1_UPPER); } -inline static int isalphaW( WCHAR wc ) +extern inline int isalphaW( WCHAR wc ) { return get_char_typeW(wc) & (C1_ALPHA|C1_LOWER|C1_UPPER); } -inline static int isgraphW( WCHAR wc ) +extern inline int isgraphW( WCHAR wc ) { return get_char_typeW(wc) & (C1_ALPHA|C1_PUNCT|C1_DIGIT|C1_LOWER|C1_UPPER); } -inline static int isprintW( WCHAR wc ) +extern inline int isprintW( WCHAR wc ) { return get_char_typeW(wc) & (C1_ALPHA|C1_BLANK|C1_PUNCT|C1_DIGIT|C1_LOWER|C1_UPPER); } /* some useful string manipulation routines */ -static inline unsigned int strlenW( const WCHAR *str ) +extern inline unsigned int strlenW( const WCHAR *str ) { const WCHAR *s = str; while (*s) s++; return s - str; } -static inline WCHAR *strcpyW( WCHAR *dst, const WCHAR *src ) +extern inline WCHAR *strcpyW( WCHAR *dst, const WCHAR *src ) { WCHAR *p = dst; while ((*p++ = *src++)); return dst; } -static inline int strcmpW( const WCHAR *str1, const WCHAR *str2 ) +/* strncpy doesn't do what you think, don't use it */ +#define strncpyW(d,s,n) error do_not_use_strncpyW_use_lstrcpynW_or_memcpy_instead + +extern inline int strcmpW( const WCHAR *str1, const WCHAR *str2 ) { while (*str1 && (*str1 == *str2)) { str1++; str2++; } return *str1 - *str2; } -static inline int strncmpW( const WCHAR *str1, const WCHAR *str2, int n ) +extern inline int strncmpW( const WCHAR *str1, const WCHAR *str2, int n ) { if (n <= 0) return 0; while ((--n > 0) && *str1 && (*str1 == *str2)) { str1++; str2++; } return *str1 - *str2; } -static inline WCHAR *strncpyW( WCHAR *str1, const WCHAR *str2, int n ) -{ - WCHAR *ret = str1; - while (n-- > 0) if (!(*str1++ = *str2++)) break; - while (n-- > 0) *str1++ = 0; - return ret; -} - -static inline WCHAR *strcatW( WCHAR *dst, const WCHAR *src ) +extern inline WCHAR *strcatW( WCHAR *dst, const WCHAR *src ) { strcpyW( dst + strlenW(dst), src ); return dst; } -static inline WCHAR *strchrW( const WCHAR *str, WCHAR ch ) -{ - for ( ; *str; str++) if (*str == ch) return (WCHAR *)str; +extern inline WCHAR *strchrW( const WCHAR *str, WCHAR ch ) +{ + do { if (*str == ch) return (WCHAR *)str; } while (*str++); return NULL; } -static inline WCHAR *strrchrW( const WCHAR *str, WCHAR ch ) +extern inline WCHAR *strrchrW( const WCHAR *str, WCHAR ch ) { WCHAR *ret = NULL; - for ( ; *str; str++) if (*str == ch) ret = (WCHAR *)str; + do { if (*str == ch) ret = (WCHAR *)str; } while (*str++); return ret; } -static inline WCHAR *strpbrkW( const WCHAR *str, const WCHAR *accept ) +extern inline WCHAR *strpbrkW( const WCHAR *str, const WCHAR *accept ) { for ( ; *str; str++) if (strchrW( accept, *str )) return (WCHAR *)str; return NULL; } -static inline size_t strspnW( const WCHAR *str, const WCHAR *accept ) +extern inline size_t strspnW( const WCHAR *str, const WCHAR *accept ) { const WCHAR *ptr; for (ptr = str; *ptr; ptr++) if (!strchrW( accept, *ptr )) break; return ptr - str; } -static inline size_t strcspnW( const WCHAR *str, const WCHAR *reject ) +extern inline size_t strcspnW( const WCHAR *str, const WCHAR *reject ) { const WCHAR *ptr; for (ptr = str; *ptr; ptr++) if (strchrW( reject, *ptr )) break; return ptr - str; } -static inline WCHAR *strlwrW( WCHAR *str ) +extern inline WCHAR *strlwrW( WCHAR *str ) { WCHAR *ret = str; while ((*str = tolowerW(*str))) str++; return ret; } -static inline WCHAR *struprW( WCHAR *str ) +extern inline WCHAR *struprW( WCHAR *str ) { WCHAR *ret = str; while ((*str = toupperW(*str))) str++; return ret; } -static inline WCHAR *memchrW( const WCHAR *ptr, WCHAR ch, size_t n ) +extern inline WCHAR *memchrW( const WCHAR *ptr, WCHAR ch, size_t n ) { const WCHAR *end; for (end = ptr + n; ptr < end; ptr++) if (*ptr == ch) return (WCHAR *)ptr; return NULL; } -static inline WCHAR *memrchrW( const WCHAR *ptr, WCHAR ch, size_t n ) +extern inline WCHAR *memrchrW( const WCHAR *ptr, WCHAR ch, size_t n ) { const WCHAR *end, *ret = NULL; for (end = ptr + n; ptr < end; ptr++) if (*ptr == ch) ret = ptr; return (WCHAR *)ret; } -static inline long int atolW( const WCHAR *str ) +extern inline long int atolW( const WCHAR *str ) { return strtolW( str, (WCHAR **)0, 10 ); } -static inline int atoiW( const WCHAR *str ) +extern inline int atoiW( const WCHAR *str ) { return (int)atolW( str ); } Modified: trunk/reactos/tools/unicode/wine_unicode.def URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/tools/unicode/wine_unicode.… ============================================================================== --- trunk/reactos/tools/unicode/wine_unicode.def (original) +++ trunk/reactos/tools/unicode/wine_unicode.def Thu May 25 23:43:52 2006 @@ -1,27 +1,58 @@ -LIBRARY libwine_unicode.dll - -EXPORTS - memicmpW - snprintfW - sprintfW - strcmpiW - strncmpiW - strstrW - strtolW - strtoulW - vsnprintfW - vsprintfW - wine_casemap_lower - wine_casemap_upper - wine_compare_string - wine_cp_enum_table - wine_cp_get_table - wine_cp_mbstowcs - wine_cp_wcstombs - wine_cpsymbol_mbstowcs - wine_cpsymbol_wcstombs - wine_fold_string - wine_get_sortkey - wine_utf8_mbstowcs - wine_utf8_wcstombs - wine_wctype_table +LIBRARY libwine_unicode.dll + +EXPORTS + atoiW + atolW + get_char_typeW + isalnumW + isalphaW + iscntrlW + isdigitW + isgraphW + islowerW + isprintW + ispunctW + isspaceW + isupperW + isxdigitW + memchrW + memicmpW + memrchrW + snprintfW + sprintfW + strcatW + strchrW + strcmpW + strcmpiW + strcpyW + strcspnW + strlenW + strlwrW + strncmpW + strncmpiW + strpbrkW + strrchrW + strspnW + strstrW + strtolW + strtoulW + struprW + tolowerW + toupperW + vsnprintfW + vsprintfW + wine_casemap_lower + wine_casemap_upper + wine_compare_string + wine_cp_enum_table + wine_cp_get_table + wine_cp_mbstowcs + wine_cp_wcstombs + wine_cpsymbol_mbstowcs + wine_cpsymbol_wcstombs + wine_fold_string + wine_get_sortkey + wine_is_dbcs_leadbyte + wine_utf8_mbstowcs + wine_utf8_wcstombs + wine_wctype_table

18 years, 3 months

[ion] 22041: - Rewrite Desktop/WindowsStation parsing to follow the NT Object Model, with some minor hacks to respect ROS's current parsing semantics. - Thanks to this, the long-lasting ExpDesktopCreate hack is gone, and so is OB_ROS_FIND_METHOD and OB_ROS_CREATE_METHOD in win32k. Next patch can fully remove WIN32_CALLOUT_DATA and use the NT type instead. - Add official OBJECT_ macros in obtypes.h

by ion＠svn.reactos.org

Author: ion Date: Thu May 25 23:30:09 2006 New Revision: 22041 URL: http://svn.reactos.ru/svn/reactos?rev=22041&view=rev Log: - Rewrite Desktop/WindowsStation parsing to follow the NT Object Model, with some minor hacks to respect ROS's current parsing semantics. - Thanks to this, the long-lasting ExpDesktopCreate hack is gone, and so is OB_ROS_FIND_METHOD and OB_ROS_CREATE_METHOD in win32k. Next patch can fully remove WIN32_CALLOUT_DATA and use the NT type instead. - Add official OBJECT_ macros in obtypes.h Modified: trunk/reactos/include/ndk/obtypes.h trunk/reactos/include/reactos/win32k/callout.h trunk/reactos/ntoskrnl/ex/win32k.c trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/obname.c trunk/reactos/ntoskrnl/ps/win32.c trunk/reactos/subsystems/win32/win32k/include/desktop.h trunk/reactos/subsystems/win32/win32k/main/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Modified: trunk/reactos/include/ndk/obtypes.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/ndk/obtypes.h?rev=2… ============================================================================== --- trunk/reactos/include/ndk/obtypes.h (original) +++ trunk/reactos/include/ndk/obtypes.h Thu May 25 23:30:09 2006 @@ -86,6 +86,22 @@ #define OB_FLAG_PERMANENT 0x10 #define OB_FLAG_SECURITY 0x20 #define OB_FLAG_SINGLE_PROCESS 0x40 + +#define OBJECT_TO_OBJECT_HEADER(o) \ + CONTAINING_RECORD((o), OBJECT_HEADER, Body) + +#define OBJECT_HEADER_TO_NAME_INFO(h) \ + ((POBJECT_HEADER_NAME_INFO)(!(h)->NameInfoOffset ? \ + NULL: ((PCHAR)(h) - (h)->NameInfoOffset))) + +#define OBJECT_HEADER_TO_HANDLE_INFO(h) \ + ((POBJECT_HEADER_HANDLE_INFO)(!(h)->HandleInfoOffset ? \ + NULL: ((PCHAR)(h) - (h)->HandleInfoOffset))) + +#define OBJECT_HEADER_TO_CREATOR_INFO(h) \ + ((POBJECT_HEADER_CREATOR_INFO)(!((h)->Flags & \ + OB_FLAG_CREATOR_INFO) ? NULL: ((PCHAR)(h) - \ + sizeof(OBJECT_HEADER_CREATOR_INFO)))) // // Reasons for Open Callback Modified: trunk/reactos/include/reactos/win32k/callout.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/include/reactos/win32k/call… ============================================================================== --- trunk/reactos/include/reactos/win32k/callout.h (original) +++ trunk/reactos/include/reactos/win32k/callout.h Thu May 25 23:30:09 2006 @@ -12,8 +12,7 @@ OB_DELETE_METHOD WinStaDelete; OB_PARSE_METHOD WinStaParse; OB_OPEN_METHOD WinStaOpen; - OB_ROS_FIND_METHOD WinStaFind; - OB_ROS_CREATE_METHOD DesktopCreate; + OB_PARSE_METHOD DesktopParse; } W32_CALLOUT_DATA, *PW32_CALLOUT_DATA; #endif Modified: trunk/reactos/ntoskrnl/ex/win32k.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ex/win32k.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ex/win32k.c (original) +++ trunk/reactos/ntoskrnl/ex/win32k.c Thu May 25 23:30:09 2006 @@ -38,8 +38,7 @@ OB_OPEN_METHOD ExpWindowStationObjectOpen = NULL; OB_PARSE_METHOD ExpWindowStationObjectParse = NULL; OB_DELETE_METHOD ExpWindowStationObjectDelete = NULL; -OB_ROS_FIND_METHOD ExpWindowStationObjectFind = NULL; -OB_ROS_CREATE_METHOD ExpDesktopObjectCreate = NULL; +OB_PARSE_METHOD ExpDesktopObjectParse = NULL; OB_DELETE_METHOD ExpDesktopObjectDelete = NULL; /* FUNCTIONS ****************************************************************/ @@ -47,17 +46,17 @@ NTSTATUS STDCALL ExpWinStaObjectOpen(OB_OPEN_REASON Reason, + PEPROCESS Process, PVOID ObjectBody, - PEPROCESS Process, - ULONG HandleCount, - ACCESS_MASK GrantedAccess) + ACCESS_MASK GrantedAccess, + ULONG HandleCount) { /* Call the Registered Callback */ return ExpWindowStationObjectOpen(Reason, + Process, ObjectBody, - Process, - HandleCount, - GrantedAccess); + GrantedAccess, + HandleCount); } VOID @@ -66,18 +65,6 @@ { /* Call the Registered Callback */ ExpWindowStationObjectDelete(DeletedObject); -} - -PVOID -STDCALL -ExpWinStaObjectFind(PVOID WinStaObject, - PWSTR Name, - ULONG Attributes) -{ - /* Call the Registered Callback */ - return ExpWindowStationObjectFind(WinStaObject, - Name, - Attributes); } NTSTATUS @@ -105,21 +92,6 @@ SecurityQos, Object); } - -NTSTATUS -STDCALL -ExpDesktopCreate(PVOID ObjectBody, - PVOID Parent, - PWSTR RemainingPath, - POBJECT_ATTRIBUTES ObjectAttributes) -{ - /* Call the Registered Callback */ - return ExpDesktopObjectCreate(ObjectBody, - Parent, - RemainingPath, - ObjectAttributes); -} - VOID STDCALL ExpDesktopDelete(PVOID DeletedObject) @@ -143,9 +115,9 @@ ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); ObjectTypeInitializer.GenericMapping = ExpWindowStationMapping; ObjectTypeInitializer.PoolType = NonPagedPool; - ObjectTypeInitializer.OpenProcedure = (OB_OPEN_METHOD)ExpWinStaObjectOpen; + ObjectTypeInitializer.OpenProcedure = ExpWinStaObjectOpen; ObjectTypeInitializer.DeleteProcedure = ExpWinStaObjectDelete; - ObjectTypeInitializer.ParseProcedure = (OB_PARSE_METHOD)ExpWinStaObjectParse; + ObjectTypeInitializer.ParseProcedure = ExpWinStaObjectParse; ObpCreateTypeObject(&ObjectTypeInitializer, &Name, &ExWindowStationObjectType); Modified: trunk/reactos/ntoskrnl/include/internal/ob.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/include/internal/o… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ob.h Thu May 25 23:30:09 2006 @@ -53,13 +53,6 @@ struct _OBJECT_ATTRIBUTES* ObjectAttributes ); -typedef PVOID -(NTAPI *OB_ROS_FIND_METHOD)( - PVOID WinStaObject, - PWSTR Name, - ULONG Attributes -); - BOOLEAN NTAPI ObpDeleteEntryDirectory(POBP_LOOKUP_CONTEXT Context); Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Thu May 25 23:30:09 2006 @@ -18,14 +18,6 @@ #include <internal/debug.h> PHANDLE_TABLE ObpKernelHandleTable = NULL; - -/* TEMPORARY HACK. DO NOT REMOVE -- Alex */ -NTSTATUS -STDCALL -ExpDesktopCreate(PVOID ObjectBody, - PVOID Parent, - PWSTR RemainingPath, - POBJECT_CREATE_INFORMATION ObjectCreateInformation); /* PRIVATE FUNCTIONS *********************************************************/ @@ -1012,7 +1004,6 @@ } if ((Header->Type == IoFileObjectType) || - (Header->Type == ExDesktopObjectType) || (Header->Type->TypeInfo.OpenProcedure != NULL)) { DPRINT("About to call Open Routine\n"); @@ -1026,15 +1017,6 @@ ObjectCreateInfo); DPRINT("Called IopCreateFile: %x\n", Status); - } - else if (Header->Type == ExDesktopObjectType) - { - /* TEMPORARY HACK. DO NOT TOUCH -- Alex */ - DPRINT("Calling ExpDesktopCreate\n"); - Status = ExpDesktopCreate(&Header->Body, - FoundObject, - RemainingPath.Buffer, - ObjectCreateInfo); } else if (Header->Type->TypeInfo.OpenProcedure != NULL) { Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c (original) +++ trunk/reactos/ntoskrnl/ob/obname.c Thu May 25 23:30:09 2006 @@ -176,13 +176,13 @@ RtlInitUnicodeString(&CurrentUs, current); Status = CurrentHeader->Type->TypeInfo.ParseProcedure(CurrentObject, CurrentHeader->Type, - NULL, - ExGetPreviousMode(), + AccessState, + ExGetPreviousMode(), // fixme: should be a parameter, since caller decides. Attributes, &PathString, &CurrentUs, - NULL, - NULL, + ParseContext, + NULL, // fixme: where do we get this from? captured OBP? &NextObject); current = CurrentUs.Buffer; if (Status == STATUS_REPARSE) Modified: trunk/reactos/ntoskrnl/ps/win32.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ps/win32.c?rev=220… ============================================================================== --- trunk/reactos/ntoskrnl/ps/win32.c (original) +++ trunk/reactos/ntoskrnl/ps/win32.c Thu May 25 23:30:09 2006 @@ -23,8 +23,7 @@ extern OB_OPEN_METHOD ExpWindowStationObjectOpen; extern OB_PARSE_METHOD ExpWindowStationObjectParse; extern OB_DELETE_METHOD ExpWindowStationObjectDelete; -extern OB_ROS_FIND_METHOD ExpWindowStationObjectFind; -extern OB_ROS_CREATE_METHOD ExpDesktopObjectCreate; +extern OB_PARSE_METHOD ExpDesktopObjectParse; extern OB_DELETE_METHOD ExpDesktopObjectDelete; #ifndef ALEX_CB_REWRITE @@ -64,8 +63,7 @@ ExpWindowStationObjectOpen = CalloutData->WinStaOpen; ExpWindowStationObjectParse = CalloutData->WinStaParse; ExpWindowStationObjectDelete = CalloutData->WinStaDelete; - ExpWindowStationObjectFind = CalloutData->WinStaFind; - ExpDesktopObjectCreate = CalloutData->DesktopCreate; + ExpDesktopObjectParse = CalloutData->DesktopParse; ExpDesktopObjectDelete = CalloutData->DesktopDelete; } Modified: trunk/reactos/subsystems/win32/win32k/include/desktop.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/inc… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/desktop.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/desktop.h Thu May 25 23:30:09 2006 @@ -10,7 +10,6 @@ CSHORT Size; LIST_ENTRY ListEntry; - UNICODE_STRING Name; /* Pointer to the associated window station. */ struct _WINSTATION_OBJECT *WindowStation; /* Pointer to the active queue. */ @@ -48,11 +47,18 @@ NTSTATUS FASTCALL CleanupDesktopImpl(VOID); -NTSTATUS STDCALL -IntDesktopObjectCreate(PVOID ObjectBody, - PVOID Parent, - PWSTR RemainingPath, - struct _OBJECT_ATTRIBUTES* ObjectAttributes); +NTSTATUS +STDCALL +IntDesktopObjectParse(IN PVOID ParseObject, + IN PVOID ObjectType, + IN OUT PACCESS_STATE AccessState, + IN KPROCESSOR_MODE AccessMode, + IN ULONG Attributes, + IN OUT PUNICODE_STRING CompleteName, + IN OUT PUNICODE_STRING RemainingName, + IN OUT PVOID Context OPTIONAL, + IN PSECURITY_QUALITY_OF_SERVICE SecurityQos OPTIONAL, + OUT PVOID *Object); VOID STDCALL IntDesktopObjectDelete(PVOID DeletedObject); @@ -119,6 +125,12 @@ #define IntIsActiveDesktop(Desktop) \ ((Desktop)->WindowStation->ActiveDesktop == (Desktop)) + +#define GET_DESKTOP_NAME(d) \ + OBJECT_HEADER_TO_NAME_INFO(OBJECT_TO_OBJECT_HEADER(d)) ? \ + &(OBJECT_HEADER_TO_NAME_INFO(OBJECT_TO_OBJECT_HEADER(d))->Name) : \ + NULL + static __inline PVOID DesktopHeapAlloc(IN PDESKTOP Desktop, Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/mai… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c Thu May 25 23:30:09 2006 @@ -384,8 +384,7 @@ CalloutData.WinStaOpen = IntWinStaObjectOpen; CalloutData.WinStaParse = IntWinStaObjectParse; CalloutData.WinStaDelete = IntWinStaObjectDelete; - CalloutData.WinStaFind = IntWinStaObjectFind; - CalloutData.DesktopCreate = IntDesktopObjectCreate; + CalloutData.DesktopParse = IntDesktopObjectParse; CalloutData.DesktopDelete = IntDesktopObjectDelete; CalloutData.W32ProcessCallout = Win32kProcessCallback; CalloutData.W32ThreadCallout = Win32kThreadCallback; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/desktop.c Thu May 25 23:30:09 2006 @@ -34,82 +34,143 @@ #define NDEBUG #include <debug.h> +static +VOID +IntFreeDesktopHeap( + IN OUT PDESKTOP_OBJECT Desktop +); + /* GLOBALS *******************************************************************/ /* Currently active desktop */ PDESKTOP_OBJECT InputDesktop = NULL; HDESK InputDesktopHandle = NULL; HDC ScreenDeviceContext = NULL; - BOOL g_PaintDesktopVersion = FALSE; -static VOID IntFreeDesktopHeap(IN OUT PDESKTOP_OBJECT Desktop); - -/* INITALIZATION FUNCTIONS ****************************************************/ - -static GENERIC_MAPPING IntDesktopMapping = - { - STANDARD_RIGHTS_READ | DESKTOP_ENUMERATE | DESKTOP_READOBJECTS, - STANDARD_RIGHTS_WRITE | DESKTOP_CREATEMENU | DESKTOP_CREATEWINDOW | DESKTOP_HOOKCONTROL | - DESKTOP_JOURNALPLAYBACK | DESKTOP_JOURNALRECORD | DESKTOP_WRITEOBJECTS, +GENERIC_MAPPING IntDesktopMapping = +{ + STANDARD_RIGHTS_READ | DESKTOP_ENUMERATE | + DESKTOP_READOBJECTS, + STANDARD_RIGHTS_WRITE | DESKTOP_CREATEMENU | + DESKTOP_CREATEWINDOW | + DESKTOP_HOOKCONTROL | + DESKTOP_JOURNALPLAYBACK | + DESKTOP_JOURNALRECORD | + DESKTOP_WRITEOBJECTS, STANDARD_RIGHTS_EXECUTE | DESKTOP_SWITCHDESKTOP, - STANDARD_RIGHTS_REQUIRED | DESKTOP_CREATEMENU | DESKTOP_CREATEWINDOW | DESKTOP_ENUMERATE | - DESKTOP_HOOKCONTROL | DESKTOP_JOURNALPLAYBACK | DESKTOP_JOURNALRECORD | - DESKTOP_READOBJECTS | DESKTOP_SWITCHDESKTOP | DESKTOP_WRITEOBJECTS - }; - -NTSTATUS FASTCALL -InitDesktopImpl(VOID) -{ - /* Set Desktop Object Attributes */ - ExDesktopObjectType->TypeInfo.DefaultNonPagedPoolCharge = sizeof(DESKTOP_OBJECT); - ExDesktopObjectType->TypeInfo.GenericMapping = IntDesktopMapping; - - return STATUS_SUCCESS; -} - -NTSTATUS FASTCALL -CleanupDesktopImpl(VOID) -{ - return STATUS_SUCCESS; -} + STANDARD_RIGHTS_REQUIRED | DESKTOP_CREATEMENU | + DESKTOP_CREATEWINDOW | + DESKTOP_ENUMERATE | + DESKTOP_HOOKCONTROL | + DESKTOP_JOURNALPLAYBACK | + DESKTOP_JOURNALRECORD | + DESKTOP_READOBJECTS | + DESKTOP_SWITCHDESKTOP | + DESKTOP_WRITEOBJECTS +}; /* OBJECT CALLBACKS **********************************************************/ -NTSTATUS STDCALL -IntDesktopObjectCreate(PVOID ObjectBody, - PVOID Parent, - PWSTR RemainingPath, - struct _OBJECT_ATTRIBUTES* ObjectAttributes) -{ - PDESKTOP_OBJECT Desktop = (PDESKTOP_OBJECT)ObjectBody; - UNICODE_STRING UnicodeString; - - DPRINT("Creating desktop (0x%X) Name (%S)\n", Desktop, RemainingPath); - if (RemainingPath == NULL) - { - return STATUS_SUCCESS; - } - - if (wcschr((RemainingPath + 1), '\\') != NULL) - { - return STATUS_UNSUCCESSFUL; - } - - RtlInitUnicodeString(&UnicodeString, (RemainingPath + 1)); - - InitializeListHead(&Desktop->ShellHookWindows); - - Desktop->WindowStation = (PWINSTATION_OBJECT)Parent; - - /* Put the desktop on the window station's list of associcated desktops */ -// ExInterlocked - InsertTailList( - &Desktop->WindowStation->DesktopListHead, - &Desktop->ListEntry);//, -// &Desktop->WindowStation->Lock); - - return RtlCreateUnicodeString(&Desktop->Name, UnicodeString.Buffer); +NTSTATUS +NTAPI +IntDesktopObjectParse(IN PVOID ParseObject, + IN PVOID ObjectType, + IN OUT PACCESS_STATE AccessState, + IN KPROCESSOR_MODE AccessMode, + IN ULONG Attributes, + IN OUT PUNICODE_STRING CompleteName, + IN OUT PUNICODE_STRING RemainingName, + IN OUT PVOID Context OPTIONAL, + IN PSECURITY_QUALITY_OF_SERVICE SecurityQos OPTIONAL, + OUT PVOID *Object) +{ + NTSTATUS Status; + PDESKTOP_OBJECT Desktop; + OBJECT_ATTRIBUTES ObjectAttributes; + PLIST_ENTRY NextEntry, ListHead; + PWINSTATION_OBJECT WinStaObject = (PWINSTATION_OBJECT)ParseObject; + PUNICODE_STRING DesktopName; + + /* Set the list pointers and loop the window station */ + DPRINT1("Creating desktop(%wZ)\n", RemainingName); + ListHead = &WinStaObject->DesktopListHead; + NextEntry = ListHead->Flink; + while (NextEntry != ListHead) + { + /* Get the current desktop */ + Desktop = CONTAINING_RECORD(NextEntry, DESKTOP_OBJECT, ListEntry); + + /* Get its name */ + DesktopName = GET_DESKTOP_NAME(Desktop); + if (DesktopName) + { + /* Compare the name */ + if (RtlEqualUnicodeString(RemainingName, + DesktopName, + (Attributes & OBJ_CASE_INSENSITIVE))) + { + /* We found a match. Did this come from a create? */ + if (Context) + { + /* Unless OPEN_IF was given, fail with an error */ + if (!(Attributes & OBJ_OPENIF)) + { + /* Name collision */ + return STATUS_OBJECT_NAME_COLLISION; + } + else + { + /* Otherwise, return with a warning only */ + Status = STATUS_OBJECT_NAME_EXISTS; + } + } + else + { + /* This was a real open, so this is OK */ + Status = STATUS_SUCCESS; + } + + /* Reference the desktop and return it */ + ObReferenceObject(Desktop); + *Object = Desktop; + RemainingName->Buffer = NULL; // => ROS Parse routines need to do this + return Status; + } + } + + /* Go to the next desktop */ + NextEntry = NextEntry->Flink; + } + + /* If we got here but this isn't a create, then fail */ + if (!Context) return STATUS_OBJECT_NAME_NOT_FOUND; + + /* Create the desktop object */ + InitializeObjectAttributes(&ObjectAttributes, RemainingName, 0, NULL, NULL); + Status = ObCreateObject(KernelMode, + ExDesktopObjectType, + &ObjectAttributes, + UserMode, + NULL, + sizeof(DESKTOP_OBJECT), + 0, + 0, + (PVOID)&Desktop); + if (!NT_SUCCESS(Status)) return Status; + + /* Initialize shell hook window list and set the parent */ + InitializeListHead(&Desktop->ShellHookWindows); + Desktop->WindowStation = (PWINSTATION_OBJECT)ParseObject; + + /* Put the desktop on the window station's list of associated desktops */ + InsertTailList(&Desktop->WindowStation->DesktopListHead, + &Desktop->ListEntry); + + /* Set the desktop object and return success */ + *Object = Desktop; + RemainingName->Buffer = NULL; // => ROS Parse routines need to do this + return STATUS_SUCCESS; } VOID STDCALL @@ -122,12 +183,27 @@ /* Remove the desktop from the window station's list of associcated desktops */ RemoveEntryList(&Desktop->ListEntry); - RtlFreeUnicodeString(&Desktop->Name); - IntFreeDesktopHeap(Desktop); } /* PRIVATE FUNCTIONS **********************************************************/ + +NTSTATUS +FASTCALL +InitDesktopImpl(VOID) +{ + /* Set Desktop Object Attributes */ + ExDesktopObjectType->TypeInfo.DefaultNonPagedPoolCharge = sizeof(DESKTOP_OBJECT); + ExDesktopObjectType->TypeInfo.GenericMapping = IntDesktopMapping; + return STATUS_SUCCESS; +} + +NTSTATUS +FASTCALL +CleanupDesktopImpl(VOID) +{ + return STATUS_SUCCESS; +} static int GetSystemVersionString(LPWSTR buffer) { @@ -736,8 +812,6 @@ Desktop->DesktopHeapSection = NULL; } } - - /* SYSCALLS *******************************************************************/ @@ -791,6 +865,7 @@ PVOID DesktopHeapSystemBase = NULL; SIZE_T DesktopInfoSize; UNICODE_STRING SafeDesktopName; + ULONG DummyContext; DECLARE_RETURN(HDESK); @@ -839,7 +914,7 @@ * Try to open already existing desktop */ - DPRINT1("Trying to open desktop (%wZ)\n", &DesktopName); + DPRINT("Trying to open desktop (%wZ)\n", &DesktopName); /* Initialize ObjectAttributes for the desktop object */ InitializeObjectAttributes( @@ -852,41 +927,26 @@ Status = ObOpenObjectByName( &ObjectAttributes, ExDesktopObjectType, - NULL, + (PVOID)&DummyContext, KernelMode, dwDesiredAccess, NULL, (HANDLE*)&Desktop); - - if (NT_SUCCESS(Status)) - { - DPRINT("Successfully opened desktop (%wZ)\n", &DesktopName); + if (!NT_SUCCESS(Status)) RETURN(NULL); + if (Status == STATUS_OBJECT_NAME_EXISTS) + { ExFreePool(DesktopName.Buffer); RETURN( Desktop); } - /* - * No existing desktop found, try to create new one - */ - - Status = ObCreateObject( - KernelMode, - ExDesktopObjectType, - &ObjectAttributes, - ExGetPreviousMode(), - NULL, - sizeof(DESKTOP_OBJECT), - 0, - 0, - (PVOID*)&DesktopObject); - - if (! NT_SUCCESS(Status)) - { - DPRINT1("Failed creating desktop (%wZ)\n", &DesktopName); - ExFreePool(DesktopName.Buffer); - SetLastNtError(STATUS_UNSUCCESSFUL); - RETURN( NULL); - } + /* Reference the desktop */ + Status = ObReferenceObjectByHandle(Desktop, + 0, + ExDesktopObjectType, + KernelMode, + (PVOID)&DesktopObject, + NULL); + if (!NT_SUCCESS(Status)) RETURN(NULL); DesktopObject->DesktopHeapSection = NULL; DesktopObject->hDesktopHeap = UserCreateHeap(&DesktopObject->DesktopHeapSection, @@ -930,16 +990,6 @@ /* Initialize some local (to win32k) desktop state. */ DesktopObject->ActiveMessageQueue = NULL; - - Status = ObInsertObject( - (PVOID)DesktopObject, - NULL, - STANDARD_RIGHTS_REQUIRED, - 0, - NULL, - (HANDLE*)&Desktop); - - ObDereferenceObject(DesktopObject); ExFreePool(DesktopName.Buffer); if (! NT_SUCCESS(Status)) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Thu May 25 23:30:09 2006 @@ -105,7 +105,6 @@ PWINSTATION_OBJECT WinSta = (PWINSTATION_OBJECT)ObjectBody; NTSTATUS Status; -DPRINT1("IntWinStaObjectOpen\n"); if (Reason == ObCreateHandle) { @@ -115,10 +114,8 @@ InitializeListHead(&WinSta->DesktopListHead); -DPRINT1("Create winsta atomtable\n"); WinSta->AtomTable = NULL; Status = RtlCreateAtomTable(37, &WinSta->AtomTable); -if (!NT_SUCCESS(Status)) DPRINT1("Error creating atom table\n"); WinSta->SystemMenuTemplate = (HANDLE)0; DPRINT("Window station successfully created.\n"); @@ -137,51 +134,6 @@ RtlDestroyAtomTable(WinSta->AtomTable); RtlFreeUnicodeString(&WinSta->Name); -} - -PVOID STDCALL -IntWinStaObjectFind(PVOID Object, - PWSTR Name, - ULONG Attributes) -{ - PLIST_ENTRY Current; - PDESKTOP_OBJECT CurrentObject; - PWINSTATION_OBJECT WinStaObject = (PWINSTATION_OBJECT)Object; - - DPRINT("WinStaObject (0x%X) Name (%wS)\n", WinStaObject, Name); - - if (Name[0] == 0) - { - return NULL; - } - - Current = WinStaObject->DesktopListHead.Flink; - while (Current != &WinStaObject->DesktopListHead) - { - CurrentObject = CONTAINING_RECORD(Current, DESKTOP_OBJECT, ListEntry); - DPRINT("Scanning %wZ for %wS\n", &CurrentObject->Name, Name); - if (Attributes & OBJ_CASE_INSENSITIVE) - { - if (_wcsicmp(CurrentObject->Name.Buffer, Name) == 0) - { - DPRINT("Found desktop at (0x%X)\n", CurrentObject); - return CurrentObject; - } - } - else - { - if (wcscmp(CurrentObject->Name.Buffer, Name) == 0) - { - DPRINT("Found desktop at (0x%X)\n", CurrentObject); - return CurrentObject; - } - } - Current = Current->Flink; - } - - DPRINT("Returning NULL\n"); - - return NULL; } NTSTATUS @@ -197,44 +149,65 @@ IN PSECURITY_QUALITY_OF_SERVICE SecurityQos OPTIONAL, OUT PVOID *NextObject) { - PWSTR *Path = &RemainingName->Buffer; - PVOID FoundObject; - NTSTATUS Status; - PWSTR End; - - DPRINT("Object (0x%X) Path (0x%X) *Path (%wS)\n", Object, Path, *Path); - - *NextObject = NULL; - - if ((Path == NULL) || ((*Path) == NULL)) - { - return STATUS_SUCCESS; - } - - End = wcschr((*Path) + 1, '\\'); - if (End != NULL) - { - DPRINT("Name contains illegal characters\n"); - return STATUS_UNSUCCESSFUL; - } - - FoundObject = IntWinStaObjectFind(Object, (*Path) + 1, Attributes); - if (FoundObject == NULL) - { - DPRINT("Name was not found\n"); - return STATUS_UNSUCCESSFUL; - } - - Status = ObReferenceObjectByPointer( - FoundObject, - STANDARD_RIGHTS_REQUIRED, - NULL, - UserMode); - - *NextObject = FoundObject; - *Path = NULL; - - return Status; + DPRINT("Object (0x%X) Path (0x%X) *Path (%wZ)\n", Object, RemainingName, RemainingName); + + /* Assume we don't find anything */ + *NextObject = NULL; + + /* Check for an empty name */ + if (!RemainingName->Length) + { + /* Make sure this is a window station, can't parse a desktop now */ + if (ObjectType != ExWindowStationObjectType) + { + /* Fail */ + return STATUS_OBJECT_TYPE_MISMATCH; + } + + /* Reference the window station and return */ + //ObReferenceObject(Object); + //*NextObject = Object; => ROS Parse routines don't need to do this + return STATUS_SUCCESS; + } + + /* Check for leading slash */ + if (RemainingName->Buffer[0] == OBJ_NAME_PATH_SEPARATOR) + { + /* Skip it */ + RemainingName->Buffer++; + RemainingName->Length -= sizeof(WCHAR); + RemainingName->MaximumLength -= sizeof(WCHAR); + } + + /* Check if there is still a slash */ + if (wcschr(RemainingName->Buffer, OBJ_NAME_PATH_SEPARATOR)) + { + /* In this case, fail */ + return STATUS_OBJECT_PATH_INVALID; + } + + /* + * Check if we are parsing a desktop. + * FIXME: ROS Sends the wrong Object Type. The parsed object's type + * should be sent, not the parsed parent's. + */ + if (ObjectType == ExWindowStationObjectType) + { + /* Then call the desktop parse routine */ + return IntDesktopObjectParse(Object, + ObjectType, + AccessState, + AccessMode, + Attributes, + FullPath, + RemainingName, + Context, + SecurityQos, + NextObject); + } + + /* Should hopefully never get here */ + return STATUS_OBJECT_TYPE_MISMATCH; } /* PRIVATE FUNCTIONS **********************************************************/ @@ -824,14 +797,14 @@ case UOI_NAME: if (WinStaObject != NULL) { - pvData = WinStaObject->Name.Buffer; - nDataSize = WinStaObject->Name.Length+2; + pvData = ((PUNICODE_STRING)GET_DESKTOP_NAME(WinStaObject))->Buffer; + nDataSize = ((PUNICODE_STRING)GET_DESKTOP_NAME(WinStaObject))->Length + 2; Status = STATUS_SUCCESS; } else if (DesktopObject != NULL) { - pvData = DesktopObject->Name.Buffer; - nDataSize = DesktopObject->Name.Length+2; + pvData = ((PUNICODE_STRING)GET_DESKTOP_NAME(DesktopObject))->Buffer; + nDataSize = ((PUNICODE_STRING)GET_DESKTOP_NAME(DesktopObject))->Length + 2; Status = STATUS_SUCCESS; } else @@ -1407,7 +1380,7 @@ DesktopEntry = DesktopEntry->Flink) { DesktopObject = CONTAINING_RECORD(DesktopEntry, DESKTOP_OBJECT, ListEntry); - ReturnLength += DesktopObject->Name.Length + sizeof(WCHAR); + ReturnLength += ((PUNICODE_STRING)GET_DESKTOP_NAME(DesktopObject))->Length + sizeof(WCHAR); EntryCount++; } DPRINT("Required size: %d Entry count: %d\n", ReturnLength, EntryCount); @@ -1450,14 +1423,14 @@ DesktopEntry = DesktopEntry->Flink) { DesktopObject = CONTAINING_RECORD(DesktopEntry, DESKTOP_OBJECT, ListEntry); - Status = MmCopyToCaller(lpBuffer, DesktopObject->Name.Buffer, DesktopObject->Name.Length); + Status = MmCopyToCaller(lpBuffer, ((PUNICODE_STRING)GET_DESKTOP_NAME(DesktopObject))->Buffer, ((PUNICODE_STRING)GET_DESKTOP_NAME(DesktopObject))->Length); if (! NT_SUCCESS(Status)) { KeReleaseSpinLock(&WindowStation->Lock, OldLevel); ObDereferenceObject(WindowStation); return Status; } - lpBuffer = (PVOID) ((PCHAR) lpBuffer + DesktopObject->Name.Length); + lpBuffer = (PVOID) ((PCHAR) lpBuffer + ((PUNICODE_STRING)GET_DESKTOP_NAME(DesktopObject))->Length); Status = MmCopyToCaller(lpBuffer, &NullWchar, sizeof(WCHAR)); if (! NT_SUCCESS(Status)) {

18 years, 3 months

[janderwald] 22040: italian explorer translation patch by folle_invasato (bug 1292)

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu May 25 20:59:15 2006 New Revision: 22040 URL: http://svn.reactos.ru/svn/reactos?rev=22040&view=rev Log: italian explorer translation patch by folle_invasato (bug 1292) Added: trunk/reactos/base/shell/explorer/explorer-it.rc Modified: trunk/reactos/base/shell/explorer/explorer_intres.rc Added: trunk/reactos/base/shell/explorer/explorer-it.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/shell/explorer/explore… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-it.rc (added) +++ trunk/reactos/base/shell/explorer/explorer-it.rc Thu May 25 20:59:15 2006 @@ -1,0 +1,363 @@ +// Microsoft Visual C++ generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include <windows.h> + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// Italian (Neutral) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ITA) +#ifdef _WIN32 +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDM_MDIFRAME MENU +BEGIN + POPUP "&File" + BEGIN + MENUITEM "&Esegui...", ID_EXECUTE + MENUITEM SEPARATOR + MENUITEM "E&sci", ID_FILE_EXIT + END + POPUP "&Visualizza" + BEGIN + MENUITEM "Barra degli s&trumenti", ID_VIEW_TOOL_BAR + MENUITEM "&Extra Bar", ID_VIEW_EXTRA_BAR + MENUITEM "&Drivebar", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "S&ide Bar", ID_VIEW_SIDE_BAR + MENUITEM "Barra di &stato", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Aggiorna\tF5", ID_REFRESH + MENUITEM "Schermo intero\tCtrl+Maiusc+S", ID_VIEW_FULLSCREEN + MENUITEM "SDI", ID_VIEW_SDI + END + POPUP "&Finestra" + BEGIN + MENUITEM "Nuova finestra", ID_WINDOW_NEW + MENUITEM "Sovrapponi\tMaiusc+F5", ID_WINDOW_CASCADE + MENUITEM "Affianca &orizzontamente", ID_WINDOW_TILE_HORZ + MENUITEM "Affianca &verticalmente\tMaiusc+F4", ID_WINDOW_TILE_VERT + MENUITEM "Disponi automaticamente", ID_WINDOW_AUTOSORT + MENUITEM "Disponi &Simboli", ID_WINDOW_ARRANGE + END + POPUP "&Strumenti" + BEGIN + MENUITEM "&Opzioni", ID_TOOLS_OPTIONS + END + POPUP "&?" + BEGIN + MENUITEM "&FAQ su Explorer...", ID_EXPLORER_FAQ + MENUITEM "&Informazioni su Explorer...", ID_ABOUT_EXPLORER + MENUITEM "Informazioni su React&OS...", ID_ABOUT_WINDOWS + END +END + +IDM_DESKTOPBAR MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Impostazioni...", ID_DESKTOPBAR_SETTINGS + MENUITEM "&Task Manager...", ID_TASKMGR + MENUITEM SEPARATOR + MENUITEM "&Informazioni su Explorer...", ID_ABOUT_EXPLORER + END +END + +IDM_VOLUME MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Apri Controllo volume", ID_TRAY_VOLUME + MENUITEM "Regola Proprietà Audio", ID_VOLUME_PROPERTIES + END +END + +IDM_NOTIFYAREA MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Visualizza icone nascoste", ID_SHOW_HIDDEN_ICONS + MENUITEM "Visualizza icone &bottoni", ID_SHOW_ICON_BUTTON + MENUITEM "&Configura notifiche...", ID_CONFIG_NOTIFYAREA + MENUITEM "Regola Data/&Ora...", ID_CONFIG_TIME + MENUITEM SEPARATOR + MENUITEM "&Informazioni su Explorer...", ID_ABOUT_EXPLORER + END +END + +IDM_SDIFRAME MENU +BEGIN + POPUP "&File" + BEGIN + MENUITEM "&Esegui...", ID_EXECUTE + MENUITEM SEPARATOR + MENUITEM "&Chiudi", ID_FILE_EXIT + END + POPUP "&Visualizza" + BEGIN + MENUITEM "Barra degli s&trumenti", ID_VIEW_TOOL_BAR + MENUITEM "S&ide Bar", ID_VIEW_SIDE_BAR, GRAYED + MENUITEM "Barra di &stato", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Aggiorna\tF5", ID_REFRESH + MENUITEM "Schermo intero\tCtrl+Maiusc+S", ID_VIEW_FULLSCREEN + MENUITEM "&MDI", ID_VIEW_MDI + END + POPUP "&Strumenti" + BEGIN + MENUITEM "&Opzioni", ID_TOOLS_OPTIONS + END + POPUP "&?" + BEGIN + MENUITEM "&FAQ su Explorer...", ID_EXPLORER_FAQ + MENUITEM "&Informazioni su Explorer...", ID_ABOUT_EXPLORER + MENUITEM "Informazioni su React&OS...", ID_ABOUT_WINDOWS + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_EXECUTE DIALOG 15, 13, 210, 63 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Esegui" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",101,"Static",SS_SIMPLE | SS_NOPREFIX,3,6,150,10 + CONTROL "&Comando:",-1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,3,18,60,10 + EDITTEXT 201,3,29,134,12,ES_AUTOHSCROLL + CONTROL "Come &Simbolo",214,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,45,71,12 + DEFPUSHBUTTON "&OK",1,158,6,47,14 + PUSHBUTTON "&Annulla",2,158,23,47,14 + PUSHBUTTON "&Aiuto",254,158,43,47,14 +END + +IDD_SEARCH_PROGRAM DIALOGEX 0, 0, 200, 65 +STYLE DS_SETFONT | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +EXSTYLE WS_EX_APPWINDOW +CAPTION "Cerca programmi nel menu avvio" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + LTEXT "&Filtro:",IDC_STATIC,7,9,18,8 + EDITTEXT IDC_FILTER,34,7,100,14,ES_AUTOHSCROLL + CONTROL "List1",IDC_PROGRAMS_FOUND,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,7,25,186,33 + PUSHBUTTON "&Verifica elementi",IDC_CHECK_ENTRIES,143,7,50,14 +END + +IDD_DESKBAR_DESKTOP DIALOG 0, 0, 212, 194 +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Impostazioni desktop" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "Seleziona la modalità di allineamento delle icone che preferisci:",IDC_STATIC,7,7,166,8 + CONTROL "left/top dwn",IDC_ICON_ALIGN_0,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,7,25,46,44 + CONTROL "left/top right",IDC_ICON_ALIGN_1,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,57,25,46,44 + CONTROL "right/top left",IDC_ICON_ALIGN_2,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,110,25,46,44 + CONTROL "rig./top dwn",IDC_ICON_ALIGN_3,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,25,46,44 + CONTROL "left/bot. up",IDC_ICON_ALIGN_4,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,7,73,46,44 + CONTROL "left/bot. right",IDC_ICON_ALIGN_5,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,57,73,46,44 + CONTROL "right/bot. left",IDC_ICON_ALIGN_6,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,110,73,46,44 + CONTROL "rig./bot. dwn",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,73,46,44 + CONTROL "border down",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,7,121,46,44 + CONTROL "border H/V",IDC_ICON_ALIGN_9,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,57,121,46,44 + CONTROL "round about",IDC_ICON_ALIGN_10,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,110,121,46,44 + CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,121,46,44 + CONTROL "Visualizza versione",ID_DESKTOP_VERSION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 +END + +IDD_DESKBAR_TASKBAR DIALOGEX 0, 0, 210, 194 +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Impostazioni Taskbar" +FONT 8, "MS Sans Serif", 0, 0, 0x0 +BEGIN + CONTROL "Visualizza orologio",ID_SHOW_CLOCK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,152,74,10 + CONTROL "&Nascondi icone inattive",ID_HIDE_INACTIVE_ICONS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,174,111,10 + PUSHBUTTON "&Notifiche...",ID_CONFIG_NOTIFYAREA,153,173,50,14 +END + +IDD_DESKBAR_STARTMENU DIALOG 0, 0, 210, 194 +STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Impostazioni Menu di avvio" +FONT 8, "MS Sans Serif" +BEGIN +END + +IDD_NOTIFYAREA DIALOGEX 0, 0, 208, 174 +STYLE DS_SETFONT | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME +EXSTYLE WS_EX_APPWINDOW +CAPTION "Configura icone di notifica" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + CONTROL "Tree1",IDC_NOTIFY_ICONS,"SysTreeView32",TVS_HASLINES | TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,194,31 + LTEXT "&Testo di aiuto:",IDC_LABEL1,7,44,40,8 + EDITTEXT IDC_NOTIFY_TOOLTIP,58,42,143,14,ES_AUTOHSCROLL + LTEXT "Titolo finestra:",IDC_LABEL2,7,63,44,8 + EDITTEXT IDC_NOTIFY_TITLE,58,60,143,14,ES_AUTOHSCROLL + LTEXT "Percorso del modulo:",IDC_LABEL3,7,81,43,8 + EDITTEXT IDC_NOTIFY_MODULE,58,78,143,14,ES_AUTOHSCROLL + GROUPBOX "&Modalità di visualizzazione",IDC_LABEL4,7,96,157,28 + CONTROL "&visualizza",IDC_NOTIFY_SHOW,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,15,108,33,10 + CONTROL "&nascondi",IDC_NOTIFY_HIDE,"Button",BS_AUTORADIOBUTTON,66,108,29,10 + CONTROL "nascondi &automaticamente",IDC_NOTIFY_AUTOHIDE,"Button",BS_AUTORADIOBUTTON,112,108,43,10 + ICON "",IDC_PICTURE,173,101,21,20 + LTEXT "&Ultima modifica:",IDC_LABEL6,7,132,43,8 + EDITTEXT IDC_LAST_CHANGE,59,129,105,14,ES_AUTOHSCROLL | ES_READONLY + CONTROL "sho&w hidden",ID_SHOW_HIDDEN_ICONS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,154,56,10 + DEFPUSHBUTTON "&OK",IDOK,91,153,50,14,WS_GROUP + PUSHBUTTON "&Annulla",IDCANCEL,151,153,50,14 +END + +IDD_MDI_SDI DIALOGEX 0, 0, 194, 157 +STYLE DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_APPWINDOW +CAPTION "Seleziona aspetto di Explorer" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + LTEXT "Seleziona la modalità di explorer:",IDC_STATIC,7,7,160,8 + CONTROL "&MDI (Interfaccia a documenti multipli)",IDC_MDI,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,7,31,124,10 + CONTROL "&SDI (Interfaccia a documento singolo)",IDC_SDI,"Button",BS_AUTORADIOBUTTON,7,62,118,10 + CONTROL 170,IDC_STATIC,"Static",SS_BITMAP,145,23,15,13 + CONTROL 171,IDC_STATIC,"Static",SS_BITMAP,145,57,15,13 + CONTROL "Apri sottocartelle in finestre separate",IDC_SEPARATE_SUBFOLDERS, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,90,135,10 + LTEXT "Queste impostazioni saranno usate come predefinite per tutte le finestre di explorer.",IDC_STATIC,7,111,174,22 + DEFPUSHBUTTON "&OK",IDOK,29,136,50,14,WS_GROUP + PUSHBUTTON "&Annulla",IDCANCEL,106,136,50,14 +END + +IDD_ABOUT_EXPLORER DIALOG 0, 0, 199, 106 +STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Informazioni su ReactOS Explorer" +FONT 10, "MS Sans Serif" +BEGIN + LTEXT "ReactOS Explorer",IDC_ROS_EXPLORER,91,13,104,11 + LTEXT "V 0.9",IDC_VERSION_TXT,91,27,104,8 + LTEXT "(c) 2003-2005 Martin Fuchs",IDC_STATIC,91,42,104,8 + LTEXT "",IDC_WIN_VERSION,91,58,98,22 + LTEXT "http://www.sky.franken.de/explorer/",IDC_WWW,17,84,129,8 + CONTROL "&OK",IDOK,"Button",BS_OWNERDRAW | BS_FLAT | WS_GROUP,154,90,38,12 +END + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include <windows.h>\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE +BEGIN + IDS_TITLE "Reactos Explorer" + IDS_START "Start" + IDS_LOGOFF "Disconnetti..." + IDS_SHUTDOWN "Chiudi sessione..." + IDS_LAUNCH "Esegui..." + IDS_START_HELP "Guida" + IDS_SEARCH_FILES "Cerca..." + IDS_DOCUMENTS "Documenti" + IDS_FAVORITES "Preferiti" + IDS_PROGRAMS "Programmi" + IDS_SETTINGS "Impostazioni" + IDS_EXPLORE "Esplora" + IDS_EMPTY "(Vuoto)" + IDS_RECENT "Documenti recenti" + IDS_ADMIN "Amministrazione" +END + +STRINGTABLE +BEGIN + IDS_STARTMENU "Menu avvio" + IDS_MINIMIZE_ALL "Minimizza tutte le finestre" + IDS_DESKTOP_NUM "Desktop %d" + IDS_VOLUME "Volume" + IDS_ITEMS_CUR "elementi attuali" + IDS_ITEMS_CONFIGURED "configurazione" + IDS_ITEMS_VISIBLE "visibile" + IDS_ITEMS_HIDDEN "nascosto" + IDS_NOTIFY_SHOW "visualizza" + IDS_NOTIFY_HIDE "nascondi" + IDS_NOTIFY_AUTOHIDE "nascondi automaticamente" + IDS_SHOW_HIDDEN_ICONS "Visualizza icone nascoste" + IDS_HIDE_ICONS "Nascondi icone" + IDS_TERMINATE "Termina ReactOS Explorer" +END + +STRINGTABLE +BEGIN + IDS_NETWORK "Rete" + IDS_CONNECTIONS "Connessioni di rete" + IDS_DRIVES "Risorse del computer" + IDS_SEARCH_COMPUTER "Cerca computer..." + IDS_SETTINGS_MENU "Impostazioni" + IDS_CONTROL_PANEL "Pannello di controllo" + IDS_PRINTERS "Stampanti" + IDS_BROWSE "Naviga files" + IDS_SEARCH_PRG "Cerca programma..." + IDS_ALL_USERS "Tutti gli utenti\\" + IDS_SEARCH "Cerca" + IDS_ABOUT_EXPLORER "&Informazioni su Explorer..." + IDS_LAUNCH_MANY_PROGRAMS + "Hai selezionato più di un programma.\nSei sicuro di volerli eseguire tutti?" + IDS_DESKTOPBAR_SETTINGS "Impostazioni del Desktop" + IDS_DESKTOP "Desktop" + IDS_TASKBAR "Taskbar" +END + +#endif // Italian (Neutral) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + Modified: trunk/reactos/base/shell/explorer/explorer_intres.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/shell/explorer/explore… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer_intres.rc (original) +++ trunk/reactos/base/shell/explorer/explorer_intres.rc Thu May 25 20:59:15 2006 @@ -119,6 +119,7 @@ "#include ""explorer-jp.rc""\r\n" "#include ""explorer-hu.rc""\r\n" "#include ""explorer-uk.rc""\r\n" + "#include ""explorer-it.rc""\r\n" "\r\n" "#ifndef __WINDRES__\r\n" "#include ""explorer-cn.rc""\r\n" @@ -214,6 +215,7 @@ #include "explorer-jp.rc" #include "explorer-hu.rc" #include "explorer-uk.rc" +#include "explorer-it.rc" #ifndef __WINDRES__ #include "explorer-cn.rc"

18 years, 3 months

[greatlrd] 22039: revert this chnage for filip told me it is complete wrong rtl should never link to mscvrt

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Thu May 25 20:34:02 2006 New Revision: 22039 URL: http://svn.reactos.ru/svn/reactos?rev=22039&view=rev Log: revert this chnage for filip told me it is complete wrong rtl should never link to mscvrt Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.rbu… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild Thu May 25 20:34:02 2006 @@ -24,7 +24,6 @@ <library>kernel32</library> <library>ntdll</library> <library>wine</library> - <library>rtl</library> <pch>precomp.h</pch> <file>dllmain.c</file> <file>msvcrt.rc</file>

18 years, 3 months

[greatlrd] 22038: Adding rtl to msvcrt.rbuild for it is only one that contain the *printf stuff.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Thu May 25 20:28:44 2006 New Revision: 22038 URL: http://svn.reactos.ru/svn/reactos?rev=22038&view=rev Log: Adding rtl to msvcrt.rbuild for it is only one that contain the *printf stuff. Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.rbu… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild Thu May 25 20:28:44 2006 @@ -24,6 +24,7 @@ <library>kernel32</library> <library>ntdll</library> <library>wine</library> + <library>rtl</library> <pch>precomp.h</pch> <file>dllmain.c</file> <file>msvcrt.rc</file>

18 years, 3 months

[ion] 22037: - Fix ObReferenceObjectByName and ObOpenObjectByName not to blissfully ignore the AccessState and ParseContext parameters. - Change ObFindObject's prototype to be able to accomodate these two parameters so that they can be sent to the parse routine.

by ion＠svn.reactos.org

Author: ion Date: Thu May 25 08:17:29 2006 New Revision: 22037 URL: http://svn.reactos.ru/svn/reactos?rev=22037&view=rev Log: - Fix ObReferenceObjectByName and ObOpenObjectByName not to blissfully ignore the AccessState and ParseContext parameters. - Change ObFindObject's prototype to be able to accomodate these two parameters so that they can be sent to the parse routine. Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c trunk/reactos/ntoskrnl/cm/registry.c trunk/reactos/ntoskrnl/include/internal/ob.h trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/obname.c trunk/reactos/ntoskrnl/ob/obref.c Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/cm/ntfunc.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/cm/ntfunc.c (original) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c Thu May 25 08:17:29 2006 @@ -264,7 +264,9 @@ (PVOID*)&Object, &RemainingPath, CmiKeyType, - &Context); + &Context, + NULL, + NULL); if (!NT_SUCCESS(Status)) { PostCreateKeyInfo.Object = NULL; @@ -1333,7 +1335,9 @@ (PVOID*)&Object, &RemainingPath, CmiKeyType, - &Context); + &Context, + NULL, + NULL); if (!NT_SUCCESS(Status)) { DPRINT("CmpFindObject() returned 0x%08lx\n", Status); Modified: trunk/reactos/ntoskrnl/cm/registry.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/cm/registry.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/cm/registry.c (original) +++ trunk/reactos/ntoskrnl/cm/registry.c Thu May 25 08:17:29 2006 @@ -727,7 +727,9 @@ (PVOID*)&ParentKey, &RemainingPath, CmiKeyType, - &Context); + &Context, + NULL, + NULL); ObpReleaseCapturedAttributes(&ObjectCreateInfo); if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); if (!NT_SUCCESS(Status)) Modified: trunk/reactos/ntoskrnl/include/internal/ob.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/include/internal/o… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ob.h Thu May 25 08:17:29 2006 @@ -118,7 +118,9 @@ PVOID* ReturnedObject, PUNICODE_STRING RemainingPath, POBJECT_TYPE ObjectType, - POBP_LOOKUP_CONTEXT Context + POBP_LOOKUP_CONTEXT Context, + IN PACCESS_STATE AccessState, + IN PVOID ParseContext ); NTSTATUS Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Thu May 25 08:17:29 2006 @@ -752,7 +752,8 @@ return Header->HandleCount; } -NTSTATUS STDCALL +NTSTATUS +NTAPI ObOpenObjectByName(IN POBJECT_ATTRIBUTES ObjectAttributes, IN POBJECT_TYPE ObjectType, IN OUT PVOID ParseContext, @@ -767,43 +768,54 @@ OBJECT_CREATE_INFORMATION ObjectCreateInfo; NTSTATUS Status; OBP_LOOKUP_CONTEXT Context; - - PAGED_CODE(); - - DPRINT("ObOpenObjectByName(...)\n"); + AUX_DATA AuxData; + PGENERIC_MAPPING GenericMapping = NULL; + ACCESS_STATE AccessState; + PAGED_CODE(); /* Capture all the info */ - DPRINT("Capturing Create Info\n"); Status = ObpCaptureObjectAttributes(ObjectAttributes, - AccessMode, - ObjectType, - &ObjectCreateInfo, - &ObjectName); - if (!NT_SUCCESS(Status)) - { - DPRINT("ObpCaptureObjectAttributes() failed (Status %lx)\n", Status); - return Status; - } - + AccessMode, + ObjectType, + &ObjectCreateInfo, + &ObjectName); + if (!NT_SUCCESS(Status)) return Status; + + /* Check if we didn't get an access state */ + if (!PassedAccessState) + { + /* Try to get the generic mapping if we can */ + if (ObjectType) GenericMapping = &ObjectType->TypeInfo.GenericMapping; + + /* Use our built-in access state */ + PassedAccessState = &AccessState; + Status = SeCreateAccessState(&AccessState, + &AuxData, + DesiredAccess, + GenericMapping); + if (!NT_SUCCESS(Status)) goto Quickie; + } + + /* Get the security descriptor */ + if (ObjectCreateInfo.SecurityDescriptor) + { + /* Save it in the access state */ + PassedAccessState->SecurityDescriptor = + ObjectCreateInfo.SecurityDescriptor; + } + + /* Now do the lookup */ Status = ObFindObject(&ObjectCreateInfo, - &ObjectName, - &Object, - &RemainingPath, - ObjectType, - &Context); - if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); - if (!NT_SUCCESS(Status)) - { - DPRINT("ObFindObject() failed (Status %lx)\n", Status); - goto Cleanup; - } - - DPRINT("OBject: %p, Remaining Path: %wZ\n", Object, &RemainingPath); - if (Object == NULL) - { - Status = STATUS_UNSUCCESSFUL; - goto Cleanup; - } + &ObjectName, + &Object, + &RemainingPath, + ObjectType, + &Context, // Temporary Hack + PassedAccessState, + ParseContext); + if (!NT_SUCCESS(Status)) goto Cleanup; + + /* ROS Hack */ if (RemainingPath.Buffer != NULL) { if (wcschr(RemainingPath.Buffer + 1, L'\\') == NULL) @@ -813,26 +825,37 @@ goto Cleanup; } + /* Create the actual handle now */ Status = ObpCreateHandle(Object, - DesiredAccess, - ObjectCreateInfo.Attributes, - Handle); + DesiredAccess, + ObjectCreateInfo.Attributes, + Handle); Cleanup: - if (Object != NULL) - { - ObDereferenceObject(Object); - } + /* Dereference the object */ + if (Object) ObDereferenceObject(Object); + + /* ROS Hacl: Free the remaining path */ RtlFreeUnicodeString(&RemainingPath); + + /* Delete the access state */ + if (PassedAccessState == &AccessState) + { + SeDeleteAccessState(PassedAccessState); + } + + /* Release the object attributes and return status */ +Quickie: ObpReleaseCapturedAttributes(&ObjectCreateInfo); - + if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); return Status; } /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS +NTAPI ObOpenObjectByPointer(IN PVOID Object, IN ULONG HandleAttributes, IN PACCESS_STATE PassedAccessState, @@ -842,28 +865,24 @@ OUT PHANDLE Handle) { NTSTATUS Status; - - PAGED_CODE(); - - DPRINT("ObOpenObjectByPointer()\n"); - + PAGED_CODE(); + + /* Reference the object */ Status = ObReferenceObjectByPointer(Object, - 0, - ObjectType, - AccessMode); - if (!NT_SUCCESS(Status)) - { - return Status; - } - + 0, + ObjectType, + AccessMode); + if (!NT_SUCCESS(Status)) return Status; + + /* Create the handle */ Status = ObpCreateHandle(Object, - DesiredAccess, - HandleAttributes, - Handle); - + DesiredAccess, + HandleAttributes, + Handle); + + /* ROS Hack: Dereference the object and return */ ObDereferenceObject(Object); - - return STATUS_SUCCESS; + return Status; } NTSTATUS STDCALL @@ -921,11 +940,9 @@ PSECURITY_DESCRIPTOR NewSecurityDescriptor = NULL; SECURITY_SUBJECT_CONTEXT SubjectContext; OBP_LOOKUP_CONTEXT Context; - PAGED_CODE(); /* Get the Header and Create Info */ - DPRINT("ObInsertObject: %x\n", Object); Header = BODY_TO_HEADER(Object); ObjectCreateInfo = Header->ObjectCreateInfo; ObjectNameInfo = HEADER_TO_OBJECT_NAME(Header); @@ -939,7 +956,9 @@ &FoundObject, &RemainingPath, NULL, - &Context); + &Context, + NULL, + NULL); DPRINT("FoundObject: %x, Path: %wZ\n", FoundObject, &RemainingPath); if (!NT_SUCCESS(Status)) { Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c (original) +++ trunk/reactos/ntoskrnl/ob/obname.c Thu May 25 08:17:29 2006 @@ -27,7 +27,9 @@ PVOID* ReturnedObject, PUNICODE_STRING RemainingPath, POBJECT_TYPE ObjectType, - POBP_LOOKUP_CONTEXT Context) + POBP_LOOKUP_CONTEXT Context, + IN PACCESS_STATE AccessState, + IN PVOID ParseContext) { PVOID NextObject; PVOID CurrentObject; Modified: trunk/reactos/ntoskrnl/ob/obref.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/ob/obref.c?rev=220… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obref.c (original) +++ trunk/reactos/ntoskrnl/ob/obref.c Thu May 25 08:17:29 2006 @@ -188,7 +188,8 @@ return(STATUS_SUCCESS); } -NTSTATUS STDCALL +NTSTATUS +NTAPI ObReferenceObjectByName(PUNICODE_STRING ObjectPath, ULONG Attributes, PACCESS_STATE PassedAccessState, @@ -204,50 +205,66 @@ OBJECT_CREATE_INFORMATION ObjectCreateInfo; NTSTATUS Status; OBP_LOOKUP_CONTEXT Context; - - PAGED_CODE(); + AUX_DATA AuxData; + ACCESS_STATE AccessState; /* Capture the name */ - DPRINT("Capturing Name\n"); Status = ObpCaptureObjectName(&ObjectName, ObjectPath, AccessMode); - if (!NT_SUCCESS(Status)) - { - DPRINT("ObpCaptureObjectName() failed (Status %lx)\n", Status); - return Status; - } - - /* - * Create a fake ObjectCreateInfo structure. Note that my upcoming - * ObFindObject refactoring will remove the need for this hack. - */ + if (!NT_SUCCESS(Status)) return Status; + + /* Check if we didn't get an access state */ + if (!PassedAccessState) + { + /* Use our built-in access state */ + PassedAccessState = &AccessState; + Status = SeCreateAccessState(&AccessState, + &AuxData, + DesiredAccess, + &ObjectType->TypeInfo.GenericMapping); + if (!NT_SUCCESS(Status)) goto Quickie; + } + + /* + * Create a fake ObjectCreateInfo structure. Note that my upcoming + * ObFindObject refactoring will remove the need for this hack. + */ ObjectCreateInfo.RootDirectory = NULL; ObjectCreateInfo.Attributes = Attributes; - Status = ObFindObject(&ObjectCreateInfo, - &ObjectName, - &Object, - &RemainingPath, - ObjectType, - &Context); - - if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); - - if (!NT_SUCCESS(Status)) - { - return(Status); - } - DPRINT("RemainingPath.Buffer '%S' Object %p\n", RemainingPath.Buffer, Object); - + &ObjectName, + &Object, + &RemainingPath, + ObjectType, + &Context, + PassedAccessState, + ParseContext); + if (!NT_SUCCESS(Status)) goto Quickie; + + /* ROS Hack */ if (RemainingPath.Buffer != NULL || Object == NULL) { - DPRINT("Object %p\n", Object); *ObjectPtr = NULL; RtlFreeUnicodeString (&RemainingPath); - return(STATUS_OBJECT_NAME_NOT_FOUND); - } + Status = STATUS_OBJECT_NAME_NOT_FOUND; + goto Quickie; + } + + /* Return the object */ *ObjectPtr = Object; - RtlFreeUnicodeString (&RemainingPath); - return(STATUS_SUCCESS); + + /* ROS Hack: Free the remaining path */ + RtlFreeUnicodeString(&RemainingPath); + + /* Free the access state */ + if (PassedAccessState == &AccessState) + { + SeDeleteAccessState(PassedAccessState); + } + +Quickie: + /* Free the captured name if we had one, and return status */ + if (ObjectName.Buffer) ExFreePool(ObjectName.Buffer); + return Status; } NTSTATUS STDCALL

18 years, 3 months

← Newer
1
...
7
8
9
10
11
12
13
...
38
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 2006