Ros-diffs July 2006

ros-diffs@reactos.org

19 participants
662 discussions

[gedmurphy] 22875: rename commdlg to comdlg32

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu Jul 6 02:44:43 2006 New Revision: 22875 URL: http://svn.reactos.org/svn/reactos?rev=22875&view=rev Log: rename commdlg to comdlg32 Added: vendor/wine/dlls/comdlg32/ - copied from r22873, vendor/wine/dlls/commdlg/ Removed: vendor/wine/dlls/comdlg32/Wine-0_9_10/ vendor/wine/dlls/commdlg/

18 years, 5 months

[gedmurphy] 22874: delete previous tag (which was never actually synced to trunk)

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu Jul 6 02:42:50 2006 New Revision: 22874 URL: http://svn.reactos.org/svn/reactos?rev=22874&view=rev Log: delete previous tag (which was never actually synced to trunk) Removed: vendor/wine/dlls/commdlg/Wine-0_9_10/

18 years, 5 months

[gedmurphy] 22873: tag Wine-0_9_16

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu Jul 6 02:41:45 2006 New Revision: 22873 URL: http://svn.reactos.org/svn/reactos?rev=22873&view=rev Log: tag Wine-0_9_16 Added: vendor/wine/dlls/commdlg/Wine-0_9_16/ - copied from r22872, vendor/wine/dlls/commdlg/current/

18 years, 5 months

[gedmurphy] 22872: Wine-0_9_16 vendor drop

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu Jul 6 02:40:02 2006 New Revision: 22872 URL: http://svn.reactos.org/svn/reactos?rev=22872&view=rev Log: Wine-0_9_16 vendor drop Added: vendor/wine/dlls/commdlg/current/finddlg16.c Modified: vendor/wine/dlls/commdlg/current/Makefile.in vendor/wine/dlls/commdlg/current/cdlg.h vendor/wine/dlls/commdlg/current/cdlg16.h vendor/wine/dlls/commdlg/current/cdlg32.c vendor/wine/dlls/commdlg/current/cdlg_Bg.rc vendor/wine/dlls/commdlg/current/cdlg_Ca.rc vendor/wine/dlls/commdlg/current/cdlg_Cn.rc vendor/wine/dlls/commdlg/current/cdlg_Cs.rc vendor/wine/dlls/commdlg/current/cdlg_Da.rc vendor/wine/dlls/commdlg/current/cdlg_De.rc vendor/wine/dlls/commdlg/current/cdlg_En.rc vendor/wine/dlls/commdlg/current/cdlg_Eo.rc vendor/wine/dlls/commdlg/current/cdlg_Es.rc vendor/wine/dlls/commdlg/current/cdlg_Fi.rc vendor/wine/dlls/commdlg/current/cdlg_Fr.rc vendor/wine/dlls/commdlg/current/cdlg_Hu.rc vendor/wine/dlls/commdlg/current/cdlg_It.rc vendor/wine/dlls/commdlg/current/cdlg_Ja.rc vendor/wine/dlls/commdlg/current/cdlg_Ko.rc vendor/wine/dlls/commdlg/current/cdlg_Nl.rc vendor/wine/dlls/commdlg/current/cdlg_No.rc vendor/wine/dlls/commdlg/current/cdlg_Pl.rc vendor/wine/dlls/commdlg/current/cdlg_Pt.rc vendor/wine/dlls/commdlg/current/cdlg_Ru.rc vendor/wine/dlls/commdlg/current/cdlg_Si.rc vendor/wine/dlls/commdlg/current/cdlg_Sk.rc vendor/wine/dlls/commdlg/current/cdlg_Sv.rc vendor/wine/dlls/commdlg/current/cdlg_Th.rc vendor/wine/dlls/commdlg/current/cdlg_Tr.rc vendor/wine/dlls/commdlg/current/cdlg_Uk.rc vendor/wine/dlls/commdlg/current/cdlg_Wa.rc vendor/wine/dlls/commdlg/current/cdlg_Zh.rc vendor/wine/dlls/commdlg/current/cdlg_xx.rc vendor/wine/dlls/commdlg/current/colordlg.c vendor/wine/dlls/commdlg/current/colordlg16.c vendor/wine/dlls/commdlg/current/filedlg.c vendor/wine/dlls/commdlg/current/filedlg16.c vendor/wine/dlls/commdlg/current/filedlg31.c vendor/wine/dlls/commdlg/current/filedlg31.h vendor/wine/dlls/commdlg/current/filedlgbrowser.c vendor/wine/dlls/commdlg/current/filedlgbrowser.h vendor/wine/dlls/commdlg/current/filetitle.c vendor/wine/dlls/commdlg/current/finddlg32.c vendor/wine/dlls/commdlg/current/fontdlg.c vendor/wine/dlls/commdlg/current/fontdlg16.c vendor/wine/dlls/commdlg/current/printdlg.c vendor/wine/dlls/commdlg/current/printdlg.h vendor/wine/dlls/commdlg/current/printdlg16.c vendor/wine/dlls/commdlg/current/rsrc.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: vendor/wine/dlls/commdlg/current/Makefile.in URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/Makefil… Modified: vendor/wine/dlls/commdlg/current/cdlg.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/cdlg.h?… Modified: vendor/wine/dlls/commdlg/current/cdlg16.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/cdlg16.… Modified: vendor/wine/dlls/commdlg/current/cdlg32.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/cdlg32.… Modified: vendor/wine/dlls/commdlg/current/cdlg_Bg.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/cdlg_Bg… Modified: vendor/wine/dlls/commdlg/current/cdlg_Ca.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/cdlg_Ca… Modified: vendor/wine/dlls/commdlg/current/cdlg_Cn.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/cdlg_Cn… Modified: vendor/wine/dlls/commdlg/current/cdlg_Cs.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/cdlg_Cs… Modified: vendor/wine/dlls/commdlg/current/cdlg_Da.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/cdlg_Da… Modified: vendor/wine/dlls/commdlg/current/cdlg_De.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/cdlg_De… Modified: vendor/wine/dlls/commdlg/current/cdlg_En.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/cdlg_En… Modified: vendor/wine/dlls/commdlg/current/cdlg_Eo.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/cdlg_Eo… Modified: vendor/wine/dlls/commdlg/current/cdlg_Es.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/cdlg_Es… Modified: vendor/wine/dlls/commdlg/current/cdlg_Fi.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/cdlg_Fi… Modified: vendor/wine/dlls/commdlg/current/cdlg_Fr.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/cdlg_Fr… Modified: vendor/wine/dlls/commdlg/current/cdlg_Hu.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/cdlg_Hu… Modified: vendor/wine/dlls/commdlg/current/cdlg_It.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/cdlg_It… Modified: vendor/wine/dlls/commdlg/current/cdlg_Ja.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/cdlg_Ja… Modified: vendor/wine/dlls/commdlg/current/cdlg_Ko.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/cdlg_Ko… Modified: vendor/wine/dlls/commdlg/current/cdlg_Nl.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/cdlg_Nl… Modified: vendor/wine/dlls/commdlg/current/cdlg_No.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/cdlg_No… Modified: vendor/wine/dlls/commdlg/current/cdlg_Pl.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/cdlg_Pl… Modified: vendor/wine/dlls/commdlg/current/cdlg_Pt.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/cdlg_Pt… Modified: vendor/wine/dlls/commdlg/current/cdlg_Ru.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/cdlg_Ru… Modified: vendor/wine/dlls/commdlg/current/cdlg_Si.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/cdlg_Si… Modified: vendor/wine/dlls/commdlg/current/cdlg_Sk.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/cdlg_Sk… Modified: vendor/wine/dlls/commdlg/current/cdlg_Sv.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/cdlg_Sv… Modified: vendor/wine/dlls/commdlg/current/cdlg_Th.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/cdlg_Th… Modified: vendor/wine/dlls/commdlg/current/cdlg_Tr.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/cdlg_Tr… Modified: vendor/wine/dlls/commdlg/current/cdlg_Uk.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/cdlg_Uk… Modified: vendor/wine/dlls/commdlg/current/cdlg_Wa.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/cdlg_Wa… Modified: vendor/wine/dlls/commdlg/current/cdlg_Zh.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/cdlg_Zh… Modified: vendor/wine/dlls/commdlg/current/cdlg_xx.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/cdlg_xx… Modified: vendor/wine/dlls/commdlg/current/colordlg.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/colordl… Modified: vendor/wine/dlls/commdlg/current/colordlg16.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/colordl… Modified: vendor/wine/dlls/commdlg/current/filedlg.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/filedlg… Modified: vendor/wine/dlls/commdlg/current/filedlg16.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/filedlg… Modified: vendor/wine/dlls/commdlg/current/filedlg31.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/filedlg… Modified: vendor/wine/dlls/commdlg/current/filedlg31.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/filedlg… Modified: vendor/wine/dlls/commdlg/current/filedlgbrowser.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/filedlg… Modified: vendor/wine/dlls/commdlg/current/filedlgbrowser.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/filedlg… Modified: vendor/wine/dlls/commdlg/current/filetitle.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/filetit… Added: vendor/wine/dlls/commdlg/current/finddlg16.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/finddlg… Modified: vendor/wine/dlls/commdlg/current/finddlg32.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/finddlg… Modified: vendor/wine/dlls/commdlg/current/fontdlg.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/fontdlg… Modified: vendor/wine/dlls/commdlg/current/fontdlg16.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/fontdlg… Modified: vendor/wine/dlls/commdlg/current/printdlg.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/printdl… Modified: vendor/wine/dlls/commdlg/current/printdlg.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/printdl… Modified: vendor/wine/dlls/commdlg/current/printdlg16.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/printdl… Modified: vendor/wine/dlls/commdlg/current/rsrc.rc URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/commdlg/current/rsrc.rc…

