Ros-diffs March 2017

ros-diffs@reactos.org

14 participants
251 discussions

[tfaber] 74077: [FREELDR] - "ReactOS Medium" isn't a trademark or anything, no need to capitalize it
by tfaber＠svn.reactos.org 05 Mar '17

05 Mar '17

Author: tfaber Date: Sun Mar 5 11:24:31 2017 New Revision: 74077 URL: http://svn.reactos.org/svn/reactos?rev=74077&view=rev Log: [FREELDR] - "ReactOS Medium" isn't a trademark or anything, no need to capitalize it Modified: trunk/reactos/boot/freeldr/bootsect/isoboot.S Modified: trunk/reactos/boot/freeldr/bootsect/isoboot.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/isob… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/isoboot.S [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/bootsect/isoboot.S [iso-8859-1] Sun Mar 5 11:24:31 2017 @@ -141,7 +141,7 @@ .read_mbr: // Read the first sector (MBR) from the first hard disk (drive 80h) to 7C00h. // If we then decide to boot from HDD, we already have it at the right place. - // In case of an error (indicated by the Carry Flag), just boot SETUPLDR from our ReactOS Medium. + // In case of an error (indicated by the Carry Flag), just boot SETUPLDR from our ReactOS medium. mov ax, HEX(0201) mov dx, HEX(0080) mov cx, HEX(0001) @@ -150,13 +150,13 @@ jc .boot_setupldr // Verify the signature of the read MBR. - // If it's invalid, there is probably no OS installed and we just boot SETUPLDR from our ReactOS Medium. + // If it's invalid, there is probably no OS installed and we just boot SETUPLDR from our ReactOS medium. mov ax, word ptr ds:[HEX(7C00)+510] cmp ax, HEX(AA55) jne .boot_setupldr #ifdef WAIT_FOR_KEY - // We could either boot from the ReactOS Medium or from hard disk. Let the user decide! + // We could either boot from the ReactOS medium or from hard disk. Let the user decide! // Display the 'Press key' message. call crlf_early mov si, offset presskey_msg @@ -172,7 +172,7 @@ add eax, 19 .poll_again: - // Check for a keypress, boot SETUPLDR from our ReactOS Medium if a key was pressed. + // Check for a keypress, boot SETUPLDR from our ReactOS medium if a key was pressed. call pollchar_and_empty jnz .boot_setupldr @@ -1071,7 +1071,7 @@ /* INITIALIZED VARIABLES *****************************************************/ presskey_msg: - .ascii "Press any key to boot from the ReactOS Medium", NUL + .ascii "Press any key to boot from the ReactOS medium", NUL dot_msg: .ascii ".", NUL isoboot_str:

1 0

[gadamopoulos] 74076: [COMCTL32] -Slightly improve the hack.
by gadamopoulos＠svn.reactos.org 05 Mar '17

05 Mar '17

Author: gadamopoulos Date: Sun Mar 5 10:26:57 2017 New Revision: 74076 URL: http://svn.reactos.org/svn/reactos?rev=74076&view=rev Log: [COMCTL32] -Slightly improve the hack. Modified: trunk/reactos/dll/win32/comctl32/button.c Modified: trunk/reactos/dll/win32/comctl32/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/button.… ============================================================================== --- trunk/reactos/dll/win32/comctl32/button.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/button.c [iso-8859-1] Sun Mar 5 10:26:57 2017 @@ -343,7 +343,7 @@ GetTextExtentPoint32W(hdc, text, wcslen(text), &TextSize); - if (logfont.lfHeight == -1 && logfont.lfWidth == 0 && wcscmp(logfont.lfFaceName, L"Arial") == 0 && wcscmp(text, L"Start") == 0) + if (logfont.lfHeight == -1 && logfont.lfWidth == 0 && wcscmp(logfont.lfFaceName, L"Arial") == 0 && wcsicmp(text, L"Start") == 0) { TextSize.cx = 5; TextSize.cy = 4;

1 0

[gadamopoulos] 74075: [COMCTL32] -Remove a debug print that is no longer needed.
by gadamopoulos＠svn.reactos.org 05 Mar '17

05 Mar '17

