Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gadamopoulos] 52639: [uxtheme] - After doing any drawing operation for the non client area, restore the previously opened theme. Fixes GetWindowTheme
by gadamopoulos＠svn.reactos.org 11 Jul '11

11 Jul '11

Author: gadamopoulos Date: Mon Jul 11 18:17:11 2011 New Revision: 52639 URL: http://svn.reactos.org/svn/reactos?rev=52639&view=rev Log: [uxtheme] - After doing any drawing operation for the non client area, restore the previously opened theme. Fixes GetWindowTheme Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/ncthm.h branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/system.c Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/ncthm.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/ncthm.h [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/ncthm.h [iso-8859-1] Mon Jul 11 18:17:11 2011 @@ -4,6 +4,7 @@ HWND hWnd; HDC hDC; HTHEME theme; + HTHEME hPrevTheme; WINDOWINFO wi; BOOL Active; /* wi.dwWindowStatus isn't correct for mdi child windows */ HRGN hRgn; Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c [iso-8859-1] Mon Jul 11 18:17:11 2011 @@ -165,6 +165,7 @@ GetWindowInfo(hWnd, &pcontext->wi); pcontext->hWnd = hWnd; pcontext->Active = IsWindowActive(hWnd, pcontext->wi.dwExStyle); + pcontext->hPrevTheme = GetPropW(hWnd, (LPCWSTR)MAKEINTATOM(atWindowTheme)); pcontext->theme = OpenThemeData(pcontext->hWnd, L"WINDOW"); pcontext->CaptionHeight = pcontext->wi.cyWindowBorders; @@ -185,6 +186,8 @@ ReleaseDC(pcontext->hWnd ,pcontext->hDC); CloseThemeData (pcontext->theme); + + SetPropW(pcontext->hWnd, (LPCWSTR)MAKEINTATOM(atWindowTheme), pcontext->hPrevTheme); if(pcontext->hRgn != NULL) { 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] Mon Jul 11 18:17:11 2011 @@ -61,7 +61,7 @@ ATOM atDialogThemeEnabled; static DWORD dwThemeAppProperties = STAP_ALLOW_NONCLIENT | STAP_ALLOW_CONTROLS; -static ATOM atWindowTheme; +ATOM atWindowTheme; static ATOM atSubAppName; static ATOM atSubIdList;

1 0

[tfaber] 52638: [KMTESTS] - add support for hidden tests also for kernel-mode - small fixes and improvements
by tfaber＠svn.reactos.org 11 Jul '11

11 Jul '11

Author: tfaber Date: Mon Jul 11 18:03:19 2011 New Revision: 52638 URL: http://svn.reactos.org/svn/reactos?rev=52638&view=rev Log: [KMTESTS] - add support for hidden tests also for kernel-mode - small fixes and improvements Modified: branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_drv.c branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeDpc.c 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 Jul 11 18:03:19 2011 @@ -129,6 +129,8 @@ #define ok_eq_uint(value, expected) ok_eq_print(value, expected, "%u") #define ok_eq_long(value, expected) ok_eq_print(value, expected, "%ld") #define ok_eq_ulong(value, expected) ok_eq_print(value, expected, "%lu") +#define ok_eq_longlong(value, expected) ok_eq_print(value, expected, "%I64d") +#define ok_eq_ulonglong(value, expected) ok_eq_print(value, expected, "%I64u") #define ok_eq_hex(value, expected) ok_eq_print(value, expected, "0x%08lx") #define ok_bool_true(value, desc) ok((value) == TRUE, desc " FALSE, expected TRUE\n") #define ok_bool_false(value, desc) ok((value) == FALSE, desc " TRUE, expected FALSE\n") 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 Jul 11 18:03:19 2011 @@ -31,6 +31,7 @@ { KMT_DO_NOTHING, KMT_LIST_TESTS, + KMT_LIST_ALL_TESTS, KMT_RUN_TEST, } KMT_OPERATION; @@ -38,11 +39,11 @@ SC_HANDLE KmtestServiceHandle; PCSTR ErrorFileAndLine = "No error"; -static void OutputError(DWORD Error); -static DWORD ListTests(VOID); -static PKMT_TESTFUNC FindTest(PCSTR TestName); -static DWORD OutputResult(PCSTR TestName); -static DWORD RunTest(PCSTR TestName); +static void OutputError(IN DWORD Error); +static DWORD ListTests(IN BOOLEAN IncludeHidden); +static PKMT_TESTFUNC FindTest(IN PCSTR TestName); +static DWORD OutputResult(IN PCSTR TestName); +static DWORD RunTest(IN PCSTR TestName); int __cdecl main(int ArgCount, char **Arguments); /** @@ -56,7 +57,7 @@ static void OutputError( - DWORD Error) + IN DWORD Error) { PSTR Message; if (!FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_ALLOCATE_BUFFER, @@ -79,11 +80,15 @@ * The list will comprise tests as listed by the driver * in addition to user-mode tests in TestList. * + * @param IncludeHidden + * TRUE to include "hidden" tests prefixed with a '-' + * * @return Win32 error code */ static DWORD -ListTests(VOID) +ListTests( + IN BOOLEAN IncludeHidden) { DWORD Error = ERROR_SUCCESS; CHAR Buffer[1024]; @@ -101,10 +106,6 @@ // output test list plus user-mode tests while (TestEntry->TestName || *TestName) { - // tests starting with a '-' should not be listed - while (TestEntry->TestName && *TestEntry->TestName == '-') - ++TestEntry; - if (!TestEntry->TestName) { NextTestName = TestName; @@ -136,7 +137,12 @@ TestName += strlen(TestName) + 1; } } - printf(" %s\n", NextTestName); + + if (IncludeHidden && NextTestName[0] == '-') + ++NextTestName; + + if (NextTestName[0] != '-') + printf(" %s\n", NextTestName); } cleanup: @@ -156,7 +162,7 @@ static PKMT_TESTFUNC FindTest( - PCSTR TestName) + IN PCSTR TestName) { PCKMT_TEST TestEntry = TestList; @@ -188,7 +194,7 @@ static DWORD OutputResult( - PCSTR TestName) + IN PCSTR TestName) { DWORD Error = ERROR_SUCCESS; DWORD BytesWritten; @@ -214,7 +220,7 @@ static DWORD RunTest( - PCSTR TestName) + IN PCSTR TestName) { DWORD Error = ERROR_SUCCESS; PKMT_TESTFUNC TestFunction; @@ -267,6 +273,7 @@ PCSTR AppName = "kmtest.exe"; PCSTR TestName = NULL; KMT_OPERATION Operation = KMT_DO_NOTHING; + BOOLEAN ShowHidden = FALSE; Error = KmtServiceInit(); if (Error) @@ -279,6 +286,7 @@ { printf("Usage: %s <test_name> - run the specified test (creates/starts the driver(s) as appropriate)\n", AppName); printf(" %s --list - list available tests\n", AppName); + printf(" %s --list-all - list available tests, including hidden\n", AppName); printf(" %s <create|delete|start|stop> - manage the kmtest driver\n\n", AppName); Operation = KMT_LIST_TESTS; } @@ -296,6 +304,8 @@ else if (!lstrcmpA(TestName, "--list")) Operation = KMT_LIST_TESTS; + else if (!lstrcmpA(TestName, "--list-all")) + Operation = KMT_LIST_ALL_TESTS; else Operation = KMT_RUN_TEST; } @@ -312,8 +322,11 @@ switch (Operation) { + case KMT_LIST_ALL_TESTS: + ShowHidden = TRUE; + /* fall through */ case KMT_LIST_TESTS: - Error = ListTests(); + Error = ListTests(ShowHidden); break; case KMT_RUN_TEST: Error = RunTest(TestName); Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_drv.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_drv.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_drv.c [iso-8859-1] Mon Jul 11 18:03:19 2011 @@ -284,7 +284,10 @@ for (TestEntry = TestList; TestEntry->TestName; ++TestEntry) { ANSI_STRING EntryName; - RtlInitAnsiString(&EntryName, TestEntry->TestName); + if (TestEntry->TestName[0] == '-') + RtlInitAnsiString(&EntryName, TestEntry->TestName + 1); + else + RtlInitAnsiString(&EntryName, TestEntry->TestName); if (!RtlCompareString(&TestName, &EntryName, FALSE)) { Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c [iso-8859-1] Mon Jul 11 18:03:19 2011 @@ -24,18 +24,18 @@ const KMT_TEST TestList[] = { - { "Example", Test_Example }, - { "ExPools", Test_ExPools }, - { "ExResource", Test_ExResource }, - { "ExTimer", Test_ExTimer }, - { "FsRtlExpression", Test_FsRtlExpression }, - { "IoDeviceInterface", Test_IoDeviceInterface }, - { "IoIrp", Test_IoIrp }, - { "IoMdl", Test_IoMdl }, - { "KeApc", Test_KeApc }, - { "KeDpc", Test_KeDpc }, - { "KeIrql", Test_KeIrql }, - { "KeProcessor", Test_KeProcessor }, - { "ObCreate", Test_ObCreate }, - { NULL, NULL } + { "Example", Test_Example }, + { "ExPools", Test_ExPools }, + { "ExResource", Test_ExResource }, + { "ExTimer", Test_ExTimer }, + { "FsRtlExpression", Test_FsRtlExpression }, + { "IoDeviceInterface", Test_IoDeviceInterface }, + { "IoIrp", Test_IoIrp }, + { "IoMdl", Test_IoMdl }, + { "KeApc", Test_KeApc }, + { "KeDpc", Test_KeDpc }, + { "KeIrql", Test_KeIrql }, + { "KeProcessor", Test_KeProcessor }, + { "ObCreate", Test_ObCreate }, + { NULL, NULL } }; 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 Jul 11 18:03:19 2011 @@ -16,8 +16,8 @@ /* TODO: DPC importance */ -static volatile LONG DpcCount = 0; -static volatile UCHAR DpcImportance = MediumImportance; +static volatile LONG DpcCount; +static volatile UCHAR DpcImportance; static KDEFERRED_ROUTINE DpcHandler; @@ -73,6 +73,9 @@ LONG ExpectedDpcCount = 0; BOOLEAN Ret; int i; + + DpcCount = 0; + DpcImportance = MediumImportance; #define ok_dpccount() ok(DpcCount == ExpectedDpcCount, "DpcCount = %ld, expected %ld\n", DpcCount, ExpectedDpcCount); trace("Dpc = %p\n", &Dpc);

