Ros-diffs December 2014

ros-diffs@reactos.org

17 participants
387 discussions

[akhaldi] 65552: [PSDK] * Add missing MoveFileWithProgress{A, W} declarations. CORE-4476

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Dec 3 11:35:29 2014 New Revision: 65552 URL: http://svn.reactos.org/svn/reactos?rev=65552&view=rev Log: [PSDK] * Add missing MoveFileWithProgress{A,W} declarations. CORE-4476 Modified: trunk/reactos/include/psdk/winbase.h Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winbase.h [iso-8859-1] Wed Dec 3 11:35:29 2014 @@ -2724,6 +2724,8 @@ BOOL WINAPI MoveFileW(_In_ LPCWSTR, _In_ LPCWSTR); BOOL WINAPI MoveFileExA(_In_ LPCSTR, _In_opt_ LPCSTR, _In_ DWORD); BOOL WINAPI MoveFileExW(_In_ LPCWSTR, _In_opt_ LPCWSTR, _In_ DWORD); +BOOL WINAPI MoveFileWithProgressA(_In_ LPCSTR, _In_opt_ LPCSTR, _In_opt_ LPPROGRESS_ROUTINE, _In_opt_ LPVOID, _In_ DWORD); +BOOL WINAPI MoveFileWithProgressW(_In_ LPCWSTR, _In_opt_ LPCWSTR, _In_opt_ LPPROGRESS_ROUTINE, _In_opt_ LPVOID, _In_ DWORD); int WINAPI MulDiv(_In_ int, _In_ int, _In_ int); BOOL WINAPI NotifyChangeEventLog(_In_ HANDLE, _In_ HANDLE); BOOL WINAPI ObjectCloseAuditAlarmA(_In_ LPCSTR, _In_ PVOID, _In_ BOOL); @@ -3378,6 +3380,7 @@ #define lstrlen lstrlenW #define MoveFile MoveFileW #define MoveFileEx MoveFileExW +#define MoveFileWithProgress MoveFileWithProgressW #define ObjectCloseAuditAlarm ObjectCloseAuditAlarmW #define ObjectDeleteAuditAlarm ObjectDeleteAuditAlarmW #define ObjectOpenAuditAlarm ObjectOpenAuditAlarmW @@ -3585,6 +3588,7 @@ #define lstrlen lstrlenA #define MoveFile MoveFileA #define MoveFileEx MoveFileExA +#define MoveFileWithProgress MoveFileWithProgressA #define ObjectCloseAuditAlarm ObjectCloseAuditAlarmA #define ObjectDeleteAuditAlarm ObjectDeleteAuditAlarmA #define ObjectOpenAuditAlarm ObjectOpenAuditAlarmA

10 years