18 years, 5 months

[ion] 22871: - Begin attempt at usage of the OPEN_PACKET for I/O Create operations. Currently we only build it and verify it, and I've fixed up IopCreateFile.

by ion＠svn.reactos.org

Author: ion Date: Thu Jul 6 00:56:03 2006 New Revision: 22871 URL: http://svn.reactos.org/svn/reactos?rev=22871&view=rev Log: - Begin attempt at usage of the OPEN_PACKET for I/O Create operations. Currently we only build it and verify it, and I've fixed up IopCreateFile. Modified: trunk/reactos/ntoskrnl/include/internal/io_x.h trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/include/internal/io_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io_x.h (original) +++ trunk/reactos/ntoskrnl/include/internal/io_x.h Thu Jul 6 00:56:03 2006 @@ -76,3 +76,19 @@ } } +BOOLEAN +static __inline +IopValidateOpenPacket(IN POPEN_PACKET OpenPacket) +{ + /* Validate the packet */ + if (!(OpenPacket) || + (OpenPacket->Type != IO_TYPE_OPEN_PACKET) || + (OpenPacket->Size != sizeof(OPEN_PACKET))) + { + /* Fail */ + return FALSE; + } + + /* Good packet */ + return TRUE; +} Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Thu Jul 6 00:56:03 2006 @@ -43,6 +43,9 @@ CompleteName, RemainingName); + /* Validate the open packet */ + if (!IopValidateOpenPacket(OpenPacket)) return STATUS_OBJECT_TYPE_MISMATCH; + /* Create the actual file object */ Status = ObCreateObject(AccessMode, IoFileObjectType, @@ -67,7 +70,7 @@ else { /* Check if we don't have a related file object */ - if (!Context) + if (!OpenPacket->RelatedFileObject) { /* Check if it has a VPB */ if (DeviceObject->Vpb) @@ -128,11 +131,14 @@ OUT PVOID *Object) { PVOID DeviceObject; - OPEN_PACKET OpenPacket; + POPEN_PACKET OpenPacket = (POPEN_PACKET)Context; + + /* Validate the open packet */ + if (!IopValidateOpenPacket(OpenPacket)) return STATUS_OBJECT_TYPE_MISMATCH; /* Get the device object */ DeviceObject = IoGetRelatedDeviceObject(ParseObject); - OpenPacket.RelatedFileObject = ParseObject; + OpenPacket->RelatedFileObject = ParseObject; /* Call the main routine */ return IopParseDevice(DeviceObject, @@ -142,7 +148,7 @@ Attributes, CompleteName, RemainingName, - &OpenPacket, + OpenPacket, SecurityQos, Object); } @@ -812,6 +818,7 @@ KIRQL OldIrql; PKNORMAL_ROUTINE NormalRoutine; PVOID NormalContext; + OPEN_PACKET OpenPacket; PAGED_CODE(); if(Options & IO_NO_PARAMETER_CHECKING) @@ -884,13 +891,41 @@ DPRINT1("FIXME: IO_CHECK_CREATE_PARAMETERS not yet supported!\n"); } + /* Setup the Open Packet */ + OpenPacket.Type = IO_TYPE_OPEN_PACKET; + OpenPacket.Size = sizeof(OPEN_PACKET); + OpenPacket.FileObject = NULL; + OpenPacket.FinalStatus = STATUS_SUCCESS; + OpenPacket.Information = 0; + OpenPacket.ParseCheck = 0; + OpenPacket.RelatedFileObject = NULL; + OpenPacket.OriginalAttributes = *ObjectAttributes; + OpenPacket.AllocationSize = SafeAllocationSize; + OpenPacket.CreateOptions = CreateOptions; + OpenPacket.FileAttributes = FileAttributes; + OpenPacket.ShareAccess = ShareAccess; + OpenPacket.EaBuffer = SystemEaBuffer; + OpenPacket.EaLength = EaLength; + OpenPacket.Options = Options; + OpenPacket.Disposition = CreateDisposition; + OpenPacket.BasicInformation = NULL; + OpenPacket.NetworkInformation = NULL; + OpenPacket.CreateFileType = CreateFileType; + OpenPacket.MailslotOrPipeParameters = ExtraCreateParameters; + OpenPacket.Override = FALSE; + OpenPacket.QueryOnly = FALSE; + OpenPacket.DeleteOnly = FALSE; + OpenPacket.FullAttributes = FALSE; + OpenPacket.DummyFileObject = NULL; + OpenPacket.InternalFlags = 0; + /* First try to open an existing named object */ Status = ObOpenObjectByName(ObjectAttributes, NULL, AccessMode, NULL, DesiredAccess, - NULL, + &OpenPacket, &LocalHandle); RtlMapGenericMask(&DesiredAccess, &IoFileObjectType->TypeInfo.GenericMapping);

