--- np2/statsave.c	2003/10/20 12:08:01	1.8
+++ np2/statsave.c	2003/10/25 09:08:24	1.13
@@ -12,14 +12,14 @@
 #include	"pc9861k.h"
 #include	"mpu98ii.h"
 #include	"board14.h"
+#include	"bios.h"
 #include	"vram.h"
-#include	"maketext.h"
 #include	"palettes.h"
-#include	"font.h"
+#include	"maketext.h"
 #include	"sound.h"
-#include	"bios.h"
 #include	"fmboard.h"
 #include	"beep.h"
+#include	"font.h"
 #include	"fddfile.h"
 #include	"fdd_mtr.h"
 #include	"sxsi.h"
@@ -38,7 +38,7 @@ typedef struct {
 	char	index[10];
 	UINT16	ver;
 	UINT32	size;
-} NP2FLAGPART_T;
+} NP2FENT;
 
 enum {
 	NP2FLAG_BIN			= 0,
@@ -50,7 +50,7 @@ enum {
 	NP2FLAG_EVT,
 	NP2FLAG_GIJ,
 	NP2FLAG_FM,
-	NP2FLAG_MIDI,
+	NP2FLAG_COM,
 	NP2FLAG_DISK
 };
 
@@ -72,9 +72,9 @@ typedef struct {
 	int		num;
 } ENUMTBL;
 
-#define	PROCID(a, b, c, d)	(((d) << 24) | ((c) << 16) | ((b) << 8) | (a))
-#define	PROC2NUM(a, b)		proc2num(&(a), b, sizeof(b)/sizeof(PROCTBL))
-#define	NUM2PROC(a, b)		num2proc(&(a), b, sizeof(b)/sizeof(PROCTBL))
+#define	PROCID(a, b, c, d)	(((d) << 24) + ((c) << 16) + ((b) << 8) + (a))
+#define	PROC2NUM(a, b)		proc2num(&(a), (b), sizeof(b)/sizeof(PROCTBL))
+#define	NUM2PROC(a, b)		num2proc(&(a), (b), sizeof(b)/sizeof(PROCTBL))
 
 #include "statsave.tbl"
 
@@ -138,15 +138,15 @@ static BOOL num2proc(void *func, const P
 // ----
 
 typedef struct {
-	FILEH		fh;
-	long		pos;
-	long		bak;
-	long		next;
-	NP2FHDR		f;
-	NP2FLAGPART_T	p;
-} NP2FFILE;
+	FILEH	fh;
+	long	pos;
+	long	bak;
+	long	next;
+	NP2FHDR	f;
+	NP2FENT	p;
+} _NP2FFILE, *NP2FFILE;
 
-static int flagopen(NP2FFILE *f, const char *filename, ERR_BUF *e) {
+static int flagopen(NP2FFILE f, const char *filename, ERR_BUF *e) {
 
 	if (f) {
 		f->fh = file_open(filename);
@@ -185,7 +185,7 @@ static int flagopen(NP2FFILE *f, const c
 	return(NP2FLAG_FAILURE);
 }
 
-static int flagcreate(NP2FFILE *f, const char *filename) {
+static int flagcreate(NP2FFILE f, const char *filename) {
 
 	if (f) {
 		f->fh = file_create(filename);
@@ -203,10 +203,10 @@ static int flagcreate(NP2FFILE *f, const
 	return(NP2FLAG_FAILURE);
 }
 
-static int flagload_create(NP2FFILE *f) {
+static int flagload_create(NP2FFILE f) {
 
 	if (f) {
-		ZeroMemory(&f->p, sizeof(NP2FLAGPART_T));
+		ZeroMemory(&f->p, sizeof(NP2FENT));
 		if (f->pos & 15) {
 			f->pos += 15;
 			f->pos &= ~0xf;
@@ -214,18 +214,17 @@ static int flagload_create(NP2FFILE *f) 
 				return(NP2FLAG_FAILURE);
 			}
 		}
-		if (file_read(f->fh, &f->p, sizeof(NP2FLAGPART_T))
-												!= sizeof(NP2FLAGPART_T)) {
+		if (file_read(f->fh, &f->p, sizeof(NP2FENT)) != sizeof(NP2FENT)) {
 			return(NP2FLAG_FAILURE);
 		}
-		f->pos += sizeof(NP2FLAGPART_T);
+		f->pos += sizeof(NP2FENT);
 		f->next = f->pos + f->p.size;
 		return(NP2FLAG_SUCCESS);
 	}
 	return(NP2FLAG_FAILURE);
 }
 
-static int flagload_load(NP2FFILE *f, void *buf, UINT size) {
+static int flagload_load(NP2FFILE f, void *buf, UINT size) {
 
 	if (f && buf && size && (file_read(f->fh, buf, size) == size)) {
 		f->pos += size;
@@ -234,7 +233,7 @@ static int flagload_load(NP2FFILE *f, vo
 	return(NP2FLAG_FAILURE);
 }
 
-static int flagload_close(NP2FFILE *f) {
+static int flagload_close(NP2FFILE f) {
 
 	if (file_seek(f->fh, f->next, 0) != f->next) {
 		return(NP2FLAG_FAILURE);
@@ -243,11 +242,11 @@ static int flagload_close(NP2FFILE *f) {
 	return(NP2FLAG_SUCCESS);
 }
 
-static int flagsave_create(NP2FFILE *f, const STENTRY *t) {
+static int flagsave_create(NP2FFILE f, const STENTRY *t) {
 
 	if (f && t) {
 		int		len;
-		ZeroMemory(&f->p, sizeof(NP2FLAGPART_T));
+		ZeroMemory(&f->p, sizeof(NP2FENT));
 		if (f->pos & 15) {
 			UINT rem;
 			rem = 16 - (f->pos & 15);
@@ -266,17 +265,16 @@ static int flagsave_create(NP2FFILE *f, 
 			CopyMemory(f->p.index, t->index, len);
 		}
 		f->p.ver = t->ver;
-		if (file_write(f->fh, &f->p, sizeof(NP2FLAGPART_T))
-												!= sizeof(NP2FLAGPART_T)) {
+		if (file_write(f->fh, &f->p, sizeof(NP2FENT)) != sizeof(NP2FENT)) {
 			return(NP2FLAG_FAILURE);
 		}
-		f->pos += sizeof(NP2FLAGPART_T);
+		f->pos += sizeof(NP2FENT);
 		return(NP2FLAG_SUCCESS);
 	}
 	return(NP2FLAG_FAILURE);
 }
 
-static int flagsave_save(NP2FFILE *f, void *buf, UINT size) {
+static int flagsave_save(NP2FFILE f, void *buf, UINT size) {
 
 	if (f && buf && size && (file_write(f->fh, buf, size) == size)) {
 		f->pos += size;
@@ -286,7 +284,7 @@ static int flagsave_save(NP2FFILE *f, vo
 	return(NP2FLAG_FAILURE);
 }
 
-static int flagsave_close(NP2FFILE *f) {
+static int flagsave_close(NP2FFILE f) {
 
 	if (!f) {
 		goto fs_closeerr;
@@ -294,8 +292,7 @@ static int flagsave_close(NP2FFILE *f) {
 	if (file_seek(f->fh, f->bak, 0) != f->bak) {
 		goto fs_closeerr;
 	}
-	if (file_write(f->fh, &f->p, sizeof(NP2FLAGPART_T))
-												!= sizeof(NP2FLAGPART_T)) {
+	if (file_write(f->fh, &f->p, sizeof(NP2FENT)) != sizeof(NP2FENT)) {
 		goto fs_closeerr;
 	}
 	if (file_seek(f->fh, f->pos, 0) == f->pos) {
@@ -306,7 +303,7 @@ fs_closeerr:
 	return(NP2FLAG_FAILURE);
 }
 
-static void flagclose(NP2FFILE *f) {
+static void flagclose(NP2FFILE f) {
 
 	if (f) {
 		file_close(f->fh);
@@ -316,7 +313,7 @@ static void flagclose(NP2FFILE *f) {
 
 // ----
 
-static int flagsave_term(NP2FFILE *f, const STENTRY *t) {
+static int flagsave_term(NP2FFILE f, const STENTRY *t) {
 
 	int		ret;
 
@@ -328,7 +325,7 @@ static int flagsave_term(NP2FFILE *f, co
 
 // ----
 
-static int flagsave_common(NP2FFILE *f, const STENTRY *t) {
+static int flagsave_common(NP2FFILE f, const STENTRY *t) {
 
 	int		ret;
 
@@ -340,7 +337,7 @@ static int flagsave_common(NP2FFILE *f, 
 	return(ret);
 }
 
-static int flagload_common(NP2FFILE *f, const STENTRY *t) {
+static int flagload_common(NP2FFILE f, const STENTRY *t) {
 
 	return(flagload_load(f, t->arg1, t->arg2));
 }
@@ -348,7 +345,7 @@ static int flagload_common(NP2FFILE *f, 
 
 // -----
 
-static int flagload_clock(NP2FFILE *f, const STENTRY *t) {
+static int flagload_clock(NP2FFILE f, const STENTRY *t) {
 
 	int		ret;
 
@@ -361,7 +358,7 @@ static int flagload_clock(NP2FFILE *f, c
 
 // -----
 
-static int flagsave_dma(NP2FFILE *f, const STENTRY *t) {
+static int flagsave_dma(NP2FFILE f, const STENTRY *t) {
 
 	int			ret;
 	int			i;
@@ -383,7 +380,7 @@ static int flagsave_dma(NP2FFILE *f, con
 	return(ret);
 }
 
-static int flagload_dma(NP2FFILE *f, const STENTRY *t) {
+static int flagload_dma(NP2FFILE f, const STENTRY *t) {
 
 	int		ret;
 	int		i;
@@ -411,7 +408,7 @@ static int flagload_dma(NP2FFILE *f, con
 
 // -----
 
-static int flagsave_egc(NP2FFILE *f, const STENTRY *t) {
+static int flagsave_egc(NP2FFILE f, const STENTRY *t) {
 
 	int		ret;
 	_EGC	egcbak;
@@ -428,7 +425,7 @@ static int flagsave_egc(NP2FFILE *f, con
 	return(ret);
 }
 
-static int flagload_egc(NP2FFILE *f, const STENTRY *t) {
+static int flagload_egc(NP2FFILE f, const STENTRY *t) {
 
 	int		ret;
 
@@ -442,7 +439,7 @@ static int flagload_egc(NP2FFILE *f, con
 
 // -----
 
-static int flagsave_ext(NP2FFILE *f, const STENTRY *t) {
+static int flagsave_ext(NP2FFILE f, const STENTRY *t) {
 
 	int		ret;
 
@@ -457,7 +454,7 @@ static int flagsave_ext(NP2FFILE *f, con
 	return(ret);
 }
 
-static int flagload_ext(NP2FFILE *f, const STENTRY *t) {
+static int flagload_ext(NP2FFILE f, const STENTRY *t) {
 
 	int		ret;
 	int		i;
@@ -505,7 +502,7 @@ typedef struct {
 	NEVENTCB	proc;
 } NEVTITEM;
 
-static int nevent_save(NP2FFILE *f, int num) {
+static int nevent_save(NP2FFILE f, int num) {
 
 	NEVTITEM	nit;
 	UINT		i;
@@ -526,7 +523,7 @@ static int nevent_save(NP2FFILE *f, int 
 	return(flagsave_save(f, &nit, sizeof(nit)));
 }
 
-static int flagsave_evt(NP2FFILE *f, const STENTRY *t) {
+static int flagsave_evt(NP2FFILE f, const STENTRY *t) {
 
 	NEVTSAVE	nevt;
 	int			ret;
@@ -549,7 +546,7 @@ static int flagsave_evt(NP2FFILE *f, con
 	return(ret);
 }
 
-static int nevent_load(NP2FFILE *f, UINT *tbl, UINT *pos) {
+static int nevent_load(NP2FFILE f, UINT *tbl, UINT *pos) {
 
 	int			ret;
 	NEVTITEM	nit;
@@ -582,7 +579,7 @@ static int nevent_load(NP2FFILE *f, UINT
 	return(ret);
 }
 
-static int flagload_evt(NP2FFILE *f, const STENTRY *t) {
+static int flagload_evt(NP2FFILE f, const STENTRY *t) {
 
 	int			ret;
 	NEVTSAVE	nevt;
@@ -606,7 +603,7 @@ static int flagload_evt(NP2FFILE *f, con
 
 // ----
 
-static int flagsave_gij(NP2FFILE *f, const STENTRY *t) {
+static int flagsave_gij(NP2FFILE f, const STENTRY *t) {
 
 	int		ret;
 	int		i;
@@ -627,7 +624,7 @@ static int flagsave_gij(NP2FFILE *f, con
 	return(ret);
 }
 
-static int flagload_gij(NP2FFILE *f, const STENTRY *t) {
+static int flagload_gij(NP2FFILE f, const STENTRY *t) {
 
 	int		ret;
 	int		i;
@@ -668,7 +665,7 @@ typedef struct {
 	BYTE	extop[4];
 } OPNKEY;
 
-static int flagsave_fm(NP2FFILE *f, const STENTRY *t) {
+static int flagsave_fm(NP2FFILE f, const STENTRY *t) {
 
 	int		ret;
 	UINT	saveflg;
@@ -783,7 +780,7 @@ static void play_psgreg(PSGGEN psg) {
 	}
 }
 
-static int flagload_fm(NP2FFILE *f, const STENTRY *t) {
+static int flagload_fm(NP2FFILE f, const STENTRY *t) {
 
 	int		ret;
 	UINT	saveflg;
@@ -841,6 +838,7 @@ static int flagload_fm(NP2FFILE *f, cons
 			break;
 
 		default:
+			saveflg = 0;
 			break;
 	}
 
@@ -919,7 +917,7 @@ typedef struct {
 	DOSTIME	time;
 } STATDISK;
 
-static int disksave(NP2FFILE *f, const char *path, int readonly) {
+static int disksave(NP2FFILE f, const char *path, int readonly) {
 
 	STATDISK	st;
 	FILEH		fh;
@@ -937,7 +935,7 @@ static int disksave(NP2FFILE *f, const c
 	return(flagsave_save(f, &st, sizeof(st)));
 }
 
-static int flagsave_disk(NP2FFILE *f, const STENTRY *t) {
+static int flagsave_disk(NP2FFILE f, const STENTRY *t) {
 
 	int		ret;
 	BYTE	i;
@@ -959,7 +957,7 @@ static int flagsave_disk(NP2FFILE *f, co
 	return(ret);
 }
 
-static int diskcheck(NP2FFILE *f, const char *name, ERR_BUF *e) {
+static int diskcheck(NP2FFILE f, const char *name, ERR_BUF *e) {
 
 	int			ret;
 	FILEH		fh;
@@ -990,7 +988,7 @@ static int diskcheck(NP2FFILE *f, const 
 	return(ret);
 }
 
-static int flagcheck_disk(NP2FFILE *f, const STENTRY *t, ERR_BUF *e) {
+static int flagcheck_disk(NP2FFILE f, const STENTRY *t, ERR_BUF *e) {
 
 	int		ret;
 	int		i;
@@ -1014,7 +1012,7 @@ static int flagcheck_disk(NP2FFILE *f, c
 	return(ret);
 }
 
-static int flagload_disk(NP2FFILE *f, const STENTRY *t) {
+static int flagload_disk(NP2FFILE f, const STENTRY *t) {
 
 	int			ret;
 	BYTE		i;
@@ -1049,13 +1047,12 @@ static int flagload_disk(NP2FFILE *f, co
 
 // -----
 
-#ifdef _MIDICH
-static int flagsave_midi(NP2FFILE *f, const STENTRY *t) {
+static int flagsave_com(NP2FFILE f, const STENTRY *t) {
 
 	UINT	device;
 	COMMNG	cm;
 	int		ret;
-	_MIDICH	mch[16];
+	COMFLAG	flag;
 
 	device = (UINT)t->arg1;
 	switch(device) {
@@ -1072,55 +1069,78 @@ static int flagsave_midi(NP2FFILE *f, co
 			break;
 	}
 	ret = NP2FLAG_SUCCESS;
-	if ((cm != NULL) && (cm->msg(cm, COMMSG_MIDISTATGET, (long)mch))) {
-		ret = flagsave_create(f, t);
-		if (ret != NP2FLAG_FAILURE) {
-			ret |= flagsave_save(f, mch, sizeof(mch));
-			ret |= flagsave_close(f);
+	if (cm) {
+		flag = (COMFLAG)cm->msg(cm, COMMSG_GETFLAG, 0);
+		if (flag) {
+			ret = flagsave_create(f, t);
+			if (ret != NP2FLAG_FAILURE) {
+				ret |= flagsave_save(f, flag, flag->size);
+				ret |= flagsave_close(f);
+			}
+			_MFREE(flag);
 		}
 	}
 	return(ret);
 }
 
-static int flagload_midi(NP2FFILE *f, const STENTRY *t) {
+static int flagload_com(NP2FFILE f, const STENTRY *t) {
 
-	_MIDICH	mch[16];
-	UINT	device;
-	COMMNG	cm;
-	int		ret;
+	UINT		device;
+	COMMNG		cm;
+	int			ret;
+	_COMFLAG	fhdr;
+	COMFLAG		flag;
 
-	ret = flagload_load(f, mch, sizeof(mch));
-	if (ret != NP2FLAG_FAILURE) {
-		device = (UINT)t->arg1;
-		switch(device) {
-			case 0:
-				commng_destroy(cm_mpu98);
-				cm = commng_create(COMCREATE_MPU98II);
-				cm_mpu98 = cm;
-				break;
+	ret = flagload_load(f, &fhdr, sizeof(fhdr));
+	if (ret != NP2FLAG_SUCCESS) {
+		goto flcom_err1;
+	}
+	if (fhdr.size < sizeof(fhdr)) {
+		goto flcom_err1;
+	}
+	flag = (COMFLAG)_MALLOC(fhdr.size, "com stat flag");
+	if (flag == NULL) {
+		goto flcom_err1;
+	}
+	CopyMemory(flag, &fhdr, sizeof(fhdr));
+	ret |= flagload_load(f, flag + 1, fhdr.size - sizeof(fhdr));
+	if (ret != NP2FLAG_SUCCESS) {
+		goto flcom_err2;
+	}
 
-			case 1:
-				commng_destroy(cm_rs232c);
-				cm = commng_create(COMCREATE_SERIAL);
-				cm_rs232c = cm;
-				break;
+	device = (UINT)t->arg1;
+	switch(device) {
+		case 0:
+			commng_destroy(cm_mpu98);
+			cm = commng_create(COMCREATE_MPU98II);
+			cm_mpu98 = cm;
+			break;
 
-			default:
-				cm = NULL;
-				break;
-		}
-		if (cm) {
-			cm->msg(cm, COMMSG_MIDISTATSET, (long)mch);
-		}
+		case 1:
+			commng_destroy(cm_rs232c);
+			cm = commng_create(COMCREATE_SERIAL);
+			cm_rs232c = cm;
+			break;
+
+		default:
+			cm = NULL;
+			break;
 	}
+	if (cm) {
+		cm->msg(cm, COMMSG_SETFLAG, (long)flag);
+	}
+
+flcom_err2:
+	_MFREE(flag);
+
+flcom_err1:
 	return(ret);
 }
-#endif
 
 
 // ----
 
-static int flagcheck_versize(NP2FFILE *f, const STENTRY *t, ERR_BUF *e) {
+static int flagcheck_versize(NP2FFILE f, const STENTRY *t, ERR_BUF *e) {
 
 	if ((f) && (t)) {
 		if ((f->p.ver == t->ver) && (f->p.size == t->arg2)) {
@@ -1132,7 +1152,7 @@ static int flagcheck_versize(NP2FFILE *f
 	return(NP2FLAG_FAILURE);
 }
 
-static int flagcheck_veronly(NP2FFILE *f, const STENTRY *t, ERR_BUF *e) {
+static int flagcheck_veronly(NP2FFILE f, const STENTRY *t, ERR_BUF *e) {
 
 	if ((f) && (t)) {
 		if (f->p.ver == t->ver) {
@@ -1149,7 +1169,7 @@ static int flagcheck_veronly(NP2FFILE *f
 
 int statsave_save(const char *filename) {
 
-	NP2FFILE	f;
+	_NP2FFILE	f;
 	int			ret;
 	UINT		i;
 
@@ -1196,11 +1216,9 @@ int statsave_save(const char *filename) 
 				ret |= flagsave_disk(&f, &np2tbl[i]);
 				break;
 
-#if defined(MIDICH)
-			case NP2FLAG_MIDI:
-				ret |= flagsave_midi(&f, &np2tbl[i]);
+			case NP2FLAG_COM:
+				ret |= flagsave_com(&f, &np2tbl[i]);
 				break;
-#endif
 		}
 	}
 	flagclose(&f);
@@ -1209,7 +1227,7 @@ int statsave_save(const char *filename) 
 
 int statsave_check(const char *filename, char *buf, int size) {
 
-	NP2FFILE	f;
+	_NP2FFILE	f;
 	int			ret;
 	UINT		i;
 	BOOL		done;
@@ -1243,6 +1261,7 @@ int statsave_check(const char *filename,
 			if (i < (sizeof(np2tbl)/sizeof(STENTRY))) {
 				switch(np2tbl[i].type) {
 					case NP2FLAG_BIN:
+					case NP2FLAG_CLOCK:
 						ret |= flagcheck_versize(&f, &np2tbl[i], &e);
 						break;
 
@@ -1250,15 +1269,12 @@ int statsave_check(const char *filename,
 						done = TRUE;
 						break;
 
-					case NP2FLAG_CLOCK:
 					case NP2FLAG_DMA:
 					case NP2FLAG_EGC:
 					case NP2FLAG_EXT:
 					case NP2FLAG_EVT:
 					case NP2FLAG_GIJ:
-#if defined(MIDICH)
-					case NP2FLAG_MIDI:
-#endif
+					case NP2FLAG_COM:
 						ret |= flagcheck_veronly(&f, &np2tbl[i], &e);
 						break;
 
@@ -1289,7 +1305,7 @@ int statsave_check(const char *filename,
 
 int statsave_load(const char *filename) {
 
-	NP2FFILE	f;
+	_NP2FFILE	f;
 	int			ret;
 	UINT		i;
 	BOOL		done;
@@ -1359,11 +1375,9 @@ int statsave_load(const char *filename) 
 					ret |= flagload_disk(&f, &np2tbl[i]);
 					break;
 
-#if defined(MIDICH)
-				case NP2FLAG_MIDI:
-					ret |= flagload_midi(&f, &np2tbl[i]);
+				case NP2FLAG_COM:
+					ret |= flagload_com(&f, &np2tbl[i]);
 					break;
-#endif
 
 				default:
 					ret |= NP2FLAG_WARNING;