Ros-diffs

ros-diffs@reactos.org

81390 discussions

[aandrejevic] 68581: [NTVDM] - Combine free blocks after resizing. - Fix the LastParagraph value in the PSP.
by aandrejevic＠svn.reactos.org 29 Jul '15

29 Jul '15

Author: aandrejevic Date: Wed Jul 29 02:03:48 2015 New Revision: 68581 URL: http://svn.reactos.org/svn/reactos?rev=68581&view=rev Log: [NTVDM] - Combine free blocks after resizing. - Fix the LastParagraph value in the PSP. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c [iso-8859-1] Wed Jul 29 02:03:48 2015 @@ -292,7 +292,8 @@ NewSize); /* Just split the block */ - NextMcb = SEGMENT_TO_MCB(Segment + NewSize + 1); + NextSegment = Segment + NewSize + 1; + NextMcb = SEGMENT_TO_MCB(NextSegment); NextMcb->BlockType = Mcb->BlockType; NextMcb->Size = Mcb->Size - NewSize - 1; NextMcb->OwnerPsp = 0; @@ -300,6 +301,9 @@ /* Update the MCB */ Mcb->BlockType = 'M'; Mcb->Size = NewSize; + + /* Combine this free block with adjoining free blocks */ + DosCombineFreeBlocks(NextSegment); } Done: Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] Wed Jul 29 02:03:48 2015 @@ -198,7 +198,7 @@ PspBlock->Exit[1] = 0x20; /* Set the number of the last paragraph */ - PspBlock->LastParagraph = Segment + ProgramSize - 1; + PspBlock->LastParagraph = Segment + ProgramSize; /* Save the interrupt vectors */ PspBlock->TerminateAddress = IntVecTable[0x22];

1 0

[dquintana] 68580: [EXPLORER] * Rework the WIN7_COMPAT_MODE into actually just disabling the incompatible functions, and introduce WIN7_DEBUG_MODE which does the rest of the "hacks" I used to ease ...
by dquintana＠svn.reactos.org 29 Jul '15

29 Jul '15

