Ros-diffs July 2011

ros-diffs@reactos.org

24 participants
517 discussions

[cgutman] 52522: [LDR] - "Just to be sure" is no reason to overwrite a potential DLL load failure status

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Jul 3 20:16:12 2011 New Revision: 52522 URL: http://svn.reactos.org/svn/reactos?rev=52522&view=rev Log: [LDR] - "Just to be sure" is no reason to overwrite a potential DLL load failure status Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrapi.c?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] Sun Jul 3 20:16:12 2011 @@ -345,9 +345,6 @@ DllName, BaseAddress, TRUE); - - /* Set it to success just to be sure */ - Status = STATUS_SUCCESS; /* Restore the old TLD DLL */ LdrpTopLevelDllBeingLoaded = OldTldDll;

13 years, 5 months

[cgutman] 52521: [LDR] - Don't overwrite the real unload status with the return value of RtlLeaveCriticalSection

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Jul 3 20:10:02 2011 New Revision: 52521 URL: http://svn.reactos.org/svn/reactos?rev=52521&view=rev Log: [LDR] - Don't overwrite the real unload status with the return value of RtlLeaveCriticalSection Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrutils.c?r… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] Sun Jul 3 20:10:02 2011 @@ -2301,7 +2301,7 @@ Quickie: /* Decrease unload count */ LdrpActiveUnloadCount--; - if (!LdrpInLdrInit) Status = RtlLeaveCriticalSection(Peb->LoaderLock); + if (!LdrpInLdrInit) RtlLeaveCriticalSection(Peb->LoaderLock); /* FIXME: Rundown the Hotpatch data, if present */

13 years, 5 months

[cmihail] 52520: [AFD] merge r52502, r52510 [TCPIP] merge r52501, r52511

by cmihail＠svn.reactos.org

Author: cmihail Date: Sun Jul 3 19:40:40 2011 New Revision: 52520 URL: http://svn.reactos.org/svn/reactos?rev=52520&view=rev Log: [AFD] merge r52502, r52510 [TCPIP] merge r52501, r52511 Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/info.c branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/main.c branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/read.c branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/write.c branches/GSoC_2011/TcpIpDriver/drivers/network/afd/include/afd.h branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/fileobjs.c Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/info.c [iso-8859-1] Sun Jul 3 19:40:40 2011 @@ -73,6 +73,19 @@ InfoReq->Information.Ulong++; CurrentEntry = CurrentEntry->Flink; } + + /* This needs to count too because when this is dispatched + * the user-mode IRP has already been completed and therefore + * will NOT be in our pending IRP list. We count this as one send + * outstanding although it could be multiple since we batch sends + * when waiting for the in flight request to return, so this number + * may not be accurate but it really doesn't matter that much since + * it's more or less a zero/non-zero comparison to determine whether + * we can shutdown the socket + */ + if (FCB->SendIrp.InFlightRequest) + InfoReq->Information.Ulong++; + break; default: Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/main.c [iso-8859-1] Sun Jul 3 19:40:40 2011 @@ -616,7 +616,8 @@ FCB->DisconnectIrp.InFlightRequest = NULL; ASSERT(FCB->DisconnectPending); - //ASSERT(IsListEmpty(&FCB->PendingIrpList[FUNCTION_SEND]) || (FCB->DisconnectFlags & TDI_DISCONNECT_ABORT)); + ASSERT((IsListEmpty(&FCB->PendingIrpList[FUNCTION_SEND]) && !FCB->SendIrp.InFlightRequest) || + (FCB->DisconnectFlags & TDI_DISCONNECT_ABORT)); if (NT_SUCCESS(Irp->IoStatus.Status) && (FCB->DisconnectFlags & TDI_DISCONNECT_RELEASE)) { @@ -666,11 +667,11 @@ NTSTATUS DoDisconnect(PAFD_FCB FCB) { - PAFD_DISCONNECT_INFO DisReq; - IO_STATUS_BLOCK Iosb; NTSTATUS Status; ASSERT(FCB->DisconnectPending); + ASSERT((IsListEmpty(&FCB->PendingIrpList[FUNCTION_SEND]) && !FCB->SendIrp.InFlightRequest) || + (FCB->DisconnectFlags & TDI_DISCONNECT_ABORT)); if (FCB->DisconnectIrp.InFlightRequest) { @@ -684,13 +685,14 @@ Status = TdiDisconnect(&FCB->DisconnectIrp.InFlightRequest, FCB->Connection.Object, - &DisReq->Timeout, + &FCB->DisconnectTimeout, FCB->DisconnectFlags, - &Iosb, + &FCB->DisconnectIrp.Iosb, DisconnectComplete, FCB, FCB->ConnectCallInfo, FCB->ConnectReturnInfo); + if (Status != STATUS_PENDING) { FCB->DisconnectPending = FALSE; @@ -704,7 +706,7 @@ { ASSERT(FCB->RemoteAddress); - if (IsListEmpty(&FCB->PendingIrpList[FUNCTION_SEND]) && FCB->DisconnectPending) + if (IsListEmpty(&FCB->PendingIrpList[FUNCTION_SEND]) && !FCB->SendIrp.InFlightRequest && FCB->DisconnectPending) { /* Sends are done; fire off a TDI_DISCONNECT request */ DoDisconnect(FCB); @@ -769,9 +771,10 @@ Status = QueueUserModeIrp(FCB, Irp, FUNCTION_DISCONNECT); if (Status == STATUS_PENDING) { - if (IsListEmpty(&FCB->PendingIrpList[FUNCTION_SEND]) || (FCB->DisconnectFlags & TDI_DISCONNECT_ABORT)) + if ((IsListEmpty(&FCB->PendingIrpList[FUNCTION_SEND]) && !FCB->SendIrp.InFlightRequest) || + (FCB->DisconnectFlags & TDI_DISCONNECT_ABORT)) { - /* Go ahead an execute the disconnect because we're ready for it */ + /* Go ahead and execute the disconnect because we're ready for it */ Status = DoDisconnect(FCB); } Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/read.c [iso-8859-1] Sun Jul 3 19:40:40 2011 @@ -30,8 +30,8 @@ { if ((Status == STATUS_SUCCESS && !Information) || (!NT_SUCCESS(Status))) { - /* The socket has been closed */ - FCB->PollState |= AFD_EVENT_CLOSE; + /* The socket has been closed by the remote side */ + FCB->PollState |= AFD_EVENT_ABORT; FCB->PollStatus[FD_CLOSE_BIT] = Status; PollReeval( FCB->DeviceExt, FCB->FileObject ); Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/write.c [iso-8859-1] Sun Jul 3 19:40:40 2011 @@ -190,7 +190,10 @@ &FCB->SendIrp.Iosb, SendComplete, FCB ); - + } + else + { + /* Nothing is waiting so try to complete a pending disconnect */ RetryDisconnectCompletion(FCB); } @@ -326,9 +329,28 @@ return UnlockAndMaybeComplete( FCB, Status, Irp, Information ); } - if( !(SendReq = LockRequest(Irp, IrpSp))) - return UnlockAndMaybeComplete - ( FCB, STATUS_NO_MEMORY, Irp, TotalBytesCopied ); + if (FCB->DisconnectPending && (FCB->DisconnectFlags & TDI_DISCONNECT_RELEASE)) + { + /* We're pending a send shutdown so don't accept anymore sends */ + return UnlockAndMaybeComplete(FCB, STATUS_FILE_CLOSED, Irp, 0); + } + + if (FCB->PollState & (AFD_EVENT_CLOSE | AFD_EVENT_DISCONNECT)) + { + if (FCB->PollStatus[FD_CLOSE_BIT] == STATUS_SUCCESS) + { + /* This is a local send shutdown or a graceful remote disconnect */ + return UnlockAndMaybeComplete(FCB, STATUS_FILE_CLOSED, Irp, 0); + } + else + { + /* This is an unexpected remote disconnect */ + return UnlockAndMaybeComplete(FCB, FCB->PollStatus[FD_CLOSE_BIT], Irp, 0); + } + } + + if (!(SendReq = LockRequest(Irp, IrpSp))) + return UnlockAndMaybeComplete(FCB, STATUS_NO_MEMORY, Irp, TotalBytesCopied); SendReq->BufferArray = LockBuffers( SendReq->BufferArray, SendReq->BufferCount, Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/network/afd/include/afd.h [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/network/afd/include/afd.h [iso-8859-1] Sun Jul 3 19:40:40 2011 @@ -184,6 +184,7 @@ UINT ConnSeq; USHORT DisconnectFlags; BOOLEAN DisconnectPending; + LARGE_INTEGER DisconnectTimeout; PTRANSPORT_ADDRESS LocalAddress, RemoteAddress; PTDI_CONNECTION_INFORMATION AddressFrom, ConnectCallInfo, ConnectReturnInfo; AFD_TDI_OBJECT AddressFile, Connection; Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Sun Jul 3 19:40:40 2011 @@ -307,9 +307,21 @@ /* Sanity check */ ASSERT(Address->Address[0].Address[0].sin_port == AddrFile->Port); } + else if (!AddrIsUnspecified(&AddrFile->Address)) + { + / The client is trying to bind to a local address so allocate a port now too + AddrFile->Port = TCPAllocatePort(0); + + // Check for bind success + if (AddrFile->Port == 0xffff) + { + ExFreePoolWithTag(AddrFile, ADDR_FILE_TAG); + return STATUS_ADDRESS_ALREADY_EXISTS; + } + } else { - /* The client wants an unspecified port so we wait to see what the TCP library gives us */ + /* The client wants an unspecified port with an unspecified address so we wait to see what the TCP library gives us */ AddrFile->Port = 0; }

13 years, 5 months

