Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sir_richard] 56515: [NTOS]: Attempt to hackfix MiGetPageProtection to support the case seen in OllyDBG. [NTOS]: Implement Case C of NtFreeVirtualMemory, which is sometimes seen in some heap logs. ...
by sir_richard＠svn.reactos.org 05 May '12

05 May '12

Author: sir_richard Date: Sat May 5 19:26:21 2012 New Revision: 56515 URL: http://svn.reactos.org/svn/reactos?rev=56515&view=rev Log: [NTOS]: Attempt to hackfix MiGetPageProtection to support the case seen in OllyDBG. [NTOS]: Implement Case C of NtFreeVirtualMemory, which is sometimes seen in some heap logs. The hard part is figuring out the right amount of committed/decommitted pages. Only supports 2-level paging for now as the algorithm is already messy enough. Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Sat May 5 19:26:21 2012 @@ -27,6 +27,168 @@ OUT PULONG OldAccessProtection OPTIONAL); /* PRIVATE FUNCTIONS **********************************************************/ + +ULONG +NTAPI +MiCalculatePageCommitment(IN ULONG_PTR StartingAddress, + IN ULONG_PTR EndingAddress, + IN PMMVAD Vad, + IN PEPROCESS Process) +{ + PMMPTE PointerPte, LastPte, PointerPde; + ULONG CommittedPages; + + /* Compute starting and ending PTE and PDE addresses */ + PointerPde = MiAddressToPde(StartingAddress); + PointerPte = MiAddressToPte(StartingAddress); + LastPte = MiAddressToPte(EndingAddress); + + /* Handle commited pages first */ + if (Vad->u.VadFlags.MemCommit == 1) + { + /* This is a committed VAD, so Assume the whole range is committed */ + CommittedPages = BYTES_TO_PAGES(EndingAddress - StartingAddress); + + /* Is the PDE demand-zero? */ + PointerPde = MiAddressToPte(PointerPte); + if (PointerPde->u.Long != 0) + { + /* It is not. Is it valid? */ + if (PointerPde->u.Hard.Valid == 0) + { + /* Fault it in */ + PointerPte = MiPteToAddress(PointerPde); + MiMakeSystemAddressValid(PointerPte, Process); + } + } + else + { + /* It is, skip it and move to the next PDE, unless we're done */ + PointerPde++; + PointerPte = MiPteToAddress(PointerPde); + if (PointerPte > LastPte) return CommittedPages; + } + + /* Now loop all the PTEs in the range */ + while (PointerPte <= LastPte) + { + /* Have we crossed a PDE boundary? */ + if (MiIsPteOnPdeBoundary(PointerPte)) + { + /* Is this PDE demand zero? */ + PointerPde = MiAddressToPte(PointerPte); + if (PointerPde->u.Long != 0) + { + /* It isn't -- is it valid? */ + if (PointerPde->u.Hard.Valid == 0) + { + /* Nope, fault it in */ + PointerPte = MiPteToAddress(PointerPde); + MiMakeSystemAddressValid(PointerPte, Process); + } + } + else + { + /* It is, skip it and move to the next PDE */ + PointerPde++; + PointerPte = MiPteToAddress(PointerPde); + continue; + } + } + + /* Is this PTE demand zero? */ + if (PointerPte->u.Long != 0) + { + /* It isn't -- is it a decommited, invalid, or faulted PTE? */ + if ((PointerPte->u.Soft.Protection == MM_DECOMMIT) && + (PointerPte->u.Hard.Valid == 0) && + ((PointerPte->u.Soft.Prototype == 0) || + (PointerPte->u.Soft.PageFileHigh == MI_PTE_LOOKUP_NEEDED))) + { + /* It is, so remove it from the count of commited pages */ + CommittedPages--; + } + } + + /* Move to the next PTE */ + PointerPte++; + } + + /* Return how many committed pages there still are */ + return CommittedPages; + } + + /* This is a non-commited VAD, so assume none of it is committed */ + CommittedPages = 0; + + /* Is the PDE demand-zero? */ + PointerPde = MiAddressToPte(PointerPte); + if (PointerPde->u.Long != 0) + { + /* It isn't -- is it invalid? */ + if (PointerPde->u.Hard.Valid == 0) + { + /* It is, so page it in */ + PointerPte = MiPteToAddress(PointerPde); + MiMakeSystemAddressValid(PointerPte, Process); + } + } + else + { + /* It is, so skip it and move to the next PDE */ + PointerPde++; + PointerPte = MiPteToAddress(PointerPde); + if (PointerPte > LastPte) return CommittedPages; + } + + /* Loop all the PTEs in this PDE */ + while (PointerPte <= LastPte) + { + /* Have we crossed a PDE boundary? */ + if (MiIsPteOnPdeBoundary(PointerPte)) + { + /* Is this new PDE demand-zero? */ + PointerPde = MiAddressToPte(PointerPte); + if (PointerPde->u.Long != 0) + { + /* It isn't. Is it valid? */ + if (PointerPde->u.Hard.Valid == 0) + { + /* It isn't, so make it valid */ + PointerPte = MiPteToAddress(PointerPde); + MiMakeSystemAddressValid(PointerPte, Process); + } + } + else + { + /* It is, so skip it and move to the next one */ + PointerPde++; + PointerPte = MiPteToAddress(PointerPde); + continue; + } + } + + /* Is this PTE demand-zero? */ + if (PointerPte->u.Long != 0) + { + /* Nope. Is it a valid, non-decommited, non-paged out PTE? */ + if ((PointerPte->u.Soft.Protection != MM_DECOMMIT) || + (PointerPte->u.Hard.Valid == 1) || + ((PointerPte->u.Soft.Prototype == 1) && + (PointerPte->u.Soft.PageFileHigh != MI_PTE_LOOKUP_NEEDED))) + { + /* It is! So we'll treat this as a committed page */ + CommittedPages++; + } + } + + /* Move to the next PTE */ + PointerPte++; + } + + /* Return how many committed pages we found in this VAD */ + return CommittedPages; +} ULONG NTAPI @@ -1118,18 +1280,19 @@ /* If we get here, the PTE is valid, so look up the page in PFN database */ Pfn = MiGetPfnEntry(TempPte.u.Hard.PageFrameNumber); - if (!Pfn->u3.e1.PrototypePte) { /* Return protection of the original pte */ + ASSERT(Pfn->u4.AweAllocation == 0); return MmProtectToValue[Pfn->OriginalPte.u.Soft.Protection]; } - /* This is hardware PTE */ - UNIMPLEMENTED; - ASSERT(FALSE); - - return PAGE_NOACCESS; + /* This is software PTE */ + DPRINT1("Prototype PTE: %lx %p\n", TempPte.u.Hard.PageFrameNumber, Pfn); + DPRINT1("VA: %p\n", MiPteToAddress(&TempPte)); + DPRINT1("Mask: %lx\n", TempPte.u.Soft.Protection); + DPRINT1("Mask2: %lx\n", Pfn->OriginalPte.u.Soft.Protection); + return MmProtectToValue[TempPte.u.Soft.Protection]; } ULONG @@ -4049,11 +4212,13 @@ // and then change the ending address of the VAD to be a bit // smaller. // - // NOT YET IMPLEMENTED IN ARM3. - // - DPRINT1("Case C not handled\n"); - Status = STATUS_FREE_VM_NOT_AT_BASE; - goto FailPath; + MiLockWorkingSet(CurrentThread, AddressSpace); + CommitReduction = MiCalculatePageCommitment(StartingAddress, + EndingAddress, + Vad, + Process); + Vad->u.VadFlags.CommitCharge -= CommitReduction; + Vad->EndingVpn = ((ULONG_PTR)StartingAddress - 1) >> PAGE_SHIFT; } else {

1 0

[tkreuzer] 56514: [WIN32K] Rename PALETTE_AllocPalette2 to PALETTE_AllocPalette, allocate PALETTE and color array in one allocation, improve code
by tkreuzer＠svn.reactos.org 05 May '12

05 May '12

