Ros-diffs June 2017

ros-diffs@reactos.org

20 participants
526 discussions

[ekohl] 75111: [NETAPI32] Implement NetConnectionEnum(). This function calls its counterpart in the server service.
by ekohl＠svn.reactos.org 18 Jun '17

18 Jun '17

Author: ekohl Date: Sun Jun 18 22:43:24 2017 New Revision: 75111 URL: http://svn.reactos.org/svn/reactos?rev=75111&view=rev Log: [NETAPI32] Implement NetConnectionEnum(). This function calls its counterpart in the server service. Modified: trunk/reactos/dll/win32/netapi32/netapi32.spec trunk/reactos/dll/win32/netapi32/srvsvc.c Modified: trunk/reactos/dll/win32/netapi32/netapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/netapi3… ============================================================================== --- trunk/reactos/dll/win32/netapi32/netapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/netapi32.spec [iso-8859-1] Sun Jun 18 22:43:24 2017 @@ -113,7 +113,7 @@ @ stdcall NetConfigGet(wstr wstr wstr ptr) @ stdcall NetConfigGetAll(wstr wstr ptr) @ stdcall NetConfigSet(wstr wstr wstr long long ptr long) -@ stub NetConnectionEnum +@ stdcall NetConnectionEnum(wstr wstr long ptr long ptr ptr ptr) @ stub NetDfsAdd @ stub NetDfsAddFtRoot @ stub NetDfsAddStdRoot Modified: trunk/reactos/dll/win32/netapi32/srvsvc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/srvsvc.… ============================================================================== --- trunk/reactos/dll/win32/netapi32/srvsvc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/srvsvc.c [iso-8859-1] Sun Jun 18 22:43:24 2017 @@ -67,6 +67,80 @@ { TRACE("RpcBindingFree returned 0x%x\n", status); } +} + + +NET_API_STATUS +WINAPI +NetConnectionEnum( + _In_ LMSTR servername, + _In_ LMSTR qualifier, + _In_ DWORD level, + _Out_ LPBYTE *bufptr, + _In_ DWORD prefmaxlen, + _Out_ LPDWORD entriesread, + _Out_ LPDWORD totalentries, + _Inout_ LPDWORD resume_handle) +{ + CONNECT_ENUM_STRUCT EnumStruct; + CONNECT_INFO_0_CONTAINER Level0Container = {0, NULL}; + CONNECT_INFO_1_CONTAINER Level1Container = {0, NULL}; + NET_API_STATUS status = 0; + + TRACE("NetConnectionEnum(%s %s %s %lu %p %lu %p %p %p)\n", + debugstr_w(servername), debugstr_w(qualifier), level, bufptr, + prefmaxlen, entriesread, totalentries, resume_handle); + + if (level > 1) + return ERROR_INVALID_LEVEL; + + EnumStruct.Level = level; + switch (level) + { + case 0: + EnumStruct.ConnectInfo.Level0 = &Level0Container; + break; + + case 1: + EnumStruct.ConnectInfo.Level1 = &Level1Container; + break; + } + + RpcTryExcept + { + status = NetrConnectionEnum(servername, + qualifier, + &EnumStruct, + prefmaxlen, + totalentries, + resume_handle); + + switch (level) + { + case 0: + if (EnumStruct.ConnectInfo.Level0->Buffer != NULL) + { + *bufptr = (LPBYTE)EnumStruct.ConnectInfo.Level0->Buffer; + *entriesread = EnumStruct.ConnectInfo.Level0->EntriesRead; + } + break; + + case 1: + if (EnumStruct.ConnectInfo.Level1->Buffer != NULL) + { + *bufptr = (LPBYTE)EnumStruct.ConnectInfo.Level1->Buffer; + *entriesread = EnumStruct.ConnectInfo.Level1->EntriesRead; + } + break; + } + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return status; }

1 0

[pschweitzer] 75110: [RXCE] lolfix build
by pschweitzer＠svn.reactos.org 18 Jun '17

18 Jun '17

