Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 73203: [MSAFD]: Convert tabs to spaces.
by hbelusca＠svn.reactos.org 11 Nov '16

11 Nov '16

Author: hbelusca Date: Fri Nov 11 21:19:13 2016 New Revision: 73203 URL: http://svn.reactos.org/svn/reactos?rev=73203&view=rev Log: [MSAFD]: Convert tabs to spaces. Modified: trunk/reactos/dll/win32/msafd/include/helpers.h Modified: trunk/reactos/dll/win32/msafd/include/helpers.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/include/he… ============================================================================== --- trunk/reactos/dll/win32/msafd/include/helpers.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/include/helpers.h [iso-8859-1] Fri Nov 11 21:19:13 2016 @@ -10,62 +10,62 @@ //#include <msafd.h> typedef struct _HELPER_DATA { - LIST_ENTRY Helpers; - LONG RefCount; - HANDLE hInstance; - INT MinWSAddressLength; - INT MaxWSAddressLength; - INT MinTDIAddressLength; - INT MaxTDIAddressLength; - BOOLEAN UseDelayedAcceptance; - PWINSOCK_MAPPING Mapping; - PWSH_OPEN_SOCKET WSHOpenSocket; - PWSH_OPEN_SOCKET2 WSHOpenSocket2; - PWSH_JOIN_LEAF WSHJoinLeaf; - PWSH_NOTIFY WSHNotify; - PWSH_GET_SOCKET_INFORMATION WSHGetSocketInformation; - PWSH_SET_SOCKET_INFORMATION WSHSetSocketInformation; - PWSH_GET_SOCKADDR_TYPE WSHGetSockaddrType; - PWSH_GET_WILDCARD_SOCKADDR WSHGetWildcardSockaddr; - PWSH_GET_BROADCAST_SOCKADDR WSHGetBroadcastSockaddr; - PWSH_ADDRESS_TO_STRING WSHAddressToString; - PWSH_STRING_TO_ADDRESS WSHStringToAddress; - PWSH_IOCTL WSHIoctl; - WCHAR TransportName[1]; + LIST_ENTRY Helpers; + LONG RefCount; + HANDLE hInstance; + INT MinWSAddressLength; + INT MaxWSAddressLength; + INT MinTDIAddressLength; + INT MaxTDIAddressLength; + BOOLEAN UseDelayedAcceptance; + PWINSOCK_MAPPING Mapping; + PWSH_OPEN_SOCKET WSHOpenSocket; + PWSH_OPEN_SOCKET2 WSHOpenSocket2; + PWSH_JOIN_LEAF WSHJoinLeaf; + PWSH_NOTIFY WSHNotify; + PWSH_GET_SOCKET_INFORMATION WSHGetSocketInformation; + PWSH_SET_SOCKET_INFORMATION WSHSetSocketInformation; + PWSH_GET_SOCKADDR_TYPE WSHGetSockaddrType; + PWSH_GET_WILDCARD_SOCKADDR WSHGetWildcardSockaddr; + PWSH_GET_BROADCAST_SOCKADDR WSHGetBroadcastSockaddr; + PWSH_ADDRESS_TO_STRING WSHAddressToString; + PWSH_STRING_TO_ADDRESS WSHStringToAddress; + PWSH_IOCTL WSHIoctl; + WCHAR TransportName[1]; } HELPER_DATA, *PHELPER_DATA; int SockLoadHelperDll( - PWSTR TransportName, - PWINSOCK_MAPPING Mapping, - PHELPER_DATA *HelperDllData + PWSTR TransportName, + PWINSOCK_MAPPING Mapping, + PHELPER_DATA *HelperDllData ); int SockLoadTransportMapping( - PWSTR TransportName, - PWINSOCK_MAPPING *Mapping + PWSTR TransportName, + PWINSOCK_MAPPING *Mapping ); int SockLoadTransportList( - PWSTR *TransportList + PWSTR *TransportList ); BOOL SockIsTripleInMapping( - PWINSOCK_MAPPING Mapping, - INT AddressFamily, - INT SocketType, - INT Protocol + PWINSOCK_MAPPING Mapping, + INT AddressFamily, + INT SocketType, + INT Protocol ); int SockGetTdiName( - PINT AddressFamily, - PINT SocketType, - PINT Protocol, - GROUP Group, - DWORD Flags, - PUNICODE_STRING TransportName, - PVOID *HelperDllContext, - PHELPER_DATA *HelperDllData, - PDWORD Events + PINT AddressFamily, + PINT SocketType, + PINT Protocol, + GROUP Group, + DWORD Flags, + PUNICODE_STRING TransportName, + PVOID *HelperDllContext, + PHELPER_DATA *HelperDllData, + PDWORD Events ); #endif /* __HELPERS_H */

1 0

[pschweitzer] 73202: [NTOSKRNL] Don't redefine RTL_NUMBER_OF
by pschweitzer＠svn.reactos.org 11 Nov '16

11 Nov '16

Author: pschweitzer Date: Fri Nov 11 18:16:43 2016 New Revision: 73202 URL: http://svn.reactos.org/svn/reactos?rev=73202&view=rev Log: [NTOSKRNL] Don't redefine RTL_NUMBER_OF Modified: trunk/reactos/ntoskrnl/kdbg/kdb.h trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb.h?rev=73… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb.h [iso-8859-1] Fri Nov 11 18:16:43 2016 @@ -1,10 +1,6 @@ #pragma once /* DEFINES *******************************************************************/ - -#ifndef RTL_NUMBER_OF -# define RTL_NUMBER_OF(x) (sizeof(x) / sizeof((x)[0])) -#endif /* formerly located in kdbg/kdb_symbols.c */ #define TAG_KDBS 'SBDK' 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] Fri Nov 11 18:16:43 2016 @@ -3152,11 +3152,6 @@ IN PEXEFMT_CB_READ_FILE ReadFileCb, IN PEXEFMT_CB_ALLOCATE_SEGMENTS AllocateSegmentsCb ); - -/* TODO: this is a standard DDK/PSDK macro */ -#ifndef RTL_NUMBER_OF -#define RTL_NUMBER_OF(ARR_) (sizeof(ARR_) / sizeof((ARR_)[0])) -#endif static PEXEFMT_LOADER ExeFmtpLoaders[] = {

1 0

[cwittich] 73201: [PSDK] small fixes for dns headers
by cwittich＠svn.reactos.org 11 Nov '16

11 Nov '16

Author: cwittich Date: Fri Nov 11 14:21:55 2016 New Revision: 73201 URL: http://svn.reactos.org/svn/reactos?rev=73201&view=rev Log: [PSDK] small fixes for dns headers Modified: trunk/reactos/sdk/include/psdk/windns.h trunk/reactos/sdk/include/reactos/idl/dnsrslvr.idl Modified: trunk/reactos/sdk/include/psdk/windns.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/windns.h?… ============================================================================== --- trunk/reactos/sdk/include/psdk/windns.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/windns.h [iso-8859-1] Fri Nov 11 14:21:55 2016 @@ -626,6 +626,7 @@ DNS_WINSR_DATAW WINSR, WinsR, NBSTAT, Nbstat; } Data; } DNS_RECORDW, *PDNS_RECORDW; +#endif #ifdef UNICODE #define DNS_RECORD DNS_RECORDW @@ -633,8 +634,6 @@ #else #define DNS_RECORD DNS_RECORDA #define PDNS_RECORD PDNS_RECORDA -#endif - #endif typedef struct _DnsRRSet { Modified: trunk/reactos/sdk/include/reactos/idl/dnsrslvr.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/idl/dn… ============================================================================== --- trunk/reactos/sdk/include/reactos/idl/dnsrslvr.idl [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/idl/dnsrslvr.idl [iso-8859-1] Fri Nov 11 14:21:55 2016 @@ -3,6 +3,8 @@ */ #include <ms-dtyp.idl> + +#define UNICODE #include <sal.h> #include <windns.h> @@ -48,7 +50,7 @@ [in] WORD wType, [in] DWORD Flags, [in][out] DWORD *dwRecords, - [out][ref] _DnsRecordW** ppResultRecords); + [out][ref] DNS_RECORDW** ppResultRecords); /* Function: 0x08 */ /* R_ResolverEnumCache */

1 0

