Ros-diffs

ros-diffs@reactos.org

81390 discussions

[spetreolle] 64263: [BUTTERFLIES] Fix MSVC build. Dedicated to Hermès :p
by spetreolle＠svn.reactos.org 24 Sep '14

24 Sep '14

Author: spetreolle Date: Wed Sep 24 22:18:51 2014 New Revision: 64263 URL: http://svn.reactos.org/svn/reactos?rev=64263&view=rev Log: [BUTTERFLIES] Fix MSVC build. Dedicated to Hermès :p Modified: trunk/rosapps/applications/screensavers/butterflies/rsrc.rc Modified: trunk/rosapps/applications/screensavers/butterflies/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/rsrc.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/butterflies/rsrc.rc [iso-8859-1] Wed Sep 24 22:18:51 2014 @@ -10,4 +10,4 @@ #include "lang/uk-UA.rc" /* UTF-8 */ -#include "lang/ro-RO.rc" +#include "lang/ro-RO.rc"

1 0

[jgardou] 64262: [NTOS/MM] - First try at creating and adding pages to the working set of processes in ARM3. Limited to 1k pages for now. CORE-8553
by jgardou＠svn.reactos.org 24 Sep '14

24 Sep '14

Author: jgardou Date: Wed Sep 24 21:55:37 2014 New Revision: 64262 URL: http://svn.reactos.org/svn/reactos?rev=64262&view=rev Log: [NTOS/MM] - First try at creating and adding pages to the working set of processes in ARM3. Limited to 1k pages for now. CORE-8553 Modified: branches/TransitionPte/ntoskrnl/mm/ARM3/miarm.h branches/TransitionPte/ntoskrnl/mm/ARM3/pagfault.c branches/TransitionPte/ntoskrnl/mm/ARM3/procsup.c branches/TransitionPte/ntoskrnl/mm/ARM3/virtual.c Modified: branches/TransitionPte/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/ntoskrnl/mm/ARM3/… ============================================================================== --- branches/TransitionPte/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ branches/TransitionPte/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Wed Sep 24 21:55:37 2014 @@ -2321,6 +2321,19 @@ IN KIRQL OldIrql ); +VOID +NTAPI +MiDeleteFromWorkingSetList( + _Inout_ PMMSUPPORT Vm, + _In_ PVOID Address); + +VOID +NTAPI +MiInsertInWorkingSetList( + _Inout_ PMMSUPPORT Vm, + _In_ PVOID Address, + _In_ ULONG Protection); + // // MiRemoveZeroPage will use inline code to zero out the page manually if only // free pages are available. In some scenarios, we don't/can't run that piece of Modified: branches/TransitionPte/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/ntoskrnl/mm/ARM3/… ============================================================================== --- branches/TransitionPte/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ branches/TransitionPte/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Wed Sep 24 21:55:37 2014 @@ -2247,6 +2247,9 @@ MiCopyPfn(PageFrameIndex, OldPageFrameIndex); + /* Delete the WS entry, we will soon replace it */ + MiDeleteFromWorkingSetList(&CurrentProcess->Vm, Address); + /* Dereference whatever this PTE is referencing */ Pfn1 = MI_PFN_ELEMENT(OldPageFrameIndex); ASSERT(Pfn1->u3.e1.PrototypePte == 1); @@ -2262,6 +2265,9 @@ MI_WRITE_VALID_PTE(PointerPte, TempPte); + /* Insert into the WS again */ + MiInsertInWorkingSetList(&CurrentProcess->Vm, Address, ProtectionCode); + KeReleaseQueuedSpinLock(LockQueuePfnLock, LockIrql); /* Return the status */ @@ -2293,6 +2299,9 @@ PointerPte, CurrentProcess, MM_NOIRQL); + + /* Insert into the WS */ + MiInsertInWorkingSetList(&CurrentProcess->Vm, Address, ProtectionCode); /* Return the status */ MiUnlockProcessWorkingSet(CurrentProcess, CurrentThread); @@ -2528,6 +2537,12 @@ TrapInformation, Vad); + /* Add it to the WS */ + if (NT_SUCCESS(Status)) + { + MiInsertInWorkingSetList(&CurrentProcess->Vm, Address, ProtectionCode); + } + /* Return the status */ ASSERT(KeGetCurrentIrql() <= APC_LEVEL); MiUnlockProcessWorkingSet(CurrentProcess, CurrentThread); Modified: branches/TransitionPte/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/ntoskrnl/mm/ARM3/… ============================================================================== --- branches/TransitionPte/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ branches/TransitionPte/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Wed Sep 24 21:55:37 2014 @@ -896,25 +896,155 @@ VOID NTAPI +MiDeleteFromWorkingSetList( + _Inout_ PMMSUPPORT Vm, + _In_ PVOID Address) +{ + ULONG i; + PMMWSLE Wsle = NULL; + + /* Only the virtual page number is interesting */ + Address = PAGE_ALIGN(Address); + + /* Check we got the right lock */ + NT_ASSERT((PsGetCurrentThread()->OwnsSessionWorkingSetExclusive) || !MI_IS_SESSION_ADDRESS(Address)); + NT_ASSERT((PsGetCurrentThread()->OwnsSystemWorkingSetExclusive) || (Address < MmSystemRangeStart) || + MI_IS_SESSION_ADDRESS(Address)); + NT_ASSERT((PsGetCurrentThread()->OwnsProcessWorkingSetExclusive) || (Address > MmSystemRangeStart)); + + /* Loop over the entries */ + for (i = 0; i < Vm->VmWorkingSetList->LastInitializedWsle; i++) + { + if (!Vm->VmWorkingSetList->Wsle[i].u1.e1.Valid) + continue; + + if (PAGE_ALIGN(Vm->VmWorkingSetList->Wsle[i].u1.VirtualAddress) == Address) + { + Wsle = &Vm->VmWorkingSetList->Wsle[i]; + break; + } + } + + if (Wsle == NULL) + { + /* Most likely because we don't expand the thing */ + DPRINT1("Address %p not found in Vm %p.\n", Address, Vm); + return; + } + + /* Simply relink it and voilÃ */ + Wsle->u1.Long = Vm->VmWorkingSetList->FirstFree << 1; + Vm->VmWorkingSetList->FirstFree = i; + Vm->WorkingSetSize--; +} + +VOID +NTAPI +MiInsertInWorkingSetList( + _Inout_ PMMSUPPORT Vm, + _In_ PVOID Address, + _In_ ULONG Protection) +{ + PMMWSLE Wsle = Vm->VmWorkingSetList->Wsle; + PMMPFN Pfn1; + PMMPTE PointerPte; + + /* Only the virtual page number is interesting */ + Address = PAGE_ALIGN(Address); + + /* Check we got the right lock */ + NT_ASSERT((PsGetCurrentThread()->OwnsSessionWorkingSetExclusive) || !MI_IS_SESSION_ADDRESS(Address)); + NT_ASSERT((PsGetCurrentThread()->OwnsSystemWorkingSetExclusive) || (Address < MmSystemRangeStart) || + MI_IS_SESSION_ADDRESS(Address)); + NT_ASSERT((PsGetCurrentThread()->OwnsProcessWorkingSetExclusive) || (Address > MmSystemRangeStart)); + + /* Get the entry where we will insert it */ + if (Vm->VmWorkingSetList->FirstFree == Vm->VmWorkingSetList->LastInitializedWsle) + { + ULONG i; + + if (Vm->VmWorkingSetList->FirstFree == Vm->VmWorkingSetList->LastEntry) + { + DPRINT1("FIXME: Could not add address %p to Vm %p because it is FULL!\n", Address, Vm); + return; + } + + /* Double that */ + Vm->VmWorkingSetList->LastInitializedWsle *= 2; + if (Vm->VmWorkingSetList->LastInitializedWsle > Vm->VmWorkingSetList->LastEntry) + Vm->VmWorkingSetList->LastInitializedWsle = Vm->VmWorkingSetList->LastEntry; + + /* Initialize them */ + for (i = Vm->VmWorkingSetList->FirstFree; i < Vm->VmWorkingSetList->LastInitializedWsle; i++) + Wsle[i].u1.Long = (i + 1) << 1; + } + + /* Get the entry where we will insert it */ + Wsle = &Vm->VmWorkingSetList->Wsle[Vm->VmWorkingSetList->FirstFree]; + + /* See if the PFN deserves to have an entry into the WS */ + PointerPte = MiAddressToPte(Address); + NT_ASSERT(PointerPte->u.Hard.Valid); + Pfn1 = MiGetPfnEntry(PFN_FROM_PTE(PointerPte)); + if ((Address >= MmSystemRangeStart) || (Pfn1->u3.e1.PrototypePte == 0)) + { + Pfn1->u1.WsIndex = Vm->VmWorkingSetList->FirstFree; + } + + /* Update the list head */ + Vm->VmWorkingSetList->FirstFree = Wsle->u1.Long >> 1; + + /* Set the entry address */ + Wsle->u1.VirtualAddress = Address; + + Wsle->u1.e1.Valid = 1; + Wsle->u1.e1.Protection = Protection; + + /* Bump it */ + Vm->WorkingSetSize++; +} + +VOID +NTAPI MiInitializeWorkingSetList(IN PEPROCESS CurrentProcess) { PMMPFN Pfn1; PMMPTE sysPte; MMPTE tempPte; - - /* Setup some bogus list data */ - MmWorkingSetList->LastEntry = CurrentProcess->Vm.MinimumWorkingSetSize; + ULONG i; + PFN_NUMBER WslePageIndex; + + /* Initialize the WS sizes */ + // FIXME: hardcoded for now + CurrentProcess->Vm.MinimumWorkingSetSize = 50; + CurrentProcess->Vm.MaximumWorkingSetSize = 345; + + /* Setup list data */ + MmWorkingSetList->LastEntry = PAGE_SIZE / sizeof(MMWSLE); MmWorkingSetList->HashTable = NULL; MmWorkingSetList->HashTableSize = 0; MmWorkingSetList->NumberOfImageWaiters = 0; - MmWorkingSetList->Wsle = (PVOID)0xDEADBABE; MmWorkingSetList->VadBitMapHint = 1; - MmWorkingSetList->HashTableStart = (PVOID)0xBADAB00B; - MmWorkingSetList->HighestPermittedHashAddress = (PVOID)0xCAFEBABE; + MmWorkingSetList->HashTableStart = NULL; + MmWorkingSetList->HighestPermittedHashAddress = NULL; MmWorkingSetList->FirstFree = 1; - MmWorkingSetList->FirstDynamic = 2; - MmWorkingSetList->NextSlot = 3; - MmWorkingSetList->LastInitializedWsle = 4; + MmWorkingSetList->FirstDynamic = 0; + MmWorkingSetList->NextSlot = 0; + MmWorkingSetList->LastInitializedWsle = CurrentProcess->Vm.MaximumWorkingSetSize; + + /* Reserve a page for the entries */ + WslePageIndex = MiRemoveAnyPage(MI_GET_NEXT_COLOR()); + sysPte = MiReserveSystemPtes(1, SystemPteSpace); + MI_MAKE_HARDWARE_PTE_KERNEL(&tempPte, sysPte, MM_READWRITE, WslePageIndex); + MiInitializePfnAndMakePteValid(WslePageIndex, sysPte, tempPte); + MmWorkingSetList->Wsle = MiPteToAddress(sysPte); + + /* Initialize the linked-list of free entries */ + for (i = 0; i < MmWorkingSetList->LastInitializedWsle; i++) + { + /* Save LSB to keep track of active/non active state */ + MmWorkingSetList->Wsle[i].u1.Long = (i + 1) << 1; + } /* The rule is that the owner process is always in the FLINK of the PDE's PFN entry */ Pfn1 = MiGetPfnEntry(CurrentProcess->Pcb.DirectoryTableBase[0] >> PAGE_SHIFT); @@ -926,6 +1056,20 @@ MI_MAKE_HARDWARE_PTE_KERNEL(&tempPte, sysPte, MM_READWRITE, CurrentProcess->WorkingSetPage); MI_WRITE_VALID_PTE(sysPte, tempPte); CurrentProcess->Vm.VmWorkingSetList = MiPteToAddress(sysPte); +} + +VOID +NTAPI +MiDeleteWorkingSetList(PMMWSL WorkingSetList) +{ + PMMPTE SysPte; + PMMPFN Pfn1; + + SysPte = MiAddressToPte(WorkingSetList->Wsle); + Pfn1 = MiGetPfnEntry(PFN_FROM_PTE(SysPte)); + MI_SET_PFN_DELETED(Pfn1); + MiDecrementShareCount(Pfn1, PFN_FROM_PTE(SysPte)); + MiReleaseSystemPtes(SysPte, 1, SystemPteSpace); } NTSTATUS @@ -1387,6 +1531,9 @@ /* Check for fully initialized process */ if (Process->AddressSpaceInitialized == 2) { + /* Free the working set list entries */ + MiDeleteWorkingSetList(Process->Vm.VmWorkingSetList); + /* Map the working set page and its page table */ Pfn1 = MiGetPfnEntry(Process->WorkingSetPage); Pfn2 = MiGetPfnEntry(Pfn1->u4.PteFrame); Modified: branches/TransitionPte/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/ntoskrnl/mm/ARM3/… ============================================================================== --- branches/TransitionPte/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ branches/TransitionPte/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Wed Sep 24 21:55:37 2014 @@ -721,6 +721,11 @@ } else { + if (TempPte.u.Hard.Valid == 1) + { + MiDeleteFromWorkingSetList(&CurrentProcess->Vm, MiPteToAddress(PointerPte)); + } + /* Delete the PTE proper */ MiDeletePte(PointerPte, (PVOID)Va, @@ -2360,9 +2365,12 @@ PteContents.u.Hard.Valid = 0; PteContents.u.Soft.Transition = 1; PteContents.u.Trans.Protection = ProtectionMask; + + /* Remove it from the WS */ + MiDeleteFromWorkingSetList(&Process->Vm, MiPteToAddress(PointerPte)); + /* Decrease PFN share count and write the PTE */ MiDecrementShareCount(Pfn1, PFN_FROM_PTE(&PteContents)); - // FIXME: remove the page from the WS MI_WRITE_INVALID_PTE(PointerPte, PteContents); #ifdef CONFIG_SMP // FIXME: Should invalidate entry in every CPU TLB

