[Silgraphite-cvs] silgraphite/include GrCommon.h,NONE,1.1 GrConstants.h,NONE,1.1 GrDebug.h,NONE,1.1 GrMstypes.h,NONE,1.1 GrPlatform.h,NONE,1.1 GrClient.h,1.1.1.1,1.2 GrData.h,1.4,1.5 IGrGraphics.h,1.3,1.4 LinkedList.h,1.1.1.1,1.2 Makefile.am,1.1,1.2 Throwable.h,1.4,1.5 UtilVector.h,1.1,1.2 common.h,1.5,NONE constants.h,1.2,NONE debug.h,1.4,NONE mstypes.h,1.3,NONE platform.h,1.7,NONE

[<sil...@li...>]

Update of /cvsroot/silgraphite/silgraphite/include
In directory sc8-pr-cvs1:/tmp/cvs-serv31411

Modified Files:
	GrClient.h GrData.h IGrGraphics.h LinkedList.h Makefile.am 
	Throwable.h UtilVector.h 
Added Files:
	GrCommon.h GrConstants.h GrDebug.h GrMstypes.h GrPlatform.h 
Removed Files:
	common.h constants.h debug.h mstypes.h platform.h 
Log Message:

rename some include files to look less common - the include dir part


--- NEW FILE: GrCommon.h ---
/*--------------------------------------------------------------------*//*:Ignore this sentence.
Copyright (C) 1999, 2001 SIL International. All rights reserved.

Distributable under the terms of either the Common Public License or the
GNU Lesser General Public License, as specified in the LICENSING.txt file.

File: Common.h
Responsibility: Shon Katzenberger
Last reviewed:

	Common generic header file.

	This header file checks for the following compile time switches:

		USING_MFC
----------------------------------------------------------------------------------------------*/
#ifdef _MSC_VER
#pragma once
#endif
#ifndef Common_H
#define Common_H 1

#include "platform.h"

/***********************************************************************************************
	Set the ENTER_DLL macro appropriately. This should be called at all potential DLL
	entry points including COM methods.
***********************************************************************************************/
//#ifndef ENTER_DLL
//	#ifdef USING_MFC
//		#define ENTER_DLL() AFX_MANAGE_STATE(AfxGetStaticModuleState())
//	#else
//		#define ENTER_DLL()
//	#endif // USING_MFC
//#endif // !ENTER_DLL

/***********************************************************************************************
	Windows / Framework headers.
***********************************************************************************************/
//#define STRICT 1

//#define WINVER 0x0501
//#undef _WIN32_WINNT
//#define _WIN32_WINNT WINVER
#ifdef _WIN32
#include <windows.h>
#endif
//#include <shlwapi.h>
//#include <commctrl.h>
//#include <ole2.h>

// This keeps all the MIDL generated header files from including windows.h and ole2.h.
//#define COM_NO_WINDOWS_H


/***********************************************************************************************
	Standard Headers.
***********************************************************************************************/
#include <malloc.h>
#include <stdio.h>
#include <stdarg.h>
//#include <sys\timeb.h>
//#include <time.h>
//#include <math.h>
#include <limits.h>
#include <tchar.h>

//#include <crtdbg.h>

//#include <exception>
#include <new>
//inline void *__cdecl operator new(size_t, void *_P)
//	{return (_P); }


// These are needed for the Task Scheduler section of FwExplorer.
//#include <mstask.h>
//#include <initguid.h>

// #include <Usp10.h> // For Uniscribe (currently only in Language DLL).

// Used for stack dumping and the like.

// imagehlp.h must be compiled with packing to eight-byte-boundaries,
// but does nothing to enforce that.
//#pragma pack( push, before_imagehlp, 8 )
//#include <imagehlp.h>
//#include <Tlhelp32.h>
//#pragma pack( pop, before_imagehlp )


/***********************************************************************************************
	Debug related definitions.
***********************************************************************************************/
#include "debug.h"

