--- np2/win9x/menu.cpp	2005/02/09 20:11:35	1.20
+++ np2/win9x/menu.cpp	2007/07/20 15:02:29	1.26
@@ -23,7 +23,7 @@ void menu_addmenubar(HMENU popup, HMENU 
 	UINT			pos;
 	UINT			i;
 	MENUITEMINFO	mii;
-	OEMCHAR			str[128];
+	TCHAR			str[128];
 	HMENU			hSubMenu;
 
 	cnt = GetMenuItemCount(menubar);
@@ -48,9 +48,9 @@ void menu_addmenubar(HMENU popup, HMENU 
 }
 
 static void insertresmenu(HMENU menu, UINT pos, UINT flag,
-													UINT item, UINT str) {
+													UINT32 item, UINT str) {
 
-	OEMCHAR	tmp[128];
+	TCHAR	tmp[128];
 
 	if (LoadString(hInst, str, tmp, NELEMENTS(tmp))) {
 		InsertMenu(menu, pos, flag, item, tmp);
@@ -189,68 +189,87 @@ void sysmenu_setscrnmul(UINT8 value) {
 
 typedef struct {
 	UINT16		title;
+	UINT16		items;
+	MENUITEMS	item[1];
+} SUBMITEMS;
+
+typedef struct {
+	UINT16		title;
+	UINT16		items;
 	MENUITEMS	item[3];
-} DISKMENU;
+} SUBMITEM3;
 
-static const DISKMENU fddmenu[4] = {
-		{IDS_FDD1,	{{IDM_FDD1OPEN,		IDS_OPEN},
-					{0,					0},
-					{IDM_FDD1EJECT,		IDS_EJECT}}},
-		{IDS_FDD2,	{{IDM_FDD2OPEN,		IDS_OPEN},
-					{0,					0},
-					{IDM_FDD2EJECT,		IDS_EJECT}}},
-		{IDS_FDD3,	{{IDM_FDD3OPEN,		IDS_OPEN},
-					{0,					0},
-					{IDM_FDD3EJECT,		IDS_EJECT}}},
-		{IDS_FDD4,	{{IDM_FDD4OPEN,		IDS_OPEN},
-					{0,					0},
-					{IDM_FDD4EJECT,		IDS_EJECT}}}};
+static const SUBMITEM3 fddmenu[4] = {
+		{IDS_FDD1, 3,
+			{{IDM_FDD1OPEN, IDS_OPEN}, {0, 0}, {IDM_FDD1EJECT, IDS_EJECT}}},
+		{IDS_FDD2, 3,
+			{{IDM_FDD2OPEN, IDS_OPEN}, {0, 0}, {IDM_FDD2EJECT, IDS_EJECT}}},
+		{IDS_FDD3, 3,
+			{{IDM_FDD3OPEN, IDS_OPEN}, {0, 0}, {IDM_FDD3EJECT, IDS_EJECT}}},
+		{IDS_FDD4, 3,
+			{{IDM_FDD4OPEN, IDS_OPEN}, {0, 0}, {IDM_FDD4EJECT, IDS_EJECT}}}};
+
+#if defined(SUPPORT_IDEIO)
+static const SUBMITEM3 side[3] = {
+		{IDS_IDE0, 3,
+			{{IDM_IDE0OPEN, IDS_OPEN}, {0, 0}, {IDM_IDE0EJECT, IDS_REMOVE}}},
+		{IDS_IDE1, 3,
+			{{IDM_IDE1OPEN, IDS_OPEN}, {0, 0}, {IDM_IDE1EJECT, IDS_REMOVE}}},
+		{IDS_IDE2, 3,
+			{{IDM_IDE2OPEN, IDS_OPEN}, {0, 0}, {IDM_IDE2EJECT, IDS_EJECT}}}};
+#else
+static const SUBMITEM3 ssasi[2] = {
+		{IDS_SASI1, 3,
+			{{IDM_IDE0OPEN, IDS_OPEN}, {0, 0}, {IDM_IDE0EJECT, IDS_REMOVE}}},
+		{IDS_SASI2, 3,
+			{{IDM_IDE1OPEN, IDS_OPEN}, {0, 0}, {IDM_IDE1EJECT, IDS_REMOVE}}}};
+#endif
 
-static void insdiskmenu(HMENU hMenu, UINT pos, const DISKMENU *m) {
+#if defined(SUPPORT_SCSI)
+static const SUBMITEM3 sscsi[4] = {
+	{IDS_SCSI0, 3,
+		{{IDM_SCSI0OPEN, IDS_OPEN}, {0, 0}, {IDM_SCSI0EJECT, IDS_REMOVE}}},
+	{IDS_SCSI1, 3,
+		{{IDM_SCSI1OPEN, IDS_OPEN}, {0, 0}, {IDM_SCSI1EJECT, IDS_REMOVE}}},
+	{IDS_SCSI2, 3,
+		{{IDM_SCSI2OPEN, IDS_OPEN}, {0, 0}, {IDM_SCSI2EJECT, IDS_REMOVE}}},
+	{IDS_SCSI3, 3,
+		{{IDM_SCSI3OPEN, IDS_OPEN}, {0, 0}, {IDM_SCSI3EJECT, IDS_REMOVE}}}};
+#endif
 
-	HMENU	hSubMenu;
+
+static void insdiskmenu(HMENU hMenu, UINT pos, const void *item) {
+
+	HMENU		hSubMenu;
+const SUBMITEMS	*smi;
 
 	hSubMenu = CreatePopupMenu();
-	insertresmenus(hSubMenu, 0, m->item, 3);
+	smi = (SUBMITEMS *)item;
+	insertresmenus(hSubMenu, 0, smi->item, smi->items);
 	insertresmenu(hMenu, pos, MF_BYPOSITION | MF_POPUP,
-											(UINT)hSubMenu, m->title);
+											(UINT)hSubMenu, smi->title);
 }
 
-#if defined(SUPPORT_SCSI)
-static const DISKMENU scsimenu[4] = {
-		{IDS_SCSI0,	{{IDM_SCSI0OPEN,	IDS_OPEN},
-					{0,					0},
-					{IDM_SCSI0EJECT,	IDS_REMOVE}}},
-		{IDS_SCSI1,	{{IDM_SCSI1OPEN,	IDS_OPEN},
-					{0,					0},
-					{IDM_SCSI1EJECT,	IDS_REMOVE}}},
-		{IDS_SCSI2,	{{IDM_SCSI2OPEN,	IDS_OPEN},
-					{0,					0},
-					{IDM_SCSI2EJECT,	IDS_REMOVE}}},
-		{IDS_SCSI3,	{{IDM_SCSI3OPEN,	IDS_OPEN},
-					{0,					0},
-					{IDM_SCSI3EJECT,	IDS_REMOVE}}}};
-#endif
 
 #if defined(SUPPORT_STATSAVE)
-static const OEMCHAR xmenu_stat[] = OEMTEXT("S&tat");
-static const OEMCHAR xmenu_statsave[] = OEMTEXT("Save %u");
-static const OEMCHAR xmenu_statload[] = OEMTEXT("Load %u");
+static const TCHAR xmenu_stat[] = _T("S&tat");
+static const TCHAR xmenu_statsave[] = _T("Save %u");
+static const TCHAR xmenu_statload[] = _T("Load %u");
 
 static void addstatsavemenu(HMENU hMenu, UINT pos) {
 
 	HMENU	hSubMenu;
 	UINT	i;
-	OEMCHAR	buf[16];
+	TCHAR	buf[16];
 
 	hSubMenu = CreatePopupMenu();
 	for (i=0; i<SUPPORT_STATSAVE; i++) {
-		OEMSPRINTF(buf, xmenu_statsave, i);
+		wsprintf(buf, xmenu_statsave, i);
 		AppendMenu(hSubMenu, MF_STRING, IDM_FLAGSAVE + i, buf);
 	}
 	AppendMenu(hSubMenu, MF_MENUBARBREAK, 0, NULL);
 	for (i=0; i<SUPPORT_STATSAVE; i++) {
-		OEMSPRINTF(buf, xmenu_statload, i);
+		wsprintf(buf, xmenu_statload, i);
 		AppendMenu(hSubMenu, MF_STRING, IDM_FLAGLOAD + i, buf);
 	}
 	InsertMenu(hMenu, pos, MF_BYPOSITION | MF_POPUP,
@@ -262,29 +281,54 @@ void xmenu_initialize(void) {
 
 	HMENU	hMenu;
 	HMENU	hSubMenu;
+	UINT	subpos;
 	UINT	i;
 
 	hMenu = np2class_gethmenu(hWndMain);
 	if (np2oscfg.I286SAVE) {
-		hSubMenu = GetSubMenu(hMenu, 4);
+		hSubMenu = GetSubMenu(hMenu, 3);
 		insertresmenu(hSubMenu, 10, MF_BYPOSITION | MF_STRING,
-												IDM_I286SAVE, IDS_I286SAVE);
+												IDM_CPUSAVE, IDS_CPUSAVE);
 	}
+
+#if defined(SUPPORT_PX)
+	hSubMenu = GetSubMenu(hMenu, 2);
+	hSubMenu = GetSubMenu(hSubMenu, 1);
+	insertresmenu(hSubMenu, 14, MF_BYPOSITION | MF_STRING,
+												IDM_PX1, IDS_PX1);
+	insertresmenu(hSubMenu, 15, MF_BYPOSITION | MF_STRING,
+												IDM_PX2, IDS_PX2);
+#endif
+
 #if defined(SUPPORT_WAVEREC)
-	hSubMenu = GetSubMenu(hMenu, 4);
+	hSubMenu = GetSubMenu(hMenu, 3);
 	insertresmenu(hSubMenu, 2, MF_BYPOSITION | MF_STRING,
 												IDM_WAVEREC, IDS_WAVEREC);
 #endif
 
+	hSubMenu = CreatePopupMenu();
+	subpos = 0;
+#if defined(SUPPORT_IDEIO)
+	for (i=0; i<NELEMENTS(side); i++) {
+		insdiskmenu(hSubMenu, subpos++, side + i);
+	}
+#else
+	for (i=0; i<NELEMENTS(ssasi); i++) {
+		insdiskmenu(hSubMenu, subpos++, ssasi + i);
+	}
+#endif
 #if defined(SUPPORT_SCSI)
-	hSubMenu = GetSubMenu(hMenu, 1);
 	AppendMenu(hSubMenu, MF_SEPARATOR, 0, NULL);
-	for (i=0; i<4; i++) {
-		insdiskmenu(hSubMenu, i + 3, scsimenu + i);
+	subpos++;
+	for (i=0; i<NELEMENTS(sscsi); i++) {
+		insdiskmenu(hSubMenu, subpos++, sscsi + i);
 	}
 #endif
+	insertresmenu(hMenu, 1, MF_BYPOSITION | MF_POPUP,
+												(UINT32)hSubMenu, IDS_HDD);
 
-	for (i=4; i--;) {
+	for (i=4; i>0;) {
+		i--;
 		if (np2cfg.fddequip & (1 << i)) {
 			insdiskmenu(hMenu, 1, fddmenu + i);
 		}
@@ -423,6 +467,10 @@ void xmenu_setsound(UINT8 value) {
 	CheckMenuItem(hmenu, IDM_SPEAKBOARD, MFCHECK(value == 0x20));
 	CheckMenuItem(hmenu, IDM_SPARKBOARD, MFCHECK(value == 0x40));
 	CheckMenuItem(hmenu, IDM_AMD98, MFCHECK(value == 0x80));
+#if defined(SUPPORT_PX)
+	CheckMenuItem(hmenu, IDM_PX1, MFCHECK(value == 0x30));
+	CheckMenuItem(hmenu, IDM_PX2, MFCHECK(value == 0x50));
+#endif	// defined(SUPPORT_PX)
 }
 
 void xmenu_setjastsound(UINT8 value) {