1 0

[tkreuzer] 64261: [WIN32K] - Improve performance of XFORMOBJ_bXformFixPoints by getting the integer values from the FLOATOBJ once instead of on every iteration
by tkreuzer＠svn.reactos.org 24 Sep '14

24 Sep '14

Author: tkreuzer Date: Wed Sep 24 21:27:47 2014 New Revision: 64261 URL: http://svn.reactos.org/svn/reactos?rev=64261&view=rev Log: [WIN32K] - Improve performance of XFORMOBJ_bXformFixPoints by getting the integer values from the FLOATOBJ once instead of on every iteration Modified: trunk/reactos/win32ss/gdi/ntgdi/xformobj.c Modified: trunk/reactos/win32ss/gdi/ntgdi/xformobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/xformobj… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/xformobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/xformobj.c [iso-8859-1] Wed Sep 24 21:27:47 2014 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS win32 kernel mode subsystem * LICENSE: GPL - See COPYING in the top level directory - * FILE: subsystems/win32/win32k/objects/xformobj.c + * FILE: win32ss/gdi/ntgdi/xformobj.c * PURPOSE: XFORMOBJ API * PROGRAMMER: Timo Kreuzer */ @@ -195,8 +195,8 @@ MATRIX mx; PMATRIX pmx, pmx1, pmx2; - pmx = XFORMOBJ_pmx(pxo); - pmx1 =XFORMOBJ_pmx(pxo1); + /* Get the source matrices */ + pmx1 = XFORMOBJ_pmx(pxo1); pmx2 = XFORMOBJ_pmx(pxo2); /* Do a 3 x 3 matrix multiplication with mx as destinantion */ @@ -210,6 +210,7 @@ FLOATOBJ_Add(&mx.efDy, &pmx2->efDy); /* Copy back */ + pmx = XFORMOBJ_pmx(pxo); *pmx = mx; /* Update accelerators and return complexity */ @@ -322,11 +323,14 @@ if (flAccel & XFORM_UNITY) { /* 1-scale integer transform */ + LONG lM12 = FLOATOBJ_GetLong(&pmx->efM12); + LONG lM21 = FLOATOBJ_GetLong(&pmx->efM21); + i = cPoints - 1; do { - LONG x = pptIn[i].x + pptIn[i].y * FLOATOBJ_GetLong(&pmx->efM21); - LONG y = pptIn[i].y + pptIn[i].x * FLOATOBJ_GetLong(&pmx->efM12); + LONG x = pptIn[i].x + pptIn[i].y * lM21; + LONG y = pptIn[i].y + pptIn[i].x * lM12; pptOut[i].y = y; pptOut[i].x = x; } @@ -335,25 +339,33 @@ else if (flAccel & XFORM_SCALE) { /* Diagonal integer transform */ + LONG lM11 = FLOATOBJ_GetLong(&pmx->efM11); + LONG lM22 = FLOATOBJ_GetLong(&pmx->efM22); + i = cPoints - 1; do { - pptOut[i].x = pptIn[i].x * FLOATOBJ_GetLong(&pmx->efM11); - pptOut[i].y = pptIn[i].y * FLOATOBJ_GetLong(&pmx->efM22); + pptOut[i].x = pptIn[i].x * lM11; + pptOut[i].y = pptIn[i].y * lM22; } while (--i >= 0); } else { /* Full integer transform */ + LONG lM11 = FLOATOBJ_GetLong(&pmx->efM11); + LONG lM12 = FLOATOBJ_GetLong(&pmx->efM12); + LONG lM21 = FLOATOBJ_GetLong(&pmx->efM21); + LONG lM22 = FLOATOBJ_GetLong(&pmx->efM22); + i = cPoints - 1; do { LONG x; - x = pptIn[i].x * FLOATOBJ_GetLong(&pmx->efM11); - x += pptIn[i].y * FLOATOBJ_GetLong(&pmx->efM21); - pptOut[i].y = pptIn[i].y * FLOATOBJ_GetLong(&pmx->efM22); - pptOut[i].y += pptIn[i].x * FLOATOBJ_GetLong(&pmx->efM12); + x = pptIn[i].x * lM11; + x += pptIn[i].y * lM21; + pptOut[i].y = pptIn[i].y * lM22; + pptOut[i].y += pptIn[i].x * lM12; pptOut[i].x = x; } while (--i >= 0);