/***********************************************************************************************
	Turn off the goofy warnings.
***********************************************************************************************/
#pragma warning(disable: 4065) // Switch statement contains default but no case.
#pragma warning(disable: 4097) // typedef-name 'xxx' used as synonym for class-name 'yyy'.
#pragma warning(disable: 4100) // unreferenced formal parameter.
#pragma warning(disable: 4192) // automatically excluding while importing.
#pragma warning(disable: 4201) // nonstandard extension used : nameless struct/union.
#pragma warning(disable: 4290) // exception specification ignored.
#pragma warning(disable: 4310) // cast truncates constant value.
#pragma warning(disable: 4355) // 'this' used in base member initializer list.
#pragma warning(disable: 4505) // unreferenced local function has been removed.
#pragma warning(disable: 4510) // default constructor could not be generated - caused by
	// applying ComSmartPtr to a non-interface class.
#pragma warning(disable: 4511) // copy constructor could not be generated.
#pragma warning(disable: 4512) // assignment operator could not be generated.
#pragma warning(disable: 4610) // class 'xxx' can never be instantiated - user defined
	// constructor required - caused by applying ComSmartPtr to a non-interface class.
#pragma warning(disable: 4660) // template-class specialization is already instantiated.
#pragma warning(disable: 4701) // local variable 'xxx' may be used without being initialized.
	// We would like to keep this warning (4701) enabled but the compiler applies it in
	// places that are obviously OK.
#pragma warning(disable: 4702) // unreachable code. We would like to keep this warning (4702)
	// enabled but the compiler applies it in places that are obviously OK.
#pragma warning(disable: 4710) // not inlined.
#pragma warning(disable: 4786) // identifier truncated in debug info.
#pragma warning(disable: 4800) // forcing value to bool 'true' or 'false' (performance warning).


/***********************************************************************************************
	Simple types.
***********************************************************************************************/
typedef wchar_t wchar;
typedef char schar;
typedef unsigned char uchar;
typedef unsigned char byte;
typedef unsigned short ushort;
typedef unsigned int uint;
typedef unsigned long ulong;
typedef unsigned short UOLECHAR;
typedef __int64 int64; // Hungarian: lln
typedef unsigned __int64 uint64; // Hungarian llu


// TODO ShonK: Make generic use these where appropriate.
#ifdef UNICODE
typedef wchar achar;
#else // !UNICODE
typedef schar achar;
#endif // UNICODE

typedef achar * Psz;
typedef const achar * Pcsz;


/*************************************************************************************
	Offsets and addresses. AddrOf is useful for taking the address of an object
	that overloads the & operator.
*************************************************************************************/
#ifdef _WIN32
#undef offsetof
#define offsetof(cls,fld) ((int)&((cls *)0)->fld)
#endif

#define addrsafe_offsetof(cls,fld) reinterpret_cast<int>(AddrOf(((cls *)0)->fld))

#ifndef NO_ASM
template<typename T> inline T * AddrOf(T & x)
{
	T * pt;
	__asm
	{
		mov eax,x
		mov pt,eax
	}
	return pt;
}
#endif


// This is to make a signed isizeof operator, otherwise we get tons of warnings about
// signed / unsigned mismatches.
#define isizeof(T) ((int)sizeof(T))

#define SizeOfArray(rgt) (isizeof(rgt) / isizeof(rgt[0]))


/***********************************************************************************************
	Tests for valid strings and pointers.
***********************************************************************************************/
inline bool ValidPsz(const wchar *pszw)
{
	// TODO ShonK: Determine if IsBadStringPtrW is implemented on Win9x.
	return pszw != NULL && !::GrIsBadStringPtrW(pszw, 0x10000000);
}

inline bool ValidPsz(const schar *pszs)
{
	return pszs != NULL && !::GrIsBadStringPtrA(pszs, 0x10000000);
}

template<typename T> inline bool ValidReadPtr(T *pt)
{
	return pt != NULL && !::GrIsBadReadPtr(pt, isizeof(T));
}

template<typename T> inline bool ValidWritePtr(T *pt)
{
	return pt != NULL && !::GrIsBadWritePtr(pt, isizeof(T));
}

inline bool ValidReadPtrSize(const void *pv, int cb)
{
	if (cb < 0)
		return false;
	if (cb == 0)
		return true;
	return pv != NULL && !::GrIsBadReadPtr(pv, cb);
}

inline bool ValidWritePtrSize(void *pv, int cb)
{
//	if (!bstr || ::IsBadReadPtr((byte *)bstr - isizeof(int), isizeof(int) + isizeof(OLECHAR)))
//		return false;
//	int cb = ((int *)bstr)[-1];
//	if (::IsBadReadPtr((byte *)bstr - isizeof(int), isizeof(int) + isizeof(OLECHAR) + cb))
//		return false;
	if (cb < 0)
		return false;
	if (cb == 0)
		return true;
	return pv != NULL && !::GrIsBadWritePtr(pv, cb);
}

