Ros-diffs March 2012

ros-diffs@reactos.org

22 participants
351 discussions

[pschweitzer] 56009: [RAMDISK] Implement RamdiskFlushBuffers, RamdiskUnload

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Mar 4 19:48:09 2012 New Revision: 56009 URL: http://svn.reactos.org/svn/reactos?rev=56009&view=rev Log: [RAMDISK] Implement RamdiskFlushBuffers, RamdiskUnload 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 19:48:09 2012 @@ -2221,17 +2221,54 @@ RamdiskFlushBuffers(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - UNIMPLEMENTED; - while (TRUE); - return STATUS_SUCCESS; + NTSTATUS Status; + PRAMDISK_DRIVE_EXTENSION DeviceExtension; + + DeviceExtension = DeviceObject->DeviceExtension; + + // + // Ensure we have drive extension + // Only perform flush on disks that have been created + // from registry entries + // + if (DeviceExtension->Type != RamdiskDrive || + DeviceExtension->DiskType > RAMDISK_MEMORY_MAPPED_DISK) + { + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + } + + // + // Queue the IRP from worker + // + Status = SendIrpToThread(DeviceObject, Irp); + if (Status != STATUS_PENDING) + { + // + // Queueing failed - complete the IRP + // and return failure + // + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } + + return Status; } VOID NTAPI RamdiskUnload(IN PDRIVER_OBJECT DriverObject) { - UNIMPLEMENTED; - while (TRUE); + // + // Just release registry path if previously allocated + // + if (DriverRegistryPath.Buffer) + { + ExFreePoolWithTag(DriverRegistryPath.Buffer, 'dmaR'); + } } NTSTATUS

12 years, 9 months

