--- np2/common/milstr.h	2004/02/18 02:03:36	1.4
+++ np2/common/milstr.h	2005/02/07 14:46:08	1.10
@@ -1,59 +1,80 @@
 
-#define	SUPPORT_ANK
-#define	SUPPORT_SJIS
-#define	SUPPORT_EUC
+#ifndef STRCALL
+#define	STRCALL
+#endif
 
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+// １文字分のサイズを取得
+int STRCALL milank_charsize(const OEMCHAR *str);
+int STRCALL milsjis_charsize(const char *str);
+int STRCALL mileuc_charsize(const char *str);
+int STRCALL milutf8_charsize(const char *str);
+
 // 大文字小文字を同一視して比較
 // ret 0:一致
-int milank_cmp(const char *str, const char *cmp);
-int milsjis_cmp(const char *str, const char *cmp);
-int mileuc_cmp(const char *str, const char *cmp);
+int STRCALL milank_cmp(const OEMCHAR *str, const OEMCHAR *cmp);
+int STRCALL milsjis_cmp(const char *str, const char *cmp);
+int STRCALL mileuc_cmp(const char *str, const char *cmp);
+int STRCALL milutf8_cmp(const char *str, const char *cmp);
 
 // 大文字小文字を 同一視してcmpのヌルまで比較
 // ret 0:一致
-int milank_memcmp(const char *str, const char *cmp);
-int milsjis_memcmp(const char *str, const char *cmp);
-int mileuc_memcmp(const char *str, const char *cmp);
+int STRCALL milank_memcmp(const OEMCHAR *str, const OEMCHAR *cmp);
+int STRCALL milsjis_memcmp(const char *str, const char *cmp);
+int STRCALL mileuc_memcmp(const char *str, const char *cmp);
+int STRCALL milutf8_memcmp(const char *str, const char *cmp);
 
 // str[pos]が漢字１バイト目かどうか…
-int milsjis_kanji1st(const char *str, int pos);
-int mileuc_kanji1st(const char *str, int pos);
+int STRCALL milsjis_kanji1st(const char *str, int pos);
+int STRCALL mileuc_kanji1st(const char *str, int pos);
+int STRCALL milutf8_kanji1st(const char *str, int pos);
 
 // str[pos]が漢字２バイト目かどうか…
-int milsjis_kanji2nd(const char *str, int pos);
-int mileuc_kanji2nd(const char *str, int pos);
+int STRCALL milsjis_kanji2nd(const char *str, int pos);
+int STRCALL mileuc_kanji2nd(const char *str, int pos);
+int STRCALL milutf8_kanji2nd(const char *str, int pos);
 
 // maxlen分だけ文字列をコピー
-void milank_ncpy(char *dst, const char *src, int maxlen);
-void milsjis_ncpy(char *dst, const char *src, int maxlen);
-void mileuc_ncpy(char *dst, const char *src, int maxlen);
+void STRCALL milank_ncpy(OEMCHAR *dst, const OEMCHAR *src, int maxlen);
+void STRCALL milsjis_ncpy(char *dst, const char *src, int maxlen);
+void STRCALL mileuc_ncpy(char *dst, const char *src, int maxlen);
+void STRCALL milutf8_ncpy(char *dst, const char *src, int maxlen);
 
 // maxlen分だけ文字列をキャット
-void milank_ncat(char *dst, const char *src, int maxlen);
-void milsjis_ncat(char *dst, const char *src, int maxlen);
-void mileuc_ncat(char *dst, const char *src, int maxlen);
+void STRCALL milank_ncat(OEMCHAR *dst, const OEMCHAR *src, int maxlen);
+void STRCALL milsjis_ncat(char *dst, const char *src, int maxlen);
+void STRCALL mileuc_ncat(char *dst, const char *src, int maxlen);
+void STRCALL milutf8_ncat(char *dst, const char *src, int maxlen);
+
+// 文字を検索
+OEMCHAR * STRCALL milank_chr(const OEMCHAR *str, int c);
+char * STRCALL milsjis_chr(const char *str, int c);
+char * STRCALL mileuc_chr(const char *str, int c);
+char * STRCALL milutf8_chr(const char *str, int c);
 
 
 // 0~9, A~Z のみを大文字小文字を同一視して比較
 // ret 0:一致