[tfaber] 52519: [KMTESTS] - rework the kmtest loader application to follow everything else's coding style and to allow user-mode test parts

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jul 3 18:53:26 2011 New Revision: 52519 URL: http://svn.reactos.org/svn/reactos?rev=52519&view=rev Log: [KMTESTS] - rework the kmtest loader application to follow everything else's coding style and to allow user-mode test parts Added: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/support.c (with props) branches/GSoC_2011/KMTestSuite/kmtests/kmtest/testlist.c (with props) Modified: branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h branches/GSoC_2011/KMTestSuite/kmtests/kmtest.rbuild branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.h branches/GSoC_2011/KMTestSuite/kmtests/kmtest/service.c Modified: branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/C… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt [iso-8859-1] Sun Jul 3 18:53:26 2011 @@ -48,6 +48,8 @@ list(APPEND KMTEST_SOURCE kmtest/kmtest.c kmtest/service.c + kmtest/support.c + kmtest/testlist.c kmtest/kmtest.rc) add_executable(kmtest ${KMTEST_SOURCE}) Modified: branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/i… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h [iso-8859-1] Sun Jul 3 18:53:26 2011 @@ -16,6 +16,7 @@ #include <stdarg.h> typedef VOID KMT_TESTFUNC(VOID); +typedef KMT_TESTFUNC *PKMT_TESTFUNC; typedef struct { @@ -37,6 +38,17 @@ CHAR LogBuffer[ANYSIZE_ARRAY]; } KMT_RESULTBUFFER, *PKMT_RESULTBUFFER; +#if defined KMT_USER_MODE +VOID KmtLoadDriver(IN PCWSTR ServiceName, IN BOOLEAN RestartIfRunning); +VOID KmtUnloadDriver(VOID); +VOID KmtOpenDriver(VOID); +VOID KmtCloseDriver(VOID); + +DWORD KmtSendToDriver(IN DWORD ControlCode); +DWORD KmtSendStringToDriver(IN DWORD ControlCode, IN PCSTR String); +DWORD KmtSendBufferToDriver(IN DWORD ControlCode, IN OUT PVOID Buffer, IN DWORD Length); +#endif /* defined KMT_USER_MODE */ + extern PKMT_RESULTBUFFER ResultBuffer; #ifdef __GNUC__ @@ -47,13 +59,15 @@ #define START_TEST(name) VOID Test_##name(VOID) +#ifndef KMT_STRINGIZE #define KMT_STRINGIZE(x) #x -#define ok(test, ...) ok_(test, __FILE__, __LINE__, __VA_ARGS__) -#define trace(...) trace_( __FILE__, __LINE__, __VA_ARGS__) +#endif /* !defined KMT_STRINGIZE */ +#define ok(test, ...) ok_(test, __FILE__, __LINE__, __VA_ARGS__) +#define trace(...) trace_( __FILE__, __LINE__, __VA_ARGS__) #define skip(test, ...) skip_(test, __FILE__, __LINE__, __VA_ARGS__) -#define ok_(test, file, line, ...) KmtOk(test, file ":" KMT_STRINGIZE(line), __VA_ARGS__) -#define trace_(file, line, ...) KmtTrace( file ":" KMT_STRINGIZE(line), __VA_ARGS__) +#define ok_(test, file, line, ...) KmtOk(test, file ":" KMT_STRINGIZE(line), __VA_ARGS__) +#define trace_(file, line, ...) KmtTrace( file ":" KMT_STRINGIZE(line), __VA_ARGS__) #define skip_(test, file, line, ...) KmtSkip(test, file ":" KMT_STRINGIZE(line), __VA_ARGS__) VOID KmtVOk(INT Condition, PCSTR FileAndLine, PCSTR Format, va_list Arguments) KMT_FORMAT(ms_printf, 3, 0); @@ -75,7 +89,9 @@ #define ok_eq_hex(value, expected) ok_eq_print(value, expected, "0x%08lx") #define ok_bool_true(value, desc) ok((value) == TRUE, desc " FALSE, expected TRUE\n") #define ok_bool_false(value, desc) ok((value) == FALSE, desc " TRUE, expected FALSE\n") -#define ok_eq_bool(value, expected) ok((value) == (expected), #value " = %s, expected %s\n", (value) ? "TRUE" : "FALSE", (expected) ? "TRUE" : "FALSE") +#define ok_eq_bool(value, expected) ok((value) == (expected), #value " = %s, expected %s\n", \ + (value) ? "TRUE" : "FALSE", \ + (expected) ? "TRUE" : "FALSE") #define ok_eq_str(value, expected) ok(!strcmp(value, expected), #value " = \"%s\", expected \"%s\"\n", value, expected) #define ok_eq_wstr(value, expected) ok(!wcscmp(value, expected), #value " = \"%ls\", expected \"%ls\"\n", value, expected) Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest.rbuild URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest.rbuild [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest.rbuild [iso-8859-1] Sun Jul 3 18:53:26 2011 @@ -5,5 +5,7 @@ <directory name="kmtest"> <file>kmtest.c</file> <file>service.c</file> + <file>support.c</file> + <file>testlist.c</file> </directory> </module> Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c [iso-8859-1] Sun Jul 3 18:53:26 2011 @@ -6,6 +6,7 @@ */ #define UNICODE +#define WIN32_LEAN_AND_MEAN #include <windows.h> #include <strsafe.h> @@ -19,186 +20,288 @@ #define KMT_DEFINE_TEST_FUNCTIONS #include <kmt_test.h> -#define LOGBUFFER_SIZE 65000 - -static void OutputError(FILE *fp, DWORD error); -static DWORD RunTest(char *testName); -static DWORD ListTests(PSTR *testList); -int __cdecl main(int argc, char **argv); - -static void OutputError(FILE *fp, DWORD error) -{ - char *message; +#define SERVICE_NAME L"Kmtest" +#define SERVICE_PATH L"kmtest_drv.sys" + +#define LOGBUFFER_SIZE 65000 +#define RESULTBUFFER_SIZE FIELD_OFFSET(KMT_RESULTBUFFER, LogBuffer[LOGBUFFER_SIZE]) + +static HANDLE KmtestHandle; +PCSTR ErrorFileAndLine = "No error"; + +static void OutputError(DWORD Error); +static DWORD ListTests(VOID); +static PKMT_TESTFUNC FindTest(PCSTR TestName); +static DWORD OutputResult(PCSTR TestName); +static DWORD RunTest(PCSTR TestName); +int __cdecl main(int ArgCount, char **Arguments); + +/** + * @name OutputError + * + * Output an error message to the console. + * + * @param Error + * Win32 error code + */ +static +void +OutputError( + DWORD Error) +{ + PSTR Message; if (!FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_ALLOCATE_BUFFER, - NULL, error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)&message, 0, NULL)) - { - fprintf(fp, "Could not retrieve error message (error 0x%08lx). Original error: 0x%08lx\n", GetLastError(), error); - } - - fprintf(fp, "%s\n", message); - - LocalFree(message); -} - -static DWORD RunTest(char *testName) -{ - DWORD error = ERROR_SUCCESS; - HANDLE hDevice = INVALID_HANDLE_VALUE; - DWORD bytesRead, bytesWritten; + NULL, Error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)&Message, 0, NULL)) + { + fprintf(stderr, "%s: Could not retrieve error message (error 0x%08lx). Original error: 0x%08lx\n", + ErrorFileAndLine, GetLastError(), Error); + return; + } + + fprintf(stderr, "%s: error 0x%08lx: %s\n", ErrorFileAndLine, Error, Message); + + LocalFree(Message); +} + +/** + * @name ListTests + * + * Output the list of tests to the console. + * The list will comprise tests as listed by the driver + * in addition to user-mode tests in TestList. + * + * @return Win32 error code + */ +static +DWORD +ListTests(VOID) +{ + DWORD Error = ERROR_SUCCESS; + CHAR Buffer[1024]; + DWORD BytesRead; + PCSTR TestName = Buffer; + PCKMT_TEST TestEntry = TestList; + PCSTR NextTestName; + + puts("Valid test names:"); + + // get test list from driver + if (!DeviceIoControl(KmtestHandle, IOCTL_KMTEST_GET_TESTS, NULL, 0, Buffer, sizeof Buffer, &BytesRead, NULL)) + error_goto(Error, cleanup); + + // output test list plus user-mode tests + while (TestEntry->TestName || *TestName) + { + // tests starting with a '-' should not be listed + while (TestEntry->TestName && *TestEntry->TestName == '-') + ++TestEntry; + + if (!TestEntry->TestName) + { + NextTestName = TestName; + TestName += strlen(TestName) + 1; + } + else if (!*TestName) + { + NextTestName = TestEntry->TestName; + ++TestEntry; + } + else + { + int Result = strcmp(TestEntry->TestName, TestName); + + if (Result == 0) + { + NextTestName = TestEntry->TestName; + TestName += strlen(TestName) + 1; + ++TestEntry; + } + else if (Result < 0) + { + NextTestName = TestEntry->TestName; + ++TestEntry; + } + else + { + NextTestName = TestName; + TestName += strlen(TestName) + 1; + } + } + printf(" %s\n", NextTestName); + } + +cleanup: + return Error; +} + +/** + * @name FindTest + * + * Find a test in TestList by name. + * + * @param TestName + * Name of the test to look for. Case sensitive + * + * @return pointer to test function, or NULL if not found + */ +static +PKMT_TESTFUNC +FindTest( + PCSTR TestName) +{ + PCKMT_TEST TestEntry = TestList; + + for (TestEntry = TestList; TestEntry->TestName; ++TestEntry) + { + PCSTR TestEntryName = TestEntry->TestName; + + // skip leading '-' if present + if (*TestEntryName == '-') + ++TestEntryName; + + if (!lstrcmpA(TestEntryName, TestName)) + break; + } + + return TestEntry->TestFunction; +} + +/** + * @name OutputResult + * + * Output the test results in ResultBuffer to the console. + * + * @param TestName + * Name of the test whose result is to be printed + * + * @return Win32 error code + */ +static +DWORD +OutputResult( + PCSTR TestName) +{ + DWORD Error = ERROR_SUCCESS; + DWORD BytesWritten; + + KmtFinishTest(TestName); + + if (!WriteConsoleA(GetStdHandle(STD_OUTPUT_HANDLE), ResultBuffer->LogBuffer, ResultBuffer->LogBufferLength, &BytesWritten, NULL)) + Error = GetLastError(); + + return Error; +} + +/** + * @name RunTest + * + * Run the named test and output its results. + * + * @param TestName + * Name of the test to run. Case sensitive + * + * @return Win32 error code + */ +static +DWORD +RunTest( + PCSTR TestName) +{ + DWORD Error = ERROR_SUCCESS; + PKMT_TESTFUNC TestFunction; + DWORD BytesRead; ResultBuffer = KmtAllocateResultBuffer(LOGBUFFER_SIZE); - if (!ResultBuffer) - { - error = GetLastError(); + if (!DeviceIoControl(KmtestHandle, IOCTL_KMTEST_SET_RESULTBUFFER, ResultBuffer, RESULTBUFFER_SIZE, NULL, 0, &BytesRead, NULL)) + error_goto(Error, cleanup); + + // check test list + TestFunction = FindTest(TestName); + + if (TestFunction) + { + TestFunction(); goto cleanup; } - - hDevice = CreateFile(KMTEST_DEVICE_PATH, GENERIC_READ | GENERIC_WRITE, 0, - NULL, OPEN_EXISTING, 0, NULL); - - if (hDevice == INVALID_HANDLE_VALUE) - { - error = GetLastError(); + + // not found in user-mode test list, call driver + if (!DeviceIoControl(KmtestHandle, IOCTL_KMTEST_RUN_TEST, (PVOID)TestName, strlen(TestName), NULL, 0, &BytesRead, NULL)) + error_goto(Error, cleanup); + +cleanup: + OutputResult(TestName); + + KmtFreeResultBuffer(ResultBuffer); + + return Error; +} + +/** + * @name main + * + * Program entry point + * + * @param ArgCount + * @param Arguments + * + * @return EXIT_SUCCESS on success, EXIT_FAILURE on failure + */ +int +main( + int ArgCount, + char **Arguments) +{ + INT Status = EXIT_SUCCESS; + DWORD Error = ERROR_SUCCESS; + SC_HANDLE ServiceHandle; + PCSTR AppName = "kmtest.exe"; + PCSTR TestName; + + Error = KmtServiceInit(); + if (Error) goto cleanup; - } - - if (!DeviceIoControl(hDevice, IOCTL_KMTEST_SET_RESULTBUFFER, ResultBuffer, FIELD_OFFSET(KMT_RESULTBUFFER, LogBuffer[LOGBUFFER_SIZE]), NULL, 0, &bytesRead, NULL)) - { - error = GetLastError(); + + Error = KmtCreateAndStartService(SERVICE_NAME, SERVICE_PATH, L"ReactOS Kernel-Mode Test Suite Driver", &ServiceHandle, FALSE); + if (Error) goto cleanup; - } - - if (!DeviceIoControl(hDevice, IOCTL_KMTEST_RUN_TEST, testName, strlen(testName), NULL, 0, &bytesRead, NULL)) - { - error = GetLastError(); - goto cleanup; - } - - KmtFinishTest(testName); - - if (!WriteConsoleA(GetStdHandle(STD_OUTPUT_HANDLE), ResultBuffer->LogBuffer, ResultBuffer->LogBufferLength, &bytesWritten, NULL)) - { - error = GetLastError(); - goto cleanup; + + KmtestHandle = CreateFile(KMTEST_DEVICE_PATH, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); + if (KmtestHandle == INVALID_HANDLE_VALUE) + error_goto(Error, cleanup); + + if (ArgCount >= 1) + AppName = Arguments[0]; + + if (ArgCount <= 1) + { + printf("Usage: %s <test_name> - run the specified test\n", AppName); + printf(" %s --list - list available tests\n", AppName); + printf(" %s <create|delete|start|stop> - manage the kmtest driver\n\n", AppName); + Error = ListTests(); + } + else + { + TestName = Arguments[1]; + if (!lstrcmpA(Arguments[1], "--list")) + Error = ListTests(); + else + Error = RunTest(TestName); } cleanup: - if (hDevice != INVALID_HANDLE_VALUE) - CloseHandle(hDevice); - - if (ResultBuffer) - KmtFreeResultBuffer(ResultBuffer); - - return error; -} - -static DWORD ListTests(PSTR *testList) -{ - DWORD error = ERROR_SUCCESS; - HANDLE hDevice = INVALID_HANDLE_VALUE; - DWORD bytesRead; - PSTR buffer = NULL; - DWORD bufferSize; - - if (!testList) - { - error = ERROR_INVALID_PARAMETER; - goto cleanup; - } - - hDevice = CreateFile(KMTEST_DEVICE_PATH, GENERIC_READ | GENERIC_WRITE, 0, - NULL, OPEN_EXISTING, 0, NULL); - - if (hDevice == INVALID_HANDLE_VALUE) - { - error = GetLastError(); - goto cleanup; - } - - bufferSize = 1024; - buffer = HeapAlloc(GetProcessHeap(), 0, bufferSize); - if (!buffer) - { - error = GetLastError(); - goto cleanup; - } - - if (!DeviceIoControl(hDevice, IOCTL_KMTEST_GET_TESTS, NULL, 0, buffer, bufferSize, &bytesRead, NULL)) - { - error = GetLastError(); - goto cleanup; - } - -cleanup: - if (buffer && error) - { - HeapFree(GetProcessHeap(), 0, buffer); - buffer = NULL; - } - - if (hDevice != INVALID_HANDLE_VALUE) - CloseHandle(hDevice); - - if (testList) - *testList = buffer; - - return error; -} - -int __cdecl main(int argc, char **argv) -{ - int status = EXIT_SUCCESS; - DWORD error; - - if (argc <= 1) - { - /* no arguments: show usage and list tests */ - char *programName = argc == 0 ? "kmtest" : argv[0]; - char *testNames, *testName; - size_t len; - - printf("Usage: %s test_name\n", programName); - printf(" %s <Create|Start|Stop|Delete>\n", programName); - puts("\nValid test names:"); - - error = ListTests(&testNames); - testName = testNames; - - while ((len = strlen(testName)) != 0) - { - printf(" %s\n", testName); - testName += len + 1; - } - - /* TODO: user-mode test parts */ - - if (error) - OutputError(stdout, error); - } + if (KmtestHandle) + CloseHandle(KmtestHandle); + + if (Error) + KmtServiceCleanup(TRUE); else - { - char *testName = argv[1]; - - if (argc > 2) - fputs("Excess arguments ignored\n", stderr); - - if (!lstrcmpiA(testName, "create")) - error = Service_Control(Service_Create); - else if (!lstrcmpiA(testName, "delete")) - error = Service_Control(Service_Delete); - else if (!lstrcmpiA(testName, "start")) - error = Service_Control(Service_Start); - else if (!lstrcmpiA(testName, "stop")) - error = Service_Control(Service_Stop); - else - /* TODO: user-mode test parts */ - error = RunTest(testName); - - OutputError(stdout, error); - } - - if (error) - status = EXIT_FAILURE; - - return status; -} + Error = KmtServiceCleanup(FALSE); + + if (Error) + OutputError(Error); + + if (Error) + Status = EXIT_FAILURE; + + return Status; +} Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.h [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.h [iso-8859-1] Sun Jul 3 18:53:26 2011 @@ -8,16 +8,57 @@ #ifndef _KMTESTS_H_ #define _KMTESTS_H_ -#include <windows.h> +extern PCSTR ErrorFileAndLine; -/* service control functions */ -typedef DWORD SERVICE_FUNC(SC_HANDLE hManager); +#ifndef KMT_STRINGIZE +#define KMT_STRINGIZE(x) #x +#endif /* !defined KMT_STRINGIZE */ -SERVICE_FUNC Service_Create; -SERVICE_FUNC Service_Delete; -SERVICE_FUNC Service_Start; -SERVICE_FUNC Service_Stop; +#define location(file, line) do { ErrorFileAndLine = file ":" KMT_STRINGIZE(line); } while (0) +#define error_value(Error, value) do { location(__FILE__, __LINE__); Error = value; } while (0) +#define error(Error) error_value(Error, GetLastError()) +#define error_goto(Error, label) do { error(Error); goto label; } while (0) +#define error_value_goto(Error, value, label) do { error_value(Error, value); goto label; } while (0) -DWORD Service_Control(SERVICE_FUNC *Service_Func); +/* service management functions */ +DWORD +KmtServiceInit(VOID); + +DWORD +KmtServiceCleanup( + BOOLEAN IgnoreErrors); + +DWORD +KmtCreateService( + IN PCWSTR ServiceName, + IN PCWSTR ServicePath, + IN PCWSTR DisplayName OPTIONAL, + OUT SC_HANDLE *ServiceHandle); + +DWORD +KmtStartService( + IN PCWSTR ServiceName OPTIONAL, + IN OUT SC_HANDLE *ServiceHandle); + +DWORD +KmtCreateAndStartService( + IN PCWSTR ServiceName, + IN PCWSTR ServicePath, + IN PCWSTR DisplayName OPTIONAL, + OUT SC_HANDLE *ServiceHandle, + IN BOOLEAN RestartIfRunning); + +DWORD +KmtStopService( + IN PCWSTR ServiceName OPTIONAL, + IN OUT SC_HANDLE *ServiceHandle); + +DWORD +KmtDeleteService( + IN PCWSTR ServiceName OPTIONAL, + IN OUT SC_HANDLE *ServiceHandle); + +DWORD KmtCloseService( + IN OUT SC_HANDLE *ServiceHandle); #endif /* !defined _KMTESTS_H_ */ Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/service.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest/service.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest/service.c [iso-8859-1] Sun Jul 3 18:53:26 2011 @@ -6,130 +6,308 @@ */ #define UNICODE +#define WIN32_LEAN_AND_MEAN #include <windows.h> #include <strsafe.h> +#include <assert.h> + #include "kmtest.h" -#define SERVICE_NAME L"Kmtest" -#define SERVICE_PATH L"\\kmtest_drv.sys" - -DWORD Service_Create(SC_HANDLE hScm) -{ - DWORD error = ERROR_SUCCESS; - SC_HANDLE hService = NULL; - wchar_t driverPath[MAX_PATH]; +#define SERVICE_ACCESS (SERVICE_START | SERVICE_STOP | DELETE) + +static SC_HANDLE ScmHandle; + +/** + * @name KmtServiceInit + * + * Initialize service management routines (by opening the service control manager) + * + * @return Win32 error code + */ +DWORD +KmtServiceInit(VOID) +{ + DWORD Error = ERROR_SUCCESS; + + assert(!ScmHandle); + + ScmHandle = OpenSCManager(NULL, NULL, SC_MANAGER_CREATE_SERVICE); + if (!ScmHandle) + error(Error); + + return Error; +} + +/** + * @name KmtServiceCleanup + * + * Clean up resources used by service management routines. + * + * @param IgnoreErrors + * If TRUE, the function will never set ErrorLineAndFile, and always return ERROR_SUCCESS + * + * @return Win32 error code + */ +DWORD +KmtServiceCleanup( + BOOLEAN IgnoreErrors) +{ + DWORD Error = ERROR_SUCCESS; + + if (ScmHandle && !CloseServiceHandle(ScmHandle) && !IgnoreErrors) + error(Error); + + return Error; +} + +/** + * @name KmtCreateService + * + * Create the specified driver service and return a handle to it + * + * @param ServiceName + * Name of the service to create + * @param ServicePath + * File name of the driver, relative to the current directory + * @param DisplayName + * Service display name + * @param ServiceHandle + * Pointer to a variable to receive the handle to the service + * + * @return Win32 error code + */ +DWORD +KmtCreateService( + IN PCWSTR ServiceName, + IN PCWSTR ServicePath, + IN PCWSTR DisplayName OPTIONAL, + OUT SC_HANDLE *ServiceHandle) +{ + DWORD Error = ERROR_SUCCESS; + WCHAR DriverPath[MAX_PATH]; HRESULT result = S_OK; - if (!GetCurrentDirectory(sizeof driverPath / sizeof driverPath[0], driverPath) - || FAILED(result = StringCbCat(driverPath, sizeof driverPath, SERVICE_PATH))) + assert(ServiceHandle); + assert(ServiceName && ServicePath); + + if (!GetCurrentDirectory(sizeof DriverPath / sizeof DriverPath[0], DriverPath)) + error_goto(Error, cleanup); + + if (DriverPath[wcslen(DriverPath) - 1] != L'\\') { - if (FAILED(result)) - error = result; - else - error = GetLastError(); - goto cleanup; + DriverPath[wcslen(DriverPath) + 1] = L'\0'; + DriverPath[wcslen(DriverPath)] = L'\\'; } - hService = CreateService(hScm, SERVICE_NAME, L"ReactOS Kernel-Mode Test Suite Driver", - SERVICE_START, SERVICE_KERNEL_DRIVER, SERVICE_DEMAND_START, - SERVICE_ERROR_NORMAL, driverPath, NULL, NULL, NULL, NULL, NULL); - - if (!hService) - error = GetLastError(); - -cleanup: - return error; -} - -DWORD Service_Delete(SC_HANDLE hScm) -{ - DWORD error = ERROR_SUCCESS; - SC_HANDLE hService = NULL; - - hService = OpenService(hScm, SERVICE_NAME, DELETE); - - if (!hService) - { - error = GetLastError(); - goto cleanup; - } - - if (!DeleteService(hService)) - error = GetLastError(); - -cleanup: - if (hService) - CloseServiceHandle(hService); - - return error; -} - -DWORD Service_Start(SC_HANDLE hScm) -{ - DWORD error = ERROR_SUCCESS; - SC_HANDLE hService = NULL; - - hService = OpenService(hScm, SERVICE_NAME, SERVICE_START); - - if (!hService) - { - error = GetLastError(); - goto cleanup; - } - - if (!StartService(hService, 0, NULL)) - error = GetLastError(); - -cleanup: - if (hService) - CloseServiceHandle(hService); - - return error; -} - -DWORD Service_Stop(SC_HANDLE hScm) -{ - DWORD error = ERROR_SUCCESS; - SC_HANDLE hService = NULL; - SERVICE_STATUS serviceStatus; - - hService = OpenService(hScm, SERVICE_NAME, SERVICE_STOP); - - if (!hService) - { - error = GetLastError(); - goto cleanup; - } - - if (!ControlService(hService, SERVICE_CONTROL_STOP, &serviceStatus)) - error = GetLastError(); - -cleanup: - if (hService) - CloseServiceHandle(hService); - - return error; -} - -DWORD Service_Control(SERVICE_FUNC *Service_Func) -{ - DWORD error = ERROR_SUCCESS; - SC_HANDLE hScm = NULL; - - hScm = OpenSCManager(NULL, NULL, SC_MANAGER_CREATE_SERVICE); - - if (!hScm) - { - error = GetLastError(); - goto cleanup; - } - - error = Service_Func(hScm); - -cleanup: - if (hScm) - CloseServiceHandle(hScm); - - return error; -} + result = StringCbCat(DriverPath, sizeof DriverPath, ServicePath); + if (FAILED(result)) + error_value_goto(Error, result, cleanup); + + *ServiceHandle = CreateService(ScmHandle, ServiceName, DisplayName, + SERVICE_ACCESS, SERVICE_KERNEL_DRIVER, SERVICE_DEMAND_START, + SERVICE_ERROR_NORMAL, DriverPath, NULL, NULL, NULL, NULL, NULL); + + if (!*ServiceHandle) + error_goto(Error, cleanup); + +cleanup: + return Error; +} + +/** + * @name KmtStartService + * + * Start the specified driver service by handle or name (and return a handle to it) + * + * @param ServiceName + * If *ServiceHandle is NULL, name of the service to start + * @param ServiceHandle + * Pointer to a variable containing the service handle, + * or NULL (in which case it will be filled with a handle to the service) + * + * @return Win32 error code + */ +DWORD +KmtStartService( + IN PCWSTR ServiceName OPTIONAL, + IN OUT SC_HANDLE *ServiceHandle) +{ + DWORD Error = ERROR_SUCCESS; + + assert(ServiceHandle); + assert(ServiceName || *ServiceHandle); + + if (!*ServiceHandle) + *ServiceHandle = OpenService(ScmHandle, ServiceName, SERVICE_ACCESS); + + if (!*ServiceHandle) + error_goto(Error, cleanup); + + if (!StartService(*ServiceHandle, 0, NULL)) + error_goto(Error, cleanup); + +cleanup: + return Error; +} + +/** + * @name KmtCreateAndStartService + * + * Create and start the specified driver service and return a handle to it + * + * @param ServiceName + * Name of the service to create + * @param ServicePath + * File name of the driver, relative to the current directory + * @param DisplayName + * Service display name + * @param ServiceHandle + * Pointer to a variable to receive the handle to the service + * @param RestartIfRunning + * TRUE to stop and restart the service if it is already running + * + * @return Win32 error code + */ +DWORD +KmtCreateAndStartService( + IN PCWSTR ServiceName, + IN PCWSTR ServicePath, + IN PCWSTR DisplayName OPTIONAL, + OUT SC_HANDLE *ServiceHandle, + IN BOOLEAN RestartIfRunning) +{ + DWORD Error = ERROR_SUCCESS; + + assert(ServiceHandle); + + Error = KmtCreateService(ServiceName, ServicePath, DisplayName, ServiceHandle); + + if (Error && Error != ERROR_SERVICE_EXISTS) + goto cleanup; + + Error = KmtStartService(ServiceName, ServiceHandle); + + if (Error != ERROR_SERVICE_ALREADY_RUNNING) + goto cleanup; + + Error = ERROR_SUCCESS; + + if (!RestartIfRunning) + goto cleanup; + + Error = KmtStopService(ServiceName, ServiceHandle); + if (Error) + goto cleanup; + + Error = KmtStartService(ServiceName, ServiceHandle); + if (Error) + goto cleanup; + +cleanup: + assert(Error || *ServiceHandle); + return Error; +} + +/** + * @name KmtStopService + * + * Stop the specified driver service by handle or name (and return a handle to it) + * + * @param ServiceName + * If *ServiceHandle is NULL, name of the service to stop + * @param ServiceHandle + * Pointer to a variable containing the service handle, + * or NULL (in which case it will be filled with a handle to the service) + * + * @return Win32 error code + */ +DWORD +KmtStopService( + IN PCWSTR ServiceName OPTIONAL, + IN OUT SC_HANDLE *ServiceHandle) +{ + DWORD Error = ERROR_SUCCESS; + SERVICE_STATUS ServiceStatus; + + assert(ServiceHandle); + assert(ServiceName || *ServiceHandle); + + if (!*ServiceHandle) + *ServiceHandle = OpenService(ScmHandle, ServiceName, SERVICE_ACCESS); + + if (!*ServiceHandle) + error_goto(Error, cleanup); + + if (!ControlService(*ServiceHandle, SERVICE_CONTROL_STOP, &ServiceStatus)) + error_goto(Error, cleanup); + +cleanup: + return Error; +} + +/** + * @name KmtDeleteService + * + * Delete the specified driver service by handle or name (and return a handle to it) + * + * @param ServiceName + * If *ServiceHandle is NULL, name of the service to delete + * @param ServiceHandle + * Pointer to a variable containing the service handle. + * Will be set to NULL on success + * + * @return Win32 error code + */ +DWORD +KmtDeleteService( + IN PCWSTR ServiceName OPTIONAL, + IN OUT SC_HANDLE *ServiceHandle) +{ + DWORD Error = ERROR_SUCCESS; + + assert(ServiceHandle); + assert(ServiceName || *ServiceHandle); + + if (!*ServiceHandle) + *ServiceHandle = OpenService(ScmHandle, ServiceName, SERVICE_ACCESS); + + if (!*ServiceHandle) + error_goto(Error, cleanup); + + if (!DeleteService(*ServiceHandle)) + error_goto(Error, cleanup); + + if (*ServiceHandle) + CloseServiceHandle(*ServiceHandle); + +cleanup: + return Error; +} + +/** + * @name KmtCloseService + * + * Close the specified driver service handle + * + * @param ServiceHandle + * Pointer to a variable containing the service handle. + * Will be set to NULL on success + * + * @return Win32 error code + */ +DWORD KmtCloseService( + IN OUT SC_HANDLE *ServiceHandle) +{ + DWORD Error = ERROR_SUCCESS; + + assert(ServiceHandle); + + if (*ServiceHandle && !CloseServiceHandle(*ServiceHandle)) + error_goto(Error, cleanup); + + *ServiceHandle = NULL; + +cleanup: + return Error; +} Added: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/support.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest/support.c (added) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest/support.c [iso-8859-1] Sun Jul 3 18:53:26 2011 @@ -1,0 +1,197 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite Driver + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#define UNICODE +#define WIN32_LEAN_AND_MEAN +#include <windows.h> +#include <strsafe.h> + +#include "kmtest.h" +#include <kmt_test.h> +#include <kmt_public.h> + +/* pseudo-tests */ +START_TEST(Create) +{ + // nothing to do here. All tests start the service if needed +} + +START_TEST(Delete) +{ + // TODO: delete kmtest service +} + +START_TEST(Start) +{ + // nothing to do here. All tests start the service +} + +START_TEST(Stop) +{ + // TODO: stop kmtest service +} + +/* test support functions for special-purpose drivers */ + +static WCHAR TestServiceName[MAX_PATH]; +static SC_HANDLE TestServiceHandle; +static HANDLE TestDeviceHandle; + +/** + * @name KmtLoadDriver + * + * Load the specified special-purpose driver (create/start the service) + * + * @param ServiceName + * Name of the driver service (Kmtest- prefix will be added automatically) + * @param RestartIfRunning + * TRUE to stop and restart the service if it is already running + */ +VOID +KmtLoadDriver( + IN PCWSTR ServiceName, + IN BOOLEAN RestartIfRunning) +{ + DWORD Error = ERROR_SUCCESS; + WCHAR ServicePath[MAX_PATH]; + + StringCbCopy(ServicePath, sizeof ServicePath, ServiceName); + StringCbCat(ServicePath, sizeof ServicePath, L"_drv.sys"); + + StringCbCopy(TestServiceName, sizeof TestServiceName, L"Kmtest-"); + StringCbCat(TestServiceName, sizeof TestServiceName, ServiceName); + + Error = KmtCreateAndStartService(TestServiceName, ServicePath, NULL, &TestServiceHandle, RestartIfRunning); + + if (Error) + { + // TODO + __debugbreak(); + } +} + +/** + * @name KmtUnloadDriver + * + * Unload special-purpose driver (stop the service) + */ +VOID +KmtUnloadDriver(VOID) +{ + DWORD Error = ERROR_SUCCESS; + + Error = KmtStopService(TestServiceName, &TestServiceHandle); + + if (Error) + { + // TODO + __debugbreak(); + } +} + +/** + * @name KmtOpenDriver + * + * Open special-purpose driver (acquire a device handle) + */ +VOID +KmtOpenDriver(VOID) +{ + DWORD Error = ERROR_SUCCESS; + WCHAR DevicePath[MAX_PATH]; + + StringCbCopy(DevicePath, sizeof DevicePath, L"\\\\.\\Global\\GLOBALROOT\\Device\\"); + StringCbCat(DevicePath, sizeof DevicePath, TestServiceName); + + TestDeviceHandle = CreateFile(KMTEST_DEVICE_PATH, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); + if (TestDeviceHandle == INVALID_HANDLE_VALUE) + error(Error); + + if (Error) + { + // TODO + __debugbreak(); + } + +} + +/** + * @name KmtCloseDriver + * + * Close special-purpose driver (close device handle) + */ +VOID +KmtCloseDriver(VOID) +{ + DWORD Error = ERROR_SUCCESS; + + if (TestDeviceHandle && !CloseHandle(TestDeviceHandle)) + error(Error); + + if (Error) + { + // TODO + __debugbreak(); + } +} + +/* TODO: check if these will be useful */ + +/** + * @name KmtSendToDriver + * + * Unload special-purpose driver (stop the service) + * + * @param ControlCode + * + * @return Win32 error code as returned by DeviceIoControl + */ +DWORD +KmtSendToDriver( + IN DWORD ControlCode) +{ + // TODO + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/** + * @name KmtSendStringToDriver + * + * Unload special-purpose driver (stop the service) + * + * @param ControlCode + * @param String + * + * @return Win32 error code as returned by DeviceIoControl + */ +DWORD +KmtSendStringToDriver( + IN DWORD ControlCode, + IN PCSTR String) +{ + // TODO + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/** + * @name KmtSendBufferToDriver + * + * @param ControlCode + * @param Buffer + * @param Length + * + * @return Win32 error code as returned by DeviceIoControl + */ +DWORD +KmtSendBufferToDriver( + IN DWORD ControlCode, + IN OUT PVOID Buffer, + IN DWORD Length) +{ + // TODO + return ERROR_CALL_NOT_IMPLEMENTED; +} Propchange: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/support.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/testlist.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest/testlist.c (added) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest/testlist.c [iso-8859-1] Sun Jul 3 18:53:26 2011 @@ -1,0 +1,26 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite user-mode test list + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#define WIN32_LEAN_AND_MEAN +#define UNICODE +#include <windows.h> +#include <kmt_test.h> + +VOID Test_Create(VOID); +VOID Test_Delete(VOID); +VOID Test_Start(VOID); +VOID Test_Stop(VOID); + +/* tests with a leading '-' will not be listed */ +const KMT_TEST TestList[] = +{ + { "-create", Test_Create }, + { "-delete", Test_Delete }, + { "-start", Test_Start }, + { "-stop", Test_Stop, }, + { NULL, NULL }, +}; Propchange: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native