1 0

[cmihail] 52637: [lwIP] - add a small hack in sys_arch.c to boost throughput; we forcefully make the timeout value a foxed constant to boost speed - add small language optimizations
by cmihail＠svn.reactos.org 11 Jul '11

11 Jul '11

Author: cmihail Date: Mon Jul 11 17:33:17 2011 New Revision: 52637 URL: http://svn.reactos.org/svn/reactos?rev=52637&view=rev Log: [lwIP] - add a small hack in sys_arch.c to boost throughput; we forcefully make the timeout value a foxed constant to boost speed - add small language optimizations Modified: 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/rostcp.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/sys_arch.c 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 Jul 11 17:33:17 2011 @@ -6,26 +6,26 @@ #include "lwip/ip_addr.h" /* External TCP event handlers */ -extern void TCPConnectEventHandler(void *arg, err_t err); +extern void TCPConnectEventHandler(void *arg, const err_t err); extern void TCPAcceptEventHandler(void *arg, struct tcp_pcb *newpcb); -extern void TCPSendEventHandler(void *arg, u16_t space); -extern void TCPFinEventHandler(void *arg, err_t err); +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); /* TCP functions */ struct tcp_pcb *LibTCPSocket(void *arg); -err_t LibTCPBind(struct tcp_pcb *pcb, struct ip_addr *ipaddr, u16_t port); -struct tcp_pcb *LibTCPListen(struct tcp_pcb *pcb, u8_t backlog); -err_t LibTCPSend(struct tcp_pcb *pcb, const void *dataptr, const u16_t len, const int safe); -err_t LibTCPConnect(struct tcp_pcb *pcb, struct ip_addr *ipaddr, u16_t port); -err_t LibTCPShutdown(struct tcp_pcb *pcb, int shut_rx, int shut_tx); +err_t LibTCPBind(struct tcp_pcb *pcb, struct ip_addr *const ipaddr, const u16_t port); +struct tcp_pcb *LibTCPListen(struct tcp_pcb *pcb, const u8_t backlog); +err_t LibTCPSend(struct tcp_pcb *pcb, void *const dataptr, const u16_t len, const int safe); +err_t LibTCPConnect(struct tcp_pcb *pcb, struct ip_addr *const ipaddr, const u16_t port); +err_t LibTCPShutdown(struct tcp_pcb *pcb, const int shut_rx, const int shut_tx); err_t LibTCPClose(struct tcp_pcb *pcb, const int safe); -err_t LibTCPGetPeerName(struct tcp_pcb *pcb, struct ip_addr *ipaddr, u16_t *port); -err_t LibTCPGetHostName(struct tcp_pcb *pcb, struct ip_addr *ipaddr, u16_t *port); +err_t LibTCPGetPeerName(struct tcp_pcb *pcb, struct ip_addr *const ipaddr, u16_t *const port); +err_t LibTCPGetHostName(struct tcp_pcb *pcb, struct ip_addr *const ipaddr, u16_t *const port); void LibTCPAccept(struct tcp_pcb *pcb, struct tcp_pcb *listen_pcb, void *arg); /* IP functions */ -void LibIPInsertPacket(void *ifarg, void *data, u32_t size); +void LibIPInsertPacket(void *ifarg, const void *const data, const u32_t size); void LibIPInitialize(void); void LibIPShutdown(void); 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 Jul 11 17:33:17 2011 @@ -7,8 +7,8 @@ void LibIPInsertPacket(void *ifarg, - void *data, - u32_t size) + const void *const data, + const u32_t size) { struct pbuf *p, *p1; u32_t i; @@ -25,6 +25,8 @@ ASSERT(p1); RtlCopyMemory(p1->payload, ((PUCHAR)data) + i, p1->len); } + + DbgPrint("LibIPInsertPacket: called 0x%x\n", *((struct netif *)ifarg)->input); ((struct netif *)ifarg)->input(p, ifarg); } 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 Jul 11 17:33:17 2011 @@ -56,7 +56,7 @@ static err_t -InternalSendEventHandler(void *arg, struct tcp_pcb *pcb, u16_t space) +InternalSendEventHandler(void *arg, struct tcp_pcb *pcb, const u16_t space) { DbgPrint("[lwIP, InternalSendEventHandler] SendEvent (0x%x, 0x%x, %d)\n", arg, pcb, (unsigned int)space); @@ -73,7 +73,7 @@ static err_t -InternalRecvEventHandler(void *arg, struct tcp_pcb *pcb, struct pbuf *p, err_t err) +InternalRecvEventHandler(void *arg, struct tcp_pcb *pcb, struct pbuf *p, const err_t err) { u32_t len; @@ -141,7 +141,7 @@ static err_t -InternalAcceptEventHandler(void *arg, struct tcp_pcb *newpcb, err_t err) +InternalAcceptEventHandler(void *arg, struct tcp_pcb *newpcb, const err_t err) { DbgPrint("[lwIP, InternalAcceptEventHandler] AcceptEvent arg = 0x%x, newpcb = 0x%x, err = %d\n", arg, newpcb, (unsigned int)err); @@ -164,7 +164,7 @@ static err_t -InternalConnectEventHandler(void *arg, struct tcp_pcb *pcb, err_t err) +InternalConnectEventHandler(void *arg, struct tcp_pcb *pcb, const err_t err) { DbgPrint("[lwIP, InternalConnectEventHandler] ConnectEvent (0x%x, pcb = 0x%x, err = %d)\n", arg, pcb, (unsigned int)err); @@ -182,7 +182,7 @@ static void -InternalErrorEventHandler(void *arg, err_t err) +InternalErrorEventHandler(void *arg, const err_t err) { DbgPrint("[lwIP, InternalErrorEventHandler] ErrorEvent(0x%x, %d)\n", arg, (unsigned int)err); @@ -290,7 +290,7 @@ } err_t -LibTCPBind(struct tcp_pcb *pcb, struct ip_addr *ipaddr, u16_t port) +LibTCPBind(struct tcp_pcb *pcb, struct ip_addr *const ipaddr, const u16_t port) { struct bind_callback_msg *msg; err_t ret; @@ -363,7 +363,7 @@ } struct tcp_pcb * -LibTCPListen(struct tcp_pcb *pcb, u8_t backlog) +LibTCPListen(struct tcp_pcb *pcb, const u8_t backlog) { struct listen_callback_msg *msg; void *ret; @@ -437,7 +437,7 @@ } err_t -LibTCPSend(struct tcp_pcb *pcb, const void *dataptr, const u16_t len, const int safe) +LibTCPSend(struct tcp_pcb *pcb, void *const dataptr, const u16_t len, const int safe) { err_t ret; @@ -529,7 +529,7 @@ } err_t -LibTCPConnect(struct tcp_pcb *pcb, struct ip_addr *ipaddr, u16_t port) +LibTCPConnect(struct tcp_pcb *pcb, struct ip_addr *const ipaddr, const u16_t port) { struct connect_callback_msg *msg; err_t ret; @@ -594,7 +594,7 @@ } err_t -LibTCPShutdown(struct tcp_pcb *pcb, int shut_rx, int shut_tx) +LibTCPShutdown(struct tcp_pcb *pcb, const int shut_rx, const int shut_tx) { struct shutdown_callback_msg *msg; err_t ret; @@ -779,7 +779,7 @@ } err_t -LibTCPGetHostName(struct tcp_pcb *pcb, struct ip_addr *ipaddr, u16_t *port) +LibTCPGetHostName(struct tcp_pcb *pcb, struct ip_addr *const ipaddr, u16_t *const port) { DbgPrint("[lwIP, LibTCPGetHostName] Called. pcb = (0x%x)\n", pcb); @@ -797,7 +797,7 @@ } err_t -LibTCPGetPeerName(struct tcp_pcb *pcb, struct ip_addr *ipaddr, u16_t *port) +LibTCPGetPeerName(struct tcp_pcb *pcb, struct ip_addr * const ipaddr, u16_t * const port) { DbgPrint("[lwIP, LibTCPGetPeerName] pcb = (0x%x)\n", pcb); Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/sys_arch.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/sys_arch.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/sys_arch.c [iso-8859-1] Mon Jul 11 17:33:17 2011 @@ -94,6 +94,10 @@ LargeTimeout.QuadPart = Int32x32To64(timeout, -10000); KeQuerySystemTime(&PreWaitTime); + + // FIXME: This is a hack to increase the throughput. Once this is done + // the right way it should definately be removed. + timeout = 5; Status = KeWaitForMultipleObjects(2, WaitObjects, @@ -103,11 +107,17 @@ FALSE, timeout != 0 ? &LargeTimeout : NULL, NULL); + + //DbgPrint("[+[+[+[ sys_arch_sem_wait ]+]+]+] timeout = %d\n", timeout); + if (Status == STATUS_WAIT_0) { KeQuerySystemTime(&PostWaitTime); TimeDiff = PostWaitTime.QuadPart - PreWaitTime.QuadPart; TimeDiff /= 10000; + + //DbgPrint("[+[+[+[ sys_arch_sem_wait ]+]+]+] TimeDiff = %llu\n", TimeDiff); + return TimeDiff; } else if (Status == STATUS_WAIT_1) @@ -120,8 +130,10 @@ return 0; } - else - return SYS_ARCH_TIMEOUT; + + //DbgPrint("[+[+[+[ sys_arch_sem_wait ]+]+]+] SYS_ARCH_TIMEOUT\n"); + + return SYS_ARCH_TIMEOUT; } err_t @@ -184,6 +196,9 @@ PLIST_ENTRY Entry; KIRQL OldIrql; PVOID WaitObjects[] = {&mbox->Event, &TerminationEvent}; + + //timeout = 0; + //DbgPrint("[[[[[ sys_arch_mbox_fetch ]]]]] %d\n", timeout); LargeTimeout.QuadPart = Int32x32To64(timeout, -10000); @@ -197,6 +212,9 @@ FALSE, timeout != 0 ? &LargeTimeout : NULL, NULL); + + //DbgPrint("[ [ [ [ sys_arch_mbox_fetch ] ] ] ] timeout = %d\n", timeout); + if (Status == STATUS_WAIT_0) { KeAcquireSpinLock(&mbox->Lock, &OldIrql); @@ -205,17 +223,19 @@ if (IsListEmpty(&mbox->ListHead)) KeClearEvent(&mbox->Event); KeReleaseSpinLock(&mbox->Lock, OldIrql); + + Container = CONTAINING_RECORD(Entry, LWIP_MESSAGE_CONTAINER, ListEntry); + Message = Container->Message; + ExFreePool(Container); + + if (msg) + *msg = Message; KeQuerySystemTime(&PostWaitTime); TimeDiff = PostWaitTime.QuadPart - PreWaitTime.QuadPart; TimeDiff /= 10000; - - Container = CONTAINING_RECORD(Entry, LWIP_MESSAGE_CONTAINER, ListEntry); - Message = Container->Message; - ExFreePool(Container); - - if (msg) - *msg = Message; + + //DbgPrint("[ [ [ [ sys_arch_mbox_fetch ] ] ] ] TimeDiff = %llu\n", TimeDiff); return TimeDiff; } @@ -229,8 +249,10 @@ return 0; } - else - return SYS_ARCH_TIMEOUT; + + //DbgPrint("[ [ [ [ sys_arch_mbox_fetch ] ] ] ] SYS_ARCH_TIMEOUT\n"); + + return SYS_ARCH_TIMEOUT; } u32_t