[jgardou] 65551: [KMTEST/TCPIP] - Adjust test data to better reflect w2k3 behaviour. Thanks Amine for the tests.

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Dec 2 18:53:45 2014 New Revision: 65551 URL: http://svn.reactos.org/svn/reactos?rev=65551&view=rev Log: [KMTEST/TCPIP] - Adjust test data to better reflect w2k3 behaviour. Thanks Amine for the tests. Modified: trunk/rostests/kmtests/tcpip/tdi.c Modified: trunk/rostests/kmtests/tcpip/tdi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/tcpip/tdi.c?rev=6… ============================================================================== --- trunk/rostests/kmtests/tcpip/tdi.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/tcpip/tdi.c [iso-8859-1] Tue Dec 2 18:53:45 2014 @@ -39,35 +39,8 @@ RTL_CONSTANT_STRING(L"\\Device\\Tcp"), STATUS_SUCCESS, STATUS_SUCCESS, { - 0x0002, // Version - 0x3FFFFFFF, // MaxSendSize - 0, // MaxConnectionUserData - 65515, // MaxDatagramSize - TDI_SERVICE_CONNECTION_MODE | - TDI_SERVICE_ORDERLY_RELEASE | - TDI_SERVICE_CONNECTIONLESS_MODE | - TDI_SERVICE_ERROR_FREE_DELIVERY | - TDI_SERVICE_BROADCAST_SUPPORTED | - TDI_SERVICE_DELAYED_ACCEPTANCE | - TDI_SERVICE_EXPEDITED_DATA | - TDI_SERVICE_NO_ZERO_LENGTH | - TDI_SERVICE_DGRAM_CONNECTION | - TDI_SERVICE_FORCE_ACCESS_CHECK | - TDI_SERVICE_DIRECT_ACCEPT | - TDI_SERVICE_ADDRESS_SECURITY | - TDI_SERVICE_NO_PUSH, // ServiceFlags - 1, // MinimumLookaheadData - 65535, // MaximumLookaheadData - 0, // NumberOfResources - {{0}} // StartTime - } - }, - { - RTL_CONSTANT_STRING(L"\\Device\\Udp"), - STATUS_SUCCESS, STATUS_SUCCESS, - { - 0x0002, // Version - 0x3FFFFFFF, // MaxSendSize + 0x0100, // Version + 0xFFFFFFFF, // MaxSendSize 0, // MaxConnectionUserData 65507, // MaxDatagramSize TDI_SERVICE_CONNECTION_MODE | @@ -80,8 +53,11 @@ TDI_SERVICE_NO_ZERO_LENGTH | TDI_SERVICE_DGRAM_CONNECTION | TDI_SERVICE_FORCE_ACCESS_CHECK | - TDI_SERVICE_DIRECT_ACCEPT | - TDI_SERVICE_ADDRESS_SECURITY, // ServiceFlags + TDI_SERVICE_SEND_AND_DISCONNECT | + TDI_SERVICE_ACCEPT_LOCAL_ADDR | + TDI_SERVICE_ADDRESS_SECURITY | + TDI_SERVICE_PREPOST_RECVS | + TDI_SERVICE_NO_PUSH, // ServiceFlags 1, // MinimumLookaheadData 65535, // MaximumLookaheadData 0, // NumberOfResources @@ -89,17 +65,13 @@ } }, { - RTL_CONSTANT_STRING(L"\\Device\\Ip"), - STATUS_SUCCESS, STATUS_NOT_IMPLEMENTED, - }, - { - RTL_CONSTANT_STRING(L"\\Device\\RawIp"), + RTL_CONSTANT_STRING(L"\\Device\\Udp"), STATUS_SUCCESS, STATUS_SUCCESS, { - 0x0002, // Version - 0x3FFFFFFF, // MaxSendSize + 0x0100, // Version + 0xFFFFFFFF, // MaxSendSize 0, // MaxConnectionUserData - 65515, // MaxDatagramSize + 65507, // MaxDatagramSize TDI_SERVICE_CONNECTION_MODE | TDI_SERVICE_ORDERLY_RELEASE | TDI_SERVICE_CONNECTIONLESS_MODE | @@ -110,8 +82,11 @@ TDI_SERVICE_NO_ZERO_LENGTH | TDI_SERVICE_DGRAM_CONNECTION | TDI_SERVICE_FORCE_ACCESS_CHECK | - TDI_SERVICE_DIRECT_ACCEPT | - TDI_SERVICE_ADDRESS_SECURITY, // ServiceFlags + TDI_SERVICE_SEND_AND_DISCONNECT | + TDI_SERVICE_ACCEPT_LOCAL_ADDR | + TDI_SERVICE_ADDRESS_SECURITY | + TDI_SERVICE_PREPOST_RECVS | + TDI_SERVICE_NO_PUSH, // ServiceFlags 1, // MinimumLookaheadData 65535, // MaximumLookaheadData 0, // NumberOfResources @@ -119,8 +94,41 @@ } }, { + RTL_CONSTANT_STRING(L"\\Device\\Ip"), + STATUS_SUCCESS, STATUS_NOT_IMPLEMENTED, + }, + { + RTL_CONSTANT_STRING(L"\\Device\\RawIp"), + STATUS_SUCCESS, STATUS_SUCCESS, + { + 0x0100, // Version + 0xFFFFFFFF, // MaxSendSize + 0, // MaxConnectionUserData + 65507, // MaxDatagramSize + TDI_SERVICE_CONNECTION_MODE | + TDI_SERVICE_ORDERLY_RELEASE | + TDI_SERVICE_CONNECTIONLESS_MODE | + TDI_SERVICE_ERROR_FREE_DELIVERY | + TDI_SERVICE_BROADCAST_SUPPORTED | + TDI_SERVICE_DELAYED_ACCEPTANCE | + TDI_SERVICE_EXPEDITED_DATA | + TDI_SERVICE_NO_ZERO_LENGTH | + TDI_SERVICE_DGRAM_CONNECTION | + TDI_SERVICE_FORCE_ACCESS_CHECK | + TDI_SERVICE_SEND_AND_DISCONNECT | + TDI_SERVICE_ACCEPT_LOCAL_ADDR | + TDI_SERVICE_ADDRESS_SECURITY | + TDI_SERVICE_PREPOST_RECVS | + TDI_SERVICE_NO_PUSH, // ServiceFlags + 1, // MinimumLookaheadData + 65535, // MaximumLookaheadData + 0, // NumberOfResources + {{0}} // StartTime + } + }, + { RTL_CONSTANT_STRING(L"\\Device\\IPMULTICAST"), - STATUS_OBJECT_NAME_NOT_FOUND, + STATUS_SUCCESS, STATUS_INVALID_PARAMETER, }, }; ULONG i;

10 years

[jgardou] 65550: [KMTESTS/TCPIP] - Fix MSVC build.

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Dec 2 18:38:32 2014 New Revision: 65550 URL: http://svn.reactos.org/svn/reactos?rev=65550&view=rev Log: [KMTESTS/TCPIP] - Fix MSVC build. Modified: trunk/rostests/kmtests/tcpip/tdi.c Modified: trunk/rostests/kmtests/tcpip/tdi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/tcpip/tdi.c?rev=6… ============================================================================== --- trunk/rostests/kmtests/tcpip/tdi.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/tcpip/tdi.c [iso-8859-1] Tue Dec 2 18:38:32 2014 @@ -9,8 +9,8 @@ #include <tdikrnl.h> static +NTSTATUS NTAPI -NTSTATUS IrpCompletionRoutine( _In_ PDEVICE_OBJECT DeviceObject, _In_ PIRP Irp,

10 years