-int milstr_extendcmp(const char *str, const char *cmp);
+int STRCALL milstr_extendcmp(const OEMCHAR *str, const OEMCHAR *cmp);
+
+// 次の語を取得
+OEMCHAR * STRCALL milstr_nextword(const OEMCHAR *str);
 
 // 文字列からARGの取得
-int milstr_getarg(char *str, char *arg[], int maxarg);
+int STRCALL milstr_getarg(OEMCHAR *str, OEMCHAR *arg[], int maxarg);
 
 // HEX2INT
-long milstr_solveHEX(const char *str);
+long STRCALL milstr_solveHEX(const OEMCHAR *str);
 
 // STR2INT
-long milstr_solveINT(const char *str);
+long STRCALL milstr_solveINT(const OEMCHAR *str);
 
 // STRLIST
-const char *milstr_list(const char *lststr, UINT pos);
+OEMCHAR * STRCALL milstr_list(const OEMCHAR *lststr, UINT pos);
 
 #ifdef __cplusplus
 }
@@ -63,28 +84,40 @@ const char *milstr_list(const char *lsts
 // ---- macros
 
 #if defined(OSLANG_SJIS)
-#define	ISKANJI1ST(c)			((((c ^ 0x20) - 0xa1) & 0xff) < 0x3c)
+#define milstr_charsize(s)		milsjis_charsize(s)
 #define	milstr_cmp(s, c)		milsjis_cmp(s, c)
 #define	milstr_memcmp(s, c)		milsjis_memcmp(s, c)
 #define	milstr_kanji1st(s, p)	milsjis_kanji1st(s, p)
 #define	milstr_kanji2nd(s, p)	milsjis_kanji2nd(s, p)
 #define	milstr_ncpy(d, s, l)	milsjis_ncpy(d, s, l)
 #define	milstr_ncat(d, s, l)	milsjis_ncat(d, s, l)
+#define	milstr_chr(s, c)		milsjis_chr(s, c)
 #elif defined(OSLANG_EUC)
-#define	ISKANJI1ST(c)			(((c - 0xa1) & 0xff) < 0x5d)
+#define milstr_charsize(s)		mileuc_charsize(s)
 #define	milstr_cmp(s, c)		mileuc_cmp(s, c)
 #define	milstr_memcmp(s, c)		mileuc_memcmp(s, c)
 #define	milstr_kanji1st(s, p)	mileuc_kanji1st(s, p)
 #define	milstr_kanji2nd(s, p)	mileuc_kanji2nd(s, p)
 #define	milstr_ncpy(d, s, l)	mileuc_ncpy(d, s, l)
 #define	milstr_ncat(d, s, l)	mileuc_ncat(d, s, l)
+#define	milstr_chr(s, c)		mileuc_chr(s, c)
+#elif defined(OSLANG_UTF8)
+#define milstr_charsize(s)		milutf8_charsize(s)
+#define	milstr_cmp(s, c)		milutf8_cmp(s, c)
+#define	milstr_memcmp(s, c)		milutf8_memcmp(s, c)
+#define	milstr_kanji1st(s, p)	milutf8_kanji1st(s, p)
+#define	milstr_kanji2nd(s, p)	milutf8_kanji2nd(s, p)
+#define	milstr_ncpy(d, s, l)	milutf8_ncpy(d, s, l)
+#define	milstr_ncat(d, s, l)	milutf8_ncat(d, s, l)
+#define	milstr_chr(s, c)		milutf8_chr(s, c)
 #else
-#define	ISKANJI1ST(c)			(0)
+#define milstr_charsize(s)		milank_charsize(s)
 #define	milstr_cmp(s, c)		milank_cmp(s, c)
 #define	milstr_memcmp(s, c)		milank_memcmp(s, c)
 #define	milstr_kanji1st(s, p)	(0)
 #define	milstr_kanji2nd(s, p)	(0)
 #define	milstr_ncpy(d, s, l)	milank_ncpy(d, s, l)
 #define	milstr_ncat(d, s, l)	milank_ncat(d, s, l)
+#define	milstr_chr(s, c)		milank_chr(s, c)
 #endif