Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gadamopoulos] 53029: [comctl32] - Register themed built-in controls even if themes are not enabled. This allows built in controls to use themes without restarting the application - Register built ...
by gadamopoulos＠svn.reactos.org 02 Aug '11

02 Aug '11

Author: gadamopoulos Date: Tue Aug 2 13:54:41 2011 New Revision: 53029 URL: http://svn.reactos.org/svn/reactos?rev=53029&view=rev Log: [comctl32] - Register themed built-in controls even if themes are not enabled. This allows built in controls to use themes without restarting the application - Register built in controls in the same way it done in windows (as global classes that belong to comctl32). This is needed in order to have themed controls in dialogs. Unfortunately our user32/win32k does not support it yet and this breaks themed built in controls Modified: branches/GSoC_2011/ThemesSupport/dll/win32/comctl32/theming.c Modified: branches/GSoC_2011/ThemesSupport/dll/win32/comctl32/theming.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/comctl32/theming.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/comctl32/theming.c [iso-8859-1] Tue Aug 2 13:54:41 2011 @@ -118,9 +118,7 @@ { 'C','C','3','2','T','h','e','m','i','n','g','S','u','b','C','l',0 }; static const WCHAR refDataPropName[] = { 'C','C','3','2','T','h','e','m','i','n','g','D','a','t','a',0 }; - - if (!IsThemeActive()) return; - + atSubclassProp = GlobalAddAtomW (subclassPropName); atRefDataProp = GlobalAddAtomW (refDataPropName); @@ -133,6 +131,8 @@ GetClassInfoExW (NULL, subclasses[i].className, &class); originalProcs[i] = class.lpfnWndProc; class.lpfnWndProc = subclassProcs[i]; + class.style |= CS_GLOBALCLASS; + class.hInstance = COMCTL32_hModule; if (!class.lpfnWndProc) {

1 0

[cgutman] 53028: [AFD] - Handle TDI receive completion better
by cgutman＠svn.reactos.org 02 Aug '11

02 Aug '11

Author: cgutman Date: Tue Aug 2 13:46:16 2011 New Revision: 53028 URL: http://svn.reactos.org/svn/reactos?rev=53028&view=rev Log: [AFD] - Handle TDI receive completion better Modified: trunk/reactos/drivers/network/afd/afd/read.c Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Tue Aug 2 13:46:16 2011 @@ -23,22 +23,38 @@ */ #include "afd.h" -static VOID HandleEOFOnIrp( PAFD_FCB FCB, NTSTATUS Status, ULONG_PTR Information ) +static VOID HandleReceiveComplete( PAFD_FCB FCB, NTSTATUS Status, ULONG_PTR Information ) { - if (Status != STATUS_SUCCESS) - { + FCB->Recv.BytesUsed = 0; + + /* Receive successful with new data */ + if (Status == STATUS_SUCCESS && Information) + { + FCB->Recv.Content = Information; + } + /* Receive successful with no data (graceful closure) */ + else if (Status == STATUS_SUCCESS) + { + FCB->Recv.Content = 0; FCB->TdiReceiveClosed = TRUE; - + + /* Signal graceful receive shutdown */ + FCB->PollState |= AFD_EVENT_DISCONNECT; + FCB->PollStatus[FD_CLOSE_BIT] = Status; + + PollReeval( FCB->DeviceExt, FCB->FileObject ); + } + /* Receive failed with no data (unexpected closure) */ + else + { + FCB->Recv.Content = 0; + FCB->TdiReceiveClosed = TRUE; + /* Signal complete connection failure immediately */ FCB->PollState |= AFD_EVENT_CLOSE; FCB->PollStatus[FD_CLOSE_BIT] = Status; PollReeval( FCB->DeviceExt, FCB->FileObject ); - } - else if (Status == STATUS_SUCCESS && !Information) - { - /* Wait to signal graceful close until all data is read */ - FCB->TdiReceiveClosed = TRUE; } } @@ -228,17 +244,6 @@ FCB->PollStatus[FD_READ_BIT] = STATUS_SUCCESS; PollReeval( FCB->DeviceExt, FCB->FileObject ); } - else if (CantReadMore(FCB) && - !(FCB->PollState & (AFD_EVENT_CLOSE | AFD_EVENT_ABORT))) - { - FCB->PollState &= ~AFD_EVENT_RECEIVE; - - /* Signal graceful receive shutdown */ - FCB->PollState |= AFD_EVENT_DISCONNECT; - FCB->PollStatus[FD_CLOSE_BIT] = STATUS_SUCCESS; - - PollReeval( FCB->DeviceExt, FCB->FileObject ); - } else { FCB->PollState &= ~AFD_EVENT_RECEIVE; @@ -272,9 +277,6 @@ ASSERT(FCB->ReceiveIrp.InFlightRequest == Irp); FCB->ReceiveIrp.InFlightRequest = NULL; - - FCB->Recv.Content = Irp->IoStatus.Information; - FCB->Recv.BytesUsed = 0; if( FCB->State == SOCKET_STATE_CLOSED ) { /* Cleanup our IRP queue because the FCB is being destroyed */ @@ -298,7 +300,7 @@ return STATUS_INVALID_PARAMETER; } - HandleEOFOnIrp( FCB, Irp->IoStatus.Status, Irp->IoStatus.Information ); + HandleReceiveComplete( FCB, Irp->IoStatus.Status, Irp->IoStatus.Information ); ReceiveActivity( FCB, NULL );

