Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jgardou] 60999: [WIN32SS] - Fix an assert in new cursoricon implementation - Fix CreateIconIndirect behaviour regarding bits per pixel and bitmap dimensions - Fix LookupIconIdFromDirectoryEx behav...
by jgardou＠svn.reactos.org 15 Nov '13

15 Nov '13

Author: jgardou Date: Fri Nov 15 17:34:13 2013 New Revision: 60999 URL: http://svn.reactos.org/svn/reactos?rev=60999&view=rev Log: [WIN32SS] - Fix an assert in new cursoricon implementation - Fix CreateIconIndirect behaviour regarding bits per pixel and bitmap dimensions - Fix LookupIconIdFromDirectoryEx behaviour to fulfill last commited tests CORE-7575 #comment LookupIconDirectoryEx and CreateIconIndirect now works as per tests Modified: trunk/reactos/win32ss/user/ntuser/cursoricon_new.c trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c Modified: trunk/reactos/win32ss/user/ntuser/cursoricon_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/cursor… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/cursoricon_new.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/cursoricon_new.c [iso-8859-1] Fri Nov 15 17:34:13 2013 @@ -25,7 +25,7 @@ SYSTEM_CURSORINFO gSysCursorInfo; BOOL -InitCursorImpl() +InitCursorImpl(VOID) { gSysCursorInfo.Enabled = FALSE; gSysCursorInfo.ButtonsDown = 0; @@ -154,7 +154,8 @@ { if(CurIcon->CURSORF_flags & CURSORF_CURRENT) { - /* Mark the object as destroyed, and fail, as per wine tests */ + /* Mark the object as destroyed, and fail, as per tests */ + TRACE("Cursor is current, marking as destroyed.\n"); UserDeleteObject(CurIcon->head.h, TYPE_CURSOR); return FALSE; } @@ -238,7 +239,9 @@ { CurIcon = Win32Process->pCursorCache; Win32Process->pCursorCache = CurIcon->pcurNext; - ASSERT(CurIcon->head.cLockObj == 2); + /* One ref for the handle, one for the list, + * and potentially one from an other process via SetCursor */ + ASSERT(CurIcon->head.cLockObj <= 3); IntDestroyCurIconObject(CurIcon, TRUE); } } @@ -1004,8 +1007,8 @@ if(IsShared) { /* Update process cache in case of shared cursor */ + PPROCESSINFO ppi = CurIcon->head.ppi; UserReferenceObject(CurIcon); - PPROCESSINFO ppi = CurIcon->head.ppi; CurIcon->pcurNext = ppi->pCursorCache; ppi->pCursorCache = CurIcon; } @@ -1038,7 +1041,7 @@ UserDereferenceObject(CurIcon); TRACE("Leave NtUserSetCursorIconData, ret=%i\n",Ret); UserLeave(); - + return Ret; } Modified: trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/cursoricon_new.c [iso-8859-1] Fri Nov 15 17:34:13 2013 @@ -173,6 +173,52 @@ } ERR("(%d): unknown/wrong size for header\n", header->biSize ); return -1; +} + +/* copy an icon bitmap, even when it can't be selected into a DC */ +/* helper for CreateIconIndirect */ +static void stretch_blt_icon(HDC hdc_dst, int dst_width, int dst_height, HBITMAP src) +{ + HDC hdc = CreateCompatibleDC( 0 ); + BITMAP bm; + HBITMAP hbmpPrev; + + GetObjectW(src, sizeof(bm), &bm); + + hbmpPrev = SelectObject(hdc, src); + + if (!hbmpPrev) /* do it the hard way */ + { + BITMAPINFO *info; + void *bits; + + if (!(info = HeapAlloc( GetProcessHeap(), 0, FIELD_OFFSET( BITMAPINFO, bmiColors[256] )))) return; + info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + info->bmiHeader.biWidth = bm.bmWidth; + info->bmiHeader.biHeight = bm.bmHeight; + info->bmiHeader.biPlanes = GetDeviceCaps( hdc_dst, PLANES ); + info->bmiHeader.biBitCount = GetDeviceCaps( hdc_dst, BITSPIXEL ); + info->bmiHeader.biCompression = BI_RGB; + info->bmiHeader.biSizeImage = get_dib_image_size( bm.bmWidth, bm.bmHeight, info->bmiHeader.biBitCount ); + info->bmiHeader.biXPelsPerMeter = 0; + info->bmiHeader.biYPelsPerMeter = 0; + info->bmiHeader.biClrUsed = 0; + info->bmiHeader.biClrImportant = 0; + bits = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ); + if (bits && GetDIBits( hdc, src, 0, bm.bmHeight, bits, info, DIB_RGB_COLORS )) + StretchDIBits( hdc_dst, 0, 0, dst_width, dst_height, + 0, 0, bm.bmWidth, bm.bmHeight, bits, info, DIB_RGB_COLORS, SRCCOPY ); + + HeapFree( GetProcessHeap(), 0, bits ); + HeapFree( GetProcessHeap(), 0, info ); + } + else + { + StretchBlt( hdc_dst, 0, 0, dst_width, dst_height, hdc, 0, 0, bm.bmWidth, bm.bmHeight, SRCCOPY ); + SelectObject(hdc, hbmpPrev); + } + + DeleteDC( hdc ); } /*********************************************************************** @@ -576,12 +622,41 @@ BITMAP bm; ZeroMemory(pCursorData, sizeof(*pCursorData)); - /* Use the CopyImage function, as it will gracefully convert our bitmap to the screen bit depth */ if(pIconInfo->hbmColor) { - pCursorData->hbmColor = CopyImage(pIconInfo->hbmColor, IMAGE_BITMAP, 0, 0, 0); - if(!pCursorData->hbmColor) + /* We must convert the color bitmap to screen format */ + HDC hdcScreen, hdcMem; + HBITMAP hbmpPrev; + + /* The mask dictates its dimensions */ + if (!GetObject(pIconInfo->hbmMask, sizeof(bm), &bm)) return FALSE; + hdcScreen = CreateDCW(DISPLAYW, NULL, NULL, NULL); + if(!hdcScreen) + return FALSE; + hdcMem = CreateCompatibleDC(hdcScreen); + if(!hdcMem) + { + DeleteDC(hdcScreen); + return FALSE; + } + pCursorData->hbmColor = CreateCompatibleBitmap(hdcScreen, bm.bmWidth, bm.bmHeight); + DeleteDC(hdcScreen); + if (!pCursorData->hbmColor) + { + DeleteDC(hdcMem); + return FALSE; + } + hbmpPrev = SelectObject(hdcMem, pCursorData->hbmColor); + if (!hbmpPrev) + { + DeleteDC(hdcMem); + DeleteObject(pCursorData->hbmColor); + return FALSE; + } + stretch_blt_icon( hdcMem, bm.bmWidth, bm.bmHeight, pIconInfo->hbmColor); + SelectObject(hdcMem, hbmpPrev); + DeleteDC(hdcMem); } pCursorData->hbmMask = CopyImage(pIconInfo->hbmMask, IMAGE_BITMAP, 0, 0, LR_MONOCHROME); if(!pCursorData->hbmMask) @@ -1318,7 +1393,7 @@ if(!dir) goto done; - wResId = LookupIconIdFromDirectoryEx((PBYTE)dir, bIcon, cxDesired, cyDesired, fuLoad & LR_MONOCHROME); + wResId = LookupIconIdFromDirectoryEx((PBYTE)dir, bIcon, cxDesired, cyDesired, fuLoad); FreeResource(handle); /* Get the relevant resource pointer */ @@ -2008,11 +2083,11 @@ WORD bppDesired; CURSORICONDIR* dir = (CURSORICONDIR*)presbits; CURSORICONDIRENTRY* entry; - int i, numMatch, iIndex = -1; - WORD width, height; - USHORT bitcount; - ULONG cxyDiff, cxyDiffTmp; - + int i, numMatch = 0, iIndex = -1; + WORD width, height, BitCount = 0; + BOOL notPaletted = FALSE; + ULONG bestScore = 0xFFFFFFFF, score; + TRACE("%p, %x, %i, %i, %x.\n", presbits, fIcon, cxDesired, cyDesired, Flags); if(!(dir && !dir->idReserved && (dir->idType & 3))) @@ -2035,13 +2110,11 @@ } if(!cxDesired) - cxDesired = GetSystemMetrics(fIcon ? SM_CXICON : SM_CXCURSOR); + cxDesired = Flags & LR_DEFAULTSIZE ? GetSystemMetrics(fIcon ? SM_CXICON : SM_CXCURSOR) : 256; if(!cyDesired) - cyDesired = GetSystemMetrics(fIcon ? SM_CYICON : SM_CYCURSOR); + cyDesired = Flags & LR_DEFAULTSIZE ? GetSystemMetrics(fIcon ? SM_CYICON : SM_CYCURSOR) : 256; /* Find the best match for the desired size */ - cxyDiff = 0xFFFFFFFF; - numMatch = 0; for(i = 0; i < dir->idCount; i++) { entry = &dir->idEntries[i]; @@ -2051,27 +2124,41 @@ /* 0 represents 256 */ if(!width) width = 256; if(!height) height = 256; - /* Let it be a 1-norm */ - cxyDiffTmp = max(abs(width - cxDesired), abs(height - cyDesired)); - if( cxyDiffTmp > cxyDiff) + /* Calculate the "score" (lower is better) */ + score = 2*(abs(width - cxDesired) + abs(height - cyDesired)); + if( score > bestScore) continue; - if( cxyDiffTmp == cxyDiff) - { + /* Bigger than requested lowers the score */ + if(width > cxDesired) + score -= width - cxDesired; + if(height > cyDesired) + score -= height - cyDesired; + if(score > bestScore) + continue; + if(score == bestScore) + { + if(entry->wBitCount > BitCount) + BitCount = entry->wBitCount; numMatch++; continue; } iIndex = i; numMatch = 1; - cxyDiff = cxyDiffTmp; + bestScore = score; + BitCount = entry->wBitCount; } if(numMatch == 1) { - /* Only one entry fit the asked dimensions */ + /* Only one entry fits the asked dimensions */ return dir->idEntries[iIndex].wResId; } - - bitcount = 0; + + /* Avoid paletted icons on non-paletted device */ + if (bppDesired > 8 && BitCount > 8) + notPaletted = TRUE; + + BitCount = 0; iIndex = -1; /* Now find the entry with the best depth */ for(i = 0; i < dir->idCount; i++) @@ -2083,25 +2170,33 @@ if(!width) width = 256; if(!height) height = 256; /* Check if this is the best match we had */ - cxyDiffTmp = max(abs(width - cxDesired), abs(height - cyDesired)); - if(cxyDiffTmp != cxyDiff) + score = 2*(abs(width - cxDesired) + abs(height - cyDesired)); + if(width > cxDesired) + score -= width - cxDesired; + if(height > cyDesired) + score -= height - cyDesired; + if(score != bestScore) continue; /* Exact match? */ if(entry->wBitCount == bppDesired) return entry->wResId; /* We take the highest possible but smaller than the display depth */ - if((entry->wBitCount > bitcount) && (entry->wBitCount < bppDesired)) - { + if((entry->wBitCount > BitCount) && (entry->wBitCount < bppDesired)) + { + /* Avoid paletted icons on non paletted devices */ + if ((entry->wBitCount <= 8) && notPaletted) + continue; iIndex = i; - bitcount = entry->wBitCount; - } - } - + BitCount = entry->wBitCount; + } + } + if(iIndex >= 0) return dir->idEntries[iIndex].wResId; - /* No inferior or equal depth available. Get the smallest one */ - bitcount = 0x7FFF; + /* No inferior or equal depth available. Get the smallest bigger one */ + BitCount = 0xFFFF; + iIndex = 0; for(i = 0; i < dir->idCount; i++) { entry = &dir->idEntries[i]; @@ -2111,14 +2206,20 @@ if(!width) width = 256; if(!height) height = 256; /* Check if this is the best match we had */ - cxyDiffTmp = max(abs(width - cxDesired), abs(height - cyDesired)); - if(cxyDiffTmp != cxyDiff) + score = 2*(abs(width - cxDesired) + abs(height - cyDesired)); + if(width > cxDesired) + score -= width - cxDesired; + if(height > cyDesired) + score -= height - cyDesired; + if(score != bestScore) continue; /* Check the bit depth */ - if(entry->wBitCount < bitcount) - { + if(entry->wBitCount < BitCount) + { + if((entry->wBitCount <= 8) && notPaletted) + continue; iIndex = i; - bitcount = entry->wBitCount; + BitCount = entry->wBitCount; } }

