Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 72242: [WIN32NT_APITEST] Add some NtUserCreateWindowEx tests by Sylvain Deverre. ROSTESTS-237
by akhaldi＠svn.reactos.org 17 Aug '16

17 Aug '16

Author: akhaldi Date: Wed Aug 17 17:53:11 2016 New Revision: 72242 URL: http://svn.reactos.org/svn/reactos?rev=72242&view=rev Log: [WIN32NT_APITEST] Add some NtUserCreateWindowEx tests by Sylvain Deverre. ROSTESTS-237 Added: trunk/rostests/apitests/win32nt/ntuser/NtUserCreateWindowEx.c (with props) Modified: trunk/rostests/apitests/win32nt/CMakeLists.txt trunk/rostests/apitests/win32nt/testlist.c Modified: trunk/rostests/apitests/win32nt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/CMakeLis… ============================================================================== --- trunk/rostests/apitests/win32nt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/win32nt/CMakeLists.txt [iso-8859-1] Wed Aug 17 17:53:11 2016 @@ -44,6 +44,7 @@ # ntuser/NtUserCallNoParam.c # ntuser/NtUserCallOneParam.c ntuser/NtUserCountClipboardFormats.c + ntuser/NtUserCreateWindowEx.c # ntuser/NtUserEnumDisplayMonitors.c ntuser/NtUserEnumDisplaySettings.c ntuser/NtUserFindExistingCursorIcon.c Added: trunk/rostests/apitests/win32nt/ntuser/NtUserCreateWindowEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/ntuser/N… ============================================================================== --- trunk/rostests/apitests/win32nt/ntuser/NtUserCreateWindowEx.c (added) +++ trunk/rostests/apitests/win32nt/ntuser/NtUserCreateWindowEx.c [iso-8859-1] Wed Aug 17 17:53:11 2016 @@ -0,0 +1,228 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for NtUserCreateWindowEx + */ + +#include <win32nt.h> + +static +inline +HWND +CreateWnd(HINSTANCE hinst, + PLARGE_STRING clsName, + PLARGE_STRING clsVer, + PLARGE_STRING wndName) +{ + return NtUserCreateWindowEx(WS_EX_OVERLAPPEDWINDOW, + clsName, + clsVer, + wndName, + WS_CAPTION, + CW_USEDEFAULT, + CW_USEDEFAULT, + 100, + 100, + NULL, + NULL, + hinst, + 0, + 0, + NULL); +} + +/* WndProc for class1 */ + +LRESULT CALLBACK wndProc1(HWND hwnd, UINT msg, WPARAM wPrm, LPARAM lPrm) +{ + return DefWindowProc(hwnd, msg, wPrm, lPrm); +} + +/* WndProc for class2 */ +LRESULT CALLBACK wndProc2(HWND hwnd, UINT msg, WPARAM wPrm, LPARAM lPrm) +{ + return DefWindowProc(hwnd, msg, wPrm, lPrm); +} + + +START_TEST(NtUserCreateWindowEx) +{ + HINSTANCE hinst = GetModuleHandle(NULL); + WNDCLASSEXW wclex = {0}; + WNDCLASSEXW wclex2 = {0}; + WNDCLASSEXW res = {0}; + + /* Unicode strings for NtRegisterClassExWOW */ + UNICODE_STRING cls = {14, 32, L"MyClass"}; + UNICODE_STRING ver_cls = {12, 32, L"v2test"}; + UNICODE_STRING another_cls = {10, 32, L"Dummy"}; + UNICODE_STRING menu = {10, 10, L"MuMnu"}; + + /* LARGE_STRING for NtUserCreateWindowEx */ + LARGE_STRING l_dummy = {14, 32, 0, L"DummyMe"}; + LARGE_STRING l_wndName = {32, 32, 0, L""}; + LARGE_STRING l_cls = {cls.Length, 32, 0, cls.Buffer}; + LARGE_STRING l_ver_cls = {ver_cls.Length, 32, 0, ver_cls.Buffer}; + WCHAR bufMe[255] = {0}; + UNICODE_STRING capture = {255, 255, bufMe}; + PWSTR pwstr = NULL; + CLSMENUNAME clsMenuName, outClsMnu = {0}; + ATOM atom, atom2, atom3; + HWND hwnd; + + clsMenuName.pszClientAnsiMenuName = "MuMnu"; + clsMenuName.pwszClientUnicodeMenuName = menu.Buffer; + clsMenuName.pusMenuName = &menu; + + wclex.cbSize = sizeof(WNDCLASSEXW); + wclex.style = 0; + wclex.lpfnWndProc = wndProc1; + wclex.cbClsExtra = 2; + wclex.cbWndExtra = 4; + wclex.hInstance = hinst; + wclex.hIcon = NULL; + wclex.hCursor = NULL; + wclex.hbrBackground = CreateSolidBrush(RGB(4,7,5)); + wclex.lpszMenuName = menu.Buffer; + wclex.lpszClassName = cls.Buffer; + wclex.hIconSm = NULL; + memcpy(&wclex2, &wclex, sizeof(wclex)); + wclex2.lpfnWndProc = wndProc2; + + /* Register our first version */ + atom = NtUserRegisterClassExWOW(&wclex, /* wndClass */ + &cls, /* ClassName */ + &cls, /* Version */ + &clsMenuName, /* MenuName */ + 0, + 0, + NULL); + TEST(atom != 0); + + /* Register second version */ + atom2 = NtUserRegisterClassExWOW(&wclex2, /* wndClass */ + &cls, /* ClassName */ + &ver_cls, /* Version */ + &clsMenuName, /* MenuName */ + 0, + 0, + NULL); + + atom3 = NtUserRegisterClassExWOW(&wclex2, /* wndClass */ + &another_cls, /* ClassName */ + &another_cls, /* Version */ + &clsMenuName, /* MenuName */ + 0, + 0, + NULL); + + TEST(NtUserGetWOWClass(hinst, &ver_cls) != 0); + + TEST(atom2 != 0); + TEST(atom == atom2 && (atom | atom2) != 0); + + /* Now, create our first window */ + hwnd = CreateWnd(hinst, &l_cls, &l_cls, &l_wndName); + TEST(hwnd != 0); + if(hwnd) + { + /* Test some settings about the window */ + TEST((WNDPROC)GetWindowLongPtrW(hwnd, GWLP_WNDPROC) == wndProc1); + + /* Check class name isn't versioned */ + TEST(NtUserGetClassName(hwnd, TRUE, &capture) != 0); + TEST(wcscmp(capture.Buffer, cls.Buffer) == 0); + TEST(wcscmp(capture.Buffer, ver_cls.Buffer) != 0); + ZeroMemory(capture.Buffer, 255); + + /* Check what return GetClassLong */ + TEST(GetClassLong(hwnd, GCW_ATOM) == atom); + TEST(NtUserSetClassLong(hwnd, GCW_ATOM, atom3, FALSE) == atom); + NtUserGetClassName(hwnd, TRUE, &capture); + TEST(wcscmp(capture.Buffer, another_cls.Buffer) == 0); + + /* Finally destroy it */ + DestroyWindow(hwnd); + } + + /* Create our second version */ + hwnd = CreateWnd(hinst, &l_cls, &l_ver_cls, &l_wndName); + TEST(hwnd != 0); + if (hwnd) + { + /* Test settings about window */ + TEST((WNDPROC)GetWindowLongPtrW(hwnd, GWLP_WNDPROC) == wndProc2); + + /* Check class name isn't versioned */ + TEST(NtUserGetClassName(hwnd, TRUE, &capture) != 0); + TEST(wcscmp(capture.Buffer, cls.Buffer) == 0); + TEST(wcscmp(capture.Buffer, ver_cls.Buffer) != 0); + ZeroMemory(capture.Buffer, 255); + + /* Check what return GetClassLong */ + TEST(GetClassLong(hwnd, GCW_ATOM) == atom); + + /* Finally destroy it */ + DestroyWindow(hwnd); + } + + /* Create a nonexistent window */ + hwnd = CreateWnd(hinst, &l_cls, &l_dummy, &l_wndName); + TEST(hwnd == 0); + if (hwnd) DestroyWindow(hwnd); + + /* Get non-versioned class info */ + res.cbSize = sizeof(res); + SetLastError(0); + TEST(NtUserGetClassInfo(hinst, &cls, &res, &pwstr, 0) != 0); + TEST(GetLastError() == 0); + TEST(res.cbSize == wclex.cbSize); + TEST(res.style == wclex.style); + TEST(res.lpfnWndProc == wclex.lpfnWndProc); + TEST(res.cbClsExtra == wclex.cbClsExtra); + TEST(res.cbWndExtra == wclex.cbWndExtra); + TEST(res.hInstance == wclex.hInstance); + TEST(res.hIcon == wclex.hIcon); + TEST(res.hCursor == wclex.hCursor); + TEST(res.hbrBackground == wclex.hbrBackground); + TEST(res.lpszMenuName == 0); + TEST(res.lpszClassName == 0); + TEST(res.hIconSm == wclex.hIconSm); + + /* Get versioned class info */ + TEST(NtUserGetClassInfo(hinst, &ver_cls, &res, &pwstr, 0) != 0); + TEST(GetLastError() == 0); + TEST(res.cbSize == wclex2.cbSize); + TEST(res.style == wclex2.style); + TEST(res.lpfnWndProc == wclex2.lpfnWndProc); + TEST(res.cbClsExtra == wclex2.cbClsExtra); + TEST(res.cbWndExtra == wclex2.cbWndExtra); + TEST(res.hInstance == wclex2.hInstance); + TEST(res.hIcon == wclex2.hIcon); + TEST(res.hCursor == wclex2.hCursor); + TEST(res.hbrBackground == wclex2.hbrBackground); + TEST(res.lpszMenuName == 0); + TEST(res.lpszClassName == 0); + TEST(res.hIconSm == wclex2.hIconSm); + + /* Create a new window from our old class. Since we set a new class atom, + * it should be set to our new atom + */ + hwnd = NULL; + hwnd = CreateWnd(hinst, &l_cls, &l_cls, &l_wndName); + TEST(hwnd != NULL); + if (hwnd) + { + TEST(GetClassLong(hwnd, GCW_ATOM) == atom3); + TEST(NtUserGetClassName(hwnd, TRUE, &capture) != 0); + TEST(wcscmp(capture.Buffer, another_cls.Buffer) == 0); + DestroyWindow(hwnd); + } + + /* Test class destruction */ + TEST(NtUserUnregisterClass(&cls, hinst, (PCLSMENUNAME)0xbad) != 0); + TEST(NtUserUnregisterClass(&ver_cls, hinst, &outClsMnu) != 0); + TEST(NtUserUnregisterClass(&another_cls, hinst, &outClsMnu) != 0); + TEST(NtUserUnregisterClass(&menu, hinst, &outClsMnu) == 0); + +} Propchange: trunk/rostests/apitests/win32nt/ntuser/NtUserCreateWindowEx.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/win32nt/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/win32nt/testlist… ============================================================================== --- trunk/rostests/apitests/win32nt/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/win32nt/testlist.c [iso-8859-1] Wed Aug 17 17:53:11 2016 @@ -44,6 +44,7 @@ //extern void func_NtUserCallNoParam(void); //extern void func_NtUserCallOneParam(void); extern void func_NtUserCountClipboardFormats(void); +extern void func_NtUserCreateWindowEx(void); //extern void func_NtUserEnumDisplayMonitors(void); extern void func_NtUserEnumDisplaySettings(void); extern void func_NtUserFindExistingCursorIcon(void); @@ -105,6 +106,7 @@ //{ "NtUserCallNoParam", func_NtUserCallNoParam }, //{ "NtUserCallOneParam", func_NtUserCallOneParam }, { "NtUserCountClipboardFormats", func_NtUserCountClipboardFormats }, + { "NtUserCreateWindowEx", func_NtUserCreateWindowEx }, //{ "NtUserEnumDisplayMonitors", func_NtUserEnumDisplayMonitors }, { "NtUserEnumDisplaySettings", func_NtUserEnumDisplaySettings }, { "NtUserFindExistingCursorIcon", func_NtUserFindExistingCursorIcon },

