--- np2/win9x/np2.cpp	2005/03/19 18:54:58	1.59
+++ np2/win9x/np2.cpp	2006/12/23 23:34:32	1.66
@@ -51,7 +51,7 @@
 #define		OPENING_WAIT		1500
 #endif
 
-static	OEMCHAR		szClassName[] = OEMTEXT("NP2-MainWindow");
+static	TCHAR		szClassName[] = _T("NP2-MainWindow");
 		HWND		hWndMain;
 		HINSTANCE	hInst;
 		HINSTANCE	hPrev;
@@ -94,11 +94,47 @@ static	int			np2quitmsg = 0;
 static	HMENU		hStat = NULL;
 static	UINT8		scrnmode;
 static	WINLOCEX	smwlex;
+static	HMODULE		resmod;
 
 static const OEMCHAR np2help[] = OEMTEXT("np2.chm");
 static const OEMCHAR np2flagext[] = OEMTEXT("S%02d");
+static const OEMCHAR np2resext[] = OEMTEXT(".%u");
 
 
+// ----
+
+static HINSTANCE loadextinst(HINSTANCE hInstance) {
+
+	OEMCHAR	path[MAX_PATH];
+	OEMCHAR	cpstr[16];
+	HMODULE dll;
+
+	file_cpyname(path, modulefile, NELEMENTS(path));
+	file_cutext(path);
+	OEMSPRINTF(cpstr, np2resext, GetOEMCP());
+	file_catname(path, cpstr, NELEMENTS(path));
+	dll = LoadLibrary(path);
+	resmod = dll;
+	if (dll != NULL) {
+		hInstance = (HINSTANCE)dll;
+	}
+	return(hInstance);
+}
+
+static void unloadextinst(void) {
+
+	HMODULE dll;
+
+	dll = resmod;
+	if (dll) {
+		resmod = 0;
+		FreeLibrary(dll);
+	}
+}
+
+
+// ----
+
 static void winuienter(void) {
 
 	winui_en = TRUE;
@@ -291,7 +327,8 @@ static int flagload(const OEMCHAR *ext, 
 	id = IDYES;
 	ret = statsave_check(path, buf, NELEMENTS(buf));
 	if (ret & (~STATFLAG_DISKCHG)) {
-		MessageBox(hWndMain, OEMTEXT("Couldn't restart"), title, MB_OK | MB_ICONSTOP);
+		MessageBox(hWndMain, _T("Couldn't restart"), title,
+										MB_OK | MB_ICONSTOP);
 		id = IDNO;
 	}
 	else if ((!force) && (ret & STATFLAG_DISKCHG)) {
@@ -336,9 +373,11 @@ static void np2popup(HWND hWnd, LPARAM l
 
 static void np2cmd(HWND hWnd, UINT16 cmd) {
 
-	UINT	update;
-	BOOL	b;
+	HINSTANCE	hInst;
+	UINT		update;
+	BOOL		b;
 
+	hInst = (HINSTANCE)GetWindowLong(hWnd, GWL_HINSTANCE);
 	update = 0;
 	switch(cmd) {
 		case IDM_RESET:
@@ -442,25 +481,38 @@ static void np2cmd(HWND hWnd, UINT16 cmd
 			toolwin_setfdd(3, NULL);
 			break;
 
-		case IDM_SASI1OPEN:
+		case IDM_IDE0OPEN:
 			winuienter();
 			dialog_changehdd(hWnd, 0x00);
 			winuileave();
 			break;
 
-		case IDM_SASI1EJECT:
+		case IDM_IDE0EJECT:
 			diskdrv_sethdd(0x00, NULL);
 			break;
 
-		case IDM_SASI2OPEN:
+		case IDM_IDE1OPEN:
 			winuienter();
 			dialog_changehdd(hWnd, 0x01);
 			winuileave();
 			break;
 
-		case IDM_SASI2EJECT:
+		case IDM_IDE1EJECT:
 			diskdrv_sethdd(0x01, NULL);
 			break;
+
+#if defined(SUPPORT_IDEIO)
+		case IDM_IDE2OPEN:
+			winuienter();
+			dialog_changehdd(hWnd, 0x02);
+			winuileave();
+			break;
+
+		case IDM_IDE2EJECT:
+			diskdrv_sethdd(0x02, NULL);
+			break;
+#endif
+
 #if defined(SUPPORT_SCSI)
 		case IDM_SCSI0OPEN:
 			winuienter();
@@ -502,6 +554,7 @@ static void np2cmd(HWND hWnd, UINT16 cmd
 			diskdrv_sethdd(0x23, NULL);
 			break;
 #endif
+
 		case IDM_WINDOW:
 			changescreen(scrnmode & (~SCRNMODE_FULLSCREEN));
 			break;
@@ -875,7 +928,7 @@ static void np2cmd(HWND hWnd, UINT16 cmd
 			update |= SYS_UPDATECFG;
 			break;
 
-		case IDM_I286SAVE:
+		case IDM_CPUSAVE:
 			debugsub_status();
 			break;
 
@@ -1080,7 +1133,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 				GetClientRect(hWnd, &rect);
 				width = rect.right - rect.left;
 				height = rect.bottom - rect.top;
-				hbmp = LoadBitmap(hinst, OEMTEXT("NP2BMP"));
+				hbmp = LoadBitmap(hinst, _T("NP2BMP"));
 				GetObject(hbmp, sizeof(BITMAP), &bmp);
 				hbrush = (HBRUSH)SelectObject(hdc,
 												GetStockObject(BLACK_BRUSH));
@@ -1283,7 +1336,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 			}
 			else if (sstpconfirm_exit()) {
 				winuienter();
-				if (MessageBox(hWnd, OEMTEXT("Sure?"), OEMTEXT("Exit"),
+				if (MessageBox(hWnd, _T("Sure?"), _T("Exit"),
 									MB_ICONQUESTION | MB_YESNO) == IDYES) {
 					b = TRUE;
 				}
@@ -1389,7 +1442,6 @@ static void processwait(UINT cnt) {
 	soundmng_sync();
 }
 
-
 int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPreInst,
 										LPSTR lpszCmdLine, int nCmdShow) {
 	WNDCLASS	wc;
@@ -1407,7 +1459,7 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 	GetModuleFileName(NULL, modulefile, NELEMENTS(modulefile));
 	dosio_init();
 	file_setcd(modulefile);
-	np2arg_analize(lpszCmdLine);
+	np2arg_analize();
 	initload();
 	toolwin_readini();
 	kdispwin_readini();
@@ -1416,7 +1468,9 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 
 	rand_setseed((unsigned)time(NULL));
 
-	CopyMemory(szClassName, np2oscfg.winid, 3 * sizeof(OEMCHAR));
+	szClassName[0] = (TCHAR)np2oscfg.winid[0];
+	szClassName[1] = (TCHAR)np2oscfg.winid[1];
+	szClassName[2] = (TCHAR)np2oscfg.winid[2];
 
 	if ((hWnd = FindWindow(szClassName, NULL)) != NULL) {
 		sstpmsg_running();
@@ -1426,7 +1480,7 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 		return(FALSE);
 	}
 
-	hInst = hInstance;
+	hInst = loadextinst(hInstance);
 	hPrev = hPreInst;
 	mmxflag = (havemmx())?0:MMXFLAG_NOTSUPPORT;
 	mmxflag += (np2oscfg.disablemmx)?MMXFLAG_DISABLE:0;
@@ -1450,23 +1504,26 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 	winkbd_setf12(np2oscfg.F12COPY);
 	keystat_initialize();
 
-	np2class_initialize(hInstance);
+	np2class_initialize(hInst);
 	if (!hPreInst) {
 		wc.style = CS_BYTEALIGNCLIENT | CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS;
 		wc.lpfnWndProc = WndProc;
 		wc.cbClsExtra = 0;
 		wc.cbWndExtra = NP2GWL_SIZE;
-		wc.hInstance = hInstance;
-		wc.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_ICON1));
+		wc.hInstance = hInst;
+		wc.hIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_ICON1));
 		wc.hCursor = LoadCursor(NULL, IDC_ARROW);
 		wc.hbrBackground = (HBRUSH)GetStockObject(NULL_BRUSH);
 		wc.lpszMenuName = MAKEINTRESOURCE(IDR_MAIN);
 		wc.lpszClassName = szClassName;
 		if (!RegisterClass(&wc)) {
+			unloadextinst();
+			TRACETERM();
+			dosio_term();
 			return(FALSE);
 		}
 	}
-	toolwin_initapp(hInstance);
+	toolwin_initapp(hInst);
 	kdispwin_initialize(hPreInst);
 	skbdwin_initialize(hPreInst);
 	mdbgwin_initialize(hPreInst);
@@ -1480,7 +1537,7 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 	}
 	hWnd = CreateWindowEx(0, szClassName, np2oscfg.titles, style,
 						np2oscfg.winx, np2oscfg.winy, 640, 400,
-						NULL, NULL, hInstance, NULL);
+						NULL, NULL, hInst, NULL);
 	hWndMain = hWnd;
 	scrnmng_initialize();
 
@@ -1543,6 +1600,9 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 				MessageBox(hWnd, _T("Couldn't create DirectDraw Object"),
 										np2oscfg.titles, MB_OK | MB_ICONSTOP);
 			}
+			unloadextinst();
+			TRACETERM();
+			dosio_term();
 			return(FALSE);
 		}
 	}
@@ -1600,10 +1660,11 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 			sstp_destruct();
 			soundmng_deinitialize();
 			scrnmng_destroy();
+			unloadextinst();
 			TRACETERM();
 			dosio_term();
 			viewer_term();
-			return(0);
+			return(FALSE);
 		}
 	}
 #endif
@@ -1750,6 +1811,8 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 	}
 	skbdwin_deinitialize();
 
+	unloadextinst();
+
 	TRACETERM();
 	_MEM_USED("report.txt");
 	dosio_term();