[Scstudio-commits] SF.net SVN: scstudio:[537] trunk

[<got...@us...>]

Revision: 537
          http://scstudio.svn.sourceforge.net/scstudio/?rev=537&view=rev
Author:   gotthardp
Date:     2009-12-28 16:45:51 +0000 (Mon, 28 Dec 2009)

Log Message:
-----------
Project migrated to Microsoft Visual Studio 2008.

Modified Paths:
--------------
    trunk/CMakeLists.txt
    trunk/src/view/visio/addon/dllmodule.rc
    trunk/src/view/visio/addon/document.cpp
    trunk/src/view/visio/addon/scstudio.vcproj
    trunk/src/view/visio/scstudio.nsi
    trunk/src/view/visio/scstudio.sln
    trunk/src/view/visio/setup-nsis/filefix.cpp
    trunk/src/view/visio/setup-nsis/setup-nsis.vcproj

Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2009-12-18 12:21:45 UTC (rev 536)
+++ trunk/CMakeLists.txt	2009-12-28 16:45:51 UTC (rev 537)
@@ -33,6 +33,10 @@
 IF(CMAKE_COMPILER_IS_GNUCXX)
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -ansi -Wall -Wno-long-long")
 ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+# Disable microsoft security warnings
+IF(MSVC)
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS")
+ENDIF(MSVC)
 
 FIND_PACKAGE(Boost REQUIRED)
 INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR})

Modified: trunk/src/view/visio/addon/dllmodule.rc
===================================================================
--- trunk/src/view/visio/addon/dllmodule.rc	2009-12-18 12:21:45 UTC (rev 536)
+++ trunk/src/view/visio/addon/dllmodule.rc	2009-12-28 16:45:51 UTC (rev 537)
@@ -31,29 +31,23 @@
 CAPTION "About Sequence Chart Studio"
 FONT 8, "Microsoft Sans Serif", 400, 0, 0x0
 BEGIN
-    LTEXT           "Sequence Chart Studio 0.0.0",IDC_ABOUT_VERSION,5,5,230,
-                    10
+    LTEXT           "Sequence Chart Studio 0.0.0",IDC_ABOUT_VERSION,5,5,230,10
     LTEXT           "http://scstudio.sourceforge.net",IDC_STATIC,5,15,230,10
-    LTEXT           "This program comes with ABSOLUTELY NO WARRANTY. This program is a free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License version 2.1.",
-                    IDC_STATIC,5,30,230,25
+    LTEXT           "This program comes with ABSOLUTELY NO WARRANTY. This program is a free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License version 2.1.",IDC_STATIC,5,30,230,25
     DEFPUSHBUTTON   "&OK",IDOK,184,60,50,14
 END
 
 IDD_OPTIONS DIALOGEX 0, 0, 205, 135
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
-    WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Options"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,145,14,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,145,33,50,14
     LTEXT           "Properties to check",IDC_STATIC,5,5,130,8
-    CONTROL         "",IDC_CHECKLIST,"SysListView32",LVS_REPORT | 
-                    LVS_SINGLESEL | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,5,
-                    14,130,90
+    CONTROL         "",IDC_CHECKLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,5,14,130,90
     LTEXT           "Display",IDC_STATIC,5,108,130,8
-    COMBOBOX        IDC_OUTPUTLEVEL,5,118,130,61,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_OUTPUTLEVEL,5,118,130,61,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
 
@@ -89,8 +83,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,3,27,0
- PRODUCTVERSION 0,3,27,0
+ FILEVERSION 0,3,28,0
+ PRODUCTVERSION 0,3,28,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x9L
@@ -107,13 +101,13 @@
         BEGIN
             VALUE "CompanyName", "Masaryk University Brno"
             VALUE "FileDescription", "Microsoft Visio add-on for design and verification of Message Sequence Charts (MSC)."
-            VALUE "FileVersion", "0.3.27"
+            VALUE "FileVersion", "0.3.28"
             VALUE "InternalName", "scstudio.vsl"
             VALUE "LegalCopyright", "(c) Petr Gotthard. All rights reserved."
             VALUE "OriginalFilename", "scstudio.vsl"
             VALUE "PrivateBuild", "$Revision$"
             VALUE "ProductName", "Sequence Chart Studio"