Author: tkreuzer Date: Sat May 5 17:29:34 2012 New Revision: 56514 URL: http://svn.reactos.org/svn/reactos?rev=56514&view=rev Log: [WIN32K] Rename PALETTE_AllocPalette2 to PALETTE_AllocPalette, allocate PALETTE and color array in one allocation, improve code Modified: trunk/reactos/win32ss/gdi/ntgdi/palette.c trunk/reactos/win32ss/gdi/ntgdi/palette.h Modified: trunk/reactos/win32ss/gdi/ntgdi/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/palette.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/palette.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/palette.c [iso-8859-1] Sat May 5 17:29:34 2012 @@ -145,62 +145,81 @@ lpPalE[i].peFlags = PC_SYS_USED | (lpPalE[i].peFlags & 0x07); } + PPALETTE NTAPI -PALETTE_AllocPalette2(ULONG Mode, - ULONG NumColors, - ULONG *Colors, - ULONG Red, - ULONG Green, - ULONG Blue) -{ - PPALETTE PalGDI; - - PalGDI = (PPALETTE)GDIOBJ_AllocateObject(GDIObjType_PAL_TYPE, - sizeof(PALETTE), - BASEFLAG_LOOKASIDE); - if (!PalGDI) - { - DPRINT1("Could not allocate a palette.\n"); +PALETTE_AllocPalette( + _In_ ULONG iMode, + _In_ ULONG cColors, + _In_ PULONG pulColors, + _In_ FLONG flRed, + _In_ FLONG flGreen, + _In_ FLONG flBlue) +{ + PPALETTE ppal; + ULONG fl = 0, cjSize = sizeof(PALETTE); + + /* Check if the palette has entries */ + if (iMode == PAL_INDEXED) + { + /* Check color count */ + if ((cColors == 0) || (cColors > 1024)) return NULL; + + /* Allocate enough space for the palete entries */ + cjSize += cColors * sizeof(PALETTEENTRY); + } + else + { + /* There are no palette entries */ + cColors = 0; + + /* We can use the lookaside list */ + fl |= BASEFLAG_LOOKASIDE; + } + + /* Allocate the object (without a handle!) */ + ppal = (PPALETTE)GDIOBJ_AllocateObject(GDIObjType_PAL_TYPE, cjSize, fl); + if (!ppal) + { return NULL; } - PalGDI->flFlags = Mode; - - if (NumColors > 0) - { - PalGDI->IndexedColors = ExAllocatePoolWithTag(PagedPool, - sizeof(PALETTEENTRY) * NumColors, - TAG_PALETTE); - if (NULL == PalGDI->IndexedColors) - { - GDIOBJ_vDeleteObject(&PalGDI->BaseObject); - return NULL; - } - if (Colors) RtlCopyMemory(PalGDI->IndexedColors, Colors, sizeof(PALETTEENTRY) * NumColors); - } - - if (Mode & PAL_INDEXED) - { - PalGDI->NumColors = NumColors; - } - else if (Mode & PAL_BITFIELDS) - { - PalGDI->RedMask = Red; - PalGDI->GreenMask = Green; - PalGDI->BlueMask = Blue; - - if (Red == 0x7c00 && Green == 0x3E0 && Blue == 0x1F) - PalGDI->flFlags |= PAL_RGB16_555; - else if (Red == 0xF800 && Green == 0x7E0 && Blue == 0x1F) - PalGDI->flFlags |= PAL_RGB16_565; - else if (Red == 0xFF0000 && Green == 0xFF00 && Blue == 0xFF) - PalGDI->flFlags |= PAL_BGR; - else if (Red == 0xFF && Green == 0xFF00 && Blue == 0xFF0000) - PalGDI->flFlags |= PAL_RGB; - } - - return PalGDI; + /* Set mode, color count and entry pointer */ + ppal->flFlags = iMode; + ppal->NumColors = cColors; + ppal->IndexedColors = ppal->apalColors; + + /* Check what kind of palette this is */ + if (iMode & PAL_INDEXED) + { + /* Check if we got a color array */ + if (pulColors) + { + /* Copy the entries */ + RtlCopyMemory(ppal->IndexedColors, + pulColors, + cColors * sizeof(ULONG)); + } + } + else if (iMode & PAL_BITFIELDS) + { + /* Copy the color masks */ + ppal->RedMask = flRed; + ppal->GreenMask = flGreen; + ppal->BlueMask = flBlue; + + /* Check what masks we have and set optimization flags */ + if ((flRed == 0x7c00) && (flGreen == 0x3E0) && (flBlue == 0x1F)) + ppal->flFlags |= PAL_RGB16_555; + else if ((flRed == 0xF800) && (flGreen == 0x7E0) && (flBlue == 0x1F)) + ppal->flFlags |= PAL_RGB16_565; + else if ((flRed == 0xFF0000) && (flGreen == 0xFF00) && (flBlue == 0xFF)) + ppal->flFlags |= PAL_BGR; + else if ((flRed == 0xFF) && (flGreen == 0xFF00) && (flBlue == 0xFF0000)) + ppal->flFlags |= PAL_RGB; + } + + return ppal; } PPALETTE @@ -216,7 +235,7 @@ PPALETTE ppal; /* Allocate the palette without a handle */ - ppal = PALETTE_AllocPalette2(iMode, cColors, pulColors, flRed, flGreen, flBlue); + ppal = PALETTE_AllocPalette(iMode, cColors, pulColors, flRed, flGreen, flBlue); if (!ppal) return NULL; /* Insert the palette into the handle table */ @@ -384,7 +403,7 @@ PPALETTE ppal; HPALETTE hpal; - ppal = PALETTE_AllocPalette2(iMode, cColors, pulColors, flRed, flGreen, flBlue); + ppal = PALETTE_AllocPalette(iMode, cColors, pulColors, flRed, flGreen, flBlue); if (!ppal) return NULL; hpal = GDIOBJ_hInsertObject(&ppal->BaseObject, GDI_OBJ_HMGR_PUBLIC); Modified: trunk/reactos/win32ss/gdi/ntgdi/palette.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/palette.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/palette.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/palette.h [iso-8859-1] Sat May 5 17:29:34 2012 @@ -59,7 +59,7 @@ PPALETTE NTAPI -PALETTE_AllocPalette2( +PALETTE_AllocPalette( _In_ ULONG iMode, _In_ ULONG cColors, _In_ PULONG pulColors, @@ -146,13 +146,3 @@ IN LPLOGPALETTE pLogPal, IN UINT cEntries); -//// - -HPALETTE -FASTCALL -PALETTE_AllocPalette(ULONG Mode, - ULONG NumColors, - ULONG *Colors, - ULONG Red, - ULONG Green, - ULONG Blue);

1 0

[tfaber] 56513: [WINETESTS] - Do not multiply define WINVER and friends - Add missing _WIN32_WINNT define in rpcrt4_winetest. Already sent to Wine(TM)
by tfaber＠svn.reactos.org 05 May '12

05 May '12

Author: tfaber Date: Sat May 5 16:54:37 2012 New Revision: 56513 URL: http://svn.reactos.org/svn/reactos?rev=56513&view=rev Log: [WINETESTS] - Do not multiply define WINVER and friends - Add missing _WIN32_WINNT define in rpcrt4_winetest. Already sent to Wine(TM) Modified: trunk/rostests/winetests/comctl32/CMakeLists.txt trunk/rostests/winetests/ntdll/CMakeLists.txt trunk/rostests/winetests/rpcrt4/CMakeLists.txt trunk/rostests/winetests/rpcrt4/ndr_marshall.c Modified: trunk/rostests/winetests/comctl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/CMakeL… ============================================================================== --- trunk/rostests/winetests/comctl32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/comctl32/CMakeLists.txt [iso-8859-1] Sat May 5 16:54:37 2012 @@ -1,11 +1,7 @@ + +remove_definitions(-D_WIN32_WINNT=0x502 -D_WIN32_IE=0x600) add_definitions(-D__ROS_LONG64__) - -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600) - -remove_definitions(-D_WIN32_IE=0x600) -add_definitions(-D_WIN32_IE=0x500) list(APPEND SOURCE comboex.c @@ -42,8 +38,7 @@ else() # FIXME: http://www.cmake.org/Bug/view.php?id=12998 #add_target_compile_flags(comctl32_winetest "-Wno-format") - #allow_warnings(comctl32_winetest) - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-format -Wno-error") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-format") endif() set_module_type(comctl32_winetest win32cui) Modified: trunk/rostests/winetests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/CMakeList… ============================================================================== --- trunk/rostests/winetests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/CMakeLists.txt [iso-8859-1] Sat May 5 16:54:37 2012 @@ -1,7 +1,7 @@ -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) +remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502) + +add_definitions(-D__ROS_LONG64__) list(APPEND SOURCE atom.c Modified: trunk/rostests/winetests/rpcrt4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/CMakeLis… ============================================================================== --- trunk/rostests/winetests/rpcrt4/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/CMakeLists.txt [iso-8859-1] Sat May 5 16:54:37 2012 @@ -1,10 +1,7 @@ remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x500) - -add_definitions( - -D__ROS_LONG64__) +add_definitions(-D__ROS_LONG64__) include_directories(${CMAKE_CURRENT_BINARY_DIR}) @@ -47,5 +44,4 @@ if(NOT MSVC) add_target_compile_flags(rpcrt4_winetest "-Wno-format") - allow_warnings(rpcrt4_winetest) endif() Modified: trunk/rostests/winetests/rpcrt4/ndr_marshall.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/ndr_mars… ============================================================================== --- trunk/rostests/winetests/rpcrt4/ndr_marshall.c [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/ndr_marshall.c [iso-8859-1] Sat May 5 16:54:37 2012 @@ -20,6 +20,7 @@ #include <stdarg.h> +#define _WIN32_WINNT 0x0500 #define NTDDI_WIN2K 0x05000000 #define NTDDI_VERSION NTDDI_WIN2K /* for some MIDL_STUB_MESSAGE fields */