/*************************************************************************************
	Cast "operators".
*************************************************************************************/
template<typename T> inline T * GetPtr(void *pv, int ib)
{
	return reinterpret_cast<T *>((byte *)pv + ib);
}


//:>********************************************************************************************
//:> Magic encodings.
//:>********************************************************************************************
// These are magic encoding numbers that are not legal encodings, but are used to signal
// the application to get the appropriate encoding from the application. For example,
// a language project has a list of one or more analysis encodings. kencAnal would
// tell the program to use the first encoding in this list.
//enum
//{
//	kencAnal = 0xffffffff, // The first analysis encoding.
//	kencVern = 0xfffffffe, // The first vernacular encoding.
//	kencAnals = 0xfffffffd, // All analysis encodings.
//	kencVerns = 0xfffffffc // All vernacular encodings.
//};

/*************************************************************************************
	Utility headers.
*************************************************************************************/
#include "UtilRect.h"
#include "GenericResource.h"
#include "UtilString.h"
//#include "Throwable.h"
#include "UtilMem.h"
#include "LinkedList.h"
#include "BinTree.h"
#include "UtilVector.h"
#include "UtilRegistry.h"

#undef offsetof
//#define offsetof(cls,fld) ((int)&((cls *)0)->fld)

#endif // !Common_H


--- NEW FILE: GrConstants.h ---
/*--------------------------------------------------------------------*//*:Ignore this sentence.
Copyright (C) 1999, 2001 SIL International. All rights reserved.

Distributable under the terms of either the Common Public License or the
GNU Lesser General Public License, as specified in the LICENSING.txt file.

File: constants.h
Responsibility: Sharon Correll
Last reviewed: Not yet.

Description:
	Various global constants.
----------------------------------------------------------------------------------------------*/
#ifdef _MSC_VER
#pragma once
#endif
#ifndef CONSTANTS_INCLUDED
#define CONSTANTS_INCLUDED

//:End Ignore


enum {

	kMaxFeatures				= 64,
//	kMaxComponentsPerGlyph		= 8,
	kFieldsPerComponent			= 4,
	kMaxSlotsPerRule			= 64,
	kMaxSubTablesInFont			= 256,
//	kMaxUserDefinableSlotAttrs	= 16,

};

//	Maxima permitted by the binary format of the TrueType tables.
enum {

	kMaxSubTables			= 256,
	kMaxRenderingBehavior	= 65536,	// ie, the maximum value allowed for an ID
	kMaxGlyphAttrs			= 65536,	// Gloc table
	kMinGlyphAttrValue		=-32768,
	kMaxGlyphAttrValue		= 32768,
	kMaxPasses				= 128,		// Sil_sub table allows 256
	kMaxPseudos				= 65536,
	kMaxRendBehaviors		= 256,
	kMaxReplcmtClasses		= 256,		// Class map
	kMaxComponents			= 16383,

};


enum {

	kPosInfinity	= 0x3FFFFFF,
	kNegInfinity	= kPosInfinity * -1,

	kInvalid		= kNegInfinity

};


enum {
	kGpointZero = -2
};


//	 for stream processing
enum {
	kBacktrack = -2,
	kNextPass = -1,
};


typedef enum DirCode {  // Hungarian: dirc

	kdircUnknown	= -1,
	kdircNeutral	=  0,	// other neutrals (default) - ON
	kdircL			=  1,	// left-to-right, strong - L
	kdircR			=  2,	// right-to-left, strong - R
	kdircRArab		=  3,	// Arabic letter, right-to-left, strong, AR
	kdircEuroNum	=  4,	// European number, left-to-right, weak - EN
	kdircEuroSep	=  5,	// European separator, left-to-right, weak - ES
	kdircEuroTerm	=  6,	// European number terminator, left-to-right, weak - ET
	kdircArabNum	=  7,	// Arabic number, left-to-right, weak - AN
	kdircComSep		=  8,	// Common number separator, left-to-right, weak - CS
	kdircWhiteSpace	=  9,	// white space, neutral - WS
	kdircBndNeutral = 10,	// boundary neutral - BN

	//	I think we need this too:
	kdircNSM		= 16,	// non-space mark

	//	Special values for internal use:
	kdircLlb		= 32,	// left-to-right line-break
	kdircRlb		= 33	// right-to-left line-break

} DirCode;