[tkreuzer] 56008: [WIN32K] - Switch from using a FONTDEV structure to using a PDEVOBJ (it was an idea to save half a KB memory per driver, but it doesn't work well together with display drivers tha...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Mar 4 19:20:41 2012 New Revision: 56008 URL: http://svn.reactos.org/svn/reactos?rev=56008&view=rev Log: [WIN32K] - Switch from using a FONTDEV structure to using a PDEVOBJ (it was an idea to save half a KB memory per driver, but it doesn't work well together with display drivers that provide font capabilities) - Modify EngLoadFontDriver to use PDEVOBJ_CreatePDEV instead of manually calling the driver - Implement RFONT_AllocRFONT, RFONT_vDeleteRFONT, RFONT_bQueryDeviceMetrics Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fntdrvsup.c branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/rfont.c Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fntdrvsup.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fntdrvsup.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/fntdrvsup.c [iso-8859-1] Sun Mar 4 19:20:41 2012 @@ -11,17 +11,6 @@ #define NDEBUG #include <debug.h> -typedef struct _FONTDEV -{ - LIST_ENTRY leLink; - DHPDEV dhpdev; - PLDEVOBJ pldev; - HSURF ahsurf[HS_DDI_MAX]; - DEVINFO devinfo; - - GDIINFO gdiinfo; // FIXME: something else? -} FONTDEV, *PFONTDEV; - C_ASSERT(sizeof(GDIINFO) == 0x130); @@ -67,15 +56,15 @@ RFONT_vInitDeviceMetrics( PRFONT prfnt) { - PFONTDEV pfntdev = (PFONTDEV)prfnt->hdevProducer; - - pfntdev->pldev->pfn.QueryFontData(prfnt->dhpdev, - &prfnt->fobj, - QFD_MAXEXTENTS, - -1, - NULL, - &prfnt->fddm, - sizeof(FD_DEVICEMETRICS)); + PPDEVOBJ ppdev = (PPDEVOBJ)prfnt->hdevProducer; + + ppdev->pldev->pfn.QueryFontData(prfnt->dhpdev, + &prfnt->fobj, + QFD_MAXEXTENTS, + -1, + NULL, + &prfnt->fddm, + sizeof(FD_DEVICEMETRICS)); } static @@ -85,8 +74,8 @@ PPFF ppff, ULONG iFace) { - PFONTDEV pfntdev = (PFONTDEV)ppff->hdev; - PLDEVOBJ pldev = pfntdev->pldev; + PPDEVOBJ ppdev = (PPDEVOBJ)ppff->hdev; + PLDEVOBJ pldev = ppdev->pldev; ppfe->pPFF = ppff; ppfe->iFont = iFace; ppfe->flPFE = 0; @@ -95,13 +84,13 @@ ppfe->tid = HandleToUlong(PsGetCurrentThreadId()); /* Query IFIMETRICS */ - ppfe->pifi = pldev->pfn.QueryFont(pfntdev->dhpdev, + ppfe->pifi = pldev->pfn.QueryFont(ppdev->dhpdev, ppff->hff, iFace, &ppfe->idifi); /* Query FD_GLYPHSET */ - ppfe->pfdg = pldev->pfn.QueryFontTree(pfntdev->dhpdev, + ppfe->pfdg = pldev->pfn.QueryFontTree(ppdev->dhpdev, ppff->hff, iFace, QFT_GLYPHSET, @@ -168,7 +157,7 @@ PWCHAR pwcCurrent; KAPC_STATE ApcState; PLIST_ENTRY ple; - PFONTDEV pfntdev = NULL; + PPDEVOBJ ppdev = NULL; HFF hff = 0; ULONG cFaces, cjSize, i, ulLangID = 0; PPFF ppff = NULL; @@ -206,23 +195,23 @@ } /* Acquire font driver list lock */ - EngAcquireSemaphore(ghsemFontDriver); + EngAcquireSemaphoreShared(ghsemFontDriver); /* Loop all installed font drivers */ for (ple = gleFontDriverList.Flink; ple != &gleFontDriverList; ple = ple->Flink) { - pfntdev = CONTAINING_RECORD(ple, FONTDEV, leLink); + ppdev = CONTAINING_RECORD(ple, PDEVOBJ, leLink); /* Call the drivers DrvLoadFontFile function */ - hff = pfntdev->pldev->pfn.LoadFontFile(cFiles, - piFiles, - apvView, - acjView, - pdv, - ulLangID, - ulCheckSum); + hff = ppdev->pldev->pfn.LoadFontFile(cFiles, + piFiles, + apvView, + acjView, + pdv, + ulLangID, + ulCheckSum); if (hff) break; } @@ -236,7 +225,7 @@ } /* Query the number of faces in the font file */ - cFaces = pfntdev->pldev->pfn.QueryFontFile(hff, QFF_NUMFACES, 0, NULL); + cFaces = ppdev->pldev->pfn.QueryFontFile(hff, QFF_NUMFACES, 0, NULL); /* Allocate a new PFF */ cjSize = FIELD_OFFSET(PFF, apfe[cFaces]); @@ -251,7 +240,7 @@ ppff->sizeofThis = cjSize; ppff->cFiles = cFiles; ppff->cFonts = cFaces; - ppff->hdev = (HDEV)pfntdev; + ppff->hdev = (HDEV)ppdev; ppff->hff = hff; /* Copy the FONTFILEVIEW pointers */ @@ -278,49 +267,28 @@ IN PWSTR pwszDriverName) { PLDEVOBJ pldev; - PFONTDEV pfntdev; - - /* Load the driver */ + PPDEVOBJ ppdev; + + /* Try to load the driver */ pldev = EngLoadImageEx(pwszDriverName, LDEV_FONT); if (!pldev) { - DPRINT1("Failed to load font driver: %ls\n", pwszDriverName); + DPRINT1("Could not load display driver '%ls'\n", pwszDriverName); return FALSE; } - // CHECK if all functions are there - - - /* Allocate a FONTDEV structure */ - pfntdev = EngAllocMem(0, sizeof(FONTDEV), 'vdfG'); - if (!pfntdev) - { - DPRINT1("Failed to allocate FONTDEV structure\n"); + /* Create a new PDEVOBJ */ + ppdev = PDEVOBJ_CreatePDEV(pldev); + if (!ppdev) + { + DPRINT1("failed to allocate a PDEV\n"); EngUnloadImage(pldev); return FALSE; } - pfntdev->pldev = pldev; - - /* Call the drivers DrvEnablePDEV function */ - pfntdev->dhpdev = pldev->pfn.EnablePDEV(NULL, - NULL, - HS_DDI_MAX, - pfntdev->ahsurf, - sizeof(GDIINFO), - (ULONG*)&pfntdev->gdiinfo, - sizeof(DEVINFO), - &pfntdev->devinfo, - (HDEV)pfntdev, - NULL, - NULL); - - /* Call the drivers DrvCompletePDEV function */ - pldev->pfn.CompletePDEV(pfntdev->dhpdev, (HDEV)pfntdev); - /* Insert the driver into the list */ EngAcquireSemaphore(ghsemFontDriver); - InsertTailList(&gleFontDriverList, &pfntdev->leLink); + InsertTailList(&gleFontDriverList, &ppdev->leLink); EngReleaseSemaphore(ghsemFontDriver); return TRUE; Modified: branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/rfont.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/subsyst… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/rfont.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/subsystems/win32/win32k/font/rfont.c [iso-8859-1] Sun Mar 4 19:20:41 2012 @@ -7,10 +7,79 @@ #include <win32k.h> #include <include/font.h> - -#define NDEBUG -#include <debug.h> - +DBG_DEFAULT_CHANNEL(GdiFont); + +ULONG gulRFONTUnique = 0; +PRFONT gprfntSystemTT; + +PRFONT +NTAPI +RFONT_AllocRFONT(void) +{ + PRFONT prfnt; + + /* Allocate the RFONT structure */ + prfnt = ExAllocatePoolWithTag(PagedPool, sizeof(RFONT), GDITAG_RFONT); + if (!prfnt) + { + ERR("Not enough memory to allocate RFONT\n"); + return NULL; + } + + /* Zero out the whole structure */ + RtlZeroMemory(prfnt, sizeof(RFONT)); + + /* Set a unique number */ + prfnt->fobj.iUniq = InterlockedIncrementUL(&gulRFONTUnique); + + + return prfnt; +} + +VOID +NTAPI +RFONT_vDeleteRFONT( + _Inout_ PRFONT prfnt) +{ + ASSERT(prfnt->cSelected == 0); + + /* Free the structure */ + ExFreePoolWithTag(prfnt, GDITAG_RFONT); + +} + +BOOL +NTAPI +RFONT_bQueryDeviceMetrics( + PRFONT prfnt) +{ + PPDEVOBJ ppdev = (PPDEVOBJ)prfnt->hdevProducer; + PLDEVOBJ pldev = ppdev->pldev; + ULONG ulResult; + + /* Preinitialize some fields */ + RtlZeroMemory(&prfnt->fddm, sizeof(FD_DEVICEMETRICS)); + prfnt->fddm.lNonLinearExtLeading = 0x80000000; + prfnt->fddm.lNonLinearIntLeading = 0x80000000; + prfnt->fddm.lNonLinearMaxCharWidth = 0x80000000; + prfnt->fddm.lNonLinearAvgCharWidth = 0x80000000; + prfnt->fddm.fdxQuantized = prfnt->fdx; + + /* Call the fontdriver */ + ulResult = pldev->pfn.QueryFontData(prfnt->ppff->dhpdev, + &prfnt->fobj, + QFD_MAXEXTENTS, + -1, + NULL, + &prfnt->fddm, + sizeof(FD_DEVICEMETRICS)); + + /* Calculate max extents (This seems to be what Windows does) */ + prfnt->fxMaxExtent = max(prfnt->fddm.fxMaxAscender, 0) + + max(prfnt->fddm.fxMaxDescender, 0); + + return (ulResult != FD_ERROR); +}

12 years, 9 months

[khornicek] 56007: [WIN32K] Take the "unsignedness" of the index into account.

by khornicek＠svn.reactos.org

Author: khornicek Date: Sun Mar 4 19:20:25 2012 New Revision: 56007 URL: http://svn.reactos.org/svn/reactos?rev=56007&view=rev Log: [WIN32K] Take the "unsignedness" of the index into account. Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c Modified: trunk/reactos/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/path.c [iso-8859-1] Sun Mar 4 19:20:25 2012 @@ -760,8 +760,11 @@ lastmove.x = orig_pos.x = pdcattr->ptlCurrent.x; lastmove.y = orig_pos.y = pdcattr->ptlCurrent.y; - for (i = pPath->numEntriesUsed - 1; i >= 0; i--) - { + i = pPath->numEntriesUsed; + + while (i != 0) + { + i--; if (pPath->pFlags[i] == PT_MOVETO) { lastmove.x = pPath->pPoints[i].x;

12 years, 9 months

[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

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); +

12 years, 9 months

[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

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? */

12 years, 9 months

[tkreuzer] 56004: [WIN32K] - Fix reference leaks in EngAssociateSurface and EngModifySurface

by tkreuzer＠svn.reactos.org

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);

12 years, 9 months

[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

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 */

12 years, 9 months

[pschweitzer] 56002: [RAMDISK] Implement RamdiskSetPartitionInfo and make use of it Also use RamdiskGetPartitionInfo in RamdiskWorkerThread

by pschweitzer＠svn.reactos.org

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:

12 years, 9 months

[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

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))

12 years, 9 months

[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

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 //

12 years, 9 months

← Newer
1
...
26
27
28
29
30
31
32
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2012