1 0

[tkreuzer] 64260: [WIN32K] - Implement REGION_SubtractRectFromRgn - Rewrite NtGdiExcludeClipRect, fixing a number of gdi32 apitests
by tkreuzer＠svn.reactos.org 24 Sep '14

24 Sep '14

Author: tkreuzer Date: Wed Sep 24 21:23:03 2014 New Revision: 64260 URL: http://svn.reactos.org/svn/reactos?rev=64260&view=rev Log: [WIN32K] - Implement REGION_SubtractRectFromRgn - Rewrite NtGdiExcludeClipRect, fixing a number of gdi32 apitests Modified: trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c trunk/reactos/win32ss/gdi/ntgdi/region.c trunk/reactos/win32ss/gdi/ntgdi/region.h Modified: trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/cliprgn.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/cliprgn.c [iso-8859-1] Wed Sep 24 21:23:03 2014 @@ -190,55 +190,79 @@ return iComplexity; } -int APIENTRY NtGdiExcludeClipRect(HDC hDC, - int LeftRect, - int TopRect, - int RightRect, - int BottomRect) -{ - INT Result; - RECTL Rect; - PREGION prgnNew; - PDC dc = DC_LockDc(hDC); - - if (!dc) +INT +APIENTRY +NtGdiExcludeClipRect( + _In_ HDC hdc, + _In_ INT xLeft, + _In_ INT yTop, + _In_ INT xRight, + _In_ INT yBottom) +{ + INT iComplexity; + RECTL rect; + PDC pdc; + + /* Lock the DC */ + pdc = DC_LockDc(hdc); + if (pdc == NULL) { EngSetLastError(ERROR_INVALID_HANDLE); return ERROR; } - Rect.left = LeftRect; - Rect.top = TopRect; - Rect.right = RightRect; - Rect.bottom = BottomRect; - - IntLPtoDP(dc, (LPPOINT)&Rect, 2); - - prgnNew = IntSysCreateRectpRgnIndirect(&Rect); - if (!prgnNew) - { - Result = ERROR; - } - else - { - if (!dc->dclevel.prgnClip) - { - dc->dclevel.prgnClip = IntSysCreateRectpRgn(0, 0, 0, 0); - IntGdiCombineRgn(dc->dclevel.prgnClip, dc->prgnVis, prgnNew, RGN_DIFF); - Result = SIMPLEREGION; + /* Convert coordinates to device space */ + rect.left = xLeft; + rect.top = yTop; + rect.right = xRight; + rect.bottom = yBottom; + RECTL_vMakeWellOrdered(&rect); + IntLPtoDP(pdc, (LPPOINT)&rect, 2); + + /* Check if we already have a clip region */ + if (pdc->dclevel.prgnClip != NULL) + { + /* We have a region, subtract the rect */ + iComplexity = REGION_SubtractRectFromRgn(pdc->dclevel.prgnClip, + pdc->dclevel.prgnClip, + &rect); + + /* Emulate Windows behavior */ + if (iComplexity == SIMPLEREGION) + iComplexity = COMPLEXREGION; + } + else + { + /* Check if the rect intersects with the window rect */ + if (RECTL_bIntersectRect(&rect, &rect, &pdc->erclWindow)) + { + /* It does. In this case create an empty region */ + pdc->dclevel.prgnClip = IntSysCreateRectpRgn(0, 0, 0, 0); + iComplexity = NULLREGION; } else { - Result = IntGdiCombineRgn(dc->dclevel.prgnClip, dc->dclevel.prgnClip, prgnNew, RGN_DIFF); - } - REGION_Delete(prgnNew); - } - if (Result != ERROR) - dc->fs |= DC_FLAG_DIRTY_RAO; - - DC_UnlockDc(dc); - - return Result; + /* Otherwise, emulate strange Windows behavior... */ + pdc->dclevel.prgnClip = IntSysCreateRectpRgn(0, 0, 1, 1); + iComplexity = COMPLEXREGION; + } + + /* Check if creating the region failed */ + if (pdc->dclevel.prgnClip == NULL) + { + /* Return error code */ + iComplexity = ERROR; + } + } + + /* If we succeeded, mark the RAO region as dirty */ + if (iComplexity != ERROR) + pdc->fs |= DC_FLAG_DIRTY_RAO; + + /* Unlock the DC */ + DC_UnlockDc(pdc); + + return iComplexity; } INT Modified: trunk/reactos/win32ss/gdi/ntgdi/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/region.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] Wed Sep 24 21:23:03 2014 @@ -1773,6 +1773,23 @@ REGION_UnionRegion(rgn, rgn, &region); } +INT +FASTCALL +REGION_SubtractRectFromRgn( + PREGION prgnDest, + PREGION prgnSrc, + const RECTL *prcl) +{ + REGION rgnLocal; + + rgnLocal.Buffer = &rgnLocal.rdh.rcBound; + rgnLocal.rdh.nCount = 1; + rgnLocal.rdh.nRgnSize = sizeof(RECT); + rgnLocal.rdh.rcBound = *prcl; + REGION_SubtractRegion(prgnDest, prgnSrc, &rgnLocal); + return REGION_Complexity(prgnDest); +} + BOOL FASTCALL REGION_CreateSimpleFrameRgn( PROSRGNDATA rgn, Modified: trunk/reactos/win32ss/gdi/ntgdi/region.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/region.h… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/region.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/region.h [iso-8859-1] Wed Sep 24 21:23:03 2014 @@ -25,6 +25,7 @@ PROSRGNDATA FASTCALL REGION_AllocRgnWithHandle(INT n); PROSRGNDATA FASTCALL REGION_AllocUserRgnWithHandle(INT n); VOID FASTCALL REGION_UnionRectWithRgn(ROSRGNDATA *rgn, const RECTL *rect); +INT FASTCALL REGION_SubtractRectFromRgn(PREGION prgnDest, PREGION prgnSrc, const RECTL *prcl); INT FASTCALL REGION_GetRgnBox(PROSRGNDATA Rgn, RECTL *pRect); BOOL FASTCALL REGION_RectInRegion(PROSRGNDATA Rgn, const RECTL *rc); BOOL FASTCALL REGION_PtInRegion(PREGION, INT, INT);