1 0

[tkreuzer] 56512: [GDI32_APITEST] - Try to fix some more test fails on win 2003
by tkreuzer＠svn.reactos.org 05 May '12

05 May '12

Author: tkreuzer Date: Sat May 5 14:19:22 2012 New Revision: 56512 URL: http://svn.reactos.org/svn/reactos?rev=56512&view=rev Log: [GDI32_APITEST] - Try to fix some more test fails on win 2003 Modified: trunk/rostests/apitests/gdi32/DPtoLP.c trunk/rostests/apitests/gdi32/GetObject.c Modified: trunk/rostests/apitests/gdi32/DPtoLP.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/DPtoLP.c?r… ============================================================================== --- trunk/rostests/apitests/gdi32/DPtoLP.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/DPtoLP.c [iso-8859-1] Sat May 5 14:19:22 2012 @@ -11,7 +11,6 @@ void Test_DPtoLP_Params() { - BOOL ret; HDC hdc; POINT apt[2]; @@ -21,53 +20,43 @@ apt[1].y = 1000; SetLastError(ERROR_SUCCESS); - ret = DPtoLP(NULL, NULL, 0); - ok(ret == 1, "Expected ret == 1, got %d\n", ret); - ok(GetLastError() == ERROR_SUCCESS, "Exected ERROR_SUCCESS, got %ld\n", GetLastError()); + ok_int(DPtoLP(NULL, NULL, 0), 1); + ok_err(ERROR_SUCCESS); - ret = DPtoLP(NULL, NULL, -1); - ok(ret == 1, "Expected ret == 1, got %d\n", ret); - ok(GetLastError() == ERROR_SUCCESS, "Exected ERROR_SUCCESS, got %ld\n", GetLastError()); + ok_int(DPtoLP(NULL, NULL, -1), 1); + ok_err(ERROR_SUCCESS); - ret = DPtoLP(NULL, (PVOID)0x80000000, -1); - ok(ret == 1, "Expected ret == 1, got %d\n", ret); - ok(GetLastError() == ERROR_SUCCESS, "Exected ERROR_SUCCESS, got %ld\n", GetLastError()); + ok_int(DPtoLP(NULL, (PVOID)0x80000000, -1), 1); + ok_err(ERROR_SUCCESS); - ret = DPtoLP(NULL, NULL, 2); - ok(ret == 0, "Expected ret == 0, got %d\n", ret); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "Exected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); + ok_int(DPtoLP(NULL, NULL, 2), 0); + ok_err(ERROR_INVALID_PARAMETER); SetLastError(ERROR_SUCCESS); - ret = DPtoLP(NULL, apt, 2); - ok(ret == 0, "Expected ret == 0, got %d\n", ret); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "Exected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); + ok_int(DPtoLP(NULL, apt, 2), 0); + ok_err(ERROR_INVALID_PARAMETER); SetLastError(ERROR_SUCCESS); - ret = DPtoLP(NULL, apt, 0); - ok(ret == 1, "Expected ret == 1, got %d\n", ret); - ok(GetLastError() == ERROR_SUCCESS, "Exected ERROR_SUCCESS, got %ld\n", GetLastError()); + ok_int(DPtoLP(NULL, apt, 0), 1); + ok(GetLastError() == ERROR_SUCCESS, "Exected ERROR_SUCCESS, got %ld\n", GetLastError()); SetLastError(ERROR_SUCCESS); - ret = DPtoLP(NULL, apt, -2); - ok(ret == 1, "Expected ret == 1, got %d\n", ret); - ok(GetLastError() == ERROR_SUCCESS, "Exected ERROR_SUCCESS, got %ld\n", GetLastError()); + ok_int(DPtoLP(NULL, apt, -2), 1); + ok_err(ERROR_SUCCESS); SetLastError(ERROR_SUCCESS); - ret = DPtoLP((HDC)-4, apt, -2); - ok(ret == 1, "Expected ret == 1, got %d\n", ret); - ok(GetLastError() == ERROR_SUCCESS, "Exected ERROR_SUCCESS, got %ld\n", GetLastError()); + ok_int(DPtoLP((HDC)-4, apt, -2), 1); + ok_err(ERROR_SUCCESS); hdc = GetDC(0); SetLastError(ERROR_SUCCESS); - ret = DPtoLP(hdc, NULL, 2); - ok(ret == 1, "Expected ret == 1, got %d\n", ret); - ok(GetLastError() == ERROR_SUCCESS, "Exected ERROR_SUCCESS, got %ld\n", GetLastError()); + ok_int(DPtoLP(hdc, NULL, 2), 1); + ok_err(ERROR_SUCCESS); hdc = GetDC(0); SetLastError(ERROR_SUCCESS); - ret = DPtoLP(hdc, (PVOID)0x80000000, 2); - ok(ret == 1, "Expected ret == 1, got %d\n", ret); - ok(GetLastError() == ERROR_SUCCESS, "Exected ERROR_SUCCESS, got %ld\n", GetLastError()); + ok_int(DPtoLP(hdc, (PVOID)0x80000000, 2), 1); + ok_err(ERROR_SUCCESS); ReleaseDC(0, hdc); @@ -75,10 +64,10 @@ void Test_DPtoLP() { - BOOL ret; HDC hdc; POINT apt[2]; XFORM xform; + LONG lLogPixelsX, lLogPixelsY; apt[0].x = 1; apt[0].y = 1; @@ -86,23 +75,23 @@ apt[1].y = 1000; hdc = GetDC(0); + lLogPixelsX = GetDeviceCaps(hdc, LOGPIXELSX); + lLogPixelsY = GetDeviceCaps(hdc, LOGPIXELSY); SetMapMode(hdc, MM_TEXT); - ret = DPtoLP(hdc, apt, 2); - ok(ret == 1, "Expected ret == 1, got %d\n", ret); + ok_int(DPtoLP(hdc, apt, 2), 1); ok_int(apt[0].x, 1); ok_int(apt[0].y, 1); ok_int(apt[1].x, -1000); ok_int(apt[1].y, 1000); + apt[0].x = 100; apt[0].y = 256; apt[1].x = -1000; apt[1].y = 1000; SetMapMode(hdc, MM_LOMETRIC); - ret = DPtoLP(hdc, apt, 2); - ok(ret == 1, "Expected ret == 1, got %d\n", ret); - ok_int(apt[0].x, 4); - ok_int(apt[0].y, -4); - ok_int(apt[1].x, -3527); - ok_int(apt[1].y, -3527); - + ok_int(DPtoLP(hdc, apt, 2), 1); + ok_int(apt[0].x * lLogPixelsX, 33888 ); + ok_int(apt[0].y * lLogPixelsY, -86688 ); + ok_int(apt[1].x * lLogPixelsX, -338688 ); + ok_int(apt[1].y * lLogPixelsY, -338688 ); SetGraphicsMode(hdc, GM_ADVANCED); SetMapMode(hdc, MM_ANISOTROPIC); @@ -110,73 +99,61 @@ xform.eM12 = 0.; xform.eM21 = 0.; xform.eM22 = 1.; - xform.eDx = 4294967167.999999761; + xform.eDx = (FLOAT)4294967167.999999761; xform.eDy = 1.; - ret = SetWorldTransform(hdc, &xform); - ok(ret == 1, "ret\n"); + ok_int(SetWorldTransform(hdc, &xform), 1); - ret = DPtoLP(hdc, apt, 2); - ok(ret == 1, "Expected ret == 0, got %d\n", ret); - ok_int(apt[0].x, 526); - ok_int(apt[0].y, 13); - ok_int(apt[1].x, -11929); - ok_int(apt[1].y, 12440); + apt[0].x = 100; apt[0].y = 256; apt[1].x = -1000; apt[1].y = 1000; + ok_int(DPtoLP(hdc, apt, 2), 1); + ok_int(apt[0].x * lLogPixelsX, 58464 ); + ok_int(apt[0].y * lLogPixelsY, -86784 ); + ok_int(apt[1].x * lLogPixelsX, -314112 ); + ok_int(apt[1].y * lLogPixelsY, -338784 ); + apt[0].x = 100; apt[0].y = 256; apt[1].x = -1000; apt[1].y = 1000; xform.eM11 = 10000000.; - ret = SetWorldTransform(hdc, &xform); - ret = DPtoLP(hdc, apt, 2); - ok(ret == 1, "Expected ret == 0, got %d\n", ret); - ok_int(apt[0].x, -429); - ok_int(apt[0].y, -47); - ok_int(apt[1].x, -429); - ok_int(apt[1].y, -43881); + ok_int(SetWorldTransform(hdc, &xform), 1); + ok_int(DPtoLP(hdc, apt, 2), 1); + ok_int(apt[0].x * lLogPixelsX, -41184 ); + ok_int(apt[0].y * lLogPixelsY, -86784 ); + ok_int(apt[1].x * lLogPixelsX, -41184 ); + ok_int(apt[1].y * lLogPixelsY, -338784 ); + apt[0].x = 100; apt[0].y = 256; apt[1].x = -1000; apt[1].y = 1000; xform.eM11 = 1.; - xform.eDx = 4294967167.999999762; // this is too big - ret = SetWorldTransform(hdc, &xform); - ok(ret == 1, "ret\n"); - ret = DPtoLP(hdc, apt, 2); - ok(ret == 0, "Expected ret == 0, got %d\n", ret); - ok_int(apt[0].x, -429); - ok_int(apt[0].y, -47); - ok_int(apt[1].x, -429); - ok_int(apt[1].y, -43881); + xform.eDx = (FLOAT)4294967167.999999762; // this is too big + ok_int(SetWorldTransform(hdc, &xform), 1); + ok_int(DPtoLP(hdc, apt, 2), 0); + ok_int(apt[0].x, 100 ); + ok_int(apt[0].y, 256 ); + ok_int(apt[1].x, -1000 ); + ok_int(apt[1].y, 1000 ); xform.eM11 = 2.; - xform.eDx = 4294967167.999999762; - ret = SetWorldTransform(hdc, &xform); - ok(ret == 1, "ret\n"); - ret = DPtoLP(hdc, apt, 2); - ok(ret == 1, "Expected ret == 1, got %d\n", ret); - ok_int(apt[0].x, 2147482891); - ok_int(apt[0].y, 165); - ok_int(apt[1].x, 2147482891); - ok_int(apt[1].y, 154782); + xform.eDx = (FLOAT)4294967167.999999762; + ok_int(SetWorldTransform(hdc, &xform), 1); + ok_int(DPtoLP(hdc, apt, 2), 1); + ok_int(apt[0].x * lLogPixelsX, 16896 ); + ok_int(apt[0].y * lLogPixelsY, -86784 ); + ok_int(apt[1].x * lLogPixelsX, -169344 ); + ok_int(apt[1].y * lLogPixelsY, -338784 ); - apt[0].x = 1; - apt[0].y = 1; - apt[1].x = -1000; - apt[1].y = 1000; - + apt[0].x = 100; apt[0].y = 256; apt[1].x = -1000; apt[1].y = 1000; xform.eM11 = 10000000.; - ret = SetWorldTransform(hdc, &xform); - ok(ret == 1, "ret\n"); - ret = DPtoLP(hdc, apt, 2); - ok(ret == 1, "Expected ret == 1, got %d\n", ret); - ok_int(apt[0].x, -429); - ok_int(apt[0].y, -5); - ok_int(apt[1].x, -429); - ok_int(apt[1].y, -3528); + ok_int(SetWorldTransform(hdc, &xform), 1); + ok_int(DPtoLP(hdc, apt, 2), 1); + ok_int(apt[0].x * lLogPixelsX, -41184 ); + ok_int(apt[0].y * lLogPixelsY, -86784 ); + ok_int(apt[1].x * lLogPixelsX, -41184 ); + ok_int(apt[1].y * lLogPixelsY, -338784 ); xform.eM11 = 1000000.; - ret = SetWorldTransform(hdc, &xform); - ok(ret == 1, "ret\n"); - ret = DPtoLP(hdc, apt, 2); - ok(ret == 1, "Expected ret == 1, got %d\n", ret); - ok_int(apt[0].x, -4295); - ok_int(apt[0].y, 17); - ok_int(apt[1].x, -4295); - ok_int(apt[1].y, 12443); + ok_int(SetWorldTransform(hdc, &xform), 1); + ok_int(DPtoLP(hdc, apt, 2), 1); + ok_int(apt[0].x * lLogPixelsX, -412320 ); + ok_int(apt[0].y * lLogPixelsY, 306048 ); + ok_int(apt[1].x * lLogPixelsX, -412320 ); + ok_int(apt[1].y * lLogPixelsY, 1195104 ); ReleaseDC(0, hdc); } Modified: trunk/rostests/apitests/gdi32/GetObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetObject.… ============================================================================== --- trunk/rostests/apitests/gdi32/GetObject.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetObject.c [iso-8859-1] Sat May 5 14:19:22 2012 @@ -127,15 +127,15 @@ //ok(GetObject(hBrush, sizeof(LOGBRUSH), plogbrush) == 0, "\n"); // fails on win7 /* Test invalid buffer */ - SetLastError(ERROR_SUCCESS); + SetLastError(0xbadbad00); ok(GetObjectA(GetStockObject(WHITE_BRUSH), sizeof(LOGBRUSH), (PVOID)0xc0000000) == 0, "\n"); - ok(GetLastError() == ERROR_NOACCESS, "expected ERROR_NOACCESS, got %ld\n", GetLastError()); + ok((GetLastError() == 0xbadbad00) || (GetLastError() == ERROR_NOACCESS), "wrong error: %ld\n", GetLastError()); SetLastError(ERROR_SUCCESS); ok(GetObjectW(GetStockObject(BLACK_PEN), sizeof(LOGPEN), (PVOID)0xc0000000) == 0, "\n"); - ok(GetLastError() == ERROR_NOACCESS, "expected ERROR_NOACCESS, got %ld\n", GetLastError()); + ok((GetLastError() == 0xbadbad00) || (GetLastError() == ERROR_NOACCESS), "wrong error: %ld\n", GetLastError()); SetLastError(ERROR_SUCCESS); ok(GetObjectW(GetStockObject(21), sizeof(BITMAP), (PVOID)0xc0000000) == 0, "\n"); - ok(GetLastError() == ERROR_NOACCESS, "expected ERROR_NOACCESS, got %ld\n", GetLastError()); + ok((GetLastError() == 0xbadbad00) || (GetLastError() == ERROR_NOACCESS), "wrong error: %ld\n", GetLastError()); SetLastError(ERROR_SUCCESS); ok(GetObjectW(GetStockObject(SYSTEM_FONT), sizeof(LOGFONT), (PVOID)0xc0000000) == 0, "\n"); ok(GetLastError() == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %ld\n", GetLastError()); @@ -157,11 +157,11 @@ /* Test buffer size of 0 */ SetLastError(ERROR_SUCCESS); - ok(GetObjectA(GetStockObject(WHITE_BRUSH), 0, &TestStruct) == sizeof(LOGBRUSH), "\n"); + ok_long(GetObjectA(GetStockObject(WHITE_BRUSH), 0, &TestStruct), sizeof(LOGBRUSH)); ok(GetLastError() == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %ld\n", GetLastError()); SetLastError(ERROR_SUCCESS); ok(GetObjectA(GetStockObject(BLACK_PEN), 0, &TestStruct) == 0, "\n"); - ok(GetLastError() == ERROR_NOACCESS, "expected ERROR_NOACCESS, got %ld\n", GetLastError()); + ok((GetLastError() == 0xbadbad00) || (GetLastError() == ERROR_NOACCESS), "wrong error: %ld\n", GetLastError()); SetLastError(ERROR_SUCCESS); ok(GetObjectW(GetStockObject(SYSTEM_FONT), 0, &TestStruct) == 0, "\n"); ok(GetLastError() == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %ld\n", GetLastError()); @@ -458,7 +458,7 @@ ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %ld\n", GetLastError()); SetLastError(ERROR_SUCCESS); ok(GetObject(hPen, 0, &extlogpen) == 0, "\n"); - ok(GetLastError() == ERROR_NOACCESS, "got %ld\n", GetLastError()); + ok((GetLastError() == 0xbadbad00) || (GetLastError() == ERROR_NOACCESS), "wrong error: %ld\n", GetLastError()); SetLastError(ERROR_SUCCESS); ok(GetObject(hPen, 4, &extlogpen) == 0, "\n"); ok(GetLastError() == ERROR_SUCCESS, "got %ld\n", GetLastError()); @@ -627,19 +627,18 @@ SetLastError(ERROR_SUCCESS); GetObjectA((HANDLE)GDI_OBJECT_TYPE_COLORSPACE, 0, NULL); //ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_COLORSPACE, 0, NULL) == 60, "\n");// FIXME: what structure? fails on win7 - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "\n"); + ok_err(ERROR_INSUFFICIENT_BUFFER); SetLastError(ERROR_SUCCESS); ok(GetObjectW((HANDLE)GDI_OBJECT_TYPE_COLORSPACE, 0, NULL) == 0, "\n"); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "\n"); + ok_err(ERROR_INSUFFICIENT_BUFFER); SetLastError(ERROR_SUCCESS); ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_COLORSPACE, 327, buffer) == 0, "\n"); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %ld\n", GetLastError()); + ok_err(ERROR_INSUFFICIENT_BUFFER); ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_COLORSPACE, 328, buffer) == 0, "\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); - - ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_COLORSPACE, 328, NULL) == 0, "\n"); - //ok(ret == 0, "Expected ... got %d\n", ret); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %ld\n", GetLastError()); + ok_err(ERROR_INVALID_PARAMETER); + + ok_long(GetObjectA((HANDLE)GDI_OBJECT_TYPE_COLORSPACE, 328, NULL), 0); + ok_err(ERROR_INSUFFICIENT_BUFFER); } void

1 0

[tkreuzer] 56511: [GDI32_APITEST] - Try to fix some more test fails on win 2003
by tkreuzer＠svn.reactos.org 05 May '12

05 May '12

Author: tkreuzer Date: Sat May 5 12:59:08 2012 New Revision: 56511 URL: http://svn.reactos.org/svn/reactos?rev=56511&view=rev Log: [GDI32_APITEST] - Try to fix some more test fails on win 2003 Modified: trunk/rostests/apitests/gdi32/GetRandomRgn.c trunk/rostests/apitests/gdi32/MaskBlt.c Modified: trunk/rostests/apitests/gdi32/GetRandomRgn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetRandomR… ============================================================================== --- trunk/rostests/apitests/gdi32/GetRandomRgn.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetRandomRgn.c [iso-8859-1] Sat May 5 12:59:08 2012 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS api tests * LICENSE: GPL - See COPYING in the top level directory - * PURPOSE: Test for ... + * PURPOSE: Test for GetRandomRgn * PROGRAMMERS: Timo Kreuzer */ @@ -41,22 +41,22 @@ SetLastError(0xbadbad00); ret = GetRandomRgn(NULL, NULL, 0); ok_int(ret, -1); - ok_long(GetLastError(), 0xbadbad00); + ok((GetLastError() == 0xbadbad00) || (GetLastError() == ERROR_INVALID_HANDLE), "wrong error: %ld\n", GetLastError()); SetLastError(0xbadbad00); ret = GetRandomRgn(NULL, NULL, CLIPRGN); ok_int(ret, -1); - ok_long(GetLastError(), 0xbadbad00); + ok((GetLastError() == 0xbadbad00) || (GetLastError() == ERROR_INVALID_HANDLE), "wrong error: %ld\n", GetLastError()); SetLastError(0xbadbad00); ret = GetRandomRgn(NULL, hrgn, 0); ok_int(ret, -1); - ok_long(GetLastError(), 0xbadbad00); + ok((GetLastError() == 0xbadbad00) || (GetLastError() == ERROR_INVALID_HANDLE), "wrong error: %ld\n", GetLastError()); SetLastError(0xbadbad00); ret = GetRandomRgn(NULL, hrgn, CLIPRGN); ok_int(ret, -1); - ok_long(GetLastError(), 0xbadbad00); + ok((GetLastError() == 0xbadbad00) || (GetLastError() == ERROR_INVALID_HANDLE), "wrong error: %ld\n", GetLastError()); SetLastError(0xbadbad00); ret = GetRandomRgn(hdc, NULL, 0); @@ -101,7 +101,7 @@ SetLastError(0xbadbad00); ret = GetRandomRgn((HDC)0x123, hrgn, CLIPRGN); ok_int(ret, -1); - ok_long(GetLastError(), 0xbadbad00); + ok((GetLastError() == 0xbadbad00) || (GetLastError() == ERROR_INVALID_HANDLE), "wrong error: %ld\n", GetLastError()); DeleteObject(hrgn); DeleteDC(hdc); Modified: trunk/rostests/apitests/gdi32/MaskBlt.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/MaskBlt.c?… ============================================================================== --- trunk/rostests/apitests/gdi32/MaskBlt.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/MaskBlt.c [iso-8859-1] Sat May 5 12:59:08 2012 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS api tests * LICENSE: GPL - See COPYING in the top level directory - * PURPOSE: Test for GdiReleaseLocalDC + * PURPOSE: Test for MaskBlt * PROGRAMMERS: Timo Kreuzer */ @@ -12,25 +12,30 @@ void Test_MaskBlt_1bpp() { HDC hdcDst, hdcSrc; - BITMAPINFO bmi = {{sizeof(BITMAPINFOHEADER), 8, 1, 1, 1, BI_RGB, 0, 10, 10, 0,0}}; + struct + { + BITMAPINFOHEADER bmiHeader; + ULONG aulColors[2]; + } bmiData = {{sizeof(BITMAPINFOHEADER), 8, 1, 1, 1, BI_RGB, 0, 10, 10, 2,0}, {0, 0xFFFFFF}}; + PBITMAPINFO pbmi = (PBITMAPINFO)&bmiData; HBITMAP hbmDst, hbmSrc, hbmMsk; PUCHAR pjBitsDst, pjBitsSrc, pjBitsMsk; BOOL ret; /* Create a dest dc and bitmap */ hdcDst = CreateCompatibleDC(NULL); - hbmDst = CreateDIBSection(hdcDst, &bmi, DIB_RGB_COLORS, (PVOID*)&pjBitsDst, NULL, 0); + hbmDst = CreateDIBSection(hdcDst, pbmi, DIB_RGB_COLORS, (PVOID*)&pjBitsDst, NULL, 0); SelectObject(hdcDst, hbmDst); /* Create a source dc and bitmap */ hdcSrc = CreateCompatibleDC(NULL); - hbmSrc = CreateDIBSection(hdcSrc, &bmi, DIB_RGB_COLORS, (PVOID*)&pjBitsSrc, NULL, 0); + hbmSrc = CreateDIBSection(hdcSrc, pbmi, DIB_RGB_COLORS, (PVOID*)&pjBitsSrc, NULL, 0); SelectObject(hdcSrc, hbmSrc); /* Create a 1 bpp mask bitmap */ - hbmMsk = CreateDIBSection(hdcDst, &bmi, DIB_RGB_COLORS, (PVOID*)&pjBitsMsk, NULL, 0); + hbmMsk = CreateDIBSection(hdcDst, pbmi, DIB_RGB_COLORS, (PVOID*)&pjBitsMsk, NULL, 0); - /* Do the masking */ + /* Do the masking (SRCCOPY / NOOP) */ pjBitsDst[0] = 0xAA; pjBitsSrc[0] = 0xCC; pjBitsMsk[0] = 0xF0; @@ -45,13 +50,29 @@ ok(ret == 1, "MaskBlt failed (%d)\n", ret); ok (pjBitsDst[0] == 0xF0, "pjBitsDst[0] == 0x%x\n", pjBitsDst[0]); + /* Do the masking (NOTSRCERASE / SRCINVERT) */ + pjBitsDst[0] = 0xF0; + pjBitsSrc[0] = 0xCC; + pjBitsMsk[0] = 0xAA; + ret = MaskBlt(hdcDst, 0, 0, 8, 1, hdcSrc, 0, 0, hbmMsk, 0, 0, MAKEROP4(NOTSRCERASE, SRCINVERT)); // 22 + ok(ret == 1, "MaskBlt failed (%d)\n", ret); + ok (pjBitsDst[0] == 0x16, "pjBitsDst[0] == 0x%x\n", pjBitsDst[0]); + + /* Do the masking (MERGEPAINT / DSxn) */ + pjBitsDst[0] = 0xF0; + pjBitsSrc[0] = 0xCC; + pjBitsMsk[0] = 0xAA; + ret = MaskBlt(hdcDst, 0, 0, 8, 1, hdcSrc, 0, 0, hbmMsk, 0, 0, MAKEROP4(MERGEPAINT, 0x990000)); + ok(ret == 1, "MaskBlt failed (%d)\n", ret); + ok (pjBitsDst[0] == 0xE3, "pjBitsDst[0] == 0x%x\n", pjBitsDst[0]); + } void Test_MaskBlt_16bpp() { HDC hdcDst, hdcSrc; - BITMAPINFO bmi1 = {{sizeof(BITMAPINFOHEADER), 8, 1, 1, 1, BI_RGB, 0, 10, 10, 0,0}}; - BITMAPINFO bmi32 = {{sizeof(BITMAPINFOHEADER), 8, 1, 1, 16, BI_RGB, 0, 10, 10, 0,0}}; + BITMAPINFO bmi1 = {{sizeof(BITMAPINFOHEADER), 8, 1, 1, 1, BI_RGB, 0, 10, 10, 0,0}}; + BITMAPINFO bmi32 = {{sizeof(BITMAPINFOHEADER), 8, 1, 1, 16, BI_RGB, 0, 10, 10, 0,0}}; HBITMAP hbmDst, hbmSrc, hbmMsk; PUCHAR pjBitsMsk; PUSHORT pusBitsDst, pusBitsSrc; @@ -59,18 +80,18 @@ /* Create a dest dc and bitmap */ hdcDst = CreateCompatibleDC(NULL); - hbmDst = CreateDIBSection(hdcDst, &bmi32, DIB_RGB_COLORS, (PVOID*)&pusBitsDst, NULL, 0); + hbmDst = CreateDIBSection(hdcDst, &bmi32, DIB_RGB_COLORS, (PVOID*)&pusBitsDst, NULL, 0); SelectObject(hdcDst, hbmDst); /* Create a source dc and bitmap */ hdcSrc = CreateCompatibleDC(NULL); - hbmSrc = CreateDIBSection(hdcSrc, &bmi32, DIB_RGB_COLORS, (PVOID*)&pusBitsSrc, NULL, 0); + hbmSrc = CreateDIBSection(hdcSrc, &bmi32, DIB_RGB_COLORS, (PVOID*)&pusBitsSrc, NULL, 0); SelectObject(hdcSrc, hbmSrc); - ok(hdcSrc && hbmSrc, "\n"); + ok(hdcSrc && hbmSrc, "\n"); /* Create a 1 bpp mask bitmap */ - hbmMsk = CreateDIBSection(hdcDst, &bmi1, DIB_RGB_COLORS, (PVOID*)&pjBitsMsk, NULL, 0); - ok(hbmMsk != 0, "CreateDIBSection failed\n"); + hbmMsk = CreateDIBSection(hdcDst, &bmi1, DIB_RGB_COLORS, (PVOID*)&pjBitsMsk, NULL, 0); + ok(hbmMsk != 0, "CreateDIBSection failed\n"); /* Do the masking */ pusBitsDst[0] = 0x1234; @@ -94,8 +115,8 @@ void Test_MaskBlt_32bpp() { HDC hdcDst, hdcSrc; - BITMAPINFO bmi1 = {{sizeof(BITMAPINFOHEADER), 8, 1, 1, 1, BI_RGB, 0, 10, 10, 0,0}}; - BITMAPINFO bmi32 = {{sizeof(BITMAPINFOHEADER), 8, 1, 1, 32, BI_RGB, 0, 10, 10, 0,0}}; + BITMAPINFO bmi1 = {{sizeof(BITMAPINFOHEADER), 8, 1, 1, 1, BI_RGB, 0, 10, 10, 0,0}}; + BITMAPINFO bmi32 = {{sizeof(BITMAPINFOHEADER), 8, 1, 1, 32, BI_RGB, 0, 10, 10, 0,0}}; HBITMAP hbmDst, hbmSrc, hbmMsk; PUCHAR pjBitsMsk; PULONG pulBitsDst, pulBitsSrc; @@ -103,18 +124,18 @@ /* Create a dest dc and bitmap */ hdcDst = CreateCompatibleDC(NULL); - hbmDst = CreateDIBSection(hdcDst, &bmi32, DIB_RGB_COLORS, (PVOID*)&pulBitsDst, NULL, 0); + hbmDst = CreateDIBSection(hdcDst, &bmi32, DIB_RGB_COLORS, (PVOID*)&pulBitsDst, NULL, 0); SelectObject(hdcDst, hbmDst); /* Create a source dc and bitmap */ hdcSrc = CreateCompatibleDC(NULL); - hbmSrc = CreateDIBSection(hdcSrc, &bmi32, DIB_RGB_COLORS, (PVOID*)&pulBitsSrc, NULL, 0); + hbmSrc = CreateDIBSection(hdcSrc, &bmi32, DIB_RGB_COLORS, (PVOID*)&pulBitsSrc, NULL, 0); SelectObject(hdcSrc, hbmSrc); - ok(hdcSrc && hbmSrc, "\n"); + ok(hdcSrc && hbmSrc, "\n"); /* Create a 1 bpp mask bitmap */ - hbmMsk = CreateDIBSection(hdcDst, &bmi1, DIB_RGB_COLORS, (PVOID*)&pjBitsMsk, NULL, 0); - ok(hbmMsk != 0, "CreateDIBSection failed\n"); + hbmMsk = CreateDIBSection(hdcDst, &bmi1, DIB_RGB_COLORS, (PVOID*)&pjBitsMsk, NULL, 0); + ok(hbmMsk != 0, "CreateDIBSection failed\n"); /* Do the masking */ pulBitsDst[0] = 0x12345678; @@ -143,6 +164,6 @@ case 16: Test_MaskBlt_16bpp(); break; case 32: Test_MaskBlt_32bpp(); break; } - + }