18 years, 5 months

[ion] 22870: - Silence TCP/IP. - Prototye fix.

by ion＠svn.reactos.org

Author: ion Date: Thu Jul 6 00:36:56 2006 New Revision: 22870 URL: http://svn.reactos.org/svn/reactos?rev=22870&view=rev Log: - Silence TCP/IP. - Prototye fix. Modified: trunk/reactos/drivers/network/tcpip/tcpip/irp.c trunk/reactos/drivers/network/tcpip/tcpip/main.c trunk/reactos/ntoskrnl/include/internal/se.h trunk/reactos/ntoskrnl/io/iomgr/file.c trunk/reactos/ntoskrnl/se/sd.c Modified: trunk/reactos/drivers/network/tcpip/tcpip/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/irp.c (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/irp.c Thu Jul 6 00:36:56 2006 @@ -18,7 +18,7 @@ } NTSTATUS IRPFinish( PIRP Irp, NTSTATUS Status ) { - DbgPrint("Called: Irp %x, Status %x Event %x\n", Irp, Status, Irp->UserEvent); + //DbgPrint("Called: Irp %x, Status %x Event %x\n", Irp, Status, Irp->UserEvent); #ifdef MEMTRACK UntrackFL( __FILE__, __LINE__, Irp ); Modified: trunk/reactos/drivers/network/tcpip/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/main.c (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/main.c Thu Jul 6 00:36:56 2006 @@ -385,7 +385,7 @@ RIRP(Irp); - DbgPrint("Called. DeviceObject is at (0x%X), IRP is at (0x%X).\n", DeviceObject, Irp); +// DbgPrint("Called. DeviceObject is at (0x%X), IRP is at (0x%X).\n", DeviceObject, Irp); IrpSp = IoGetCurrentIrpStackLocation(Irp); @@ -413,7 +413,7 @@ Status = STATUS_INVALID_DEVICE_REQUEST; } - DbgPrint("Leaving. Status is (0x%X)\n", Status); + //DbgPrint("Leaving. Status is (0x%X)\n", Status); return IRPFinish( Irp, Status ); } Modified: trunk/reactos/ntoskrnl/include/internal/se.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/se.h (original) +++ trunk/reactos/ntoskrnl/include/internal/se.h Thu Jul 6 00:36:56 2006 @@ -260,7 +260,7 @@ NTAPI SeSetWorldSecurityDescriptor( SECURITY_INFORMATION SecurityInformation, - PSECURITY_DESCRIPTOR SecurityDescriptor, + PISECURITY_DESCRIPTOR SecurityDescriptor, PULONG BufferLength ); Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Thu Jul 6 00:36:56 2006 @@ -884,8 +884,6 @@ DPRINT1("FIXME: IO_CHECK_CREATE_PARAMETERS not yet supported!\n"); } - RtlMapGenericMask(&DesiredAccess, &IoFileObjectType->TypeInfo.GenericMapping); - /* First try to open an existing named object */ Status = ObOpenObjectByName(ObjectAttributes, NULL, @@ -894,6 +892,8 @@ DesiredAccess, NULL, &LocalHandle); + + RtlMapGenericMask(&DesiredAccess, &IoFileObjectType->TypeInfo.GenericMapping); ObReferenceObjectByHandle(LocalHandle, DesiredAccess, NULL, Modified: trunk/reactos/ntoskrnl/se/sd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/sd.c?rev=22870… ============================================================================== --- trunk/reactos/ntoskrnl/se/sd.c (original) +++ trunk/reactos/ntoskrnl/se/sd.c Thu Jul 6 00:36:56 2006 @@ -116,7 +116,7 @@ } NTSTATUS -STDCALL +NTAPI SeSetWorldSecurityDescriptor(SECURITY_INFORMATION SecurityInformation, PISECURITY_DESCRIPTOR SecurityDescriptor, PULONG BufferLength)