13 years, 5 months

[cgutman] 52518: [MSAFD] - Only shutdown the socket if it has not already been shutdown - Fixes EINVAL messages

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Jul 3 16:24:19 2011 New Revision: 52518 URL: http://svn.reactos.org/svn/reactos?rev=52518&view=rev Log: [MSAFD] - Only shutdown the socket if it has not already been shutdown - Fixes EINVAL messages Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c 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] Sun Jul 3 16:24:19 2011 @@ -514,24 +514,28 @@ { DisconnectInfo.Timeout = RtlConvertLongToLargeInteger(0); DisconnectInfo.DisconnectType = LingerWait < 0 ? AFD_DISCONNECT_SEND : AFD_DISCONNECT_ABORT; - - /* Send IOCTL */ - Status = NtDeviceIoControlFile((HANDLE)Handle, - SockEvent, - NULL, - NULL, - &IoStatusBlock, - IOCTL_AFD_DISCONNECT, - &DisconnectInfo, - sizeof(DisconnectInfo), - NULL, - 0); - - /* Wait for return */ - if (Status == STATUS_PENDING) + + if (((DisconnectInfo.DisconnectType & AFD_DISCONNECT_SEND) && (!Socket->SharedData.SendShutdown)) || + ((DisconnectInfo.DisconnectType & AFD_DISCONNECT_ABORT) && (!Socket->SharedData.ReceiveShutdown))) { - WaitForSingleObject(SockEvent, INFINITE); - Status = IoStatusBlock.Status; + /* Send IOCTL */ + Status = NtDeviceIoControlFile((HANDLE)Handle, + SockEvent, + NULL, + NULL, + &IoStatusBlock, + IOCTL_AFD_DISCONNECT, + &DisconnectInfo, + sizeof(DisconnectInfo), + NULL, + 0); + + /* Wait for return */ + if (Status == STATUS_PENDING) + { + WaitForSingleObject(SockEvent, INFINITE); + Status = IoStatusBlock.Status; + } } } }