[pschweitzer] 73200: [KMTESTS:MM] Bugfix for IRP_MJ_SET_INFORMATION/FileEndOfFileInformation: really set the information. The test still works fine in Windows and still fails hard in ReactOS.
by pschweitzer＠svn.reactos.org 11 Nov '16

11 Nov '16

Author: pschweitzer Date: Fri Nov 11 10:44:51 2016 New Revision: 73200 URL: http://svn.reactos.org/svn/reactos?rev=73200&view=rev Log: [KMTESTS:MM] Bugfix for IRP_MJ_SET_INFORMATION/FileEndOfFileInformation: really set the information. The test still works fine in Windows and still fails hard in ReactOS. Modified: trunk/rostests/kmtests/ntos_mm/NtCreateSection_drv.c Modified: trunk/rostests/kmtests/ntos_mm/NtCreateSection_drv.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/NtCreateS… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/NtCreateSection_drv.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_mm/NtCreateSection_drv.c [iso-8859-1] Fri Nov 11 10:44:51 2016 @@ -477,6 +477,7 @@ ok_bool_false(IoStack->Parameters.SetFile.AdvanceOnly, "AdvanceOnly set!\n"); ok(EOFInfo->EndOfFile.QuadPart > Fcb->Header.AllocationSize.QuadPart, "New size smaller\n"); + Fcb->Header.AllocationSize.QuadPart = EOFInfo->EndOfFile.QuadPart; if (CcIsFileCached(IoStack->FileObject)) { CcSetFileSizes(IoStack->FileObject, (PCC_FILE_SIZES)(&(Fcb->Header.AllocationSize)));

1 0

[pschweitzer] 73199: [NTOSKRNL] In MmCreateDataFileSection(), when maximum size is higher than file size, don't deal with its allocation size, just move EOF. This was shown by NtCreateSection() tests.
by pschweitzer＠svn.reactos.org 10 Nov '16

10 Nov '16

Author: pschweitzer Date: Thu Nov 10 21:17:21 2016 New Revision: 73199 URL: http://svn.reactos.org/svn/reactos?rev=73199&view=rev Log: [NTOSKRNL] In MmCreateDataFileSection(), when maximum size is higher than file size, don't deal with its allocation size, just move EOF. This was shown by NtCreateSection() tests. 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] Thu Nov 10 21:17:21 2016 @@ -2998,7 +2998,7 @@ if (MaximumSize.QuadPart > FileInfo.EndOfFile.QuadPart) { Status = IoSetInformation(FileObject, - FileAllocationInformation, + FileEndOfFileInformation, sizeof(LARGE_INTEGER), &MaximumSize); if (!NT_SUCCESS(Status))

1 0

[pschweitzer] 73198: [KMTESTS:MM] Add tests for the NtCreateSection functions which mimic some of the behavior that can be exposed by FSDs (late init, too small files, and so on). It was designed i...
by pschweitzer＠svn.reactos.org 10 Nov '16

10 Nov '16

