Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 56006: [WIN32K] - Calculate font name hash in GreHfontCreate - Partly implement LFONT_ppfe, which finds a matching PFE for an LFONT - Implement PFE_ulPenalty, that calculates a penalty v...
by tkreuzer＠svn.reactos.org 04 Mar '12

04 Mar '12

Author: tkreuzer Date: Sun Mar 4 19:08:47 2012 New Revision: 56006 URL: http://svn.reactos.org/svn/reactos?rev=56006&view=rev Log: [WIN32K] - Calculate font name hash in GreHfontCreate - Partly implement LFONT_ppfe, which finds a matching PFE for an LFONT - Implement PFE_ulPenalty, that calculates a penalty value from a PFE based on a LOGFONT - Implement HASHBUCKET_ppfeFindBestMatch, that finds the best matching PFE from within a HASHBUCKET - Implement PFT_ppfeFindBestMatch, that finds the best matching PFE from a PFT - Rename PFT_pffFindFont to PFT_pffFindFontByFile - Use bitfields instead of BOOLs in RFONT structure - Add a name hash value to the LFONT structure - Add a FONTSUBSTITUTE structure that will be used for font substitutions Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fontrsrc.c branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/lfont.c branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/font.h Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fontrsrc.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fontrsrc.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fontrsrc.c [iso-8859-1] Sun Mar 4 19:08:47 2012 @@ -7,12 +7,19 @@ #include <win32k.h> #include <include/font.h> - -#define NDEBUG -#include <debug.h> +DBG_DEFAULT_CHANNEL(GdiFont); PFT gpftPublic; ULONG gulHashBucketId = 0; + +static +PFONTSUBSTITUTE +GetFontSubstitute(PWSTR pwszFace) +{ + // HACK + WARN("GetFontSubstitute is unimplemented.\n"); + return NULL; +} VOID NTAPI @@ -34,8 +41,8 @@ } -static ULONG +NTAPI CalculateNameHash(PWSTR pwszName) { ULONG iHash = 0; @@ -121,7 +128,7 @@ if (!ppfel) { - DPRINT1("PFE not found!\n"); + ERR("PFE not found!\n"); ASSERT(FALSE); } @@ -138,6 +145,185 @@ /* Free the PFELINK */ ExFreePoolWithTag(ppfel, GDITAG_PFE_LINK); +} + +BYTE +NTAPI +GreGetDefaultCharset() +{ + USHORT usACP, usOEM; + + RtlGetDefaultCodePage(&usACP, &usOEM); + WARN("GreGetDefaultCharset is unimplemented.\n"); + + // HACK! + return ANSI_CHARSET; +} + +ULONG +NTAPI +PFE_ulPenalty( + PPFE ppfe, + LOGFONTW *plfw, + ULONG ulMargin) +{ + PIFIMETRICS pifi = ppfe->pifi; + ULONG i, ulPenalty = 0; + PBYTE pjCharSets; + BYTE jCharSet; + + jCharSet = plfw->lfCharSet; + if (jCharSet == DEFAULT_CHARSET) + { + /* Get the default charset */ + jCharSet = GreGetDefaultCharset(); + } + + /* Check charsets */ + if (pifi->dpCharSets) + { + /* Get a pointer to the charset array */ + pjCharSets = (PBYTE)pifi + pifi->dpCharSets; + + /* Loop charsets, until the requeste one is found */ + for (i = 0; pjCharSets[i] != jCharSet; i++) + { + /* Check if this is the last charset */ + if ((i == 15) || (pjCharSets[i] == DEFAULT_CHARSET)) + { + /* Charset wasn't found, add penalty */ + ulPenalty += PENALTY_CharSet; + if (ulPenalty > ulMargin) return ulPenalty; + break; + } + } + } + else + { + /* Otherwise check if the win charset matches */ + if (pifi->jWinCharSet != jCharSet) + { + /* Charset doesn't match, add penalty */ + ulPenalty += PENALTY_CharSet; + if (ulPenalty > ulMargin) return ulPenalty; + } + } + + + /* There are contrary claims about the font mapper behaviour towards + different lfOutPrecision values between MS LOGFONT structure docs + and the font mapper article. */ + if ((plfw->lfOutPrecision == OUT_DEVICE_PRECIS) && + ((ppfe->flPFE & PFE_DEVICEFONT) == 0)) + { + ulPenalty += PENALTY_OutputPrecision; + } + + /* Check if pitch matches */ + if (((plfw->lfPitchAndFamily & 0x0f) == FIXED_PITCH) && + (pifi->jWinPitchAndFamily & 0x0f) != FIXED_PITCH) + { + ulPenalty += PENALTY_FixedPitch; + if (ulPenalty > ulMargin) return ulPenalty; + } + else if (((plfw->lfPitchAndFamily & 0x0f) == VARIABLE_PITCH) && + (pifi->jWinPitchAndFamily & 0x0f) != VARIABLE_PITCH) + { + ulPenalty += PENALTY_PitchVariable; + if (ulPenalty > ulMargin) return ulPenalty; + } + + + if ((plfw->lfPitchAndFamily & 0xf0) != FF_DONTCARE) + { + if ((pifi->jWinPitchAndFamily & 0xf0) == FF_DONTCARE) + { + ulPenalty += PENALTY_FamilyUnknown; + } + else if ((plfw->lfPitchAndFamily & 0xf0) != (pifi->jWinPitchAndFamily & 0xf0)) + { + ulPenalty += PENALTY_Family; + } + } + +// PENALTY_HeightSmaller 150 +// PENALTY_HeightBiggerDifference 150 +// PENALTY_FamilyUnlikely 50 +// PENALTY_Width 50 +// PENALTY_SizeSynth 50 +// PENALTY_Aspect 30 +// PENALTY_IntSizeSynth 20 +// PENALTY_UnevenSizeSynth 4 + + if (!plfw->lfItalic && (pifi->fsSelection & FM_SEL_ITALIC)) + { + ulPenalty += PENALTY_Italic; + } + + if ((plfw->lfOutPrecision == OUT_TT_ONLY_PRECIS) && + !(pifi->flInfo & FM_INFO_TECH_TRUETYPE)) + { + ulPenalty += 500000; // more then can be accounted for + } + + if ((plfw->lfOutPrecision == OUT_TT_PRECIS) && + !(pifi->flInfo & FM_INFO_TECH_TRUETYPE)) + { + ulPenalty += PENALTY_NotTrueType; + } + + + ulPenalty += (abs(plfw->lfWeight - pifi->usWinWeight) / 10) * PENALTY_Weight; + + if (!plfw->lfUnderline && (pifi->fsSelection & FM_SEL_UNDERSCORE)) + { + ulPenalty += PENALTY_Underline; + } + + if (!plfw->lfStrikeOut && (pifi->fsSelection & FM_SEL_STRIKEOUT)) + { + ulPenalty += PENALTY_StrikeOut; + } + +// PENALTY_VectorHeightSmaller 2 +// PENALTY_DeviceFavor 2 +// PENALTY_ItalicSim 1 + + if (((plfw->lfPitchAndFamily & 0x0f) == DEFAULT_PITCH) && + (pifi->jWinPitchAndFamily & 0x0f) != FIXED_PITCH) + { + ulPenalty += PENALTY_DefaultPitchFixed; + } + +// PENALTY_SmallPenalty 1 +// PENALTY_VectorHeightBigger 1 + return ulPenalty; +} + + +static +PPFE +HASHBUCKET_ppfeFindBestMatch( + PHASHBUCKET pbkt, + LOGFONTW *plf, + ULONG *pulPenalty) +{ + PPFELINK ppfel; + ULONG ulPenalty, ulBestMatch = *pulPenalty; + PPFE ppfeBestMatch; + + /* Loop all PFELINKs */ + for (ppfel = pbkt->ppfelEnumHead; ppfel; ppfel = ppfel->ppfelNext) + { + ulPenalty = PFE_ulPenalty(ppfel->ppfe, plf, ulBestMatch); + if (ulPenalty < ulBestMatch) + { + ppfeBestMatch = ppfel->ppfe; + ulBestMatch = ulPenalty; + } + } + + return ppfeBestMatch; } static @@ -218,6 +404,7 @@ return pbkt; } + static VOID FONTHASH_vInsertPFE( @@ -303,9 +490,69 @@ return FALSE; } +PPFE +NTAPI +PFT_ppfeFindBestMatch( + _In_ PPFT ppft, + _In_ PWSTR pwszCapName, + _In_ ULONG iHashValue, + _In_ LOGFONTW *plf, + _Inout_ PULONG pulPenalty) +{ + PHASHBUCKET pbkt; + ULONG ulPenalty = *pulPenalty; + PFONTSUBSTITUTE pfs = NULL; + PPFE ppfe; + + /* Acquire PFT lock for reading */ + EngAcquireSemaphoreShared(ppft->hsem); + + /* Try to find a HASHBUCKET by the face name */ + pbkt = FONTHASH_pbktFindBucketByName(ppft->pfhFace, pwszCapName, iHashValue); + + /* Check if we found the face name */ + if (!pbkt) + { + /* Check if there is a font substitute */ + pfs = GetFontSubstitute(pwszCapName); + if (pfs) + { + /* Try again with the substitute name */ + pbkt = FONTHASH_pbktFindBucketByName(ppft->pfhFace, + pfs->awcCapSubstName, + pfs->iHashValue); + } + } + + if (pbkt) + { + ppfe = HASHBUCKET_ppfeFindBestMatch(pbkt, plf, &ulPenalty); + if (pfs) ulPenalty += PENALTY_FaceNameSubst; + + } + else + { + TRACE("Font with face name '%ls' was not found!\n", pwszCapName); + ulPenalty = PENALTY_FaceName; + } + + + if (ulPenalty >= PENALTY_FaceName) + { + } + + /* Release PFT lock */ + EngReleaseSemaphore(ppft->hsem); + + *pulPenalty = ulPenalty; + return ppfe; +} + + + static PPFF -PFT_pffFindFont( +PFT_pffFindFontByFile( PFT *ppft, PWSTR pwszFiles, ULONG cwc, @@ -407,7 +654,7 @@ iFileNameHash = CalculateNameHash(pwszFiles); /* Try to find the font in the font table */ - ppff = PFT_pffFindFont(ppft, pwszFiles, cwc, cFiles, iFileNameHash); + ppff = PFT_pffFindFontByFile(ppft, pwszFiles, cwc, cFiles, iFileNameHash); /* Did we find the font? */ if (ppff) @@ -424,7 +671,7 @@ ppff = EngLoadFontFileFD(pwszFiles, cwc, cFiles, pdv, ulCheckSum); if (!ppff) { - DPRINT1("Failed to load font with font driver\n"); + ERR("Failed to load font with font driver\n"); return 0; } Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/lfont.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/lfont.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/lfont.c [iso-8859-1] Sun Mar 4 19:08:47 2012 @@ -18,6 +18,81 @@ ASSERT(FALSE); return 0; } + +PPFE +NTAPI +LFONT_ppfe(PLFONT plfnt) +{ + PPFEOBJ ppfeobj; + PPFE ppfe, ppfeSave; + HGDIOBJ hPFE; + ULONG ulPenalty; + + /* Check if the font has a PFE associated */ + hPFE = plfnt->hPFE; + if (hPFE) + { + /* Try to lock the PFE */ + ppfeobj = (PVOID)GDIOBJ_ReferenceObjectByHandle(hPFE, 0x0c); + + /* If we succeeded, the font is still there and we can use it */ + if (ppfeobj) return ppfeobj->ppfe; + + /* The previous font is not loaded anymore, reset the handle */ + InterlockedCompareExchangePointer((PVOID*)&plfnt->hPFE, hPFE, NULL); + } + + ulPenalty = PENALTY_Max; +#if 0 + /* Search the private font table */ + pti = PsGetCurrentThreadWin32Thread(); + ppfe = PFT_ppfeFindBestMatch(pti->ppftPrivate, + plfnt->awchFace, + plfnt->iNameHash, + &plfnt->elfexw.elfEnumLogfontEx.elfLogFont, + &ulPenalty); +#else + ppfe = 0; +#endif + /* Check if we got an exact match */ + if (ulPenalty != 0) + { + /* Not an exact match, save this PFE */ + ppfeSave = ppfe; + + /* Try to find a better match in the global table */ + ppfe = PFT_ppfeFindBestMatch(&gpftPublic, + plfnt->awchFace, + plfnt->iNameHash, + &plfnt->elfexw.elfEnumLogfontEx.elfLogFont, + &ulPenalty); + + /* If we didn't find a better one, use the old one */ + if (!ppfe) ppfe = ppfeSave; + } + + /* Check if we got an exact match now */ + if (ulPenalty == 0) + { + __debugbreak(); + // should create a PFEOBJ and save it + } + + ASSERT(ppfe); + return ppfe; +} + +PRFONT +NTAPI +LFONT_prfntFindRFONT( + IN PLFONT plfnt) +{ + + __debugbreak(); + + return NULL; +} + HFONT NTAPI @@ -51,6 +126,9 @@ UpcaseString(plfnt->awchFace, pelfw->elfEnumLogfontEx.elfLogFont.lfFaceName, LF_FACESIZE); + + /* Calculate the name hash value */ + plfnt->iNameHash = CalculateNameHash(plfnt->awchFace); /* Set client data */ GDIOBJ_vSetObjectAttr(&plfnt->baseobj, pvCliData); Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/font.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/font.h [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/font.h [iso-8859-1] Sun Mar 4 19:08:47 2012 @@ -1,9 +1,17 @@ #pragma once +// FIXME: duplicated from ntoskrnl, should got to NDK or something +#define InterlockedIncrementUL(Addend) \ + (ULONG)InterlockedIncrement((PLONG)(Addend)) + +#define InterlockedDecrementUL(Addend) \ + (ULONG)InterlockedDecrement((PLONG)(Addend)) + #define LFONT_GetObject FontGetObject #define ENGAPI +#define PENALTY_Max 127979 #define PENALTY_CharSet 65000 #define PENALTY_OutputPrecision 19000 #define PENALTY_FixedPitch 15000 @@ -38,6 +46,14 @@ extern PEPROCESS gpepCSRSS; +typedef struct _FONTSUBSTITUTE +{ + WCHAR awcSubstName[LF_FACESIZE]; + WCHAR awcCapSubstName[LF_FACESIZE]; + ULONG iHashValue; +} FONTSUBSTITUTE, *PFONTSUBSTITUTE; + + typedef struct _POINTEF { FLOATOBJ x; @@ -46,11 +62,24 @@ typedef struct _RFONT *PRFONT; +typedef enum _FLPFE +{ + PFE_DEVICEFONT = 0x0001, + PFE_DEADSTATE = 0x0002, + PFE_REMOTEFONT = 0x0004, + PFE_EUDC = 0x0008, + PFE_SBCS_SYSTEM = 0x0010, + PFE_UFIMATCH = 0x0020, + PFE_MEMORYFONT = 0x0040, + PFE_DBCS_FONT = 0x0080, + PFE_VERT_FACE = 0x0100, +} FLPFE; + typedef struct _PFE { struct _PFF * pPFF; ULONG_PTR iFont; - FLONG flPFE; + FLPFE flPFE; FD_GLYPHSET *pfdg; ULONG_PTR idfdg; IFIMETRICS * pifi; @@ -71,6 +100,12 @@ ULONG cPfdgRef; ULONG aiFamilyName[1]; } PFE, *PPFE; + +typedef struct _PFEOBJ +{ + BASEOBJECT baseobj; + PPFE ppfe; +} PFEOBJ, *PPFEOBJ; typedef struct _PFF { @@ -215,11 +250,14 @@ ULONG iGraphicsMode; ULONG ulOrientation; ULONG cBitsPerPel; - BOOL bVertical; - BOOL bDeviceFont; - BOOL bIsSystemFont; - BOOL bNeededPaths; - BOOL bFilledEudcArray; + struct + { + ULONG bVertical:1; + ULONG bDeviceFont:1; + ULONG bIsSystemFont:1; + ULONG bNeededPaths:1; + ULONG bFilledEudcArray:1; + }; FD_XFORM fdx; @@ -278,6 +316,7 @@ FLONG fl; PPDEVOBJ ppdev; HGDIOBJ hPFE; + ULONG iNameHash; WCHAR awchFace[LF_FACESIZE]; ENUMLOGFONTEXDVW elfexw; } LFONT, *PLFONT; @@ -332,6 +371,27 @@ ULONG acFaceNameGlyphs[8]; } ESTROBJ, *PESTROBJ; +extern PRFONT gprfntSystemTT; +extern PFT gpftPublic; + +FORCEINLINE +PLFONT +LFONT_ShareLockFont(HFONT hfont) +{ + return (PLFONT)GDIOBJ_ReferenceObjectByHandle(hfont, GDIObjType_LFONT_TYPE); +} + +FORCEINLINE +VOID +LFONT_ShareUnlockFont(PLFONT plfnt) +{ + GDIOBJ_vDereferenceObject(&plfnt->baseobj); +} + +PPFE +NTAPI +LFONT_ppfe(PLFONT plfnt); + VOID NTAPI UpcaseString( @@ -339,24 +399,24 @@ IN PWSTR pwszSource, IN ULONG cwc); -FORCEINLINE -PLFONT -LFONT_ShareLockFont(HFONT hfont) -{ - return (PLFONT)GDIOBJ_ReferenceObjectByHandle(hfont, GDIObjType_LFONT_TYPE); -} - -FORCEINLINE -VOID -LFONT_ShareUnlockFont(PLFONT plfnt) -{ - GDIOBJ_vDereferenceObject(&plfnt->baseobj); -} +ULONG +NTAPI +CalculateNameHash( + PWSTR pwszName); BOOL NTAPI PFT_bInit( PFT *ppft); + +PPFE +NTAPI +PFT_ppfeFindBestMatch( + _In_ PPFT ppft, + _In_ PWSTR pwszCapName, + _In_ ULONG iHashValue, + _In_ LOGFONTW *plf, + _Inout_ PULONG pulPenalty); VOID NTAPI @@ -423,3 +483,8 @@ INT cwc, LPSIZE psize, UINT flOpts); + +PRFONT +NTAPI +RFONT_AllocRFONT(void); +