1 0

[gadamopoulos] 53027: [comctl32] - Do not call CombineRgn with erroneous parameters - Should be sent to wine
by gadamopoulos＠svn.reactos.org 02 Aug '11

02 Aug '11

Author: gadamopoulos Date: Tue Aug 2 13:42:18 2011 New Revision: 53027 URL: http://svn.reactos.org/svn/reactos?rev=53027&view=rev Log: [comctl32] - Do not call CombineRgn with erroneous parameters - Should be sent to wine Modified: branches/GSoC_2011/ThemesSupport/dll/win32/comctl32/listview.c Modified: branches/GSoC_2011/ThemesSupport/dll/win32/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/comctl32/listview.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/comctl32/listview.c [iso-8859-1] Tue Aug 2 13:42:18 2011 @@ -10400,7 +10400,7 @@ cliprgn = CreateRectRgn (r.left + cxEdge, r.top + cyEdge, r.right - cxEdge, r.bottom - cyEdge); - if (region != (HRGN)1) + if (region > (HRGN)1) CombineRgn (cliprgn, cliprgn, region, RGN_AND); OffsetRect(&r, -r.left, -r.top);

1 0

[gadamopoulos] 53026: [uxtheme] - Do not try to load the current theme when uxtheme loads. Instead, load the current theme when theme hooks are installed or when the application receives a WM_THEME...
by gadamopoulos＠svn.reactos.org 02 Aug '11

02 Aug '11

Author: gadamopoulos Date: Tue Aug 2 13:38:58 2011 New Revision: 53026 URL: http://svn.reactos.org/svn/reactos?rev=53026&view=rev Log: [uxtheme] - Do not try to load the current theme when uxtheme loads. Instead, load the current theme when theme hooks are installed or when the application receives a WM_THEMECHANGED message. This allows us to change themes without restarting the running applications. - Use the default behaviour of DefWindowProc from user32 when themes are not active. This allows us to have api hooks enabled when themes are disabled. Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/system.c branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themehooks.c branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/uxthemedll.h Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/system.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/system.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/system.c [iso-8859-1] Tue Aug 2 13:38:58 2011 @@ -148,7 +148,7 @@ * * Set the current active theme from the registry */ -static void UXTHEME_LoadTheme(void) +void UXTHEME_LoadTheme(void) { HKEY hKey; DWORD buffsize; @@ -542,8 +542,6 @@ atSubAppName = GlobalAddAtomW(szSubAppName); atSubIdList = GlobalAddAtomW(szSubIdList); atDialogThemeEnabled = GlobalAddAtomW(szDialogThemeEnabled); - - UXTHEME_LoadTheme(); } /*********************************************************************** Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themehooks.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themehooks.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themehooks.c [iso-8859-1] Tue Aug 2 13:38:58 2011 @@ -29,6 +29,14 @@ static LRESULT CALLBACK ThemeDefWindowProcW(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) { + if(!IsThemeActive()) + { + return user32ApiHook.DefWindowProcW(hWnd, + Msg, + wParam, + lParam); + } + return ThemeWndProc(hWnd, Msg, wParam, @@ -39,11 +47,32 @@ static LRESULT CALLBACK ThemeDefWindowProcA(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) { + if(!IsThemeActive()) + { + return user32ApiHook.DefWindowProcA(hWnd, + Msg, + wParam, + lParam); + } + return ThemeWndProc(hWnd, Msg, wParam, lParam, user32ApiHook.DefWindowProcA); +} + +static LRESULT CALLBACK +ThemePreWindowProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam, ULONG_PTR ret,PDWORD unknown) +{ + switch(Msg) + { + case WM_THEMECHANGED: + UXTHEME_LoadTheme(); + return 0; + } + + return 0; } BOOL CALLBACK @@ -60,6 +89,7 @@ puah->DefWindowProcA = ThemeDefWindowProcA; puah->DefWindowProcW = ThemeDefWindowProcW; + puah->PreWndProc = ThemePreWindowProc; puah->DefWndProcArray.MsgBitArray = gabDWPmessages; puah->DefWndProcArray.Size = UAHOWP_MAX_SIZE; puah->WndProcArray.MsgBitArray = gabMSGPmessages; @@ -100,7 +130,7 @@ UAH_HOOK_MESSAGE(puah->WndProcArray, WM_THEMECHANGED); UAH_HOOK_MESSAGE(puah->WndProcArray, WM_UAHINIT); - UXTHEME_InitSystem(hDllInst); + UXTHEME_LoadTheme(); return TRUE; } Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/uxthemedll.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/uxthemedll.h [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/uxthemedll.h [iso-8859-1] Tue Aug 2 13:38:58 2011 @@ -95,6 +95,7 @@ ParseThemeIniFileProc callback, LPVOID lpData); extern void UXTHEME_InitSystem(HINSTANCE hInst); +extern void UXTHEME_LoadTheme(void); /* No alpha blending */ #define ALPHABLEND_NONE 0

