Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-15 11:13:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

#52455

Browse Source 
r=pedemonte, jkobal, a=blizzard
Woohoo! We found the random memory overwrite that was breaking fonts.
This commit is contained in:
mkaply%us.ibm.com 2000-10-05 22:10:23 +00:00
parent 4af35f0767
commit b0545d3ff8
2 changed files with 19 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
gfx/src/os2/nsFontMetricsOS2.cpp
View File

@ -954,8 +954,8 @@ nsFontMetricsOS2::InitializeGlobalFonts(HPS aPS)
lRemFonts = GpiQueryFonts(aPS, QF_PUBLIC, NULL, &lNumFonts, sizeof(FONTMETRICS), pFontMetrics);
for (int i=0; i < lNumFonts; i++) {
BOOL fAlreadyFound = FALSE;
for (int j = 0; j < nsFontMetricsOS2::gGlobalFontsCount && !fAlreadyFound; j++) {
if (!strcmp(nsFontMetricsOS2::gGlobalFonts[j].fontMetrics.szFamilyname,
for (int j = 0; j < gGlobalFontsCount && !fAlreadyFound; j++) {
if (!strcmp(gGlobalFonts[j].fontMetrics.szFamilyname,
pFontMetrics[i].szFamilyname)) {
fAlreadyFound = TRUE;
}
@ -978,14 +978,14 @@ nsFontMetricsOS2::InitializeGlobalFonts(HPS aPS)
#ifdef OLDCODE
for (int j = 0; j < nsFontMetricsOS2::gGlobalFontsCount; j++) {
if (!strcmp(nsFontMetricsOS2::gGlobalFonts[i].logFont.szFamilyname,
if (!strcmp(gGlobalFonts[i].logFont.szFamilyname,
logFont->lfFaceName)) {
//work-around for Win95/98 problem
int charSetSigBit = charSetToBit[gCharSetToIndex[logFont->lfCharSet]];
if (charSetSigBit >= 0) {
DWORD charsetSigAdd = 1 << charSetSigBit;
nsFontMetricsOS2::gGlobalFonts[i].signature.fsCsb[0] |= charsetSigAdd;
gGlobalFonts[i].signature.fsCsb[0] |= charsetSigAdd;
}
return 1;
@ -995,33 +995,33 @@ nsFontMetricsOS2::InitializeGlobalFonts(HPS aPS)
// XXX make this smarter: don't add font to list if we already have a font
// with the same font signature -- erik
if (nsFontMetricsOS2::gGlobalFontsCount == gGlobalFontsAlloc) {
if (gGlobalFontsCount == gGlobalFontsAlloc) {
int newSize = 2 * (gGlobalFontsAlloc ? gGlobalFontsAlloc : 1);
nsGlobalFont* newPointer = (nsGlobalFont*)
PR_Realloc(nsFontMetricsOS2::gGlobalFonts, newSize*sizeof(nsGlobalFont));
PR_Realloc(gGlobalFonts, newSize*sizeof(nsGlobalFont));
if (newPointer) {
nsFontMetricsOS2::gGlobalFonts = newPointer;
gGlobalFonts = newPointer;
gGlobalFontsAlloc = newSize;
}
}
nsGlobalFont* font = &nsFontMetricsOS2::gGlobalFonts[nsFontMetricsOS2::gGlobalFontsCount];
nsFontMetricsOS2::gGlobalFontsCount++;
nsGlobalFont* font = &gGlobalFonts[gGlobalFontsCount];
gGlobalFontsCount++;
// PRUnichar name[FACESIZE*2];
// name[0] = 0;
// strcpy(name, pFontMetrics[i].szFamilyname);
font->name = new nsString();
font->name->AssignWithConversion(pFontMetrics[i].szFamilyname);
if (!font->name) {
nsFontMetricsOS2::gGlobalFontsCount--;
gGlobalFontsCount--;
continue;
}
font->name->AssignWithConversion(pFontMetrics[i].szFamilyname);
font->map = nsnull;
font->fontMetrics = pFontMetrics[i];
font->skip = 0;
nsFontMetricsOS2::gGlobalFonts[i].signature = pFontMetrics[i].fsDefn;
gGlobalFonts[gGlobalFontsCount].signature = pFontMetrics[i].fsDefn;
} /* endwhile */
gInitializedGlobalFonts = 1;
nsMemory::Free(pFontMetrics);
@ -1073,32 +1073,6 @@ CompareFontNames(const void* aArg1, const void* aArg2, void* aClosure)
NS_IMETHODIMP
nsFontEnumeratorOS2::EnumerateAllFonts(PRUint32* aCount, PRUnichar*** aResult)
{
#ifndef XP_OS2
*aCount = 18;
PRUnichar** newarray = (PRUnichar**)
nsMemory::Alloc(18 * sizeof(PRUnichar*));
newarray[0] = nsString(NS_ConvertASCIItoUCS2("Tms Rmn")).ToNewUnicode();
newarray[1] = nsString(NS_ConvertASCIItoUCS2("Tms Rmn")).ToNewUnicode();
newarray[2] = nsString(NS_ConvertASCIItoUCS2("Tms Rmn")).ToNewUnicode();
newarray[3] = nsString(NS_ConvertASCIItoUCS2("Tms Rmn")).ToNewUnicode();
newarray[4] = nsString(NS_ConvertASCIItoUCS2("Tms Rmn")).ToNewUnicode();
newarray[5] = nsString(NS_ConvertASCIItoUCS2("Tms Rmn")).ToNewUnicode();
newarray[6] = nsString(NS_ConvertASCIItoUCS2("Tms Rmn")).ToNewUnicode();
newarray[7] = nsString(NS_ConvertASCIItoUCS2("Tms Rmn")).ToNewUnicode();
newarray[8] = nsString(NS_ConvertASCIItoUCS2("Tms Rmn")).ToNewUnicode();
newarray[9] = nsString(NS_ConvertASCIItoUCS2("Tms Rmn")).ToNewUnicode();
newarray[10] = nsString(NS_ConvertASCIItoUCS2("Tms Rmn")).ToNewUnicode();
newarray[11] = nsString(NS_ConvertASCIItoUCS2("Tms Rmn")).ToNewUnicode();
newarray[12] = nsString(NS_ConvertASCIItoUCS2("Tms Rmn")).ToNewUnicode();
newarray[13] = nsString(NS_ConvertASCIItoUCS2("Tms Rmn")).ToNewUnicode();
newarray[14] = nsString(NS_ConvertASCIItoUCS2("Tms Rmn")).ToNewUnicode();
newarray[15] = nsString(NS_ConvertASCIItoUCS2("Tms Rmn")).ToNewUnicode();
newarray[16] = nsString(NS_ConvertASCIItoUCS2("Tms Rmn")).ToNewUnicode();
newarray[17] = nsString(NS_ConvertASCIItoUCS2("Tms Rmn")).ToNewUnicode();
*aResult = newarray;
return NS_OK;
#endif
if (aCount) {
*aCount = 0;
}
@ -1232,33 +1206,6 @@ NS_IMETHODIMP
nsFontEnumeratorOS2::EnumerateFonts(const char* aLangGroup,
const char* aGeneric, PRUint32* aCount, PRUnichar*** aResult)
{
#ifndef XP_OS2
*aCount = 18;
PRUnichar** newarray = (PRUnichar**)
nsMemory::Alloc(18 * sizeof(PRUnichar*));
newarray[0] = nsString(NS_ConvertASCIItoUCS2("Tms Rmn")).ToNewUnicode();
newarray[1] = nsString(NS_ConvertASCIItoUCS2("Tms Rmn")).ToNewUnicode();
newarray[2] = nsString(NS_ConvertASCIItoUCS2("Tms Rmn")).ToNewUnicode();
newarray[3] = nsString(NS_ConvertASCIItoUCS2("Tms Rmn")).ToNewUnicode();
newarray[4] = nsString(NS_ConvertASCIItoUCS2("Tms Rmn")).ToNewUnicode();
newarray[5] = nsString(NS_ConvertASCIItoUCS2("Tms Rmn")).ToNewUnicode();
newarray[6] = nsString(NS_ConvertASCIItoUCS2("Tms Rmn")).ToNewUnicode();
newarray[7] = nsString(NS_ConvertASCIItoUCS2("Tms Rmn")).ToNewUnicode();
newarray[8] = nsString(NS_ConvertASCIItoUCS2("Tms Rmn")).ToNewUnicode();
newarray[9] = nsString(NS_ConvertASCIItoUCS2("Tms Rmn")).ToNewUnicode();
newarray[10] = nsString(NS_ConvertASCIItoUCS2("Tms Rmn")).ToNewUnicode();
newarray[11] = nsString(NS_ConvertASCIItoUCS2("Tms Rmn")).ToNewUnicode();
newarray[12] = nsString(NS_ConvertASCIItoUCS2("Tms Rmn")).ToNewUnicode();
newarray[13] = nsString(NS_ConvertASCIItoUCS2("Tms Rmn")).ToNewUnicode();
newarray[14] = nsString(NS_ConvertASCIItoUCS2("Tms Rmn")).ToNewUnicode();
newarray[15] = nsString(NS_ConvertASCIItoUCS2("Tms Rmn")).ToNewUnicode();
newarray[16] = nsString(NS_ConvertASCIItoUCS2("Tms Rmn")).ToNewUnicode();
newarray[17] = nsString(NS_ConvertASCIItoUCS2("Tms Rmn")).ToNewUnicode();
*aResult = newarray;
return NS_OK;
#endif
if ((!aLangGroup) || (!aGeneric)) {
return NS_ERROR_NULL_POINTER;
}

11
gfx/src/os2/nsRenderingContextOS2.cpp
View File

@ -1267,16 +1267,17 @@ nsresult nsRenderingContextOS2::DrawString( const char *aString,
GpiMove( mSurface->mPS, &ptl);
PRUint32 lLength = aLength;
const char *aStringTemp = aString;
// GpiCharString has a max length of 512 chars at a time...
while( lLength)
{
ULONG thislen = min( lLength, 512);
GpiCharStringPos( mSurface->mPS, nsnull,
aSpacing == nsnull ? 0 : CHS_VECTOR,
thislen, (PCH)aString,
thislen, (PCH)aStringTemp,
aSpacing == nsnull ? nsnull : (PLONG) dx0);
lLength -= thislen;
aString += thislen;
aStringTemp += thislen;
dx0 += thislen;
}
@ -1357,13 +1358,15 @@ NS_IMETHODIMP nsRenderingContextOS2::GetWidth( const char* aString,
POINTL ptls[ 4];
const char* aStringTemp = aString;
while( lLength) // max data to gpi function is 512 chars.
{
ULONG thislen = min( lLength, 512);
GpiQueryTextBox( mSurface->mPS, thislen, (PCH) aString, 4, ptls);
GpiQueryTextBox( mSurface->mPS, thislen, (PCH) aStringTemp, 4, ptls);
sum += ptls[ TXTBOX_TOPRIGHT].x;
lLength -= thislen;
aString += thislen;
aStringTemp += thislen;
}
aWidth = NSToCoordRound(float(sum) * mP2T);