--- np2/win9x/dialog/d_sound.cpp	2004/03/24 06:07:57	1.12
+++ np2/win9x/dialog/d_sound.cpp	2005/02/07 15:39:28	1.15
@@ -31,12 +31,12 @@ static const char str_sndopt[] = "Sound 
 typedef struct {
 	UINT16	res;
 	UINT16	resstr;
-	BYTE	*value;
+	UINT8	*value;
 	UINT16	min;
 	UINT16	max;
 } SLIDERTBL;
 
-static void slidersetvaluestr(HWND hWnd, const SLIDERTBL *item, BYTE value) {
+static void slidersetvaluestr(HWND hWnd, const SLIDERTBL *item, UINT8 value) {
 
 	char	work[32];
 
@@ -44,13 +44,13 @@ static void slidersetvaluestr(HWND hWnd,
 	SetDlgItemText(hWnd, item->resstr, work);
 }
 
-static void slidersetvalue(HWND hWnd, const SLIDERTBL *item, BYTE value) {
+static void slidersetvalue(HWND hWnd, const SLIDERTBL *item, UINT8 value) {
 
-	if (value > (BYTE)(item->max)) {
-		value = (BYTE)(item->max);
+	if (value > (UINT8)(item->max)) {
+		value = (UINT8)(item->max);
 	}
-	else if (value < (BYTE)(item->min)) {
-		value = (BYTE)(item->min);
+	else if (value < (UINT8)(item->min)) {
+		value = (UINT8)(item->min);
 	}
 	SendDlgItemMessage(hWnd, item->res, TBM_SETPOS, TRUE, value);
 	slidersetvaluestr(hWnd, item, value);
@@ -65,29 +65,29 @@ static void sliderinit(HWND hWnd, const 
 
 static void sliderresetpos(HWND hWnd, const SLIDERTBL *item) {
 
-	BYTE	value;
+	UINT8	value;
 
-	value = (BYTE)SendDlgItemMessage(hWnd, item->res, TBM_GETPOS, 0, 0);
-	if (value > (BYTE)(item->max)) {
-		value = (BYTE)(item->max);
+	value = (UINT8)SendDlgItemMessage(hWnd, item->res, TBM_GETPOS, 0, 0);
+	if (value > (UINT8)(item->max)) {
+		value = (UINT8)(item->max);
 	}
-	else if (value < (BYTE)(item->min)) {
-		value = (BYTE)(item->min);
+	else if (value < (UINT8)(item->min)) {
+		value = (UINT8)(item->min);
 	}
 	slidersetvaluestr(hWnd, item, value);
 }
 
-static BYTE sliderrestore(HWND hWnd, const SLIDERTBL *item) {
+static UINT8 sliderrestore(HWND hWnd, const SLIDERTBL *item) {
 
-	BYTE	value;
-	BYTE	ret;
+	UINT8	value;
+	UINT8	ret;
 
-	value = (BYTE)SendDlgItemMessage(hWnd, item->res, TBM_GETPOS, 0, 0);
-	if (value > (BYTE)(item->max)) {
-		value = (BYTE)(item->max);
+	value = (UINT8)SendDlgItemMessage(hWnd, item->res, TBM_GETPOS, 0, 0);
+	if (value > (UINT8)(item->max)) {
+		value = (UINT8)(item->max);
 	}
-	else if (value < (BYTE)(item->min)) {
-		value = (BYTE)(item->min);
+	else if (value < (UINT8)(item->min)) {
+		value = (UINT8)(item->min);
 	}
 	ret = (*(item->value)) - value;
 	if (ret) {
@@ -119,7 +119,7 @@ static LRESULT CALLBACK SndmixDlgProc(HW
 			return(TRUE);
 
 		case WM_COMMAND:
-			switch (LOWORD(wp)) {
+			switch(LOWORD(wp)) {
 				case IDC_SNDMIXDEF:
 					for (i=0; i<5; i++) {
 						slidersetvalue(hWnd, &sndmixitem[i], 64);
@@ -214,26 +214,26 @@ static LRESULT CALLBACK Snd14optDlgProc(
 
 static const UINT snd26paranum[4] = {0, 3, 1, 2};
 
-static void setsnd26iopara(HWND hWnd, BYTE value) {
+static void setsnd26iopara(HWND hWnd, UINT8 value) {
 
 	SendMessage(hWnd, CB_SETCURSEL, (WPARAM)((value >> 4) & 1), (LPARAM)0);
 }
 
-static BYTE getsnd26io(HWND hWnd, WORD res) {
+static UINT8 getsnd26io(HWND hWnd, UINT16 res) {
 
 	char	work[8];
 
 	GetDlgItemText(hWnd, res, work, sizeof(work));
-	return((BYTE)((work[1] == '1')?0x10:0x00));
+	return((UINT8)((work[1] == '1')?0x10:0x00));
 }
 
-static void setsnd26intpara(HWND hWnd, BYTE value) {
+static void setsnd26intpara(HWND hWnd, UINT8 value) {
 
 	SendMessage(hWnd, CB_SETCURSEL,
 						(WPARAM)snd26paranum[(value >> 6) & 3], (LPARAM)0);
 }
 
-static BYTE getsnd26int(HWND hWnd, WORD res) {
+static UINT8 getsnd26int(HWND hWnd, UINT16 res) {
 
 	char	work[8];
 
@@ -251,7 +251,7 @@ static BYTE getsnd26int(HWND hWnd, WORD 
 	return(0xc0);
 }
 
-static void setsnd26rompara(HWND hWnd, BYTE value) {
+static void setsnd26rompara(HWND hWnd, UINT8 value) {
 
 	int		para;
 
@@ -262,15 +262,15 @@ static void setsnd26rompara(HWND hWnd, B
 	SendMessage(hWnd, CB_SETCURSEL, (WPARAM)para, (LPARAM)0);
 }
 
-static BYTE getsnd26rom(HWND hWnd, WORD res) {
+static UINT8 getsnd26rom(HWND hWnd, UINT16 res) {
 
 	char	work[8];
-	DWORD	adrs;
+	UINT32	adrs;
 
 	GetDlgItemText(hWnd, res, work, sizeof(work));
-	adrs = ((DWORD)milstr_solveHEX(work) - 0xc8000) >> 14;
+	adrs = ((UINT32)milstr_solveHEX(work) - 0xc8000) >> 14;
 	if (adrs < 4) {
-		return((BYTE)adrs);
+		return((UINT8)adrs);
 	}
 	return(4);
 }
@@ -278,10 +278,9 @@ static BYTE getsnd26rom(HWND hWnd, WORD 
 
 // ---- PC-9801-26
 
-static	BYTE	snd26 = 0;
+static	UINT8	snd26 = 0;
 
-
-static void set26jmp(HWND hWnd, BYTE value, BYTE bit) {
+static void set26jmp(HWND hWnd, UINT8 value, UINT8 bit) {
 
 	if ((snd26 ^ value) & bit) {
 		snd26 &= ~bit;
@@ -296,8 +295,8 @@ static void snd26cmdjmp(HWND hWnd) {
 	RECT	rect2;
 	POINT	p;
 	BOOL	redraw;
-	BYTE	b;
-	BYTE	bit;
+	UINT8	b;
+	UINT8	bit;
 
 	GetWindowRect(GetDlgItem(hWnd, IDC_SND26JMP), &rect1);
 	GetClientRect(GetDlgItem(hWnd, IDC_SND26JMP), &rect2);
@@ -311,7 +310,7 @@ static void snd26cmdjmp(HWND hWnd) {
 		return;
 	}
 	if ((p.x >= 2) && (p.x < 7)) {
-		b = (BYTE)(p.x - 2);
+		b = (UINT8)(p.x - 2);
 		if ((snd26 ^ b) & 7) {
 			snd26 &= ~0x07;
 			snd26 |= b;
@@ -342,7 +341,7 @@ static void snd26cmdjmp(HWND hWnd) {
 		}
 	}
 	else if ((p.x >= 15) && (p.x < 17)) {
-		b = (BYTE)((p.x - 15) << 4);
+		b = (UINT8)((p.x - 15) << 4);
 		if ((snd26 ^ b) & 0x10) {
 			snd26 &= ~0x10;
 			snd26 |= b;
@@ -375,7 +374,7 @@ static LRESULT CALLBACK Snd26optDlgProc(
 			return(TRUE);
 
 		case WM_COMMAND:
-			switch (LOWORD(wp)) {
+			switch(LOWORD(wp)) {
 				case IDC_SND26IO:
 					set26jmp(hWnd, getsnd26io(hWnd, IDC_SND26IO), 0x10);
 					break;
@@ -425,31 +424,31 @@ static LRESULT CALLBACK Snd26optDlgProc(
 
 // ---- PC-9801-86
 
-static	BYTE	snd86 = 0;
+static	UINT8	snd86 = 0;
 
 static const UINT snd86paranum[4] = {0, 1, 3, 2};
 
 
-static void setsnd86iopara(HWND hWnd, BYTE value) {
+static void setsnd86iopara(HWND hWnd, UINT8 value) {
 
 	SendMessage(hWnd, CB_SETCURSEL, (WPARAM)((~value) & 1), (LPARAM)0);
 }
 
-static BYTE getsnd86io(HWND hWnd, WORD res) {
+static UINT8 getsnd86io(HWND hWnd, UINT16 res) {
 
 	char	work[8];
 
 	GetDlgItemText(hWnd, res, work, sizeof(work));
-	return((BYTE)((work[1] == '1')?0x01:0x00));
+	return((UINT8)((work[1] == '1')?0x01:0x00));
 }
 
-static void setsnd86intpara(HWND hWnd, BYTE value) {
+static void setsnd86intpara(HWND hWnd, UINT8 value) {
 
 	SendMessage(hWnd, CB_SETCURSEL,
 						(WPARAM)snd86paranum[(value >> 2) & 3], (LPARAM)0);
 }
 
-static BYTE getsnd86int(HWND hWnd) {
+static UINT8 getsnd86int(HWND hWnd) {
 
 	char	work[8];
 
@@ -467,12 +466,12 @@ static BYTE getsnd86int(HWND hWnd) {
 	return(0x0c);
 }
 
-static void setsnd86idpara(HWND hWnd, BYTE value) {
+static void setsnd86idpara(HWND hWnd, UINT8 value) {
 
 	SendMessage(hWnd, CB_SETCURSEL, (WPARAM)(((~value) >> 5) & 7), (LPARAM)0);
 }
 
-static BYTE getsnd86id(HWND hWnd) {
+static UINT8 getsnd86id(HWND hWnd) {
 
 	char	work[8];
 
@@ -480,7 +479,7 @@ static BYTE getsnd86id(HWND hWnd) {
 	return((~work[0] & 7) << 5);
 }
 
-static void set86jmp(HWND hWnd, BYTE value, BYTE bit) {
+static void set86jmp(HWND hWnd, UINT8 value, UINT8 bit) {
 
 	if ((snd86 ^ value) & bit) {
 		snd86 &= ~bit;
@@ -558,7 +557,7 @@ static LRESULT CALLBACK Snd86optDlgProc(
 			return(TRUE);
 
 		case WM_COMMAND:
-			switch (LOWORD(wp)) {
+			switch(LOWORD(wp)) {
 				case IDC_SND86IO:
 					set86jmp(hWnd, getsnd86io(hWnd, IDC_SND86IO), 0x01);
 					break;
@@ -620,9 +619,8 @@ static LRESULT CALLBACK Snd86optDlgProc(
 
 // ---- Speak board
 
-static	BYTE	spb = 0;
-static	BYTE	spbvrc = 0;
-
+static	UINT8	spb = 0;
+static	UINT8	spbvrc = 0;
 
 static void setspbVRch(HWND hWnd) {
 
@@ -660,8 +658,8 @@ static void spbcmdjmp(HWND hWnd) {
 	RECT	rect2;
 	POINT	p;
 	BOOL	redraw;
-	BYTE	b;
-	BYTE	bit;
+	UINT8	b;
+	UINT8	bit;
 
 	GetWindowRect(GetDlgItem(hWnd, IDC_SPBJMP), &rect1);
 	GetClientRect(GetDlgItem(hWnd, IDC_SPBJMP), &rect2);
@@ -701,7 +699,7 @@ static void spbcmdjmp(HWND hWnd) {
 		redraw = TRUE;
 	}
 	else if ((p.x >= 10) && (p.x < 12)) {
-		b = (BYTE)((p.x - 10) << 4);
+		b = (UINT8)((p.x - 10) << 4);
 		if ((spb ^ b) & 0x10) {
 			spb &= ~0x10;
 			spb |= b;
@@ -710,7 +708,7 @@ static void spbcmdjmp(HWND hWnd) {
 		}
 	}
 	else if ((p.x >= 14) && (p.x < 19)) {
-		b = (BYTE)(p.x - 14);
+		b = (UINT8)(p.x - 14);
 		if ((spb ^ b) & 7) {
 			spb &= ~0x07;
 			spb |= b;
@@ -719,7 +717,7 @@ static void spbcmdjmp(HWND hWnd) {
 		}
 	}
 	else if ((p.x >= 21) && (p.x < 24)) {
-		spbvrc ^= (BYTE)(3 - p.y);
+		spbvrc ^= (UINT8)(3 - p.y);
 		setspbVRch(hWnd);
 		redraw = TRUE;
 	}
@@ -728,7 +726,7 @@ static void spbcmdjmp(HWND hWnd) {
 	}
 }
 
-static void setspbjmp(HWND hWnd, BYTE value, BYTE bit) {
+static void setspbjmp(HWND hWnd, UINT8 value, UINT8 bit) {
 
 	if ((spb ^ value) & bit) {
 		spb &= ~bit;
@@ -737,9 +735,9 @@ static void setspbjmp(HWND hWnd, BYTE va
 	}
 }
 
-static BYTE getspbVRch(HWND hWnd) {
+static UINT8 getspbVRch(HWND hWnd) {
 
-	BYTE	ret;
+	UINT8	ret;
 
 	ret = 0;
 	if (Button_GetCheck(GetDlgItem(hWnd, IDC_SPBVRL))) {
@@ -753,7 +751,7 @@ static BYTE getspbVRch(HWND hWnd) {
 
 static LRESULT CALLBACK SPBoptDlgProc(HWND hWnd, UINT msg,
 													WPARAM wp, LPARAM lp) {
-	BYTE	b;
+	UINT8	b;
 	UINT	update;
 
 	switch(msg) {
@@ -762,7 +760,7 @@ static LRESULT CALLBACK SPBoptDlgProc(HW
 			return(TRUE);
 
 		case WM_COMMAND:
-			switch (LOWORD(wp)) {
+			switch(LOWORD(wp)) {
 				case IDC_SPBIO:
 					setspbjmp(hWnd, getsnd26io(hWnd, IDC_SPBIO), 0x10);
 					break;
@@ -812,14 +810,15 @@ static LRESULT CALLBACK SPBoptDlgProc(HW
 					np2cfg.spb_vrc = spbvrc;
 					update |= SYS_UPDATECFG;
 				}
-				b = (BYTE)SendDlgItemMessage(hWnd, IDC_SPBVRLEVEL,
+				b = (UINT8)SendDlgItemMessage(hWnd, IDC_SPBVRLEVEL,
 															TBM_GETPOS, 0, 0);
 				if (np2cfg.spb_vrl != b) {
 					np2cfg.spb_vrl = b;
 					update |= SYS_UPDATECFG;
 				}
 				opngen_setVR(np2cfg.spb_vrc, np2cfg.spb_vrl);
-				b = (BYTE)(Button_GetCheck(GetDlgItem(hWnd, IDC_SPBREVERSE))?																			1:0);
+				b = (UINT8)(Button_GetCheck(GetDlgItem(hWnd, IDC_SPBREVERSE))
+																		?1:0);
 				if (np2cfg.spb_x != b) {
 					np2cfg.spb_x = b;
 					update |= SYS_UPDATECFG;
@@ -845,7 +844,7 @@ static LRESULT CALLBACK SPBoptDlgProc(HW
 typedef struct {
 	UINT16	res;
 	UINT16	bit;
-	BYTE	*ptr;
+	UINT8	*ptr;
 } CHECKTBL;
 
 static const CHECKTBL pad1opt[13] = {
@@ -870,11 +869,11 @@ static void checkbtnres_load(HWND hWnd, 
 								(*(item->ptr)) & (1 << (item->bit)));
 }
 
-static BYTE checkbtnres_store(HWND hWnd, const CHECKTBL *item) {
+static UINT8 checkbtnres_store(HWND hWnd, const CHECKTBL *item) {
 
-	BYTE	value;
-	BYTE	bit;
-	BYTE	ret;
+	UINT8	value;
+	UINT8	bit;
+	UINT8	ret;
 
 	bit = 1 << (item->bit);
 	value = ((Button_GetCheck(GetDlgItem(hWnd, item->res)))?0xff:0) & bit;
@@ -889,7 +888,7 @@ static LRESULT CALLBACK PAD1optDlgProc(H
 													WPARAM wp, LPARAM lp) {
 
 	int		i;
-	BYTE	renewal;
+	UINT8	renewal;
 
 	switch(msg) {
 		case WM_INITDIALOG:
@@ -926,7 +925,7 @@ void dialog_sndopt(HWND hWnd) {
 	HINSTANCE		hinst;
 	PROPSHEETPAGE	psp;
 	PROPSHEETHEADER	psh;
-	HPROPSHEETPAGE	hpsp[6];										// ver0.29
+	HPROPSHEETPAGE	hpsp[6];
 
 	hinst = (HINSTANCE)GetWindowLong(hWnd, GWL_HINSTANCE);
 
@@ -976,6 +975,7 @@ void dialog_sndopt(HWND hWnd) {
 
 // ----
 
+#if defined(SUPPORT_S98)
 static const char s98ui_file[] = "NP2_%04d.S98";
 static const char s98ui_title[] = "Save as S98 log";
 static const char s98ui_ext[] = "s98";
@@ -1000,6 +1000,7 @@ void dialog_s98(HWND hWnd) {
 	}
 	xmenu_sets98logging(check);
 }
+#endif
 
 
 // ----
@@ -1013,8 +1014,10 @@ static const FILESEL wrui = {wrui_title,
 
 void dialog_waverec(HWND hWnd) {
 
+	UINT8	check;
 	char	path[MAX_PATH];
 
+	check = FALSE;
 	sound_recstop();
 	file_cpyname(path, bmpfilefolder, sizeof(path));
 	file_cutname(path);
@@ -1023,7 +1026,9 @@ void dialog_waverec(HWND hWnd) {
 		(sound_recstart(path) == SUCCESS)) {
 		file_cpyname(bmpfilefolder, path, sizeof(bmpfilefolder));
 		sysmng_update(SYS_UPDATEOSCFG);
+		check = TRUE;
 	}
+	xmenu_setwaverec(check);
 }
 #endif