1 0

[akhaldi] 72241: [KERNEL32] Sync sortkey.c with Wine Staging 1.9.16. CORE-10771 CORE-11866
by akhaldi＠svn.reactos.org 17 Aug '16

17 Aug '16

Author: akhaldi Date: Wed Aug 17 15:35:42 2016 New Revision: 72241 URL: http://svn.reactos.org/svn/reactos?rev=72241&view=rev Log: [KERNEL32] Sync sortkey.c with Wine Staging 1.9.16. CORE-10771 CORE-11866 Modified: trunk/reactos/dll/win32/kernel32/winnls/string/sortkey.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/kernel32/winnls/string/sortkey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/sortkey.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/sortkey.c [iso-8859-1] Wed Aug 17 15:35:42 2016 @@ -20,8 +20,10 @@ #include <wine/unicode.h> +#ifdef __REACTOS__ #define get_char_typeW(x) iswctype((x) >> 8, (x) & 0xFF) -extern int get_decomposition(WCHAR src, WCHAR *dst, unsigned int dstlen); +#endif +extern unsigned int wine_decompose( WCHAR ch, WCHAR *dst, unsigned int dstlen ); extern const unsigned int collation_table[]; /* @@ -40,11 +42,10 @@ key_len[0] = key_len[1] = key_len[2] = key_len[3] = 0; for (; srclen; srclen--, src++) { - int decomposed_len = 1;/*get_decomposition(*src, dummy, 4);*/ + unsigned int i, decomposed_len = 1;/*wine_decompose(*src, dummy, 4);*/ dummy[0] = *src; if (decomposed_len) { - int i; for (i = 0; i < decomposed_len; i++) { WCHAR wch = dummy[i]; @@ -98,11 +99,10 @@ for (; srclen; srclen--, src++) { - int decomposed_len = 1;/*get_decomposition(*src, dummy, 4);*/ + unsigned int i, decomposed_len = 1;/*wine_decompose(*src, dummy, 4);*/ dummy[0] = *src; if (decomposed_len) { - int i; for (i = 0; i < decomposed_len; i++) { WCHAR wch = dummy[i]; @@ -225,8 +225,16 @@ len1--; len2--; } - if (len1 && !*str1) len1--; - if (len2 && !*str2) len2--; + while (len1 && !*str1) + { + str1++; + len1--; + } + while (len2 && !*str2) + { + str2++; + len2--; + } return len1 - len2; } @@ -276,8 +284,16 @@ len1--; len2--; } - if (len1 && !*str1) len1--; - if (len2 && !*str2) len2--; + while (len1 && !*str1) + { + str1++; + len1--; + } + while (len2 && !*str2) + { + str2++; + len2--; + } return len1 - len2; } @@ -327,8 +343,16 @@ len1--; len2--; } - if (len1 && !*str1) len1--; - if (len2 && !*str2) len2--; + while (len1 && !*str1) + { + str1++; + len1--; + } + while (len2 && !*str2) + { + str2++; + len2--; + } return len1 - len2; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Aug 17 15:35:42 2016 @@ -283,7 +283,7 @@ reactos/dll/win32/kernel32/winnls/string/lang.c # Synced in r52754 reactos/dll/win32/kernel32/winnls/string/lcformat.c # Synced to WineStaging-1.7.55 reactos/dll/win32/kernel32/winnls/string/nls.c # Synced in r52754 - reactos/dll/win32/kernel32/winnls/string/sortkey.c # Synced to WineStaging-1.7.55 + reactos/dll/win32/kernel32/winnls/string/sortkey.c # Synced to WineStaging-1.9.16 msvcrt - reactos/lib/sdk/crt/except/cpp.c # Synced at 20080528

1 0

[akhaldi] 72240: [GLU32] Remove the special case for Clang. CORE-11799
by akhaldi＠svn.reactos.org 17 Aug '16

17 Aug '16

Author: akhaldi Date: Wed Aug 17 15:33:15 2016 New Revision: 72240 URL: http://svn.reactos.org/svn/reactos?rev=72240&view=rev Log: [GLU32] Remove the special case for Clang. CORE-11799 Modified: trunk/reactos/dll/opengl/glu32/CMakeLists.txt Modified: trunk/reactos/dll/opengl/glu32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/CMakeList… ============================================================================== --- trunk/reactos/dll/opengl/glu32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/glu32/CMakeLists.txt [iso-8859-1] Wed Aug 17 15:33:15 2016 @@ -113,14 +113,7 @@ set_module_type(glu32 win32dll) if(NOT MSVC) - add_target_compile_flags(glu32 "-Wno-write-strings") - if(CMAKE_C_COMPILER_ID STREQUAL "Clang") - target_link_libraries(glu32 mingwex) - #FIXME: longjmp exists in both our msvcrt and mingwex - add_target_link_flags(glu32 "-Wl,--allow-multiple-definition") - else() - add_target_compile_flags(glu32 "-Wno-unused-but-set-variable") - endif() + add_target_compile_flags(glu32 "-Wno-write-strings -Wno-unused-but-set-variable") endif() add_importlibs(glu32 opengl32 gdi32 msvcrt kernel32 ntdll)