[jgardou] 65549: [TCPIP_DRVTEST] - Do not try to HeapFree a stack buffer.

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Dec 2 18:12:26 2014 New Revision: 65549 URL: http://svn.reactos.org/svn/reactos?rev=65549&view=rev Log: [TCPIP_DRVTEST] - Do not try to HeapFree a stack buffer. Modified: trunk/rostests/drivers/tcpip/InterfaceInfo.c Modified: trunk/rostests/drivers/tcpip/InterfaceInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/tcpip/InterfaceIn… ============================================================================== --- trunk/rostests/drivers/tcpip/InterfaceInfo.c [iso-8859-1] (original) +++ trunk/rostests/drivers/tcpip/InterfaceInfo.c [iso-8859-1] Tue Dec 2 18:12:26 2014 @@ -102,6 +102,7 @@ trace("\tIndex %lu, name %S\n", pInterfaceInfo->Adapter[i].Index, pInterfaceInfo->Adapter[i].Name); } - HeapFree(GetProcessHeap(), 0, pInterfaceInfo); + if (pInterfaceInfo != &InterfaceInfo) + HeapFree(GetProcessHeap(), 0, pInterfaceInfo); CloseHandle(FileHandle); }

10 years

[jgardou] 65548: [KMTESTS] - Fix typo

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Dec 2 18:08:33 2014 New Revision: 65548 URL: http://svn.reactos.org/svn/reactos?rev=65548&view=rev Log: [KMTESTS] - Fix typo Modified: trunk/rostests/kmtests/CMakeLists.txt 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] Tue Dec 2 18:08:33 2014 @@ -132,7 +132,7 @@ example_drv iodeviceobject_drv iohelper_drv - tcpip_test_drv) + tcpip_drv) add_custom_target(kmtest_all) add_dependencies(kmtest_all kmtest_drivers kmtest)

10 years