Author: dquintana Date: Wed Jul 29 01:29:29 2015 New Revision: 68580 URL: http://svn.reactos.org/svn/reactos?rev=68580&view=rev Log: [EXPLORER] * Rework the WIN7_COMPAT_MODE into actually just disabling the incompatible functions, and introduce WIN7_DEBUG_MODE which does the rest of the "hacks" I used to ease development. Modified: trunk/reactos/base/shell/explorer/explorer.cpp trunk/reactos/base/shell/explorer/precomp.h trunk/reactos/base/shell/explorer/traywnd.cpp Modified: trunk/reactos/base/shell/explorer/explorer.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer.cpp [iso-8859-1] Wed Jul 29 01:29:29 2015 @@ -59,7 +59,7 @@ } } -#if !WIN7_COMPAT_MODE +#if !WIN7_DEBUG_MODE static BOOL SetShellReadyEvent(IN LPCTSTR lpEventName) { @@ -95,7 +95,9 @@ if (!SystemParametersInfo(SPI_SETMINIMIZEDMETRICS, sizeof(mm), &mm, 0)) ERR("SystemParametersInfo failed with %lu\n", GetLastError()); } - +#endif + +#if !WIN7_COMPAT_MODE static INT StartWithCommandLine(IN HINSTANCE hInstance) { @@ -140,9 +142,11 @@ InitCommonControls(); OleInitialize(NULL); +#if !WIN7_DEBUG_MODE + ProcessStartupItems(); +#endif + #if !WIN7_COMPAT_MODE - ProcessStartupItems(); - /* Initialize shell dde support */ _ShellDDEInit(TRUE); #endif @@ -156,7 +160,7 @@ CComPtr<ITrayWindow> Tray; CreateTrayWindow(&Tray); -#if !WIN7_COMPAT_MODE +#if !WIN7_DEBUG_MODE /* This not only hides the minimized window captions in the bottom left screen corner, but is also needed in order to receive HSHELL_* notification messages (which are required for taskbar @@ -175,12 +179,12 @@ if (Tray != NULL) { TrayMessageLoop(Tray); -#if !WIN7_COMPAT_MODE +#if !WIN7_DEBUG_MODE HideMinimizedWindows(FALSE); #endif } -#if !WIN7_COMPAT_MODE +#if !WIN7_DEBUG_MODE if (hShellDesktop != NULL) DesktopDestroyShellWindow(hShellDesktop); #endif @@ -201,17 +205,17 @@ IN LPTSTR lpCmdLine, IN INT nCmdShow) { -#if !WIN7_COMPAT_MODE - BOOL CreateShellDesktop = FALSE; - - TRACE("Explorer starting... Commandline: %S\n", lpCmdLine); - /* * Set our shutdown parameters: we want to shutdown the very last, * but before any TaskMgr instance (which has a shutdown level of 1). */ SetProcessShutdownParameters(2, 0); +#if !WIN7_COMPAT_MODE + BOOL CreateShellDesktop = FALSE; + + TRACE("Explorer starting... Commandline: %S\n", lpCmdLine); + if (GetShellWindow() == NULL) CreateShellDesktop = TRUE; Modified: trunk/reactos/base/shell/explorer/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/precom… ============================================================================== --- trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] Wed Jul 29 01:29:29 2015 @@ -2,6 +2,12 @@ #define _EXPLORER_PRECOMP__H_ #define WIN7_COMPAT_MODE 0 +#define WIN7_DEBUG_MODE 0 + +#if WIN7_DEBUG_MODE && !WIN7_COMPAT_MODE +#undef WIN7_COMPAT_MODE +#define WIN7_COMPAT_MODE 1 +#endif #include <stdio.h> #include <tchar.h> Modified: trunk/reactos/base/shell/explorer/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traywn… ============================================================================== --- trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] Wed Jul 29 01:29:29 2015 @@ -986,7 +986,7 @@ VOID ResizeWorkArea() { -#if !WIN7_COMPAT_MODE +#if !WIN7_DEBUG_MODE RECT rcTray, rcWorkArea; /* If monitor has changed then fix the previous monitors work area */ @@ -1098,7 +1098,7 @@ /* FIXME: Are there more flags? */ -#if WIN7_COMPAT_MODE +#if WIN7_DEBUG_MODE m_Position = ABE_LEFT; #else if (sr.Position > ABE_BOTTOM)

1 0

[ekohl] 68579: [PARPORT] Reduce the minimum I/O-Range size for parallel ports to 4. This fixes port detection on VMware. Found by Colin Finck.
by ekohl＠svn.reactos.org 26 Jul '15

26 Jul '15

Author: ekohl Date: Sun Jul 26 19:30:21 2015 New Revision: 68579 URL: http://svn.reactos.org/svn/reactos?rev=68579&view=rev Log: [PARPORT] Reduce the minimum I/O-Range size for parallel ports to 4. This fixes port detection on VMware. Found by Colin Finck. Modified: trunk/reactos/drivers/parallel/parport/fdo.c Modified: trunk/reactos/drivers/parallel/parport/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/parallel/parport/f… ============================================================================== --- trunk/reactos/drivers/parallel/parport/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/parallel/parport/fdo.c [iso-8859-1] Sun Jul 26 19:30:21 2015 @@ -161,7 +161,7 @@ if (DeviceExtension->BaseAddress == 0) { - if (PartialDescriptor->u.Port.Length < 8) + if (PartialDescriptor->u.Port.Length < 4) return STATUS_INSUFFICIENT_RESOURCES; DeviceExtension->BaseAddress = PartialDescriptor->u.Port.Start.u.LowPart;

1 0

[tfaber] 68578: [ROSAUTOTEST] - When directly submitting the results to the web service, make sure to URL-encode the test log, or & signs will terminate the log and make Testman see the test as cra...
by tfaber＠svn.reactos.org 26 Jul '15

26 Jul '15

Author: tfaber Date: Sun Jul 26 10:02:03 2015 New Revision: 68578 URL: http://svn.reactos.org/svn/reactos?rev=68578&view=rev Log: [ROSAUTOTEST] - When directly submitting the results to the web service, make sure to URL-encode the test log, or & signs will terminate the log and make Testman see the test as crashed (and have all other kinds of possible consequences) Modified: trunk/rostests/rosautotest/CWebService.cpp Modified: trunk/rostests/rosautotest/CWebService.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CWebService.c… ============================================================================== --- trunk/rostests/rosautotest/CWebService.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CWebService.cpp [iso-8859-1] Sun Jul 26 10:02:03 2015 @@ -234,7 +234,7 @@ Data += "&suiteid="; Data += SuiteID; Data += "&log="; - Data += TestInfo->Log; + Data += EscapeString(TestInfo->Log); Response.reset(DoRequest(Data));

1 0

[tfaber] 68577: [WS2_32_APITEST] - Apparently doesntexist.reactos.org... exists
by tfaber＠svn.reactos.org 26 Jul '15

26 Jul '15

Author: tfaber Date: Sun Jul 26 09:26:29 2015 New Revision: 68577 URL: http://svn.reactos.org/svn/reactos?rev=68577&view=rev Log: [WS2_32_APITEST] - Apparently doesntexist.reactos.org... exists Modified: trunk/rostests/apitests/ws2_32/getaddrinfo.c Modified: trunk/rostests/apitests/ws2_32/getaddrinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ws2_32/getaddrin… ============================================================================== --- trunk/rostests/apitests/ws2_32/getaddrinfo.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ws2_32/getaddrinfo.c [iso-8859-1] Sun Jul 26 09:26:29 2015 @@ -54,7 +54,7 @@ { { "", LocalAddress }, { " ", NULL }, - { "doesntexist.reactos.org", NULL }, + { "doesntexist.example.com", NULL }, { "localhost", "127.0.0.1" }, { "localhost:80", NULL }, { "7.8.9.10", "7.8.9.10", AI_NUMERICHOST },

1 0

[tfaber] 68576: [USER32_WINETEST] - Skip test_paintingloop instead of test_paint_messages? Grml ROSTESTS-18
by tfaber＠svn.reactos.org 26 Jul '15

26 Jul '15

Author: tfaber Date: Sun Jul 26 09:11:08 2015 New Revision: 68576 URL: http://svn.reactos.org/svn/reactos?rev=68576&view=rev Log: [USER32_WINETEST] - Skip test_paintingloop instead of test_paint_messages? Grml ROSTESTS-18 Modified: trunk/rostests/winetests/user32/msg.c Modified: trunk/rostests/winetests/user32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/msg.c?re… ============================================================================== --- trunk/rostests/winetests/user32/msg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/msg.c [iso-8859-1] Sun Jul 26 09:11:08 2015 @@ -15035,15 +15035,15 @@ { init_tests(); test_scrollwindowex(); + test_paint_messages(); #ifdef __REACTOS__ if (!winetest_interactive && !strcmp(winetest_platform, "windows")) { - skip("ROSTESTS-184: Skipping user3232_winetest:msg_paint test_paint_messages because it hangs on WHS-Testbot. Set winetest_interactive to run it anyway.\n"); + skip("ROSTESTS-185: Skipping user32_winetest:msg_paint test_paintingloop because it hangs on WHS-Testbot. Set winetest_interactive to run it anyway.\n"); } else #endif - test_paint_messages(); test_paintingloop(); cleanup_tests(); }

1 0

[tfaber] 68575: [USER32_WINETEST] - Skip user32:msg_paint test_paint_messages if running on Windows in non-interactive mode. This should allow WHS-Testbot to get a bit further ROSTESTS-185 ONLINE-4...
by tfaber＠svn.reactos.org 26 Jul '15

26 Jul '15

Author: tfaber Date: Sun Jul 26 08:41:13 2015 New Revision: 68575 URL: http://svn.reactos.org/svn/reactos?rev=68575&view=rev Log: [USER32_WINETEST] - Skip user32:msg_paint test_paint_messages if running on Windows in non-interactive mode. This should allow WHS-Testbot to get a bit further ROSTESTS-185 ONLINE-441 ROSTESTS-184 Modified: trunk/rostests/winetests/user32/msg.c Modified: trunk/rostests/winetests/user32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/msg.c?re… ============================================================================== --- trunk/rostests/winetests/user32/msg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/msg.c [iso-8859-1] Sun Jul 26 08:41:13 2015 @@ -15035,6 +15035,14 @@ { init_tests(); test_scrollwindowex(); +#ifdef __REACTOS__ + if (!winetest_interactive && + !strcmp(winetest_platform, "windows")) + { + skip("ROSTESTS-184: Skipping user3232_winetest:msg_paint test_paint_messages because it hangs on WHS-Testbot. Set winetest_interactive to run it anyway.\n"); + } + else +#endif test_paint_messages(); test_paintingloop(); cleanup_tests();

1 0

[tfaber] 68574: [KMTESTS:RTL] - Fix build CORE-9947
by tfaber＠svn.reactos.org 26 Jul '15

26 Jul '15

Author: tfaber Date: Sun Jul 26 08:05:07 2015 New Revision: 68574 URL: http://svn.reactos.org/svn/reactos?rev=68574&view=rev Log: [KMTESTS:RTL] - Fix build CORE-9947 Modified: trunk/rostests/kmtests/rtl/RtlIntSafe.c Modified: trunk/rostests/kmtests/rtl/RtlIntSafe.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/rtl/RtlIntSafe.c?… ============================================================================== --- trunk/rostests/kmtests/rtl/RtlIntSafe.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/rtl/RtlIntSafe.c [iso-8859-1] Sun Jul 26 08:05:07 2015 @@ -7,6 +7,7 @@ #define KMT_EMULATE_KERNEL #include <kmt_test.h> +#define ENABLE_INTSAFE_SIGNED_FUNCTIONS #include <ntintsafe.h> START_TEST(RtlIntSafe) @@ -18,6 +19,7 @@ UINT UIntResult; USHORT UShortResult; SHORT ShortResult; + LONGLONG LongLongResult; #define TEST_CONVERSION(FromName, FromType, ToName, ToType, Print, Value, Expected, ExpectedStatus) \ do \

1 0

[tfaber] 68573: [PSDK] - Add support for intsafe signed Add functions - Guard signed math in ENABLE_INTSAFE_SIGNED_FUNCTIONS CORE-9947 #resolve
by tfaber＠svn.reactos.org 26 Jul '15

26 Jul '15

Author: tfaber Date: Sun Jul 26 08:03:02 2015 New Revision: 68573 URL: http://svn.reactos.org/svn/reactos?rev=68573&view=rev Log: [PSDK] - Add support for intsafe signed Add functions - Guard signed math in ENABLE_INTSAFE_SIGNED_FUNCTIONS CORE-9947 #resolve Modified: trunk/reactos/include/psdk/intsafe.h trunk/rostests/kmtests/rtl/RtlIntSafe.c Modified: trunk/reactos/include/psdk/intsafe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intsafe.h?rev… ============================================================================== --- trunk/reactos/include/psdk/intsafe.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/intsafe.h [iso-8859-1] Sun Jul 26 08:03:02 2015 @@ -433,6 +433,7 @@ DEFINE_SAFE_CONVERT_STOS(LongPtrToInt, LONG_PTR, INT) DEFINE_SAFE_CONVERT_STOS(LongPtrToLong, LONG_PTR, LONG) DEFINE_SAFE_CONVERT_STOS(LongPtrToIntPtr, LONG_PTR, INT_PTR) +DEFINE_SAFE_CONVERT_STOS(LongLongToInt, LONGLONG, INT) DEFINE_SAFE_CONVERT_STOS(LongLongToLong, LONGLONG, LONG) DEFINE_SAFE_CONVERT_STOS(LongLongToIntPtr, LONGLONG, INT_PTR) DEFINE_SAFE_CONVERT_STOS(LongLongToLongPtr, LONGLONG, LONG_PTR) @@ -582,6 +583,55 @@ DEFINE_SAFE_SUB(SIZETSub, SIZE_T) DEFINE_SAFE_SUB(ULongLongSub, ULONGLONG) +#ifdef ENABLE_INTSAFE_SIGNED_FUNCTIONS +_Must_inspect_result_ +__forceinline +INTSAFE_RESULT +INTSAFE_NAME(LongLongAdd)( + _In_ LONGLONG Augend, + _In_ LONGLONG Addend, + _Out_ _Deref_out_range_(==, Augend + Addend) LONGLONG* pResult) +{ + LONGLONG Result = Augend + Addend; + + /* The only way the result can overflow, is when the sign of the augend + and the addend are the same. In that case the result is expected to + have the same sign as the two, otherwise it overflowed. + Sign equality is checked with a binary xor operation. */ + if ( ((Augend ^ Addend) >= 0) && ((Augend ^ Result) < 0) ) + { + *pResult = LONGLONG_ERROR; + return INTSAFE_E_ARITHMETIC_OVERFLOW; + } + else + { + *pResult = Result; + return INTSAFE_SUCCESS; + } +} + + +#define DEFINE_SAFE_ADD_S(_Name, _Type1, _Type2, _Convert) \ +C_ASSERT(sizeof(_Type2) > sizeof(_Type1)); \ +_Must_inspect_result_ \ +__forceinline \ +INTSAFE_RESULT \ +INTSAFE_NAME(_Name)( \ + _In_ _Type1 Augend, \ + _In_ _Type1 Addend, \ + _Out_ _Deref_out_range_(==, Augend + Addend) _Type1* pOutput) \ +{ \ + return INTSAFE_NAME(_Convert)(((_Type2)Augend) + ((_Type2)Addend), pOutput); \ +} + +DEFINE_SAFE_ADD_S(Int8Add, INT8, SHORT, ShortToInt8) +DEFINE_SAFE_ADD_S(ShortAdd, SHORT, INT, IntToShort) +DEFINE_SAFE_ADD_S(IntAdd, INT, LONGLONG, LongLongToInt) +DEFINE_SAFE_ADD_S(LongAdd, LONG, LONGLONG, LongLongToLong) +#ifndef _WIN64 +DEFINE_SAFE_ADD_S(IntPtrAdd, INT_PTR, LONGLONG, LongLongToIntPtr) +DEFINE_SAFE_ADD_S(LongPtrAdd, LONG_PTR, LONGLONG, LongLongToLongPtr) +#endif _Must_inspect_result_ __forceinline @@ -611,6 +661,7 @@ #define DEFINE_SAFE_SUB_S(_Name, _Type1, _Type2, _Convert) \ +C_ASSERT(sizeof(_Type2) > sizeof(_Type1)); \ _Must_inspect_result_ \ __forceinline \ INTSAFE_RESULT \ @@ -628,6 +679,7 @@ DEFINE_SAFE_SUB_S(LongPtrSub, LONG_PTR, LONGLONG, LongLongToLongPtr) #endif +#endif /* ENABLE_INTSAFE_SIGNED_FUNCTIONS */ _Must_inspect_result_ __forceinline @@ -741,6 +793,8 @@ #define RtlUInt16Mult RtlUShortMult #define RtlWordMult RtlUShortMult #ifdef _WIN64 +#define RtlIntPtrAdd RtlLongLongAdd +#define RtlLongPtrAdd RtlLongLongAdd #define RtlIntPtrSub RtlLongLongSub #define RtlLongPtrSub RtlLongLongSub #define RtlSizeTMult RtlULongLongMult @@ -769,6 +823,8 @@ #define UInt16Mult UShortMult #define WordMult UShortMult #ifdef _WIN64 +#define IntPtrAdd LongLongAdd +#define LongPtrAdd LongLongAdd #define IntPtrSub LongLongSub #define LongPtrSub LongLongSub #define SizeTMult ULongLongMult Modified: trunk/rostests/kmtests/rtl/RtlIntSafe.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/rtl/RtlIntSafe.c?… ============================================================================== --- trunk/rostests/kmtests/rtl/RtlIntSafe.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/rtl/RtlIntSafe.c [iso-8859-1] Sun Jul 26 08:03:02 2015 @@ -111,4 +111,36 @@ TEST_ADD(UInt8, UINT8, uint, UINT8_MAX - 1, 1, UINT8_MAX, STATUS_SUCCESS); TEST_ADD(UInt8, UINT8, uint, UINT8_MAX, 1, (UINT8)-1, STATUS_INTEGER_OVERFLOW); TEST_ADD(UInt8, UINT8, uint, UINT8_MAX, UINT8_MAX, (UINT8)-1, STATUS_INTEGER_OVERFLOW); + + TEST_ADD(Int8, INT8, int, 0, 0, 0, STATUS_SUCCESS); + TEST_ADD(Int8, INT8, int, 5, 5, 10, STATUS_SUCCESS); + TEST_ADD(Int8, INT8, int, 0, INT8_MAX, INT8_MAX, STATUS_SUCCESS); + TEST_ADD(Int8, INT8, int, INT8_MAX, 0, INT8_MAX, STATUS_SUCCESS); + TEST_ADD(Int8, INT8, int, INT8_MAX - 1, 1, INT8_MAX, STATUS_SUCCESS); + TEST_ADD(Int8, INT8, int, INT8_MAX, 1, (INT8)-1, STATUS_INTEGER_OVERFLOW); + TEST_ADD(Int8, INT8, int, INT8_MAX, INT8_MAX, (INT8)-1, STATUS_INTEGER_OVERFLOW); + TEST_ADD(Int8, INT8, int, 0, -1, -1, STATUS_SUCCESS); + TEST_ADD(Int8, INT8, int, -1, 0, -1, STATUS_SUCCESS); + TEST_ADD(Int8, INT8, int, 0, INT8_MIN, INT8_MIN, STATUS_SUCCESS); + TEST_ADD(Int8, INT8, int, INT8_MIN, 0, INT8_MIN, STATUS_SUCCESS); + TEST_ADD(Int8, INT8, int, INT8_MAX, INT8_MIN, (INT8)-1, STATUS_SUCCESS); + TEST_ADD(Int8, INT8, int, INT8_MIN, -1, (INT8)-1, STATUS_INTEGER_OVERFLOW); + TEST_ADD(Int8, INT8, int, INT8_MIN, INT8_MIN, (INT8)-1, STATUS_INTEGER_OVERFLOW); + + TEST_ADD(LongLong, LONGLONG, longlong, 0, 0, 0, STATUS_SUCCESS); + TEST_ADD(LongLong, LONGLONG, longlong, 5, 5, 10, STATUS_SUCCESS); + TEST_ADD(LongLong, LONGLONG, longlong, 0, LONGLONG_MAX, LONGLONG_MAX, STATUS_SUCCESS); + TEST_ADD(LongLong, LONGLONG, longlong, LONGLONG_MAX, 0, LONGLONG_MAX, STATUS_SUCCESS); + TEST_ADD(LongLong, LONGLONG, longlong, LONGLONG_MAX - 1, 1, LONGLONG_MAX, STATUS_SUCCESS); + TEST_ADD(LongLong, LONGLONG, longlong, LONGLONG_MAX, 1, (LONGLONG)-1, STATUS_INTEGER_OVERFLOW); + TEST_ADD(LongLong, LONGLONG, longlong, LONGLONG_MAX, INT8_MAX, (LONGLONG)-1, STATUS_INTEGER_OVERFLOW); + TEST_ADD(LongLong, LONGLONG, longlong, 0, -1, -1, STATUS_SUCCESS); + TEST_ADD(LongLong, LONGLONG, longlong, -1, 0, -1, STATUS_SUCCESS); + TEST_ADD(LongLong, LONGLONG, longlong, 0, LONGLONG_MIN, LONGLONG_MIN, STATUS_SUCCESS); + TEST_ADD(LongLong, LONGLONG, longlong, LONGLONG_MIN, 0, LONGLONG_MIN, STATUS_SUCCESS); + TEST_ADD(LongLong, LONGLONG, longlong, LONGLONG_MAX, LONGLONG_MIN, (LONGLONG)-1, STATUS_SUCCESS); + TEST_ADD(LongLong, LONGLONG, longlong, LONGLONG_MIN, -1, (LONGLONG)-1, STATUS_INTEGER_OVERFLOW); + TEST_ADD(LongLong, LONGLONG, longlong, LONGLONG_MIN, LONGLONG_MIN, (LONGLONG)-1, STATUS_INTEGER_OVERFLOW); + TEST_ADD(LongLong, LONGLONG, longlong, ULONG_MAX, 1, 0x100000000LL, STATUS_SUCCESS); + TEST_ADD(LongLong, LONGLONG, longlong, ULONG_MAX, ULONG_MAX, 0x1fffffffeLL, STATUS_SUCCESS); }