1 0

[gadamopoulos] 52636: [uxtheme] - Really fix a comment
by gadamopoulos＠svn.reactos.org 11 Jul '11

11 Jul '11

Author: gadamopoulos Date: Mon Jul 11 14:18:36 2011 New Revision: 52636 URL: http://svn.reactos.org/svn/reactos?rev=52636&view=rev Log: [uxtheme] - Really fix a comment Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c [iso-8859-1] Mon Jul 11 14:18:36 2011 @@ -621,7 +621,7 @@ SelectObject(pcontext->hDC, FontOld); - /* Fill the menu background are that isn't painted yet*/ + /* Fill the menu background area that isn't painted yet*/ FillRect(pcontext->hDC, &Rect, GetSysColorBrush(flat_menu ? COLOR_MENUBAR : COLOR_MENU)); }

1 0

[gadamopoulos] 52635: [uxtheme] - Fix some comments
by gadamopoulos＠svn.reactos.org 11 Jul '11

11 Jul '11

Author: gadamopoulos Date: Mon Jul 11 13:53:58 2011 New Revision: 52635 URL: http://svn.reactos.org/svn/reactos?rev=52635&view=rev Log: [uxtheme] - Fix some comments Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c [iso-8859-1] Mon Jul 11 13:53:58 2011 @@ -317,6 +317,7 @@ ThemeGetButtonState(HTHELP, htHot, htDown, pcontext->Active)); } +/* Used from WM_NCPAINT and WM_NCACTIVATE handlers*/ static void ThemeDrawCaption(PDRAW_CONTEXT pcontext, RECT* prcCurrent) { @@ -564,7 +565,7 @@ DrawTextW(pcontext->hDC, Text, i, &Rect, uFormat); - /* Exclude the area drawn by DrawText from the clip region */ + /* Exclude from the clip region the area drawn by DrawText */ SetRect(&rcCalc, 0,0,0,0); DrawTextW(pcontext->hDC, Text, i, &rcCalc, uFormat | DT_CALCRECT); InflateRect( &Rect, 0, -(rcCalc.bottom+1)/2); @@ -620,7 +621,7 @@ SelectObject(pcontext->hDC, FontOld); - /* Fill the menu background area that isn't painted yet*/ + /* Fill the menu background are that isn't painted yet*/ FillRect(pcontext->hDC, &Rect, GetSysColorBrush(flat_menu ? COLOR_MENUBAR : COLOR_MENU)); }