[jgardou] 65547: [ROSTESTS] - Add tcpip_drvtest, for now only testing the IOCTL behind iphlpapi's GetInterfaceInfo

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Dec 2 18:06:57 2014 New Revision: 65547 URL: http://svn.reactos.org/svn/reactos?rev=65547&view=rev Log: [ROSTESTS] - Add tcpip_drvtest, for now only testing the IOCTL behind iphlpapi's GetInterfaceInfo Added: trunk/rostests/drivers/CMakeLists.txt (with props) trunk/rostests/drivers/tcpip/ trunk/rostests/drivers/tcpip/CMakeLists.txt (with props) trunk/rostests/drivers/tcpip/InterfaceInfo.c (with props) trunk/rostests/drivers/tcpip/testlist.c (with props) Modified: trunk/rostests/CMakeLists.txt Modified: trunk/rostests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/CMakeLists.txt?rev=65547&… ============================================================================== --- trunk/rostests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/CMakeLists.txt [iso-8859-1] Tue Dec 2 18:06:57 2014 @@ -1,7 +1,7 @@ add_subdirectory(apitests) #add_subdirectory(dibtests) -#add_subdirectory(drivers) +add_subdirectory(drivers) #add_subdirectory(dxtest) add_subdirectory(kmtests) #add_subdirectory(regtests) Added: trunk/rostests/drivers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/CMakeLists.txt?re… ============================================================================== --- trunk/rostests/drivers/CMakeLists.txt (added) +++ trunk/rostests/drivers/CMakeLists.txt [iso-8859-1] Tue Dec 2 18:06:57 2014 @@ -0,0 +1,5 @@ + +#add_subdirectory(csqtest) +#add_subdirectory(memtest) +#add_subdirectory(ntoskrnl) +add_subdirectory(tcpip) Propchange: trunk/rostests/drivers/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/drivers/tcpip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/tcpip/CMakeLists.… ============================================================================== --- trunk/rostests/drivers/tcpip/CMakeLists.txt (added) +++ trunk/rostests/drivers/tcpip/CMakeLists.txt [iso-8859-1] Tue Dec 2 18:06:57 2014 @@ -0,0 +1,12 @@ + +include_directories(../../apitests/include) + +list(APPEND SOURCE + InterfaceInfo.c + testlist.c) + +add_executable(tcpip_drvtest ${SOURCE}) +target_link_libraries(tcpip_drvtest wine) +set_module_type(tcpip_drvtest win32cui) +add_importlibs(tcpip_drvtest msvcrt kernel32 ntdll) +add_cd_file(TARGET tcpip_drvtest DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/drivers/tcpip/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/drivers/tcpip/InterfaceInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/tcpip/InterfaceIn… ============================================================================== --- trunk/rostests/drivers/tcpip/InterfaceInfo.c (added) +++ trunk/rostests/drivers/tcpip/InterfaceInfo.c [iso-8859-1] Tue Dec 2 18:06:57 2014 @@ -0,0 +1,107 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: User mode part of the TcpIp.sys test suite + * PROGRAMMER: JÃ©rÃ´me Gardou <jerome.gardou(a)reactos.org> + */ + +#include <apitest.h> + +#include <ipexport.h> +#include <winioctl.h> +#include <tcpioctl.h> +#include <tcpip_undoc.h> + +START_TEST(InterfaceInfo) +{ + IP_INTERFACE_INFO* pInterfaceInfo; + IP_INTERFACE_INFO InterfaceInfo; + HANDLE FileHandle; + DWORD BufferSize; + BOOL Result; + ULONG i; + + /* Open a control channel file for TCP */ + FileHandle = CreateFileW( + L"\\\\.\\Tcp", + FILE_READ_DATA | FILE_WRITE_DATA, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, + OPEN_EXISTING, + FILE_FLAG_OVERLAPPED, + NULL); + ok(FileHandle != INVALID_HANDLE_VALUE, "CreateFile failed, GLE %lu\n", GetLastError()); + + /* Try the IOCTL */ + BufferSize = 0; + pInterfaceInfo = &InterfaceInfo; + Result = DeviceIoControl( + FileHandle, + IOCTL_IP_INTERFACE_INFO, + NULL, + 0, + pInterfaceInfo, + sizeof(InterfaceInfo), + &BufferSize, + NULL); + ok(!Result, "DeviceIoControl succeeded.\n"); + ok_long(GetLastError(), ERROR_INVALID_FUNCTION); + ok_long(BufferSize, 0); + + CloseHandle(FileHandle); + + /* This IOCTL only works with \Device\Ip */ + FileHandle = CreateFileW( + L"\\\\.\\Ip", + FILE_READ_DATA | FILE_WRITE_DATA, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, + OPEN_EXISTING, + FILE_FLAG_OVERLAPPED, + NULL); + ok(FileHandle != INVALID_HANDLE_VALUE, "CreateFile failed, GLE %lu\n", GetLastError()); + + /* Get the buffer size. */ + BufferSize = 0; + pInterfaceInfo = &InterfaceInfo; + Result = DeviceIoControl( + FileHandle, + IOCTL_IP_INTERFACE_INFO, + NULL, + 0, + pInterfaceInfo, + sizeof(InterfaceInfo), + &BufferSize, + NULL); + ok(Result, "DeviceIoControl failed.\n"); + ok(BufferSize != 0, "Buffer size is zero.\n"); + trace("Buffer size is %lu.\n", BufferSize); + + if (BufferSize > sizeof(InterfaceInfo)) + { + pInterfaceInfo = HeapAlloc(GetProcessHeap(), 0, BufferSize); + ok(pInterfaceInfo != NULL, "HeapAlloc failed.\n"); + + /* Send IOCTL to fill the buffer in. */ + Result = DeviceIoControl( + FileHandle, + IOCTL_IP_INTERFACE_INFO, + NULL, + 0, + pInterfaceInfo, + BufferSize, + &BufferSize, + NULL); + ok(Result, "DeviceIoControl failed.\n"); + } + + /* Nothing much to test. Just print out the adapters we got */ + trace("We got %ld adapters.\n", pInterfaceInfo->NumAdapters); + for (i = 0; i < pInterfaceInfo->NumAdapters; i++) + { + trace("\tIndex %lu, name %S\n", pInterfaceInfo->Adapter[i].Index, pInterfaceInfo->Adapter[i].Name); + } + + HeapFree(GetProcessHeap(), 0, pInterfaceInfo); + CloseHandle(FileHandle); +} Propchange: trunk/rostests/drivers/tcpip/InterfaceInfo.c ------------------------------------------------------------------------------ charset = UTF-8 Propchange: trunk/rostests/drivers/tcpip/InterfaceInfo.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/drivers/tcpip/InterfaceInfo.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: trunk/rostests/drivers/tcpip/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/tcpip/testlist.c?… ============================================================================== --- trunk/rostests/drivers/tcpip/testlist.c (added) +++ trunk/rostests/drivers/tcpip/testlist.c [iso-8859-1] Tue Dec 2 18:06:57 2014 @@ -0,0 +1,14 @@ +#define __ROS_LONG64__ + +#define STANDALONE +#include <apitest.h> + +extern void func_InterfaceInfo(void); + +const struct test winetest_testlist[] = +{ + { "InterfaceInfo", func_InterfaceInfo }, + + { 0, 0 } +}; + Propchange: trunk/rostests/drivers/tcpip/testlist.c ------------------------------------------------------------------------------ charset = UTF-8 Propchange: trunk/rostests/drivers/tcpip/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/drivers/tcpip/testlist.c ------------------------------------------------------------------------------ svn:mime-type = text/plain

10 years

