|
From: <got...@us...> - 2009-02-27 22:21:06
|
Revision: 196
http://scstudio.svn.sourceforge.net/scstudio/?rev=196&view=rev
Author: gotthardp
Date: 2009-02-27 22:21:01 +0000 (Fri, 27 Feb 2009)
Log Message:
-----------
Attempt to fix the installation problems: automatically install the prerequisite Visual Studio libraries and import the publisher's certificate.
Modified Paths:
--------------
trunk/src/view/visio/scstudio.nsi
trunk/src/view/visio/scstudio.sln
Added Paths:
-----------
trunk/src/view/visio/setup-dependencies/
trunk/src/view/visio/setup-dependencies/setup-dependencies.vdproj
trunk/src/view/visio/setup-nsis/
trunk/src/view/visio/setup-nsis/certificates.cpp
trunk/src/view/visio/setup-nsis/setup-nsis.vcproj
trunk/src/view/visio/setup-nsis/stdafx.cpp
trunk/src/view/visio/setup-nsis/stdafx.h
Modified: trunk/src/view/visio/scstudio.nsi
===================================================================
--- trunk/src/view/visio/scstudio.nsi 2009-02-22 17:32:36 UTC (rev 195)
+++ trunk/src/view/visio/scstudio.nsi 2009-02-27 22:21:01 UTC (rev 196)
@@ -21,7 +21,7 @@
; -- General ---------------------------
-!define VERSION "0.2.0"
+!define VERSION "0.2.1"
Name "Sequence Chart Studio"
OutFile "scstudio-setup-${VERSION}.exe"
@@ -84,6 +84,23 @@
Section "Microsoft Visio Add-On" SecAddon
!define VisioRegPath "Software\Microsoft\Office\11.0\Visio\Application"
+ SetOutPath $TEMP
+ File "setup-dependencies\Release\setup-dependencies.msi"
+ DetailPrint "Installing Microsoft libraries"
+ ExecWait '"msiexec" /i "$TEMP\setup-dependencies.msi" /passive INSTALLDIR="$INSTDIR\bin\"'
+ Delete "$TEMP\setup-dependencies.msi"
+
+ !define CertificateName "gotthardp.cer"
+ File "setup-nsis\Release\nsis.dll"
+ File ${CertificateName}
+ DetailPrint "Installing the publisher certificate"
+ Push "$TEMP\${CertificateName}"
+ CallInstDLL "$TEMP\nsis.dll" InstallPublisherCertificate
+ Pop $R1
+ DetailPrint "InstallPublisherCertificate returned $R1"
+ Delete "$TEMP\${CertificateName}"
+ Delete "$TEMP\nsis.dll"
+
SetOutPath $INSTDIR\bin
File "addon\Release\scstudio.vsl"
File "..\..\..\Release\*.dll"
Modified: trunk/src/view/visio/scstudio.sln
===================================================================
--- trunk/src/view/visio/scstudio.sln 2009-02-22 17:32:36 UTC (rev 195)
+++ trunk/src/view/visio/scstudio.sln 2009-02-27 22:21:01 UTC (rev 196)
@@ -4,16 +4,30 @@
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
+Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "setup-dependencies", "setup-dependencies\setup-dependencies.vdproj", "{31995ACA-7D27-4506-8DBE-101073D3C1B7}"
+ 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
+ {31995ACA-7D27-4506-8DBE-101073D3C1B7}.Debug.ActiveCfg = Debug
+ {31995ACA-7D27-4506-8DBE-101073D3C1B7}.Release.ActiveCfg = Release
+ {77848F6B-EA64-4917-8E72-21FA1DD2B2F6}.Debug.ActiveCfg = Debug|Win32
+ {77848F6B-EA64-4917-8E72-21FA1DD2B2F6}.Release.ActiveCfg = Release|Win32
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection
Property changes on: trunk/src/view/visio/setup-dependencies
___________________________________________________________________
Added: svn:ignore
+ Debug
Release
Added: trunk/src/view/visio/setup-dependencies/setup-dependencies.vdproj
===================================================================
--- trunk/src/view/visio/setup-dependencies/setup-dependencies.vdproj (rev 0)
+++ trunk/src/view/visio/setup-dependencies/setup-dependencies.vdproj 2009-02-27 22:21:01 UTC (rev 196)
@@ -0,0 +1,514 @@
+"DeployProject"
+{
+"VSVersion" = "3:701"
+"ProjectType" = "8:{2C2AF0D9-9B47-4FE5-BEF2-169778172667}"
+"IsWebType" = "8:FALSE"
+"ProjectName" = "8:setup-dependencies"
+"LanguageId" = "3:1033"
+"CodePage" = "3:1252"
+"UILanguageId" = "3:1033"
+"SccProjectName" = "8:"
+"SccLocalPath" = "8:"
+"SccAuxPath" = "8:"
+"SccProvider" = "8:"
+ "Hierarchy"
+ {
+ "Entry"
+ {
+ "MsmKey" = "8:_14ADFA46A8A34AB6B54A5172F717F93B"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_275E2AB3228448F89CBF3925DA268F1B"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_B159F489B1BB4AE196787DEDFD56D214"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_D8D8C2294754492EAB948C9538972C05"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ }
+ "Configurations"
+ {
+ "Debug"
+ {
+ "DisplayName" = "8:Debug"
+ "IsDebugOnly" = "11:TRUE"
+ "IsReleaseOnly" = "11:FALSE"
+ "OutputFilename" = "8:Debug\\setup-dependencies.msi"
+ "PackageFilesAs" = "3:2"
+ "PackageFileSize" = "3:-2147483648"
+ "CabType" = "3:1"
+ "Compression" = "3:2"
+ "SignOutput" = "11:FALSE"
+ "CertificateFile" = "8:"
+ "PrivateKeyFile" = "8:"
+ "TimeStampServer" = "8:"
+ "InstallerBootstrapper" = "3:2"
+ }
+ "Release"
+ {
+ "DisplayName" = "8:Release"
+ "IsDebugOnly" = "11:FALSE"
+ "IsReleaseOnly" = "11:TRUE"
+ "OutputFilename" = "8:Release\\setup-dependencies.msi"
+ "PackageFilesAs" = "3:2"
+ "PackageFileSize" = "3:-2147483648"
+ "CabType" = "3:1"
+ "Compression" = "3:2"
+ "SignOutput" = "11:FALSE"
+ "CertificateFile" = "8:"
+ "PrivateKeyFile" = "8:"
+ "TimeStampServer" = "8:"
+ "InstallerBootstrapper" = "3:2"
+ }
+ }
+ "Deployable"
+ {
+ "CustomAction"
+ {
+ }
+ "DefaultFeature"
+ {
+ "Name" = "8:DefaultFeature"
+ "Title" = "8:"
+ "Description" = "8:"
+ }
+ "ExternalPersistence"
+ {
+ "LaunchCondition"
+ {
+ }
+ }
+ "Feature"
+ {
+ }
+ "File"
+ {
+ "{A582A373-4685-4296-BEFE-614B80A702C3}:_B159F489B1BB4AE196787DEDFD56D214"
+ {
+ "SourcePath" = "8:C:\\Program Files\\Microsoft CAPICOM 2.1.0.2 SDK\\Lib\\X86\\capicom.dll"
+ "TargetName" = "8:capicom.dll"
+ "Tag" = "8:"
+ "Folder" = "8:_0F19EBDEE77C42FD9994F1B7AA01C76D"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
+ "ReadOnly" = "11:FALSE"
+ "Hidden" = "11:FALSE"
+ "System" = "11:FALSE"
+ "Permanent" = "11:FALSE"
+ "SharedLegacy" = "11:FALSE"
+ "PackageAs" = "3:1"
+ "Register" = "3:4"
+ "Exclude" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "IsolateTo" = "8:"
+ }
+ }
+ "FileType"
+ {
+ }
+ "Folder"
+ {
+ "{58C0ADA3-3CEA-43BD-A3B3-2EA121BC8217}:_0F19EBDEE77C42FD9994F1B7AA01C76D"
+ {
+ "DefaultLocation" = "8:[ProgramFilesFolder][Manufacturer]\\[ProductName]"
+ "Name" = "8:#1925"
+ "AlwaysCreate" = "11:FALSE"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Property" = "8:TARGETDIR"
+ "Folders"
+ {
+ }
+ }
+ "{78BAF5CE-F2E5-45BE-83BC-DB6AF387E941}:_6924DF7BFB6F4F689AC28F2519B5E889"
+ {
+ "Name" = "8:#1916"
+ "AlwaysCreate" = "11:FALSE"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Property" = "8:DesktopFolder"
+ "Folders"
+ {
+ }
+ }
+ "{78BAF5CE-F2E5-45BE-83BC-DB6AF387E941}:_FACF431EF97443819BA7AEACAFB702CE"
+ {
+ "Name" = "8:#1919"
+ "AlwaysCreate" = "11:FALSE"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Property" = "8:ProgramMenuFolder"
+ "Folders"
+ {
+ }
+ }
+ }
+ "LaunchCondition"
+ {
+ }
+ "Locator"
+ {
+ }
+ "MsiBootstrapper"
+ {
+ "LangId" = "3:1033"
+ }
+ "Product"
+ {
+ "Name" = "8:Microsoft Visual Studio"
+ "ProductName" = "8:Sequence Chart Studio Dependencies"
+ "ProductCode" = "8:{80DD7792-221E-4BA9-A8BC-CAE8FCDB37E8}"
+ "PackageCode" = "8:{2EBE7445-FDDC-4AC5-84B0-5DF7FFA58F2B}"
+ "UpgradeCode" = "8:{F342D056-58E1-46A7-BFEA-F4329E203339}"
+ "RestartWWWService" = "11:FALSE"
+ "RemovePreviousVersions" = "11:FALSE"
+ "DetectNewerInstalledVersion" = "11:TRUE"
+ "ProductVersion" = "8:1.0.0"
+ "Manufacturer" = "8:Brno"
+ "ARPHELPTELEPHONE" = "8:"
+ "ARPHELPLINK" = "8:http://scstudio.sourceforge.net"
+ "Title" = "8:Sequence Chart Studio Dependencies"
+ "Subject" = "8:"
+ "ARPCONTACT" = "8:Petr Gotthard"
+ "Keywords" = "8:"
+ "ARPCOMMENTS" = "8:"
+ "ARPURLINFOABOUT" = "8:"
+ "ARPPRODUCTICON" = "8:"
+ "ARPIconIndex" = "3:0"
+ "SearchPath" = "8:"
+ "UseSystemSearchPath" = "11:TRUE"
+ }
+ "Registry"
+ {
+ "HKLM"
+ {
+ "Keys"
+ {
+ }
+ }
+ "HKCU"
+ {
+ "Keys"
+ {
+ }
+ }
+ "HKCR"
+ {
+ "Keys"
+ {
+ }
+ }
+ "HKU"
+ {
+ "Keys"
+ {
+ }
+ }
+ "HKPU"
+ {
+ "Keys"
+ {
+ }
+ }
+ }
+ "Sequences"
+ {
+ }
+ "Shortcut"
+ {
+ }
+ "UserInterface"
+ {
+ "{8D9DEE8B-DD8B-4F48-9072-C4364E4F4011}:_0452C877B9F84CE487BED6B41580CC41"
+ {
+ "Name" = "8:#1902"
+ "Sequence" = "3:1"
+ "Attributes" = "3:3"
+ "Dialogs"
+ {
+ "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_E72A972D3D0247EE9EB3F2C1185DE98B"
+ {
+ "Sequence" = "3:100"
+ "DisplayName" = "8:Finished"
+ "UseDynamicProperties" = "11:TRUE"
+ "IsDependency" = "11:FALSE"
+ "SourcePath" = "8:<VsdDialogDir>\\VsdFinishedDlg.wid"
+ "Properties"
+ {
+ "BannerBitmap"
+ {
+ "Name" = "8:BannerBitmap"
+ "DisplayName" = "8:#1001"
+ "Description" = "8:#1101"
+ "Type" = "3:8"
+ "ContextData" = "8:Bitmap"
+ "Attributes" = "3:4"
+ "Setting" = "3:1"
+ "UsePlugInResources" = "11:TRUE"
+ }
+ "UpdateText"
+ {
+ "Name" = "8:UpdateText"
+ "DisplayName" = "8:#1058"
+ "Description" = "8:#1158"
+ "Type" = "3:15"
+ "ContextData" = "8:"
+ "Attributes" = "3:0"
+ "Setting" = "3:1"
+ "Value" = "8:#1258"
+ "DefaultValue" = "8:#1258"
+ "UsePlugInResources" = "11:TRUE"
+ }
+ }
+ }
+ }
+ }
+ "{8D9DEE8B-DD8B-4F48-9072-C4364E4F4011}:_07E486B5199E4D1FB476100ECB0592EE"
+ {
+ "Name" = "8:#1901"
+ "Sequence" = "3:2"
+ "Attributes" = "3:2"
+ "Dialogs"
+ {
+ "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_F3394C44E09247F2AD8605A0E2A813EA"
+ {
+ "Sequence" = "3:100"
+ "DisplayName" = "8:Progress"
+ "UseDynamicProperties" = "11:TRUE"
+ "IsDependency" = "11:FALSE"
+ "SourcePath" = "8:<VsdDialogDir>\\VsdAdminProgressDlg.wid"
+ "Properties"
+ {
+ "BannerBitmap"
+ {
+ "Name" = "8:BannerBitmap"
+ "DisplayName" = "8:#1001"
+ "Description" = "8:#1101"
+ "Type" = "3:8"
+ "ContextData" = "8:Bitmap"
+ "Attributes" = "3:4"
+ "Setting" = "3:1"
+ "UsePlugInResources" = "11:TRUE"
+ }
+ "ShowProgress"
+ {
+ "Name" = "8:ShowProgress"
+ "DisplayName" = "8:#1009"
+ "Description" = "8:#1109"
+ "Type" = "3:5"
+ "ContextData" = "8:1;True=1;False=0"
+ "Attributes" = "3:0"
+ "Setting" = "3:0"
+ "Value" = "3:1"
+ "DefaultValue" = "3:1"
+ "UsePlugInResources" = "11:TRUE"
+ }
+ }
+ }
+ }
+ }
+ "{8D9DEE8B-DD8B-4F48-9072-C4364E4F4011}:_306A86054EA846A292989E1AEE3B4081"
+ {
+ "Name" = "8:#1901"
+ "Sequence" = "3:1"
+ "Attributes" = "3:2"
+ "Dialogs"
+ {
+ "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_9063B8046935487D92F2E995ABA151B2"
+ {
+ "Sequence" = "3:100"
+ "DisplayName" = "8:Progress"
+ "UseDynamicProperties" = "11:TRUE"
+ "IsDependency" = "11:FALSE"
+ "SourcePath" = "8:<VsdDialogDir>\\VsdProgressDlg.wid"
+ "Properties"
+ {
+ "BannerBitmap"
+ {
+ "Name" = "8:BannerBitmap"
+ "DisplayName" = "8:#1001"
+ "Description" = "8:#1101"
+ "Type" = "3:8"
+ "ContextData" = "8:Bitmap"
+ "Attributes" = "3:4"
+ "Setting" = "3:1"
+ "UsePlugInResources" = "11:TRUE"
+ }
+ "ShowProgress"
+ {
+ "Name" = "8:ShowProgress"
+ "DisplayName" = "8:#1009"
+ "Description" = "8:#1109"
+ "Type" = "3:5"
+ "ContextData" = "8:1;True=1;False=0"
+ "Attributes" = "3:0"
+ "Setting" = "3:0"
+ "Value" = "3:1"
+ "DefaultValue" = "3:1"
+ "UsePlugInResources" = "11:TRUE"
+ }
+ }
+ }
+ }
+ }
+ "{B654A020-6903-4E6A-A86C-75DC463DB54B}:_49F1CFEC3D7C43959F8B2D7D7550B238"
+ {
+ "UseDynamicProperties" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "SourcePath" = "8:<VsdDialogDir>\\VsdUserInterface.wim"
+ }
+ "{8D9DEE8B-DD8B-4F48-9072-C4364E4F4011}:_5717214767004A378EC7B3D1953F8C59"
+ {
+ "Name" = "8:#1902"
+ "Sequence" = "3:2"
+ "Attributes" = "3:3"
+ "Dialogs"
+ {
+ "{18ADD6EC-89FE-4ED7-AD3E-211C40278470}:_F38D32C09FB94FA4A8DDB233024B6CE1"
+ {
+ "Sequence" = "3:100"
+ "DisplayName" = "8:Finished"
+ "UseDynamicProperties" = "11:TRUE"
+ "IsDependency" = "11:FALSE"
+ "SourcePath" = "8:<VsdDialogDir>\\VsdAdminFinishedDlg.wid"
+ "Properties"
+ {
+ "BannerBitmap"
+ {
+ "Name" = "8:BannerBitmap"
+ "DisplayName" = "8:#1001"
+ "Description" = "8:#1101"
+ "Type" = "3:8"
+ "ContextData" = "8:Bitmap"
+ "Attributes" = "3:4"
+ "Setting" = "3:1"
+ "UsePlugInResources" = "11:TRUE"
+ }
+ }
+ }
+ }
+ }
+ "{B654A020-6903-4E6A-A86C-75DC463DB54B}:_9D1F298E64A94DEF868DF3B828563063"
+ {
+ "UseDynamicProperties" = "11:FALSE"
+ "IsDependency" = "11:FALSE"
+ "SourcePath" = "8:<VsdDialogDir>\\VsdBasicDialogs.wim"
+ }
+ "{8D9DEE8B-DD8B-4F48-9072-C4364E4F4011}:_A3D820BA2FFF4999BD02483C03FCD0E3"
+ {
+ "Name" = "8:#1900"
+ "Sequence" = "3:1"
+ "Attributes" = "3:1"
+ "Dialogs"
+ {
+ }
+ }
+ "{8D9DEE8B-DD8B-4F48-9072-C4364E4F4011}:_C35B2E4719314A75AEABA452DDF96EFE"
+ {
+ "Name" = "8:#1900"
+ "Sequence" = "3:2"
+ "Attributes" = "3:1"
+ "Dialogs"
+ {
+ }
+ }
+ }
+ "MergeModule"
+ {
+ "{35A69C6E-5BA4-440D-803D-762B59A45393}:_14ADFA46A8A34AB6B54A5172F717F93B"
+ {
+ "UseDynamicProperties" = "11:TRUE"
+ "IsDependency" = "11:FALSE"
+ "SourcePath" = "8:C:\\Program Files\\Common Files\\Merge Modules\\VC_User_CRT71_RTL_X86_---.msm"
+ "Properties"
+ {
+ "DIR_RETARGET_TARGETDIR"
+ {
+ "Name" = "8:DIR_RETARGET_TARGETDIR"
+ "DisplayName" = "8:Module Retargetable Folder"
+ "Description" = "8:"
+ "Type" = "3:10"
+ "ContextData" = "8:IsolationDir"
+ "Attributes" = "3:6"
+ "Setting" = "3:1"
+ "UsePlugInResources" = "11:FALSE"
+ }
+ }
+ "LanguageId" = "3:0"
+ "Exclude" = "11:FALSE"
+ "Folder" = "8:"
+ "Feature" = "8:"
+ "IsolateTo" = "8:"
+ }
+ "{35A69C6E-5BA4-440D-803D-762B59A45393}:_275E2AB3228448F89CBF3925DA268F1B"
+ {
+ "UseDynamicProperties" = "11:TRUE"
+ "IsDependency" = "11:FALSE"
+ "SourcePath" = "8:C:\\Program Files\\Common Files\\Merge Modules\\VC_User_STL71_RTL_X86_---.msm"
+ "Properties"
+ {
+ "DIR_RETARGET_TARGETDIR"
+ {
+ "Name" = "8:DIR_RETARGET_TARGETDIR"
+ "DisplayName" = "8:Module Retargetable Folder"
+ "Description" = "8:"
+ "Type" = "3:10"
+ "ContextData" = "8:IsolationDir"
+ "Attributes" = "3:6"
+ "Setting" = "3:1"
+ "UsePlugInResources" = "11:FALSE"
+ }
+ }
+ "LanguageId" = "3:0"
+ "Exclude" = "11:FALSE"
+ "Folder" = "8:"
+ "Feature" = "8:"
+ "IsolateTo" = "8:"
+ }
+ "{35A69C6E-5BA4-440D-803D-762B59A45393}:_D8D8C2294754492EAB948C9538972C05"
+ {
+ "UseDynamicProperties" = "11:TRUE"
+ "IsDependency" = "11:FALSE"
+ "SourcePath" = "8:C:\\Program Files\\Common Files\\Merge Modules\\VC_User_ATL71_RTL_X86_---.msm"
+ "Properties"
+ {
+ "DIR_RETARGET_TARGETDIR"
+ {
+ "Name" = "8:DIR_RETARGET_TARGETDIR"
+ "DisplayName" = "8:Module Retargetable Folder"
+ "Description" = "8:"
+ "Type" = "3:10"
+ "ContextData" = "8:IsolationDir"
+ "Attributes" = "3:6"
+ "Setting" = "3:1"
+ "UsePlugInResources" = "11:FALSE"
+ }
+ }
+ "LanguageId" = "3:0"
+ "Exclude" = "11:FALSE"
+ "Folder" = "8:"
+ "Feature" = "8:"
+ "IsolateTo" = "8:"
+ }
+ }
+ "ProjectOutput"
+ {
+ }
+ "VJSharpPlugin"
+ {
+ }
+ }
+}
Property changes on: trunk/src/view/visio/setup-dependencies/setup-dependencies.vdproj
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/src/view/visio/setup-nsis
___________________________________________________________________
Added: svn:ignore
+ Debug
Release
api.h
pluginapi.*
*.cer
Added: trunk/src/view/visio/setup-nsis/certificates.cpp
===================================================================
--- trunk/src/view/visio/setup-nsis/certificates.cpp (rev 0)
+++ trunk/src/view/visio/setup-nsis/certificates.cpp 2009-02-27 22:21:01 UTC (rev 196)
@@ -0,0 +1,93 @@
+/*
+ * scstudio - Sequence Chart Studio
+ * http://scstudio.sourceforge.net
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * Copyright (c) 2009 Petr Gotthard <pet...@ce...>
+ *
+ * $Id$
+ */
+
+#include <stdafx.h>
+#include <tchar.h>
+#include <atlbase.h>
+#include <windows.h>
+
+// include NSIS plug-in headers and library
+// http://nsis.sourceforge.net/Examples/Plugin
+#include "pluginapi.h"
+
+#pragma warning (disable : 4192)
+
+// include Microsoft CAPICOM 2.0
+// http://go.microsoft.com/fwlink/?linkid=84567
+#import "capicom.dll"
+
+extern "C" __declspec(dllexport)
+void __cdecl InstallPublisherCertificate(HWND hwndParent,
+ int string_size, char *variables, stack_t **stacktop)
+{
+ HRESULT hr = S_OK;
+ TCHAR filename[MAX_PATH+1];
+
+ EXDLL_INIT();
+ popstringn(filename, MAX_PATH);
+
+ try
+ {
+ // load certificate
+ CAPICOM::ICertificate2Ptr pICertificate(__uuidof(CAPICOM::Certificate));
+ hr = pICertificate->Load(filename, _T(""),
+ CAPICOM::CAPICOM_KEY_STORAGE_DEFAULT, CAPICOM::CAPICOM_CURRENT_USER_KEY);
+
+ CAPICOM::IStorePtr pIRootStore(__uuidof(CAPICOM::Store));
+ // open a store for root certificates
+ if (FAILED(hr = pIRootStore->Open(
+ CAPICOM::CAPICOM_CURRENT_USER_STORE, _T("ROOT"),
+ CAPICOM::CAPICOM_STORE_OPEN_READ_WRITE)))
+ {
+ ATLTRACE(_T("Error [%#x]: pIStore->Open() failed at line %d.\n"), hr, __LINE__);
+ throw hr;
+ }
+
+ hr = pIRootStore->Add(pICertificate);
+
+ CAPICOM::IStorePtr pITrustedPublisherStore(__uuidof(CAPICOM::Store));
+ // open a certificate store for trusted publishers
+ if (FAILED(hr = pITrustedPublisherStore->Open(
+ CAPICOM::CAPICOM_CURRENT_USER_STORE, _T("TrustedPublisher"),
+ CAPICOM::CAPICOM_STORE_OPEN_READ_WRITE)))
+ {
+ ATLTRACE(_T("Error [%#x]: pIStore->Open() failed at line %d.\n"), hr, __LINE__);
+ throw hr;
+ }
+
+ hr = pITrustedPublisherStore->Add(pICertificate);
+ }
+ catch (_com_error e)
+ {
+ hr = e.Error();
+ ATLTRACE(_T("Error [%#x]: %s.\n"), hr, e.ErrorMessage());
+ }
+ catch (HRESULT hr)
+ {
+ ATLTRACE(_T("Error [%#x]: CAPICOM error.\n"), hr);
+ }
+ catch(...)
+ {
+ hr = CAPICOM::CAPICOM_E_UNKNOWN;
+ ATLTRACE(_T("Unknown error.\n"));
+ }
+
+ pushint(hr);
+}
+
+// $Id$
Property changes on: trunk/src/view/visio/setup-nsis/certificates.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Added: trunk/src/view/visio/setup-nsis/setup-nsis.vcproj
===================================================================
--- trunk/src/view/visio/setup-nsis/setup-nsis.vcproj (rev 0)
+++ trunk/src/view/visio/setup-nsis/setup-nsis.vcproj 2009-02-27 22:21:01 UTC (rev 196)
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="windows-1250"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="7.10"
+ Name="setup-nsis"
+ ProjectGUID="{77848F6B-EA64-4917-8E72-21FA1DD2B2F6}"
+ Keyword="Win32Proj">
+ <Platforms>
+ <Platform
+ Name="Win32"/>
+ </Platforms>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="Debug"
+ IntermediateDirectory="Debug"
+ ConfigurationType="2"
+ CharacterSet="0">
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="C:\Program Files\Microsoft Platform SDK for Windows XP SP2\Bin"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ MinimalRebuild="TRUE"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="5"
+ UsePrecompiledHeader="3"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="4"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="pluginapi.lib"
+ OutputFile="$(OutDir)/nsis.dll"
+ LinkIncremental="2"
+ GenerateDebugInformation="TRUE"
+ ProgramDatabaseFile="$(OutDir)/nsis.pdb"
+ SubSystem="1"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="Release"
+ IntermediateDirectory="Release"
+ ConfigurationType="2"
+ CharacterSet="0">
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="C:\Program Files\Microsoft Platform SDK for Windows XP SP2\Bin"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ RuntimeLibrary="4"
+ UsePrecompiledHeader="3"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="TRUE"
+ DebugInformationFormat="3"/>
+ <Tool
+ Name="VCCustomBuildTool"/>
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="pluginapi.lib"
+ OutputFile="$(OutDir)/nsis.dll"
+ LinkIncremental="1"
+ GenerateDebugInformation="TRUE"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCWebDeploymentTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+ <File
+ RelativePath=".\certificates.cpp">
+ </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}">
+ <File
+ 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}">
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Property changes on: trunk/src/view/visio/setup-nsis/setup-nsis.vcproj
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/src/view/visio/setup-nsis/stdafx.cpp
===================================================================
--- trunk/src/view/visio/setup-nsis/stdafx.cpp (rev 0)
+++ trunk/src/view/visio/setup-nsis/stdafx.cpp 2009-02-27 22:21:01 UTC (rev 196)
@@ -0,0 +1,8 @@
+// stdafx.cpp : source file that includes just the standard includes
+// nsis.pch will be the pre-compiled header
+// stdafx.obj will contain the pre-compiled type information
+
+#include "stdafx.h"
+
+// TODO: reference any additional headers you need in STDAFX.H
+// and not in this file
Property changes on: trunk/src/view/visio/setup-nsis/stdafx.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Added: trunk/src/view/visio/setup-nsis/stdafx.h
===================================================================
--- trunk/src/view/visio/setup-nsis/stdafx.h (rev 0)
+++ trunk/src/view/visio/setup-nsis/stdafx.h 2009-02-27 22:21:01 UTC (rev 196)
@@ -0,0 +1,7 @@
+// stdafx.h : include file for standard system include files,
+// or project specific include files that are used frequently, but
+// are changed infrequently
+//
+
+#pragma once
+
Property changes on: trunk/src/view/visio/setup-nsis/stdafx.h
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|