Author: pschweitzer Date: Sun Jun 18 22:15:34 2017 New Revision: 75110 URL: http://svn.reactos.org/svn/reactos?rev=75110&view=rev Log: [RXCE] lolfix build Modified: trunk/reactos/sdk/lib/drivers/rxce/CMakeLists.txt Modified: trunk/reactos/sdk/lib/drivers/rxce/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/rxce/CMake… ============================================================================== --- trunk/reactos/sdk/lib/drivers/rxce/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/drivers/rxce/CMakeLists.txt [iso-8859-1] Sun Jun 18 22:15:34 2017 @@ -6,5 +6,9 @@ rxce.c) add_library(rxce ${SOURCE}) +if(NOT MSVC) +target_link_libraries(rxce ntoskrnl memcmp) +else() target_link_libraries(rxce memcmp) +endif() add_dependencies(rxce bugcodes xdk)

1 0

[hbelusca] 75109: [NFS][RXCE]: Fix MSVC build (definitively?)
by hbelusca＠svn.reactos.org 18 Jun '17

18 Jun '17

Author: hbelusca Date: Sun Jun 18 21:47:52 2017 New Revision: 75109 URL: http://svn.reactos.org/svn/reactos?rev=75109&view=rev Log: [NFS][RXCE]: Fix MSVC build (definitively?) Modified: trunk/reactos/drivers/filesystems/nfs/CMakeLists.txt trunk/reactos/sdk/lib/drivers/rxce/CMakeLists.txt Modified: trunk/reactos/drivers/filesystems/nfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/nfs/CM… ============================================================================== --- trunk/reactos/drivers/filesystems/nfs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/nfs/CMakeLists.txt [iso-8859-1] Sun Jun 18 21:47:52 2017 @@ -12,7 +12,7 @@ add_library(nfs41_driver SHARED ${SOURCE} nfs.rc) set_module_type(nfs41_driver kernelmodedriver) target_link_libraries(nfs41_driver ntoskrnl_vista rdbsslib ${PSEH_LIB}) -add_importlibs(nfs41_driver hal) +add_importlibs(nfs41_driver ntoskrnl hal) if((NOT MSVC) AND (NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")) add_target_compile_flags(nfs41_driver "-Wno-switch") Modified: trunk/reactos/sdk/lib/drivers/rxce/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/rxce/CMake… ============================================================================== --- trunk/reactos/sdk/lib/drivers/rxce/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/drivers/rxce/CMakeLists.txt [iso-8859-1] Sun Jun 18 21:47:52 2017 @@ -6,5 +6,5 @@ rxce.c) add_library(rxce ${SOURCE}) -target_link_libraries(rxce ntoskrnl memcmp) +target_link_libraries(rxce memcmp) add_dependencies(rxce bugcodes xdk)

1 0

[ekohl] 75108: [NTOS:SE] Add the CmpAssignSecurityDescriptor() stub and improve some comments.
by ekohl＠svn.reactos.org 18 Jun '17

18 Jun '17

Author: ekohl Date: Sun Jun 18 21:43:09 2017 New Revision: 75108 URL: http://svn.reactos.org/svn/reactos?rev=75108&view=rev Log: [NTOS:SE] Add the CmpAssignSecurityDescriptor() stub and improve some comments. Modified: trunk/reactos/ntoskrnl/config/cmse.c Modified: trunk/reactos/ntoskrnl/config/cmse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmse.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmse.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmse.c [iso-8859-1] Sun Jun 18 21:43:09 2017 @@ -249,6 +249,15 @@ } NTSTATUS +CmpAssignSecurityDescriptor(IN PCM_KEY_CONTROL_BLOCK Kcb, + IN PSECURITY_DESCRIPTOR SecurityDescriptor) +{ + DPRINT("CmpAssignSecurityDescriptor(%p %p)\n", + Kcb, SecurityDescriptor); + return STATUS_SUCCESS; +} + +NTSTATUS NTAPI CmpSecurityMethod(IN PVOID ObjectBody, IN SECURITY_OPERATION_CODE OperationCode, @@ -267,7 +276,7 @@ Kcb = ((PCM_KEY_BODY)ObjectBody)->KeyControlBlock; - /* Acquire hive lock */ + /* Acquire the hive lock */ CmpLockRegistry(); /* Acquire the KCB lock */ @@ -283,10 +292,10 @@ /* Don't touch deleted keys */ if (Kcb->Delete) { - /* Unlock the KCB */ + /* Release the KCB lock */ CmpReleaseKcbLock(Kcb); - /* Unlock the HIVE */ + /* Release the hive lock */ CmpUnlockRegistry(); return STATUS_KEY_DELETED; } @@ -318,17 +327,18 @@ case AssignSecurityDescriptor: DPRINT("Assign security descriptor\n"); - /* HACK */ + Status = CmpAssignSecurityDescriptor(Kcb, + SecurityDescriptor); break; default: KeBugCheckEx(SECURITY_SYSTEM, 0, STATUS_INVALID_PARAMETER, 0, 0); } - /* Unlock the KCB */ + /* Release the KCB lock */ CmpReleaseKcbLock(Kcb); - /* Unlock the hive */ + /* Release the hive lock */ CmpUnlockRegistry(); return Status;