18 years, 5 months

[ion] 22869: - Simplify IopParseDevice by removing duplicate code.

by ion＠svn.reactos.org

Author: ion Date: Thu Jul 6 00:08:08 2006 New Revision: 22869 URL: http://svn.reactos.org/svn/reactos?rev=22869&view=rev Log: - Simplify IopParseDevice by removing duplicate code. Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/include/internal/se.h trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h Thu Jul 6 00:08:08 2006 @@ -1001,6 +1001,7 @@ extern ULONG IopTraceLevel; extern NPAGED_LOOKASIDE_LIST IopMdlLookasideList; extern GENERIC_MAPPING IopCompletionMapping; +extern GENERIC_MAPPING IopFileMapping; // // Inlined Functions Modified: trunk/reactos/ntoskrnl/include/internal/se.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/se.h (original) +++ trunk/reactos/ntoskrnl/include/internal/se.h Thu Jul 6 00:08:08 2006 @@ -256,6 +256,14 @@ PGENERIC_MAPPING GenericMapping ); +NTSTATUS +NTAPI +SeSetWorldSecurityDescriptor( + SECURITY_INFORMATION SecurityInformation, + PSECURITY_DESCRIPTOR SecurityDescriptor, + PULONG BufferLength +); + #define SepAcquireTokenLockExclusive(Token) \ do { \ KeEnterCriticalRegion(); \ Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Thu Jul 6 00:08:08 2006 @@ -13,16 +13,6 @@ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> - -/* GLOBALS *******************************************************************/ - -extern GENERIC_MAPPING IopFileMapping; - -NTSTATUS -STDCALL -SeSetWorldSecurityDescriptor(SECURITY_INFORMATION SecurityInformation, - PSECURITY_DESCRIPTOR SecurityDescriptor, - PULONG BufferLength); /* PRIVATE FUNCTIONS *********************************************************/ @@ -53,79 +43,73 @@ CompleteName, RemainingName); + /* Create the actual file object */ + Status = ObCreateObject(AccessMode, + IoFileObjectType, + NULL, + AccessMode, + NULL, + sizeof(FILE_OBJECT), + 0, + 0, + (PVOID*)&FileObject); + RtlZeroMemory(FileObject, sizeof(FILE_OBJECT)); + + /* Parent is a device object */ + DeviceObject = IoGetAttachedDevice(ParseObject); + + /* Check if we don't have a remaining name */ if (!*RemainingName->Buffer) { - DeviceObject = ParseObject; - Status = IopReferenceDeviceObject(DeviceObject); - // fixme: NT wouldn't allow this - //if (!NT_SUCCESS(Status)) return Status;// KEBUGCHECK(0); - - Status = ObCreateObject(AccessMode, - IoFileObjectType, - NULL, - AccessMode, - NULL, - sizeof(FILE_OBJECT), - 0, - 0, - (PVOID*)&FileObject); - /* Set File Object Data */ - ASSERT(DeviceObject); - RtlZeroMemory(FileObject, sizeof(FILE_OBJECT)); - FileObject->DeviceObject = IoGetAttachedDevice(DeviceObject); - DPRINT("DO. DRV Name: %p %wZ\n", DeviceObject, &DeviceObject->DriverObject->DriverName); - - /* HACK */ + /* Then this is a device */ FileObject->Flags |= FO_DIRECT_DEVICE_OPEN; - *Object = FileObject; - return STATUS_SUCCESS; - } - - Status = ObCreateObject(AccessMode, - IoFileObjectType, - NULL, - AccessMode, - NULL, - sizeof(FILE_OBJECT), - 0, - 0, - (PVOID*)&FileObject); - RtlZeroMemory(FileObject, sizeof(FILE_OBJECT)); - if (!Context) - { - /* Parent is a device object */ - DeviceObject = IoGetAttachedDevice((PDEVICE_OBJECT)ParseObject); - - /* Check if it has a VPB */ - if (DeviceObject->Vpb) - { - /* Check if it's not already mounted */ - if (!(DeviceObject->Vpb->Flags & VPB_MOUNTED)) + } + else + { + /* Check if we don't have a related file object */ + if (!Context) + { + /* Check if it has a VPB */ + if (DeviceObject->Vpb) { - Status = IopMountVolume(DeviceObject, FALSE, FALSE, FALSE, &Vpb); - if (!NT_SUCCESS(Status)) + /* Check if it's not already mounted */ + if (!(DeviceObject->Vpb->Flags & VPB_MOUNTED)) { - /* Couldn't mount, fail the lookup */ - ObDereferenceObject(FileObject); - *Object = NULL; - return STATUS_UNSUCCESSFUL; + /* Mount the volume */ + Status = IopMountVolume(DeviceObject, + FALSE, + FALSE, + FALSE, + &Vpb); + if (!NT_SUCCESS(Status)) + { + /* Couldn't mount, fail the lookup */ + ObDereferenceObject(FileObject); + *Object = NULL; + return STATUS_UNSUCCESSFUL; + } } + + /* Get the VPB's device object */ + DeviceObject = DeviceObject->Vpb->DeviceObject; } - - DeviceObject = DeviceObject->Vpb->DeviceObject; - } - } - else - { - FileObject->RelatedFileObject = OpenPacket->RelatedFileObject; - DeviceObject = OpenPacket->RelatedFileObject->DeviceObject; - } - + } + else + { + /* Otherwise, this is an open */ + FileObject->RelatedFileObject = OpenPacket->RelatedFileObject; + DeviceObject = OpenPacket->RelatedFileObject->DeviceObject; + } + + /* Create the name for the file object */ + RtlCreateUnicodeString(&FileObject->FileName, RemainingName->Buffer); + } + + /* Set the device object and reference it */ Status = IopReferenceDeviceObject(DeviceObject); - // fixme: NT wouldn't allow this - //if (!NT_SUCCESS(Status)) return Status;// KEBUGCHECK(0); - RtlCreateUnicodeString(&FileObject->FileName, RemainingName->Buffer); FileObject->DeviceObject = DeviceObject; + + /* Set the file object and return success */ *Object = FileObject; return STATUS_SUCCESS; }

18 years, 5 months

[ion] 22868: [FORMATTING] - Fix formatting in IoCreateFile

by ion＠svn.reactos.org

Author: ion Date: Wed Jul 5 23:55:25 2006 New Revision: 22868 URL: http://svn.reactos.org/svn/reactos?rev=22868&view=rev Log: [FORMATTING] - Fix formatting in IoCreateFile Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Wed Jul 5 23:55:25 2006 @@ -795,199 +795,121 @@ } /* - * NAME EXPORTED - * IoCreateFile@56 - * - * DESCRIPTION - * Either causes a new file or directory to be created, or it - * opens an existing file, device, directory or volume, giving - * the caller a handle for the file object. This handle can be - * used by subsequent calls to manipulate data within the file - * or the file object's state of attributes. - * - * ARGUMENTS - * FileHandle (OUT) - * Points to a variable which receives the file handle - * on return; - * - * DesiredAccess - * Desired access to the file; - * - * ObjectAttributes - * Structure describing the file; - * - * IoStatusBlock (OUT) - * Receives information about the operation on return; - * - * AllocationSize [OPTIONAL] - * Initial size of the file in bytes; - * - * FileAttributes - * Attributes to create the file with; - * - * ShareAccess - * Type of shared access the caller would like to the - * file; - * - * CreateDisposition - * Specifies what to do, depending on whether the - * file already exists; - * - * CreateOptions - * Options for creating a new file; - * - * EaBuffer [OPTIONAL] - * Undocumented; - * - * EaLength - * Undocumented; - * - * CreateFileType - * Type of file (normal, named pipe, mailslot) to create; - * - * ExtraCreateParameters [OPTIONAL] - * Additional creation data for named pipe and mailsots; - * - * Options - * Undocumented. - * - * RETURN VALUE - * Status - * - * NOTE - * Prototype taken from Bo Branten's ntifs.h v15. - * Description taken from old NtCreateFile's which is - * now a wrapper of this call. - * - * REVISIONS - * * @implemented */ NTSTATUS -STDCALL -IoCreateFile(OUT PHANDLE FileHandle, - IN ACCESS_MASK DesiredAccess, +NTAPI +IoCreateFile(OUT PHANDLE FileHandle, + IN ACCESS_MASK DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes, OUT PIO_STATUS_BLOCK IoStatusBlock, - IN PLARGE_INTEGER AllocationSize OPTIONAL, - IN ULONG FileAttributes, - IN ULONG ShareAccess, - IN ULONG CreateDisposition, - IN ULONG CreateOptions, - IN PVOID EaBuffer OPTIONAL, - IN ULONG EaLength, + IN PLARGE_INTEGER AllocationSize OPTIONAL, + IN ULONG FileAttributes, + IN ULONG ShareAccess, + IN ULONG CreateDisposition, + IN ULONG CreateOptions, + IN PVOID EaBuffer OPTIONAL, + IN ULONG EaLength, IN CREATE_FILE_TYPE CreateFileType, - IN PVOID ExtraCreateParameters OPTIONAL, - IN ULONG Options) -{ - PFILE_OBJECT FileObject = NULL; - //PDEVICE_OBJECT DeviceObject; - PIRP Irp; - PEXTENDED_IO_STACK_LOCATION StackLoc; - IO_SECURITY_CONTEXT SecurityContext; - KPROCESSOR_MODE AccessMode; - HANDLE LocalHandle; - LARGE_INTEGER SafeAllocationSize; - PVOID SystemEaBuffer = NULL; - NTSTATUS Status = STATUS_SUCCESS; - AUX_DATA AuxData; - ACCESS_STATE AccessState; + IN PVOID ExtraCreateParameters OPTIONAL, + IN ULONG Options) +{ + PFILE_OBJECT FileObject = NULL; + PIRP Irp; + PEXTENDED_IO_STACK_LOCATION StackLoc; + IO_SECURITY_CONTEXT SecurityContext; + KPROCESSOR_MODE AccessMode; + HANDLE LocalHandle = 0; + LARGE_INTEGER SafeAllocationSize; + PVOID SystemEaBuffer = NULL; + NTSTATUS Status = STATUS_SUCCESS; + AUX_DATA AuxData; + ACCESS_STATE AccessState; KIRQL OldIrql; PKNORMAL_ROUTINE NormalRoutine; PVOID NormalContext; - - DPRINT("IoCreateFile(FileHandle 0x%p, DesiredAccess %x, " - "ObjectAttributes 0x%p ObjectAttributes->ObjectName->Buffer %S)\n", - FileHandle,DesiredAccess,ObjectAttributes, - ObjectAttributes->ObjectName->Buffer); - - ASSERT_IRQL(PASSIVE_LEVEL); - - if (IoStatusBlock == NULL || FileHandle == NULL) - return STATUS_ACCESS_VIOLATION; - - LocalHandle = 0; - - if(Options & IO_NO_PARAMETER_CHECKING) - AccessMode = KernelMode; - else - AccessMode = ExGetPreviousMode(); - - if(AccessMode != KernelMode) - { - _SEH_TRY - { - ProbeForWriteHandle(FileHandle); - ProbeForWrite(IoStatusBlock, - sizeof(IO_STATUS_BLOCK), - sizeof(ULONG)); - if(AllocationSize != NULL) - { - SafeAllocationSize = ProbeForReadLargeInteger(AllocationSize); - } - else - SafeAllocationSize.QuadPart = 0; - - if(EaBuffer != NULL && EaLength > 0) - { - ProbeForRead(EaBuffer, - EaLength, - sizeof(ULONG)); - - /* marshal EaBuffer */ - SystemEaBuffer = ExAllocatePool(NonPagedPool, - EaLength); - if(SystemEaBuffer == NULL) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - _SEH_LEAVE; - } - - RtlCopyMemory(SystemEaBuffer, - EaBuffer, - EaLength); - } - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - - if(!NT_SUCCESS(Status)) - { - return Status; - } - } - else - { - if(AllocationSize != NULL) - SafeAllocationSize = *AllocationSize; - else - SafeAllocationSize.QuadPart = 0; - - if(EaBuffer != NULL && EaLength > 0) - { - SystemEaBuffer = EaBuffer; - } - } - - if(Options & IO_CHECK_CREATE_PARAMETERS) - { - DPRINT1("FIXME: IO_CHECK_CREATE_PARAMETERS not yet supported!\n"); - } - - RtlMapGenericMask(&DesiredAccess, &IoFileObjectType->TypeInfo.GenericMapping); - - /* First try to open an existing named object */ - Status = ObOpenObjectByName(ObjectAttributes, - NULL, - AccessMode, - NULL, - DesiredAccess, - NULL, - &LocalHandle); - + PAGED_CODE(); + + if(Options & IO_NO_PARAMETER_CHECKING) + { + AccessMode = KernelMode; + } + else + { + AccessMode = ExGetPreviousMode(); + } + + if(AccessMode != KernelMode) + { + _SEH_TRY + { + ProbeForWriteHandle(FileHandle); + ProbeForWrite(IoStatusBlock, + sizeof(IO_STATUS_BLOCK), + sizeof(ULONG)); + if (AllocationSize) + { + SafeAllocationSize = ProbeForReadLargeInteger(AllocationSize); + } + else + { + SafeAllocationSize.QuadPart = 0; + } + + if ((EaBuffer) && (EaLength)) + { + ProbeForRead(EaBuffer, + EaLength, + sizeof(ULONG)); + + /* marshal EaBuffer */ + SystemEaBuffer = ExAllocatePool(NonPagedPool, EaLength); + if(!SystemEaBuffer) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + _SEH_LEAVE; + } + + RtlCopyMemory(SystemEaBuffer, EaBuffer, EaLength); + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if(!NT_SUCCESS(Status)) return Status; + } + else + { + if (AllocationSize) + { + SafeAllocationSize = *AllocationSize; + } + else + { + SafeAllocationSize.QuadPart = 0; + } + + if ((EaBuffer) && (EaLength)) SystemEaBuffer = EaBuffer; + } + + if(Options & IO_CHECK_CREATE_PARAMETERS) + { + DPRINT1("FIXME: IO_CHECK_CREATE_PARAMETERS not yet supported!\n"); + } + + RtlMapGenericMask(&DesiredAccess, &IoFileObjectType->TypeInfo.GenericMapping); + + /* First try to open an existing named object */ + Status = ObOpenObjectByName(ObjectAttributes, + NULL, + AccessMode, + NULL, + DesiredAccess, + NULL, + &LocalHandle); ObReferenceObjectByHandle(LocalHandle, DesiredAccess, NULL, @@ -999,10 +921,6 @@ FileObject->Type = IO_TYPE_FILE; FileObject->Size = sizeof(FILE_OBJECT); - // - // stop stuff that should be in IopParseDevice - // - if (CreateOptions & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) { @@ -1034,107 +952,84 @@ { FileObject->Flags |= FO_OPENED_CASE_SENSITIVE; } - /* - * FIXME: We should get the access state from Ob once this function becomes - * a parse routine once the Ob is refactored. - */ - SeCreateAccessState(&AccessState, &AuxData, FILE_ALL_ACCESS, NULL); - - SecurityContext.SecurityQos = NULL; /* ?? */ - SecurityContext.AccessState = &AccessState; - SecurityContext.DesiredAccess = DesiredAccess; - SecurityContext.FullCreateOptions = CreateOptions; - - KeInitializeEvent(&FileObject->Lock, SynchronizationEvent, TRUE); - KeInitializeEvent(&FileObject->Event, NotificationEvent, FALSE); - - DPRINT("FileObject 0x%p\n", FileObject); - DPRINT("FileObject->DeviceObject 0x%p\n", FileObject->DeviceObject); - /* - * Create a new IRP to hand to - * the FS driver: this may fail - * due to resource shortage. - */ - Irp = IoAllocateIrp(FileObject->DeviceObject->StackSize, FALSE); - if (Irp == NULL) - { - ZwClose(LocalHandle); - return STATUS_UNSUCCESSFUL; - } - - /* Now set the IRP data */ - Irp->Tail.Overlay.OriginalFileObject = FileObject; - Irp->RequestorMode = AccessMode; - Irp->Flags = IRP_CREATE_OPERATION | - IRP_SYNCHRONOUS_API | - IRP_DEFER_IO_COMPLETION; - Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - Irp->UserEvent = &FileObject->Event; - Irp->UserIosb = IoStatusBlock; - Irp->MdlAddress = NULL; - Irp->PendingReturned = FALSE; - Irp->UserEvent = NULL; - Irp->Cancel = FALSE; - Irp->CancelRoutine = NULL; - Irp->Tail.Overlay.AuxiliaryBuffer = NULL; - - /* - * Get the stack location for the new - * IRP and prepare it. - */ - StackLoc = (PEXTENDED_IO_STACK_LOCATION)IoGetNextIrpStackLocation(Irp); - StackLoc->Control = 0; - StackLoc->FileObject = FileObject; - - switch (CreateFileType) - { - default: - case CreateFileTypeNone: - StackLoc->MajorFunction = IRP_MJ_CREATE; - StackLoc->Flags = Options; - StackLoc->Parameters.Create.EaLength = SystemEaBuffer != NULL ? EaLength : 0; - StackLoc->Flags |= !(ObjectAttributes->Attributes & OBJ_CASE_INSENSITIVE) ? SL_CASE_SENSITIVE: 0; - break; - - case CreateFileTypeNamedPipe: - StackLoc->MajorFunction = IRP_MJ_CREATE_NAMED_PIPE; - StackLoc->Parameters.CreatePipe.Parameters = ExtraCreateParameters; - break; - - case CreateFileTypeMailslot: - StackLoc->MajorFunction = IRP_MJ_CREATE_MAILSLOT; - StackLoc->Parameters.CreateMailslot.Parameters = ExtraCreateParameters; - break; - } - - /* Set the common data */ - Irp->Overlay.AllocationSize = SafeAllocationSize; - Irp->AssociatedIrp.SystemBuffer = SystemEaBuffer; - StackLoc->Parameters.Create.Options = (CreateDisposition << 24) | (CreateOptions & 0x00FFFFFF); - StackLoc->Parameters.Create.FileAttributes = FileAttributes; - StackLoc->Parameters.Create.ShareAccess = ShareAccess; - StackLoc->Parameters.Create.SecurityContext = &SecurityContext; - - /* - * Now call the driver and - * possibly wait if it can - * not complete the request - * immediately. - */ - Status = IofCallDriver(FileObject->DeviceObject, Irp ); - DPRINT("Status :%x\n", Status); - - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&FileObject->Event, - Executive, - AccessMode, - FALSE, - NULL); - Status = IoStatusBlock->Status; - } - else - { + + SeCreateAccessState(&AccessState, &AuxData, FILE_ALL_ACCESS, NULL); + SecurityContext.SecurityQos = NULL; /* ?? */ + SecurityContext.AccessState = &AccessState; + SecurityContext.DesiredAccess = DesiredAccess; + SecurityContext.FullCreateOptions = CreateOptions; + + KeInitializeEvent(&FileObject->Lock, SynchronizationEvent, TRUE); + KeInitializeEvent(&FileObject->Event, NotificationEvent, FALSE); + + Irp = IoAllocateIrp(FileObject->DeviceObject->StackSize, FALSE); + if (!Irp) + { + ZwClose(LocalHandle); + return STATUS_UNSUCCESSFUL; + } + + /* Now set the IRP data */ + Irp->Tail.Overlay.OriginalFileObject = FileObject; + Irp->RequestorMode = AccessMode; + Irp->Flags = IRP_CREATE_OPERATION | + IRP_SYNCHRONOUS_API | + IRP_DEFER_IO_COMPLETION; + Irp->Tail.Overlay.Thread = PsGetCurrentThread(); + Irp->UserEvent = &FileObject->Event; + Irp->UserIosb = IoStatusBlock; + Irp->MdlAddress = NULL; + Irp->PendingReturned = FALSE; + Irp->UserEvent = NULL; + Irp->Cancel = FALSE; + Irp->CancelRoutine = NULL; + Irp->Tail.Overlay.AuxiliaryBuffer = NULL; + + StackLoc = (PEXTENDED_IO_STACK_LOCATION)IoGetNextIrpStackLocation(Irp); + StackLoc->Control = 0; + StackLoc->FileObject = FileObject; + + switch (CreateFileType) + { + default: + case CreateFileTypeNone: + StackLoc->MajorFunction = IRP_MJ_CREATE; + StackLoc->Flags = Options; + StackLoc->Parameters.Create.EaLength = SystemEaBuffer != NULL ? EaLength : 0; + StackLoc->Flags |= !(ObjectAttributes->Attributes & OBJ_CASE_INSENSITIVE) ? SL_CASE_SENSITIVE: 0; + break; + + case CreateFileTypeNamedPipe: + StackLoc->MajorFunction = IRP_MJ_CREATE_NAMED_PIPE; + StackLoc->Parameters.CreatePipe.Parameters = ExtraCreateParameters; + break; + + case CreateFileTypeMailslot: + StackLoc->MajorFunction = IRP_MJ_CREATE_MAILSLOT; + StackLoc->Parameters.CreateMailslot.Parameters = ExtraCreateParameters; + break; + } + + /* Set the common data */ + Irp->Overlay.AllocationSize = SafeAllocationSize; + Irp->AssociatedIrp.SystemBuffer = SystemEaBuffer; + StackLoc->Parameters.Create.Options = (CreateDisposition << 24) | (CreateOptions & 0x00FFFFFF); + StackLoc->Parameters.Create.FileAttributes = FileAttributes; + StackLoc->Parameters.Create.ShareAccess = ShareAccess; + StackLoc->Parameters.Create.SecurityContext = &SecurityContext; + + Status = IofCallDriver(FileObject->DeviceObject, Irp ); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&FileObject->Event, + Executive, + AccessMode, + FALSE, + NULL); + Status = IoStatusBlock->Status; + } + else + { /* We'll have to complete it ourselves */ ASSERT(!Irp->PendingReturned); KeRaiseIrql(APC_LEVEL, &OldIrql); @@ -1144,38 +1039,34 @@ (PVOID*)&FileObject, &NormalContext); KeLowerIrql(OldIrql); - } - if (!NT_SUCCESS(Status)) - { - DPRINT("Failing create request with status %x\n", Status); - FileObject->DeviceObject = NULL; - FileObject->Vpb = NULL; - ObDereferenceObject(FileObject); - } - else - { - _SEH_TRY - { - *FileHandle = LocalHandle; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - - /* cleanup EABuffer if captured */ - if(AccessMode != KernelMode && SystemEaBuffer != NULL) - { - ExFreePool(SystemEaBuffer); - } - - ASSERT_IRQL(PASSIVE_LEVEL); - - DPRINT("Finished IoCreateFile() (*FileHandle) 0x%p\n", (*FileHandle)); - - return Status; + } + + if (!NT_SUCCESS(Status)) + { + FileObject->DeviceObject = NULL; + FileObject->Vpb = NULL; + ObDereferenceObject(FileObject); + } + else + { + _SEH_TRY + { + *FileHandle = LocalHandle; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + + /* cleanup EABuffer if captured */ + if (AccessMode != KernelMode && (SystemEaBuffer)) + { + ExFreePool(SystemEaBuffer); + } + + return Status; } /*