1 0

[tkreuzer] 56510: Add missing test data files
by tkreuzer＠svn.reactos.org 05 May '12

05 May '12

Author: tkreuzer Date: Sat May 5 12:24:49 2012 New Revision: 56510 URL: http://svn.reactos.org/svn/reactos?rev=56510&view=rev Log: Add missing test data files Added: trunk/rostests/apitests/testdata/test.pfb (with props) trunk/rostests/apitests/testdata/test.pfm (with props) Added: trunk/rostests/apitests/testdata/test.pfb URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/testdata/test.pf… ============================================================================== Binary file - no diff available. Propchange: trunk/rostests/apitests/testdata/test.pfb ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/rostests/apitests/testdata/test.pfm URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/testdata/test.pf… ============================================================================== Binary file - no diff available. Propchange: trunk/rostests/apitests/testdata/test.pfm ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[tkreuzer] 56509: [GDI32_APITEST] - Comment out tests that fail on windows 2003 - Try to fix a number of tests for Windows 2003
by tkreuzer＠svn.reactos.org 05 May '12

05 May '12

Author: tkreuzer Date: Sat May 5 12:21:56 2012 New Revision: 56509 URL: http://svn.reactos.org/svn/reactos?rev=56509&view=rev Log: [GDI32_APITEST] - Comment out tests that fail on windows 2003 - Try to fix a number of tests for Windows 2003 Modified: trunk/rostests/apitests/gdi32/CombineRgn.c trunk/rostests/apitests/gdi32/CombineTransform.c trunk/rostests/apitests/gdi32/CreateBitmap.c trunk/rostests/apitests/gdi32/CreateBitmapIndirect.c Modified: trunk/rostests/apitests/gdi32/CombineRgn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CombineRgn… ============================================================================== --- trunk/rostests/apitests/gdi32/CombineRgn.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CombineRgn.c [iso-8859-1] Sat May 5 12:21:56 2012 @@ -21,7 +21,7 @@ ok_long(CombineRgn(NULL, NULL, NULL, 0), ERROR); ok_long(CombineRgn(hrgn1, hrgn2, hrgn3, 0), ERROR); ok_long(CombineRgn(hrgn1, hrgn2, hrgn3, 6), ERROR); - ok_long(GetLastError(), 0xbadbabe); + ok((GetLastError() == 0xbadbabe) || (GetLastError() == ERROR_INVALID_PARAMETER), "wrong error: %ld\n", GetLastError()); } @@ -38,7 +38,7 @@ ok_long(CombineRgn(NULL, hrgn1, NULL, RGN_COPY), ERROR); ok_long(CombineRgn(NULL, NULL, hrgn1, RGN_COPY), ERROR); ok_long(CombineRgn(NULL, hrgn1, hrgn2, RGN_COPY), ERROR); - ok_long(GetLastError(), 0xbadbabe); + ok((GetLastError() == 0xbadbabe) || (GetLastError() == ERROR_INVALID_HANDLE), "wrong error: %ld\n", GetLastError()); ok_long(CombineRgn(hrgn1, hrgn2, hrgn3, RGN_COPY), SIMPLEREGION); ok(EqualRgn(hrgn1, hrgn2), "Region is not correct\n"); @@ -58,7 +58,7 @@ ok_long(CombineRgn(hrgn1, NULL, NULL, RGN_COPY), ERROR); ok(EqualRgn(hrgn1, hrgn3), "Region is not correct\n"); - ok_long(GetLastError(), 0xbadbabe); + ok((GetLastError() == 0xbadbabe) || (GetLastError() == ERROR_INVALID_HANDLE), "wrong error: %ld\n", GetLastError()); } @@ -77,7 +77,7 @@ ok_long(CombineRgn(hrgn1, NULL, hrgn2, RGN_AND), ERROR); ok_long(CombineRgn(hrgn1, GetStockObject(BLACK_PEN), hrgn2, RGN_AND), ERROR); ok_long(CombineRgn(hrgn1, hrgn2, GetStockObject(BLACK_PEN), RGN_AND), ERROR); - ok_long(GetLastError(), 0xbadbabe); + ok((GetLastError() == 0xbadbabe) || (GetLastError() == ERROR_INVALID_HANDLE), "wrong error: %ld\n", GetLastError()); ok_long(CombineRgn(hrgn1, hrgn2, hrgn3, RGN_AND), SIMPLEREGION); @@ -152,7 +152,7 @@ ok_long(CombineRgn(hrgn1, NULL, hrgn2, RGN_DIFF), ERROR); ok_long(CombineRgn(hrgn1, GetStockObject(BLACK_PEN), hrgn2, RGN_DIFF), ERROR); ok_long(CombineRgn(hrgn1, hrgn2, GetStockObject(BLACK_PEN), RGN_DIFF), ERROR); - ok_long(GetLastError(), 0xbadbabe); + ok((GetLastError() == 0xbadbabe) || (GetLastError() == ERROR_INVALID_HANDLE), "wrong error: %ld\n", GetLastError()); ok_long(CombineRgn(hrgn1, hrgn1, hrgn1, RGN_DIFF), NULLREGION); ok_long(CombineRgn(hrgn1, hrgn2, hrgn2, RGN_DIFF), NULLREGION); @@ -182,7 +182,7 @@ ok_long(CombineRgn(hrgn1, NULL, hrgn2, RGN_XOR), ERROR); ok_long(CombineRgn(hrgn1, GetStockObject(BLACK_PEN), hrgn2, RGN_XOR), ERROR); ok_long(CombineRgn(hrgn1, hrgn2, GetStockObject(BLACK_PEN), RGN_XOR), ERROR); - ok_long(GetLastError(), 0xbadbabe); + ok((GetLastError() == 0xbadbabe) || (GetLastError() == ERROR_INVALID_HANDLE), "wrong error: %ld\n", GetLastError()); ok_long(CombineRgn(hrgn1, hrgn2, hrgn3, RGN_XOR), COMPLEXREGION); ok_long(CombineRgn(hrgn4, hrgn2, hrgn3, RGN_OR), COMPLEXREGION); Modified: trunk/rostests/apitests/gdi32/CombineTransform.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CombineTra… ============================================================================== --- trunk/rostests/apitests/gdi32/CombineTransform.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CombineTransform.c [iso-8859-1] Sat May 5 12:21:56 2012 @@ -19,9 +19,13 @@ #define ok_flt(x, y) \ { \ FLT_LONG __x, __y; \ - __x.e = (x); \ - __y.e = (y); \ - ok(__x.l == __y.l, "Wrong value for " #x ", expected " #y " (%f), got %f\n", (double)(y), (double)(x)); \ + __x.e = (x); \ + __y.e = (y); \ + if (_isnan(y)) {\ + ok((__x.l == __y.l) || (__x.l == 0), "Wrong value for " #x ", expected " #y " (%f), got %f\n", (double)(y), (double)(x)); \ + } else {\ + ok(__x.l == __y.l, "Wrong value for " #x ", expected " #y " (%f), got %f\n", (double)(y), (double)(x)); \ + } \ } #define ok_xform(xform, m11, m12, m21, m22, dx, dy) \ @@ -122,33 +126,33 @@ set_xform(&xform1, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0); set_xform(&xform2, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0); set_xform(&xform3, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0); - xform1.eDx = 4294967167.999999761; + xform1.eDx = (FLOAT)4294967167.999999761; ok(xform1.eDx == 4294967040.0, "float rounding error.\n"); ret = CombineTransform(&xform3, &xform1, &xform2); ok(ret == 1, "expected ret = 1, got %d\n", ret); ok_xform(xform3, 1.0, 0.0, 0.0, 1.0, 4294967040.0, 0.0); set_xform(&xform3, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0); - xform1.eDx = 4294967167.999999762; + xform1.eDx = (FLOAT)4294967167.999999762; ok(xform1.eDx == 4294967296.0, "float rounding error.\n"); ret = CombineTransform(&xform3, &xform1, &xform2); ok_int(ret, 0); ok_int(GetLastError(), ERROR_SUCCESS); ok_xform(xform3, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0); - xform1.eDx = -4294967167.999999761; + xform1.eDx = (FLOAT)-4294967167.999999761; ok(xform1.eDx == -4294967040.0, "float rounding error.\n"); ret = CombineTransform(&xform3, &xform1, &xform2); ok_int(ret, 1); - xform1.eDx = -4294967167.999999762; + xform1.eDx = (FLOAT)-4294967167.999999762; ok(xform1.eDx == -4294967296.0, "float rounding error.\n"); ret = CombineTransform(&xform3, &xform1, &xform2); ok_int(ret, 0); ok_int(GetLastError(), ERROR_SUCCESS); xform1.eDx = 0; - xform1.eDy = 4294967167.999999761; + xform1.eDy = (FLOAT)4294967167.999999761; ok(xform1.eDy == 4294967040.0, "float rounding error.\n"); ret = CombineTransform(&xform3, &xform1, &xform2); ok_int(ret, 1); @@ -158,18 +162,18 @@ ok_int(ret, 1); ok_flt(xform3.eDy, 4294967040.0); - xform1.eDy = 4294967167.999999762; + xform1.eDy = (FLOAT)4294967167.999999762; ok(xform1.eDy == 4294967296.0, "float rounding error.\n"); ret = CombineTransform(&xform3, &xform1, &xform2); ok_int(ret, 0); ok_int(GetLastError(), ERROR_SUCCESS); - xform1.eDy = -4294967167.999999761; + xform1.eDy = (FLOAT)-4294967167.999999761; ok(xform1.eDy == -4294967040.0, "float rounding error.\n"); ret = CombineTransform(&xform3, &xform1, &xform2); ok_int(ret, 1); - xform1.eDy = -4294967167.999999762; + xform1.eDy = (FLOAT)-4294967167.999999762; ok(xform1.eDy == -4294967296.0, "float rounding error.\n"); ret = CombineTransform(&xform3, &xform1, &xform2); ok_int(ret, 0); @@ -180,7 +184,7 @@ ok_int(ret, 1); set_xform(&xform1, 1000.0, 0.0, 0.0, 0.0, 0.0, 0.0); - xform1.eDx = -4294967167.999999762; + xform1.eDx = (FLOAT)-4294967167.999999762; xform2.eM11 = 1000.0; ret = CombineTransform(&xform3, &xform1, &xform2); ok_int(ret, 0); @@ -207,18 +211,18 @@ ok_xform(xform3, geIND, geIND, geINF, geINF, 0.0, 0.0); ok_int(GetLastError(), ERROR_SUCCESS); - set_xform(&xform1, 18446743500000000000.0, 0.0, 1.0, 0.0, 0.0, 0.0); + set_xform(&xform1, (FLOAT)18446743500000000000.0, 0.0, 1.0, 0.0, 0.0, 0.0); xform2 = xform1; ret = CombineTransform(&xform3, &xform1, &xform2); ok_int(ret, 1); ok_flt(xform3.eM11, 340282326356119260000000000000000000000.0); - xform1.eM11 = 18446745000000000000.0; + xform1.eM11 = (FLOAT)18446745000000000000.0; ret = CombineTransform(&xform3, &xform1, &xform2); ok_int(ret, 1); ok_flt(xform3.eM11, 340282346638528860000000000000000000000.0); - xform1.eM11 = 18446746000000000000.0; + xform1.eM11 = (FLOAT)18446746000000000000.0; ret = CombineTransform(&xform3, &xform1, &xform2); ok_long(*(DWORD*)&xform3.eM11, 0x7f800000); Modified: trunk/rostests/apitests/gdi32/CreateBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateBitm… ============================================================================== --- trunk/rostests/apitests/gdi32/CreateBitmap.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CreateBitmap.c [iso-8859-1] Sat May 5 12:21:56 2012 @@ -66,7 +66,7 @@ /* Check for maximum height */ hbmp = CreateBitmap(1, 0x1FFFFF00, 1, 1, NULL); - ok(hbmp != 0, "\n"); + //ok(hbmp != 0, "\n"); // fails on windows 2003 DeleteObject(hbmp); SetLastError(0); hbmp = CreateBitmap(1, 0x1FFFFFFF, 1, 1, NULL); @@ -75,7 +75,7 @@ /* Check for overflow in width * height */ hbmp = CreateBitmap(0x20000, 0x1FFFF, 1, 1, NULL); - ok(hbmp != 0, "\n"); + //ok(hbmp != 0, "\n"); // fails on windows 2003 DeleteObject(hbmp); SetLastError(0); hbmp = CreateBitmap(0x20000, 0x20000, 1, 1, NULL); Modified: trunk/rostests/apitests/gdi32/CreateBitmapIndirect.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateBitm… ============================================================================== --- trunk/rostests/apitests/gdi32/CreateBitmapIndirect.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CreateBitmapIndirect.c [iso-8859-1] Sat May 5 12:21:56 2012 @@ -68,7 +68,7 @@ win_bitmap.bmWidth = 0x8000; win_bitmap.bmWidthBytes = win_bitmap.bmWidth; win_hBmp = CreateBitmapIndirect(&win_bitmap); - ok(win_hBmp != 0, "CreateBitmapIndirect failed\n"); + //ok(win_hBmp != 0, "CreateBitmapIndirect failed\n"); // fails on win 2003 DeleteObject(win_hBmp); }

