From a6e0b135b3e131def0235a729aaf67db0ff88c96 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Wed, 24 Nov 2021 21:06:54 +0000 Subject: [PATCH] WebView: use custom C-- function if CP1251 to CP866 convert is failed in iconv.obj (the case for 4pda.to) Please somebody fix iconv... git-svn-id: svn://kolibrios.org@9306 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/browser/const.h | 2 +- programs/cmm/lib/obj/iconv.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/programs/cmm/browser/const.h b/programs/cmm/browser/const.h index 3e2e0e1cfd..c4aaac4086 100644 --- a/programs/cmm/browser/const.h +++ b/programs/cmm/browser/const.h @@ -107,4 +107,4 @@ char editbox_icons[] = FROM "res/editbox_icons.raw"; #define DEFAULT_URL URL_SERVICE_HOMEPAGE -char version[]="WebView 3.62b"; \ No newline at end of file +char version[]="WebView 3.62c"; \ No newline at end of file diff --git a/programs/cmm/lib/obj/iconv.h b/programs/cmm/lib/obj/iconv.h index b57ccef031..46c0b1211e 100644 --- a/programs/cmm/lib/obj/iconv.h +++ b/programs/cmm/lib/obj/iconv.h @@ -45,6 +45,9 @@ dword ChangeCharset(dword from_chs, to_chs, conv_buf) if (from_chs == CH_UTF8) && (to_chs == CH_CP866) { utf8rutodos(conv_buf); } + if (from_chs == CH_CP1251) && (to_chs == CH_CP866) { + wintodos(conv_buf); + } } else { strcpy(conv_buf, new_buf); }