1 0

[tkreuzer] 56005: [WIN32K] Amendment to r56003 - Add TagSig field to PDEV - Add leLink to PDEV, this one is ros specific, but it will help to keep track of font drivers - Remove an obsolete tag def...
by tkreuzer＠svn.reactos.org 04 Mar '12

04 Mar '12

Author: tkreuzer Date: Sun Mar 4 18:58:13 2012 New Revision: 56005 URL: http://svn.reactos.org/svn/reactos?rev=56005&view=rev Log: [WIN32K] Amendment to r56003 - Add TagSig field to PDEV - Add leLink to PDEV, this one is ros specific, but it will help to keep track of font drivers - Remove an obsolete tag defintion Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/pdevobj.h branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/tags.h Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/pdevobj.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/pdevobj.h [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/pdevobj.h [iso-8859-1] Sun Mar 4 18:58:13 2012 @@ -113,7 +113,7 @@ // PFN_DrvSynchronizeSurface pfnDrvSynchronizeSurface; // PFN_DrvSetPalette pfnDrvSetPalette; // PFN_DrvNotify pfnDrvNotify; -// ULONG TagSig; + ULONG TagSig; struct _LDEVOBJ * pldev; DHPDEV dhpdev; /* DHPDEV for device. */ struct _PALETTE* ppalSurf; /* PEPALOBJ/PPALETTE for this device. */ @@ -138,6 +138,7 @@ }; /* ros specific */ + LIST_ENTRY leLink; ULONG DxDd_nCount; GDIPOINTER Pointer; /* Stuff to keep track of software cursors; win32k gdi part */ @@ -179,6 +180,18 @@ NTAPI InitPDEVImpl(VOID); +PPDEVOBJ +NTAPI +PDEVOBJ_CreatePDEV( + struct _LDEVOBJ *pldev); + +BOOL +NTAPI +PDEVOBJ_bEnablePDEV( + PPDEVOBJ ppdev, + PDEVMODEW pdevmode, + PWSTR pwszLogAddress); + PSIZEL FASTCALL PDEVOBJ_sizl(PPDEVOBJ, PSIZEL); Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/tags.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/tags.h [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/include/tags.h [iso-8859-1] Sun Mar 4 18:58:13 2012 @@ -25,7 +25,6 @@ #define TAG_PALETTE GDITAG_HMGR_LOOKASIDE_PAL_TYPE #define TAG_ICMLCS '90hG' #define TAG_LFONT GDITAG_HMGR_LOOKASIDE_LFONT_TYPE -#define TAG_RFONT ';0gG' /* Correct? */ #define TAG_PFE '<0hG' #define TAG_PFT '=0hG' /* Correct? */ #define TAG_ICMCXF '>0hG' /* Correct? */

1 0

[tkreuzer] 56004: [WIN32K] - Fix reference leaks in EngAssociateSurface and EngModifySurface
by tkreuzer＠svn.reactos.org 04 Mar '12

04 Mar '12

Author: tkreuzer Date: Sun Mar 4 18:48:48 2012 New Revision: 56004 URL: http://svn.reactos.org/svn/reactos?rev=56004&view=rev Log: [WIN32K] - Fix reference leaks in EngAssociateSurface and EngModifySurface Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/surface.c Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/surface.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/surface.c [iso-8859-1] Sun Mar 4 18:48:48 2012 @@ -388,7 +388,8 @@ psurf->flags &= ~HOOK_FLAGS; psurf->flags |= (flHooks & HOOK_FLAGS); - /* Get palette */ + /* Get new palette */ + if (psurf->ppal) PALETTE_ShareUnlockPalette(psurf->ppal); psurf->ppal = PALETTE_ShareLockPalette(ppdev->devinfo.hpalDefault); SURFACE_ShareUnlockSurface(psurf); @@ -432,7 +433,8 @@ psurf->flags &= ~HOOK_FLAGS; psurf->flags |= (flHooks & HOOK_FLAGS); - /* Get palette */ + /* Get new palette */ + if (psurf->ppal) PALETTE_ShareUnlockPalette(psurf->ppal); psurf->ppal = PALETTE_ShareLockPalette(ppdev->devinfo.hpalDefault); SURFACE_ShareUnlockSurface(psurf);

1 0

[tkreuzer] 56003: [WIN32K] - Check if required driver functions are available in LDEVOBJ_bLoadDriver - Unload the image in EngLoadImageEx instead of in LDEVOBJ_bLoadDriver - Implement PDEVOBJ_vDest...
by tkreuzer＠svn.reactos.org 04 Mar '12

04 Mar '12

Author: tkreuzer Date: Sun Mar 4 18:47:09 2012 New Revision: 56003 URL: http://svn.reactos.org/svn/reactos?rev=56003&view=rev Log: [WIN32K] - Check if required driver functions are available in LDEVOBJ_bLoadDriver - Unload the image in EngLoadImageEx instead of in LDEVOBJ_bLoadDriver - Implement PDEVOBJ_vDestroyPDEV and call if from PDEVOBJ_vRelease - Check for failure in PDEVOBJ_bEnablePDEV - Implement PDEVOBJ_CreatePDEV, which does the common PDEV creation tasks for display and font drivers Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/ldevobj.c branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/pdevobj.c Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/ldevobj.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/ldevobj.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/ldevobj.c [iso-8859-1] Sun Mar 4 18:47:09 2012 @@ -250,9 +250,6 @@ if (!pfnEnableDriver(GDI_ENGINE_VERSION, sizeof(ded), &ded)) { DPRINT1("DrvEnableDriver failed\n"); - - /* Unload the image. */ - LDEVOBJ_vUnloadImage(pldev); return FALSE; } @@ -263,6 +260,44 @@ for (i = 0; i < ded.c; i++) { pldev->apfn[ded.pdrvfn[i].iFunc] = ded.pdrvfn[i].pfn; + } + + /* Check if the neccessary functions are there */ + if ((!pldev->pfn.EnablePDEV) || + (!pldev->pfn.CompletePDEV) || + (!pldev->pfn.UnloadFontFile)) + { + DPRINT1("Missing function for gdi driver\n"); + return FALSE; + } + + if (pldev->ldevtype == LDEV_DEVICE_DISPLAY) + { + if ((!pldev->pfn.AssertMode) || + (!pldev->pfn.EnableSurface) || + (!pldev->pfn.DisableSurface) || + (!pldev->pfn.DisableDriver) || + (!pldev->pfn.DisablePDEV) || + (!pldev->pfn.GetModes)) + { + DPRINT1("Missing function for display driver\n"); + return FALSE; + } + } + else if (pldev->ldevtype == LDEV_FONT) + { + if ((!pldev->pfn.LoadFontFile) || + (!pldev->pfn.QueryAdvanceWidths) || // ? + (!pldev->pfn.QueryFont) || + (!pldev->pfn.QueryFontCaps) || // ? + (!pldev->pfn.QueryFontData) || + (!pldev->pfn.QueryFontFile) || + (!pldev->pfn.QueryFontTree) || + (!pldev->pfn.UnloadFontFile)) + { + DPRINT1("Missing function for font driver\n"); + return FALSE; + } } /* Return success. */ @@ -356,10 +391,7 @@ RtlAppendUnicodeToString(&strDriverName, pwsz); /* MSDN says "The driver must include this suffix in the pwszDriver string." - But in fact it's optional. - - ms win32k EngLoadImageEx loading .sys file without append .dll - */ + But in fact it's optional. */ if ( (_wcsnicmp(pwszDriverName + cwcLength - 4, L".dll", 4) != 0) && (_wcsnicmp(pwszDriverName + cwcLength - 4, L".sys", 4) != 0) ) { @@ -399,9 +431,9 @@ /* Load the image */ if (!LDEVOBJ_bLoadImage(pldev, &strDriverName)) { + DPRINT1("LDEVOBJ_bLoadImage failed\n"); LDEVOBJ_vFreeLDEV(pldev); pldev = NULL; - DPRINT1("LDEVOBJ_bLoadImage failed\n"); goto leave; } @@ -412,6 +444,9 @@ if (!LDEVOBJ_bLoadDriver(pldev)) { DPRINT1("LDEVOBJ_bLoadDriver failed\n"); + + /* Unload the image. */ + LDEVOBJ_vUnloadImage(pldev); LDEVOBJ_vFreeLDEV(pldev); pldev = NULL; goto leave; Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/pdevobj.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/pdevobj.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/eng/pdevobj.c [iso-8859-1] Sun Mar 4 18:47:09 2012 @@ -25,84 +25,75 @@ return STATUS_SUCCESS; } - -PPDEVOBJ -PDEVOBJ_AllocPDEV() -{ - PPDEVOBJ ppdev; - - ppdev = ExAllocatePoolWithTag(PagedPool, sizeof(PDEVOBJ), GDITAG_PDEV); - if (!ppdev) - return NULL; - - RtlZeroMemory(ppdev, sizeof(PDEVOBJ)); - - ppdev->cPdevRefs = 1; - - return ppdev; -} - VOID NTAPI -PDEVOBJ_vRelease(PPDEVOBJ ppdev) -{ +PDEVOBJ_vDestroyPDEV(PPDEVOBJ ppdev) +{ + /* Do we have a surface? */ + if(ppdev->pSurface) + { + /* Release the surface and let the driver free it */ + SURFACE_ShareUnlockSurface(ppdev->pSurface); + ppdev->pfn.DisableSurface(ppdev->dhpdev); + } + + /* Do we have a palette? */ + if(ppdev->ppalSurf) + { + PALETTE_ShareUnlockPalette(ppdev->ppalSurf); + } + + /* Disable PDEV */ + ppdev->pfn.DisablePDEV(ppdev->dhpdev); + /* Lock loader */ EngAcquireSemaphore(ghsemPDEV); - /* Decrease reference count */ - --ppdev->cPdevRefs; - - ASSERT(ppdev->cPdevRefs >= 0) ; - - /* Check if references are left */ - if (ppdev->cPdevRefs == 0) - { - /* Do we have a surface? */ - if(ppdev->pSurface) + /* Remove it from list */ + if( ppdev == gppdevList ) + gppdevList = ppdev->ppdevNext ; + else + { + PPDEVOBJ ppdevCurrent = gppdevList; + BOOL found = FALSE ; + while (!found && ppdevCurrent->ppdevNext) { - /* Release the surface and let the driver free it */ - SURFACE_ShareUnlockSurface(ppdev->pSurface); - ppdev->pfn.DisableSurface(ppdev->dhpdev); + if (ppdevCurrent->ppdevNext == ppdev) + found = TRUE; + else + ppdevCurrent = ppdevCurrent->ppdevNext ; } - - /* Do we have a palette? */ - if(ppdev->ppalSurf) - { - PALETTE_ShareUnlockPalette(ppdev->ppalSurf); - } - - /* Disable PDEV */ - ppdev->pfn.DisablePDEV(ppdev->dhpdev); - - /* Remove it from list */ - if( ppdev == gppdevList ) - gppdevList = ppdev->ppdevNext ; - else - { - PPDEVOBJ ppdevCurrent = gppdevList; - BOOL found = FALSE ; - while (!found && ppdevCurrent->ppdevNext) - { - if (ppdevCurrent->ppdevNext == ppdev) - found = TRUE; - else - ppdevCurrent = ppdevCurrent->ppdevNext ; - } - if(found) - ppdevCurrent->ppdevNext = ppdev->ppdevNext; - } - - /* Is this the primary one ? */ - if (ppdev == gppdevPrimary) - gppdevPrimary = NULL; - - /* Free it */ - ExFreePoolWithTag(ppdev, GDITAG_PDEV ); - } + if(found) + ppdevCurrent->ppdevNext = ppdev->ppdevNext; + } + + /* Is this the primary one ? */ + if (ppdev == gppdevPrimary) + gppdevPrimary = NULL; /* Unlock loader */ EngReleaseSemaphore(ghsemPDEV); + /* Delete device lock semaphore */ + if (ppdev->hsemDevLock) + EngDeleteSemaphore(ppdev->hsemDevLock); + + /* Free it */ + ExFreePoolWithTag(ppdev, GDITAG_PDEV ); +} + +VOID +NTAPI +PDEVOBJ_vRelease(PPDEVOBJ ppdev) +{ + ASSERT(ppdev->cPdevRefs > 0) ; + + /* Decrease reference count */ + if (InterlockedDecrement(&ppdev->cPdevRefs) == 0) + { + /* Destroy this PDEV */ + PDEVOBJ_vDestroyPDEV(ppdev); + } } BOOL @@ -132,6 +123,9 @@ ppdev->pGraphicsDevice->pwszDescription, ppdev->pGraphicsDevice->DeviceObject); + /* Check for failure */ + if (!ppdev->dhpdev) return FALSE; + /* Fix up some values */ if (ppdev->gdiinfo.ulLogPixelsX == 0) ppdev->gdiinfo.ulLogPixelsX = 96; @@ -148,12 +142,78 @@ } VOID -NTAPI +FORCEINLINE PDEVOBJ_vCompletePDEV( PPDEVOBJ ppdev) { /* Call the drivers DrvCompletePDEV function */ ppdev->pldev->pfn.CompletePDEV(ppdev->dhpdev, (HDEV)ppdev); +} + +PPDEVOBJ +NTAPI +PDEVOBJ_CreatePDEV( + PLDEVOBJ pldev) +{ + PPDEVOBJ ppdev; + LDEVTYPE ldevtype; + + /* Allocate a new PDEVOBJ */ + ppdev = ExAllocatePoolWithTag(PagedPool, sizeof(PDEVOBJ), GDITAG_PDEV); + if (!ppdev) + { + DPRINT1("failed to allocate a PDEV\n"); + return FALSE; + } + + /* Zero out the structure */ + RtlZeroMemory(ppdev, sizeof(PDEVOBJ)); + + /* Initialize some fields */ + ppdev->TagSig = 'Pdev'; + ppdev->cPdevRefs = 1; + ppdev->pldev = pldev; + + /* Copy the function table from the LDEVOBJ */ + ppdev->pfn = ppdev->pldev->pfn; + + /* Allocate the device lock semaphore */ + ppdev->hsemDevLock = EngCreateSemaphore(); + if (!ppdev->hsemDevLock) + { + DPRINT1("Failed to create semaphore\n"); + ExFreePoolWithTag(ppdev, GDITAG_PDEV); + return FALSE; + } + + /* Call the drivers DrvEnablePDEV function */ + if (!PDEVOBJ_bEnablePDEV(ppdev, NULL, NULL)) + { + DPRINT1("Failed to enable PDEV\n"); + EngDeleteSemaphore(ppdev->hsemDevLock); + ExFreePoolWithTag(ppdev, GDITAG_PDEV); + return FALSE; + } + + /* Set flags based on the LDEV type */ + ldevtype = pldev->ldevtype; + if (ldevtype == LDEV_DEVICE_MIRROR) ppdev->flFlags |= PDEV_CLONE_DEVICE; + else if (ldevtype == LDEV_DEVICE_DISPLAY) ppdev->flFlags |= PDEV_DISPLAY; + else if (ldevtype == LDEV_DEVICE_PRINTER) ppdev->flFlags |= PDEV_PRINTER; + else if (ldevtype == LDEV_DEVICE_META) ppdev->flFlags |= PDEV_META_DEVICE; + else if (ldevtype == LDEV_FONT) ppdev->flFlags |= PDEV_FONTDRIVER; + + /* Check if the driver supports fonts */ + if (ppdev->devinfo.cFonts != 0) ppdev->flFlags |= PDEV_GOTFONTS; + + if (ppdev->pfn.MovePointer) ppdev->flFlags |= PDEV_HARDWARE_POINTER; + + if (ppdev->pvGammaRamp) ppdev->flFlags |= PDEV_GAMMARAMP_TABLE; + + /* Call the drivers DrvCompletePDEV function */ + PDEVOBJ_vCompletePDEV(ppdev); + + return ppdev; } PSURFACE @@ -221,15 +281,16 @@ return NULL; } -static PPDEVOBJ -EngpCreatePDEV( +NTAPI +EngCreateDisplayPDEV( PUNICODE_STRING pustrDeviceName, PDEVMODEW pdm) { PGRAPHICS_DEVICE pGraphicsDevice; + PLDEVOBJ pldev; PPDEVOBJ ppdev; - DPRINT("EngpCreatePDEV(%wZ, %p)\n", pustrDeviceName, pdm); + DPRINT("EngCreateDisplayPDEV(%wZ, %p)\n", pustrDeviceName, pdm); /* Try to find the GRAPHICS_DEVICE */ if (pustrDeviceName) @@ -247,14 +308,6 @@ pGraphicsDevice = gpPrimaryGraphicsDevice; } - /* Allocate a new PDEVOBJ */ - ppdev = PDEVOBJ_AllocPDEV(); - if (!ppdev) - { - DPRINT1("failed to allocate a PDEV\n"); - return NULL; - } - /* If no DEVMODEW is given, ... */ if (!pdm) { @@ -264,18 +317,23 @@ } /* Try to get a diplay driver */ - ppdev->pldev = EngLoadImageEx(pdm->dmDeviceName, LDEV_DEVICE_DISPLAY); - if (!ppdev->pldev) + pldev = EngLoadImageEx(pdm->dmDeviceName, LDEV_DEVICE_DISPLAY); + if (!pldev) { DPRINT1("Could not load display driver '%ls', '%s'\n", pGraphicsDevice->pDiplayDrivers, pdm->dmDeviceName); - ExFreePoolWithTag(ppdev, GDITAG_PDEV); return NULL; } - /* Copy the function table */ - ppdev->pfn = ppdev->pldev->pfn; + /* Create a new PDEVOBJ */ + ppdev = PDEVOBJ_CreatePDEV(pldev); + if (!ppdev) + { + DPRINT1("failed to allocate a PDEV\n"); + EngUnloadImage(pldev); + return FALSE; + } /* Set MovePointer function */ ppdev->pfnMovePointer = ppdev->pfn.MovePointer; @@ -283,28 +341,14 @@ ppdev->pfnMovePointer = EngMovePointer; ppdev->pGraphicsDevice = pGraphicsDevice; - ppdev->hsemDevLock = EngCreateSemaphore(); // Should we change the ative mode of pGraphicsDevice ? ppdev->pdmwDev = PDEVOBJ_pdmMatchDevMode(ppdev, pdm) ; - /* FIXME! */ - ppdev->flFlags = PDEV_DISPLAY; - /* HACK: Don't use the pointer */ ppdev->Pointer.Exclude.right = -1; - /* Call the driver to enable the PDEV */ - if (!PDEVOBJ_bEnablePDEV(ppdev, pdm, NULL)) - { - DPRINT1("Failed to enable PDEV!\n"); - ASSERT(FALSE); - } - /* FIXME: this must be done in a better way */ pGraphicsDevice->StateFlags |= DISPLAY_DEVICE_ATTACHED_TO_DESKTOP; - - /* Tell the driver that the PDEV is ready */ - PDEVOBJ_vCompletePDEV(ppdev); /* Return the PDEV */ return ppdev; @@ -393,7 +437,7 @@ /* 2. Create new PDEV */ RtlInitUnicodeString(&ustrDevice, ppdev->pGraphicsDevice->szWinDeviceName); - ppdevTmp = EngpCreatePDEV(&ustrDevice, pdm); + ppdevTmp = EngCreateDisplayPDEV(&ustrDevice, pdm); if (!ppdevTmp) { DPRINT1("Failed to create a new PDEV\n"); @@ -481,7 +525,7 @@ if (!ppdev) { /* No, create a new PDEV */ - ppdev = EngpCreatePDEV(pustrDeviceName, NULL); + ppdev = EngCreateDisplayPDEV(pustrDeviceName, NULL); if (ppdev) { /* Insert the PDEV into the list */

