Ros-dev

ros-dev@reactos.org

5788 discussions

advapi self forwarding and kernel32 self imports

by Timo Kreuzer

Hi, 1.) Is there a reason, why some exports of advapi32 are forwarded instead of just set to the proper function? Forwarding is more work for the loader. 2.) kernel32 imports from itself. Which will probably lead to the same result as bug 4292. This is because the mingw lib imports from kernel32 and requires kernel32 library to be added afterwards. But rbuild likes to add mingw lib at the very end of the library list which requires adding kernel32 as a library to mingw_common to resolve imports. This should be fixed and mingw added as the very first library. I wonder if those 2 are even allowed on Windows, as both don't make sense. Timo

15 years, 6 months

Re: [ros-dev] [ros-diffs] [tkreuzer] 40115: rename DCs pDc_Attr to pdcattr, like in gdikdx. Make pdcattr alsways point to a DC_ATTR, either the user mode struct or the local part. Get rid of all the If (!pdcattr) pdcattr = &dc->Dc_Attr; That are not

by James Tabor

Hi All! Good to see it go, I had it in as a safeguard, and now we moved on to the next phase of the rewrite! Thanks Timo! James 8^D On Fri, Mar 20, 2009 at 4:47 AM, Aleksey Bragin <aleksey(a)reactos.org> wrote: > Oh, finally! ;) > > On Mar 20, 2009, at 7:51 AM, tkreuzer(a)svn.reactos.org wrote: > >> Author: tkreuzer >> Date: Fri Mar 20 07:51:26 2009 >> New Revision: 40115 >> >> URL: http://svn.reactos.org/svn/reactos?rev=40115&view=rev >> Log: >> rename DCs pDc_Attr to pdcattr, like in gdikdx. >> Make pdcattr alsways point to a DC_ATTR, either the user mode >> struct or the local part. Get rid of all the If (!pdcattr) pdcattr >> = &dc->Dc_Attr; That are not required anymore. >

15 years, 6 months

by Aleksey Bragin

Oh, finally! ;) On Mar 20, 2009, at 7:51 AM, tkreuzer(a)svn.reactos.org wrote: > Author: tkreuzer > Date: Fri Mar 20 07:51:26 2009 > New Revision: 40115 > > URL: http://svn.reactos.org/svn/reactos?rev=40115&view=rev > Log: > rename DCs pDc_Attr to pdcattr, like in gdikdx. > Make pdcattr alsways point to a DC_ATTR, either the user mode > struct or the local part. Get rid of all the If (!pdcattr) pdcattr > = &dc->Dc_Attr; That are not required anymore.

15 years, 6 months

[ros-diffs] [fireball] 40106: - Don't try to be smarter than Windows and don't copy background/foreground color from the original DC.

by James Tabor

Introduced in revision 6042. Over think was a norm back then.

15 years, 6 months

header hack.... eeh workaround ;)

by Timo Kreuzer

Hi, I's like to suggest a workaround to the problem that we have to deal with both RECT and RECTL structures in win32k and as they are incompatible need to typecast in a lot of places. RECTL is what the DDI interface uses (almost) exclusively. While the NtGdi Interface and a lot of User structures also use RECT. Both structures are equal, but not compatible when it comes to assigning one to another, So we need to do all these nasty typecasts. My suggestion is adding some defines after the inclusion of windef.h: #define RECT RECTL #define PRECT PRECTL #define LPRECT LPRECTL #define LPCRECT LPCRECTL same for POINT and POINTL I'd like to hear your opinion on that. Thanks, Timo

15 years, 6 months

Re: [ros-dev] [ros-diffs] [dgorbachev] 40014: Trying to fix boot breakage.

by Timo Kreuzer