1 0

[tfaber] 60998: [CMAKE] - Revert MSVC build to /W3
by tfaber＠svn.reactos.org 15 Nov '13

15 Nov '13

Author: tfaber Date: Fri Nov 15 12:13:25 2013 New Revision: 60998 URL: http://svn.reactos.org/svn/reactos?rev=60998&view=rev Log: [CMAKE] - Revert MSVC build to /W3 Modified: trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=60998… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Fri Nov 15 12:13:25 2013 @@ -20,7 +20,7 @@ add_definitions(/Dinline=__inline /D__STDC__=1) -add_compile_flags("/X /GR- /EHs-c- /GS- /Zl /W4") +add_compile_flags("/X /GR- /EHs-c- /GS- /Zl /W3") # HACK: for VS 11+ we need to explicitly disable SSE, which is off by # default for older compilers. See CORE-6507

1 0

[tfaber] 60997: [CMAKE] - Temporarily raise MSVC warning level to 4 to get an inventory of the warnings we produce
by tfaber＠svn.reactos.org 15 Nov '13

15 Nov '13

Author: tfaber Date: Fri Nov 15 11:55:35 2013 New Revision: 60997 URL: http://svn.reactos.org/svn/reactos?rev=60997&view=rev Log: [CMAKE] - Temporarily raise MSVC warning level to 4 to get an inventory of the warnings we produce Modified: trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=60997… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Fri Nov 15 11:55:35 2013 @@ -20,7 +20,7 @@ add_definitions(/Dinline=__inline /D__STDC__=1) -add_compile_flags("/X /GR- /EHs-c- /GS- /Zl /W3") +add_compile_flags("/X /GR- /EHs-c- /GS- /Zl /W4") # HACK: for VS 11+ we need to explicitly disable SSE, which is off by # default for older compilers. See CORE-6507