13 years, 5 months

[cmihail] 52517: [TCPIP] apply changes r52501 for lwIP branch - Fix binding to an unspecified port on a connect so that it works reliably by asking the TCP library for a free port instead of assumi...

by cmihail＠svn.reactos.org

Author: cmihail Date: Sun Jul 3 13:34:36 2011 New Revision: 52517 URL: http://svn.reactos.org/svn/reactos?rev=52517&view=rev Log: [TCPIP] apply changes r52501 for lwIP branch - Fix binding to an unspecified port on a connect so that it works reliably by asking the TCP library for a free port instead of assuming that one we have is free - Fix binding to an unspecified port on a listen which previously would result in the address file not having information stored about the port number assigned - Fix a nasty bug which resulted in us binding to an arbitrary port during a connect even when the client wanted a specific port Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/dispatch.c branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/fileobjs.c branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/accept.c branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/if.c branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/tcp.c Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Sun Jul 3 13:34:36 2011 @@ -729,120 +729,130 @@ * Status of operation */ { - PTDI_REQUEST_KERNEL_QUERY_INFORMATION Parameters; - PTRANSPORT_CONTEXT TranContext; - PIO_STACK_LOCATION IrpSp; - - TI_DbgPrint(DEBUG_IRP, ("[TCPIP, DispTdiQueryInformation] Called\n")); - - IrpSp = IoGetCurrentIrpStackLocation(Irp); - Parameters = (PTDI_REQUEST_KERNEL_QUERY_INFORMATION)&IrpSp->Parameters; - - TranContext = IrpSp->FileObject->FsContext; - if (!TranContext) { - TI_DbgPrint(MID_TRACE, ("Bad transport context.\n")); - return STATUS_INVALID_PARAMETER; - } - - switch (Parameters->QueryType) - { - case TDI_QUERY_ADDRESS_INFO: - { - PTDI_ADDRESS_INFO AddressInfo; - PADDRESS_FILE AddrFile; - PTA_IP_ADDRESS Address; - PCONNECTION_ENDPOINT Endpoint = NULL; - - - if (MmGetMdlByteCount(Irp->MdlAddress) < - (FIELD_OFFSET(TDI_ADDRESS_INFO, Address.Address[0].Address) + - sizeof(TDI_ADDRESS_IP))) { - TI_DbgPrint(MID_TRACE, ("MDL buffer too small.\n")); - return STATUS_BUFFER_TOO_SMALL; + PTDI_REQUEST_KERNEL_QUERY_INFORMATION Parameters; + PTRANSPORT_CONTEXT TranContext; + PIO_STACK_LOCATION IrpSp; + + TI_DbgPrint(DEBUG_IRP, ("[TCPIP, DispTdiQueryInformation] Called\n")); + + IrpSp = IoGetCurrentIrpStackLocation(Irp); + Parameters = (PTDI_REQUEST_KERNEL_QUERY_INFORMATION)&IrpSp->Parameters; + + TranContext = IrpSp->FileObject->FsContext; + if (!TranContext) + { + TI_DbgPrint(MID_TRACE, ("Bad transport context.\n")); + return STATUS_INVALID_PARAMETER; + } + + switch (Parameters->QueryType) + { + case TDI_QUERY_ADDRESS_INFO: + { + PTDI_ADDRESS_INFO AddressInfo; + PADDRESS_FILE AddrFile; + PTA_IP_ADDRESS Address; + PCONNECTION_ENDPOINT Endpoint = NULL; + + if (MmGetMdlByteCount(Irp->MdlAddress) < + (FIELD_OFFSET(TDI_ADDRESS_INFO, Address.Address[0].Address) + + sizeof(TDI_ADDRESS_IP))) + { + TI_DbgPrint(MID_TRACE, ("MDL buffer too small.\n")); + return STATUS_BUFFER_TOO_SMALL; + } + + AddressInfo = (PTDI_ADDRESS_INFO)MmGetSystemAddressForMdl(Irp->MdlAddress); + Address = (PTA_IP_ADDRESS)&AddressInfo->Address; + + switch ((ULONG_PTR)IrpSp->FileObject->FsContext2) + { + case TDI_TRANSPORT_ADDRESS_FILE: + AddrFile = (PADDRESS_FILE)TranContext->Handle.AddressHandle; + + Address->TAAddressCount = 1; + Address->Address[0].AddressLength = TDI_ADDRESS_LENGTH_IP; + Address->Address[0].AddressType = TDI_ADDRESS_TYPE_IP; + Address->Address[0].Address[0].sin_port = AddrFile->Port; + Address->Address[0].Address[0].in_addr = AddrFile->Address.Address.IPv4Address; + RtlZeroMemory( + &Address->Address[0].Address[0].sin_zero, + sizeof(Address->Address[0].Address[0].sin_zero)); + return STATUS_SUCCESS; + + case TDI_CONNECTION_FILE: + Endpoint = (PCONNECTION_ENDPOINT)TranContext->Handle.ConnectionContext; + + Address->TAAddressCount = 1; + Address->Address[0].AddressLength = TDI_ADDRESS_LENGTH_IP; + Address->Address[0].AddressType = TDI_ADDRESS_TYPE_IP; + Address->Address[0].Address[0].sin_port = Endpoint->AddressFile->Port; + Address->Address[0].Address[0].in_addr = Endpoint->AddressFile->Address.Address.IPv4Address; + + RtlZeroMemory( + &Address->Address[0].Address[0].sin_zero, + sizeof(Address->Address[0].Address[0].sin_zero)); + + return STATUS_SUCCESS; + + default: + TI_DbgPrint(MIN_TRACE, ("Invalid transport context\n")); + return STATUS_INVALID_PARAMETER; + } } - AddressInfo = (PTDI_ADDRESS_INFO)MmGetSystemAddressForMdl(Irp->MdlAddress); - Address = (PTA_IP_ADDRESS)&AddressInfo->Address; - - switch ((ULONG_PTR)IrpSp->FileObject->FsContext2) { - case TDI_TRANSPORT_ADDRESS_FILE: - AddrFile = (PADDRESS_FILE)TranContext->Handle.AddressHandle; - - Address->TAAddressCount = 1; - Address->Address[0].AddressLength = TDI_ADDRESS_LENGTH_IP; - Address->Address[0].AddressType = TDI_ADDRESS_TYPE_IP; - Address->Address[0].Address[0].sin_port = AddrFile->Port; - Address->Address[0].Address[0].in_addr = AddrFile->Address.Address.IPv4Address; - RtlZeroMemory( - &Address->Address[0].Address[0].sin_zero, - sizeof(Address->Address[0].Address[0].sin_zero)); - return STATUS_SUCCESS; - - case TDI_CONNECTION_FILE: - Endpoint = - (PCONNECTION_ENDPOINT)TranContext->Handle.ConnectionContext; - RtlZeroMemory( - &Address->Address[0].Address[0].sin_zero, - sizeof(Address->Address[0].Address[0].sin_zero)); - return TCPGetSockAddress( Endpoint, (PTRANSPORT_ADDRESS)Address, FALSE ); - - default: - TI_DbgPrint(MIN_TRACE, ("Invalid transport context\n")); - return STATUS_INVALID_PARAMETER; + case TDI_QUERY_CONNECTION_INFO: + { + PTDI_CONNECTION_INFORMATION AddressInfo; + PADDRESS_FILE AddrFile; + PCONNECTION_ENDPOINT Endpoint = NULL; + + if (MmGetMdlByteCount(Irp->MdlAddress) < + (FIELD_OFFSET(TDI_CONNECTION_INFORMATION, RemoteAddress) + + sizeof(PVOID))) { + TI_DbgPrint(MID_TRACE, ("MDL buffer too small (ptr).\n")); + return STATUS_BUFFER_TOO_SMALL; + } + + AddressInfo = (PTDI_CONNECTION_INFORMATION) + MmGetSystemAddressForMdl(Irp->MdlAddress); + + switch ((ULONG_PTR)IrpSp->FileObject->FsContext2) + { + case TDI_TRANSPORT_ADDRESS_FILE: + AddrFile = (PADDRESS_FILE)TranContext->Handle.AddressHandle; + Endpoint = AddrFile ? AddrFile->Connection : NULL; + break; + + case TDI_CONNECTION_FILE: + Endpoint = (PCONNECTION_ENDPOINT)TranContext->Handle.ConnectionContext; + break; + + default: + TI_DbgPrint(MIN_TRACE, ("Invalid transport context\n")); + return STATUS_INVALID_PARAMETER; + } + + if (!Endpoint) + { + TI_DbgPrint(MID_TRACE, ("No connection object.\n")); + return STATUS_INVALID_PARAMETER; + } + + return TCPGetSockAddress( Endpoint, AddressInfo->RemoteAddress, TRUE ); } - } - - case TDI_QUERY_CONNECTION_INFO: - { - PTDI_CONNECTION_INFORMATION AddressInfo; - PADDRESS_FILE AddrFile; - PCONNECTION_ENDPOINT Endpoint = NULL; - - if (MmGetMdlByteCount(Irp->MdlAddress) < - (FIELD_OFFSET(TDI_CONNECTION_INFORMATION, RemoteAddress) + - sizeof(PVOID))) { - TI_DbgPrint(MID_TRACE, ("MDL buffer too small (ptr).\n")); - return STATUS_BUFFER_TOO_SMALL; + + case TDI_QUERY_MAX_DATAGRAM_INFO: + { + PTDI_MAX_DATAGRAM_INFO MaxDatagramInfo = MmGetSystemAddressForMdl(Irp->MdlAddress); + + MaxDatagramInfo->MaxDatagramSize = 0xFFFF; + + return STATUS_SUCCESS; } - - AddressInfo = (PTDI_CONNECTION_INFORMATION) - MmGetSystemAddressForMdl(Irp->MdlAddress); - - switch ((ULONG_PTR)IrpSp->FileObject->FsContext2) { - case TDI_TRANSPORT_ADDRESS_FILE: - AddrFile = (PADDRESS_FILE)TranContext->Handle.AddressHandle; - Endpoint = AddrFile ? AddrFile->Connection : NULL; - break; - - case TDI_CONNECTION_FILE: - Endpoint = - (PCONNECTION_ENDPOINT)TranContext->Handle.ConnectionContext; - break; - - default: - TI_DbgPrint(MIN_TRACE, ("Invalid transport context\n")); - return STATUS_INVALID_PARAMETER; - } - - if (!Endpoint) { - TI_DbgPrint(MID_TRACE, ("No connection object.\n")); - return STATUS_INVALID_PARAMETER; - } - - return TCPGetSockAddress( Endpoint, AddressInfo->RemoteAddress, TRUE ); - } - - case TDI_QUERY_MAX_DATAGRAM_INFO: - { - PTDI_MAX_DATAGRAM_INFO MaxDatagramInfo = MmGetSystemAddressForMdl(Irp->MdlAddress); - - MaxDatagramInfo->MaxDatagramSize = 0xFFFF; - - return STATUS_SUCCESS; - } - } - - return STATUS_NOT_IMPLEMENTED; + } + + return STATUS_NOT_IMPLEMENTED; } Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Sun Jul 3 13:34:36 2011 @@ -199,7 +199,10 @@ switch (AddrFile->Protocol) { case IPPROTO_TCP: - TCPFreePort( AddrFile->Port ); + if (AddrFile->Port) + { + TCPFreePort(AddrFile->Port); + } break; case IPPROTO_UDP: @@ -289,8 +292,36 @@ switch (Protocol) { case IPPROTO_TCP: + if (Address->Address[0].Address[0].sin_port) + { + /* The client specified an explicit port so we force a bind to this */ + AddrFile->Port = TCPAllocatePort(Address->Address[0].Address[0].sin_port); + + /* Check for bind success */ + if (AddrFile->Port == 0xffff) + { + ExFreePoolWithTag(AddrFile, ADDR_FILE_TAG); + return STATUS_ADDRESS_ALREADY_EXISTS; + } + + /* Sanity check */ + ASSERT(Address->Address[0].Address[0].sin_port == AddrFile->Port); + } + else + { + /* The client wants an unspecified port so we wait to see what the TCP library gives us */ + AddrFile->Port = 0; + } + + AddEntity(CO_TL_ENTITY, AddrFile, CO_TL_TCP); + + AddrFile->Send = NULL; /* TCPSendData */ + break; + + case IPPROTO_UDP: + TI_DbgPrint(MID_TRACE,("Allocating udp port\n")); AddrFile->Port = - TCPAllocatePort(Address->Address[0].Address[0].sin_port); + UDPAllocatePort(Address->Address[0].Address[0].sin_port); if ((Address->Address[0].Address[0].sin_port && AddrFile->Port != Address->Address[0].Address[0].sin_port) || @@ -300,24 +331,6 @@ return STATUS_ADDRESS_ALREADY_EXISTS; } - AddEntity(CO_TL_ENTITY, AddrFile, CO_TL_TCP); - - AddrFile->Send = NULL; /* TCPSendData */ - break; - - case IPPROTO_UDP: - TI_DbgPrint(MID_TRACE,("Allocating udp port\n")); - AddrFile->Port = - UDPAllocatePort(Address->Address[0].Address[0].sin_port); - - if ((Address->Address[0].Address[0].sin_port && - AddrFile->Port != Address->Address[0].Address[0].sin_port) || - AddrFile->Port == 0xffff) - { - ExFreePoolWithTag(AddrFile, ADDR_FILE_TAG); - return STATUS_ADDRESS_ALREADY_EXISTS; - } - TI_DbgPrint(MID_TRACE,("Setting port %d (wanted %d)\n", AddrFile->Port, Address->Address[0].Address[0].sin_port)); Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/accept.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] Sun Jul 3 13:34:36 2011 @@ -51,11 +51,13 @@ NTSTATUS Status = STATUS_SUCCESS; struct ip_addr AddressToBind; KIRQL OldIrql; + TA_IP_ADDRESS LocalAddress; ASSERT(Connection); - ASSERT_KM_POINTER(Connection->AddressFile); LockObject(Connection, &OldIrql); + + ASSERT_KM_POINTER(Connection->AddressFile); TI_DbgPrint(DEBUG_TCP,("[IP, TCPListen] Called\n")); DbgPrint("[IP, TCPListen] Called\n"); @@ -68,6 +70,24 @@ Status = TCPTranslateError(LibTCPBind(Connection->SocketContext, &AddressToBind, Connection->AddressFile->Port)); + + if (NT_SUCCESS(Status)) + { + /* Check if we had an unspecified port */ + if (!Connection->AddressFile->Port) + { + /* We did, so we need to copy back the port */ + Status = TCPGetSockAddress(Connection, (PTRANSPORT_ADDRESS)&LocalAddress, FALSE); + if (NT_SUCCESS(Status)) + { + /* Allocate the port in the port bitmap */ + Connection->AddressFile->Port = TCPAllocatePort(LocalAddress.Address[0].Address[0].sin_port); + + /* This should never fail */ + ASSERT(Connection->AddressFile->Port != 0xFFFF); + } + } + } if (NT_SUCCESS(Status)) { Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] Sun Jul 3 13:34:36 2011 @@ -212,7 +212,7 @@ /* sanity assert...this should never be in anything else but a CLOSED state */ ASSERT(((struct tcp_pcb*)OldSocketContext)->state == CLOSED); /* free socket context created in FileOpenConnection, as we're using a new - one; we free it asynchornously because otherwise we create a dedlock */ + one; we free it asynchornously because otherwise we create a deadlock */ ChewCreate(SocketContextCloseWorker, OldSocketContext); } Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/if.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/if.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/if.c [iso-8859-1] Sun Jul 3 13:34:36 2011 @@ -39,17 +39,22 @@ } else { + DbgPrint("[IP, TCPSendDataCallback] FAIL EINVAL 1\n"); return EINVAL; } + DbgPrint("[IP, TCPSendDataCallback] Set packet local and remore adresses\n"); + if (!(NCE = RouteGetRouteToDestination(&RemoteAddress))) { + DbgPrint("[IP, TCPSendDataCallback] FAIL EINVAL 2\n"); return EINVAL; } NdisStatus = AllocatePacketWithBuffer(&Packet.NdisPacket, NULL, p->tot_len); if (NdisStatus != NDIS_STATUS_SUCCESS) { + DbgPrint("[IP, TCPSendDataCallback] FAIL ENOBUFS\n"); return ENOBUFS; } @@ -60,6 +65,8 @@ ASSERT(p1); RtlCopyMemory(((PUCHAR)Packet.Header) + i, p1->payload, p1->len); } + + DbgPrint("[IP, TCPSendDataCallback] Allocated NDIS packet and set data\n"); Packet.HeaderSize = sizeof(IPv4_HEADER); Packet.TotalSize = p->tot_len; @@ -68,9 +75,12 @@ if (!NT_SUCCESS(IPSendDatagram(&Packet, NCE, TCPPacketSendComplete, NULL))) { + DbgPrint("[IP, TCPSendDataCallback] FAIL EINVAL 3\n"); FreeNdisPacket(Packet.NdisPacket); return EINVAL; } + + DbgPrint("[IP, TCPSendDataCallback] Leaving\n"); return 0; } Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Sun Jul 3 13:34:36 2011 @@ -110,11 +110,12 @@ PVOID Socket; LockObject(Connection, &OldIrql); + + DbgPrint("[IP, TCPClose] Called for Connection( 0x%x )->SocketConext( 0x%x )\n", Connection, Connection->SocketContext); + Socket = Connection->SocketContext; Connection->SocketContext = NULL; - DbgPrint("[IP, TCPClose] Called\n"); - /* We should not be associated to an address file at this point */ ASSERT(!Connection->AddressFile); @@ -122,6 +123,9 @@ if (Socket) { FlushAllQueues(Connection, STATUS_CANCELLED); + + DbgPrint("[IP, TCPClose] Socket (pcb) = 0x%x\n", Socket); + LibTCPClose(Socket); } @@ -247,6 +251,7 @@ struct ip_addr bindaddr, connaddr; IP_ADDRESS RemoteAddress; USHORT RemotePort; + TA_IP_ADDRESS LocalAddress; PTDI_BUCKET Bucket; PNEIGHBOR_CACHE_ENTRY NCE; KIRQL OldIrql; @@ -301,39 +306,42 @@ if (NT_SUCCESS(Status)) { - connaddr.addr = RemoteAddress.Address.IPv4Address; - - Bucket = ExAllocatePoolWithTag( NonPagedPool, sizeof(*Bucket), TDI_BUCKET_TAG ); - if( !Bucket ) - { - UnlockObject(Connection, OldIrql); - return STATUS_NO_MEMORY; - } - - Bucket->Request.RequestNotifyObject = (PVOID)Complete; - Bucket->Request.RequestContext = Context; - - InsertTailList( &Connection->ConnectRequest, &Bucket->Entry ); - - Status = TCPTranslateError(LibTCPConnect(Connection->SocketContext, - &connaddr, - RemotePort)); - - DbgPrint("LibTCPConnect: 0x%x\n", Status); - - if (Status == STATUS_PENDING) - { - /*Bucket = ExAllocatePoolWithTag( NonPagedPool, sizeof(*Bucket), TDI_BUCKET_TAG ); + /* Check if we had an unspecified port */ + if (!Connection->AddressFile->Port) + { + /* We did, so we need to copy back the port */ + Status = TCPGetSockAddress(Connection, (PTRANSPORT_ADDRESS)&LocalAddress, FALSE); + if (NT_SUCCESS(Status)) + { + /* Allocate the port in the port bitmap */ + Connection->AddressFile->Port = TCPAllocatePort(LocalAddress.Address[0].Address[0].sin_port); + + /* This should never fail */ + ASSERT(Connection->AddressFile->Port != 0xFFFF); + } + } + + if (NT_SUCCESS(Status)) + { + connaddr.addr = RemoteAddress.Address.IPv4Address; + + Bucket = ExAllocatePoolWithTag( NonPagedPool, sizeof(*Bucket), TDI_BUCKET_TAG ); if( !Bucket ) { - UnlockObject(Connection, OldIrql); - return STATUS_NO_MEMORY; + UnlockObject(Connection, OldIrql); + return STATUS_NO_MEMORY; } Bucket->Request.RequestNotifyObject = (PVOID)Complete; Bucket->Request.RequestContext = Context; - InsertTailList( &Connection->ConnectRequest, &Bucket->Entry );*/ + InsertTailList( &Connection->ConnectRequest, &Bucket->Entry ); + + Status = TCPTranslateError(LibTCPConnect(Connection->SocketContext, + &connaddr, + RemotePort)); + + DbgPrint("LibTCPConnect: 0x%x\n", Status); } }

