[vlc-commits] Win32: add FromANSI / ToANSI and use them

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Mar 22 18:46:22 2012 +0200| [a5fded6e089a4d7b3d9fe36181630129ebf661ea] | committer: Rémi Denis-Courmont

Win32: add FromANSI / ToANSI and use them

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a5fded6e089a4d7b3d9fe36181630129ebf661ea
---

 include/vlc_charset.h |   37 +++++++++++++++++++------------------
 1 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/include/vlc_charset.h b/include/vlc_charset.h
index 4bd30ca..7a0a37e 100644
--- a/include/vlc_charset.h
+++ b/include/vlc_charset.h
@@ -57,22 +57,6 @@ VLC_API void * ToCharset( const char *charset, const char *in, size_t *outsize )
 
 #else
 VLC_USED
-static inline char *FromLocale (const char *locale)
-{
-    return locale ? FromCharset ("", locale, strlen (locale)) : NULL;
-}
-
-VLC_USED
-static inline char *ToLocale (const char *utf8)
-{
-    size_t outsize;
-    return utf8 ? (char *)ToCharset ("", utf8, &outsize) : (char *)NULL;
-}
-# define LocaleFree(s) free((char *)(s))
-# define FromLocaleDup FromLocale
-# define ToLocaleDup   ToLocale
-
-VLC_USED
 static inline char *FromWide (const wchar_t *wide)
 {
     size_t len = WideCharToMultiByte (CP_UTF8, 0, wide, -1, NULL, 0, NULL, NULL);
@@ -135,13 +119,30 @@ static inline char *FromCodePage (unsigned cp, const char *mb)
     return utf8;
 }
 
+VLC_USED VLC_MALLOC
+static inline char *FromANSI (const char *ansi)
+{
+    return FromCodePage (GetACP (), ansi);
+}
+
+VLC_USED VLC_MALLOC
+static inline char *ToANSI (const char *utf8)
+{
+    return ToCodePage (GetACP (), utf8);
+}
+
 # ifdef UNICODE
 #  define FromT FromWide
 #  define ToT   ToWide
 # else
-#  define FromT FromLocaleDup
-#  define ToT   ToLocaleDup
+#  define FromT FromANSI
+#  define ToT   ToANSI
 # endif
+# define FromLocale    FromANSI
+# define ToLocale      ToAnsi
+# define LocaleFree(s) free((char *)(s))
+# define FromLocaleDup FromANSI
+# define ToLocaleDup   ToANSI
 #endif
 
 /**