1 0

[aandrejevic] 60996: [FAST486] The CS cached descriptor has the default operand size, even for stack operations.
by aandrejevic＠svn.reactos.org 15 Nov '13

15 Nov '13

Author: aandrejevic Date: Fri Nov 15 04:16:25 2013 New Revision: 60996 URL: http://svn.reactos.org/svn/reactos?rev=60996&view=rev Log: [FAST486] The CS cached descriptor has the default operand size, even for stack operations. Modified: branches/ntvdm/lib/fast486/common.inl Modified: branches/ntvdm/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/common.inl?re… ============================================================================== --- branches/ntvdm/lib/fast486/common.inl [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/common.inl [iso-8859-1] Fri Nov 15 04:16:25 2013 @@ -257,7 +257,7 @@ Fast486StackPush(PFAST486_STATE State, ULONG Value) { - BOOLEAN Size = State->SegmentRegs[FAST486_REG_SS].Size; + BOOLEAN Size = State->SegmentRegs[FAST486_REG_CS].Size; /* The OPSIZE prefix toggles the size */ if (State->PrefixFlags & FAST486_PREFIX_OPSIZE) Size = !Size; @@ -315,7 +315,7 @@ { ULONG LongValue; USHORT ShortValue; - BOOLEAN Size = State->SegmentRegs[FAST486_REG_SS].Size; + BOOLEAN Size = State->SegmentRegs[FAST486_REG_CS].Size; /* The OPSIZE prefix toggles the size */ TOGGLE_OPSIZE(Size);

1 0

[aandrejevic] 60995: [FAST486] - Fix the privilege checks. - Store the CPL in a special field, so that it doesn't get mixed up with the lowest 2 bits of real mode selectors while switching into pro...
by aandrejevic＠svn.reactos.org 15 Nov '13

15 Nov '13

Author: aandrejevic Date: Fri Nov 15 02:32:08 2013 New Revision: 60995 URL: http://svn.reactos.org/svn/reactos?rev=60995&view=rev Log: [FAST486] - Fix the privilege checks. - Store the CPL in a special field, so that it doesn't get mixed up with the lowest 2 bits of real mode selectors while switching into protected mode. - Reset the exception count after a successful ISR call. - In Fast486OpcodeGroup0F01, check for prefix overrides after parsing the Mod-Reg-R/M, which might add a SS: prefix override in some cases. Modified: branches/ntvdm/include/reactos/libs/fast486/fast486.h branches/ntvdm/lib/fast486/common.c branches/ntvdm/lib/fast486/common.inl branches/ntvdm/lib/fast486/fast486.c branches/ntvdm/lib/fast486/opgroups.c Modified: branches/ntvdm/include/reactos/libs/fast486/fast486.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/libs/fast… ============================================================================== --- branches/ntvdm/include/reactos/libs/fast486/fast486.h [iso-8859-1] (original) +++ branches/ntvdm/include/reactos/libs/fast486/fast486.h [iso-8859-1] Fri Nov 15 02:32:08 2013 @@ -394,6 +394,7 @@ FAST486_REG InstPtr, SavedInstPtr; FAST486_FLAGS_REG Flags; FAST486_TABLE_REG Gdtr, Idtr, Ldtr, Tss; + UCHAR Cpl; ULONG ControlRegisters[FAST486_NUM_CTRL_REGS]; ULONG DebugRegisters[FAST486_NUM_DBG_REGS]; ULONG ExceptionCount; Modified: branches/ntvdm/lib/fast486/common.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/common.c?rev=… ============================================================================== --- branches/ntvdm/lib/fast486/common.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/common.c [iso-8859-1] Fri Nov 15 02:32:08 2013 @@ -65,7 +65,8 @@ return FALSE; } - if (GET_SEGMENT_RPL(CachedDescriptor->Selector) > CachedDescriptor->Dpl) + if ((!InstFetch && (GET_SEGMENT_RPL(CachedDescriptor->Selector) > CachedDescriptor->Dpl)) + || (Fast486GetCurrentPrivLevel(State) > CachedDescriptor->Dpl)) { Fast486Exception(State, FAST486_EXCEPTION_GP); return FALSE; @@ -132,7 +133,8 @@ return FALSE; } - if (GET_SEGMENT_RPL(CachedDescriptor->Selector) > CachedDescriptor->Dpl) + if ((GET_SEGMENT_RPL(CachedDescriptor->Selector) > CachedDescriptor->Dpl) + || (Fast486GetCurrentPrivLevel(State) > CachedDescriptor->Dpl)) { Fast486Exception(State, FAST486_EXCEPTION_GP); return FALSE; @@ -330,8 +332,18 @@ && (State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PE)) { /* Push the error code */ - Fast486StackPush(State, ErrorCode); - } + if (!Fast486StackPush(State, ErrorCode)) + { + /* + * If this function failed, that means Fast486Exception + * was called again, so just return in this case. + */ + return; + } + } + + /* Reset the exception count */ + State->ExceptionCount = 0; } /* EOF */ Modified: branches/ntvdm/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/common.inl?re… ============================================================================== --- branches/ntvdm/lib/fast486/common.inl [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/common.inl [iso-8859-1] Fri Nov 15 02:32:08 2013 @@ -27,16 +27,8 @@ INT Fast486GetCurrentPrivLevel(PFAST486_STATE State) { - if (State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PE) - { - /* In protected mode, return the RPL of the CS */ - return GET_SEGMENT_RPL(State->SegmentRegs[FAST486_REG_CS].Selector); - } - else - { - /* Real mode is always in supervisor mode */ - return 0; - } + /* Return the CPL, or 3 if we're in virtual 8086 mode */ + return (!State->Flags.Vm) ? State->Cpl : 3; } FORCEINLINE @@ -464,7 +456,10 @@ else if (Segment == FAST486_REG_CS) { /* Loading the code segment */ - // TODO: NOT IMPLEMENTED + // TODO: Implement security checks, call gates, etc... + + /* Update CPL */ + State->Cpl = GET_SEGMENT_RPL(Selector); } else { @@ -478,7 +473,7 @@ } if ((GET_SEGMENT_RPL(Selector) > GdtEntry.Dpl) - && (Fast486GetCurrentPrivLevel(State) > GdtEntry.Dpl)) + || (Fast486GetCurrentPrivLevel(State) > GdtEntry.Dpl)) { Fast486Exception(State, FAST486_EXCEPTION_GP); return FALSE; Modified: branches/ntvdm/lib/fast486/fast486.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/fast486.c?rev… ============================================================================== --- branches/ntvdm/lib/fast486/fast486.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/fast486.c [iso-8859-1] Fri Nov 15 02:32:08 2013 @@ -238,6 +238,9 @@ /* Initialize the registers */ State->Flags.AlwaysSet = 1; State->InstPtr.LowWord = 0xFFF0; + + /* Set the CPL to 0 */ + State->Cpl = 0; /* Initialize segments */ for (i = 0; i < FAST486_NUM_SEG_REGS; i++) Modified: branches/ntvdm/lib/fast486/opgroups.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opgroups.c?re… ============================================================================== --- branches/ntvdm/lib/fast486/opgroups.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/opgroups.c [iso-8859-1] Fri Nov 15 02:32:08 2013 @@ -1668,17 +1668,17 @@ NO_LOCK_PREFIX(); TOGGLE_ADSIZE(AddressSize); + if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + /* Check for the segment override */ if (State->PrefixFlags & FAST486_PREFIX_SEG) { /* Use the override segment instead */ Segment = State->SegmentOverride; - } - - if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) - { - /* Exception occurred */ - return FALSE; } /* Check which operation this is */