13 years, 5 months

[cmihail] 52516: [AFD] merge r52497 - Rewrite disconnect to work asynchronously merge r52492 - Fix several bugs related to the FD_WRITE event - We would not set the sendable poll state if the socke...

by cmihail＠svn.reactos.org

Author: cmihail Date: Sun Jul 3 12:03:49 2011 New Revision: 52516 URL: http://svn.reactos.org/svn/reactos?rev=52516&view=rev Log: [AFD] merge r52497 - Rewrite disconnect to work asynchronously merge r52492 - Fix several bugs related to the FD_WRITE event - We would not set the sendable poll state if the socket had data waiting to be sent even if there was buffer space - We did not set the poll state after performing a send - We did not clear the sendable poll state if we ran out of buffer space Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/connect.c branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/listen.c branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/main.c branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/select.c branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/tdi.c branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/write.c branches/GSoC_2011/TcpIpDriver/drivers/network/afd/include/afd.h branches/GSoC_2011/TcpIpDriver/drivers/network/afd/include/tdi_proto.h Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/connect.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/connect.c [iso-8859-1] Sun Jul 3 12:03:49 2011 @@ -355,7 +355,7 @@ NextIrp = CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); AFD_DbgPrint(MID_TRACE,("Completing connect %x\n", NextIrp)); - DbgPrint("[AFD, StreamSocketConnectComplete] Completing connect 0x%x\n", NextIrp); + DbgPrint("[AFD, StreamSocketConnectComplete] Completing connect 0x%x with Status = 0x%x\n", NextIrp, Status); NextIrp->IoStatus.Status = Status; NextIrp->IoStatus.Information = (NT_SUCCESS(Status) ? ((ULONG_PTR)FCB->Connection.Handle) : 0); @@ -369,6 +369,7 @@ if (NT_SUCCESS(Status)) { + DbgPrint("[AFD, StreamSocketConnectComplete] Making socket into connection\n"); Status = MakeSocketIntoConnection(FCB); if (!NT_SUCCESS(Status)) @@ -377,21 +378,21 @@ return Status; } - FCB->FilledConnectData = MIN(FCB->ConnectInfo->UserDataLength, + FCB->FilledConnectData = MIN(FCB->ConnectReturnInfo->UserDataLength, FCB->ConnectDataSize); if (FCB->FilledConnectData) { RtlCopyMemory(FCB->ConnectData, - FCB->ConnectInfo->UserData, + FCB->ConnectReturnInfo->UserData, FCB->FilledConnectData); } - FCB->FilledConnectOptions = MIN(FCB->ConnectInfo->OptionsLength, + FCB->FilledConnectOptions = MIN(FCB->ConnectReturnInfo->OptionsLength, FCB->ConnectOptionsSize); if (FCB->FilledConnectOptions) { RtlCopyMemory(FCB->ConnectOptions, - FCB->ConnectInfo->Options, + FCB->ConnectReturnInfo->Options, FCB->FilledConnectOptions); } @@ -415,6 +416,7 @@ SocketStateUnlock(FCB); AFD_DbgPrint(MID_TRACE,("Returning %x\n", Status)); + DbgPrint("[AFD, StreamSocketConnectComplete] Leaving. Status = 0x%x\n", Status); return Status; } @@ -430,7 +432,6 @@ PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = (PAFD_FCB)FileObject->FsContext; PAFD_CONNECT_INFO ConnectReq; - PTDI_CONNECTION_INFORMATION TargetAddress; AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB)); if (!SocketAcquireStateLock(FCB)) @@ -507,41 +508,42 @@ if (!NT_SUCCESS(Status)) break; - Status = TdiBuildConnectionInfo(&FCB->ConnectInfo, &ConnectReq->RemoteAddress); + if (FCB->ConnectReturnInfo) ExFreePool(FCB->ConnectReturnInfo); + Status = TdiBuildConnectionInfo(&FCB->ConnectReturnInfo, &ConnectReq->RemoteAddress); if (NT_SUCCESS(Status)) - Status = TdiBuildConnectionInfo(&TargetAddress, &ConnectReq->RemoteAddress); - else break; + { + if (FCB->ConnectCallInfo) ExFreePool(FCB->ConnectCallInfo); + Status = TdiBuildConnectionInfo(&FCB->ConnectCallInfo, + &ConnectReq->RemoteAddress); + } + else + break; if (NT_SUCCESS(Status)) { - TargetAddress->UserData = FCB->ConnectData; - TargetAddress->UserDataLength = FCB->ConnectDataSize; - TargetAddress->Options = FCB->ConnectOptions; - TargetAddress->OptionsLength = FCB->ConnectOptionsSize; - - AFD_DbgPrint(MID_TRACE,("Queueing IRP %x\n", Irp)); - DbgPrint("[AFD, AfdStreamSocketConnect] Queueing IRP %x\n", Irp); + FCB->ConnectCallInfo->UserData = FCB->ConnectData; + FCB->ConnectCallInfo->UserDataLength = FCB->ConnectDataSize; + FCB->ConnectCallInfo->Options = FCB->ConnectOptions; + FCB->ConnectCallInfo->OptionsLength = FCB->ConnectOptionsSize; FCB->State = SOCKET_STATE_CONNECTING; AFD_DbgPrint(MID_TRACE,("Queueing IRP %x\n", Irp)); - Status = QueueUserModeIrp( FCB, Irp, FUNCTION_CONNECT ); + Status = QueueUserModeIrp(FCB, Irp, FUNCTION_CONNECT); if (Status == STATUS_PENDING) { - Status = TdiConnect( &FCB->ConnectIrp.InFlightRequest, + Status = TdiConnect(&FCB->ConnectIrp.InFlightRequest, FCB->Connection.Object, - TargetAddress, - FCB->ConnectInfo, + FCB->ConnectCallInfo, + FCB->ConnectReturnInfo, &FCB->ConnectIrp.Iosb, StreamSocketConnectComplete, - FCB ); + FCB); } if (Status != STATUS_PENDING) FCB->State = SOCKET_STATE_BOUND; - - ExFreePool(TargetAddress); SocketStateUnlock(FCB); Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/listen.c [iso-8859-1] Sun Jul 3 12:03:49 2011 @@ -43,7 +43,10 @@ Status = MakeSocketIntoConnection( FCB ); if (NT_SUCCESS(Status)) - Status = TdiBuildConnectionInfo(&FCB->ConnectInfo, FCB->RemoteAddress); + Status = TdiBuildConnectionInfo(&FCB->ConnectCallInfo, FCB->RemoteAddress); + + if (NT_SUCCESS(Status)) + Status = TdiBuildConnectionInfo(&FCB->ConnectReturnInfo, FCB->RemoteAddress); return UnlockAndMaybeComplete( FCB, Status, Irp, 0 ); } Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/main.c [iso-8859-1] Sun Jul 3 12:03:49 2011 @@ -373,6 +373,7 @@ } FileObject->FsContext = FCB; + DbgPrint("FileObject->FsContext = 0x%x\n", FCB); /* It seems that UDP sockets are writable from inception */ if (FCB->Flags & AFD_ENDPOINT_CONNECTIONLESS) @@ -381,8 +382,8 @@ /* A datagram socket is always sendable */ FCB->PollState |= AFD_EVENT_SEND; - FCB->PollStatus[FD_WRITE_BIT] = STATUS_SUCCESS; - PollReeval( FCB->DeviceExt, FCB->FileObject ); + FCB->PollStatus[FD_WRITE_BIT] = STATUS_SUCCESS; + PollReeval( FCB->DeviceExt, FCB->FileObject ); } if (!NT_SUCCESS(Status)) @@ -523,8 +524,11 @@ if ( FCB->AddressFrom ) ExFreePool(FCB->AddressFrom); - if (FCB->ConnectInfo) - ExFreePool(FCB->ConnectInfo); + if (FCB->ConnectCallInfo) + ExFreePool(FCB->ConnectCallInfo); + + if (FCB->ConnectReturnInfo) + ExFreePool(FCB->ConnectReturnInfo); if (FCB->ConnectData) ExFreePool(FCB->ConnectData); @@ -596,78 +600,101 @@ static NTSTATUS -DoDisconnect(PAFD_FCB FCB, PIRP CurrentIrp) +NTAPI +DisconnectComplete(PDEVICE_OBJECT DeviceObject, + PIRP Irp, + PVOID Context) +{ + PAFD_FCB FCB = Context; + PIRP CurrentIrp; + PLIST_ENTRY CurrentEntry; + + if( !SocketAcquireStateLock( FCB ) ) + return STATUS_FILE_CLOSED; + + ASSERT(FCB->DisconnectIrp.InFlightRequest == Irp); + FCB->DisconnectIrp.InFlightRequest = NULL; + + ASSERT(FCB->DisconnectPending); + //ASSERT(IsListEmpty(&FCB->PendingIrpList[FUNCTION_SEND]) || (FCB->DisconnectFlags & TDI_DISCONNECT_ABORT)); + + if (NT_SUCCESS(Irp->IoStatus.Status) && (FCB->DisconnectFlags & TDI_DISCONNECT_RELEASE)) + { + FCB->FilledDisconnectData = MIN(FCB->DisconnectDataSize, FCB->ConnectReturnInfo->UserDataLength); + if (FCB->FilledDisconnectData) + { + RtlCopyMemory(FCB->DisconnectData, + FCB->ConnectReturnInfo->UserData, + FCB->FilledDisconnectData); + } + + FCB->FilledDisconnectOptions = MIN(FCB->DisconnectOptionsSize, FCB->ConnectReturnInfo->OptionsLength); + if (FCB->FilledDisconnectOptions) + { + RtlCopyMemory(FCB->DisconnectOptions, + FCB->ConnectReturnInfo->Options, + FCB->FilledDisconnectOptions); + } + } + + FCB->DisconnectPending = FALSE; + + while (!IsListEmpty(&FCB->PendingIrpList[FUNCTION_DISCONNECT])) + { + CurrentEntry = RemoveHeadList(&FCB->PendingIrpList[FUNCTION_DISCONNECT]); + CurrentIrp = CONTAINING_RECORD(CurrentEntry, IRP, Tail.Overlay.ListEntry); + CurrentIrp->IoStatus.Status = Irp->IoStatus.Status; + CurrentIrp->IoStatus.Information = 0; + UnlockRequest(CurrentIrp, IoGetCurrentIrpStackLocation(CurrentIrp)); + (void)IoSetCancelRoutine(CurrentIrp, NULL); + IoCompleteRequest(CurrentIrp, IO_NETWORK_INCREMENT ); + } + + if (FCB->DisconnectFlags & TDI_DISCONNECT_RELEASE) + FCB->PollState |= AFD_EVENT_DISCONNECT; + else + FCB->PollState |= AFD_EVENT_ABORT; + FCB->PollStatus[FD_CLOSE_BIT] = Irp->IoStatus.Status; + PollReeval(FCB->DeviceExt, FCB->FileObject); + + SocketStateUnlock(FCB); + + return Irp->IoStatus.Status; +} + +static +NTSTATUS +DoDisconnect(PAFD_FCB FCB) { PAFD_DISCONNECT_INFO DisReq; IO_STATUS_BLOCK Iosb; - PTDI_CONNECTION_INFORMATION ConnectionReturnInfo; - PIO_STACK_LOCATION CurrentIrpSp; - USHORT Flags = 0; NTSTATUS Status; - CurrentIrpSp = IoGetCurrentIrpStackLocation(CurrentIrp); - DisReq = GetLockedData(CurrentIrp, CurrentIrpSp); - - if (DisReq->DisconnectType & AFD_DISCONNECT_SEND) - Flags |= TDI_DISCONNECT_RELEASE; - if (DisReq->DisconnectType & AFD_DISCONNECT_RECV || - DisReq->DisconnectType & AFD_DISCONNECT_ABORT) - Flags |= TDI_DISCONNECT_ABORT; - - Status = TdiBuildNullConnectionInfo(&ConnectionReturnInfo, - FCB->RemoteAddress->Address[0].AddressType); - if (NT_SUCCESS(Status)) - { - FCB->ConnectInfo->UserData = FCB->DisconnectData; - FCB->ConnectInfo->UserDataLength = FCB->DisconnectDataSize; - FCB->ConnectInfo->Options = FCB->DisconnectOptions; - FCB->ConnectInfo->OptionsLength = FCB->DisconnectOptionsSize; - - Status = TdiDisconnect(FCB->Connection.Object, - &DisReq->Timeout, - Flags, - &Iosb, - NULL, - NULL, - FCB->ConnectInfo, - ConnectionReturnInfo); - - if (NT_SUCCESS(Status)) - { - FCB->FilledDisconnectData = MIN(FCB->DisconnectDataSize, ConnectionReturnInfo->UserDataLength); - if (FCB->FilledDisconnectData) - { - RtlCopyMemory(FCB->DisconnectData, - ConnectionReturnInfo->UserData, - FCB->FilledDisconnectData); - } - - FCB->FilledDisconnectOptions = MIN(FCB->DisconnectOptionsSize, ConnectionReturnInfo->OptionsLength); - if (FCB->FilledDisconnectOptions) - { - RtlCopyMemory(FCB->DisconnectOptions, - ConnectionReturnInfo->Options, - FCB->FilledDisconnectOptions); - } - } - - ExFreePool(ConnectionReturnInfo); - - if (Flags & TDI_DISCONNECT_RELEASE) - FCB->PollState |= AFD_EVENT_DISCONNECT; - else - FCB->PollState |= AFD_EVENT_ABORT; - - FCB->PollStatus[FD_CLOSE_BIT] = Status; - PollReeval(FCB->DeviceExt, FCB->FileObject); - } - - CurrentIrp->IoStatus.Status = Status; - CurrentIrp->IoStatus.Information = 0; - UnlockRequest(CurrentIrp, CurrentIrpSp); - (void)IoSetCancelRoutine(CurrentIrp, NULL); - - IoCompleteRequest(CurrentIrp, IO_NETWORK_INCREMENT); + ASSERT(FCB->DisconnectPending); + + if (FCB->DisconnectIrp.InFlightRequest) + { + return STATUS_PENDING; + } + + FCB->ConnectCallInfo->UserData = FCB->DisconnectData; + FCB->ConnectCallInfo->UserDataLength = FCB->DisconnectDataSize; + FCB->ConnectCallInfo->Options = FCB->DisconnectOptions; + FCB->ConnectCallInfo->OptionsLength = FCB->DisconnectOptionsSize; + + Status = TdiDisconnect(&FCB->DisconnectIrp.InFlightRequest, + FCB->Connection.Object, + &DisReq->Timeout, + FCB->DisconnectFlags, + &Iosb, + DisconnectComplete, + FCB, + FCB->ConnectCallInfo, + FCB->ConnectReturnInfo); + if (Status != STATUS_PENDING) + { + FCB->DisconnectPending = FALSE; + } return Status; } @@ -675,20 +702,12 @@ VOID RetryDisconnectCompletion(PAFD_FCB FCB) { - if (IsListEmpty(&FCB->PendingIrpList[FUNCTION_SEND])) - { - PIRP CurrentIrp; - PLIST_ENTRY CurrentEntry; - - ASSERT(FCB->RemoteAddress); - - while (!IsListEmpty(&FCB->PendingIrpList[FUNCTION_DISCONNECT])) - { - CurrentEntry = RemoveHeadList(&FCB->PendingIrpList[FUNCTION_DISCONNECT]); - CurrentIrp = CONTAINING_RECORD(CurrentEntry, IRP, Tail.Overlay.ListEntry); - - DoDisconnect(FCB, CurrentIrp); - } + ASSERT(FCB->RemoteAddress); + + if (IsListEmpty(&FCB->PendingIrpList[FUNCTION_SEND]) && FCB->DisconnectPending) + { + /* Sends are done; fire off a TDI_DISCONNECT request */ + DoDisconnect(FCB); } } @@ -702,6 +721,8 @@ PAFD_DISCONNECT_INFO DisReq; NTSTATUS Status = STATUS_SUCCESS; USHORT Flags = 0; + PLIST_ENTRY CurrentEntry; + PIRP CurrentIrp; if (!SocketAcquireStateLock(FCB)) return LostSocket(Irp); @@ -717,23 +738,52 @@ if (!(FCB->Flags & AFD_ENDPOINT_CONNECTIONLESS)) { - if (!FCB->ConnectInfo) + if (!FCB->ConnectCallInfo) return UnlockAndMaybeComplete(FCB, STATUS_INVALID_PARAMETER, Irp, 0); - if (IsListEmpty(&FCB->PendingIrpList[FUNCTION_SEND]) || (Flags & TDI_DISCONNECT_ABORT)) - { - /* Go ahead an execute the disconnect because we're ready for it */ - Status = DoDisconnect(FCB, Irp); + if (FCB->DisconnectPending) + { + if (FCB->DisconnectIrp.InFlightRequest) + { + IoCancelIrp(FCB->DisconnectIrp.InFlightRequest); + ASSERT(!FCB->DisconnectIrp.InFlightRequest); + } + else + { + while (!IsListEmpty(&FCB->PendingIrpList[FUNCTION_DISCONNECT])) + { + CurrentEntry = RemoveHeadList(&FCB->PendingIrpList[FUNCTION_DISCONNECT]); + CurrentIrp = CONTAINING_RECORD(CurrentEntry, IRP, Tail.Overlay.ListEntry); + CurrentIrp->IoStatus.Status = STATUS_CANCELLED; + CurrentIrp->IoStatus.Information = 0; + UnlockRequest(CurrentIrp, IoGetCurrentIrpStackLocation(CurrentIrp)); + (void)IoSetCancelRoutine(CurrentIrp, NULL); + IoCompleteRequest(CurrentIrp, IO_NETWORK_INCREMENT ); + } + } + } + + FCB->DisconnectFlags = Flags; + FCB->DisconnectPending = TRUE; + + Status = QueueUserModeIrp(FCB, Irp, FUNCTION_DISCONNECT); + if (Status == STATUS_PENDING) + { + if (IsListEmpty(&FCB->PendingIrpList[FUNCTION_SEND]) || (FCB->DisconnectFlags & TDI_DISCONNECT_ABORT)) + { + /* Go ahead an execute the disconnect because we're ready for it */ + Status = DoDisconnect(FCB); + } - /* DoDisconnect takes care of the IRP */ + if (Status != STATUS_PENDING) + RemoveEntryList(&Irp->Tail.Overlay.ListEntry); + } + + if (Status == STATUS_PENDING) + { SocketStateUnlock(FCB); - + return Status; - } - else - { - /* We have a graceful disconnect waiting on pending sends to complete */ - return LeaveIrpUntilLater(FCB, Irp, FUNCTION_DISCONNECT); } } @@ -983,6 +1033,8 @@ PAFD_DEVICE_EXTENSION DeviceExt = DeviceObject->DeviceExtension; KIRQL OldIrql; PAFD_ACTIVE_POLL Poll; + + DbgPrint("[AFD, AfdCancelHandler] called\n"); IoReleaseCancelSpinLock(Irp->CancelIrql); @@ -1032,37 +1084,43 @@ case IOCTL_AFD_SELECT: KeAcquireSpinLock(&DeviceExt->Lock, &OldIrql); - CurrentEntry = DeviceExt->Polls.Flink; - while (CurrentEntry != &DeviceExt->Polls) - { - Poll = CONTAINING_RECORD(CurrentEntry, AFD_ACTIVE_POLL, ListEntry); - - if (Irp == Poll->Irp) + CurrentEntry = DeviceExt->Polls.Flink; + while (CurrentEntry != &DeviceExt->Polls) { - CleanupPendingIrp(FCB, Irp, IrpSp, Poll); - KeReleaseSpinLock(&DeviceExt->Lock, OldIrql); - SocketStateUnlock(FCB); - return; + Poll = CONTAINING_RECORD(CurrentEntry, AFD_ACTIVE_POLL, ListEntry); + + if (Irp == Poll->Irp) + { + CleanupPendingIrp(FCB, Irp, IrpSp, Poll); + KeReleaseSpinLock(&DeviceExt->Lock, OldIrql); + SocketStateUnlock(FCB); + + DbgPrint("[AFD, AfdCancelHandler] Cancelled IRP\n"); + + return; + } + else + { + CurrentEntry = CurrentEntry->Flink; + } } - else - { - CurrentEntry = CurrentEntry->Flink; - } - } - - KeReleaseSpinLock(&DeviceExt->Lock, OldIrql); - - SocketStateUnlock(FCB); + + KeReleaseSpinLock(&DeviceExt->Lock, OldIrql); + + SocketStateUnlock(FCB); - DbgPrint("WARNING!!! IRP cancellation race could lead to a process hang! (IOCTL_AFD_SELECT)\n"); - return; + DbgPrint("WARNING!!! IRP cancellation race could lead to a process hang! (IOCTL_AFD_SELECT)\n"); + return; default: - ASSERT(FALSE); - UnlockAndMaybeComplete(FCB, STATUS_CANCELLED, Irp, 0); - return; - } - + ASSERT(FALSE); + UnlockAndMaybeComplete(FCB, STATUS_CANCELLED, Irp, 0); + return; + } + + DbgPrint("[AFD, AfdCancelHandler] Cancelling MSAFD -> AFD IRPs\n"); + + /* Cancel IRPs from MSAFD to AFD (pending IRPs) */ CurrentEntry = FCB->PendingIrpList[Function].Flink; while (CurrentEntry != &FCB->PendingIrpList[Function]) { Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/select.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/select.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/select.c [iso-8859-1] Sun Jul 3 12:03:49 2011 @@ -141,6 +141,7 @@ UINT i; AFD_DbgPrint(MID_TRACE,("Killing selects that refer to %x\n", FileObject)); + DbgPrint("[AFD, KillSelectsForFCB] Called for FileObject->FsContext = 0x%x\n", FileObject->FsContext); KeAcquireSpinLock( &DeviceExt->Lock, &OldIrql ); @@ -152,6 +153,8 @@ Irp = Poll->Irp; PollReq = Irp->AssociatedIrp.SystemBuffer; HandleArray = AFD_HANDLES(PollReq); + + DbgPrint("[AFD, KillSelectsForFCB] killing select 0x%x\n", Poll); for (i = 0; i < PollReq->HandleCount; i++) { @@ -161,6 +164,7 @@ if ((PVOID)HandleArray[i].Handle == FileObject && (!OnlyExclusive || (OnlyExclusive && Poll->Exclusive)) ) { + DbgPrint("[AFD, KillSelectsForFCB] Zeroing events and signaling socket\n"); ZeroEvents( PollReq->Handles, PollReq->HandleCount ); SignalSocket( Poll, NULL, PollReq, STATUS_CANCELLED ); } @@ -170,6 +174,7 @@ KeReleaseSpinLock( &DeviceExt->Lock, OldIrql ); AFD_DbgPrint(MID_TRACE,("Done\n")); + DbgPrint("[AFD, KillSelectsForFCB] Leaving\n"); } NTSTATUS @@ -191,6 +196,10 @@ PollReq->HandleCount, (INT)(PollReq->Timeout.QuadPart))); + DbgPrint("[AFD, AfdSelect] Called. HandleCount = %d, Timeout = %d\n", + PollReq->HandleCount, + (INT)(PollReq->Timeout.QuadPart)); + SET_AFD_HANDLES(PollReq, LockHandles( PollReq->Handles, PollReq->HandleCount )); @@ -266,6 +275,8 @@ KeSetTimer( &Poll->Timer, PollReq->Timeout, &Poll->TimeoutDpc ); + DbgPrint("[AFD, AfdSelect] Marking IRP with STATUS_PENDING\n"); + Status = STATUS_PENDING; IoMarkIrpPending( Irp ); (void)IoSetCancelRoutine(Irp, AfdCancelHandler); @@ -280,6 +291,7 @@ KeReleaseSpinLock( &DeviceExt->Lock, OldIrql ); AFD_DbgPrint(MID_TRACE,("Returning %x\n", Status)); + DbgPrint("[AFD, AfdSelect] Leaving. Status = 0x%x\n", Status); return Status; } Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/tdi.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/tdi.c [iso-8859-1] Sun Jul 3 12:03:49 2011 @@ -1241,6 +1241,7 @@ } NTSTATUS TdiDisconnect( + PIRP *Irp, PFILE_OBJECT TransportObject, PLARGE_INTEGER Time, USHORT Flags, @@ -1250,10 +1251,6 @@ PTDI_CONNECTION_INFORMATION RequestConnectionInfo, PTDI_CONNECTION_INFORMATION ReturnConnectionInfo) { PDEVICE_OBJECT DeviceObject; - KEVENT Event; - PIRP Irp; - - KeInitializeEvent(&Event, NotificationEvent, FALSE); if (!TransportObject) { AFD_DbgPrint(MIN_TRACE, ("Bad transport object.\n")); @@ -1268,20 +1265,20 @@ return STATUS_INVALID_PARAMETER; } - Irp = TdiBuildInternalDeviceControlIrp + *Irp = TdiBuildInternalDeviceControlIrp ( TDI_DISCONNECT, /* Sub function */ DeviceObject, /* Device object */ TransportObject, /* File object */ - &Event, /* Event */ + NULL, /* Event */ Iosb ); /* Status */ - if (!Irp) { + if (!*Irp) { AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); return STATUS_INSUFFICIENT_RESOURCES; } TdiBuildDisconnect - (Irp, /* I/O Request Packet */ + (*Irp, /* I/O Request Packet */ DeviceObject, /* Device object */ TransportObject, /* File object */ CompletionRoutine, /* Completion routine */ @@ -1291,7 +1288,9 @@ RequestConnectionInfo, /* Indication of who to disconnect */ ReturnConnectionInfo); /* Indication of who disconnected */ - return TdiCall(Irp, DeviceObject, &Event, Iosb); + TdiCall(*Irp, DeviceObject, NULL, Iosb); + + return STATUS_PENDING; } /* EOF */ Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/write.c [iso-8859-1] Sun Jul 3 12:03:49 2011 @@ -168,11 +168,20 @@ break; } + if (FCB->Send.Size - FCB->Send.BytesUsed != 0) + { + FCB->PollState |= AFD_EVENT_SEND; + FCB->PollStatus[FD_WRITE_BIT] = STATUS_SUCCESS; + PollReeval( FCB->DeviceExt, FCB->FileObject ); + } + else + { + FCB->PollState &= ~AFD_EVENT_SEND; + } + /* Some data is still waiting */ if (FCB->Send.BytesUsed) { - FCB->PollState &= ~AFD_EVENT_SEND; - Status = TdiSend( &FCB->SendIrp.InFlightRequest, FCB->Connection.Object, 0, @@ -183,12 +192,6 @@ FCB ); RetryDisconnectCompletion(FCB); - } - else - { - FCB->PollState |= AFD_EVENT_SEND; - FCB->PollStatus[FD_WRITE_BIT] = STATUS_SUCCESS; - PollReeval( FCB->DeviceExt, FCB->FileObject ); } SocketStateUnlock( FCB ); @@ -408,6 +411,7 @@ } else { + FCB->PollState &= ~AFD_EVENT_SEND; if (SendReq->AfdFlags & AFD_IMMEDIATE) { AFD_DbgPrint(MID_TRACE,("Nonblocking\n")); @@ -438,6 +442,17 @@ AFD_DbgPrint(MID_TRACE,("Dismissing request: %x (%d)\n", Status, TotalBytesCopied)); + } + + if (SpaceAvail) + { + FCB->PollState |= AFD_EVENT_SEND; + FCB->PollStatus[FD_WRITE_BIT] = STATUS_SUCCESS; + PollReeval( FCB->DeviceExt, FCB->FileObject ); + } + else + { + FCB->PollState &= ~AFD_EVENT_SEND; } RetryDisconnectCompletion(FCB); Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/network/afd/include/afd.h [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/network/afd/include/afd.h [iso-8859-1] Sun Jul 3 12:03:49 2011 @@ -182,10 +182,12 @@ PAFD_DEVICE_EXTENSION DeviceExt; BOOLEAN DelayedAccept; UINT ConnSeq; + USHORT DisconnectFlags; + BOOLEAN DisconnectPending; PTRANSPORT_ADDRESS LocalAddress, RemoteAddress; - PTDI_CONNECTION_INFORMATION AddressFrom, ConnectInfo; + PTDI_CONNECTION_INFORMATION AddressFrom, ConnectCallInfo, ConnectReturnInfo; AFD_TDI_OBJECT AddressFile, Connection; - AFD_IN_FLIGHT_REQUEST ConnectIrp, ListenIrp, ReceiveIrp, SendIrp; + AFD_IN_FLIGHT_REQUEST ConnectIrp, ListenIrp, ReceiveIrp, SendIrp, DisconnectIrp; AFD_DATA_WINDOW Send, Recv; KMUTEX Mutex; PKEVENT EventSelect; Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/include/tdi_proto.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/network/afd/include/tdi_proto.h [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/network/afd/include/tdi_proto.h [iso-8859-1] Sun Jul 3 12:03:49 2011 @@ -16,7 +16,8 @@ PFILE_OBJECT FileObject); NTSTATUS TdiDisconnect -( PFILE_OBJECT TransportObject, +( PIRP *Irp, + PFILE_OBJECT TransportObject, PLARGE_INTEGER Time, USHORT Flags, PIO_STATUS_BLOCK Iosb,