1 0

[jgardou] 53025: [CMAKE/GCC] - fix entry point for native dlls
by jgardou＠svn.reactos.org 02 Aug '11

02 Aug '11

Author: jgardou Date: Tue Aug 2 06:11:12 2011 New Revision: 53025 URL: http://svn.reactos.org/svn/reactos?rev=53025&view=rev Log: [CMAKE/GCC] - fix entry point for native dlls Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=53025&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Tue Aug 2 06:11:12 2011 @@ -165,6 +165,7 @@ add_dependencies(${MODULE} bugcodes) elseif(${TYPE} MATCHES nativedll) set_subsystem(${MODULE} native) + set_entrypoint(${MODULE} DllMain 12) else() message(FATAL_ERROR "Unknown module type : ${TYPE}") endif()

1 0

[jgardou] 53024: [PSDK/WINNT.H] - add DEFINE_ENUM_FLAG_OPERATORS macro
by jgardou＠svn.reactos.org 02 Aug '11

02 Aug '11

Author: jgardou Date: Tue Aug 2 06:10:15 2011 New Revision: 53024 URL: http://svn.reactos.org/svn/reactos?rev=53024&view=rev Log: [PSDK/WINNT.H] - add DEFINE_ENUM_FLAG_OPERATORS macro Modified: trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Tue Aug 2 06:10:15 2011 @@ -313,6 +313,22 @@ #define ERROR_SEVERITY_INFORMATIONAL 0x40000000 #define ERROR_SEVERITY_WARNING 0x80000000 #define ERROR_SEVERITY_ERROR 0xC0000000 + +#ifdef __cplusplus +#define DEFINE_ENUM_FLAG_OPERATORS(ENUMTYPE) \ +extern "C++" { \ + inline ENUMTYPE operator | (ENUMTYPE a, ENUMTYPE b) { return ENUMTYPE(((int)a)|((int)b)); } \ + inline ENUMTYPE operator |= (ENUMTYPE &a, ENUMTYPE b) { return (ENUMTYPE &)(((int &)a) |= ((int)b)); } \ + inline ENUMTYPE operator & (ENUMTYPE a, ENUMTYPE b) { return ENUMTYPE(((int)a)&((int)b)); } \ + inline ENUMTYPE operator &= (ENUMTYPE &a, ENUMTYPE b) { return (ENUMTYPE &)(((int &)a) &= ((int)b)); } \ + inline ENUMTYPE operator ~ (ENUMTYPE a) { return (ENUMTYPE)(~((int)a)); } \ + inline ENUMTYPE operator ^ (ENUMTYPE a, ENUMTYPE b) { return ENUMTYPE(((int)a)^((int)b)); } \ + inline ENUMTYPE operator ^= (ENUMTYPE &a, ENUMTYPE b) { return (ENUMTYPE &)(((int &)a) ^= ((int)b)); } \ +} +#else +#define DEFINE_ENUM_FLAG_OPERATORS(ENUMTYPE) /* */ +#endif + /* also in ddk/ntifs.h */ #define COMPRESSION_FORMAT_NONE (0x0000) #define COMPRESSION_FORMAT_DEFAULT (0x0001)

1 0

[rharabien] 53023: [NTOSKRNL] - Fix *TRACE macros definition. See r53008 for more info.
by rharabien＠svn.reactos.org 01 Aug '11

01 Aug '11

