--- np2/win9x/np2.cpp	2003/11/09 21:57:04	1.27
+++ np2/win9x/np2.cpp	2003/11/15 07:10:03	1.30
@@ -603,61 +603,67 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 				case IDM_KEY:
 					xmenu_setkey(0);
 					keystat_resetjoykey();
+					update |= SYS_UPDATECFG;
 					break;
 
 				case IDM_JOY1:
 					xmenu_setkey(1);
 					keystat_resetjoykey();
+					update |= SYS_UPDATECFG;
 					break;
 
 				case IDM_JOY2:
 					xmenu_setkey(2);
 					keystat_resetjoykey();
+					update |= SYS_UPDATECFG;
 					break;
 
 				case IDM_XSHIFT:
 					xmenu_setxshift(np2cfg.XSHIFT ^ 1);
 					keystat_forcerelease(0x70);
+					update |= SYS_UPDATECFG;
 					break;
 
 				case IDM_XCTRL:
 					xmenu_setxshift(np2cfg.XSHIFT ^ 2);
 					keystat_forcerelease(0x74);
+					update |= SYS_UPDATECFG;
 					break;
 
 				case IDM_XGRPH:
 					xmenu_setxshift(np2cfg.XSHIFT ^ 4);
 					keystat_forcerelease(0x73);
+					update |= SYS_UPDATECFG;
 					break;
 
 				case IDM_F12MOUSE:
 					xmenu_setf12copy(0);
 					winkbd_resetf12();
-					update |= SYS_UPDATECFG;
+					update |= SYS_UPDATEOSCFG;
 					break;
 
 				case IDM_F12COPY:
 					xmenu_setf12copy(1);
 					winkbd_resetf12();
-					update |= SYS_UPDATECFG;
+					update |= SYS_UPDATEOSCFG;
 					break;
 
 				case IDM_F12STOP:
 					xmenu_setf12copy(2);
 					winkbd_resetf12();
-					update |= SYS_UPDATECFG;
+					update |= SYS_UPDATEOSCFG;
 					break;
 
 				case IDM_F12EQU:
 					xmenu_setf12copy(3);
 					winkbd_resetf12();
-					update |= SYS_UPDATECFG;
+					update |= SYS_UPDATEOSCFG;
 					break;
 
 				case IDM_F12COMMA:
 					xmenu_setf12copy(4);
 					winkbd_resetf12();
-					update |= SYS_UPDATECFG;
+					update |= SYS_UPDATEOSCFG;
 					break;
 
 				case IDM_BEEPOFF:
@@ -685,66 +691,38 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 					break;
 
 				case IDM_NOSOUND:
-					xmenu_setsound(0);
+					xmenu_setsound(0x00);
 					update |= SYS_UPDATECFG;
 					break;
 
 				case IDM_PC9801_14:
-					xmenu_setsound(1);
+					xmenu_setsound(0x01);
 					update |= SYS_UPDATECFG;
 					break;
 
 				case IDM_PC9801_26K:
-					{
-						BYTE	sw;
-						sw = np2cfg.SOUND_SW;
-						if (sw & 4) {
-							sw &= 6;
-							sw ^= 2;
-						}
-						else {
-							sw = 2;
-						}
-						xmenu_setsound(sw);
-						update |= SYS_UPDATECFG;
-					}
+					xmenu_setsound(0x02);
+					update |= SYS_UPDATECFG;
 					break;
 
 				case IDM_PC9801_86:
-					{
-						BYTE	sw;
-						sw = np2cfg.SOUND_SW;
-						if (sw & 2) {
-							sw &= 6;
-							sw ^= 4;
-						}
-						else if (!(sw & 4)) {
-							sw = 4;
-						}
-						xmenu_setsound(sw);
-						update |= SYS_UPDATECFG;
-					}
+					xmenu_setsound(0x04);
+					update |= SYS_UPDATECFG;
 					break;
 
-				case IDM_PC9801_118:
-					xmenu_setsound(8);
+				case IDM_PC9801_26_86:
+					xmenu_setsound(0x06);
 					update |= SYS_UPDATECFG;
 					break;
 
-				case IDM_CHIBIOTO:
-					{
-						BYTE	sw;
-						sw = np2cfg.SOUND_SW;
-						if (sw & 4) {
-							sw &= 0x14;
-							sw ^= 0x10;
-						}
-						else {
-							sw = 0x14;
-						}
-						xmenu_setsound(sw);
-						update |= SYS_UPDATECFG;
-					}
+				case IDM_PC9801_86_CB:
+					xmenu_setsound(0x14);
+					update |= SYS_UPDATECFG;
+					break;
+
+				case IDM_PC9801_118:
+					xmenu_setsound(0x08);
+					update |= SYS_UPDATECFG;
 					break;
 
 				case IDM_SPEAKBOARD:
@@ -1264,6 +1242,8 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 	UINT32		tick;
 #endif
 
+	_MEM_INIT();
+
 	GetModuleFileName(NULL, modulefile, sizeof(modulefile));
 	dosio_init();
 	file_setcd(modulefile);
@@ -1609,6 +1589,7 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 	}
 
 	TRACETERM();
+	_MEM_USED("report.txt");
 	dosio_term();
 
 	viewer_term();												// ver0.30