bool StrongDir(DirCode dirc);
bool WeakDir(DirCode dirc);
bool NeutralDir(DirCode dirc);
bool RightToLeftDir(DirCode dirc);


//	Unicode characters with special meanings in the bidi algorithm
enum BidiCodes {

	kchwLRE = 0x202A,			// left-to-right embedding
	kchwRLE = 0x202B,			// right-to-left embedding
	kchwPDF = 0x202C,			// pop directional format
	kchwLRO = 0x202D,			// left-to-right override
	kchwRLO = 0x202E,			// right-to-left override
	kchwLRM = 0x200E,			// left-to-right mark
	kchwRLM = 0x200F,			// right-to-left mark

};


typedef enum SlotAttrName {
	kslatAdvX = 0,		kslatAdvY,
	kslatAttTo,
	kslatAttAtX,		kslatAttAtY,		kslatAttAtGpt,
	kslatAttAtXoff,		kslatAttAtYoff,
	kslatAttWithX,		kslatAttWithY,		kslatAttWithGpt,
	kslatAttWithXoff,	kslatAttWithYoff,
	kslatAttLevel,
	kslatBreak,
	kslatCompRef,
	kslatDir,
	kslatInsert,
	kslatPosX,			kslatPosY,
	kslatShiftX,		kslatShiftY,
	kslatUserDefn,

	kslatMax,

	kslatNoEffect = kslatMax + 1	// for internal use
} SlotAttrName;


typedef enum GlyphMetric {
	kgmetLsb = 0,		kgmetRsb,
	kgmetBbTop,			kgmetBbBottom,		kgmetBbLeft,		kgmetBbRight,
	kgmetBbHeight,		kgmetBbWidth,
	kgmetAdvWidth,		kgmetAdvHeight,
	kgmetAscent,		kgmetDescent,
} GlyphMetric;

#endif // CONSTANTS_INCLUDED

--- NEW FILE: GrDebug.h ---
/*--------------------------------------------------------------------*//*:Ignore this sentence.
Copyright (C) 1999, 2001 SIL International. All rights reserved.

Distributable under the terms of either the Common Public License or the
GNU Lesser General Public License, as specified in the LICENSING.txt file.

File: debug.h
Responsibility: 
Last reviewed: 

Description:
	Assert and debug definitions.
----------------------------------------------------------------------------------------------*/

#ifndef __DEBUG_H__
#define __DEBUG_H__

#ifdef _DEBUG
	#undef DEBUG
	#define DEBUG 1
	#undef NDEBUG
	#define DEFINE_THIS_FILE static char THIS_FILE[] = __FILE__;
	#undef THIS_FILE
	#define THIS_FILE __FILE__
	
#else  //!_DEBUG
	#undef DEBUG
	#undef NDEBUG
	#define NDEBUG 1
	#define DEFINE_THIS_FILE
	
	//#define Debug(foo)
#endif //!_DEBUG

#if 0
//#ifdef DEBUG

