--- np2/win9x/toolwin.res	2005/02/09 20:11:35	1.6
+++ np2/win9x/toolwin.res	2007/11/11 07:11:27	1.9
@@ -1,6 +1,6 @@
 
-static const OEMCHAR np2toolclass[] = OEMTEXT("np2-toolwin");
-static const OEMCHAR np2tooltitle[] = OEMTEXT("NP2 tool");
+static const TCHAR np2tooltitle[] = _T("NP2 tool");
+static const TCHAR np2toolclass[] = _T("np2-toolwin");
 
 static const OEMCHAR str_deffont[] = OEMTEXT("£Í£Ó £Ð¥´¥·¥Ã¥¯");
 static const OEMCHAR str_browse[] = OEMTEXT("...");
@@ -8,9 +8,9 @@ static const OEMCHAR str_eject[] = OEMTE
 static const OEMCHAR str_reset[] = OEMTEXT("Reset");
 static const OEMCHAR str_power[] = OEMTEXT("Power");
 
-static const OEMCHAR str_static[] = OEMTEXT("STATIC");
-static const OEMCHAR str_combobox[] = OEMTEXT("COMBOBOX");
-static const OEMCHAR str_button[] = OEMTEXT("BUTTON");
+static const TCHAR str_static[] = _T("STATIC");
+static const TCHAR str_combobox[] = _T("COMBOBOX");
+static const TCHAR str_button[] = _T("BUTTON");
 
 static const SUBITEM defsubitem[IDC_MAXITEMS] = {
 		{TCTL_STATIC,	NULL,		 49, 44,   8,   3, 0, 0},
@@ -29,25 +29,26 @@ static const SUBITEM defsubitem[IDC_MAXI
 
 static const OEMCHAR skintitle[] = OEMTEXT("ToolWindow");
 
-static const INITBL skinini1[] = {
-	{"MAIN",		INITYPE_STR,	toolskin.main,	NELEMENTS(toolskin.main)},
-	{"FONT",		INITYPE_STR,	toolskin.font,	NELEMENTS(toolskin.font)},
-	{"FONTSIZE",	INITYPE_SINT32,	&toolskin.fontsize,					0},
-	{"COLOR1",		INITYPE_HEX32,	&toolskin.color1,					0},
-	{"COLOR2",		INITYPE_HEX32,	&toolskin.color2,					0}};
-
-static const INITBL skinini2[] = {
-	{"HDDACC",		INITYPE_ARGS16,	&subitem[IDC_TOOLHDDACC].posx,		5},
-	{"FD1ACC",		INITYPE_ARGS16,	&subitem[IDC_TOOLFDD1ACC].posx,		5},
-	{"FD1LIST",		INITYPE_ARGS16,	&subitem[IDC_TOOLFDD1LIST].posx,	5},
-	{"FD1BROWSE",	INITYPE_ARGS16,	&subitem[IDC_TOOLFDD1BROWSE].posx,	5},
-	{"FD1EJECT",	INITYPE_ARGS16,	&subitem[IDC_TOOLFDD1EJECT].posx,	5},
-	{"FD2ACC",		INITYPE_ARGS16,	&subitem[IDC_TOOLFDD2ACC].posx,		5},
-	{"FD2LIST",		INITYPE_ARGS16,	&subitem[IDC_TOOLFDD2LIST].posx,	5},
-	{"FD2BROWSE",	INITYPE_ARGS16,	&subitem[IDC_TOOLFDD2BROWSE].posx,	5},
-	{"FD2EJECT",	INITYPE_ARGS16,	&subitem[IDC_TOOLFDD2EJECT].posx,	5},
-	{"RESETBTN",	INITYPE_ARGS16,	&subitem[IDC_TOOLRESET].posx,		5},
-	{"POWERBTN",	INITYPE_ARGS16,	&subitem[IDC_TOOLPOWER].posx,		5}};
+static const PFTBL skinini1[] = {
+	PFSTR("MAIN",		PFTYPE_STR,		toolskin.main),
+	PFSTR("FONT",		PFTYPE_STR,		toolskin.font),
+	PFVAL("FONTSIZE",	PFTYPE_SINT32,	&toolskin.fontsize),
+	PFVAL("COLOR1",		PFTYPE_HEX32,	&toolskin.color1),
+	PFVAL("COLOR2",		PFTYPE_HEX32,	&toolskin.color2)};
+
+static const PFTBL skinini2[] = {
+	PFEXT("HDDACC",		PFTYPE_ARGS16,	&subitem[IDC_TOOLHDDACC].posx,		5),
+	PFEXT("FD1ACC",		PFTYPE_ARGS16,	&subitem[IDC_TOOLFDD1ACC].posx,		5),
+	PFEXT("FD1LIST",	PFTYPE_ARGS16,	&subitem[IDC_TOOLFDD1LIST].posx,	5),
+	PFEXT("FD1BROWSE",	PFTYPE_ARGS16,	&subitem[IDC_TOOLFDD1BROWSE].posx,	5),
+	PFEXT("FD1EJECT",	PFTYPE_ARGS16,	&subitem[IDC_TOOLFDD1EJECT].posx,	5),
+	PFEXT("FD2ACC",		PFTYPE_ARGS16,	&subitem[IDC_TOOLFDD2ACC].posx,		5),
+	PFEXT("FD2LIST",	PFTYPE_ARGS16,	&subitem[IDC_TOOLFDD2LIST].posx,	5),
+	PFEXT("FD2BROWSE",	PFTYPE_ARGS16,	&subitem[IDC_TOOLFDD2BROWSE].posx,	5),
+	PFEXT("FD2EJECT",	PFTYPE_ARGS16,	&subitem[IDC_TOOLFDD2EJECT].posx,	5),
+	PFEXT("RESETBTN",	PFTYPE_ARGS16,	&subitem[IDC_TOOLRESET].posx,		5),
+	PFEXT("POWERBTN",	PFTYPE_ARGS16,	&subitem[IDC_TOOLPOWER].posx,		5)
+};
 
 
 // static const DWORD mvccol[MVC_MAXCOLOR] = {
@@ -56,13 +57,16 @@ static const INITBL skinini2[] = {
 
 // ----
 
-static const OEMCHAR str_skindef[] = OEMTEXT("<&Base Skin>");
-static const OEMCHAR str_skinsel[] = OEMTEXT("&Select Skin...");
-static const OEMCHAR str_toolskin[] = OEMTEXT("&Skins");
-static const OEMCHAR str_toolclose[] = OEMTEXT("&Close");
-
-static const OEMCHAR skinui_title[] = OEMTEXT("Select skin file");
-static const OEMCHAR skinui_filter[] = OEMTEXT("ini files (*.ini)\0*.ini\0text files (*.txt)\0*.txt\0All files (*.*)\0*.*\0");
-static const OEMCHAR skinui_ext[] = OEMTEXT("ini");
-static const FILESEL skinui = {skinui_title, skinui_ext, skinui_filter, 1};
+static const TCHAR str_skindef[] = _T("<&Base Skin>");
+static const TCHAR str_skinsel[] = _T("&Select Skin...");
+static const TCHAR str_toolskin[] = _T("&Skins");
+static const TCHAR str_toolclose[] = _T("&Close");
+
+static const FSPARAM fpSkin = 
+{
+	MAKEINTRESOURCE(IDS_SKINTITLE),
+	MAKEINTRESOURCE(IDS_SKINEXT),
+	MAKEINTRESOURCE(IDS_SKINFILTER),
+	1
+};