--- np2/win9x/np2.cpp	2003/11/13 15:33:06	1.28
+++ np2/win9x/np2.cpp	2004/05/21 08:40:27	1.52
@@ -25,12 +25,10 @@
 #include	"sstpmsg.h"
 #include	"dclock.h"
 #include	"toolwin.h"
-#ifdef USE_ROMEO
 #include	"juliet.h"
-#endif
 #include	"np2class.h"
 #include	"dialog.h"
-#include	"memory.h"
+#include	"cpucore.h"
 #include	"pccore.h"
 #include	"iocore.h"
 #include	"pc9861k.h"
@@ -43,9 +41,9 @@
 #include	"diskdrv.h"
 #include	"fddfile.h"
 #include	"timing.h"
-#include	"statsave.h"
+#include	"keystat.h"
 #include	"debugsub.h"
-#include	"keydisp.h"
+#include	"subwind.h"
 #include	"viewer.h"
 
 
@@ -53,8 +51,6 @@
 #define		OPENING_WAIT		1500
 #endif
 
-#define	STATSAVEMAX		10
-
 static	char		szClassName[] = "NP2-MainWindow";
 		HWND		hWndMain;
 		HINSTANCE	hInst;
@@ -64,8 +60,13 @@ static	char		szClassName[] = "NP2-MainWi
 		BOOL		winui_en;
 
 		NP2OSCFG	np2oscfg = {
-						"Neko Project II", "NP2",
-						CW_USEDEFAULT, CW_USEDEFAULT, 1, 1, 0, 1, 0, 2,
+#if !defined(SUPPORT_PC9821)
+						"Neko Project II",
+#else
+						"Neko Project 21",
+#endif
+						"NP2",
+						CW_USEDEFAULT, CW_USEDEFAULT, 1, 1, 0, 1, 0, 0,
 						0, 0, KEY_UNKNOWN, 0,
 						0, 0, 0, {1, 2, 2, 1},
 						{5, 0, 0x3e, 19200, "", "", "", ""},		// ver0.34
@@ -73,7 +74,7 @@ static	char		szClassName[] = "NP2-MainWi
 						{0, 0, 0x3e, 19200, "", "", "", ""},		// ver0.34
 						{0, 0, 0x3e, 19200, "", "", "", ""},		// ver0.34
 						0xffffff, 0xffbf6a, 0, 0,
-						0, 1, 0, 9801, 0, 0, 0, 0, 0, 0, 0, 0};		// ver0.38
+						0, 1, 0, 9801, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 
 		char		fddfolder[MAX_PATH];
 		char		hddfolder[MAX_PATH];
@@ -92,8 +93,6 @@ static	WINLOCEX	smwlex;
 
 static const char np2help[] = "np2.chm";
 static const char np2flagext[] = "S%02d";