1 0

[tfaber] 64259: [EVENTVWR][TELNET][USETUP] - Remove dead code. Patch by Kudratov Olimjon. CORE-8545
by tfaber＠svn.reactos.org 24 Sep '14

24 Sep '14

Author: tfaber Date: Wed Sep 24 21:05:29 2014 New Revision: 64259 URL: http://svn.reactos.org/svn/reactos?rev=64259&view=rev Log: [EVENTVWR][TELNET][USETUP] - Remove dead code. Patch by Kudratov Olimjon. CORE-8545 Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c trunk/reactos/base/applications/network/telnet/src/tmapldr.cpp trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c [iso-8859-1] Wed Sep 24 21:05:29 2014 @@ -798,7 +798,6 @@ case IDCANCEL: { return FALSE; - break; } case IDNO: Modified: trunk/reactos/base/applications/network/telnet/src/tmapldr.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/telnet/src/tmapldr.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/telnet/src/tmapldr.cpp [iso-8859-1] Wed Sep 24 21:05:29 2014 @@ -426,7 +426,6 @@ Charmap.modmap(bHost, 'B', bConsole); }; return (Charmap.enabled = 1); - return 1; }; // AVS Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Wed Sep 24 21:05:29 2014 @@ -930,17 +930,14 @@ else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ { return INSTALL_INTRO_PAGE; - break; } else if (toupper(Ir->Event.KeyEvent.uChar.AsciiChar) == 'R') /* R */ { return REPAIR_INTRO_PAGE; - break; } else if (toupper(Ir->Event.KeyEvent.uChar.AsciiChar) == 'L') /* R */ { return LICENSE_PAGE; - break; } } @@ -965,7 +962,6 @@ if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */ { return INTRO_PAGE; - break; } }

1 0

[tfaber] 64258: [WINED3D] - Use correct FXCAPS constant in wined3d_get_device_caps. Spotted by Kudratov Olimjon. CORE-8545
by tfaber＠svn.reactos.org 24 Sep '14

24 Sep '14

Author: tfaber Date: Wed Sep 24 20:58:00 2014 New Revision: 64258 URL: http://svn.reactos.org/svn/reactos?rev=64258&view=rev Log: [WINED3D] - Use correct FXCAPS constant in wined3d_get_device_caps. Spotted by Kudratov Olimjon. CORE-8545 Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/directx.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/directx.c [iso-8859-1] Wed Sep 24 20:58:00 2014 @@ -4614,7 +4614,7 @@ WINEDDFXCAPS_BLTSHRINKX | WINEDDFXCAPS_BLTSHRINKXN | WINEDDFXCAPS_BLTSHRINKY | - WINEDDFXCAPS_BLTSHRINKXN | + WINEDDFXCAPS_BLTSHRINKYN | WINEDDFXCAPS_BLTSTRETCHX | WINEDDFXCAPS_BLTSTRETCHXN | WINEDDFXCAPS_BLTSTRETCHY |

1 0

[akhaldi] 64257: * Sync up to trunk head (r64256).
by akhaldi＠svn.reactos.org 24 Sep '14

24 Sep '14

