Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 22879: Commit initiate work of implement of autostart of screen saver.
by greatlrd＠svn.reactos.org 06 Jul '06

06 Jul '06

Author: greatlrd Date: Thu Jul 6 05:44:01 2006 New Revision: 22879 URL: http://svn.reactos.org/svn/reactos?rev=22879&view=rev Log: Commit initiate work of implement of autostart of screen saver. Modified: trunk/reactos/include/reactos/subsys/csrss/csrss.h trunk/reactos/subsystems/win32/csrss/include/desktopbg.h trunk/reactos/subsystems/win32/csrss/win32csr/conio.c trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c trunk/reactos/subsystems/win32/win32k/ntuser/csr.c Modified: trunk/reactos/include/reactos/subsys/csrss/csrss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/csr… ============================================================================== --- trunk/reactos/include/reactos/subsys/csrss/csrss.h (original) +++ trunk/reactos/include/reactos/subsys/csrss/csrss.h Thu Jul 6 05:44:01 2006 @@ -409,6 +409,12 @@ { HANDLE InputWaitHandle; } CSRSS_GET_INPUT_WAIT_HANDLE, *PCSRSS_GET_INPUT_WAIT_HANDLE; + +typedef struct +{ + BOOL Start; +} CSRSS_START_SCREEN_SAVER, *PCSRSS_START_SCREEN_SAVER; + #define CSR_API_MESSAGE_HEADER_SIZE(Type) (FIELD_OFFSET(CSR_API_MESSAGE, Data) + sizeof(Type)) #define CSRSS_MAX_WRITE_CONSOLE (LPC_MAX_DATA_LENGTH - CSR_API_MESSAGE_HEADER_SIZE(CSRSS_WRITE_CONSOLE)) @@ -477,6 +483,7 @@ #define SET_CONSOLE_OUTPUT_CP (0x34) #define GET_INPUT_WAIT_HANDLE (0x35) #define GET_PROCESS_LIST (0x36) +#define START_SCREEN_SAVER (0x37) /* Keep in sync with definition below. */ #define CSRSS_HEADER_SIZE (sizeof(PORT_MESSAGE) + sizeof(ULONG) + sizeof(NTSTATUS)) @@ -542,6 +549,7 @@ CSRSS_SET_CONSOLE_OUTPUT_CP SetConsoleOutputCodePage; CSRSS_GET_INPUT_WAIT_HANDLE GetConsoleInputWaitHandle; CSRSS_GET_PROCESS_LIST GetProcessListRequest; + CSRSS_START_SCREEN_SAVER StartScreenSaver; } Data; } CSR_API_MESSAGE, *PCSR_API_MESSAGE; Modified: trunk/reactos/subsystems/win32/csrss/include/desktopbg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/desktopbg.h (original) +++ trunk/reactos/subsystems/win32/csrss/include/desktopbg.h Thu Jul 6 05:44:01 2006 @@ -16,6 +16,7 @@ CSR_API(CsrShowDesktop); CSR_API(CsrHideDesktop); CSR_API(CsrRegisterSystemClasses); +CSR_API(CsrStartScreenSaver); BOOL FASTCALL DtbgIsDesktopVisible(VOID); Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c Thu Jul 6 05:44:01 2006 @@ -3301,4 +3301,52 @@ return Request->Status = STATUS_SUCCESS; } + +CSR_API(CsrStartScreenSaver) +{ + + DPRINT1("CsrStartScreenSaver : Start Screen Saver \n"); + + if (Request->Data.StartScreenSaver.Start == TRUE) + { + STARTUPINFOW si; + PROCESS_INFORMATION pi; + WCHAR szCmdline[MAX_PATH]; + + HKEY hKey; + WCHAR szBuffer[MAX_PATH]; + DWORD bufferSize = sizeof(szBuffer); + DWORD varType = REG_SZ; + LONG result; + + + + // FIXME read the register key for the screen saver + //swprintf(szCmdline, L"c:\\reactos\\system32\\matrix.scr /s"); + + RegOpenKeyExW(HKEY_CURRENT_USER, L"Control Panel\\Desktop", 0, KEY_ALL_ACCESS, &hKey); + result = RegQueryValueExW(hKey, L"SCRNSAVE.EXE", 0, &varType, (LPBYTE)szBuffer, &bufferSize); + if(result == ERROR_SUCCESS) + { + swprintf(szCmdline, L"%s /s",szBuffer); + DPRINT1("CsrStartScreenSaver : OK %S\n",szCmdline); + ZeroMemory( &si, sizeof(si) ); + si.cb = sizeof(si); + ZeroMemory( &pi, sizeof(pi) ); + if(CreateProcessW( NULL, szCmdline, NULL, NULL, FALSE, 0, NULL,NULL,&si, &pi )) + { + CloseHandle( pi.hProcess ); + CloseHandle( pi.hThread ); + } + } + else + { + DPRINT1("CsrStartScreenSaver : FAIL %S\n",szBuffer); + } + + RegCloseKey(hKey); + } + return Request->Status = STATUS_SUCCESS; +} + /* EOF */ Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c Thu Jul 6 05:44:01 2006 @@ -68,6 +68,7 @@ CSRSS_DEFINE_API(GET_CONSOLE_OUTPUT_CP, CsrGetConsoleOutputCodePage), CSRSS_DEFINE_API(SET_CONSOLE_OUTPUT_CP, CsrSetConsoleOutputCodePage), CSRSS_DEFINE_API(GET_PROCESS_LIST, CsrGetProcessList), + CSRSS_DEFINE_API(START_SCREEN_SAVER, CsrStartScreenSaver), { 0, 0, NULL } }; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/csr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/csr.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/csr.c Thu Jul 6 05:44:01 2006 @@ -85,6 +85,47 @@ return Status; } + +NTSTATUS FASTCALL +co_CsrNotifyScreenSaver(PCSR_API_MESSAGE Request) +{ + NTSTATUS Status; + PEPROCESS OldProcess; + + if (NULL == CsrProcess) + { + return STATUS_INVALID_PORT_HANDLE; + } + + Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); + Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); + + /* Switch to the process in which the WindowsApiPort handle is valid */ + OldProcess = PsGetCurrentProcess(); + if (CsrProcess != OldProcess) + { + KeAttachProcess(&CsrProcess->Pcb); + } + + Status = ZwRequestWaitReplyPort(WindowsApiPort, + &Request->Header, + &Request->Header); + + + if (CsrProcess != OldProcess) + { + KeDetachProcess(); + } + + if (NT_SUCCESS(Status)) + { + Status = Request->Status; + } + + return Status; +} + + NTSTATUS STDCALL CsrInsertObject(HANDLE ObjectHandle,

