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

fixed a harmless buglet in wxSysErrorMsg() under Win32

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-12-31 02:41:25 +00:00
parent 6415c4fe8a
commit 251244a020
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/common/log.cpp
View File

@@ -732,20 +732,23 @@ const wxChar *wxSysErrorMsg(unsigned long nErrCode)
0, NULL); 0, NULL);
// copy it to our buffer and free memory // copy it to our buffer and free memory
if( lpMsgBuf != 0 ) if( lpMsgBuf != 0 ) {
wxStrncpy(s_szBuf, (const wxChar *)lpMsgBuf, WXSIZEOF(s_szBuf) - 1); wxStrncpy(s_szBuf, (const wxChar *)lpMsgBuf, WXSIZEOF(s_szBuf) - 1);
else s_szBuf[WXSIZEOF(s_szBuf) - 1] = wxT('\0');
s_szBuf[0] = wxT('\0');
s_szBuf[WXSIZEOF(s_szBuf) - 1] = wxT('\0');
LocalFree(lpMsgBuf);
// returned string is capitalized and ended with '\r\n' - bad LocalFree(lpMsgBuf);
s_szBuf[0] = (wxChar)wxTolower(s_szBuf[0]);
size_t len = wxStrlen(s_szBuf); // returned string is capitalized and ended with '\r\n' - bad
if ( len > 0 ) { s_szBuf[0] = (wxChar)wxTolower(s_szBuf[0]);
// truncate string size_t len = wxStrlen(s_szBuf);
if ( s_szBuf[len - 2] == wxT('\r') ) if ( len > 0 ) {
s_szBuf[len - 2] = wxT('\0'); // truncate string
if ( s_szBuf[len - 2] == wxT('\r') )
s_szBuf[len - 2] = wxT('\0');
}
}
else {
s_szBuf[0] = wxT('\0');
} }
return s_szBuf; return s_szBuf;