1 0

[pschweitzer] 75107: [NFS] Remove dependency already brought in by rxce
by pschweitzer＠svn.reactos.org 18 Jun '17

18 Jun '17

Author: pschweitzer Date: Sun Jun 18 21:40:52 2017 New Revision: 75107 URL: http://svn.reactos.org/svn/reactos?rev=75107&view=rev Log: [NFS] Remove dependency already brought in by rxce Modified: trunk/reactos/drivers/filesystems/nfs/CMakeLists.txt Modified: trunk/reactos/drivers/filesystems/nfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/nfs/CM… ============================================================================== --- trunk/reactos/drivers/filesystems/nfs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/nfs/CMakeLists.txt [iso-8859-1] Sun Jun 18 21:40:52 2017 @@ -12,7 +12,7 @@ add_library(nfs41_driver SHARED ${SOURCE} nfs.rc) set_module_type(nfs41_driver kernelmodedriver) target_link_libraries(nfs41_driver ntoskrnl_vista rdbsslib ${PSEH_LIB}) -add_importlibs(nfs41_driver ntoskrnl hal) +add_importlibs(nfs41_driver hal) if((NOT MSVC) AND (NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")) add_target_compile_flags(nfs41_driver "-Wno-switch")

1 0

[pschweitzer] 75106: [RDBSS] Clean up CMake files, based on suggestions by Hermès. Might fix MSVC build.
by pschweitzer＠svn.reactos.org 18 Jun '17

18 Jun '17

Author: pschweitzer Date: Sun Jun 18 21:27:56 2017 New Revision: 75106 URL: http://svn.reactos.org/svn/reactos?rev=75106&view=rev Log: [RDBSS] Clean up CMake files, based on suggestions by Hermès. Might fix MSVC build. Modified: trunk/reactos/sdk/lib/drivers/rdbsslib/CMakeLists.txt trunk/reactos/sdk/lib/drivers/rxce/CMakeLists.txt trunk/reactos/sdk/lib/drivers/rxce/rxce.c Modified: trunk/reactos/sdk/lib/drivers/rdbsslib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/rdbsslib/C… ============================================================================== --- trunk/reactos/sdk/lib/drivers/rdbsslib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/drivers/rdbsslib/CMakeLists.txt [iso-8859-1] Sun Jun 18 21:27:56 2017 @@ -1,4 +1,4 @@ -add_definitions(-DUNICODE -D_UNICODE -D__NTOSKRNL__ -D_NTOSKRNL_ -DRDBSS_TRACKER) +add_definitions(-DUNICODE -D_UNICODE -DRDBSS_TRACKER) include_directories(${REACTOS_SOURCE_DIR}/drivers/filesystems/mup) @@ -7,4 +7,4 @@ add_library(rdbsslib ${SOURCE}) target_link_libraries(rdbsslib rxce) -add_dependencies(rdbsslib rxce bugcodes xdk) +add_dependencies(rdbsslib bugcodes xdk) Modified: trunk/reactos/sdk/lib/drivers/rxce/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/rxce/CMake… ============================================================================== --- trunk/reactos/sdk/lib/drivers/rxce/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/drivers/rxce/CMakeLists.txt [iso-8859-1] Sun Jun 18 21:27:56 2017 @@ -1,4 +1,4 @@ -add_definitions(-DUNICODE -D_UNICODE -D__NTOSKRNL__ -D_NTOSKRNL_ -DRDBSS_TRACKER) +add_definitions(-DUNICODE -D_UNICODE -DRDBSS_TRACKER) include_directories(${REACTOS_SOURCE_DIR}/drivers/filesystems/mup) @@ -7,4 +7,4 @@ add_library(rxce ${SOURCE}) target_link_libraries(rxce ntoskrnl memcmp) -add_dependencies(rxce bugcodes xdk ntoskrnl) +add_dependencies(rxce bugcodes xdk) Modified: trunk/reactos/sdk/lib/drivers/rxce/rxce.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/rxce/rxce.… ============================================================================== --- trunk/reactos/sdk/lib/drivers/rxce/rxce.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/drivers/rxce/rxce.c [iso-8859-1] Sun Jun 18 21:27:56 2017 @@ -4686,7 +4686,7 @@ /* Reference ourselves */ CurrentThread = PsGetCurrentThread(); - Status = ObReferenceObjectByPointer(CurrentThread, THREAD_ALL_ACCESS, PsThreadType, KernelMode); + Status = ObReferenceObjectByPointer(CurrentThread, THREAD_ALL_ACCESS, *PsThreadType, KernelMode); ASSERT(NT_SUCCESS(Status)); /* Infinite loop for worker */ @@ -4926,7 +4926,7 @@ NTSTATUS Status; PRX_DISPATCHER RxDispatcher; - Status = ObReferenceObjectByPointer(PsGetCurrentThread(), THREAD_ALL_ACCESS, PsThreadType, KernelMode); + Status = ObReferenceObjectByPointer(PsGetCurrentThread(), THREAD_ALL_ACCESS, *PsThreadType, KernelMode); if (!NT_SUCCESS(Status)) { PsTerminateSystemThread(STATUS_SUCCESS);