1 0

[gadamopoulos] 52634: [uxtheme] - Do not close hKey in query_reg_path. Noticed while testing our uxtheme in windows. Should be sent to wine
by gadamopoulos＠svn.reactos.org 11 Jul '11

11 Jul '11

Author: gadamopoulos Date: Mon Jul 11 13:38:05 2011 New Revision: 52634 URL: http://svn.reactos.org/svn/reactos?rev=52634&view=rev Log: [uxtheme] - Do not close hKey in query_reg_path. Noticed while testing our uxtheme in windows. Should be sent to wine Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/system.c 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] Mon Jul 11 13:38:05 2011 @@ -140,7 +140,6 @@ } } - RegCloseKey(hKey); return dwRet; }

1 0

[gadamopoulos] 52633: [uxtheme] - Call UXTHEME_InitSystem when user api hooks are installed
by gadamopoulos＠svn.reactos.org 11 Jul '11

11 Jul '11

Author: gadamopoulos Date: Mon Jul 11 13:28:20 2011 New Revision: 52633 URL: http://svn.reactos.org/svn/reactos?rev=52633&view=rev Log: [uxtheme] - Call UXTHEME_InitSystem when user api hooks are installed Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/themehooks.c 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] Mon Jul 11 13:28:20 2011 @@ -100,6 +100,8 @@ UAH_HOOK_MESSAGE(puah->WndProcArray, WM_THEMECHANGED); UAH_HOOK_MESSAGE(puah->WndProcArray, WM_UAHINIT); + UXTHEME_InitSystem(hDllInst); + return TRUE; }

