diff --git a/qse/cmd/awk/awk.c b/qse/cmd/awk/awk.c index 7994d97e..662dbbcf 100644 --- a/qse/cmd/awk/awk.c +++ b/qse/cmd/awk/awk.c @@ -1265,9 +1265,8 @@ int qse_main (int argc, qse_achar_t* argv[]) /* nothing special */ #endif - #if defined(_WIN32) - codepage = GetConsoleOutputCP(); + codepage = GetConsoleOutputCP(); if (codepage == CP_UTF8) { /*SetConsoleOUtputCP (CP_UTF8);*/ @@ -1279,12 +1278,12 @@ int qse_main (int argc, qse_achar_t* argv[]) qse_fmtuintmaxtombs (locale, QSE_COUNTOF(locale), codepage, 10, -1, QSE_MT('\0'), QSE_MT(".")); setlocale (LC_ALL, locale); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /* qse_setdflcmgrbyid (QSE_CMGR_SLMB); */ } #else setlocale (LC_ALL, ""); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /* qse_setdflcmgrbyid (QSE_CMGR_SLMB); */ #endif qse_openstdsios (); diff --git a/qse/cmd/http/httpd.c b/qse/cmd/http/httpd.c index eeb4d67e..773064ce 100644 --- a/qse/cmd/http/httpd.c +++ b/qse/cmd/http/httpd.c @@ -2821,12 +2821,12 @@ int qse_main (int argc, qse_achar_t* argv[]) qse_fmtuintmaxtombs (locale, QSE_COUNTOF(locale), codepage, 10, -1, QSE_MT('\0'), QSE_MT(".")); setlocale (LC_ALL, locale); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ } #else setlocale (LC_ALL, ""); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ #endif qse_openstdsios (); diff --git a/qse/cmd/http/ursd.c b/qse/cmd/http/ursd.c index 43d494db..91640cd0 100644 --- a/qse/cmd/http/ursd.c +++ b/qse/cmd/http/ursd.c @@ -1014,7 +1014,7 @@ int qse_main (int argc, qse_achar_t* argv[]) qse_fmtuintmaxtombs (locale, QSE_COUNTOF(locale), codepage, 10, -1, QSE_MT('\0'), QSE_MT(".")); setlocale (LC_ALL, locale); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ } if (WSAStartup (MAKEWORD(2,0), &wsadata) != 0) @@ -1025,7 +1025,7 @@ int qse_main (int argc, qse_achar_t* argv[]) #else setlocale (LC_ALL, ""); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ #endif qse_openstdsios (); diff --git a/qse/cmd/sed/sed.c b/qse/cmd/sed/sed.c index 6c98ca47..03d4de02 100644 --- a/qse/cmd/sed/sed.c +++ b/qse/cmd/sed/sed.c @@ -1065,11 +1065,11 @@ int qse_main (int argc, qse_achar_t* argv[]) qse_fmtuintmaxtombs (locale, QSE_COUNTOF(locale), codepage, 10, -1, QSE_MT('\0'), QSE_MT(".")); setlocale (LC_ALL, locale); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ } #else setlocale (LC_ALL, ""); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ #endif qse_openstdsios (); diff --git a/qse/cmd/xli/xli.c b/qse/cmd/xli/xli.c index 7c1d8181..99b41c55 100644 --- a/qse/cmd/xli/xli.c +++ b/qse/cmd/xli/xli.c @@ -640,11 +640,11 @@ int qse_main (int argc, qse_achar_t* argv[]) qse_fmtuintmaxtombs (locale, QSE_COUNTOF(locale), codepage, 10, -1, QSE_MT('\0'), QSE_MT(".")); setlocale (LC_ALL, locale); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ } #else setlocale (LC_ALL, ""); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ #endif qse_openstdsios (); diff --git a/qse/include/qse/cmn/mbwc.h b/qse/include/qse/cmn/mbwc.h index b2b79d11..80e7c1d8 100644 --- a/qse/include/qse/cmn/mbwc.h +++ b/qse/include/qse/cmn/mbwc.h @@ -103,15 +103,15 @@ QSE_EXPORT qse_cmgr_t* qse_getdflcmgr ( void ); -QSE_EXPORT void qse_setdflcmgr ( +QSE_EXPORT qse_cmgr_t* qse_setdflcmgr ( qse_cmgr_t* cmgr ); /** - * The qse_setdflcmgrbyid() function finds a built-in - * cmgr for the \a id and sets it as a default cmgr. + * The qse_setdflcmgrbyid() function finds a built-in cmgr for the \a id and + * sets it as a default cmgr. It returns the pointer to the cmgr object set. */ -QSE_EXPORT void qse_setdflcmgrbyid ( +QSE_EXPORT qse_cmgr_t* qse_setdflcmgrbyid ( qse_cmgr_id_t id ); diff --git a/qse/lib/cmn/mbwc.c b/qse/lib/cmn/mbwc.c index 702ed58e..6a88efa4 100644 --- a/qse/lib/cmn/mbwc.c +++ b/qse/lib/cmn/mbwc.c @@ -50,7 +50,15 @@ static qse_cmgr_t builtin_cmgr[] = #endif }; -static qse_cmgr_t* dfl_cmgr = &builtin_cmgr[QSE_CMGR_SLMB]; +#if defined(_WIN32) && defined(HAVE_WCRTOMB) + /* read the comment at the bottom of qse_slwcrtoslmb() in slmb.c + * for the condition above. */ +# define DEFAULT_CMGR QSE_CMGR_SLMB +#else +# define DEFAULT_CMGR QSE_CMGR_UTF8 +#endif + +static qse_cmgr_t* dfl_cmgr = &builtin_cmgr[DEFAULT_CMGR]; static qse_cmgr_finder_t cmgr_finder = QSE_NULL; qse_cmgr_t* qse_getdflcmgr (void) @@ -58,15 +66,17 @@ qse_cmgr_t* qse_getdflcmgr (void) return dfl_cmgr; } -void qse_setdflcmgr (qse_cmgr_t* cmgr) +qse_cmgr_t* qse_setdflcmgr (qse_cmgr_t* cmgr) { - dfl_cmgr = (cmgr? cmgr: &builtin_cmgr[QSE_CMGR_SLMB]); + dfl_cmgr = (cmgr? cmgr: &builtin_cmgr[DEFAULT_CMGR]); + return dfl_cmgr; } -void qse_setdflcmgrbyid (qse_cmgr_id_t id) +qse_cmgr_t* qse_setdflcmgrbyid (qse_cmgr_id_t id) { qse_cmgr_t* cmgr = qse_findcmgrbyid (id); - dfl_cmgr = (cmgr? cmgr: &builtin_cmgr[QSE_CMGR_SLMB]); + dfl_cmgr = (cmgr? cmgr: &builtin_cmgr[DEFAULT_CMGR]); + return dfl_cmgr; } qse_cmgr_t* qse_findcmgrbyid (qse_cmgr_id_t id) diff --git a/qse/lib/cmn/sio.c b/qse/lib/cmn/sio.c index aab6ec9f..4d58623b 100644 --- a/qse/lib/cmn/sio.c +++ b/qse/lib/cmn/sio.c @@ -815,15 +815,16 @@ static qse_ssize_t file_output ( static qse_sio_t* sio_stdout = QSE_NULL; static qse_sio_t* sio_stderr = QSE_NULL; +/* TODO: add sio_stdin, qse_getmbs, etc */ int qse_openstdsios (void) { if (sio_stdout == QSE_NULL) - { + { sio_stdout = qse_sio_openstd (QSE_MMGR_GETDFL(), 0, QSE_SIO_STDOUT, QSE_SIO_LINEBREAK); } if (sio_stderr == QSE_NULL) - { + { sio_stderr = qse_sio_openstd (QSE_MMGR_GETDFL(), 0, QSE_SIO_STDERR, QSE_SIO_LINEBREAK); } diff --git a/qse/lib/cmn/slmb.c b/qse/lib/cmn/slmb.c index 118d337e..fed6fb43 100644 --- a/qse/lib/cmn/slmb.c +++ b/qse/lib/cmn/slmb.c @@ -104,6 +104,9 @@ qse_size_t qse_slwcrtoslmb ( #else /* not supported */ + + /* make sure to update the precessor condition to set DEFAULT_CMGR + * in mbwc.c when you have different implementation here */ return 0; #endif } diff --git a/qse/lib/cmn/tio.c b/qse/lib/cmn/tio.c index 68431dfc..aa950681 100644 --- a/qse/lib/cmn/tio.c +++ b/qse/lib/cmn/tio.c @@ -708,7 +708,7 @@ qse_ssize_t qse_tio_writewcs ( /* flush the full buffer regardless of conversion * result. */ if (qse_tio_flush (tio) <= -1) return -1; - nl = 0; + nl = 0; } if (n <= -1) diff --git a/qse/samples/awk/awk00.c b/qse/samples/awk/awk00.c index 514119ca..16ccc75d 100644 --- a/qse/samples/awk/awk00.c +++ b/qse/samples/awk/awk00.c @@ -24,10 +24,10 @@ void init_awk_sample_locale (void) qse_fmtuintmaxtombs (locale, QSE_COUNTOF(locale), codepage, 10, -1, QSE_MT('\0'), QSE_MT(".")); setlocale (LC_ALL, locale); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ } #else setlocale (LC_ALL, ""); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ #endif } diff --git a/qse/samples/awk/awk24.cpp b/qse/samples/awk/awk24.cpp index 121e70d9..3bf0aa99 100644 --- a/qse/samples/awk/awk24.cpp +++ b/qse/samples/awk/awk24.cpp @@ -174,11 +174,11 @@ int qse_main (int argc, qse_achar_t* argv[]) { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ } #else setlocale (LC_ALL, ""); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ #endif } diff --git a/qse/samples/awk/awk25.cpp b/qse/samples/awk/awk25.cpp index 67f77f2d..b94559ed 100644 --- a/qse/samples/awk/awk25.cpp +++ b/qse/samples/awk/awk25.cpp @@ -471,7 +471,7 @@ int qse_main (int argc, qse_achar_t* argv[]) { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ } if (WSAStartup (MAKEWORD(2,0), &wsadata) != 0) @@ -482,7 +482,7 @@ int qse_main (int argc, qse_achar_t* argv[]) #else setlocale (LC_ALL, ""); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ #endif } diff --git a/qse/samples/awk/awk26.cpp b/qse/samples/awk/awk26.cpp index ba29a0a7..aae497a5 100644 --- a/qse/samples/awk/awk26.cpp +++ b/qse/samples/awk/awk26.cpp @@ -104,11 +104,11 @@ int qse_main (int argc, qse_achar_t* argv[]) { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ } #else setlocale (LC_ALL, ""); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ #endif } diff --git a/qse/samples/awk/awk27.cpp b/qse/samples/awk/awk27.cpp index 987eeccb..ce705beb 100644 --- a/qse/samples/awk/awk27.cpp +++ b/qse/samples/awk/awk27.cpp @@ -132,11 +132,11 @@ int qse_main (int argc, qse_achar_t* argv[]) { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ } #else setlocale (LC_ALL, ""); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ #endif } diff --git a/qse/samples/awk/awk28.cpp b/qse/samples/awk/awk28.cpp index 0a3046af..24b379a3 100644 --- a/qse/samples/awk/awk28.cpp +++ b/qse/samples/awk/awk28.cpp @@ -239,11 +239,11 @@ int qse_main (int argc, qse_achar_t* argv[]) { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ } #else setlocale (LC_ALL, ""); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ #endif } diff --git a/qse/samples/cmn/chr01.c b/qse/samples/cmn/chr01.c index c4676093..e035fd79 100644 --- a/qse/samples/cmn/chr01.c +++ b/qse/samples/cmn/chr01.c @@ -40,11 +40,11 @@ int main () { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ } #else setlocale (LC_ALL, ""); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ #endif diff --git a/qse/samples/cmn/dir01.c b/qse/samples/cmn/dir01.c index 8374f021..535d6fcc 100644 --- a/qse/samples/cmn/dir01.c +++ b/qse/samples/cmn/dir01.c @@ -113,11 +113,11 @@ int qse_main (int argc, qse_achar_t* argv[]) qse_fmtuintmaxtombs (locale, QSE_COUNTOF(locale), codepage, 10, -1, QSE_MT('\0'), QSE_MT(".")); setlocale (LC_ALL, locale); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ } #else setlocale (LC_ALL, ""); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ #endif qse_openstdsios (); diff --git a/qse/samples/cmn/fmt01.c b/qse/samples/cmn/fmt01.c index 1491ec98..47a883e5 100644 --- a/qse/samples/cmn/fmt01.c +++ b/qse/samples/cmn/fmt01.c @@ -70,11 +70,11 @@ int qse_main (int argc, qse_achar_t* argv[]) { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ } #else setlocale (LC_ALL, ""); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ #endif qse_openstdsios (); x = qse_runmain (argc, argv, test_main); diff --git a/qse/samples/cmn/fmt02.c b/qse/samples/cmn/fmt02.c index b22a6d6d..2daa658b 100644 --- a/qse/samples/cmn/fmt02.c +++ b/qse/samples/cmn/fmt02.c @@ -90,11 +90,11 @@ int qse_main (int argc, qse_achar_t* argv[]) { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ } #else setlocale (LC_ALL, ""); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ #endif qse_openstdsios (); x = qse_runmain (argc, argv, test_main); diff --git a/qse/samples/cmn/fs01.c b/qse/samples/cmn/fs01.c index 76ad367f..d53c583a 100644 --- a/qse/samples/cmn/fs01.c +++ b/qse/samples/cmn/fs01.c @@ -89,11 +89,11 @@ int qse_main (int argc, qse_achar_t* argv[]) { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ } #else setlocale (LC_ALL, ""); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ #endif qse_openstdsios (); diff --git a/qse/samples/cmn/fs02.c b/qse/samples/cmn/fs02.c index fb6c798b..ef2ca116 100644 --- a/qse/samples/cmn/fs02.c +++ b/qse/samples/cmn/fs02.c @@ -118,11 +118,11 @@ int main (int argc, qse_achar_t* argv[]) qse_fmtuintmaxtombs (locale, QSE_COUNTOF(locale), codepage, 10, -1, QSE_MT('\0'), QSE_MT(".")); setlocale (LC_ALL, locale); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ } #else setlocale (LC_ALL, ""); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ #endif qse_openstdsios (); diff --git a/qse/samples/cmn/fs03.c b/qse/samples/cmn/fs03.c index 674ee332..76ff8128 100644 --- a/qse/samples/cmn/fs03.c +++ b/qse/samples/cmn/fs03.c @@ -116,11 +116,11 @@ int main (int argc, qse_achar_t* argv[]) qse_fmtuintmaxtombs (locale, QSE_COUNTOF(locale), codepage, 10, -1, QSE_MT('\0'), QSE_MT(".")); setlocale (LC_ALL, locale); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ } #else setlocale (LC_ALL, ""); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ #endif qse_openstdsios (); diff --git a/qse/samples/cmn/glob01.c b/qse/samples/cmn/glob01.c index 8404681a..234b5b81 100644 --- a/qse/samples/cmn/glob01.c +++ b/qse/samples/cmn/glob01.c @@ -54,11 +54,11 @@ int qse_main (int argc, qse_achar_t* argv[]) qse_fmtuintmaxtombs (locale, QSE_COUNTOF(locale), codepage, 10, -1, QSE_MT('\0'), QSE_MT(".")); setlocale (LC_ALL, locale); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ } #else setlocale (LC_ALL, ""); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ #endif qse_openstdsios (); diff --git a/qse/samples/cmn/ipad01.c b/qse/samples/cmn/ipad01.c index 07f34fb4..8853aeb8 100644 --- a/qse/samples/cmn/ipad01.c +++ b/qse/samples/cmn/ipad01.c @@ -201,11 +201,11 @@ int qse_main (int argc, qse_achar_t* argv[]) { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ } #else setlocale (LC_ALL, ""); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ #endif qse_openstdsios (); x = qse_runmain (argc, argv, test_main); diff --git a/qse/samples/cmn/main01.c b/qse/samples/cmn/main01.c index 76d8f75c..523fd63c 100644 --- a/qse/samples/cmn/main01.c +++ b/qse/samples/cmn/main01.c @@ -36,11 +36,11 @@ int qse_main (int argc, qse_achar_t* argv[]) { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ } #else setlocale (LC_ALL, ""); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ #endif qse_openstdsios (); diff --git a/qse/samples/cmn/main02.c b/qse/samples/cmn/main02.c index 94e009d3..c5f35b9c 100644 --- a/qse/samples/cmn/main02.c +++ b/qse/samples/cmn/main02.c @@ -41,11 +41,11 @@ int qse_main (int argc, qse_achar_t* argv[], qse_achar_t* envp[]) { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ } #else setlocale (LC_ALL, ""); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ #endif qse_openstdsios (); diff --git a/qse/samples/cmn/mbwc01.c b/qse/samples/cmn/mbwc01.c index 78407ee4..eda25249 100644 --- a/qse/samples/cmn/mbwc01.c +++ b/qse/samples/cmn/mbwc01.c @@ -224,11 +224,11 @@ int main () { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ } #else setlocale (LC_ALL, ""); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ #endif qse_openstdsios (); diff --git a/qse/samples/cmn/mbwc02.c b/qse/samples/cmn/mbwc02.c index 3e97c7ca..a65b0a4f 100644 --- a/qse/samples/cmn/mbwc02.c +++ b/qse/samples/cmn/mbwc02.c @@ -304,11 +304,11 @@ int main () { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ } #else setlocale (LC_ALL, ""); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ #endif qse_openstdsios (); diff --git a/qse/samples/cmn/nwad01.c b/qse/samples/cmn/nwad01.c index 0f9eebfc..c050fb3a 100644 --- a/qse/samples/cmn/nwad01.c +++ b/qse/samples/cmn/nwad01.c @@ -167,11 +167,11 @@ int qse_main (int argc, qse_achar_t* argv[]) { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ } #else setlocale (LC_ALL, ""); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ #endif qse_openstdsios (); x = qse_runmain (argc, argv, test_main); diff --git a/qse/samples/cmn/nwif01.c b/qse/samples/cmn/nwif01.c index 03fa4da4..f1b310db 100644 --- a/qse/samples/cmn/nwif01.c +++ b/qse/samples/cmn/nwif01.c @@ -82,11 +82,11 @@ int qse_main (int argc, qse_achar_t* argv[]) qse_fmtuintmaxtombs (locale, QSE_COUNTOF(locale), codepage, 10, -1, QSE_MT('\0'), QSE_MT(".")); setlocale (LC_ALL, locale); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ } #else setlocale (LC_ALL, ""); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ #endif qse_openstdsios (); ret = qse_runmain (argc, argv, test_main); diff --git a/qse/samples/cmn/nwif02.c b/qse/samples/cmn/nwif02.c index 329e1641..727c3c26 100644 --- a/qse/samples/cmn/nwif02.c +++ b/qse/samples/cmn/nwif02.c @@ -94,11 +94,11 @@ int qse_main (int argc, qse_achar_t* argv[]) qse_fmtuintmaxtombs (locale, QSE_COUNTOF(locale), codepage, 10, -1, QSE_MT('\0'), QSE_MT(".")); setlocale (LC_ALL, locale); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ } #else setlocale (LC_ALL, ""); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ #endif qse_openstdsios (); ret = qse_runmain (argc, argv, test_main); diff --git a/qse/samples/cmn/path01.c b/qse/samples/cmn/path01.c index 8d280ba8..48461b9c 100644 --- a/qse/samples/cmn/path01.c +++ b/qse/samples/cmn/path01.c @@ -79,11 +79,11 @@ int qse_main (int argc, qse_achar_t* argv[]) { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ } #else setlocale (LC_ALL, ""); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ #endif qse_openstdsios (); diff --git a/qse/samples/cmn/rex01.c b/qse/samples/cmn/rex01.c index b2feddb1..dd08f469 100644 --- a/qse/samples/cmn/rex01.c +++ b/qse/samples/cmn/rex01.c @@ -83,11 +83,11 @@ int qse_main (int argc, qse_achar_t* argv[]) { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ } #else setlocale (LC_ALL, ""); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ #endif qse_openstdsios (); x = qse_runmain (argc, argv, rex_main); diff --git a/qse/samples/cmn/sio01.c b/qse/samples/cmn/sio01.c index 93516c3f..3e1cdcc6 100644 --- a/qse/samples/cmn/sio01.c +++ b/qse/samples/cmn/sio01.c @@ -106,11 +106,11 @@ int main () { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ } #else setlocale (LC_ALL, ""); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ #endif g_out = qse_sio_openstd (QSE_MMGR_GETDFL(), 0, QSE_SIO_STDOUT, QSE_SIO_WRITE | QSE_SIO_IGNOREMBWCERR); diff --git a/qse/samples/cmn/sio02.c b/qse/samples/cmn/sio02.c index 3d41c4cb..0a3a77ff 100644 --- a/qse/samples/cmn/sio02.c +++ b/qse/samples/cmn/sio02.c @@ -156,11 +156,11 @@ int main () { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ } #else setlocale (LC_ALL, ""); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ #endif setlocale (LC_ALL, ""); diff --git a/qse/samples/cmn/sio03.c b/qse/samples/cmn/sio03.c index 6700c095..07ea5299 100644 --- a/qse/samples/cmn/sio03.c +++ b/qse/samples/cmn/sio03.c @@ -179,11 +179,11 @@ int main () { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ } #else setlocale (LC_ALL, ""); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ #endif g_out = qse_sio_openstd (QSE_MMGR_GETDFL(), 0, QSE_SIO_STDOUT, QSE_SIO_WRITE | QSE_SIO_IGNOREMBWCERR); diff --git a/qse/samples/cmn/slmb01.c b/qse/samples/cmn/slmb01.c index 39754f3b..20146915 100644 --- a/qse/samples/cmn/slmb01.c +++ b/qse/samples/cmn/slmb01.c @@ -208,7 +208,7 @@ int main () { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ } #if 0 @@ -221,7 +221,7 @@ int main () #else setlocale (LC_ALL, ""); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ #endif qse_openstdsios (); diff --git a/qse/samples/cmn/task01.c b/qse/samples/cmn/task01.c index 7e4c68c4..a894d74d 100644 --- a/qse/samples/cmn/task01.c +++ b/qse/samples/cmn/task01.c @@ -95,11 +95,11 @@ int qse_main (int argc, qse_achar_t* argv[]) { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ } #else setlocale (LC_ALL, ""); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ #endif qse_openstdsios (); diff --git a/qse/samples/cmn/tre01.c b/qse/samples/cmn/tre01.c index 0d687b6e..84cf283d 100644 --- a/qse/samples/cmn/tre01.c +++ b/qse/samples/cmn/tre01.c @@ -90,11 +90,11 @@ int qse_main (int argc, qse_achar_t* argv[]) { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ } #else setlocale (LC_ALL, ""); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ #endif qse_openstdsios (); x = qse_runmain (argc, argv, test_main); diff --git a/qse/samples/cmn/uri01.c b/qse/samples/cmn/uri01.c index c811e22a..5ba11626 100644 --- a/qse/samples/cmn/uri01.c +++ b/qse/samples/cmn/uri01.c @@ -129,11 +129,11 @@ int qse_main (int argc, qse_achar_t* argv[]) { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ } #else setlocale (LC_ALL, ""); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ #endif qse_openstdsios (); x = qse_runmain (argc, argv, test_main); diff --git a/qse/samples/http/httpd01.c b/qse/samples/http/httpd01.c index ea6f9736..6856d24b 100644 --- a/qse/samples/http/httpd01.c +++ b/qse/samples/http/httpd01.c @@ -122,7 +122,7 @@ int qse_main (int argc, qse_achar_t* argv[]) { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ } if (WSAStartup (MAKEWORD(2,0), &wsadata) != 0) @@ -133,7 +133,7 @@ int qse_main (int argc, qse_achar_t* argv[]) } #else setlocale (LC_ALL, ""); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ #endif #if defined(HAVE_SSL) diff --git a/qse/samples/http/httpd02.c b/qse/samples/http/httpd02.c index 5ee9fbae..234ff6d5 100644 --- a/qse/samples/http/httpd02.c +++ b/qse/samples/http/httpd02.c @@ -257,7 +257,7 @@ int qse_main (int argc, qse_achar_t* argv[]) { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ } @@ -269,7 +269,7 @@ int qse_main (int argc, qse_achar_t* argv[]) #else setlocale (LC_ALL, ""); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ #endif #if defined(HAVE_SSL) diff --git a/qse/samples/http/upxd01.c b/qse/samples/http/upxd01.c index 21cb3339..e23736b7 100644 --- a/qse/samples/http/upxd01.c +++ b/qse/samples/http/upxd01.c @@ -885,11 +885,11 @@ int qse_main (int argc, qse_achar_t* argv[]) { sprintf (locale, ".%u", (unsigned int)codepage); setlocale (LC_ALL, locale); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ } #else setlocale (LC_ALL, ""); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ #endif return qse_runmain (argc, argv, upxd_main); diff --git a/qse/samples/sed/sed00.c b/qse/samples/sed/sed00.c index 7ba8a9ca..af702638 100644 --- a/qse/samples/sed/sed00.c +++ b/qse/samples/sed/sed00.c @@ -24,10 +24,10 @@ void init_sed_sample_locale (void) qse_fmtuintmaxtombs (locale, QSE_COUNTOF(locale), codepage, 10, -1, QSE_MT('\0'), QSE_MT(".")); setlocale (LC_ALL, locale); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ } #else setlocale (LC_ALL, ""); - qse_setdflcmgrbyid (QSE_CMGR_SLMB); + /*qse_setdflcmgrbyid (QSE_CMGR_SLMB);*/ #endif }