18 years, 5 months

[greatlrd] 22867: [AUDIT] after looking through code no signs of reverse engineering were found. Almost ever thing is almost complete from djgpp, few funcion is writen by us

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Wed Jul 5 23:09:29 2006 New Revision: 22867 URL: http://svn.reactos.org/svn/reactos?rev=22867&view=rev Log: [AUDIT] after looking through code no signs of reverse engineering were found. Almost ever thing is almost complete from djgpp, few funcion is writen by us Modified: trunk/reactos/lib/crt/stdlib/qsort.c (props changed) trunk/reactos/lib/crt/stdlib/rand.c (props changed) trunk/reactos/lib/crt/stdlib/rot.c (props changed) trunk/reactos/lib/crt/stdlib/senv.c (props changed) trunk/reactos/lib/crt/stdlib/splitp.c (props changed) trunk/reactos/lib/crt/stdlib/strtod.c (props changed) trunk/reactos/lib/crt/stdlib/strtol.c (props changed) trunk/reactos/lib/crt/stdlib/strtold.c (props changed) trunk/reactos/lib/crt/stdlib/strtoul.c (props changed) trunk/reactos/lib/crt/stdlib/strtoull.c (props changed) trunk/reactos/lib/crt/stdlib/wcstod.c (props changed) trunk/reactos/lib/crt/stdlib/wcstol.c (props changed) trunk/reactos/lib/crt/stdlib/wcstom.c (props changed) trunk/reactos/lib/crt/stdlib/wcstomb.c (props changed) trunk/reactos/lib/crt/stdlib/wcstombs.c (props changed) trunk/reactos/lib/crt/stdlib/wcstoul.c (props changed) trunk/reactos/lib/crt/stdlib/wctomb.c (props changed) trunk/reactos/lib/crt/stdlib/witow.c (props changed) Propchange: trunk/reactos/lib/crt/stdlib/qsort.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/stdlib/rand.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/stdlib/rot.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/stdlib/senv.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/stdlib/splitp.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/stdlib/strtod.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/stdlib/strtol.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/stdlib/strtold.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/stdlib/strtoul.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/stdlib/strtoull.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/stdlib/wcstod.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/stdlib/wcstol.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/stdlib/wcstom.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/stdlib/wcstomb.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/stdlib/wcstombs.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/stdlib/wcstoul.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/stdlib/wctomb.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/stdlib/witow.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

