From c49432f7d39dfe7fedc722b85cd1162bd5096ac1 Mon Sep 17 00:00:00 2001 From: Bevan Weiss Date: Fri, 3 Jan 2025 15:14:49 +1100 Subject: Migrate COM+ E2E tests from raw binaries to source code. Signed-off-by: Bevan Weiss --- .../Components/ComPlusComponents.sln | 79 ++++++ .../Components/TestComponentNET3.dll | Bin 16384 -> 0 bytes .../Components/TestComponentNET3/AssemblyInfo.cs | 57 ++++ .../TestComponentNET3/TestComponentNET3.cs | 30 +++ .../TestComponentNET3/TestComponentNET3.csproj | 97 +++++++ .../Components/TestComponentNET4.dll | Bin 16384 -> 0 bytes .../Components/TestComponentNET4/AssemblyInfo.cs | 57 ++++ .../TestComponentNET4/TestComponentNET4.cs | 30 +++ .../TestComponentNET4/TestComponentNET4.csproj | 97 +++++++ .../Components/TestComponentNative.dll | Bin 56832 -> 0 bytes .../Components/TestComponentNative/Message.cpp | 12 + .../Components/TestComponentNative/Message.h | 58 ++++ .../Components/TestComponentNative/Message.rgs | 16 ++ .../TestComponentNative/TestComponentNative.cpp | 74 ++++++ .../TestComponentNative/TestComponentNative.def | 10 + .../TestComponentNative/TestComponentNative.idl | 37 +++ .../TestComponentNative/TestComponentNative.rc | 144 ++++++++++ .../TestComponentNative/TestComponentNative.rgs | 3 + .../TestComponentNative.vcxproj | 291 +++++++++++++++++++++ .../TestComponentNative.vcxproj.filters | 82 ++++++ .../TestComponentNative/TestComponentNativeps.def | 8 + .../Components/TestComponentNative/dllmain.cpp | 16 ++ .../Components/TestComponentNative/dllmain.h | 10 + .../Components/TestComponentNative/framework.h | 21 ++ .../Components/TestComponentNative/pch.cpp | 5 + .../Components/TestComponentNative/pch.h | 13 + .../Components/TestComponentNative/resource.h | 18 ++ .../Components/TestComponentNative/targetver.h | 8 + .../InstallUninstallNET3WithoutPartitions.wixproj | 1 + .../product.wxs | 4 +- .../InstallUninstallNET4WithoutPartitions.wixproj | 1 + .../product.wxs | 4 +- ...InstallUninstallNativeWithoutPartitions.wixproj | 1 + .../product.wxs | 3 +- .../InstallUninstallWithPartitions.wixproj | 1 + .../InstallUninstallWithPartitions/product.wxs | 2 +- 36 files changed, 1283 insertions(+), 7 deletions(-) create mode 100644 src/test/msi/TestData/ComPlusExtensionTests/Components/ComPlusComponents.sln delete mode 100644 src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET3.dll create mode 100644 src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET3/AssemblyInfo.cs create mode 100644 src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET3/TestComponentNET3.cs create mode 100644 src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET3/TestComponentNET3.csproj delete mode 100644 src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET4.dll create mode 100644 src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET4/AssemblyInfo.cs create mode 100644 src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET4/TestComponentNET4.cs create mode 100644 src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET4/TestComponentNET4.csproj delete mode 100644 src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative.dll create mode 100644 src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/Message.cpp create mode 100644 src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/Message.h create mode 100644 src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/Message.rgs create mode 100644 src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNative.cpp create mode 100644 src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNative.def create mode 100644 src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNative.idl create mode 100644 src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNative.rc create mode 100644 src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNative.rgs create mode 100644 src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNative.vcxproj create mode 100644 src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNative.vcxproj.filters create mode 100644 src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNativeps.def create mode 100644 src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/dllmain.cpp create mode 100644 src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/dllmain.h create mode 100644 src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/framework.h create mode 100644 src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/pch.cpp create mode 100644 src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/pch.h create mode 100644 src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/resource.h create mode 100644 src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/targetver.h (limited to 'src/test') diff --git a/src/test/msi/TestData/ComPlusExtensionTests/Components/ComPlusComponents.sln b/src/test/msi/TestData/ComPlusExtensionTests/Components/ComPlusComponents.sln new file mode 100644 index 00000000..d25fea76 --- /dev/null +++ b/src/test/msi/TestData/ComPlusExtensionTests/Components/ComPlusComponents.sln @@ -0,0 +1,79 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.11.35111.106 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestComponentNET3", "TestComponentNET3\TestComponentNET3.csproj", "{B4CD7ECE-7245-445B-9F04-D2952631554D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestComponentNET4", "TestComponentNET4\TestComponentNET4.csproj", "{EA2AFCCE-677D-433E-8517-4CFBBD3EBFAA}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestComponentNative", "TestComponentNative\TestComponentNative.vcxproj", "{EB199FA2-F9F7-4A2F-A4D3-6689F8A18952}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestComponentNET8", "TestComponentNET8\TestComponentNET8.csproj", "{EC2F6BAE-9840-4CA0-8B83-F38F635CF246}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {B4CD7ECE-7245-445B-9F04-D2952631554D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B4CD7ECE-7245-445B-9F04-D2952631554D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B4CD7ECE-7245-445B-9F04-D2952631554D}.Debug|x64.ActiveCfg = Debug|Any CPU + {B4CD7ECE-7245-445B-9F04-D2952631554D}.Debug|x64.Build.0 = Debug|Any CPU + {B4CD7ECE-7245-445B-9F04-D2952631554D}.Debug|x86.ActiveCfg = Debug|Any CPU + {B4CD7ECE-7245-445B-9F04-D2952631554D}.Debug|x86.Build.0 = Debug|Any CPU + {B4CD7ECE-7245-445B-9F04-D2952631554D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B4CD7ECE-7245-445B-9F04-D2952631554D}.Release|Any CPU.Build.0 = Release|Any CPU + {B4CD7ECE-7245-445B-9F04-D2952631554D}.Release|x64.ActiveCfg = Release|Any CPU + {B4CD7ECE-7245-445B-9F04-D2952631554D}.Release|x64.Build.0 = Release|Any CPU + {B4CD7ECE-7245-445B-9F04-D2952631554D}.Release|x86.ActiveCfg = Release|Any CPU + {B4CD7ECE-7245-445B-9F04-D2952631554D}.Release|x86.Build.0 = Release|Any CPU + {EA2AFCCE-677D-433E-8517-4CFBBD3EBFAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EA2AFCCE-677D-433E-8517-4CFBBD3EBFAA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EA2AFCCE-677D-433E-8517-4CFBBD3EBFAA}.Debug|x64.ActiveCfg = Debug|Any CPU + {EA2AFCCE-677D-433E-8517-4CFBBD3EBFAA}.Debug|x64.Build.0 = Debug|Any CPU + {EA2AFCCE-677D-433E-8517-4CFBBD3EBFAA}.Debug|x86.ActiveCfg = Debug|Any CPU + {EA2AFCCE-677D-433E-8517-4CFBBD3EBFAA}.Debug|x86.Build.0 = Debug|Any CPU + {EA2AFCCE-677D-433E-8517-4CFBBD3EBFAA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EA2AFCCE-677D-433E-8517-4CFBBD3EBFAA}.Release|Any CPU.Build.0 = Release|Any CPU + {EA2AFCCE-677D-433E-8517-4CFBBD3EBFAA}.Release|x64.ActiveCfg = Release|Any CPU + {EA2AFCCE-677D-433E-8517-4CFBBD3EBFAA}.Release|x64.Build.0 = Release|Any CPU + {EA2AFCCE-677D-433E-8517-4CFBBD3EBFAA}.Release|x86.ActiveCfg = Release|Any CPU + {EA2AFCCE-677D-433E-8517-4CFBBD3EBFAA}.Release|x86.Build.0 = Release|Any CPU + {EB199FA2-F9F7-4A2F-A4D3-6689F8A18952}.Debug|Any CPU.ActiveCfg = Debug|x64 + {EB199FA2-F9F7-4A2F-A4D3-6689F8A18952}.Debug|Any CPU.Build.0 = Debug|x64 + {EB199FA2-F9F7-4A2F-A4D3-6689F8A18952}.Debug|x64.ActiveCfg = Debug|x64 + {EB199FA2-F9F7-4A2F-A4D3-6689F8A18952}.Debug|x64.Build.0 = Debug|x64 + {EB199FA2-F9F7-4A2F-A4D3-6689F8A18952}.Debug|x86.ActiveCfg = Debug|Win32 + {EB199FA2-F9F7-4A2F-A4D3-6689F8A18952}.Debug|x86.Build.0 = Debug|Win32 + {EB199FA2-F9F7-4A2F-A4D3-6689F8A18952}.Release|Any CPU.ActiveCfg = Release|x64 + {EB199FA2-F9F7-4A2F-A4D3-6689F8A18952}.Release|Any CPU.Build.0 = Release|x64 + {EB199FA2-F9F7-4A2F-A4D3-6689F8A18952}.Release|x64.ActiveCfg = Release|x64 + {EB199FA2-F9F7-4A2F-A4D3-6689F8A18952}.Release|x64.Build.0 = Release|x64 + {EB199FA2-F9F7-4A2F-A4D3-6689F8A18952}.Release|x86.ActiveCfg = Release|Win32 + {EB199FA2-F9F7-4A2F-A4D3-6689F8A18952}.Release|x86.Build.0 = Release|Win32 + {EC2F6BAE-9840-4CA0-8B83-F38F635CF246}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EC2F6BAE-9840-4CA0-8B83-F38F635CF246}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EC2F6BAE-9840-4CA0-8B83-F38F635CF246}.Debug|x64.ActiveCfg = Debug|Any CPU + {EC2F6BAE-9840-4CA0-8B83-F38F635CF246}.Debug|x64.Build.0 = Debug|Any CPU + {EC2F6BAE-9840-4CA0-8B83-F38F635CF246}.Debug|x86.ActiveCfg = Debug|Any CPU + {EC2F6BAE-9840-4CA0-8B83-F38F635CF246}.Debug|x86.Build.0 = Debug|Any CPU + {EC2F6BAE-9840-4CA0-8B83-F38F635CF246}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EC2F6BAE-9840-4CA0-8B83-F38F635CF246}.Release|Any CPU.Build.0 = Release|Any CPU + {EC2F6BAE-9840-4CA0-8B83-F38F635CF246}.Release|x64.ActiveCfg = Release|Any CPU + {EC2F6BAE-9840-4CA0-8B83-F38F635CF246}.Release|x64.Build.0 = Release|Any CPU + {EC2F6BAE-9840-4CA0-8B83-F38F635CF246}.Release|x86.ActiveCfg = Release|Any CPU + {EC2F6BAE-9840-4CA0-8B83-F38F635CF246}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {4C27BD28-1E2C-4414-8290-3C5C042DF148} + EndGlobalSection +EndGlobal diff --git a/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET3.dll b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET3.dll deleted file mode 100644 index b46be649..00000000 Binary files a/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET3.dll and /dev/null differ diff --git a/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET3/AssemblyInfo.cs b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET3/AssemblyInfo.cs new file mode 100644 index 00000000..83e802dd --- /dev/null +++ b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET3/AssemblyInfo.cs @@ -0,0 +1,57 @@ +using System.Reflection; + +// +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +// +[assembly: AssemblyTitle("")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("")] +[assembly: AssemblyCopyright("")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Revision and Build Numbers +// by using the '*' as shown below: + +[assembly: AssemblyVersion("1.0.*")] + +// +// In order to sign your assembly you must specify a key to use. Refer to the +// Microsoft .NET Framework documentation for more information on assembly signing. +// +// Use the attributes below to control which key is used for signing. +// +// Notes: +// (*) If no key is specified, the assembly is not signed. +// (*) KeyName refers to a key that has been installed in the Crypto Service +// Provider (CSP) on your machine. KeyFile refers to a file which contains +// a key. +// (*) If the KeyFile and the KeyName values are both specified, the +// following processing occurs: +// (1) If the KeyName can be found in the CSP, that key is used. +// (2) If the KeyName does not exist and the KeyFile does exist, the key +// in the KeyFile is installed into the CSP and used. +// (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility. +// When specifying the KeyFile, the location of the KeyFile should be +// relative to the project output directory which is +// %Project Directory%\obj\. For example, if your KeyFile is +// located in the project directory, you would specify the AssemblyKeyFile +// attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")] +// (*) Delay Signing is an advanced option - see the Microsoft .NET Framework +// documentation for more information on this. +// +[assembly: AssemblyDelaySign(false)] +//[assembly: AssemblyKeyFile("..\\..\\..\\Signing.sn")] +[assembly: AssemblyKeyName("")] diff --git a/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET3/TestComponentNET3.cs b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET3/TestComponentNET3.cs new file mode 100644 index 00000000..9922d637 --- /dev/null +++ b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET3/TestComponentNET3.cs @@ -0,0 +1,30 @@ +using System; +using System.EnterpriseServices; +using System.Runtime.InteropServices; + +[assembly: ApplicationActivation(ActivationOption.Library)] +namespace TestApplication +{ + /// + /// TestComponent + /// + [ComVisible(true)] + [Transaction(TransactionOption.Required)] + [ObjectPooling(true, 5, 10)] + [Guid("17F82C39-5433-493A-A396-36072C645B80")] + public class TestComponent3 : ServicedComponent + { + public TestComponent3() + { + // + // TODO: Add constructor logic here + // + } + + [AutoComplete(true)] + public void TestMethod(string Name, string Address, int JobType, bool MakeFail) + { + + } + } +} diff --git a/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET3/TestComponentNET3.csproj b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET3/TestComponentNET3.csproj new file mode 100644 index 00000000..b0c4aff9 --- /dev/null +++ b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET3/TestComponentNET3.csproj @@ -0,0 +1,97 @@ + + + + Local + 7.0.9466 + 1.0 + {B4CD7ECE-7245-445B-9F04-D2952631554D} + Debug + AnyCPU + false + + + TestComponentNET3 + + JScript + Grid + IE50 + false + Library + TestApplication + + + + + + 0.0 + v3.5 + + + + bin\Debug\ + false + 285212672 + false + + DEBUG;TRACE + + true + 4096 + false + false + false + false + 4 + full + prompt + false + AnyCPU + + + bin\Release\ + false + 285212672 + false + + TRACE + + false + 4096 + true + false + false + false + 4 + none + prompt + false + + + + System + + + System.Data + + + System.EnterpriseServices + + + System.XML + + + + + Code + + + Code + + + + + + call "$(DevEnvDir)..\Tools\VsDevCmd.bat" +tlbexp.exe $(TargetDir)$(TargetFileName) + + \ No newline at end of file diff --git a/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET4.dll b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET4.dll deleted file mode 100644 index e0fd3dee..00000000 Binary files a/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET4.dll and /dev/null differ diff --git a/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET4/AssemblyInfo.cs b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET4/AssemblyInfo.cs new file mode 100644 index 00000000..83e802dd --- /dev/null +++ b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET4/AssemblyInfo.cs @@ -0,0 +1,57 @@ +using System.Reflection; + +// +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +// +[assembly: AssemblyTitle("")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("")] +[assembly: AssemblyCopyright("")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Revision and Build Numbers +// by using the '*' as shown below: + +[assembly: AssemblyVersion("1.0.*")] + +// +// In order to sign your assembly you must specify a key to use. Refer to the +// Microsoft .NET Framework documentation for more information on assembly signing. +// +// Use the attributes below to control which key is used for signing. +// +// Notes: +// (*) If no key is specified, the assembly is not signed. +// (*) KeyName refers to a key that has been installed in the Crypto Service +// Provider (CSP) on your machine. KeyFile refers to a file which contains +// a key. +// (*) If the KeyFile and the KeyName values are both specified, the +// following processing occurs: +// (1) If the KeyName can be found in the CSP, that key is used. +// (2) If the KeyName does not exist and the KeyFile does exist, the key +// in the KeyFile is installed into the CSP and used. +// (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility. +// When specifying the KeyFile, the location of the KeyFile should be +// relative to the project output directory which is +// %Project Directory%\obj\. For example, if your KeyFile is +// located in the project directory, you would specify the AssemblyKeyFile +// attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")] +// (*) Delay Signing is an advanced option - see the Microsoft .NET Framework +// documentation for more information on this. +// +[assembly: AssemblyDelaySign(false)] +//[assembly: AssemblyKeyFile("..\\..\\..\\Signing.sn")] +[assembly: AssemblyKeyName("")] diff --git a/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET4/TestComponentNET4.cs b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET4/TestComponentNET4.cs new file mode 100644 index 00000000..7aabd169 --- /dev/null +++ b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET4/TestComponentNET4.cs @@ -0,0 +1,30 @@ +using System; +using System.EnterpriseServices; +using System.Runtime.InteropServices; + +[assembly: ApplicationActivation(ActivationOption.Library)] +namespace TestApplication +{ + /// + /// TestComponent + /// + [ComVisible(true)] + [Transaction(TransactionOption.Required)] + [ObjectPooling(true, 5, 10)] + [Guid("146AB3A2-4472-4DB9-94D5-311536E799BD")] + public class TestComponent4 : ServicedComponent + { + public TestComponent4() + { + // + // TODO: Add constructor logic here + // + } + + [AutoComplete(true)] + public void TestMethod(string Name, string Address, int JobType, bool MakeFail) + { + + } + } +} diff --git a/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET4/TestComponentNET4.csproj b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET4/TestComponentNET4.csproj new file mode 100644 index 00000000..60785894 --- /dev/null +++ b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNET4/TestComponentNET4.csproj @@ -0,0 +1,97 @@ + + + + Local + 7.0.9466 + 1.0 + {EA2AFCCE-677D-433E-8517-4CFBBD3EBFAA} + Debug + AnyCPU + false + + + TestComponentNET4 + + JScript + Grid + IE50 + false + Library + TestApplication + + + + + + 0.0 + v4.5.2 + + + + bin\Debug\ + false + 285212672 + false + + DEBUG;TRACE + + true + 4096 + false + false + false + false + 4 + full + prompt + false + AnyCPU + + + bin\Release\ + false + 285212672 + false + + TRACE + + false + 4096 + true + false + false + false + 4 + none + prompt + false + + + + System + + + System.Data + + + System.EnterpriseServices + + + System.XML + + + + + Code + + + Code + + + + + + call "$(DevEnvDir)..\Tools\VsDevCmd.bat" +tlbexp.exe $(TargetDir)$(TargetFileName) + + \ No newline at end of file diff --git a/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative.dll b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative.dll deleted file mode 100644 index dbcb5807..00000000 Binary files a/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative.dll and /dev/null differ diff --git a/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/Message.cpp b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/Message.cpp new file mode 100644 index 00000000..0b48727d --- /dev/null +++ b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/Message.cpp @@ -0,0 +1,12 @@ +// Message.cpp : Implementation of CMessage + +#include "pch.h" +#include "Message.h" + + +// CMessage + +HRESULT STDMETHODCALLTYPE CMessage::SayHello(void) +{ + return S_OK; +}; \ No newline at end of file diff --git a/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/Message.h b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/Message.h new file mode 100644 index 00000000..2fbd47d4 --- /dev/null +++ b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/Message.h @@ -0,0 +1,58 @@ +// Message.h : Declaration of the CMessage + +#pragma once +#include "resource.h" // main symbols + + + +#include "TestComponentNative_i.h" + + + +#if defined(_WIN32_WCE) && !defined(_CE_DCOM) && !defined(_CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA) +#error "Single-threaded COM objects are not properly supported on Windows CE platform, such as the Windows Mobile platforms that do not include full DCOM support. Define _CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA to force ATL to support creating single-thread COM object's and allow use of it's single-threaded COM object implementations. The threading model in your rgs file was set to 'Free' as that is the only threading model supported in non DCOM Windows CE platforms." +#endif + +using namespace ATL; + + +// CMessage + +class ATL_NO_VTABLE CMessage : + public CComObjectRootEx, + public CComCoClass, + public IDispatchImpl +{ +public: + CMessage() + { + } + HRESULT STDMETHODCALLTYPE CMessage::SayHello(void); +DECLARE_REGISTRY_RESOURCEID(106) + + +BEGIN_COM_MAP(CMessage) + COM_INTERFACE_ENTRY(IMessage) + COM_INTERFACE_ENTRY(IDispatch) +END_COM_MAP() + + + + DECLARE_PROTECT_FINAL_CONSTRUCT() + + HRESULT FinalConstruct() + { + return S_OK; + } + + void FinalRelease() + { + } + +public: + + + +}; + +OBJECT_ENTRY_AUTO(__uuidof(Message), CMessage) diff --git a/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/Message.rgs b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/Message.rgs new file mode 100644 index 00000000..94a89f1f --- /dev/null +++ b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/Message.rgs @@ -0,0 +1,16 @@ +HKCR +{ + NoRemove CLSID + { + ForceRemove {8b4c3a90-762c-465b-abc5-81cb3cc5e464} = s 'Message class' + { + ForceRemove Programmable + InprocServer32 = s '%MODULE%' + { + val ThreadingModel = s 'Apartment' + } + TypeLib = s '{8aaadab2-ac31-4618-ad2b-6b71d2a318eb}' + Version = s '1.0' + } + } +} diff --git a/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNative.cpp b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNative.cpp new file mode 100644 index 00000000..1a9fcb32 --- /dev/null +++ b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNative.cpp @@ -0,0 +1,74 @@ +// TestComponentNative.cpp : Implementation of DLL Exports. + + +#include "pch.h" +#include "framework.h" +#include "resource.h" +#include "TestComponentNative_i.h" +#include "dllmain.h" + + +using namespace ATL; + +// Used to determine whether the DLL can be unloaded by OLE. +_Use_decl_annotations_ +STDAPI DllCanUnloadNow(void) +{ + return _AtlModule.DllCanUnloadNow(); +} + +// Returns a class factory to create an object of the requested type. +_Use_decl_annotations_ +STDAPI DllGetClassObject(_In_ REFCLSID rclsid, _In_ REFIID riid, _Outptr_ LPVOID* ppv) +{ + return _AtlModule.DllGetClassObject(rclsid, riid, ppv); +} + +// DllRegisterServer - Adds entries to the system registry. +_Use_decl_annotations_ +STDAPI DllRegisterServer(void) +{ + // registers object, typelib and all interfaces in typelib + HRESULT hr = _AtlModule.DllRegisterServer(); + return hr; +} + +// DllUnregisterServer - Removes entries from the system registry. +_Use_decl_annotations_ +STDAPI DllUnregisterServer(void) +{ + HRESULT hr = _AtlModule.DllUnregisterServer(); + return hr; +} + +// DllInstall - Adds/Removes entries to the system registry per user per machine. +STDAPI DllInstall(BOOL bInstall, _In_opt_ LPCWSTR pszCmdLine) +{ + HRESULT hr = E_FAIL; + static const wchar_t szUserSwitch[] = L"user"; + + if (pszCmdLine != nullptr) + { + if (_wcsnicmp(pszCmdLine, szUserSwitch, _countof(szUserSwitch)) == 0) + { + ATL::AtlSetPerUserRegistration(true); + } + } + + if (bInstall) + { + hr = DllRegisterServer(); + if (FAILED(hr)) + { + DllUnregisterServer(); + } + } + else + { + hr = DllUnregisterServer(); + } + + return hr; +} + + diff --git a/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNative.def b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNative.def new file mode 100644 index 00000000..1c707604 --- /dev/null +++ b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNative.def @@ -0,0 +1,10 @@ +; TestComponentNative.def : Declares the module parameters. + +LIBRARY + +EXPORTS + DllCanUnloadNow PRIVATE + DllGetClassObject PRIVATE + DllRegisterServer PRIVATE + DllUnregisterServer PRIVATE + DllInstall PRIVATE diff --git a/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNative.idl b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNative.idl new file mode 100644 index 00000000..12d77921 --- /dev/null +++ b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNative.idl @@ -0,0 +1,37 @@ +// TestComponentNative.idl : IDL source for TestComponentNative +// + +// This file will be processed by the MIDL tool to +// produce the type library (TestComponentNative.tlb) and marshalling code. + +import "oaidl.idl"; +import "ocidl.idl"; + +[ + object, + uuid(b734850b-d5c9-4903-bea3-4c46ee544ed8), + dual, + nonextensible, + pointer_default(unique) +] +interface IMessage : IDispatch +{ + [id(1), helpstring("hello")] HRESULT SayHello(); +}; +[ + uuid(8aaadab2-ac31-4618-ad2b-6b71d2a318eb), + version(1.0), +] +library TestComponentNativeLib +{ + importlib("stdole2.tlb"); + [ + uuid(8b4c3a90-762c-465b-abc5-81cb3cc5e464) + ] + coclass Message + { + [default] interface IMessage; + }; +}; + +import "shobjidl.idl"; diff --git a/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNative.rc b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNative.rc new file mode 100644 index 00000000..87f4785e --- /dev/null +++ b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNative.rc @@ -0,0 +1,144 @@ +// Microsoft Visual C++ generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#ifndef APSTUDIO_INVOKED +#include "targetver.h" +#endif +#include "winres.h" +#include "verrsrc.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (United States) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#ifndef APSTUDIO_INVOKED\r\n" + "#include ""targetver.h""\r\n" + "#endif\r\n" + "#include ""winres.h""\r\n" + "#include ""verrsrc.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "1 TYPELIB ""TestComponentNative.tlb""\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// +// REMOVED: This is provided by WiX build system overrides + +//VS_VERSION_INFO VERSIONINFO +// FILEVERSION 1,0,0,1 +// PRODUCTVERSION 1,0,0,1 +// FILEFLAGSMASK 0x3fL +//#ifdef _DEBUG +// FILEFLAGS 0x1L +//#else +// FILEFLAGS 0x0L +//#endif +// FILEOS 0x40004L +// FILETYPE 0x2L +// FILESUBTYPE 0x0L +//BEGIN +// BLOCK "StringFileInfo" +// BEGIN +// BLOCK "040904B0" +// BEGIN +// VALUE "CompanyName", "TODO: " +// VALUE "FileDescription", "TODO: " +// VALUE "FileVersion", "1.0.0.1" +// VALUE "LegalCopyright", "TODO: (c) . All rights reserved." +// VALUE "InternalName", "TestComponentNative.dll" +// VALUE "OriginalFilename", "TestComponentNative.dll" +// VALUE "ProductName", "TODO: " +// VALUE "ProductVersion", "1.0.0.1" +// END +// END +// BLOCK "VarFileInfo" +// BEGIN +// VALUE "Translation", 0x409, 1200 +// END +//END + + +///////////////////////////////////////////////////////////////////////////// +// +// REGISTRY +// + +IDR_TESTCOMPONENTNATIVE REGISTRY "TestComponentNative.rgs" + + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE +BEGIN + IDS_PROJNAME "TestComponentNative" +END + +#endif // English (United States) resources +///////////////////////////////////////////////////////////////////////////// + + +///////////////////////////////////////////////////////////////////////////// +// English (United Kingdom) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK + +///////////////////////////////////////////////////////////////////////////// +// +// REGISTRY +// + +IDR_MESSAGE REGISTRY "Message.rgs" + +#endif // English (United Kingdom) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// +1 TYPELIB "TestComponentNative.tlb" + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNative.rgs b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNative.rgs new file mode 100644 index 00000000..e7d37400 --- /dev/null +++ b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNative.rgs @@ -0,0 +1,3 @@ +HKCR +{ +} diff --git a/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNative.vcxproj b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNative.vcxproj new file mode 100644 index 00000000..d2e7b2b6 --- /dev/null +++ b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNative.vcxproj @@ -0,0 +1,291 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 17.0 + {EB199FA2-F9F7-4A2F-A4D3-6689F8A18952} + AtlProj + 10.0 + + + + DynamicLibrary + true + v143 + Unicode + + + DynamicLibrary + false + v143 + Unicode + + + DynamicLibrary + true + v143 + Unicode + + + DynamicLibrary + false + v143 + Unicode + + + + + + + + + + + + + + + + + + + + + true + true + $(ProjectDir)bin\$(Configuration)\ + $(ProjectDir)obj\$(Configuration)\ + + + true + true + $(ProjectDir)bin\$(Configuration)\ + $(ProjectDir)obj\$(Configuration)\ + + + true + false + $(ProjectDir)bin\$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + true + false + $(ProjectDir)bin\$(Platform)\$(Configuration)\ + $(ProjectDir)obj\$(Platform)\$(Configuration)\ + + + + Use + Level3 + Disabled + _WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + pch.h + true + false + + + false + _DEBUG;%(PreprocessorDefinitions) + TestComponentNative_i.h + TestComponentNative_i.c + TestComponentNative_p.c + true + $(IntDir)TestComponentNative.tlb + + true + + + 0x0409 + $(IntDir);%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + + + Windows + .\TestComponentNative.def + false + + + + + Use + Level3 + Disabled + WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions) + pch.h + true + false + + + false + Win32 + _DEBUG;%(PreprocessorDefinitions) + TestComponentNative_i.h + TestComponentNative_i.c + TestComponentNative_p.c + true + $(IntDir)TestComponentNative.tlb + + true + + + 0x0409 + $(IntDir);%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + + + Windows + .\TestComponentNative.def + false + + + + + Use + Level3 + MaxSpeed + WIN32;_WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) + pch.h + true + MultiThreaded + false + + + false + Win32 + NDEBUG;%(PreprocessorDefinitions) + TestComponentNative_i.h + TestComponentNative_i.c + TestComponentNative_p.c + true + $(IntDir)TestComponentNative.tlb + + true + + + 0x0409 + $(IntDir);%(AdditionalIncludeDirectories) + NDEBUG;%(PreprocessorDefinitions) + + + Windows + .\TestComponentNative.def + true + true + false + + + + + Use + Level3 + MaxSpeed + _WINDOWS;NDEBUG;_USRDLL;%(PreprocessorDefinitions) + pch.h + true + MultiThreaded + false + + + false + NDEBUG;%(PreprocessorDefinitions) + TestComponentNative_i.h + TestComponentNative_i.c + TestComponentNative_p.c + true + $(IntDir)TestComponentNative.tlb + + true + + + 0x0409 + $(IntDir);%(AdditionalIncludeDirectories) + NDEBUG;%(PreprocessorDefinitions) + + + Windows + .\TestComponentNative.def + true + true + false + + + + + + + + + + + + + + false + false + false + false + + + + + + + + + + + + Create + Create + Create + Create + + + + false + false + false + false + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNative.vcxproj.filters b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNative.vcxproj.filters new file mode 100644 index 00000000..a05a6a8f --- /dev/null +++ b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNative.vcxproj.filters @@ -0,0 +1,82 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + {2bfedd2b-d1cd-4377-bc56-e6696fb568b9} + False + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Generated Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Generated Files + + + Source Files + + + Source Files + + + + + Resource Files + + + + + Resource Files + + + Source Files + + + Resource Files + + + + + Source Files + + + \ No newline at end of file diff --git a/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNativeps.def b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNativeps.def new file mode 100644 index 00000000..2a4265af --- /dev/null +++ b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNativeps.def @@ -0,0 +1,8 @@ + +LIBRARY + +EXPORTS + DllGetClassObject PRIVATE + DllCanUnloadNow PRIVATE + DllRegisterServer PRIVATE + DllUnregisterServer PRIVATE diff --git a/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/dllmain.cpp b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/dllmain.cpp new file mode 100644 index 00000000..1cd8a618 --- /dev/null +++ b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/dllmain.cpp @@ -0,0 +1,16 @@ +// dllmain.cpp : Implementation of DllMain. + +#include "pch.h" +#include "framework.h" +#include "resource.h" +#include "TestComponentNative_i.h" +#include "dllmain.h" + +CTestComponentNativeModule _AtlModule; + +// DLL Entry Point +extern "C" BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved) +{ + hInstance; + return _AtlModule.DllMain(dwReason, lpReserved); +} diff --git a/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/dllmain.h b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/dllmain.h new file mode 100644 index 00000000..62d92dc0 --- /dev/null +++ b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/dllmain.h @@ -0,0 +1,10 @@ +// dllmain.h : Declaration of module class. + +class CTestComponentNativeModule : public ATL::CAtlDllModuleT< CTestComponentNativeModule > +{ +public : + DECLARE_LIBID(LIBID_TestComponentNativeLib) + DECLARE_REGISTRY_APPID_RESOURCEID(IDR_TESTCOMPONENTNATIVE, "{8aaadab2-ac31-4618-ad2b-6b71d2a318eb}") +}; + +extern class CTestComponentNativeModule _AtlModule; diff --git a/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/framework.h b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/framework.h new file mode 100644 index 00000000..bdecff6a --- /dev/null +++ b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/framework.h @@ -0,0 +1,21 @@ +#pragma once + +#ifndef STRICT +#define STRICT +#endif + +#include "targetver.h" + +#define _ATL_APARTMENT_THREADED + +#define _ATL_NO_AUTOMATIC_NAMESPACE + +#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit + + +#define ATL_NO_ASSERT_ON_DESTROY_NONEXISTENT_WINDOW + +#include "resource.h" +#include +#include +#include diff --git a/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/pch.cpp b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/pch.cpp new file mode 100644 index 00000000..64b7eef6 --- /dev/null +++ b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/pch.cpp @@ -0,0 +1,5 @@ +// pch.cpp: source file corresponding to the pre-compiled header + +#include "pch.h" + +// When you are using pre-compiled headers, this source file is necessary for compilation to succeed. diff --git a/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/pch.h b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/pch.h new file mode 100644 index 00000000..885d5d62 --- /dev/null +++ b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/pch.h @@ -0,0 +1,13 @@ +// pch.h: This is a precompiled header file. +// Files listed below are compiled only once, improving build performance for future builds. +// This also affects IntelliSense performance, including code completion and many code browsing features. +// However, files listed here are ALL re-compiled if any one of them is updated between builds. +// Do not add files here that you will be updating frequently as this negates the performance advantage. + +#ifndef PCH_H +#define PCH_H + +// add headers that you want to pre-compile here +#include "framework.h" + +#endif //PCH_H diff --git a/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/resource.h b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/resource.h new file mode 100644 index 00000000..32e500b8 --- /dev/null +++ b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/resource.h @@ -0,0 +1,18 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by TestComponentNative.rc +// +#define IDS_PROJNAME 100 +#define IDR_TESTCOMPONENTNATIVE 101 +#define IDR_MESSAGE 106 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 201 +#define _APS_NEXT_COMMAND_VALUE 32768 +#define _APS_NEXT_CONTROL_VALUE 201 +#define _APS_NEXT_SYMED_VALUE 107 +#endif +#endif diff --git a/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/targetver.h b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/targetver.h new file mode 100644 index 00000000..87c0086d --- /dev/null +++ b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/targetver.h @@ -0,0 +1,8 @@ +#pragma once + +// Including SDKDDKVer.h defines the highest available Windows platform. + +// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and +// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h. + +#include diff --git a/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallNET3WithoutPartitions/InstallUninstallNET3WithoutPartitions.wixproj b/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallNET3WithoutPartitions/InstallUninstallNET3WithoutPartitions.wixproj index 19382c83..eb01e716 100644 --- a/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallNET3WithoutPartitions/InstallUninstallNET3WithoutPartitions.wixproj +++ b/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallNET3WithoutPartitions/InstallUninstallNET3WithoutPartitions.wixproj @@ -7,6 +7,7 @@ + diff --git a/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallNET3WithoutPartitions/product.wxs b/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallNET3WithoutPartitions/product.wxs index 129669cc..de56d279 100644 --- a/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallNET3WithoutPartitions/product.wxs +++ b/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallNET3WithoutPartitions/product.wxs @@ -12,8 +12,8 @@ - - + + diff --git a/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallNET4WithoutPartitions/InstallUninstallNET4WithoutPartitions.wixproj b/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallNET4WithoutPartitions/InstallUninstallNET4WithoutPartitions.wixproj index 19382c83..629bda1f 100644 --- a/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallNET4WithoutPartitions/InstallUninstallNET4WithoutPartitions.wixproj +++ b/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallNET4WithoutPartitions/InstallUninstallNET4WithoutPartitions.wixproj @@ -7,6 +7,7 @@ + diff --git a/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallNET4WithoutPartitions/product.wxs b/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallNET4WithoutPartitions/product.wxs index eabd7794..b0fafc70 100644 --- a/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallNET4WithoutPartitions/product.wxs +++ b/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallNET4WithoutPartitions/product.wxs @@ -12,8 +12,8 @@ - - + + diff --git a/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallNativeWithoutPartitions/InstallUninstallNativeWithoutPartitions.wixproj b/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallNativeWithoutPartitions/InstallUninstallNativeWithoutPartitions.wixproj index 19382c83..35bfd38d 100644 --- a/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallNativeWithoutPartitions/InstallUninstallNativeWithoutPartitions.wixproj +++ b/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallNativeWithoutPartitions/InstallUninstallNativeWithoutPartitions.wixproj @@ -7,6 +7,7 @@ + diff --git a/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallNativeWithoutPartitions/product.wxs b/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallNativeWithoutPartitions/product.wxs index ee3c4d8f..1a20f55b 100644 --- a/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallNativeWithoutPartitions/product.wxs +++ b/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallNativeWithoutPartitions/product.wxs @@ -12,8 +12,7 @@ - - + diff --git a/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallWithPartitions/InstallUninstallWithPartitions.wixproj b/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallWithPartitions/InstallUninstallWithPartitions.wixproj index 19382c83..35bfd38d 100644 --- a/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallWithPartitions/InstallUninstallWithPartitions.wixproj +++ b/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallWithPartitions/InstallUninstallWithPartitions.wixproj @@ -7,6 +7,7 @@ + diff --git a/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallWithPartitions/product.wxs b/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallWithPartitions/product.wxs index 92dc892b..b1c96bf0 100644 --- a/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallWithPartitions/product.wxs +++ b/src/test/msi/TestData/ComPlusExtensionTests/InstallUninstallWithPartitions/product.wxs @@ -14,7 +14,7 @@ - + -- cgit v1.2.3-55-g6feb