[jgardou] 65546: [KMTEST] - Add some tests for tcpip.sys TDI capabilities (for now, TDI_PROVIDER_INFO)

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Dec 2 18:06:48 2014 New Revision: 65546 URL: http://svn.reactos.org/svn/reactos?rev=65546&view=rev Log: [KMTEST] - Add some tests for tcpip.sys TDI capabilities (for now, TDI_PROVIDER_INFO) Added: trunk/rostests/kmtests/tcpip/ trunk/rostests/kmtests/tcpip/CMakeLists.txt (with props) trunk/rostests/kmtests/tcpip/TcpIp_drv.c (with props) trunk/rostests/kmtests/tcpip/TcpIp_user.c (with props) trunk/rostests/kmtests/tcpip/tcpip.h (with props) trunk/rostests/kmtests/tcpip/tdi.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] Tue Dec 2 18:06:48 2014 @@ -7,6 +7,7 @@ add_subdirectory(example) add_subdirectory(kernel32) add_subdirectory(ntos_io) +add_subdirectory(tcpip) list(APPEND COMMON_SOURCE example/GuardedMemory.c @@ -108,6 +109,7 @@ example/Example_user.c kernel32/FindFile_user.c ntos_io/IoDeviceObject_user.c + tcpip/TcpIp_user.c ${COMMON_SOURCE} kmtest/kmtest.rc) @@ -129,7 +131,8 @@ kmtest_drv example_drv iodeviceobject_drv - iohelper_drv) + iohelper_drv + tcpip_test_drv) add_custom_target(kmtest_all) add_dependencies(kmtest_all kmtest_drivers kmtest) 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] Tue Dec 2 18:06:48 2014 @@ -17,6 +17,8 @@ KMT_TESTFUNC Test_RtlRegistry; KMT_TESTFUNC Test_RtlSplayTree; KMT_TESTFUNC Test_RtlUnicodeString; +KMT_TESTFUNC Test_TcpIpIoctl; +KMT_TESTFUNC Test_TcpIpTdi; /* tests with a leading '-' will not be listed */ const KMT_TEST TestList[] = @@ -31,5 +33,6 @@ { "RtlRegistry", Test_RtlRegistry }, { "RtlSplayTree", Test_RtlSplayTree }, { "RtlUnicodeString", Test_RtlUnicodeString }, + { "TcpIpTdi", Test_TcpIpTdi }, { NULL, NULL }, }; Added: trunk/rostests/kmtests/tcpip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/tcpip/CMakeLists.… ============================================================================== --- trunk/rostests/kmtests/tcpip/CMakeLists.txt (added) +++ trunk/rostests/kmtests/tcpip/CMakeLists.txt [iso-8859-1] Tue Dec 2 18:06:48 2014 @@ -0,0 +1,15 @@ + +include_directories(../include) + +list(APPEND TCPIP_TEST_DRV_SOURCE + ../kmtest_drv/kmtest_standalone.c + tdi.c + TcpIp_drv.c) + +add_library(tcpip_drv SHARED ${TCPIP_TEST_DRV_SOURCE}) +set_module_type(tcpip_drv kernelmodedriver) +target_link_libraries(tcpip_drv kmtest_printf ${PSEH_LIB}) +add_importlibs(tcpip_drv ntoskrnl hal) +add_target_compile_definitions(tcpip_drv KMT_STANDALONE_DRIVER) +#add_pch(example_drv ../include/kmt_test.h) +add_cd_file(TARGET tcpip_drv DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/kmtests/tcpip/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/kmtests/tcpip/TcpIp_drv.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/tcpip/TcpIp_drv.c… ============================================================================== --- trunk/rostests/kmtests/tcpip/TcpIp_drv.c (added) +++ trunk/rostests/kmtests/tcpip/TcpIp_drv.c [iso-8859-1] Tue Dec 2 18:06:48 2014 @@ -0,0 +1,55 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite for tcpip.sys + * PROGRAMMER: JÃ©rÃ´me Gardou <jerome.gardou(a)reactos.org> + */ + +#include <kmt_test.h> +#include "tcpip.h" + +extern KMT_MESSAGE_HANDLER TestTdi; + +static struct +{ + ULONG ControlCode; + PKMT_MESSAGE_HANDLER Handler; +} MessageHandlers[] = +{ + { IOCTL_TEST_TDI, TestTdi }, +}; + +NTSTATUS +TestEntry( + _In_ PDRIVER_OBJECT DriverObject, + _In_ PCUNICODE_STRING RegistryPath, + _Out_ PCWSTR *DeviceName, + _Inout_ INT *Flags) +{ + ULONG i; + + PAGED_CODE(); + + UNREFERENCED_PARAMETER(DriverObject); + UNREFERENCED_PARAMETER(RegistryPath); + UNREFERENCED_PARAMETER(Flags); + + *DeviceName = L"TcpIp"; + + for (i = 0; i < (sizeof(MessageHandlers) / sizeof(MessageHandlers[0])); i++) + KmtRegisterMessageHandler(MessageHandlers[i].ControlCode, NULL, MessageHandlers[i].Handler); + + trace("TcpIp test driver loaded.\n"); + + return STATUS_SUCCESS; +} + +VOID +TestUnload( + _In_ PDRIVER_OBJECT DriverObject) +{ + PAGED_CODE(); + + UNREFERENCED_PARAMETER(DriverObject); +} + Propchange: trunk/rostests/kmtests/tcpip/TcpIp_drv.c ------------------------------------------------------------------------------ charset = UTF-8 Propchange: trunk/rostests/kmtests/tcpip/TcpIp_drv.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/kmtests/tcpip/TcpIp_drv.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: trunk/rostests/kmtests/tcpip/TcpIp_user.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/tcpip/TcpIp_user.… ============================================================================== --- trunk/rostests/kmtests/tcpip/TcpIp_user.c (added) +++ trunk/rostests/kmtests/tcpip/TcpIp_user.c [iso-8859-1] Tue Dec 2 18:06:48 2014 @@ -0,0 +1,37 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: User mode part of the TcpIp.sys test suite + * PROGRAMMER: JÃ©rÃ´me Gardou <jerome.gardou(a)reactos.org> + */ + +#include <kmt_test.h> + +#include "tcpip.h" + +static +void +LoadTcpIpTestDriver(void) +{ + /* Start the special-purpose driver */ + KmtLoadDriver(L"TcpIp", FALSE); + KmtOpenDriver(); +} + +static +void +UnloadTcpIpTestDriver(void) +{ + /* Stop the driver. */ + KmtCloseDriver(); + KmtUnloadDriver(); +} + +START_TEST(TcpIpTdi) +{ + LoadTcpIpTestDriver(); + + ok(KmtSendToDriver(IOCTL_TEST_TDI) == ERROR_SUCCESS, "\n"); + + UnloadTcpIpTestDriver(); +} Propchange: trunk/rostests/kmtests/tcpip/TcpIp_user.c ------------------------------------------------------------------------------ charset = UTF-8 Propchange: trunk/rostests/kmtests/tcpip/TcpIp_user.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/kmtests/tcpip/TcpIp_user.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: trunk/rostests/kmtests/tcpip/tcpip.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/tcpip/tcpip.h?rev… ============================================================================== --- trunk/rostests/kmtests/tcpip/tcpip.h (added) +++ trunk/rostests/kmtests/tcpip/tcpip.h [iso-8859-1] Tue Dec 2 18:06:48 2014 @@ -0,0 +1,2 @@ + +#define IOCTL_TEST_TDI 1 Propchange: trunk/rostests/kmtests/tcpip/tcpip.h ------------------------------------------------------------------------------ charset = UTF-8 Propchange: trunk/rostests/kmtests/tcpip/tcpip.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/kmtests/tcpip/tcpip.h ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: trunk/rostests/kmtests/tcpip/tdi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/tcpip/tdi.c?rev=6… ============================================================================== --- trunk/rostests/kmtests/tcpip/tdi.c (added) +++ trunk/rostests/kmtests/tcpip/tdi.c [iso-8859-1] Tue Dec 2 18:06:48 2014 @@ -0,0 +1,291 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPLv2+ - See COPYING.LIB in the top level directory + * PURPOSE: Kernel-Mode Test Suite for TCPIP.sys + * PROGRAMMER: JÃ©rÃ´me Gardou <jerome.gardou(a)reactos.org> + */ + +#include <kmt_test.h> +#include <tdikrnl.h> + +static +NTAPI +NTSTATUS +IrpCompletionRoutine( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ PIRP Irp, + _In_ PVOID Context) +{ + UNREFERENCED_PARAMETER(DeviceObject); + UNREFERENCED_PARAMETER(Irp); + + KeSetEvent((PKEVENT)Context, IO_NETWORK_INCREMENT, FALSE); + + return STATUS_MORE_PROCESSING_REQUIRED; +} + +static +VOID +TestProviderInfo(void) +{ + struct + { + UNICODE_STRING DeviceName; + NTSTATUS CreateStatus, IrpStatus; + TDI_PROVIDER_INFO ExpectedInfo; + } TestData[] = + { + { + RTL_CONSTANT_STRING(L"\\Device\\Tcp"), + STATUS_SUCCESS, STATUS_SUCCESS, + { + 0x0002, // Version + 0x3FFFFFFF, // MaxSendSize + 0, // MaxConnectionUserData + 65515, // MaxDatagramSize + TDI_SERVICE_CONNECTION_MODE | + TDI_SERVICE_ORDERLY_RELEASE | + TDI_SERVICE_CONNECTIONLESS_MODE | + TDI_SERVICE_ERROR_FREE_DELIVERY | + TDI_SERVICE_BROADCAST_SUPPORTED | + TDI_SERVICE_DELAYED_ACCEPTANCE | + TDI_SERVICE_EXPEDITED_DATA | + TDI_SERVICE_NO_ZERO_LENGTH | + TDI_SERVICE_DGRAM_CONNECTION | + TDI_SERVICE_FORCE_ACCESS_CHECK | + TDI_SERVICE_DIRECT_ACCEPT | + TDI_SERVICE_ADDRESS_SECURITY | + TDI_SERVICE_NO_PUSH, // ServiceFlags + 1, // MinimumLookaheadData + 65535, // MaximumLookaheadData + 0, // NumberOfResources + {{0}} // StartTime + } + }, + { + RTL_CONSTANT_STRING(L"\\Device\\Udp"), + STATUS_SUCCESS, STATUS_SUCCESS, + { + 0x0002, // Version + 0x3FFFFFFF, // MaxSendSize + 0, // MaxConnectionUserData + 65507, // MaxDatagramSize + TDI_SERVICE_CONNECTION_MODE | + TDI_SERVICE_ORDERLY_RELEASE | + TDI_SERVICE_CONNECTIONLESS_MODE | + TDI_SERVICE_ERROR_FREE_DELIVERY | + TDI_SERVICE_BROADCAST_SUPPORTED | + TDI_SERVICE_DELAYED_ACCEPTANCE | + TDI_SERVICE_EXPEDITED_DATA | + TDI_SERVICE_NO_ZERO_LENGTH | + TDI_SERVICE_DGRAM_CONNECTION | + TDI_SERVICE_FORCE_ACCESS_CHECK | + TDI_SERVICE_DIRECT_ACCEPT | + TDI_SERVICE_ADDRESS_SECURITY, // ServiceFlags + 1, // MinimumLookaheadData + 65535, // MaximumLookaheadData + 0, // NumberOfResources + {{0}} // StartTime + } + }, + { + RTL_CONSTANT_STRING(L"\\Device\\Ip"), + STATUS_SUCCESS, STATUS_NOT_IMPLEMENTED, + }, + { + RTL_CONSTANT_STRING(L"\\Device\\RawIp"), + STATUS_SUCCESS, STATUS_SUCCESS, + { + 0x0002, // Version + 0x3FFFFFFF, // MaxSendSize + 0, // MaxConnectionUserData + 65515, // MaxDatagramSize + TDI_SERVICE_CONNECTION_MODE | + TDI_SERVICE_ORDERLY_RELEASE | + TDI_SERVICE_CONNECTIONLESS_MODE | + TDI_SERVICE_ERROR_FREE_DELIVERY | + TDI_SERVICE_BROADCAST_SUPPORTED | + TDI_SERVICE_DELAYED_ACCEPTANCE | + TDI_SERVICE_EXPEDITED_DATA | + TDI_SERVICE_NO_ZERO_LENGTH | + TDI_SERVICE_DGRAM_CONNECTION | + TDI_SERVICE_FORCE_ACCESS_CHECK | + TDI_SERVICE_DIRECT_ACCEPT | + TDI_SERVICE_ADDRESS_SECURITY, // ServiceFlags + 1, // MinimumLookaheadData + 65535, // MaximumLookaheadData + 0, // NumberOfResources + {{0}} // StartTime + } + }, + { + RTL_CONSTANT_STRING(L"\\Device\\IPMULTICAST"), + STATUS_OBJECT_NAME_NOT_FOUND, + }, + }; + ULONG i; + + for (i = 0; i < (sizeof(TestData) / sizeof(TestData[0])); i++) + { + IO_STATUS_BLOCK StatusBlock; + NTSTATUS Status; + FILE_OBJECT* FileObject; + DEVICE_OBJECT* DeviceObject; + PIRP Irp; + KEVENT Event; + PMDL Mdl; + TDI_PROVIDER_INFO* ProviderInfo; + HANDLE FileHandle; + OBJECT_ATTRIBUTES ObjectAttributes; + + trace("Testing device %wZ\n", &TestData[i].DeviceName); + + InitializeObjectAttributes( + &ObjectAttributes, + &TestData[i].DeviceName, + OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, + NULL, + NULL); + + Status = ZwCreateFile( + &FileHandle, + FILE_READ_DATA | FILE_WRITE_DATA, + &ObjectAttributes, + &StatusBlock, + NULL, + FILE_ATTRIBUTE_NORMAL, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_OPEN, + 0, + NULL, + 0); + ok_eq_hex(Status, TestData[i].CreateStatus); + if (!NT_SUCCESS(Status)) + continue; + + Status = ObReferenceObjectByHandle( + FileHandle, + GENERIC_READ, + *IoFileObjectType, + KernelMode, + (PVOID*)&FileObject, + NULL); + ok_eq_hex(Status, STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + return; + + DeviceObject = IoGetRelatedDeviceObject(FileObject); + ok(DeviceObject != NULL, "Device object is NULL!\n"); + if (!DeviceObject) + { + ObDereferenceObject(FileObject); + return; + } + + ProviderInfo = ExAllocatePoolWithTag(NonPagedPool, sizeof(*ProviderInfo), 'tseT'); + ok(ProviderInfo != NULL, "Ran out of memory.\n"); + if (!ProviderInfo) + { + ObDereferenceObject(FileObject); + return; + } + + Mdl = IoAllocateMdl(ProviderInfo, sizeof(*ProviderInfo), FALSE, FALSE, NULL); + ok(Mdl != NULL, "Could not allocate the MDL!\n"); + if (!Mdl) + { + ExFreePoolWithTag(ProviderInfo, 'tseT'); + ObDereferenceObject(FileObject); + return; + } + + MmBuildMdlForNonPagedPool(Mdl); + + /* Build the IRP */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); + ok(Irp != NULL, "TdiBuildInternalDeviceControlIrp returned NULL!\n"); + if (!Irp) + { + IoFreeMdl(Mdl); + ExFreePoolWithTag(ProviderInfo, 'tseT'); + ObDereferenceObject(FileObject); + return; + } + + TdiBuildQueryInformation( + Irp, + DeviceObject, + FileObject, + NULL, + NULL, + TDI_QUERY_PROVIDER_INFO, + Mdl); + + IoSetCompletionRoutine(Irp, IrpCompletionRoutine, &Event, TRUE, TRUE, TRUE); + + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject( + &Event, + Executive, + KernelMode, + FALSE, + NULL); + Status = StatusBlock.Status; + } + ok_eq_hex(Status, TestData[i].IrpStatus); + + IoFreeIrp(Irp); + IoFreeMdl(Mdl); + ObDereferenceObject(FileObject); + + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(ProviderInfo, 'tseT'); + continue; + } + + ok_eq_hex(ProviderInfo->Version, TestData[i].ExpectedInfo.Version); + ok_eq_ulong(ProviderInfo->MaxSendSize, TestData[i].ExpectedInfo.MaxSendSize); + ok_eq_ulong(ProviderInfo->MaxConnectionUserData, TestData[i].ExpectedInfo.MaxConnectionUserData); + ok_eq_ulong(ProviderInfo->MaxDatagramSize, TestData[i].ExpectedInfo.MaxDatagramSize); + ok_eq_hex(ProviderInfo->ServiceFlags, TestData[i].ExpectedInfo.ServiceFlags); + ok_eq_ulong(ProviderInfo->MinimumLookaheadData, TestData[i].ExpectedInfo.MinimumLookaheadData); + ok_eq_ulong(ProviderInfo->MaximumLookaheadData, TestData[i].ExpectedInfo.MaximumLookaheadData); + ok_eq_ulong(ProviderInfo->NumberOfResources, TestData[i].ExpectedInfo.NumberOfResources); + + ExFreePoolWithTag(ProviderInfo, 'tseT'); + } +} + +static KSTART_ROUTINE RunTest; +static +VOID +NTAPI +RunTest( + _In_ PVOID Context) +{ + UNREFERENCED_PARAMETER(Context); + + TestProviderInfo(); +} + +KMT_MESSAGE_HANDLER TestTdi; +NTSTATUS +TestTdi( + _In_ PDEVICE_OBJECT DeviceObject, + _In_ ULONG ControlCode, + _In_opt_ PVOID Buffer, + _In_ SIZE_T InLength, + _Inout_ PSIZE_T OutLength +) +{ + PKTHREAD Thread; + + Thread = KmtStartThread(RunTest, NULL); + KmtFinishThread(Thread, NULL); + + return STATUS_SUCCESS; +} Propchange: trunk/rostests/kmtests/tcpip/tdi.c ------------------------------------------------------------------------------ charset = UTF-8 Propchange: trunk/rostests/kmtests/tcpip/tdi.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/kmtests/tcpip/tdi.c ------------------------------------------------------------------------------ svn:mime-type = text/plain