Author: rharabien Date: Mon Aug 1 22:59:44 2011 New Revision: 53023 URL: http://svn.reactos.org/svn/reactos?rev=53023&view=rev Log: [NTOSKRNL] - Fix *TRACE macros definition. See r53008 for more info. Modified: trunk/reactos/ntoskrnl/include/internal/cm.h trunk/reactos/ntoskrnl/include/internal/dbgk.h trunk/reactos/ntoskrnl/include/internal/fsrtl.h trunk/reactos/ntoskrnl/include/internal/hdl.h trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/include/internal/lpc.h trunk/reactos/ntoskrnl/include/internal/po.h trunk/reactos/ntoskrnl/include/internal/ps.h trunk/reactos/ntoskrnl/include/internal/vdm.h Modified: trunk/reactos/ntoskrnl/include/internal/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] Mon Aug 1 22:59:44 2011 @@ -33,7 +33,7 @@ if (x & CmpTraceLevel) DbgPrint(__VA_ARGS__) #endif #else -#define CMTRACE(x, ...) DPRINT(__VA_ARGS__) +#define CMTRACE(x, fmt, ...) DPRINT(fmt, ##__VA_ARGS__) #endif // Modified: trunk/reactos/ntoskrnl/include/internal/dbgk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/dbgk.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/dbgk.h [iso-8859-1] Mon Aug 1 22:59:44 2011 @@ -43,7 +43,7 @@ } #endif #else -#define DBGKTRACE(x, ...) DPRINT(__VA_ARGS__) +#define DBGKTRACE(x, fmt, ...) DPRINT(fmt, ##__VA_ARGS__) #endif VOID Modified: trunk/reactos/ntoskrnl/include/internal/fsrtl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/fsrtl.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/fsrtl.h [iso-8859-1] Mon Aug 1 22:59:44 2011 @@ -36,7 +36,7 @@ if (x & FsRtlpTraceLevel) DbgPrint(__VA_ARGS__) #endif #else -#define FSTRACE(x, ...) DPRINT(__VA_ARGS__) +#define FSTRACE(x, fmt, ...) DPRINT(fmt, ##__VA_ARGS__) #endif // Modified: trunk/reactos/ntoskrnl/include/internal/hdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/hdl.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/hdl.h [iso-8859-1] Mon Aug 1 22:59:44 2011 @@ -30,7 +30,7 @@ if (x & HdlpTraceLevel) DbgPrint(__VA_ARGS__) #endif #else -#define HDLTRACE(x, ...) DPRINT(__VA_ARGS__) +#define HDLTRACE(x, fmt, ...) DPRINT(fmt, ##__VA_ARGS__) #endif // Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] Mon Aug 1 22:59:44 2011 @@ -10,7 +10,7 @@ // // Define this if you want debugging support // -#define _IO_DEBUG_ 0x00 +#define _IO_DEBUG_ 0x01 // // These define the Debug Masks Supported @@ -43,7 +43,7 @@ } #endif #else -#define IOTRACE(x, ...) DPRINT(__VA_ARGS__) +#define IOTRACE(x, fmt, ...) DPRINT(fmt, ##__VA_ARGS__) #endif // Modified: trunk/reactos/ntoskrnl/include/internal/lpc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/lpc.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/lpc.h [iso-8859-1] Mon Aug 1 22:59:44 2011 @@ -46,7 +46,7 @@ } #endif #else -#define LPCTRACE(x, ...) DPRINT(__VA_ARGS__) +#define LPCTRACE(x, fmt, ...) DPRINT(fmt, ##__VA_ARGS__) #endif // Modified: trunk/reactos/ntoskrnl/include/internal/po.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/po.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/po.h [iso-8859-1] Mon Aug 1 22:59:44 2011 @@ -30,7 +30,7 @@ if (x & PopTraceLevel) DbgPrint(__VA_ARGS__) #endif #else -#define POTRACE(x, ...) DPRINT(__VA_ARGS__) +#define POTRACE(x, fmt, ...) DPRINT(fmt, ##__VA_ARGS__) #endif typedef struct _PO_HIBER_PERF Modified: trunk/reactos/ntoskrnl/include/internal/ps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ps.h [iso-8859-1] Mon Aug 1 22:59:44 2011 @@ -54,7 +54,7 @@ __LINE__, \ OBJECT_TO_OBJECT_HEADER(x)->PointerCount) #else -#define PSTRACE(x, ...) DPRINT(__VA_ARGS__) +#define PSTRACE(x, fmt, ...) DPRINT(fmt, ##__VA_ARGS__) #define PSREFTRACE(x) #endif Modified: trunk/reactos/ntoskrnl/include/internal/vdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/vdm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/vdm.h [iso-8859-1] Mon Aug 1 22:59:44 2011 @@ -27,7 +27,7 @@ if (x & VdmpTraceLevel) DbgPrint(__VA_ARGS__) #endif #else -#define VMTRACE(x, ...) DPRINT(__VA_ARGS__) +#define VMTRACE(x, fmt, ...) DPRINT(fmt, ##__VA_ARGS__) #endif //

1 0

[rharabien] 53022: [WIN32K] - Fix possible thread reference leak when calling hook - Fix possible memory corruption if hook is unexpectedly removed - Cleanup hooks a bit - Fixes bug #1567 (explorer...
by rharabien＠svn.reactos.org 01 Aug '11

01 Aug '11

