--- np2/win9x/fontmng.cpp	2005/03/11 15:12:58	1.6
+++ np2/win9x/fontmng.cpp	2006/12/23 12:49:22	1.7
@@ -35,7 +35,8 @@ void *fontmng_create(int size, UINT type
 	int			fontwidth;
 	int			fontheight;
 	int			weight;
-	UINT		pitch;
+	DWORD		pitch;
+	DWORD		charset;
 
 	if (size < 0) {
 		size *= -1;
@@ -105,9 +106,10 @@ void *fontmng_create(int size, UINT type
 	if (fontface == NULL) {
 		fontface = (type & FDAT_PROPORTIONAL)?deffontface2:deffontface;
 	}
+	charset = (type & FDAT_SHIFTJIS)?SHIFTJIS_CHARSET:DEFAULT_CHARSET;
 	ret->hfont = CreateFont(size, 0,
 						FW_DONTCARE, FW_DONTCARE, weight,
-						FALSE, FALSE, FALSE, SHIFTJIS_CHARSET,
+						FALSE, FALSE, FALSE, charset,
 						OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS,
 						NONANTIALIASED_QUALITY, pitch, fontface);
 	ret->hfont = (HFONT)SelectObject(ret->hdcimage, ret->hfont);