10 years

[jgardou] 65545: [INCLUDE] - Introduce tcpip_undoc.h defining undocumented tcpip.sys IOCTLs and structures.

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Dec 2 18:02:15 2014 New Revision: 65545 URL: http://svn.reactos.org/svn/reactos?rev=65545&view=rev Log: [INCLUDE] - Introduce tcpip_undoc.h defining undocumented tcpip.sys IOCTLs and structures. Added: trunk/reactos/include/reactos/tcpip_undoc.h (with props) Added: trunk/reactos/include/reactos/tcpip_undoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/tcpip_undo… ============================================================================== --- trunk/reactos/include/reactos/tcpip_undoc.h (added) +++ trunk/reactos/include/reactos/tcpip_undoc.h [iso-8859-1] Tue Dec 2 18:02:15 2014 @@ -0,0 +1,5 @@ + +#pragma once + +/* Ioctl called by GetInterfaceInfo. Returns IP_INTERFACE_INFO structure. */ +#define IOCTL_IP_INTERFACE_INFO _TCP_CTL_CODE(0x10, METHOD_BUFFERED, FILE_ANY_ACCESS) Propchange: trunk/reactos/include/reactos/tcpip_undoc.h ------------------------------------------------------------------------------ charset = UTF-8 Propchange: trunk/reactos/include/reactos/tcpip_undoc.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/include/reactos/tcpip_undoc.h ------------------------------------------------------------------------------ svn:mime-type = text/plain