1 0

[pschweitzer] 75105: [NFS] Import the NFS file system mini-redirector and the associated network provider. Not all the pieces are in place to make it working. CORE-8204
by pschweitzer＠svn.reactos.org 18 Jun '17

18 Jun '17

Author: pschweitzer Date: Sun Jun 18 20:49:46 2017 New Revision: 75105 URL: http://svn.reactos.org/svn/reactos?rev=75105&view=rev Log: [NFS] Import the NFS file system mini-redirector and the associated network provider. Not all the pieces are in place to make it working. CORE-8204 Added: trunk/reactos/dll/np/ trunk/reactos/dll/np/CMakeLists.txt (with props) trunk/reactos/dll/np/nfs/ trunk/reactos/dll/np/nfs/CMakeLists.txt (with props) trunk/reactos/dll/np/nfs/dllmain.c (with props) trunk/reactos/dll/np/nfs/nfs41_np.c (with props) trunk/reactos/dll/np/nfs/nfs41_np.h (with props) trunk/reactos/dll/np/nfs/nfs41_np.spec (with props) trunk/reactos/dll/np/nfs/nfsnp.rc (with props) trunk/reactos/dll/np/nfs/options.c (with props) trunk/reactos/dll/np/nfs/options.h (with props) trunk/reactos/drivers/filesystems/nfs/ trunk/reactos/drivers/filesystems/nfs/CMakeLists.txt (with props) trunk/reactos/drivers/filesystems/nfs/nfs.rc (with props) trunk/reactos/drivers/filesystems/nfs/nfs41_debug.c (with props) trunk/reactos/drivers/filesystems/nfs/nfs41_debug.h (with props) trunk/reactos/drivers/filesystems/nfs/nfs41_driver.c (with props) trunk/reactos/drivers/filesystems/nfs/nfs41_driver.h (with props) Modified: trunk/reactos/dll/CMakeLists.txt trunk/reactos/drivers/filesystems/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/CMakeLists.txt?rev=751… Added: trunk/reactos/dll/np/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/np/CMakeLists.txt?rev=… Added: trunk/reactos/dll/np/nfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/np/nfs/CMakeLists.txt?… Added: trunk/reactos/dll/np/nfs/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/np/nfs/dllmain.c?rev=7… Added: trunk/reactos/dll/np/nfs/nfs41_np.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/np/nfs/nfs41_np.c?rev=… Added: trunk/reactos/dll/np/nfs/nfs41_np.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/np/nfs/nfs41_np.h?rev=… Added: trunk/reactos/dll/np/nfs/nfs41_np.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/np/nfs/nfs41_np.spec?r… Added: trunk/reactos/dll/np/nfs/nfsnp.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/np/nfs/nfsnp.rc?rev=75… Added: trunk/reactos/dll/np/nfs/options.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/np/nfs/options.c?rev=7… Added: trunk/reactos/dll/np/nfs/options.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/np/nfs/options.h?rev=7… Modified: trunk/reactos/drivers/filesystems/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/CMakeL… Added: trunk/reactos/drivers/filesystems/nfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/nfs/CM… Added: trunk/reactos/drivers/filesystems/nfs/nfs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/nfs/nf… Added: trunk/reactos/drivers/filesystems/nfs/nfs41_debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/nfs/nf… Added: trunk/reactos/drivers/filesystems/nfs/nfs41_debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/nfs/nf… Added: trunk/reactos/drivers/filesystems/nfs/nfs41_driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/nfs/nf… Added: trunk/reactos/drivers/filesystems/nfs/nfs41_driver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/nfs/nf…