1 0

[jgardou] 60994: [USER32_APITEST] - Add tests for LookupIconIdFromDirectoryEx - Add a workaround in GetIconInfo tests for a ReactOS bug in EnumDisplaySettings - Add tests for EnumDisplaySettings de...
by jgardou＠svn.reactos.org 14 Nov '13

14 Nov '13

Author: jgardou Date: Thu Nov 14 23:11:23 2013 New Revision: 60994 URL: http://svn.reactos.org/svn/reactos?rev=60994&view=rev Log: [USER32_APITEST] - Add tests for LookupIconIdFromDirectoryEx - Add a workaround in GetIconInfo tests for a ReactOS bug in EnumDisplaySettings - Add tests for EnumDisplaySettings demonstrating the bug. - Add some traces to better follow the test run Added: trunk/rostests/apitests/user32/EnumDisplaySettings.c (with props) trunk/rostests/apitests/user32/LookupIconIdFromDirectoryEx.c (with props) Modified: trunk/rostests/apitests/user32/CMakeLists.txt trunk/rostests/apitests/user32/CreateIconFromResourceEx.c trunk/rostests/apitests/user32/GetIconInfo.c trunk/rostests/apitests/user32/LoadImage.c trunk/rostests/apitests/user32/testlist.c 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] Thu Nov 14 23:11:23 2013 @@ -7,12 +7,14 @@ DestroyCursorIcon.c DrawIconEx.c desktop.c + EnumDisplaySettings.c GetIconInfo.c GetKeyState.c GetPeekMessage.c GetSystemMetrics.c InitializeLpkHooks.c LoadImage.c + LookupIconIdFromDirectoryEx.c RealGetWindowClass.c ScrollDC.c ScrollWindowEx.c Modified: trunk/rostests/apitests/user32/CreateIconFromResourceEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/CreateIco… ============================================================================== --- trunk/rostests/apitests/user32/CreateIconFromResourceEx.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/CreateIconFromResourceEx.c [iso-8859-1] Thu Nov 14 23:11:23 2013 @@ -2,6 +2,7 @@ #include <apitest.h> #include <winuser.h> +#include <wingdi.h> START_TEST(CreateIconFromResourceEx) { @@ -9,7 +10,9 @@ HMODULE hMod; HRSRC hResource; // handle to FindResource HRSRC hMem; // handle to LoadResource - BYTE *lpResource; // pointer to resource data + BYTE *lpResource; // pointer to resource data + DWORD err; + int wResId; hMod = GetModuleHandle(NULL); ok(hMod != NULL, "\n"); @@ -43,6 +46,47 @@ ok(DestroyCursor(hcur1), "\n"); ok(DestroyCursor(hcur2), "\n"); ok(DestroyCursor(hcur2), "\n"); + + /* See what happens if we ask for an icon on a cursor resource (directory) */ + SetLastError(0x0badf00d); + hcur1 = CreateIconFromResourceEx(lpResource, SizeofResource(hMod, hResource), TRUE, 0x00030000, 0, 0, 0); + ok(hcur1 == NULL, "\n"); + err = GetLastError(); + ok(err == 0x0badf00d, "err: %lu\n", err); + + /* Same tests, but for cursor resource (not directory) */ + wResId = LookupIconIdFromDirectoryEx(lpResource, FALSE, 0, 0, 0); + ok(wResId != 0, "\n"); + FreeResource(hResource); + + hResource = FindResourceA(hMod, MAKEINTRESOURCEA(wResId), RT_CURSOR); + ok(hResource != NULL, "\n"); + + hMem = LoadResource(hMod, hResource); + ok(hMem != NULL, "\n"); + + lpResource = LockResource(hMem); + ok(lpResource != NULL, "\n"); - FreeResource(hResource); + /* MSDN states that LR_SHARED permits to not load twice the same cursor again. + * But CreateIconFromResourceEx still returns two different handles */ + hcur2 = CreateIconFromResourceEx(lpResource, SizeofResource(hMod, hResource), FALSE, 0x00030000, 0, 0, LR_SHARED); + ok(hcur2 != NULL, "\n"); + ok(hcur2 != hcur1, "\n"); + hcur1 = CreateIconFromResourceEx(lpResource, SizeofResource(hMod, hResource), FALSE, 0x00030000, 0, 0, LR_SHARED); + ok(hcur1 != NULL, "\n"); + ok(hcur2 != hcur1, "\n"); + + /* Try to destroy them multiple times (see DestroyCursor test) */ + ok(DestroyCursor(hcur1), "\n"); + ok(DestroyCursor(hcur1), "\n"); + ok(DestroyCursor(hcur2), "\n"); + ok(DestroyCursor(hcur2), "\n"); + + /* See what happens if we ask for an icon on a cursor resource (no directory) */ + SetLastError(0x0badf00d); + hcur1 = CreateIconFromResourceEx(lpResource, SizeofResource(hMod, hResource), TRUE, 0x00030000, 0, 0, 0); + ok(hcur1 == NULL, "\n"); + err = GetLastError(); + ok(err == 0x0badf00d, "err: %lu\n", err); } Added: trunk/rostests/apitests/user32/EnumDisplaySettings.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/EnumDispl… ============================================================================== --- trunk/rostests/apitests/user32/EnumDisplaySettings.c (added) +++ trunk/rostests/apitests/user32/EnumDisplaySettings.c [iso-8859-1] Thu Nov 14 23:11:23 2013 @@ -0,0 +1,60 @@ +#include <apitest.h> + +#include <wingdi.h> +#include <winuser.h> + +#define SIZEOF_DEVMODEW_300 188 +#define SIZEOF_DEVMODEW_400 212 +#define SIZEOF_DEVMODEW_500 220 + +START_TEST(EnumDisplaySettings) +{ + DEVMODEW dm; + HDC icDisplay; + + /* TODO: test with a printer driver */ + + icDisplay = CreateICW(L"DISPLAY", NULL, NULL, NULL); + ok(icDisplay != NULL, "\n"); + + dm.dmDriverExtra = 0x7777; + + /* Try ridiculous size */ + dm.dmSize = 0x8888; + ok(EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &dm), "\n"); + ok(dm.dmBitsPerPel == GetDeviceCaps(icDisplay, BITSPIXEL), "%lu, should be %d.\n", dm.dmBitsPerPel, GetDeviceCaps(icDisplay, BITSPIXEL)); + ok(dm.dmSize == SIZEOF_DEVMODEW_300, "%d\n", dm.dmSize); + ok(dm.dmDriverExtra == 0, "%d\n", dm.dmDriverExtra); + + /* Try a tiny size */ + dm.dmSize = 4; + ok(EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &dm), "\n"); + ok(dm.dmBitsPerPel == GetDeviceCaps(icDisplay, BITSPIXEL), "%lu, should be %d.\n", dm.dmBitsPerPel, GetDeviceCaps(icDisplay, BITSPIXEL)); + ok(dm.dmSize == SIZEOF_DEVMODEW_300, "%d\n", dm.dmSize); + + /* Something in between */ + dm.dmSize = (SIZEOF_DEVMODEW_300 + SIZEOF_DEVMODEW_400) / 2 ; + ok(EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &dm), "\n"); + ok(dm.dmBitsPerPel == GetDeviceCaps(icDisplay, BITSPIXEL), "%lu, should be %d.\n", dm.dmBitsPerPel, GetDeviceCaps(icDisplay, BITSPIXEL)); + ok(dm.dmSize == SIZEOF_DEVMODEW_300, "%d\n", dm.dmSize); + + /* WINVER < 0x0400 */ + dm.dmSize = SIZEOF_DEVMODEW_300; + ok(EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &dm), "\n"); + ok(dm.dmBitsPerPel == GetDeviceCaps(icDisplay, BITSPIXEL), "%lu, should be %d.\n", dm.dmBitsPerPel, GetDeviceCaps(icDisplay, BITSPIXEL)); + ok(dm.dmSize == SIZEOF_DEVMODEW_300, "%d\n", dm.dmSize); + + /* WINVER < 0x0500 */ + dm.dmSize = SIZEOF_DEVMODEW_400; + ok(EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &dm), "\n"); + ok(dm.dmBitsPerPel == GetDeviceCaps(icDisplay, BITSPIXEL), "%lu, should be %d.\n", dm.dmBitsPerPel, GetDeviceCaps(icDisplay, BITSPIXEL)); + ok(dm.dmSize == SIZEOF_DEVMODEW_300, "%d\n", dm.dmSize); + + /* "Modern" windows */ + dm.dmSize = SIZEOF_DEVMODEW_500; + ok(EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &dm), "\n"); + ok(dm.dmBitsPerPel == GetDeviceCaps(icDisplay, BITSPIXEL), "%lu, should be %d.\n", dm.dmBitsPerPel, GetDeviceCaps(icDisplay, BITSPIXEL)); + ok(dm.dmSize == SIZEOF_DEVMODEW_300, "%d\n", dm.dmSize); + + DeleteDC(icDisplay); +} Propchange: trunk/rostests/apitests/user32/EnumDisplaySettings.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/user32/GetIconInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/GetIconIn… ============================================================================== --- trunk/rostests/apitests/user32/GetIconInfo.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/GetIconInfo.c [iso-8859-1] Thu Nov 14 23:11:23 2013 @@ -99,7 +99,7 @@ ok(bitmap.bmHeight == 16, "\n"); ok(bitmap.bmWidthBytes == 8 * bitmap.bmBitsPixel / 8, "\n"); ok(bitmap.bmPlanes == 1, "\n"); - ok(bitmap.bmBitsPixel == screen_bpp, "\n"); + ok(bitmap.bmBitsPixel == screen_bpp, "%d\n", bitmap.bmBitsPixel); ok(bitmap.bmBits == NULL, "\n"); DeleteObject(iconinfo2.hbmMask); DeleteObject(iconinfo2.hbmColor); @@ -152,13 +152,20 @@ DWORD data[] = {0, 0, 0, 0, 0, 0}; DWORD bpp, screenbpp, creationbpp; DEVMODEW dm; + + dm.dmSize = sizeof(dm); + dm.dmDriverExtra = 0; /* Test icons behaviour regarding display settings */ - EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &dm); + ok(EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &dm), "\n"); screenbpp = dm.dmBitsPerPel; - Test_GetIconInfo(0, screenbpp); - Test_GetIconInfo(1, screenbpp); + trace("Icon default size: %dx%d.\n", GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON)); + trace("Cursor default size: %dx%d.\n", GetSystemMetrics(SM_CXCURSOR), GetSystemMetrics(SM_CYCURSOR)); + + trace("Screen bpp: %lu.\n", screenbpp); + Test_GetIconInfo(FALSE, screenbpp); + Test_GetIconInfo(TRUE, screenbpp); hcursor = LoadCursor(GetModuleHandle(NULL), "TESTCURSOR"); ok(hcursor != 0, "should not fail, error %ld\n", GetLastError()); @@ -192,6 +199,7 @@ skip("Unable to change bpp to %lu.\n", creationbpp); continue; } + trace("starting with creationbpp = %lu\n", creationbpp); hcursor = LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_TEST), IMAGE_ICON, @@ -203,6 +211,7 @@ /* If we reverse the loop here (32->16 bpp), then hbmColor.bmBitsPixel is always 32 */ for(bpp = 16; bpp <=32; bpp += 8) { + trace("testing resetting to %lu\n", bpp); dm.dmBitsPerPel = bpp; if(ChangeDisplaySettingsExW(NULL, &dm, NULL, 0, NULL) != DISP_CHANGE_SUCCESSFUL) { Modified: trunk/rostests/apitests/user32/LoadImage.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/LoadImage… ============================================================================== --- trunk/rostests/apitests/user32/LoadImage.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/LoadImage.c [iso-8859-1] Thu Nov 14 23:11:23 2013 @@ -35,7 +35,7 @@ hCopy = CopyIcon(arg); ok(hCopy != NULL, "\n"); ok(DestroyIcon(hCopy), "\n"); - + hCopy = CopyImage(arg, IMAGE_CURSOR, 0, 0, 0); ok(hCopy != NULL, "\n"); ok(DestroyIcon(hCopy), "\n"); Added: trunk/rostests/apitests/user32/LookupIconIdFromDirectoryEx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/LookupIco… ============================================================================== --- trunk/rostests/apitests/user32/LookupIconIdFromDirectoryEx.c (added) +++ trunk/rostests/apitests/user32/LookupIconIdFromDirectoryEx.c [iso-8859-1] Thu Nov 14 23:11:23 2013 @@ -0,0 +1,132 @@ + +#include <apitest.h> + +#include <wingdi.h> +#include <winuser.h> + +#include "resource.h" + +START_TEST(LookupIconIdFromDirectoryEx) +{ + HRSRC hResource; + HGLOBAL hMem; + HMODULE hMod; + int wResId; + DEVMODEW dm; + DWORD dwOrigBpp; + UINT i; + BYTE* lpResource; + + /* This tests assumes that default icon size is 32x32 */ + + struct + { + DWORD bpp; + int wResId; + int cxDesired; + int cyDesired; + UINT flags; + } + TestData[] = + { + {8, 1, 0, 0, 0}, + {8, 1, 48, 48, 0}, + {8, 2, 32, 32, 0}, + {8, 3, 24, 24, 0}, + {8, 4, 16, 16, 0}, + {8, 1, 0, 0, LR_MONOCHROME}, + {8, 1, 48, 48, LR_MONOCHROME}, + {8, 2, 32, 32, LR_MONOCHROME}, + {8, 3, 24, 24, LR_MONOCHROME}, + {8, 4, 16, 16, LR_MONOCHROME}, + {8, 2, 0, 0, LR_DEFAULTSIZE}, + {8, 1, 48, 48, LR_DEFAULTSIZE}, + /* Non exact sizes */ + {8, 1, 41, 41, 0}, + {8, 1, 40, 40, 0}, + /* Non square sizes */ + {8, 1, 16, 48, 0}, + {8, 1, 48, 16, 0}, + {16, 5, 0, 0, 0}, + {16, 5, 48, 48, 0}, + {16, 6, 32, 32, 0}, + {16, 7, 24, 24, 0}, + {16, 1, 0, 0, LR_MONOCHROME}, + {16, 1, 48, 48, LR_MONOCHROME}, + {16, 2, 32, 32, LR_MONOCHROME}, + {16, 3, 24, 24, LR_MONOCHROME}, + {16, 4, 16, 16, LR_MONOCHROME}, + {16, 6, 0, 0, LR_DEFAULTSIZE}, + {16, 5, 48, 48, LR_DEFAULTSIZE}, + {24, 5, 0, 0, 0}, + {24, 5, 48, 48, 0}, + {24, 6, 32, 32, 0}, + {24, 7, 24, 24, 0}, + {24, 8, 16, 16, 0}, + {16, 8, 16, 16, 0}, + {24, 1, 0, 0, LR_MONOCHROME}, + {24, 1, 48, 48, LR_MONOCHROME}, + {24, 2, 32, 32, LR_MONOCHROME}, + {24, 3, 24, 24, LR_MONOCHROME}, + {24, 4, 16, 16, LR_MONOCHROME}, + {24, 6, 0, 0, LR_DEFAULTSIZE}, + {24, 5, 48, 48, LR_DEFAULTSIZE}, + {32, 9, 0, 0, 0}, + {32, 9, 48, 48, 0}, + {32, 10, 32, 32, 0}, + {32, 11, 24, 24, 0}, + {32, 12, 16, 16, 0}, + {32, 1, 0, 0, LR_MONOCHROME}, + {32, 1, 48, 48, LR_MONOCHROME}, + {32, 2, 32, 32, LR_MONOCHROME}, + {32, 3, 24, 24, LR_MONOCHROME}, + {32, 4, 16, 16, LR_MONOCHROME}, + {32, 10, 0, 0, LR_DEFAULTSIZE}, + {32, 9, 48, 48, LR_DEFAULTSIZE}, + }; + + hMod = GetModuleHandle(NULL); + ok(hMod != NULL, "\n"); + /* Find our cursor directory resource */ + hResource = FindResourceA(hMod, + MAKEINTRESOURCE(IDI_TEST), + RT_GROUP_ICON); + ok(hResource != NULL, "\n"); + + hMem = LoadResource(hMod, hResource); + ok(hMem != NULL, "\n"); + + lpResource = LockResource(hMem); + ok(lpResource != NULL, "\n"); + + dm.dmSize = sizeof(dm); + dm.dmDriverExtra = 0; + + ok(EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &dm), "\n"); + + dwOrigBpp = dm.dmBitsPerPel; + + for (i = 0; i < sizeof(TestData)/sizeof(TestData[0]); i++) + { + dm.dmBitsPerPel = TestData[i].bpp; + if (ChangeDisplaySettingsExW(NULL, &dm, NULL, 0, NULL) != DISP_CHANGE_SUCCESSFUL) + { + skip("Unable to change bpp to %lu.\n", dm.dmBitsPerPel); + continue; + } + wResId = LookupIconIdFromDirectoryEx(lpResource, TRUE, TestData[i].cxDesired, TestData[i].cyDesired, TestData[i].flags); + ok(wResId == TestData[i].wResId, "Got %d, expected %d for %dx%dx%lu, flags %x.\n", + wResId, + TestData[i].wResId, + TestData[i].cxDesired, + TestData[i].cyDesired, + TestData[i].bpp, + TestData[i].flags); + } + + /* Restore */ + dm.dmBitsPerPel = dwOrigBpp; + ok(ChangeDisplaySettingsExW(NULL, &dm, NULL, 0, NULL) == DISP_CHANGE_SUCCESSFUL, "\n"); + + FreeResource(hMem); +} Propchange: trunk/rostests/apitests/user32/LookupIconIdFromDirectoryEx.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/user32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/testlist.… ============================================================================== --- trunk/rostests/apitests/user32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/testlist.c [iso-8859-1] Thu Nov 14 23:11:23 2013 @@ -9,12 +9,14 @@ extern void func_DestroyCursorIcon(void); extern void func_DrawIconEx(void); extern void func_desktop(void); +extern void func_EnumDisplaySettings(void); extern void func_GetIconInfo(void); extern void func_GetKeyState(void); extern void func_GetPeekMessage(void); extern void func_GetSystemMetrics(void); extern void func_InitializeLpkHooks(void); extern void func_LoadImage(void); +extern void func_LookupIconIdFromDirectoryEx(void); extern void func_RealGetWindowClass(void); extern void func_ScrollDC(void); extern void func_ScrollWindowEx(void); @@ -33,12 +35,14 @@ { "DestroyCursorIcon", func_DestroyCursorIcon }, { "DrawIconEx", func_DrawIconEx }, { "desktop", func_desktop }, + { "EnumDisplaySettings", func_EnumDisplaySettings }, { "GetIconInfo", func_GetIconInfo }, { "GetKeyState", func_GetKeyState }, { "GetPeekMessage", func_GetPeekMessage }, { "GetSystemMetrics", func_GetSystemMetrics }, { "InitializeLpkHooks", func_InitializeLpkHooks }, { "LoadImage", func_LoadImage }, + { "LookupIconIdFromDirectoryEx", func_LookupIconIdFromDirectoryEx }, { "RealGetWindowClass", func_RealGetWindowClass }, { "ScrollDC", func_ScrollDC }, { "ScrollWindowEx", func_ScrollWindowEx },

