- Fixed: Multibang [] not assumed when [Measure] is replaced in CConfigParser::ReadString().

- Minor changes of ConvertToXXX(): Get an appropriate buffer size to convert the string. And using [] when deleting arrays.
- Fixed a few memory leaks.
- It's now possible to send the !BANG command when all windows are "On Desktop". (Rainmeter.exe and WebParser)
This commit is contained in:
spx
2009-09-12 11:11:40 +00:00
parent 8ea3c6780a
commit 9d96ec61c1
10 changed files with 155 additions and 82 deletions

View File

@ -82,13 +82,18 @@ std::string ConvertToAscii(LPCTSTR str)
{
std::string szAscii;
if (str)
if (str && *str)
{
size_t len = (wcslen(str) + 1);
char* tmpSz = new char[len * 2];
WideCharToMultiByte(CP_ACP, 0, str, -1, tmpSz, (int)len * 2, NULL, FALSE);
szAscii = tmpSz;
delete tmpSz;
int strLen = (int)wcslen(str) + 1;
int bufLen = WideCharToMultiByte(CP_ACP, 0, str, strLen, NULL, 0, NULL, NULL);
if (bufLen > 0)
{
char* tmpSz = new char[bufLen];
tmpSz[0] = 0;
WideCharToMultiByte(CP_ACP, 0, str, strLen, tmpSz, bufLen, NULL, NULL);
szAscii = tmpSz;
delete [] tmpSz;
}
}
return szAscii;
}