1 0

[akhaldi] 72239: [OPENGL32] We don't need mingwex anymore. CORE-11799
by akhaldi＠svn.reactos.org 17 Aug '16

17 Aug '16

Author: akhaldi Date: Wed Aug 17 15:29:25 2016 New Revision: 72239 URL: http://svn.reactos.org/svn/reactos?rev=72239&view=rev Log: [OPENGL32] We don't need mingwex anymore. CORE-11799 Modified: trunk/reactos/dll/opengl/opengl32/CMakeLists.txt Modified: trunk/reactos/dll/opengl/opengl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32/CMakeL… ============================================================================== --- trunk/reactos/dll/opengl/opengl32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/opengl32/CMakeLists.txt [iso-8859-1] Wed Aug 17 15:29:25 2016 @@ -53,10 +53,6 @@ target_link_libraries(opengl32 mesa_x86) endif() -if(CMAKE_C_COMPILER_ID STREQUAL "Clang") - target_link_libraries(opengl32 mingwex) -endif() - set_module_type(opengl32 win32dll) add_importlibs(opengl32 gdi32 user32 advapi32 msvcrt kernel32 ntdll) add_pch(opengl32 opengl32.h SOURCE)

1 0

[akhaldi] 72238: [INCLUDE/REACTOS] Add some missing VOIDs. CORE-11799
by akhaldi＠svn.reactos.org 17 Aug '16

17 Aug '16

Author: akhaldi Date: Wed Aug 17 15:21:48 2016 New Revision: 72238 URL: http://svn.reactos.org/svn/reactos?rev=72238&view=rev Log: [INCLUDE/REACTOS] Add some missing VOIDs. CORE-11799 Modified: trunk/reactos/sdk/include/reactos/uxundoc.h Modified: trunk/reactos/sdk/include/reactos/uxundoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/uxundo… ============================================================================== --- trunk/reactos/sdk/include/reactos/uxundoc.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/uxundoc.h [iso-8859-1] Wed Aug 17 15:21:48 2016 @@ -114,7 +114,7 @@ PNONCLIENTMETRICSW pncMetrics, COLORREF* lpaRgbValues); -BOOL WINAPI ThemeHooksInstall(); +BOOL WINAPI ThemeHooksInstall(VOID); -BOOL WINAPI ThemeHooksRemove(); +BOOL WINAPI ThemeHooksRemove(VOID);

1 0

[zhu] 72237: Set Irp->CancelRoutine when enqueueing IRPs. More detailed debug printouts. Deleted old debug printouts.
by zhu＠svn.reactos.org 16 Aug '16

16 Aug '16

