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

Bug 441473. Fix VC 7.1 bustage. r=jdaggett, sr=roc

Browse Source
This commit is contained in:
John Daggett 2008-10-15 18:21:17 +09:00
parent 49b89b615f
commit 9e90b4cf1c
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gfx/thebes/src/gfxWindowsPlatform.cpp
View File

@ -56,7 +56,6 @@
#include "gfxUserFontSet.h" #include "gfxUserFontSet.h"
#include <string> #include <string>
#include <time.h>
#include "lcms.h" #include "lcms.h"
@ -639,11 +638,10 @@ static void MakeUniqueFontName(PRUnichar aName[LF_FACESIZE])
{ {
static PRUint32 fontCount = 0; static PRUint32 fontCount = 0;
++fontCount; ++fontCount;
PRUint32 time = (PRUint32) _time32(nsnull);
char buf[LF_FACESIZE]; char buf[LF_FACESIZE];
sprintf(buf, "mozfont%8.8x%8.8x", time, fontCount); // slightly retarded, figure something better later... sprintf(buf, "mozfont%8.8x%8.8x", ::GetTickCount(), fontCount); // slightly retarded, figure something better later...
nsCAutoString fontName(buf); nsCAutoString fontName(buf);
@ -671,17 +669,17 @@ typedef struct
LONG WINAPI TTLoadEmbeddedFont LONG WINAPI TTLoadEmbeddedFont
( (
__out HANDLE* phFontReference, // on completion, contains handle to identify embedded font installed HANDLE* phFontReference, // on completion, contains handle to identify embedded font installed
// on system // on system
__in ULONG ulFlags, // flags specifying the request ULONG ulFlags, // flags specifying the request
__out ULONG* pulPrivStatus, // on completion, contains the embedding status ULONG* pulPrivStatus, // on completion, contains the embedding status
__in ULONG ulPrivs, // allows for the reduction of licensing privileges ULONG ulPrivs, // allows for the reduction of licensing privileges
__out ULONG* pulStatus, // on completion, may contain status flags for request ULONG* pulStatus, // on completion, may contain status flags for request
__in READEMBEDPROC lpfnReadFromStream, // callback function for doc/disk reads READEMBEDPROC lpfnReadFromStream, // callback function for doc/disk reads
__in LPVOID lpvReadStream, // the input stream tokin LPVOID lpvReadStream, // the input stream tokin
__in_opt LPWSTR szWinFamilyName, // the new 16 bit windows family name can be NULL LPWSTR szWinFamilyName, // the new 16 bit windows family name can be NULL
__in_opt LPSTR szMacFamilyName, // the new 8 bit mac family name can be NULL LPSTR szMacFamilyName, // the new 8 bit mac family name can be NULL
__in_opt TTLOADINFO* pTTLoadInfo // optional security TTLOADINFO* pTTLoadInfo // optional security
); );
#endif // __t2embapi__ #endif // __t2embapi__