1 0

[pschweitzer] 56002: [RAMDISK] Implement RamdiskSetPartitionInfo and make use of it Also use RamdiskGetPartitionInfo in RamdiskWorkerThread
by pschweitzer＠svn.reactos.org 04 Mar '12

04 Mar '12

Author: pschweitzer Date: Sun Mar 4 18:32:07 2012 New Revision: 56002 URL: http://svn.reactos.org/svn/reactos?rev=56002&view=rev Log: [RAMDISK] Implement RamdiskSetPartitionInfo and make use of it Also use RamdiskGetPartitionInfo in RamdiskWorkerThread Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] Sun Mar 4 18:32:07 2012 @@ -881,6 +881,131 @@ return Status; } +NTSTATUS +NTAPI +RamdiskGetPartitionInfo(IN PIRP Irp, + IN PRAMDISK_DRIVE_EXTENSION DeviceExtension) +{ + NTSTATUS Status; + PPARTITION_INFORMATION PartitionInfo; + PVOID BaseAddress; + LARGE_INTEGER Zero = {{0, 0}}; + ULONG Length; + PIO_STACK_LOCATION IoStackLocation; + + // + // Validate the length + // + IoStackLocation = IoGetCurrentIrpStackLocation(Irp); + if (IoStackLocation->Parameters.DeviceIoControl. + OutputBufferLength < sizeof(PARTITION_INFORMATION)) + { + // + // Invalid length + // + Status = STATUS_BUFFER_TOO_SMALL; + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + return Status; + } + + // + // Map the partition table + // + BaseAddress = RamdiskMapPages(DeviceExtension, Zero, PAGE_SIZE, &Length); + if (!BaseAddress) + { + // + // No memory + // + Status = STATUS_INSUFFICIENT_RESOURCES; + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + return Status; + } + + // + // Fill out the information + // + PartitionInfo = Irp->AssociatedIrp.SystemBuffer; + PartitionInfo->StartingOffset.QuadPart = DeviceExtension->BytesPerSector; + PartitionInfo->PartitionLength.QuadPart = DeviceExtension->BytesPerSector * + DeviceExtension->SectorsPerTrack * + DeviceExtension->NumberOfHeads * + DeviceExtension->Cylinders; + PartitionInfo->HiddenSectors = DeviceExtension->HiddenSectors; + PartitionInfo->PartitionNumber = 0; + PartitionInfo->PartitionType = *((PCHAR)BaseAddress + 450); + PartitionInfo->BootIndicator = (DeviceExtension->DiskType == + RAMDISK_BOOT_DISK) ? TRUE: FALSE; + PartitionInfo->RecognizedPartition = IsRecognizedPartition(PartitionInfo-> + PartitionType); + PartitionInfo->RewritePartition = FALSE; + + // + // Unmap the partition table + // + RamdiskUnmapPages(DeviceExtension, BaseAddress, Zero, Length); + + // + // Done + // + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = sizeof(PARTITION_INFORMATION); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +RamdiskSetPartitionInfo(IN PIRP Irp, + IN PRAMDISK_DRIVE_EXTENSION DeviceExtension) +{ + ULONG BytesRead; + NTSTATUS Status; + PVOID BaseAddress; + PIO_STACK_LOCATION Stack; + LARGE_INTEGER Zero = {{0, 0}}; + PPARTITION_INFORMATION PartitionInfo; + + // + // First validate input + // + Stack = IoGetCurrentIrpStackLocation(Irp); + if (Stack->Parameters.DeviceIoControl.InputBufferLength < sizeof(PARTITION_INFORMATION)) + { + Status = STATUS_INVALID_PARAMETER; + goto SetAndQuit; + } + + // + // Map to get MBR + // + BaseAddress = RamdiskMapPages(DeviceExtension, Zero, PAGE_SIZE, &BytesRead); + if (BaseAddress == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto SetAndQuit; + } + + // + // Set the new partition type + // On partition 0, field system indicator + // + PartitionInfo = (PPARTITION_INFORMATION)Irp->AssociatedIrp.SystemBuffer; + *((PCHAR)BaseAddress + 450) = PartitionInfo->PartitionType; + + // + // And unmap + // + RamdiskUnmapPages(DeviceExtension, BaseAddress, Zero, BytesRead); + Status = STATUS_SUCCESS; + +SetAndQuit: + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + return Status; +} + VOID NTAPI RamdiskWorkerThread(IN PDEVICE_OBJECT DeviceObject, @@ -935,12 +1060,10 @@ break; case IOCTL_DISK_SET_PARTITION_INFO: - - DPRINT1("Set partition info request\n"); - UNIMPLEMENTED; - while (TRUE); + + Status = RamdiskSetPartitionInfo(Irp, (PRAMDISK_DRIVE_EXTENSION)DeviceExtension); break; - + case IOCTL_DISK_GET_DRIVE_LAYOUT: DPRINT1("Get drive layout request\n"); @@ -949,12 +1072,10 @@ break; case IOCTL_DISK_GET_PARTITION_INFO: - - DPRINT1("Get partitinon info request\n"); - UNIMPLEMENTED; - while (TRUE); + + Status = RamdiskGetPartitionInfo(Irp, (PRAMDISK_DRIVE_EXTENSION)DeviceExtension); break; - + default: DPRINT1("Invalid request\n"); @@ -1193,80 +1314,6 @@ // if (!BytesLeft) return Status; } -} - -NTSTATUS -NTAPI -RamdiskGetPartitionInfo(IN PIRP Irp, - IN PRAMDISK_DRIVE_EXTENSION DeviceExtension) -{ - NTSTATUS Status; - PPARTITION_INFORMATION PartitionInfo; - PVOID BaseAddress; - LARGE_INTEGER Zero = {{0, 0}}; - ULONG Length; - PIO_STACK_LOCATION IoStackLocation; - - // - // Validate the length - // - IoStackLocation = IoGetCurrentIrpStackLocation(Irp); - if (IoStackLocation->Parameters.DeviceIoControl. - OutputBufferLength < sizeof(PARTITION_INFORMATION)) - { - // - // Invalid length - // - Status = STATUS_BUFFER_TOO_SMALL; - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = 0; - return Status; - } - - // - // Map the partition table - // - BaseAddress = RamdiskMapPages(DeviceExtension, Zero, PAGE_SIZE, &Length); - if (!BaseAddress) - { - // - // No memory - // - Status = STATUS_INSUFFICIENT_RESOURCES; - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = 0; - return Status; - } - - // - // Fill out the information - // - PartitionInfo = Irp->AssociatedIrp.SystemBuffer; - PartitionInfo->StartingOffset.QuadPart = DeviceExtension->BytesPerSector; - PartitionInfo->PartitionLength.QuadPart = DeviceExtension->BytesPerSector * - DeviceExtension->SectorsPerTrack * - DeviceExtension->NumberOfHeads * - DeviceExtension->Cylinders; - PartitionInfo->HiddenSectors = DeviceExtension->HiddenSectors; - PartitionInfo->PartitionNumber = 0; - PartitionInfo->PartitionType = PARTITION_FAT32; //*((PCHAR)BaseAddress + 450); - PartitionInfo->BootIndicator = (DeviceExtension->DiskType == - RAMDISK_BOOT_DISK) ? TRUE: FALSE; - PartitionInfo->RecognizedPartition = IsRecognizedPartition(PartitionInfo-> - PartitionType); - PartitionInfo->RewritePartition = FALSE; - - // - // Unmap the partition table - // - RamdiskUnmapPages(DeviceExtension, BaseAddress, Zero, Length); - - // - // Done - // - Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = sizeof(PARTITION_INFORMATION); - return STATUS_SUCCESS; } NTSTATUS @@ -1572,8 +1619,7 @@ case IOCTL_DISK_SET_PARTITION_INFO: - UNIMPLEMENTED; - while (TRUE); + Status = RamdiskSetPartitionInfo(Irp, DriveExtension); break; case IOCTL_DISK_GET_PARTITION_INFO:

1 0

[jgardou] 56001: [NTOSKRNL] - fix code assuming System process pointer is never NULL, which is the case when we're creating it.
by jgardou＠svn.reactos.org 04 Mar '12

04 Mar '12

Author: jgardou Date: Sun Mar 4 17:57:44 2012 New Revision: 56001 URL: http://svn.reactos.org/svn/reactos?rev=56001&view=rev Log: [NTOSKRNL] - fix code assuming System process pointer is never NULL, which is the case when we're creating it. Modified: trunk/reactos/ntoskrnl/ps/process.c Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/process.c [iso-8859-1] Sun Mar 4 17:57:44 2012 @@ -464,8 +464,9 @@ /* Assume no section object */ SectionObject = NULL; - /* Is the parent the initial process? */ - if (Parent != PsInitialSystemProcess) + /* Is the parent the initial process? + * Check for NULL also, as at initialization PsInitialSystemProcess is NULL */ + if (Parent != PsInitialSystemProcess && (Parent != NULL)) { /* It's not, so acquire the process rundown */ if (ExAcquireRundownProtection(&Parent->RundownProtect))

1 0

[sir_richard] 56000: [MEGAPERF]: This build introduces the following performance boosts: - Using a dead stack lookaside list for up to 5 dead kernel thread stacks. 1500% improvement when rapidly de...
by sir_richard＠svn.reactos.org 04 Mar '12

04 Mar '12