1 0

[tfaber] 56508: [CRT] - Fix declaration of malloc_func_t and free_func_t. Already sent upstream(TM)
by tfaber＠svn.reactos.org 05 May '12

05 May '12

Author: tfaber Date: Sat May 5 11:49:54 2012 New Revision: 56508 URL: http://svn.reactos.org/svn/reactos?rev=56508&view=rev Log: [CRT] - Fix declaration of malloc_func_t and free_func_t. Already sent upstream(TM) Modified: trunk/reactos/lib/sdk/crt/include/internal/wine/msvcrt.h Modified: trunk/reactos/lib/sdk/crt/include/internal/wine/msvcrt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern… ============================================================================== --- trunk/reactos/lib/sdk/crt/include/internal/wine/msvcrt.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/include/internal/wine/msvcrt.h [iso-8859-1] Sat May 5 11:49:54 2012 @@ -62,8 +62,8 @@ // void* __cdecl MSVCRT_operator_new(size_t); void __cdecl MSVCRT_operator_delete(void*); -typedef void* (*__cdecl malloc_func_t)(size_t); -typedef void (*__cdecl free_func_t)(void*); +typedef void* (__cdecl *malloc_func_t)(size_t); +typedef void (__cdecl *free_func_t)(void*); extern char* __cdecl __unDName(char *,const char*,int,malloc_func_t,free_func_t,unsigned short int); extern char* __cdecl __unDNameEx(char *,const char*,int,malloc_func_t,free_func_t,void *,unsigned short int);

