--- np2/win9x/toolwin.res	2003/10/29 21:35:58	1.2
+++ np2/win9x/toolwin.res	2005/02/09 20:11:35	1.6
@@ -1,52 +1,53 @@
 
-static const char np2toolclass[] = "np2-toolwin";
-static const char np2tooltitle[] = "NP2 tool";
+static const OEMCHAR np2toolclass[] = OEMTEXT("np2-toolwin");
+static const OEMCHAR np2tooltitle[] = OEMTEXT("NP2 tool");
 
-static const char str_deffont[] = "£Í£Ó £Ð¥´¥·¥Ã¥¯";
-static const char str_browse[] = "...";
-static const char str_eject[] = "Eject";
-
-static const char str_static[] = "STATIC";
-static const char str_combobox[] = "COMBOBOX";
-static const char str_button[] = "BUTTON";
+static const OEMCHAR str_deffont[] = OEMTEXT("£Í£Ó £Ð¥´¥·¥Ã¥¯");
+static const OEMCHAR str_browse[] = OEMTEXT("...");
+static const OEMCHAR str_eject[] = OEMTEXT("Eject");
+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 SUBITEM defsubitem[IDC_MAXITEMS] = {
-		{str_static,	NULL,		WS_VISIBLE,		47, 44, 8, 3, FALSE},
-		{str_static,	NULL,		WS_VISIBLE,		93, 19, 8, 3, FALSE},
-		{str_combobox,	NULL,		WS_VISIBLE | CBS_DROPDOWNLIST | WS_VSCROLL,
-													104, 6, 248, 160, TRUE},
-		{str_button,	str_browse,	WS_VISIBLE | BS_PUSHBUTTON,	
-													352, 7, 18, 17, TRUE},
-		{str_button,	str_eject,	WS_VISIBLE | BS_PUSHBUTTON,
-													370, 7, 34, 17, TRUE},
-		{str_static,	NULL,		WS_VISIBLE,		93, 41, 8, 3, FALSE},
-		{str_combobox,	NULL,		WS_VISIBLE | CBS_DROPDOWNLIST | WS_VSCROLL,
-													104, 28, 248, 160, TRUE},
-		{str_button,	str_browse,	WS_VISIBLE | BS_PUSHBUTTON,
-													352, 29, 18, 17, TRUE},
-		{str_button,	str_eject,	WS_VISIBLE | BS_PUSHBUTTON,
-													370, 29, 34, 17, TRUE}};
-
+		{TCTL_STATIC,	NULL,		 49, 44,   8,   3, 0, 0},
+		{TCTL_STATIC,	NULL,		 93, 19,   8,   3, 0, 0},
+		{TCTL_DDLIST,	NULL,		104,  6, 248, 160, 0, 0},
+		{TCTL_BUTTON,	str_browse,	352,  7,  18,  17, 0, 0},
+		{TCTL_BUTTON,	str_eject,	370,  7,  34,  17, 0, 0},
+		{TCTL_STATIC,	NULL,		 93, 41,   8,   3, 0, 0},
+		{TCTL_DDLIST,	NULL,		104, 28, 248, 160, 0, 0},
+		{TCTL_BUTTON,	str_browse,	352, 29,  18,  17, 0, 0},
+		{TCTL_BUTTON,	str_eject,	370, 29,  34,  17, 0, 0},
+		{TCTL_BUTTON,	str_reset,    0,  0,   0,   0, 0, 0},
+		{TCTL_BUTTON,	str_power,	  0,  0,   0,   0, 0, 0}};
 
 // ----
 
-static const char skintitle[] = "ToolWindow";
+static const OEMCHAR skintitle[] = OEMTEXT("ToolWindow");
 
-static const INITBL skinini[] = {
-	{"MAIN",		INITYPE_STR,	toolskin.main,	sizeof(toolskin.main)},
-	{"FONT",		INITYPE_STR,	toolskin.font,	sizeof(toolskin.font)},
+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},
-	{"HDDACC",		INITYPE_ARGS16,	&subitem[IDC_TOOLHDDACC].posx,		4},
-	{"FD1ACC",		INITYPE_ARGS16,	&subitem[IDC_TOOLFDD1ACC].posx,		4},
-	{"FD1LIST",		INITYPE_ARGS16,	&subitem[IDC_TOOLFDD1LIST].posx,	4},
-	{"FD1BROWSE",	INITYPE_ARGS16,	&subitem[IDC_TOOLFDD1BROWSE].posx,	4},
-	{"FD1EJECT",	INITYPE_ARGS16,	&subitem[IDC_TOOLFDD1EJECT].posx,	4},
-	{"FD2ACC",		INITYPE_ARGS16,	&subitem[IDC_TOOLFDD2ACC].posx,		4},
-	{"FD2LIST",		INITYPE_ARGS16,	&subitem[IDC_TOOLFDD2LIST].posx,	4},
-	{"FD2BROWSE",	INITYPE_ARGS16,	&subitem[IDC_TOOLFDD2BROWSE].posx,	4},
-	{"FD2EJECT",	INITYPE_ARGS16,	&subitem[IDC_TOOLFDD2EJECT].posx,	4}};
+	{"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 DWORD mvccol[MVC_MAXCOLOR] = {
@@ -55,15 +56,13 @@ static const INITBL skinini[] = {
 
 // ----
 
-static const char str_skindef[] = "&Base Skin";
-static const char str_skinsel[] = "&Load Skin...";
-static const char str_toolclose[] = "&Close";
-
-static const char skinui_title[] = "Select skin file";
-static const char skinui_filter[] =								\
-								"ini files (*.ini)\0*.ini\0"	\
-								"text files (*.txt)\0*.txt\0"	\
-								"All files (*.*)\0*.*\0";
-static const char skinui_ext[] = "ini";
+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};