1 0

[gadamopoulos] 52632: [uxtheme] - Move some definitions to a header file
by gadamopoulos＠svn.reactos.org 11 Jul '11

11 Jul '11

Author: gadamopoulos Date: Mon Jul 11 13:17:39 2011 New Revision: 52632 URL: http://svn.reactos.org/svn/reactos?rev=52632&view=rev Log: [uxtheme] - Move some definitions to a header file Added: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/ncthm.h (with props) Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c Added: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/ncthm.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/ncthm.h (added) +++ branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/ncthm.h [iso-8859-1] Mon Jul 11 13:17:39 2011 @@ -1,0 +1,48 @@ + +typedef struct _DRAW_CONTEXT +{ + HWND hWnd; + HDC hDC; + HTHEME theme; + WINDOWINFO wi; + BOOL Active; /* wi.dwWindowStatus isn't correct for mdi child windows */ + HRGN hRgn; + int CaptionHeight; + + /* for double buffering */ + HDC hDCScreen; + HBITMAP hbmpOld; +} DRAW_CONTEXT, *PDRAW_CONTEXT; + +typedef enum +{ + CLOSEBUTTON, + MAXBUTTON, + MINBUTTON, + HELPBUTTON +} CAPTIONBUTTON; + +/* +The following values specify all possible vutton states +Note that not all of them are documented but it is easy to +find them by opening a theme file +*/ +typedef enum { + BUTTON_NORMAL = 1 , + BUTTON_HOT , + BUTTON_PRESSED , + BUTTON_DISABLED , + BUTTON_INACTIVE +} THEME_BUTTON_STATES; + +#define HASSIZEGRIP(Style, ExStyle, ParentStyle, WindowRect, ParentClientRect) \ + ((!(Style & WS_CHILD) && (Style & WS_THICKFRAME) && !(Style & WS_MAXIMIZE)) || \ + ((Style & WS_CHILD) && (ParentStyle & WS_THICKFRAME) && !(ParentStyle & WS_MAXIMIZE) && \ + (WindowRect.right - WindowRect.left == ParentClientRect.right) && \ + (WindowRect.bottom - WindowRect.top == ParentClientRect.bottom))) + +#define HAS_MENU(hwnd,style) ((((style) & (WS_CHILD | WS_POPUP)) != WS_CHILD) && GetMenu(hwnd)) + +#define BUTTON_GAP_SIZE 2 + +#define MENU_BAR_ITEMS_SPACE (12) Propchange: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/ncthm.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/dll/win… ============================================================================== --- branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/dll/win32/uxtheme/nonclient.c [iso-8859-1] Mon Jul 11 13:17:39 2011 @@ -12,58 +12,11 @@ #include "vfwmsgs.h" #include "uxtheme.h" #include <tmschema.h> +#include "ncthm.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(uxtheme); - -typedef struct _DRAW_CONTEXT -{ - HWND hWnd; - HDC hDC; - HTHEME theme; - WINDOWINFO wi; - BOOL Active; /* wi.dwWindowStatus isn't correct for mdi child windows */ - HRGN hRgn; - int CaptionHeight; - - /* for double buffering */ - HDC hDCScreen; - HBITMAP hbmpOld; -} DRAW_CONTEXT, *PDRAW_CONTEXT; - -typedef enum -{ - CLOSEBUTTON, - MAXBUTTON, - MINBUTTON, - HELPBUTTON -} CAPTIONBUTTON; - -/* -The following values specify all possible vutton states -Note that not all of them are documented but it is easy to -find them by opening a theme file -*/ -typedef enum { - BUTTON_NORMAL = 1 , - BUTTON_HOT , - BUTTON_PRESSED , - BUTTON_DISABLED , - BUTTON_INACTIVE -} THEME_BUTTON_STATES; - -#define HASSIZEGRIP(Style, ExStyle, ParentStyle, WindowRect, ParentClientRect) \ - ((!(Style & WS_CHILD) && (Style & WS_THICKFRAME) && !(Style & WS_MAXIMIZE)) || \ - ((Style & WS_CHILD) && (ParentStyle & WS_THICKFRAME) && !(ParentStyle & WS_MAXIMIZE) && \ - (WindowRect.right - WindowRect.left == ParentClientRect.right) && \ - (WindowRect.bottom - WindowRect.top == ParentClientRect.bottom))) - -#define HAS_MENU(hwnd,style) ((((style) & (WS_CHILD | WS_POPUP)) != WS_CHILD) && GetMenu(hwnd)) - -#define BUTTON_GAP_SIZE 2 - -#define MENU_BAR_ITEMS_SPACE (12) HFONT hMenuFont = NULL; HFONT hMenuFontBold = NULL; @@ -1094,4 +1047,4 @@ default: return DefWndProc(hWnd, Msg, wParam, lParam); } -} +}

1 0