Author: gadamopoulos Date: Sun Mar 5 09:42:29 2017 New Revision: 74075 URL: http://svn.reactos.org/svn/reactos?rev=74075&view=rev Log: [COMCTL32] -Remove a debug print that is no longer needed. Modified: trunk/reactos/dll/win32/comctl32/button.c Modified: trunk/reactos/dll/win32/comctl32/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/button.… ============================================================================== --- trunk/reactos/dll/win32/comctl32/button.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/button.c [iso-8859-1] Sun Mar 5 09:42:29 2017 @@ -316,7 +316,7 @@ HFONT hFont = 0, hPrevFont = 0; SIZE TextSize, ImageSize, ButtonSize; BOOL ret = FALSE; - LOGFONTW logfont; + LOGFONTW logfont = {0}; pdata = _GetButtonData(hwnd); text = get_button_text( hwnd ); @@ -372,8 +372,6 @@ rcContents.right = ImageSize.cx + TextSize.cx; rcContents.bottom = max(ImageSize.cy, TextSize.cy); GetThemeBackgroundExtent(theme, hdc, BP_PUSHBUTTON, PBS_NORMAL, &rcContents, &rcButtonExtent); - ERR("rcContents: %d, %d, %d, %d\n", rcContents.left, rcContents.top, rcContents.right, rcContents.bottom); - ERR("rcButtonExtent: %d, %d, %d, %d\n", rcButtonExtent.left, rcButtonExtent.top, rcButtonExtent.right, rcButtonExtent.bottom); ButtonSize.cx = rcButtonExtent.right - rcButtonExtent.left; ButtonSize.cy = rcButtonExtent.bottom - rcButtonExtent.top; }

1 0

[gadamopoulos] 74074: [COMCTL32] - A button with the style BS_DEFPUSHBUTTON is drawn as defaulted instead of normal.
by gadamopoulos＠svn.reactos.org 05 Mar '17

05 Mar '17

Author: gadamopoulos Date: Sun Mar 5 09:35:12 2017 New Revision: 74074 URL: http://svn.reactos.org/svn/reactos?rev=74074&view=rev Log: [COMCTL32] - A button with the style BS_DEFPUSHBUTTON is drawn as defaulted instead of normal. Modified: trunk/reactos/dll/win32/comctl32/theme_button.c Modified: trunk/reactos/dll/win32/comctl32/theme_button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/theme_b… ============================================================================== --- trunk/reactos/dll/win32/comctl32/theme_button.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/theme_button.c [iso-8859-1] Sun Mar 5 09:35:12 2017 @@ -361,6 +361,11 @@ } else drawState = STATE_DISABLED; + if (drawState == STATE_NORMAL && (dwStyle & BUTTON_TYPE) == BS_DEFPUSHBUTTON) + { + drawState = STATE_DEFAULTED; + } + paint(theme, hwnd, hParamDC, drawState, dtFlags, state & BST_FOCUS, prfFlag); return TRUE; }

1 0

[gadamopoulos] 74073: [COMCTL32] -Make the lautus hack a bit more strict.
by gadamopoulos＠svn.reactos.org 05 Mar '17

05 Mar '17

Author: gadamopoulos Date: Sun Mar 5 09:14:12 2017 New Revision: 74073 URL: http://svn.reactos.org/svn/reactos?rev=74073&view=rev Log: [COMCTL32] -Make the lautus hack a bit more strict. Modified: trunk/reactos/dll/win32/comctl32/button.c Modified: trunk/reactos/dll/win32/comctl32/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/button.… ============================================================================== --- trunk/reactos/dll/win32/comctl32/button.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/button.c [iso-8859-1] Sun Mar 5 09:14:12 2017 @@ -343,7 +343,7 @@ GetTextExtentPoint32W(hdc, text, wcslen(text), &TextSize); - if (logfont.lfHeight == -1 && logfont.lfWidth == 0 && wcscmp(logfont.lfFaceName, L"Arial") == 0) + if (logfont.lfHeight == -1 && logfont.lfWidth == 0 && wcscmp(logfont.lfFaceName, L"Arial") == 0 && wcscmp(text, L"Start") == 0) { TextSize.cx = 5; TextSize.cy = 4;

1 0

[gadamopoulos] 74072: [COMCTL32] Ha^^Fix the size of the start button for lautus so as it gets the same size with our shell in ros and windows.
by gadamopoulos＠svn.reactos.org 05 Mar '17

05 Mar '17

