--- np2/win9xc/np2.cpp	2004/03/23 18:34:05	1.26
+++ np2/win9xc/np2.cpp	2005/02/07 14:46:15	1.31
@@ -18,7 +18,7 @@
 #include	"winkbd.h"
 #include	"ini.h"
 #include	"menu.h"
-#include	"debugwin.h"
+#include	"subwind.h"
 #include	"dialog.h"
 #include	"cpucore.h"
 #include	"pccore.h"
@@ -69,7 +69,7 @@ static	UINT		waitcnt = 0;
 static	UINT		framemax = 1;
 static	int			np2opening = 1;
 static	int			np2quitmsg = 0;
-static	BYTE	scrnmode;
+static	UINT8	scrnmode;
 
 
 static const char np2help[] = "np2.chm";
@@ -88,10 +88,10 @@ static void winuileave(void) {
 	soundmng_enable(SNDPROC_MAIN);
 }
 
-static void changescreen(BYTE newmode) {
+static void changescreen(UINT8 newmode) {
 
-	BYTE	change;
-	BYTE	renewal;
+	UINT8	change;
+	UINT8	renewal;
 
 	change = scrnmode ^ newmode;
 	renewal = (change & SCRNMODE_FULLSCREEN);
@@ -552,13 +552,20 @@ static void np2cmd(HWND hWnd, UINT16 cmd
 			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_CALENDAR:
 			winuienter();
 			DialogBox(hInst, MAKEINTRESOURCE(IDD_CALENDAR),
@@ -818,7 +825,8 @@ static void framereset(void) {
 
 	framecnt = 0;
 	sysmng_updatecaption();
-	debugwin_process();
+	memdbg_process();
+	skbdwin_process();
 }
 
 static void processwait(UINT cnt) {
@@ -851,6 +859,8 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 	file_setcd(modulefile);
 	np2arg_analize(lpszCmdLine);
 	initload();
+	memdbg_readini();
+	skbdwin_readini();
 
 	rand_setseed((unsigned)time(NULL));
 
@@ -877,7 +887,7 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 			np2oscfg.KEYBOARD = KEY_KEY106;
 		}
 	}
-	keystat_reset();
+	keystat_initialize();
 
 	if (!hPreInst) {
 		wc.style = CS_BYTEALIGNCLIENT | CS_HREDRAW | CS_VREDRAW;
@@ -894,7 +904,8 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 			return(FALSE);
 		}
 	}
-	debugwin_initapp(hInstance);
+	memdbg_initialize(hInstance);
+	skbdwin_initialize(hInstance);
 
 	mousemng_initialize();
 
@@ -978,8 +989,6 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 
 	pccore_reset();
 
-	debugwin_create();
-
 	np2opening = 0;
 
 	// ¤ì¤¸¤¦¤à
@@ -1013,6 +1022,9 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 		}
 	}
 
+	memdbg_create();
+	skbdwin_create();
+
 	while(1) {
 		if (PeekMessage(&msg, 0, 0, 0, PM_NOREMOVE)) {
 			if (!GetMessage(&msg, NULL, 0, 0)) {
@@ -1103,15 +1115,20 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 #endif
 
 	pccore_term();
-	debugwin_destroy();
+	memdbg_destroy();
+	skbdwin_destroy();
 
 	soundmng_deinitialize();
 	scrnmng_destroy();
 
 	if (sys_updates	& (SYS_UPDATECFG | SYS_UPDATEOSCFG)) {
 		initsave();
+		memdbg_writeini();
+		skbdwin_writeini();
 	}
 
+	skbdwin_deinitialize();
+
 	TRACETERM();
 	_MEM_USED("report.txt");
 	dosio_term();