1 0

[tfaber] 75104: [NTOS:MM] - Directly pass the file object to MmCreateDataFileSection
by tfaber＠svn.reactos.org 18 Jun '17

18 Jun '17

Author: tfaber Date: Sun Jun 18 20:10:44 2017 New Revision: 75104 URL: http://svn.reactos.org/svn/reactos?rev=75104&view=rev Log: [NTOS:MM] - Directly pass the file object to MmCreateDataFileSection Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sun Jun 18 20:10:44 2017 @@ -2898,7 +2898,7 @@ PLARGE_INTEGER UMaximumSize, ULONG SectionPageProtection, ULONG AllocationAttributes, - HANDLE FileHandle) + PFILE_OBJECT FileObject) /* * Create a section backed by a data file */ @@ -2906,9 +2906,7 @@ PROS_SECTION_OBJECT Section; NTSTATUS Status; LARGE_INTEGER MaximumSize; - PFILE_OBJECT FileObject; PMM_SECTION_SEGMENT Segment; - ULONG FileAccess; FILE_STANDARD_INFORMATION FileInfo; ULONG Length; @@ -2926,6 +2924,7 @@ (PVOID*)&Section); if (!NT_SUCCESS(Status)) { + ObDereferenceObject(FileObject); return(Status); } /* @@ -2936,22 +2935,6 @@ Section->Size = 'TN'; Section->SectionPageProtection = SectionPageProtection; Section->AllocationAttributes = AllocationAttributes; - - /* - * Reference the file handle - */ - FileAccess = MiArm3GetCorrectFileAccessMask(SectionPageProtection); - Status = ObReferenceObjectByHandle(FileHandle, - FileAccess, - IoFileObjectType, - ExGetPreviousMode(), - (PVOID*)(PVOID)&FileObject, - NULL); - if (!NT_SUCCESS(Status)) - { - ObDereferenceObject(Section); - return(Status); - } /* * FIXME: This is propably not entirely correct. We can't look into @@ -5132,9 +5115,7 @@ MaximumSize, SectionPageProtection, AllocationAttributes, - FileHandle); - if (FileObject) - ObDereferenceObject(FileObject); + FileObject); } #else else if (FileHandle != NULL || FileObject != NULL)

1 0

[tfaber] 75103: [NTOS:PNP] - If PFN tracing is enabled, create a device object that allows the user to trigger a PFN dump (e.g. via "type \\.\Global\GLOBALROOT\Device\PfnDump")
by tfaber＠svn.reactos.org 18 Jun '17

18 Jun '17

Author: tfaber Date: Sun Jun 18 19:48:45 2017 New Revision: 75103 URL: http://svn.reactos.org/svn/reactos?rev=75103&view=rev Log: [NTOS:PNP] - If PFN tracing is enabled, create a device object that allows the user to trigger a PFN dump (e.g. via "type \\.\Global\GLOBALROOT\Device\PfnDump") Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnproot… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c [iso-8859-1] Sun Jun 18 19:48:45 2017 @@ -1344,19 +1344,75 @@ return STATUS_SUCCESS; } +#if MI_TRACE_PFNS +PDEVICE_OBJECT IopPfnDumpDeviceObject; + +NTSTATUS NTAPI +PnpRootCreateClose( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + + if (DeviceObject != IopPfnDumpDeviceObject) + { + Irp->IoStatus.Status = STATUS_INVALID_DEVICE_REQUEST; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_INVALID_DEVICE_REQUEST; + } + + IoStack = IoGetCurrentIrpStackLocation(Irp); + if (IoStack->MajorFunction == IRP_MJ_CREATE) + { + MmDumpArmPfnDatabase(TRUE); + } + + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} +#endif + NTSTATUS NTAPI PnpRootDriverEntry( IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath) { +#if MI_TRACE_PFNS + NTSTATUS Status; + UNICODE_STRING PfnDumpDeviceName = RTL_CONSTANT_STRING(L"\\Device\\PfnDump"); +#endif + DPRINT("PnpRootDriverEntry(%p %wZ)\n", DriverObject, RegistryPath); IopRootDriverObject = DriverObject; DriverObject->DriverExtension->AddDevice = PnpRootAddDevice; +#if MI_TRACE_PFNS + DriverObject->MajorFunction[IRP_MJ_CREATE] = PnpRootCreateClose; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = PnpRootCreateClose; +#endif DriverObject->MajorFunction[IRP_MJ_PNP] = PnpRootPnpControl; DriverObject->MajorFunction[IRP_MJ_POWER] = PnpRootPowerControl; +#if MI_TRACE_PFNS + Status = IoCreateDevice(DriverObject, + 0, + &PfnDumpDeviceName, + FILE_DEVICE_UNKNOWN, + 0, + FALSE, + &IopPfnDumpDeviceObject); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Creating PFN Dump device failed with %lx\n", Status); + } + else + { + IopPfnDumpDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; + } +#endif + return STATUS_SUCCESS; }