Author: sir_richard Date: Sun Mar 4 17:56:00 2012 New Revision: 56000 URL: http://svn.reactos.org/svn/reactos?rev=56000&view=rev Log: [MEGAPERF]: This build introduces the following performance boosts: - Using a dead stack lookaside list for up to 5 dead kernel thread stacks. 1500% improvement when rapidly destroying/creating threads, such as during second stage setup and many winetests. - Using a free pool page lookaside list for up to 12 free non-paged or paged pool pages. 800% improvement when allocating big pages from the pool, as well as during pool expansion. - Using a bucketized per-processor and local list (in the KPRCB) for block sizes between 1 and 32 bytes. 1000% improvement when rapidly allocating/freeing small pool allocations, and 8x reduction in pool fragmentation. Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c trunk/reactos/ntoskrnl/mm/ARM3/expool.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/mminit.c trunk/reactos/ntoskrnl/mm/ARM3/pool.c trunk/reactos/ntoskrnl/mm/ARM3/procsup.c Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] Sun Mar 4 17:56:00 2012 @@ -367,7 +367,7 @@ /* We can't unload unless there's an unload handler */ if (!DriverObject->DriverUnload) { - DPRINT1("No DriverUnload function! '%wZ' will not be unloaded!\n", &DriverObject->DriverName); + DPRINT("No DriverUnload function! '%wZ' will not be unloaded!\n", &DriverObject->DriverName); return; } Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/expool.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] Sun Mar 4 17:56:00 2012 @@ -1346,7 +1346,7 @@ { ULONG i; PPOOL_DESCRIPTOR PoolDesc; - + // // Assume all failures // @@ -1414,6 +1414,8 @@ KIRQL OldIrql; USHORT BlockSize, i; ULONG OriginalType; + PKPRCB Prcb = KeGetCurrentPrcb(); + PGENERAL_LOOKASIDE LookasideList; // // Some sanity checks @@ -1560,6 +1562,57 @@ // i = (USHORT)((NumberOfBytes + sizeof(POOL_HEADER) + (POOL_BLOCK_SIZE - 1)) / POOL_BLOCK_SIZE); + + // + // Handle lookaside list optimization for both paged and nonpaged pool + // + if (i <= MAXIMUM_PROCESSORS) + { + // + // Try popping it from the per-CPU lookaside list + // + LookasideList = (PoolType == PagedPool) ? + Prcb->PPPagedLookasideList[i - 1].P : + Prcb->PPNPagedLookasideList[i - 1].P; + LookasideList->TotalAllocates++; + Entry = (PPOOL_HEADER)InterlockedPopEntrySList(&LookasideList->ListHead); + if (!Entry) + { + // + // We failed, try popping it from the global list + // + LookasideList = (PoolType == PagedPool) ? + Prcb->PPPagedLookasideList[i - 1].L : + Prcb->PPNPagedLookasideList[i - 1].L; + LookasideList->TotalAllocates++; + Entry = (PPOOL_HEADER)InterlockedPopEntrySList(&LookasideList->ListHead); + } + + // + // If we were able to pop it, update the accounting and return the block + // + if (Entry) + { + LookasideList->AllocateHits++; + + // + // Get the real entry, write down its pool type, and track it + // + Entry--; + Entry->PoolType = PoolType + 1; + ExpInsertPoolTracker(Tag, + Entry->BlockSize * POOL_BLOCK_SIZE, + OriginalType); + + // + // Return the pool allocation + // + Entry->PoolTag = Tag; + (POOL_FREE_BLOCK(Entry))->Flink = NULL; + (POOL_FREE_BLOCK(Entry))->Blink = NULL; + return POOL_FREE_BLOCK(Entry); + } + } // // Loop in the free lists looking for a block if this size. Start with the @@ -1902,6 +1955,8 @@ ULONG Tag; BOOLEAN Combined = FALSE; PFN_NUMBER PageCount, RealPageCount; + PKPRCB Prcb = KeGetCurrentPrcb(); + PGENERAL_LOOKASIDE LookasideList; // // Check if any of the debug flags are enabled @@ -2073,6 +2128,40 @@ Entry->PoolType - 1); // + // Is this allocation small enough to have come from a lookaside list? + // + if (BlockSize <= MAXIMUM_PROCESSORS) + { + // + // Try pushing it into the per-CPU lookaside list + // + LookasideList = (PoolType == PagedPool) ? + Prcb->PPPagedLookasideList[BlockSize - 1].P : + Prcb->PPNPagedLookasideList[BlockSize - 1].P; + LookasideList->TotalFrees++; + if (ExQueryDepthSList(&LookasideList->ListHead) < LookasideList->Depth) + { + LookasideList->FreeHits++; + InterlockedPushEntrySList(&LookasideList->ListHead, P); + return; + } + + // + // We failed, try to push it into the global lookaside list + // + LookasideList = (PoolType == PagedPool) ? + Prcb->PPPagedLookasideList[BlockSize - 1].L : + Prcb->PPNPagedLookasideList[BlockSize - 1].L; + LookasideList->TotalFrees++; + if (ExQueryDepthSList(&LookasideList->ListHead) < LookasideList->Depth) + { + LookasideList->FreeHits++; + InterlockedPushEntrySList(&LookasideList->ListHead, P); + return; + } + } + + // // Get the pointer to the next entry // NextEntry = POOL_BLOCK(Entry, BlockSize); Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Sun Mar 4 17:56:00 2012 @@ -598,6 +598,8 @@ extern PVOID MiSessionPoolEnd; // 0xBE000000 extern PVOID MiSessionPoolStart; // 0xBD000000 extern PVOID MiSessionViewStart; // 0xBE000000 +extern ULONG MmMaximumDeadKernelStacks; +extern SLIST_HEADER MmDeadStackSListHead; BOOLEAN FORCEINLINE Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mminit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Sun Mar 4 17:56:00 2012 @@ -2076,6 +2076,9 @@ KeInitializeEvent(&MmZeroingPageEvent, SynchronizationEvent, FALSE); MmZeroingPageThreadActive = FALSE; + /* Initialize the dead stack S-LIST */ + InitializeSListHead(&MmDeadStackSListHead); + // // Check if this is a machine with less than 19MB of RAM // @@ -2268,18 +2271,21 @@ { /* Set small system */ MmSystemSize = MmSmallSystem; + MmMaximumDeadKernelStacks = 0; } else if (MmNumberOfPhysicalPages <= ((19 * _1MB) / PAGE_SIZE)) { /* Set small system and add 100 pages for the cache */ MmSystemSize = MmSmallSystem; MmSystemCacheWsMinimum += 100; + MmMaximumDeadKernelStacks = 2; } else { /* Set medium system and add 400 pages for the cache */ MmSystemSize = MmMediumSystem; MmSystemCacheWsMinimum += 400; + MmMaximumDeadKernelStacks = 5; } /* Check for less than 24MB */ Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pool.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] Sun Mar 4 17:56:00 2012 @@ -27,6 +27,10 @@ ULONG MmSpecialPoolTag; ULONG MmConsumedPoolPercentage; BOOLEAN MmProtectFreedNonPagedPool; +SLIST_HEADER MiNonPagedPoolSListHead; +ULONG MiNonPagedPoolSListMaximum = 4; +SLIST_HEADER MiPagedPoolSListHead; +ULONG MiPagedPoolSListMaximum = 8; /* PRIVATE FUNCTIONS **********************************************************/ @@ -276,6 +280,34 @@ PMMFREE_POOL_ENTRY FreeEntry, FirstEntry; PMMPTE PointerPte; PAGED_CODE(); + + // + // Initialize the pool S-LISTs as well as their maximum count. In general, + // we'll allow 8 times the default on a 2GB system, and two times the default + // on a 1GB system. + // + InitializeSListHead(&MiPagedPoolSListHead); + InitializeSListHead(&MiNonPagedPoolSListHead); + if (MmNumberOfPhysicalPages >= ((2 * _1GB) /PAGE_SIZE)) + { + MiNonPagedPoolSListMaximum *= 8; + MiPagedPoolSListMaximum *= 8; + } + else if (MmNumberOfPhysicalPages >= (_1GB /PAGE_SIZE)) + { + MiNonPagedPoolSListMaximum *= 2; + MiPagedPoolSListMaximum *= 2; + } + + // + // However if debugging options for the pool are enabled, turn off the S-LIST + // to reduce the risk of messing things up even more + // + if (MmProtectFreedNonPagedPool) + { + MiNonPagedPoolSListMaximum = 0; + MiPagedPoolSListMaximum = 0; + } // // We keep 4 lists of free pages (4 lists help avoid contention) @@ -411,6 +443,15 @@ if ((PoolType & BASE_POOL_TYPE_MASK) == PagedPool) { // + // If only one page is being requested, try to grab it from the S-LIST + // + if ((SizeInPages == 1) && (ExQueryDepthSList(&MiPagedPoolSListHead))) + { + BaseVa = InterlockedPopEntrySList(&MiPagedPoolSListHead); + if (BaseVa) return BaseVa; + } + + // // Lock the paged pool mutex // KeAcquireGuardedMutex(&MmPagedPoolMutex); @@ -611,6 +652,15 @@ } // + // If only one page is being requested, try to grab it from the S-LIST + // + if ((SizeInPages == 1) && (ExQueryDepthSList(&MiNonPagedPoolSListHead))) + { + BaseVa = InterlockedPopEntrySList(&MiNonPagedPoolSListHead); + if (BaseVa) return BaseVa; + } + + // // Allocations of less than 4 pages go into their individual buckets // i = SizeInPages - 1; @@ -861,9 +911,16 @@ while (!RtlTestBit(MmPagedPoolInfo.EndOfPagedPoolBitmap, End)) End++; // - // Now calculate the total number of pages this allocation spans + // Now calculate the total number of pages this allocation spans. If it's + // only one page, add it to the S-LIST instead of freeing it // NumberOfPages = End - i + 1; + if ((NumberOfPages == 1) && + (ExQueryDepthSList(&MiPagedPoolSListHead) < MiPagedPoolSListMaximum)) + { + InterlockedPushEntrySList(&MiPagedPoolSListHead, StartingVa); + return 1; + } /* Delete the actual pages */ PointerPte = MmPagedPoolInfo.FirstPteForPagedPool + i; @@ -898,10 +955,18 @@ } // - // Get the first PTE and its corresponding PFN entry + // Get the first PTE and its corresponding PFN entry. If this is also the + // last PTE, meaning that this allocation was only for one page, push it into + // the S-LIST instead of freeing it // StartPte = PointerPte = MiAddressToPte(StartingVa); StartPfn = Pfn1 = MiGetPfnEntry(PointerPte->u.Hard.PageFrameNumber); + if ((Pfn1->u3.e1.EndOfAllocation == 1) && + (ExQueryDepthSList(&MiNonPagedPoolSListHead) < MiNonPagedPoolSListMaximum)) + { + InterlockedPushEntrySList(&MiNonPagedPoolSListHead, StartingVa); + return 1; + } // // Loop until we find the last PTE Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Sun Mar 4 17:56:00 2012 @@ -19,6 +19,8 @@ ULONG MmProcessColorSeed = 0x12345678; PMMWSL MmWorkingSetList; +ULONG MmMaximumDeadKernelStacks = 5; +SLIST_HEADER MmDeadStackSListHead; /* PRIVATE FUNCTIONS **********************************************************/ @@ -235,6 +237,19 @@ PointerPte--; // + // If this is a small stack, just push the stack onto the dead stack S-LIST + // + if (!GuiStack) + { + if (ExQueryDepthSList(&MmDeadStackSListHead) < MmMaximumDeadKernelStacks) + { + Pfn1 = MiGetPfnEntry(PointerPte->u.Hard.PageFrameNumber); + InterlockedPushEntrySList(&MmDeadStackSListHead, &Pfn1->u1.NextStackPfn); + return; + } + } + + // // Calculate pages used // StackPages = BYTES_TO_PAGES(GuiStack ? @@ -303,6 +318,7 @@ KIRQL OldIrql; PFN_NUMBER PageFrameIndex; ULONG i; + PMMPFN Pfn1; // // Calculate pages needed @@ -318,6 +334,21 @@ } else { + // + // If the dead stack S-LIST has a stack on it, use it instead of allocating + // new system PTEs for this stack + // + if (ExQueryDepthSList(&MmDeadStackSListHead)) + { + Pfn1 = (PMMPFN)InterlockedPopEntrySList(&MmDeadStackSListHead); + if (Pfn1) + { + PointerPte = Pfn1->PteAddress; + BaseAddress = MiPteToAddress(++PointerPte); + return BaseAddress; + } + } + // // We'll allocate 12K and that's it //

1 0

[sir_richard] 55999: [NTOS]: Drop a reference count to the page table in MiDeleteSystemPageableVm as ARM3 now owns PDEs. This helps out yet again to free a little bit of extra RAM up.
by sir_richard＠svn.reactos.org 04 Mar '12

04 Mar '12

Author: sir_richard Date: Sun Mar 4 17:42:56 2012 New Revision: 55999 URL: http://svn.reactos.org/svn/reactos?rev=55999&view=rev Log: [NTOS]: Drop a reference count to the page table in MiDeleteSystemPageableVm as ARM3 now owns PDEs. This helps out yet again to free a little bit of extra RAM up. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Sun Mar 4 17:42:56 2012 @@ -371,9 +371,10 @@ IN PMMPFN Pfn1) { MMPTE TempPte; - PMMPTE OriginalPte; + PMMPTE OriginalPte, PageTablePte; ULONG_PTR Protection; PFN_NUMBER PageFrameIndex; + PMMPFN Pfn2; /* Must be called with an valid prototype PTE, with the PFN lock held */ ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); @@ -386,7 +387,12 @@ Pfn1 = MiGetPfnEntry(PageFrameIndex); Pfn1->u3.e1.PrototypePte = 1; - /* FIXME: Increment the share count for the page table */ + /* Increment the share count for the page table */ + // FIXME: This doesn't work because we seem to bump the sharecount to two, and MiDeletePte gets annoyed and ASSERTs. + // This could be beause MiDeletePte is now being called from strange code in Rosmm + PageTablePte = MiAddressToPte(PointerPte); + Pfn2 = MiGetPfnEntry(PageTablePte->u.Hard.PageFrameNumber); + //Pfn2->u2.ShareCount++; /* Check where we should be getting the protection information from */ if (PointerPte->u.Soft.PageFileHigh == MI_PTE_LOOKUP_NEEDED) 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] Sun Mar 4 17:42:56 2012 @@ -116,8 +116,7 @@ { PFN_COUNT ActualPages = 0; PETHREAD CurrentThread = PsGetCurrentThread(); - PMMPFN Pfn1; - //PMMPFN Pfn2; + PMMPFN Pfn1, Pfn2; PFN_NUMBER PageFrameIndex, PageTableIndex; KIRQL OldIrql; ASSERT(KeGetCurrentIrql() <= APC_LEVEL); @@ -150,7 +149,7 @@ /* Get the page table entry */ PageTableIndex = Pfn1->u4.PteFrame; - //Pfn2 = MiGetPfnEntry(PageTableIndex); + Pfn2 = MiGetPfnEntry(PageTableIndex); /* Lock the PFN database */ OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); @@ -160,10 +159,7 @@ MiDecrementShareCount(Pfn1, PageFrameIndex); /* Decrement the page table too */ - DPRINT("FIXME: ARM3 should decrement the pool PDE refcount for: %p\n", PageTableIndex); - #if 0 // ARM3: Dont't trust this yet MiDecrementShareCount(Pfn2, PageTableIndex); - #endif /* Release the PFN database */ KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); @@ -293,8 +289,7 @@ /* There should only be 1 shared reference count */ ASSERT(Pfn1->u2.ShareCount == 1); - /* FIXME: Drop the reference on the page table. For now, leak it until RosMM is gone */ - //DPRINT1("Dropping a ref...\n"); + /* Drop the reference on the page table. */ MiDecrementShareCount(MiGetPfnEntry(Pfn1->u4.PteFrame), Pfn1->u4.PteFrame); /* Mark the PFN for deletion and dereference what should be the last ref */

1 0

[tkreuzer] 55998: [GENDIB] - Generate ansi style indentation - Fix signed/unsigned MSVC warnings in generated code
by tkreuzer＠svn.reactos.org 04 Mar '12

