Fierelier/notepad-plus-plus-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Support compilation in VS2015.

Browse Source 
Changes:
_CRT_NON_CONFORMING_WCSTOK - to have old wcstok behaviour
dbghelp.h doesn't disable warnings, do it manually.
Better casting from pointer to integral.
Disable warnings in tinyXml headers.
Disable warnings 4456;4457;4459 to not touch the source.
More details about the warnings: http://blogs.msdn.com/b/vcblog/archive/2014/11/12/improvements-to-warnings-in-the-c-compiler.aspx
This commit is contained in:
NN 2015-05-19 14:01:27 +03:00
parent a76ff09ac0
commit 2ef5e5eca3
5 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PowerEditor/src/MISC/Common/precompiledHeaders.h
View File

@ -32,6 +32,7 @@
// w/o precompiled headers file : 1 minute 55 sec // w/o precompiled headers file : 1 minute 55 sec
#define _WIN32_WINNT 0x0501 #define _WIN32_WINNT 0x0501
#define _CRT_NON_CONFORMING_WCSTOK
// C RunTime Header Files // C RunTime Header Files
#include <stdio.h> #include <stdio.h>
@ -63,7 +64,11 @@
#include <shlwapi.h> #include <shlwapi.h>
#include <uxtheme.h> #include <uxtheme.h>
#include <Oleacc.h> #include <Oleacc.h>
#pragma warning(push)
#pragma warning(disable: 4091)
#include <dbghelp.h> #include <dbghelp.h>
#pragma warning(pop)
#include <eh.h> #include <eh.h>
#ifdef UNICODE #ifdef UNICODE

8
PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp
View File

@ -2374,9 +2374,9 @@ void ScintillaEditView::convertSelectedTextTo(bool Case)
for (int j = 0 ; j < nbChar ; ++j) for (int j = 0 ; j < nbChar ; ++j)
{ {
if (Case == UPPERCASE) if (Case == UPPERCASE)
destStr[j] = (wchar_t)::CharUpperW((LPWSTR)destStr[j]); destStr[j] = (wchar_t)(UINT_PTR)::CharUpperW((LPWSTR)destStr[j]);
else else
destStr[j] = (wchar_t)::CharLowerW((LPWSTR)destStr[j]); destStr[j] = (wchar_t)(UINT_PTR)::CharLowerW((LPWSTR)destStr[j]);
} }
::WideCharToMultiByte(codepage, 0, destStr, len, srcStr, len, NULL, NULL); ::WideCharToMultiByte(codepage, 0, destStr, len, srcStr, len, NULL, NULL);
@ -2414,9 +2414,9 @@ void ScintillaEditView::convertSelectedTextTo(bool Case)
for (int i = 0 ; i < nbChar ; ++i) for (int i = 0 ; i < nbChar ; ++i)
{ {
if (Case == UPPERCASE) if (Case == UPPERCASE)
selectedStrW[i] = (WCHAR)::CharUpperW((LPWSTR)selectedStrW[i]); selectedStrW[i] = (WCHAR)(UINT_PTR)::CharUpperW((LPWSTR)selectedStrW[i]);
else else
selectedStrW[i] = (WCHAR)::CharLowerW((LPWSTR)selectedStrW[i]); selectedStrW[i] = (WCHAR)(UINT_PTR)::CharLowerW((LPWSTR)selectedStrW[i]);
} }
::WideCharToMultiByte(codepage, 0, selectedStrW, strWSize, selectedStr, strSize, NULL, NULL); ::WideCharToMultiByte(codepage, 0, selectedStrW, strWSize, selectedStr, strSize, NULL, NULL);

5
PowerEditor/src/TinyXml/tinyXmlA/tinyxmlA.h
View File

@ -27,6 +27,8 @@ distribution.
#define TINYXMLA_INCLUDED #define TINYXMLA_INCLUDED
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning( push )
#pragma warning( disable : 4458 )
#pragma warning( disable : 4530 ) #pragma warning( disable : 4530 )
#pragma warning( disable : 4786 ) #pragma warning( disable : 4786 )
#endif #endif
@ -1250,6 +1252,9 @@ private:
TiXmlNodeA* node; TiXmlNodeA* node;
}; };
#ifdef _MSC_VER
#pragma warning( pop )
#endif
#endif #endif

5
PowerEditor/src/TinyXml/tinyxml.h
View File

@ -27,6 +27,8 @@ distribution.
#define TINYXML_INCLUDED #define TINYXML_INCLUDED
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning( push )
#pragma warning( disable : 4458 )
#pragma warning( disable : 4530 ) #pragma warning( disable : 4530 )
#pragma warning( disable : 4786 ) #pragma warning( disable : 4786 )
#endif #endif
@ -1248,6 +1250,9 @@ private:
TiXmlNode* node; TiXmlNode* node;
}; };
#ifdef _MSC_VER
#pragma warning( pop )
#endif
#endif #endif

2
PowerEditor/visual.net/notepadPlus.vcxproj
View File

@ -69,6 +69,7 @@
<WarningLevel>Level4</WarningLevel> <WarningLevel>Level4</WarningLevel>
<TreatWarningAsError>true</TreatWarningAsError> <TreatWarningAsError>true</TreatWarningAsError>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<DisableSpecificWarnings>4456;4457;4459</DisableSpecificWarnings>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalOptions>/fixed:no %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/fixed:no %(AdditionalOptions)</AdditionalOptions>
@ -111,6 +112,7 @@
<TreatWarningAsError>true</TreatWarningAsError> <TreatWarningAsError>true</TreatWarningAsError>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet> <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
<DisableSpecificWarnings>4456;4457;4459</DisableSpecificWarnings>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>comctl32.lib;shlwapi.lib;shell32.lib;Oleacc.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>comctl32.lib;shlwapi.lib;shell32.lib;Oleacc.lib;%(AdditionalDependencies)</AdditionalDependencies>