Author: akhaldi Date: Wed Sep 24 20:09:20 2014 New Revision: 64257 URL: http://svn.reactos.org/svn/reactos?rev=64257&view=rev Log: * Sync up to trunk head (r64256). Added: branches/TransitionPte/dll/win32/fltlib/ - copied from r64245, trunk/reactos/dll/win32/fltlib/ branches/TransitionPte/dll/win32/mspatcha/ - copied from r64256, trunk/reactos/dll/win32/mspatcha/ branches/TransitionPte/include/psdk/patchapi.h - copied unchanged from r64256, trunk/reactos/include/psdk/patchapi.h Modified: branches/TransitionPte/ (props changed) branches/TransitionPte/CMakeLists.txt branches/TransitionPte/boot/bootdata/hivesft.inf branches/TransitionPte/cmake/gcc.cmake branches/TransitionPte/dll/directx/wine/d3d8/buffer.c branches/TransitionPte/dll/directx/wine/d3d8/d3d8_main.c branches/TransitionPte/dll/directx/wine/d3d8/d3d8_private.h branches/TransitionPte/dll/directx/wine/d3d8/device.c branches/TransitionPte/dll/directx/wine/d3d8/surface.c branches/TransitionPte/dll/directx/wine/d3d8/swapchain.c branches/TransitionPte/dll/directx/wine/d3d8/texture.c branches/TransitionPte/dll/directx/wine/d3d8/volume.c branches/TransitionPte/dll/directx/wine/d3d9/buffer.c branches/TransitionPte/dll/directx/wine/d3d9/d3d9_main.c branches/TransitionPte/dll/directx/wine/d3d9/d3d9_private.h branches/TransitionPte/dll/directx/wine/d3d9/device.c branches/TransitionPte/dll/directx/wine/d3d9/query.c branches/TransitionPte/dll/directx/wine/d3d9/surface.c branches/TransitionPte/dll/directx/wine/d3d9/swapchain.c branches/TransitionPte/dll/directx/wine/d3d9/texture.c branches/TransitionPte/dll/directx/wine/d3d9/volume.c branches/TransitionPte/dll/directx/wine/ddraw/ddraw.c branches/TransitionPte/dll/directx/wine/ddraw/ddraw_private.h branches/TransitionPte/dll/directx/wine/ddraw/device.c branches/TransitionPte/dll/directx/wine/ddraw/executebuffer.c branches/TransitionPte/dll/directx/wine/ddraw/palette.c branches/TransitionPte/dll/directx/wine/ddraw/surface.c branches/TransitionPte/dll/directx/wine/ddraw/utils.c branches/TransitionPte/dll/directx/wine/ddraw/vertexbuffer.c branches/TransitionPte/dll/directx/wine/ddraw/viewport.c branches/TransitionPte/dll/directx/wine/wined3d/arb_program_shader.c branches/TransitionPte/dll/directx/wine/wined3d/buffer.c branches/TransitionPte/dll/directx/wine/wined3d/context.c branches/TransitionPte/dll/directx/wine/wined3d/cs.c branches/TransitionPte/dll/directx/wine/wined3d/device.c branches/TransitionPte/dll/directx/wine/wined3d/directx.c branches/TransitionPte/dll/directx/wine/wined3d/drawprim.c branches/TransitionPte/dll/directx/wine/wined3d/glsl_shader.c branches/TransitionPte/dll/directx/wine/wined3d/palette.c branches/TransitionPte/dll/directx/wine/wined3d/query.c branches/TransitionPte/dll/directx/wine/wined3d/resource.c branches/TransitionPte/dll/directx/wine/wined3d/shader.c branches/TransitionPte/dll/directx/wine/wined3d/shader_sm4.c branches/TransitionPte/dll/directx/wine/wined3d/state.c branches/TransitionPte/dll/directx/wine/wined3d/stateblock.c branches/TransitionPte/dll/directx/wine/wined3d/surface.c branches/TransitionPte/dll/directx/wine/wined3d/swapchain.c branches/TransitionPte/dll/directx/wine/wined3d/texture.c branches/TransitionPte/dll/directx/wine/wined3d/utils.c branches/TransitionPte/dll/directx/wine/wined3d/view.c branches/TransitionPte/dll/directx/wine/wined3d/volume.c branches/TransitionPte/dll/directx/wine/wined3d/wined3d.spec branches/TransitionPte/dll/directx/wine/wined3d/wined3d_gl.h branches/TransitionPte/dll/directx/wine/wined3d/wined3d_main.c branches/TransitionPte/dll/directx/wine/wined3d/wined3d_private.h branches/TransitionPte/dll/ntdll/ldr/ldrutils.c branches/TransitionPte/dll/win32/CMakeLists.txt branches/TransitionPte/dll/win32/advapi32/service/sctrl.c branches/TransitionPte/dll/win32/msi/action.c branches/TransitionPte/dll/win32/msi/appsearch.c branches/TransitionPte/dll/win32/msi/classes.c branches/TransitionPte/dll/win32/msi/cond.tab.c branches/TransitionPte/dll/win32/msi/files.c branches/TransitionPte/dll/win32/msi/msi.c branches/TransitionPte/dll/win32/msi/msi.spec branches/TransitionPte/dll/win32/msi/package.c branches/TransitionPte/dll/win32/msi/patch.c branches/TransitionPte/dll/win32/msi/sql.tab.c branches/TransitionPte/dll/win32/msi/sql.tab.h branches/TransitionPte/dll/win32/msi/table.c branches/TransitionPte/drivers/crypto/ksecdd/random.c branches/TransitionPte/drivers/filesystems/ntfs/attrib.c branches/TransitionPte/drivers/filesystems/ntfs/ntfs.h branches/TransitionPte/include/ndk/i386/asm.h branches/TransitionPte/include/ndk/rtltypes.h branches/TransitionPte/include/psdk/d3d8.h branches/TransitionPte/include/psdk/d3d8types.h branches/TransitionPte/include/psdk/d3d9.h branches/TransitionPte/include/psdk/d3d9types.h branches/TransitionPte/include/psdk/msiquery.h branches/TransitionPte/include/reactos/wine/wined3d.h branches/TransitionPte/media/doc/README.WINE branches/TransitionPte/ntoskrnl/mm/ARM3/virtual.c branches/TransitionPte/subsystems/ntvdm/bios/vidbios.c branches/TransitionPte/subsystems/ntvdm/hardware/speaker.c branches/TransitionPte/win32ss/gdi/ntgdi/cliprgn.c branches/TransitionPte/win32ss/gdi/ntgdi/cliprgn.h branches/TransitionPte/win32ss/gdi/ntgdi/coord.c branches/TransitionPte/win32ss/gdi/ntgdi/dc.h branches/TransitionPte/win32ss/gdi/ntgdi/gdidebug.h branches/TransitionPte/win32ss/gdi/ntgdi/region.c branches/TransitionPte/win32ss/gdi/ntgdi/region.h branches/TransitionPte/win32ss/user/ntuser/callback.c branches/TransitionPte/win32ss/user/ntuser/vis.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/TransitionPte/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/CMakeLists.txt?re… Modified: branches/TransitionPte/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/boot/bootdata/hiv… Modified: branches/TransitionPte/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/cmake/gcc.cmake?r… Modified: branches/TransitionPte/dll/directx/wine/d3d8/buffer.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/d3d8/d3d8_main.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/d3d8/d3d8_private.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/d3d8/device.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/d3d8/surface.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/d3d8/swapchain.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/d3d8/texture.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/d3d8/volume.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/d3d9/buffer.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/d3d9/d3d9_main.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/d3d9/device.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/d3d9/query.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/d3d9/surface.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/d3d9/swapchain.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/d3d9/texture.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/d3d9/volume.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/ddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/ddraw/ddraw_private.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/ddraw/device.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/ddraw/executebuffer.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/ddraw/palette.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/ddraw/surface.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/ddraw/utils.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/ddraw/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/ddraw/viewport.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/arb_program_shader.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/buffer.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/context.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/cs.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/device.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/drawprim.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/glsl_shader.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/palette.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/query.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/resource.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/shader.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/shader_sm4.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/state.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/stateblock.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/surface.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/swapchain.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/texture.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/utils.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/view.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/volume.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/wined3d.spec URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/wined3d_gl.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/wined3d_main.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/directx/wine/… Modified: branches/TransitionPte/dll/ntdll/ldr/ldrutils.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/ntdll/ldr/ldr… Modified: branches/TransitionPte/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/win32/CMakeLi… Modified: branches/TransitionPte/dll/win32/advapi32/service/sctrl.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/win32/advapi3… Modified: branches/TransitionPte/dll/win32/msi/action.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/win32/msi/act… Modified: branches/TransitionPte/dll/win32/msi/appsearch.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/win32/msi/app… Modified: branches/TransitionPte/dll/win32/msi/classes.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/win32/msi/cla… Modified: branches/TransitionPte/dll/win32/msi/cond.tab.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/win32/msi/con… Modified: branches/TransitionPte/dll/win32/msi/files.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/win32/msi/fil… Modified: branches/TransitionPte/dll/win32/msi/msi.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/win32/msi/msi… Modified: branches/TransitionPte/dll/win32/msi/msi.spec URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/win32/msi/msi… Modified: branches/TransitionPte/dll/win32/msi/package.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/win32/msi/pac… Modified: branches/TransitionPte/dll/win32/msi/patch.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/win32/msi/pat… Modified: branches/TransitionPte/dll/win32/msi/sql.tab.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/win32/msi/sql… Modified: branches/TransitionPte/dll/win32/msi/sql.tab.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/win32/msi/sql… Modified: branches/TransitionPte/dll/win32/msi/table.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/dll/win32/msi/tab… Modified: branches/TransitionPte/drivers/crypto/ksecdd/random.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/crypto/ks… Modified: branches/TransitionPte/drivers/filesystems/ntfs/attrib.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesyste… Modified: branches/TransitionPte/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesyste… Modified: branches/TransitionPte/include/ndk/i386/asm.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/include/ndk/i386/… Modified: branches/TransitionPte/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/include/ndk/rtlty… Modified: branches/TransitionPte/include/psdk/d3d8.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/include/psdk/d3d8… Modified: branches/TransitionPte/include/psdk/d3d8types.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/include/psdk/d3d8… Modified: branches/TransitionPte/include/psdk/d3d9.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/include/psdk/d3d9… Modified: branches/TransitionPte/include/psdk/d3d9types.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/include/psdk/d3d9… Modified: branches/TransitionPte/include/psdk/msiquery.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/include/psdk/msiq… Modified: branches/TransitionPte/include/reactos/wine/wined3d.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/include/reactos/w… Modified: branches/TransitionPte/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/media/doc/README.… Modified: branches/TransitionPte/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/ntoskrnl/mm/ARM3/… Modified: branches/TransitionPte/subsystems/ntvdm/bios/vidbios.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/subsystems/ntvdm/… Modified: branches/TransitionPte/subsystems/ntvdm/hardware/speaker.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/subsystems/ntvdm/… Modified: branches/TransitionPte/win32ss/gdi/ntgdi/cliprgn.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/win32ss/gdi/ntgdi… Modified: branches/TransitionPte/win32ss/gdi/ntgdi/cliprgn.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/win32ss/gdi/ntgdi… Modified: branches/TransitionPte/win32ss/gdi/ntgdi/coord.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/win32ss/gdi/ntgdi… Modified: branches/TransitionPte/win32ss/gdi/ntgdi/dc.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/win32ss/gdi/ntgdi… Modified: branches/TransitionPte/win32ss/gdi/ntgdi/gdidebug.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/win32ss/gdi/ntgdi… Modified: branches/TransitionPte/win32ss/gdi/ntgdi/region.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/win32ss/gdi/ntgdi… Modified: branches/TransitionPte/win32ss/gdi/ntgdi/region.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/win32ss/gdi/ntgdi… Modified: branches/TransitionPte/win32ss/user/ntuser/callback.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/win32ss/user/ntus… Modified: branches/TransitionPte/win32ss/user/ntuser/vis.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/win32ss/user/ntus…

