Unignore and fix warnings elsewhere

This commit is contained in:
Birunthan Mohanathas
2013-12-23 19:44:42 +00:00
parent a577608835
commit c196396ad0
36 changed files with 61 additions and 81 deletions

View File

@ -19,7 +19,6 @@
<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions>_USRDLL;HAVE_CONFIG_H;SUPPORT_UTF8;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>4018;4090;4114;4244;4267;4351;4786;4800;4996</DisableSpecificWarnings>
</ClCompile>
<Link>
<AdditionalDependencies>Urlmon.lib;Wininet.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

View File

@ -920,14 +920,14 @@ void ParseData(MeasureData* measure, LPCSTR parseData, DWORD dwSize)
// Must convert the data to utf8
utf8Data = StringUtil::NarrowUTF8((LPCWSTR)parseData, dwSize / 2);
parseData = utf8Data.c_str();
dwSize = utf8Data.length();
dwSize = (DWORD)utf8Data.length();
}
else if (measure->codepage != CP_UTF8 && measure->codepage != 0) // 0 = CP_ACP
{
// Must convert the data to utf8
utf8Data = ConvertAsciiToUTF8(parseData, dwSize, measure->codepage);
parseData = utf8Data.c_str();
dwSize = utf8Data.length();
dwSize = (DWORD)utf8Data.length();
}
rc = pcre_exec(