1 0

[ion] 22878: - Move the code in IoCreateFile inside IopParseDevice where it belongs. Currently only a raw move and hacks to make it not regress anything, but in the future we can now finally start applying some important fixes for proper communication with FSDs and setting a myriad of flags and settings required. Will also allow for some nice optimizations in the future.
by ion＠svn.reactos.org 05 Jul '06

05 Jul '06

Author: ion Date: Thu Jul 6 03:55:45 2006 New Revision: 22878 URL: http://svn.reactos.org/svn/reactos?rev=22878&view=rev Log: - Move the code in IoCreateFile inside IopParseDevice where it belongs. Currently only a raw move and hacks to make it not regress anything, but in the future we can now finally start applying some important fixes for proper communication with FSDs and setting a myriad of flags and settings required. Will also allow for some nice optimizations in the future. 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 Thu Jul 6 03:55:45 2006 @@ -34,6 +34,10 @@ NTSTATUS Status; PFILE_OBJECT FileObject; PVPB Vpb; + PIRP Irp; + PEXTENDED_IO_STACK_LOCATION StackLoc; + IO_SECURITY_CONTEXT SecurityContext; + IO_STATUS_BLOCK IoStatusBlock; DPRINT("IopParseDevice:\n" "DeviceObject : %p\n" "RelatedFileObject : %p\n" @@ -45,6 +49,13 @@ /* Validate the open packet */ if (!IopValidateOpenPacket(OpenPacket)) return STATUS_OBJECT_TYPE_MISMATCH; + + RtlMapGenericMask(&AccessState->RemainingDesiredAccess, + &IoFileObjectType->TypeInfo.GenericMapping); + RtlMapGenericMask(&AccessState->OriginalDesiredAccess, + &IoFileObjectType->TypeInfo.GenericMapping); + SeSetAccessStateGenericMapping(AccessState, + &IoFileObjectType->TypeInfo.GenericMapping); /* Create the actual file object */ Status = ObCreateObject(AccessMode, @@ -112,9 +123,145 @@ Status = IopReferenceDeviceObject(DeviceObject); FileObject->DeviceObject = DeviceObject; - /* Set the file object and return success */ + FileObject->Type = IO_TYPE_FILE; + FileObject->Size = sizeof(FILE_OBJECT); + + if (OpenPacket->CreateOptions & + (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) + { + FileObject->Flags |= FO_SYNCHRONOUS_IO; + if (OpenPacket->CreateOptions & FILE_SYNCHRONOUS_IO_ALERT) + { + FileObject->Flags |= FO_ALERTABLE_IO; + } + } + + if (OpenPacket->CreateOptions & FILE_NO_INTERMEDIATE_BUFFERING) + { + FileObject->Flags |= FO_NO_INTERMEDIATE_BUFFERING; + } + if (OpenPacket->CreateOptions & FILE_WRITE_THROUGH) + { + FileObject->Flags |= FO_WRITE_THROUGH; + } + if (OpenPacket->CreateOptions & FILE_SEQUENTIAL_ONLY) + { + FileObject->Flags |= FO_SEQUENTIAL_ONLY; + } + if (OpenPacket->CreateOptions & FILE_RANDOM_ACCESS) + { + FileObject->Flags |= FO_RANDOM_ACCESS; + } + + if (!(Attributes & OBJ_CASE_INSENSITIVE)) + { + FileObject->Flags |= FO_OPENED_CASE_SENSITIVE; + } + + SecurityContext.SecurityQos = SecurityQos; + SecurityContext.AccessState = AccessState; + SecurityContext.DesiredAccess = AccessState->RemainingDesiredAccess; + SecurityContext.FullCreateOptions = OpenPacket->CreateOptions; + + KeInitializeEvent(&FileObject->Lock, SynchronizationEvent, TRUE); + KeInitializeEvent(&FileObject->Event, NotificationEvent, FALSE); + + Irp = IoAllocateIrp(FileObject->DeviceObject->StackSize, FALSE); + if (!Irp) 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 (OpenPacket->CreateFileType) + { + default: + case CreateFileTypeNone: + StackLoc->MajorFunction = IRP_MJ_CREATE; + StackLoc->Flags = OpenPacket->Options; + StackLoc->Parameters.Create.EaLength = OpenPacket->EaBuffer != NULL ? OpenPacket->EaLength : 0; + StackLoc->Flags |= !(Attributes & OBJ_CASE_INSENSITIVE) ? SL_CASE_SENSITIVE: 0; + break; + + case CreateFileTypeNamedPipe: + StackLoc->MajorFunction = IRP_MJ_CREATE_NAMED_PIPE; + StackLoc->Parameters.CreatePipe.Parameters = OpenPacket->MailslotOrPipeParameters; + break; + + case CreateFileTypeMailslot: + StackLoc->MajorFunction = IRP_MJ_CREATE_MAILSLOT; + StackLoc->Parameters.CreateMailslot.Parameters = OpenPacket->MailslotOrPipeParameters; + break; + } + + /* Set the common data */ + Irp->Overlay.AllocationSize = OpenPacket->AllocationSize; + Irp->AssociatedIrp.SystemBuffer =OpenPacket->EaBuffer; + StackLoc->Parameters.Create.Options = (OpenPacket->Disposition << 24) | (OpenPacket->CreateOptions & 0x00FFFFFF); + StackLoc->Parameters.Create.FileAttributes = OpenPacket->FileAttributes; + StackLoc->Parameters.Create.ShareAccess = OpenPacket->ShareAccess; + StackLoc->Parameters.Create.SecurityContext = &SecurityContext; + + /* Reference the file object and call the driver */ + ObReferenceObject(FileObject); + Status = IoCallDriver(FileObject->DeviceObject, Irp ); + + /* Copy the status block */ + OpenPacket->Information = IoStatusBlock.Information; + OpenPacket->FinalStatus = IoStatusBlock.Status; + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&FileObject->Event, + Executive, + KernelMode, + FALSE, + NULL); + Status = IoStatusBlock.Status; + } +#if 0 + else + { + KIRQL OldIrql; + PKNORMAL_ROUTINE NormalRoutine; + PVOID NormalContext; + + /* We'll have to complete it ourselves */ + ASSERT(!Irp->PendingReturned); + KeRaiseIrql(APC_LEVEL, &OldIrql); + IopCompleteRequest(&Irp->Tail.Apc, + &NormalRoutine, + &NormalContext, + (PVOID*)&FileObject, + &NormalContext); + KeLowerIrql(OldIrql); + } +#endif + if (!NT_SUCCESS(Status)) + { + FileObject->DeviceObject = NULL; + FileObject->Vpb = NULL; + FileObject = NULL; + //ObDereferenceObject(FileObject); + } + *Object = FileObject; - return STATUS_SUCCESS; + return Status; } NTSTATUS @@ -804,20 +951,11 @@ 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; + NTSTATUS Status = STATUS_SUCCESS; OPEN_PACKET OpenPacket; PAGED_CODE(); @@ -928,156 +1066,19 @@ &OpenPacket, &LocalHandle); - RtlMapGenericMask(&DesiredAccess, &IoFileObjectType->TypeInfo.GenericMapping); - ObReferenceObjectByHandle(LocalHandle, - DesiredAccess, - NULL, - KernelMode, - (PVOID*)&FileObject, - NULL); - if (!NT_SUCCESS(Status)) return Status; - - FileObject->Type = IO_TYPE_FILE; - FileObject->Size = sizeof(FILE_OBJECT); - - if (CreateOptions & - (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) - { - FileObject->Flags |= FO_SYNCHRONOUS_IO; - if (CreateOptions & FILE_SYNCHRONOUS_IO_ALERT) - { - FileObject->Flags |= FO_ALERTABLE_IO; - } - } - - if (CreateOptions & FILE_NO_INTERMEDIATE_BUFFERING) - { - FileObject->Flags |= FO_NO_INTERMEDIATE_BUFFERING; - } - if (CreateOptions & FILE_WRITE_THROUGH) - { - FileObject->Flags |= FO_WRITE_THROUGH; - } - if (CreateOptions & FILE_SEQUENTIAL_ONLY) - { - FileObject->Flags |= FO_SEQUENTIAL_ONLY; - } - if (CreateOptions & FILE_RANDOM_ACCESS) - { - FileObject->Flags |= FO_RANDOM_ACCESS; - } - - if (!(ObjectAttributes->Attributes & OBJ_CASE_INSENSITIVE)) - { - FileObject->Flags |= FO_OPENED_CASE_SENSITIVE; - } - - 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); - IopCompleteRequest(&Irp->Tail.Apc, - &NormalRoutine, - &NormalContext, - (PVOID*)&FileObject, - &NormalContext); - KeLowerIrql(OldIrql); - } - - if (!NT_SUCCESS(Status)) - { - FileObject->DeviceObject = NULL; - FileObject->Vpb = NULL; - ObDereferenceObject(FileObject); - } - else - { - _SEH_TRY - { - *FileHandle = LocalHandle; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } + DPRINT1("Status: %lx %lx\n", Status, LocalHandle); + + _SEH_TRY + { + *FileHandle = LocalHandle; + IoStatusBlock->Information = OpenPacket.Information; + IoStatusBlock->Status = OpenPacket.FinalStatus; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; /* cleanup EABuffer if captured */ if (AccessMode != KernelMode && (SystemEaBuffer))