1 0

[ion] 64256: [NDK]: A few minor updates.
by ion＠svn.reactos.org 24 Sep '14

24 Sep '14

Author: ion Date: Wed Sep 24 16:00:35 2014 New Revision: 64256 URL: http://svn.reactos.org/svn/reactos?rev=64256&view=rev Log: [NDK]: A few minor updates. Modified: trunk/reactos/include/ndk/i386/asm.h trunk/reactos/include/ndk/rtltypes.h Modified: trunk/reactos/include/ndk/i386/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/asm.h?rev… ============================================================================== --- trunk/reactos/include/ndk/i386/asm.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/i386/asm.h [iso-8859-1] Wed Sep 24 16:00:35 2014 @@ -476,6 +476,7 @@ #define EFLAGS_VIP 0x100000 #define EFLAG_SIGN 0x8000 #define EFLAG_ZERO 0x4000 +#define EFLAGS_ID 0x200000 #define EFLAG_SELECT (EFLAG_SIGN + EFLAG_ZERO) #endif #define EFLAGS_USER_SANITIZE 0x3F4DD7 Modified: trunk/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] Wed Sep 24 16:00:35 2014 @@ -74,6 +74,7 @@ // // Flags in RTL_ACTIVATION_CONTEXT_STACK_FRAME (from Checked NTDLL) // +#define RTL_ACTIVATION_CONTEXT_STACK_FRAME_FLAG_RELEASE_ON_DEACTIVATION 0x01 #define RTL_ACTIVATION_CONTEXT_STACK_FRAME_FLAG_NO_DEACTIVATE 0x02 #define RTL_ACTIVATION_CONTEXT_STACK_FRAME_FLAG_ON_FREE_LIST 0x04 #define RTL_ACTIVATION_CONTEXT_STACK_FRAME_FLAG_HEAP_ALLOCATED 0x08 @@ -884,6 +885,13 @@ typedef RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_EXTENDED RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME; typedef PRTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_EXTENDED PRTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME; +typedef struct _RTL_HEAP_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME +{ + RTL_ACTIVATION_CONTEXT_STACK_FRAME Frame; + ULONG_PTR Cookie; + PVOID ActivationStackBackTrace[8]; +} RTL_HEAP_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME, *PRTL_HEAP_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME; + #if (NTDDI_VERSION >= NTDDI_WS03) typedef struct _ACTIVATION_CONTEXT_STACK { @@ -914,6 +922,16 @@ ULONG AssemblyRosterOffset; ULONG Flags; } ACTIVATION_CONTEXT_DATA, *PACTIVATION_CONTEXT_DATA; + +typedef struct _ACTIVATION_CONTEXT_STACK_FRAMELIST +{ + ULONG Magic; + ULONG FramesInUse; + LIST_ENTRY Links; + ULONG Flags; + ULONG NotFramesInUse; + RTL_HEAP_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME Frames[32]; +} ACTIVATION_CONTEXT_STACK_FRAMELIST, *PACTIVATION_CONTEXT_STACK_FRAMELIST; #endif /* NTOS_MODE_USER */

1 0

[jgardou] 64255: [NDK] - Rename MM_PAGE_FRAME_NUMBER_SIZE into MM_VPN_BITS_SIZE on a suggestion from Timo
by jgardou＠svn.reactos.org 24 Sep '14

24 Sep '14

Author: jgardou Date: Wed Sep 24 10:11:51 2014 New Revision: 64255 URL: http://svn.reactos.org/svn/reactos?rev=64255&view=rev Log: [NDK] - Rename MM_PAGE_FRAME_NUMBER_SIZE into MM_VPN_BITS_SIZE on a suggestion from Timo Modified: branches/TransitionPte/include/ndk/amd64/mmtypes.h branches/TransitionPte/include/ndk/arm/mmtypes.h branches/TransitionPte/include/ndk/i386/mmtypes.h branches/TransitionPte/include/ndk/mmtypes.h Modified: branches/TransitionPte/include/ndk/amd64/mmtypes.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/include/ndk/amd64… ============================================================================== --- branches/TransitionPte/include/ndk/amd64/mmtypes.h [iso-8859-1] (original) +++ branches/TransitionPte/include/ndk/amd64/mmtypes.h [iso-8859-1] Wed Sep 24 10:11:51 2014 @@ -35,7 +35,7 @@ #define PAGE_SHIFT 12L #define MM_ALLOCATION_GRANULARITY 0x10000 #define MM_ALLOCATION_GRANULARITY_SHIFT 16L -#define MM_PAGE_FRAME_NUMBER_SIZE 52 +#define MM_VPN_BITS_SIZE 52 // // Address of the shared user page Modified: branches/TransitionPte/include/ndk/arm/mmtypes.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/include/ndk/arm/m… ============================================================================== --- branches/TransitionPte/include/ndk/arm/mmtypes.h [iso-8859-1] (original) +++ branches/TransitionPte/include/ndk/arm/mmtypes.h [iso-8859-1] Wed Sep 24 10:11:51 2014 @@ -36,7 +36,7 @@ #define PAGE_SHIFT 12L #define MM_ALLOCATION_GRANULARITY 0x10000 #define MM_ALLOCATION_GRANULARITY_SHIFT 16L -#define MM_PAGE_FRAME_NUMBER_SIZE 20 +#define MM_VPN_BITS_SIZE 20 // // Sanity checks for Paging Macros Modified: branches/TransitionPte/include/ndk/i386/mmtypes.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/include/ndk/i386/… ============================================================================== --- branches/TransitionPte/include/ndk/i386/mmtypes.h [iso-8859-1] (original) +++ branches/TransitionPte/include/ndk/i386/mmtypes.h [iso-8859-1] Wed Sep 24 10:11:51 2014 @@ -34,7 +34,7 @@ #define PAGE_SHIFT 12L #define MM_ALLOCATION_GRANULARITY 0x10000 #define MM_ALLOCATION_GRANULARITY_SHIFT 16L -#define MM_PAGE_FRAME_NUMBER_SIZE 20 +#define MM_VPN_BITS_SIZE 20 // // Address of the shared user page Modified: branches/TransitionPte/include/ndk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/include/ndk/mmtyp… ============================================================================== --- branches/TransitionPte/include/ndk/mmtypes.h [iso-8859-1] (original) +++ branches/TransitionPte/include/ndk/mmtypes.h [iso-8859-1] Wed Sep 24 10:11:51 2014 @@ -850,7 +850,7 @@ ULONG_PTR Hashed:1; ULONG_PTR Direct:1; ULONG_PTR Age:2; - ULONG_PTR VirtualPageNumber: MM_PAGE_FRAME_NUMBER_SIZE; + ULONG_PTR VirtualPageNumber: MM_VPN_BITS_SIZE; } MMWSLENTRY, *PMMWSLENTRY; typedef struct _MMWSLE

1 0

