--- xmil/win9x/fontmng.cpp 2005/02/04 06:42:12 1.4 +++ xmil/win9x/fontmng.cpp 2005/02/13 22:27:53 1.5 @@ -20,8 +20,7 @@ typedef struct { } _FNTMNG, *FNTMNG; -// static const OEMCHAR deffontface[] = OEMTEXT("£Í£Ó ¥´¥·¥Ã¥¯"); -static const OEMCHAR deffontface[] = OEMTEXT("£Ä£Æ ºÙ´Ý¥´¥·¥Ã¥¯ÂÎ"); +static const OEMCHAR deffontface[] = OEMTEXT("£Í£Ó ¥´¥·¥Ã¥¯"); static const OEMCHAR deffontface2[] = OEMTEXT("£Í£Ó £Ð¥´¥·¥Ã¥¯"); @@ -36,7 +35,7 @@ void *fontmng_create(int size, UINT type int fontwidth; int fontheight; int weight; - DWORD pitch; + UINT pitch; if (size < 0) { size *= -1; @@ -211,7 +210,6 @@ BRESULT fontmng_getdrawsize(void *hdl, c width = 0; posx = 0; - buf[2] = '\0'; while(1) { leng = milstr_charsize(string); if (!leng) { @@ -223,7 +221,7 @@ BRESULT fontmng_getdrawsize(void *hdl, c getlength1((FNTMNG)hdl, &fdat, buf, leng); width = posx + max(fdat.width, fdat.pitch); posx += fdat.pitch; - } while(1); + } if (pt) { pt->x = width;