1 0

[tfaber] 60993: [PSDK] - Fix (nt)intsafe.h signed to unsigned conversions. Based on a patch by Timo. CORE-7578 #resolve
by tfaber＠svn.reactos.org 14 Nov '13

14 Nov '13

Author: tfaber Date: Thu Nov 14 21:44:47 2013 New Revision: 60993 URL: http://svn.reactos.org/svn/reactos?rev=60993&view=rev Log: [PSDK] - Fix (nt)intsafe.h signed to unsigned conversions. Based on a patch by Timo. CORE-7578 #resolve Modified: trunk/reactos/include/psdk/intsafe.h 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] Thu Nov 14 21:44:47 2013 @@ -343,7 +343,8 @@ _In_ _TypeFrom Input, \ _Out_ _Deref_out_range_(==, Input) _TypeTo *pOutput) \ { \ - if ((Input >= 0) && ((_TypeTo)Input <= _TypeTo ## _MAX)) \ + if ((Input >= 0) && \ + ((sizeof(_TypeFrom) <= sizeof(_TypeTo)) || (Input <= (_TypeFrom)_TypeTo ## _MAX))) \ { \ *pOutput = (_TypeTo)Input; \ return INTSAFE_SUCCESS; \

1 0

[jimtabor] 60992: - Isolate driver name for sysparams test crash, one more try. CORE-7574
by jimtabor＠svn.reactos.org 14 Nov '13

