Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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

[hbelusca] 74067: [WS2_32]: Fix the crash in ws2_32 reported in CORE-12852, that happens when opening e.g. Word 2010 for the first time (when it asks for registration): - Check whether WsNcLoadProv...
by hbelusca＠svn.reactos.org 05 Mar '17

05 Mar '17

Author: hbelusca Date: Sun Mar 5 00:24:08 2017 New Revision: 74067 URL: http://svn.reactos.org/svn/reactos?rev=74067&view=rev Log: [WS2_32]: Fix the crash in ws2_32 reported in CORE-12852, that happens when opening e.g. Word 2010 for the first time (when it asks for registration): - Check whether WsNcLoadProvider really succeeded in loading a provider in WsNcGetCatalogFromProviderId, and return appropriate error code. - In WsNqLookupServiceBegin, initialize CatalogEntry to NULL prior to calling WsNcGetCatalogFromProviderId, and check for success or failure of WsNqAddProvider (and fail in accordance). Modified: trunk/reactos/dll/win32/ws2_32/src/nscatalo.c trunk/reactos/dll/win32/ws2_32/src/nsquery.c Modified: trunk/reactos/dll/win32/ws2_32/src/nscatalo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/nscat… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/nscatalo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/nscatalo.c [iso-8859-1] Sun Mar 5 00:24:08 2017 @@ -497,6 +497,7 @@ IN LPGUID ProviderId, OUT PNSCATALOG_ENTRY *CatalogEntry) { + INT ErrorCode = WSAEINVAL; PLIST_ENTRY NextEntry; PNSCATALOG_ENTRY Entry; @@ -514,25 +515,24 @@ /* Check if this is the Catalog Entry ID we want */ if (IsEqualGUID(&Entry->ProviderId, ProviderId)) { - /* Check if it doesn't already have a provider */ + /* If it doesn't already have a provider, load the provider */ if (!Entry->Provider) + ErrorCode = WsNcLoadProvider(Catalog, Entry); + + /* If we succeeded, reference the entry and return it */ + if (Entry->Provider /* || ErrorCode == ERROR_SUCCESS */) { - /* Match, load the Provider */ - WsNcLoadProvider(Catalog, Entry); + InterlockedIncrement(&Entry->RefCount); + *CatalogEntry = Entry; + ErrorCode = ERROR_SUCCESS; + break; } - - /* Reference the entry and return it */ - InterlockedIncrement(&Entry->RefCount); - *CatalogEntry = Entry; - break; - } - } - - /* Release the catalog */ + } + } + + /* Release the lock and return */ WsNcUnlock(); - - /* Return */ - return ERROR_SUCCESS; + return ErrorCode; } BOOL Modified: trunk/reactos/dll/win32/ws2_32/src/nsquery.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/nsque… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/nsquery.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/nsquery.c [iso-8859-1] Sun Mar 5 00:24:08 2017 @@ -355,7 +355,7 @@ PLIST_ENTRY Entry; INT ErrorCode; DWORD ClassInfoSize; - PNSCATALOG_ENTRY CatalogEntry; + PNSCATALOG_ENTRY CatalogEntry = NULL; ENUM_CONTEXT EnumContext; BOOLEAN TryAgain; @@ -396,10 +396,13 @@ ErrorCode = SOCKET_ERROR; goto Exit; } - else - { - /* Add this provider */ - WsNqAddProvider(NsQuery, CatalogEntry->Provider); + /* We succeeded, add this provider */ + else if (!WsNqAddProvider(NsQuery, CatalogEntry->Provider)) + { + /* Fail */ + SetLastError(WSA_NOT_ENOUGH_MEMORY); + ErrorCode = SOCKET_ERROR; + goto Exit; } } else

1 0

[hbelusca] 74066: [WS2_32] - Let require explicit semicolons when using the Ws***(Un)Lock macros (and thus remove the semicolon from their definition).
by hbelusca＠svn.reactos.org 04 Mar '17

04 Mar '17

Author: hbelusca Date: Sat Mar 4 23:55:30 2017 New Revision: 74066 URL: http://svn.reactos.org/svn/reactos?rev=74066&view=rev Log: [WS2_32] - Let require explicit semicolons when using the Ws***(Un)Lock macros (and thus remove the semicolon from their definition). Modified: trunk/reactos/dll/win32/ws2_32/src/async.c trunk/reactos/dll/win32/ws2_32/src/dcatalog.c trunk/reactos/dll/win32/ws2_32/src/dprocess.c trunk/reactos/dll/win32/ws2_32/src/nscatalo.c trunk/reactos/dll/win32/ws2_32/src/nsquery.c trunk/reactos/dll/win32/ws2_32/src/rasdial.c trunk/reactos/dll/win32/ws2_32/src/rnr.c trunk/reactos/dll/win32/ws2_32/src/startup.c Modified: trunk/reactos/dll/win32/ws2_32/src/async.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/async… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/async.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/async.c [iso-8859-1] Sat Mar 4 23:55:30 2017 @@ -21,8 +21,8 @@ HANDLE WsAsyncCancelledTaskHandle; HINSTANCE WsAsyncDllHandle; -#define WsAsyncLock() EnterCriticalSection(&WsAsyncCritSect); -#define WsAsyncUnlock() LeaveCriticalSection(&WsAsyncCritSect); +#define WsAsyncLock() EnterCriticalSection(&WsAsyncCritSect) +#define WsAsyncUnlock() LeaveCriticalSection(&WsAsyncCritSect) /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32/src/dcatalog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/dcata… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/dcatalog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/dcatalog.c [iso-8859-1] Sat Mar 4 23:55:30 2017 @@ -15,8 +15,8 @@ /* DATA **********************************************************************/ -#define WsTcLock() EnterCriticalSection(&Catalog->Lock); -#define WsTcUnlock() LeaveCriticalSection(&Catalog->Lock); +#define WsTcLock() EnterCriticalSection(&Catalog->Lock) +#define WsTcUnlock() LeaveCriticalSection(&Catalog->Lock) /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32/src/dprocess.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/dproc… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/dprocess.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/dprocess.c [iso-8859-1] Sat Mar 4 23:55:30 2017 @@ -14,8 +14,8 @@ PWSPROCESS CurrentWsProcess; -#define WsProcLock() EnterCriticalSection(&Process->ThreadLock); -#define WsProcUnlock() LeaveCriticalSection(&Process->ThreadLock); +#define WsProcLock() EnterCriticalSection(&Process->ThreadLock) +#define WsProcUnlock() LeaveCriticalSection(&Process->ThreadLock) /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32/src/nscatalo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/nscat… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/nscatalo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/nscatalo.c [iso-8859-1] Sat Mar 4 23:55:30 2017 @@ -15,8 +15,8 @@ /* DATA **********************************************************************/ -#define WsNcLock() EnterCriticalSection(&Catalog->Lock); -#define WsNcUnlock() LeaveCriticalSection(&Catalog->Lock); +#define WsNcLock() EnterCriticalSection(&Catalog->Lock) +#define WsNcUnlock() LeaveCriticalSection(&Catalog->Lock) /* FUNCTIONS *****************************************************************/ @@ -370,7 +370,7 @@ GoOn = Callback(Context, CatalogEntry); } - /* Release lock */ + /* Release the lock */ WsNcUnlock(); } @@ -413,7 +413,7 @@ } } - /* Release the lock */ + /* Release the lock and return */ WsNcUnlock(); return ErrorCode; } Modified: trunk/reactos/dll/win32/ws2_32/src/nsquery.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/nsque… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/nsquery.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/nsquery.c [iso-8859-1] Sat Mar 4 23:55:30 2017 @@ -12,8 +12,8 @@ /* DATA **********************************************************************/ -#define WsNqLock() EnterCriticalSection(&NsQuery->Lock); -#define WsNqUnlock() LeaveCriticalSection(&NsQuery->Lock); +#define WsNqLock() EnterCriticalSection(&NsQuery->Lock) +#define WsNqUnlock() LeaveCriticalSection(&NsQuery->Lock) /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/dll/win32/ws2_32/src/rasdial.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/rasdi… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/rasdial.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/rasdial.c [iso-8859-1] Sat Mar 4 23:55:30 2017 @@ -37,8 +37,8 @@ PWS_ATTEMPT_AUTODIAL_NAME lpfnWSAttemptAutodialName; PWS_NOTE_SUCCESSFUL_HOSTENT_LOOKUP lpfnWSNoteSuccessfulHostentLookup; -#define WsRasLock() EnterCriticalSection(&WsRasHelperLock); -#define WsRasUnlock() LeaveCriticalSection(&WsRasHelperLock); +#define WsRasLock() EnterCriticalSection(&WsRasHelperLock) +#define WsRasUnlock() LeaveCriticalSection(&WsRasHelperLock) /* FUNCTIONS *****************************************************************/ 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] Sat Mar 4 23:55:30 2017 @@ -34,6 +34,7 @@ PTCATALOG_ENTRY CatalogEntry; LPWSTR UnicodeString; DWORD Length = *lpdwAddressStringLength; + DPRINT("WSAAddressToStringA: %p\n", lpsaAddress); /* Enter prolog */ @@ -136,6 +137,7 @@ DWORD CatalogEntryId; PTCATALOG Catalog; PTCATALOG_ENTRY CatalogEntry; + DPRINT("WSAAddressToStringW: %p\n", lpsaAddress); /* Enter prolog */ @@ -203,6 +205,7 @@ PWSTHREAD Thread; INT ErrorCode; PNSQUERY Query = hLookup; + DPRINT("WSALookupServiceEnd: %lx\n", hLookup); /* Enter prolog */ @@ -246,6 +249,7 @@ INT ErrorCode; LPWSAQUERYSETW UnicodeQuerySet = NULL; DWORD UnicodeQuerySetSize = 0; + DPRINT("WSALookupServiceBeginA: %p\n", lpqsRestrictions); /* Verify pointer */ @@ -317,6 +321,7 @@ PWSTHREAD Thread; INT ErrorCode; PNSQUERY Query; + DPRINT("WSALookupServiceBeginW: %p\n", lpqsRestrictions); /* Enter prolog */ @@ -387,6 +392,7 @@ PWSTHREAD Thread; INT ErrorCode; PNSQUERY Query = hLookup; + DPRINT("WSALookupServiceNextW: %lx\n", hLookup); /* Enter prolog */ @@ -440,6 +446,7 @@ LPWSAQUERYSETW UnicodeQuerySet; DWORD UnicodeQuerySetSize; INT ErrorCode; + DPRINT("WSALookupServiceNextA: %lx\n", hLookup); /* Verify pointers */ @@ -734,6 +741,7 @@ PWSPROCESS WsProcess; PNSCATALOG Catalog; NSPROVIDER_ENUM_CONTEXT Context; + DPRINT("WSAEnumNameSpaceProvidersInternal: %lx\n", lpnspBuffer); if (!lpdwBufferLength) @@ -829,6 +837,7 @@ PTCATALOG_ENTRY CatalogEntry; LPWSTR UnicodeString; DWORD Length = (DWORD)strlen(AddressString) + 1; + DPRINT("WSAStringToAddressA: %s\n", AddressString); /* Enter prolog */ @@ -920,6 +929,7 @@ DWORD CatalogEntryId; PTCATALOG Catalog; PTCATALOG_ENTRY CatalogEntry; + DPRINT("WSAStringToAddressW: %S\n", AddressString); /* Enter prolog */ Modified: trunk/reactos/dll/win32/ws2_32/src/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/src/start… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/src/startup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/src/startup.c [iso-8859-1] Sat Mar 4 23:55:30 2017 @@ -18,8 +18,8 @@ PWS_SOCK_POST_ROUTINE WsSockPostRoutine = NULL; CRITICAL_SECTION WsStartupLock; -#define WsStartupLock() EnterCriticalSection(&WsStartupLock); -#define WsStartupUnlock() LeaveCriticalSection(&WsStartupLock); +#define WsStartupLock() EnterCriticalSection(&WsStartupLock) +#define WsStartupUnlock() LeaveCriticalSection(&WsStartupLock) /* FUNCTIONS *****************************************************************/

1 0

[gadamopoulos] 74065: [UXTHEME]: Handle WM_NCACTIVATE only when the window has a themed caption (it's not like windows with classic borders and no caption need to be redrawn to reflect that they ge...
by gadamopoulos＠svn.reactos.org 04 Mar '17

04 Mar '17

Author: gadamopoulos Date: Sat Mar 4 22:33:21 2017 New Revision: 74065 URL: http://svn.reactos.org/svn/reactos?rev=74065&view=rev Log: [UXTHEME]: Handle WM_NCACTIVATE only when the window has a themed caption (it's not like windows with classic borders and no caption need to be redrawn to reflect that they get or lose the active state). Fixes the classic border drawn on deactivation in the taskbar. Found by Sylvain Deverre. CORE-12887 Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/nonclien… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] Sat Mar 4 22:33:21 2017 @@ -1087,6 +1087,10 @@ // case WM_NCUAHDRAWFRAME: case WM_NCACTIVATE: + + if ((GetWindowLongW(hWnd, GWL_STYLE) & WS_CAPTION) != WS_CAPTION) + return TRUE; + ThemeHandleNCPaint(hWnd, (HRGN)1); return TRUE; case WM_NCMOUSEMOVE:

1 0

[mjansen] 74064: [NTDLL] Implement some basic shim engine integration. CORE-10368
by mjansen＠svn.reactos.org 04 Mar '17

04 Mar '17

Author: mjansen Date: Sat Mar 4 20:34:36 2017 New Revision: 74064 URL: http://svn.reactos.org/svn/reactos?rev=74064&view=rev Log: [NTDLL] Implement some basic shim engine integration. CORE-10368 Modified: trunk/reactos/dll/ntdll/include/ntdllp.h trunk/reactos/dll/ntdll/ldr/ldrapi.c trunk/reactos/dll/ntdll/ldr/ldrinit.c trunk/reactos/dll/ntdll/ldr/ldrutils.c Modified: trunk/reactos/dll/ntdll/include/ntdllp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/include/ntdllp.h… ============================================================================== --- trunk/reactos/dll/ntdll/include/ntdllp.h [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/include/ntdllp.h [iso-8859-1] Sat Mar 4 20:34:36 2017 @@ -47,6 +47,13 @@ extern UNICODE_STRING LdrpKnownDllPath; extern PLDR_DATA_TABLE_ENTRY LdrpGetModuleHandleCache, LdrpLoadedDllHandleCache; extern ULONG RtlpDphGlobalFlags; +extern BOOLEAN g_ShimsEnabled; +extern PVOID g_pShimEngineModule; +extern PVOID g_pfnSE_DllLoaded; +extern PVOID g_pfnSE_DllUnloaded; +extern PVOID g_pfnSE_InstallBeforeInit; +extern PVOID g_pfnSE_InstallAfterInit; +extern PVOID g_pfnSE_ProcessDying; /* ldrinit.c */ NTSTATUS NTAPI LdrpRunInitializeRoutines(IN PCONTEXT Context OPTIONAL); @@ -139,6 +146,18 @@ VOID NTAPI LdrpFreeUnicodeString(PUNICODE_STRING String); +VOID NTAPI +LdrpGetShimEngineInterface(); + +VOID +NTAPI +LdrpLoadShimEngine(IN PWSTR ImageName, + IN PUNICODE_STRING ProcessImage, + IN PVOID pShimData); + +VOID NTAPI +LdrpUnloadShimEngine(); + /* FIXME: Cleanup this mess */ typedef NTSTATUS (NTAPI *PEPFUNC)(PPEB); Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrapi.c?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] Sat Mar 4 20:34:36 2017 @@ -1404,7 +1404,12 @@ LdrEntry->EntryPoint); } - /* FIXME: Call Shim Engine and notify */ + /* Call Shim Engine and notify */ + if (g_ShimsEnabled) + { + VOID (NTAPI* SE_DllUnloaded)(PVOID) = RtlDecodeSystemPointer(g_pfnSE_DllUnloaded); + SE_DllUnloaded(LdrEntry); + } /* Unlink it */ CurrentEntry = LdrEntry; Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrinit.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] Sat Mar 4 20:34:36 2017 @@ -901,10 +901,12 @@ if (LdrpShutdownInProgress) return STATUS_SUCCESS; /* Tell the Shim Engine */ - //if (ShimsEnabled) - //{ - /* FIXME */ - //} + if (g_ShimsEnabled) + { + VOID(NTAPI *SE_ProcessDying)(); + SE_ProcessDying = RtlDecodeSystemPointer(g_pfnSE_ProcessDying); + SE_ProcessDying(); + } /* Tell the world */ if (ShowSnaps) @@ -2110,8 +2112,7 @@ { /* Load the Shim Engine */ Peb->AppCompatInfo = NULL; - //LdrpLoadShimEngine(OldShimData, ImagePathName, OldShimData); - DPRINT1("We do not support shims yet\n"); + LdrpLoadShimEngine(OldShimData, &ImagePathName, OldShimData); } else { @@ -2134,7 +2135,13 @@ return Status; } - /* FIXME: Unload the Shim Engine if it was loaded */ + /* Notify Shim Engine */ + if (g_ShimsEnabled) + { + VOID(NTAPI *SE_InstallAfterInit)(PUNICODE_STRING, PVOID); + SE_InstallAfterInit = RtlDecodeSystemPointer(g_pfnSE_InstallAfterInit); + SE_InstallAfterInit(&ImagePathName, OldShimData); + } /* Check if we have a user-defined Post Process Routine */ if (NT_SUCCESS(Status) && Peb->PostProcessInitRoutine) Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrutils.c?r… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] Sat Mar 4 20:34:36 2017 @@ -17,7 +17,14 @@ /* GLOBALS *******************************************************************/ PLDR_DATA_TABLE_ENTRY LdrpLoadedDllHandleCache, LdrpGetModuleHandleCache; + BOOLEAN g_ShimsEnabled; +PVOID g_pShimEngineModule; +PVOID g_pfnSE_DllLoaded; +PVOID g_pfnSE_DllUnloaded; +PVOID g_pfnSE_InstallBeforeInit; +PVOID g_pfnSE_InstallAfterInit; +PVOID g_pfnSE_ProcessDying; /* FUNCTIONS *****************************************************************/ @@ -2548,12 +2555,11 @@ /* If we have to run the entrypoint, make sure the DB is ready */ if (CallInit && LdrpLdrDatabaseIsSetup) { - /* FIXME: Notify Shim Engine */ + /* Notify Shim Engine */ if (g_ShimsEnabled) { - /* Call it */ - //ShimLoadCallback = RtlDecodeSystemPointer(g_pfnSE_DllLoaded); - //ShimLoadCallback(LdrEntry); + VOID (NTAPI* SE_DllLoaded)(PLDR_DATA_TABLE_ENTRY) = RtlDecodeSystemPointer(g_pfnSE_DllLoaded); + SE_DllLoaded(LdrEntry); } /* Run the init routine */ @@ -2654,4 +2660,72 @@ return ModulesCount; } +PVOID LdrpGetShimEngineFunction(PCSZ FunctionName) +{ + ANSI_STRING Function; + NTSTATUS Status; + PVOID Address; + RtlInitAnsiString(&Function, FunctionName); + Status = LdrGetProcedureAddress(g_pShimEngineModule, &Function, 0, &Address); + return NT_SUCCESS(Status) ? Address : NULL; +} + +VOID +NTAPI +LdrpGetShimEngineInterface() +{ + PVOID SE_DllLoaded = LdrpGetShimEngineFunction("SE_DllLoaded"); + PVOID SE_DllUnloaded = LdrpGetShimEngineFunction("SE_DllUnloaded"); + PVOID SE_InstallBeforeInit = LdrpGetShimEngineFunction("SE_InstallBeforeInit"); + PVOID SE_InstallAfterInit = LdrpGetShimEngineFunction("SE_InstallAfterInit"); + PVOID SE_ProcessDying = LdrpGetShimEngineFunction("SE_ProcessDying"); + + if (SE_DllLoaded && SE_DllUnloaded && SE_InstallBeforeInit && SE_InstallAfterInit && SE_ProcessDying) + { + g_pfnSE_DllLoaded = RtlEncodeSystemPointer(SE_DllLoaded); + g_pfnSE_DllUnloaded = RtlEncodeSystemPointer(SE_DllUnloaded); + g_pfnSE_InstallBeforeInit = RtlEncodeSystemPointer(SE_InstallBeforeInit); + g_pfnSE_InstallAfterInit = RtlEncodeSystemPointer(SE_InstallAfterInit); + g_pfnSE_ProcessDying = RtlEncodeSystemPointer(SE_ProcessDying); + g_ShimsEnabled = TRUE; + } + else + { + LdrpUnloadShimEngine(); + } +} + + +VOID +NTAPI +LdrpLoadShimEngine(IN PWSTR ImageName, IN PUNICODE_STRING ProcessImage, IN PVOID pShimData) +{ + UNICODE_STRING ShimLibraryName; + PVOID ShimLibrary; + NTSTATUS Status; + RtlInitUnicodeString(&ShimLibraryName, ImageName); + Status = LdrpLoadDll(FALSE, NULL, NULL, &ShimLibraryName, &ShimLibrary, TRUE); + if (NT_SUCCESS(Status)) + { + g_pShimEngineModule = ShimLibrary; + LdrpGetShimEngineInterface(); + if (g_ShimsEnabled) + { + VOID(NTAPI *SE_InstallBeforeInit)(PUNICODE_STRING, PVOID); + SE_InstallBeforeInit = RtlDecodeSystemPointer(g_pfnSE_InstallBeforeInit); + SE_InstallBeforeInit(ProcessImage, pShimData); + } + } +} + +VOID +NTAPI +LdrpUnloadShimEngine() +{ + /* Make sure we do not call into the shim engine anymore */ + g_ShimsEnabled = FALSE; + LdrUnloadDll(g_pShimEngineModule); + g_pShimEngineModule = NULL; +} + /* EOF */

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