--- np2/win9x/np2.h 2005/02/07 14:46:14 1.18 +++ np2/win9x/np2.h 2007/01/08 01:16:59 1.24 @@ -1,23 +1,37 @@ +#if !defined(SUPPORT_PC9821) +#define PROJECTNAME "Neko Project II" +#else +#define PROJECTNAME "Neko Project 21" +#endif + +#if !defined(_WIN64) +#define PROJECTSUBNAME "" +#else +#define PROJECTSUBNAME " x64" +#endif + typedef struct { UINT8 port; UINT8 def_en; UINT8 param; UINT32 speed; - char mout[MAXPNAMELEN]; - char min[MAXPNAMELEN]; - char mdl[64]; - char def[MAX_PATH]; + OEMCHAR mout[MAXPNAMELEN]; + OEMCHAR min[MAXPNAMELEN]; + OEMCHAR mdl[64]; + OEMCHAR def[MAX_PATH]; } COMCFG; typedef struct { - char titles[256]; - char winid[4]; + OEMCHAR titles[256]; + OEMCHAR winid[4]; int winx; int winy; UINT paddingx; UINT paddingy; + UINT fscrn_cx; + UINT fscrn_cy; UINT8 force400; UINT8 WINSNAP; UINT8 NOWAIT; @@ -51,7 +65,9 @@ typedef struct { UINT8 resume; // ver0.30 UINT8 statsave; +#if !defined(_WIN64) UINT8 disablemmx; +#endif UINT8 wintype; UINT8 toolwin; UINT8 keydisp; @@ -61,6 +77,8 @@ typedef struct { UINT8 useromeo; UINT8 thickframe; UINT8 xrollkey; + UINT8 fscrnbpp; + UINT8 fscrnmod; } NP2OSCFG; @@ -120,14 +138,16 @@ extern NP2OSCFG np2oscfg; extern HWND hWndMain; extern HINSTANCE hInst; extern HINSTANCE hPrev; -extern int mmxflag; extern UINT8 np2break; extern BOOL winui_en; +#if !defined(_WIN64) +extern int mmxflag; +#endif -extern char modulefile[MAX_PATH]; -extern char fddfolder[MAX_PATH]; -extern char hddfolder[MAX_PATH]; -extern char bmpfilefolder[MAX_PATH]; +extern OEMCHAR modulefile[MAX_PATH]; +extern OEMCHAR fddfolder[MAX_PATH]; +extern OEMCHAR hddfolder[MAX_PATH]; +extern OEMCHAR bmpfilefolder[MAX_PATH]; void np2active_renewal(void);