dgorbachev(a)svn.reactos.org schrieb: > Author: dgorbachev > Date: Sat Mar 14 21:13:32 2009 > New Revision: 40014 > > URL: http://svn.reactos.org/svn/reactos?rev=40014&view=rev > Log: > Trying to fix boot breakage. > Try harder, please ;-P http://reactos.org:8010/builders/ReactOS_%28Debug%29/builds/13888/steps/tes… > Modified: > trunk/reactos/ntoskrnl/mm/freelist.c > trunk/reactos/ntoskrnl/mm/kmap.c > > Modified: trunk/reactos/ntoskrnl/mm/freelist.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Sat Mar 14 21:13:32 2009 > @@ -942,6 +942,21 @@ > return NumberOfPagesFound; > } > > +static > +NTSTATUS > +MiZeroPageInternal(PFN_TYPE Page) > +{ > + PVOID TempAddress; > + > + TempAddress = MiMapPageToZeroInHyperSpace(Page); > + if (TempAddress == NULL) > + { > + return(STATUS_NO_MEMORY); > + } > + memset(TempAddress, 0, PAGE_SIZE); > + return(STATUS_SUCCESS); > +} > + > NTSTATUS > NTAPI > MmZeroPageThreadMain(PVOID Ignored) > @@ -989,7 +1004,7 @@ > PageDescriptor->Flags.Type = MM_PHYSICAL_PAGE_USED; > KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); > Pfn = PageDescriptor - MmPageArray; > - Status = MiZeroPage(Pfn); > + Status = MiZeroPageInternal(Pfn); > > oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); > if (PageDescriptor->MapCount != 0) > > Modified: trunk/reactos/ntoskrnl/mm/kmap.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/kmap.c?rev=400… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/kmap.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/kmap.c [iso-8859-1] Sat Mar 14 21:13:32 2009 > @@ -16,18 +16,23 @@ > /* GLOBALS *****************************************************************/ > > /* FUNCTIONS ***************************************************************/ > + > NTSTATUS > NTAPI > MiZeroPage(PFN_TYPE Page) > { > + PEPROCESS Process; > + KIRQL Irql; > PVOID TempAddress; > > - TempAddress = MiMapPageToZeroInHyperSpace(Page); > + Process = (PEPROCESS)KeGetCurrentThread()->ApcState.Process; > + TempAddress = MiMapPageInHyperSpace(Process, Page, &Irql); > if (TempAddress == NULL) > { > return(STATUS_NO_MEMORY); > } > memset(TempAddress, 0, PAGE_SIZE); > + MiUnmapPageInHyperSpace(Process, TempAddress, Irql); > return(STATUS_SUCCESS); > } > > > >

15 years, 6 months

Re: [ros-dev] [ros-diffs] [dgorbachev] 40008: Return to an old idea of MiMapPageToZeroInHyperSpace(), "fix" bug #4267.

by Timo Kreuzer