-            VALUE "ProductVersion", "0.3.27"
+            VALUE "ProductVersion", "0.3.28"
         END
     END
     BLOCK "VarFileInfo"

Modified: trunk/src/view/visio/addon/document.cpp
===================================================================
--- trunk/src/view/visio/addon/document.cpp	2009-12-18 12:21:45 UTC (rev 536)
+++ trunk/src/view/visio/addon/document.cpp	2009-12-28 16:45:51 UTC (rev 537)
@@ -30,7 +30,7 @@
 
 // Include libraries from the Windows Template Library (WTL).
 // http://wtl.sourceforge.net
-// Install WTL80 under e.g. "C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\"
+// Install WTL81 under e.g. "C:\Program Files\Microsoft Visual Studio 9.0\VC\"
 #include <atldlgs.h>
 
 #include <boost/graph/adjacency_list.hpp>
@@ -976,7 +976,7 @@
   for(FormatterPtrList::const_iterator fpos = m_formatters.begin();
     fpos != m_formatters.end(); fpos++)
   {
-    if(stricmp(fileExtension+1, (*fpos)->get_extension().c_str()) != 0)
+    if(_stricmp(fileExtension+1, (*fpos)->get_extension().c_str()) != 0)
       continue;
 
     ImportFormatterPtr formatter = boost::dynamic_pointer_cast<ImportFormatter>(*fpos);
@@ -1048,7 +1048,7 @@
   for(FormatterPtrList::const_iterator fpos = m_formatters.begin();
     fpos != m_formatters.end(); fpos++)
   {
-    if(stricmp(fileExtension+1, (*fpos)->get_extension().c_str()) != 0)
+    if(_stricmp(fileExtension+1, (*fpos)->get_extension().c_str()) != 0)
       continue;
 
     ExportFormatterPtr formatter = boost::dynamic_pointer_cast<ExportFormatter>(*fpos);

Modified: trunk/src/view/visio/addon/scstudio.vcproj
===================================================================
--- trunk/src/view/visio/addon/scstudio.vcproj	2009-12-18 12:21:45 UTC (rev 536)
+++ trunk/src/view/visio/addon/scstudio.vcproj	2009-12-28 16:45:51 UTC (rev 537)
@@ -1,161 +1,224 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="9,00"
 	Name="scstudio"
 	ProjectGUID="{0E00282C-F48B-4984-A274-5B59E1E2AD49}"
 	RootNamespace="scstudio"
-	Keyword="AtlProj">
+	Keyword="AtlProj"
+	TargetFrameworkVersion="131072"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfATL="2"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="1">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
 			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\src;&quot;$(BOOST_ROOT)&quot;;&quot;$(VISIOSDK_ROOT)\Libraries\CPP\Include&quot;;&quot;$(VISIOSDK_ROOT)\Libraries\CPP\Source&quot;;&quot;$(VISIOSDK_ROOT)\Libraries\TypeLib&quot;;&quot;$(VCInstallDir)\WTL80\include&quot;"
-				PreprocessorDefinitions="WIN32;_WIN32_WINNT=0x0500;_WINDOWS;_DEBUG;_USRDLL"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="2"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="4"/>
+				Name="VCPreBuildEventTool"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCCustomBuildTool"
+			/>
 			<Tool
-				Name="VCLinkerTool"
-				RegisterOutput="TRUE"
-				IgnoreImportLibrary="TRUE"
-				AdditionalDependencies="version.lib scmsc.lib"
-				OutputFile="$(OutDir)\$(ProjectName).vsl"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\..\..\..\$(OutDir)"
-				ModuleDefinitionFile=".\dllmodule.def"
-				GenerateDebugInformation="TRUE"
-				SubSystem="2"
-				TargetMachine="1"/>
+				Name="VCXMLDataGeneratorTool"
+			/>
 			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="_DEBUG"
 				AdditionalIncludeDirectories="&quot;$(VISIOSDK_ROOT)\Libraries\TypeLib&quot;"
-				MkTypLibCompatible="FALSE"
+				MkTypLibCompatible="false"
 				TargetEnvironment="1"
-				GenerateStublessProxies="TRUE"
+				GenerateStublessProxies="true"
 				TypeLibraryName="$(IntDir)/scstudio.tlb"
 				HeaderFileName="scstudio.h"
 				DLLDataFileName=""
 				InterfaceIdentifierFileName="scstudio_i.c"
 				ProxyFileName="scstudio_p.c"
-				ValidateParameters="FALSE"/>
+				ValidateParameters="false"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"
-				Description="Signing code..."
-				CommandLine="signcode $(OutDir)\$(ProjectName).vsl"
-				ExcludedFromBuild="FALSE"/>
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\..\src;&quot;$(BOOST_ROOT)&quot;;&quot;$(VISIOSDK_ROOT)\Libraries\CPP\Include&quot;;&quot;$(VISIOSDK_ROOT)\Libraries\CPP\Source&quot;;&quot;$(VISIOSDK_ROOT)\Libraries\TypeLib&quot;;&quot;$(VCInstallDir)\WTL81\include&quot;"
+				PreprocessorDefinitions="WIN32;_WIN32_WINNT=0x0500;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_DEBUG;_USRDLL"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="4"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
-				AdditionalIncludeDirectories="$(IntDir)"/>
+				AdditionalIncludeDirectories="$(IntDir)"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCLinkerTool"
+				RegisterOutput="true"
+				IgnoreImportLibrary="true"
+				AdditionalDependencies="version.lib scmsc.lib"
+				OutputFile="$(OutDir)\$(ProjectName).vsl"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories="..\..\..\..\$(OutDir)"
+				ModuleDefinitionFile=".\dllmodule.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="Signing code..."
+				CommandLine="signtool sign /a $(OutDir)\$(ProjectName).vsl"
+				ExcludedFromBuild="false"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfATL="2"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="1">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="1"
+			>
 			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\..\..\..\src;&quot;$(BOOST_ROOT)&quot;;&quot;$(VISIOSDK_ROOT)\Libraries\CPP\Include&quot;;&quot;$(VISIOSDK_ROOT)\Libraries\CPP\Source&quot;;&quot;$(VISIOSDK_ROOT)\Libraries\TypeLib&quot;;&quot;$(VCInstallDir)\WTL80\include&quot;"
-				PreprocessorDefinitions="WIN32;_WIN32_WINNT=0x0500;_WINDOWS;NDEBUG;_USRDLL"
-				RuntimeLibrary="2"
-				RuntimeTypeInfo="TRUE"
-				UsePrecompiledHeader="2"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
+				Name="VCPreBuildEventTool"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCCustomBuildTool"
+			/>
 			<Tool
-				Name="VCLinkerTool"
-				RegisterOutput="TRUE"
-				IgnoreImportLibrary="TRUE"
-				AdditionalDependencies="version.lib scmsc.lib"
-				OutputFile="$(OutDir)\$(ProjectName).vsl"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\..\..\$(OutDir)"
-				ModuleDefinitionFile=".\dllmodule.def"
-				GenerateDebugInformation="TRUE"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"/>
+				Name="VCXMLDataGeneratorTool"
+			/>
 			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
 				Name="VCMIDLTool"
 				PreprocessorDefinitions="NDEBUG"
 				AdditionalIncludeDirectories="&quot;$(VISIOSDK_ROOT)\Libraries\TypeLib&quot;"
-				MkTypLibCompatible="FALSE"
+				MkTypLibCompatible="false"
 				TargetEnvironment="1"
-				GenerateStublessProxies="TRUE"
+				GenerateStublessProxies="true"
 				TypeLibraryName="$(IntDir)/scstudio.tlb"
 				HeaderFileName="scstudio.h"
 				DLLDataFileName=""
 				InterfaceIdentifierFileName="scstudio_i.c"
 				ProxyFileName="scstudio_p.c"
-				ValidateParameters="FALSE"/>
+				ValidateParameters="false"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"
-				Description="Signing code..."
-				CommandLine="signcode $(OutDir)\$(ProjectName).vsl"
-				ExcludedFromBuild="FALSE"/>
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				AdditionalIncludeDirectories="..\..\..\..\src;&quot;$(BOOST_ROOT)&quot;;&quot;$(VISIOSDK_ROOT)\Libraries\CPP\Include&quot;;&quot;$(VISIOSDK_ROOT)\Libraries\CPP\Source&quot;;&quot;$(VISIOSDK_ROOT)\Libraries\TypeLib&quot;;&quot;$(VCInstallDir)\WTL81\include&quot;"
+				PreprocessorDefinitions="WIN32;_WIN32_WINNT=0x0500;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;NDEBUG;_USRDLL"
+				RuntimeLibrary="2"
+				RuntimeTypeInfo="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
 				Name="VCResourceCompilerTool"
 				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
-				AdditionalIncludeDirectories="$(IntDir)"/>
+				AdditionalIncludeDirectories="$(IntDir)"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCLinkerTool"
+				RegisterOutput="true"
+				IgnoreImportLibrary="true"
+				AdditionalDependencies="version.lib scmsc.lib"
+				OutputFile="$(OutDir)\$(ProjectName).vsl"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="..\..\..\..\$(OutDir)"
+				ModuleDefinitionFile=".\dllmodule.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="Signing code..."
+				CommandLine="signtool sign /a $(OutDir)\$(ProjectName).vsl"
+				ExcludedFromBuild="false"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -164,124 +227,160 @@
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
 			<File
-				RelativePath=".\aboutdlg.h">
+				RelativePath=".\aboutdlg.h"
+				>
 			</File>
 			<File
-				RelativePath=".\addon.cpp">
+				RelativePath=".\addon.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\addon.h">
+				RelativePath=".\addon.h"
+				>
 			</File>
 			<File
-				RelativePath=".\dllmodule.cpp">
+				RelativePath=".\dllmodule.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\dllmodule.def">
+				RelativePath=".\dllmodule.def"
+				>
 			</File>
 			<File
-				RelativePath=".\dllmodule.h">
+				RelativePath=".\dllmodule.h"
+				>
 			</File>
 			<File
-				RelativePath=".\document.cpp">
+				RelativePath=".\document.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\document.h">
+				RelativePath=".\document.h"
+				>
 			</File>
 			<File
-				RelativePath=".\errors.cpp">
+				RelativePath=".\errors.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\errors.h">
+				RelativePath=".\errors.h"
+				>
 			</File>
 			<File
-				RelativePath=".\eventsink.idl">
+				RelativePath=".\eventsink.idl"
+				>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCMIDLTool"
 						HeaderFileName="eventsink.h"
 						InterfaceIdentifierFileName="eventsink_i.c"
-						ProxyFileName="eventsink_p.c"/>
+						ProxyFileName="eventsink_p.c"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCMIDLTool"
 						HeaderFileName="eventsink.h"
 						InterfaceIdentifierFileName="eventsink_i.c"
-						ProxyFileName="eventsink_p.c"/>
+						ProxyFileName="eventsink_p.c"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\extract.cpp">
+				RelativePath=".\extract.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\extract.h">
+				RelativePath=".\extract.h"
+				>
 			</File>
 			<File
-				RelativePath=".\optionsdlg.cpp">
+				RelativePath=".\optionsdlg.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\optionsdlg.h">
+				RelativePath=".\optionsdlg.h"
+				>
 			</File>
 			<File
-				RelativePath=".\reportview.cpp">
+				RelativePath=".\reportview.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\reportview.h">
+				RelativePath=".\reportview.h"
+				>
 			</File>
 			<File
-				RelativePath=".\resource.h">
+				RelativePath=".\resource.h"
+				>
 			</File>
 			<File
-				RelativePath=".\stdafx.cpp">
+				RelativePath=".\stdafx.cpp"
+				>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"/>
+						UsePrecompiledHeader="1"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"/>
+						UsePrecompiledHeader="1"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\stdafx.h">
+				RelativePath=".\stdafx.h"
+				>
 			</File>
 			<File
-				RelativePath=".\visualize.cpp">
+				RelativePath=".\visualize.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\visualize.h">
+				RelativePath=".\visualize.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
 			<File
-				RelativePath=".\dllmodule.rc">
+				RelativePath=".\dllmodule.rc"
+				>
 			</File>
 			<File
-				RelativePath=".\dllmodule.rgs">
+				RelativePath=".\dllmodule.rgs"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Generated Files"
-			Filter="">
+			>
 			<File
-				RelativePath=".\eventsink_i.c">
+				RelativePath=".\eventsink_i.c"
+				>
 			</File>
 		</Filter>
 	</Files>
 	<Globals>
 		<Global
 			Name="RESOURCE_FILE"
-			Value="dllmodule.rc"/>
+			Value="dllmodule.rc"
+		/>
 	</Globals>
 </VisualStudioProject>

Modified: trunk/src/view/visio/scstudio.nsi
===================================================================
--- trunk/src/view/visio/scstudio.nsi	2009-12-18 12:21:45 UTC (rev 536)
+++ trunk/src/view/visio/scstudio.nsi	2009-12-28 16:45:51 UTC (rev 537)
@@ -21,7 +21,7 @@
 
 ; -- General ---------------------------
 
-!define VERSION "0.3.27"
+!define VERSION "0.3.28"
 
 Name "Sequence Chart Studio"
 OutFile "scstudio-setup-${VERSION}.exe"
@@ -96,9 +96,9 @@
 Section "Microsoft Visio Add-On" SecAddon
   SetOutPath $INSTDIR\bin
   DetailPrint "Installing Microsoft libraries"
-  File "redistribute\atl71.dll"
-  File "redistribute\msvcp71.dll"
-  File "redistribute\msvcr71.dll"
+  File "redistribute\atl90.dll"
+  File "redistribute\msvcp90.dll"
+  File "redistribute\msvcr90.dll"
   File "redistribute\lpsolve55.dll"
   File "redistribute\capicom.dll"
   ExecWait 'regsvr32.exe /s "$INSTDIR\capicom.dll"'

Modified: trunk/src/view/visio/scstudio.sln
===================================================================
--- trunk/src/view/visio/scstudio.sln	2009-12-18 12:21:45 UTC (rev 536)
+++ trunk/src/view/visio/scstudio.sln	2009-12-28 16:45:51 UTC (rev 537)
@@ -1,32 +1,11 @@
 
-Microsoft Visual Studio Solution File, Format Version 8.00
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scstudio", "addon\scstudio.vcproj", "{0E00282C-F48B-4984-A274-5B59E1E2AD49}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "setup-nsis", "setup-nsis\setup-nsis.vcproj", "{77848F6B-EA64-4917-8E72-21FA1DD2B2F6}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
 EndProject
 Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		Release = Release
-	EndGlobalSection
-	GlobalSection(ProjectDependencies) = postSolution
-	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{0E00282C-F48B-4984-A274-5B59E1E2AD49}.Debug.ActiveCfg = Debug|Win32
-		{0E00282C-F48B-4984-A274-5B59E1E2AD49}.Debug.Build.0 = Debug|Win32
-		{0E00282C-F48B-4984-A274-5B59E1E2AD49}.Release.ActiveCfg = Release|Win32
-		{0E00282C-F48B-4984-A274-5B59E1E2AD49}.Release.Build.0 = Release|Win32
-		{77848F6B-EA64-4917-8E72-21FA1DD2B2F6}.Debug.ActiveCfg = Debug|Win32
-		{77848F6B-EA64-4917-8E72-21FA1DD2B2F6}.Release.ActiveCfg = Release|Win32
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
 		Release|Win32 = Release|Win32
@@ -36,6 +15,8 @@
 		{0E00282C-F48B-4984-A274-5B59E1E2AD49}.Debug|Win32.Build.0 = Debug|Win32
 		{0E00282C-F48B-4984-A274-5B59E1E2AD49}.Release|Win32.ActiveCfg = Release|Win32
 		{0E00282C-F48B-4984-A274-5B59E1E2AD49}.Release|Win32.Build.0 = Release|Win32
+		{77848F6B-EA64-4917-8E72-21FA1DD2B2F6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{77848F6B-EA64-4917-8E72-21FA1DD2B2F6}.Release|Win32.ActiveCfg = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Modified: trunk/src/view/visio/setup-nsis/filefix.cpp
===================================================================
--- trunk/src/view/visio/setup-nsis/filefix.cpp	2009-12-18 12:21:45 UTC (rev 536)
+++ trunk/src/view/visio/setup-nsis/filefix.cpp	2009-12-28 16:45:51 UTC (rev 537)
@@ -46,15 +46,15 @@
   BOOL result = SHGetSpecialFolderPath(NULL, path, CSIDL_LOCAL_APPDATA, false);
 
   TCHAR source_path[MAX_PATH+1];
-  _tcscpy(source_path, path);
-  _tcscat(source_path, _T("\\"));
-  _tcscat(source_path, filename);
-  _tcscat(source_path, _T(".old"));
+  _tcscpy_s(source_path, MAX_PATH, path);
+  _tcscat_s(source_path, MAX_PATH, _T("\\"));
+  _tcscat_s(source_path, MAX_PATH, filename);
+  _tcscat_s(source_path, MAX_PATH, _T(".old"));
 
   TCHAR target_path[MAX_PATH+1];
-  _tcscpy(target_path, path);
-  _tcscat(target_path, _T("\\"));
-  _tcscat(target_path, filename);
+  _tcscpy_s(target_path, MAX_PATH, path);
+  _tcscat_s(target_path, MAX_PATH, _T("\\"));
+  _tcscat_s(target_path, MAX_PATH, filename);
 
   // remove previous filename.old
   remove(source_path);
@@ -62,11 +62,11 @@
   rename(target_path, source_path);
 
   FILE *infile;
-  if((infile = fopen(source_path, "rb")) == NULL) // filename.old
+  if(fopen_s(&infile, source_path, "rb") != 0) // filename.old
     return;
 
   FILE *outfile;
-  if((outfile = fopen(target_path, "wb")) == NULL) // filename
+  if(fopen_s(&outfile, target_path, "wb") != 0) // filename
     return;
 
   while(!feof(infile))

Modified: trunk/src/view/visio/setup-nsis/setup-nsis.vcproj
===================================================================
--- trunk/src/view/visio/setup-nsis/setup-nsis.vcproj	2009-12-18 12:21:45 UTC (rev 536)
+++ trunk/src/view/visio/setup-nsis/setup-nsis.vcproj	2009-12-28 16:45:51 UTC (rev 537)
@@ -1,112 +1,175 @@
 <?xml version="1.0" encoding="windows-1250"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="9,00"
 	Name="setup-nsis"
 	ProjectGUID="{77848F6B-EA64-4917-8E72-21FA1DD2B2F6}"
-	Keyword="Win32Proj">
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="Debug"
 			IntermediateDirectory="Debug"
 			ConfigurationType="2"
-			CharacterSet="0">
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="0"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="C:\Program Files\Microsoft Platform SDK for Windows XP SP2\Bin"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="TRUE"
+				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
-				UsePrecompiledHeader="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="2"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="4"/>
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="4"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="pluginapi.lib"
 				OutputFile="$(OutDir)/nsis.dll"
 				LinkIncremental="2"
-				GenerateDebugInformation="TRUE"
+				IgnoreDefaultLibraryNames=""
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/nsis.pdb"
 				SubSystem="1"
-				TargetMachine="1"/>
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="Release"
 			IntermediateDirectory="Release"
 			ConfigurationType="2"
-			CharacterSet="0">
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="0"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="C:\Program Files\Microsoft Platform SDK for Windows XP SP2\Bin"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="4"
-				UsePrecompiledHeader="3"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="2"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="pluginapi.lib"
 				OutputFile="$(OutDir)/nsis.dll"
 				LinkIncremental="1"
-				GenerateDebugInformation="TRUE"
+				IgnoreDefaultLibraryNames=""
+				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				TargetMachine="1"/>
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -115,41 +178,72 @@
 		<Filter
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
 			<File
-				RelativePath=".\certificates.cpp">
+				RelativePath=".\certificates.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\filefix.cpp">
+				RelativePath=".\filefix.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\stdafx.cpp">
+				RelativePath=".\pluginapi.c"
+				>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"/>
+						UsePrecompiledHeader="0"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"/>
+						UsePrecompiledHeader="0"
+					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath=".\stdafx.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
 			<File
-				RelativePath=".\stdafx.h">
+				RelativePath=".\stdafx.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
 		</Filter>
 	</Files>
 	<Globals>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.