--- np2/win9x/compiler.h	2003/10/16 17:58:39	1.1.1.1
+++ np2/win9x/compiler.h	2006/12/10 12:45:47	1.31
@@ -1,49 +1,160 @@
+
+#define	_WIN32_IE	0x0200
+
 #include	<windows.h>
+#include	<tchar.h>
 #include	<stdio.h>
 #include	<stddef.h>
+#include	<setjmp.h>
+#if defined(TRACE)
+#include	<assert.h>
+#endif
 
 #define	BYTESEX_LITTLE
+#if !defined(OSLANG_UTF8)
+#if !defined(_UNICODE)
+#define	OSLANG_SJIS
+#else
+#define	OSLANG_UCS2
+#endif
+#endif
+#define	OSLINEBREAK_CRLF
 
-#if 1
-#ifndef __cplusplus
-#define	DWORD	xxx
-#define	WORD	xxx
+#ifndef __GNUC__
+typedef	signed int			SINT;
+typedef	signed char			SINT8;
+typedef	unsigned char		UINT8;
+typedef	signed short		SINT16;
+typedef	unsigned short		UINT16;
+typedef	signed int			SINT32;
+typedef	unsigned int		UINT32;
+typedef	signed __int64		SINT64;
+typedef	unsigned __int64	UINT64;
+#define	INLINE				__inline
+#define	QWORD_CONST(v)		((UINT64)(v))
+#define	SQWORD_CONST(v)		((SINT64)(v))
+#define	snprintf			_snprintf
+#define	vsnprintf			_vsnprintf
+#else
+#include	<stdlib.h>
+typedef	signed int			SINT;
+typedef	signed char			SINT8;
+typedef	unsigned char		UINT8;
+typedef	signed short		SINT16;
+typedef	unsigned short		UINT16;
+typedef	signed int			SINT32;
+typedef	signed __int64		SINT64;
+#define	INLINE				inline
 #endif
+#define	FASTCALL			__fastcall
+
+// for x86
+#define	LOADINTELDWORD(a)		(*((UINT32 *)(a)))
+#define	LOADINTELWORD(a)		(*((UINT16 *)(a)))
+#define	STOREINTELDWORD(a, b)	*(UINT32 *)(a) = (b)
+#define	STOREINTELWORD(a, b)	*(UINT16 *)(a) = (b)
+
+#define	sigjmp_buf				jmp_buf
+#define	sigsetjmp(env, mask)	setjmp(env)
+#define	siglongjmp(env, val)	longjmp(env, val)
+#define	msgbox(title, msg)		__msgbox(title, msg)
+
+#define	STRCALL		__stdcall
+
+#define	BRESULT				UINT8
+#if !defined(OSLANG_UTF8)
+#define	OEMCHAR				TCHAR
+#define	OEMTEXT(string)		_T(string)
+#define	OEMSPRINTF			wsprintf
+#define	OEMSTRLEN			lstrlen
+#else
+#define	OEMCHAR				char
+#define	OEMTEXT(string)		string
+#define	OEMSPRINTF			sprintf
+#define	OEMSTRLEN			strlen
 #endif
 
-typedef	short			SINT16;
-typedef	unsigned short	UINT16;
-typedef	int				SINT32;
-typedef	unsigned int	UINT32;
 
 #include	"common.h"
+#include	"win32sub.h"
 #include	"milstr.h"
 #include	"_memory.h"
 #include	"rect.h"
 #include	"lstarray.h"
 #include	"trace.h"
 
+
 #define	GETTICK()			GetTickCount()
-#define	GETRAND()			rand()
+#if defined(TRACE)
+#define	__ASSERT(s)			assert(s)
+#else
+#define	__ASSERT(s)
+#endif
+#if defined(_UNICODE)
+#define	SPRINTF				sprintf
+#define	STRLEN				strlen
+#else
 #define	SPRINTF				wsprintf
+#define	STRLEN				lstrlen
+#endif
 
-#define	LABEL		__declspec(naked)
-#define RELEASE(x) 	if (x) {(x)->Release(); (x) = NULL;}
+#define	LABEL				__declspec(naked)
+#define	RELEASE(x) 			if (x) {(x)->Release(); (x) = NULL;}
 
+#define	OPNGENX86
 #define	VERMOUTH_LIB
+#define	MT32SOUND_DLL
 #define	PARTSCALL	__fastcall
 #define	CPUCALL		__fastcall
 #define	MEMCALL		__fastcall
-#define DMACCALL	__fastcall
+#define	DMACCALL	__fastcall
 #define	IOOUTCALL	__fastcall
 #define	IOINPCALL	__fastcall
-#define SOUNDCALL	__fastcall
+#define	SOUNDCALL	__fastcall
 #define	VRAMCALL	__fastcall
 #define	SCRNCALL	__fastcall
 
+#if defined(OSLANG_SJIS)
+#define	SUPPORT_SJIS
+#elif defined(OSLANG_UTF8)
+#define	SUPPORT_UTF8
+#else
+#define	SUPPORT_ANK
+#endif
+
 #define	SUPPORT_8BPP
 #define	SUPPORT_16BPP
 #define	SUPPORT_24BPP
 #define	SUPPORT_32BPP
-#define SUPPORT_NORMALDISP
+#define	SUPPORT_NORMALDISP
+
+#if defined(SUPPORT_PC9821)
+#define	CPUCORE_IA32
+#define	IA32_PAGING_EACHSIZE
+#define	SUPPORT_CRT31KHZ
+#define	SUPPORT_PC9801_119
+#endif
+#define	SUPPORT_CRT15KHZ
+#define	SUPPORT_PC9861K
+#define	SUPPORT_SOFTKBD		0
+#define	SUPPORT_S98
+#define	SUPPORT_KEYDISP
+#define	SUPPORT_MEMDBG32
+#define	SUPPORT_HOSTDRV
+#define	SUPPORT_SASI
+#define	SUPPORT_SCSI
+#if defined(TRACE)
+	#define	SUPPORT_IDEIO
+#endif
+#define SUPPORT_ARC
+#define SUPPORT_ZLIB
+
+#define	SUPPORT_RESUME
+#define	SUPPORT_STATSAVE	10
+#define	SUPPORT_ROMEO
+
+#define	SOUNDRESERVE	20
+
+
+#define	SUPPORT_TEXTCNV