10 years

[dquintana] 65544: [RSHELL] * Oops. That shouldn't have been commited.

by dquintana＠svn.reactos.org

Author: dquintana Date: Tue Dec 2 12:27:44 2014 New Revision: 65544 URL: http://svn.reactos.org/svn/reactos?rev=65544&view=rev Log: [RSHELL] * Oops. That shouldn't have been commited. Modified: trunk/reactos/base/shell/rshell/precomp.h Modified: trunk/reactos/base/shell/rshell/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/precomp.… ============================================================================== --- trunk/reactos/base/shell/rshell/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/precomp.h [iso-8859-1] Tue Dec 2 12:27:44 2014 @@ -17,9 +17,9 @@ #pragma warning(disable:4512) // assignment operator could not be gernerated #endif -#define USE_SYSTEM_MENUDESKBAR 1 -#define USE_SYSTEM_MENUSITE 1 -#define USE_SYSTEM_MENUBAND 1 +#define USE_SYSTEM_MENUDESKBAR 0 +#define USE_SYSTEM_MENUSITE 0 +#define USE_SYSTEM_MENUBAND 0 #define USE_SYSTEM_MERGED_FOLDERS 0 #define MERGE_FOLDERS 1

10 years

[jgardou] 65543: [PSDK] - Add missing TDI_SERVICE_* flags

by jgardou＠svn.reactos.org

Author: jgardou Date: Mon Dec 1 19:30:45 2014 New Revision: 65543 URL: http://svn.reactos.org/svn/reactos?rev=65543&view=rev Log: [PSDK] - Add missing TDI_SERVICE_* flags Modified: trunk/reactos/include/psdk/tdi.h Modified: trunk/reactos/include/psdk/tdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/tdi.h?rev=655… ============================================================================== --- trunk/reactos/include/psdk/tdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/tdi.h [iso-8859-1] Mon Dec 1 19:30:45 2014 @@ -262,6 +262,9 @@ #define TDI_SERVICE_SEND_AND_DISCONNECT 0x00020000 #define TDI_SERVICE_DIRECT_ACCEPT 0x00040000 #define TDI_SERVICE_ACCEPT_LOCAL_ADDR 0x00080000 +#define TDI_SERVICE_ADDRESS_SECURITY 0x00100000 +#define TDI_SERVICE_PREPOST_RECVS 0x00200000 +#define TDI_SERVICE_NO_PUSH 0x00400000 typedef struct _TDI_PROVIDER_RESOURCE_STATS { ULONG ResourceId;

10 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2014