[gadamopoulos] 52631: [win32k] -Add a hack to GreStretchBltMask to return TRUE when a dimension is 0. After some investigation it seems that windows returns TRUE in such a case but couldn't investi...
by gadamopoulos＠svn.reactos.org 11 Jul '11

11 Jul '11

Author: gadamopoulos Date: Mon Jul 11 12:59:21 2011 New Revision: 52631 URL: http://svn.reactos.org/svn/reactos?rev=52631&view=rev Log: [win32k] -Add a hack to GreStretchBltMask to return TRUE when a dimension is 0. After some investigation it seems that windows returns TRUE in such a case but couldn't investigate more if this change is really correct. This hack is needed because a drawing operation in uxtheme is aborted when StretchBlt returns FALSE Modified: branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/objects/bitblt.c Modified: branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/ThemesSupport/subsyst… ============================================================================== --- branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original) +++ branches/GSoC_2011/ThemesSupport/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Mon Jul 11 12:59:21 2011 @@ -660,7 +660,7 @@ if (0 == WidthDest || 0 == HeightDest || 0 == WidthSrc || 0 == HeightSrc) { EngSetLastError(ERROR_INVALID_PARAMETER); - return FALSE; + return TRUE; } DPRINT("Locking DCs\n");

1 0

[cmihail] 52630: [lwIP/IP] - Optimize the way Send and Close handlers work by executing executing the raw lwIP functions directly instead of using lwIP's callback system. This works because the han...
by cmihail＠svn.reactos.org 11 Jul '11

11 Jul '11