1 0

[tfaber] 56507: [MOUNTMGR] - Silence false GCC warnings
by tfaber＠svn.reactos.org 05 May '12

05 May '12

Author: tfaber Date: Sat May 5 10:31:47 2012 New Revision: 56507 URL: http://svn.reactos.org/svn/reactos?rev=56507&view=rev Log: [MOUNTMGR] - Silence false GCC warnings Modified: trunk/reactos/drivers/filters/mountmgr/point.c Modified: trunk/reactos/drivers/filters/mountmgr/point.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/mountmgr/p… ============================================================================== --- trunk/reactos/drivers/filters/mountmgr/point.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/mountmgr/point.c [iso-8859-1] Sat May 5 10:31:47 2012 @@ -43,7 +43,7 @@ PMOUNTDEV_UNIQUE_ID UniqueId; PSYMLINK_INFORMATION SymlinkInformation; UNICODE_STRING SymLink, TargetDeviceName; - PDEVICE_INFORMATION DeviceInformation, DeviceInfo; + PDEVICE_INFORMATION DeviceInformation = NULL, DeviceInfo; /* Get device name */ Status = QueryDeviceInformation(SymbolicLinkName, @@ -434,7 +434,7 @@ PIO_STACK_LOCATION Stack; UNICODE_STRING DeviceName; PMOUNTMGR_MOUNT_POINTS MountPoints; - PDEVICE_INFORMATION DeviceInformation; + PDEVICE_INFORMATION DeviceInformation = NULL; PLIST_ENTRY DeviceEntry, SymlinksEntry; PSYMLINK_INFORMATION SymlinkInformation;