This breaks boot. http://reactos.org:8010/builders/ReactOS_%28Debug%29/builds/13880/steps/tes… dgorbachev(a)svn.reactos.org schrieb: > Author: dgorbachev > Date: Sat Mar 14 04:20:18 2009 > New Revision: 40008 > > URL: http://svn.reactos.org/svn/reactos?rev=40008&view=rev > Log: > Return to an old idea of MiMapPageToZeroInHyperSpace(), "fix" bug #4267. > > Modified: > trunk/reactos/ntoskrnl/mm/hypermap.c > > Modified: trunk/reactos/ntoskrnl/mm/hypermap.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/hypermap.c?rev… > ============================================================================== > --- trunk/reactos/ntoskrnl/mm/hypermap.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/mm/hypermap.c [iso-8859-1] Sat Mar 14 04:20:18 2009 > @@ -14,8 +14,11 @@ > > /* GLOBALS ********************************************************************/ > > +#define MI_ZEROING_PTES 255 > + > PMMPTE MmFirstReservedMappingPte; > PMMPTE MmLastReservedMappingPte; > +PMMPTE MmFirstReservedZeroingPte; > MMPTE HyperTemplatePte; > PEPROCESS HyperProcess; > KIRQL HyperIrql; > @@ -40,6 +43,8 @@ > MmFirstReservedMappingPte = MiAddressToPte(MI_MAPPING_RANGE_START); > MmLastReservedMappingPte = MiAddressToPte(MI_MAPPING_RANGE_END); > MmFirstReservedMappingPte->u.Hard.PageFrameNumber = MI_HYPERSPACE_PTES; > + MmFirstReservedZeroingPte = MiAddressToPte(MI_ZERO_PTE); > + MmFirstReservedZeroingPte->u.Hard.PageFrameNumber = MI_ZEROING_PTES; > } > > PVOID > @@ -134,38 +139,62 @@ > { > MMPTE TempPte; > PMMPTE PointerPte; > + PFN_NUMBER Offset; > PVOID Address; > - > + > // > // Never accept page 0 > // > ASSERT(Page != 0); > - > + > // > // Build the PTE > // > TempPte = HyperTemplatePte; > TempPte.u.Hard.PageFrameNumber = Page; > - > - // > - // Get the Zero PTE and its address > - // > - PointerPte = MiAddressToPte(MI_ZERO_PTE); > + > + // > + // Pick the first zeroing PTE > + // > + PointerPte = MmFirstReservedZeroingPte; > + > + // > + // Now get the first free PTE > + // > + Offset = PFN_FROM_PTE(PointerPte); > + if (!Offset) > + { > + // > + // Reset the PTEs > + // > + Offset = MI_ZEROING_PTES; > + KeFlushProcessTb(); > + } > + > + // > + // Prepare the next PTE > + // > + PointerPte->u.Hard.PageFrameNumber = Offset - 1; > + > + // > + // Write the current PTE > + // > + PointerPte += Offset; > + *PointerPte = TempPte; > + > + // > + // Return the address > + // > Address = (PVOID)((ULONG_PTR)PointerPte << 10); > - > - // > - // Invalidate the old address > - // > - __invlpg(Address); > - > - // > - // Write the current PTE > - // > - TempPte.u.Hard.PageFrameNumber = Page; > - *PointerPte = TempPte; > - > - // > - // Return the address > - // > return Address; > } > + > +VOID > +NTAPI > +MiUnmapPageInZeroSpace(IN PVOID Address) > +{ > + // > + // Blow away the mapping > + // > + MiAddressToPte(Address)->u.Long = 0; > +} > > >

15 years, 6 months

Re: [ros-dev] [ros-diffs] [mkupfer] 39871: Sascha Clausen <r4v3r AT hotmail DOT de> - Draw bullet for menu radio group. - See issue #4193 for details.

by Ged

Looking at the patch only this looks wrong to me. Assuming this is radio button it should use the marlett font. Ged. -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of mkupfer(a)svn.reactos.org Sent: 04 March 2009 16:30 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [mkupfer] 39871: Sascha Clausen <r4v3r AT hotmail DOT de> - Draw bullet for menu radio group. - See issue #4193 for details. Author: mkupfer Date: Wed Mar 4 19:29:57 2009 New Revision: 39871 URL: http://svn.reactos.org/svn/reactos?rev=39871&view=rev Log: Sascha Clausen <r4v3r AT hotmail DOT de> - Draw bullet for menu radio group. - See issue #4193 for details. Modified: trunk/reactos/dll/win32/user32/windows/draw.c Modified: trunk/reactos/dll/win32/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] Wed Mar 4 19:29:57 2009 @@ -1276,11 +1276,12 @@ yc = myr.top + SmallDiam - SmallDiam/2; i = 234*SmallDiam/750; i = i < 1 ? 1 : i; - myr.left = xc - i+i/2; + myr.left = xc - i/2; myr.right = xc + i/2; - myr.top = yc - i+i/2; + myr.top = yc - i/2; myr.bottom = yc + i/2; - Pie(dc, myr.left, myr.top, myr.right, myr.bottom, xe, ye, xe, ye); + // if the start and the end point are equal, Pie() only draws a single line, so start one pixel lower + Pie(dc, myr.left, myr.top, myr.right, myr.bottom, xe, ye+1, xe, ye); break; case DFCS_MENUCHECK:

15 years, 6 months

Re: [ros-dev] [ros-diffs] [mkupfer] 39997: - Add a hackfix comment for issue #4243 due to several requests.