Author: zhu Date: Tue Aug 16 21:42:21 2016 New Revision: 72237 URL: http://svn.reactos.org/svn/reactos?rev=72237&view=rev Log: Set Irp->CancelRoutine when enqueueing IRPs. More detailed debug printouts. Deleted old debug printouts. Modified: branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpclient/main.c branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.h branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/main.c Modified: branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpclient/main.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/base/appli… ============================================================================== --- branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpclient/main.c [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpclient/main.c [iso-8859-1] Tue Aug 16 21:42:21 2016 @@ -3,7 +3,7 @@ #include <winsock2.h> #define LENGTH 255 -#define NUM_CLIENTS 1 +#define NUM_CLIENTS 2 DWORD WINAPI ClientThreadMain(LPVOID lpParam) { SOCKET Sock; @@ -30,7 +30,7 @@ ServerAddr.sin_addr.s_addr = inet_addr("127.0.0.1"); ServerAddr.sin_port = htons(10000); - printf("Client %d attempting to connect\n", self); + printf("Client %d attempting to connect\n", self); ret = connect(Sock, (struct sockaddr *)&ServerAddr, sizeof(struct sockaddr_in)); if (ret == SOCKET_ERROR) { printf("Client %d failed to connect: %d\n", self, WSAGetLastError()); @@ -40,7 +40,7 @@ sprintf(buff, "Client %d pinging server", self); len = strlen(buff); - printf("Client %d attempting to send\n", self); + printf("Client %d attempting to send\n", self); ret = send(Sock, buff, len, 0); if (ret != len) { printf("Client %d failed to send properly. Should send %d bytes, send() returned %d\n WSA Error: %d\n", @@ -49,7 +49,7 @@ return 1; } - printf("Client %d attempting to receive\n", self); + printf("Client %d attempting to receive\n", self); ret = recv(Sock, buff, LENGTH, 0); buff[LENGTH - 1] = '\0'; if (ret <= 0) { Modified: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… ============================================================================== --- branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c [iso-8859-1] Tue Aug 16 21:42:21 2016 @@ -230,6 +230,13 @@ #define AddrIsUnspecified(Address) ((Address->in_addr == 0) || (Address->in_addr == 0xFFFFFFFF)) #define TCP_SET_STATE(State,Context) \ + Context->TcpState = State +#define TCP_ADD_STATE(State,Context) \ + Context->TcpState |= State +#define TCP_RMV_STATE(State,Context) \ + Context->TcpState &= ~(State) +/* +#define TCP_SET_STATE(State,Context) \ DPRINT("Setting Context %p State to %s\n", Context, #State); \ Context->TcpState = State #define TCP_ADD_STATE(State,Context) \ @@ -238,7 +245,7 @@ #define TCP_RMV_STATE(State,Context) \ DPRINT("Removing State %s from Context %p\n", #State, Context); \ Context->TcpState &= ~(State) - +*/ /** * Context mutex functions **/ @@ -256,7 +263,19 @@ PTCP_CONTEXT Context ) { +/* +#ifndef NDEBUG + PKTHREAD Thread; + Thread = KeGetCurrentThread(); + DPRINT("Thread %p acquiring lock on Context %p\n", Thread, Context); +#endif +*/ KeWaitForMutexObject(&Context->Mutex, Executive, KernelMode, FALSE, NULL); +/* +#ifndef NDEBUG + DPRINT("Thread %p acquired lock on Context %p\n", Thread, Context); +#endif +*/ } VOID @@ -264,7 +283,19 @@ PTCP_CONTEXT Context ) { +/* +#ifndef NDEBUG + PKTHREAD Thread; + Thread = KeGetCurrentThread(); + DPRINT("Thread %p releasing lock on Context %p\n", Thread, Context); +#endif +*/ KeReleaseMutex(&Context->Mutex, FALSE); +/* +#ifndef NDEBUG + DPRINT("Thread %p released lock on Context %p\n", Thread, Context); +#endif +*/ } /** @@ -354,7 +385,7 @@ } /* We should never go through both lists without finding a match */ - DPRINT1("Cancelling unknow IRP %p\n", Irp); + DPRINT1("Cancelling unknown IRP %p for Context %p\n", Irp, Context); goto FINISH; FOUND_REQUEST: @@ -368,6 +399,9 @@ { tcp_arg(CurrentContext->lwip_tcp_pcb, NULL); tcp_abort(CurrentContext->lwip_tcp_pcb); +#ifndef NDEBUG + REMOVE_PCB(CurrentContext->lwip_tcp_pcb); +#endif CurrentContext->lwip_tcp_pcb = NULL; } RELEASE_SERIAL_MUTEX(); @@ -379,6 +413,9 @@ { tcp_arg(CurrentContext->lwip_tcp_pcb, NULL); tcp_close(CurrentContext->lwip_tcp_pcb); +#ifndef NDEBUG + REMOVE_PCB(CurrentContext->lwip_tcp_pcb); +#endif CurrentContext->lwip_tcp_pcb = NULL; } RELEASE_SERIAL_MUTEX(); @@ -386,7 +423,8 @@ case TCP_REQUEST_CANCEL_MODE_PRESERVE : break; default : - DPRINT1("Invalid cancel mode %08x\n", Request->CancelMode); + DPRINT1("Invalid cancel mode %08x for Request on Context %p\n", + Request->CancelMode, CurrentContext); break; } @@ -452,14 +490,15 @@ PendingIrp->IoStatus.Status = STATUS_CANCELLED; PendingIrp->IoStatus.Information = 0; IoCompleteRequest(PendingIrp, IO_NETWORK_INCREMENT); -#ifndef NDEBUG - REMOVE_IRP(Irp); -#endif case TCP_REQUEST_PAYLOAD_PCB : tcp_arg(ListWalkRequest->Payload.apcb, NULL); tcp_close(ListWalkRequest->Payload.apcb); +#ifndef NDEBUG + REMOVE_PCB(ListWalkRequest->Payload.apcb); +#endif default : - DPRINT1("Invalid payload type on Context %p\n", CurrentContext); + DPRINT1("Invalid payload type %08x on Context %p\n", + ListWalkRequest->PayloadType, CurrentContext); break; } ExFreePoolWithTag(ListWalkRequest, TAG_TCP_REQUEST); @@ -490,7 +529,8 @@ break; default : ContextMutexRelease(CurrentContext); - DPRINT1("Invalid pending mode for cancel\n"); + DPRINT1("Invalid pending mode %08x for cancel on Context %p\n", + Request->PendingMode, CurrentContext); break; } ExFreePoolWithTag(Request, TAG_TCP_REQUEST); @@ -499,9 +539,6 @@ Irp->IoStatus.Status = STATUS_CANCELLED; Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); -#ifndef NDEBUG - REMOVE_IRP(Irp); -#endif } /** @@ -518,12 +555,10 @@ AddrFileCount = 0; GlContextCount = 0; PcbCount = 0; - IRPCount = 0; KeInitializeSpinLock(&AddrFileArrayLock); KeInitializeSpinLock(&ContextArrayLock); KeInitializeSpinLock(&PCBArrayLock); - KeInitializeSpinLock(&IRPArrayLock); #endif } @@ -726,7 +761,8 @@ /* Sanity checks */ if ((AddressFile->Protocol != IPPROTO_TCP) || (Context->TcpState != TCP_STATE_CREATED)) { - DPRINT1("We should be associating a new TCP Context with a TCP Address File\n"); + DPRINT1("Context %p has wrong state or Addr File %p has wrong protocol, for association\n", + Context, AddressFile); ObDereferenceObject(FileObject); return STATUS_INVALID_PARAMETER; } @@ -762,28 +798,28 @@ case (ERR_BUF) : { RELEASE_SERIAL_MUTEX(); - DPRINT1("lwIP ERR_BUFF\n"); + DPRINT1("lwIP ERR_BUFF. Context %p, PCB %p\n", Context, Context->lwip_tcp_pcb); Status = STATUS_NO_MEMORY; goto FINISH; } case (ERR_VAL) : { RELEASE_SERIAL_MUTEX(); - DPRINT1("lwIP ERR_VAL\n"); + DPRINT1("lwIP ERR_VAL. Context %p, PCB %p\n", Context, Context->lwip_tcp_pcb); Status = STATUS_INVALID_PARAMETER; goto FINISH; } case (ERR_USE) : { RELEASE_SERIAL_MUTEX(); - DPRINT1("lwIP ERR_USE\n"); + DPRINT1("lwIP ERR_USE. Context %p, PCB %p\n", Context, Context->lwip_tcp_pcb); Status = STATUS_ADDRESS_ALREADY_EXISTS; goto FINISH; } default : { RELEASE_SERIAL_MUTEX(); - DPRINT1("lwIP unexpected error\n"); + DPRINT1("lwIP unexpected error. Context %p, PCB %p\n", Context, Context->lwip_tcp_pcb); // TODO: better return code Status = STATUS_UNSUCCESSFUL; goto FINISH; @@ -809,13 +845,14 @@ **/ /* This handler never acquires the mutex for the incoming Context because the IRP sender should be - * the only reference holder for that Context */ + * the only reference holder for that Context. */ NTSTATUS TcpIpListen( _Inout_ PIRP Irp ) { #ifndef NDEBUG + INT i; KIRQL OldIrql; #endif LARGE_INTEGER Timeout; @@ -840,7 +877,7 @@ Context = IrpSp->FileObject->FsContext; if (Context->TcpState != TCP_STATE_BOUND) { - DPRINT1("Context is not a bound context\n"); + DPRINT1("Context %p is not a bound context\n", Context); return STATUS_INVALID_PARAMETER; } @@ -893,7 +930,8 @@ /* We walked the entire Request list without finding a connection waiting to be accepted. * Now we must enquque a Request and wait for an incomming connection request. */ - DPRINT("Walked entire Request list without finding a connection\n"); + DPRINT("Found no connection for Context %p on Listener %p with PCB %p\n", + Context, ListenContext, ListenContext->lwip_tcp_pcb); Status = EnqueueIRP( Irp, @@ -926,6 +964,7 @@ InterlockedIncrement(&AddressFile->ContextCount); /* Initialize the Listener */ + TCP_SET_STATE(TCP_STATE_LISTENING, ListenContext); ListenContext->AddressFile = AddressFile; InitializeListHead(&ListenContext->RequestListHead); ListenContext->ReferencedByUpperLayer = FALSE; @@ -934,10 +973,13 @@ /* Initiate lwIP listen */ ACQUIRE_SERIAL_MUTEX_NO_TO(); ListenContext->lwip_tcp_pcb = tcp_listen(Context->lwip_tcp_pcb); +#ifndef NDEBUG + REMOVE_PCB(Context->lwip_tcp_pcb); +#endif if (ListenContext->lwip_tcp_pcb == NULL) { RELEASE_SERIAL_MUTEX(); - DPRINT1("Listen failed\n"); + DPRINT1("Listen failed on Context %p\n", Context); return STATUS_INVALID_ADDRESS; } #ifndef NDEBUG @@ -1001,7 +1043,7 @@ Context = IrpSp->FileObject->FsContext; if (Context->TcpState != TCP_STATE_BOUND) { - DPRINT1("Connecting from unbound socket\n"); + DPRINT1("Connecting from unbound socket context %p\n", Context); return STATUS_INVALID_PARAMETER; } @@ -1032,34 +1074,35 @@ return Status; case ERR_VAL : RELEASE_SERIAL_MUTEX(); - DPRINT1("lwip ERR_VAL\n"); + DPRINT1("lwip ERR_VAL. Context %p, PCB %p\n", Context, Context->lwip_tcp_pcb); return STATUS_INVALID_PARAMETER; case ERR_ISCONN : RELEASE_SERIAL_MUTEX(); - DPRINT1("lwip ERR_ISCONN\n"); + DPRINT1("lwip ERR_ISCONN. Context %p, PCB %p\n", Context, Context->lwip_tcp_pcb); return STATUS_CONNECTION_ACTIVE; case ERR_RTE : RELEASE_SERIAL_MUTEX(); - DPRINT1("lwip ERR_RTE\n"); + DPRINT1("lwip ERR_RTE. Context %p, PCB %p\n", Context, Context->lwip_tcp_pcb); return STATUS_NETWORK_UNREACHABLE; case ERR_BUF : /* Use correct error once NDIS errors are included. * This return value means local port unavailable. */ RELEASE_SERIAL_MUTEX(); - DPRINT1("lwip ERR_BUF\n"); + DPRINT1("lwip ERR_BUF. Context %p, PCB %p\n", Context, Context->lwip_tcp_pcb); return STATUS_ADDRESS_ALREADY_EXISTS; case ERR_USE : RELEASE_SERIAL_MUTEX(); - DPRINT1("lwip ERR_USE\n"); + DPRINT1("lwip ERR_USE. Context %p, PCB %p\n", Context, Context->lwip_tcp_pcb); return STATUS_CONNECTION_ACTIVE; case ERR_MEM : RELEASE_SERIAL_MUTEX(); - DPRINT1("lwip ERR_MEM\n"); + DPRINT1("lwip ERR_MEM. Context %p, PCB %p\n", Context, Context->lwip_tcp_pcb); return STATUS_NO_MEMORY; default : /* unknown return value */ RELEASE_SERIAL_MUTEX(); - DPRINT1("lwip unknown return code\n"); + DPRINT1("lwip unknown return code. Context %p, PCB %p\n", + Context, Context->lwip_tcp_pcb); return STATUS_NOT_IMPLEMENTED; } } @@ -1148,7 +1191,8 @@ ContextMutexAcquire(Context); if (!(Context->TcpState & TCP_STATE_CONNECTED)) { - DPRINT1("Receiving on TCP Context %p in state %08x\n", Context, Context->TcpState); + DPRINT1("Receiving on TCP Context %p in state %08x with PCB %p\n", + Context, Context->TcpState, Context->lwip_tcp_pcb); ContextMutexRelease(Context); return STATUS_ADDRESS_CLOSED; } @@ -1223,6 +1267,9 @@ { tcp_arg(Context->lwip_tcp_pcb, NULL); tcp_close(Context->lwip_tcp_pcb); +#ifndef NDEBUG + REMOVE_PCB(Context->lwip_tcp_pcb); +#endif Context->lwip_tcp_pcb = NULL; } RELEASE_SERIAL_MUTEX(); @@ -1245,9 +1292,6 @@ PendingIrp->IoStatus.Status = STATUS_CANCELLED; PendingIrp->IoStatus.Information = 0; IoCompleteRequest(PendingIrp, IO_NETWORK_INCREMENT); -#ifndef NDEBUG - REMOVE_IRP(PendingIrp); -#endif ExFreePoolWithTag(Request, TAG_TCP_REQUEST); } @@ -1263,6 +1307,10 @@ _Inout_ PIRP Irp ) { +#ifndef NDEBUG + INT i; + KIRQL OldIrql; +#endif LARGE_INTEGER Timeout; PIO_STACK_LOCATION IrpSp; @@ -1288,6 +1336,9 @@ { tcp_arg(Context->lwip_tcp_pcb, NULL); tcp_close(Context->lwip_tcp_pcb); +#ifndef NDEBUG + REMOVE_PCB(Context->lwip_tcp_pcb); +#endif Context->lwip_tcp_pcb = NULL; } @@ -1337,7 +1388,8 @@ ContextMutexAcquire(Context); if ((Context->AddressFile != NULL) || (Context->lwip_tcp_pcb != NULL)) { - DPRINT1("Context retains association. AddressFile %p, tcp_pcb %p\n", + DPRINT1("Context %p retains association. AddressFile %p, tcp_pcb %p\n", + Context, Context->AddressFile, Context->lwip_tcp_pcb); return STATUS_CONNECTION_ACTIVE; @@ -1364,9 +1416,6 @@ _Inout_ struct _DEVICE_OBJECT* DeviceObject, _Inout_ _IRQL_uses_cancel_ struct _IRP *Irp) { -#ifndef NDEBUG - INT i; -#endif PIO_STACK_LOCATION IrpSp; ADDRESS_FILE* AddressFile; RECEIVE_DATAGRAM_REQUEST* Request; @@ -1400,9 +1449,6 @@ Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); -#ifndef NDEBUG - REMOVE_IRP(Irp); -#endif ExFreePoolWithTag(Request, TAG_DGRAM_REQST); } @@ -1411,10 +1457,6 @@ TcpIpReceiveDatagram( _Inout_ PIRP Irp) { -#ifndef NDEBUG - KIRQL OldIrql; - INT i; -#endif PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); ADDRESS_FILE *AddressFile; RECEIVE_DATAGRAM_REQUEST* Request = NULL; @@ -1489,9 +1531,6 @@ ExFreePoolWithTag(Request, TAG_DGRAM_REQST); Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); -#ifndef NDEBUG - REMOVE_IRP(Irp); -#endif return Status; } @@ -1499,10 +1538,6 @@ TcpIpSendDatagram( _Inout_ PIRP Irp) { -#ifndef NDEBUG - KIRQL OldIrql; - INT i; -#endif PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); ADDRESS_FILE *AddressFile; PTDI_REQUEST_KERNEL_SENDDG RequestInfo; @@ -1638,9 +1673,6 @@ pbuf_free(p); Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); -#ifndef NDEBUG - REMOVE_IRP(Irp); -#endif return Status; } @@ -1867,16 +1899,17 @@ case ERR_OK: return STATUS_SUCCESS; case ERR_MEM: - DPRINT1("lwIP ERR_MEM\n"); + DPRINT1("lwIP ERR_MEM. Context %p with PCB %p\n", Context, Context->lwip_tcp_pcb); return STATUS_NO_MEMORY; case ERR_ARG: - DPRINT1("lwIP ERR_ARG\n"); + DPRINT1("lwIP ERR_ARG. Context %p with PCB %p\n", Context, Context->lwip_tcp_pcb); return STATUS_INVALID_PARAMETER; case ERR_CONN: - DPRINT1("lwIP ERR_CONN\n"); + DPRINT1("lwIP ERR_CONN. Context %p with PCB %p\n", Context, Context->lwip_tcp_pcb); return STATUS_CONNECTION_ACTIVE; default: - DPRINT1("Unknwon lwIP Error: %d\n", lwip_err); + DPRINT1("Unknwon lwIP Error: %d. Context %p with PCB %p\n", + lwip_err, Context, Context->lwip_tcp_pcb); return STATUS_NOT_IMPLEMENTED; } } @@ -1899,6 +1932,7 @@ return STATUS_NO_MEMORY; } + IoSetCancelRoutine(Irp, CancelRoutine); Request->Payload.PendingIrp = Irp; Request->CancelMode = CancelMode; Request->PendingMode = PendingMode; @@ -1950,7 +1984,6 @@ ) { #ifndef NDEBUG - INT i; KIRQL OldIrql; #endif @@ -1967,10 +2000,14 @@ ListenContext = (PTCP_CONTEXT)arg; if (ListenContext == NULL) { - DPRINT("No listener\n"); + DPRINT("No listener.\n"); return ERR_CLSD; } +#ifndef NDEBUG + ADD_PCB(newpcb); +#endif + /* Do non-dependent PCB setup */ tcp_err(newpcb, lwip_tcp_err_callback); tcp_recv(newpcb, lwip_tcp_recv_callback); @@ -2006,9 +2043,6 @@ /* Complete the IRP */ Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); -#ifndef NDEBUG - REMOVE_IRP(Irp); -#endif ExFreePoolWithTag(Request, TAG_TCP_REQUEST); @@ -2045,7 +2079,7 @@ struct tcp_pcb *tpcb, struct pbuf *p, err_t err -) +) { #ifndef NDEBUG INT i; @@ -2069,7 +2103,7 @@ Context = (PTCP_CONTEXT)arg; if (Context == NULL) { - DPRINT("No receiving Context\n"); + DPRINT("No receiving Context for PCB %p\n", tpcb); return ERR_CLSD; } ContextMutexAcquire(Context); @@ -2077,6 +2111,10 @@ /* A null buffer means the connection has been closed */ if (p == NULL) { +#ifndef NDEBUG + DPRINT("Context %p closed by lwIP\n", Context); + REMOVE_PCB(Context->lwip_tcp_pcb); +#endif Context->lwip_tcp_pcb = NULL; TCP_SET_STATE(TCP_STATE_CLOSED, Context); ContextMutexRelease(Context); @@ -2087,13 +2125,14 @@ if (!(Context->TcpState & (TCP_STATE_CONNECTED|TCP_STATE_RECEIVING))) { ContextMutexRelease(Context); - DPRINT("Receiving on unconnected Context %p\n", Context); + DPRINT("Receiving on unconnected Context %p from PCB %p\n", Context, tpcb); return ERR_ARG; } if (Context->lwip_tcp_pcb != tpcb) { ContextMutexRelease(Context); - DPRINT1("Receive PCB mismatch\n"); + DPRINT1("Receive PCB mismatch. Context %p has %p, callback has %p\n", + Context, Context->lwip_tcp_pcb, tpcb); return ERR_ARG; } @@ -2121,7 +2160,8 @@ /* If we did not find a TDI_RECEIVE, simply return an error. lwIP will save the refused data. */ TCP_RMV_STATE(TCP_STATE_RECEIVING, Context); ContextMutexRelease(Context); - DPRINT("Did not find a TDI_RECEIVE on Context %p marked as Receiving\n", Context); + DPRINT("Did not find a TDI_RECEIVE on Context %p marked as Receiving with PCB %p\n", + Context, Context->lwip_tcp_pcb); return ERR_MEM; COPY_DATA: @@ -2186,9 +2226,6 @@ Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = CopiedLength; IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); -#ifndef NDEBUG - REMOVE_IRP(Irp); -#endif return ERR_OK; } @@ -2201,10 +2238,6 @@ u16_t len ) { -#ifndef NDEBUG - INT i; - KIRQL OldIrql; -#endif NTSTATUS Status; PIRP Irp; @@ -2217,20 +2250,21 @@ Context = (PTCP_CONTEXT)arg; if (Context == NULL) { - DPRINT("Callack on closed Context\n"); + DPRINT("Callack on closed Context from PCB %p\n", tpcb); return ERR_CLSD; } ContextMutexAcquire(Context); if (!(Context->TcpState & TCP_STATE_SENDING)) { ContextMutexRelease(Context); - DPRINT("Callback on Context %p that is not sending\n", Context); + DPRINT("Callback on Context %p that is not sending for PCB %p\n", Context, tpcb); return ERR_ARG; } if (Context->lwip_tcp_pcb != tpcb) { ContextMutexRelease(Context); - DPRINT("Sent PCB mismatch\n"); + DPRINT("Sent PCB mismatch. Context %p has %p, callback has %p\n", + Context, Context->lwip_tcp_pcb, tpcb); return ERR_ARG; } @@ -2253,9 +2287,6 @@ Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = len; IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); -#ifndef NDEBUG - REMOVE_IRP(Irp); -#endif ExFreePoolWithTag(Request, TAG_TCP_REQUEST); @@ -2265,7 +2296,8 @@ /* If we didn't find a TDI_SEND, something is wrong. */ ContextMutexRelease(Context); - DPRINT("No TDI_SEND on Context %p marked as SENDING\n", Context); + DPRINT("No TDI_SEND on Context %p marked as SENDING with PCB %p\n", + Context, Context->lwip_tcp_pcb); return ERR_ARG; CHECK_FOR_NEXT_REQUEST: @@ -2303,9 +2335,13 @@ err_t err ) { +#ifndef NDEBUG + INT i; + KIRQL OldIrql; +#endif PTCP_CONTEXT Context; - DPRINT("lwIP closed a socket: %d\n", err); + DPRINT("lwIP closed a socket with arg %08x: %d\n", arg, err); Context = (PTCP_CONTEXT)arg; if (Context == NULL) @@ -2314,6 +2350,9 @@ } ContextMutexAcquire(Context); +#ifndef NDEBUG + REMOVE_PCB(Context->lwip_tcp_pcb); +#endif Context->lwip_tcp_pcb = NULL; ContextMutexRelease(Context); } @@ -2326,11 +2365,6 @@ err_t err ) { -#ifndef NDEBUG - INT i; - KIRQL OldIrql; -#endif - PIRP Irp; PLIST_ENTRY Entry; PTCP_CONTEXT Context; @@ -2342,20 +2376,22 @@ Context = (PTCP_CONTEXT)arg; if (Context == NULL) { - DPRINT("No callback Context\n"); + DPRINT("No callback Context for PCB %p\n", tpcb); return ERR_CLSD; } ContextMutexAcquire(Context); if (Context->TcpState != TCP_STATE_CONNECTING) { ContextMutexRelease(Context); - DPRINT("Connection established for Context %p in state %08x\n", Context, Context->TcpState); + DPRINT("Connection established for Context %p in state %08x on PCB %p\n", + Context, Context->TcpState, tpcb); return ERR_ARG; } if (Context->lwip_tcp_pcb != tpcb) { ContextMutexRelease(Context); - DPRINT("Connected PCB mismatch\n"); + DPRINT("Connected PCB mismatch. Context %p has %p, callback has %p\n", + Context, Context->lwip_tcp_pcb, tpcb); return ERR_ARG; } @@ -2364,7 +2400,7 @@ if (Entry == &Context->RequestListHead) { ContextMutexRelease(Context); - DPRINT("No Connect request\n"); + DPRINT("No Connect request on Context %p\n", Context); return ERR_ARG; } @@ -2384,9 +2420,6 @@ Irp->IoStatus.Status = STATUS_CANCELLED; Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); -#ifndef NDEBUG - REMOVE_IRP(Irp); -#endif return ERR_ARG; } @@ -2401,9 +2434,6 @@ Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); -#ifndef NDEBUG - REMOVE_IRP(Irp); -#endif return ERR_OK; } Modified: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… ============================================================================== --- branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.h [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.h [iso-8859-1] Tue Aug 16 21:42:21 2016 @@ -10,72 +10,21 @@ #define TCP_REQUEST_PENDING_LISTEN 4 #define TCP_REQUEST_PENDING_ACCEPTED_CONNECTION 5 -#define TCP_REQUEST_PAYLOAD_IRP 1 -#define TCP_REQUEST_PAYLOAD_PCB 2 +#define TCP_REQUEST_PAYLOAD_IRP 1 +#define TCP_REQUEST_PAYLOAD_PCB 2 // TODO: simplify states -#define TCP_STATE_CREATED 0x1 << 0 -#define TCP_STATE_BOUND 0x1 << 1 -#define TCP_STATE_LISTENING 0x1 << 2 -#define TCP_STATE_RECEIVING 0x1 << 3 -#define TCP_STATE_ABORTED 0x1 << 4 -#define TCP_STATE_CONNECTING 0x1 << 5 -#define TCP_STATE_CONNECTED 0x1 << 6 -#define TCP_STATE_SENDING 0x1 << 7 -#define TCP_STATE_CLOSED 0x1 << 8 +#define TCP_STATE_CREATED 0x1 << 0 +#define TCP_STATE_BOUND 0x1 << 1 +#define TCP_STATE_LISTENING 0x1 << 2 +#define TCP_STATE_RECEIVING 0x1 << 3 +#define TCP_STATE_ABORTED 0x1 << 4 +#define TCP_STATE_CONNECTING 0x1 << 5 +#define TCP_STATE_CONNECTED 0x1 << 6 +#define TCP_STATE_SENDING 0x1 << 7 +#define TCP_STATE_CLOSED 0x1 << 8 //#define TCPIP_NDEBUG -#ifndef TCPIP_NDEBUG -KSPIN_LOCK IRPArrayLock; -PIRP IRPArray[256]; -volatile long int IRPCount; - -#define ADD_IRP(Irp) \ - KeAcquireSpinLock(&IRPArrayLock, &OldIrql); \ - IRPArray[IRPCount] = Irp; \ - IRPCount++; \ - KeReleaseSpinLock(&IRPArrayLock, OldIrql) - -#define ADD_IRP_DPC(Irp) \ - KeAcquireSpinLockAtDpcLevel(&IRPArrayLock); \ - IRPArray[IRPCount] = Irp; \ - IRPCount++; \ - KeReleaseSpinLockFromDpcLevel(&IRPArrayLock) - -#define REMOVE_IRP(Irp) \ - KeAcquireSpinLock(&IRPArrayLock, &OldIrql); \ - for (i = 0; i < IRPCount; i++) \ - { \ - if (Irp == IRPArray[i]) \ - { \ - IRPArray[i] = NULL; \ - } \ - if (IRPArray[i] == NULL) \ - { \ - IRPArray[i] = IRPArray[i+1]; \ - IRPArray[i+1] = NULL; \ - } \ - } \ - IRPCount--; \ - KeReleaseSpinLock(&IRPArrayLock, OldIrql) - -#define REMOVE_IRP_DPC(Irp) \ - KeAcquireSpinLockAtDpcLevel(&IRPArrayLock); \ - for (i = 0; i < IRPCount; i++) \ - { \ - if (Irp == IRPArray[i]) \ - { \ - IRPArray[i] = NULL; \ - } \ - if (IRPArray[i] == NULL) \ - { \ - IRPArray[i] = IRPArray[i+1]; \ - IRPArray[i+1] = NULL; \ - } \ - } \ - IRPCount--; \ - KeReleaseSpinLockFromDpcLevel(&IRPArrayLock) -#endif #define _IoCompleteRequest(Irp,Mode) \ DPRINT("Complete IRP %p with IO Status %08X\n", Irp, Irp->IoStatus.Status); \ Modified: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… ============================================================================== --- branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/main.c [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/main.c [iso-8859-1] Tue Aug 16 21:42:21 2016 @@ -211,22 +211,11 @@ _Inout_ struct _IRP *Irp ) { -#ifndef NDEBUG - KIRQL OldIrql; - INT i; -#endif NTSTATUS Status; PFILE_FULL_EA_INFORMATION FileInfo; IPPROTO Protocol; -// ADDRESS_FILE *AddressFile; - -// ULONG *temp; PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); - -#ifndef NDEBUG - ADD_IRP(Irp); -#endif /* Grab the info describing the file */ FileInfo = Irp->AssociatedIrp.SystemBuffer; @@ -276,21 +265,11 @@ goto Quickie; } - /* All good. */ -/* temp = (ULONG*)Address; - DPRINT1("\nPTA_IP_ADDRESS dump before\n %08x %08x %08x %08x\n %08x %08x %08x %08x\n", - temp[7], temp[6], temp[5], temp[4], - temp[3], temp[2], temp[1], temp[0]);*/ - // DPRINT1("Call into TcpIpCreateAddress\n"); Status = TcpIpCreateAddress(Irp, &Address->Address[0].Address[0], Protocol); - // DPRINT1("Returned from TcpIpCreateAddress\n"); if (Status != STATUS_SUCCESS) { goto Quickie; } -/* DPRINT1("\nPTA_IP_ADDRESS dump after\n %08x %08x %08x %08x\n %08x %08x %08x %08x\n", - temp[7], temp[6], temp[5], temp[4], - temp[3], temp[2], temp[1], temp[0]);*/ break; } case TDI_CONNECTION_CONTEXT_LENGTH: @@ -315,19 +294,7 @@ goto Quickie; } -/* temp = (ULONG*)Protocol; - DPRINT1("\n Protocol: %08x\n", temp); - - temp = (ULONG*)Address;*/ - - /* All good. */ -/* DPRINT1("\n PTA_IP_ADDRESS dump before\n %08x %08x %08x %08x\n %08x %08x %08x %08x\n", - temp[7], temp[6], temp[5], temp[4], - temp[3], temp[2], temp[1], temp[0]);*/ Status = TcpIpCreateContext(Irp, &Address->Address[0].Address[0], Protocol); -/* DPRINT1("\n PTA_IP_ADDRESS dump after\n %08x %08x %08x %08x\n %08x %08x %08x %08x\n", - temp[7], temp[6], temp[5], temp[4], - temp[3], temp[2], temp[1], temp[0]);*/ break; } @@ -345,9 +312,6 @@ else { IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); -#ifndef NDEBUG - REMOVE_IRP(Irp); -#endif } return Status; @@ -361,20 +325,12 @@ _Inout_ struct _IRP *Irp ) { -#ifndef NDEBUG - KIRQL OldIrql; - INT i; -#endif PIO_STACK_LOCATION IrpSp; NTSTATUS Status; ULONG_PTR FileType; IrpSp = IoGetCurrentIrpStackLocation(Irp); -#ifndef NDEBUG - ADD_IRP(Irp); -#endif - FileType = (ULONG_PTR)IrpSp->FileObject->FsContext2; switch (FileType) @@ -390,14 +346,13 @@ Status = TcpIpCloseAddress(IrpSp->FileObject->FsContext); break; case TDI_CONNECTION_FILE: - DPRINT1("TCPIP Close Connection File\n"); if (!IrpSp->FileObject->FsContext) { DPRINT1("TCPIP: Got a close request without a file to close!\n"); Status = STATUS_INVALID_PARAMETER; goto Quickie; } - DPRINT1("TCPIP Close Connection Context\n"); + DPRINT1("TCPIP Close Connection Context %p\n", IrpSp->FileObject->FsContext); Status = TcpIpCloseContext(IrpSp->FileObject->FsContext); break; case TDI_CONTROL_CHANNEL_FILE: @@ -414,9 +369,6 @@ Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); -#ifndef NDEBUG - REMOVE_IRP(Irp); -#endif return Status; } @@ -429,22 +381,13 @@ _Inout_ struct _IRP *Irp ) { -#ifndef NDEBUG - KIRQL OldIrql; - INT i; -#endif NTSTATUS Status; PIO_STACK_LOCATION IrpSp; PTCP_CONTEXT Context; PADDRESS_FILE AddressFile; - DPRINT1("TcpIpDispatchInternal\n"); - IrpSp = IoGetCurrentIrpStackLocation(Irp); - -#ifndef NDEBUG - ADD_IRP(Irp); -#endif + DPRINT("TcpIpDispatchInternal on TDI object %p\n", IrpSp->FileObject->FsContext); switch ((ULONG)IrpSp->FileObject->FsContext2) { @@ -577,9 +520,6 @@ else { IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); -#ifndef NDEBUG - REMOVE_IRP(Irp); -#endif } return Status; @@ -595,12 +535,6 @@ { NTSTATUS Status; PIO_STACK_LOCATION IrpSp; - -#ifndef NDEBUG - INT i; - KIRQL OldIrql; - ADD_IRP(Irp); -#endif IrpSp = IoGetCurrentIrpStackLocation(Irp); @@ -642,9 +576,6 @@ else { IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); -#ifndef NDEBUG - REMOVE_IRP(Irp); -#endif } return Status; @@ -662,4 +593,4 @@ IoDeleteDevice(UdpDeviceObject); IoDeleteDevice(TcpDeviceObject); TcpIpUnregisterNdisProtocol(); -} +}

