--- np2/win9xc/np2.cpp	2005/03/20 08:58:20	1.32
+++ np2/win9xc/np2.cpp	2011/02/15 00:51:52	1.34
@@ -653,15 +653,20 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 		case WM_PAINT:
 			hdc = BeginPaint(hWnd, &ps);
 			if (np2opening) {
-			    HINSTANCE	hinst;
+				HINSTANCE	hinst;
 				RECT		rect;
 				int			width;
 				int			height;
-			    HBITMAP		hbmp;
-			    BITMAP		bmp;
-			    HDC			hmdc;
+				HBITMAP		hbmp;
+				BITMAP		bmp;
+				HDC			hmdc;
 				HBRUSH		hbrush;
-			    hinst = (HINSTANCE)GetWindowLong(hWnd, GWL_HINSTANCE);
+
+#if defined(_WIN64)
+				hinst = reinterpret_cast<HINSTANCE>(::GetWindowLongPtr(hWnd, GWLP_HINSTANCE));
+#else
+				hinst = reinterpret_cast<HINSTANCE>(::GetWindowLong(hWnd, GWL_HINSTANCE));
+#endif
 				GetClientRect(hWnd, &rect);
 				width = rect.right - rect.left;
 				height = rect.bottom - rect.top;
@@ -1018,8 +1023,7 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 //	リセットしてから… コマンドラインのディスク挿入。				// ver0.29
 	for (i=0; i<4; i++) {
 		if (np2arg.disk[i]) {
-			milstr_ncpy(diskdrv_fname[i], np2arg.disk[i], MAX_PATH);
-			diskdrv_delay[i] = 1;
+			diskdrv_readyfdd((REG8)i, np2arg.disk[i], 0);
 		}
 	}
 
@@ -1134,6 +1138,6 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 	_MEM_USED("report.txt");
 	dosio_term();
 
-	return(msg.wParam);
+	return static_cast<int>(msg.wParam);
 }