[M-git] Mahogany sources repository. branch master updated. v0.67-741-g0c3a634
Nerijus Baliūnas via Mahogany-cvsupdates <[email protected]> Mon, 18 Sep 2017 13:33:25 +0000
| Newsgroups | gmane.mail.mahogany.cvs |
|---|---|
| Message-ID | <[email protected]> |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Mahogany sources repository.".
The branch, master has been updated
via 0c3a634ab0814eb0e673fe261992ce06a87287dc (commit)
via cc3c124837649d9d02f54175c3847e4ceeb2ea05 (commit)
via a39eb128f56c94a1f19425fd16db262ae3e71275 (commit)
via 37f7f59ec3c50f89e7b3303db68cca13fa2c2203 (commit)
via 2c84b0a3248a8e649653fd9c069b4514d26c0be0 (commit)
from 77236a4addf673a1e44e53f89c2d7cb0c58abfc9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 0c3a634ab0814eb0e673fe261992ce06a87287dc
Author: Vadim Zeitlin <[email protected]>
Date: Sun Jun 4 16:34:03 2017 +0200
Use v140 toolset in MSVS builds instead of v140_xp one
There doesn't seem to be any point in supporting Windows XP any longer and
it's just annoying to use the non default toolset. If we really want to do it,
it would be simple enough to change it back.
diff --git a/M.vcxproj b/M.vcxproj
index dd0c3c8..e0bc599 100644
--- a/M.vcxproj
+++ b/M.vcxproj
@@ -44,7 +44,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v140_xp</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug DLL|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
@@ -54,7 +54,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>NotSet</CharacterSet>
- <PlatformToolset>v140_xp</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release DLL|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
@@ -64,7 +64,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v140_xp</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug DLL|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
@@ -74,7 +74,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>NotSet</CharacterSet>
- <PlatformToolset>v140_xp</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release DLL|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
@@ -162,7 +162,7 @@
<AdditionalDependencies>imap.lib;compface.lib;dspam.lib;versit.lib;winmm.lib;comctl32.lib;rpcrt4.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ShowProgress>NotSet</ShowProgress>
<OutputFile>$(OutDir)M.exe</OutputFile>
- <AdditionalLibraryDirectories>$(OutDir);$(wxwin)\lib\vc120_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(OutDir);$(wxwin)\lib\vc140_lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<GenerateMapFile>true</GenerateMapFile>
<SubSystem>Windows</SubSystem>
@@ -195,7 +195,7 @@
<AdditionalDependencies>imap.lib;compface.lib;dspam.lib;versit.lib;winmm.lib;comctl32.lib;rpcrt4.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ShowProgress>NotSet</ShowProgress>
<OutputFile>$(OutDir)M.exe</OutputFile>
- <AdditionalLibraryDirectories>$(OutDir);$(wxwin)\lib\vc120_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(OutDir);$(wxwin)\lib\vc140_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<GenerateMapFile>true</GenerateMapFile>
<SubSystem>Windows</SubSystem>
@@ -330,7 +330,7 @@
<Link>
<AdditionalDependencies>imap.lib;compface.lib;dspam.lib;versit.lib;winmm.lib;comctl32.lib;rpcrt4.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)M.exe</OutputFile>
- <AdditionalLibraryDirectories>$(OutDir);$(wxwin)\lib\vc120_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(OutDir);$(wxwin)\lib\vc140_dll;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<StackReserveSize>10000000</StackReserveSize>
@@ -1538,4 +1538,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Mconfig.vcxproj b/Mconfig.vcxproj
index d59af22..c7607f7 100644
--- a/Mconfig.vcxproj
+++ b/Mconfig.vcxproj
@@ -29,22 +29,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
- <PlatformToolset>v140_xp</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
- <PlatformToolset>v140_xp</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
- <PlatformToolset>v140_xp</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
- <PlatformToolset>v140_xp</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -138,4 +138,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/lib/compface/compface.vcxproj b/lib/compface/compface.vcxproj
index 22b76fb..e04849b 100644
--- a/lib/compface/compface.vcxproj
+++ b/lib/compface/compface.vcxproj
@@ -27,25 +27,25 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v140_xp</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v140_xp</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v140_xp</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v140_xp</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -249,4 +249,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/lib/dspam/dspam.vcxproj b/lib/dspam/dspam.vcxproj
index eb9754d..2ae9197 100644
--- a/lib/dspam/dspam.vcxproj
+++ b/lib/dspam/dspam.vcxproj
@@ -28,25 +28,25 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v140_xp</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v140_xp</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v140_xp</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v140_xp</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -242,4 +242,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/lib/imap/imap.vcxproj b/lib/imap/imap.vcxproj
index 11d96e8..491e8b7 100644
--- a/lib/imap/imap.vcxproj
+++ b/lib/imap/imap.vcxproj
@@ -28,25 +28,25 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v140_xp</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v140_xp</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v140_xp</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v140_xp</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -240,4 +240,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/wx/vcard/versit.vcxproj b/src/wx/vcard/versit.vcxproj
index b1fbf0a..b9e4125 100644
--- a/src/wx/vcard/versit.vcxproj
+++ b/src/wx/vcard/versit.vcxproj
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
- <PlatformToolset>v140_xp</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
- <PlatformToolset>v140_xp</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
- <PlatformToolset>v140_xp</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
- <PlatformToolset>v140_xp</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -271,4 +271,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
commit cc3c124837649d9d02f54175c3847e4ceeb2ea05
Author: Vadim Zeitlin <[email protected]>
Date: Sun Jun 4 16:30:23 2017 +0200
Upgrade the MSVS solution file to 2015 version too
Somehow this file wasn't updated in a937793fc184e0d1db49a62c6ab69ef4ff199318.
diff --git a/M.sln b/M.sln
index a63e5da..4e053da 100644
--- a/M.sln
+++ b/M.sln
@@ -1,5 +1,5 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
+Microsoft Visual Studio Solution File, Format Version 14.00
+# Visual Studio 2015
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "M", "M.vcxproj", "{1515C8EB-5C72-43DF-9D3A-0703F155F268}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imap", "lib\imap\imap.vcxproj", "{457CFEC8-5C3F-4C7E-98A6-B65E1DE22682}"
commit a39eb128f56c94a1f19425fd16db262ae3e71275
Author: Vadim Zeitlin <[email protected]>
Date: Sun Jun 4 16:19:43 2017 +0200
Don't trust ASCII encoded words in headers to contain ASCII
This is not necessarily the case for untrusted inputs and could result in
asserts when calling wxString::FromAscii(), so decode ASCII words ourselves.
diff --git a/src/mail/MimeDecode.cpp b/src/mail/MimeDecode.cpp
index 3737034..a8e26ce 100644
--- a/src/mail/MimeDecode.cpp
+++ b/src/mail/MimeDecode.cpp
@@ -332,8 +332,25 @@ String DecodeHeaderOnce(const String& in, wxFontEncoding *pEncoding)
if ( encodingWord == wxFONTENCODING_DEFAULT )
{
// CharsetToEncoding() returns this for US-ASCII but
- // wxCSConv() doesn't accept it
- textDecoded = wxString::FromAscii(ctext, len);
+ // wxCSConv() doesn't accept it, so handle it manually (we
+ // also avoid wxString::FromAscii() because it asserts if the
+ // string contains non-ASCII characters, but this can happen,
+ // after all we're using untrusted input).
+ textDecoded.reserve(len);
+ for (unsigned long n = 0; n < len; ++n)
+ {
+ const unsigned char c = ctext[n];
+ if ( c >= 0x80 )
+ {
+ wxLogDebug(wxS("Invalid character \"%c\" "
+ "in ASCII-encoded word \"%s\""),
+ c, in);
+ }
+ else
+ {
+ textDecoded += static_cast<char>(c);
+ }
+ }
}
else // real conversion needed
{
commit 37f7f59ec3c50f89e7b3303db68cca13fa2c2203
Author: Vadim Zeitlin <[email protected]>
Date: Sat Oct 8 00:42:43 2016 +0200
Fix format specifiers in a template warning message
Use correct %zu for size_t variables.
diff --git a/src/classes/MessageTemplate.cpp b/src/classes/MessageTemplate.cpp
index 8206a65..6440df4 100644
--- a/src/classes/MessageTemplate.cpp
+++ b/src/classes/MessageTemplate.cpp
@@ -366,7 +366,7 @@ MessageTemplateParser::ExpandTemplate(const wxChar **ppc, String *value) const
// failed.
if ( value->empty() )
{
- wxLogWarning(_("Unknown variable '%s' at line %d, position %d "
+ wxLogWarning(_("Unknown variable '%s' at line %zu, position %zu "
"in the file '%s'."),
name.c_str(),
m_nLine,
commit 2c84b0a3248a8e649653fd9c069b4514d26c0be0
Author: Vadim Zeitlin <[email protected]>
Date: Sat Aug 15 17:02:58 2015 +0200
Slightly improve wxFont construction in CreateFontFromDesc().
There is no need to check for -1 font size as wxFontInfo already handles this
correctly by default, but OTOH there is no need to set the family if it is
default.
No real changes, this commit is just due to merging some of the old local
changes with the latest master.
diff --git a/src/gui/wxMGuiUtils.cpp b/src/gui/wxMGuiUtils.cpp
index e1383fc..6c09b69 100644
--- a/src/gui/wxMGuiUtils.cpp
+++ b/src/gui/wxMGuiUtils.cpp
@@ -121,10 +121,11 @@ CreateFontFromDesc(const String& fontDesc, int fontSize, int fontFamily)
// given size and family if we have [either of] them
if ( !font.Ok() && (fontSize != -1 || fontFamily != wxFONTFAMILY_DEFAULT) )
{
- if ( fontSize == -1 )
- fontSize = wxNORMAL_FONT->GetPointSize();
+ wxFontInfo info(fontSize);
+ if ( fontFamily != wxFONTFAMILY_DEFAULT )
+ info.Family(static_cast<wxFontFamily>(fontFamily));
- font = wxFontInfo(fontSize).Family(static_cast<wxFontFamily>(fontFamily));
+ font = wxFont(info);
}
return font;
-----------------------------------------------------------------------
Summary of changes:
M.sln | 4 ++--
M.vcxproj | 16 ++++++++--------
Mconfig.vcxproj | 10 +++++-----
lib/compface/compface.vcxproj | 10 +++++-----
lib/dspam/dspam.vcxproj | 10 +++++-----
lib/imap/imap.vcxproj | 10 +++++-----
src/classes/MessageTemplate.cpp | 2 +-
src/gui/wxMGuiUtils.cpp | 7 ++++---
src/mail/MimeDecode.cpp | 21 +++++++++++++++++++--
src/wx/vcard/versit.vcxproj | 10 +++++-----
10 files changed, 59 insertions(+), 41 deletions(-)
hooks/post-receive
--
Mahogany sources repository.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot