Ros-diffs October 2014

ros-diffs@reactos.org

19 participants
730 discussions

[akhaldi] 64710: [CRT] * Update MSVCRT_I10_OUTPUT(). CORE-8540

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Oct 13 10:31:36 2014 New Revision: 64710 URL: http://svn.reactos.org/svn/reactos?rev=64710&view=rev Log: [CRT] * Update MSVCRT_I10_OUTPUT(). CORE-8540 Modified: trunk/reactos/lib/sdk/crt/misc/i10output.c Modified: trunk/reactos/lib/sdk/crt/misc/i10output.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/misc/i10output… ============================================================================== --- trunk/reactos/lib/sdk/crt/misc/i10output.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/misc/i10output.c [iso-8859-1] Mon Oct 13 10:31:36 2014 @@ -11,7 +11,7 @@ /********************************************************************* * $I10_OUTPUT (MSVCRT.@) - * ld - long double to be printed to data + * ld80 - long double (Intel 80 bit FP in 12 bytes) to be printed to data * prec - precision of part, we're interested in * flag - 0 for first prec digits, 1 for fractional part * data - data to be populated @@ -24,16 +24,22 @@ * Native sets last byte of data->str to '0' or '9', I don't know what * it means. Current implementation sets it always to '0'. */ -int CDECL MSVCRT_I10_OUTPUT(long double ld, int prec, int flag, struct _I10_OUTPUT_DATA *data) +int CDECL MSVCRT_I10_OUTPUT(_LDOUBLE ld80, int prec, int flag, struct _I10_OUTPUT_DATA *data) { static const char inf_str[] = "1#INF"; static const char nan_str[] = "1#QNAN"; - double d = ld; + /* MS' long double type wants 12 bytes for Intel's 80 bit FP format. + * Some UNIX have sizeof(long double) == 16, yet only 80 bit are used. + * Assume long double uses 80 bit FP, never seen 128 bit FP. */ + long double ld = 0; + double d; char format[8]; char buf[I10_OUTPUT_MAX_PREC+9]; /* 9 = strlen("0.e+0000") + '\0' */ char *p; + memcpy(&ld, &ld80, 10); + d = ld; TRACE("(%lf %d %x %p)\n", d, prec, flag, data); if(d<0) { @@ -59,7 +65,7 @@ } if(flag&1) { - int exp = (int)(1+floor(log10(d))); + int exp = 1+floor(log10(d)); prec += exp; if(exp < 0) @@ -83,7 +89,7 @@ data->pos++; for(p = buf+prec+1; p>buf+1 && *p=='0'; p--); - data->len = (BYTE)(p - buf); + data->len = p-buf; memcpy(data->str, buf+1, data->len); data->str[data->len] = '\0';

9 years, 11 months

[fireball] 64709: [ARWINSS] - Add missing EndTask() implementation.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Oct 13 10:27:27 2014 New Revision: 64709 URL: http://svn.reactos.org/svn/reactos?rev=64709&view=rev Log: [ARWINSS] - Add missing EndTask() implementation. Modified: branches/arwinss/arwinss/client/user32/user32.spec branches/arwinss/arwinss/client/user32/user_main.c Modified: branches/arwinss/arwinss/client/user32/user32.spec URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/u… ============================================================================== --- branches/arwinss/arwinss/client/user32/user32.spec [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/user32.spec [iso-8859-1] Mon Oct 13 10:27:27 2014 @@ -204,7 +204,7 @@ @ stdcall EndDialog(long long) @ stdcall EndMenu() @ stdcall EndPaint(long ptr) -@ stub EndTask +@ stdcall EndTask(ptr long long) @ stub EnterReaderModeHelper @ stdcall EnumChildWindows(long ptr long) @ stdcall EnumClipboardFormats(long) Modified: branches/arwinss/arwinss/client/user32/user_main.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/u… ============================================================================== --- branches/arwinss/arwinss/client/user32/user_main.c [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/user_main.c [iso-8859-1] Mon Oct 13 10:27:27 2014 @@ -378,4 +378,27 @@ { TRACE(": stub\n"); return TRUE; -} +} + +/* + * @implemented + */ +BOOL +WINAPI +EndTask( + HWND hWnd, + BOOL fShutDown, + BOOL fForce) +{ + SendMessageW(hWnd, WM_CLOSE, 0, 0); + + if (IsWindow(hWnd)) + { + if (fForce) + return DestroyWindow(hWnd); + else + return FALSE; + } + + return TRUE; +}

9 years, 11 months

[fireball] 64708: [ARWINSS] - Properly declare with FORCEINLINE (see r63152 by Pierre).

by fireball＠svn.reactos.org

Author: fireball Date: Mon Oct 13 10:24:08 2014 New Revision: 64708 URL: http://svn.reactos.org/svn/reactos?rev=64708&view=rev Log: [ARWINSS] - Properly declare with FORCEINLINE (see r63152 by Pierre). Modified: branches/arwinss/arwinss/server/include/gdiobj.h branches/arwinss/arwinss/server/include/gre.h branches/arwinss/arwinss/server/include/palobj.h branches/arwinss/arwinss/server/include/winesup.h Modified: branches/arwinss/arwinss/server/include/gdiobj.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/include/… ============================================================================== --- branches/arwinss/arwinss/server/include/gdiobj.h [iso-8859-1] (original) +++ branches/arwinss/arwinss/server/include/gdiobj.h [iso-8859-1] Mon Oct 13 10:24:08 2014 @@ -72,8 +72,8 @@ VOID FASTCALL GreDeleteObject(HGDIOBJ hBitmap); /* Inlines */ +FORCEINLINE ULONG -FORCEINLINE GDIOBJ_ShareUnlockObjByPtr(PBASEOBJECT Object) { HGDIOBJ hobj = Object->hHmgr; Modified: branches/arwinss/arwinss/server/include/gre.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/include/… ============================================================================== --- branches/arwinss/arwinss/server/include/gre.h [iso-8859-1] (original) +++ branches/arwinss/arwinss/server/include/gre.h [iso-8859-1] Mon Oct 13 10:24:08 2014 @@ -238,8 +238,8 @@ BOOLEAN NTAPI RECTL_bIntersectRect(RECTL* prclDst, const RECTL* prcl1, const RECTL* prcl2); -VOID FORCEINLINE +VOID RECTL_vSetRect(RECTL *prcl, LONG left, LONG top, LONG right, LONG bottom) { prcl->left = left; @@ -248,8 +248,8 @@ prcl->bottom = bottom; } -VOID FORCEINLINE +VOID RECTL_vSetEmptyRect(RECTL *prcl) { prcl->left = 0; @@ -258,8 +258,8 @@ prcl->bottom = 0; } -VOID FORCEINLINE +VOID RECTL_vOffsetRect(RECTL *prcl, INT cx, INT cy) { prcl->left += cx; @@ -268,15 +268,15 @@ prcl->bottom += cy; } +FORCEINLINE BOOL -FORCEINLINE RECTL_bIsEmptyRect(const RECTL *prcl) { return (prcl->left >= prcl->right || prcl->top >= prcl->bottom); } +FORCEINLINE BOOL -FORCEINLINE RECTL_bPointInRect(const RECTL *prcl, INT x, INT y) { return (x >= prcl->left && x <= prcl->right && Modified: branches/arwinss/arwinss/server/include/palobj.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/include/… ============================================================================== --- branches/arwinss/arwinss/server/include/palobj.h [iso-8859-1] (original) +++ branches/arwinss/arwinss/server/include/palobj.h [iso-8859-1] Mon Oct 13 10:24:08 2014 @@ -87,8 +87,8 @@ PPALETTEENTRY FASTCALL ReturnSystemPalette (VOID); HPALETTE FASTCALL GdiSelectPalette(HDC, HPALETTE, BOOL); +FORCEINLINE ULONG -FORCEINLINE CalculateShift(ULONG ulMask1, ULONG ulMask2) { ULONG ulShift1, ulShift2; Modified: branches/arwinss/arwinss/server/include/winesup.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/include/… ============================================================================== --- branches/arwinss/arwinss/server/include/winesup.h [iso-8859-1] (original) +++ branches/arwinss/arwinss/server/include/winesup.h [iso-8859-1] Mon Oct 13 10:24:08 2014 @@ -133,7 +133,8 @@ void remove_timeout_user( struct timeout_user *user ); struct timeout_user *add_timeout_user( timeout_t when, timeout_callback func, void *private ); -VOID FORCEINLINE +FORCEINLINE +VOID get_current_time(timeout_t *value) { LARGE_INTEGER time;

9 years, 11 months

[fireball] 64707: [ARWINSS] - Comment out broken precompiled header directives.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Oct 13 10:19:18 2014 New Revision: 64707 URL: http://svn.reactos.org/svn/reactos?rev=64707&view=rev Log: [ARWINSS] - Comment out broken precompiled header directives. Modified: branches/arwinss/arwinss/client/user32/CMakeLists.txt branches/arwinss/arwinss/server/CMakeLists.txt Modified: branches/arwinss/arwinss/client/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/client/user32/C… ============================================================================== --- branches/arwinss/arwinss/client/user32/CMakeLists.txt [iso-8859-1] (original) +++ branches/arwinss/arwinss/client/user32/CMakeLists.txt [iso-8859-1] Mon Oct 13 10:19:18 2014 @@ -73,6 +73,6 @@ add_delay_importlibs(user32 imm32 usp10) add_importlibs(user32 gdi32 advapi32 version msvcrt kernel32 ntdll) -add_pch(user32 include/user32.h SOURCE) +#add_pch(user32 include/user32.h SOURCE) add_cd_file(TARGET user32 DESTINATION reactos/system32 FOR all) Modified: branches/arwinss/arwinss/server/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/arwinss/arwinss/server/CMakeLis… ============================================================================== --- branches/arwinss/arwinss/server/CMakeLists.txt [iso-8859-1] (original) +++ branches/arwinss/arwinss/server/CMakeLists.txt [iso-8859-1] Mon Oct 13 10:19:18 2014 @@ -140,7 +140,7 @@ libcntpr) add_importlibs(win32k ntoskrnl hal) -add_pch(win32k pch.h SOURCE) +#add_pch(win32k pch.h SOURCE) add_cd_file(TARGET win32k DESTINATION reactos/system32 FOR all) set_source_files_properties(sys-stubs.S PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/w32ksvc.h)

9 years, 11 months