Author: pschweitzer Date: Thu Nov 10 21:02:48 2016 New Revision: 73198 URL: http://svn.reactos.org/svn/reactos?rev=73198&view=rev Log: [KMTESTS:MM] Add tests for the NtCreateSection functions which mimic some of the behavior that can be exposed by FSDs (late init, too small files, and so on). It was designed in W2K3. Added: trunk/rostests/kmtests/ntos_mm/CMakeLists.txt (with props) trunk/rostests/kmtests/ntos_mm/NtCreateSection_drv.c (with props) trunk/rostests/kmtests/ntos_mm/NtCreateSection_user.c (with props) Modified: trunk/rostests/kmtests/CMakeLists.txt trunk/rostests/kmtests/kmtest/testlist.c Modified: trunk/rostests/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/CMakeLists.txt?re… ============================================================================== --- trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] Thu Nov 10 21:02:48 2016 @@ -8,6 +8,7 @@ add_subdirectory(kernel32) add_subdirectory(ntos_cc) add_subdirectory(ntos_io) +add_subdirectory(ntos_mm) add_subdirectory(ntos_po) add_subdirectory(tcpip) @@ -126,6 +127,7 @@ ntos_io/IoCreateFile_user.c ntos_io/IoDeviceObject_user.c ntos_io/IoReadWrite_user.c + ntos_mm/NtCreateSection_user.c ntos_po/PoIrp_user.c tcpip/TcpIp_user.c ${COMMON_SOURCE} @@ -153,6 +155,7 @@ iodeviceobject_drv iohelper_drv ioreadwrite_drv + ntcreatesection_drv poirp_drv tcpip_drv cccopyread_drv) Modified: trunk/rostests/kmtests/kmtest/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest/testlist.c… ============================================================================== --- trunk/rostests/kmtests/kmtest/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest/testlist.c [iso-8859-1] Thu Nov 10 21:02:48 2016 @@ -13,6 +13,7 @@ KMT_TESTFUNC Test_IoCreateFile; KMT_TESTFUNC Test_IoDeviceObject; KMT_TESTFUNC Test_IoReadWrite; +KMT_TESTFUNC Test_NtCreateSection; KMT_TESTFUNC Test_PoIrp; KMT_TESTFUNC Test_RtlAvlTree; KMT_TESTFUNC Test_RtlException; @@ -34,6 +35,7 @@ { "IoCreateFile", Test_IoCreateFile }, { "IoDeviceObject", Test_IoDeviceObject }, { "IoReadWrite", Test_IoReadWrite }, + { "NtCreateSection", Test_NtCreateSection }, { "PoIrp", Test_PoIrp }, { "RtlAvlTree", Test_RtlAvlTree }, { "RtlException", Test_RtlException }, Added: trunk/rostests/kmtests/ntos_mm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/CMakeList… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/CMakeLists.txt (added) +++ trunk/rostests/kmtests/ntos_mm/CMakeLists.txt [iso-8859-1] Thu Nov 10 21:02:48 2016 @@ -0,0 +1,17 @@ + +include_directories(../include) + +# +# NtCreateSection +# +list(APPEND NTCREATESECTION_DRV_SOURCE + ../kmtest_drv/kmtest_standalone.c + NtCreateSection_drv.c) + +add_library(ntcreatesection_drv SHARED ${NTCREATESECTION_DRV_SOURCE}) +set_module_type(ntcreatesection_drv kernelmodedriver) +target_link_libraries(ntcreatesection_drv kmtest_printf ${PSEH_LIB}) +add_importlibs(ntcreatesection_drv ntoskrnl hal) +add_target_compile_definitions(ntcreatesection_drv KMT_STANDALONE_DRIVER) +#add_pch(ntcreatesection_drv ../include/kmt_test.h) +add_cd_file(TARGET ntcreatesection_drv DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/kmtests/ntos_mm/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/kmtests/ntos_mm/NtCreateSection_drv.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/NtCreateS… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/NtCreateSection_drv.c (added) +++ trunk/rostests/kmtests/ntos_mm/NtCreateSection_drv.c [iso-8859-1] Thu Nov 10 21:02:48 2016 @@ -0,0 +1,507 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test driver for NtCreateSection function + * PROGRAMMER: Pierre Schweitzer <pierre(a)reactos.org> + */ + +#include <kmt_test.h> + +#define NDEBUG +#include <debug.h> + +typedef struct _TEST_FCB +{ + FSRTL_ADVANCED_FCB_HEADER Header; + SECTION_OBJECT_POINTERS SectionObjectPointers; + FAST_MUTEX HeaderMutex; +} TEST_FCB, *PTEST_FCB; + +static PFILE_OBJECT TestFileObject; +static PDEVICE_OBJECT TestDeviceObject; +static KMT_IRP_HANDLER TestIrpHandler; +static FAST_IO_DISPATCH TestFastIoDispatch; + +static UNICODE_STRING InitOnCreate = RTL_CONSTANT_STRING(L"\\InitOnCreate"); +static UNICODE_STRING InitOnRW = RTL_CONSTANT_STRING(L"\\InitOnRW"); +static UNICODE_STRING InvalidInit = RTL_CONSTANT_STRING(L"\\InvalidInit"); + +static +BOOLEAN +NTAPI +FastIoRead( + _In_ PFILE_OBJECT FileObject, + _In_ PLARGE_INTEGER FileOffset, + _In_ ULONG Length, + _In_ BOOLEAN Wait, + _In_ ULONG LockKey, + _Out_ PVOID Buffer, + _Out_ PIO_STATUS_BLOCK IoStatus, + _In_ PDEVICE_OBJECT DeviceObject) +{ + IoStatus->Status = STATUS_NOT_SUPPORTED; + return FALSE; +} + +static +BOOLEAN +NTAPI +FastIoWrite( + _In_ PFILE_OBJECT FileObject, + _In_ PLARGE_INTEGER FileOffset, + _In_ ULONG Length, + _In_ BOOLEAN Wait, + _In_ ULONG LockKey, + _Out_ PVOID Buffer, + _Out_ PIO_STATUS_BLOCK IoStatus, + _In_ PDEVICE_OBJECT DeviceObject) +{ + IoStatus->Status = STATUS_NOT_SUPPORTED; + return FALSE; +} + +static +BOOLEAN +NTAPI +FastIoQueryStandardInfo( + _In_ PFILE_OBJECT FileObject, + _In_ BOOLEAN Wait, + _Out_ PFILE_STANDARD_INFORMATION Buffer, + _Out_ PIO_STATUS_BLOCK IoStatus, + _In_ PDEVICE_OBJECT DeviceObject) +{ + IoStatus->Status = STATUS_NOT_SUPPORTED; + return FALSE; +} + +NTSTATUS +TestEntry( + _In_ PDRIVER_OBJECT DriverObject, + _In_ PCUNICODE_STRING RegistryPath, + _Out_ PCWSTR *DeviceName, + _Inout_ INT *Flags) +{ + NTSTATUS Status = STATUS_SUCCESS; + + PAGED_CODE(); + + UNREFERENCED_PARAMETER(RegistryPath); + + *DeviceName = L"NtCreateSection"; + *Flags = TESTENTRY_NO_EXCLUSIVE_DEVICE | + TESTENTRY_BUFFERED_IO_DEVICE | + TESTENTRY_NO_READONLY_DEVICE; + + KmtRegisterIrpHandler(IRP_MJ_CLEANUP, NULL, TestIrpHandler); + KmtRegisterIrpHandler(IRP_MJ_CREATE, NULL, TestIrpHandler); + KmtRegisterIrpHandler(IRP_MJ_READ, NULL, TestIrpHandler); + KmtRegisterIrpHandler(IRP_MJ_WRITE, NULL, TestIrpHandler); + KmtRegisterIrpHandler(IRP_MJ_QUERY_INFORMATION, NULL, TestIrpHandler); + KmtRegisterIrpHandler(IRP_MJ_SET_INFORMATION, NULL, TestIrpHandler); + + TestFastIoDispatch.FastIoRead = FastIoRead; + TestFastIoDispatch.FastIoWrite = FastIoWrite; + TestFastIoDispatch.FastIoQueryStandardInfo = FastIoQueryStandardInfo; + DriverObject->FastIoDispatch = &TestFastIoDispatch; + + + return Status; +} + +VOID +TestUnload( + _In_ PDRIVER_OBJECT DriverObject) +{ + PAGED_CODE(); +} + +BOOLEAN +NTAPI +AcquireForLazyWrite( + _In_ PVOID Context, + _In_ BOOLEAN Wait) +{ + return TRUE; +} + +VOID +NTAPI +ReleaseFromLazyWrite( + _In_ PVOID Context) +{ + return; +} + +BOOLEAN +NTAPI +AcquireForReadAhead( + _In_ PVOID Context, + _In_ BOOLEAN Wait) +{ + return TRUE; +} + +VOID +NTAPI +ReleaseFromReadAhead( + _In_ PVOID Context) +{ + return; +} + +static CACHE_MANAGER_CALLBACKS Callbacks = { + AcquireForLazyWrite, + ReleaseFromLazyWrite, + AcquireForReadAhead, + ReleaseFromReadAhead, +}; + +static +PVOID +MapAndLockUserBuffer( + _In_ _Out_ PIRP Irp, + _In_ ULONG BufferLength) +{ + PMDL Mdl; + + if (Irp->MdlAddress == NULL) + { + Mdl = IoAllocateMdl(Irp->UserBuffer, BufferLength, FALSE, FALSE, Irp); + if (Mdl == NULL) + { + return NULL; + } + + _SEH2_TRY + { + MmProbeAndLockPages(Mdl, Irp->RequestorMode, IoWriteAccess); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + IoFreeMdl(Mdl); + Irp->MdlAddress = NULL; + _SEH2_YIELD(return NULL); + } + _SEH2_END; + } + + return MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority); +} + + +static +NTSTATUS +TestIrpHandler( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ PIRP Irp, + _In_ PIO_STACK_LOCATION IoStack) +{ + NTSTATUS Status; + PTEST_FCB Fcb; + CACHE_UNINITIALIZE_EVENT CacheUninitEvent; + + PAGED_CODE(); + + DPRINT("IRP %x/%x\n", IoStack->MajorFunction, IoStack->MinorFunction); + ASSERT(IoStack->MajorFunction == IRP_MJ_CLEANUP || + IoStack->MajorFunction == IRP_MJ_CREATE || + IoStack->MajorFunction == IRP_MJ_READ || + IoStack->MajorFunction == IRP_MJ_WRITE || + IoStack->MajorFunction == IRP_MJ_QUERY_INFORMATION || + IoStack->MajorFunction == IRP_MJ_SET_INFORMATION); + + Status = STATUS_NOT_SUPPORTED; + Irp->IoStatus.Information = 0; + + if (IoStack->MajorFunction == IRP_MJ_CREATE) + { + ULONG RequestedDisposition = ((IoStack->Parameters.Create.Options >> 24) & 0xff); + ok(RequestedDisposition == FILE_CREATE || RequestedDisposition == FILE_OPEN, "Invalid disposition: %lu\n", RequestedDisposition); + + if (IoStack->FileObject->FileName.Length >= 2 * sizeof(WCHAR)) + { + TestDeviceObject = DeviceObject; + TestFileObject = IoStack->FileObject; + } + Fcb = ExAllocatePoolWithTag(NonPagedPool, sizeof(*Fcb), 'FwrI'); + RtlZeroMemory(Fcb, sizeof(*Fcb)); + ExInitializeFastMutex(&Fcb->HeaderMutex); + FsRtlSetupAdvancedHeader(&Fcb->Header, &Fcb->HeaderMutex); + + /* Consider file/dir doesn't exist */ + if (RequestedDisposition == FILE_CREATE) + { + Fcb->Header.AllocationSize.QuadPart = 0; + Fcb->Header.FileSize.QuadPart = 0; + Fcb->Header.ValidDataLength.QuadPart = 0; + } + else + { + Fcb->Header.AllocationSize.QuadPart = 512; + Fcb->Header.FileSize.QuadPart = 512; + Fcb->Header.ValidDataLength.QuadPart = 512; + } + Fcb->Header.IsFastIoPossible = FastIoIsNotPossible; + + DPRINT1("File: %wZ\n", &IoStack->FileObject->FileName); + + IoStack->FileObject->FsContext = Fcb; + if (RtlCompareUnicodeString(&IoStack->FileObject->FileName, &InvalidInit, FALSE) != 0) + { + IoStack->FileObject->SectionObjectPointer = &Fcb->SectionObjectPointers; + } + + if (IoStack->FileObject->FileName.Length == 0 || + RtlCompareUnicodeString(&IoStack->FileObject->FileName, &InitOnCreate, FALSE) == 0) + { + DPRINT1("Init\n"); + + CcInitializeCacheMap(IoStack->FileObject, + (PCC_FILE_SIZES)&Fcb->Header.AllocationSize, + FALSE, &Callbacks, NULL); + } + + Irp->IoStatus.Information = (RequestedDisposition == FILE_CREATE) ? FILE_CREATED : FILE_OPENED; + Status = STATUS_SUCCESS; + } + else if (IoStack->MajorFunction == IRP_MJ_READ) + { + BOOLEAN Ret; + ULONG Length; + PVOID Buffer; + LARGE_INTEGER Offset; + + Offset = IoStack->Parameters.Read.ByteOffset; + Length = IoStack->Parameters.Read.Length; + Fcb = IoStack->FileObject->FsContext; + + ok_eq_pointer(DeviceObject, TestDeviceObject); + ok_eq_pointer(IoStack->FileObject, TestFileObject); + + if (Offset.QuadPart + Length > Fcb->Header.FileSize.QuadPart) + { + Status = STATUS_END_OF_FILE; + } + else if (Length == 0) + { + Status = STATUS_SUCCESS; + } + else + { + if (!FlagOn(Irp->Flags, IRP_NOCACHE)) + { + Buffer = Irp->AssociatedIrp.SystemBuffer; + ok(Buffer != NULL, "Null pointer!\n"); + + _SEH2_TRY + { + if (IoStack->FileObject->PrivateCacheMap == NULL) + { + DPRINT1("Init\n"); + ok_eq_ulong(RtlCompareUnicodeString(&IoStack->FileObject->FileName, &InitOnRW, FALSE), 0); + CcInitializeCacheMap(IoStack->FileObject, + (PCC_FILE_SIZES)&Fcb->Header.AllocationSize, + FALSE, &Callbacks, Fcb); + } + + Ret = CcCopyRead(IoStack->FileObject, &Offset, Length, TRUE, Buffer, + &Irp->IoStatus); + ok_bool_true(Ret, "CcCopyRead"); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Irp->IoStatus.Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + Status = Irp->IoStatus.Status; + } + else + { + ok(Irp->AssociatedIrp.SystemBuffer == NULL, "A SystemBuffer was allocated!\n"); + Buffer = MapAndLockUserBuffer(Irp, Length); + ok(Buffer != NULL, "Null pointer!\n"); + RtlFillMemory(Buffer, Length, 0xBA); + + Status = STATUS_SUCCESS; + } + } + + if (NT_SUCCESS(Status)) + { + Irp->IoStatus.Information = Length; + IoStack->FileObject->CurrentByteOffset.QuadPart = Offset.QuadPart + Length; + } + } + else if (IoStack->MajorFunction == IRP_MJ_WRITE) + { + BOOLEAN Ret; + ULONG Length; + PVOID Buffer; + LARGE_INTEGER Offset; + + Offset = IoStack->Parameters.Write.ByteOffset; + Length = IoStack->Parameters.Write.Length; + Fcb = IoStack->FileObject->FsContext; + + ok_eq_pointer(DeviceObject, TestDeviceObject); + ok_eq_pointer(IoStack->FileObject, TestFileObject); + + if (Length == 0) + { + Status = STATUS_SUCCESS; + } + else + { + if (!FlagOn(Irp->Flags, IRP_NOCACHE)) + { + Buffer = Irp->AssociatedIrp.SystemBuffer; + ok(Buffer != NULL, "Null pointer!\n"); + + _SEH2_TRY + { + if (IoStack->FileObject->PrivateCacheMap == NULL) + { + ok_eq_ulong(RtlCompareUnicodeString(&IoStack->FileObject->FileName, &InitOnRW, FALSE), 0); + CcInitializeCacheMap(IoStack->FileObject, + (PCC_FILE_SIZES)&Fcb->Header.AllocationSize, + FALSE, &Callbacks, Fcb); + } + + Ret = CcCopyWrite(IoStack->FileObject, &Offset, Length, TRUE, Buffer); + ok_bool_true(Ret, "CcCopyWrite"); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Irp->IoStatus.Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + Status = Irp->IoStatus.Status; + } + else + { + Status = STATUS_SUCCESS; + } + + if (NT_SUCCESS(Status)) + { + if (Length + Offset.QuadPart > Fcb->Header.FileSize.QuadPart) + { + Fcb->Header.AllocationSize.QuadPart = Length + Offset.QuadPart; + Fcb->Header.FileSize.QuadPart = Length + Offset.QuadPart; + Fcb->Header.ValidDataLength.QuadPart = Length + Offset.QuadPart; + + if (CcIsFileCached(IoStack->FileObject)) + { + CcSetFileSizes(IoStack->FileObject, (PCC_FILE_SIZES)(&(Fcb->Header.AllocationSize))); + } + } + } + } + } + else if (IoStack->MajorFunction == IRP_MJ_CLEANUP) + { + Fcb = IoStack->FileObject->FsContext; + ok(Fcb != NULL, "Null pointer!\n"); + if (IoStack->FileObject->PrivateCacheMap != NULL) + { + CcFlushCache(&Fcb->SectionObjectPointers, NULL, 0, NULL); + CcPurgeCacheSection(&Fcb->SectionObjectPointers, NULL, 0, FALSE); + KeInitializeEvent(&CacheUninitEvent.Event, NotificationEvent, FALSE); + CcUninitializeCacheMap(IoStack->FileObject, NULL, &CacheUninitEvent); + KeWaitForSingleObject(&CacheUninitEvent.Event, Executive, KernelMode, FALSE, NULL); + } + ExFreePoolWithTag(Fcb, 'FwrI'); + IoStack->FileObject->FsContext = NULL; + Status = STATUS_SUCCESS; + } + else if (IoStack->MajorFunction == IRP_MJ_QUERY_INFORMATION) + { + Fcb = IoStack->FileObject->FsContext; + + ok_eq_pointer(DeviceObject, TestDeviceObject); + ok_eq_pointer(IoStack->FileObject, TestFileObject); + ok_eq_ulong(IoStack->Parameters.QueryFile.FileInformationClass, FileStandardInformation); + + if (IoStack->Parameters.QueryFile.FileInformationClass == FileStandardInformation) + { + PFILE_STANDARD_INFORMATION StandardInfo = Irp->AssociatedIrp.SystemBuffer; + ULONG BufferLength = IoStack->Parameters.QueryFile.Length; + + if (BufferLength < sizeof(FILE_STANDARD_INFORMATION)) + { + Status = STATUS_BUFFER_OVERFLOW; + } + else + { + ok(StandardInfo != NULL, "Null pointer!\n"); + ok(Fcb != NULL, "Null pointer!\n"); + + StandardInfo->AllocationSize = Fcb->Header.AllocationSize; + StandardInfo->EndOfFile = Fcb->Header.FileSize; + StandardInfo->Directory = FALSE; + StandardInfo->NumberOfLinks = 1; + StandardInfo->DeletePending = FALSE; + + Irp->IoStatus.Information = sizeof(FILE_STANDARD_INFORMATION); + Status = STATUS_SUCCESS; + } + } + else + { + Status = STATUS_NOT_IMPLEMENTED; + } + } + else if (IoStack->MajorFunction == IRP_MJ_SET_INFORMATION) + { + Fcb = IoStack->FileObject->FsContext; + + ok_eq_pointer(DeviceObject, TestDeviceObject); + ok_eq_pointer(IoStack->FileObject, TestFileObject); + ok_eq_ulong(IoStack->Parameters.SetFile.FileInformationClass, FileEndOfFileInformation); + + if (IoStack->Parameters.SetFile.FileInformationClass == FileEndOfFileInformation) + { + PFILE_END_OF_FILE_INFORMATION EOFInfo = Irp->AssociatedIrp.SystemBuffer; + ULONG BufferLength = IoStack->Parameters.SetFile.Length; + + if (BufferLength < sizeof(FILE_END_OF_FILE_INFORMATION)) + { + Status = STATUS_BUFFER_OVERFLOW; + } + else + { + ok(EOFInfo != NULL, "Null pointer!\n"); + ok(Fcb != NULL, "Null pointer!\n"); + ok_bool_false(IoStack->Parameters.SetFile.AdvanceOnly, "AdvanceOnly set!\n"); + ok(EOFInfo->EndOfFile.QuadPart > Fcb->Header.AllocationSize.QuadPart, "New size smaller\n"); + + if (CcIsFileCached(IoStack->FileObject)) + { + CcSetFileSizes(IoStack->FileObject, (PCC_FILE_SIZES)(&(Fcb->Header.AllocationSize))); + } + + Status = STATUS_SUCCESS; + } + } + else + { + Status = STATUS_NOT_IMPLEMENTED; + } + } + + if (Status == STATUS_PENDING) + { + IoMarkIrpPending(Irp); + IoCompleteRequest(Irp, IO_NO_INCREMENT); + Status = STATUS_PENDING; + } + else + { + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } + + return Status; +} Propchange: trunk/rostests/kmtests/ntos_mm/NtCreateSection_drv.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/kmtests/ntos_mm/NtCreateSection_user.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/NtCreateS… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/NtCreateSection_user.c (added) +++ trunk/rostests/kmtests/ntos_mm/NtCreateSection_user.c [iso-8859-1] Thu Nov 10 21:02:48 2016 @@ -0,0 +1,252 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite NtCreateSection test user-mode part + * PROGRAMMER: Pierre Schweitzer <pierre(a)reactos.org> + */ + +#include <kmt_test.h> + +START_TEST(NtCreateSection) +{ + PVOID Buffer; + ULONG FileSize; + NTSTATUS Status; + LARGE_INTEGER MaxFileSize; + HANDLE Handle, SectionHandle; + IO_STATUS_BLOCK IoStatusBlock; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING InitOnCreate = RTL_CONSTANT_STRING(L"\\Device\\Kmtest-NtCreateSection\\InitOnCreate"); + UNICODE_STRING InitOnRW = RTL_CONSTANT_STRING(L"\\Device\\Kmtest-NtCreateSection\\InitOnRW"); + UNICODE_STRING InvalidInit = RTL_CONSTANT_STRING(L"\\Device\\Kmtest-NtCreateSection\\InvalidInit"); + + KmtLoadDriver(L"NtCreateSection", FALSE); + KmtOpenDriver(); + + /* Test 0 */ + InitializeObjectAttributes(&ObjectAttributes, &InvalidInit, OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = NtCreateFile(&Handle, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, + NULL, FILE_ATTRIBUTE_NORMAL, 0, FILE_CREATE, FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); + ok_eq_hex(Status, STATUS_SUCCESS); + + MaxFileSize.QuadPart = 512; + Status = NtCreateSection(&SectionHandle, SECTION_ALL_ACCESS, 0, &MaxFileSize, + PAGE_READWRITE, SEC_COMMIT, Handle); + ok_eq_hex(Status, STATUS_INVALID_FILE_FOR_SECTION); + NtClose(Handle); + + /* Test 1 */ + InitializeObjectAttributes(&ObjectAttributes, &InitOnCreate, OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = NtCreateFile(&Handle, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, + NULL, FILE_ATTRIBUTE_NORMAL, 0, FILE_CREATE, FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); + ok_eq_hex(Status, STATUS_SUCCESS); + + MaxFileSize.QuadPart = 512; + Status = NtCreateSection(&SectionHandle, SECTION_ALL_ACCESS, 0, &MaxFileSize, + PAGE_READWRITE, SEC_COMMIT, Handle); + ok_eq_hex(Status, STATUS_SUCCESS); + + Buffer = NULL; + FileSize = 0; + Status = NtMapViewOfSection(SectionHandle, NtCurrentProcess(), &Buffer, 0, 0, 0, + &FileSize, ViewUnmap, 0, PAGE_READWRITE); + ok_eq_hex(Status, STATUS_SUCCESS); + + KmtStartSeh(); + memset(Buffer, 0xBA, 512); + KmtEndSeh(STATUS_SUCCESS); + + NtUnmapViewOfSection(NtCurrentProcess(), Buffer); + NtClose(SectionHandle); + NtClose(Handle); + + /* Test 2 */ + InitializeObjectAttributes(&ObjectAttributes, &InitOnCreate, OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = NtCreateFile(&Handle, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, + NULL, FILE_ATTRIBUTE_NORMAL, 0, FILE_CREATE, FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); + ok_eq_hex(Status, STATUS_SUCCESS); + + MaxFileSize.QuadPart = 4096; + Status = NtCreateSection(&SectionHandle, SECTION_ALL_ACCESS, 0, &MaxFileSize, + PAGE_READWRITE, SEC_COMMIT, Handle); + ok_eq_hex(Status, STATUS_SUCCESS); + + Buffer = NULL; + FileSize = 0; + Status = NtMapViewOfSection(SectionHandle, NtCurrentProcess(), &Buffer, 0, 0, 0, + &FileSize, ViewUnmap, 0, PAGE_READWRITE); + ok_eq_hex(Status, STATUS_SUCCESS); + + KmtStartSeh(); + memset(Buffer, 0xBA, 4096); + KmtEndSeh(STATUS_SUCCESS); + + NtUnmapViewOfSection(NtCurrentProcess(), Buffer); + NtClose(SectionHandle); + NtClose(Handle); + + /* Test 3 */ + InitializeObjectAttributes(&ObjectAttributes, &InitOnRW, OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = NtCreateFile(&Handle, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, + NULL, FILE_ATTRIBUTE_NORMAL, 0, FILE_CREATE, FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); + ok_eq_hex(Status, STATUS_SUCCESS); + + MaxFileSize.QuadPart = 512; + Status = NtCreateSection(&SectionHandle, SECTION_ALL_ACCESS, 0, &MaxFileSize, + PAGE_READWRITE, SEC_COMMIT, Handle); + ok_eq_hex(Status, STATUS_SUCCESS); + + Buffer = NULL; + FileSize = 0; + Status = NtMapViewOfSection(SectionHandle, NtCurrentProcess(), &Buffer, 0, 0, 0, + &FileSize, ViewUnmap, 0, PAGE_READWRITE); + ok_eq_hex(Status, STATUS_SUCCESS); + + KmtStartSeh(); + memset(Buffer, 0xBA, 512); + KmtEndSeh(STATUS_SUCCESS); + + NtUnmapViewOfSection(NtCurrentProcess(), Buffer); + NtClose(SectionHandle); + NtClose(Handle); + + /* Test 4 */ + InitializeObjectAttributes(&ObjectAttributes, &InitOnRW, OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = NtCreateFile(&Handle, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, + NULL, FILE_ATTRIBUTE_NORMAL, 0, FILE_CREATE, FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); + ok_eq_hex(Status, STATUS_SUCCESS); + + MaxFileSize.QuadPart = 4096; + Status = NtCreateSection(&SectionHandle, SECTION_ALL_ACCESS, 0, &MaxFileSize, + PAGE_READWRITE, SEC_COMMIT, Handle); + ok_eq_hex(Status, STATUS_SUCCESS); + + Buffer = NULL; + FileSize = 0; + Status = NtMapViewOfSection(SectionHandle, NtCurrentProcess(), &Buffer, 0, 0, 0, + &FileSize, ViewUnmap, 0, PAGE_READWRITE); + ok_eq_hex(Status, STATUS_SUCCESS); + + KmtStartSeh(); + memset(Buffer, 0xBA, 4096); + KmtEndSeh(STATUS_SUCCESS); + + NtUnmapViewOfSection(NtCurrentProcess(), Buffer); + NtClose(SectionHandle); + NtClose(Handle); + + /* Test 10 */ + InitializeObjectAttributes(&ObjectAttributes, &InvalidInit, OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = NtCreateFile(&Handle, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, + NULL, FILE_ATTRIBUTE_NORMAL, 0, FILE_OPEN, FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); + ok_eq_hex(Status, STATUS_SUCCESS); + + MaxFileSize.QuadPart = 512; + Status = NtCreateSection(&SectionHandle, SECTION_ALL_ACCESS, 0, &MaxFileSize, + PAGE_READWRITE, SEC_COMMIT, Handle); + ok_eq_hex(Status, STATUS_INVALID_FILE_FOR_SECTION); + NtClose(Handle); + + /* Test 11 */ + InitializeObjectAttributes(&ObjectAttributes, &InitOnCreate, OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = NtCreateFile(&Handle, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, + NULL, FILE_ATTRIBUTE_NORMAL, 0, FILE_OPEN, FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); + ok_eq_hex(Status, STATUS_SUCCESS); + + MaxFileSize.QuadPart = 512; + Status = NtCreateSection(&SectionHandle, SECTION_ALL_ACCESS, 0, &MaxFileSize, + PAGE_READWRITE, SEC_COMMIT, Handle); + ok_eq_hex(Status, STATUS_SUCCESS); + + Buffer = NULL; + FileSize = 0; + Status = NtMapViewOfSection(SectionHandle, NtCurrentProcess(), &Buffer, 0, 0, 0, + &FileSize, ViewUnmap, 0, PAGE_READWRITE); + ok_eq_hex(Status, STATUS_SUCCESS); + + KmtStartSeh(); + memset(Buffer, 0xBA, 512); + KmtEndSeh(STATUS_SUCCESS); + + NtUnmapViewOfSection(NtCurrentProcess(), Buffer); + NtClose(SectionHandle); + NtClose(Handle); + + /* Test 12 */ + InitializeObjectAttributes(&ObjectAttributes, &InitOnCreate, OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = NtCreateFile(&Handle, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, + NULL, FILE_ATTRIBUTE_NORMAL, 0, FILE_OPEN, FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); + ok_eq_hex(Status, STATUS_SUCCESS); + + MaxFileSize.QuadPart = 4096; + Status = NtCreateSection(&SectionHandle, SECTION_ALL_ACCESS, 0, &MaxFileSize, + PAGE_READWRITE, SEC_COMMIT, Handle); + ok_eq_hex(Status, STATUS_SUCCESS); + + Buffer = NULL; + FileSize = 0; + Status = NtMapViewOfSection(SectionHandle, NtCurrentProcess(), &Buffer, 0, 0, 0, + &FileSize, ViewUnmap, 0, PAGE_READWRITE); + ok_eq_hex(Status, STATUS_SUCCESS); + + KmtStartSeh(); + memset(Buffer, 0xBA, 4096); + KmtEndSeh(STATUS_SUCCESS); + + NtUnmapViewOfSection(NtCurrentProcess(), Buffer); + NtClose(SectionHandle); + NtClose(Handle); + + /* Test 13 */ + InitializeObjectAttributes(&ObjectAttributes, &InitOnRW, OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = NtCreateFile(&Handle, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, + NULL, FILE_ATTRIBUTE_NORMAL, 0, FILE_OPEN, FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); + ok_eq_hex(Status, STATUS_SUCCESS); + + MaxFileSize.QuadPart = 512; + Status = NtCreateSection(&SectionHandle, SECTION_ALL_ACCESS, 0, &MaxFileSize, + PAGE_READWRITE, SEC_COMMIT, Handle); + ok_eq_hex(Status, STATUS_SUCCESS); + + Buffer = NULL; + FileSize = 0; + Status = NtMapViewOfSection(SectionHandle, NtCurrentProcess(), &Buffer, 0, 0, 0, + &FileSize, ViewUnmap, 0, PAGE_READWRITE); + ok_eq_hex(Status, STATUS_SUCCESS); + + KmtStartSeh(); + memset(Buffer, 0xBA, 512); + KmtEndSeh(STATUS_SUCCESS); + + NtUnmapViewOfSection(NtCurrentProcess(), Buffer); + NtClose(SectionHandle); + NtClose(Handle); + + /* Test 14 */ + InitializeObjectAttributes(&ObjectAttributes, &InitOnRW, OBJ_CASE_INSENSITIVE, NULL, NULL); + Status = NtCreateFile(&Handle, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &ObjectAttributes, &IoStatusBlock, + NULL, FILE_ATTRIBUTE_NORMAL, 0, FILE_OPEN, FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); + ok_eq_hex(Status, STATUS_SUCCESS); + + MaxFileSize.QuadPart = 4096; + Status = NtCreateSection(&SectionHandle, SECTION_ALL_ACCESS, 0, &MaxFileSize, + PAGE_READWRITE, SEC_COMMIT, Handle); + ok_eq_hex(Status, STATUS_SUCCESS); + + Buffer = NULL; + FileSize = 0; + Status = NtMapViewOfSection(SectionHandle, NtCurrentProcess(), &Buffer, 0, 0, 0, + &FileSize, ViewUnmap, 0, PAGE_READWRITE); + ok_eq_hex(Status, STATUS_SUCCESS); + + KmtStartSeh(); + memset(Buffer, 0xBA, 4096); + KmtEndSeh(STATUS_SUCCESS); + + NtUnmapViewOfSection(NtCurrentProcess(), Buffer); + NtClose(SectionHandle); + NtClose(Handle); + + KmtCloseDriver(); + KmtUnloadDriver(); +} Propchange: trunk/rostests/kmtests/ntos_mm/NtCreateSection_user.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[phater] 73197: [MSAFD] Implement SO_CONNECT_TIME. CORE-12104
by phater＠svn.reactos.org 10 Nov '16

