diff options
author | George Hazan <ghazan@miranda.im> | 2018-12-18 15:40:58 +0300 |
---|---|---|
committer | George Hazan <ghazan@miranda.im> | 2018-12-18 15:40:58 +0300 |
commit | 0e854af70f6f330e63aa36fde125fbb0ca4ff8ef (patch) | |
tree | d681b5e06a8c572c13d82d0b49b54860fb896843 | |
parent | d60f86e09f10ab4d55b94c6193b3bb3d3ca46b18 (diff) |
C++ exceptions are disabled in all cases where they just prevent warnings
75 files changed, 55 insertions, 275 deletions
diff --git a/build/vc.common/common.props b/build/vc.common/common.props index c48250008e..7838a6d1f9 100644 --- a/build/vc.common/common.props +++ b/build/vc.common/common.props @@ -17,7 +17,7 @@ <ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\include;$(ProjectDir)..\..\plugins\ExternalAPI;$(ProjectDir)..\..\..\boost;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINDOWS;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_HAS_EXCEPTIONS=0;_WINDOWS;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>4995;4996;4312;4091;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<IntrinsicFunctions>false</IntrinsicFunctions>
diff --git a/libs/freeimage/freeimage.vcxproj b/libs/freeimage/freeimage.vcxproj index 82f5f45a82..273a134408 100644 --- a/libs/freeimage/freeimage.vcxproj +++ b/libs/freeimage/freeimage.vcxproj @@ -29,7 +29,6 @@ <ClCompile> <PreprocessorDefinitions>FREEIMAGE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>src;..\..\libs\zLib\src;..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <ExceptionHandling>Sync</ExceptionHandling> </ClCompile> </ItemDefinitionGroup> <ItemGroup> diff --git a/libs/hunspell/hunspell.vcxproj b/libs/hunspell/hunspell.vcxproj index 259a46402c..2b2e199fe5 100644 --- a/libs/hunspell/hunspell.vcxproj +++ b/libs/hunspell/hunspell.vcxproj @@ -25,11 +25,6 @@ <ImportGroup Label="PropertySheets">
<Import Project="$(ProjectDir)..\..\build\vc.common\lib.props" />
</ImportGroup>
- <ItemDefinitionGroup>
- <ClCompile>
- <ExceptionHandling>Sync</ExceptionHandling>
- </ClCompile>
- </ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="src\*.c++">
<PreprocessorDefinitions>BUILDING_LIBHUNSPELL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/libs/libjson/libjson.vcxproj b/libs/libjson/libjson.vcxproj index c522fba75b..2b95d8b6f0 100644 --- a/libs/libjson/libjson.vcxproj +++ b/libs/libjson/libjson.vcxproj @@ -27,7 +27,6 @@ </ImportGroup>
<ItemDefinitionGroup>
<ClCompile>
- <ExceptionHandling>Sync</ExceptionHandling>
<PreprocessorDefinitions Condition="'$(Configuration)'=='Debug'">LIBJSON_EXPORTS;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)'=='Release'">LIBJSON_EXPORTS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
diff --git a/plugins/AsSingleWindow/AsSingleWindow.vcxproj b/plugins/AsSingleWindow/AsSingleWindow.vcxproj index fe4006f613..72b631ad00 100644 --- a/plugins/AsSingleWindow/AsSingleWindow.vcxproj +++ b/plugins/AsSingleWindow/AsSingleWindow.vcxproj @@ -25,9 +25,4 @@ <ImportGroup Label="PropertySheets"> <Import Project="$(ProjectDir)..\..\build\vc.common\plugin.props" /> </ImportGroup> - <ItemDefinitionGroup> - <ClCompile> - <ExceptionHandling>Sync</ExceptionHandling> - </ClCompile> - </ItemDefinitionGroup> </Project>
\ No newline at end of file diff --git a/plugins/BasicHistory/BasicHistory.vcxproj b/plugins/BasicHistory/BasicHistory.vcxproj index cee5a6d1c8..f8e376365c 100644 --- a/plugins/BasicHistory/BasicHistory.vcxproj +++ b/plugins/BasicHistory/BasicHistory.vcxproj @@ -31,9 +31,4 @@ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
- <ItemDefinitionGroup>
- <ClCompile>
- <ExceptionHandling>Sync</ExceptionHandling>
- </ClCompile>
- </ItemDefinitionGroup>
</Project>
\ No newline at end of file diff --git a/plugins/Boltun/src/stdafx.h b/plugins/Boltun/src/stdafx.h index 3ac662479c..18153fec0e 100644 --- a/plugins/Boltun/src/stdafx.h +++ b/plugins/Boltun/src/stdafx.h @@ -22,6 +22,8 @@ #define _BOLTUN_H
#include <windows.h>
+
+#include <malloc.h>
#include <time.h>
#include <fstream>
#include <assert.h>
diff --git a/plugins/Clist_nicer/clist_nicer.vcxproj b/plugins/Clist_nicer/clist_nicer.vcxproj index 530b4c9922..5ce4a6fb8b 100644 --- a/plugins/Clist_nicer/clist_nicer.vcxproj +++ b/plugins/Clist_nicer/clist_nicer.vcxproj @@ -25,9 +25,4 @@ <ImportGroup Label="PropertySheets">
<Import Project="$(ProjectDir)..\..\build\vc.common\plugin.props" />
</ImportGroup>
- <ItemDefinitionGroup>
- <ClCompile>
- <ExceptionHandling>Sync</ExceptionHandling>
- </ClCompile>
- </ItemDefinitionGroup>
</Project>
\ No newline at end of file diff --git a/plugins/Clist_nicer/src/config.cpp b/plugins/Clist_nicer/src/config.cpp index 5a78cdb154..39d230a500 100644 --- a/plugins/Clist_nicer/src/config.cpp +++ b/plugins/Clist_nicer/src/config.cpp @@ -233,26 +233,27 @@ HMODULE Utils::loadSystemLibrary(const wchar_t* szFilename, bool useGetHandle) wchar_t sysPathName[MAX_PATH + 2];
HMODULE _h = nullptr;
- try {
- if (0 == ::GetSystemDirectory(sysPathName, MAX_PATH))
- throw(CRTException("Error while loading system library", szFilename));
-
- sysPathName[MAX_PATH - 1] = 0;
- if (mir_wstrlen(sysPathName) + mir_wstrlen(szFilename) >= MAX_PATH)
- throw(CRTException("Error while loading system library", szFilename));
-
- mir_wstrcat(sysPathName, szFilename);
- if (useGetHandle)
- _h = ::GetModuleHandle(sysPathName);
- else
- _h = LoadLibrary(sysPathName);
- if (nullptr == _h)
- throw(CRTException("Error while loading system library", szFilename));
+ if (0 == ::GetSystemDirectory(sysPathName, MAX_PATH)) {
+ CRTException("Error while loading system library", szFilename).display();
+ return nullptr;
}
- catch (CRTException& ex) {
- ex.display();
+
+ sysPathName[MAX_PATH - 1] = 0;
+ if (mir_wstrlen(sysPathName) + mir_wstrlen(szFilename) >= MAX_PATH) {
+ CRTException("Error while loading system library", szFilename).display();
+ return nullptr;
+ }
+
+ mir_wstrcat(sysPathName, szFilename);
+ if (useGetHandle)
+ _h = ::GetModuleHandle(sysPathName);
+ else
+ _h = LoadLibrary(sysPathName);
+ if (nullptr == _h) {
+ CRTException("Error while loading system library", szFilename).display();
return nullptr;
}
+
return (_h);
}
diff --git a/plugins/Clist_nicer/src/stdafx.h b/plugins/Clist_nicer/src/stdafx.h index bab2bf55c3..5053044be6 100644 --- a/plugins/Clist_nicer/src/stdafx.h +++ b/plugins/Clist_nicer/src/stdafx.h @@ -34,6 +34,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <shlwapi.h>
#include <Richedit.h>
+#include <malloc.h>
#include <uxtheme.h>
#include <vssym32.h>
#include <time.h>
diff --git a/plugins/CloudFile/CloudFile.vcxproj b/plugins/CloudFile/CloudFile.vcxproj index 4349de9dcc..88e1946426 100644 --- a/plugins/CloudFile/CloudFile.vcxproj +++ b/plugins/CloudFile/CloudFile.vcxproj @@ -36,8 +36,5 @@ <Link> <AdditionalDependencies>comctl32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> - <ClCompile> - <ExceptionHandling>Sync</ExceptionHandling> - </ClCompile> </ItemDefinitionGroup> </Project> diff --git a/plugins/CyrTranslit/CyrTranslit.vcxproj b/plugins/CyrTranslit/CyrTranslit.vcxproj index 625fb50040..2729f9cb7e 100644 --- a/plugins/CyrTranslit/CyrTranslit.vcxproj +++ b/plugins/CyrTranslit/CyrTranslit.vcxproj @@ -25,9 +25,4 @@ <ImportGroup Label="PropertySheets">
<Import Project="$(ProjectDir)..\..\build\vc.common\plugin.props" />
</ImportGroup>
- <ItemDefinitionGroup>
- <ClCompile>
- <ExceptionHandling>Sync</ExceptionHandling>
- </ClCompile>
- </ItemDefinitionGroup>
</Project>
\ No newline at end of file diff --git a/plugins/Db3x_mmap/src/stdafx.h b/plugins/Db3x_mmap/src/stdafx.h index e18d5c8318..920735848e 100644 --- a/plugins/Db3x_mmap/src/stdafx.h +++ b/plugins/Db3x_mmap/src/stdafx.h @@ -29,6 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <wincred.h>
#include <WinIoCtl.h>
+#include <malloc.h>
#include <time.h>
#include <process.h>
#include <memory>
diff --git a/plugins/Db_autobackups/db_autobackups.vcxproj b/plugins/Db_autobackups/db_autobackups.vcxproj index 041a3c6756..0144412644 100644 --- a/plugins/Db_autobackups/db_autobackups.vcxproj +++ b/plugins/Db_autobackups/db_autobackups.vcxproj @@ -34,9 +34,4 @@ <ItemGroup>
<Image Include="res\backup.ico" />
</ItemGroup>
- <ItemDefinitionGroup>
- <ClCompile>
- <ExceptionHandling>Sync</ExceptionHandling>
- </ClCompile>
- </ItemDefinitionGroup>
</Project>
\ No newline at end of file diff --git a/plugins/Dbx_mdbx/dbx_mdbx.vcxproj b/plugins/Dbx_mdbx/dbx_mdbx.vcxproj index 4b2e3bcc38..d542408b09 100644 --- a/plugins/Dbx_mdbx/dbx_mdbx.vcxproj +++ b/plugins/Dbx_mdbx/dbx_mdbx.vcxproj @@ -31,9 +31,4 @@ <ImportGroup Label="PropertySheets">
<Import Project="$(ProjectDir)..\..\build\vc.common\plugin.props" />
</ImportGroup>
- <ItemDefinitionGroup>
- <ClCompile>
- <ExceptionHandling>Sync</ExceptionHandling>
- </ClCompile>
- </ItemDefinitionGroup>
</Project>
\ No newline at end of file diff --git a/plugins/Dbx_mdbx/src/stdafx.h b/plugins/Dbx_mdbx/src/stdafx.h index 2ee27c924a..0eb01b1631 100644 --- a/plugins/Dbx_mdbx/src/stdafx.h +++ b/plugins/Dbx_mdbx/src/stdafx.h @@ -24,7 +24,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #pragma once
#include <windows.h>
+
#include <io.h>
+#include <malloc.h>
#include <time.h>
#include <process.h>
diff --git a/plugins/Dbx_sqlite/dbx_sqlite.vcxproj b/plugins/Dbx_sqlite/dbx_sqlite.vcxproj index a49f988021..028d343eea 100644 --- a/plugins/Dbx_sqlite/dbx_sqlite.vcxproj +++ b/plugins/Dbx_sqlite/dbx_sqlite.vcxproj @@ -32,7 +32,6 @@ </ImportGroup> <ItemDefinitionGroup> <ClCompile> - <ExceptionHandling>Sync</ExceptionHandling> <AdditionalIncludeDirectories>$(ProjectDir)..\..\libs\sqlite3\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> </ItemDefinitionGroup> diff --git a/plugins/Dbx_sqlite/src/dbevents.cpp b/plugins/Dbx_sqlite/src/dbevents.cpp index ba4e91236d..52451b4327 100644 --- a/plugins/Dbx_sqlite/src/dbevents.cpp +++ b/plugins/Dbx_sqlite/src/dbevents.cpp @@ -574,9 +574,9 @@ MEVENT CDbxSQLite::FindNextEvent(MCONTACT hContact, MEVENT hDbEvent) in.Append(")"); CMStringA query(FORMAT, "select id from events where contact_id in %s and id <> %lu and timestamp > (select timestamp from events where contact_id in %s and id = %lu limit 1) order by timestamp, id limit 1;", - in, + in.c_str(), hDbEvent, - in, + in.c_str(), hDbEvent); sqlite3_stmt *stmt; @@ -628,9 +628,9 @@ MEVENT CDbxSQLite::FindPrevEvent(MCONTACT hContact, MEVENT hDbEvent) in.Append(")"); CMStringA query(FORMAT, "select id from events where contact_id in %s and id <> %lu and timestamp < (select timestamp from events where contact_id in %s and id = %lu limit 1) order by timestamp desc, id desc limit 1;", - in, + in.c_str(), hDbEvent, - in, + in.c_str(), hDbEvent); sqlite3_stmt *stmt; @@ -695,12 +695,12 @@ BOOL CDbxSQLite::SetEventId(LPCSTR, MEVENT hDbEvent, LPCSTR szId) return (rc != SQLITE_DONE); } -BOOL CDbxSQLite::MetaMergeHistory(DBCachedContact *ccMeta, DBCachedContact *ccSub) +BOOL CDbxSQLite::MetaMergeHistory(DBCachedContact*, DBCachedContact*) { return TRUE; } -BOOL CDbxSQLite::MetaSplitHistory(DBCachedContact *ccMeta, DBCachedContact *ccSub) +BOOL CDbxSQLite::MetaSplitHistory(DBCachedContact*, DBCachedContact*) { return TRUE; }
\ No newline at end of file diff --git a/plugins/Dbx_sqlite/src/stdafx.h b/plugins/Dbx_sqlite/src/stdafx.h index 91d20b4109..a73a36ef53 100644 --- a/plugins/Dbx_sqlite/src/stdafx.h +++ b/plugins/Dbx_sqlite/src/stdafx.h @@ -5,6 +5,7 @@ #include <memory> +#include <malloc.h> #include <newpluginapi.h> #include <win2k.h> #include <assert.h> diff --git a/plugins/Exchange/Exchange.vcxproj b/plugins/Exchange/Exchange.vcxproj index 47af766e0c..bb8fee1b9d 100644 --- a/plugins/Exchange/Exchange.vcxproj +++ b/plugins/Exchange/Exchange.vcxproj @@ -30,9 +30,4 @@ <AdditionalDependencies>mapi32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
- <ItemDefinitionGroup>
- <ClCompile>
- <ExceptionHandling>Sync</ExceptionHandling>
- </ClCompile>
- </ItemDefinitionGroup>
</Project>
\ No newline at end of file diff --git a/plugins/FTPFileYM/ftpfile.vcxproj b/plugins/FTPFileYM/ftpfile.vcxproj index e1e6250c01..d5b530b582 100644 --- a/plugins/FTPFileYM/ftpfile.vcxproj +++ b/plugins/FTPFileYM/ftpfile.vcxproj @@ -37,7 +37,6 @@ </ItemGroup>
<ItemDefinitionGroup>
<ClCompile>
- <ExceptionHandling>Sync</ExceptionHandling>
<AdditionalIncludeDirectories>..\..\libs\libcurl\include\curl\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
diff --git a/plugins/FileAsMessage/fileecho.vcxproj b/plugins/FileAsMessage/fileecho.vcxproj index f06261bfeb..6bb1825d7a 100644 --- a/plugins/FileAsMessage/fileecho.vcxproj +++ b/plugins/FileAsMessage/fileecho.vcxproj @@ -25,9 +25,4 @@ <ImportGroup Label="PropertySheets"> <Import Project="$(ProjectDir)..\..\build\vc.common\plugin.props" /> </ImportGroup> - <ItemDefinitionGroup> - <ClCompile> - <ExceptionHandling>Sync</ExceptionHandling> - </ClCompile> - </ItemDefinitionGroup> </Project>
\ No newline at end of file diff --git a/plugins/HistoryStats/historystats.vcxproj b/plugins/HistoryStats/historystats.vcxproj index de62d88d0d..ec63e6246c 100644 --- a/plugins/HistoryStats/historystats.vcxproj +++ b/plugins/HistoryStats/historystats.vcxproj @@ -28,9 +28,4 @@ <ImportGroup Label="PropertySheets">
<Import Project="$(ProjectDir)..\..\build\vc.common\plugin.props" />
</ImportGroup>
- <ItemDefinitionGroup>
- <ClCompile>
- <ExceptionHandling>Sync</ExceptionHandling>
- </ClCompile>
- </ItemDefinitionGroup>
</Project>
\ No newline at end of file diff --git a/plugins/Import/import.vcxproj b/plugins/Import/import.vcxproj index fe74dbadbd..242b086e6a 100644 --- a/plugins/Import/import.vcxproj +++ b/plugins/Import/import.vcxproj @@ -58,7 +58,6 @@ </ItemGroup>
<ItemDefinitionGroup>
<ClCompile>
- <ExceptionHandling>Sync</ExceptionHandling>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\libs\sqlite3\src;$(ProjectDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
</ItemDefinitionGroup>
diff --git a/plugins/ListeningTo/listeningto.vcxproj b/plugins/ListeningTo/listeningto.vcxproj index ce511fbccf..de3a5a0344 100644 --- a/plugins/ListeningTo/listeningto.vcxproj +++ b/plugins/ListeningTo/listeningto.vcxproj @@ -25,11 +25,6 @@ <ImportGroup Label="PropertySheets">
<Import Project="$(ProjectDir)..\..\build\vc.common\plugin.props" />
</ImportGroup>
- <ItemDefinitionGroup>
- <ClCompile>
- <ExceptionHandling>Sync</ExceptionHandling>
- </ClCompile>
- </ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="src\players\foobar.h" />
<ClInclude Include="src\players\generic.h" />
diff --git a/plugins/MimCmd/MimCmd.vcxproj b/plugins/MimCmd/MimCmd.vcxproj index 9ba7bd360c..99832bb4a5 100644 --- a/plugins/MimCmd/MimCmd.vcxproj +++ b/plugins/MimCmd/MimCmd.vcxproj @@ -34,8 +34,5 @@ <DelayLoadDLLs Condition="'$(Configuration)'=='Debug'">mir_core.mir;ucrtbased.dll;vcruntime140.dll</DelayLoadDLLs>
<DelayLoadDLLs Condition="'$(Configuration)'=='Release'">mir_core.mir;ucrtbase.dll;api-ms-win-crt-string-l1-1-0.dll;api-ms-win-crt-heap-l1-1-0.dll;api-ms-win-crt-locale-l1-1-0.dll;api-ms-win-crt-math-l1-1-0.dll;api-ms-win-crt-runtime-l1-1-0.dll;api-ms-win-crt-stdio-l1-1-0.dll;VCRUNTIME140.dll</DelayLoadDLLs>
</Link>
- <ClCompile>
- <ExceptionHandling>Sync</ExceptionHandling>
- </ClCompile>
</ItemDefinitionGroup>
</Project>
\ No newline at end of file diff --git a/plugins/MirLua/MirLua.vcxproj b/plugins/MirLua/MirLua.vcxproj index 5869a1fb6a..4d97c40c33 100644 --- a/plugins/MirLua/MirLua.vcxproj +++ b/plugins/MirLua/MirLua.vcxproj @@ -33,7 +33,6 @@ <AdditionalDependencies>comctl32.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<ClCompile>
- <ExceptionHandling>Sync</ExceptionHandling>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\libs\liblua\include;$(ProjectDir)include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
</ItemDefinitionGroup>
diff --git a/plugins/MirLua/Modules/m_enumerable/m_enumerable.vcxproj b/plugins/MirLua/Modules/m_enumerable/m_enumerable.vcxproj index a8e4c9307c..dd2bc8bed3 100644 --- a/plugins/MirLua/Modules/m_enumerable/m_enumerable.vcxproj +++ b/plugins/MirLua/Modules/m_enumerable/m_enumerable.vcxproj @@ -25,9 +25,4 @@ <ImportGroup Label="PropertySheets"> <Import Project="$(ProjectDir)..\module.props" /> </ImportGroup> - <ItemDefinitionGroup> - <ClCompile> - <ExceptionHandling>Sync</ExceptionHandling> - </ClCompile> - </ItemDefinitionGroup> </Project> diff --git a/plugins/MirLua/Modules/m_popup/m_popup.vcxproj b/plugins/MirLua/Modules/m_popup/m_popup.vcxproj index 68b486e795..eab741dac9 100644 --- a/plugins/MirLua/Modules/m_popup/m_popup.vcxproj +++ b/plugins/MirLua/Modules/m_popup/m_popup.vcxproj @@ -25,9 +25,4 @@ <ImportGroup Label="PropertySheets">
<Import Project="$(ProjectDir)..\module.props" />
</ImportGroup>
- <ItemDefinitionGroup>
- <ClCompile>
- <ExceptionHandling>Sync</ExceptionHandling>
- </ClCompile>
- </ItemDefinitionGroup>
</Project>
diff --git a/plugins/MirLua/Modules/m_schedule/m_schedule.vcxproj b/plugins/MirLua/Modules/m_schedule/m_schedule.vcxproj index b37e08d0a2..b2b8563a1d 100644 --- a/plugins/MirLua/Modules/m_schedule/m_schedule.vcxproj +++ b/plugins/MirLua/Modules/m_schedule/m_schedule.vcxproj @@ -25,9 +25,4 @@ <ImportGroup Label="PropertySheets">
<Import Project="$(ProjectDir)..\module.props" />
</ImportGroup>
- <ItemDefinitionGroup>
- <ClCompile>
- <ExceptionHandling>Sync</ExceptionHandling>
- </ClCompile>
- </ItemDefinitionGroup>
</Project>
diff --git a/plugins/MirLua/Modules/m_toptoolbar/m_toptoolbar.vcxproj b/plugins/MirLua/Modules/m_toptoolbar/m_toptoolbar.vcxproj index d71b41c4c3..e05f3c25a9 100644 --- a/plugins/MirLua/Modules/m_toptoolbar/m_toptoolbar.vcxproj +++ b/plugins/MirLua/Modules/m_toptoolbar/m_toptoolbar.vcxproj @@ -25,9 +25,4 @@ <ImportGroup Label="PropertySheets">
<Import Project="$(ProjectDir)..\module.props" />
</ImportGroup>
- <ItemDefinitionGroup>
- <ClCompile>
- <ExceptionHandling>Sync</ExceptionHandling>
- </ClCompile>
- </ItemDefinitionGroup>
</Project>
diff --git a/plugins/MirLua/Modules/m_variables/m_variables.vcxproj b/plugins/MirLua/Modules/m_variables/m_variables.vcxproj index 40c56f365b..fedbf4a66c 100644 --- a/plugins/MirLua/Modules/m_variables/m_variables.vcxproj +++ b/plugins/MirLua/Modules/m_variables/m_variables.vcxproj @@ -25,9 +25,4 @@ <ImportGroup Label="PropertySheets">
<Import Project="$(ProjectDir)..\module.props" />
</ImportGroup>
- <ItemDefinitionGroup>
- <ClCompile>
- <ExceptionHandling>Sync</ExceptionHandling>
- </ClCompile>
- </ItemDefinitionGroup>
</Project>
diff --git a/plugins/MirandaG15/MirandaG15.vcxproj b/plugins/MirandaG15/MirandaG15.vcxproj index 27d8f1be9e..b64dfe091e 100644 --- a/plugins/MirandaG15/MirandaG15.vcxproj +++ b/plugins/MirandaG15/MirandaG15.vcxproj @@ -26,9 +26,6 @@ <Import Project="$(ProjectDir)..\..\build\vc.common\plugin.props" />
</ImportGroup>
<ItemDefinitionGroup>
- <ClCompile>
- <ExceptionHandling>Sync</ExceptionHandling>
- </ClCompile>
<Link>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
diff --git a/plugins/Msg_Export/msg_export.vcxproj b/plugins/Msg_Export/msg_export.vcxproj index 7aa6599dc4..7e73a71330 100644 --- a/plugins/Msg_Export/msg_export.vcxproj +++ b/plugins/Msg_Export/msg_export.vcxproj @@ -25,9 +25,4 @@ <ImportGroup Label="PropertySheets">
<Import Project="$(ProjectDir)..\..\build\vc.common\plugin.props" />
</ImportGroup>
- <ItemDefinitionGroup>
- <ClCompile>
- <ExceptionHandling>Sync</ExceptionHandling>
- </ClCompile>
- </ItemDefinitionGroup>
</Project>
\ No newline at end of file diff --git a/plugins/Msg_Export/src/stdafx.h b/plugins/Msg_Export/src/stdafx.h index aae56f15b3..5c870fd621 100755 --- a/plugins/Msg_Export/src/stdafx.h +++ b/plugins/Msg_Export/src/stdafx.h @@ -22,6 +22,9 @@ #include <Windows.h>
#include <windowsx.h>
#include <Richedit.h>
+
+#include <malloc.h>
+
using namespace std;
#include <Shlobj.h>
#include <list>
diff --git a/plugins/NotifyAnything/NotifyAnything.vcxproj b/plugins/NotifyAnything/NotifyAnything.vcxproj index 5e200c8dd8..be4d26f8a6 100644 --- a/plugins/NotifyAnything/NotifyAnything.vcxproj +++ b/plugins/NotifyAnything/NotifyAnything.vcxproj @@ -25,9 +25,4 @@ <ImportGroup Label="PropertySheets">
<Import Project="$(ProjectDir)..\..\build\vc.common\plugin.props" />
</ImportGroup>
- <ItemDefinitionGroup>
- <ClCompile>
- <ExceptionHandling>Sync</ExceptionHandling>
- </ClCompile>
- </ItemDefinitionGroup>
</Project>
\ No newline at end of file diff --git a/plugins/OpenSSL/OpenSSL.vcxproj b/plugins/OpenSSL/OpenSSL.vcxproj index f7136fda99..222078ad7d 100644 --- a/plugins/OpenSSL/OpenSSL.vcxproj +++ b/plugins/OpenSSL/OpenSSL.vcxproj @@ -26,9 +26,6 @@ <Import Project="$(ProjectDir)..\..\build\vc.common\plugin.props" />
</ImportGroup>
<ItemDefinitionGroup>
- <ClCompile>
- <ExceptionHandling>Sync</ExceptionHandling>
- </ClCompile>
<Link>
<AdditionalDependencies>libeay32.lib;ssleay32.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
diff --git a/plugins/PackUpdater/PackUpdater.vcxproj b/plugins/PackUpdater/PackUpdater.vcxproj index b932875335..c333f0316e 100644 --- a/plugins/PackUpdater/PackUpdater.vcxproj +++ b/plugins/PackUpdater/PackUpdater.vcxproj @@ -25,9 +25,4 @@ <ImportGroup Label="PropertySheets">
<Import Project="$(ProjectDir)..\..\build\vc.common\plugin.props" />
</ImportGroup>
- <ItemDefinitionGroup>
- <ClCompile>
- <ExceptionHandling>Sync</ExceptionHandling>
- </ClCompile>
- </ItemDefinitionGroup>
</Project>
\ No newline at end of file diff --git a/plugins/PasteIt/PasteIt.vcxproj b/plugins/PasteIt/PasteIt.vcxproj index 3c7dbc9ea2..04e1e6e11e 100644 --- a/plugins/PasteIt/PasteIt.vcxproj +++ b/plugins/PasteIt/PasteIt.vcxproj @@ -25,9 +25,4 @@ <ImportGroup Label="PropertySheets">
<Import Project="$(ProjectDir)..\..\build\vc.common\plugin.props" />
</ImportGroup>
- <ItemDefinitionGroup>
- <ClCompile>
- <ExceptionHandling>Sync</ExceptionHandling>
- </ClCompile>
- </ItemDefinitionGroup>
</Project>
diff --git a/plugins/Ping/ping.vcxproj b/plugins/Ping/ping.vcxproj index 63d8260a15..9991b22d97 100644 --- a/plugins/Ping/ping.vcxproj +++ b/plugins/Ping/ping.vcxproj @@ -25,9 +25,4 @@ <ImportGroup Label="PropertySheets">
<Import Project="$(ProjectDir)..\..\build\vc.common\plugin.props" />
</ImportGroup>
- <ItemDefinitionGroup>
- <ClCompile>
- <ExceptionHandling>Sync</ExceptionHandling>
- </ClCompile>
- </ItemDefinitionGroup>
</Project>
\ No newline at end of file diff --git a/plugins/Popup/Popup.vcxproj b/plugins/Popup/Popup.vcxproj index 14b557102c..c942364454 100644 --- a/plugins/Popup/Popup.vcxproj +++ b/plugins/Popup/Popup.vcxproj @@ -28,7 +28,6 @@ <ItemDefinitionGroup>
<ClCompile>
<DisableSpecificWarnings>4458;%(DisableSpecificWarnings)</DisableSpecificWarnings>
- <ExceptionHandling>Sync</ExceptionHandling>
</ClCompile>
</ItemDefinitionGroup>
</Project>
\ No newline at end of file diff --git a/plugins/RecentContacts/RecentContacts.vcxproj b/plugins/RecentContacts/RecentContacts.vcxproj index 6818d97907..60258c39d4 100644 --- a/plugins/RecentContacts/RecentContacts.vcxproj +++ b/plugins/RecentContacts/RecentContacts.vcxproj @@ -25,9 +25,4 @@ <ImportGroup Label="PropertySheets">
<Import Project="$(ProjectDir)..\..\build\vc.common\plugin.props" />
</ImportGroup>
- <ItemDefinitionGroup>
- <ClCompile>
- <ExceptionHandling>Sync</ExceptionHandling>
- </ClCompile>
- </ItemDefinitionGroup>
</Project>
\ No newline at end of file diff --git a/plugins/SendScreenshotPlus/SendSS.vcxproj b/plugins/SendScreenshotPlus/SendSS.vcxproj index 988a4e57b9..a9721f9613 100644 --- a/plugins/SendScreenshotPlus/SendSS.vcxproj +++ b/plugins/SendScreenshotPlus/SendSS.vcxproj @@ -33,7 +33,6 @@ <ItemDefinitionGroup>
<ClCompile>
<DisableSpecificWarnings>4458;%(DisableSpecificWarnings)</DisableSpecificWarnings>
- <ExceptionHandling>Sync</ExceptionHandling>
</ClCompile>
</ItemDefinitionGroup>
</Project>
\ No newline at end of file diff --git a/plugins/SpellChecker/spellchecker.vcxproj b/plugins/SpellChecker/spellchecker.vcxproj index 0ec2bf8dab..66e36418c7 100644 --- a/plugins/SpellChecker/spellchecker.vcxproj +++ b/plugins/SpellChecker/spellchecker.vcxproj @@ -33,7 +33,6 @@ <AdditionalDependencies>comctl32.lib;rpcrt4.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<ClCompile>
- <ExceptionHandling>Sync</ExceptionHandling>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\libs\hunspell\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
diff --git a/plugins/StatusManager/StatusManager.vcxproj b/plugins/StatusManager/StatusManager.vcxproj index 5cd732cc2c..314028a9cc 100644 --- a/plugins/StatusManager/StatusManager.vcxproj +++ b/plugins/StatusManager/StatusManager.vcxproj @@ -35,8 +35,5 @@ <Link> <AdditionalDependencies>ws2_32.lib;wininet.lib;UxTheme.lib;Iphlpapi.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> - <ClCompile> - <ExceptionHandling>Sync</ExceptionHandling> - </ClCompile> </ItemDefinitionGroup> </Project> diff --git a/plugins/StopSpamMod/src/stdafx.h b/plugins/StopSpamMod/src/stdafx.h index 6ae48751de..011161651a 100755 --- a/plugins/StopSpamMod/src/stdafx.h +++ b/plugins/StopSpamMod/src/stdafx.h @@ -1,10 +1,18 @@ #pragma once #include <windows.h> +#include <malloc.h> using namespace std; #include <fstream> #include <string> +#include <sstream> + +#include <boost\regex.hpp> +#include <boost\algorithm\string.hpp> +#include <boost\nondet_random.hpp> +#include <boost\random\variate_generator.hpp> +#include <boost\random\uniform_int.hpp> #include <newpluginapi.h> #include <m_database.h> @@ -20,15 +28,6 @@ using namespace std; #include <m_variables.h> #include <m_folders.h> -#include <string> -#include <sstream> - -#include <boost\regex.hpp> -#include <boost\algorithm\string.hpp> -#include <boost\nondet_random.hpp> -#include <boost\random\variate_generator.hpp> -#include <boost\random\uniform_int.hpp> - #include "globals.h" #include "stopspam.h" #include "version.h" diff --git a/plugins/StopSpamPlus/stopspam.vcxproj b/plugins/StopSpamPlus/stopspam.vcxproj index 04e1cff10d..0c3866da18 100644 --- a/plugins/StopSpamPlus/stopspam.vcxproj +++ b/plugins/StopSpamPlus/stopspam.vcxproj @@ -25,9 +25,4 @@ <ImportGroup Label="PropertySheets">
<Import Project="$(ProjectDir)..\..\build\vc.common\plugin.props" />
</ImportGroup>
- <ItemDefinitionGroup>
- <ClCompile>
- <ExceptionHandling>Sync</ExceptionHandling>
- </ClCompile>
- </ItemDefinitionGroup>
</Project>
\ No newline at end of file diff --git a/plugins/TabSRMM/tabsrmm.vcxproj b/plugins/TabSRMM/tabsrmm.vcxproj index f2533dc33b..9ec18f8b11 100644 --- a/plugins/TabSRMM/tabsrmm.vcxproj +++ b/plugins/TabSRMM/tabsrmm.vcxproj @@ -30,9 +30,4 @@ <Project>{5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E}</Project>
</ProjectReference>
</ItemGroup>
- <ItemDefinitionGroup>
- <ClCompile>
- <ExceptionHandling>Sync</ExceptionHandling>
- </ClCompile>
- </ItemDefinitionGroup>
</Project>
\ No newline at end of file diff --git a/plugins/Toaster/Toaster.vcxproj b/plugins/Toaster/Toaster.vcxproj index 867dd0bee0..2cf487ef31 100644 --- a/plugins/Toaster/Toaster.vcxproj +++ b/plugins/Toaster/Toaster.vcxproj @@ -35,9 +35,6 @@ <LibraryPath>$(VC_LibraryPath_x64);$(ProgramFiles)\Windows Kits\8.1\lib\winv6.3\um\x64;</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup>
- <ClCompile>
- <ExceptionHandling>Sync</ExceptionHandling>
- </ClCompile>
<Link>
<AdditionalDependencies>delayimp.lib;runtimeobject.lib;%(AdditionalDependencies)</AdditionalDependencies>
<DelayLoadDLLs>API-MS-WIN-CORE-WINRT-STRING-L1-1-0.DLL;API-MS-WIN-CORE-WINRT-L1-1-0.DLL;%(DelayLoadDLLs)</DelayLoadDLLs>
diff --git a/plugins/TooltipNotify/ttnotify.vcxproj b/plugins/TooltipNotify/ttnotify.vcxproj index f45cf0abf2..0bfbcded39 100644 --- a/plugins/TooltipNotify/ttnotify.vcxproj +++ b/plugins/TooltipNotify/ttnotify.vcxproj @@ -25,9 +25,4 @@ <ImportGroup Label="PropertySheets">
<Import Project="$(ProjectDir)..\..\build\vc.common\plugin.props" />
</ImportGroup>
- <ItemDefinitionGroup>
- <ClCompile>
- <ExceptionHandling>Sync</ExceptionHandling>
- </ClCompile>
- </ItemDefinitionGroup>
</Project>
\ No newline at end of file diff --git a/plugins/UserInfoEx/UInfoEx.vcxproj b/plugins/UserInfoEx/UInfoEx.vcxproj index 691d74bd4e..20144f2d78 100644 --- a/plugins/UserInfoEx/UInfoEx.vcxproj +++ b/plugins/UserInfoEx/UInfoEx.vcxproj @@ -25,26 +25,6 @@ <ImportGroup Label="PropertySheets">
<Import Project="$(ProjectDir)..\..\build\vc.common\plugin.props" />
</ImportGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <ExceptionHandling>Sync</ExceptionHandling>
- </ClCompile>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <ExceptionHandling>Sync</ExceptionHandling>
- </ClCompile>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <ClCompile>
- <ExceptionHandling>Sync</ExceptionHandling>
- </ClCompile>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <ClCompile>
- <ExceptionHandling>Sync</ExceptionHandling>
- </ClCompile>
- </ItemDefinitionGroup>
<ItemGroup>
<ProjectReference Include="..\..\libs\freeimage\freeimage.vcxproj">
<Project>{5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E}</Project>
diff --git a/plugins/UserInfoEx/src/stdafx.h b/plugins/UserInfoEx/src/stdafx.h index 76d67779b0..d438efa2da 100644 --- a/plugins/UserInfoEx/src/stdafx.h +++ b/plugins/UserInfoEx/src/stdafx.h @@ -38,6 +38,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <shlwapi.h>
#include <Richedit.h>
#include <dlgs.h>
+
+#include <malloc.h>
#include <assert.h>
#include <UxTheme.h>
#include <string>
diff --git a/plugins/WinterSpeak/WinterSpeak.vcxproj b/plugins/WinterSpeak/WinterSpeak.vcxproj index 1ae26eb201..a621913fdd 100644 --- a/plugins/WinterSpeak/WinterSpeak.vcxproj +++ b/plugins/WinterSpeak/WinterSpeak.vcxproj @@ -26,9 +26,6 @@ <Import Project="$(ProjectDir)..\..\build\vc.common\plugin.props" />
</ImportGroup>
<ItemDefinitionGroup>
- <ClCompile>
- <ExceptionHandling>Sync</ExceptionHandling>
- </ClCompile>
<Link>
<AdditionalDependencies>spchwrap.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>src\SAPI 4.0\Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
diff --git a/protocols/Discord/discord.vcxproj b/protocols/Discord/discord.vcxproj index ef948176a8..ab81bd4bb4 100644 --- a/protocols/Discord/discord.vcxproj +++ b/protocols/Discord/discord.vcxproj @@ -25,11 +25,6 @@ <ImportGroup Label="PropertySheets"> <Import Project="$(ProjectDir)..\..\build\vc.common\plugin.props" /> </ImportGroup> - <ItemDefinitionGroup> - <ClCompile> - <ExceptionHandling>Sync</ExceptionHandling> - </ClCompile> - </ItemDefinitionGroup> <ItemGroup> <ProjectReference Include="..\..\libs\zlib\zlib.vcxproj"> <Project>{01F9E227-06F5-4BED-907F-402CA7DFAFE6}</Project> diff --git a/protocols/Discord/src/stdafx.h b/protocols/Discord/src/stdafx.h index 10891296e9..7f23c5d300 100644 --- a/protocols/Discord/src/stdafx.h +++ b/protocols/Discord/src/stdafx.h @@ -8,6 +8,8 @@ #include <Windows.h> #include <Shlwapi.h> #include <Wincrypt.h> + +#include <malloc.h> #include <stdio.h> #include <io.h> #include <direct.h> diff --git a/protocols/Dummy/dummy.vcxproj b/protocols/Dummy/dummy.vcxproj index 132a1b9c1b..f99be2ab7c 100644 --- a/protocols/Dummy/dummy.vcxproj +++ b/protocols/Dummy/dummy.vcxproj @@ -25,9 +25,4 @@ <ImportGroup Label="PropertySheets"> <Import Project="$(ProjectDir)..\..\build\vc.common\plugin.props" /> </ImportGroup> - <ItemDefinitionGroup> - <ClCompile> - <ExceptionHandling>Sync</ExceptionHandling> - </ClCompile> - </ItemDefinitionGroup> </Project>
\ No newline at end of file diff --git a/protocols/EmLanProto/emlanproto.vcxproj b/protocols/EmLanProto/emlanproto.vcxproj index 27cf97a318..724615b0c2 100644 --- a/protocols/EmLanProto/emlanproto.vcxproj +++ b/protocols/EmLanProto/emlanproto.vcxproj @@ -25,9 +25,4 @@ <ImportGroup Label="PropertySheets"> <Import Project="$(ProjectDir)..\..\build\vc.common\plugin.props" /> </ImportGroup> - <ItemDefinitionGroup> - <ClCompile> - <ExceptionHandling>Sync</ExceptionHandling> - </ClCompile> - </ItemDefinitionGroup> </Project>
\ No newline at end of file diff --git a/protocols/FacebookRM/facebook.vcxproj b/protocols/FacebookRM/facebook.vcxproj index 4bf9c5b79c..7abb3a804b 100644 --- a/protocols/FacebookRM/facebook.vcxproj +++ b/protocols/FacebookRM/facebook.vcxproj @@ -30,11 +30,6 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
</ItemGroup>
- <ItemDefinitionGroup>
- <ClCompile>
- <ExceptionHandling>Sync</ExceptionHandling>
- </ClCompile>
- </ItemDefinitionGroup>
<ItemGroup>
<ProjectReference Include="..\..\libs\libjson\libjson.vcxproj">
<Project>{f6a9340e-b8d9-4c75-be30-47dc66d0abc7}</Project>
diff --git a/protocols/Gadu-Gadu/gadugadu.vcxproj b/protocols/Gadu-Gadu/gadugadu.vcxproj index 3b2553918c..0e4c337738 100644 --- a/protocols/Gadu-Gadu/gadugadu.vcxproj +++ b/protocols/Gadu-Gadu/gadugadu.vcxproj @@ -27,7 +27,6 @@ </ImportGroup> <ItemDefinitionGroup> <ClCompile> - <ExceptionHandling>Sync</ExceptionHandling> <AdditionalIncludeDirectories>src\libgadu;$(ProjectDir)..\..\libs\zlib\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DisableSpecificWarnings>4100;%(DisableSpecificWarnings)</DisableSpecificWarnings> <PrecompiledHeaderFile>gg.h</PrecompiledHeaderFile> diff --git a/protocols/ICQCorp/ICQCorp.vcxproj b/protocols/ICQCorp/ICQCorp.vcxproj index ee157e019a..ca9f97ee16 100644 --- a/protocols/ICQCorp/ICQCorp.vcxproj +++ b/protocols/ICQCorp/ICQCorp.vcxproj @@ -25,9 +25,4 @@ <ImportGroup Label="PropertySheets"> <Import Project="$(ProjectDir)..\..\build\vc.common\plugin.props" /> </ImportGroup> - <ItemDefinitionGroup> - <ClCompile> - <ExceptionHandling>Sync</ExceptionHandling> - </ClCompile> - </ItemDefinitionGroup> </Project>
\ No newline at end of file diff --git a/protocols/JabberG/jabber.vcxproj b/protocols/JabberG/jabber.vcxproj index 74dddceefa..76c883041c 100755 --- a/protocols/JabberG/jabber.vcxproj +++ b/protocols/JabberG/jabber.vcxproj @@ -28,7 +28,6 @@ <ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\libs\libaxolotl\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <ExceptionHandling>Sync</ExceptionHandling>
</ClCompile>
<Link>
<AdditionalDependencies>libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/protocols/MSN/msn.vcxproj b/protocols/MSN/msn.vcxproj index 8f29aceb73..67ec5aa81b 100644 --- a/protocols/MSN/msn.vcxproj +++ b/protocols/MSN/msn.vcxproj @@ -26,9 +26,6 @@ <Import Project="$(ProjectDir)..\..\build\vc.common\plugin.props" />
</ImportGroup>
<ItemDefinitionGroup>
- <ClCompile>
- <ExceptionHandling>Sync</ExceptionHandling>
- </ClCompile>
<Link>
<AdditionalDependencies>libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
diff --git a/protocols/MinecraftDynmap/MinecraftDynmap.vcxproj b/protocols/MinecraftDynmap/MinecraftDynmap.vcxproj index ae81b7dc57..27d40d44b2 100644 --- a/protocols/MinecraftDynmap/MinecraftDynmap.vcxproj +++ b/protocols/MinecraftDynmap/MinecraftDynmap.vcxproj @@ -30,9 +30,4 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
</ItemGroup>
- <ItemDefinitionGroup>
- <ClCompile>
- <ExceptionHandling>Sync</ExceptionHandling>
- </ClCompile>
- </ItemDefinitionGroup>
</Project>
\ No newline at end of file diff --git a/protocols/Omegle/omegle.vcxproj b/protocols/Omegle/omegle.vcxproj index eb61116d9b..dbab91773f 100644 --- a/protocols/Omegle/omegle.vcxproj +++ b/protocols/Omegle/omegle.vcxproj @@ -30,9 +30,4 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
</ItemGroup>
- <ItemDefinitionGroup>
- <ClCompile>
- <ExceptionHandling>Sync</ExceptionHandling>
- </ClCompile>
- </ItemDefinitionGroup>
</Project>
\ No newline at end of file diff --git a/protocols/SkypeWeb/SkypeWeb.vcxproj b/protocols/SkypeWeb/SkypeWeb.vcxproj index 75292a9b36..2c38d7a301 100644 --- a/protocols/SkypeWeb/SkypeWeb.vcxproj +++ b/protocols/SkypeWeb/SkypeWeb.vcxproj @@ -25,11 +25,6 @@ <ImportGroup Label="PropertySheets">
<Import Project="$(ProjectDir)..\..\build\vc.common\plugin.props" />
</ImportGroup>
- <ItemDefinitionGroup>
- <ClCompile>
- <ExceptionHandling>Sync</ExceptionHandling>
- </ClCompile>
- </ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="res\Icons\*" />
<ClInclude Include="src\requests\avatars.h" />
diff --git a/protocols/SkypeWeb/src/stdafx.h b/protocols/SkypeWeb/src/stdafx.h index 2be5607f21..3bc1b1cc53 100644 --- a/protocols/SkypeWeb/src/stdafx.h +++ b/protocols/SkypeWeb/src/stdafx.h @@ -19,6 +19,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define _COMMON_H_
#include <windows.h>
+
+#include <malloc.h>
#include <time.h>
#include <string>
#include <vector>
diff --git a/protocols/Steam/Steam.vcxproj b/protocols/Steam/Steam.vcxproj index 36b0c03011..dd104a1159 100644 --- a/protocols/Steam/Steam.vcxproj +++ b/protocols/Steam/Steam.vcxproj @@ -36,7 +36,6 @@ </ItemGroup>
<ItemDefinitionGroup>
<ClCompile>
- <ExceptionHandling>Sync</ExceptionHandling>
<LanguageStandard>stdcpp17</LanguageStandard>
</ClCompile>
</ItemDefinitionGroup>
diff --git a/protocols/Tox/Tox.vcxproj b/protocols/Tox/Tox.vcxproj index a550839300..5004a62a3a 100644 --- a/protocols/Tox/Tox.vcxproj +++ b/protocols/Tox/Tox.vcxproj @@ -30,11 +30,6 @@ <AdditionalIncludeDirectories>..\..\include;libtox\src\toxcore;libtox\src\toxencryptsave;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
</ItemDefinitionGroup>
- <ItemDefinitionGroup>
- <ClCompile>
- <ExceptionHandling>Sync</ExceptionHandling>
- </ClCompile>
- </ItemDefinitionGroup>
<ItemGroup>
<None Include="res\*.ico" />
</ItemGroup>
diff --git a/protocols/Tox/src/stdafx.h b/protocols/Tox/src/stdafx.h index b1d360aae5..9dbf24a568 100644 --- a/protocols/Tox/src/stdafx.h +++ b/protocols/Tox/src/stdafx.h @@ -2,9 +2,11 @@ #define _COMMON_H_
#include <windows.h>
+#include <commctrl.h>
+
#include <io.h>
+#include <malloc.h>
#include <time.h>
-#include <commctrl.h>
#include <msapi/comptr.h>
#include <vector>
diff --git a/protocols/Tox/src/tox_connection.cpp b/protocols/Tox/src/tox_connection.cpp index fef16834c8..02ab9e223c 100644 --- a/protocols/Tox/src/tox_connection.cpp +++ b/protocols/Tox/src/tox_connection.cpp @@ -62,7 +62,7 @@ void CToxProto::OnToxCheck(void *arg, BYTE) { CToxProto *proto = (CToxProto*)arg; - int retriesCount = proto->getByte("MaxReconnectRetries", TOX_MAX_RECONNECT_RETRIES); + // int retriesCount = proto->getByte("MaxReconnectRetries", TOX_MAX_RECONNECT_RETRIES); if (proto->m_iStatus < ID_STATUS_ONLINE) proto->TryConnect(); else diff --git a/protocols/Twitter/src/stdafx.h b/protocols/Twitter/src/stdafx.h index 3eb1d93a87..8373154179 100644 --- a/protocols/Twitter/src/stdafx.h +++ b/protocols/Twitter/src/stdafx.h @@ -5,6 +5,8 @@ #pragma once
+#define _HAS_EXCEPTIONS 1
+
#include <Windows.h>
#include <Shlwapi.h>
#include <Wincrypt.h>
diff --git a/protocols/VKontakte/vk.vcxproj b/protocols/VKontakte/vk.vcxproj index 7452affb5e..ad417c8054 100644 --- a/protocols/VKontakte/vk.vcxproj +++ b/protocols/VKontakte/vk.vcxproj @@ -25,11 +25,6 @@ <ImportGroup Label="PropertySheets">
<Import Project="$(ProjectDir)..\..\build\vc.common\plugin.props" />
</ImportGroup>
- <ItemDefinitionGroup>
- <ClCompile>
- <ExceptionHandling>Sync</ExceptionHandling>
- </ClCompile>
- </ItemDefinitionGroup>
<ItemGroup>
<ProjectReference Include="..\..\libs\libjson\libjson.vcxproj">
<Project>{f6a9340e-b8d9-4c75-be30-47dc66d0abc7}</Project>
diff --git a/src/core/stdssl/stdssl.vcxproj b/src/core/stdssl/stdssl.vcxproj index 6a38265b4b..59605c12b4 100644 --- a/src/core/stdssl/stdssl.vcxproj +++ b/src/core/stdssl/stdssl.vcxproj @@ -26,9 +26,6 @@ <Import Project="$(ProjectDir)..\..\..\build\vc.common\core.props" />
</ImportGroup>
<ItemDefinitionGroup>
- <ClCompile>
- <ExceptionHandling>Sync</ExceptionHandling>
- </ClCompile>
<Link>
<AdditionalDependencies>secur32.lib;crypt32.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
diff --git a/tools/mdbx_dump/mdbx_dump.vcxproj b/tools/mdbx_dump/mdbx_dump.vcxproj index 693194c994..7792611dd0 100644 --- a/tools/mdbx_dump/mdbx_dump.vcxproj +++ b/tools/mdbx_dump/mdbx_dump.vcxproj @@ -41,8 +41,5 @@ <DelayLoadDLLs Condition="'$(Configuration)'=='Debug'">libmdbx.mir;ucrtbased.dll;vcruntime140d.dll</DelayLoadDLLs> <DelayLoadDLLs Condition="'$(Configuration)'=='Release'">libmdbx.mir;ucrtbase.dll;api-ms-win-crt-string-l1-1-0.dll;api-ms-win-crt-heap-l1-1-0.dll;api-ms-win-crt-locale-l1-1-0.dll;api-ms-win-crt-math-l1-1-0.dll;api-ms-win-crt-runtime-l1-1-0.dll;api-ms-win-crt-stdio-l1-1-0.dll;VCRUNTIME140.dll</DelayLoadDLLs> </Link> - <ClCompile> - <ExceptionHandling>Sync</ExceptionHandling> - </ClCompile> </ItemDefinitionGroup> </Project>
\ No newline at end of file diff --git a/tools/mdbx_load/mdbx_load.vcxproj b/tools/mdbx_load/mdbx_load.vcxproj index 32031b8acb..b0b1939ff9 100644 --- a/tools/mdbx_load/mdbx_load.vcxproj +++ b/tools/mdbx_load/mdbx_load.vcxproj @@ -39,8 +39,5 @@ <DelayLoadDLLs Condition="'$(Configuration)'=='Debug'">libmdbx.mir;ucrtbased.dll;vcruntime140d.dll</DelayLoadDLLs> <DelayLoadDLLs Condition="'$(Configuration)'=='Release'">libmdbx.mir;ucrtbase.dll;api-ms-win-crt-string-l1-1-0.dll;api-ms-win-crt-heap-l1-1-0.dll;api-ms-win-crt-locale-l1-1-0.dll;api-ms-win-crt-math-l1-1-0.dll;api-ms-win-crt-runtime-l1-1-0.dll;api-ms-win-crt-stdio-l1-1-0.dll;VCRUNTIME140.dll</DelayLoadDLLs> </Link> - <ClCompile> - <ExceptionHandling>Sync</ExceptionHandling> - </ClCompile> </ItemDefinitionGroup> </Project>
\ No newline at end of file |