13 years, 5 months

[hpoussin] 52515: [LDR] Fix some mis-assignations Brought to you by WinOCM See issue #6353 for more details.

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun Jul 3 10:58:26 2011 New Revision: 52515 URL: http://svn.reactos.org/svn/reactos?rev=52515&view=rev Log: [LDR] Fix some mis-assignations Brought to you by WinOCM See issue #6353 for more details. Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrutils.c?r… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] Sun Jul 3 10:58:26 2011 @@ -118,7 +118,7 @@ Entry->LoadCount--; break; case LDRP_UPDATE_PIN: - Entry->LoadCount == -1; + Entry->LoadCount = -1; break; } @@ -162,7 +162,7 @@ Entry->LoadCount--; break; case LDRP_UPDATE_PIN: - Entry->LoadCount == -1; + Entry->LoadCount = -1; break; } @@ -231,7 +231,7 @@ Entry->LoadCount--; break; case LDRP_UPDATE_PIN: - Entry->LoadCount == -1; + Entry->LoadCount = -1; break; }

13 years, 5 months

[osiejka] 52514: [KDCOM] Increase KdpStallScaleFactor by a factor of 10. Fixes initial delay of debug output on faster PCs with WinDBG.

by osiejka＠svn.reactos.org

Author: osiejka Date: Sun Jul 3 10:13:53 2011 New Revision: 52514 URL: http://svn.reactos.org/svn/reactos?rev=52514&view=rev Log: [KDCOM] Increase KdpStallScaleFactor by a factor of 10. Fixes initial delay of debug output on faster PCs with WinDBG. Modified: trunk/reactos/drivers/base/kddll/kddll.c Modified: trunk/reactos/drivers/base/kddll/kddll.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kddll/kddll.c… ============================================================================== --- trunk/reactos/drivers/base/kddll/kddll.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/kddll/kddll.c [iso-8859-1] Sun Jul 3 10:13:53 2011 @@ -14,7 +14,7 @@ ULONG CurrentPacketId = INITIAL_PACKET_ID | SYNC_PACKET_ID; ULONG RemotePacketId = 0; BOOLEAN KdpPhase1Complete = FALSE; -ULONG KdpStallScaleFactor = 1000; +ULONG KdpStallScaleFactor = 10000; /* PRIVATE FUNCTIONS **********************************************************/