1 0

[tfaber] 56506: [POWRPROF_APITEST] - Fix warnings - there is no DischargePolicy[4] - Disable tests that fail on Windows 2003 (576 failures?!) - Add missing file header
by tfaber＠svn.reactos.org 05 May '12

05 May '12

Author: tfaber Date: Sat May 5 10:21:19 2012 New Revision: 56506 URL: http://svn.reactos.org/svn/reactos?rev=56506&view=rev Log: [POWRPROF_APITEST] - Fix warnings - there is no DischargePolicy[4] - Disable tests that fail on Windows 2003 (576 failures?!) - Add missing file header Modified: trunk/rostests/apitests/powrprof/power.c Modified: trunk/rostests/apitests/powrprof/power.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/powrprof/power.c… ============================================================================== --- trunk/rostests/apitests/powrprof/power.c [iso-8859-1] (original) +++ trunk/rostests/apitests/powrprof/power.c [iso-8859-1] Sat May 5 10:21:19 2012 @@ -1,3 +1,12 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Tests for powrprof.dll + * PROGRAMMER: Alex Wurzinger + * Johannes Anderwald + * Martin Rottensteiner + */ + #include <stdarg.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -1200,7 +1209,6 @@ gpp.user.DischargePolicy[1].Enable=FALSE; gpp.user.DischargePolicy[2].Enable=FALSE; gpp.user.DischargePolicy[3].Enable=FALSE; - gpp.user.DischargePolicy[4].Enable=FALSE; ret = ValidatePowerPolicies(&gpp,0); ok(ret, "function was expected to succeed return %i\n",(UINT)GetLastError()); if (!ret) @@ -1347,7 +1355,7 @@ gpp_compare.user.DischargePolicy[2].PowerPolicy.EventCode = 131072; gpp_compare.user.DischargePolicy[3].PowerPolicy.EventCode = 196608; ok(globalcompare(gpp,gpp_compare),"Difference Found\n"); - + gpp_original.user.PowerButtonAc.Action = PowerActionNone; memcpy(&gpp, &gpp_original, sizeof(GLOBAL_POWER_POLICY)); memcpy(&gpp_compare, &gpp_original, sizeof(GLOBAL_POWER_POLICY)); @@ -1448,17 +1456,6 @@ ok(globalcompare(gpp,gpp_compare),"Difference Found\n"); gpp_original.user.DischargePolicy[3].Enable=FALSE; - memcpy(&gpp, &gpp_original, sizeof(GLOBAL_POWER_POLICY)); - memcpy(&gpp_compare, &gpp_original, sizeof(GLOBAL_POWER_POLICY)); - ret = ValidatePowerPolicies(&gpp,0); - ok(ret, "function was expected to succeed return %i\n",(UINT)GetLastError()); - gpp_compare.mach.BroadcastCapacityResolution=100; - gpp_compare.user.DischargePolicy[1].PowerPolicy.EventCode = 65536; - gpp_compare.user.DischargePolicy[2].PowerPolicy.EventCode = 131072; - gpp_compare.user.DischargePolicy[3].PowerPolicy.EventCode = 196608; - ok(globalcompare(gpp,gpp_compare),"Difference Found\n"); - - gpp_original.user.DischargePolicy[4].Enable=FALSE; memcpy(&gpp, &gpp_original, sizeof(GLOBAL_POWER_POLICY)); memcpy(&gpp_compare, &gpp_original, sizeof(GLOBAL_POWER_POLICY)); ret = ValidatePowerPolicies(&gpp,0); @@ -2259,7 +2256,7 @@ test_ValidatePowerPolicies_Next(&gpp_original,&pp_original); - + // memcpy(&gpp, &gpp_original, sizeof(GLOBAL_POWER_POLICY)); // memcpy(&gpp_compare, &gpp_original, sizeof(GLOBAL_POWER_POLICY)); //memcpy(&pp, &pp_original, sizeof(POWER_POLICY)); @@ -4416,7 +4413,7 @@ pPP_original->user.IdleAc.Action=PowerActionNone; - + pPP_original->user.IdleDc.Action=PowerActionNone-2; memcpy(&gpp, pGPP_original, sizeof(GLOBAL_POWER_POLICY)); memcpy(&gpp_compare, pGPP_original, sizeof(GLOBAL_POWER_POLICY)); @@ -4862,7 +4859,10 @@ void func_power(void) { - test_CallNtPowerInformation(); + if (1) + skip("CallNtPowerInformation test is broken and fails on Windows\n"); + else + test_CallNtPowerInformation(); test_CanUserWritePwrScheme(); test_EnumPwrSchemes(); test_GetSetActivePwrScheme(); @@ -4881,8 +4881,13 @@ test_ReadGlobalPwrPolicy(); test_ReadProcessorPwrScheme(); test_SetSuspendState(); - test_ValidatePowerPolicies_Old(); - test_ValidatePowerPolicies(); + if (1) + skip("ValidatePowerPolicies tests are broken and fail on Windows\n"); + else + { + test_ValidatePowerPolicies_Old(); + test_ValidatePowerPolicies(); + } test_WriteGlobalPwrPolicy(); test_WriteProcessorPwrScheme();

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