14 Nov '13

Author: jimtabor Date: Thu Nov 14 17:29:24 2013 New Revision: 60992 URL: http://svn.reactos.org/svn/reactos?rev=60992&view=rev Log: - Isolate driver name for sysparams test crash, one more try. CORE-7574 Modified: trunk/reactos/win32ss/gdi/eng/ldevobj.c Modified: trunk/reactos/win32ss/gdi/eng/ldevobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/ldevobj.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/ldevobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/ldevobj.c [iso-8859-1] Thu Nov 14 17:29:24 2013 @@ -374,7 +374,8 @@ /* Check if the ldev is associated with a file */ if (pldev->pGdiDriverInfo) { - ERR("Driver Name %wZ\n", &strDriverName); + ERR("Driver Name 1 %wZ\n", &strDriverName); + ERR("Driver Name 2 %wZ\n", &pldev->pGdiDriverInfo->DriverName); /* Check for match (case insensative) */ if (RtlEqualUnicodeString(&pldev->pGdiDriverInfo->DriverName, &strDriverName, 1)) {

1 0

[tfaber] 60991: [KMTESTS:RTL] - Add RtlIntSafe test for ntintsafe.h functions CORE-7578
by tfaber＠svn.reactos.org 14 Nov '13

14 Nov '13

Author: tfaber Date: Thu Nov 14 09:19:16 2013 New Revision: 60991 URL: http://svn.reactos.org/svn/reactos?rev=60991&view=rev Log: [KMTESTS:RTL] - Add RtlIntSafe test for ntintsafe.h functions CORE-7578 Added: trunk/rostests/kmtests/rtl/RtlIntSafe.c (with props) Modified: trunk/rostests/kmtests/CMakeLists.txt trunk/rostests/kmtests/kmtest/testlist.c trunk/rostests/kmtests/kmtest_drv/testlist.c Modified: trunk/rostests/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/CMakeLists.txt?re… ============================================================================== --- trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] Thu Nov 14 09:19:16 2013 @@ -12,6 +12,7 @@ example/GuardedMemory.c rtl/RtlAvlTree.c rtl/RtlException.c + rtl/RtlIntSafe.c rtl/RtlMemory.c rtl/RtlRegistry.c rtl/RtlSplayTree.c Modified: trunk/rostests/kmtests/kmtest/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest/testlist.c… ============================================================================== --- trunk/rostests/kmtests/kmtest/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest/testlist.c [iso-8859-1] Thu Nov 14 09:19:16 2013 @@ -12,6 +12,7 @@ KMT_TESTFUNC Test_IoDeviceObject; KMT_TESTFUNC Test_RtlAvlTree; KMT_TESTFUNC Test_RtlException; +KMT_TESTFUNC Test_RtlIntSafe; KMT_TESTFUNC Test_RtlMemory; KMT_TESTFUNC Test_RtlRegistry; KMT_TESTFUNC Test_RtlSplayTree; @@ -25,6 +26,7 @@ { "IoDeviceObject", Test_IoDeviceObject }, { "RtlAvlTree", Test_RtlAvlTree }, { "RtlException", Test_RtlException }, + { "RtlIntSafe", Test_RtlIntSafe }, { "RtlMemory", Test_RtlMemory }, { "RtlRegistry", Test_RtlRegistry }, { "RtlSplayTree", Test_RtlSplayTree }, Modified: trunk/rostests/kmtests/kmtest_drv/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest_drv/testli… ============================================================================== --- trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] Thu Nov 14 09:19:16 2013 @@ -47,6 +47,7 @@ KMT_TESTFUNC Test_SeQueryInfoToken; KMT_TESTFUNC Test_RtlAvlTree; KMT_TESTFUNC Test_RtlException; +KMT_TESTFUNC Test_RtlIntSafe; KMT_TESTFUNC Test_RtlMemory; KMT_TESTFUNC Test_RtlRegistry; KMT_TESTFUNC Test_RtlSplayTree; @@ -97,6 +98,7 @@ { "-SeQueryInfoToken", Test_SeQueryInfoToken }, { "RtlAvlTreeKM", Test_RtlAvlTree }, { "RtlExceptionKM", Test_RtlException }, + { "RtlIntSafeKM", Test_RtlIntSafe }, { "RtlMemoryKM", Test_RtlMemory }, { "RtlRegistryKM", Test_RtlRegistry }, { "RtlSplayTreeKM", Test_RtlSplayTree }, Added: 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 (added) +++ trunk/rostests/kmtests/rtl/RtlIntSafe.c [iso-8859-1] Thu Nov 14 09:19:16 2013 @@ -0,0 +1,98 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Test for ntintsafe.h functions + * PROGRAMMER: Thomas Faber <thomas.faber(a)reactos.org> + */ + +#define KMT_EMULATE_KERNEL +#include <kmt_test.h> +#include <ntintsafe.h> + +START_TEST(RtlIntSafe) +{ + NTSTATUS Status; + INT8 Int8Result; + UINT8 UInt8Result; + INT IntResult; + UINT UIntResult; + USHORT UShortResult; + SHORT ShortResult; + +#define TEST_CONVERSION(FromName, FromType, ToName, ToType, Print, Value, Expected, ExpectedStatus) \ + do \ + { \ + ToName ## Result = (ToType)0xfedcba9876543210; \ + Status = Rtl ## FromName ## To ## ToName(Value, \ + &ToName ## Result); \ + ok_eq_hex(Status, ExpectedStatus); \ + ok_eq_ ## Print(ToName ## Result, Expected); \ + } while (0) + + TEST_CONVERSION(UInt8, UINT8, Int8, INT8, int, 0, 0, STATUS_SUCCESS); + TEST_CONVERSION(UInt8, UINT8, Int8, INT8, int, 5, 5, STATUS_SUCCESS); + TEST_CONVERSION(UInt8, UINT8, Int8, INT8, int, INT8_MAX, INT8_MAX, STATUS_SUCCESS); + TEST_CONVERSION(UInt8, UINT8, Int8, INT8, int, INT8_MAX + 1, (INT8)-1, STATUS_INTEGER_OVERFLOW); + TEST_CONVERSION(UInt8, UINT8, Int8, INT8, int, (UINT8)-1, (INT8)-1, STATUS_INTEGER_OVERFLOW); + + TEST_CONVERSION(ULong, ULONG, UShort, USHORT, uint, 0, 0, STATUS_SUCCESS); + TEST_CONVERSION(ULong, ULONG, UShort, USHORT, uint, 5, 5, STATUS_SUCCESS); + TEST_CONVERSION(ULong, ULONG, UShort, USHORT, uint, USHORT_MAX, USHORT_MAX, STATUS_SUCCESS); + TEST_CONVERSION(ULong, ULONG, UShort, USHORT, uint, USHORT_MAX + 1, (USHORT)-1, STATUS_INTEGER_OVERFLOW); + TEST_CONVERSION(ULong, ULONG, UShort, USHORT, uint, (ULONG)-1, (USHORT)-1, STATUS_INTEGER_OVERFLOW); + + TEST_CONVERSION(ULong, ULONG, Int, INT, int, 0, 0, STATUS_SUCCESS); + TEST_CONVERSION(ULong, ULONG, Int, INT, int, 5, 5, STATUS_SUCCESS); + TEST_CONVERSION(ULong, ULONG, Int, INT, int, INT_MAX, INT_MAX, STATUS_SUCCESS); + TEST_CONVERSION(ULong, ULONG, Int, INT, int, (ULONG)INT_MAX + 1, (INT)-1, STATUS_INTEGER_OVERFLOW); + TEST_CONVERSION(ULong, ULONG, Int, INT, int, (ULONG)-1, (INT)-1, STATUS_INTEGER_OVERFLOW); + + TEST_CONVERSION(ULong, ULONG, UInt, UINT, uint, 0, 0, STATUS_SUCCESS); + TEST_CONVERSION(ULong, ULONG, UInt, UINT, uint, 5, 5, STATUS_SUCCESS); + TEST_CONVERSION(ULong, ULONG, UInt, UINT, uint, UINT_MAX, UINT_MAX, STATUS_SUCCESS); + TEST_CONVERSION(ULong, ULONG, UInt, UINT, uint, (ULONG)-1, (UINT)-1, STATUS_SUCCESS); + + TEST_CONVERSION(Int8, INT8, UInt8, UINT8, uint, 0, 0, STATUS_SUCCESS); + TEST_CONVERSION(Int8, INT8, UInt8, UINT8, uint, 5, 5, STATUS_SUCCESS); + TEST_CONVERSION(Int8, INT8, UInt8, UINT8, uint, INT8_MAX, INT8_MAX, STATUS_SUCCESS); + TEST_CONVERSION(Int8, INT8, UInt8, UINT8, uint, -1, (UINT8)-1, STATUS_INTEGER_OVERFLOW); + TEST_CONVERSION(Int8, INT8, UInt8, UINT8, uint, INT8_MIN, (UINT8)-1, STATUS_INTEGER_OVERFLOW); + + TEST_CONVERSION(Int8, INT8, UShort, USHORT, uint, 0, 0, STATUS_SUCCESS); + TEST_CONVERSION(Int8, INT8, UShort, USHORT, uint, 5, 5, STATUS_SUCCESS); + TEST_CONVERSION(Int8, INT8, UShort, USHORT, uint, INT8_MAX, INT8_MAX, STATUS_SUCCESS); + TEST_CONVERSION(Int8, INT8, UShort, USHORT, uint, -1, (USHORT)-1, STATUS_INTEGER_OVERFLOW); + TEST_CONVERSION(Int8, INT8, UShort, USHORT, uint, INT8_MIN, (USHORT)-1, STATUS_INTEGER_OVERFLOW); + + TEST_CONVERSION(Long, LONG, UShort, USHORT, uint, 0, 0, STATUS_SUCCESS); + TEST_CONVERSION(Long, LONG, UShort, USHORT, uint, 5, 5, STATUS_SUCCESS); + TEST_CONVERSION(Long, LONG, UShort, USHORT, uint, USHORT_MAX, USHORT_MAX, STATUS_SUCCESS); + TEST_CONVERSION(Long, LONG, UShort, USHORT, uint, USHORT_MAX + 1, (USHORT)-1, STATUS_INTEGER_OVERFLOW); + TEST_CONVERSION(Long, LONG, UShort, USHORT, uint, LONG_MAX, (USHORT)-1, STATUS_INTEGER_OVERFLOW); + TEST_CONVERSION(Long, LONG, UShort, USHORT, uint, -1, (USHORT)-1, STATUS_INTEGER_OVERFLOW); + TEST_CONVERSION(Long, LONG, UShort, USHORT, uint, LONG_MIN, (USHORT)-1, STATUS_INTEGER_OVERFLOW); + + TEST_CONVERSION(Long, LONG, UInt, UINT, uint, 0, 0, STATUS_SUCCESS); + TEST_CONVERSION(Long, LONG, UInt, UINT, uint, 5, 5, STATUS_SUCCESS); + TEST_CONVERSION(Long, LONG, UInt, UINT, uint, LONG_MAX, LONG_MAX, STATUS_SUCCESS); + TEST_CONVERSION(Long, LONG, UInt, UINT, uint, -1, (UINT)-1, STATUS_INTEGER_OVERFLOW); + TEST_CONVERSION(Long, LONG, UInt, UINT, uint, LONG_MIN, (UINT)-1, STATUS_INTEGER_OVERFLOW); + + TEST_CONVERSION(Int, INT, Int8, INT8, int, 0, 0, STATUS_SUCCESS); + TEST_CONVERSION(Int, INT, Int8, INT8, int, 5, 5, STATUS_SUCCESS); + TEST_CONVERSION(Int, INT, Int8, INT8, int, INT8_MAX, INT8_MAX, STATUS_SUCCESS); + TEST_CONVERSION(Int, INT, Int8, INT8, int, INT8_MAX + 1, (INT8)-1, STATUS_INTEGER_OVERFLOW); + TEST_CONVERSION(Int, INT, Int8, INT8, int, INT_MAX, (INT8)-1, STATUS_INTEGER_OVERFLOW); + TEST_CONVERSION(Int, INT, Int8, INT8, int, INT8_MIN, INT8_MIN, STATUS_SUCCESS); + TEST_CONVERSION(Int, INT, Int8, INT8, int, INT8_MIN - 1, (INT8)-1, STATUS_INTEGER_OVERFLOW); + TEST_CONVERSION(Int, INT, Int8, INT8, int, INT_MIN, (INT8)-1, STATUS_INTEGER_OVERFLOW); + + TEST_CONVERSION(Int, INT, Short, SHORT, int, 0, 0, STATUS_SUCCESS); + TEST_CONVERSION(Int, INT, Short, SHORT, int, 5, 5, STATUS_SUCCESS); + TEST_CONVERSION(Int, INT, Short, SHORT, int, SHORT_MAX, SHORT_MAX, STATUS_SUCCESS); + TEST_CONVERSION(Int, INT, Short, SHORT, int, SHORT_MAX + 1, (SHORT)-1, STATUS_INTEGER_OVERFLOW); + TEST_CONVERSION(Int, INT, Short, SHORT, int, INT_MAX, (SHORT)-1, STATUS_INTEGER_OVERFLOW); + 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); +} Propchange: trunk/rostests/kmtests/rtl/RtlIntSafe.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[aandrejevic] 60990: [FAST486] Fix the previous fix. ESI was already updated earlier in the function.
by aandrejevic＠svn.reactos.org 14 Nov '13