//#include <windows.h>

	typedef void (WINAPI * Pfn_Assert)(const char * pszExp, const char * pszFile, int nLine,
		HMODULE hmod);
	typedef Pfn_Assert Pfn_Warn;

	/*__declspec(dllimport)*/ void WINAPI WarnProc(const char * pszExp, const char * pszFile,
		int nLine, bool fCritical, HMODULE hmod);
	/*__declspec(dllimport)*/ void WINAPI AssertProc(const char * pszExp, const char * pszFile,
		int nLine, bool fCritical, HMODULE hmod);

	__declspec(dllimport) Pfn_Assert WINAPI SetAssertProc(Pfn_Assert pfnAssert);
	__declspec(dllimport) Pfn_Warn WINAPI SetWarnProc(Pfn_Warn pfnWarn);
	__declspec(dllimport) int WINAPI HideWarnings(bool f);
	__declspec(dllimport) int WINAPI HideAsserts(bool f);
	__declspec(dllimport) int WINAPI HideErrors(bool f);

	void WINAPI WarnHrProc(HRESULT hr, const char * pszFile, int nLine, bool fCritical);
	void WINAPI WarnProcLocal(const char * pszExp, const char * pszFile, int nLine,
		bool fCritical);
	void WINAPI AssertProcLocal(const char * pszExp, const char * pszFile, int nLine,
		bool fCritical);

	#undef assert
	#define Assert(exp) ((exp) || (AssertProcLocal(#exp, THIS_FILE, __LINE__, false), 0))
	#define AssertC(exp) ((exp) || (AssertProcLocal(#exp, THIS_FILE, __LINE__, true), 0))
	#define AssertMsg(exp, msg) ((exp) || (AssertProcLocal(msg, THIS_FILE, __LINE__, false), 0))
	#define AssertMsgC(exp, msg) ((exp) || (AssertProcLocal(msg, THIS_FILE, __LINE__, true), 0))

	#undef Warn
	#define Warn(psz) (void)(WarnProcLocal(psz, THIS_FILE, __LINE__, false))
	#define WarnC(psz) (void)(WarnProcLocal(psz, THIS_FILE, __LINE__, true))

	#undef WarnIf
	#define WarnIf(exp) (void)(!(exp) || (WarnProcLocal("(" #exp ") is true", THIS_FILE, \
		__LINE__, false), 0))
	#define WarnIfC(exp) (void)(!(exp) || (WarnProcLocal("(" #exp ") is true", THIS_FILE, \
		__LINE__, true), 0))

	#undef WarnUnless
	#define WarnUnless(exp) (void)((exp) || (WarnProcLocal("(" #exp ") is false", \
		THIS_FILE, __LINE__, false), 0))
	#define WarnUnlessC(exp) (void)((exp) || (WarnProcLocal("(" #exp ") is false", \
		THIS_FILE, __LINE__, true), 0))

	#undef WarnHr
	#define WarnHr(hr) ((SUCCEEDED(hr) || (WarnHrProc(hr, THIS_FILE, __LINE__, false), 0)), \
		(hr))
	#define WarnHrC(hr) ((SUCCEEDED(hr) || (WarnHrProc(hr, THIS_FILE, __LINE__, true), 0)), \
		(hr))

	class IgnoreWarnings
	{
	public:
		IgnoreWarnings()
			{ HideWarnings(true); }
		~IgnoreWarnings()
			{ HideWarnings(false); }
	};

	class IgnoreAsserts
	{
	public:
		IgnoreAsserts()
			{ HideAsserts(true); }
		~IgnoreAsserts()
			{ HideAsserts(false); }
	};

	class IgnoreErrors
	{
	private:
		IgnoreWarnings iw;
		IgnoreAsserts ia;
	};

	#define Debug(exp) exp
	#define DoAssert(exp) Assert(exp)
	#define DoAssertC(exp) AssertC(exp)
	#define DoAssertHr(hr) Assert(SUCCEEDED(hr))
	#define DoAssertHrC(hr) AssertC(SUCCEEDED(hr))
#else
	#undef assert
	#define Assert(exp)
	#define AssertC(exp)
	#define AssertMsg(exp, msg)
	#define AssertMsgC(exp, msg)
	#define Warn(psz)
	#define WarnC(psz)
	#define WarnIf(exp)
	#define WarnIfC(exp)
	#define WarnUnless(exp)
	#define WarnUnlessC(exp)
	#define WarnHr(hr) (hr)
	#define WarnHrC(hr) (hr)
        #define Debug(exp)
	#define DoAssert(exp) (exp)
	#define DoAssertC(exp) (exp)
	#define DoAssertHr(hr) (hr)
	#define DoAssertHrC(hr) (hr)
#endif //DEBUG

#define AssertPtr(pv) Assert(ValidReadPtr(pv))
#define AssertPtrN(pv) Assert(!(pv) || ValidReadPtr(pv))
#define AssertArray(pv, cv) Assert((cv) >= 0 && ValidReadPtrSize((pv), isizeof(*(pv)) * (cv)))
#define AssertArrayN(pv, cv) Assert((cv) >= 0 && (!(pv) || ValidReadPtrSize((pv), isizeof(*(pv)) * (cv))))
#define AssertPtrSize(pv, cb) Assert((cb) >= 0 && ValidReadPtrSize((pv), cb))

#define AssertPfn(pfn) Assert(!IsBadCodePtr((FARPROC)(pfn)))
#define AssertPfnN(pfn) Assert(!(pfn) || !IsBadCodePtr((FARPROC)(pfn)))

#define AssertPsz(psz) Assert(ValidPsz(psz))
#define AssertPszN(psz) Assert(!(psz) || ValidPsz(psz))

#define AssertBstr(bstr) Assert(ValidBstr(bstr))
#define AssertBstrN(bstr) Assert(!(bstr) || ValidBstr(bstr))

#define AssertObj(pv) Assert(ValidReadPtr(pv) && (pv)->AssertValid())
#define AssertObjN(pv) Assert(!(pv) || ValidReadPtr(pv) && (pv)->AssertValid())

/*----------------------------------------------------------------------------------------------
	This class implements custom output to the debugger.  The results of Watch() can be 
	viewed on a line in the Watch window.  Output() writes to the Debugger Output window.
	Calls to Output() should be included in the Watch() function as needed.  Watch()
	is executed every time the debugger displays this class in the Watch window.
	To use it:

	1) Put the fillowing line in:
			\program files\Microsoft Visual Studio\Common\MSDev98\bin\AutoExp.dat
		in the [AutoExpand] section:
			DebugWatch=<WatchNV(),su>

	2) In the class from which you want custom debug output, add the equivalent of:
		#ifdef DEBUG
		class Dbw1 : public DebugWatch { virtual OLECHAR * Watch(); ... };
		Dbw1 m_dbw1;
		#endif //DEBUG

	3) Implement the Watch() function to display the data you want to see, bracketed by
	   #ifdef DEBUG / #endif.  Note that Output() is LIMITED to 10 pointer-sized arguments.  
	   If you must have more, then call _CrtDbgReport() directly.  Note also that 
	   _CrtDbgReport() is not implemented for wide characters, so neither is Output().  
----------------------------------------------------------------------------------------------*/
#if 0
//#ifdef DEBUG
class DebugWatch 
{
public:
	int m_nSerial; // increment and display this for positive affirmation of refresh
	DebugWatch() { m_nSerial = 0; }
	OLECHAR * WatchNV(); // debugger won't find it if it is virtual or inline.
	virtual OLECHAR * Watch() { return L"No DebugWatch string implemented"; }
	void Output (char *fmt, ...); // LIMITED to 10 pointer-sized arguments
};
#endif //DEBUG

#endif

--- NEW FILE: GrMstypes.h ---
#ifndef _MSTYPES_H
#define _MSTYPES_H

typedef unsigned short  WORD,       *PWORD,    *LPWORD;
typedef short           SHORT,      *PSHORT;

#define __RPC_FAR
typedef unsigned int uint;
typedef unsigned int UINT,*PUINT,*LPUINT;
typedef wchar_t WCHAR;
typedef WCHAR *PWCHAR,*LPWCH,*PWCH,*NWPSTR,*LPWSTR,*PWSTR;
typedef const WCHAR *LPCWCH,*PCWCH,*LPCWSTR,*PCWSTR;
#ifndef OLE2ANSI
typedef WCHAR OLECHAR;
typedef LPWSTR LPOLESTR;
typedef LPCWSTR LPCOLESTR;
#define OLESTR(s) L##s
#else
typedef char OLECHAR;
typedef LPSTR LPOLESTR;
typedef LPCSTR LPCOLESTR;
#define OLESTR(s) s
#endif
typedef OLECHAR *BSTR;
typedef BSTR *LPBSTR;

typedef void *HANDLE;
typedef HANDLE *PHANDLE,*LPHANDLE;

#define __int64 long long

#ifndef NOMINMAX
#ifndef max
#define max(a,b) ((a)>(b)?(a):(b))
#endif
#ifndef min
#define min(a,b) ((a)<(b)?(a):(b))
#endif
#endif

typedef long LONG;
typedef long *LPLONG;
typedef LONG HRESULT;
#define SUCCEEDED(Status) ((HRESULT)(Status) >= 0)
#define FAILED(Status) ((HRESULT)(Status)<0)
#define IS_ERROR(Status) ((unsigned long)(Status) >> 31 == SEVERITY_ERROR)

typedef unsigned long DWORD;
typedef DWORD COLORREF;

