Commit 1cffa565 authored by damienf's avatar damienf
Browse files

- unicode.c, wincp.c: compile fix

parent 284187d1
......@@ -142,13 +142,13 @@ static char *locale_fast (const char *string, vlc_bool_t from)
0, string, -1, NULL, 0);
wchar_t wide[len];
MultiByteToWideChar (from ? CP_UTF8 : CP_ACP, 0, string, -1, wide, len);
len = 1 + WideCharToMultiByte (p->toCP, 0, wide, -1, NULL, 0, NULL, NULL);
MultiByteToWideChar (from ? CP_ACP : CP_UTF8, 0, string, -1, wide, len);
len = 1 + WideCharToMultiByte (from ? CP_UTF8 : CP_ACP, 0, wide, -1, NULL, 0, NULL, NULL);
out = malloc (len);
if (out == NULL)
return NULL;
WideCharToMultiByte (p->toCP, 0, wide, -1, out, len, NULL, NULL);
WideCharToMultiByte (from ? CP_UTF8 : CP_ACP, 0, wide, -1, out, len, NULL, NULL);
return out;
#else
return (char *)string;
......
......@@ -214,6 +214,7 @@ const char *GetFallbackEncoding( void )
return FindFallbackEncoding (psz_lang);
#else
static char buf[16] = "";
if (buf[0] == 0)
snprintf (buf, sizeof (buf), "CP%u", GetACP ());
return buf;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment