--- np2/win9x/np2.cpp	2003/11/24 07:40:02	1.32
+++ np2/win9x/np2.cpp	2004/01/22 01:10:05	1.35
@@ -43,7 +43,6 @@
 #include	"diskdrv.h"
 #include	"fddfile.h"
 #include	"timing.h"
-#include	"statsave.h"
 #include	"debugsub.h"
 #include	"keydisp.h"
 #include	"kdispwin.h"
@@ -66,7 +65,7 @@ static	char		szClassName[] = "NP2-MainWi
 
 		NP2OSCFG	np2oscfg = {
 						"Neko Project II", "NP2",
-						CW_USEDEFAULT, CW_USEDEFAULT, 1, 1, 0, 1, 0, 2,
+						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
@@ -74,7 +73,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};	// ver0.73
 
 		char		fddfolder[MAX_PATH];
 		char		hddfolder[MAX_PATH];
@@ -319,6 +318,8 @@ static void np2popup(HWND hWnd, LPARAM l
 	DestroyMenu(hMenu);
 }
 
+// extern "C" void iptrace_out(void);
+
 LRESULT CALLBACK WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) {
 
 	PAINTSTRUCT	ps;
@@ -504,22 +505,22 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 
 				case IDM_SASI1OPEN:
 					winuienter();
-					dialog_changehdd(hWnd, 0);
+					dialog_changehdd(hWnd, 0x00);
 					winuileave();
 					break;
 
 				case IDM_SASI1EJECT:
-					diskdrv_sethdd(0, NULL);
+					diskdrv_sethdd(0x00, NULL);
 					break;
 
 				case IDM_SASI2OPEN:
 					winuienter();
-					dialog_changehdd(hWnd, 1);
+					dialog_changehdd(hWnd, 0x01);
 					winuileave();
 					break;
 
 				case IDM_SASI2EJECT:
-					diskdrv_sethdd(1, NULL);
+					diskdrv_sethdd(0x01, NULL);
 					break;
 
 				case IDM_WINDOW:
@@ -739,10 +740,9 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 					update |= SYS_UPDATECFG;
 					break;
 
-				case IDM_SNDOPT:
-					winuienter();
-					dialog_sndopt(hWnd);
-					winuileave();
+				case IDM_JASTSOUND:
+					xmenu_setjastsound(np2oscfg.jastsnd ^ 1);
+					update |= SYS_UPDATEOSCFG;
 					break;
 
 				case IDM_SEEKSND:
@@ -795,6 +795,12 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 					pc9861k_midipanic();
 					break;
 
+				case IDM_SNDOPT:
+					winuienter();
+					dialog_sndopt(hWnd);
+					winuileave();
+					break;
+
 				case IDM_BMPSAVE:
 					winuienter();
 					dialog_writebmp(hWnd);
@@ -856,6 +862,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 
 				case IDM_I286SAVE:
 					debugsub_status();
+// iptrace_out();
 					break;
 
 				case IDM_HELP:
@@ -1301,37 +1308,50 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 	}
 	toolwin_initapp(hInstance);
 	kdispwin_initialize(hPreInst);
-	viewer_init(hPreInst);										// ver0.30
+	viewer_init(hPreInst);
 
-	hWndMain = CreateWindow(szClassName, np2oscfg.titles,
+#if 1
+	hWndMain = 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);
+#else	// ¥Æ¥¹¥È
+	hWndMain = CreateWindowEx(0,
+						szClassName, np2oscfg.titles,
+						WS_OVERLAPPED | WS_SYSMENU | WS_CAPTION |
+						WS_MINIMIZEBOX,
+						np2oscfg.winx, np2oscfg.winy, 640, 400,
+						NULL, NULL, hInstance, NULL);
+#endif
 	hWnd = hWndMain;
 	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);
 
+	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);
+	xmenu_seti286save(np2oscfg.I286SAVE);
+
 	ShowWindow(hWnd, nCmdShow);
 	UpdateWindow(hWnd);