[tfaber] 64706: [USER32_APITEST] - Extend GetUserObjectInformation test to include the ansi version. ... this is the lazy way and just duplicates the code, feel free to make it more concise. CORE-8101

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Oct 13 09:22:59 2014 New Revision: 64706 URL: http://svn.reactos.org/svn/reactos?rev=64706&view=rev Log: [USER32_APITEST] - Extend GetUserObjectInformation test to include the ansi version. ... this is the lazy way and just duplicates the code, feel free to make it more concise. CORE-8101 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] Mon Oct 13 09:22:59 2014 @@ -76,6 +76,8 @@ ok(Status == STATUS_SUCCESS, "Status = %lx\n", Status); } +#define xok ok // Make the test succeed on Win2003 +//#define xok(...) // This should make the test succeed on all Windows versions #define NOTSET 1234 #define TestUserObjectInfo(Handle, Index, Buffer, Length, Ret, Error, LengthNeeded) do \ @@ -89,14 +91,14 @@ _Ret = GetUserObjectInformationW(Handle, Index, Buffer, Length, NULL); \ _Error = GetLastError(); \ ok(_Ret == (Ret), "Ret = %d\n", _Ret); \ - ok(_Error == (Error), "Error = %lu\n", _Error); \ + xok(_Error == (Error), "Error = %lu\n", _Error); \ \ SetLastError(0xdeadbeef); \ _Ret = GetUserObjectInformationW(Handle, Index, Buffer, Length, &_LengthNeeded);\ _Error = GetLastError(); \ ok(_Ret == (Ret), "Ret = %d\n", _Ret); \ - ok(_Error == (Error), "Error = %lu\n", _Error); \ - ok(_LengthNeeded == (LengthNeeded), "LengthNeeded = %lu\n", _LengthNeeded); \ + xok(_Error == (Error), "Error = %lu\n", _Error); \ + xok(_LengthNeeded == (LengthNeeded), "LengthNeeded = %lu\n", _LengthNeeded); \ \ SetLastError(0xdeadbeef); \ *(PDWORD)&_LengthBuffer[1] = NOTSET; \ @@ -104,9 +106,9 @@ (PDWORD)&_LengthBuffer[1]); \ _Error = GetLastError(); \ ok(_Ret == (Ret), "Ret = %d\n", _Ret); \ - ok(_Error == (Error), "Error = %lu\n", _Error); \ + xok(_Error == (Error), "Error = %lu\n", _Error); \ _LengthNeeded = *(PDWORD)&_LengthBuffer[1]; \ - ok(_LengthNeeded == (LengthNeeded), "LengthNeeded = %lu\n", _LengthNeeded); \ + xok(_LengthNeeded == (LengthNeeded), "LengthNeeded = %lu\n", _LengthNeeded); \ \ SetLastError(0xdeadbeef); \ _Ret = GetUserObjectInformationW(Handle, Index, Buffer, Length, (PVOID)-4); \ @@ -115,7 +117,9 @@ ok(_Error == ERROR_NOACCESS, "Error = %lu\n", _Error); \ } while (0) -START_TEST(GetUserObjectInformation) +static +void +TestGetUserObjectInfoW(void) { USEROBJECTFLAGS UserObjectFlags; PWCHAR Buffer; @@ -183,3 +187,118 @@ TestUserObjectInfo(Desktop, UOI_TYPE, Buffer, BufferSize + 1, FALSE, ERROR_NOACCESS, NOTSET); FreeGuarded(Buffer); } + +#undef TestUserObjectInfo +#define TestUserObjectInfo(Handle, Index, Buffer, Length, Ret, Error, LengthNeeded) do \ + { \ + DWORD _LengthNeeded = NOTSET; \ + DECLSPEC_ALIGN(16) CHAR _LengthBuffer[2 * sizeof(DWORD)]; \ + DWORD _Error; \ + BOOL _Ret; \ + \ + SetLastError(0xdeadbeef); \ + _Ret = GetUserObjectInformationA(Handle, Index, Buffer, Length, NULL); \ + _Error = GetLastError(); \ + ok(_Ret == (Ret), "Ret = %d\n", _Ret); \ + xok(_Error == (Error), "Error = %lu\n", _Error); \ + \ + SetLastError(0xdeadbeef); \ + _Ret = GetUserObjectInformationA(Handle, Index, Buffer, Length, &_LengthNeeded);\ + _Error = GetLastError(); \ + ok(_Ret == (Ret), "Ret = %d\n", _Ret); \ + xok(_Error == (Error), "Error = %lu\n", _Error); \ + xok(_LengthNeeded == (LengthNeeded), "LengthNeeded = %lu\n", _LengthNeeded); \ + \ + SetLastError(0xdeadbeef); \ + *(PDWORD)&_LengthBuffer[1] = NOTSET; \ + _Ret = GetUserObjectInformationA(Handle, Index, Buffer, Length, \ + (PDWORD)&_LengthBuffer[1]); \ + _Error = GetLastError(); \ + ok(_Ret == (Ret), "Ret = %d\n", _Ret); \ + xok(_Error == (Error), "Error = %lu\n", _Error); \ + _LengthNeeded = *(PDWORD)&_LengthBuffer[1]; \ + xok(_LengthNeeded == (LengthNeeded), "LengthNeeded = %lu\n", _LengthNeeded); \ + \ + SetLastError(0xdeadbeef); \ + _Ret = GetUserObjectInformationA(Handle, Index, Buffer, Length, (PVOID)-4); \ + _Error = GetLastError(); \ + ok(_Ret == FALSE, "Ret = %d\n", _Ret); \ + ok(_Error == ERROR_NOACCESS, "Error = %lu\n", _Error); \ + } while (0) + +static +void +TestGetUserObjectInfoA(void) +{ + USEROBJECTFLAGS UserObjectFlags; + PCHAR Buffer; + ULONG BufferSize = 64; + HDESK Desktop; + BOOLEAN Check; + + Buffer = AllocateGuarded(BufferSize); + + TestUserObjectInfo(NULL, 5, NULL, 0, FALSE, ERROR_INVALID_HANDLE, 0); + TestUserObjectInfo(NULL, UOI_FLAGS, NULL, 0, FALSE, ERROR_INVALID_HANDLE, 0); + TestUserObjectInfo(NULL, UOI_FLAGS, (PVOID)1, 0, FALSE, ERROR_INVALID_HANDLE, 0); + TestUserObjectInfo(NULL, UOI_FLAGS, NULL, 1, FALSE, ERROR_NOACCESS, NOTSET); + TestUserObjectInfo(NULL, UOI_FLAGS, (PVOID)1, 1, FALSE, ERROR_NOACCESS, NOTSET); + TestUserObjectInfo(NULL, UOI_FLAGS, &UserObjectFlags, sizeof(UserObjectFlags), FALSE, ERROR_INVALID_HANDLE, 0); + + TestUserObjectInfo(NULL, UOI_TYPE, NULL, 0, FALSE, ERROR_INVALID_HANDLE, 0); + TestUserObjectInfo(NULL, UOI_TYPE, (PVOID)1, 0, FALSE, ERROR_INVALID_HANDLE, 0); + TestUserObjectInfo(NULL, UOI_TYPE, NULL, 1, FALSE, ERROR_INVALID_HANDLE, 0); + TestUserObjectInfo(NULL, UOI_TYPE, (PVOID)1, 1, FALSE, ERROR_INVALID_HANDLE, 0); + TestUserObjectInfo(NULL, UOI_TYPE, Buffer, BufferSize, FALSE, ERROR_INVALID_HANDLE, 0); + + Desktop = GetThreadDesktop(GetCurrentThreadId()); + if (!Desktop) + { + skip("Failed to get desktop handle\n"); + return; + } + + TestUserObjectInfo(Desktop, 5, NULL, 0, FALSE, ERROR_INVALID_PARAMETER, 0); + TestUserObjectInfo(Desktop, UOI_FLAGS, NULL, 0, FALSE, ERROR_INSUFFICIENT_BUFFER, sizeof(USEROBJECTFLAGS)); + TestUserObjectInfo(Desktop, UOI_FLAGS, (PVOID)1, 0, FALSE, ERROR_INSUFFICIENT_BUFFER, sizeof(USEROBJECTFLAGS)); + TestUserObjectInfo(Desktop, UOI_FLAGS, NULL, 1, FALSE, ERROR_NOACCESS, NOTSET); + 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"); + + FreeGuarded(Buffer); + + BufferSize = sizeof("Desktop"); + Buffer = AllocateGuarded(BufferSize); + TestUserObjectInfo(Desktop, UOI_TYPE, Buffer, BufferSize, TRUE, 0xdeadbeef, sizeof("Desktop")); + TestUserObjectInfo(Desktop, UOI_TYPE, Buffer, BufferSize + 1, TRUE, 0xdeadbeef, sizeof("Desktop")); + FreeGuarded(Buffer); +} + +START_TEST(GetUserObjectInformation) +{ + TestGetUserObjectInfoW(); + TestGetUserObjectInfoA(); +}