#ifdef __GNUC__
#define PACKED __attribute__((packed))
#ifndef _stdcall
#define _stdcall __attribute__((stdcall))
#endif
#ifndef __stdcall
#define __stdcall __attribute__((stdcall))
#endif
#ifndef _cdecl
#define _cdecl __attribute__((cdecl))
#endif
#ifndef __cdecl
#define __cdecl __attribute__((cdecl))
#endif
#ifndef __declspec
#define __declspec(e) __attribute__((e))
#endif
#ifndef _declspec
#define _declspec(e) __attribute__((e))
#endif
#else
#define PACKED
#define _cdecl
#define __cdecl
#endif

#define WINAPI __stdcall 
LONG WINAPI InterlockedIncrement(LPLONG);
LONG WINAPI InterlockedDecrement(LPLONG);
//int WINAPI MulDiv(int,int,int);

#define E_POINTER 0x80004003L

#define ETO_GLYPH_INDEX 0x0010		// from WinGDI.h

typedef struct
{
    WORD    fract;
    SHORT   value;
} FIXED;


#define S_OK			0
#define E_FAIL			0x80004005L
#define E_OUTOFMEMORY	0x8007000EL
#define E_UNEXPECTED	0x80000003L
#define E_INVALIDARG	0x80000002L


#endif

--- NEW FILE: GrPlatform.h ---
#ifndef _PLATFORM_H
#define _PLATFORM_H

#ifdef __GNUC__
#include "GrMstypes.h"
#define NO_ASM
#else
typedef unsigned short wchar_t;
#endif


typedef unsigned char BYTE;

#ifndef NULL
#define NULL	0
#endif

inline bool GrIsBadStringPtrW(const wchar_t *pszw, long base)
{
	return (pszw == (const wchar_t *)NULL);
}

inline bool GrIsBadStringPtrA(const char *psza, long base)
{
	return (psza == (const char *)NULL);
}

inline bool GrIsBadReadPtr(const void *lp, unsigned int ucb)
{
	return false;
}

inline bool GrIsBadWritePtr(const void *lp, unsigned int ucb)
{
	return false;
}


// Can probably remove this stuff:
//#define GRE_S_OK			0
//#define GRE_E_FAIL			0x80004005L
//#define GRE_E_OUTOFMEMORY	0x8007000EL

//#define GRE_STG_E_READFAULT	0x80000001L
//#define GRE_E_INVALIDARG	0x80000002L
//#define GRE_E_UNEXPECTED	0x80000003L
//#define GRE_E_NOTIMPL		0x80000004L

//#ifndef SUCCEEDED
//#define SUCCEEDED(Status) ((unsigned long)(Status) >= 0)
//#endif
//
// and the inverse
//
//#ifndef FAILED
//#define FAILED(Status) ((unsigned long)(Status)<0)
//#endif

int Platform_UnicodeToANSI(const wchar_t * prgchwSrc, int cchwSrc, char * prgchsDst, int cchsDst);
int Platform_AnsiToUnicode(const char * prgchsSrc, int cchsSrc, wchar_t * prgchwDst, int cchwDst);
int Platform_MulDiv(int nNumber, int nNumerator, int nDenominator);

#endif

Index: GrClient.h
===================================================================
RCS file: /cvsroot/silgraphite/silgraphite/include/GrClient.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- GrClient.h	5 Nov 2002 21:29:10 -0000	1.1.1.1
+++ GrClient.h	1 Apr 2003 08:55:03 -0000	1.2
@@ -1,6 +1,6 @@
 
-#include "common.h"
-#include "constants.h"
+#include "GrCommon.h"
+#include "GrConstants.h"
 
 typedef WCHAR OLECHAR;
 #define __RPC_FAR
@@ -18,4 +18,4 @@
 class GrSlotOutput;
 class GrCharStream;
 class GrSegment;
-class GrIStream;
\ No newline at end of file
+class GrIStream;

Index: GrData.h
===================================================================
RCS file: /cvsroot/silgraphite/silgraphite/include/GrData.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- GrData.h	12 Feb 2003 15:35:53 -0000	1.4
+++ GrData.h	1 Apr 2003 08:55:06 -0000	1.5
@@ -22,6 +22,8 @@
 #ifndef GRDATA_INCLUDED
 #define GRDATA_INCLUDED
 
+#include "GrCommon.h"
+
 /*
 //:End Ignore
  */

Index: IGrGraphics.h
===================================================================
RCS file: /cvsroot/silgraphite/silgraphite/include/IGrGraphics.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- IGrGraphics.h	2 Jan 2003 21:18:43 -0000	1.3
+++ IGrGraphics.h	1 Apr 2003 08:55:11 -0000	1.4
@@ -17,6 +17,9 @@
 #ifndef IGRGRAPHICS_INCLUDED
 #define IGRGRAPHICS_INCLUDED
 
+#include "GrResult.h"
+#include "GrData.h"
+
 /*----------------------------------------------------------------------------------------------
 Class: IGrGraphics
 ----------------------------------------------------------------------------------------------*/

Index: LinkedList.h
===================================================================
RCS file: /cvsroot/silgraphite/silgraphite/include/LinkedList.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- LinkedList.h	5 Nov 2002 21:29:10 -0000	1.1.1.1
+++ LinkedList.h	1 Apr 2003 08:55:13 -0000	1.2
@@ -15,7 +15,7 @@
 #define LINKEDLIST_H
 
 #include <stdio.h>
-#include "debug.h"
+#include "GrDebug.h"
 
 /*************************************************************************************
 	This contains a pointer to the data node.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/silgraphite/silgraphite/include/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.am	12 Nov 2002 23:05:19 -0000	1.1
+++ Makefile.am	1 Apr 2003 08:55:13 -0000	1.2
@@ -9,6 +9,8 @@
 pkginclude_HEADERS += $(grincludedir)/GrResult.h
 pkginclude_HEADERS += $(grincludedir)/GrSegment.h
 pkginclude_HEADERS += $(grincludedir)/IGrGraphics.h
+pkginclude_HEADERS += $(grincludedir)/IGrGraphicsDrawing.h
+pkginclude_HEADERS += $(grincludedir)/IGrGraphicsFont.h
 pkginclude_HEADERS += $(grincludedir)/IGrTextSource.h
 pkginclude_HEADERS += $(grincludedir)/LinkedList.h
 pkginclude_HEADERS += $(grincludedir)/Throwable.h
@@ -17,8 +19,8 @@
 pkginclude_HEADERS += $(grincludedir)/UtilRegistry.h
 pkginclude_HEADERS += $(grincludedir)/UtilString.h
 pkginclude_HEADERS += $(grincludedir)/UtilVector.h
-pkginclude_HEADERS += $(grincludedir)/common.h
-pkginclude_HEADERS += $(grincludedir)/constants.h
-pkginclude_HEADERS += $(grincludedir)/debug.h
-pkginclude_HEADERS += $(grincludedir)/mstypes.h
-pkginclude_HEADERS += $(grincludedir)/platform.h
+pkginclude_HEADERS += $(grincludedir)/GrCommon.h
+pkginclude_HEADERS += $(grincludedir)/GrConstants.h
+pkginclude_HEADERS += $(grincludedir)/GrDebug.h
+pkginclude_HEADERS += $(grincludedir)/GrMstypes.h
+pkginclude_HEADERS += $(grincludedir)/GrPlatform.h

Index: Throwable.h
===================================================================
RCS file: /cvsroot/silgraphite/silgraphite/include/Throwable.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Throwable.h	12 Nov 2002 19:36:40 -0000	1.4
+++ Throwable.h	1 Apr 2003 08:55:14 -0000	1.5
@@ -19,8 +19,8 @@
 #ifndef _WIN32
 #include <cwchar>
 #endif
-#include "common.h"
-#include "debug.h"
+#include "GrCommon.h"
+#include "GrDebug.h"
 
 /*----------------------------------------------------------------------------------------------
 	Standard class to wrap an HRESULT, HelpID, and message.

Index: UtilVector.h
===================================================================
RCS file: /cvsroot/silgraphite/silgraphite/include/UtilVector.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- UtilVector.h	11 Nov 2002 23:40:14 -0000	1.1
+++ UtilVector.h	1 Apr 2003 08:55:15 -0000	1.2
@@ -28,8 +28,8 @@
 #ifndef VECTOR_H_INCLUDED
 #define VECTOR_H_INCLUDED
 
-#include "common.h"
-#include "debug.h"
+#include "GrCommon.h"
+#include "GrDebug.h"
 
 /***********************************************************************************************
 	Element destruction.

--- common.h DELETED ---

--- constants.h DELETED ---

--- debug.h DELETED ---

--- mstypes.h DELETED ---

--- platform.h DELETED ---