18 years, 5 months

[greatlrd] 22866: [AUDIT] after looking through code no signs of reverse engineering were found. 1. Follow fix need be done remove hardcode exe, cmd extions in wstart* use PATHEXT to found right excutions.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Wed Jul 5 22:57:25 2006 New Revision: 22866 URL: http://svn.reactos.org/svn/reactos?rev=22866&view=rev Log: [AUDIT] after looking through code no signs of reverse engineering were found. 1. Follow fix need be done remove hardcode exe, cmd extions in wstart* use PATHEXT to found right excutions. Modified: trunk/reactos/lib/crt/sys_stat/fstat.c (props changed) trunk/reactos/lib/crt/sys_stat/fstati64.c (props changed) trunk/reactos/lib/crt/sys_stat/futime.c (props changed) trunk/reactos/lib/crt/sys_stat/stat.c (props changed) trunk/reactos/lib/crt/sys_stat/systime.c (props changed) trunk/reactos/lib/crt/sys_stat/wstat.c (props changed) Propchange: trunk/reactos/lib/crt/sys_stat/fstat.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/sys_stat/fstati64.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/sys_stat/futime.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/sys_stat/stat.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/sys_stat/systime.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/sys_stat/wstat.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

18 years, 5 months

← Newer
1
...
50
51
52
53
54
55
56
...
67
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 July 2006