9 years, 11 months

[tfaber] 64705: [USER32] - Correctly treat lpnLengthNeeded as optional in GetUserObjectInformationA. Fixes crash in user32_winetest:winstation CORE-8101 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon Oct 13 09:18:46 2014 New Revision: 64705 URL: http://svn.reactos.org/svn/reactos?rev=64705&view=rev Log: [USER32] - Correctly treat lpnLengthNeeded as optional in GetUserObjectInformationA. Fixes crash in user32_winetest:winstation CORE-8101 #resolve Modified: trunk/reactos/win32ss/user/user32/misc/object.c Modified: trunk/reactos/win32ss/user/user32/misc/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/o… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/object.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/object.c [iso-8859-1] Mon Oct 13 09:18:46 2014 @@ -73,7 +73,8 @@ if (LengthNeeded != 0) { - *lpnLengthNeeded = LengthNeeded; + if (lpnLengthNeeded) + *lpnLengthNeeded = LengthNeeded; ret = TRUE; } }

9 years, 11 months

[akhaldi] 64704: [CMAKE/MSVC] * Introduce support for for MSVC native run-time checks. Set RUNTIME_CHECKS to TRUE to enable it. * Dedicated to Christoph von Wittich and all ReactOS devs that use MS...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Oct 12 22:59:32 2014 New Revision: 64704 URL: http://svn.reactos.org/svn/reactos?rev=64704&view=rev Log: [CMAKE/MSVC] * Introduce support for for MSVC native run-time checks. Set RUNTIME_CHECKS to TRUE to enable it. * Dedicated to Christoph von Wittich and all ReactOS devs that use MSVC builds ;) CORE-8626 Modified: trunk/reactos/cmake/CMakeMacros.cmake trunk/reactos/cmake/msvc.cmake trunk/reactos/dll/win32/kernel32/CMakeLists.txt trunk/reactos/lib/pseh/i386/seh.s trunk/reactos/lib/sdk/crt/except/i386/seh.s trunk/reactos/lib/sdk/crt/startup/gs_support.c trunk/reactos/lib/sdk/crt/startup/mscmain.c Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Sun Oct 12 22:59:32 2014 @@ -502,6 +502,14 @@ if("${LIB}" MATCHES "msvcrt") add_target_compile_definitions(${_module} _DLL __USE_CRTIMP) target_link_libraries(${_module} msvcrtex) + if(MSVC) + if(RUNTIME_CHECKS) + if(NOT ${_module} STREQUAL "kernel32") + add_target_compile_flags(${_module} "/RTC1") + target_link_libraries(${_module} RunTmChk.lib) + endif() + endif() + endif() endif() target_link_libraries(${_module} lib${LIB}) add_dependencies(${_module} lib${LIB}) Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=64704… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Sun Oct 12 22:59:32 2014 @@ -80,6 +80,14 @@ if(NOT DEFINED USE_FOLDER_STRUCTURE) set(USE_FOLDER_STRUCTURE FALSE) endif() +endif() + +if(NOT DEFINED RUNTIME_CHECKS) + set(RUNTIME_CHECKS FALSE) +endif() + +if(RUNTIME_CHECKS) + add_definitions(-D__RUNTIME_CHECKS__) endif() set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO /INCREMENTAL:NO /SAFESEH:NO /NODEFAULTLIB /RELEASE") Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Sun Oct 12 22:59:32 2014 @@ -107,6 +107,10 @@ target_link_libraries(kernel32 wine chkstk ${PSEH_LIB}) +if(RUNTIME_CHECKS) + target_link_libraries(kernel32 RunTmChk.lib) +endif() + add_importlibs(kernel32 ntdll) add_pch(kernel32 k32.h SOURCE) add_dependencies(kernel32 psdk errcodes asm) Modified: trunk/reactos/lib/pseh/i386/seh.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/i386/seh.s?rev=64… ============================================================================== --- trunk/reactos/lib/pseh/i386/seh.s [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/i386/seh.s [iso-8859-1] Sun Oct 12 22:59:32 2014 @@ -22,9 +22,12 @@ /* GLOBALS *******************************************************************/ +#ifndef __RUNTIME_CHECKS__ PUBLIC __global_unwind2 PUBLIC __local_unwind2 PUBLIC __abnormal_termination +#endif + PUBLIC __except_handler2 PUBLIC __except_handler3 Modified: trunk/reactos/lib/sdk/crt/except/i386/seh.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/i386/se… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/i386/seh.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/i386/seh.s [iso-8859-1] Sun Oct 12 22:59:32 2014 @@ -25,8 +25,11 @@ PUBLIC __global_unwind2 PUBLIC __local_unwind2 PUBLIC __abnormal_termination + +#if !defined(__RUNTIME_CHECKS__) || (defined(__RUNTIME_CHECKS__) && !defined(_LIBCNT_)) PUBLIC __except_handler2 PUBLIC __except_handler3 +#endif /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/lib/sdk/crt/startup/gs_support.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/gs_sup… ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/gs_support.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/startup/gs_support.c [iso-8859-1] Sun Oct 12 22:59:32 2014 @@ -102,6 +102,7 @@ __declspec(noreturn) void __cdecl __report_gsfailure (ULONG_PTR); +#ifndef _MSC_VER __declspec(noreturn) void __cdecl __report_gsfailure (ULONG_PTR StackCookie) { @@ -147,4 +148,4 @@ TerminateProcess (GetCurrentProcess (), STATUS_STACK_BUFFER_OVERRUN); abort(); } - +#endif /* !_MSC_VER */ Modified: trunk/reactos/lib/sdk/crt/startup/mscmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/mscmai… ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/mscmain.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/startup/mscmain.c [iso-8859-1] Sun Oct 12 22:59:32 2014 @@ -36,6 +36,18 @@ return TRUE; } +void Catch_RTC_Failure(int errType, const wchar_t *file, int line, + const wchar_t *module, const wchar_t *format, ...) +{ + /* FIXME: better failure routine */ + __debugbreak(); +} + +void* __cdecl _CRT_RTC_INITW(void *res0, void **res1, int res2, int res3, int res4) +{ + return &Catch_RTC_Failure; +} + static int initialized = 0; void