1 0

[tfaber] 75102: [NPFS] - Misc changes to improve code clarity
by tfaber＠svn.reactos.org 18 Jun '17

18 Jun '17

Author: tfaber Date: Sun Jun 18 18:08:52 2017 New Revision: 75102 URL: http://svn.reactos.org/svn/reactos?rev=75102&view=rev Log: [NPFS] - Misc changes to improve code clarity Modified: trunk/reactos/drivers/filesystems/npfs/create.c trunk/reactos/drivers/filesystems/npfs/fsctrl.c trunk/reactos/drivers/filesystems/npfs/strucsup.c trunk/reactos/drivers/filesystems/npfs/volinfo.c Modified: trunk/reactos/drivers/filesystems/npfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/create.c [iso-8859-1] Sun Jun 18 18:08:52 2017 @@ -676,7 +676,7 @@ if (!(Parameters->TimeoutSpecified) || !(Parameters->MaximumInstances) || - (Parameters->DefaultTimeout.HighPart >= 0)) + (Parameters->DefaultTimeout.QuadPart >= 0)) { Status = STATUS_INVALID_PARAMETER; goto Quickie; @@ -706,7 +706,8 @@ goto Quickie; } - if (!Parameters->NamedPipeType && Parameters->ReadMode == 1) + if (Parameters->NamedPipeType == FILE_PIPE_BYTE_STREAM_TYPE && + Parameters->ReadMode == FILE_PIPE_MESSAGE_MODE) { Status = STATUS_INVALID_PARAMETER; goto Quickie; Modified: trunk/reactos/drivers/filesystems/npfs/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/fsctrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/fsctrl.c [iso-8859-1] Sun Jun 18 18:08:52 2017 @@ -547,7 +547,7 @@ } Status = NpWriteDataQueue(WriteQueue, - 1, + FILE_PIPE_MESSAGE_MODE, InBuffer, InLength, Ccb->Fcb->NamedPipeType, Modified: trunk/reactos/drivers/filesystems/npfs/strucsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/s… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/strucsup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/strucsup.c [iso-8859-1] Sun Jun 18 18:08:52 2017 @@ -15,7 +15,7 @@ /* GLOBALS ********************************************************************/ -PWCHAR NpRootDCBName = L"\\"; +WCHAR NpRootDCBName[] = L"\\"; PNP_VCB NpVcb; /* FUNCTIONS ******************************************************************/ @@ -188,8 +188,8 @@ InitializeListHead(&Dcb->FcbList); Dcb->FullName.Buffer = NpRootDCBName; - Dcb->FullName.Length = 2; - Dcb->FullName.MaximumLength = 4; + Dcb->FullName.Length = sizeof(NpRootDCBName) - sizeof(UNICODE_NULL); + Dcb->FullName.MaximumLength = sizeof(NpRootDCBName); Dcb->ShortName.Length = Dcb->FullName.Length; Dcb->ShortName.MaximumLength = Dcb->FullName.MaximumLength; Modified: trunk/reactos/drivers/filesystems/npfs/volinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/v… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/volinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/volinfo.c [iso-8859-1] Sun Jun 18 18:08:52 2017 @@ -27,8 +27,7 @@ *Length -= FIELD_OFFSET(FILE_FS_VOLUME_INFORMATION, VolumeLabel); - InfoBuffer->VolumeCreationTime.LowPart = 0; - InfoBuffer->VolumeCreationTime.HighPart = 0; + InfoBuffer->VolumeCreationTime.QuadPart = 0; InfoBuffer->VolumeSerialNumber = 0; InfoBuffer->SupportsObjects = 0;

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
53
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2017