1 0

[hbelusca] 72236: [EVENTLOG] - Get rid of MyHeap. - Continue using safe string functions. - Allow event logs themselves to be their own source. And store the full list of log sources in the "Source...
by hbelusca＠svn.reactos.org 16 Aug '16

16 Aug '16

Author: hbelusca Date: Tue Aug 16 21:08:15 2016 New Revision: 72236 URL: http://svn.reactos.org/svn/reactos?rev=72236&view=rev Log: [EVENTLOG] - Get rid of MyHeap. - Continue using safe string functions. - Allow event logs themselves to be their own source. And store the full list of log sources in the "Sources" registry multi-string value. - Correctly compute the number of records. - Correctly return the event number and the write timestamp of reported events. - Use a helper function for ElfrReportEventW/A and for ElfrReportEventAndSourceW that is now implemented. - Rewrite the file.c functions using NT-APIs almost exclusively for file operations. - Modify the logic of LogfReadEvents so that a RecordNumber == 0 in sequential read mode means we need to determine where to start the read operation, depending on whether a forwards-read or a backwards-read is performed. The log handle's CurrentRecord member is therefore initialized to 0 before usage. - Adjust LogfAllocAndBuildNewRecord to take in input the event generation timestamp. - Do not "compute" the RecordNumber of the new event in LogfAllocAndBuildNewRecord; it will be consistently assigned by LogfWriteRecord. - Correctly initialize the OldestRecordNumber to zero for new (empty) logs. - Perform extensive log validity checks when opening existing logs: log header and EOF record as well as boundary checks. - Rewrite almost of the functions to support event log wrapping (see https://msdn.microsoft.com/en-us/library/windows/desktop/bb309026(v=vs.85).… ) and splitted records. Now our event logs are not corrupted anymore, and are readable under Windows 2k/xp/2k3/Vista+. - As a consequence of supporting wrapping event logs we need to iterate through them at loading time in order to locate the valid EOF record (indeed it may happen that the log header is not correctly synced, and its Start/EndOffsets are invalid. The EOF record offsets contain on the other way the correct values). The file.c fixes are a bit still work-in-progress, but the bulk of the code works. It is extensively tested in situ in my local VM since 2 months now. CORE-11843 #resolve Modified: trunk/reactos/base/services/eventlog/eventlog.c trunk/reactos/base/services/eventlog/eventlog.h trunk/reactos/base/services/eventlog/eventsource.c trunk/reactos/base/services/eventlog/file.c trunk/reactos/base/services/eventlog/logport.c trunk/reactos/base/services/eventlog/rpc.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/services/eventlog/eventlog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… Modified: trunk/reactos/base/services/eventlog/eventlog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… Modified: trunk/reactos/base/services/eventlog/eventsource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/eve… Modified: trunk/reactos/base/services/eventlog/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/fil… Modified: trunk/reactos/base/services/eventlog/logport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/log… Modified: trunk/reactos/base/services/eventlog/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/rpc…