9 years, 11 months

[akhaldi] 64703: [CMAKE] * Module type win32dll ENTRYPOINT 0 => module.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Oct 12 22:28:39 2014 New Revision: 64703 URL: http://svn.reactos.org/svn/reactos?rev=64703&view=rev Log: [CMAKE] * Module type win32dll ENTRYPOINT 0 => module. Modified: trunk/rostests/tests/dllexport/CMakeLists.txt Modified: trunk/rostests/tests/dllexport/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/dllexport/CMakeList… ============================================================================== --- trunk/rostests/tests/dllexport/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/tests/dllexport/CMakeLists.txt [iso-8859-1] Sun Oct 12 22:28:39 2014 @@ -6,14 +6,14 @@ add_library(dllexport_test_dll1 SHARED dllexport_test_dll1.c ${CMAKE_CURRENT_BINARY_DIR}/dllexport_test_dll1.def) -set_module_type(dllexport_test_dll1 win32dll ENTRYPOINT 0) +set_module_type(dllexport_test_dll1 module) add_importlibs(dllexport_test_dll1 dllexport_test_dll2) set(baseaddress_dllexport_test_dll2 0x2000000) add_library(dllexport_test_dll2 SHARED dllexport_test_dll2.c ${CMAKE_CURRENT_BINARY_DIR}/dllexport_test_dll2.def) -set_module_type(dllexport_test_dll2 win32dll ENTRYPOINT 0) +set_module_type(dllexport_test_dll2 module) add_executable(dllexport_test dllexport_test.c) @@ -27,7 +27,7 @@ add_library(dllimport_test SHARED dllimport_framedyn.cpp) -set_module_type(dllimport_test win32dll ENTRYPOINT 0) +set_module_type(dllimport_test module) add_importlibs(dllimport_test framedyn) if(NOT MSVC) target_link_libraries(dllimport_test framedynex)

