[commit] r2805 - in trunk/GME: Common Console ConstraintManager Core GMEActiveBrowser Gme Interfaces Meta Mga MgaUtil ObjectInspector PanningView Parser PartBrowser Search XmlBackEnd
GMESRC Repository Notifications
gme-commit at list.isis.vanderbilt.edu
Fri Oct 1 11:44:37 CDT 2021
Author: ksmyth
Date: Fri Oct 1 11:44:37 2021
New Revision: 2805
Log:
Fix sprintf formats (or args)
Modified:
trunk/GME/Common/Common.vcxproj
trunk/GME/Console/Console.vcxproj
trunk/GME/Console/ScriptEdit.cpp
trunk/GME/ConstraintManager/ConstraintManager.vcxproj
trunk/GME/Core/Core.vcxproj
trunk/GME/GMEActiveBrowser/GMEActiveBrowser.vcxproj
trunk/GME/Gme/GME.vcxproj
trunk/GME/Gme/GMEView.cpp
trunk/GME/Gme/GUIObject.cpp
trunk/GME/Gme/GraphicsUtil.cpp
trunk/GME/Interfaces/Interfaces.vcxproj
trunk/GME/Meta/Meta.vcxproj
trunk/GME/Mga/Mga.vcxproj
trunk/GME/Mga/MgaFCO.cpp
trunk/GME/MgaUtil/AnnotationNode.cpp
trunk/GME/MgaUtil/MgaUtil.vcxproj
trunk/GME/ObjectInspector/ObjectInspector.vcxproj
trunk/GME/PanningView/PanningView.vcxproj
trunk/GME/Parser/Parser.vcxproj
trunk/GME/PartBrowser/PartBrowser.vcxproj
trunk/GME/Search/Search.vcxproj
trunk/GME/XmlBackEnd/XmlBackEnd.vcxproj
Modified: trunk/GME/Common/Common.vcxproj
==============================================================================
--- trunk/GME/Common/Common.vcxproj Fri Oct 1 11:44:30 2021 (r2804)
+++ trunk/GME/Common/Common.vcxproj Fri Oct 1 11:44:37 2021 (r2805)
@@ -60,18 +60,22 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
Modified: trunk/GME/Console/Console.vcxproj
==============================================================================
--- trunk/GME/Console/Console.vcxproj Fri Oct 1 11:44:30 2021 (r2804)
+++ trunk/GME/Console/Console.vcxproj Fri Oct 1 11:44:37 2021 (r2805)
@@ -61,18 +61,22 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
Modified: trunk/GME/Console/ScriptEdit.cpp
==============================================================================
--- trunk/GME/Console/ScriptEdit.cpp Fri Oct 1 11:44:30 2021 (r2804)
+++ trunk/GME/Console/ScriptEdit.cpp Fri Oct 1 11:44:37 2021 (r2805)
@@ -47,7 +47,7 @@
catch(hresult_exception &e)
{
TCHAR s[200];
- _stprintf_s(s, _T("Scripting Initialization Error: 0x%x"), e.hr);
+ _stprintf_s(s, _T("Scripting Initialization Error: 0x%x"), (unsigned int)e.hr);
m_console->Message(s, MSG_ERROR);
_ftprintf(stderr, _T("%s"), s);
return false;
@@ -176,14 +176,14 @@
catch(hresult_exception &e)
{
TCHAR s[1000];
- _stprintf_s(s, _T("Scripting Error: 0x%x"), e.hr);
+ _stprintf_s(s, _T("Scripting Error: 0x%x"), (unsigned int)e.hr);
m_console->Message((LPCTSTR)s, MSG_ERROR);
_ftprintf(stderr, _T("%s"), s);
}
catch(_com_error &e)
{
TCHAR s[1000];
- _stprintf_s(s, _T("Scripting Error: 0x%x"), e.Error());
+ _stprintf_s(s, _T("Scripting Error: 0x%x"), (unsigned int)e.Error());
m_console->Message(s, MSG_ERROR);
_ftprintf(stderr, _T("%s"), s);
}
@@ -198,14 +198,14 @@
catch(hresult_exception &e)
{
TCHAR s[1000];
- _stprintf_s(s, _T("Scripting Error: 0x%x"), e.hr);
+ _stprintf_s(s, _T("Scripting Error: 0x%x"), (unsigned int)e.hr);
m_console->Message(s, MSG_ERROR);
_ftprintf(stderr, _T("%s"), s);
}
catch(_com_error &e)
{
TCHAR s[1000];
- _stprintf_s(s, _T("Scripting Error: 0x%x"), e.Error());
+ _stprintf_s(s, _T("Scripting Error: 0x%x"), (unsigned int)e.Error());
m_console->Message(s, MSG_ERROR);
_ftprintf(stderr, _T("%s"), s);
}
@@ -250,13 +250,13 @@
}
catch(hresult_exception& e) {
TCHAR s[1000];
- _stprintf_s(s, _T("Scripting Error: 0x%x"), e.hr);
+ _stprintf_s(s, _T("Scripting Error: 0x%x"), (unsigned int)e.hr);
m_console->Message(s, MSG_ERROR);
}
catch(_com_error& e) {
TCHAR s[1000];
COMTHROW(e.Error());
- _stprintf_s(s, _T("Execute Script Error: 0x%x"), e.Error());
+ _stprintf_s(s, _T("Execute Script Error: 0x%x"), (unsigned int)e.Error());
m_console->Message(s, MSG_ERROR);
}
catch(...) {
Modified: trunk/GME/ConstraintManager/ConstraintManager.vcxproj
==============================================================================
--- trunk/GME/ConstraintManager/ConstraintManager.vcxproj Fri Oct 1 11:44:30 2021 (r2804)
+++ trunk/GME/ConstraintManager/ConstraintManager.vcxproj Fri Oct 1 11:44:37 2021 (r2805)
@@ -61,18 +61,22 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
Modified: trunk/GME/Core/Core.vcxproj
==============================================================================
--- trunk/GME/Core/Core.vcxproj Fri Oct 1 11:44:30 2021 (r2804)
+++ trunk/GME/Core/Core.vcxproj Fri Oct 1 11:44:37 2021 (r2805)
@@ -113,37 +113,45 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\Release.props" />
<Import Project="CoreRelease.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\Release.props" />
<Import Project="CoreRelease.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_PGO_Instrument|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\Release.props" />
<Import Project="CoreRelease.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_PGO_Instrument|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\Release.props" />
<Import Project="CoreRelease.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_PGO_Optimize|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\Release.props" />
<Import Project="CoreRelease.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_PGO_Optimize|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\Release.props" />
<Import Project="CoreRelease.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
Modified: trunk/GME/GMEActiveBrowser/GMEActiveBrowser.vcxproj
==============================================================================
--- trunk/GME/GMEActiveBrowser/GMEActiveBrowser.vcxproj Fri Oct 1 11:44:30 2021 (r2804)
+++ trunk/GME/GMEActiveBrowser/GMEActiveBrowser.vcxproj Fri Oct 1 11:44:37 2021 (r2805)
@@ -61,18 +61,22 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
Modified: trunk/GME/Gme/GME.vcxproj
==============================================================================
--- trunk/GME/Gme/GME.vcxproj Fri Oct 1 11:44:30 2021 (r2804)
+++ trunk/GME/Gme/GME.vcxproj Fri Oct 1 11:44:37 2021 (r2805)
@@ -62,21 +62,25 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\CrashRpt.props" />
<Import Project="..\CSGUI\CSGUI.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\CrashRpt.props" />
<Import Project="..\CSGUI\CSGUI.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\CrashRpt.props" />
<Import Project="..\CSGUI\CSGUI.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\CrashRpt.props" />
<Import Project="..\CSGUI\CSGUI.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
Modified: trunk/GME/Gme/GMEView.cpp
==============================================================================
--- trunk/GME/Gme/GMEView.cpp Fri Oct 1 11:44:30 2021 (r2804)
+++ trunk/GME/Gme/GMEView.cpp Fri Oct 1 11:44:37 2021 (r2805)
@@ -9976,15 +9976,15 @@
wchar_t srcPath[100];
if (srcPortMeta)
- swprintf_s(srcPath, L"src %d %d, ", srcMeta->MetaRef, srcPortMeta->MetaRef);
+ swprintf_s(srcPath, L"src %ld %ld, ", srcMeta->MetaRef, srcPortMeta->MetaRef);
else
- swprintf_s(srcPath, L"src %d, ", srcMeta->MetaRef);
+ swprintf_s(srcPath, L"src %ld, ", srcMeta->MetaRef);
wchar_t dstPath[100];
if (dstPortMeta)
- swprintf_s(dstPath, L"dst %d %d", dstMeta->MetaRef, dstPortMeta->MetaRef);
+ swprintf_s(dstPath, L"dst %ld %ld", dstMeta->MetaRef, dstPortMeta->MetaRef);
else
- swprintf_s(dstPath, L"dst %d", dstMeta->MetaRef);
+ swprintf_s(dstPath, L"dst %ld", dstMeta->MetaRef);
_bstr_t path = srcPath;
path += dstPath;
Modified: trunk/GME/Gme/GUIObject.cpp
==============================================================================
--- trunk/GME/Gme/GUIObject.cpp Fri Oct 1 11:44:30 2021 (r2804)
+++ trunk/GME/Gme/GUIObject.cpp Fri Oct 1 11:44:37 2021 (r2805)
@@ -609,7 +609,7 @@
COMTHROW(aspNode->get_Value(&bstr));
CString str(bstr);
long lx, ly;
- if(_stscanf(str,_T("%d,%d"), &lx, &ly) == 2) {
+ if(_stscanf(str,_T("%ld,%ld"), &lx, &ly) == 2) {
decoratorData[aspect]->location.left = lx;
decoratorData[aspect]->location.top = ly;
return;
@@ -624,7 +624,7 @@
COMTHROW(rootNode->get_Value(&bstrRoot));
CString strRoot(bstrRoot);
long lxr, lyr;
- if(_stscanf(strRoot,_T("%d,%d"), &lxr, &lyr) == 2) {
+ if(_stscanf(strRoot,_T("%ld,%ld"), &lxr, &lyr) == 2) {
decoratorData[aspect]->location.left = lxr;
decoratorData[aspect]->location.top = lyr;
return;
Modified: trunk/GME/Gme/GraphicsUtil.cpp
==============================================================================
--- trunk/GME/Gme/GraphicsUtil.cpp Fri Oct 1 11:44:30 2021 (r2804)
+++ trunk/GME/Gme/GraphicsUtil.cpp Fri Oct 1 11:44:37 2021 (r2805)
@@ -86,12 +86,12 @@
{
if (dir == GME_LEFT_DIRECTION || dir == GME_RIGHT_DIRECTION)
{
- Gdiplus::Matrix matrix(1.0f, 0.0f, 0.0f, 1.7f, 0, (Gdiplus::REAL)-lasty * (1.7 - 1));
+ Gdiplus::Matrix matrix(1.0f, 0.0f, 0.0f, 1.7f, 0, (Gdiplus::REAL)-lasty * (1.7f - 1));
arrowHeadPath.Transform(&matrix);
}
else
{
- Gdiplus::Matrix matrix(1.7f, 0.0f, 0.0f, 1.0f, (Gdiplus::REAL)-lastx * (1.7 - 1), 0);
+ Gdiplus::Matrix matrix(1.7f, 0.0f, 0.0f, 1.0f, (Gdiplus::REAL)-lastx * (1.7f - 1), 0);
arrowHeadPath.Transform(&matrix);
}
}
@@ -284,8 +284,9 @@
Gdiplus::Pen* CGraphics::GetGdipPen(Gdiplus::Graphics* gdip, COLORREF color, bool isPrinting, GMEConnLineType lineType,
int width)
{
- CString chBuffer;
- chBuffer.Format(_T("%x-%d-%d-%ld"), color, isPrinting, lineType, width);
+ wchar_t buf[128];
+ _swprintf(buf, _T("%x-%d-%d-%d"), (unsigned int)color, isPrinting, lineType, width);
+ CString chBuffer = buf;
std::map<CString,Gdiplus::Pen*>::iterator it = m_mapGdipPens.find(chBuffer);
if (it != m_mapGdipPens.end())
return it->second;
Modified: trunk/GME/Interfaces/Interfaces.vcxproj
==============================================================================
--- trunk/GME/Interfaces/Interfaces.vcxproj Fri Oct 1 11:44:30 2021 (r2804)
+++ trunk/GME/Interfaces/Interfaces.vcxproj Fri Oct 1 11:44:37 2021 (r2805)
@@ -33,9 +33,11 @@
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
Modified: trunk/GME/Meta/Meta.vcxproj
==============================================================================
--- trunk/GME/Meta/Meta.vcxproj Fri Oct 1 11:44:30 2021 (r2804)
+++ trunk/GME/Meta/Meta.vcxproj Fri Oct 1 11:44:37 2021 (r2805)
@@ -113,39 +113,47 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\Common.props" />
<Import Project="..\Release.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_PGO_Optimize|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\Common.props" />
<Import Project="..\Release.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_PGO_Instrument|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\Common.props" />
<Import Project="..\Release.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\Common.props" />
<Import Project="..\Release.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_PGO_Optimize|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\Common.props" />
<Import Project="..\Release.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_PGO_Instrument|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\Common.props" />
<Import Project="..\Release.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\Common.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\Common.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
Modified: trunk/GME/Mga/Mga.vcxproj
==============================================================================
--- trunk/GME/Mga/Mga.vcxproj Fri Oct 1 11:44:30 2021 (r2804)
+++ trunk/GME/Mga/Mga.vcxproj Fri Oct 1 11:44:37 2021 (r2805)
@@ -112,46 +112,54 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\Common.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\Common.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\Release.props" />
<Import Project="..\Common.props" />
<Import Project="MgaRelease.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_PGO_Optimize|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\Release.props" />
<Import Project="..\Common.props" />
<Import Project="MgaRelease.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_PGO_Instrument|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\Release.props" />
<Import Project="..\Common.props" />
<Import Project="MgaRelease.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\Release.props" />
<Import Project="..\Common.props" />
<Import Project="MgaRelease.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_PGO_Optimize|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\Release.props" />
<Import Project="..\Common.props" />
<Import Project="MgaRelease.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_PGO_Instrument|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\Release.props" />
<Import Project="..\Common.props" />
<Import Project="MgaRelease.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
Modified: trunk/GME/Mga/MgaFCO.cpp
==============================================================================
--- trunk/GME/Mga/MgaFCO.cpp Fri Oct 1 11:44:30 2021 (r2804)
+++ trunk/GME/Mga/MgaFCO.cpp Fri Oct 1 11:44:37 2021 (r2805)
@@ -177,7 +177,7 @@
OLECHAR t[20];
objid_type ss;
COMTHROW(self->get_ObjID(&ss));
- swprintf(t, 20, OLESTR("id-%04lx-%08lx"),GetMetaID(self), ss);
+ swprintf(t, 20, OLESTR("id-%04lx-%08lx"), (unsigned long)GetMetaID(self), ss);
*pVal = CComBSTR(t).Detach();
} COMCATCH(;);
}
Modified: trunk/GME/MgaUtil/AnnotationNode.cpp
==============================================================================
--- trunk/GME/MgaUtil/AnnotationNode.cpp Fri Oct 1 11:44:30 2021 (r2804)
+++ trunk/GME/MgaUtil/AnnotationNode.cpp Fri Oct 1 11:44:37 2021 (r2805)
@@ -393,7 +393,7 @@
CComBSTR rootVal;
COMTHROW(aspRoot->get_Value(&rootVal));
CString rootValStr(rootVal);
- long lx, ly;
+ int lx, ly;
if(_stscanf(rootValStr,_T("%d,%d"), &lx, &ly) == 2) {
m_aspects[aspIdx].m_loc = CPoint(lx,ly);
}
@@ -417,7 +417,7 @@
CComBSTR aspVal;
COMTHROW(aspNode->get_Value(&aspVal));
CString aspValStr(aspVal);
- long lx, ly;
+ int lx, ly;
if(_stscanf(aspValStr,_T("%d,%d"), &lx, &ly) == 2) {
m_aspects[aspIdx].m_loc = CPoint(lx,ly);
m_aspects[aspIdx].m_isLocDef = false;
Modified: trunk/GME/MgaUtil/MgaUtil.vcxproj
==============================================================================
--- trunk/GME/MgaUtil/MgaUtil.vcxproj Fri Oct 1 11:44:30 2021 (r2804)
+++ trunk/GME/MgaUtil/MgaUtil.vcxproj Fri Oct 1 11:44:37 2021 (r2805)
@@ -61,18 +61,22 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\CrashRpt.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\CrashRpt.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\CrashRpt.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\CrashRpt.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
Modified: trunk/GME/ObjectInspector/ObjectInspector.vcxproj
==============================================================================
--- trunk/GME/ObjectInspector/ObjectInspector.vcxproj Fri Oct 1 11:44:30 2021 (r2804)
+++ trunk/GME/ObjectInspector/ObjectInspector.vcxproj Fri Oct 1 11:44:37 2021 (r2805)
@@ -61,18 +61,22 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
Modified: trunk/GME/PanningView/PanningView.vcxproj
==============================================================================
--- trunk/GME/PanningView/PanningView.vcxproj Fri Oct 1 11:44:30 2021 (r2804)
+++ trunk/GME/PanningView/PanningView.vcxproj Fri Oct 1 11:44:37 2021 (r2805)
@@ -61,18 +61,22 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
Modified: trunk/GME/Parser/Parser.vcxproj
==============================================================================
--- trunk/GME/Parser/Parser.vcxproj Fri Oct 1 11:44:30 2021 (r2804)
+++ trunk/GME/Parser/Parser.vcxproj Fri Oct 1 11:44:37 2021 (r2805)
@@ -61,18 +61,22 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
Modified: trunk/GME/PartBrowser/PartBrowser.vcxproj
==============================================================================
--- trunk/GME/PartBrowser/PartBrowser.vcxproj Fri Oct 1 11:44:30 2021 (r2804)
+++ trunk/GME/PartBrowser/PartBrowser.vcxproj Fri Oct 1 11:44:37 2021 (r2805)
@@ -61,18 +61,22 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
Modified: trunk/GME/Search/Search.vcxproj
==============================================================================
--- trunk/GME/Search/Search.vcxproj Fri Oct 1 11:44:30 2021 (r2804)
+++ trunk/GME/Search/Search.vcxproj Fri Oct 1 11:44:37 2021 (r2805)
@@ -60,15 +60,19 @@
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
Modified: trunk/GME/XmlBackEnd/XmlBackEnd.vcxproj
==============================================================================
--- trunk/GME/XmlBackEnd/XmlBackEnd.vcxproj Fri Oct 1 11:44:30 2021 (r2804)
+++ trunk/GME/XmlBackEnd/XmlBackEnd.vcxproj Fri Oct 1 11:44:37 2021 (r2805)
@@ -61,18 +61,22 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project="..\Warnings.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
More information about the gme-commit
mailing list