--- np2/win9x/np2.cpp	2005/02/09 20:11:35	1.57
+++ np2/win9x/np2.cpp	2005/03/19 18:54:58	1.59
@@ -78,7 +78,7 @@ static	OEMCHAR		szClassName[] = OEMTEXT(
 						{0, 0, 0x3e, 19200,
 						 OEMTEXT(""), OEMTEXT(""), OEMTEXT(""), OEMTEXT("")},
 						0xffffff, 0xffbf6a, 0, 0,
-						0, 1, 0, 9801, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+						0, 1, 0, 9801, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 
 		OEMCHAR		fddfolder[MAX_PATH];
 		OEMCHAR		hddfolder[MAX_PATH];
@@ -1540,7 +1540,7 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 		scrnmode ^= SCRNMODE_FULLSCREEN;
 		if (scrnmng_create(scrnmode) != SUCCESS) {
 			if (sstpmsg_dxerror()) {
-				MessageBox(hWnd, OEMTEXT("Couldn't create DirectDraw Object"),
+				MessageBox(hWnd, _T("Couldn't create DirectDraw Object"),
 										np2oscfg.titles, MB_OK | MB_ICONSTOP);
 			}
 			return(FALSE);
@@ -1588,7 +1588,9 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 
 		id = flagload(str_sav, str_resume, FALSE);
 		if (id == IDYES) {
-			for (i=0; i<4; i++) np2arg.disk[i] = NULL;
+			for (i=0; i<4; i++) {
+				np2arg.disk[i] = NULL;
+			}
 		}
 		else if (id == IDCANCEL) {
 			DestroyWindow(hWnd);
@@ -1609,8 +1611,7 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 //	リセットしてから… コマンドラインのディスク挿入。
 	for (i=0; i<4; i++) {
 		if (np2arg.disk[i]) {
-			milstr_ncpy(diskdrv_fname[i], np2arg.disk[i], NELEMENTS(diskdrv_fname[0]));
-			diskdrv_delay[i] = 1;
+			diskdrv_readyfdd((REG8)i, np2arg.disk[i], 0);
 		}
 	}