9 years, 11 months

[tfaber] 64702: [RTL] - Allow the thread that called LdrShutdownProcess to forcefully acquire critical sections (the loader lock in particular). This fixes the race condition where ExitProcess migh...

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Oct 12 20:45:32 2014 New Revision: 64702 URL: http://svn.reactos.org/svn/reactos?rev=64702&view=rev Log: [RTL] - Allow the thread that called LdrShutdownProcess to forcefully acquire critical sections (the loader lock in particular). This fixes the race condition where ExitProcess might terminate a thread holding the loader lock and subsequently call LdrShutdownProcess. That would then result in a deadlock because LdrShutdownProcess cannot acquire the loader lock. This is a pretty ugly hack... but at least Windows does it the same way. Fixes hangs after the summary line when running mshtml tests. CORE-8624 #resolve Modified: trunk/reactos/lib/rtl/critical.c Modified: trunk/reactos/lib/rtl/critical.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/critical.c?rev=647… ============================================================================== --- trunk/reactos/lib/rtl/critical.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/critical.c [iso-8859-1] Sun Oct 12 20:45:32 2014 @@ -23,6 +23,9 @@ static BOOLEAN RtlpDebugInfoFreeList[MAX_STATIC_CS_DEBUG_OBJECTS]; LARGE_INTEGER RtlpTimeout; +extern BOOLEAN LdrpShutdownInProgress; +extern HANDLE LdrpShutdownThreadId; + /* FUNCTIONS *****************************************************************/ /*++ @@ -124,6 +127,18 @@ if (CriticalSection->DebugInfo) CriticalSection->DebugInfo->EntryCount++; + + /* + * If we're shutting down the process, we're allowed to acquire any + * critical sections by force (the loader lock in particular) + */ + if (LdrpShutdownInProgress && + LdrpShutdownThreadId == NtCurrentTeb()->RealClientId.UniqueThread) + { + DPRINT("Forcing ownership of critical section %p\n", CriticalSection); + CriticalSection->LockCount = 0; + return STATUS_SUCCESS; + } for (;;) {