Author: gadamopoulos Date: Sun Mar 5 09:09:30 2017 New Revision: 74072 URL: http://svn.reactos.org/svn/reactos?rev=74072&view=rev Log: [COMCTL32] Ha^^Fix the size of the start button for lautus so as it gets the same size with our shell in ros and windows. Modified: trunk/reactos/dll/win32/comctl32/button.c Modified: trunk/reactos/dll/win32/comctl32/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/button.… ============================================================================== --- trunk/reactos/dll/win32/comctl32/button.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/button.c [iso-8859-1] Sun Mar 5 09:09:30 2017 @@ -316,6 +316,7 @@ HFONT hFont = 0, hPrevFont = 0; SIZE TextSize, ImageSize, ButtonSize; BOOL ret = FALSE; + LOGFONTW logfont; pdata = _GetButtonData(hwnd); text = get_button_text( hwnd ); @@ -326,7 +327,6 @@ /* FIXME : Should use GetThemeTextExtent but unfortunately uses DrawTextW which is broken */ if (theme) { - LOGFONTW logfont; HRESULT hr = GetThemeFont(theme, hdc, BP_PUSHBUTTON, PBS_NORMAL, TMT_FONT, &logfont); if(SUCCEEDED(hr)) { @@ -342,6 +342,12 @@ } GetTextExtentPoint32W(hdc, text, wcslen(text), &TextSize); + + if (logfont.lfHeight == -1 && logfont.lfWidth == 0 && wcscmp(logfont.lfFaceName, L"Arial") == 0) + { + TextSize.cx = 5; + TextSize.cy = 4; + } if (hPrevFont) SelectObject( hdc, hPrevFont ); @@ -368,8 +374,8 @@ GetThemeBackgroundExtent(theme, hdc, BP_PUSHBUTTON, PBS_NORMAL, &rcContents, &rcButtonExtent); ERR("rcContents: %d, %d, %d, %d\n", rcContents.left, rcContents.top, rcContents.right, rcContents.bottom); ERR("rcButtonExtent: %d, %d, %d, %d\n", rcButtonExtent.left, rcButtonExtent.top, rcButtonExtent.right, rcButtonExtent.bottom); - ButtonSize.cx = abs(rcButtonExtent.right - rcButtonExtent.left) + 1; - ButtonSize.cy = abs(rcButtonExtent.bottom - rcButtonExtent.top) - 1; + ButtonSize.cx = rcButtonExtent.right - rcButtonExtent.left; + ButtonSize.cy = rcButtonExtent.bottom - rcButtonExtent.top; } else {

1 0

[hbelusca] 74071: [USER32]: Use RtlInitEmptyUnicodeString where needed. Fix CID 1401230 and CID 701428 in the process.
by hbelusca＠svn.reactos.org 05 Mar '17

05 Mar '17

Author: hbelusca Date: Sun Mar 5 01:20:40 2017 New Revision: 74071 URL: http://svn.reactos.org/svn/reactos?rev=74071&view=rev Log: [USER32]: Use RtlInitEmptyUnicodeString where needed. Fix CID 1401230 and CID 701428 in the process. Modified: trunk/reactos/win32ss/user/user32/windows/class.c Modified: trunk/reactos/win32ss/user/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/class.c [iso-8859-1] Sun Mar 5 01:20:40 2017 @@ -215,8 +215,7 @@ { if (IS_ATOM(pszClass)) { - ClassName.Buffer = ClassNameBuf; - ClassName.MaximumLength = sizeof(ClassNameBuf); + RtlInitEmptyUnicodeString(&ClassName, ClassNameBuf, sizeof(ClassNameBuf)); if (!NtUserGetAtomName(LOWORD((DWORD_PTR)pszClass), &ClassName)) { ERR("Error while verifying ATOM\n"); @@ -1027,8 +1026,9 @@ UNICODE_STRING ClassName; int Result; - ClassName.MaximumLength = nMaxCount * sizeof(WCHAR); - ClassName.Buffer = lpClassName; + RtlInitEmptyUnicodeString(&ClassName, + lpClassName, + nMaxCount * sizeof(WCHAR)); Result = NtUserGetClassName(hWnd, FALSE, @@ -1214,8 +1214,10 @@ UINT cchType) { UNICODE_STRING ClassName; - ClassName.MaximumLength = cchType * sizeof(WCHAR); - ClassName.Buffer = (PWSTR)pszType; + + RtlInitEmptyUnicodeString(&ClassName, + pszType, + cchType * sizeof(WCHAR)); return NtUserGetClassName(hwnd,TRUE,&ClassName); }

1 0

[hbelusca] 74070: [USER32]: Trim trailing whitespace + few code style changes only.
by hbelusca＠svn.reactos.org 05 Mar '17

05 Mar '17

Author: hbelusca Date: Sun Mar 5 01:19:07 2017 New Revision: 74070 URL: http://svn.reactos.org/svn/reactos?rev=74070&view=rev Log: [USER32]: Trim trailing whitespace + few code style changes only. Modified: trunk/reactos/win32ss/user/user32/windows/class.c Modified: trunk/reactos/win32ss/user/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/class.c [iso-8859-1] Sun Mar 5 01:19:07 2017 @@ -165,9 +165,9 @@ /* This block is a hack! */ if (!VersionedClass) { - /* - * In windows the default activation context always contains comctl32v5 - * In reactos we don't have a default activation context so we + /* + * In windows the default activation context always contains comctl32v5 + * In reactos we don't have a default activation context so we * mimic wine here. */ VersionedClass = is_comctl32_class(SectionName.Buffer); @@ -179,9 +179,9 @@ } #endif - /* - * The returned strings are pointers in the activation context and - * will get freed when the activation context gets freed + /* + * The returned strings are pointers in the activation context and + * will get freed when the activation context gets freed */ return VersionedClass; } @@ -209,9 +209,9 @@ _SEH2_TRY { hLibModule = LoadLibraryW(lpLibFileName); - if ( hLibModule ) - { - if ((pRegisterClassNameW = (void*) GetProcAddress(hLibModule, "RegisterClassNameW"))) + if (hLibModule) + { + if ((pRegisterClassNameW = (void*)GetProcAddress(hLibModule, "RegisterClassNameW"))) { if (IS_ATOM(pszClass)) { @@ -238,15 +238,15 @@ _SEH2_END Error_Exit: - if ( Ret || !hLibModule ) - { - if ( phLibModule ) *phLibModule = hLibModule; + if (Ret || !hLibModule) + { + if (phLibModule) *phLibModule = hLibModule; } else { - DWORD save_error = GetLastError(); + DWORD dwLastError = GetLastError(); FreeLibrary(hLibModule); - SetLastError(save_error); + SetLastError(dwLastError); } RtlDeactivateActivationContextUnsafeFast(&Frame); @@ -266,7 +266,7 @@ UNICODE_STRING ClassName = {0}; LPCSTR pszMenuName; HMODULE hLibModule = NULL; - DWORD save_error; + DWORD dwLastError; BOOL Ret, ClassFound = FALSE, ConvertedString = FALSE; LPCWSTR lpszClsVersion; HANDLE pCtx = NULL; @@ -279,7 +279,7 @@ if (!lpwcx) { - SetLastError( ERROR_NOACCESS ); + SetLastError(ERROR_NOACCESS); return FALSE; } @@ -321,7 +321,7 @@ for(;;) { - Ret = NtUserGetClassInfo( hInstance, + Ret = NtUserGetClassInfo(hInstance, &ClassName, (LPWNDCLASSEXW)lpwcx, (LPWSTR *)&pszMenuName, @@ -330,9 +330,9 @@ if (!lpLibFileName) break; if (!ClassFound) { - save_error = GetLastError(); - if ( save_error == ERROR_CANNOT_FIND_WND_CLASS || - save_error == ERROR_CLASS_DOES_NOT_EXIST ) + dwLastError = GetLastError(); + if ( dwLastError == ERROR_CANNOT_FIND_WND_CLASS || + dwLastError == ERROR_CLASS_DOES_NOT_EXIST ) { ClassFound = VersionRegisterClass(ClassName.Buffer, lpLibFileName, pCtx, &hLibModule); if (ClassFound) continue; @@ -340,9 +340,9 @@ } if (hLibModule) { - save_error = GetLastError(); + dwLastError = GetLastError(); FreeLibrary(hLibModule); - SetLastError(save_error); + SetLastError(dwLastError); hLibModule = 0; } break; @@ -376,7 +376,7 @@ UNICODE_STRING ClassName = {0}; LPWSTR pszMenuName; HMODULE hLibModule = NULL; - DWORD save_error; + DWORD dwLastError; BOOL Ret, ClassFound = FALSE; LPCWSTR lpszClsVersion; HANDLE pCtx = NULL; @@ -438,9 +438,9 @@ if (!lpLibFileName) break; if (!ClassFound) { - save_error = GetLastError(); - if ( save_error == ERROR_CANNOT_FIND_WND_CLASS || - save_error == ERROR_CLASS_DOES_NOT_EXIST ) + dwLastError = GetLastError(); + if ( dwLastError == ERROR_CANNOT_FIND_WND_CLASS || + dwLastError == ERROR_CLASS_DOES_NOT_EXIST ) { ClassFound = VersionRegisterClass(ClassName.Buffer, lpLibFileName, pCtx, &hLibModule); if (ClassFound) continue; @@ -448,9 +448,9 @@ } if (hLibModule) { - save_error = GetLastError(); + dwLastError = GetLastError(); FreeLibrary(hLibModule); - SetLastError(save_error); + SetLastError(dwLastError); hLibModule = 0; } break; @@ -1878,7 +1878,9 @@ } } else + { ClassName.Buffer = (PWSTR)((ULONG_PTR)lpClassName); + } Ret = NtUserUnregisterClass(&ClassName, hInstance, 0); @@ -1916,7 +1918,7 @@ RtlInitUnicodeString(&ClassName, lpClassName); } else - { + { ClassName.Buffer = (PWSTR)((ULONG_PTR)lpClassName); }

1 0

[tfaber] 74069: [NTOS:LPC] - Implement the early exit case (e.g. on connection refused) in NtAcceptConnectPort CORE-12145
by tfaber＠svn.reactos.org 05 Mar '17

05 Mar '17

Author: tfaber Date: Sun Mar 5 00:55:50 2017 New Revision: 74069 URL: http://svn.reactos.org/svn/reactos?rev=74069&view=rev Log: [NTOS:LPC] - Implement the early exit case (e.g. on connection refused) in NtAcceptConnectPort CORE-12145 Added: trunk/rostests/apitests/ntdll/NtAcceptConnectPort.c (with props) Modified: trunk/reactos/ntoskrnl/lpc/complete.c trunk/rostests/apitests/ntdll/CMakeLists.txt trunk/rostests/apitests/ntdll/testlist.c Modified: trunk/reactos/ntoskrnl/lpc/complete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/complete.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/complete.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/lpc/complete.c [iso-8859-1] Sun Mar 5 00:55:50 2017 @@ -394,8 +394,12 @@ /* Check if we got here while still having a client thread */ if (ClientThread) { - /* FIXME: Complex cleanup code */ - ASSERT(FALSE); + KeAcquireGuardedMutex(&LpcpLock); + ClientThread->LpcReplyMessage = Message; + LpcpPrepareToWakeClient(ClientThread); + KeReleaseGuardedMutex(&LpcpLock); + LpcpCompleteWait(&ClientThread->LpcReplySemaphore); + ObDereferenceObject(ClientThread); } /* Dereference the client port if we have one, and the process */ Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/CMakeLists… ============================================================================== --- trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] Sun Mar 5 00:55:50 2017 @@ -1,6 +1,7 @@ list(APPEND SOURCE LdrEnumResources.c + NtAcceptConnectPort.c NtAllocateVirtualMemory.c NtApphelpCacheControl.c NtContinue.c Added: trunk/rostests/apitests/ntdll/NtAcceptConnectPort.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtAcceptCo… ============================================================================== --- trunk/rostests/apitests/ntdll/NtAcceptConnectPort.c (added) +++ trunk/rostests/apitests/ntdll/NtAcceptConnectPort.c [iso-8859-1] Sun Mar 5 00:55:50 2017 @@ -0,0 +1,254 @@ +/* + * PROJECT: ReactOS API tests + * LICENSE: LGPLv2.1+ - See COPYING.LIB in the top level directory + * PURPOSE: Test for NtAcceptConnectPort + * PROGRAMMERS: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#include <apitest.h> + +#define WIN32_NO_STATUS +#include <ndk/lpcfuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/rtlfuncs.h> +#include <process.h> + +#define TEST_CONNECTION_INFO_SIGNATURE1 0xaabb0123 +#define TEST_CONNECTION_INFO_SIGNATURE2 0xaabb0124 +typedef struct _TEST_CONNECTION_INFO +{ + ULONG Signature; +} TEST_CONNECTION_INFO, *PTEST_CONNECTION_INFO; + +#define TEST_MESSAGE_MESSAGE 0x4455cdef +typedef struct _TEST_MESSAGE +{ + PORT_MESSAGE Header; + ULONG Message; +} TEST_MESSAGE, *PTEST_MESSAGE; + +static UNICODE_STRING PortName = RTL_CONSTANT_STRING(L"\\NtdllApitestNtAcceptConnectPortTestPort"); +static UINT ServerThreadId; +static UINT ClientThreadId; +static UCHAR Context; + +UINT +CALLBACK +ServerThread( + _Inout_ PVOID Parameter) +{ + NTSTATUS Status; + TEST_MESSAGE Message; + HANDLE PortHandle; + HANDLE ServerPortHandle = Parameter; + + /* Listen, but refuse the connection */ + RtlZeroMemory(&Message, sizeof(Message)); + Status = NtListenPort(ServerPortHandle, + &Message.Header); + ok_hex(Status, STATUS_SUCCESS); + + ok(Message.Header.u1.s1.TotalLength == RTL_SIZEOF_THROUGH_FIELD(TEST_MESSAGE, Message), + "TotalLength = %u, expected %lu\n", + Message.Header.u1.s1.TotalLength, RTL_SIZEOF_THROUGH_FIELD(TEST_MESSAGE, Message)); + ok(Message.Header.u1.s1.DataLength == sizeof(TEST_CONNECTION_INFO), + "DataLength = %u\n", Message.Header.u1.s1.DataLength); + ok(Message.Header.u2.s2.Type == LPC_CONNECTION_REQUEST, + "Type = %x\n", Message.Header.u2.s2.Type); + ok(Message.Header.ClientId.UniqueProcess == (HANDLE)GetCurrentProcessId(), + "UniqueProcess = %p, expected %lx\n", + Message.Header.ClientId.UniqueProcess, GetCurrentProcessId()); + ok(Message.Header.ClientId.UniqueThread == (HANDLE)ClientThreadId, + "UniqueThread = %p, expected %x\n", + Message.Header.ClientId.UniqueThread, ClientThreadId); + ok(Message.Message == TEST_CONNECTION_INFO_SIGNATURE1, "Message = %lx\n", Message.Message); + + PortHandle = (PVOID)(ULONG_PTR)0x55555555; + Status = NtAcceptConnectPort(&PortHandle, + &Context, + &Message.Header, + FALSE, + NULL, + NULL); + ok_hex(Status, STATUS_SUCCESS); + ok(PortHandle == (PVOID)(ULONG_PTR)0x55555555, "PortHandle = %p\n", PortHandle); + + /* Listen a second time, then accept */ + RtlZeroMemory(&Message, sizeof(Message)); + Status = NtListenPort(ServerPortHandle, + &Message.Header); + ok_hex(Status, STATUS_SUCCESS); + + ok(Message.Header.u1.s1.TotalLength == RTL_SIZEOF_THROUGH_FIELD(TEST_MESSAGE, Message), + "TotalLength = %u, expected %lu\n", + Message.Header.u1.s1.TotalLength, RTL_SIZEOF_THROUGH_FIELD(TEST_MESSAGE, Message)); + ok(Message.Header.u1.s1.DataLength == sizeof(TEST_CONNECTION_INFO), + "DataLength = %u\n", Message.Header.u1.s1.DataLength); + ok(Message.Header.u2.s2.Type == LPC_CONNECTION_REQUEST, + "Type = %x\n", Message.Header.u2.s2.Type); + ok(Message.Header.ClientId.UniqueProcess == (HANDLE)GetCurrentProcessId(), + "UniqueProcess = %p, expected %lx\n", + Message.Header.ClientId.UniqueProcess, GetCurrentProcessId()); + ok(Message.Header.ClientId.UniqueThread == (HANDLE)ClientThreadId, + "UniqueThread = %p, expected %x\n", + Message.Header.ClientId.UniqueThread, ClientThreadId); + ok(Message.Message == TEST_CONNECTION_INFO_SIGNATURE2, "Message = %lx\n", Message.Message); + + Status = NtAcceptConnectPort(&PortHandle, + &Context, + &Message.Header, + TRUE, + NULL, + NULL); + ok_hex(Status, STATUS_SUCCESS); + + Status = NtCompleteConnectPort(PortHandle); + ok_hex(Status, STATUS_SUCCESS); + + RtlZeroMemory(&Message, sizeof(Message)); + Status = NtReplyWaitReceivePort(PortHandle, + NULL, + NULL, + &Message.Header); + ok_hex(Status, STATUS_SUCCESS); + + ok(Message.Header.u1.s1.TotalLength == sizeof(Message), + "TotalLength = %u, expected %Iu\n", + Message.Header.u1.s1.TotalLength, sizeof(Message)); + ok(Message.Header.u1.s1.DataLength == sizeof(Message.Message), + "DataLength = %u\n", Message.Header.u1.s1.DataLength); + ok(Message.Header.u2.s2.Type == LPC_DATAGRAM, + "Type = %x\n", Message.Header.u2.s2.Type); + ok(Message.Header.ClientId.UniqueProcess == (HANDLE)GetCurrentProcessId(), + "UniqueProcess = %p, expected %lx\n", + Message.Header.ClientId.UniqueProcess, GetCurrentProcessId()); + ok(Message.Header.ClientId.UniqueThread == (HANDLE)ClientThreadId, + "UniqueThread = %p, expected %x\n", + Message.Header.ClientId.UniqueThread, ClientThreadId); + ok(Message.Message == TEST_MESSAGE_MESSAGE, "Message = %lx\n", Message.Message); + + Status = NtClose(PortHandle); + ok_hex(Status, STATUS_SUCCESS); + + return 0; +} + +UINT +CALLBACK +ClientThread( + _Inout_ PVOID Parameter) +{ + NTSTATUS Status; + HANDLE PortHandle; + TEST_CONNECTION_INFO ConnectInfo; + ULONG ConnectInfoLength; + SECURITY_QUALITY_OF_SERVICE SecurityQos; + TEST_MESSAGE Message; + + SecurityQos.Length = sizeof(SecurityQos); + SecurityQos.ImpersonationLevel = SecurityIdentification; + SecurityQos.EffectiveOnly = TRUE; + SecurityQos.ContextTrackingMode = SECURITY_STATIC_TRACKING; + + /* Attempt to connect -- will be rejected */ + ConnectInfo.Signature = TEST_CONNECTION_INFO_SIGNATURE1; + ConnectInfoLength = sizeof(ConnectInfo); + PortHandle = (PVOID)(ULONG_PTR)0x55555555; + Status = NtConnectPort(&PortHandle, + &PortName, + &SecurityQos, + NULL, + NULL, + NULL, + &ConnectInfo, + &ConnectInfoLength); + ok_hex(Status, STATUS_PORT_CONNECTION_REFUSED); + ok(PortHandle == (PVOID)(ULONG_PTR)0x55555555, "PortHandle = %p\n", PortHandle); + + /* Try again, this time it will be accepted */ + ConnectInfo.Signature = TEST_CONNECTION_INFO_SIGNATURE2; + ConnectInfoLength = sizeof(ConnectInfo); + Status = NtConnectPort(&PortHandle, + &PortName, + &SecurityQos, + NULL, + NULL, + NULL, + &ConnectInfo, + &ConnectInfoLength); + ok_hex(Status, STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + { + skip("Failed to connect\n"); + return 0; + } + + RtlZeroMemory(&Message, sizeof(Message)); + Message.Header.u1.s1.TotalLength = sizeof(Message); + Message.Header.u1.s1.DataLength = sizeof(Message.Message); + Message.Message = TEST_MESSAGE_MESSAGE; + Status = NtRequestPort(PortHandle, + &Message.Header); + ok_hex(Status, STATUS_SUCCESS); + + Status = NtClose(PortHandle); + ok_hex(Status, STATUS_SUCCESS); + + return 0; +} + +START_TEST(NtAcceptConnectPort) +{ + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE PortHandle; + HANDLE ThreadHandles[2]; + + InitializeObjectAttributes(&ObjectAttributes, + &PortName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtCreatePort(&PortHandle, + &ObjectAttributes, + sizeof(TEST_CONNECTION_INFO), + sizeof(TEST_MESSAGE), + 2 * sizeof(TEST_MESSAGE)); + ok_hex(Status, STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + { + skip("Failed to create port\n"); + return; + } + + ThreadHandles[0] = (HANDLE)_beginthreadex(NULL, + 0, + ServerThread, + PortHandle, + 0, + &ServerThreadId); + ok(ThreadHandles[0] != NULL, "_beginthreadex failed\n"); + + ThreadHandles[1] = (HANDLE)_beginthreadex(NULL, + 0, + ClientThread, + PortHandle, + 0, + &ClientThreadId); + ok(ThreadHandles[1] != NULL, "_beginthreadex failed\n"); + + Status = NtWaitForMultipleObjects(RTL_NUMBER_OF(ThreadHandles), + ThreadHandles, + WaitAll, + FALSE, + NULL); + ok_hex(Status, STATUS_SUCCESS); + + Status = NtClose(ThreadHandles[0]); + ok_hex(Status, STATUS_SUCCESS); + Status = NtClose(ThreadHandles[1]); + ok_hex(Status, STATUS_SUCCESS); + + Status = NtClose(PortHandle); + ok_hex(Status, STATUS_SUCCESS); +} Propchange: trunk/rostests/apitests/ntdll/NtAcceptConnectPort.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/ntdll/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/testlist.c… ============================================================================== --- trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] Sun Mar 5 00:55:50 2017 @@ -4,6 +4,7 @@ #include <apitest.h> extern void func_LdrEnumResources(void); +extern void func_NtAcceptConnectPort(void); extern void func_NtAllocateVirtualMemory(void); extern void func_NtApphelpCacheControl(void); extern void func_NtContinue(void); @@ -57,6 +58,7 @@ const struct test winetest_testlist[] = { { "LdrEnumResources", func_LdrEnumResources }, + { "NtAcceptConnectPort", func_NtAcceptConnectPort }, { "NtAllocateVirtualMemory", func_NtAllocateVirtualMemory }, { "NtApphelpCacheControl", func_NtApphelpCacheControl }, { "NtContinue", func_NtContinue },