04 Mar '12

Author: tkreuzer Date: Sun Mar 4 13:33:07 2012 New Revision: 55998 URL: http://svn.reactos.org/svn/reactos?rev=55998&view=rev Log: [GENDIB] - Generate ansi style indentation - Fix signed/unsigned MSVC warnings in generated code Modified: trunk/reactos/tools/gendib/gendib.c Modified: trunk/reactos/tools/gendib/gendib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/gendib/gendib.c?rev=… ============================================================================== --- trunk/reactos/tools/gendib/gendib.c [iso-8859-1] (original) +++ trunk/reactos/tools/gendib/gendib.c [iso-8859-1] Sun Mar 4 13:33:07 2012 @@ -177,14 +177,11 @@ unsigned n; va_list Args; - if (NULL != strchr(Fmt, '{') && 0 != Indent) - { - Indent += 2; - } - else if (NULL != strchr(Fmt, '}')) - { - Indent -= 2; - } + if (strchr(Fmt, '}')) + { + Indent -= 4; + } + if (AtBOL) { for (n = 0; n < Indent; n++) @@ -198,14 +195,11 @@ vfprintf(Out, Fmt, Args); va_end(Args); - if (NULL != strchr(Fmt, '{')) - { - Indent += 2; - } - else if (NULL != strchr(Fmt, '}') && 0 != Indent) - { - Indent -= 2; - } + if (strchr(Fmt, '{')) + { + Indent += 4; + } + AtBOL = '\n' == Fmt[strlen(Fmt) - 1]; } @@ -460,7 +454,7 @@ else { Output(Out, "LeftCount = (ULONG_PTR) DestBase & 0x03;\n"); - Output(Out, "if (BltInfo->DestRect.right - BltInfo->DestRect.left < " + Output(Out, "if ((ULONG)(BltInfo->DestRect.right - BltInfo->DestRect.left) < " "LeftCount)\n"); Output(Out, "{\n"); Output(Out, "LeftCount = BltInfo->DestRect.right - " @@ -800,7 +794,7 @@ Output(Out, "ULONG i;\n"); if (RopInfo->UsesPattern) { - Output(Out, "ULONG PatternX =0, PatternY = 0, BasePatternX = 0;\n"); + Output(Out, "LONG PatternX =0, PatternY = 0, BasePatternX = 0;\n"); } First = 1; if (RopInfo->UsesSource)

1 0

[tkreuzer] 55997: [GENDIB] Fix formatting
by tkreuzer＠svn.reactos.org 04 Mar '12

04 Mar '12

