Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 735194 - gfxDWriteFontList.cpp fails to compile on mingw r=bas

Browse Source
This commit is contained in:
Jacek Caban 2012-04-04 11:12:11 +02:00
parent a0d2197948
commit 7741551caa
2 changed files with 27 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gfx/thebes/gfxDWriteFontList.cpp
View File

@ -321,8 +321,8 @@ gfxDWriteFontEntry::GetFontTable(PRUint32 aTableTag,
AutoDC dc;
AutoSelectFont font(dc.GetDC(), &logfont);
if (font.IsValid()) {
PRInt32 tableSize =
::GetFontData(dc.GetDC(), NS_SWAP32(aTableTag), 0, NULL, NULL);
PRUint32 tableSize =
::GetFontData(dc.GetDC(), NS_SWAP32(aTableTag), 0, NULL, 0);
if (tableSize != GDI_ERROR) {
if (aBuffer.SetLength(tableSize)) {
::GetFontData(dc.GetDC(), NS_SWAP32(aTableTag), 0,
@ -669,8 +669,6 @@ gfxDWriteFontList::MakePlatformFont(const gfxProxyFontEntry *aProxyEntry,
return nsnull;
}
DWORD numFonts = 0;
nsRefPtr<IDWriteFontFile> fontFile;
HRESULT hr;
@ -710,7 +708,6 @@ gfxDWriteFontList::MakePlatformFont(const gfxProxyFontEntry *aProxyEntry,
DWRITE_FONT_FILE_TYPE fileType;
UINT32 numFaces;
PRUint16 w = (aProxyEntry->mWeight == 0 ? 400 : aProxyEntry->mWeight);
gfxDWriteFontEntry *entry =
new gfxDWriteFontEntry(uniqueName,
fontFile,
@ -766,7 +763,7 @@ gfxDWriteFontList::InitFontList()
if (LOG_FONTINIT_ENABLED()) {
GetTimeFormat(LOCALE_INVARIANT, TIME_FORCE24HOURFORMAT,
NULL, NULL, nowTime, 256);
GetDateFormat(LOCALE_INVARIANT, NULL, NULL, NULL, nowDate, 256);
GetDateFormat(LOCALE_INVARIANT, 0, NULL, NULL, nowDate, 256);
}
upTime = (double) GetTickCount();
QueryPerformanceFrequency(&frequency);
@ -834,7 +831,7 @@ gfxDWriteFontList::DelayedInitFontList()
if (LOG_FONTINIT_ENABLED()) {
GetTimeFormat(LOCALE_INVARIANT, TIME_FORCE24HOURFORMAT,
NULL, NULL, nowTime, 256);
GetDateFormat(LOCALE_INVARIANT, NULL, NULL, NULL, nowDate, 256);
GetDateFormat(LOCALE_INVARIANT, 0, NULL, NULL, nowDate, 256);
}
upTime = (double) GetTickCount();
@ -1314,13 +1311,13 @@ static nsresult GetFamilyName(IDWriteFont *aFont, nsString& aFamilyName)
// for a given character.
IFACEMETHODIMP FontFallbackRenderer::DrawGlyphRun(
__maybenull void* clientDrawingContext,
void* clientDrawingContext,
FLOAT baselineOriginX,
FLOAT baselineOriginY,
DWRITE_MEASURING_MODE measuringMode,
__in DWRITE_GLYPH_RUN const* glyphRun,
__in DWRITE_GLYPH_RUN_DESCRIPTION const* glyphRunDescription,
__maybenull IUnknown* clientDrawingEffect
DWRITE_GLYPH_RUN const* glyphRun,
DWRITE_GLYPH_RUN_DESCRIPTION const* glyphRunDescription,
IUnknown* clientDrawingEffect
)
{
if (!mSystemFonts) {

38
gfx/thebes/gfxDWriteFontList.h
View File

@ -232,21 +232,21 @@ public:
// IDWriteTextRenderer methods
IFACEMETHOD(DrawGlyphRun)(
__maybenull void* clientDrawingContext,
void* clientDrawingContext,
FLOAT baselineOriginX,
FLOAT baselineOriginY,
DWRITE_MEASURING_MODE measuringMode,
__in DWRITE_GLYPH_RUN const* glyphRun,
__in DWRITE_GLYPH_RUN_DESCRIPTION const* glyphRunDescription,
__maybenull IUnknown* clientDrawingEffect
DWRITE_GLYPH_RUN const* glyphRun,
DWRITE_GLYPH_RUN_DESCRIPTION const* glyphRunDescription,
IUnknown* clientDrawingEffect
);
IFACEMETHOD(DrawUnderline)(
__maybenull void* clientDrawingContext,
void* clientDrawingContext,
FLOAT baselineOriginX,
FLOAT baselineOriginY,
__in DWRITE_UNDERLINE const* underline,
__maybenull IUnknown* clientDrawingEffect
DWRITE_UNDERLINE const* underline,
IUnknown* clientDrawingEffect
)
{
return E_NOTIMPL;
@ -254,11 +254,11 @@ public:
IFACEMETHOD(DrawStrikethrough)(
__maybenull void* clientDrawingContext,
void* clientDrawingContext,
FLOAT baselineOriginX,
FLOAT baselineOriginY,
__in DWRITE_STRIKETHROUGH const* strikethrough,
__maybenull IUnknown* clientDrawingEffect
DWRITE_STRIKETHROUGH const* strikethrough,
IUnknown* clientDrawingEffect
)
{
return E_NOTIMPL;
@ -266,13 +266,13 @@ public:
IFACEMETHOD(DrawInlineObject)(
__maybenull void* clientDrawingContext,
void* clientDrawingContext,
FLOAT originX,
FLOAT originY,
IDWriteInlineObject* inlineObject,
BOOL isSideways,
BOOL isRightToLeft,
__maybenull IUnknown* clientDrawingEffect
IUnknown* clientDrawingEffect
)
{
return E_NOTIMPL;
@ -281,8 +281,8 @@ public:
// IDWritePixelSnapping methods
IFACEMETHOD(IsPixelSnappingDisabled)(
__maybenull void* clientDrawingContext,
__out BOOL* isDisabled
void* clientDrawingContext,
BOOL* isDisabled
)
{
*isDisabled = FALSE;
@ -290,8 +290,8 @@ public:
}
IFACEMETHOD(GetCurrentTransform)(
__maybenull void* clientDrawingContext,
__out DWRITE_MATRIX* transform
void* clientDrawingContext,
DWRITE_MATRIX* transform
)
{
const DWRITE_MATRIX ident = {1.0, 0.0, 0.0, 1.0, 0.0, 0.0};
@ -300,8 +300,8 @@ public:
}
IFACEMETHOD(GetPixelsPerDip)(
__maybenull void* clientDrawingContext,
__out FLOAT* pixelsPerDip
void* clientDrawingContext,
FLOAT* pixelsPerDip
)
{
*pixelsPerDip = 1.0f;
@ -347,7 +347,7 @@ public:
const nsString& FallbackFamilyName() { return mFamilyName; }
protected:
unsigned long mRefCount;
long mRefCount;
nsRefPtr<IDWriteFontCollection> mSystemFonts;
nsString mFamilyName;
};