-static const char np2resumeext[] = "sav";
-
 
 
 static void winuienter(void) {
@@ -112,13 +111,17 @@ static void winuileave(void) {
 
 WINLOCEX np2_winlocexallwin(HWND base) {
 
-	HWND	list[3];
 	UINT	i;
+	UINT	cnt;
+	HWND	list[5];
 
-	list[0] = hWndMain;
-	list[1] = toolwin_gethwnd();
-	list[2] = keydisp_gethwnd();
-	for (i=0; i<3; i++) {
+	cnt = 0;
+	list[cnt++] = hWndMain;
+	list[cnt++] = toolwin_gethwnd();
+	list[cnt++] = kdispwin_gethwnd();
+	list[cnt++] = skbdwin_gethwnd();
+	list[cnt++] = mdbgwin_gethwnd();
+	for (i=0; i<cnt; i++) {
 		if (list[i] == base) {
 			list[i] = NULL;
 		}
@@ -126,7 +129,7 @@ WINLOCEX np2_winlocexallwin(HWND base) {
 	if (base != hWndMain) {		// hWndMainのみ全体移動
 		base = NULL;
 	}
-	return(winlocex_create(base, list, 3));
+	return(winlocex_create(base, list, cnt));
 }
 
 static void changescreen(BYTE newmode) {
@@ -147,7 +150,9 @@ static void changescreen(BYTE newmode) {
 	if (renewal) {
 		if (renewal & SCRNMODE_FULLSCREEN) {
 			toolwin_destroy();
-			keydisp_destroy();
+			kdispwin_destroy();
+			skbdwin_destroy();
+			mdbgwin_destroy();
 		}
 		else if (renewal & SCRNMODE_ROTATEMASK) {
 			wlex = np2_winlocexallwin(hWndMain);
@@ -172,7 +177,7 @@ static void changescreen(BYTE newmode) {
 					toolwin_create();
 				}
 				if (np2oscfg.keydisp) {
-					keydisp_create();
+					kdispwin_create();
 				}
 			}
 		}
@@ -209,7 +214,7 @@ static void wincentering(HWND hWnd) {
 	MoveWindow(hWndMain, np2oscfg.winx, np2oscfg.winy, width, height, TRUE);
 }
 
-void np2active_renewal(void) {									// ver0.30
+void np2active_renewal(void) {										// ver0.30
 
 	if (np2break & (~NP2BREAK_MAIN)) {
 		np2stopemulate = 2;
@@ -235,6 +240,10 @@ void np2active_renewal(void) {									/
 	}
 }
 
+
+// ---- resume and statsave
+
+#if defined(SUPPORT_RESUME) || defined(SUPPORT_STATSAVE)
 static void getstatfilename(char *path, const char *ext, int size) {
 
 	file_cpyname(path, modulefile, size);
@@ -277,11 +286,11 @@ static int flagload(const char *ext, con
 	winuienter();
 	id = IDYES;
 	ret = statsave_check(path, buf, sizeof(buf));
-	if (ret & (~NP2FLAG_DISKCHG)) {
+	if (ret & (~STATFLAG_DISKCHG)) {
 		MessageBox(hWndMain, "Couldn't restart", title, MB_OK | MB_ICONSTOP);
 		id = IDNO;
 	}
-	else if ((!force) && (ret & NP2FLAG_DISKCHG)) {
+	else if ((!force) && (ret & STATFLAG_DISKCHG)) {
 		char buf2[1024 + 256];
 		wsprintf(buf2, "Conflict!\n\n%s\nContinue?", buf);
 		id = MessageBox(hWndMain, buf2, title,
@@ -297,6 +306,7 @@ static int flagload(const char *ext, con
 	winuileave();
 	return(id);
 }
+#endif
 
 
 // ---- proc
@@ -320,6 +330,574 @@ static void np2popup(HWND hWnd, LPARAM l
 	DestroyMenu(hMenu);
 }
 
+static void np2cmd(HWND hWnd, UINT16 cmd) {
+
+	UINT	update;
+	BOOL	b;
+
+	update = 0;
+	switch(cmd) {
+		case IDM_RESET:
+			b = FALSE;
+			if (!np2oscfg.comfirm) {
+				b = TRUE;
+			}
+			else if (sstpconfirm_reset()) {
+				winuienter();
+				if (MessageBox(hWnd, "Sure?", "Reset",
+									MB_ICONQUESTION | MB_YESNO) == IDYES) {
+					b = TRUE;
+				}
+				winuileave();
+			}
+			if (b) {
+				sstpmsg_reset();
+				juliet_YMF288Reset();
+				pccore_cfgupdate();
+				pccore_reset();
+			}
+			break;
+
+		case IDM_CONFIG:
+			winuienter();
+			sstpmsg_config();
+			DialogBox(hInst, MAKEINTRESOURCE(IDD_CONFIG),
+									hWnd, (DLGPROC)CfgDialogProc);
+			winuileave();
+			break;
+
+		case IDM_NEWDISK:
+			winuienter();
+			dialog_newdisk(hWnd);
+			winuileave();
+			break;
+
+		case IDM_CHANGEFONT:
+			winuienter();
+			dialog_font(hWnd);
+			winuileave();
+			break;
+
+		case IDM_EXIT:
+			SendMessage(hWnd, WM_CLOSE, 0, 0L);
+			break;
+
+		case IDM_FDD1OPEN:
+			winuienter();
+			dialog_changefdd(hWnd, 0);
+			winuileave();
+			break;
+
+		case IDM_FDD1EJECT:
+			diskdrv_setfdd(0, NULL, 0);
+			toolwin_setfdd(0, NULL);
+			break;
+
+		case IDM_FDD2OPEN:
+			winuienter();
+			dialog_changefdd(hWnd, 1);
+			winuileave();
+			break;
+
+		case IDM_FDD2EJECT:
+			diskdrv_setfdd(1, NULL, 0);
+			toolwin_setfdd(1, NULL);
+			break;
+
+		case IDM_FDD3OPEN:
+			winuienter();
+			dialog_changefdd(hWnd, 2);
+			winuileave();
+			break;
+
+		case IDM_FDD3EJECT:
+			diskdrv_setfdd(2, NULL, 0);
+			toolwin_setfdd(2, NULL);
+			break;
+
+		case IDM_FDD4OPEN:
+			winuienter();
+			dialog_changefdd(hWnd, 3);
+			winuileave();
+			break;
+
+		case IDM_FDD4EJECT:
+			diskdrv_setfdd(3, NULL, 0);
+			toolwin_setfdd(3, NULL);
+			break;
+
+		case IDM_SASI1OPEN:
+			winuienter();
+			dialog_changehdd(hWnd, 0x00);
+			winuileave();
+			break;
+
+		case IDM_SASI1EJECT:
+			diskdrv_sethdd(0x00, NULL);
+			break;
+
+		case IDM_SASI2OPEN:
+			winuienter();
+			dialog_changehdd(hWnd, 0x01);
+			winuileave();
+			break;
+
+		case IDM_SASI2EJECT:
+			diskdrv_sethdd(0x01, NULL);
+			break;
+#if defined(SUPPORT_SCSI)
+		case IDM_SCSI0OPEN:
+			winuienter();
+			dialog_changehdd(hWnd, 0x20);
+			winuileave();
+			break;
+
+		case IDM_SCSI0EJECT:
+			diskdrv_sethdd(0x20, NULL);
+			break;
+
+		case IDM_SCSI1OPEN:
+			winuienter();
+			dialog_changehdd(hWnd, 0x21);
+			winuileave();
+			break;
+
+		case IDM_SCSI1EJECT:
+			diskdrv_sethdd(0x21, NULL);
+			break;
+
+		case IDM_SCSI2OPEN:
+			winuienter();
+			dialog_changehdd(hWnd, 0x22);
+			winuileave();
+			break;
+
+		case IDM_SCSI2EJECT:
+			diskdrv_sethdd(0x22, NULL);
+			break;
+
+		case IDM_SCSI3OPEN:
+			winuienter();
+			dialog_changehdd(hWnd, 0x23);
+			winuileave();
+			break;
+
+		case IDM_SCSI3EJECT:
+			diskdrv_sethdd(0x23, NULL);
+			break;
+#endif
+		case IDM_WINDOW:
+			changescreen(scrnmode & (~SCRNMODE_FULLSCREEN));
+			break;
+
+		case IDM_FULLSCREEN:
+			changescreen(scrnmode | SCRNMODE_FULLSCREEN);
+			break;
+
+		case IDM_ROLNORMAL:
+			xmenu_setroltate(0);
+			changescreen(scrnmode & (~SCRNMODE_ROTATEMASK));
+			break;
+
+		case IDM_ROLLEFT:
+			xmenu_setroltate(1);
+			changescreen((scrnmode & (~SCRNMODE_ROTATEMASK)) |
+														SCRNMODE_ROTATELEFT);
+			break;
+
+		case IDM_ROLRIGHT:
+			xmenu_setroltate(2);
+			changescreen((scrnmode & (~SCRNMODE_ROTATEMASK)) |
+														SCRNMODE_ROTATERIGHT);
+			break;
+
+		case IDM_DISPSYNC:
+			xmenu_setdispmode(np2cfg.DISPSYNC ^ 1);
+			update |= SYS_UPDATECFG;
+			break;
+
+		case IDM_RASTER:
+			xmenu_setraster(np2cfg.RASTER ^ 1);
+			if (np2cfg.RASTER) {
+				changescreen(scrnmode | SCRNMODE_HIGHCOLOR);
+			}
+			else {
+				changescreen(scrnmode & (~SCRNMODE_HIGHCOLOR));
+			}
+			update |= SYS_UPDATECFG;
+			break;
+
+		case IDM_NOWAIT:
+			xmenu_setwaitflg(np2oscfg.NOWAIT ^ 1);
+			update |= SYS_UPDATECFG;
+			break;
+
+		case IDM_AUTOFPS:
+			xmenu_setframe(0);
+			update |= SYS_UPDATECFG;
+			break;
+
+		case IDM_60FPS:
+			xmenu_setframe(1);
+			update |= SYS_UPDATECFG;
+			break;
+
+		case IDM_30FPS:
+			xmenu_setframe(2);
+			update |= SYS_UPDATECFG;
+			break;
+
+		case IDM_20FPS:
+			xmenu_setframe(3);
+			update |= SYS_UPDATECFG;
+			break;
+
+		case IDM_15FPS:
+			xmenu_setframe(4);
+			update |= SYS_UPDATECFG;
+			break;
+
+		case IDM_SCREENOPT:
+			winuienter();
+			dialog_scropt(hWnd);
+			winuileave();
+			break;
+
+		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();
+			winkbd_setf12(0);
+			update |= SYS_UPDATEOSCFG;
+			break;
+
+		case IDM_F12COPY:
+			xmenu_setf12copy(1);
+			winkbd_resetf12();
+			winkbd_setf12(1);
+			update |= SYS_UPDATEOSCFG;
+			break;
+
+		case IDM_F12STOP:
+			xmenu_setf12copy(2);
+			winkbd_resetf12();
+			winkbd_setf12(2);
+			update |= SYS_UPDATEOSCFG;
+			break;
+
+		case IDM_F12EQU:
+			xmenu_setf12copy(3);
+			winkbd_resetf12();
+			winkbd_setf12(3);
+			update |= SYS_UPDATEOSCFG;
+			break;
+
+		case IDM_F12COMMA:
+			xmenu_setf12copy(4);
+			winkbd_resetf12();
+			winkbd_setf12(4);
+			update |= SYS_UPDATEOSCFG;
+			break;
+
+		case IDM_USERKEY1:
+			xmenu_setf12copy(5);
+			winkbd_resetf12();
+			winkbd_setf12(5);
+			update |= SYS_UPDATEOSCFG;
+			break;
+
+		case IDM_USERKEY2:
+			xmenu_setf12copy(6);
+			winkbd_resetf12();
+			winkbd_setf12(6);
+			update |= SYS_UPDATEOSCFG;
+			break;
+
+		case IDM_BEEPOFF:
+			xmenu_setbeepvol(0);
+			beep_setvol(0);
+			update |= SYS_UPDATECFG;
+			break;
+
+		case IDM_BEEPLOW:
+			xmenu_setbeepvol(1);
+			beep_setvol(1);
+			update |= SYS_UPDATECFG;
+			break;
+
+		case IDM_BEEPMID:
+			xmenu_setbeepvol(2);
+			beep_setvol(2);
+			update |= SYS_UPDATECFG;
+			break;
+
+		case IDM_BEEPHIGH:
+			xmenu_setbeepvol(3);
+			beep_setvol(3);
+			update |= SYS_UPDATECFG;
+			break;
+
+		case IDM_NOSOUND:
+			xmenu_setsound(0x00);
+			update |= SYS_UPDATECFG;
+			break;
+
+		case IDM_PC9801_14:
+			xmenu_setsound(0x01);
+			update |= SYS_UPDATECFG;
+			break;
+
+		case IDM_PC9801_26K:
+			xmenu_setsound(0x02);
+			update |= SYS_UPDATECFG;
+			break;
+
+		case IDM_PC9801_86:
+			xmenu_setsound(0x04);
+			update |= SYS_UPDATECFG;
+			break;
+
+		case IDM_PC9801_26_86:
+			xmenu_setsound(0x06);
+			update |= SYS_UPDATECFG;
+			break;
+
+		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:
+			xmenu_setsound(0x20);
+			update |= SYS_UPDATECFG;
+			break;
+
+		case IDM_SPARKBOARD:
+			xmenu_setsound(0x40);
+			update |= SYS_UPDATECFG;
+			break;
+
+		case IDM_AMD98:
+			xmenu_setsound(0x80);
+			update |= SYS_UPDATECFG;
+			break;
+
+		case IDM_JASTSOUND:
+			xmenu_setjastsound(np2oscfg.jastsnd ^ 1);
+			update |= SYS_UPDATEOSCFG;
+			break;
+
+		case IDM_SEEKSND:
+			xmenu_setmotorflg(np2cfg.MOTOR ^ 1);
+			update |= SYS_UPDATECFG;
+			break;
+
+		case IDM_MEM640:
+			xmenu_setextmem(0);
+			update |= SYS_UPDATECFG;
+			break;
+
+		case IDM_MEM16:
+			xmenu_setextmem(1);
+			update |= SYS_UPDATECFG;
+			break;
+
+		case IDM_MEM36:
+			xmenu_setextmem(3);
+			update |= SYS_UPDATECFG;
+			break;
+
+		case IDM_MEM76:
+			xmenu_setextmem(7);
+			update |= SYS_UPDATECFG;
+			break;
+
+		case IDM_MEM116:
+			xmenu_setextmem(11);
+			update |= SYS_UPDATECFG;
+			break;
+
+		case IDM_MEM136:
+			xmenu_setextmem(13);
+			update |= SYS_UPDATECFG;
+			break;
+
+		case IDM_MOUSE:
+			mousemng_toggle(MOUSEPROC_SYSTEM);
+			xmenu_setmouse(np2oscfg.MOUSE_SW ^ 1);
+			update |= SYS_UPDATECFG;
+			break;
+
+		case IDM_SERIAL1:
+			winuienter();
+			dialog_serial(hWnd);
+			winuileave();
+			break;
+
+		case IDM_MPUPC98:
+			winuienter();
+			DialogBox(hInst, MAKEINTRESOURCE(IDD_MPUPC98),
+											hWnd, (DLGPROC)MidiDialogProc);
+			winuileave();
+			break;
+
+		case IDM_MIDIPANIC:
+			rs232c_midipanic();
+			mpu98ii_midipanic();
+			pc9861k_midipanic();
+			break;
+
+		case IDM_SNDOPT:
+			winuienter();
+			dialog_sndopt(hWnd);
+			winuileave();
+			break;
+
+		case IDM_BMPSAVE:
+			winuienter();
+			dialog_writebmp(hWnd);
+			winuileave();
+			break;
+#if defined(SUPPPORT_S98)
+		case IDM_S98LOGGING:
+			winuienter();
+			dialog_s98(hWnd);
+			winuileave();
+			break;
+#endif
+#if defined(SUPPORT_WAVEREC)
+		case IDM_WAVEREC:
+			winuienter();
+			dialog_waverec(hWnd);
+			winuileave();
+			break;
+#endif
+		case IDM_DISPCLOCK:
+			xmenu_setdispclk(np2oscfg.DISPCLK ^ 1);
+			update |= SYS_UPDATECFG;
+			break;
+
+		case IDM_DISPFRAME:
+			xmenu_setdispclk(np2oscfg.DISPCLK ^ 2);
+			update |= SYS_UPDATECFG;
+			break;
+
+		case IDM_CALENDAR:
+			winuienter();
+			DialogBox(hInst, MAKEINTRESOURCE(IDD_CALENDAR),
+											hWnd, (DLGPROC)ClndDialogProc);
+			winuileave();
+			break;
+
+		case IDM_ALTENTER:
+			xmenu_setshortcut(np2oscfg.shortcut ^ 1);
+			update |= SYS_UPDATECFG;
+			break;
+
+		case IDM_ALTF4:
+			xmenu_setshortcut(np2oscfg.shortcut ^ 2);
+			update |= SYS_UPDATECFG;
+			break;
+
+		case IDM_JOYX:
+			xmenu_setbtnmode(np2cfg.BTN_MODE ^ 1);
+			update |= SYS_UPDATECFG;
+			break;
+
+		case IDM_RAPID:
+			xmenu_setbtnrapid(np2cfg.BTN_RAPID ^ 1);
+			update |= SYS_UPDATECFG;
+			break;
+
+		case IDM_MSRAPID:
+			xmenu_setmsrapid(np2cfg.MOUSERAPID ^ 1);
+			update |= SYS_UPDATECFG;
+			break;
+
+		case IDM_SSTP:
+			xmenu_setsstp(np2oscfg.sstp ^ 1);
+			update |= SYS_UPDATECFG;
+			break;
+
+		case IDM_I286SAVE:
+			debugsub_status();
+			break;
+
+		case IDM_HELP:
+			ShellExecute(hWnd, NULL, file_getcd(np2help),
+									NULL, NULL, SW_SHOWNORMAL);
+			break;
+
+		case IDM_ABOUT:
+			sstpmsg_about();
+			if (sstp_result() != SSTP_SENDING) {
+				winuienter();
+				DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUT),
+								hWnd, (DLGPROC)AboutDialogProc);
+				winuileave();
+			}
+			break;
+
+		default:
+#if defined(SUPPORT_STATSAVE)
+			if ((cmd >= IDM_FLAGSAVE) &&
+				(cmd < (IDM_FLAGSAVE + SUPPORT_STATSAVE))) {
+				char ext[4];
+				SPRINTF(ext, np2flagext, cmd - IDM_FLAGSAVE);
+				flagsave(ext);
+			}
+			else if ((cmd >= IDM_FLAGLOAD) &&
+				(cmd < (IDM_FLAGLOAD + SUPPORT_STATSAVE))) {
+				char ext[4];
+				SPRINTF(ext, np2flagext, cmd - IDM_FLAGLOAD);
+				flagload(ext, "Status Load", TRUE);
+			}
+#endif
+			break;
+	}
+	sysmng_update(update);
+}
+
 LRESULT CALLBACK WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) {
 
 	PAINTSTRUCT	ps;
@@ -354,16 +932,27 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 					update |= SYS_UPDATEOSCFG;
 					break;
 
+#if defined(SUPPORT_KEYDISP)
 				case IDM_KEYDISP:
 					sysmenu_setkeydisp(np2oscfg.keydisp ^ 1);
 					if (np2oscfg.keydisp) {
-						keydisp_create();
+						kdispwin_create();
 					}
 					else {
-						keydisp_destroy();
+						kdispwin_destroy();
 					}
 					break;
-
+#endif
+#if defined(SUPPORT_SOFTKBD)
+				case IDM_SOFTKBD:
+					skbdwin_create();
+					break;
+#endif
+#if defined(CPUCORE_IA32) && defined(SUPPORT_MEMDBG32)
+				case IDM_MEMDBG32:
+					mdbgwin_create();
+					break;
+#endif
 				case IDM_SCREENCENTER:
 					if ((!scrnmng_isfullscreen()) &&
 						(!(GetWindowLong(hWnd, GWL_STYLE) &
@@ -398,7 +987,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 					viewer_open();
 					break;
 
-				case IDM_SCRNMUL4:								// ver0.26
+				case IDM_SCRNMUL4:
 				case IDM_SCRNMUL6:
 				case IDM_SCRNMUL8:
 				case IDM_SCRNMUL10:
@@ -422,7 +1011,15 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 					if (subwin) {
 						ShowWindow(subwin, SW_SHOWNOACTIVATE);
 					}
-					subwin = keydisp_gethwnd();
+					subwin = kdispwin_gethwnd();
+					if (subwin) {
+						ShowWindow(subwin, SW_SHOWNOACTIVATE);
+					}
+					subwin = skbdwin_gethwnd();
+					if (subwin) {
+						ShowWindow(subwin, SW_SHOWNOACTIVATE);
+					}
+					subwin = mdbgwin_gethwnd();
 					if (subwin) {
 						ShowWindow(subwin, SW_SHOWNOACTIVATE);
 					}
@@ -435,457 +1032,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 			break;
 
 		case WM_COMMAND:
-			update = 0;
-			switch(LOWORD(wParam)) {
-				case IDM_RESET:
-					b = FALSE;
-					if (!np2oscfg.comfirm) {
-						b = TRUE;
-					}
-					else if (sstpconfirm_reset()) {
-						winuienter();
-						if (MessageBox(hWnd, "Sure?", "Reset",
-									MB_ICONQUESTION | MB_YESNO) == IDYES) {
-							b = TRUE;
-						}
-						winuileave();
-					}
-					if (b) {
-						sstpmsg_reset();
-						pccore_cfgupdate();
-						pccore_reset();
-					}
-					break;
-
-				case IDM_CONFIG:
-					winuienter();
-					sstpmsg_config();
-					DialogBox(hInst, MAKEINTRESOURCE(IDD_CONFIG),
-									hWnd, (DLGPROC)CfgDialogProc);
-					winuileave();
-					break;
-
-				case IDM_NEWDISK:
-					winuienter();
-					dialog_newdisk(hWnd);
-					winuileave();
-					break;
-
-				case IDM_CHANGEFONT:
-					winuienter();
-					dialog_font(hWnd);
-					winuileave();
-					break;
-
-				case IDM_EXIT:
-					SendMessage(hWnd, WM_CLOSE, 0, 0L);
-					break;
-
-				case IDM_FDD1OPEN:
-					winuienter();
-					dialog_changefdd(hWnd, 0);
-					winuileave();
-					break;
-
-				case IDM_FDD1EJECT:
-					diskdrv_setfdd(0, NULL, 0);
-					toolwin_setfdd(0, NULL);
-					break;
-
-				case IDM_FDD2OPEN:
-					winuienter();
-					dialog_changefdd(hWnd, 1);
-					winuileave();
-					break;
-
-				case IDM_FDD2EJECT:
-					diskdrv_setfdd(1, NULL, 0);
-					toolwin_setfdd(1, NULL);
-					break;
-
-				case IDM_SASI1OPEN:
-					winuienter();
-					dialog_changehdd(hWnd, 0);
-					winuileave();
-					break;
-
-				case IDM_SASI1EJECT:
-					diskdrv_sethdd(0, NULL);
-					break;
-
-				case IDM_SASI2OPEN:
-					winuienter();
-					dialog_changehdd(hWnd, 1);
-					winuileave();
-					break;
-
-				case IDM_SASI2EJECT:
-					diskdrv_sethdd(1, NULL);
-					break;
-
-				case IDM_WINDOW:
-					changescreen(scrnmode & (~SCRNMODE_FULLSCREEN));
-					break;
-
-				case IDM_FULLSCREEN:
-					changescreen(scrnmode | SCRNMODE_FULLSCREEN);
-					break;
-
-				case IDM_ROLNORMAL:
-					xmenu_setroltate(0);
-					changescreen(scrnmode & (~SCRNMODE_ROTATEMASK));
-					break;
-
-				case IDM_ROLLEFT:
-					xmenu_setroltate(1);
-					changescreen((scrnmode & (~SCRNMODE_ROTATEMASK)) |
-														SCRNMODE_ROTATELEFT);
-					break;
-
-				case IDM_ROLRIGHT:
-					xmenu_setroltate(2);
-					changescreen((scrnmode & (~SCRNMODE_ROTATEMASK)) |
-														SCRNMODE_ROTATERIGHT);
-					break;
-
-				case IDM_DISPSYNC:
-					xmenu_setdispmode(np2cfg.DISPSYNC ^ 1);
-					update |= SYS_UPDATECFG;
-					break;
-
-				case IDM_RASTER:
-					xmenu_setraster(np2cfg.RASTER ^ 1);
-					if (np2cfg.RASTER) {
-						changescreen(scrnmode | SCRNMODE_HIGHCOLOR);
-					}
-					else {
-						changescreen(scrnmode & (~SCRNMODE_HIGHCOLOR));
-					}
-					update |= SYS_UPDATECFG;
-					break;
-
-				case IDM_NOWAIT:
-					xmenu_setwaitflg(np2oscfg.NOWAIT ^ 1);
-					update |= SYS_UPDATECFG;
-					break;
-
-				case IDM_AUTOFPS:
-					xmenu_setframe(0);
-					update |= SYS_UPDATECFG;
-					break;
-
-				case IDM_60FPS:
-					xmenu_setframe(1);
-					update |= SYS_UPDATECFG;
-					break;
-
-				case IDM_30FPS:
-					xmenu_setframe(2);
-					update |= SYS_UPDATECFG;
-					break;
-
-				case IDM_20FPS:
-					xmenu_setframe(3);
-					update |= SYS_UPDATECFG;
-					break;
-
-				case IDM_15FPS:
-					xmenu_setframe(4);
-					update |= SYS_UPDATECFG;
-					break;
-
-				case IDM_SCREENOPT:
-					winuienter();
-					dialog_scropt(hWnd);
-					winuileave();
-					break;
-
-				case IDM_KEY:
-					xmenu_setkey(0);
-					keystat_resetjoykey();
-					break;
-
-				case IDM_JOY1:
-					xmenu_setkey(1);
-					keystat_resetjoykey();
-					break;
-
-				case IDM_JOY2:
-					xmenu_setkey(2);
-					keystat_resetjoykey();
-					break;
-
-				case IDM_XSHIFT:
-					xmenu_setxshift(np2cfg.XSHIFT ^ 1);
-					keystat_forcerelease(0x70);
-					break;
-
-				case IDM_XCTRL:
-					xmenu_setxshift(np2cfg.XSHIFT ^ 2);
-					keystat_forcerelease(0x74);
-					break;
-
-				case IDM_XGRPH:
-					xmenu_setxshift(np2cfg.XSHIFT ^ 4);
-					keystat_forcerelease(0x73);
-					break;
-
-				case IDM_F12MOUSE:
-					xmenu_setf12copy(0);
-					winkbd_resetf12();
-					update |= SYS_UPDATECFG;
-					break;
-
-				case IDM_F12COPY:
-					xmenu_setf12copy(1);
-					winkbd_resetf12();
-					update |= SYS_UPDATECFG;
-					break;
-
-				case IDM_F12STOP:
-					xmenu_setf12copy(2);
-					winkbd_resetf12();
-					update |= SYS_UPDATECFG;
-					break;
-
-				case IDM_F12EQU:
-					xmenu_setf12copy(3);
-					winkbd_resetf12();
-					update |= SYS_UPDATECFG;
-					break;
-
-				case IDM_F12COMMA:
-					xmenu_setf12copy(4);
-					winkbd_resetf12();
-					update |= SYS_UPDATECFG;
-					break;
-
-				case IDM_BEEPOFF:
-					xmenu_setbeepvol(0);
-					beep_setvol(0);
-					update |= SYS_UPDATECFG;
-					break;
-
-				case IDM_BEEPLOW:
-					xmenu_setbeepvol(1);
-					beep_setvol(1);
-					update |= SYS_UPDATECFG;
-					break;
-
-				case IDM_BEEPMID:
-					xmenu_setbeepvol(2);
-					beep_setvol(2);
-					update |= SYS_UPDATECFG;
-					break;
-
-				case IDM_BEEPHIGH:
-					xmenu_setbeepvol(3);
-					beep_setvol(3);
-					update |= SYS_UPDATECFG;
-					break;
-
-				case IDM_NOSOUND:
-					xmenu_setsound(0x00);
-					update |= SYS_UPDATECFG;
-					break;
-
-				case IDM_PC9801_14:
-					xmenu_setsound(0x01);
-					update |= SYS_UPDATECFG;
-					break;
-
-				case IDM_PC9801_26K:
-					xmenu_setsound(0x02);
-					update |= SYS_UPDATECFG;
-					break;
-
-				case IDM_PC9801_86:
-					xmenu_setsound(0x04);
-					update |= SYS_UPDATECFG;
-					break;
-
-				case IDM_PC9801_26_86:
-					xmenu_setsound(0x06);
-					update |= SYS_UPDATECFG;
-					break;
-
-				case IDM_PC9801_86_CB:
-					xmenu_setsound(0x14);
-					update |= SYS_UPDATECFG;
-					break;
-
-				case IDM_PC9801_118:
-					xmenu_setsound(8);
-					update |= SYS_UPDATECFG;
-					break;
-
-				case IDM_SPEAKBOARD:
-					xmenu_setsound(0x20);
-					update |= SYS_UPDATECFG;
-					break;
-
-				case IDM_SPARKBOARD:
-					xmenu_setsound(0x40);
-					update |= SYS_UPDATECFG;
-					break;
-
-				case IDM_AMD98:
-					xmenu_setsound(0x80);
-					update |= SYS_UPDATECFG;
-					break;
-
-				case IDM_SNDOPT:
-					winuienter();
-					dialog_sndopt(hWnd);
-					winuileave();
-					break;
-
-				case IDM_SEEKSND:
-					xmenu_setmotorflg(np2cfg.MOTOR ^ 1);
-					update |= SYS_UPDATECFG;
-					break;
-
-				case IDM_MEM640:
-					xmenu_setextmem(0);
-					update |= SYS_UPDATECFG;
-					break;
-
-				case IDM_MEM16:
-					xmenu_setextmem(1);
-					update |= SYS_UPDATECFG;
-					break;
-
-				case IDM_MEM36:
-					xmenu_setextmem(3);
-					update |= SYS_UPDATECFG;
-					break;
-
-				case IDM_MEM76:
-					xmenu_setextmem(7);
-					update |= SYS_UPDATECFG;
-					break;
-
-				case IDM_MOUSE:
-					mousemng_toggle(MOUSEPROC_SYSTEM);
-					xmenu_setmouse(np2oscfg.MOUSE_SW ^ 1);
-					update |= SYS_UPDATECFG;
-					break;
-
-				case IDM_SERIAL1:
-					winuienter();
-					dialog_serial(hWnd);
-					winuileave();
-					break;
-
-				case IDM_MPUPC98:
-					winuienter();
-					DialogBox(hInst, MAKEINTRESOURCE(IDD_MPUPC98),
-											hWnd, (DLGPROC)MidiDialogProc);
-					winuileave();
-					break;
-
-				case IDM_MIDIPANIC:									// ver0.29
-					rs232c_midipanic();
-					mpu98ii_midipanic();
-					pc9861k_midipanic();
-					break;
-
-				case IDM_BMPSAVE:
-					winuienter();
-					dialog_writebmp(hWnd);
-					winuileave();
-					break;
-
-				case IDM_S98LOGGING:
-					winuienter();
-					dialog_s98(hWnd);
-					winuileave();
-					break;
-
-				case IDM_DISPCLOCK:
-					xmenu_setdispclk(np2oscfg.DISPCLK ^ 1);
-					update |= SYS_UPDATECFG;
-					break;
-
-				case IDM_DISPFRAME:
-					xmenu_setdispclk(np2oscfg.DISPCLK ^ 2);
-					update |= SYS_UPDATECFG;
-					break;
-
-				case IDM_CALENDAR:
-					winuienter();
-					DialogBox(hInst, MAKEINTRESOURCE(IDD_CALENDAR),
-											hWnd, (DLGPROC)ClndDialogProc);
-					winuileave();
-					break;
-
-				case IDM_ALTENTER:
-					xmenu_setshortcut(np2oscfg.shortcut ^ 1);
-					update |= SYS_UPDATECFG;
-					break;
-
-				case IDM_ALTF4:
-					xmenu_setshortcut(np2oscfg.shortcut ^ 2);
-					update |= SYS_UPDATECFG;
-					break;
-
-				case IDM_JOYX:
-					xmenu_setbtnmode(np2cfg.BTN_MODE ^ 1);
-					update |= SYS_UPDATECFG;
-					break;
-
-				case IDM_RAPID:
-					xmenu_setbtnrapid(np2cfg.BTN_RAPID ^ 1);
-					update |= SYS_UPDATECFG;
-					break;
-
-				case IDM_MSRAPID:
-					xmenu_setmsrapid(np2cfg.MOUSERAPID ^ 1);
-					update |= SYS_UPDATECFG;
-					break;
-
-				case IDM_SSTP:
-					xmenu_setsstp(np2oscfg.sstp ^ 1);
-					update |= SYS_UPDATECFG;
-					break;
-
-				case IDM_I286SAVE:
-					debugsub_status();
-					break;
-
-				case IDM_HELP:
-					ShellExecute(hWnd, NULL, file_getcd(np2help),
-											NULL, NULL, SW_SHOWNORMAL);
-					break;
-
-				case IDM_ABOUT:
-					sstpmsg_about();
-					if (sstp_result() != SSTP_SENDING) {
-						winuienter();
-						DialogBox(hInst, MAKEINTRESOURCE(IDD_ABOUT),
-										hWnd, (DLGPROC)AboutDialogProc);
-						winuileave();
-					}
-					break;
-
-				default:
-					if ((LOWORD(wParam) >= IDM_FLAGSAVE) &&
-						(LOWORD(wParam) < IDM_FLAGSAVE + STATSAVEMAX)) {
-						char ext[4];
-						wsprintf(ext, np2flagext,
-									(LOWORD(wParam) - IDM_FLAGSAVE) % 100);
-						flagsave(ext);
-					}
-					if ((LOWORD(wParam) >= IDM_FLAGLOAD) &&
-						(LOWORD(wParam) < IDM_FLAGLOAD + STATSAVEMAX)) {
-						char ext[4];
-						wsprintf(ext, np2flagext,
-									(LOWORD(wParam) - IDM_FLAGLOAD) % 100);
-						flagload(ext, "Status Load", TRUE);
-					}
-					break;
-			}
-			sysmng_update(update);
+			np2cmd(hWnd, LOWORD(wParam));
 			break;
 
 		case WM_ACTIVATE:
@@ -943,14 +1090,13 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 			break;
 
 		case WM_MOVE:
-			if (!scrnmng_isfullscreen()) {
-				if (!(GetWindowLong(hWnd, GWL_STYLE) &
-											(WS_MAXIMIZE | WS_MINIMIZE))) {
-					GetWindowRect(hWnd, &rc);
-					np2oscfg.winx = rc.left;
-					np2oscfg.winy = rc.top;
-					sysmng_update(SYS_UPDATEOSCFG);
-				}
+			if ((!scrnmng_isfullscreen()) &&
+				(!(GetWindowLong(hWnd, GWL_STYLE) &
+									(WS_MAXIMIZE | WS_MINIMIZE)))) {
+				GetWindowRect(hWnd, &rc);
+				np2oscfg.winx = rc.left;
+				np2oscfg.winy = rc.top;
+				sysmng_update(SYS_UPDATEOSCFG);
 			}
 			break;
 
@@ -1069,7 +1215,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 			}
 			break;
 
-		case WM_MBUTTONDOWN:									// ver0.26
+		case WM_MBUTTONDOWN:
 			mousemng_toggle(MOUSEPROC_SYSTEM);
 			xmenu_setmouse(np2oscfg.MOUSE_SW ^ 1);
 			sysmng_update(SYS_UPDATECFG);
@@ -1128,7 +1274,6 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 				winuileave();
 			}
 			if (b) {
-				keydisp_destroy();
 				viewer_allclose();
 				DestroyWindow(hWnd);
 			}
@@ -1153,6 +1298,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 					break;
 
 				case NP2CMD_RESET:
+					juliet_YMF288Reset();
 					pccore_cfgupdate();
 					pccore_reset();
 					break;
@@ -1203,7 +1349,9 @@ static void framereset(UINT cnt) {
 
 	framecnt = 0;
 	scrnmng_dispclock();
-	keydisp_draw((BYTE)cnt);
+	kdispwin_draw((BYTE)cnt);
+	skbdwin_process();
+	mdbgwin_process();
 	toolwin_draw((BYTE)cnt);
 	viewer_allreload(FALSE);
 	if (np2oscfg.DISPCLK & 3) {
@@ -1222,6 +1370,7 @@ static void processwait(UINT cnt) {
 	else {
 		Sleep(1);
 	}
+	soundmng_sync();
 }
 
 
@@ -1229,29 +1378,32 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 										LPSTR lpszCmdLine, int nCmdShow) {
 	WNDCLASS	wc;
 	MSG			msg;
-	HMENU		hMenu;
-	HWND		hwndorg;
+	HWND		hWnd;
 	UINT		i;
 #ifdef OPENING_WAIT
 	UINT32		tick;
 #endif
 
+	_MEM_INIT();
+
 	GetModuleFileName(NULL, modulefile, sizeof(modulefile));
 	dosio_init();
 	file_setcd(modulefile);
 	np2arg_analize(lpszCmdLine);
 	initload();
 	toolwin_readini();
-	keydisp_readini();
+	kdispwin_readini();
+	skbdwin_readini();
+	mdbgwin_readini();
 
 	rand_setseed((unsigned)time(NULL));
 
 	CopyMemory(szClassName, np2oscfg.winid, 3);
 
-	if ((hwndorg = FindWindow(szClassName, NULL)) != NULL) {
+	if ((hWnd = FindWindow(szClassName, NULL)) != NULL) {
 		sstpmsg_running();
-		ShowWindow(hwndorg, SW_RESTORE);
-		SetForegroundWindow(hwndorg);
+		ShowWindow(hWnd, SW_RESTORE);
+		SetForegroundWindow(hWnd);
 		dosio_term();
 		return(FALSE);
 	}
@@ -1262,7 +1414,7 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 	mmxflag += (np2oscfg.disablemmx)?MMXFLAG_DISABLE:0;
 	TRACEINIT();
 
-	if (np2oscfg.KEYBOARD >= KEY_TYPEMAX) {							// ver0.28
+	if (np2oscfg.KEYBOARD >= KEY_TYPEMAX) {
 		int keytype = GetKeyboardType(1);
 		if ((keytype & 0xff00) == 0x0d00) {
 			np2oscfg.KEYBOARD = KEY_PC98;
@@ -1274,7 +1426,9 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 			np2oscfg.KEYBOARD = KEY_KEY106;
 		}
 	}
-	keystat_reset();
+	winkbd_roll(np2oscfg.KEYBOARD != KEY_PC98);
+	winkbd_setf12(np2oscfg.F12COPY);
+	keystat_initialize();
 
 	np2class_initialize(hInstance);
 	if (!hPreInst) {
@@ -1293,66 +1447,57 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 		}
 	}
 	toolwin_initapp(hInstance);
-	keydisp_initialize(hPreInst);
-	viewer_init(hPreInst);										// ver0.30
+	kdispwin_initialize(hPreInst);
+	skbdwin_initialize(hPreInst);
+	mdbgwin_initialize(hPreInst);
+	viewer_init(hPreInst);
+
+	mousemng_initialize();
 
-	hWndMain = CreateWindow(szClassName, np2oscfg.titles,
+	hWnd = CreateWindowEx(0, szClassName, np2oscfg.titles,
 						WS_OVERLAPPED | WS_SYSMENU | WS_CAPTION |
 						WS_THICKFRAME | WS_MINIMIZEBOX,
 						np2oscfg.winx, np2oscfg.winy, 640, 400,
 						NULL, NULL, hInstance, NULL);
+	hWndMain = hWnd;
 	scrnmng_initialize();
 
-	xmenu_setsound(np2cfg.SOUND_SW);
-	xmenu_setbeepvol(np2cfg.BEEP_VOL);
-	xmenu_setkey(0);
-	xmenu_setbtnrapid(np2cfg.BTN_RAPID);
-	xmenu_setbtnmode(np2cfg.BTN_MODE);
-	xmenu_setmsrapid(np2cfg.MOUSERAPID);
+	xmenu_setroltate(0);
+	xmenu_setdispmode(np2cfg.DISPSYNC);
+	xmenu_setraster(np2cfg.RASTER);
 	xmenu_setwaitflg(np2oscfg.NOWAIT);
 	xmenu_setframe(np2oscfg.DRAW_SKIP);
-	xmenu_setdispmode(np2cfg.DISPSYNC);
-	xmenu_setdispclk(np2oscfg.DISPCLK);
-	xmenu_seti286save(np2oscfg.I286SAVE);
-	xmenu_setmotorflg(np2cfg.MOTOR);
-	xmenu_setroltate(0);
+
+	xmenu_setkey(0);
 	xmenu_setxshift(0);
 	xmenu_setf12copy(np2oscfg.F12COPY);
+	xmenu_setbeepvol(np2cfg.BEEP_VOL);
+	xmenu_setsound(np2cfg.SOUND_SW);
+	xmenu_setjastsound(np2oscfg.jastsnd);
+	xmenu_setmotorflg(np2cfg.MOTOR);
 	xmenu_setextmem(np2cfg.EXTMEM);
-	xmenu_setraster(np2cfg.RASTER);
-	xmenu_setshortcut(np2oscfg.shortcut);						// ver0.30
-	xmenu_setsstp(np2oscfg.sstp);
 	xmenu_setmouse(np2oscfg.MOUSE_SW);
 
-	ShowWindow(hWndMain, nCmdShow);
-	UpdateWindow(hWndMain);
+	xmenu_setshortcut(np2oscfg.shortcut);
+	xmenu_setdispclk(np2oscfg.DISPCLK);
+	xmenu_setbtnmode(np2cfg.BTN_MODE);
+	xmenu_setbtnrapid(np2cfg.BTN_RAPID);
+	xmenu_setmsrapid(np2cfg.MOUSERAPID);
+	xmenu_setsstp(np2oscfg.sstp);
+
+	ShowWindow(hWnd, nCmdShow);
+	UpdateWindow(hWnd);
 
 #ifdef OPENING_WAIT
 	tick = GetTickCount();
 #endif
 
-	// めにゅー追加
-	if (np2oscfg.statsave) {
-		char buf[16];
-		hMenu = GetMenu(hWndMain);
-		hStat = CreatePopupMenu();
-		for (i=0; i<STATSAVEMAX; i++) {
-			wsprintf(buf, "Save %d", i);
-			AppendMenu(hStat, MF_STRING, IDM_FLAGSAVE + i, buf);
-		}
-		AppendMenu(hStat, MF_MENUBARBREAK, 0, NULL);
-		for (i=0; i<STATSAVEMAX; i++) {
-			wsprintf(buf, "Load %d", i);
-			AppendMenu(hStat, MF_STRING, IDM_FLAGLOAD + i, buf);
-		}
-		InsertMenu(hMenu, 1, MF_BYPOSITION | MF_POPUP, (UINT)hStat, "S&tat");
-	}
 	sysmenu_initialize();
-	DrawMenuBar(hWndMain);
+	xmenu_initialize();
+	DrawMenuBar(hWnd);
 
-	// ver0.30
-	if (file_attr_c(np2help) == (short)-1) {
-		EnableMenuItem(GetMenu(hWndMain), IDM_HELP, MF_GRAYED);
+	if (file_attr_c(np2help) == (short)-1) {						// ver0.30
+		EnableMenuItem(GetMenu(hWnd), IDM_HELP, MF_GRAYED);
 	}
 
 	sysmenu_settoolwin(np2oscfg.toolwin);
@@ -1360,7 +1505,7 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 	sysmenu_setwinsnap(np2oscfg.WINSNAP);
 	sysmenu_setbackground(np2oscfg.background);
 	sysmenu_setbgsound(np2oscfg.background);
-	sysmenu_setscrnmul(8);										// ver0.26
+	sysmenu_setscrnmul(8);
 
 	scrnmode = 0;
 	if (np2arg.fullscreen) {
@@ -1373,7 +1518,7 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 		scrnmode ^= SCRNMODE_FULLSCREEN;
 		if (scrnmng_create(scrnmode) != SUCCESS) {
 			if (sstpmsg_dxerror()) {
-				MessageBox(hWndMain, "Couldn't create DirectDraw Object",
+				MessageBox(hWnd, "Couldn't create DirectDraw Object",
 										np2oscfg.titles, MB_OK | MB_ICONSTOP);
 			}
 			return(FALSE);
@@ -1387,22 +1532,18 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 		soundmng_pcmvolume(SOUND_PCMSEEK1, np2cfg.MOTORVOL);
 	}
 
-#ifdef USE_ROMEO
-	juliet_load();
-	juliet_prepare();
-#endif
+	if (np2oscfg.useromeo) {
+		juliet_initialize();
+	}
 
-	mousemng_initialize();
 	if (np2oscfg.MOUSE_SW) {										// ver0.30
 		mousemng_enable(MOUSEPROC_SYSTEM);
 	}
-//	mousemng_enable(MOUSEPROC_WINUI);
-//	mousemng_enable(MOUSEPROC_BG);
 
 	commng_initialize();
 	sysmng_initialize();
 
-	joy_init();
+	joymng_initialize();
 	pccore_init();
 	S98_init();
 
@@ -1416,27 +1557,19 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 
 	pccore_reset();
 
-	if (!(scrnmode & SCRNMODE_FULLSCREEN)) {
-		if (np2oscfg.toolwin) {
-			toolwin_create();
-		}
-		if (np2oscfg.keydisp) {
-			keydisp_create();
-		}
-	}
-
 	np2opening = 0;
 
 	// れじうむ
+#if defined(SUPPORT_RESUME)
 	if (np2oscfg.resume) {
 		int		id;
 
-		id = flagload(np2resumeext, "Resume", FALSE);
+		id = flagload(str_sav, str_resume, FALSE);
 		if (id == IDYES) {
 			for (i=0; i<4; i++) np2arg.disk[i] = NULL;
 		}
 		else if (id == IDCANCEL) {
-			DestroyWindow(hWndMain);
+			DestroyWindow(hWnd);
 			mousemng_disable(MOUSEPROC_WINUI);
 			S98_trash();
 			pccore_term();
@@ -1449,8 +1582,9 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 			return(0);
 		}
 	}
+#endif
 
-//	リセットしてから… コマンドラインのディスク挿入。				// ver0.29
+//	リセットしてから… コマンドラインのディスク挿入。
 	for (i=0; i<4; i++) {
 		if (np2arg.disk[i]) {
 			milstr_ncpy(diskdrv_fname[i], np2arg.disk[i], MAX_PATH);
@@ -1458,13 +1592,22 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 		}
 	}
 
+	if (!(scrnmode & SCRNMODE_FULLSCREEN)) {
+		if (np2oscfg.toolwin) {
+			toolwin_create();
+		}
+		if (np2oscfg.keydisp) {
+			kdispwin_create();
+		}
+	}
+
 	while(1) {
 		if (!np2stopemulate) {
 			if (PeekMessage(&msg, 0, 0, 0, PM_NOREMOVE)) {
 				if (!GetMessage(&msg, NULL, 0, 0)) {
 					break;
 				}
-				if ((msg.hwnd != hWndMain) ||
+				if ((msg.hwnd != hWnd) ||
 					((msg.message != WM_SYSKEYDOWN) &&
 					(msg.message != WM_SYSKEYUP))) {
 					TranslateMessage(&msg);
@@ -1473,8 +1616,8 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 			}
 			else {
 				if (np2oscfg.NOWAIT) {
-					joy_flash();
-					mousemng_callback();
+					joymng_sync();
+					mousemng_sync();
 					pccore_exec(framecnt == 0);
 					dclock_callback();
 					if (np2oscfg.DRAW_SKIP) {		// nowait frame skip
@@ -1492,8 +1635,8 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 				}
 				else if (np2oscfg.DRAW_SKIP) {		// frame skip
 					if (framecnt < np2oscfg.DRAW_SKIP) {
-						joy_flash();
-						mousemng_callback();
+						joymng_sync();
+						mousemng_sync();
 						pccore_exec(framecnt == 0);
 						dclock_callback();
 						framecnt++;
@@ -1505,8 +1648,8 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 				else {								// auto skip
 					if (!waitcnt) {
 						UINT cnt;
-						joy_flash();
-						mousemng_callback();
+						joymng_sync();
+						mousemng_sync();
 						pccore_exec(framecnt == 0);
 						dclock_callback();
 						framecnt++;
@@ -1547,29 +1690,30 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 		}
 	}
 	toolwin_destroy();
+	kdispwin_destroy();
+	skbdwin_destroy();
+	mdbgwin_destroy();
 
 	pccore_cfgupdate();
 
 	mousemng_disable(MOUSEPROC_WINUI);
 	S98_trash();
 
+#if defined(SUPPORT_RESUME)
 	if (np2oscfg.resume) {
-		flagsave(np2resumeext);
+		flagsave(str_sav);
 	}
 	else {
-		flagdelete(np2resumeext);
+		flagdelete(str_sav);
 	}
+#endif
 
-#ifdef USE_ROMEO
 	juliet_YMF288Reset();
-#endif
 	pccore_term();
 
 	sstp_destruct();
 
-#ifdef USE_ROMEO
-	juliet_unload();
-#endif
+	juliet_deinitialize();
 
 	soundmng_deinitialize();
 	scrnmng_destroy();
@@ -1577,13 +1721,17 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 	if (sys_updates	& (SYS_UPDATECFG | SYS_UPDATEOSCFG)) {
 		initsave();
 		toolwin_writeini();
-		keydisp_writeini();
+		kdispwin_writeini();
+		skbdwin_writeini();
+		mdbgwin_writeini();
 	}
+	skbdwin_deinitialize();
 
 	TRACETERM();
+	_MEM_USED("report.txt");
 	dosio_term();
 
-	viewer_term();												// ver0.30
+	viewer_term();													// ver0.30
 
 	return(msg.wParam);
 }