Commit b0dc81f055d4eb523c92bc859d5641e72d343b00
2013-02-01T16:17:34
Win32: Make sure error messages are consistently UTF-8 encoded W/o this a libgit2 error message could have a mixed encoding: e.g. a filename in UTF-8 combined with a native Windows error message encoded with the local code page. Signed-off-by: Sven Strickroth <email@cs-ware.de>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66
diff --git a/src/errors.c b/src/errors.c
index d9827fb..c64db7b 100644
--- a/src/errors.c
+++ b/src/errors.c
@@ -52,16 +52,25 @@ void giterr_set(int error_class, const char *string, ...)
if (error_class == GITERR_OS) {
#ifdef GIT_WIN32
if (win32_error_code) {
- char *lpMsgBuf;
-
- if (FormatMessageA(
+ LPWSTR lpMsgBuf = NULL;
+ int size = FormatMessageW(
FORMAT_MESSAGE_ALLOCATE_BUFFER |
FORMAT_MESSAGE_FROM_SYSTEM |
FORMAT_MESSAGE_IGNORE_INSERTS,
- NULL, win32_error_code, 0, (LPSTR)&lpMsgBuf, 0, NULL)) {
+ NULL, win32_error_code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+ (LPWSTR)&lpMsgBuf, 0, NULL);
+
+ if (size) {
+ int utf8_size = size * 4 + 1;
+
+ char *lpMsgBuf_utf8 = git__calloc(utf8_size, sizeof(char));
+ GITERR_CHECK_ALLOC(lpMsgBuf_utf8);
+ WideCharToMultiByte(CP_UTF8, 0, lpMsgBuf, size, lpMsgBuf_utf8, utf8_size, NULL, NULL);
+
git_buf_PUTS(&buf, ": ");
- git_buf_puts(&buf, lpMsgBuf);
+ git_buf_puts(&buf, lpMsgBuf_utf8);
LocalFree(lpMsgBuf);
+ git__free(lpMsgBuf_utf8);
}
SetLastError(0);
diff --git a/src/netops.c b/src/netops.c
index 59e6bda..851ed42 100644
--- a/src/netops.c
+++ b/src/netops.c
@@ -40,16 +40,20 @@
#ifdef GIT_WIN32
static void net_set_error(const char *str)
{
- int size, error = WSAGetLastError();
- LPSTR err_str = NULL;
+ int error = WSAGetLastError();
+ LPWSTR err_str = NULL;
- size = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
- 0, error, 0, (LPSTR)&err_str, 0, 0);
+ int size = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
+ 0, error, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPWSTR)&err_str, 0, 0);
- GIT_UNUSED(size);
+ int utf8_size = size * 4 + 1;
+ char * err_str_utf8 = git__calloc(utf8_size, sizeof(char));
+ GITERR_CHECK_ALLOC(err_str_utf8);
+ WideCharToMultiByte(CP_UTF8, 0, err_str, size, err_str_utf8, utf8_size, NULL, NULL);
- giterr_set(GITERR_NET, "%s: %s", str, err_str);
+ giterr_set(GITERR_NET, "%s: %s", str, err_str_utf8);
LocalFree(err_str);
+ git__free(err_str_utf8);
}
#else
static void net_set_error(const char *str)