--- np2/win9x/dialog/dialogs.cpp	2007/11/11 11:00:02	1.13
+++ np2/win9x/dialog/dialogs.cpp	2007/12/17 14:52:56	1.15
@@ -12,8 +12,6 @@
 #endif
 
 
-const TCHAR str_nc[] = _T("N/C");
-
 
 // ---- enable
 
@@ -288,7 +286,7 @@ void dlgs_setlistuint32(HWND hWnd, UINT1
 	}
 }
 
-void dlgs_setcbitem(HWND hWnd, UINT uID, PCCBPARAM pItem, UINT uItems)
+void dlgs_setcbitem(HWND hWnd, UINT uID, PCCBPARAM pcItem, UINT uItems)
 {
 	HWND	hItem;
 	UINT	i;
@@ -299,7 +297,7 @@ void dlgs_setcbitem(HWND hWnd, UINT uID,
 	hItem = GetDlgItem(hWnd, uID);
 	for (i=0; i<uItems; i++)
 	{
-		lpcszStr = pItem[i].lpcszString;
+		lpcszStr = pcItem[i].lpcszString;
 		if (!HIWORD(lpcszStr))
 		{
 			if (!loadstringresource(g_hInstance, LOWORD(lpcszStr),
@@ -313,7 +311,27 @@ void dlgs_setcbitem(HWND hWnd, UINT uID,
 		if (nIndex >= 0)
 		{
 			SendMessage(hItem, CB_SETITEMDATA,
-								(WPARAM)nIndex, (LPARAM)pItem[i].nItemData);
+								(WPARAM)nIndex, (LPARAM)pcItem[i].nItemData);
+		}
+	}
+}
+
+void dlgs_setcbnumber(HWND hWnd, UINT uID, PCCBNPARAM pcItem, UINT uItems)
+{
+	HWND	hItem;
+	UINT	i;
+	TCHAR	szValue[16];
+	int		nIndex;
+
+	hItem = GetDlgItem(hWnd, uID);
+	for (i=0; i<uItems; i++)
+	{
+		wsprintf(szValue, str_u, pcItem[i].uValue);
+		nIndex = SendMessage(hItem, CB_ADDSTRING, 0, (LPARAM)szValue);
+		if (nIndex >= 0)
+		{
+			SendMessage(hItem, CB_SETITEMDATA,
+								(WPARAM)nIndex, (LPARAM)pcItem[i].nItemData);
 		}
 	}
 }
@@ -353,6 +371,15 @@ int dlgs_getcbcur(HWND hWnd, UINT uID, i
 
 // ---- MIDIデバイスのリスト
 
+static void insertnc(HWND hWnd, int nPos)
+{
+	TCHAR	szNC[128];
+
+	loadstringresource(g_hInstance, LOWORD(IDS_NONCONNECT),
+													szNC, NELEMENTS(szNC));
+	SendMessage(hWnd, CB_INSERTSTRING, (WPARAM)nPos, (LPARAM)szNC);
+}
+
 void dlgs_setlistmidiout(HWND hWnd, UINT16 res, const OEMCHAR *defname) {
 
 	HWND		wnd;
@@ -365,7 +392,7 @@ void dlgs_setlistmidiout(HWND hWnd, UINT
 	wnd = GetDlgItem(hWnd, res);
 	defcur = 0;
 	devs = midiOutGetNumDevs();
-	SendMessage(wnd, CB_INSERTSTRING, (WPARAM)0, (LPARAM)str_nc);
+	insertnc(wnd, 0);
 	SendMessage(wnd, CB_INSERTSTRING, (WPARAM)1, (LPARAM)cmmidi_midimapper);
 	if (!milstr_cmp(defname, cmmidi_midimapper)) {
 		defcur = 1;
@@ -412,7 +439,7 @@ void dlgs_setlistmidiin(HWND hWnd, UINT1
 	wnd = GetDlgItem(hWnd, res);
 	defcur = 0;
 	num = midiInGetNumDevs();
-	SendMessage(wnd, CB_INSERTSTRING, (WPARAM)0, (LPARAM)str_nc);
+	insertnc(wnd, 0);
 	for (i=0; i<num; i++) {
 		if (midiInGetDevCaps(i, &mic, sizeof(mic)) == MMSYSERR_NOERROR) {
 			SendMessage(wnd, CB_INSERTSTRING,