1 0

[tfaber] 68572: [PSDK] - intsafe: use the correct type to check overflow in DEFINE_SAFE_ADD CORE-9946 #resolve
by tfaber＠svn.reactos.org 26 Jul '15

26 Jul '15

Author: tfaber Date: Sun Jul 26 07:48:24 2015 New Revision: 68572 URL: http://svn.reactos.org/svn/reactos?rev=68572&view=rev Log: [PSDK] - intsafe: use the correct type to check overflow in DEFINE_SAFE_ADD CORE-9946 #resolve Modified: trunk/reactos/include/psdk/intsafe.h trunk/rostests/kmtests/rtl/RtlIntSafe.c Modified: trunk/reactos/include/psdk/intsafe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intsafe.h?rev… ============================================================================== --- trunk/reactos/include/psdk/intsafe.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/intsafe.h [iso-8859-1] Sun Jul 26 07:48:24 2015 @@ -526,7 +526,7 @@ _In_ _Type Addend, \ _Out_ _Deref_out_range_(==, Augend + Addend) _Type *pOutput) \ { \ - if ((Augend + Addend) >= Augend) \ + if ((_Type)(Augend + Addend) >= Augend) \ { \ *pOutput = Augend + Addend; \ return INTSAFE_SUCCESS; \ Modified: trunk/rostests/kmtests/rtl/RtlIntSafe.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/rtl/RtlIntSafe.c?… ============================================================================== --- trunk/rostests/kmtests/rtl/RtlIntSafe.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/rtl/RtlIntSafe.c [iso-8859-1] Sun Jul 26 07:48:24 2015 @@ -95,4 +95,20 @@ TEST_CONVERSION(Int, INT, Short, SHORT, int, SHORT_MIN, SHORT_MIN, STATUS_SUCCESS); TEST_CONVERSION(Int, INT, Short, SHORT, int, SHORT_MIN - 1, (SHORT)-1, STATUS_INTEGER_OVERFLOW); TEST_CONVERSION(Int, INT, Short, SHORT, int, INT_MIN, (SHORT)-1, STATUS_INTEGER_OVERFLOW); + +#define TEST_ADD(_Name, _Type, _Print, _Value1, _Value2, _Expected, _Status) do \ + { \ + _Name ## Result = (_Type)0xfedcba9876543210; \ + Status = Rtl ## _Name ## Add(_Value1, _Value2, & _Name ## Result); \ + ok_eq_hex(Status, _Status); \ + ok_eq_ ## _Print(_Name ## Result, _Expected); \ + } while (0) + + TEST_ADD(UInt8, UINT8, uint, 0, 0, 0, STATUS_SUCCESS); + TEST_ADD(UInt8, UINT8, uint, 5, 5, 10, STATUS_SUCCESS); + TEST_ADD(UInt8, UINT8, uint, 0, UINT8_MAX, UINT8_MAX, STATUS_SUCCESS); + TEST_ADD(UInt8, UINT8, uint, UINT8_MAX, 0, UINT8_MAX, STATUS_SUCCESS); + TEST_ADD(UInt8, UINT8, uint, UINT8_MAX - 1, 1, UINT8_MAX, STATUS_SUCCESS); + TEST_ADD(UInt8, UINT8, uint, UINT8_MAX, 1, (UINT8)-1, STATUS_INTEGER_OVERFLOW); + TEST_ADD(UInt8, UINT8, uint, UINT8_MAX, UINT8_MAX, (UINT8)-1, STATUS_INTEGER_OVERFLOW); }

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