1 0

[dchapyshev] 72235: [INPUT] - Show localized keyboard layout name
by dchapyshev＠svn.reactos.org 16 Aug '16

16 Aug '16

Author: dchapyshev Date: Tue Aug 16 18:33:50 2016 New Revision: 72235 URL: http://svn.reactos.org/svn/reactos?rev=72235&view=rev Log: [INPUT] - Show localized keyboard layout name Modified: trunk/reactos/dll/cpl/input/layout_list.c Modified: trunk/reactos/dll/cpl/input/layout_list.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/layout_list.… ============================================================================== --- trunk/reactos/dll/cpl/input/layout_list.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/layout_list.c [iso-8859-1] Tue Aug 16 18:33:50 2016 @@ -148,13 +148,73 @@ dwSize = sizeof(szBuffer); if (RegQueryValueExW(hLayoutKey, - L"Layout Text", + L"Layout Display Name", NULL, NULL, - (LPBYTE)szBuffer, &dwSize) == ERROR_SUCCESS) + (LPBYTE)szBuffer, &dwSize) == ERROR_SUCCESS && + szBuffer[0] == L'@') { - DWORD dwLayoutId = DWORDfromString(szLayoutId); - - LayoutList_AppendNode(dwLayoutId, dwSpecialId, szBuffer); + WCHAR szPath[MAX_PATH]; + WCHAR *pBuffer; + WCHAR *pIndex; + INT iIndex; + + /* Move to the position after the character "@" */ + pBuffer = szBuffer + 1; + + /* Get a pointer to the beginning ",-" */ + pIndex = wcsstr(pBuffer, L",-"); + + /* Convert the number in the string after the ",-" */ + iIndex = _wtoi(pIndex + 2); + + pIndex[0] = 0; + + if (ExpandEnvironmentStringsW(pBuffer, szPath, ARRAYSIZE(szPath)) != 0) + { + HANDLE hHandle; + + hHandle = LoadLibraryW(szPath); + if (hHandle != NULL) + { + INT iLength = LoadStringW(hHandle, iIndex, szBuffer, ARRAYSIZE(szBuffer)); + + FreeLibrary(hHandle); + + if (iLength != 0) + { + DWORD dwLayoutId = DWORDfromString(szLayoutId); + + LayoutList_AppendNode(dwLayoutId, dwSpecialId, szBuffer); + } + else + { + goto NotTranslated; + } + } + else + { + goto NotTranslated; + } + } + else + { + goto NotTranslated; + } + } + else + { +NotTranslated: + dwSize = sizeof(szBuffer); + + if (RegQueryValueExW(hLayoutKey, + L"Layout Text", + NULL, NULL, + (LPBYTE)szBuffer, &dwSize) == ERROR_SUCCESS) + { + DWORD dwLayoutId = DWORDfromString(szLayoutId); + + LayoutList_AppendNode(dwLayoutId, dwSpecialId, szBuffer); + } } } }

