--- xmil/common.h	2004/08/01 05:31:29	1.1
+++ xmil/common.h	2004/08/18 15:42:28	1.8
@@ -4,12 +4,16 @@ enum {
 	FAILURE		= 1
 };
 
+#ifndef PI
+#define PI 3.14159265357989
+#endif
+
 #ifndef BRESULT
-#define	BRESULT		UINT8
+#define	BRESULT		UINT
 #endif
 
-#ifndef PI
-#define PI 3.14159265357989
+#ifndef INTPTR
+#define	INTPTR		long
 #endif
 
 #ifndef LOADINTELDWORD
@@ -24,15 +28,15 @@ enum {
 #endif
 
 #ifndef STOREINTELDWORD
-#define	STOREINTELDWORD(a, b)	*((a)+0) = (BYTE)((b));			\
-								*((a)+1) = (BYTE)((b)>>8);		\
-								*((a)+2) = (BYTE)((b)>>16);		\
-								*((a)+3) = (BYTE)((b)>>24)
+#define	STOREINTELDWORD(a, b)	*((a)+0) = (UINT8)((b));		\
+								*((a)+1) = (UINT8)((b)>>8);		\
+								*((a)+2) = (UINT8)((b)>>16);	\
+								*((a)+3) = (UINT8)((b)>>24)
 #endif
 
 #ifndef STOREINTELWORD
-#define	STOREINTELWORD(a, b)	*((a)+0) = (BYTE)((b));			\
-								*((a)+1) = (BYTE)((b)>>8)
+#define	STOREINTELWORD(a, b)	*((a)+0) = (UINT8)((b));			\
+								*((a)+1) = (UINT8)((b)>>8)
 #endif
 
 #ifndef	NELEMENTS
@@ -49,6 +53,15 @@ enum {
 #define	REG16		UINT16
 #endif
 
+#ifndef LOW8
+#define	LOW8(a)					((UINT8)(a))
+#endif
+#ifndef LOW10
+#define	LOW10(a)				((a) & 0x03ff)
+#endif
+#ifndef LOW11
+#define	LOW11(a)				((a) & 0x07ff)
+#endif
 #ifndef LOW12
 #define	LOW12(a)				((a) & 0x0fff)
 #endif
@@ -116,25 +129,26 @@ typedef union {
 #endif
 
 
+#define	FTYPEID(a, b, c, d)	(((a) << 24) + ((b) << 16) + ((c) << 8) + (d))
+
 enum {
-	FTYPE_NONE = 0,		// ¼«Æ°È½ÊÌ or PC
-	FTYPE_SMIL,
-	FTYPE_TEXT,
-	FTYPE_BMP,
-	FTYPE_PICT,
-	FTYPE_PNG,
-	FTYPE_WAV,
-	FTYPE_OGG,
-	FTYPE_D88,
-	FTYPE_FDI,
-	FTYPE_BETA,
-	FTYPE_THD,
-	FTYPE_NHD,
-	FTYPE_HDI,
-	FTYPE_HDD,
-	FTYPE_S98,
-	FTYPE_MIMPI,
-	FTYPE_USER
+	FTYPE_NONE		= 0,
+	FTYPE_SMIL		= FTYPEID('S','M','I','L'),
+	FTYPE_TEXT		= FTYPEID('T','E','X','T'),
+	FTYPE_BMP		= FTYPEID('B','M','P',' '),
+	FTYPE_GIF		= FTYPEID('G','I','F',' '),
+	FTYPE_WAVE		= FTYPEID('W','A','V','E'),
+	FTYPE_OGG		= FTYPEID('O','G','G',' '),
+	FTYPE_MP3		= FTYPEID('M','P','3',' '),
+	FTYPE_D88		= FTYPEID('.','D','8','8'),
+	FTYPE_FDI		= FTYPEID('.','F','D','I'),
+	FTYPE_BETA		= FTYPEID('B','E','T','A'),
+	FTYPE_THD		= FTYPEID('.','T','H','D'),
+	FTYPE_NHD		= FTYPEID('.','N','H','D'),
+	FTYPE_HDI		= FTYPEID('.','H','D','I'),
+	FTYPE_HDD		= FTYPEID('.','H','D','D'),
+	FTYPE_S98		= FTYPEID('.','S','9','8'),
+	FTYPE_MIMPI		= FTYPEID('M','I','M','P')
 };
 
 
@@ -145,19 +159,3 @@ enum {
 #define	FASTCALL
 #endif
 
-
-// ---- ?
-
-typedef struct {
-	DWORD	x;
-	DWORD	y;
-	DWORD	w;
-	DWORD	h;
-} NP2RECT;
-
-
-typedef struct {
-	DWORD	x;
-	DWORD	y;
-} XYSIZE;
-