[tkreuzer] 64254: [GDI32_APITEST] Add tests for ExcludeClipRect, convert tabs to spaces
by tkreuzer＠svn.reactos.org 24 Sep '14

24 Sep '14

Author: tkreuzer Date: Wed Sep 24 08:35:30 2014 New Revision: 64254 URL: http://svn.reactos.org/svn/reactos?rev=64254&view=rev Log: [GDI32_APITEST] Add tests for ExcludeClipRect, convert tabs to spaces Added: trunk/rostests/apitests/gdi32/ExcludeClipRect.c (with props) Modified: trunk/rostests/apitests/gdi32/CMakeLists.txt trunk/rostests/apitests/gdi32/GetClipBox.c trunk/rostests/apitests/gdi32/testlist.c Modified: trunk/rostests/apitests/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CMakeLists… ============================================================================== --- trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] Wed Sep 24 08:35:30 2014 @@ -22,6 +22,7 @@ EngCreateSemaphore.c EngDeleteSemaphore.c EngReleaseSemaphore.c + ExcludeClipRect.c ExtCreatePen.c GdiConvertBitmap.c GdiConvertBrush.c Added: trunk/rostests/apitests/gdi32/ExcludeClipRect.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/ExcludeCli… ============================================================================== --- trunk/rostests/apitests/gdi32/ExcludeClipRect.c (added) +++ trunk/rostests/apitests/gdi32/ExcludeClipRect.c [iso-8859-1] Wed Sep 24 08:35:30 2014 @@ -0,0 +1,100 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for ExcludeClipRect + * PROGRAMMERS: Timo Kreuzer + */ + +#include <apitest.h> + +#include <wingdi.h> +#include <winuser.h> + +#define CLIPRGN 1 + +#define ok_rect(_prc, _left, _top, _right, _bottom) \ + ok_int((_prc)->left, _left); \ + ok_int((_prc)->top, _top); \ + ok_int((_prc)->right, _right); \ + ok_int((_prc)->bottom, _bottom); \ + +void Test_ExcludeClipRect() +{ + HDC hdc; + HRGN hrgn, hrgn2; + + hdc = CreateCompatibleDC(NULL); + ok(hdc != 0, "CreateCompatibleDC failed, skipping tests.\n"); + if (!hdc) return; + + hrgn2 = CreateRectRgn(0, 0, 0, 0); + + /* Test NULL DC */ + SetLastError(0x12345); + ok_int(ExcludeClipRect(NULL, 0, 0, 0, 0), ERROR); + ok_int(GetLastError(), ERROR_INVALID_HANDLE); + + /* Test invalid DC */ + SetLastError(0x12345); + ok_int(ExcludeClipRect((HDC)(ULONG_PTR)0x12345, 0, 0, 0, 0), ERROR); + ok_int(GetLastError(), ERROR_INVALID_HANDLE); + SetLastError(0x12345); + + /* Set a clip region */ + hrgn = CreateRectRgn(10, 10, 20, 30); + ok_int(SelectClipRgn(hdc, hrgn), NULLREGION); // yeah... it's NULLREGION + ok_int(GetRandomRgn(hdc, hrgn2, CLIPRGN), 1); + ok_int(CombineRgn(hrgn2, hrgn2, hrgn, RGN_XOR), NULLREGION); // but in fact it's a rect region! + + /* Exclude something outside of the clip region */ + ok_int(ExcludeClipRect(hdc, 0, 0, 1, 1), COMPLEXREGION); // in reality it's a rect region + ok_int(GetRandomRgn(hdc, hrgn2, CLIPRGN), 1); + ok_int(CombineRgn(hrgn2, hrgn2, hrgn, RGN_XOR), NULLREGION); + + /* Now exclude something for real */ + ok_int(ExcludeClipRect(hdc, 0, 0, 15, 15), COMPLEXREGION); + ok_int(GetRandomRgn(hdc, hrgn2, CLIPRGN), 1); + ok_int(CombineRgn(hrgn, hrgn2, NULL, RGN_COPY), COMPLEXREGION); + + /* Exclude everything left */ + ok_int(ExcludeClipRect(hdc, 0, 0, 100, 100), NULLREGION); + ok_int(GetRandomRgn(hdc, hrgn2, CLIPRGN), 1); + ok_int(CombineRgn(hrgn, hrgn2, NULL, RGN_COPY), NULLREGION); + + /* Reset the clip region */ + ok_int(SelectClipRgn(hdc, NULL), SIMPLEREGION); // makes sense, it's actually the whole region + ok_int(GetRandomRgn(hdc, hrgn2, CLIPRGN), 0); // return value says region is NULL + ok_int(ExcludeClipRect(hdc, 0, 0, 1, 1), NULLREGION); + ok_int(GetRandomRgn(hdc, hrgn2, CLIPRGN), 1); // but now we have a region + ok_int(CombineRgn(hrgn, hrgn2, NULL, RGN_COPY), NULLREGION); // but it's a NULLREGION (aka empty)? + + /* Test negative rect */ + ok_int(SelectClipRgn(hdc, NULL), SIMPLEREGION); + ok_int(ExcludeClipRect(hdc, -10, -10, 0, 0), COMPLEXREGION); // this time it's a complex region? + ok_int(GetRandomRgn(hdc, hrgn2, CLIPRGN), 1); + hrgn = CreateRectRgn(0, 0, 1, 1); + ok_int(CombineRgn(hrgn2, hrgn2, hrgn, RGN_XOR), NULLREGION); + + /* Test rect with high coordinates */ + ok_int(SelectClipRgn(hdc, NULL), SIMPLEREGION); + ok_int(ExcludeClipRect(hdc, 100000, 100000, 100010, 100010), COMPLEXREGION); // this time it's a complex region? + ok_int(GetRandomRgn(hdc, hrgn2, CLIPRGN), 1); + hrgn = CreateRectRgn(0, 0, 1, 1); + ok_int(CombineRgn(hrgn2, hrgn2, hrgn, RGN_XOR), NULLREGION); + + /* Test reversed rect negative, but still above 0 */ + ok_int(SelectClipRgn(hdc, NULL), SIMPLEREGION); + ok_int(ExcludeClipRect(hdc, 1, 1, -10, -20), NULLREGION); + ok_int(GetRandomRgn(hdc, hrgn2, CLIPRGN), 1); + hrgn = CreateRectRgn(0, 0, 0, 0); + ok_int(CombineRgn(hrgn, hrgn2, NULL, RGN_COPY), NULLREGION); + + ok_int(GetLastError(), 0x12345); + +} + + +START_TEST(ExcludeClipRect) +{ + Test_ExcludeClipRect(); +} Propchange: trunk/rostests/apitests/gdi32/ExcludeClipRect.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/gdi32/GetClipBox.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetClipBox… ============================================================================== --- trunk/rostests/apitests/gdi32/GetClipBox.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetClipBox.c [iso-8859-1] Wed Sep 24 08:35:30 2014 @@ -18,117 +18,117 @@ void Test_GetClipBox() { - HWND hWnd; - HDC hdc; - RECT rect; - HRGN hrgn, hrgn2; - int ret; + HWND hWnd; + HDC hdc; + RECT rect; + HRGN hrgn, hrgn2; + int ret; - /* Create a window */ - hWnd = CreateWindowW(L"BUTTON", L"TestWindow", WS_OVERLAPPEDWINDOW | WS_VISIBLE, - CW_USEDEFAULT, CW_USEDEFAULT, 100, 100, - NULL, NULL, 0, 0); + /* Create a window */ + hWnd = CreateWindowW(L"BUTTON", L"TestWindow", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + CW_USEDEFAULT, CW_USEDEFAULT, 100, 100, + NULL, NULL, 0, 0); ok(hWnd != NULL, "CreateWindowW failed\n"); if (hWnd == NULL) { return; } - hdc = GetDC(hWnd); + hdc = GetDC(hWnd); - /* Test invalid DC */ - SetLastError(ERROR_SUCCESS); - ret = GetClipBox((HDC)0x12345, &rect); - ok(ret == ERROR, "Expected ERROR, got %d\n", ret); - ok(GetLastError() == 0, "Expected 0, got %ld\n", GetLastError()); + /* Test invalid DC */ + SetLastError(ERROR_SUCCESS); + ret = GetClipBox((HDC)0x12345, &rect); + ok(ret == ERROR, "Expected ERROR, got %d\n", ret); + ok(GetLastError() == 0, "Expected 0, got %ld\n", GetLastError()); - //ret = GetClipBox(hdc, &rect); - //ok_int(ret, SIMPLEREGION); - //ok_rect(&rect, 0, 0, 132, 68); + //ret = GetClipBox(hdc, &rect); + //ok_int(ret, SIMPLEREGION); + //ok_rect(&rect, 0, 0, 132, 68); /* Create a clip region */ - hrgn = CreateRectRgn(5, 7, 50, 50); + hrgn = CreateRectRgn(5, 7, 50, 50); SelectClipRgn(hdc, hrgn); DeleteObject(hrgn); - ret = GetClipBox(hdc, &rect); - ok_int(ret, SIMPLEREGION); - ok_rect(&rect, 5, 7, 50, 50); + ret = GetClipBox(hdc, &rect); + ok_int(ret, SIMPLEREGION); + ok_rect(&rect, 5, 7, 50, 50); /* Set clip region as meta region */ SetMetaRgn(hdc); /* Create a new clip region */ - hrgn = CreateRectRgn(10, 10, 100, 100); + hrgn = CreateRectRgn(10, 10, 100, 100); SelectClipRgn(hdc, hrgn); DeleteObject(hrgn); - ret = GetClipBox(hdc, &rect); - ok_int(ret, SIMPLEREGION); - ok_rect(&rect, 10, 10, 50, 50); + ret = GetClipBox(hdc, &rect); + ok_int(ret, SIMPLEREGION); + ok_rect(&rect, 10, 10, 50, 50); /* Create an empty clip region */ - hrgn = CreateRectRgn(10, 10, 10, 30); + hrgn = CreateRectRgn(10, 10, 10, 30); SelectClipRgn(hdc, hrgn); DeleteObject(hrgn); - ret = GetClipBox(hdc, &rect); - ok_int(ret, NULLREGION); - ok_rect(&rect, 0, 0, 0, 0); + ret = GetClipBox(hdc, &rect); + ok_int(ret, NULLREGION); + ok_rect(&rect, 0, 0, 0, 0); /* Create a complex region */ - hrgn = CreateRectRgn(10, 10, 30, 30); - hrgn2 = CreateRectRgn(20, 20, 60, 60); - ok_int(CombineRgn(hrgn, hrgn, hrgn2, RGN_OR), COMPLEXREGION); + hrgn = CreateRectRgn(10, 10, 30, 30); + hrgn2 = CreateRectRgn(20, 20, 60, 60); + ok_int(CombineRgn(hrgn, hrgn, hrgn2, RGN_OR), COMPLEXREGION); SelectClipRgn(hdc, hrgn); DeleteObject(hrgn2); - ret = GetClipBox(hdc, &rect); - ok_int(ret, COMPLEXREGION); - ok_rect(&rect, 10, 10, 50, 50); + ret = GetClipBox(hdc, &rect); + ok_int(ret, COMPLEXREGION); + ok_rect(&rect, 10, 10, 50, 50); /* Set scaling but keep the mapping mode (viewport should not be changed) */ ok_int(SetViewportExtEx(hdc, 1000, 1000, NULL), 1); - ret = GetClipBox(hdc, &rect); - ok_int(ret, COMPLEXREGION); - ok_rect(&rect, 10, 10, 50, 50); + ret = GetClipBox(hdc, &rect); + ok_int(ret, COMPLEXREGION); + ok_rect(&rect, 10, 10, 50, 50); /* Set unisotropic mode, ClipBox should be unchanged */ ok_int(SetMapMode(hdc, MM_ANISOTROPIC), 1); - ret = GetClipBox(hdc, &rect); - ok_int(ret, COMPLEXREGION); - ok_rect(&rect, 10, 10, 50, 50); + ret = GetClipBox(hdc, &rect); + ok_int(ret, COMPLEXREGION); + ok_rect(&rect, 10, 10, 50, 50); /* Now set viewport again */ ok_int(SetViewportExtEx(hdc, 200, 400, NULL), 1); - ret = GetClipBox(hdc, &rect); - ok_int(ret, COMPLEXREGION); // obviously some special secret feature... - ok_rect(&rect, 0, 0, 0, 0); + ret = GetClipBox(hdc, &rect); + ok_int(ret, COMPLEXREGION); // obviously some special secret feature... + ok_rect(&rect, 0, 0, 0, 0); /* Reset clip region */ SelectClipRgn(hdc, NULL); SetMetaRgn(hdc); - ret = GetClipBox(hdc, &rect); - ok_int(ret, SIMPLEREGION); - ok_rect(&rect, 0, 0, 0, 0); + ret = GetClipBox(hdc, &rect); + ok_int(ret, SIMPLEREGION); + ok_rect(&rect, 0, 0, 0, 0); - hrgn = CreateRectRgn(10, 10, 190, 190); + hrgn = CreateRectRgn(10, 10, 190, 190); SelectClipRgn(hdc, hrgn); - ret = GetClipBox(hdc, &rect); - ok_int(ret, SIMPLEREGION); - ok_rect(&rect, 0, 0, 0, 0); + ret = GetClipBox(hdc, &rect); + ok_int(ret, SIMPLEREGION); + ok_rect(&rect, 0, 0, 0, 0); /* Now also set the window extension */ ok_int(SetWindowExtEx(hdc, 400, 600, NULL), 1); - ret = GetClipBox(hdc, &rect); - ok_int(ret, SIMPLEREGION); - ok_rect(&rect, 20, 15, 100, 75); + ret = GetClipBox(hdc, &rect); + ok_int(ret, SIMPLEREGION); + ok_rect(&rect, 20, 15, 100, 75); - hrgn = CreateRectRgn(30, 30, 300, 300); + hrgn = CreateRectRgn(30, 30, 300, 300); SelectClipRgn(hdc, hrgn); SetMetaRgn(hdc); - ret = GetClipBox(hdc, &rect); - ok_int(ret, SIMPLEREGION); - ok_rect(&rect, 60, 45, 100, 75); + ret = GetClipBox(hdc, &rect); + ok_int(ret, SIMPLEREGION); + ok_rect(&rect, 60, 45, 100, 75); - ReleaseDC(hWnd, hdc); - DestroyWindow(hWnd); + ReleaseDC(hWnd, hdc); + DestroyWindow(hWnd); } START_TEST(GetClipBox) Modified: trunk/rostests/apitests/gdi32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/testlist.c… ============================================================================== --- trunk/rostests/apitests/gdi32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/testlist.c [iso-8859-1] Wed Sep 24 08:35:30 2014 @@ -23,6 +23,7 @@ extern void func_EngCreateSemaphore(void); extern void func_EngDeleteSemaphore(void); extern void func_EngReleaseSemaphore(void); +extern void func_ExcludeClipRect(void); extern void func_ExtCreatePen(void); extern void func_GdiConvertBitmap(void); extern void func_GdiConvertBrush(void); @@ -83,6 +84,7 @@ { "EngCreateSemaphore", func_EngCreateSemaphore }, { "EngDeleteSemaphore", func_EngDeleteSemaphore }, { "EngReleaseSemaphore", func_EngReleaseSemaphore }, + { "ExcludeClipRect", func_ExcludeClipRect }, { "ExtCreatePen", func_ExtCreatePen }, { "GdiConvertBitmap", func_GdiConvertBitmap }, { "GdiConvertBrush", func_GdiConvertBrush },

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