Author: cmihail Date: Mon Jul 11 12:36:07 2011 New Revision: 52630 URL: http://svn.reactos.org/svn/reactos?rev=52630&view=rev Log: [lwIP/IP] - Optimize the way Send and Close handlers work by executing executing the raw lwIP functions directly instead of using lwIP's callback system. This works because the handlers are executed from lwIP's master thread context - small language optimizations Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/rosip.h branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c 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 Jul 11 12:36:07 2011 @@ -48,13 +48,6 @@ static VOID -SocketContextCloseWorker(PVOID Context) -{ - LibTCPClose(Context); -} - -static -VOID CompleteBucket(PCONNECTION_ENDPOINT Connection, PTDI_BUCKET Bucket, BOOLEAN Synchronous) { ReferenceObject(Connection); @@ -173,7 +166,7 @@ PIRP Irp; NTSTATUS Status; KIRQL OldIrql; - void *OldSocketContext; + struct tcp_pcb* OldSocketContext; DbgPrint("[IP, TCPAcceptEventHandler] Called\n"); @@ -222,9 +215,9 @@ /* sanity assert...this should never be in anything else but a CLOSED state */ ASSERT(((struct tcp_pcb*)OldSocketContext)->state == CLOSED); - /* free socket context created in FileOpenConnection, as we're using a new - one; we free it asynchornously because otherwise we create a deadlock */ - ChewCreate(SocketContextCloseWorker, OldSocketContext); + + /* free socket context created in FileOpenConnection, as we're using a new one */ + LibTCPClose(OldSocketContext, TRUE); } DereferenceObject(Bucket->AssociatedEndpoint); @@ -279,7 +272,7 @@ Status = TCPTranslateError(LibTCPSend(Connection->SocketContext, SendBuffer, - SendLen)); + SendLen, TRUE)); TI_DbgPrint(DEBUG_TCP,("TCP Bytes: %d\n", SendLen)); 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 Jul 11 12:36:07 2011 @@ -16,10 +16,10 @@ struct tcp_pcb *LibTCPSocket(void *arg); err_t LibTCPBind(struct tcp_pcb *pcb, struct ip_addr *ipaddr, u16_t port); struct tcp_pcb *LibTCPListen(struct tcp_pcb *pcb, u8_t backlog); -err_t LibTCPSend(struct tcp_pcb *pcb, void *dataptr, u16_t len); +err_t LibTCPSend(struct tcp_pcb *pcb, const void *dataptr, const u16_t len, const int safe); err_t LibTCPConnect(struct tcp_pcb *pcb, struct ip_addr *ipaddr, u16_t port); err_t LibTCPShutdown(struct tcp_pcb *pcb, int shut_rx, int shut_tx); -err_t LibTCPClose(struct tcp_pcb *pcb); +err_t LibTCPClose(struct tcp_pcb *pcb, const int safe); err_t LibTCPGetPeerName(struct tcp_pcb *pcb, struct ip_addr *ipaddr, u16_t *port); err_t LibTCPGetHostName(struct tcp_pcb *pcb, struct ip_addr *ipaddr, u16_t *port); void LibTCPAccept(struct tcp_pcb *pcb, struct tcp_pcb *listen_pcb, void *arg); 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 Jul 11 12:36:07 2011 @@ -437,34 +437,57 @@ } err_t -LibTCPSend(struct tcp_pcb *pcb, void *dataptr, u16_t len) -{ - struct send_callback_msg *msg; +LibTCPSend(struct tcp_pcb *pcb, const void *dataptr, const u16_t len, const int safe) +{ err_t ret; if (!pcb) return ERR_CLSD; - - msg = ExAllocatePool(NonPagedPool, sizeof(struct send_callback_msg)); - if (msg) - { - KeInitializeEvent(&msg->Event, NotificationEvent, FALSE); - msg->Pcb = pcb; - msg->Data = dataptr; - msg->DataLength = len; - - tcpip_callback_with_block(LibTCPSendCallback, msg, 1); - - if (WaitForEventSafely(&msg->Event)) - ret = msg->Error; + + /* + If we're being called from a handler it means we're in the conetxt of teh tcpip + main thread. Therefore we don't have to queue our request via a callback and we + can execute immediately. + */ + if (safe) + { + if (tcp_sndbuf(pcb) < len) + { + ret = ERR_INPROGRESS; + } else - ret = ERR_CLSD; - - DbgPrint("LibTCPSend(0x%x)\n", pcb); - - ExFreePool(msg); - + { + ret = tcp_write(pcb, dataptr, len, TCP_WRITE_FLAG_COPY); + tcp_output(pcb); + } + return ret; + } + else + { + struct send_callback_msg *msg; + + msg = ExAllocatePool(NonPagedPool, sizeof(struct send_callback_msg)); + if (msg) + { + KeInitializeEvent(&msg->Event, NotificationEvent, FALSE); + msg->Pcb = pcb; + msg->Data = dataptr; + msg->DataLength = len; + + tcpip_callback_with_block(LibTCPSendCallback, msg, 1); + + if (WaitForEventSafely(&msg->Event)) + ret = msg->Error; + else + ret = ERR_CLSD; + + DbgPrint("LibTCPSend(0x%x)\n", pcb); + + ExFreePool(msg); + + return ret; + } } return ERR_MEM; @@ -496,9 +519,7 @@ tcp_recv(msg->Pcb, InternalRecvEventHandler); tcp_sent(msg->Pcb, InternalSendEventHandler); - - //if (msg->Error == ERR_OK) - // msg->Error = ERR_INPROGRESS; + err_t Error = tcp_connect(msg->Pcb, msg->IpAddress, ntohs(msg->Port), InternalConnectEventHandler); msg->Error = Error == ERR_OK ? ERR_INPROGRESS : Error; @@ -648,9 +669,8 @@ } err_t -LibTCPClose(struct tcp_pcb *pcb) -{ - struct close_callback_msg *msg; +LibTCPClose(struct tcp_pcb *pcb, const int safe) +{ err_t ret; DbgPrint("[lwIP, LibTCPClose] Called on pcb = 0x%x\n", pcb); @@ -681,32 +701,58 @@ tcp_accept(pcb, NULL); DbgPrint("[lwIP, LibTCPClose] Attempting to allocate memory for msg\n"); - - msg = ExAllocatePool(NonPagedPool, sizeof(struct close_callback_msg)); - if (msg) - { - DbgPrint("[lwIP, LibTCPClose] Initializing msg->Event\n"); - KeInitializeEvent(&msg->Event, NotificationEvent, FALSE); - - DbgPrint("[lwIP, LibTCPClose] Initializing msg->pcb = 0x%x\n", pcb); - msg->Pcb = pcb; - - DbgPrint("[lwIP, LibTCPClose] Attempting to call LibTCPCloseCallback\n"); - - tcpip_callback_with_block(LibTCPCloseCallback, msg, 1); - - if (WaitForEventSafely(&msg->Event)) - ret = msg->Error; + + /* + If we're being called from a handler it means we're in the conetxt of teh tcpip + main thread. Therefore we don't have to queue our request via a callback and we + can execute immediately. + */ + if (safe) + { + if (pcb->state == LISTEN) + { + DbgPrint("[lwIP, LibTCPClose] Closing a listener\n"); + ret = tcp_close(pcb); + } else - ret = ERR_CLSD; - - ExFreePool(msg); - - DbgPrint("[lwIP, LibTCPClose] pcb = 0x%x\n", pcb); - - DbgPrint("[lwIP, LibTCPClose] Done\n"); - + { + DbgPrint("[lwIP, LibTCPClose] Aborting a connection\n"); + tcp_abort(pcb); + ret = ERR_OK; + } + return ret; + } + else + { + struct close_callback_msg *msg; + + msg = ExAllocatePool(NonPagedPool, sizeof(struct close_callback_msg)); + if (msg) + { + DbgPrint("[lwIP, LibTCPClose] Initializing msg->Event\n"); + KeInitializeEvent(&msg->Event, NotificationEvent, FALSE); + + DbgPrint("[lwIP, LibTCPClose] Initializing msg->pcb = 0x%x\n", pcb); + msg->Pcb = pcb; + + DbgPrint("[lwIP, LibTCPClose] Attempting to call LibTCPCloseCallback\n"); + + tcpip_callback_with_block(LibTCPCloseCallback, msg, 1); + + if (WaitForEventSafely(&msg->Event)) + ret = msg->Error; + else + ret = ERR_CLSD; + + ExFreePool(msg); + + DbgPrint("[lwIP, LibTCPClose] pcb = 0x%x\n", pcb); + + DbgPrint("[lwIP, LibTCPClose] Done\n"); + + return ret; + } } DbgPrint("[lwIP, LibTCPClose] Failed to allocate memory\n");

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