10 Nov '16

Author: phater Date: Thu Nov 10 17:55:00 2016 New Revision: 73197 URL: http://svn.reactos.org/svn/reactos?rev=73197&view=rev Log: [MSAFD] Implement SO_CONNECT_TIME. CORE-12104 Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c trunk/reactos/dll/win32/msafd/msafd.h Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Thu Nov 10 17:55:00 2016 @@ -1320,6 +1320,21 @@ return HandleCount; } +DWORD +GetCurrentTimeInSeconds() +{ + FILETIME Time; + FILETIME Adjustment; + ULARGE_INTEGER lTime, lAdj; + SYSTEMTIME st = { 1970,1,0,1,0,0,0 }; + SystemTimeToFileTime(&st, &Adjustment); + memcpy(&lAdj, &Adjustment, sizeof(lAdj)); + GetSystemTimeAsFileTime(&Time); + memcpy(&lTime, &Time, sizeof(lTime)); + lTime.QuadPart -= lAdj.QuadPart; + return (DWORD)(lTime.QuadPart / 10000000LLU); +} + SOCKET WSPAPI WSPAccept(SOCKET Handle, @@ -1666,6 +1681,7 @@ } AcceptSocketInfo->SharedData->State = SocketConnected; + AcceptSocketInfo->SharedData->ConnectTime = GetCurrentTimeInSeconds(); /* Return Address in SOCKADDR FORMAT */ if( SocketAddress ) @@ -1884,6 +1900,7 @@ Socket->SharedData->State = SocketConnected; Socket->TdiConnectionHandle = (HANDLE)IOSB.Information; + Socket->SharedData->ConnectTime = GetCurrentTimeInSeconds(); /* Get any pending connect data */ if (lpCalleeData != NULL) @@ -2437,6 +2454,7 @@ PVOID Buffer; INT BufferSize; BOOL BoolBuffer; + DWORD DwordBuffer; INT Errno; TRACE("Called\n"); @@ -2540,6 +2558,12 @@ case SO_ERROR: Buffer = &Socket->SharedData->SocketLastError; BufferSize = sizeof(INT); + break; + + case SO_CONNECT_TIME: + DwordBuffer = GetCurrentTimeInSeconds() - Socket->SharedData->ConnectTime; + Buffer = &DwordBuffer; + BufferSize = sizeof(DWORD); break; case SO_SNDTIMEO: Modified: trunk/reactos/dll/win32/msafd/msafd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/msafd.h?re… ============================================================================== --- trunk/reactos/dll/win32/msafd/msafd.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/msafd.h [iso-8859-1] Thu Nov 10 17:55:00 2016 @@ -59,6 +59,7 @@ ULONG RecvTimeout; ULONG SizeOfRecvBuffer; ULONG SizeOfSendBuffer; + ULONG ConnectTime; struct { BOOLEAN Listening:1; BOOLEAN Broadcast:1;

