mirror of
https://git.proxmox.com/git/libgit2
synced 2025-05-30 18:43:25 +00:00
Win32 error reporting: Support WinHTTP errors
This commit is contained in:
parent
0227fa2a35
commit
8cc2f2d86f
@ -8,34 +8,70 @@
|
|||||||
#include "common.h"
|
#include "common.h"
|
||||||
#include "error.h"
|
#include "error.h"
|
||||||
|
|
||||||
|
#ifdef GIT_WINHTTP
|
||||||
|
# include <winhttp.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define WC_ERR_INVALID_CHARS 0x80
|
||||||
|
|
||||||
char *git_win32_get_error_message(DWORD error_code)
|
char *git_win32_get_error_message(DWORD error_code)
|
||||||
{
|
{
|
||||||
LPWSTR lpMsgBuf = NULL;
|
LPWSTR lpMsgBuf = NULL;
|
||||||
|
HMODULE hModule = NULL;
|
||||||
|
char *utf8_msg = NULL;
|
||||||
|
int utf8_size;
|
||||||
|
DWORD dwFlags =
|
||||||
|
FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_IGNORE_INSERTS;
|
||||||
|
|
||||||
if (!error_code)
|
if (!error_code)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
if (FormatMessageW(
|
#ifdef GIT_WINHTTP
|
||||||
FORMAT_MESSAGE_ALLOCATE_BUFFER |
|
/* Errors raised by WinHTTP are not in the system resource table */
|
||||||
FORMAT_MESSAGE_FROM_SYSTEM |
|
if (error_code >= WINHTTP_ERROR_BASE &&
|
||||||
FORMAT_MESSAGE_IGNORE_INSERTS,
|
error_code <= WINHTTP_ERROR_LAST)
|
||||||
NULL, error_code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
|
hModule = GetModuleHandleW(L"winhttp");
|
||||||
(LPWSTR)&lpMsgBuf, 0, NULL)) {
|
#endif
|
||||||
int utf8_size = WideCharToMultiByte(CP_UTF8, 0, lpMsgBuf, -1, NULL, 0, NULL, NULL);
|
|
||||||
|
|
||||||
char *lpMsgBuf_utf8 = git__malloc(utf8_size * sizeof(char));
|
GIT_UNUSED(hModule);
|
||||||
if (lpMsgBuf_utf8 == NULL) {
|
|
||||||
LocalFree(lpMsgBuf);
|
if (hModule)
|
||||||
return NULL;
|
dwFlags |= FORMAT_MESSAGE_FROM_HMODULE;
|
||||||
}
|
else
|
||||||
if (!WideCharToMultiByte(CP_UTF8, 0, lpMsgBuf, -1, lpMsgBuf_utf8, utf8_size, NULL, NULL)) {
|
dwFlags |= FORMAT_MESSAGE_FROM_SYSTEM;
|
||||||
LocalFree(lpMsgBuf);
|
|
||||||
git__free(lpMsgBuf_utf8);
|
if (FormatMessageW(dwFlags, hModule, error_code,
|
||||||
return NULL;
|
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
|
||||||
|
(LPWSTR)&lpMsgBuf, 0, NULL)) {
|
||||||
|
|
||||||
|
/* Invalid code point check supported on Vista+ only */
|
||||||
|
if (LOBYTE(LOWORD(GetVersion())) >= 6)
|
||||||
|
dwFlags = WC_ERR_INVALID_CHARS;
|
||||||
|
else
|
||||||
|
dwFlags = 0;
|
||||||
|
|
||||||
|
utf8_size = WideCharToMultiByte(CP_UTF8, dwFlags,
|
||||||
|
lpMsgBuf, -1, NULL, 0, NULL, NULL);
|
||||||
|
|
||||||
|
if (!utf8_size) {
|
||||||
|
assert(0);
|
||||||
|
goto on_error;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
utf8_msg = git__malloc(utf8_size);
|
||||||
|
|
||||||
|
if (!utf8_msg)
|
||||||
|
goto on_error;
|
||||||
|
|
||||||
|
if (!WideCharToMultiByte(CP_UTF8, dwFlags,
|
||||||
|
lpMsgBuf, -1, utf8_msg, utf8_size, NULL, NULL)) {
|
||||||
|
git__free(utf8_msg);
|
||||||
|
goto on_error;
|
||||||
|
}
|
||||||
|
|
||||||
|
on_error:
|
||||||
LocalFree(lpMsgBuf);
|
LocalFree(lpMsgBuf);
|
||||||
return lpMsgBuf_utf8;
|
|
||||||
}
|
}
|
||||||
return NULL;
|
|
||||||
|
return utf8_msg;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user