by Ged

It's not UserDrawIconEx which is hacky, it's just the code you added for detecting alpha pixels Ged. -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of mkupfer(a)svn.reactos.org Sent: 13 March 2009 00:21 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [mkupfer] 39997: - Add a hackfix comment for issue #4243 due to several requests. Author: mkupfer Date: Fri Mar 13 03:20:48 2009 New Revision: 39997 URL: http://svn.reactos.org/svn/reactos?rev=39997&view=rev Log: - Add a hackfix comment for issue #4243 due to several requests. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Fri Mar 13 03:20:48 2009 @@ -1389,6 +1389,7 @@ } +/* FIXME: ReactOS specific hack */ BOOL UserDrawIconEx( HDC hDc,

15 years, 6 months

Re: [ros-dev] [ros-diffs] [mkupfer] 39989: Evgeniy Boltik <bstsoft AT narod DOT ru> - Fix draw icon with alpha in 32 bit. - See issue #4243 for details.

by Ged

This looks hacky -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of mkupfer(a)svn.reactos.org Sent: 12 March 2009 21:26 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [mkupfer] 39989: Evgeniy Boltik <bstsoft AT narod DOT ru> - Fix draw icon with alpha in 32 bit. - See issue #4243 for details. Author: mkupfer Date: Fri Mar 13 00:25:49 2009 New Revision: 39989 URL: http://svn.reactos.org/svn/reactos?rev=39989&view=rev Log: Evgeniy Boltik <bstsoft AT narod DOT ru> - Fix draw icon with alpha in 32 bit. - See issue #4243 for details. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Fri Mar 13 00:25:49 2009 @@ -1389,82 +1389,6 @@ } -#define STRETCH_CAN_SRCCOPY_ONLY - -#ifdef STRETCH_CAN_SRCCOPY_ONLY -void -FASTCALL -DoStretchBlt(HDC DcDest, int XDest, int YDest, int WidthDest, int HeightDest, - HDC DcSrc, int XSrc, int YSrc, int WidthSrc, int HeightSrc, - DWORD Rop3, BOOL Color) -{ - HDC DcStretched; - HBITMAP BitmapStretched; - HBITMAP OldBitmap; - - if (WidthDest == WidthSrc && HeightDest == HeightSrc) - { - NtGdiBitBlt(DcDest, XDest, YDest, WidthDest, HeightDest, - DcSrc, XSrc, YSrc, Rop3, 0, 0); - } - else if (SRCCOPY == Rop3) - { - NtGdiStretchBlt(DcDest, XDest, YDest, WidthDest, HeightDest, - DcSrc, XSrc, YSrc, WidthSrc, HeightSrc, - Rop3, 0); - } - else - { - DcStretched = NtGdiCreateCompatibleDC(DcSrc); - if (NULL == DcStretched) - { - DPRINT1("Failed to create compatible DC\n"); - return; - } - if (Color) - { - BitmapStretched = NtGdiCreateCompatibleBitmap(DcDest, WidthDest, - HeightDest); - } - else - { - BitmapStretched = IntGdiCreateBitmap(WidthDest, HeightDest, 1, 1, NULL); - } - if (NULL == BitmapStretched) - { - NtGdiDeleteObjectApp(DcStretched); - DPRINT1("Failed to create temporary bitmap\n"); - return; - } - OldBitmap = NtGdiSelectBitmap(DcStretched, BitmapStretched); - if (NULL == OldBitmap) - { - NtGdiDeleteObject(BitmapStretched); - NtGdiDeleteObjectApp(DcStretched); - DPRINT1("Failed to create temporary bitmap\n"); - return; - } - if (! NtGdiStretchBlt(DcStretched, 0, 0, WidthDest, HeightDest, - DcSrc, XSrc, YSrc, WidthSrc, HeightSrc, - SRCCOPY, 0) || - ! NtGdiBitBlt(DcDest, XDest, YDest, WidthDest, HeightDest, - DcStretched, 0, 0, Rop3, 0, 0)) - { - DPRINT1("Failed to blt\n"); - } - NtGdiSelectBitmap(DcStretched, OldBitmap); - NtGdiDeleteObject(BitmapStretched); - NtGdiDeleteObjectApp(DcStretched); - } -} -#else -#define DoStretchBlt(DcDest, XDest, YDest, WidthDest, HeightDest, \ - DcSrc, XSrc, YSrc, WidthSrc, HeightSrc, Rop3, Color) \ - NtGdiStretchBlt((DcDest), (XDest), (YDest), (WidthDest), (HeightDest), \ - (DcSrc), (XSrc), (YSrc), (WidthSrc), (HeightSrc), \ - (Rop3), 0) -#endif /* STRETCH_CAN_SRCCOPY_ONLY */ - BOOL UserDrawIconEx( HDC hDc, @@ -1482,7 +1406,6 @@ BITMAP bmpMask, bmpColor; COLORREF oldFg, oldBg; BOOL DoFlickerFree; - INT nStretchMode; SIZE IconSize; HDC hdcOff; @@ -1524,7 +1447,31 @@ when cxWidth or cyHeight is 0 */ if ((bmpColor.bmBitsPixel == 32) && (cxWidth != 0) && (cyHeight != 0)) { - bAlpha = TRUE; + SURFACE *psurfOff = NULL; + PFN_DIB_GetPixel fnSource_GetPixel = NULL; + INT x, y; + + //Find alpha into icon + psurfOff = SURFACE_LockSurface(hbmColor ? hbmColor : hbmMask); + if (psurfOff) + { + fnSource_GetPixel = DibFunctionsForBitmapFormat[psurfOff->SurfObj.iBitmapFormat].DIB_GetPixel; + if (fnSource_GetPixel) + { + for (x = 0; x < psurfOff->SurfObj.sizlBitmap.cx; x++) + { + for (y = 0; y < psurfOff->SurfObj.sizlBitmap.cy; y++) + { + bAlpha = ((BYTE)(fnSource_GetPixel(&psurfOff->SurfObj, x, y) >> 24) & 0xff); + if (bAlpha) + break; + } + if (bAlpha) + break; + } + } + SURFACE_UnlockSurface(psurfOff); + } } if (!diFlags) @@ -1608,8 +1555,6 @@ goto cleanup; } - nStretchMode = IntGdiSetStretchBltMode(hdcOff, STRETCH_DELETESCANS); - oldFg = IntGdiSetTextColor(hdcOff, RGB(0, 0, 0)); oldBg = IntGdiSetBkColor(hdcOff, RGB(255, 255, 255)); @@ -1622,7 +1567,7 @@ goto cleanup; } - DoStretchBlt(hdcOff, + NtGdiStretchBlt(hdcOff, (DoFlickerFree || bAlpha ? 0 : xLeft), (DoFlickerFree || bAlpha ? 0 : yTop), cxWidth, @@ -1633,7 +1578,7 @@ IconSize.cx, IconSize.cy, ((diFlags & DI_IMAGE) ? SRCAND : SRCCOPY), - FALSE); + 0); NtGdiSelectBitmap(hdcMem, hOldMem); } @@ -1642,7 +1587,7 @@ { hOldMem = NtGdiSelectBitmap(hdcMem, (hbmColor ? hbmColor : hbmMask)); - DoStretchBlt(hdcOff, + NtGdiStretchBlt(hdcOff, (DoFlickerFree || bAlpha ? 0 : xLeft), (DoFlickerFree || bAlpha ? 0 : yTop), cxWidth, @@ -1653,7 +1598,7 @@ IconSize.cx, IconSize.cy, ((diFlags & DI_MASK) ? SRCINVERT : SRCCOPY), - NULL != hbmColor); + 0); NtGdiSelectBitmap(hdcMem, hOldMem); } @@ -1729,7 +1674,6 @@ IntGdiSetTextColor(hdcOff, oldFg); IntGdiSetBkColor(hdcOff, oldBg); - IntGdiSetStretchBltMode(hdcOff, nStretchMode); Ret = TRUE;

15 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-dev