13 years, 5 months

[tkreuzer] 52513: [NTOSKRNL] - Fix KdComponentTableSize - Make assembly instruction in KiCallUserMode MASM compatible - silence some KD internal debug prints The MSVC bootcd boots to desktop, but c...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Jul 3 09:56:59 2011 New Revision: 52513 URL: http://svn.reactos.org/svn/reactos?rev=52513&view=rev Log: [NTOSKRNL] - Fix KdComponentTableSize - Make assembly instruction in KiCallUserMode MASM compatible - silence some KD internal debug prints The MSVC bootcd boots to desktop, but crashes with BAD_POOL_HEADER before 2nd stage setup starts. Modified: trunk/reactos/ntoskrnl/kd64/kddata.c trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S trunk/reactos/ntoskrnl/mm/ARM3/mmdbg.c Modified: trunk/reactos/ntoskrnl/kd64/kddata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kddata.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kddata.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kddata.c [iso-8859-1] Sun Jul 3 09:56:59 2011 @@ -356,7 +356,7 @@ &Kd_ENDOFTABLE_Mask, }; -ULONG KdComponentTableSize = sizeof(KdComponentTable); +ULONG KdComponentTableSize = sizeof(KdComponentTable) / sizeof(KdComponentTable[0]); // // Debugger Data Modified: trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/usercall_… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S [iso-8859-1] Sun Jul 3 09:56:59 2011 @@ -13,7 +13,7 @@ #include <internal/i386/asmmacro.S> EXTERN _MmGrowKernelStack@4:PROC -EXTERN _KeUserCallbackDispatcher:PROC +EXTERN _KeUserCallbackDispatcher:DWORD EXTERN @KiServiceExit@8:PROC EXTERN _KeGetCurrentIrql@0:PROC EXTERN _KeBugCheckEx@20:PROC @@ -190,7 +190,7 @@ /* Get user-mode dispatcher address and set it as EIP */ SetEip: - mov eax, _KeUserCallbackDispatcher + mov eax, dword ptr [_KeUserCallbackDispatcher] mov [esp+KTRAP_FRAME_EIP], eax /* Set the exception list */ Modified: trunk/reactos/ntoskrnl/mm/ARM3/mmdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mmdbg.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mmdbg.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mmdbg.c [iso-8859-1] Sun Jul 3 09:56:59 2011 @@ -17,6 +17,8 @@ #ifndef _WINKD_ #define KdpDprintf DPRINT +#elif defined(NDEBUG) +#define KdpDprintf(...) #endif /* GLOBALS ********************************************************************/

13 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2011