--- np2/wince/ini.cpp	2004/06/20 02:57:47	1.12
+++ np2/wince/ini.cpp	2005/02/11 21:17:23	1.15
@@ -183,15 +183,18 @@ static void iniwrsetarg8(char *work, int
 	char	tmp[8];
 
 	if (arg > 0) {
-		SPRINTF(tmp, "%.2x", ptr[0]);
+		OEMSPRINTF(tmp, "%.2x", ptr[0]);
 		milstr_ncpy(work, tmp, size);
 	}
 	for (i=1; i<arg; i++) {
-		SPRINTF(tmp, " %.2x", ptr[i]);
+		OEMSPRINTF(tmp, " %.2x", ptr[i]);
 		milstr_ncat(work, tmp, size);
 	}
 }
 
+
+static const UINT8 utf8hdr[3] = {0xef, 0xbb, 0xbf};
+
 void ini_write(const char *path, const char *title,
 											const INITBL *tbl, UINT count) {
 
@@ -205,6 +208,9 @@ const INITBL	*pterm;
 	if (fh == FILEH_INVALID) {
 		return;
 	}
+#if defined(OSLANG_UTF8)
+	file_write(fh, utf8hdr, sizeof(utf8hdr));
+#endif
 	milstr_ncpy(work, "[", sizeof(work));
 	milstr_ncat(work, title, sizeof(work));
 	milstr_ncat(work, "]\r\n", sizeof(work));
@@ -378,22 +384,19 @@ static const INITBL iniitem[] = {
 };
 
 
-#define	INIITEMS	(sizeof(iniitem) / sizeof(INITBL))
-
-
 void initload(void) {
 
-	char	path[MAX_PATH];
+	OEMCHAR	path[MAX_PATH];
 
-	milstr_ncpy(path, file_getcd(inifile), sizeof(path));
-	ini_read(path, ini_title, iniitem, INIITEMS);
+	milstr_ncpy(path, file_getcd(inifile), NELEMENTS(path));
+	ini_read(path, ini_title, iniitem, NELEMENTS(iniitem));
 }
 
 void initsave(void) {
 
-	char	path[MAX_PATH];
+	OEMCHAR	path[MAX_PATH];
 
-	milstr_ncpy(path, file_getcd(inifile), sizeof(path));
-	ini_write(path, ini_title, iniitem, INIITEMS);
+	milstr_ncpy(path, file_getcd(inifile), NELEMENTS(path));
+	ini_write(path, ini_title, iniitem, NELEMENTS(iniitem));
 }