Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'web-request'

Browse Source 
Add wxWebViewRequest and related classes allowing to use HTTPS and
HTTP/2.

See https://github.com/wxWidgets/wxWidgets/pull/977
This commit is contained in:
Vadim Zeitlin
2021-01-17 18:19:47 +01:00
parent 10c85670dc 970ab0a1ae
commit febd185fc6
100 changed files with 29554 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/common/log.cpp
View File

@@ -1091,19 +1091,22 @@ unsigned long wxSysErrorCode()
#endif //Win/Unix
}
static const wxChar* GetSysErrorMsg(wxChar* szBuf, size_t sizeBuf, unsigned long nErrCode)
{
if ( nErrCode == 0 )
nErrCode = wxSysErrorCode();
#if defined(__WINDOWS__)
wxString wxMSWFormatMessage(DWORD nErrCode, HMODULE hModule)
{
DWORD flags = FORMAT_MESSAGE_ALLOCATE_BUFFER |
FORMAT_MESSAGE_FROM_SYSTEM |
FORMAT_MESSAGE_IGNORE_INSERTS;
if ( hModule )
flags |= FORMAT_MESSAGE_FROM_HMODULE;
// get error message from system
LPVOID lpMsgBuf;
if ( ::FormatMessage
(
FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM |
FORMAT_MESSAGE_IGNORE_INSERTS,
NULL,
flags,
hModule,
nErrCode,
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
(LPTSTR)&lpMsgBuf,
@@ -1111,37 +1114,44 @@ static const wxChar* GetSysErrorMsg(wxChar* szBuf, size_t sizeBuf, unsigned long
NULL
) == 0 )
{
wxLogDebug(wxS("FormatMessage failed with error 0x%lx in %s"),
GetLastError(), __WXFUNCTION__ ? __WXFUNCTION__ : "");
wxLogDebug(wxS("FormatMessage failed with error 0x%lx"), GetLastError());
// if this happens, something is seriously wrong, so don't use _() here
// for safety
wxSprintf(szBuf, wxS("unknown error 0x%lx"), nErrCode);
return szBuf;
return wxString::Format(wxS("unknown error 0x%lx"), nErrCode);
}
wxString str;
// copy it to our buffer and free memory
// Crashes on SmartPhone (FIXME)
if( lpMsgBuf != 0 )
{
wxStrlcpy(szBuf, (const wxChar *)lpMsgBuf, sizeBuf);
str = static_cast<const wxChar *>(lpMsgBuf);
LocalFree(lpMsgBuf);
// returned string is ended with '\r\n' - bad
size_t len = wxStrlen(szBuf);
size_t len = str.length();
if ( len >= 2 ) {
// truncate string
if ( szBuf[len - 2] == wxS('\r') )
szBuf[len - 2] = wxS('\0');
if ( str[len - 2] == wxS('\r') )
str.Truncate(len - 2);
}
}
else
{
szBuf[0] = wxS('\0');
}
return szBuf;
return str;
}
#endif // __WINDOWS__
wxString wxSysErrorMsgStr(unsigned long nErrCode)
{
if ( nErrCode == 0 )
nErrCode = wxSysErrorCode();
#if defined(__WINDOWS__)
return wxMSWFormatMessage(nErrCode);
#else // !__WINDOWS__
char buffer[1024];
char *errorMsg = buffer;
@@ -1158,29 +1168,19 @@ static const wxChar* GetSysErrorMsg(wxChar* szBuf, size_t sizeBuf, unsigned long
#endif
// at this point errorMsg might not point to buffer anymore
szBuf[0] = wxS('\0');
#if wxUSE_UNICODE
wxConvCurrent->MB2WC(szBuf, errorMsg, sizeBuf - 1);
szBuf[sizeBuf - 1] = wxS('\0');
#else
wxStrlcpy(szBuf, errorMsg, sizeBuf);
#endif
return szBuf;
return errorMsg;
#endif // __WINDOWS__/!__WINDOWS__
}
// get error message from system
// get error message from system as a char pointer: this function has to use a
// static buffer of fixed size, so should be avoided in favour of the function
// returning wxString
const wxChar *wxSysErrorMsg(unsigned long nErrCode)
{
static wxChar s_szBuf[1024];
return GetSysErrorMsg(s_szBuf, WXSIZEOF(s_szBuf), nErrCode);
}
// get error message from system as wxString
wxString wxSysErrorMsgStr(unsigned long nErrCode)
{
wxChar szBuf[1024];
return GetSysErrorMsg(szBuf, WXSIZEOF(szBuf), nErrCode);
wxStrlcpy(s_szBuf, (const wxChar*)wxSysErrorMsgStr(nErrCode).c_str(),
WXSIZEOF(s_szBuf));
return s_szBuf;
}
#endif // wxUSE_LOG