9 years, 11 months

[hbelusca] 64701: [NTVDM] - Move the stack frame indices to where they belong (this is the stack layout when an interrupt is called). - In the bootstrap interrupt, modify the CS:IP stored in the st...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Oct 12 17:23:20 2014 New Revision: 64701 URL: http://svn.reactos.org/svn/reactos?rev=64701&view=rev Log: [NTVDM] - Move the stack frame indices to where they belong (this is the stack layout when an interrupt is called). - In the bootstrap interrupt, modify the CS:IP stored in the stack instead of the current CS:IP of the CPU, so that we can clean up everything and the interrupt return correctly, instead of breaking everything... (some apps wouldn't start with the original code^^). This is an addendum/fix to revision 64521. Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c trunk/reactos/subsystems/ntvdm/cpu/callback.h trunk/reactos/subsystems/ntvdm/int32.h Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/bios32/bios32.c [iso-8859-1] Sun Oct 12 17:23:20 2014 @@ -295,9 +295,18 @@ /* Load DOS */ DosBootsectorInitialize(); - /* Position CPU to 0000:7C00 to boot the OS */ - setCS(0x0000); - setIP(0x7C00); + + /* + * Position CPU to 0000:7C00 to boot the OS. + * + * Since we are called via the INT32 mechanism, we need to correctly set + * CS:IP, not by changing the current one (otherwise the interrupt could + * not be clean up and return properly), but by changing the CS:IP in the + * stack, so that when the interrupt returns, the modified CS:IP is popped + * off the stack and the CPU is correctly repositioned. + */ + Stack[STACK_CS] = 0x0000; + Stack[STACK_IP] = 0x7C00; DPRINT1("<-- BiosBootstrapLoader\n"); } Modified: trunk/reactos/subsystems/ntvdm/cpu/callback.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/cpu/callb… ============================================================================== --- trunk/reactos/subsystems/ntvdm/cpu/callback.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/cpu/callback.h [iso-8859-1] Sun Oct 12 17:23:20 2014 @@ -29,16 +29,6 @@ USHORT NextOffset; } CALLBACK16, *PCALLBACK16; -// -// WARNING WARNING!! -// If you're changing the indices here, you then need to -// also fix the BOP code in callback.c !!!!!!!!!!!!!!!!! -// -#define STACK_INT_NUM 0 -#define STACK_IP 1 -#define STACK_CS 2 -#define STACK_FLAGS 3 - /* FUNCTIONS ******************************************************************/ VOID Modified: trunk/reactos/subsystems/ntvdm/int32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/int32.h?r… ============================================================================== --- trunk/reactos/subsystems/ntvdm/int32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/int32.h [iso-8859-1] Sun Oct 12 17:23:20 2014 @@ -18,6 +18,21 @@ /* 32-bit Interrupt Identifiers */ #define EMULATOR_MAX_INT32_NUM 0xFF + 1 + + +// +// WARNING WARNING!! +// If you're changing the stack indices here, you then need +// to also fix the Int16To32 handler code in int32.c !! +// + +// Custom variable pushed onto the stack for INT32 interrupts +#define STACK_INT_NUM 0 + +// This is the standard stack layout for an interrupt +#define STACK_IP 1 +#define STACK_CS 2 +#define STACK_FLAGS 3 extern const ULONG Int16To32StubSize;

9 years, 11 months

← Newer
1
...
43
44
45
46
47
48
49
...
73
Older →

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 2014