--- np2/win9x/extromio.cpp	2005/02/07 14:46:14	1.5
+++ np2/win9x/extromio.cpp	2007/11/11 07:11:26	1.8
@@ -1,13 +1,14 @@
 #include	"compiler.h"
 #include	"np2.h"
+#include	"oemtext.h"
 #include	"dosio.h"
 #include	"extromio.h"
 
 
-static const char str_extrom[] = "EXTROM";
+static const TCHAR str_extrom[] = _T("EXTROM");
 
 
-EXTROMH extromio_open(const char *filename, UINT type) {
+EXTROMH extromio_open(const OEMCHAR *filename, UINT type) {
 
 	EXTROMH	ret;
 	HRSRC	hrsrc;
@@ -25,12 +26,18 @@ EXTROMH extromio_open(const char *filena
 		}
 	}
 	else if (type == EXTROMIO_RES) {
-		hrsrc = FindResource(hInst, filename, str_extrom);
+#if defined(OSLANG_UTF8)
+		TCHAR tchr[MAX_PATH];
+		oemtotchar(tchr, NELEMENTS(tchr), filename, -1);
+		hrsrc = FindResource(g_hInstance, tchr, str_extrom);
+#else
+		hrsrc = FindResource(g_hInstance, filename, str_extrom);
+#endif
 		if (hrsrc) {
-			hg = LoadResource(hInst, hrsrc);
+			hg = LoadResource(g_hInstance, hrsrc);
 			ret->fh = (void *)LockResource(hg);
 			ret->pos = 0;
-			ret->size = SizeofResource(hInst, hrsrc);
+			ret->size = SizeofResource(g_hInstance, hrsrc);
 			return(ret);
 		}
 	}