14 Nov '13

Author: aandrejevic Date: Thu Nov 14 03:11:33 2013 New Revision: 60990 URL: http://svn.reactos.org/svn/reactos?rev=60990&view=rev Log: [FAST486] Fix the previous fix. ESI was already updated earlier in the function. Modified: branches/ntvdm/lib/fast486/opcodes.c Modified: branches/ntvdm/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/fast486/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/opcodes.c [iso-8859-1] Thu Nov 14 03:11:33 2013 @@ -5886,17 +5886,9 @@ else State->GeneralRegs[FAST486_REG_ESI].LowWord -= (Count - 1) * DataSize; } - /* Update registers */ - if (OperandSize) - { - State->GeneralRegs[FAST486_REG_ECX].Long = 0; - State->GeneralRegs[FAST486_REG_ESI].Long += (Count - 1) * DataSize; - } - else - { - State->GeneralRegs[FAST486_REG_ECX].LowWord = 0; - State->GeneralRegs[FAST486_REG_ESI].LowWord += (Count - 1) * DataSize; - } + /* Clear ECX */ + if (OperandSize) State->GeneralRegs[FAST486_REG_ECX].Long = 0; + else State->GeneralRegs[FAST486_REG_ECX].LowWord = 0; } /* Read from the source operand */

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