1 0

[gedmurphy] 22877: update Wine file.
by gedmurphy＠svn.reactos.org 05 Jul '06

05 Jul '06

Author: gedmurphy Date: Thu Jul 6 02:52:42 2006 New Revision: 22877 URL: http://svn.reactos.org/svn/reactos?rev=22877&view=rev Log: update Wine file. Modified: trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Thu Jul 6 02:52:42 2006 @@ -40,7 +40,7 @@ reactos/dll/win32/avifil32 # Synced to Wine-0_9_5 reactos/dll/win32/cabinet # Synced to Wine-0_9_10 reactos/dll/win32/comctl32 # Synced to Wine-0_9_16 -reactos/dll/win32/comdlg32 # Synced to Wine-0_9_5 +reactos/dll/win32/comdlg32 # Synced to Wine-0_9_16 reactos/dll/win32/crypt32 # Synced to Wine-0_9_10 reactos/dll/win32/dbghelp # reactos/dll/win32/icmp # Synced to Wine-0_9_10

1 0

[gedmurphy] 22875: rename commdlg to comdlg32
by gedmurphy＠svn.reactos.org 05 Jul '06

05 Jul '06

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/

1 0

[gedmurphy] 22874: delete previous tag (which was never actually synced to trunk)
by gedmurphy＠svn.reactos.org 05 Jul '06

05 Jul '06

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/

1 0

[gedmurphy] 22873: tag Wine-0_9_16
by gedmurphy＠svn.reactos.org 05 Jul '06

05 Jul '06

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/

1 0

[gedmurphy] 22872: Wine-0_9_16 vendor drop
by gedmurphy＠svn.reactos.org 05 Jul '06

05 Jul '06

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…

1 0

[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 05 Jul '06

05 Jul '06

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);

1 0

[ion] 22870: - Silence TCP/IP. - Prototye fix.
by ion＠svn.reactos.org 05 Jul '06

05 Jul '06

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)

1 0

[ion] 22869: - Simplify IopParseDevice by removing duplicate code.
by ion＠svn.reactos.org 05 Jul '06

05 Jul '06

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; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs