Ros-diffs August 2011

ros-diffs@reactos.org

18 participants
498 discussions

[tfaber] 53021: [KMTESTS] - add kmt_platform.h that includes user or kernel headers as appropriate and allows Rtl tests to run in user mode without modification - include kmt_platform.h from kmt_te...
by tfaber＠svn.reactos.org 01 Aug '11

01 Aug '11

Author: tfaber Date: Mon Aug 1 21:53:52 2011 New Revision: 53021 URL: http://svn.reactos.org/svn/reactos?rev=53021&view=rev Log: [KMTESTS] - add kmt_platform.h that includes user or kernel headers as appropriate and allows Rtl tests to run in user mode without modification - include kmt_platform.h from kmt_test.h, so that tests don't have to include separate headers. This also allows for a PCH Added: branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_platform.h (with props) Modified: branches/GSoC_2011/KMTestSuite/kmtests/example/Example.c branches/GSoC_2011/KMTestSuite/kmtests/example/Example_drv.c branches/GSoC_2011/KMTestSuite/kmtests/example/Example_user.c branches/GSoC_2011/KMTestSuite/kmtests/example/KernelType.c branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c branches/GSoC_2011/KMTestSuite/kmtests/kmtest/service.c branches/GSoC_2011/KMTestSuite/kmtests/kmtest/support.c branches/GSoC_2011/KMTestSuite/kmtests/kmtest/testlist.c branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExDoubleList.c branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExHardError.c branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExInterlocked.c branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExPools.c branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExResource.c branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExSingleList.c branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExTimer.c branches/GSoC_2011/KMTestSuite/kmtests/ntos_fsrtl/FsRtlExpression.c branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoDeviceInterface.c branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoIrp.c branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoMdl.c branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeApc.c branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeDpc.c branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeIrql.c branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeProcessor.c branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeSpinLock.c branches/GSoC_2011/KMTestSuite/kmtests/ntos_ob/ObCreate.c branches/GSoC_2011/KMTestSuite/kmtests/rtl/RtlMemory.c Modified: branches/GSoC_2011/KMTestSuite/kmtests/example/Example.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/e… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/example/Example.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/example/Example.c [iso-8859-1] Mon Aug 1 21:53:52 2011 @@ -5,7 +5,6 @@ * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> */ -#include <ntddk.h> #include <kmt_test.h> START_TEST(Example) Modified: branches/GSoC_2011/KMTestSuite/kmtests/example/Example_drv.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/e… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/example/Example_drv.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/example/Example_drv.c [iso-8859-1] Mon Aug 1 21:53:52 2011 @@ -4,8 +4,6 @@ * PURPOSE: Kernel-Mode Test Suite Example Test Driver * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> */ - -#include <ntddk.h> #include <kmt_test.h> Modified: branches/GSoC_2011/KMTestSuite/kmtests/example/Example_user.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/e… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/example/Example_user.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/example/Example_user.c [iso-8859-1] Mon Aug 1 21:53:52 2011 @@ -5,9 +5,6 @@ * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> */ -#define UNICODE -#define WIN32_LEAN_AND_MEAN -#include <windows.h> #include <kmt_test.h> #include "Example.h" Modified: branches/GSoC_2011/KMTestSuite/kmtests/example/KernelType.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/e… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/example/KernelType.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/example/KernelType.c [iso-8859-1] Mon Aug 1 21:53:52 2011 @@ -5,7 +5,6 @@ * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> */ -#include <ntddk.h> #include <kmt_test.h> START_TEST(KernelType) Added: branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_platform.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/i… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_platform.h (added) +++ branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_platform.h [iso-8859-1] Mon Aug 1 21:53:52 2011 @@ -1,0 +1,48 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite platform declarations + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#ifndef _KMTEST_PLATFORM_H_ +#define _KMTEST_PLATFORM_H_ + +#if defined KMT_KERNEL_MODE || defined KMT_STANDALONE_DRIVER +#include <ntddk.h> +#include <ntifs.h> +#include <ndk/ntndk.h> +#include <ntstrsafe.h> + +#elif defined KMT_USER_MODE +#define WIN32_LEAN_AND_MEAN +#define WIN32_NO_STATUS +#define UNICODE +#include <windows.h> +#include <ndk/ntndk.h> +#include <strsafe.h> +#include <winioctl.h> + +#ifdef KMT_EMULATE_KERNEL +#define ok_irql(i) +#ifdef __GNUC__ +#define KIRQL __attribute__((__unused__)) int +#elif !defined __GNUC__ +#define KIRQL int +#endif /* !defined __GNUC__ */ + +#undef KeRaiseIrql +#define KeRaiseIrql(new, old) +#undef KeLowerIrql +#define KeLowerIrql(i) +#define ExAllocatePool(type, size) HeapAlloc(GetProcessHeap(), 0, size) +#define ExAllocatePoolWithTag(type, size, tag) HeapAlloc(GetProcessHeap(), 0, size) +#define ExFreePool(p) HeapFree(GetProcessHeap(), 0, p) +#define ExFreePoolWithTag(p, tag) HeapFree(GetProcessHeap(), 0, p) +#endif /* defined KMT_EMULATE_KERNEL */ + +#endif /* defined KMT_USER_MODE */ + +#include <pseh/pseh2.h> + +#endif /* !defined _KMTEST_PLATFORM_H_ */ Propchange: branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_platform.h ------------------------------------------------------------------------------ svn:eol-style = native 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] Mon Aug 1 21:53:52 2011 @@ -12,6 +12,8 @@ #ifndef _KMTEST_TEST_H_ #define _KMTEST_TEST_H_ + +#include <kmt_platform.h> #include <stdarg.h> 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] Mon Aug 1 21:53:52 2011 @@ -5,20 +5,15 @@ * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> */ -#define UNICODE -#define WIN32_LEAN_AND_MEAN -#include <windows.h> -#include <strsafe.h> -#include <winioctl.h> +#define KMT_DEFINE_TEST_FUNCTIONS +#include <kmt_test.h> + +#include "kmtest.h" +#include <kmt_public.h> #include <assert.h> #include <stdio.h> #include <stdlib.h> - -#include "kmtest.h" -#include <kmt_public.h> -#define KMT_DEFINE_TEST_FUNCTIONS -#include <kmt_test.h> #define SERVICE_NAME L"Kmtest" #define SERVICE_PATH L"kmtest_drv.sys" 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] Mon Aug 1 21:53:52 2011 @@ -5,14 +5,10 @@ * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> */ -#define UNICODE -#define WIN32_LEAN_AND_MEAN -#include <windows.h> -#include <strsafe.h> +#include <kmt_test.h> +#include "kmtest.h" #include <assert.h> - -#include "kmtest.h" #define SERVICE_ACCESS (SERVICE_START | SERVICE_STOP | DELETE) Modified: 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 [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest/support.c [iso-8859-1] Mon Aug 1 21:53:52 2011 @@ -5,17 +5,12 @@ * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> */ -#define UNICODE -#define WIN32_LEAN_AND_MEAN -#include <windows.h> -#include <strsafe.h> -#include <winioctl.h> - -#include <assert.h> +#include <kmt_test.h> #include "kmtest.h" #include <kmt_public.h> -#include <kmt_test.h> + +#include <assert.h> extern HANDLE KmtestHandle; Modified: 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 [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest/testlist.c [iso-8859-1] Mon Aug 1 21:53:52 2011 @@ -5,9 +5,6 @@ * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> */ -#define WIN32_LEAN_AND_MEAN -#define UNICODE -#include <windows.h> #include <kmt_test.h> KMT_TESTFUNC Test_Example; Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExDoubleList.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExDoubleList.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExDoubleList.c [iso-8859-1] Mon Aug 1 21:53:52 2011 @@ -10,7 +10,6 @@ struct _LIST_ENTRY *__stdcall ExInterlockedInsertTailList(struct _LIST_ENTRY *, struct _LIST_ENTRY *, unsigned long *); struct _LIST_ENTRY *__stdcall ExInterlockedRemoveHeadList(struct _LIST_ENTRY *, unsigned long *); -#include <ntddk.h> #include <kmt_test.h> LIST_ENTRY Entries[5]; Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExHardError.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExHardError.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExHardError.c [iso-8859-1] Mon Aug 1 21:53:52 2011 @@ -4,11 +4,6 @@ * PURPOSE: Kernel-Mode Test Suite Hard error message test * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> */ - -#include <ntddk.h> -#include <ntifs.h> -#include <ndk/exfuncs.h> -#include <pseh/pseh2.h> #include <kmt_test.h> Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExInterlocked.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExInterlocked.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExInterlocked.c [iso-8859-1] Mon Aug 1 21:53:52 2011 @@ -24,9 +24,6 @@ __declspec(dllimport) int __stdcall ExInterlockedDecrementLong(long *, void *); __declspec(dllimport) int __stdcall Exi386InterlockedIncrementLong(long *); __declspec(dllimport) int __stdcall Exi386InterlockedDecrementLong(long *); - -#include <ntddk.h> -#include <pseh/pseh2.h> #include <kmt_test.h> Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExPools.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExPools.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExPools.c [iso-8859-1] Mon Aug 1 21:53:52 2011 @@ -7,11 +7,6 @@ /* TODO: PoolsCorruption tests fail because accessing invalid memory doesn't necessarily cause an access violation */ -#include <ntddk.h> -#include <ntifs.h> -#include <ndk/ntndk.h> -/* SEH support with PSEH */ -#include <pseh/pseh2.h> #include <kmt_test.h> #define NDEBUG Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExResource.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExResource.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExResource.c [iso-8859-1] Mon Aug 1 21:53:52 2011 @@ -5,11 +5,7 @@ * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> */ -#include <ntddk.h> -#include <ntifs.h> -#include <ndk/extypes.h> #include <kmt_test.h> -#include <pseh/pseh2.h> //#define NDEBUG #include <debug.h> Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExSingleList.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExSingleList.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExSingleList.c [iso-8859-1] Mon Aug 1 21:53:52 2011 @@ -9,7 +9,6 @@ struct _SINGLE_LIST_ENTRY *__stdcall ExInterlockedPushEntryList(struct _SINGLE_LIST_ENTRY *, struct _SINGLE_LIST_ENTRY *, unsigned long *); struct _SINGLE_LIST_ENTRY *__stdcall ExInterlockedPopEntryList(struct _SINGLE_LIST_ENTRY *, unsigned long *); -#include <ntddk.h> #include <kmt_test.h> SINGLE_LIST_ENTRY Entries[5]; Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExTimer.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExTimer.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExTimer.c [iso-8859-1] Mon Aug 1 21:53:52 2011 @@ -5,9 +5,6 @@ * PROGRAMMER: Aleksey Bragin <aleksey(a)reactos.org> */ -#include <ntddk.h> -#include <ntifs.h> -#include <ndk/ntndk.h> #include <kmt_test.h> #define NDEBUG Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_fsrtl/FsRtlExpression.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/ntos_fsrtl/FsRtlExpression.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_fsrtl/FsRtlExpression.c [iso-8859-1] Mon Aug 1 21:53:52 2011 @@ -7,7 +7,6 @@ /* TODO: most of these calls fail the Windows checked build's !islower assertion and others */ -#include <ntifs.h> #include <kmt_test.h> #define NDEBUG Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoDeviceInterface.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoDeviceInterface.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoDeviceInterface.c [iso-8859-1] Mon Aug 1 21:53:52 2011 @@ -7,8 +7,6 @@ /* TODO: what's with the prototypes at the top, what's with the if-ed out part? Doesn't process most results */ -#include <ntifs.h> -#include <ndk/iotypes.h> #include <kmt_test.h> #define NDEBUG Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoIrp.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoIrp.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoIrp.c [iso-8859-1] Mon Aug 1 21:53:52 2011 @@ -6,7 +6,6 @@ */ /* Based on code Copyright 2008 Etersoft (Alexander Morozov) */ -#include <ntddk.h> #include <kmt_test.h> #define NDEBUG Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoMdl.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoMdl.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoMdl.c [iso-8859-1] Mon Aug 1 21:53:52 2011 @@ -5,7 +5,6 @@ * PROGRAMMER: Aleksey Bragin <aleksey(a)reactos.org> */ -#include <ntddk.h> #include <kmt_test.h> #define NDEBUG Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeApc.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeApc.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeApc.c [iso-8859-1] Mon Aug 1 21:53:52 2011 @@ -5,9 +5,6 @@ * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> */ -#include <ntddk.h> -#include <ntifs.h> -#include <ndk/ketypes.h> #include <kmt_test.h> #define CheckApcs(KernelApcsDisabled, SpecialApcsDisabled, AllApcsDisabled, Irql) do \ Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeDpc.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeDpc.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeDpc.c [iso-8859-1] Mon Aug 1 21:53:52 2011 @@ -5,11 +5,7 @@ * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> */ -#include <ntddk.h> -#include <ntifs.h> -#include <ndk/ketypes.h> #include <kmt_test.h> -#include <pseh/pseh2.h> //#define NDEBUG #include <debug.h> Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeIrql.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeIrql.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeIrql.c [iso-8859-1] Mon Aug 1 21:53:52 2011 @@ -8,11 +8,7 @@ __declspec(dllimport) void __stdcall KeRaiseIrql(unsigned char, unsigned char *); __declspec(dllimport) void __stdcall KeLowerIrql(unsigned char); -#include <ntddk.h> -#include <ntifs.h> -#include <ndk/ntndk.h> #include <kmt_test.h> -#include <pseh/pseh2.h> #define NDEBUG #include <debug.h> Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeProcessor.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeProcessor.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeProcessor.c [iso-8859-1] Mon Aug 1 21:53:52 2011 @@ -7,9 +7,6 @@ /* TODO: this test doesn't process any test results; it also takes very long */ -#include <ntddk.h> -#include <ntifs.h> -#include <ndk/ntndk.h> #include <kmt_test.h> #define NDEBUG Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeSpinLock.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeSpinLock.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeSpinLock.c [iso-8859-1] Mon Aug 1 21:53:52 2011 @@ -14,11 +14,7 @@ /* this define makes KeInitializeSpinLock not use the inlined version */ #define WIN9X_COMPAT_SPINLOCK -#include <ntddk.h> -#include <ntifs.h> -#include <ndk/kefuncs.h> #include <kmt_test.h> -#include <pseh/pseh2.h> #include <limits.h> //#define NDEBUG Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ob/ObCreate.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ob/ObCreate.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ob/ObCreate.c [iso-8859-1] Mon Aug 1 21:53:52 2011 @@ -7,9 +7,6 @@ /* TODO: this test terminates with an access violation in Windows */ -#include <ntddk.h> -#include <ntifs.h> -#include <ndk/ntndk.h> #include <kmt_test.h> #define NDEBUG Modified: branches/GSoC_2011/KMTestSuite/kmtests/rtl/RtlMemory.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/r… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/rtl/RtlMemory.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/rtl/RtlMemory.c [iso-8859-1] Mon Aug 1 21:53:52 2011 @@ -5,16 +5,7 @@ * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> */ -/* TODO: move this to some header */ -#ifdef KMT_USER_MODE -# include <windows.h> -# define ok_irql(i) -# define KIRQL int -# define KeRaiseIrql(new, old) -# define KeLowerIrql(i) -#elif KMT_KERNEL_MODE -# include <ntddk.h> -#endif +#define KMT_EMULATE_KERNEL #include <kmt_test.h> START_TEST(RtlMemory)

1 0

[cmihail] 53020: [TCPIP] - merge r53017 - do some code cleanup [lwIP] - do some code cleanup
by cmihail＠svn.reactos.org 01 Aug '11

01 Aug '11

Author: cmihail Date: Mon Aug 1 20:10:55 2011 New Revision: 53020 URL: http://svn.reactos.org/svn/reactos?rev=53020&view=rev Log: [TCPIP] - merge r53017 - do some code cleanup [lwIP] - do some code cleanup Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/include/tcp.h branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/dispatch.c branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/tcp.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/tcp_in.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/rosip.h branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rosip.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rosmem.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/include/tcp.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/include/tcp.h [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/include/tcp.h [iso-8859-1] Mon Aug 1 20:10:55 2011 @@ -166,11 +166,11 @@ NTSTATUS TCPClose( PCONNECTION_ENDPOINT Connection ); -NTSTATUS TCPTranslateError( INT8 err ); +NTSTATUS TCPTranslateError( const INT8 err ); -UINT TCPAllocatePort( UINT HintPort ); +UINT TCPAllocatePort( const UINT HintPort ); -VOID TCPFreePort( UINT Port ); +VOID TCPFreePort( const UINT Port ); NTSTATUS TCPGetSockAddress ( PCONNECTION_ENDPOINT Connection, @@ -192,4 +192,4 @@ TCPUpdateInterfaceIPInformation(PIP_INTERFACE IF); VOID -FlushAllQueues(PCONNECTION_ENDPOINT Connection, NTSTATUS Status); +FlushAllQueues(PCONNECTION_ENDPOINT Connection, const NTSTATUS Status); 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] Mon Aug 1 20:10:55 2011 @@ -122,6 +122,7 @@ PTRANSPORT_CONTEXT TranContext; PFILE_OBJECT FileObject; UCHAR MinorFunction; + PCONNECTION_ENDPOINT Connection; BOOLEAN DequeuedIrp = TRUE; IoReleaseCancelSpinLock(Irp->CancelIrql); @@ -173,7 +174,16 @@ break; case TDI_DISCONNECT: + Connection = (PCONNECTION_ENDPOINT)TranContext->Handle.ConnectionContext; + DequeuedIrp = TCPRemoveIRP(TranContext->Handle.ConnectionContext, Irp); + if (DequeuedIrp) + { + if (KeCancelTimer(&Connection->DisconnectTimer)) + { + DereferenceObject(Connection); + } + } break; default: 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] Mon Aug 1 20:10:55 2011 @@ -46,8 +46,9 @@ ExFreePoolWithTag(Bucket, TDI_BUCKET_TAG); } -VOID -CompleteBucket(PCONNECTION_ENDPOINT Connection, PTDI_BUCKET Bucket, BOOLEAN Synchronous) +static +VOID +CompleteBucket(PCONNECTION_ENDPOINT Connection, PTDI_BUCKET Bucket, const BOOLEAN Synchronous) { ReferenceObject(Connection); Bucket->AssociatedEndpoint = Connection; @@ -62,7 +63,7 @@ } VOID -FlushAllQueues(PCONNECTION_ENDPOINT Connection, NTSTATUS Status) +FlushAllQueues(PCONNECTION_ENDPOINT Connection, const NTSTATUS Status) { PTDI_BUCKET Bucket; PLIST_ENTRY Entry; @@ -140,7 +141,7 @@ } VOID -TCPFinEventHandler(void *arg, err_t err) +TCPFinEventHandler(void *arg, const err_t err) { PCONNECTION_ENDPOINT Connection = (PCONNECTION_ENDPOINT)arg; const NTSTATUS status = TCPTranslateError(err); @@ -148,7 +149,7 @@ DbgPrint("[IP, TCPFinEventHandler] Called for Connection( 0x%x )-> SocketContext = pcb (0x%x)\n", Connection, Connection->SocketContext); /* Only clear the pointer if the shutdown was caused by an error */ - if ((err != ERR_OK)) + if (err != ERR_OK) { /* We're already closed by the error so we don't want to call lwip_close */ DbgPrint("[IP, TCPFinEventHandler] MAKING Connection( 0x%x )-> SocketContext = pcb (0x%x) NULL\n", Connection, Connection->SocketContext); @@ -162,7 +163,7 @@ } VOID -TCPAcceptEventHandler(void *arg, struct tcp_pcb *newpcb) +TCPAcceptEventHandler(void *arg, PTCP_PCB newpcb) { PCONNECTION_ENDPOINT Connection = (PCONNECTION_ENDPOINT)arg; PTDI_BUCKET Bucket; @@ -200,13 +201,13 @@ { DbgPrint("[IP, TCPAcceptEventHandler] newpcb->state = %s, listen_pcb->state = %s, newpcb = 0x%x\n", tcp_state_str[newpcb->state], - tcp_state_str[((struct tcp_pcb*)Connection->SocketContext)->state], + tcp_state_str[((PTCP_PCB)Connection->SocketContext)->state], newpcb); LockObject(Bucket->AssociatedEndpoint, &OldIrql); /* sanity assert...this should never be in anything else but a CLOSED state */ - ASSERT(((struct tcp_pcb*)Bucket->AssociatedEndpoint->SocketContext)->state == CLOSED); + ASSERT( ((PTCP_PCB)Bucket->AssociatedEndpoint->SocketContext)->state == CLOSED ); /* free socket context created in FileOpenConnection, as we're using a new one */ LibTCPClose(Bucket->AssociatedEndpoint, TRUE); @@ -233,7 +234,7 @@ VOID TCPSendEventHandler(void *arg, u16_t space) { - PCONNECTION_ENDPOINT Connection = arg; + PCONNECTION_ENDPOINT Connection = (PCONNECTION_ENDPOINT)arg; PTDI_BUCKET Bucket; PLIST_ENTRY Entry; PIRP Irp; 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] Mon Aug 1 20:10:55 2011 @@ -105,8 +105,7 @@ return Status; } -NTSTATUS TCPClose -( PCONNECTION_ENDPOINT Connection ) +NTSTATUS TCPClose( PCONNECTION_ENDPOINT Connection ) { KIRQL OldIrql; PVOID Socket; @@ -116,7 +115,6 @@ DbgPrint("[IP, TCPClose] Called for Connection( 0x%x )->SocketConext( 0x%x )\n", Connection, Connection->SocketContext); Socket = Connection->SocketContext; - //Connection->SocketContext = NULL; /* We should not be associated to an address file at this point */ ASSERT(!Connection->AddressFile); @@ -131,7 +129,7 @@ LibTCPClose(Connection, FALSE); } - DbgPrint("[IP, TCPClose] Leaving. Connection->RefCount = %d\n", Connection->RefCount); + DbgPrint("[IP, TCPClose] Leaving\n"); UnlockObject(Connection, OldIrql); @@ -170,7 +168,7 @@ NTSTATUS Status; Status = PortsStartup( &TCPPorts, 1, 0xfffe ); - if( !NT_SUCCESS(Status) ) + if (!NT_SUCCESS(Status)) { return Status; } @@ -209,7 +207,7 @@ return STATUS_SUCCESS; } -NTSTATUS TCPTranslateError( err_t err ) +NTSTATUS TCPTranslateError(const err_t err) { NTSTATUS Status; @@ -328,7 +326,7 @@ connaddr.addr = RemoteAddress.Address.IPv4Address; Bucket = ExAllocatePoolWithTag( NonPagedPool, sizeof(*Bucket), TDI_BUCKET_TAG ); - if( !Bucket ) + if (!Bucket) { UnlockObject(Connection, OldIrql); return STATUS_NO_MEMORY; @@ -427,7 +425,7 @@ LockObject(Connection, &OldIrql); /* Freed in TCPSocketState */ - Bucket = ExAllocatePoolWithTag( NonPagedPool, sizeof(*Bucket), TDI_BUCKET_TAG ); + Bucket = ExAllocatePoolWithTag(NonPagedPool, sizeof(*Bucket), TDI_BUCKET_TAG); if (!Bucket) { TI_DbgPrint(DEBUG_TCP,("[IP, TCPReceiveData] Failed to allocate bucket\n")); @@ -492,11 +490,11 @@ TI_DbgPrint(DEBUG_TCP,("[IP, TCPSendData] Send: %x, %d\n", Status, SendLength)); /* Keep this request around ... there was no data yet */ - if( Status == STATUS_PENDING ) + if (Status == STATUS_PENDING) { /* Freed in TCPSocketState */ Bucket = ExAllocatePoolWithTag( NonPagedPool, sizeof(*Bucket), TDI_BUCKET_TAG ); - if( !Bucket ) + if (!Bucket) { UnlockObject(Connection, OldIrql); TI_DbgPrint(DEBUG_TCP,("[IP, TCPSendData] Failed to allocate bucket\n")); @@ -526,16 +524,15 @@ return Status; } -UINT TCPAllocatePort( UINT HintPort ) -{ - if( HintPort ) - { - if( AllocatePort( &TCPPorts, HintPort ) ) +UINT TCPAllocatePort(const UINT HintPort) +{ + if (HintPort) + { + if (AllocatePort(&TCPPorts, HintPort)) return HintPort; else { - TI_DbgPrint - (MID_TRACE,("We got a hint port but couldn't allocate it\n")); + TI_DbgPrint(MID_TRACE,("We got a hint port but couldn't allocate it\n")); return (UINT)-1; } } @@ -543,9 +540,9 @@ return AllocatePortFromRange( &TCPPorts, 1024, 5000 ); } -VOID TCPFreePort( UINT Port ) -{ - DeallocatePort( &TCPPorts, Port ); +VOID TCPFreePort(const UINT Port) +{ + DeallocatePort(&TCPPorts, Port); } NTSTATUS TCPGetSockAddress Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/tcp_in.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/tcp_in.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/tcp_in.c [iso-8859-1] Mon Aug 1 20:10:55 2011 @@ -78,6 +78,20 @@ static err_t tcp_listen_input(struct tcp_pcb_listen *pcb); static err_t tcp_timewait_input(struct tcp_pcb *pcb); + +static const char * const tcp_state_str[] = { + "CLOSED", + "LISTEN", + "SYN_SENT", + "SYN_RCVD", + "ESTABLISHED", + "FIN_WAIT_1", + "FIN_WAIT_2", + "CLOSE_WAIT", + "CLOSING", + "LAST_ACK", + "TIME_WAIT" +}; /** * The initial input processing of TCP. It verifies the TCP header, demultiplexes @@ -325,12 +339,14 @@ end. We then call the error callback to inform the application that the connection is dead before we deallocate the PCB. */ + DbgPrint("tcp_input: removing pcb = 0x%x in state %s with TF_RESET\n", pcb, tcp_state_str[pcb->state]); TCP_EVENT_ERR(pcb->errf, pcb->callback_arg, ERR_RST); tcp_pcb_remove(&tcp_active_pcbs, pcb); memp_free(MEMP_TCP_PCB, pcb); } else if (recv_flags & TF_CLOSED) { /* The connection has been closed and we will deallocate the PCB. */ + DbgPrint("tcp_input: removing pcb = 0x%x with TF_CLOSED\n", pcb); tcp_pcb_remove(&tcp_active_pcbs, pcb); memp_free(MEMP_TCP_PCB, pcb); } else { @@ -422,6 +438,7 @@ pbuf_free(p); } + DbgPrint("tcp_input: done\n"); LWIP_ASSERT("tcp_input: tcp_pcbs_sane()", tcp_pcbs_sane()); PERF_STOP("tcp_input"); } Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/rosip.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/rosip.h [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/rosip.h [iso-8859-1] Mon Aug 1 20:10:55 2011 @@ -22,7 +22,7 @@ /* External TCP event handlers */ extern void TCPConnectEventHandler(void *arg, const err_t err); -extern void TCPAcceptEventHandler(void *arg, struct tcp_pcb *newpcb); +extern void TCPAcceptEventHandler(void *arg, PTCP_PCB newpcb); extern void TCPSendEventHandler(void *arg, const u16_t space); extern void TCPFinEventHandler(void *arg, const err_t err); extern u32_t TCPRecvEventHandler(void *arg, struct pbuf *p); Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rosip.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rosip.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rosip.c [iso-8859-1] Mon Aug 1 20:10:55 2011 @@ -4,6 +4,8 @@ #include "rosip.h" #include <debug.h> + +typedef struct netif* PNETIF; void LibIPInsertPacket(void *ifarg, @@ -26,9 +28,7 @@ RtlCopyMemory(p1->payload, ((PUCHAR)data) + i, p1->len); } - DbgPrint("LibIPInsertPacket: called 0x%x\n", *((struct netif *)ifarg)->input); - - ((struct netif *)ifarg)->input(p, ifarg); + ((PNETIF)ifarg)->input(p, (PNETIF)ifarg); } } Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rosmem.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rosmem.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rosmem.c [iso-8859-1] Mon Aug 1 20:10:55 2011 @@ -1,10 +1,11 @@ - #include "lwip/opt.h" #include "lwip/def.h" #include "lwip/mem.h" -#define LWIP_TAG 'PIwl' +#ifndef LWIP_TAG + #define LWIP_TAG 'PIwl' +#endif void * malloc(mem_size_t size) @@ -27,6 +28,7 @@ void free(void *mem) { + //DbgPrint("ROSMEM: free 0x%x\n", mem); ExFreePoolWithTag(mem, LWIP_TAG); } Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c [iso-8859-1] Mon Aug 1 20:10:55 2011 @@ -45,8 +45,7 @@ Entry = RemoveHeadList(&Connection->PacketQueue); qp = CONTAINING_RECORD(Entry, QUEUE_ENTRY, ListEntry); - - // reenable this later + pbuf_free(qp->p); ExFreePoolWithTag(qp, LWIP_TAG); @@ -772,7 +771,7 @@ { tcp_arg(pcb, NULL); /* - if this pcb is not in LISTEN state than it has + if this pcb is not in LISTEN state then it has valid recv, send and err callbacks to cancel */ if (pcb->state != LISTEN) @@ -796,8 +795,6 @@ if (!msg->Connection->SocketContext) { DbgPrint("[lwIP, LibTCPCloseCallback] NULL pcb...bail, bail!!!\n"); - - //ASSERT(FALSE); msg->Error = ERR_OK; return;

1 0

[cgutman] 53019: [TCPIP] - Remove the extra debug prints since the bug has been fixed
by cgutman＠svn.reactos.org 01 Aug '11

01 Aug '11

Author: cgutman Date: Mon Aug 1 13:50:00 2011 New Revision: 53019 URL: http://svn.reactos.org/svn/reactos?rev=53019&view=rev Log: [TCPIP] - Remove the extra debug prints since the bug has been fixed Modified: trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c trunk/reactos/lib/drivers/ip/transport/tcp/accept.c trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c Modified: trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Mon Aug 1 13:50:00 2011 @@ -284,7 +284,6 @@ { /* The client specified an explicit port so we force a bind to this */ AddrFile->Port = TCPAllocatePort(Address->Address[0].Address[0].sin_port); - DbgPrint("Bind - Explicit port %d\n", AddrFile->Port); /* Check for bind success */ if (AddrFile->Port == 0xffff) @@ -300,7 +299,6 @@ { /* The client is trying to bind to a local address so allocate a port now too */ AddrFile->Port = TCPAllocatePort(0); - DbgPrint("Bind - Unspecified port %d\n", AddrFile->Port); /* Check for bind success */ if (AddrFile->Port == 0xffff) Modified: trunk/reactos/lib/drivers/ip/transport/tcp/accept.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] Mon Aug 1 13:50:00 2011 @@ -88,8 +88,6 @@ Status = TCPTranslateError(OskitTCPBind(Connection, &AddressToBind, sizeof(AddressToBind))); - - DbgPrint("Listen - Explicit bind on port %d returned 0x%x\n", Connection->AddressFile->Port, Status); } else { @@ -110,7 +108,6 @@ { /* Allocate the port in the port bitmap */ Connection->AddressFile->Port = TCPAllocatePort(LocalAddress.Address[0].Address[0].sin_port); - DbgPrint("Listen - Implicit bind on port %d\n", Connection->AddressFile->Port); /* This should never fail */ ASSERT(Connection->AddressFile->Port != 0xFFFF); Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Mon Aug 1 13:50:00 2011 @@ -773,8 +773,6 @@ Status = TCPTranslateError(OskitTCPBind(Connection, &AddressToBind, sizeof(AddressToBind))); - - DbgPrint("Connect - Explicit bind on port %d returned 0x%x\n", Connection->AddressFile->Port, Status); } else { @@ -805,7 +803,6 @@ { /* Allocate the port in the port bitmap */ Connection->AddressFile->Port = TCPAllocatePort(LocalAddress.Address[0].Address[0].sin_port); - DbgPrint("Connect - Implicit bind on port %d\n", Connection->AddressFile->Port); /* This should never fail */ ASSERT(Connection->AddressFile->Port != 0xFFFF);

1 0

[cgutman] 53018: [AFD] - Use the correct access mode
by cgutman＠svn.reactos.org 01 Aug '11

01 Aug '11

Author: cgutman Date: Mon Aug 1 12:41:31 2011 New Revision: 53018 URL: http://svn.reactos.org/svn/reactos?rev=53018&view=rev Log: [AFD] - Use the correct access mode Modified: trunk/reactos/drivers/network/afd/afd/lock.c Modified: trunk/reactos/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/lo… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] Mon Aug 1 12:41:31 2011 @@ -156,7 +156,7 @@ if( MapBuf[i].Mdl ) { AFD_DbgPrint(MID_TRACE,("Probe and lock pages\n")); _SEH2_TRY { - MmProbeAndLockPages( MapBuf[i].Mdl, KernelMode, + MmProbeAndLockPages( MapBuf[i].Mdl, UserMode, Write ? IoModifyAccess : IoReadAccess ); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { LockFailed = TRUE;

1 0

[cgutman] 53017: [TCPIP] - Cancel the disconnect timer if the disconnect is cancelled
by cgutman＠svn.reactos.org 01 Aug '11

01 Aug '11

Author: cgutman Date: Mon Aug 1 04:06:55 2011 New Revision: 53017 URL: http://svn.reactos.org/svn/reactos?rev=53017&view=rev Log: [TCPIP] - Cancel the disconnect timer if the disconnect is cancelled Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Mon Aug 1 04:06:55 2011 @@ -120,6 +120,7 @@ PTRANSPORT_CONTEXT TranContext; PFILE_OBJECT FileObject; UCHAR MinorFunction; + PCONNECTION_ENDPOINT Connection; BOOLEAN DequeuedIrp = TRUE; IoReleaseCancelSpinLock(Irp->CancelIrql); @@ -171,7 +172,16 @@ break; case TDI_DISCONNECT: + Connection = (PCONNECTION_ENDPOINT)TranContext->Handle.ConnectionContext; + DequeuedIrp = TCPRemoveIRP(TranContext->Handle.ConnectionContext, Irp); + if (DequeuedIrp) + { + if (KeCancelTimer(&Connection->DisconnectTimer)) + { + DereferenceObject(Connection); + } + } break; default:

1 0

[cgutman] 53016: [AFD] - Cancel the in-flight disconnect IRP during socket closure [TCPIP] - Make a disconnect IRP cancelable
by cgutman＠svn.reactos.org 01 Aug '11

01 Aug '11

Author: cgutman Date: Mon Aug 1 03:54:19 2011 New Revision: 53016 URL: http://svn.reactos.org/svn/reactos?rev=53016&view=rev Log: [AFD] - Cancel the in-flight disconnect IRP during socket closure [TCPIP] - Make a disconnect IRP cancelable Modified: trunk/reactos/drivers/network/afd/afd/main.c trunk/reactos/drivers/network/afd/include/afd.h trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Mon Aug 1 03:54:19 2011 @@ -436,6 +436,7 @@ InFlightRequest[1] = &FCB->ReceiveIrp; InFlightRequest[2] = &FCB->SendIrp; InFlightRequest[3] = &FCB->ConnectIrp; + InFlightRequest[4] = &FCB->DisconnectIrp; /* Cancel our pending requests */ for( i = 0; i < IN_FLIGHT_REQUESTS; i++ ) { Modified: trunk/reactos/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/includ… ============================================================================== --- trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] Mon Aug 1 03:54:19 2011 @@ -108,7 +108,7 @@ #define FUNCTION_CLOSE 6 #define MAX_FUNCTIONS 7 -#define IN_FLIGHT_REQUESTS 4 +#define IN_FLIGHT_REQUESTS 5 #define EXTRA_LOCK_BUFFERS 2 /* Number of extra buffers needed * for ancillary data on packet Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Mon Aug 1 03:54:19 2011 @@ -543,15 +543,22 @@ Status = STATUS_INVALID_PARAMETER; goto done; } - - Status = TCPDisconnect( - TranContext->Handle.ConnectionContext, - DisReq->RequestFlags, - DisReq->RequestSpecific, - DisReq->RequestConnectionInformation, - DisReq->ReturnConnectionInformation, - DispDataRequestComplete, - Irp ); + + Status = DispPrepareIrpForCancel + (TranContext->Handle.ConnectionContext, + Irp, + (PDRIVER_CANCEL)DispCancelRequest); + + if (NT_SUCCESS(Status)) + { + Status = TCPDisconnect(TranContext->Handle.ConnectionContext, + DisReq->RequestFlags, + DisReq->RequestSpecific, + DisReq->RequestConnectionInformation, + DisReq->ReturnConnectionInformation, + DispDataRequestComplete, + Irp); + } done: if (Status != STATUS_PENDING) {

1 0

[arty] 53015: [RTL] Implemenet SwapSplayLinks, return 'NewElement' correctly when inserting. Thanks to Alex Ionescu for helping out with this patch.
by arty＠svn.reactos.org 01 Aug '11

01 Aug '11

Author: arty Date: Mon Aug 1 03:23:53 2011 New Revision: 53015 URL: http://svn.reactos.org/svn/reactos?rev=53015&view=rev Log: [RTL] Implemenet SwapSplayLinks, return 'NewElement' correctly when inserting. Thanks to Alex Ionescu for helping out with this patch. Modified: trunk/reactos/lib/rtl/generictable.c trunk/reactos/lib/rtl/splaytree.c Modified: trunk/reactos/lib/rtl/generictable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/generictable.c?rev… ============================================================================== --- trunk/reactos/lib/rtl/generictable.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/generictable.c [iso-8859-1] Mon Aug 1 03:23:53 2011 @@ -213,7 +213,7 @@ Table->TableRoot = RtlSplay(NewNode); /* Return status */ - if (NewElement) *NewElement = (SearchResult == TableFoundNode); + if (NewElement) *NewElement = (SearchResult != TableFoundNode); /* Return pointer to user data */ return &((PTABLE_ENTRY_HEADER)NewNode)->UserData; @@ -300,7 +300,7 @@ /* Get the splay links and table search result immediately */ Result = RtlpFindGenericTableNodeOrParent(Table, Buffer, &NodeOrParent); - if ((Result == TableEmptyTree) || (Result != TableFoundNode)) + if (Result != TableFoundNode) { /* Nothing to delete */ return FALSE; Modified: trunk/reactos/lib/rtl/splaytree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/splaytree.c?rev=53… ============================================================================== --- trunk/reactos/lib/rtl/splaytree.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/splaytree.c [iso-8859-1] Mon Aug 1 03:23:53 2011 @@ -13,13 +13,134 @@ #define NDEBUG #include <debug.h> +//#define VERIFY_SWAP_SPLAY_LINKS + /* FUNCTIONS ***************************************************************/ +static +VOID +FixupChildLinks(PRTL_SPLAY_LINKS Links, BOOLEAN Root, BOOLEAN LeftChild) +{ + if (RtlLeftChild(Links)) { + RtlInsertAsLeftChild(Links, RtlLeftChild(Links)); + } + if (RtlRightChild(Links)) { + RtlInsertAsRightChild(Links, RtlRightChild(Links)); + } + if (!Root) { + if (LeftChild) { + RtlInsertAsLeftChild(RtlParent(Links), Links); + } else { + RtlInsertAsRightChild(RtlParent(Links), Links); + } + } +} + +/* + +Given the tree: + D + B F +A C E G + +Swap(Q,S): + +Q S Q.P Q.L Q.R S.P S.L S.R +A C S.P S.L S.R Q.P Q.L Q.R +B A S S.L S.R Q.P Q Q.R +B C S S.L S.R Q.P Q.L Q +D A S.P S.L S.R S Q.L Q.R +D B S S.L S.R S Q Q.R +D F S S.L S.R S Q.L Q + +When Q is the immediate parent of S, + Set Q's parent to S, and the proper child ptr of S to Q +When Q is the root, + Set S's parent to S + */ + +static VOID SwapSplayLinks(PRTL_SPLAY_LINKS LinkA, PRTL_SPLAY_LINKS LinkB) { - DPRINT1("UNIMPLEMENTED!\n"); + if (RtlParent(LinkA) == LinkB || RtlIsRoot(LinkB)) { + PRTL_SPLAY_LINKS Tmp = LinkA; + LinkA = LinkB; + LinkB = Tmp; + } + + { + RTL_SPLAY_LINKS Ta = *LinkA, Tb = *LinkB; + BOOLEAN RootA = RtlIsRoot(LinkA), + LeftA = RtlIsLeftChild(LinkA), + LeftB = RtlIsLeftChild(LinkB); + *LinkB = Ta; *LinkA = Tb; + + // A was parent of B is a special case: A->Parent is now B + if (RtlParent(&Tb) == LinkA) { + if (!RootA) { + if (LeftA) { + RtlInsertAsLeftChild(RtlParent(&Ta), LinkB); + } else { + RtlInsertAsRightChild(RtlParent(&Ta), LinkB); + } + } + if (LeftB) { + RtlInsertAsLeftChild(LinkB, LinkA); + } else { + RtlInsertAsRightChild(LinkB, LinkA); + } + } + + FixupChildLinks(LinkA, FALSE, LeftB); + FixupChildLinks(LinkB, RootA, LeftA); + + // A was root is a special case: B->Parent is now B + if (RootA) + RtlParent(LinkB) = LinkB; + +#ifdef VERIFY_SWAP_SPLAY_LINKS + // Verify the distinct cases of node swap + if (RootA) { + if (RtlParent(&Tb) == LinkA) { + // LinkA = D, LinkB = B + // D B S S.L S.R S Q Q.R + ASSERT(RtlParent(LinkA) == LinkB); + ASSERT(RtlLeftChild(LinkA) == RtlLeftChild(&Tb)); + ASSERT(RtlRightChild(LinkA) == RtlRightChild(&Tb)); + ASSERT(RtlParent(LinkB) == LinkB); + ASSERT(RtlLeftChild(LinkB) == (LeftB ? LinkA : RtlLeftChild(&Ta))); + ASSERT(RtlRightChild(LinkB) == (LeftB ? RtlRightChild(&Ta) : LinkA)); + } else { + // LinkA = D, LinkB = A + // D A S.P S.L S.R S Q.L Q.R + ASSERT(RtlParent(LinkA) == RtlParent(&Tb)); + ASSERT(RtlLeftChild(LinkA) == RtlLeftChild(&Tb)); + ASSERT(RtlRightChild(LinkA) == RtlRightChild(&Tb)); + ASSERT(RtlParent(LinkB) == LinkB); + ASSERT(RtlLeftChild(LinkB) == RtlLeftChild(&Ta)); + ASSERT(RtlRightChild(LinkB) == RtlRightChild(&Ta)); + } + } else { + if (RtlParent(&Tb) == LinkA) { + // LinkA = B, LinkB = A + // B A S S.L S.R Q.P Q Q.R + ASSERT(RtlParent(LinkA) == LinkB); + ASSERT(RtlLeftChild(LinkA) == RtlLeftChild(&Tb)); + ASSERT(RtlRightChild(LinkA) == RtlRightChild(&Tb)); + ASSERT(RtlParent(LinkB) == RtlParent(&Ta)); + ASSERT(RtlLeftChild(LinkB) == (LeftB ? LinkA : RtlLeftChild(&Ta))); + ASSERT(RtlRightChild(LinkB) == (LeftB ? RtlRightChild(&Ta) : LinkA)); + } else { + // LinkA = A, LinkB = C + // A C S.P S.L S.R Q.P Q.L Q.R + ASSERT(!memcmp(LinkA, &Tb, sizeof(Tb))); + ASSERT(!memcmp(LinkB, &Ta, sizeof(Ta))); + } + } +#endif + } } /* @@ -513,6 +634,7 @@ } /* Return the root entry */ + ASSERT(RtlIsRoot(N)); return N; }

1 0

[cgutman] 53014: [OSKITTCP] - Force the connection to be closed immediately - Hopefully will fix the random bind issues caused by oskit becoming out of sync with the rest of the IP library
by cgutman＠svn.reactos.org 01 Aug '11

01 Aug '11

Author: cgutman Date: Mon Aug 1 03:13:18 2011 New Revision: 53014 URL: http://svn.reactos.org/svn/reactos?rev=53014&view=rev Log: [OSKITTCP] - Force the connection to be closed immediately - Hopefully will fix the random bind issues caused by oskit becoming out of sync with the rest of the IP library Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] Mon Aug 1 03:13:18 2011 @@ -294,11 +294,17 @@ int OskitTCPClose( PCONNECTION_ENDPOINT connection ) { int error; - - OSKLock(); - if (connection->SocketContext) - { - error = soclose(connection->SocketContext); + struct socket *socket; + + OSKLock(); + socket = connection->SocketContext; + if (socket) + { + /* HACK: Force abortive close by changing SO_LINGER settings */ + socket->so_options |= SO_LINGER; + socket->so_linger = 0; + + error = soclose(socket); } else {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2011