Author: tkreuzer Date: Sun Mar 4 13:06:02 2012 New Revision: 55997 URL: http://svn.reactos.org/svn/reactos?rev=55997&view=rev Log: [GENDIB] Fix formatting Modified: trunk/reactos/tools/gendib/gendib.c Modified: trunk/reactos/tools/gendib/gendib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/gendib/gendib.c?rev=… ============================================================================== --- trunk/reactos/tools/gendib/gendib.c [iso-8859-1] (original) +++ trunk/reactos/tools/gendib/gendib.c [iso-8859-1] Sun Mar 4 13:06:02 2012 @@ -28,49 +28,49 @@ * Basically, what happens is that generic code which looks like: * * for (...) - * { + * { * if (CondA) - * { + * { * doSomethingA; - * } + * } * for (...) - * { + * { * if (CondB) - * { + * { * doSomethingB; - * } + * } * else - * { + * { * doSomethingElseB; - * } - * } - * } + * } + * } + * } * * is specialized for named rops to look like: * * if (condC) - * { + * { * if (condD) - * { + * { * for (...) - * { + * { * for (...) - * { + * { * pumpSomeBytes; - * } - * } - * } + * } + * } + * } * else - * { + * { * for (...) - * { + * { * for (...) - * { + * { * pumpSomeBytesSlightlyDifferentE; - * } - * } - * } - * } + * } + * } + * } + * } * * i.e. we make the inner loops as tight as possible. * Another optimization is to try to load/store 32 alligned bits at a time from @@ -117,14 +117,14 @@ #define ROPCODE_GENERIC 256 /* Special case */ typedef struct _ROPINFO - { +{ unsigned RopCode; const char *Name; const char *Operation; int UsesDest; int UsesSource; int UsesPattern; - } +} ROPINFO, *PROPINFO; #define FLAG_PATTERNSURFACE 0x01 @@ -136,170 +136,170 @@ static PROPINFO FindRopInfo(unsigned RopCode) { - static ROPINFO KnownCodes[] = - { - { ROPCODE_BLACKNESS, "BLACKNESS", "0", 0, 0, 0 }, - { ROPCODE_NOTSRCERASE, "NOTSRCERASE","~(D | S)", 1, 1, 0 }, - { ROPCODE_NOTSRCCOPY, "NOTSRCCOPY", "~S", 0, 1, 0 }, - { ROPCODE_SRCERASE, "SRCERASE", "(~D) & S", 1, 1, 0 }, - { ROPCODE_DSTINVERT, "DSTINVERT", "~D", 1, 0, 0 }, - { ROPCODE_PATINVERT, "PATINVERT", "D ^ P", 1, 0, 1 }, - { ROPCODE_SRCINVERT, "SRCINVERT", "D ^ S", 1, 1, 0 }, - { ROPCODE_SRCAND, "SRCAND", "D & S", 1, 1, 0 }, - { ROPCODE_NOOP, "NOOP", "D", 1, 0, 0 }, - { ROPCODE_MERGEPAINT, "MERGEPAINT", "D | (~S)", 1, 1, 0 }, - { ROPCODE_MERGECOPY, "MERGECOPY", "S & P", 0, 1, 1 }, - { ROPCODE_SRCCOPY, "SRCCOPY", "S", 0, 1, 0 }, - { ROPCODE_SRCPAINT, "SRCPAINT", "D | S", 1, 1, 0 }, - { ROPCODE_PATCOPY, "PATCOPY", "P", 0, 0, 1 }, - { ROPCODE_PATPAINT, "PATPAINT", "D | (~S) | P", 1, 1, 1 }, - { ROPCODE_WHITENESS, "WHITENESS", "0xffffffff", 0, 0, 0 }, - { ROPCODE_GENERIC, NULL, NULL, 1, 1, 1 } + static ROPINFO KnownCodes[] = + { + { ROPCODE_BLACKNESS, "BLACKNESS", "0", 0, 0, 0 }, + { ROPCODE_NOTSRCERASE, "NOTSRCERASE","~(D | S)", 1, 1, 0 }, + { ROPCODE_NOTSRCCOPY, "NOTSRCCOPY", "~S", 0, 1, 0 }, + { ROPCODE_SRCERASE, "SRCERASE", "(~D) & S", 1, 1, 0 }, + { ROPCODE_DSTINVERT, "DSTINVERT", "~D", 1, 0, 0 }, + { ROPCODE_PATINVERT, "PATINVERT", "D ^ P", 1, 0, 1 }, + { ROPCODE_SRCINVERT, "SRCINVERT", "D ^ S", 1, 1, 0 }, + { ROPCODE_SRCAND, "SRCAND", "D & S", 1, 1, 0 }, + { ROPCODE_NOOP, "NOOP", "D", 1, 0, 0 }, + { ROPCODE_MERGEPAINT, "MERGEPAINT", "D | (~S)", 1, 1, 0 }, + { ROPCODE_MERGECOPY, "MERGECOPY", "S & P", 0, 1, 1 }, + { ROPCODE_SRCCOPY, "SRCCOPY", "S", 0, 1, 0 }, + { ROPCODE_SRCPAINT, "SRCPAINT", "D | S", 1, 1, 0 }, + { ROPCODE_PATCOPY, "PATCOPY", "P", 0, 0, 1 }, + { ROPCODE_PATPAINT, "PATPAINT", "D | (~S) | P", 1, 1, 1 }, + { ROPCODE_WHITENESS, "WHITENESS", "0xffffffff", 0, 0, 0 }, + { ROPCODE_GENERIC, NULL, NULL, 1, 1, 1 } }; - unsigned Index; - - for (Index = 0; Index < sizeof(KnownCodes) / sizeof(KnownCodes[0]); Index++) - { - if (RopCode == KnownCodes[Index].RopCode) - { - return KnownCodes + Index; - } - } - - return NULL; + unsigned Index; + + for (Index = 0; Index < sizeof(KnownCodes) / sizeof(KnownCodes[0]); Index++) + { + if (RopCode == KnownCodes[Index].RopCode) + { + return KnownCodes + Index; + } + } + + return NULL; } static void Output(FILE *Out, const char *Fmt, ...) { - static unsigned Indent = 0; - static int AtBOL = 1; - unsigned n; - va_list Args; - - if (NULL != strchr(Fmt, '{') && 0 != Indent) - { - Indent += 2; - } - else if (NULL != strchr(Fmt, '}')) - { - Indent -= 2; - } - if (AtBOL) - { - for (n = 0; n < Indent; n++) - { - putc(' ', Out); - } - AtBOL = 0; - } - - va_start(Args, Fmt); - vfprintf(Out, Fmt, Args); - va_end(Args); - - if (NULL != strchr(Fmt, '{')) - { - Indent += 2; - } - else if (NULL != strchr(Fmt, '}') && 0 != Indent) - { - Indent -= 2; - } - AtBOL = '\n' == Fmt[strlen(Fmt) - 1]; + static unsigned Indent = 0; + static int AtBOL = 1; + unsigned n; + va_list Args; + + if (NULL != strchr(Fmt, '{') && 0 != Indent) + { + Indent += 2; + } + else if (NULL != strchr(Fmt, '}')) + { + Indent -= 2; + } + if (AtBOL) + { + for (n = 0; n < Indent; n++) + { + putc(' ', Out); + } + AtBOL = 0; + } + + va_start(Args, Fmt); + vfprintf(Out, Fmt, Args); + va_end(Args); + + if (NULL != strchr(Fmt, '{')) + { + Indent += 2; + } + else if (NULL != strchr(Fmt, '}') && 0 != Indent) + { + Indent -= 2; + } + AtBOL = '\n' == Fmt[strlen(Fmt) - 1]; } static void PrintRoutineName(FILE *Out, unsigned Bpp, PROPINFO RopInfo) { - if (NULL != RopInfo && ROPCODE_GENERIC != RopInfo->RopCode) - { - Output(Out, "DIB_%uBPP_BitBlt_%s", Bpp, RopInfo->Name); - } - else - { - Output(Out, "DIB_%uBPP_BitBlt_Generic", Bpp); + if (NULL != RopInfo && ROPCODE_GENERIC != RopInfo->RopCode) + { + Output(Out, "DIB_%uBPP_BitBlt_%s", Bpp, RopInfo->Name); + } + else + { + Output(Out, "DIB_%uBPP_BitBlt_Generic", Bpp); } } static void CreateShiftTables(FILE *Out) { - Output(Out, "\n"); - Output(Out, "static unsigned Shift1Bpp[] =\n"); - Output(Out, "{\n"); - Output(Out, "0,\n"); - Output(Out, "24, 25, 26, 27, 28, 29, 30, 31, 16, 17, 18, 19, 20, 21, 22, 23,\n"); - Output(Out, "8, 9, 10, 11, 12, 13, 14, 15, 0, 1, 2, 3, 4, 5, 6, 7\n"); - Output(Out, "};\n"); - Output(Out, "static unsigned Shift4Bpp[] =\n"); - Output(Out, "{\n"); - Output(Out, "0,\n"); - Output(Out, "24, 28, 16, 20, 8, 12, 0, 4\n"); - Output(Out, "};\n"); - Output(Out, "static unsigned Shift8Bpp[] =\n"); - Output(Out, "{\n"); - Output(Out, "0,\n"); - Output(Out, "24, 16, 8, 0\n"); - Output(Out, "};\n"); - Output(Out, "static unsigned Shift16Bpp[] =\n"); - Output(Out, "{\n"); - Output(Out, "0,\n"); - Output(Out, "16, 0\n"); - Output(Out, "};\n"); + Output(Out, "\n"); + Output(Out, "static unsigned Shift1Bpp[] =\n"); + Output(Out, "{\n"); + Output(Out, "0,\n"); + Output(Out, "24, 25, 26, 27, 28, 29, 30, 31, 16, 17, 18, 19, 20, 21, 22, 23,\n"); + Output(Out, "8, 9, 10, 11, 12, 13, 14, 15, 0, 1, 2, 3, 4, 5, 6, 7\n"); + Output(Out, "};\n"); + Output(Out, "static unsigned Shift4Bpp[] =\n"); + Output(Out, "{\n"); + Output(Out, "0,\n"); + Output(Out, "24, 28, 16, 20, 8, 12, 0, 4\n"); + Output(Out, "};\n"); + Output(Out, "static unsigned Shift8Bpp[] =\n"); + Output(Out, "{\n"); + Output(Out, "0,\n"); + Output(Out, "24, 16, 8, 0\n"); + Output(Out, "};\n"); + Output(Out, "static unsigned Shift16Bpp[] =\n"); + Output(Out, "{\n"); + Output(Out, "0,\n"); + Output(Out, "16, 0\n"); + Output(Out, "};\n"); } static void CreateOperation(FILE *Out, unsigned Bpp, PROPINFO RopInfo, unsigned SourceBpp, unsigned Bits) { - const char *Cast; - const char *Dest; - const char *Template; - - MARK(Out); - if (32 == Bits) - { - Cast = ""; - Dest = "*DestPtr"; - } - else if (16 == Bpp) - { - Cast = "(USHORT) "; - Dest = "*((PUSHORT) DestPtr)"; - } - else - { - Cast = "(UCHAR) "; - Dest = "*((PUCHAR) DestPtr)"; - } - Output(Out, "%s = ", Dest); - if (ROPCODE_GENERIC == RopInfo->RopCode) - { - Output(Out, "%sDIB_DoRop(BltInfo->Rop4, %s, Source, Pattern)", - Cast, Dest); - } - else - { - Template = RopInfo->Operation; - while ('\0' != *Template) - { - switch(*Template) + const char *Cast; + const char *Dest; + const char *Template; + + MARK(Out); + if (32 == Bits) + { + Cast = ""; + Dest = "*DestPtr"; + } + else if (16 == Bpp) + { + Cast = "(USHORT) "; + Dest = "*((PUSHORT) DestPtr)"; + } + else + { + Cast = "(UCHAR) "; + Dest = "*((PUCHAR) DestPtr)"; + } + Output(Out, "%s = ", Dest); + if (ROPCODE_GENERIC == RopInfo->RopCode) + { + Output(Out, "%sDIB_DoRop(BltInfo->Rop4, %s, Source, Pattern)", + Cast, Dest); + } + else + { + Template = RopInfo->Operation; + while ('\0' != *Template) + { + switch(*Template) { case 'S': - Output(Out, "%sSource", Cast); - break; + Output(Out, "%sSource", Cast); + break; case 'P': - Output(Out, "%sPattern", Cast); - break; + Output(Out, "%sPattern", Cast); + break; case 'D': - Output(Out, "%s", Dest); - break; + Output(Out, "%s", Dest); + break; default: - Output(Out, "%c", *Template); - break; - } - Template++; + Output(Out, "%c", *Template); + break; + } + Template++; } } } @@ -307,62 +307,62 @@ static void CreateBase(FILE *Out, int Source, int Flags, unsigned Bpp) { - const char *What = (Source ? "Source" : "Dest"); - - MARK(Out); - Output(Out, "%sBase = (char *) BltInfo->%sSurface->pvScan0 +\n", What, What); - if (0 == (Flags & FLAG_BOTTOMUP)) - { - if (Source) - { - Output(Out, " BltInfo->SourcePoint.y *\n"); - } - else - { - Output(Out, " BltInfo->DestRect.top *\n"); - } - } - else - { - if (Source) - { - Output(Out, " (BltInfo->SourcePoint.y +\n"); - Output(Out, " BltInfo->DestRect.bottom -\n"); - Output(Out, " BltInfo->DestRect.top - 1) *\n"); - } - else - { - Output(Out, " (BltInfo->DestRect.bottom - 1) *\n"); - } - } - Output(Out, " %sBltInfo->%sSurface->lDelta +\n", - Source ? " " : "", What); - if (Source) - { - Output(Out, " %sBltInfo->SourcePoint.x", - 16 < Bpp ? "" : "(("); - } - else - { - Output(Out, " BltInfo->DestRect.left"); - } - if (Bpp < 8) - { - Output(Out, " / %u", 8 / Bpp); - } - else if (8 < Bpp) - { - Output(Out, " * %u", Bpp / 8); - } - if (Source && Bpp <= 16) - { - Output(Out, ") & ~ 0x3)"); - } - Output(Out, ";\n", Bpp / 8); - if (Source && Bpp <= 16) - { - Output(Out, "BaseSourcePixels = %u - (BltInfo->SourcePoint.x & 0x%x);\n", - 32 / Bpp, 32 / Bpp - 1); + const char *What = (Source ? "Source" : "Dest"); + + MARK(Out); + Output(Out, "%sBase = (char *) BltInfo->%sSurface->pvScan0 +\n", What, What); + if (0 == (Flags & FLAG_BOTTOMUP)) + { + if (Source) + { + Output(Out, " BltInfo->SourcePoint.y *\n"); + } + else + { + Output(Out, " BltInfo->DestRect.top *\n"); + } + } + else + { + if (Source) + { + Output(Out, " (BltInfo->SourcePoint.y +\n"); + Output(Out, " BltInfo->DestRect.bottom -\n"); + Output(Out, " BltInfo->DestRect.top - 1) *\n"); + } + else + { + Output(Out, " (BltInfo->DestRect.bottom - 1) *\n"); + } + } + Output(Out, " %sBltInfo->%sSurface->lDelta +\n", + Source ? " " : "", What); + if (Source) + { + Output(Out, " %sBltInfo->SourcePoint.x", + 16 < Bpp ? "" : "(("); + } + else + { + Output(Out, " BltInfo->DestRect.left"); + } + if (Bpp < 8) + { + Output(Out, " / %u", 8 / Bpp); + } + else if (8 < Bpp) + { + Output(Out, " * %u", Bpp / 8); + } + if (Source && Bpp <= 16) + { + Output(Out, ") & ~ 0x3)"); + } + Output(Out, ";\n", Bpp / 8); + if (Source && Bpp <= 16) + { + Output(Out, "BaseSourcePixels = %u - (BltInfo->SourcePoint.x & 0x%x);\n", + 32 / Bpp, 32 / Bpp - 1); } } @@ -370,79 +370,79 @@ CreateGetSource(FILE *Out, unsigned Bpp, PROPINFO RopInfo, int Flags, unsigned SourceBpp, unsigned Shift) { - const char *AssignOp; - const char *Before; - char After[8]; - - MARK(Out); - if (0 == Shift) - { - AssignOp = "="; - Before = ""; - After[0] = '\0'; - } - else - { - AssignOp = "|="; - Before = "("; - sprintf(After, ") << %u", Shift); - } - - if (ROPCODE_SRCCOPY != RopInfo->RopCode || - 0 == (Flags & FLAG_TRIVIALXLATE) || Bpp != SourceBpp) - { - if (0 == (Flags & FLAG_FORCERAWSOURCEAVAIL) && SourceBpp <= 16) - { - Output(Out, "if (0 == SourcePixels)\n"); - Output(Out, "{\n"); - Output(Out, "RawSource = *SourcePtr++;\n"); - Output(Out, "SourcePixels = %u;\n", 32 / SourceBpp); - Output(Out, "}\n"); - } - Output(Out, "Source %s (%s", AssignOp, Before); - if (0 == (Flags & FLAG_TRIVIALXLATE)) - { - Output(Out, "XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, %s", - 16 < SourceBpp ? "" : "("); - } - if (32 == SourceBpp) - { - Output(Out, "*SourcePtr++"); - } - else if (24 == SourceBpp) - { - Output(Out, "*(PUSHORT) SourcePtr + (*((PBYTE) SourcePtr + 2) << 16)"); - } - else - { - Output(Out, "RawSource >> Shift%uBpp[SourcePixels]", SourceBpp); - } - if (0 == (Flags & FLAG_TRIVIALXLATE)) - { - if (16 < SourceBpp) - { - Output(Out, ")"); - } - else - { - Output(Out, ") & 0x%x)", (1 << SourceBpp) - 1); - } - } - if (32 == Bpp) - { - Output(Out, ")%s;\n", After); - } - else - { - Output(Out, " & 0x%x)%s;\n", (1 << Bpp) - 1, After); - } - if (SourceBpp <= 16) - { - Output(Out, "SourcePixels--;\n"); - } - else if (24 == SourceBpp) - { - Output(Out, "SourcePtr = (PULONG)((char *) SourcePtr + 3);\n"); + const char *AssignOp; + const char *Before; + char After[8]; + + MARK(Out); + if (0 == Shift) + { + AssignOp = "="; + Before = ""; + After[0] = '\0'; + } + else + { + AssignOp = "|="; + Before = "("; + sprintf(After, ") << %u", Shift); + } + + if (ROPCODE_SRCCOPY != RopInfo->RopCode || + 0 == (Flags & FLAG_TRIVIALXLATE) || Bpp != SourceBpp) + { + if (0 == (Flags & FLAG_FORCERAWSOURCEAVAIL) && SourceBpp <= 16) + { + Output(Out, "if (0 == SourcePixels)\n"); + Output(Out, "{\n"); + Output(Out, "RawSource = *SourcePtr++;\n"); + Output(Out, "SourcePixels = %u;\n", 32 / SourceBpp); + Output(Out, "}\n"); + } + Output(Out, "Source %s (%s", AssignOp, Before); + if (0 == (Flags & FLAG_TRIVIALXLATE)) + { + Output(Out, "XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, %s", + 16 < SourceBpp ? "" : "("); + } + if (32 == SourceBpp) + { + Output(Out, "*SourcePtr++"); + } + else if (24 == SourceBpp) + { + Output(Out, "*(PUSHORT) SourcePtr + (*((PBYTE) SourcePtr + 2) << 16)"); + } + else + { + Output(Out, "RawSource >> Shift%uBpp[SourcePixels]", SourceBpp); + } + if (0 == (Flags & FLAG_TRIVIALXLATE)) + { + if (16 < SourceBpp) + { + Output(Out, ")"); + } + else + { + Output(Out, ") & 0x%x)", (1 << SourceBpp) - 1); + } + } + if (32 == Bpp) + { + Output(Out, ")%s;\n", After); + } + else + { + Output(Out, " & 0x%x)%s;\n", (1 << Bpp) - 1, After); + } + if (SourceBpp <= 16) + { + Output(Out, "SourcePixels--;\n"); + } + else if (24 == SourceBpp) + { + Output(Out, "SourcePtr = (PULONG)((char *) SourcePtr + 3);\n"); } } } @@ -450,31 +450,31 @@ static void CreateCounts(FILE *Out, unsigned Bpp) { - MARK(Out); - if (32 != Bpp) - { - if (8 < Bpp) - { - Output(Out, "LeftCount = ((ULONG_PTR) DestBase >> 1) & 0x01;\n"); - } - else - { - Output(Out, "LeftCount = (ULONG_PTR) DestBase & 0x03;\n"); - Output(Out, "if (BltInfo->DestRect.right - BltInfo->DestRect.left < " - "LeftCount)\n"); - Output(Out, "{\n"); - Output(Out, "LeftCount = BltInfo->DestRect.right - " - "BltInfo->DestRect.left;\n"); - Output(Out, "}\n"); - } - Output(Out, "CenterCount = (BltInfo->DestRect.right - BltInfo->DestRect.left -\n"); - Output(Out, " LeftCount) / %u;\n", 32 / Bpp); - Output(Out, "RightCount = (BltInfo->DestRect.right - BltInfo->DestRect.left -\n"); - Output(Out, " LeftCount - %u * CenterCount);\n", 32 / Bpp); - } - else - { - Output(Out, "CenterCount = BltInfo->DestRect.right - BltInfo->DestRect.left;\n"); + MARK(Out); + if (32 != Bpp) + { + if (8 < Bpp) + { + Output(Out, "LeftCount = ((ULONG_PTR) DestBase >> 1) & 0x01;\n"); + } + else + { + Output(Out, "LeftCount = (ULONG_PTR) DestBase & 0x03;\n"); + Output(Out, "if (BltInfo->DestRect.right - BltInfo->DestRect.left < " + "LeftCount)\n"); + Output(Out, "{\n"); + Output(Out, "LeftCount = BltInfo->DestRect.right - " + "BltInfo->DestRect.left;\n"); + Output(Out, "}\n"); + } + Output(Out, "CenterCount = (BltInfo->DestRect.right - BltInfo->DestRect.left -\n"); + Output(Out, " LeftCount) / %u;\n", 32 / Bpp); + Output(Out, "RightCount = (BltInfo->DestRect.right - BltInfo->DestRect.left -\n"); + Output(Out, " LeftCount - %u * CenterCount);\n", 32 / Bpp); + } + else + { + Output(Out, "CenterCount = BltInfo->DestRect.right - BltInfo->DestRect.left;\n"); } } @@ -482,562 +482,562 @@ CreateSetSinglePixel(FILE *Out, unsigned Bpp, PROPINFO RopInfo, int Flags, unsigned SourceBpp) { - if (RopInfo->UsesSource && 0 == (Flags & FLAG_FORCENOUSESSOURCE)) - { - CreateGetSource(Out, Bpp, RopInfo, Flags, SourceBpp, 0); - MARK(Out); - } - if (RopInfo->UsesPattern && 0 != (Flags & FLAG_PATTERNSURFACE)) - { - Output(Out, "Pattern = DIB_GetSourceIndex(BltInfo->PatternSurface, PatternX, PatternY);\n"); - Output(Out, "if (BltInfo->PatternSurface->sizlBitmap.cx <= ++PatternX)\n"); - Output(Out, "{\n"); - Output(Out, "PatternX -= BltInfo->PatternSurface->sizlBitmap.cx;\n"); - Output(Out, "}\n"); - } - if ((RopInfo->UsesSource && 0 == (Flags & FLAG_FORCENOUSESSOURCE) && - Bpp != SourceBpp) || - (RopInfo->UsesPattern && 0 != (Flags & FLAG_PATTERNSURFACE))) - { - Output(Out, "\n"); - } - CreateOperation(Out, Bpp, RopInfo, SourceBpp, 16); - Output(Out, ";\n"); - MARK(Out); - Output(Out, "\n"); - Output(Out, "DestPtr = (PULONG)((char *) DestPtr + %u);\n", Bpp / 8); + if (RopInfo->UsesSource && 0 == (Flags & FLAG_FORCENOUSESSOURCE)) + { + CreateGetSource(Out, Bpp, RopInfo, Flags, SourceBpp, 0); + MARK(Out); + } + if (RopInfo->UsesPattern && 0 != (Flags & FLAG_PATTERNSURFACE)) + { + Output(Out, "Pattern = DIB_GetSourceIndex(BltInfo->PatternSurface, PatternX, PatternY);\n"); + Output(Out, "if (BltInfo->PatternSurface->sizlBitmap.cx <= ++PatternX)\n"); + Output(Out, "{\n"); + Output(Out, "PatternX -= BltInfo->PatternSurface->sizlBitmap.cx;\n"); + Output(Out, "}\n"); + } + if ((RopInfo->UsesSource && 0 == (Flags & FLAG_FORCENOUSESSOURCE) && + Bpp != SourceBpp) || + (RopInfo->UsesPattern && 0 != (Flags & FLAG_PATTERNSURFACE))) + { + Output(Out, "\n"); + } + CreateOperation(Out, Bpp, RopInfo, SourceBpp, 16); + Output(Out, ";\n"); + MARK(Out); + Output(Out, "\n"); + Output(Out, "DestPtr = (PULONG)((char *) DestPtr + %u);\n", Bpp / 8); } static void CreateBitCase(FILE *Out, unsigned Bpp, PROPINFO RopInfo, int Flags, unsigned SourceBpp) { - unsigned Partial; - - MARK(Out); - if (RopInfo->UsesSource) - { - if (0 == (Flags & FLAG_FORCENOUSESSOURCE)) - { - CreateBase(Out, 1, Flags, SourceBpp); - } - CreateBase(Out, 0, Flags, Bpp); - CreateCounts(Out, Bpp); - MARK(Out); - } - if (RopInfo->UsesPattern && 0 != (Flags & FLAG_PATTERNSURFACE)) - { - if (0 == (Flags & FLAG_BOTTOMUP)) - { - Output(Out, "PatternY = (BltInfo->DestRect.top - BltInfo->BrushOrigin.y) %%\n"); - Output(Out, " BltInfo->PatternSurface->sizlBitmap.cy;\n"); - } - else - { - Output(Out, "PatternY = (BltInfo->DestRect.bottom - 1 -\n"); - Output(Out, " BltInfo->BrushOrigin.y) %%\n"); - Output(Out, " BltInfo->PatternSurface->sizlBitmap.cy;\n"); - } - } - if (ROPCODE_SRCCOPY == RopInfo->RopCode && - 0 != (Flags & FLAG_TRIVIALXLATE) && Bpp == SourceBpp) - { - Output(Out, "CenterCount = %u * (BltInfo->DestRect.right -\n", Bpp >> 3); - Output(Out, " BltInfo->DestRect.left);\n"); - } - if (RopInfo->UsesPattern && 0 != (Flags & FLAG_PATTERNSURFACE)) - { - Output(Out, "BasePatternX = (BltInfo->DestRect.left - BltInfo->BrushOrigin.x) %%\n"); - Output(Out, " BltInfo->PatternSurface->sizlBitmap.cx;\n"); - } - - Output(Out, "for (LineIndex = 0; LineIndex < LineCount; LineIndex++)\n"); - Output(Out, "{\n"); - if (ROPCODE_SRCCOPY != RopInfo->RopCode || - 0 == (Flags & FLAG_TRIVIALXLATE) || Bpp != SourceBpp) - { - if (RopInfo->UsesSource && 0 == (Flags & FLAG_FORCENOUSESSOURCE)) - { - Output(Out, "SourcePtr = (PULONG) SourceBase;\n"); - if (SourceBpp <= 16) - { - Output(Out, "RawSource = *SourcePtr++;\n"); - Output(Out, "SourcePixels = BaseSourcePixels;\n"); - } - } - Output(Out, "DestPtr = (PULONG) DestBase;\n"); - } - - if (RopInfo->UsesPattern && 0 != (Flags & FLAG_PATTERNSURFACE)) - { - Output(Out, "PatternX = BasePatternX;\n"); - } - - if (ROPCODE_SRCCOPY == RopInfo->RopCode && - 0 != (Flags & FLAG_TRIVIALXLATE) && Bpp == SourceBpp) - { - Output(Out, "RtlMoveMemory(DestBase, SourceBase, CenterCount);\n"); - Output(Out, "\n"); - } - else - { - Output(Out, "\n"); - if (32 != Bpp) - { - if (16 == Bpp) - { - Output(Out, "if (0 != LeftCount)\n"); - } - else - { - Output(Out, "for (i = 0; i < LeftCount; i++)\n"); - } - Output(Out, "{\n"); - CreateSetSinglePixel(Out, Bpp, RopInfo, - (16 == Bpp ? Flags | FLAG_FORCERAWSOURCEAVAIL : - Flags), SourceBpp); - MARK(Out); - Output(Out, "}\n"); - Output(Out, "\n"); - } - Output(Out, "for (i = 0; i < CenterCount; i++)\n"); - Output(Out, "{\n"); - if (RopInfo->UsesSource && 0 == (Flags & FLAG_FORCENOUSESSOURCE)) - { - for (Partial = 0; Partial < 32 / Bpp; Partial++) - { - CreateGetSource(Out, Bpp, RopInfo, Flags, SourceBpp, - Partial * Bpp); - MARK(Out); - } - Output(Out, "\n"); - } - if (RopInfo->UsesPattern && 0 != (Flags & FLAG_PATTERNSURFACE)) - { - for (Partial = 0; Partial < 32 / Bpp; Partial++) - { - if (0 == Partial) + unsigned Partial; + + MARK(Out); + if (RopInfo->UsesSource) + { + if (0 == (Flags & FLAG_FORCENOUSESSOURCE)) + { + CreateBase(Out, 1, Flags, SourceBpp); + } + CreateBase(Out, 0, Flags, Bpp); + CreateCounts(Out, Bpp); + MARK(Out); + } + if (RopInfo->UsesPattern && 0 != (Flags & FLAG_PATTERNSURFACE)) + { + if (0 == (Flags & FLAG_BOTTOMUP)) + { + Output(Out, "PatternY = (BltInfo->DestRect.top - BltInfo->BrushOrigin.y) %%\n"); + Output(Out, " BltInfo->PatternSurface->sizlBitmap.cy;\n"); + } + else + { + Output(Out, "PatternY = (BltInfo->DestRect.bottom - 1 -\n"); + Output(Out, " BltInfo->BrushOrigin.y) %%\n"); + Output(Out, " BltInfo->PatternSurface->sizlBitmap.cy;\n"); + } + } + if (ROPCODE_SRCCOPY == RopInfo->RopCode && + 0 != (Flags & FLAG_TRIVIALXLATE) && Bpp == SourceBpp) + { + Output(Out, "CenterCount = %u * (BltInfo->DestRect.right -\n", Bpp >> 3); + Output(Out, " BltInfo->DestRect.left);\n"); + } + if (RopInfo->UsesPattern && 0 != (Flags & FLAG_PATTERNSURFACE)) + { + Output(Out, "BasePatternX = (BltInfo->DestRect.left - BltInfo->BrushOrigin.x) %%\n"); + Output(Out, " BltInfo->PatternSurface->sizlBitmap.cx;\n"); + } + + Output(Out, "for (LineIndex = 0; LineIndex < LineCount; LineIndex++)\n"); + Output(Out, "{\n"); + if (ROPCODE_SRCCOPY != RopInfo->RopCode || + 0 == (Flags & FLAG_TRIVIALXLATE) || Bpp != SourceBpp) + { + if (RopInfo->UsesSource && 0 == (Flags & FLAG_FORCENOUSESSOURCE)) + { + Output(Out, "SourcePtr = (PULONG) SourceBase;\n"); + if (SourceBpp <= 16) + { + Output(Out, "RawSource = *SourcePtr++;\n"); + Output(Out, "SourcePixels = BaseSourcePixels;\n"); + } + } + Output(Out, "DestPtr = (PULONG) DestBase;\n"); + } + + if (RopInfo->UsesPattern && 0 != (Flags & FLAG_PATTERNSURFACE)) + { + Output(Out, "PatternX = BasePatternX;\n"); + } + + if (ROPCODE_SRCCOPY == RopInfo->RopCode && + 0 != (Flags & FLAG_TRIVIALXLATE) && Bpp == SourceBpp) + { + Output(Out, "RtlMoveMemory(DestBase, SourceBase, CenterCount);\n"); + Output(Out, "\n"); + } + else + { + Output(Out, "\n"); + if (32 != Bpp) + { + if (16 == Bpp) + { + Output(Out, "if (0 != LeftCount)\n"); + } + else + { + Output(Out, "for (i = 0; i < LeftCount; i++)\n"); + } + Output(Out, "{\n"); + CreateSetSinglePixel(Out, Bpp, RopInfo, + (16 == Bpp ? Flags | FLAG_FORCERAWSOURCEAVAIL : + Flags), SourceBpp); + MARK(Out); + Output(Out, "}\n"); + Output(Out, "\n"); + } + Output(Out, "for (i = 0; i < CenterCount; i++)\n"); + Output(Out, "{\n"); + if (RopInfo->UsesSource && 0 == (Flags & FLAG_FORCENOUSESSOURCE)) + { + for (Partial = 0; Partial < 32 / Bpp; Partial++) + { + CreateGetSource(Out, Bpp, RopInfo, Flags, SourceBpp, + Partial * Bpp); + MARK(Out); + } + Output(Out, "\n"); + } + if (RopInfo->UsesPattern && 0 != (Flags & FLAG_PATTERNSURFACE)) + { + for (Partial = 0; Partial < 32 / Bpp; Partial++) + { + if (0 == Partial) { - Output(Out, "Pattern = DIB_GetSourceIndex(BltInfo->PatternSurface, PatternX, PatternY);\n"); + Output(Out, "Pattern = DIB_GetSourceIndex(BltInfo->PatternSurface, PatternX, PatternY);\n"); } - else + else { - Output(Out, "Pattern |= DIB_GetSourceIndex(BltInfo->PatternSurface, PatternX, PatternY) << %u;\n", Partial * Bpp); + Output(Out, "Pattern |= DIB_GetSourceIndex(BltInfo->PatternSurface, PatternX, PatternY) << %u;\n", Partial * Bpp); } - Output(Out, "if (BltInfo->PatternSurface->sizlBitmap.cx <= ++PatternX)\n"); - Output(Out, "{\n"); - Output(Out, "PatternX -= BltInfo->PatternSurface->sizlBitmap.cx;\n"); - Output(Out, "}\n"); - } - Output(Out, "\n"); - } - CreateOperation(Out, Bpp, RopInfo, SourceBpp, 32); - Output(Out, ";\n"); - MARK(Out); - Output(Out, "\n"); - Output(Out, "DestPtr++;\n"); - Output(Out, "}\n"); - Output(Out, "\n"); - if (32 != Bpp) - { - if (16 == Bpp) - { - Output(Out, "if (0 != RightCount)\n"); - } - else - { - Output(Out, "for (i = 0; i < RightCount; i++)\n"); - } - Output(Out, "{\n"); - CreateSetSinglePixel(Out, Bpp, RopInfo, Flags, SourceBpp); - MARK(Out); - Output(Out, "}\n"); - Output(Out, "\n"); - } - if (RopInfo->UsesPattern && 0 != (Flags & FLAG_PATTERNSURFACE)) - { - if (0 == (Flags & FLAG_BOTTOMUP)) - { - Output(Out, "if (BltInfo->PatternSurface->sizlBitmap.cy <= ++PatternY)\n"); - Output(Out, "{\n"); - Output(Out, "PatternY -= BltInfo->PatternSurface->sizlBitmap.cy;\n"); - Output(Out, "}\n"); - } - else - { - Output(Out, "if (0 == PatternY--)\n"); - Output(Out, "{\n"); - Output(Out, "PatternY = BltInfo->PatternSurface->sizlBitmap.cy - 1;\n"); - Output(Out, "}\n"); - } - } - } - if (RopInfo->UsesSource && 0 == (Flags & FLAG_FORCENOUSESSOURCE)) - { - Output(Out, "SourceBase %c= BltInfo->SourceSurface->lDelta;\n", - 0 == (Flags & FLAG_BOTTOMUP) ? '+' : '-'); - } - Output(Out, "DestBase %c= BltInfo->DestSurface->lDelta;\n", - 0 == (Flags & FLAG_BOTTOMUP) ? '+' : '-'); - Output(Out, "}\n"); + Output(Out, "if (BltInfo->PatternSurface->sizlBitmap.cx <= ++PatternX)\n"); + Output(Out, "{\n"); + Output(Out, "PatternX -= BltInfo->PatternSurface->sizlBitmap.cx;\n"); + Output(Out, "}\n"); + } + Output(Out, "\n"); + } + CreateOperation(Out, Bpp, RopInfo, SourceBpp, 32); + Output(Out, ";\n"); + MARK(Out); + Output(Out, "\n"); + Output(Out, "DestPtr++;\n"); + Output(Out, "}\n"); + Output(Out, "\n"); + if (32 != Bpp) + { + if (16 == Bpp) + { + Output(Out, "if (0 != RightCount)\n"); + } + else + { + Output(Out, "for (i = 0; i < RightCount; i++)\n"); + } + Output(Out, "{\n"); + CreateSetSinglePixel(Out, Bpp, RopInfo, Flags, SourceBpp); + MARK(Out); + Output(Out, "}\n"); + Output(Out, "\n"); + } + if (RopInfo->UsesPattern && 0 != (Flags & FLAG_PATTERNSURFACE)) + { + if (0 == (Flags & FLAG_BOTTOMUP)) + { + Output(Out, "if (BltInfo->PatternSurface->sizlBitmap.cy <= ++PatternY)\n"); + Output(Out, "{\n"); + Output(Out, "PatternY -= BltInfo->PatternSurface->sizlBitmap.cy;\n"); + Output(Out, "}\n"); + } + else + { + Output(Out, "if (0 == PatternY--)\n"); + Output(Out, "{\n"); + Output(Out, "PatternY = BltInfo->PatternSurface->sizlBitmap.cy - 1;\n"); + Output(Out, "}\n"); + } + } + } + if (RopInfo->UsesSource && 0 == (Flags & FLAG_FORCENOUSESSOURCE)) + { + Output(Out, "SourceBase %c= BltInfo->SourceSurface->lDelta;\n", + 0 == (Flags & FLAG_BOTTOMUP) ? '+' : '-'); + } + Output(Out, "DestBase %c= BltInfo->DestSurface->lDelta;\n", + 0 == (Flags & FLAG_BOTTOMUP) ? '+' : '-'); + Output(Out, "}\n"); } static void CreateActionBlock(FILE *Out, unsigned Bpp, PROPINFO RopInfo, int Flags) { - static unsigned SourceBpp[ ] = + static unsigned SourceBpp[ ] = { 1, 4, 8, 16, 24, 32 }; - unsigned BppIndex; - - MARK(Out); - if (RopInfo->UsesSource) - { - if (ROPCODE_GENERIC == RopInfo->RopCode) - { - Output(Out, "if (UsesSource)\n"); - Output(Out, "{\n"); - } - Output(Out, "switch (BltInfo->SourceSurface->iBitmapFormat)\n"); - Output(Out, "{\n"); - for (BppIndex = 0; - BppIndex < sizeof(SourceBpp) / sizeof(unsigned); - BppIndex++) - { - Output(Out, "case BMF_%uBPP:\n", SourceBpp[BppIndex]); - Output(Out, "{\n"); - if (Bpp == SourceBpp[BppIndex]) - { - Output(Out, "if (NULL == BltInfo->XlateSourceToDest ||\n"); - Output(Out, " 0 != (BltInfo->XlateSourceToDest->flXlate & XO_TRIVIAL))\n"); - Output(Out, "{\n"); - Output(Out, "if (BltInfo->DestRect.top < BltInfo->SourcePoint.y)\n"); - Output(Out, "{\n"); - CreateBitCase(Out, Bpp, RopInfo, - Flags | FLAG_TRIVIALXLATE, - SourceBpp[BppIndex]); - MARK(Out); - Output(Out, "}\n"); - Output(Out, "else\n"); - Output(Out, "{\n"); - CreateBitCase(Out, Bpp, RopInfo, - Flags | FLAG_BOTTOMUP | FLAG_TRIVIALXLATE, - SourceBpp[BppIndex]); - MARK(Out); - Output(Out, "}\n"); - Output(Out, "}\n"); - Output(Out, "else\n"); - Output(Out, "{\n"); - Output(Out, "if (BltInfo->DestRect.top < BltInfo->SourcePoint.y)\n"); - Output(Out, "{\n"); - CreateBitCase(Out, Bpp, RopInfo, Flags, SourceBpp[BppIndex]); - MARK(Out); - Output(Out, "}\n"); - Output(Out, "else\n"); - Output(Out, "{\n"); - CreateBitCase(Out, Bpp, RopInfo, - Flags | FLAG_BOTTOMUP, - SourceBpp[BppIndex]); - MARK(Out); - Output(Out, "}\n"); - Output(Out, "}\n"); - } - else - { - CreateBitCase(Out, Bpp, RopInfo, Flags, - SourceBpp[BppIndex]); - MARK(Out); - } - Output(Out, "break;\n"); - Output(Out, "}\n"); - } - Output(Out, "}\n"); - if (ROPCODE_GENERIC == RopInfo->RopCode) - { - Output(Out, "}\n"); - Output(Out, "else\n"); - Output(Out, "{\n"); - CreateBitCase(Out, Bpp, RopInfo, Flags | FLAG_FORCENOUSESSOURCE, 0); - MARK(Out); - Output(Out, "}\n"); - } - } - else - { - CreateBitCase(Out, Bpp, RopInfo, Flags, 0); + unsigned BppIndex; + + MARK(Out); + if (RopInfo->UsesSource) + { + if (ROPCODE_GENERIC == RopInfo->RopCode) + { + Output(Out, "if (UsesSource)\n"); + Output(Out, "{\n"); + } + Output(Out, "switch (BltInfo->SourceSurface->iBitmapFormat)\n"); + Output(Out, "{\n"); + for (BppIndex = 0; + BppIndex < sizeof(SourceBpp) / sizeof(unsigned); + BppIndex++) + { + Output(Out, "case BMF_%uBPP:\n", SourceBpp[BppIndex]); + Output(Out, "{\n"); + if (Bpp == SourceBpp[BppIndex]) + { + Output(Out, "if (NULL == BltInfo->XlateSourceToDest ||\n"); + Output(Out, " 0 != (BltInfo->XlateSourceToDest->flXlate & XO_TRIVIAL))\n"); + Output(Out, "{\n"); + Output(Out, "if (BltInfo->DestRect.top < BltInfo->SourcePoint.y)\n"); + Output(Out, "{\n"); + CreateBitCase(Out, Bpp, RopInfo, + Flags | FLAG_TRIVIALXLATE, + SourceBpp[BppIndex]); + MARK(Out); + Output(Out, "}\n"); + Output(Out, "else\n"); + Output(Out, "{\n"); + CreateBitCase(Out, Bpp, RopInfo, + Flags | FLAG_BOTTOMUP | FLAG_TRIVIALXLATE, + SourceBpp[BppIndex]); + MARK(Out); + Output(Out, "}\n"); + Output(Out, "}\n"); + Output(Out, "else\n"); + Output(Out, "{\n"); + Output(Out, "if (BltInfo->DestRect.top < BltInfo->SourcePoint.y)\n"); + Output(Out, "{\n"); + CreateBitCase(Out, Bpp, RopInfo, Flags, SourceBpp[BppIndex]); + MARK(Out); + Output(Out, "}\n"); + Output(Out, "else\n"); + Output(Out, "{\n"); + CreateBitCase(Out, Bpp, RopInfo, + Flags | FLAG_BOTTOMUP, + SourceBpp[BppIndex]); + MARK(Out); + Output(Out, "}\n"); + Output(Out, "}\n"); + } + else + { + CreateBitCase(Out, Bpp, RopInfo, Flags, + SourceBpp[BppIndex]); + MARK(Out); + } + Output(Out, "break;\n"); + Output(Out, "}\n"); + } + Output(Out, "}\n"); + if (ROPCODE_GENERIC == RopInfo->RopCode) + { + Output(Out, "}\n"); + Output(Out, "else\n"); + Output(Out, "{\n"); + CreateBitCase(Out, Bpp, RopInfo, Flags | FLAG_FORCENOUSESSOURCE, 0); + MARK(Out); + Output(Out, "}\n"); + } + } + else + { + CreateBitCase(Out, Bpp, RopInfo, Flags, 0); } } static void CreatePrimitive(FILE *Out, unsigned Bpp, PROPINFO RopInfo) { - int First; - unsigned Partial; - - MARK(Out); - Output(Out, "\n"); - Output(Out, "static void\n"); - PrintRoutineName(Out, Bpp, RopInfo); - Output(Out, "(PBLTINFO BltInfo)\n"); - Output(Out, "{\n"); - if (ROPCODE_BLACKNESS == RopInfo->RopCode) - { - Output(Out, "DIB_%uBPP_ColorFill(BltInfo->DestSurface, " - "&BltInfo->DestRect, 0x0);\n", Bpp); - } - else if (ROPCODE_WHITENESS == RopInfo->RopCode) - { - Output(Out, "DIB_%uBPP_ColorFill(BltInfo->DestSurface, " - "&BltInfo->DestRect, ~0);\n", Bpp); - } - else if (ROPCODE_NOOP == RopInfo->RopCode) - { - Output(Out, "return;\n"); - } - else - { - Output(Out, "ULONG LineIndex, LineCount;\n"); - Output(Out, "ULONG i;\n"); - if (RopInfo->UsesPattern) - { - Output(Out, "ULONG PatternX =0, PatternY = 0, BasePatternX = 0;\n"); - } - First = 1; - if (RopInfo->UsesSource) - { - Output(Out, "ULONG Source = 0"); - First = 0; - } - if (RopInfo->UsesPattern) - { - Output(Out, "%s Pattern = 0", First ? "ULONG" : ","); - First = 0; - } - if (! First) - { - Output(Out, ";\n"); - } - Output(Out, "char *DestBase;\n"); - Output(Out, "PULONG DestPtr;\n"); - if (RopInfo->UsesSource) - { - Output(Out, "char *SourceBase;\n"); - Output(Out, "PULONG SourcePtr;\n"); - Output(Out, "ULONG RawSource;\n"); - Output(Out, "unsigned SourcePixels, BaseSourcePixels;\n"); - } - if (32 == Bpp) - { - Output(Out, "ULONG CenterCount;\n"); - } - else - { - Output(Out, "ULONG LeftCount, CenterCount, RightCount;\n"); - } - if (ROPCODE_GENERIC == RopInfo->RopCode) - { - Output(Out, "BOOLEAN UsesSource, UsesPattern;\n"); - Output(Out, "\n"); - Output(Out, "UsesSource = ROP4_USES_SOURCE(BltInfo->Rop4);\n"); - Output(Out, "UsesPattern = ROP4_USES_PATTERN(BltInfo->Rop4);\n"); - } - Output(Out, "\n"); - if (! RopInfo->UsesSource) - { - CreateBase(Out, 0, 0, Bpp); - CreateCounts(Out, Bpp); - MARK(Out); - } - Output(Out, "LineCount = BltInfo->DestRect.bottom - BltInfo->DestRect.top;\n"); - - Output(Out, "\n"); - if (RopInfo->UsesPattern) - { - if (ROPCODE_GENERIC == RopInfo->RopCode) - { - Output(Out, "if (UsesPattern && NULL != BltInfo->PatternSurface)\n"); - } - else - { - Output(Out, "if (NULL != BltInfo->PatternSurface)\n"); - } - Output(Out, "{\n"); - CreateActionBlock(Out, Bpp, RopInfo, FLAG_PATTERNSURFACE); - MARK(Out); - Output(Out, "}\n"); - Output(Out, "else\n"); - Output(Out, "{\n"); - if (ROPCODE_GENERIC == RopInfo->RopCode) - { - Output(Out, "if (UsesPattern)\n"); - Output(Out, "{\n"); - } - for (Partial = 0; Partial < 32 / Bpp; Partial++) - { - if (0 == Partial) + int First; + unsigned Partial; + + MARK(Out); + Output(Out, "\n"); + Output(Out, "static void\n"); + PrintRoutineName(Out, Bpp, RopInfo); + Output(Out, "(PBLTINFO BltInfo)\n"); + Output(Out, "{\n"); + if (ROPCODE_BLACKNESS == RopInfo->RopCode) + { + Output(Out, "DIB_%uBPP_ColorFill(BltInfo->DestSurface, " + "&BltInfo->DestRect, 0x0);\n", Bpp); + } + else if (ROPCODE_WHITENESS == RopInfo->RopCode) + { + Output(Out, "DIB_%uBPP_ColorFill(BltInfo->DestSurface, " + "&BltInfo->DestRect, ~0);\n", Bpp); + } + else if (ROPCODE_NOOP == RopInfo->RopCode) + { + Output(Out, "return;\n"); + } + else + { + Output(Out, "ULONG LineIndex, LineCount;\n"); + Output(Out, "ULONG i;\n"); + if (RopInfo->UsesPattern) + { + Output(Out, "ULONG PatternX =0, PatternY = 0, BasePatternX = 0;\n"); + } + First = 1; + if (RopInfo->UsesSource) + { + Output(Out, "ULONG Source = 0"); + First = 0; + } + if (RopInfo->UsesPattern) + { + Output(Out, "%s Pattern = 0", First ? "ULONG" : ","); + First = 0; + } + if (! First) + { + Output(Out, ";\n"); + } + Output(Out, "char *DestBase;\n"); + Output(Out, "PULONG DestPtr;\n"); + if (RopInfo->UsesSource) + { + Output(Out, "char *SourceBase;\n"); + Output(Out, "PULONG SourcePtr;\n"); + Output(Out, "ULONG RawSource;\n"); + Output(Out, "unsigned SourcePixels, BaseSourcePixels;\n"); + } + if (32 == Bpp) + { + Output(Out, "ULONG CenterCount;\n"); + } + else + { + Output(Out, "ULONG LeftCount, CenterCount, RightCount;\n"); + } + if (ROPCODE_GENERIC == RopInfo->RopCode) + { + Output(Out, "BOOLEAN UsesSource, UsesPattern;\n"); + Output(Out, "\n"); + Output(Out, "UsesSource = ROP4_USES_SOURCE(BltInfo->Rop4);\n"); + Output(Out, "UsesPattern = ROP4_USES_PATTERN(BltInfo->Rop4);\n"); + } + Output(Out, "\n"); + if (! RopInfo->UsesSource) + { + CreateBase(Out, 0, 0, Bpp); + CreateCounts(Out, Bpp); + MARK(Out); + } + Output(Out, "LineCount = BltInfo->DestRect.bottom - BltInfo->DestRect.top;\n"); + + Output(Out, "\n"); + if (RopInfo->UsesPattern) + { + if (ROPCODE_GENERIC == RopInfo->RopCode) + { + Output(Out, "if (UsesPattern && NULL != BltInfo->PatternSurface)\n"); + } + else + { + Output(Out, "if (NULL != BltInfo->PatternSurface)\n"); + } + Output(Out, "{\n"); + CreateActionBlock(Out, Bpp, RopInfo, FLAG_PATTERNSURFACE); + MARK(Out); + Output(Out, "}\n"); + Output(Out, "else\n"); + Output(Out, "{\n"); + if (ROPCODE_GENERIC == RopInfo->RopCode) + { + Output(Out, "if (UsesPattern)\n"); + Output(Out, "{\n"); + } + for (Partial = 0; Partial < 32 / Bpp; Partial++) + { + if (0 == Partial) { - Output(Out, "if (!BltInfo->Brush)\n"); - Output(Out, "{\n"); - Output(Out, "Pattern = 0;\n"); - Output(Out, "}\n"); - Output(Out, "else\n"); - Output(Out, "{\n"); - Output(Out, "Pattern = BltInfo->Brush->iSolidColor"); + Output(Out, "if (!BltInfo->Brush)\n"); + Output(Out, "{\n"); + Output(Out, "Pattern = 0;\n"); + Output(Out, "}\n"); + Output(Out, "else\n"); + Output(Out, "{\n"); + Output(Out, "Pattern = BltInfo->Brush->iSolidColor"); } - else + else { - Output(Out, " (BltInfo->Brush->iSolidColor << %d)", - Partial * Bpp); + Output(Out, " (BltInfo->Brush->iSolidColor << %d)", + Partial * Bpp); } - if (32 / Bpp <= Partial + 1) + if (32 / Bpp <= Partial + 1) { - Output(Out, ";\n"); - Output(Out, "}\n"); + Output(Out, ";\n"); + Output(Out, "}\n"); } - else + else { - Output(Out, " |\n"); + Output(Out, " |\n"); } } - if (ROPCODE_PATINVERT == RopInfo->RopCode || - ROPCODE_MERGECOPY == RopInfo->RopCode) - { - Output(Out, "if (0 == Pattern)\n"); - Output(Out, "{\n"); - if (ROPCODE_MERGECOPY == RopInfo->RopCode) + if (ROPCODE_PATINVERT == RopInfo->RopCode || + ROPCODE_MERGECOPY == RopInfo->RopCode) + { + Output(Out, "if (0 == Pattern)\n"); + Output(Out, "{\n"); + if (ROPCODE_MERGECOPY == RopInfo->RopCode) { - Output(Out, "DIB_%uBPP_ColorFill(BltInfo->DestSurface, " - "&BltInfo->DestRect, 0x0);\n", Bpp); + Output(Out, "DIB_%uBPP_ColorFill(BltInfo->DestSurface, " + "&BltInfo->DestRect, 0x0);\n", Bpp); } - Output(Out, "return;\n"); - Output(Out, "}\n"); - } - else if (ROPCODE_PATPAINT == RopInfo->RopCode) - { - Output(Out, "if ((~0) == Pattern)\n"); - Output(Out, "{\n"); - Output(Out, "DIB_%uBPP_ColorFill(BltInfo->DestSurface, " - "&BltInfo->DestRect, ~0);\n", Bpp); - Output(Out, "return;\n"); - Output(Out, "}\n"); - } - if (ROPCODE_GENERIC == RopInfo->RopCode) - { - Output(Out, "}\n"); - } - CreateActionBlock(Out, Bpp, RopInfo, 0); - MARK(Out); - Output(Out, "}\n"); - } - else - { - CreateActionBlock(Out, Bpp, RopInfo, 0); - MARK(Out); - } - } - Output(Out, "}\n"); + Output(Out, "return;\n"); + Output(Out, "}\n"); + } + else if (ROPCODE_PATPAINT == RopInfo->RopCode) + { + Output(Out, "if ((~0) == Pattern)\n"); + Output(Out, "{\n"); + Output(Out, "DIB_%uBPP_ColorFill(BltInfo->DestSurface, " + "&BltInfo->DestRect, ~0);\n", Bpp); + Output(Out, "return;\n"); + Output(Out, "}\n"); + } + if (ROPCODE_GENERIC == RopInfo->RopCode) + { + Output(Out, "}\n"); + } + CreateActionBlock(Out, Bpp, RopInfo, 0); + MARK(Out); + Output(Out, "}\n"); + } + else + { + CreateActionBlock(Out, Bpp, RopInfo, 0); + MARK(Out); + } + } + Output(Out, "}\n"); } static void CreateTable(FILE *Out, unsigned Bpp) { - unsigned RopCode; - - MARK(Out); - Output(Out, "\n"); - Output(Out, "static void (*PrimitivesTable[256])(PBLTINFO) =\n"); - Output(Out, "{\n"); - for (RopCode = 0; RopCode < 256; RopCode++) - { - PrintRoutineName(Out, Bpp, FindRopInfo(RopCode)); - if (RopCode < 255) - { - Output(Out, ","); - } - Output(Out, "\n"); - } - Output(Out, "};\n"); + unsigned RopCode; + + MARK(Out); + Output(Out, "\n"); + Output(Out, "static void (*PrimitivesTable[256])(PBLTINFO) =\n"); + Output(Out, "{\n"); + for (RopCode = 0; RopCode < 256; RopCode++) + { + PrintRoutineName(Out, Bpp, FindRopInfo(RopCode)); + if (RopCode < 255) + { + Output(Out, ","); + } + Output(Out, "\n"); + } + Output(Out, "};\n"); } static void CreateBitBlt(FILE *Out, unsigned Bpp) { - MARK(Out); - Output(Out, "\n"); - Output(Out, "BOOLEAN\n"); - Output(Out, "DIB_%uBPP_BitBlt(PBLTINFO BltInfo)\n", Bpp); - Output(Out, "{\n"); - Output(Out, "PrimitivesTable[BltInfo->Rop4 & 0xff](BltInfo);\n"); - Output(Out, "\n"); - Output(Out, "return TRUE;\n"); - Output(Out, "}\n"); + MARK(Out); + Output(Out, "\n"); + Output(Out, "BOOLEAN\n"); + Output(Out, "DIB_%uBPP_BitBlt(PBLTINFO BltInfo)\n", Bpp); + Output(Out, "{\n"); + Output(Out, "PrimitivesTable[BltInfo->Rop4 & 0xff](BltInfo);\n"); + Output(Out, "\n"); + Output(Out, "return TRUE;\n"); + Output(Out, "}\n"); } static void Generate(char *OutputDir, unsigned Bpp) { - FILE *Out; - unsigned RopCode; - PROPINFO RopInfo; - char *FileName; - - FileName = malloc(strlen(OutputDir) + 12); - if (NULL == FileName) - { - fprintf(stderr, "Out of memory\n"); - exit(1); - } - strcpy(FileName, OutputDir); - if ('/' != FileName[strlen(FileName) - 1]) - { - strcat(FileName, "/"); - } - sprintf(FileName + strlen(FileName), "dib%ugen.c", Bpp); - - Out = fopen(FileName, "w"); - free(FileName); - if (NULL == Out) - { - perror("Error opening output file"); - exit(1); - } - - MARK(Out); - Output(Out, "/* This is a generated file. Please do not edit */\n"); - Output(Out, "\n"); - Output(Out, "#include <win32k.h>\n"); - CreateShiftTables(Out); - - RopInfo = FindRopInfo(ROPCODE_GENERIC); - CreatePrimitive(Out, Bpp, RopInfo); - for (RopCode = 0; RopCode < 256; RopCode++) - { - RopInfo = FindRopInfo(RopCode); - if (NULL != RopInfo) - { - CreatePrimitive(Out, Bpp, RopInfo); - } - } - CreateTable(Out, Bpp); - CreateBitBlt(Out, Bpp); - - fclose(Out); + FILE *Out; + unsigned RopCode; + PROPINFO RopInfo; + char *FileName; + + FileName = malloc(strlen(OutputDir) + 12); + if (NULL == FileName) + { + fprintf(stderr, "Out of memory\n"); + exit(1); + } + strcpy(FileName, OutputDir); + if ('/' != FileName[strlen(FileName) - 1]) + { + strcat(FileName, "/"); + } + sprintf(FileName + strlen(FileName), "dib%ugen.c", Bpp); + + Out = fopen(FileName, "w"); + free(FileName); + if (NULL == Out) + { + perror("Error opening output file"); + exit(1); + } + + MARK(Out); + Output(Out, "/* This is a generated file. Please do not edit */\n"); + Output(Out, "\n"); + Output(Out, "#include <win32k.h>\n"); + CreateShiftTables(Out); + + RopInfo = FindRopInfo(ROPCODE_GENERIC); + CreatePrimitive(Out, Bpp, RopInfo); + for (RopCode = 0; RopCode < 256; RopCode++) + { + RopInfo = FindRopInfo(RopCode); + if (NULL != RopInfo) + { + CreatePrimitive(Out, Bpp, RopInfo); + } + } + CreateTable(Out, Bpp); + CreateBitBlt(Out, Bpp); + + fclose(Out); } int main(int argc, char *argv[]) { - unsigned Index; - static unsigned DestBpp[] = + unsigned Index; + static unsigned DestBpp[] = { 8, 16, 32 }; - if (argc < 2) + if (argc < 2) + return 0; + + for (Index = 0; Index < sizeof(DestBpp) / sizeof(DestBpp[0]); Index++) + { + Generate(argv[1], DestBpp[Index]); + } + return 0; - - for (Index = 0; Index < sizeof(DestBpp) / sizeof(DestBpp[0]); Index++) - { - Generate(argv[1], DestBpp[Index]); - } - - return 0; -} +}

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