Author: rharabien Date: Mon Aug 1 22:30:21 2011 New Revision: 53022 URL: http://svn.reactos.org/svn/reactos?rev=53022&view=rev Log: [WIN32K] - Fix possible thread reference leak when calling hook - Fix possible memory corruption if hook is unexpectedly removed - Cleanup hooks a bit - Fixes bug #1567 (explorer ghost in taskmgr) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Mon Aug 1 22:30:21 2011 @@ -5,6 +5,7 @@ * FILE: subsystems/win32/win32k/ntuser/hook.c * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * James Tabor (james.tabor(a)rectos.org) + * Rafal Harabien (rafalh(a)reactos.org) * * REVISION HISTORY: * 06-06-2001 CSH Created @@ -29,15 +30,15 @@ static LRESULT FASTCALL -IntCallLowLevelHook( PHOOK Hook, - INT Code, - WPARAM wParam, - LPARAM lParam) +co_IntCallLowLevelHook(PHOOK Hook, + INT Code, + WPARAM wParam, + LPARAM lParam) { NTSTATUS Status; PTHREADINFO pti; PHOOKPACK pHP; - INT Size; + INT Size = 0; UINT uTimeout = 300; BOOL Block = FALSE; ULONG_PTR uResult = 0; @@ -53,7 +54,6 @@ pHP->pHk = Hook; pHP->lParam = lParam; pHP->pHookStructs = NULL; - Size = 0; // This prevents stack corruption from the caller. switch(Hook->HookId) @@ -170,13 +170,14 @@ &Hook->ModuleName); } +static LRESULT FASTCALL -IntCallDebugHook( PHOOK Hook, - int Code, - WPARAM wParam, - LPARAM lParam, - BOOL Ansi) +co_IntCallDebugHook(PHOOK Hook, + int Code, + WPARAM wParam, + LPARAM lParam, + BOOL Ansi) { LRESULT lResult = 0; ULONG Size; @@ -302,13 +303,14 @@ return lResult; } +static LRESULT FASTCALL -UserCallNextHookEx( PHOOK Hook, - int Code, - WPARAM wParam, - LPARAM lParam, - BOOL Ansi) +co_UserCallNextHookEx(PHOOK Hook, + int Code, + WPARAM wParam, + LPARAM lParam, + BOOL Ansi) { LRESULT lResult = 0; BOOL BadChk = FALSE; @@ -697,7 +699,7 @@ } case WH_DEBUG: - lResult = IntCallDebugHook(Hook, Code, wParam, lParam, Ansi); + lResult = co_IntCallDebugHook(Hook, Code, wParam, lParam, Ansi); break; /* @@ -740,31 +742,35 @@ return Hook; } -/* get the first hook in the chain */ static -PHOOK +HHOOK* FASTCALL -IntGetFirstHook(PLIST_ENTRY Table) -{ - PLIST_ENTRY Elem = Table->Flink; - - if (IsListEmpty(Table)) return NULL; - - return Elem == Table ? NULL : CONTAINING_RECORD(Elem, HOOK, Chain); -} - -static -PHOOK -FASTCALL -IntGetNextGlobalHook(PHOOK Hook, PDESKTOP pdo) -{ - int HookId = Hook->HookId; - PLIST_ENTRY Elem; - - Elem = Hook->Chain.Flink; - if (Elem != &pdo->pDeskInfo->aphkStart[HOOKID_TO_INDEX(HookId)]) - return CONTAINING_RECORD(Elem, HOOK, Chain); - return NULL; +IntGetGlobalHookHandles(PDESKTOP pdo, int HookId) +{ + PLIST_ENTRY pLastHead, pElem; + unsigned i, cHooks; + HHOOK *pList; + PHOOK pHook; + + pLastHead = &pdo->pDeskInfo->aphkStart[HOOKID_TO_INDEX(HookId)]; + for (pElem = pLastHead->Flink; pElem != pLastHead; pElem = pElem->Flink) + ++cHooks; + + pList = ExAllocatePoolWithTag(PagedPool, (cHooks + 1) * sizeof(HHOOK), TAG_HOOK); + if(!pList) + { + EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + + for (pElem = pLastHead->Flink; pElem != pLastHead; pElem = pElem->Flink) + { + pHook = CONTAINING_RECORD(pElem, HOOK, Chain); + pList[i++] = pHook->head.h; + } + pList[i] = NULL; + + return pList; } /* find the next hook in the chain */ @@ -773,22 +779,23 @@ IntGetNextHook(PHOOK Hook) { int HookId = Hook->HookId; - PLIST_ENTRY Elem; + PLIST_ENTRY pLastHead, pElem; PTHREADINFO pti; if (Hook->Thread) { pti = ((PTHREADINFO)Hook->Thread->Tcb.Win32Thread); - - Elem = Hook->Chain.Flink; - if (Elem != &pti->aphkStart[HOOKID_TO_INDEX(HookId)]) - return CONTAINING_RECORD(Elem, HOOK, Chain); + pLastHead = &pti->aphkStart[HOOKID_TO_INDEX(HookId)]; } else { pti = PsGetCurrentThreadWin32Thread(); - return IntGetNextGlobalHook(Hook, pti->rpdesk); - } + pLastHead = &pti->rpdesk->pDeskInfo->aphkStart[HOOKID_TO_INDEX(HookId)]; + } + + pElem = Hook->Chain.Flink; + if (pElem != pLastHead) + return CONTAINING_RECORD(pElem, HOOK, Chain); return NULL; } @@ -810,7 +817,7 @@ /* remove a hook, freeing it from the chain */ static -BOOL +VOID FASTCALL IntRemoveHook(PHOOK Hook) { @@ -837,7 +844,6 @@ { } _SEH2_END; - return TRUE; } } else // Global @@ -851,10 +857,8 @@ IsListEmpty(&pdo->pDeskInfo->aphkStart[HOOKID_TO_INDEX(HookId)]) ) { pdo->pDeskInfo->fsHooks &= ~HOOKID_TO_FLAG(HookId); - return TRUE; - } - } - return FALSE; + } + } } VOID @@ -875,27 +879,21 @@ DPRINT1("Kill Thread Hooks pti 0x%x pdo 0x%x\n",pti,pdo); return; } - ObReferenceObject(Thread); // Local Thread cleanup. if (pti->fsHooks) { for (HookId = WH_MINHOOK; HookId <= WH_MAXHOOK; HookId++) { - PLIST_ENTRY pLLE = &pti->aphkStart[HOOKID_TO_INDEX(HookId)]; - - if (IsListEmpty(pLLE)) continue; - - pElem = pLLE->Flink; - HookObj = CONTAINING_RECORD(pElem, HOOK, Chain); - do + PLIST_ENTRY pLastHead = &pti->aphkStart[HOOKID_TO_INDEX(HookId)]; + + pElem = pLastHead->Flink; + while (pElem != pLastHead) { - if (!HookObj) break; - if (IntRemoveHook(HookObj)) break; - pElem = HookObj->Chain.Flink; HookObj = CONTAINING_RECORD(pElem, HOOK, Chain); + pElem = HookObj->Chain.Flink; // get next element before hook is destroyed + IntRemoveHook(HookObj); } - while (pElem != pLLE); } pti->fsHooks = 0; } @@ -905,25 +903,19 @@ for (HookId = WH_MINHOOK; HookId <= WH_MAXHOOK; HookId++) { PLIST_ENTRY pGLE = &pdo->pDeskInfo->aphkStart[HOOKID_TO_INDEX(HookId)]; - - if (IsListEmpty(pGLE)) continue; - + pElem = pGLE->Flink; - HookObj = CONTAINING_RECORD(pElem, HOOK, Chain); - do + while (pElem != pGLE) { - if (!HookObj) break; + HookObj = CONTAINING_RECORD(pElem, HOOK, Chain); + pElem = HookObj->Chain.Flink; // get next element before hook is destroyed if (HookObj->head.pti == pti) { - if (IntRemoveHook(HookObj)) break; + IntRemoveHook(HookObj); } - pElem = HookObj->Chain.Flink; - HookObj = CONTAINING_RECORD(pElem, HOOK, Chain); } - while (pElem != pGLE); } } - ObDereferenceObject(Thread); return; } @@ -940,10 +932,11 @@ PHOOK Hook, SaveHook; PTHREADINFO pti; PCLIENTINFO ClientInfo; - PLIST_ENTRY pLLE, pGLE; + PLIST_ENTRY pLastHead; PDESKTOP pdo; BOOL Local = FALSE, Global = FALSE; LRESULT Result = 0; + USER_REFERENCE_ENTRY Ref; ASSERT(WH_MINHOOK <= HookId && HookId <= WH_MAXHOOK); @@ -992,14 +985,15 @@ */ if ( Local ) { - pLLE = &pti->aphkStart[HOOKID_TO_INDEX(HookId)]; - Hook = IntGetFirstHook(pLLE); - if (!Hook) + pLastHead = &pti->aphkStart[HOOKID_TO_INDEX(HookId)]; + if (IsListEmpty(pLastHead)) { DPRINT1("No Local Hook Found!\n"); goto Exit; } - ObReferenceObject(Hook->Thread); + + Hook = CONTAINING_RECORD(pLastHead->Flink, HOOK, Chain); + UserRefObjectCo(Hook, &Ref); ClientInfo = pti->pClientInfo; SaveHook = pti->sphkCurrent; @@ -1043,44 +1037,46 @@ } pti->sphkCurrent = SaveHook; Hook->phkNext = NULL; - ObDereferenceObject(Hook->Thread); + UserDerefObjectCo(Hook); } if ( Global ) { PTHREADINFO ptiHook; - - pGLE = &pdo->pDeskInfo->aphkStart[HOOKID_TO_INDEX(HookId)]; - Hook = IntGetFirstHook(pGLE); - if (!Hook) - { - DPRINT1("No Global Hook Found!\n"); + HHOOK *pHookHandles; + unsigned i; + + /* Keep hooks in array because hooks can be destroyed in user world */ + pHookHandles = IntGetGlobalHookHandles(pdo, HookId); + if(!pHookHandles) goto Exit; - } + /* Performance goes down the drain. If more hooks are associated to this * hook ID, this will have to post to each of the thread message queues * or make a direct call. */ - do - { + for(i = 0; pHookHandles[i]; ++i) + { + Hook = (PHOOK)UserGetObject(gHandleTable, pHookHandles[i], otHook); + if(!Hook) + { + DPRINT1("Invalid hook!\n"); + continue; + } + UserRefObjectCo(Hook, &Ref); + /* Hook->Thread is null, we hax around this with Hook->head.pti. */ ptiHook = Hook->head.pti; - /* "Global hook monitors messages for all threads in the same desktop - * as the calling thread." - */ - if ( ptiHook->TIF_flags & (TIF_INCLEANUP|TIF_DISABLEHOOKS) || - ptiHook->rpdesk != pdo) + if ( (pti->TIF_flags & TIF_DISABLEHOOKS) || (ptiHook->TIF_flags & TIF_INCLEANUP)) { - DPRINT("Next Hook 0x%x, 0x%x\n",ptiHook->rpdesk,pdo); - Hook = IntGetNextGlobalHook(Hook, pdo); - if (!Hook) break; + DPRINT("Next Hook 0x%x, 0x%x\n", ptiHook->rpdesk, pdo); continue; } - // Lockup the thread while this links through user world. - ObReferenceObject(ptiHook->pEThread); + if (ptiHook != pti ) - { // Block | TimeOut + { + // Block | TimeOut if ( HookId == WH_JOURNALPLAYBACK || // 1 | 0 HookId == WH_JOURNALRECORD || // 1 | 0 HookId == WH_KEYBOARD || // 1 | 200 @@ -1088,13 +1084,12 @@ HookId == WH_KEYBOARD_LL || // 0 | 300 HookId == WH_MOUSE_LL ) // 0 | 300 { - DPRINT("\nGlobal Hook posting to another Thread! %d\n",HookId ); - Result = IntCallLowLevelHook(Hook, Code, wParam, lParam); + DPRINT("\nGlobal Hook posting to another Thread! %d\n", HookId); + Result = co_IntCallLowLevelHook(Hook, Code, wParam, lParam); } } else { /* Make the direct call. */ - DPRINT("\nLocal Hook calling to Thread! %d\n",HookId ); Result = co_IntCallHookProc( HookId, Code, wParam, @@ -1103,11 +1098,10 @@ Hook->Ansi, &Hook->ModuleName); } - ObDereferenceObject(ptiHook->pEThread); - Hook = IntGetNextGlobalHook(Hook, pdo); - } - while ( Hook ); - DPRINT("Ret: Global HookId %d Result 0x%x\n", HookId,Result); + UserDerefObjectCo(Hook); + } + ExFreePoolWithTag(pHookHandles, TAG_HOOK); + DPRINT("Ret: Global HookId %d Result 0x%x\n", HookId, Result); } Exit: return Result; @@ -1118,7 +1112,7 @@ IntUnhookWindowsHook(int HookId, HOOKPROC pfnFilterProc) { PHOOK Hook; - PLIST_ENTRY pLLE, pLE; + PLIST_ENTRY pLastHead, pElement; PTHREADINFO pti = PsGetCurrentThreadWin32Thread(); if (HookId < WH_MINHOOK || WH_MAXHOOK < HookId ) @@ -1129,15 +1123,13 @@ if (pti->fsHooks) { - pLLE = &pti->aphkStart[HOOKID_TO_INDEX(HookId)]; - - if (IsListEmpty(pLLE)) return FALSE; - - pLE = pLLE->Flink; - Hook = CONTAINING_RECORD(pLE, HOOK, Chain); - do - { - if (!Hook) break; + pLastHead = &pti->aphkStart[HOOKID_TO_INDEX(HookId)]; + + pElement = pLastHead->Flink; + while (pElement != pLastHead) + { + Hook = CONTAINING_RECORD(pElement, HOOK, Chain); + if (Hook->Proc == pfnFilterProc) { if (Hook->head.pti == pti) @@ -1152,10 +1144,9 @@ return FALSE; } } - pLE = Hook->Chain.Flink; - Hook = CONTAINING_RECORD(pLE, HOOK, Chain); - } - while (pLE != pLLE); + + pElement = Hook->Chain.Flink; + } } return FALSE; } @@ -1207,7 +1198,7 @@ if (ClientInfo && NextObj) { NextObj->phkNext = IntGetNextHook(NextObj); - lResult = UserCallNextHookEx( NextObj, Code, wParam, lParam, NextObj->Ansi); + lResult = co_UserCallNextHookEx( NextObj, Code, wParam, lParam, NextObj->Ansi); } RETURN( lResult); @@ -1252,14 +1243,13 @@ NTSTATUS Status; HHOOK Handle; PETHREAD Thread = NULL; - PTHREADINFO ptiCurrent, pti = NULL; - BOOL Hit = FALSE; + PTHREADINFO pti, ptiHook = NULL; DECLARE_RETURN(HHOOK); DPRINT("Enter NtUserSetWindowsHookEx\n"); UserEnterExclusive(); - ptiCurrent = PsGetCurrentThreadWin32Thread(); + pti = PsGetCurrentThreadWin32Thread(); if (HookId < WH_MINHOOK || WH_MAXHOOK < HookId ) { @@ -1294,11 +1284,11 @@ RETURN( NULL); } - pti = Thread->Tcb.Win32Thread; + ptiHook = Thread->Tcb.Win32Thread; ObDereferenceObject(Thread); - if ( pti->rpdesk != ptiCurrent->rpdesk) // gptiCurrent->rpdesk) + if ( ptiHook->rpdesk != pti->rpdesk) // gptiCurrent->rpdesk) { DPRINT1("Local hook wrong desktop HookId: %d\n",HookId); EngSetLastError(ERROR_ACCESS_DENIED); @@ -1322,7 +1312,7 @@ RETURN( NULL); } - if ( (pti->TIF_flags & (TIF_CSRSSTHREAD|TIF_SYSTEMTHREAD)) && + if ( (ptiHook->TIF_flags & (TIF_CSRSSTHREAD|TIF_SYSTEMTHREAD)) && (HookId == WH_GETMESSAGE || HookId == WH_CALLWNDPROC || HookId == WH_CBT || @@ -1339,7 +1329,7 @@ } else /* system-global hook */ { - pti = ptiCurrent; // gptiCurrent; + ptiHook = pti; // gptiCurrent; if ( !Mod && (HookId == WH_GETMESSAGE || HookId == WH_CALLWNDPROC || @@ -1379,68 +1369,60 @@ Hook->ihmod = (INT)Mod; // Module Index from atom table, Do this for now. Hook->Thread = Thread; /* Set Thread, Null is Global. */ Hook->HookId = HookId; - Hook->rpdesk = pti->rpdesk; + Hook->rpdesk = ptiHook->rpdesk; Hook->phkNext = NULL; /* Dont use as a chain! Use link lists for chaining. */ Hook->Proc = HookProc; Hook->Ansi = Ansi; - DPRINT("Set Hook Desk 0x%x DeskInfo 0x%x Handle Desk 0x%x\n",pti->rpdesk, pti->pDeskInfo,Hook->head.rpdesk); + DPRINT("Set Hook Desk 0x%x DeskInfo 0x%x Handle Desk 0x%x\n", ptiHook->rpdesk, ptiHook->pDeskInfo,Hook->head.rpdesk); if (ThreadId) /* thread-local hook */ { - InsertHeadList(&pti->aphkStart[HOOKID_TO_INDEX(HookId)], &Hook->Chain); - pti->sphkCurrent = NULL; - Hook->ptiHooked = pti; - pti->fsHooks |= HOOKID_TO_FLAG(HookId); - - if (pti->pClientInfo) - { - if ( pti->ppi == ptiCurrent->ppi) /* gptiCurrent->ppi) */ + InsertHeadList(&ptiHook->aphkStart[HOOKID_TO_INDEX(HookId)], &Hook->Chain); + ptiHook->sphkCurrent = NULL; + Hook->ptiHooked = ptiHook; + ptiHook->fsHooks |= HOOKID_TO_FLAG(HookId); + + if (ptiHook->pClientInfo) + { + if ( ptiHook->ppi == pti->ppi) /* gptiCurrent->ppi) */ { _SEH2_TRY { - pti->pClientInfo->fsHooks = pti->fsHooks; - pti->pClientInfo->phkCurrent = NULL; + ptiHook->pClientInfo->fsHooks = ptiHook->fsHooks; + ptiHook->pClientInfo->phkCurrent = NULL; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Hit = TRUE; + DPRINT1("Problem writing to Local ClientInfo!\n"); } _SEH2_END; - if (Hit) - { - DPRINT1("Problem writing to Local ClientInfo!\n"); - } } else { - KeAttachProcess(&pti->ppi->peProcess->Pcb); + KeAttachProcess(&ptiHook->ppi->peProcess->Pcb); _SEH2_TRY { - pti->pClientInfo->fsHooks = pti->fsHooks; - pti->pClientInfo->phkCurrent = NULL; + ptiHook->pClientInfo->fsHooks = ptiHook->fsHooks; + ptiHook->pClientInfo->phkCurrent = NULL; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Hit = TRUE; + DPRINT1("Problem writing to Remote ClientInfo!\n"); } _SEH2_END; KeDetachProcess(); - if (Hit) - { - DPRINT1("Problem writing to Remote ClientInfo!\n"); - } } } } else { - InsertHeadList(&pti->rpdesk->pDeskInfo->aphkStart[HOOKID_TO_INDEX(HookId)], &Hook->Chain); + InsertHeadList(&ptiHook->rpdesk->pDeskInfo->aphkStart[HOOKID_TO_INDEX(HookId)], &Hook->Chain); Hook->ptiHooked = NULL; //gptiCurrent->pDeskInfo->fsHooks |= HOOKID_TO_FLAG(HookId); - pti->rpdesk->pDeskInfo->fsHooks |= HOOKID_TO_FLAG(HookId); - pti->sphkCurrent = NULL; - pti->pClientInfo->phkCurrent = NULL; + ptiHook->rpdesk->pDeskInfo->fsHooks |= HOOKID_TO_FLAG(HookId); + ptiHook->sphkCurrent = NULL; + ptiHook->pClientInfo->phkCurrent = NULL; } RtlInitUnicodeString(&Hook->ModuleName, NULL);

1 0

[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

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs