Ros-diffs October 2016

ros-diffs@reactos.org

20 participants
222 discussions

[akhaldi] 72903: [WS2_32_WINETEST] Enable test_address_list_query() again, now that CORE-12000 is resolved.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Oct 4 18:32:09 2016 New Revision: 72903 URL: http://svn.reactos.org/svn/reactos?rev=72903&view=rev Log: [WS2_32_WINETEST] Enable test_address_list_query() again, now that CORE-12000 is resolved. Modified: trunk/rostests/winetests/ws2_32/sock.c Modified: trunk/rostests/winetests/ws2_32/sock.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ws2_32/sock.c?r… ============================================================================== --- trunk/rostests/winetests/ws2_32/sock.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ws2_32/sock.c [iso-8859-1] Tue Oct 4 18:32:09 2016 @@ -9287,7 +9287,6 @@ CloseHandle(previous_port); } -#if CORE_12000_IS_FIXED /* CORE-12000 */ /* WSHIoctl is not supported by wshtcpip.dll and crashes. Test should be fixed also! */ static void test_address_list_query(void) { @@ -9351,7 +9350,6 @@ HeapFree(GetProcessHeap(), 0, address_list); closesocket(s); } -#endif /* CORE-12000 */ static DWORD WINAPI inet_ntoa_thread_proc(void *param) { @@ -9810,9 +9808,7 @@ test_WSAAsyncGetServByName(); test_completion_port(); -#if CORE_12000_IS_FIXED /* FIXME: CORE-12000 */ test_address_list_query(); -#endif /* this is an io heavy test, do it at the end so the kernel doesn't start dropping packets */ test_send();

8 years, 2 months

[akhaldi] 72902: [MSAFD] Partial implementation of SIO_ADDRESS_LIST_QUERY by Peter Hater. CORE-12000

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Oct 4 18:27:17 2016 New Revision: 72902 URL: http://svn.reactos.org/svn/reactos?rev=72902&view=rev Log: [MSAFD] Partial implementation of SIO_ADDRESS_LIST_QUERY by Peter Hater. CORE-12000 Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Tue Oct 4 18:27:17 2016 @@ -890,6 +890,9 @@ if(!NT_SUCCESS(Status)) { + if (lpErrno) + *lpErrno = WSAEFAULT; + ERR("NtCreateEvent failed, 0x%08x\n", Status); return SOCKET_ERROR; } @@ -2055,6 +2058,24 @@ case SIO_GET_EXTENSION_FUNCTION_POINTER: *lpErrno = WSAEINVAL; return SOCKET_ERROR; + + case SIO_ADDRESS_LIST_QUERY: + if (cbOutBuffer < (sizeof(SOCKET_ADDRESS_LIST) + sizeof(Socket->WSLocalAddress)) || IS_INTRESOURCE(lpvOutBuffer)) + { + *lpErrno = WSAEINVAL; + return SOCKET_ERROR; + } + + *lpcbBytesReturned = sizeof(SOCKET_ADDRESS_LIST) + + sizeof(Socket->WSLocalAddress); + + ((SOCKET_ADDRESS_LIST*)lpvOutBuffer)->iAddressCount = 1; + ((SOCKET_ADDRESS_LIST*)lpvOutBuffer)->Address[0].iSockaddrLength = sizeof(Socket->WSLocalAddress); + ((SOCKET_ADDRESS_LIST*)lpvOutBuffer)->Address[0].lpSockaddr = &Socket->WSLocalAddress; + + *lpErrno = NO_ERROR; + return NO_ERROR; + default: *lpErrno = Socket->HelperData->WSHIoctl(Socket->HelperContext, Handle,

8 years, 2 months

[tfaber] 72901: [USER32_APITEST] - Fix build

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Oct 4 15:37:25 2016 New Revision: 72901 URL: http://svn.reactos.org/svn/reactos?rev=72901&view=rev Log: [USER32_APITEST] - Fix build Modified: trunk/rostests/apitests/user32/CMakeLists.txt Modified: trunk/rostests/apitests/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/CMakeList… ============================================================================== --- trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/CMakeLists.txt [iso-8859-1] Tue Oct 4 15:37:25 2016 @@ -40,5 +40,5 @@ add_executable(user32_apitest ${SOURCE}) target_link_libraries(user32_apitest wine ${PSEH_LIB}) set_module_type(user32_apitest win32cui) -add_importlibs(user32_apitest gdi32 user32 msvcrt kernel32 ntdll) +add_importlibs(user32_apitest advapi32 gdi32 user32 msvcrt kernel32 ntdll) add_cd_file(TARGET user32_apitest DESTINATION reactos/bin FOR all)

8 years, 2 months

[tfaber] 72900: [USER32_APITEST] - Extend GetUserObjectInformation tests by adding tests for UOI_NAME on the default as well as custom window stations/desktops. CORE-12073

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Oct 4 15:14:30 2016 New Revision: 72900 URL: http://svn.reactos.org/svn/reactos?rev=72900&view=rev Log: [USER32_APITEST] - Extend GetUserObjectInformation tests by adding tests for UOI_NAME on the default as well as custom window stations/desktops. CORE-12073 Modified: trunk/rostests/apitests/user32/GetUserObjectInformation.c Modified: trunk/rostests/apitests/user32/GetUserObjectInformation.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/GetUserOb… ============================================================================== --- trunk/rostests/apitests/user32/GetUserObjectInformation.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/GetUserObjectInformation.c [iso-8859-1] Tue Oct 4 15:14:30 2016 @@ -6,9 +6,11 @@ */ #include <apitest.h> +#include <wingdi.h> #include <winuser.h> #include <ndk/mmfuncs.h> #include <ndk/pstypes.h> +#include <strsafe.h> static BOOLEAN @@ -117,6 +119,36 @@ ok(_Error == ERROR_NOACCESS, "Error = %lu\n", _Error); \ } while (0) +#define TestUserObjectInfoWithString(Handle, Index, Buffer, BufferSize, String) do \ + { \ + BOOLEAN _Check; \ + ULONG SizeOfString = wcslen(String) * sizeof(WCHAR) + sizeof(UNICODE_NULL); \ + TestUserObjectInfo(Handle, Index, NULL, 0, FALSE, ERROR_INSUFFICIENT_BUFFER, SizeOfString); \ + TestUserObjectInfo(Handle, Index, (PVOID)1, 0, FALSE, ERROR_INSUFFICIENT_BUFFER, SizeOfString); \ + TestUserObjectInfo(Handle, Index, NULL, 1, FALSE, ERROR_NOACCESS, NOTSET); \ + TestUserObjectInfo(Handle, Index, (PVOID)1, 1, FALSE, ERROR_NOACCESS, NOTSET); \ + RtlFillMemory(Buffer, BufferSize, 0x55); \ + TestUserObjectInfo(Handle, Index, Buffer, SizeOfString - 2, FALSE, ERROR_INSUFFICIENT_BUFFER, SizeOfString); \ + _Check = CheckBuffer(Buffer, BufferSize, 0x55); \ + ok(_Check == TRUE, "CheckBuffer failed\n"); \ + RtlFillMemory(Buffer, BufferSize, 0x55); \ + TestUserObjectInfo(Handle, Index, Buffer, SizeOfString - 1, FALSE, ERROR_INSUFFICIENT_BUFFER, SizeOfString); \ + _Check = CheckBuffer(Buffer, BufferSize, 0x55); \ + ok(_Check == TRUE, "CheckBuffer failed\n"); \ + RtlFillMemory(Buffer, BufferSize, 0x55); \ + Buffer[BufferSize / sizeof(WCHAR) - 1] = UNICODE_NULL; \ + TestUserObjectInfo(Handle, Index, Buffer, SizeOfString, TRUE, 0xdeadbeef, SizeOfString); \ + ok(wcscmp(Buffer, String) == 0, "Buffer '%ls', expected '%ls'\n", Buffer, String); \ + _Check = CheckBuffer(Buffer + SizeOfString / sizeof(Buffer[0]), BufferSize - SizeOfString - sizeof(WCHAR), 0x55); \ + ok(_Check == TRUE, "CheckBuffer failed\n"); \ + RtlFillMemory(Buffer, BufferSize, 0x55); \ + Buffer[BufferSize / sizeof(WCHAR) - 1] = UNICODE_NULL; \ + TestUserObjectInfo(Handle, Index, Buffer, BufferSize, TRUE, 0xdeadbeef, SizeOfString); \ + ok(wcscmp(Buffer, String) == 0, "Buffer '%ls', expected '%ls'\n", Buffer, String); \ + _Check = CheckBuffer(Buffer + SizeOfString / sizeof(Buffer[0]), BufferSize - SizeOfString - sizeof(WCHAR), 0x55); \ + ok(_Check == TRUE, "CheckBuffer failed\n"); \ + } while (0) + static void TestGetUserObjectInfoW(void) @@ -125,7 +157,13 @@ PWCHAR Buffer; ULONG BufferSize = 64 * sizeof(WCHAR); HDESK Desktop; - BOOLEAN Check; + HDESK Desktop2; + HWINSTA WinSta; + HANDLE Token; + TOKEN_STATISTICS Statistics; + WCHAR WinStaName[64]; + BOOL Success; + ULONG Length; Buffer = AllocateGuarded(BufferSize); @@ -142,10 +180,25 @@ TestUserObjectInfo(NULL, UOI_TYPE, (PVOID)1, 1, FALSE, ERROR_NOACCESS, NOTSET); TestUserObjectInfo(NULL, UOI_TYPE, Buffer, BufferSize, FALSE, ERROR_INVALID_HANDLE, 0); + TestUserObjectInfo(NULL, UOI_NAME, NULL, 0, FALSE, ERROR_INVALID_HANDLE, 0); + TestUserObjectInfo(NULL, UOI_NAME, (PVOID)1, 0, FALSE, ERROR_INVALID_HANDLE, 0); + TestUserObjectInfo(NULL, UOI_NAME, NULL, 1, FALSE, ERROR_NOACCESS, NOTSET); + TestUserObjectInfo(NULL, UOI_NAME, (PVOID)1, 1, FALSE, ERROR_NOACCESS, NOTSET); + TestUserObjectInfo(NULL, UOI_NAME, Buffer, BufferSize, FALSE, ERROR_INVALID_HANDLE, 0); + Desktop = GetThreadDesktop(GetCurrentThreadId()); if (!Desktop) { skip("Failed to get desktop handle\n"); + FreeGuarded(Buffer); + return; + } + + WinSta = GetProcessWindowStation(); + if (!WinSta) + { + skip("Failed to get winsta handle\n"); + FreeGuarded(Buffer); return; } @@ -156,31 +209,115 @@ TestUserObjectInfo(Desktop, UOI_FLAGS, (PVOID)1, 1, FALSE, ERROR_NOACCESS, NOTSET); TestUserObjectInfo(Desktop, UOI_FLAGS, &UserObjectFlags, sizeof(UserObjectFlags), TRUE, 0xdeadbeef, sizeof(USEROBJECTFLAGS)); - TestUserObjectInfo(Desktop, UOI_TYPE, NULL, 0, FALSE, ERROR_INSUFFICIENT_BUFFER, sizeof(L"Desktop")); - TestUserObjectInfo(Desktop, UOI_TYPE, (PVOID)1, 0, FALSE, ERROR_INSUFFICIENT_BUFFER, sizeof(L"Desktop")); - TestUserObjectInfo(Desktop, UOI_TYPE, NULL, 1, FALSE, ERROR_NOACCESS, NOTSET); - TestUserObjectInfo(Desktop, UOI_TYPE, (PVOID)1, 1, FALSE, ERROR_NOACCESS, NOTSET); - RtlFillMemory(Buffer, BufferSize, 0x55); - TestUserObjectInfo(Desktop, UOI_TYPE, Buffer, sizeof(L"Desktop") - 2, FALSE, ERROR_INSUFFICIENT_BUFFER, sizeof(L"Desktop")); - Check = CheckBuffer(Buffer, BufferSize, 0x55); - ok(Check == TRUE, "CheckBuffer failed\n"); - RtlFillMemory(Buffer, BufferSize, 0x55); - TestUserObjectInfo(Desktop, UOI_TYPE, Buffer, sizeof(L"Desktop") - 1, FALSE, ERROR_INSUFFICIENT_BUFFER, sizeof(L"Desktop")); - Check = CheckBuffer(Buffer, BufferSize, 0x55); - ok(Check == TRUE, "CheckBuffer failed\n"); - RtlFillMemory(Buffer, BufferSize, 0x55); - TestUserObjectInfo(Desktop, UOI_TYPE, Buffer, sizeof(L"Desktop"), TRUE, 0xdeadbeef, sizeof(L"Desktop")); - ok(wcscmp(Buffer, L"Desktop") == 0, "Buffer '%ls'\n", Buffer); - Check = CheckBuffer(Buffer + sizeof("Desktop"), BufferSize - sizeof(L"Desktop"), 0x55); - ok(Check == TRUE, "CheckBuffer failed\n"); - RtlFillMemory(Buffer, BufferSize, 0x55); - TestUserObjectInfo(Desktop, UOI_TYPE, Buffer, BufferSize, TRUE, 0xdeadbeef, sizeof(L"Desktop")); - ok(wcscmp(Buffer, L"Desktop") == 0, "Buffer '%ls'\n", Buffer); - Check = CheckBuffer(Buffer + sizeof("Desktop"), BufferSize - sizeof(L"Desktop"), 0x55); - ok(Check == TRUE, "CheckBuffer failed\n"); + TestUserObjectInfoWithString(Desktop, UOI_TYPE, Buffer, BufferSize, L"Desktop"); + TestUserObjectInfoWithString(Desktop, UOI_NAME, Buffer, BufferSize, L"Default"); + + TestUserObjectInfoWithString(WinSta, UOI_TYPE, Buffer, BufferSize, L"WindowStation"); + TestUserObjectInfoWithString(WinSta, UOI_NAME, Buffer, BufferSize, L"WinSta0"); + + /* Autogenerated name will be Service-0x<luidhigh>-<luidlow>$ */ + StringCbCopyW(WinStaName, sizeof(WinStaName), L"<failed>"); + Success = OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &Token); + ok(Success == TRUE, "OpenProcessToken failed with %lu\n", GetLastError()); + if (Success) + { + Success = GetTokenInformation(Token, + TokenStatistics, + &Statistics, + sizeof(Statistics), + &Length); + ok(Success == TRUE, "GetTokenInformation failed with %lu\n", GetLastError()); + if (Success) + { + StringCbPrintfW(WinStaName, + sizeof(WinStaName), + L"Service-0x%lx-%lx$", + Statistics.AuthenticationId.HighPart, + Statistics.AuthenticationId.LowPart); + trace("Expected autogenerated Winsta name: %ls\n", WinStaName); + } + CloseHandle(Token); + } + + /* Create our own Winsta */ + WinSta = CreateWindowStationW(NULL, 0, WINSTA_READATTRIBUTES, NULL); + ok(WinSta != NULL, "CreateWindowStationW failed with %lu\n", GetLastError()); + if (WinSta) + { + TestUserObjectInfoWithString(WinSta, UOI_TYPE, Buffer, BufferSize, L"WindowStation"); + TestUserObjectInfoWithString(WinSta, UOI_NAME, Buffer, BufferSize, WinStaName); + CloseWindowStation(WinSta); + } + else + { + skip("Failed to create winsta\n"); + } + + WinSta = CreateWindowStationW(L"", 0, WINSTA_READATTRIBUTES, NULL); + ok(WinSta != NULL, "CreateWindowStationW failed with %lu\n", GetLastError()); + if (WinSta) + { + TestUserObjectInfoWithString(WinSta, UOI_TYPE, Buffer, BufferSize, L"WindowStation"); + TestUserObjectInfoWithString(WinSta, UOI_NAME, Buffer, BufferSize, WinStaName); + CloseWindowStation(WinSta); + } + else + { + skip("Failed to create winsta\n"); + } + + WinSta = CreateWindowStationW(L"GetUserObjectInformation_apitest_winsta", 0, WINSTA_READATTRIBUTES, NULL); + ok(WinSta != NULL, "CreateWindowStationW failed with %lu\n", GetLastError()); + if (WinSta) + { + TestUserObjectInfoWithString(WinSta, UOI_TYPE, Buffer, BufferSize, L"WindowStation"); + TestUserObjectInfoWithString(WinSta, UOI_NAME, Buffer, BufferSize, L"GetUserObjectInformation_apitest_winsta"); + CloseWindowStation(WinSta); + } + else + { + skip("Failed to create winsta\n"); + } + + WinSta = CreateWindowStationW(L"1", 0, WINSTA_READATTRIBUTES, NULL); + ok(WinSta != NULL, "CreateWindowStationW failed with %lu\n", GetLastError()); + if (WinSta) + { + TestUserObjectInfoWithString(WinSta, UOI_TYPE, Buffer, BufferSize, L"WindowStation"); + TestUserObjectInfoWithString(WinSta, UOI_NAME, Buffer, BufferSize, L"1"); + CloseWindowStation(WinSta); + } + else + { + skip("Failed to create winsta\n"); + } + + /* Create our own desktop */ + Desktop2 = CreateDesktopW(NULL, NULL, NULL, 0, DESKTOP_CREATEWINDOW | DESKTOP_READOBJECTS, NULL); + ok(Desktop2 == NULL, "CreateDesktopW succeeded\n"); + if (Desktop2) CloseDesktop(Desktop2); + + Desktop2 = CreateDesktopW(L"", NULL, NULL, 0, DESKTOP_CREATEWINDOW | DESKTOP_READOBJECTS, NULL); + ok(Desktop2 == NULL, "CreateDesktopW succeeded\n"); + if (Desktop2) CloseDesktop(Desktop2); + + Desktop2 = CreateDesktopW(L"2", NULL, NULL, 0, DESKTOP_CREATEWINDOW | DESKTOP_READOBJECTS, NULL); + ok(Desktop2 != NULL, "CreateDesktopW failed with %lu\n", GetLastError()); + if (Desktop2) + { + TestUserObjectInfoWithString(Desktop2, UOI_TYPE, Buffer, BufferSize, L"Desktop"); + TestUserObjectInfoWithString(Desktop2, UOI_NAME, Buffer, BufferSize, L"2"); + } + else + { + skip("Failed to create winsta\n"); + } + + CloseDesktop(Desktop2); FreeGuarded(Buffer); + /* Make sure nothing behind the needed buffer is touched */ BufferSize = sizeof(L"Desktop"); Buffer = AllocateGuarded(BufferSize); TestUserObjectInfo(Desktop, UOI_TYPE, Buffer, BufferSize, TRUE, 0xdeadbeef, sizeof(L"Desktop")); @@ -226,6 +363,34 @@ ok(_Error == ERROR_NOACCESS, "Error = %lu\n", _Error); \ } while (0) +#undef TestUserObjectInfoWithString +#define TestUserObjectInfoWithString(Handle, Index, Buffer, BufferSize, String) do \ + { \ + BOOLEAN _Check; \ + TestUserObjectInfo(Handle, Index, NULL, 0, FALSE, ERROR_INSUFFICIENT_BUFFER, sizeof(String) * sizeof(WCHAR));\ + TestUserObjectInfo(Handle, Index, (PVOID)1, 0, FALSE, ERROR_INSUFFICIENT_BUFFER, sizeof(String) * sizeof(WCHAR));\ + TestUserObjectInfo(Handle, Index, NULL, 1, FALSE, ERROR_INSUFFICIENT_BUFFER, sizeof(String) * sizeof(WCHAR));\ + TestUserObjectInfo(Handle, Index, (PVOID)1, 1, FALSE, ERROR_INSUFFICIENT_BUFFER, sizeof(String) * sizeof(WCHAR));\ + RtlFillMemory(Buffer, BufferSize, 0x55); \ + TestUserObjectInfo(Handle, Index, Buffer, sizeof(String) - 2, FALSE, ERROR_INSUFFICIENT_BUFFER, sizeof(String) * sizeof(WCHAR));\ + _Check = CheckBuffer(Buffer, BufferSize, 0x55); \ + ok(_Check == TRUE, "CheckBuffer failed\n"); \ + RtlFillMemory(Buffer, BufferSize, 0x55); \ + TestUserObjectInfo(Handle, Index, Buffer, sizeof(String) - 1, FALSE, ERROR_INSUFFICIENT_BUFFER, sizeof(String) * sizeof(WCHAR));\ + _Check = CheckBuffer(Buffer, BufferSize, 0x55); \ + ok(_Check == TRUE, "CheckBuffer failed\n"); \ + RtlFillMemory(Buffer, BufferSize, 0x55); \ + TestUserObjectInfo(Handle, Index, Buffer, sizeof(String), TRUE, 0xdeadbeef, sizeof(String)); \ + ok(strcmp(Buffer, String) == 0, "Buffer '%s'\n", Buffer); \ + _Check = CheckBuffer(Buffer + sizeof(String), BufferSize - sizeof(String), 0x55); \ + ok(_Check == TRUE, "CheckBuffer failed\n"); \ + RtlFillMemory(Buffer, BufferSize, 0x55); \ + TestUserObjectInfo(Handle, Index, Buffer, BufferSize, TRUE, 0xdeadbeef, sizeof(String)); \ + ok(strcmp(Buffer, String) == 0, "Buffer '%s'\n", Buffer); \ + _Check = CheckBuffer(Buffer + sizeof(String), BufferSize - sizeof(String), 0x55); \ + ok(_Check == TRUE, "CheckBuffer failed\n"); \ + } while (0) + static void TestGetUserObjectInfoA(void) @@ -234,7 +399,7 @@ PCHAR Buffer; ULONG BufferSize = 64; HDESK Desktop; - BOOLEAN Check; + HWINSTA WinSta; Buffer = AllocateGuarded(BufferSize); @@ -251,10 +416,25 @@ TestUserObjectInfo(NULL, UOI_TYPE, (PVOID)1, 1, FALSE, ERROR_INVALID_HANDLE, 0); TestUserObjectInfo(NULL, UOI_TYPE, Buffer, BufferSize, FALSE, ERROR_INVALID_HANDLE, 0); + TestUserObjectInfo(NULL, UOI_NAME, NULL, 0, FALSE, ERROR_INVALID_HANDLE, 0); + TestUserObjectInfo(NULL, UOI_NAME, (PVOID)1, 0, FALSE, ERROR_INVALID_HANDLE, 0); + TestUserObjectInfo(NULL, UOI_NAME, NULL, 1, FALSE, ERROR_INVALID_HANDLE, 0); + TestUserObjectInfo(NULL, UOI_NAME, (PVOID)1, 1, FALSE, ERROR_INVALID_HANDLE, 0); + TestUserObjectInfo(NULL, UOI_NAME, Buffer, BufferSize, FALSE, ERROR_INVALID_HANDLE, 0); + Desktop = GetThreadDesktop(GetCurrentThreadId()); if (!Desktop) { skip("Failed to get desktop handle\n"); + FreeGuarded(Buffer); + return; + } + + WinSta = GetProcessWindowStation(); + if (!WinSta) + { + skip("Failed to get winsta handle\n"); + FreeGuarded(Buffer); return; } @@ -265,31 +445,15 @@ TestUserObjectInfo(Desktop, UOI_FLAGS, (PVOID)1, 1, FALSE, ERROR_NOACCESS, NOTSET); TestUserObjectInfo(Desktop, UOI_FLAGS, &UserObjectFlags, sizeof(UserObjectFlags), TRUE, 0xdeadbeef, sizeof(USEROBJECTFLAGS)); - TestUserObjectInfo(Desktop, UOI_TYPE, NULL, 0, FALSE, ERROR_INSUFFICIENT_BUFFER, sizeof(L"Desktop")); - TestUserObjectInfo(Desktop, UOI_TYPE, (PVOID)1, 0, FALSE, ERROR_INSUFFICIENT_BUFFER, sizeof(L"Desktop")); - TestUserObjectInfo(Desktop, UOI_TYPE, NULL, 1, FALSE, ERROR_INSUFFICIENT_BUFFER, sizeof(L"Desktop")); - TestUserObjectInfo(Desktop, UOI_TYPE, (PVOID)1, 1, FALSE, ERROR_INSUFFICIENT_BUFFER, sizeof(L"Desktop")); - RtlFillMemory(Buffer, BufferSize, 0x55); - TestUserObjectInfo(Desktop, UOI_TYPE, Buffer, sizeof("Desktop") - 2, FALSE, ERROR_INSUFFICIENT_BUFFER, sizeof(L"Desktop")); - Check = CheckBuffer(Buffer, BufferSize, 0x55); - ok(Check == TRUE, "CheckBuffer failed\n"); - RtlFillMemory(Buffer, BufferSize, 0x55); - TestUserObjectInfo(Desktop, UOI_TYPE, Buffer, sizeof("Desktop") - 1, FALSE, ERROR_INSUFFICIENT_BUFFER, sizeof(L"Desktop")); - Check = CheckBuffer(Buffer, BufferSize, 0x55); - ok(Check == TRUE, "CheckBuffer failed\n"); - RtlFillMemory(Buffer, BufferSize, 0x55); - TestUserObjectInfo(Desktop, UOI_TYPE, Buffer, sizeof("Desktop"), TRUE, 0xdeadbeef, sizeof("Desktop")); - ok(strcmp(Buffer, "Desktop") == 0, "Buffer '%s'\n", Buffer); - Check = CheckBuffer(Buffer + sizeof("Desktop"), BufferSize - sizeof("Desktop"), 0x55); - ok(Check == TRUE, "CheckBuffer failed\n"); - RtlFillMemory(Buffer, BufferSize, 0x55); - TestUserObjectInfo(Desktop, UOI_TYPE, Buffer, BufferSize, TRUE, 0xdeadbeef, sizeof("Desktop")); - ok(strcmp(Buffer, "Desktop") == 0, "Buffer '%s'\n", Buffer); - Check = CheckBuffer(Buffer + sizeof("Desktop"), BufferSize - sizeof("Desktop"), 0x55); - ok(Check == TRUE, "CheckBuffer failed\n"); + TestUserObjectInfoWithString(Desktop, UOI_TYPE, Buffer, BufferSize, "Desktop"); + TestUserObjectInfoWithString(Desktop, UOI_NAME, Buffer, BufferSize, "Default"); + + TestUserObjectInfoWithString(WinSta, UOI_TYPE, Buffer, BufferSize, "WindowStation"); + TestUserObjectInfoWithString(WinSta, UOI_NAME, Buffer, BufferSize, "WinSta0"); FreeGuarded(Buffer); + /* Make sure nothing behind the needed buffer is touched */ BufferSize = sizeof("Desktop"); Buffer = AllocateGuarded(BufferSize); TestUserObjectInfo(Desktop, UOI_TYPE, Buffer, BufferSize, TRUE, 0xdeadbeef, sizeof("Desktop"));

8 years, 2 months

[cfinck] 72899: [HOST_TOOLS] Defining -fshort-wchar globally for all host tools breaks every possibility to interact with the host's Unicode support for some operating systems with 4 byte wchar_t (...

by cfinck＠svn.reactos.org

Author: cfinck Date: Tue Oct 4 12:37:52 2016 New Revision: 72899 URL: http://svn.reactos.org/svn/reactos?rev=72899&view=rev Log: [HOST_TOOLS] Defining -fshort-wchar globally for all host tools breaks every possibility to interact with the host's Unicode support for some operating systems with 4 byte wchar_t (like Mac OS X). Let's better define no additional global flags and only add -fshort-wchar for the host modules that really need a 2-byte wchar_t for writing ReactOS data files. These are cmlibhost, inflibhost, mkhive and xml2sdb. Also add -Wno-multichar only for cmlibhost, where it's required. In preparation for CORE-11988 Modified: trunk/reactos/CMakeLists.txt trunk/reactos/sdk/lib/cmlib/CMakeLists.txt trunk/reactos/sdk/lib/inflib/CMakeLists.txt trunk/reactos/sdk/tools/mkhive/CMakeLists.txt trunk/reactos/sdk/tools/xml2sdb/CMakeLists.txt Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=72899&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Tue Oct 4 12:37:52 2016 @@ -94,8 +94,6 @@ add_definitions(/D_ALLOW_KEYWORD_MACROS) endif() add_definitions(/Dinline=__inline) - else() - add_compile_flags("-fshort-wchar -Wno-multichar") endif() include_directories(sdk/include/host) Modified: trunk/reactos/sdk/lib/cmlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/cmlib/CMakeLists.t… ============================================================================== --- trunk/reactos/sdk/lib/cmlib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/cmlib/CMakeLists.txt [iso-8859-1] Tue Oct 4 12:37:52 2016 @@ -26,5 +26,10 @@ -D__NO_CTYPE_INLINES -DCMLIB_HOST) add_library(cmlibhost ${SOURCE}) + + if(NOT MSVC) + add_target_compile_flags(cmlibhost "-fshort-wchar -Wno-multichar") + endif() + target_link_libraries(cmlibhost unicode) endif() Modified: trunk/reactos/sdk/lib/inflib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/inflib/CMakeLists.… ============================================================================== --- trunk/reactos/sdk/lib/inflib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/inflib/CMakeLists.txt [iso-8859-1] Tue Oct 4 12:37:52 2016 @@ -23,8 +23,10 @@ add_definitions(-D__NO_CTYPE_INLINES -DINFLIB_HOST) add_library(inflibhost ${SOURCE}) + if(NOT MSVC) - add_target_compile_flags(inflibhost "-Wpointer-arith -Wwrite-strings") + add_target_compile_flags(inflibhost "-fshort-wchar -Wpointer-arith -Wwrite-strings") endif() + target_link_libraries(inflibhost unicode) endif() Modified: trunk/reactos/sdk/tools/mkhive/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/mkhive/CMakeList… ============================================================================== --- trunk/reactos/sdk/tools/mkhive/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/mkhive/CMakeLists.txt [iso-8859-1] Tue Oct 4 12:37:52 2016 @@ -15,4 +15,9 @@ rtl.c) add_host_tool(mkhive ${SOURCE}) + +if(NOT MSVC) + add_target_compile_flags(mkhive "-fshort-wchar") +endif() + target_link_libraries(mkhive unicode cmlibhost inflibhost) Modified: trunk/reactos/sdk/tools/xml2sdb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/tools/xml2sdb/CMakeLis… ============================================================================== --- trunk/reactos/sdk/tools/xml2sdb/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/sdk/tools/xml2sdb/CMakeLists.txt [iso-8859-1] Tue Oct 4 12:37:52 2016 @@ -1,12 +1,5 @@ add_definitions(-DSDBWRITE_HOSTTOOL=1) - -if(MSVC) - set_property(SOURCE main.cpp tinyxml2.cpp xml2sdb.cpp APPEND_STRING PROPERTY COMPILE_FLAGS " /EHsc") -else() - add_compile_flags("-fshort-wchar -Wno-multichar") -endif() - list(APPEND SOURCE main.cpp @@ -17,3 +10,9 @@ include_directories(${REACTOS_SOURCE_DIR}/dll/appcompat/apphelp) add_host_tool(xml2sdb ${SOURCE}) + +if(MSVC) + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS " /EHsc") +else() + add_target_compile_flags(xml2sdb "-fshort-wchar") +endif()

8 years, 2 months

[akhaldi] 72898: [ADNS][DNSAPI] Fix a local resolving regression that led to some browsers crashing after startup. By Peter Hater. CORE-12072 CORE-12088

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Oct 4 07:55:15 2016 New Revision: 72898 URL: http://svn.reactos.org/svn/reactos?rev=72898&view=rev Log: [ADNS][DNSAPI] Fix a local resolving regression that led to some browsers crashing after startup. By Peter Hater. CORE-12072 CORE-12088 Modified: trunk/reactos/dll/win32/dnsapi/dnsapi/query.c trunk/reactos/sdk/lib/3rdparty/adns/src/setup.c Modified: trunk/reactos/dll/win32/dnsapi/dnsapi/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi/qu… ============================================================================== --- trunk/reactos/dll/win32/dnsapi/dnsapi/query.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dnsapi/dnsapi/query.c [iso-8859-1] Tue Oct 4 07:55:15 2016 @@ -771,6 +771,12 @@ } adns_error = adns_init(&astate, adns_if_noenv | adns_if_noerrprint | adns_if_noserverwarn, 0); + if (adns_error != adns_s_ok) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, AnsiName); + RtlFreeHeap(RtlGetProcessHeap(), 0, network_info); + return DnsIntTranslateAdnsToDNS_STATUS(adns_error); + } for (pip = &(network_info->DnsServerList); pip; pip = pip->Next) { addr.s_addr = inet_addr(pip->IpAddress.String); @@ -782,12 +788,6 @@ adns_ccf_search(astate, "LOCALDOMAIN", -1, network_info->DomainName); } RtlFreeHeap(RtlGetProcessHeap(), 0, network_info); - - if (adns_error != adns_s_ok) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, AnsiName); - return DnsIntTranslateAdnsToDNS_STATUS(adns_error); - } if (Servers) { Modified: trunk/reactos/sdk/lib/3rdparty/adns/src/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/adns/src/… ============================================================================== --- trunk/reactos/sdk/lib/3rdparty/adns/src/setup.c [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/3rdparty/adns/src/setup.c [iso-8859-1] Tue Oct 4 07:55:15 2016 @@ -521,17 +521,18 @@ } static int init_finish(adns_state ads) { - struct in_addr ia; struct protoent *proto; int r; - +/* Don't add loopback on ReactOS it slows down queries to non existent server */ +#ifndef __REACTOS__ + struct in_addr ia; if (!ads->nservers) { if (ads->diagfile && ads->iflags & adns_if_debug) fprintf(ads->diagfile,"adns: no nameservers, using localhost\n"); ia.s_addr= htonl(INADDR_LOOPBACK); addserver(ads,ia); } - +#endif proto= getprotobyname("udp"); if (!proto) { r= ENOPROTOOPT; goto x_free; } ADNS_CLEAR_ERRNO; ads->udpsocket= socket(AF_INET,SOCK_DGRAM,proto->p_proto);

8 years, 2 months

[hbelusca] 72897: [CLIPBRD][EVENTVWR][MPLAY32][WELCOME][SYSDM] Fix the ShowLastWin32Error helpers: - don't display the last error string if it's ERROR_SUCCESS (since the code usually expects to dis...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Oct 3 12:22:29 2016 New Revision: 72897 URL: http://svn.reactos.org/svn/reactos?rev=72897&view=rev Log: [CLIPBRD][EVENTVWR][MPLAY32][WELCOME][SYSDM] Fix the ShowLastWin32Error helpers: - don't display the last error string if it's ERROR_SUCCESS (since the code usually expects to display the last error message in case of errors); - *always* call FormatMessage with the FORMAT_MESSAGE_IGNORE_INSERTS flag enabled. Indeed if it happens that the message string associated to an error ID contains insert parameter placeholders, and since we don't give here FormatMessage any argument array, the call would result into a crash without this flag. Modified: trunk/reactos/base/applications/clipbrd/winutils.c trunk/reactos/base/applications/mplay32/mplay32.c trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c trunk/reactos/base/setup/welcome/welcome.c trunk/reactos/dll/cpl/sysdm/general.c Modified: trunk/reactos/base/applications/clipbrd/winutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… ============================================================================== --- trunk/reactos/base/applications/clipbrd/winutils.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/clipbrd/winutils.c [iso-8859-1] Mon Oct 3 12:22:29 2016 @@ -14,9 +14,21 @@ LPWSTR lpMsgBuf = NULL; dwError = GetLastError(); - - FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, - NULL, dwError, 0, (LPWSTR)&lpMsgBuf, 0, NULL); + if (dwError == ERROR_SUCCESS) + return; + + if (!FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, + dwError, + LANG_USER_DEFAULT, + (LPWSTR)&lpMsgBuf, + 0, NULL)) + { + return; + } + MessageBoxW(hwndParent, lpMsgBuf, NULL, MB_OK | MB_ICONERROR); LocalFree(lpMsgBuf); } Modified: trunk/reactos/base/applications/mplay32/mplay32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] Mon Oct 3 12:22:29 2016 @@ -209,16 +209,23 @@ LPTSTR lpMessageBuffer; DWORD dwError = GetLastError(); - if (FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, - NULL, - dwError, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPTSTR)&lpMessageBuffer, - 0, NULL) != 0) - { - MessageBox(hwnd, lpMessageBuffer, szAppTitle, MB_OK | MB_ICONERROR); - if (lpMessageBuffer) LocalFree(lpMessageBuffer); - } + if (dwError == ERROR_SUCCESS) + return; + + if (!FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, + dwError, + LANG_USER_DEFAULT, + (LPTSTR)&lpMessageBuffer, + 0, NULL)) + { + return; + } + + MessageBox(hwnd, lpMessageBuffer, szAppTitle, MB_OK | MB_ICONERROR); + LocalFree(lpMessageBuffer); } static VOID Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] Mon Oct 3 12:22:29 2016 @@ -245,13 +245,20 @@ LPWSTR lpMessageBuffer; dwError = GetLastError(); - FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, - dwError, - 0, - (LPWSTR)&lpMessageBuffer, - 0, - NULL); + if (dwError == ERROR_SUCCESS) + return; + + if (!FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, + dwError, + LANG_USER_DEFAULT, + (LPWSTR)&lpMessageBuffer, + 0, NULL)) + { + return; + } MessageBoxW(hwndMainWindow, lpMessageBuffer, szTitle, MB_OK | MB_ICONERROR); LocalFree(lpMessageBuffer); Modified: trunk/reactos/base/setup/welcome/welcome.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/welcome… ============================================================================== --- trunk/reactos/base/setup/welcome/welcome.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/welcome.c [iso-8859-1] Mon Oct 3 12:22:29 2016 @@ -113,20 +113,23 @@ LPTSTR lpMessageBuffer = NULL; DWORD dwError = GetLastError(); - if (FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, - NULL, - dwError, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPTSTR)&lpMessageBuffer, - 0, NULL)) - { - MessageBox(hWnd, lpMessageBuffer, szAppTitle, MB_OK | MB_ICONERROR); - } - - if (lpMessageBuffer) - { - LocalFree(lpMessageBuffer); - } + if (dwError == ERROR_SUCCESS) + return; + + if (!FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, + dwError, + LANG_USER_DEFAULT, + (LPTSTR)&lpMessageBuffer, + 0, NULL)) + { + return; + } + + MessageBox(hWnd, lpMessageBuffer, szAppTitle, MB_OK | MB_ICONERROR); + LocalFree(lpMessageBuffer); } #endif Modified: trunk/reactos/dll/cpl/sysdm/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/general.c?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/general.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/general.c [iso-8859-1] Mon Oct 3 12:22:29 2016 @@ -35,23 +35,23 @@ DWORD LastError; LastError = GetLastError(); - - if ((LastError == 0) || - !FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | - FORMAT_MESSAGE_FROM_SYSTEM, - NULL, - LastError, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPTSTR)&lpMsg, - 0, - NULL)) - { + if (LastError == ERROR_SUCCESS) return; + + if (!FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, + LastError, + LANG_USER_DEFAULT, + (LPTSTR)&lpMsg, + 0, NULL)) + { + return; } MessageBox(hWndOwner, lpMsg, NULL, MB_OK | MB_ICONERROR); - - LocalFree((LPVOID)lpMsg); + LocalFree(lpMsg); }

8 years, 2 months

[ion] 72896: [NTOS]: Handle two complex failure paths, one of which is apparently easily reproducible by ntdll:om test (I'm guessing some invalid object attribute). Thanks to Amine and lentin. Have...

by ion＠svn.reactos.org

Author: ion Date: Mon Oct 3 03:30:11 2016 New Revision: 72896 URL: http://svn.reactos.org/svn/reactos?rev=72896&view=rev Log: [NTOS]: Handle two complex failure paths, one of which is apparently easily reproducible by ntdll:om test (I'm guessing some invalid object attribute). Thanks to Amine and lentin. Haven't tested this, but hopefully fixes things (and doesn't leak). Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Mon Oct 3 03:30:11 2016 @@ -2419,6 +2419,7 @@ BOOLEAN FileLock = FALSE, KernelCall = FALSE; KIRQL OldIrql; PFILE_OBJECT File; + BOOLEAN UserRefIncremented = FALSE; PVOID PreviousSectionPointer; /* Make the same sanity checks that the Nt interface should've validated */ @@ -2516,6 +2517,7 @@ /* Write down that this CA is being created, and set it */ ControlArea->u.Flags.BeingCreated = TRUE; + ASSERT((AllocationAttributes & SEC_IMAGE) == 0); PreviousSectionPointer = File->SectionObjectPointer; File->SectionObjectPointer->DataSectionObject = ControlArea; @@ -2535,8 +2537,47 @@ SectionPageProtection, AllocationAttributes, KernelCall); + if (!NT_SUCCESS(Status)) + { + /* Lock the PFN database while we play with the section pointers */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + /* Reset the waiting-for-deletion event */ + ASSERT(ControlArea->WaitingForDeletion == NULL); + ControlArea->WaitingForDeletion = NULL; + + /* Set the file pointer NULL flag */ + ASSERT(ControlArea->u.Flags.FilePointerNull == 0); + ControlArea->u.Flags.FilePointerNull = TRUE; + + /* Delete the data section object */ + ASSERT((AllocationAttributes & SEC_IMAGE) == 0); + File->SectionObjectPointer->DataSectionObject = NULL; + + /* No longer being created */ + ControlArea->u.Flags.BeingCreated = FALSE; + + /* We can release the PFN lock now */ + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + + /* Check if we locked and set the IRP */ + if (FileLock) + { + /* Undo */ + IoSetTopLevelIrp(NULL); + //FsRtlReleaseFile(File); + } + + /* Free the control area and de-ref the file object */ + ExFreePool(ControlArea); + ObDereferenceObject(File); + + /* All done */ + return Status; + } + + /* On success, we expect this */ ASSERT(PreviousSectionPointer == File->SectionObjectPointer); - ASSERT(NT_SUCCESS(Status)); /* Check if a maximum size was specified */ if (!InputMaximumSize->QuadPart) @@ -2568,7 +2609,9 @@ /* Set the size here, and read the control area */ Section.SizeOfSection.QuadPart = NewSegment->SizeOfSegment; ControlArea = NewSegment->ControlArea; - ASSERT(ControlArea->u.Flags.BeingCreated == 1); + + /* MiCreatePagingFileMap increments user references */ + UserRefIncremented = TRUE; } /* Did we already have a segment? */ @@ -2613,16 +2656,16 @@ /* Check if this is a user-mode read-write non-image file mapping */ if (!(FileObject) && (SectionPageProtection & (PAGE_READWRITE | PAGE_EXECUTE_READWRITE)) && - (ControlArea->u.Flags.Image == 0) && - (ControlArea->FilePointer != NULL)) + !(ControlArea->u.Flags.Image) && + (ControlArea->FilePointer)) { /* Add a reference and set the flag */ - Section.u.Flags.UserWritable = 1; - InterlockedIncrement((PLONG)&ControlArea->WritableUserReferences); + Section.u.Flags.UserWritable = TRUE; + InterlockedIncrement((volatile LONG*)&ControlArea->WritableUserReferences); } /* Check for image mappings or page file mappings */ - if ((ControlArea->u.Flags.Image == 1) || !(ControlArea->FilePointer)) + if ((ControlArea->u.Flags.Image) || !(ControlArea->FilePointer)) { /* Charge the segment size, and allocate a subsection */ PagedCharge = sizeof(SECTION) + NewSegment->TotalNumberOfPtes * sizeof(MMPTE); @@ -2657,7 +2700,39 @@ PagedCharge, NonPagedCharge, (PVOID*)&NewSection); - ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + { + /* Check if this is a user-mode read-write non-image file mapping */ + if (!(FileObject) && + (SectionPageProtection & (PAGE_READWRITE | PAGE_EXECUTE_READWRITE)) && + !(ControlArea->u.Flags.Image) && + (ControlArea->FilePointer)) + { + /* Remove a reference and check the flag */ + ASSERT(Section.u.Flags.UserWritable == 1); + InterlockedDecrement((volatile LONG*)&ControlArea->WritableUserReferences); + } + + /* Check if a user reference was added */ + if (UserRefIncremented) + { + /* Acquire the PFN lock while we change counters */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + /* Decrement the accounting counters */ + ControlArea->NumberOfSectionReferences--; + ASSERT((LONG)ControlArea->NumberOfUserReferences > 0); + ControlArea->NumberOfUserReferences--; + + /* Check if we should destroy the CA and release the lock */ + MiCheckControlArea(ControlArea, OldIrql); + } + + /* Return the failure code */ + return Status; + } + + /* NOTE: Past this point, all failures will be handled by Ob upon ref->0 */ /* Now copy the local section object from the stack into this new object */ RtlCopyMemory(NewSection, &Section, sizeof(SECTION));

8 years, 2 months

[hbelusca] 72895: [EVENTCREATE]: Update the english, russian & turkish translations: - Translate a string into english (that I forgot to do: english & turkish); - Fix the allowed event ID range men...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Oct 2 21:49:03 2016 New Revision: 72895 URL: http://svn.reactos.org/svn/reactos?rev=72895&view=rev Log: [EVENTCREATE]: Update the english, russian & turkish translations: - Translate a string into english (that I forgot to do: english & turkish); - Fix the allowed event ID range mentioned in the help (russian); - The event log names should not be localized (turkish). Modified: trunk/reactos/base/applications/cmdutils/eventcreate/lang/en-US.rc trunk/reactos/base/applications/cmdutils/eventcreate/lang/ru-RU.rc trunk/reactos/base/applications/cmdutils/eventcreate/lang/tr-TR.rc Modified: trunk/reactos/base/applications/cmdutils/eventcreate/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/eventcreate/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/eventcreate/lang/en-US.rc [iso-8859-1] Sun Oct 2 21:49:03 2016 @@ -60,7 +60,7 @@ IDS_LOG_NOT_FOUND "The log '%s' does not exist. Cannot create the event.\n" IDS_SOURCE_NOCREATE "The new source cannot be created because the log name is not specified.\nPlease use the /L switch to specify the log name.\n" IDS_SOURCE_EXISTS "The source already exists in the log '%s' and cannot be duplicated.\n" - IDS_SOURCE_NOT_CUSTOM "Le paramÃ¨tre Source est utilisÃ© pour identifier les scripts/applications\npersonnalisÃ©es (pas les applications installÃ©es).\n" + IDS_SOURCE_NOT_CUSTOM "The Source parameter is used to identify the custom scripts/applications\n(not the installed applications).\n" IDS_SUCCESS_1 "Operation successful: an event of type '%s' has been created in the log '%s'.\n" IDS_SUCCESS_2 "Operation successful: an event of type '%s' has been created with the source '%s'.\n" Modified: trunk/reactos/base/applications/cmdutils/eventcreate/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/eventcreate/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/eventcreate/lang/ru-RU.rc [iso-8859-1] Sun Oct 2 21:49:03 2016 @@ -39,7 +39,7 @@ /C ÐºÐ°ÑÐµÐ³Ð¾ÑÐ¸Ñ ÐÐ¿ÑÐµÐ´ÐµÐ»ÑÐµÑ ÐºÐ°ÑÐµÐ³Ð¾ÑÐ¸Ñ ÑÐ¾Ð±ÑÑÐ¸Ñ (ÑÐ¸ÑÐ»Ð¾) Ð´Ð»Ñ ÑÐ¾Ð±ÑÑÐ¸Ñ.\n\ \n\ /ID ÐºÐ¾Ð´_ÑÐ¾Ð±ÑÑÐ¸Ñ ÐÐ¾Ð´ ÑÐ¾Ð±ÑÑÐ¸Ñ Ð´Ð»Ñ ÑÑÐ¾Ð³Ð¾ ÑÐ¾Ð±ÑÑÐ¸Ñ. ÐÐ¾Ð¿ÑÑÑÐ¸Ð¼ÑÐ¼ ÐºÐ¾Ð´Ð¾Ð¼\n\ - ÑÐ²Ð»ÑÐµÑÑÑ ÑÐ¸ÑÐ»Ð¾ Ð² Ð´Ð¸Ð°Ð¿Ð°Ð·Ð¾Ð½Ðµ Ð¾Ñ 1 Ð´Ð¾ 1000.\n\ + ÑÐ²Ð»ÑÐµÑÑÑ ÑÐ¸ÑÐ»Ð¾ Ð² Ð´Ð¸Ð°Ð¿Ð°Ð·Ð¾Ð½Ðµ Ð¾Ñ 0 Ð´Ð¾ 65535.\n\ \n\ /D Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ðµ ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð²Ð°ÐµÐ¼Ð¾Ð³Ð¾ ÑÐ¾Ð±ÑÑÐ¸Ñ.\n\ \n\ Modified: trunk/reactos/base/applications/cmdutils/eventcreate/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/eventcreate/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/eventcreate/lang/tr-TR.rc [iso-8859-1] Sun Oct 2 21:49:03 2016 @@ -25,12 +25,12 @@ \n\ /L kayÄ±t adÄ± OluÅturulacak olayÄ±n kayÄ±t adÄ±nÄ± belirtir.\n\ GeÃ§erli adlar ÅunlardÄ±r:\n\ - Uygulama, Dizge, GÃ¼venlik\n\ + Application, System, Security\n\ (Ä°kincisi yalnÄ±zca DÄ°ZGE hesÃ¢bÄ±na ayrÄ±lmÄ±ÅtÄ±r.)\n\ \n\ /SO kaynak Olay iÃ§in kullanÄ±lacak kaynak adÄ±nÄ± belirtir.\n\ (Belirtilmezse Ã¶n tanÄ±mlÄ± kaynak adÄ±\n\ - ""eventcreate"" olacaktÄ±r.)\n\ + 'eventcreate' olacaktÄ±r.)\n\ GeÃ§erli bir kaynak, rastgele bir dizgi olabilir ve olayÄ±\n\ oluÅturan uygulamayÄ± veyÃ¢ bileÅeni belirtmelidir.\n\ \n\ @@ -62,7 +62,7 @@ IDS_LOG_NOT_FOUND """%s"" kaydÄ± yok. Olay oluÅturulamÄ±yor.\n" IDS_SOURCE_NOCREATE "KayÄ±t adÄ± belirtilmediÄinden yeni kaynak oluÅturulamÄ±yor.\nKayÄ±t adÄ±nÄ± belirtmek iÃ§in lÃ¼tfen /L seÃ§eneÄini kullanÄ±nÄ±z.\n" IDS_SOURCE_EXISTS "Kaynak ""%s"" kaydÄ±nda Ã¶nceden var ve Ã§oÄaltÄ±lamaz.\n" - IDS_SOURCE_NOT_CUSTOM "Le paramÃ¨tre Source est utilisÃ© pour identifier les scripts/applications\npersonnalisÃ©es (pas les applications installÃ©es).\n" + IDS_SOURCE_NOT_CUSTOM "The Source parameter is used to identify the custom scripts/applications\n(not the installed applications).\n" IDS_SUCCESS_1 "Ä°Ålem baÅarÄ±lÄ±: ""%s"" tÃ¼rÃ¼nde bir olay ""%s"" kaydÄ±nda oluÅturuldu.\n" IDS_SUCCESS_2 "Ä°Ålem baÅarÄ±lÄ±: ""%s"" tÃ¼rÃ¼nde bir olay ""%s"" kaynaÄÄ±yla oluÅturuldu.\n"

8 years, 2 months

[akhaldi] 72894: [EVENTCREATE] Attempt to fix unrecognized escape sequence issue. Sergey please review. CORE-12069

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Oct 2 20:40:06 2016 New Revision: 72894 URL: http://svn.reactos.org/svn/reactos?rev=72894&view=rev Log: [EVENTCREATE] Attempt to fix unrecognized escape sequence issue. Sergey please review. CORE-12069 Modified: trunk/reactos/base/applications/cmdutils/eventcreate/lang/ru-RU.rc Modified: trunk/reactos/base/applications/cmdutils/eventcreate/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/eventcreate/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/eventcreate/lang/ru-RU.rc [iso-8859-1] Sun Oct 2 20:40:06 2016 @@ -59,7 +59,7 @@ IDS_LOG_NOT_FOUND "ÐÑÑÐ½Ð°Ð» '%s' Ð½Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ. ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ ÑÐ¾Ð·Ð´Ð°ÑÑ ÑÐ¾Ð±ÑÑÐ¸Ðµ.\n" IDS_SOURCE_NOCREATE "ÐÐ¾Ð²ÑÐ¹ Ð¸ÑÑÐ¾ÑÐ½Ð¸Ðº Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ ÑÐ¾Ð·Ð´Ð°Ð½, Ð¿Ð¾ÑÐºÐ¾Ð»ÑÐºÑ Ð¸Ð¼Ñ Ð¶ÑÑÐ½Ð°Ð»Ð° Ð½Ðµ ÑÐºÐ°Ð·Ð°Ð½Ð¾.\nÐÑÐ¿Ð¾Ð»ÑÐ·ÑÐ¹ÑÐµ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ /L ÑÑÐ¾Ð±Ñ ÑÐºÐ°Ð·Ð°ÑÑ Ð¸Ð¼Ñ Ð¶ÑÑÐ½Ð°Ð»Ð°.\n" IDS_SOURCE_EXISTS "ÐÑÑÐ¾ÑÐ½Ð¸Ðº ÑÐ¶Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ Ð² Ð¶ÑÑÐ½Ð°Ð»Ðµ '%s' Ð¸ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð¿ÑÐ¾Ð´ÑÐ±Ð»Ð¸ÑÐ¾Ð²Ð°Ð½.\n" - IDS_SOURCE_NOT_CUSTOM "ÐÐ°ÑÐ°Ð¼ÐµÑÑ ÐÑÑÐ¾ÑÐ½Ð¸Ðº Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑÑÑ Ð´Ð»Ñ Ð¸Ð´ÐµÐ½ÑÐ¸ÑÐ¸ÐºÐ°ÑÐ¸Ð¸ ÑÑÐµÐ½Ð°ÑÐ¸ÐµÐ²/Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼\Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÑÑÐºÐ¸Ñ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹ (Ð½Ðµ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½ÑÑ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹).\n" + IDS_SOURCE_NOT_CUSTOM "ÐÐ°ÑÐ°Ð¼ÐµÑÑ ÐÑÑÐ¾ÑÐ½Ð¸Ðº Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑÑÑ Ð´Ð»Ñ Ð¸Ð´ÐµÐ½ÑÐ¸ÑÐ¸ÐºÐ°ÑÐ¸Ð¸ ÑÑÐµÐ½Ð°ÑÐ¸ÐµÐ²/Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼\nÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÑÑÐºÐ¸Ñ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹ (Ð½Ðµ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½ÑÑ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹).\n" IDS_SUCCESS_1 "ÐÐ¿ÐµÑÐ°ÑÐ¸Ñ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð° ÑÑÐ¿ÐµÑÐ½Ð¾: ÑÐ¾Ð±ÑÑÐ¸Ðµ Ñ ÑÐ¸Ð¿Ð¾Ð¼ '%s' Ð±ÑÐ»Ð¾ ÑÑÐ¿ÐµÑÐ½Ð¾ ÑÐ¾Ð·Ð´Ð°Ð½Ð¾ Ð² Ð¶ÑÑÐ½Ð°Ð»Ðµ '%s'.\n" IDS_SUCCESS_2 "ÐÐ¿ÐµÑÐ°ÑÐ¸Ñ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð° ÑÑÐ¿ÐµÑÐ½Ð¾: ÑÐ¾Ð±ÑÑÐ¸Ðµ Ñ ÑÐ¸Ð¿Ð¾Ð¼ '%s' Ð±ÑÐ»Ð¾ ÑÑÐ¿ÐµÑÐ½Ð¾ ÑÐ¾Ð·Ð´Ð°Ð½Ð¾ Ñ Ð¸ÑÑÐ¾ÑÐ½Ð¸ÐºÐ¾Ð¼ '%s'.\n"

8 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2016