1 0

[hbelusca] 74068: [WS2_32] - Fix pointers verification in WSALookupServiceNextW and WSALookupServiceNextA; - In WSALookupServiceNextA: Perform extra checks to see whether we failed the first local ...
by hbelusca＠svn.reactos.org 05 Mar '17

05 Mar '17

Author: hbelusca Date: Sun Mar 5 00:40:22 2017 New Revision: 74068 URL: http://svn.reactos.org/svn/reactos?rev=74068&view=rev Log: [WS2_32] - Fix pointers verification in WSALookupServiceNextW and WSALookupServiceNextA; - In WSALookupServiceNextA: Perform extra checks to see whether we failed the first local buffer allocation, and if so, retrieve the needed size by calling a first time WSALookupServiceNextW, then reallocate the temp buffer and redo a WSALookupServiceNextW call (if it still fails, then we bail out). CID 513448. Modified: trunk/reactos/dll/win32/ws2_32/src/rnr.c Modified: trunk/reactos/dll/win32/ws2_32/src/rnr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/rnr.c… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/rnr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/rnr.c [iso-8859-1] Sun Mar 5 00:40:22 2017 @@ -403,9 +403,12 @@ return SOCKET_ERROR; } - /* Verify pointers */ + /* + * Verify pointers. Note that the size of the buffer + * pointed by lpqsResults is given by *lpdwBufferLength. + */ if (IsBadReadPtr(lpdwBufferLength, sizeof(*lpdwBufferLength)) || - IsBadWritePtr(lpqsResults, sizeof(*lpqsResults))) + IsBadWritePtr(lpqsResults, *lpdwBufferLength)) { /* It is invalid; fail */ SetLastError(WSAEFAULT); @@ -449,9 +452,12 @@ DPRINT("WSALookupServiceNextA: %lx\n", hLookup); - /* Verify pointers */ + /* + * Verify pointers. Note that the size of the buffer + * pointed by lpqsResults is given by *lpdwBufferLength. + */ if (IsBadReadPtr(lpdwBufferLength, sizeof(*lpdwBufferLength)) || - IsBadWritePtr(lpqsResults, sizeof(*lpqsResults))) + IsBadWritePtr(lpqsResults, *lpdwBufferLength)) { /* It is invalid; fail */ SetLastError(WSAEFAULT); @@ -465,13 +471,24 @@ { /* Allocate the buffer we'll use */ UnicodeQuerySet = HeapAlloc(WsSockHeap, 0, UnicodeQuerySetSize); - if (!UnicodeQuerySet) UnicodeQuerySetSize = 0; + if (!UnicodeQuerySet) + { + /* + * We failed, possibly because the specified size was too large? + * Retrieve the needed buffer size with the WSALookupServiceNextW + * call and retry again a second time. + */ + UnicodeQuerySetSize = 0; + } } else { - /* His buffer is too small */ + /* + * The buffer is too small. Retrieve the needed buffer size with + * the WSALookupServiceNextW call and return it to the caller. + */ + UnicodeQuerySet = NULL; UnicodeQuerySetSize = 0; - UnicodeQuerySet = NULL; } /* Call the Unicode Function */ @@ -479,13 +496,39 @@ dwControlFlags, &UnicodeQuerySetSize, UnicodeQuerySet); + + /* + * Check whether we actually just retrieved the needed buffer size + * because our previous local allocation did fail. If so, allocate + * a new buffer and retry again. + */ + if ( (!UnicodeQuerySet) && (*lpdwBufferLength >= sizeof(WSAQUERYSETW)) && + (ErrorCode == SOCKET_ERROR) && (GetLastError() == WSAEFAULT) ) + { + /* Allocate the buffer we'll use */ + UnicodeQuerySet = HeapAlloc(WsSockHeap, 0, UnicodeQuerySetSize); + if (UnicodeQuerySet) + { + /* Call the Unicode Function */ + ErrorCode = WSALookupServiceNextW(hLookup, + dwControlFlags, + &UnicodeQuerySetSize, + UnicodeQuerySet); + } + /* + * Otherwise the allocation failed and we + * fall back into the error checks below. + */ + } + if (ErrorCode == ERROR_SUCCESS) { - /* Not convert to ANSI */ + /* Now convert back to ANSI */ ErrorCode = MapUnicodeQuerySetToAnsi(UnicodeQuerySet, lpdwBufferLength, lpqsResults); - if (ErrorCode != ERROR_SUCCESS) SetLastError(ErrorCode); + if (ErrorCode != ERROR_SUCCESS) + SetLastError(ErrorCode); } else { @@ -499,10 +542,11 @@ } /* If we had a local buffer, free it */ - if (UnicodeQuerySet) HeapFree(WsSockHeap, 0, UnicodeQuerySet); + if (UnicodeQuerySet) + HeapFree(WsSockHeap, 0, UnicodeQuerySet); /* Return to caller */ - return ErrorCode == ERROR_SUCCESS ? ErrorCode : SOCKET_ERROR; + return (ErrorCode == ERROR_SUCCESS) ? ErrorCode : SOCKET_ERROR; } /*

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
26
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2017