1 0

[spetreolle] 72234: Get rosautotest from the web. @aminekhaldi thanks for the idea. ONLINE-567
by spetreolle＠svn.reactos.org 15 Aug '16

15 Aug '16

Author: spetreolle Date: Mon Aug 15 23:32:42 2016 New Revision: 72234 URL: http://svn.reactos.org/svn/reactos?rev=72234&view=rev Log: Get rosautotest from the web. @aminekhaldi thanks for the idea. ONLINE-567 Modified: trunk/reactos/boot/bootdata/bootcdregtest/AHKAppTests.cmd Modified: trunk/reactos/boot/bootdata/bootcdregtest/AHKAppTests.cmd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcdregtes… ============================================================================== --- trunk/reactos/boot/bootdata/bootcdregtest/AHKAppTests.cmd [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/bootcdregtest/AHKAppTests.cmd [iso-8859-1] Mon Aug 15 23:32:42 2016 @@ -6,4 +6,6 @@ ) xcopy /Y /H /E D:\AHK-Tests\*.* C:\ReactOS\bin -dbgprint "....AHK Application testing suite added." +REM Download Amine's rosautotest from svn +dwnl http://svn.reactos.org/amine/rosautotest.exe C:\ReactOS\system32\rosautotest.exe +dbgprint "....AHK Application testing suite added."

1 0

[gadamopoulos] 72233: [EXPLORER] - Implement resizing the taskbar in steps based on the way the rebar resizes. It works in windows (a bit buggy) and it would work in ros if our rebar could resize o...
by gadamopoulos＠svn.reactos.org 15 Aug '16

15 Aug '16

Author: gadamopoulos Date: Mon Aug 15 20:53:12 2016 New Revision: 72233 URL: http://svn.reactos.org/svn/reactos?rev=72233&view=rev Log: [EXPLORER] - Implement resizing the taskbar in steps based on the way the rebar resizes. It works in windows (a bit buggy) and it would work in ros if our rebar could resize on demand. - Let CStartButton handle the creation of the start button. Modified: trunk/reactos/base/shell/explorer/traywnd.cpp Modified: trunk/reactos/base/shell/explorer/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traywn… ============================================================================== --- trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] Mon Aug 15 20:53:12 2016 @@ -64,16 +64,15 @@ const GUID IID_IShellDesktopTray = { 0x213e2df9, 0x9a14, 0x4328, { 0x99, 0xb1, 0x69, 0x61, 0xf9, 0x14, 0x3c, 0xe9 } }; class CStartButton - : public CContainedWindow + : public CWindow { HIMAGELIST m_ImageList; SIZE m_Size; HFONT m_Font; public: - CStartButton(CMessageMap *pObject, DWORD dwMsgMapID) - : CContainedWindow(pObject, dwMsgMapID), - m_ImageList(NULL), + CStartButton() + : m_ImageList(NULL), m_Font(NULL) { m_Size.cx = 0; @@ -311,7 +310,7 @@ } } - SendMessage(WM_SETFONT, (WPARAM) m_Font, FALSE); + SetFont(m_Font, FALSE); if (CreateImageList()) { @@ -350,6 +349,36 @@ if (hbmOld != NULL) DeleteObject(hbmOld); } + } + + HWND Create(HWND hwndParent) + { + WCHAR szStartCaption[32]; + if (!LoadStringW(hExplorerInstance, + IDS_START, + szStartCaption, + _countof(szStartCaption))) + { + szStartCaption[0] = L'\0'; + } + + DWORD dwStyle = WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | BS_PUSHBUTTON | BS_CENTER | BS_VCENTER | BS_BITMAP; + + m_hWnd = CreateWindowEx( + 0, + WC_BUTTON, + szStartCaption, + dwStyle, + 0, 0, 0, 0, + hwndParent, + (HMENU) IDC_STARTBTN, + hExplorerInstance, + NULL); + + if (m_hWnd) + Initialize(); + + return m_hWnd; } }; @@ -418,7 +447,7 @@ public: CTrayWindow() : - m_StartButton(this, 1), + m_StartButton(), m_Theme(NULL), m_CaptionFont(NULL), m_Font(NULL), @@ -1457,22 +1486,11 @@ LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - WCHAR szStartCaption[32]; - ((ITrayWindow*)this)->AddRef(); SetWindowTheme(m_hWnd, L"TaskBar", NULL); - OnThemeChanged(); InterlockedIncrement(&TrayWndCount); - - if (!LoadStringW(hExplorerInstance, - IDS_START, - szStartCaption, - _countof(szStartCaption))) - { - szStartCaption[0] = L'\0'; - } if (m_CaptionFont == NULL) { @@ -1490,27 +1508,9 @@ } } } - + /* Create the Start button */ - m_StartButton.SubclassWindow(CreateWindowEx( - 0, - WC_BUTTON, - szStartCaption, - WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | - BS_PUSHBUTTON | BS_CENTER | BS_VCENTER | BS_BITMAP, - 0, - 0, - 0, - 0, - m_hWnd, - (HMENU) IDC_STARTBTN, - hExplorerInstance, - NULL)); - - if (m_StartButton.m_hWnd) - { - m_StartButton.Initialize(); - } + m_StartButton.Create(m_hWnd); /* Load the saved tray window settings */ RegLoadSettings(); @@ -1520,11 +1520,6 @@ m_StartMenuPopup = CreateStartMenu(this, &m_StartMenuBand, hbmBanner, 0); /* Load the tray band site */ - if (m_TrayBandSite != NULL) - { - m_TrayBandSite.Release(); - } - m_TrayBandSite = CreateTrayBandSite(this, &m_Rebar, &m_TaskSwitch); SetWindowTheme(m_Rebar, L"TaskBar", NULL); @@ -2305,6 +2300,36 @@ if (!Locked) { + /* Get the rect of the rebar */ + RECT rebarRect, taskbarRect; + ::GetWindowRect(m_Rebar, &rebarRect); + ::GetWindowRect(m_hWnd, &taskbarRect); + OffsetRect(&rebarRect, -taskbarRect.left, -taskbarRect.top); + + /* Calculate the difference of size of the taskbar and the rebar */ + SIZE margins; + margins.cx = taskbarRect.right - taskbarRect.left - rebarRect.right + rebarRect.left; + margins.cy = taskbarRect.bottom - taskbarRect.top - rebarRect.bottom + rebarRect.top; + + /* Calculate the new size of the rebar and make it resize, then change the new taskbar size */ + switch (m_Position) + { + case ABE_TOP: + rebarRect.bottom = rebarRect.top + pRect->bottom - pRect->top - margins.cy; + ::SendMessageW(m_Rebar, RB_SIZETORECT, RBSTR_CHANGERECT, (LPARAM)&rebarRect); + pRect->bottom = pRect->top + rebarRect.bottom - rebarRect.top + margins.cy; + break; + case ABE_BOTTOM: + rebarRect.top = rebarRect.bottom - (pRect->bottom - pRect->top - margins.cy); + ::SendMessageW(m_Rebar, RB_SIZETORECT, RBSTR_CHANGERECT, (LPARAM)&rebarRect); + pRect->top = pRect->bottom - (rebarRect.bottom - rebarRect.top + margins.cy); + break; + case ABE_LEFT: + case ABE_RIGHT: + /* FIXME: what to do here? */ + break; + } + CalculateValidSize(m_Position, pRect); } else

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