1 0

[tfaber] 73196: [HOST-TOOLS] - Fix some GCC6 warnings
by tfaber＠svn.reactos.org 10 Nov '16

10 Nov '16

Author: tfaber Date: Thu Nov 10 15:34:25 2016 New Revision: 73196 URL: http://svn.reactos.org/svn/reactos?rev=73196&view=rev Log: [HOST-TOOLS] - Fix some GCC6 warnings Modified: trunk/reactos/sdk/lib/cmlib/cmlib.h trunk/reactos/sdk/tools/kbdtool/kbdtool.h trunk/reactos/sdk/tools/widl/write_msft.c Modified: trunk/reactos/sdk/lib/cmlib/cmlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/cmlib/cmlib.h?rev=… ============================================================================== --- trunk/reactos/sdk/lib/cmlib/cmlib.h [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/cmlib/cmlib.h [iso-8859-1] Thu Nov 10 15:34:25 2016 @@ -69,6 +69,26 @@ #define OBJ_NAME_PATH_SEPARATOR ((WCHAR)L'\\') #define UNICODE_NULL ((WCHAR)0) + + VOID NTAPI + RtlInitUnicodeString( + IN OUT PUNICODE_STRING DestinationString, + IN PCWSTR SourceString); + + LONG NTAPI + RtlCompareUnicodeString( + IN PCUNICODE_STRING String1, + IN PCUNICODE_STRING String2, + IN BOOLEAN CaseInSensitive); + + VOID + NTAPI + KeBugCheckEx( + IN ULONG BugCheckCode, + IN ULONG_PTR BugCheckParameter1, + IN ULONG_PTR BugCheckParameter2, + IN ULONG_PTR BugCheckParameter3, + IN ULONG_PTR BugCheckParameter4); VOID NTAPI KeQuerySystemTime( Modified: trunk/reactos/sdk/tools/kbdtool/kbdtool.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/kbdtool/kbdtool.… ============================================================================== --- trunk/reactos/sdk/tools/kbdtool/kbdtool.h [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/kbdtool/kbdtool.h [iso-8859-1] Thu Nov 10 15:34:25 2016 @@ -8,6 +8,7 @@ /* INCLUDES *******************************************************************/ +#include <ctype.h> #include <string.h> #include <stdarg.h> #include <stdio.h> @@ -66,10 +67,29 @@ LAYOUTENTRY Entry[110]; } LAYOUT, *PLAYOUT; +ULONG +DoOutput( + IN ULONG StateCount, + IN PULONG ShiftStates, + IN PKEYNAME DescriptionData, + IN PKEYNAME LanguageData, + IN PVOID AttributeData, + IN PVOID DeadKeyData, + IN PVOID LigatureData, + IN PKEYNAME KeyNameData, + IN PKEYNAME KeyNameExtData, + IN PKEYNAME KeyNameDeadData +); + PCHAR getVKName( IN ULONG VirtualKey, IN BOOLEAN Prefix +); + +ULONG +DoParsing( + VOID ); extern BOOLEAN Verbose, UnicodeFile, SanityCheck, FallbackDriver; Modified: trunk/reactos/sdk/tools/widl/write_msft.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/widl/write_msft.… ============================================================================== --- trunk/reactos/sdk/tools/widl/write_msft.c [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/widl/write_msft.c [iso-8859-1] Thu Nov 10 15:34:25 2016 @@ -49,6 +49,7 @@ #include "header.h" #include "hash.h" #include "typetree.h" +#include "parser.h" #ifdef __REACTOS__ #define S_OK 0

1 0

[phater] 73195: [WS2_32_APITESTS] Add nonblocking tests
by phater＠svn.reactos.org 10 Nov '16

10 Nov '16

Author: phater Date: Thu Nov 10 15:13:19 2016 New Revision: 73195 URL: http://svn.reactos.org/svn/reactos?rev=73195&view=rev Log: [WS2_32_APITESTS] Add nonblocking tests Added: trunk/rostests/apitests/ws2_32/nonblocking.c (with props) Modified: trunk/rostests/apitests/ws2_32/CMakeLists.txt trunk/rostests/apitests/ws2_32/testlist.c Modified: trunk/rostests/apitests/ws2_32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/CMakeList… ============================================================================== --- trunk/rostests/apitests/ws2_32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/CMakeLists.txt [iso-8859-1] Thu Nov 10 15:13:19 2016 @@ -6,6 +6,7 @@ getservbyport.c helpers.c ioctlsocket.c + nonblocking.c nostartup.c recv.c send.c Added: trunk/rostests/apitests/ws2_32/nonblocking.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/nonblocki… ============================================================================== --- trunk/rostests/apitests/ws2_32/nonblocking.c (added) +++ trunk/rostests/apitests/ws2_32/nonblocking.c [iso-8859-1] Thu Nov 10 15:13:19 2016 @@ -0,0 +1,135 @@ +/* +* PROJECT: ReactOS api tests +* LICENSE: GPL - See COPYING in the top level directory +* PURPOSE: Test for nonblocking sockets +* PROGRAMMERS: Peter Hater +*/ + +#include <apitest.h> + +#include <stdio.h> +#include <windows.h> +#include <winsock2.h> + +#define SVR_PORT 5000 +#define WAIT_TIMEOUT_ 10000 +#define EXIT_FLAGS (FD_ACCEPT|FD_CONNECT) + +START_TEST(nonblocking) +{ + WSADATA WsaData; + SOCKET ServerSocket = INVALID_SOCKET, + ClientSocket = INVALID_SOCKET; + struct sockaddr_in server_addr_in; + struct sockaddr_in addr_remote; + struct sockaddr_in addr_con_loc; + int nConRes, err; + int addrsize; + SOCKET sockaccept; + ULONG ulValue = 1; + DWORD dwFlags = 0, dwLen, dwAddrLen; + fd_set readfds, writefds, exceptfds; + struct timeval tval = { 0 }; + char address[100]; + + if (WSAStartup(MAKEWORD(2, 2), &WsaData) != 0) + { + skip("WSAStartup failed\n"); + return; + } + + ServerSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ClientSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + + if (ServerSocket == INVALID_SOCKET) + { + skip("ERROR: Server socket creation failed\n"); + return; + } + if (ClientSocket == INVALID_SOCKET) + { + skip("ERROR: Client socket creation failed\n"); + closesocket(ServerSocket); + return; + } + server_addr_in.sin_family = AF_INET; + server_addr_in.sin_addr.s_addr = INADDR_ANY; + server_addr_in.sin_port = htons(SVR_PORT); + + // server inialialization + trace("Initializing server and client connections ...\n"); + err = bind(ServerSocket, (struct sockaddr*)&server_addr_in, sizeof(server_addr_in)); + ok(err == 0, "ERROR: server bind failed\n"); + err = ioctlsocket(ServerSocket, FIONBIO, &ulValue); + ok(err == 0, "ERROR: server ioctlsocket FIONBIO failed\n"); + + // client inialialization + err = ioctlsocket(ClientSocket, FIONBIO, &ulValue); + ok(err == 0, "ERROR: client ioctlsocket FIONBIO failed\n"); + + // listen + trace("Starting server listening mode ...\n"); + err = listen(ServerSocket, 2); + ok(err == 0, "ERROR: cannot initialize server listen\n"); + + trace("Starting client to server connection ...\n"); + // connect + server_addr_in.sin_addr.s_addr = htonl(INADDR_LOOPBACK); + server_addr_in.sin_port = htons(SVR_PORT); + nConRes = connect(ClientSocket, (struct sockaddr*)&server_addr_in, sizeof(server_addr_in)); + ok(nConRes == SOCKET_ERROR, "ERROR: client connect() result is not SOCKET_ERROR\n"); + ok(WSAGetLastError() == WSAEWOULDBLOCK, "ERROR: client connect() last error is not WSAEWOULDBLOCK\n"); + FD_ZERO(&readfds); + FD_ZERO(&writefds); + FD_ZERO(&exceptfds); + FD_SET(ServerSocket, &readfds); + + while (dwFlags != EXIT_FLAGS) + { + addrsize = sizeof(addr_con_loc); + err = getsockname(ClientSocket, (struct sockaddr*)&addr_con_loc, &addrsize); + if (err == 0) + {// client connected + dwLen = sizeof(addr_con_loc); + dwAddrLen = sizeof(address); + err = WSAAddressToStringA((PSOCKADDR)&addr_con_loc, dwLen, NULL, address, &dwAddrLen); + if (err == 0) + { + trace("Event FD_CONNECT...\n"); + dwFlags |= FD_CONNECT; + err = recv(ClientSocket, address, dwAddrLen, 0); + ok(err == -1, "ERROR: error reading data from connected socket, error %d\n", WSAGetLastError()); + ok(WSAGetLastError() == WSAEWOULDBLOCK, "ERROR: client connect() last error is not WSAEWOULDBLOCK\n"); + err = send(ClientSocket, address, dwAddrLen, 0); + ok(err == dwAddrLen, "ERROR: error writing data to connected socket, error %d %d\n", err, WSAGetLastError()); + } + else + { + trace("WSAAddressToStringA failed %d\n", WSAGetLastError()); + } + } + + err = select(1, &readfds, &writefds, &exceptfds, &tval); + if (err == 1 && FD_ISSET(ServerSocket, &readfds)) + {// connection ready to be accepted + trace("Event FD_ACCEPT...\n"); + addrsize = sizeof(addr_remote); + sockaccept = accept(ServerSocket, (struct sockaddr*)&addr_remote, &addrsize); + ok(sockaccept != INVALID_SOCKET, "ERROR: Connection accept function failed, error %d\n", WSAGetLastError()); + dwFlags |= FD_ACCEPT; + dwLen = sizeof(addr_remote); + dwAddrLen = sizeof(address); + err = WSAAddressToStringA((PSOCKADDR)&addr_remote, dwLen, NULL, address, &dwAddrLen); + ok(err == 0, "WSAAddressToStringA, error %d\n", WSAGetLastError()); + ok(dwAddrLen > 7, "len <= 7\n"); + err = send(sockaccept, address, dwAddrLen, 0); + ok(err == dwAddrLen, "ERROR: error sending data on accepted socket, error %d\n", WSAGetLastError()); + } + } + + closesocket(sockaccept); + closesocket(ServerSocket); + closesocket(ClientSocket); + + WSACleanup(); +} Propchange: trunk/rostests/apitests/ws2_32/nonblocking.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/ws2_32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/testlist.… ============================================================================== --- trunk/rostests/apitests/ws2_32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/testlist.c [iso-8859-1] Thu Nov 10 15:13:19 2016 @@ -8,6 +8,7 @@ extern void func_getservbyname(void); extern void func_getservbyport(void); extern void func_ioctlsocket(void); +extern void func_nonblocking(void); extern void func_nostartup(void); extern void func_recv(void); extern void func_send(void); @@ -23,6 +24,7 @@ { "getservbyname", func_getservbyname }, { "getservbyport", func_getservbyport }, { "ioctlsocket", func_ioctlsocket }, + { "nonblocking", func_nonblocking }, { "nostartup", func_nostartup }, { "recv", func_recv }, { "send", func_send },

1 0

[phater] 73194: [WS2_32_APITESTS] Add more WSAAsync tests
by phater＠svn.reactos.org 10 Nov '16

10 Nov '16

Author: phater Date: Thu Nov 10 15:00:44 2016 New Revision: 73194 URL: http://svn.reactos.org/svn/reactos?rev=73194&view=rev Log: [WS2_32_APITESTS] Add more WSAAsync tests Modified: trunk/rostests/apitests/ws2_32/WSAAsync.c Modified: trunk/rostests/apitests/ws2_32/WSAAsync.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/WSAAsync.… ============================================================================== --- trunk/rostests/apitests/ws2_32/WSAAsync.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/WSAAsync.c [iso-8859-1] Thu Nov 10 15:00:44 2016 @@ -26,7 +26,7 @@ struct sockaddr_in server_addr_in; struct sockaddr_in addr_remote; struct sockaddr_in addr_con_loc; - int nConRes; + int nConRes, nSockNameRes; int addrsize, len; WSAEVENT fEvents[2]; SOCKET fSockets[2]; @@ -35,6 +35,11 @@ ULONG ulValue = 1; DWORD dwWait; DWORD dwFlags = 0; + struct fd_set select_rfds; + struct fd_set select_wfds; + struct fd_set select_efds; + struct timeval timeval; + BOOL ConnectSent = FALSE; if (WSAStartup(MAKEWORD(2, 2), &WsaData) != 0) { @@ -156,10 +161,135 @@ } } } + closesocket(sockaccept); + closesocket(ServerSocket); + closesocket(ClientSocket); + + /* same test but with waiting select and getsockname to return proper values */ + ServerSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ClientSocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + + if (ServerSocket == INVALID_SOCKET) + { + skip("ERROR: Server socket creation failed\n"); + return; + } + if (ClientSocket == INVALID_SOCKET) + { + skip("ERROR: Client socket creation failed\n"); + closesocket(ServerSocket); + return; + } + ent = gethostbyname("127.0.0.1"); + if (ent == NULL) + { + ok(ent != NULL, "ERROR: gethostbyname '127.0.0.1' failed, trying 'localhost'\n"); + ent = gethostbyname("localhost"); + + if (ent == NULL) + { + skip("ERROR: gethostbyname 'localhost' failed\n"); + goto done; + } + } + + server_addr_in.sin_family = AF_INET; + server_addr_in.sin_port = htons(SVR_PORT); + memcpy(&server_addr_in.sin_addr.S_un.S_addr, ent->h_addr_list[0], 4); + + // server inialialization + trace("Initializing server and client connections ...\n"); + ok(bind(ServerSocket, (struct sockaddr*)&server_addr_in, sizeof(server_addr_in)) == 0, "ERROR: server bind failed\n"); + ok(ioctlsocket(ServerSocket, FIONBIO, &ulValue) == 0, "ERROR: server ioctlsocket FIONBIO failed\n"); + + // client inialialization + ok(ioctlsocket(ClientSocket, FIONBIO, &ulValue) == 0, "ERROR: client ioctlsocket FIONBIO failed\n"); + + // listen + trace("Starting server listening mode ...\n"); + ok(listen(ServerSocket, SOMAXCONN) == 0, "ERROR: cannot initialize server listen\n"); + + memset(&timeval, 0, sizeof(timeval)); + timeval.tv_usec = WAIT_TIMEOUT_; + dwFlags = 0; + + while (dwFlags != EXIT_FLAGS) + { + len = sizeof(addr_con_loc); + nSockNameRes = getsockname(ClientSocket, (struct sockaddr*)&addr_con_loc, &len); + if (dwFlags == 0 && !ConnectSent) + { + ok(nSockNameRes == SOCKET_ERROR, "ERROR: getsockname function failed, expected %d error %d\n", SOCKET_ERROR, nSockNameRes); + ok(WSAGetLastError() == WSAEINVAL, "ERROR: getsockname function failed, expected %ld error %d\n", WSAEINVAL, WSAGetLastError()); + trace("Starting client to server connection ...\n"); + // connect + nConRes = connect(ClientSocket, (struct sockaddr*)&server_addr_in, sizeof(server_addr_in)); + ok(nConRes == SOCKET_ERROR, "ERROR: client connect() result is not SOCKET_ERROR\n"); + ok(WSAGetLastError() == WSAEWOULDBLOCK, "ERROR: client connect() last error is not WSAEWOULDBLOCK\n"); + ConnectSent = TRUE; + continue; + } + else + { + ok(nSockNameRes == 0, "ERROR: getsockname function failed, expected %d error %d\n", 0, nSockNameRes); + ok(len == sizeof(addr_con_loc), "ERROR: getsockname function wrong size, expected %d returned %d\n", sizeof(addr_con_loc), len); + ok(addr_con_loc.sin_addr.s_addr == server_addr_in.sin_addr.s_addr, "ERROR: getsockname function wrong addr, expected %lx returned %lx\n", server_addr_in.sin_addr.s_addr, addr_con_loc.sin_addr.s_addr); + } + if ((dwFlags & FD_ACCEPT) != 0) + {// client connected + trace("Select CONNECT...\n"); + dwFlags |= FD_CONNECT; + } + + FD_ZERO(&select_rfds); + FD_ZERO(&select_wfds); + FD_ZERO(&select_efds); + FD_SET(ServerSocket, &select_rfds); + FD_SET(ClientSocket, &select_rfds); + FD_SET(ServerSocket, &select_wfds); + FD_SET(ClientSocket, &select_wfds); + FD_SET(ServerSocket, &select_efds); + FD_SET(ClientSocket, &select_efds); + if ((dwFlags & FD_ACCEPT) != 0) + { + FD_SET(sockaccept, &select_rfds); + FD_SET(sockaccept, &select_wfds); + FD_SET(sockaccept, &select_efds); + } + if (select(0, &select_rfds, &select_wfds, &select_efds, &timeval) != 0) + {// connection accepted + if (dwFlags == (FD_ACCEPT | FD_CONNECT)) + { + trace("Select ACCEPT&CONNECT...\n"); + ok(FD_ISSET(ClientSocket, &select_wfds), "ClientSocket is not writable\n"); + ok(FD_ISSET(sockaccept, &select_wfds), "sockaccept is not writable\n"); + ok(!FD_ISSET(ServerSocket, &select_rfds), "ServerSocket is readable\n"); + } + if (dwFlags == FD_ACCEPT) + { + trace("Select ACCEPT...\n"); + ok(!FD_ISSET(ClientSocket, &select_wfds), "ClientSocket is writable\n"); + ok(FD_ISSET(sockaccept, &select_wfds), "sockaccept is not writable\n"); + ok(FD_ISSET(ServerSocket, &select_rfds), "ServerSocket is not readable\n"); + } + if (dwFlags == 0) + { + if (FD_ISSET(ServerSocket, &select_rfds)) + { + trace("Select ACCEPT...\n"); + addrsize = sizeof(addr_remote); + sockaccept = accept(ServerSocket, (struct sockaddr*)&addr_remote, &addrsize); + ok(sockaccept != INVALID_SOCKET, "ERROR: Connection accept function failed, error %d\n", WSAGetLastError()); + dwFlags |= FD_ACCEPT; + } + } + } + } done: WSACloseEvent(ServerEvent); WSACloseEvent(ClientEvent); + closesocket(sockaccept); closesocket(ServerSocket); closesocket(ClientSocket);

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