diff --git a/.gitattributes b/.gitattributes index 09325b8..749b6e0 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,17 +1,15 @@ * text=auto !eol -AMSICA/AMSICA-10.0.sln svneol=CRLF#text/plain eol=crlf -AMSICA/build/AMSICA.props -text svneol=unset#text/xml -AMSICA/build/AMSICALib.vcxproj -text svneol=unset#text/xml -AMSICA/build/AMSICALib.vcxproj.filters -text svneol=unset#text/xml -AMSICA/include/AMSICA.h -text -AMSICA/include/StdAfx.h -text -AMSICA/msm/Makefile -text svneol=unset#text/plain%3B+charset%3DWindows-1250 -AMSICA/res/en_GB.po -text -AMSICA/src/AMSICA.cpp -text -AMSICA/src/AMSICAFileOp.cpp -text -AMSICA/src/AMSICATSOp.cpp -text -AMSICA/src/MSICARegOp.cpp -text -AMSICA/src/StdAfx.cpp -text +MSICALib/FileOp.cpp -text +MSICALib/MSICALib.cpp -text +MSICALib/MSICALib.h -text +MSICALib/MSICALib.vcxproj -text svneol=unset#text/xml +MSICALib/MSICALib.vcxproj.filters -text svneol=unset#text/xml +MSICALib/RegOp.cpp -text +MSICALib/TSOp.cpp -text +MSICALib/msm/Makefile -text svneol=unset#text/plain%3B+charset%3DWindows-1250 +MSICALib/res/en_GB.po -text +MSICALib/stdafx.cpp -text +MSICALib/stdafx.h -text MSITSCA/L10N/sl_SI.po -text MSITSCA/MSITSCA.cpp -text MSITSCA/MSITSCA.h -text @@ -22,3 +20,8 @@ MSITSCA/StdAfx.h -text MSITSCA/msm/Makefile -text svneol=unset#text/plain%3B+charset%3DWindows-1250 MSITSCA/res/MSITSCA.rc -text svneol=unset#unset MSITSCA/res/MSITSCA.rcx -text svneol=unset#unset +include/Debug.props -text svneol=unset#text/xml +include/Release.props -text svneol=unset#text/xml +include/Win32.props -text svneol=unset#text/xml +include/common.props -text svneol=unset#text/xml +include/x64.props -text svneol=unset#text/xml diff --git a/.gitignore b/.gitignore index 2f08dfc..b12dcf3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,21 +1,15 @@ -AMSICA/*.opensdf -AMSICA/*.sdf -AMSICA/*.suo -AMSICA/build/*.user -AMSICA/build/AMSICALib.Debug.Win32 -AMSICA/build/AMSICALib.Debug.x64 -AMSICA/build/AMSICALib.Release.Win32 -AMSICA/build/AMSICALib.Release.x64 -AMSICA/msm/*-1.idt -AMSICA/msm/*-2.idt -AMSICA/msm/*-2.idtx -AMSICA/msm/*.Binary-1 -AMSICA/msm/*.Binary-2 -AMSICA/msm/*.Icon-1 -AMSICA/msm/*.Icon-2 -AMSICA/msm/*.lst -AMSICA/msm/*.msm -AMSICA/res/*.mo +MSICALib/*.user +MSICALib/msm/*-1.idt +MSICALib/msm/*-2.idt +MSICALib/msm/*-2.idtx +MSICALib/msm/*.Binary-1 +MSICALib/msm/*.Binary-2 +MSICALib/msm/*.Icon-1 +MSICALib/msm/*.Icon-2 +MSICALib/msm/*.lst +MSICALib/msm/*.msm +MSICALib/res/*.mo +MSICALib/temp MSITSCA/*.user MSITSCA/L10N/*.mo MSITSCA/MSITSCA.Debug.Win32 diff --git a/AMSICA/AMSICA-10.0.sln b/AMSICA/AMSICA-10.0.sln deleted file mode 100644 index d31ffc8..0000000 --- a/AMSICA/AMSICA-10.0.sln +++ /dev/null @@ -1,26 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AMSICALib", "build\AMSICALib.vcxproj", "{8552EE55-177E-4F51-B51B-BAF7D6462CDE}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Debug|Win32.ActiveCfg = Debug|Win32 - {8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Debug|Win32.Build.0 = Debug|Win32 - {8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Debug|x64.ActiveCfg = Debug|x64 - {8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Debug|x64.Build.0 = Debug|x64 - {8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Release|Win32.ActiveCfg = Release|Win32 - {8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Release|Win32.Build.0 = Release|Win32 - {8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Release|x64.ActiveCfg = Release|x64 - {8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/AMSICA/build/AMSICA.props b/AMSICA/build/AMSICA.props deleted file mode 100644 index 33ea2e9..0000000 --- a/AMSICA/build/AMSICA.props +++ /dev/null @@ -1,20 +0,0 @@ - - - - <_ProjectFileVersion>10.0.30319.1 - - - - $(IntDir);..\include;..\..\include;..\..\AOsn\include;%(AdditionalIncludeDirectories) - - - $(IntDir);..\include;..\..\include;..\res;..\..\AOsn\include;%(AdditionalIncludeDirectories) - - - ..\res\en_GB.po - - - ..\res\en_GB.po - - - \ No newline at end of file diff --git a/AMSICA/src/StdAfx.cpp b/AMSICA/src/StdAfx.cpp deleted file mode 100644 index 9b13c1c..0000000 --- a/AMSICA/src/StdAfx.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "StdAfx.h" diff --git a/AMSICA/src/AMSICAFileOp.cpp b/MSICALib/FileOp.cpp similarity index 95% rename from AMSICA/src/AMSICAFileOp.cpp rename to MSICALib/FileOp.cpp index 41d69ba..b49de6d 100644 --- a/AMSICA/src/AMSICAFileOp.cpp +++ b/MSICALib/FileOp.cpp @@ -1,7 +1,7 @@ -#include "StdAfx.h" +#include "stdafx.h" -namespace AMSICA { +namespace MSICA { //////////////////////////////////////////////////////////////////////////// // COpFileDelete @@ -85,4 +85,4 @@ HRESULT COpFileMove::Execute(CSession *pSession) } } -} // namespace AMSICA +} // namespace MSICA diff --git a/AMSICA/src/AMSICA.cpp b/MSICALib/MSICALib.cpp similarity index 94% rename from AMSICA/src/AMSICA.cpp rename to MSICALib/MSICALib.cpp index d10f079..94e4326 100644 --- a/AMSICA/src/AMSICA.cpp +++ b/MSICALib/MSICALib.cpp @@ -1,9 +1,9 @@ -#include "StdAfx.h" +#include "stdafx.h" #pragma comment(lib, "msi.lib") -namespace AMSICA { +namespace MSICA { //////////////////////////////////////////////////////////////////////////// // COperation @@ -181,4 +181,4 @@ CSession::~CSession() m_olCommit.Free(); } -} // namespace AMSICA +} // namespace MSICA diff --git a/AMSICA/include/AMSICA.h b/MSICALib/MSICALib.h similarity index 96% rename from AMSICA/include/AMSICA.h rename to MSICALib/MSICALib.h index 9a6f734..fbcb6a4 100644 --- a/AMSICA/include/AMSICA.h +++ b/MSICALib/MSICALib.h @@ -1,17 +1,17 @@ -#ifndef __AMSICA_H__ -#define __AMSICA_H__ +#ifndef __MSICALib_H__ +#define __MSICALib_H__ //////////////////////////////////////////////////////////////////////////// // Version //////////////////////////////////////////////////////////////////////////// -#define AMSICA_VERSION 0x02000000 +#define MSICALib_VERSION 0x02000000 -#define AMSICA_VERSION_MAJ 2 -#define AMSICA_VERSION_MIN 0 -#define AMSICA_VERSION_REV 0 +#define MSICALib_VERSION_MAJ 2 +#define MSICALib_VERSION_MIN 0 +#define MSICALib_VERSION_REV 0 -#define AMSICA_VERSION_STR "2.0" +#define MSICALib_VERSION_STR "2.0" #if !defined(RC_INVOKED) && !defined(MIDL_PASS) @@ -52,7 +52,7 @@ #define ERROR_INSTALL_SCHEDULED_TASKS_OPLIST_CREATE 2551L -namespace AMSICA { +namespace MSICA { //////////////////////////////////////////////////////////////////////////// @@ -469,7 +469,7 @@ public: COpList m_olCommit; // Commit operation list }; -} // namespace AMSICA +} // namespace MSICA //////////////////////////////////////////////////////////////////// @@ -742,7 +742,7 @@ inline UINT MsiGetTargetPathW(MSIHANDLE hInstall, LPCWSTR szFolder, ATL::CAtlStr } -namespace AMSICA { +namespace MSICA { //////////////////////////////////////////////////////////////////////////// // Inline operators @@ -1422,8 +1422,8 @@ template inline HRESULT COpList::LoadAndAddTail(ATL::CAtlFile &f) return S_OK; } -} // namespace AMSICA +} // namespace MSICA #endif // RC_INVOKED -#endif // __AMSICA_H__ +#endif // __MSICALib_H__ diff --git a/AMSICA/build/AMSICALib.vcxproj b/MSICALib/MSICALib.vcxproj similarity index 68% rename from AMSICA/build/AMSICALib.vcxproj rename to MSICALib/MSICALib.vcxproj index ecebe69..b7b730a 100644 --- a/AMSICA/build/AMSICALib.vcxproj +++ b/MSICALib/MSICALib.vcxproj @@ -19,11 +19,11 @@ - - - - - + + + + + Create Create Create @@ -31,17 +31,17 @@ - - + + - + {8552EE55-177E-4F51-B51B-BAF7D6462CDE} Win32Proj - AMSICALib - AMSICALib + MSICALib + MSICALib @@ -68,37 +68,29 @@ - + - - - - - + + + - + - - - - - + + + - + - - - - - + + + - + - - - - - + + + diff --git a/AMSICA/build/AMSICALib.vcxproj.filters b/MSICALib/MSICALib.vcxproj.filters similarity index 76% rename from AMSICA/build/AMSICALib.vcxproj.filters rename to MSICALib/MSICALib.vcxproj.filters index 00fbc92..ffdd07b 100644 --- a/AMSICA/build/AMSICALib.vcxproj.filters +++ b/MSICALib/MSICALib.vcxproj.filters @@ -15,32 +15,32 @@ - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Header Files - + Header Files - + Resource Files diff --git a/AMSICA/src/MSICARegOp.cpp b/MSICALib/RegOp.cpp similarity index 97% rename from AMSICA/src/MSICARegOp.cpp rename to MSICALib/RegOp.cpp index 1588144..c872a7a 100644 --- a/AMSICA/src/MSICARegOp.cpp +++ b/MSICALib/RegOp.cpp @@ -1,7 +1,7 @@ -#include "StdAfx.h" +#include "stdafx.h" -namespace AMSICA { +namespace MSICA { //////////////////////////////////////////////////////////////////////////// @@ -721,4 +721,4 @@ HRESULT COpRegValueDelete::Execute(CSession *pSession) } } -} // namespace AMSICA +} // namespace MSICA diff --git a/AMSICA/src/AMSICATSOp.cpp b/MSICALib/TSOp.cpp similarity index 97% rename from AMSICA/src/AMSICATSOp.cpp rename to MSICALib/TSOp.cpp index ee23d21..089c3d4 100644 --- a/AMSICA/src/AMSICATSOp.cpp +++ b/MSICALib/TSOp.cpp @@ -1,10 +1,10 @@ -#include "StdAfx.h" +#include "stdafx.h" #pragma comment(lib, "mstask.lib") #pragma comment(lib, "taskschd.lib") -namespace AMSICA { +namespace MSICA { //////////////////////////////////////////////////////////////////////////// // COpTaskCreate @@ -1035,4 +1035,4 @@ finish: return hr; } -} // namespace AMSICA +} // namespace MSICA diff --git a/AMSICA/msm/Makefile b/MSICALib/msm/Makefile similarity index 100% rename from AMSICA/msm/Makefile rename to MSICALib/msm/Makefile diff --git a/AMSICA/res/en_GB.po b/MSICALib/res/en_GB.po similarity index 100% rename from AMSICA/res/en_GB.po rename to MSICALib/res/en_GB.po diff --git a/MSICALib/stdafx.cpp b/MSICALib/stdafx.cpp new file mode 100644 index 0000000..a27b824 --- /dev/null +++ b/MSICALib/stdafx.cpp @@ -0,0 +1 @@ +#include "stdafx.h" diff --git a/AMSICA/include/StdAfx.h b/MSICALib/stdafx.h similarity index 78% rename from AMSICA/include/StdAfx.h rename to MSICALib/stdafx.h index a131344..9e433b4 100644 --- a/AMSICA/include/StdAfx.h +++ b/MSICALib/stdafx.h @@ -1,4 +1,4 @@ -// StdAfx.h : include file for standard system include files, +// stdafx.h : include file for standard system include files, // or project specific include files that are used frequently, // but are changed infrequently @@ -19,9 +19,6 @@ #define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers #define _WIN32_WINNT 0x0501 // Include Windows XP symbols #define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h -#ifdef _WINDLL -#define AMSICA_DLL // This is a DLL -#endif //#define _ATL_APARTMENT_THREADED //#define _ATL_NO_AUTOMATIC_NAMESPACE //#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // Some CString constructors will be explicit @@ -30,11 +27,9 @@ #include #include -#include "BuildNum.h" - -#include "AMSICA.h" - #include #include #include #include + +#include "MSICALib.h" diff --git a/include/Debug.props b/include/Debug.props new file mode 100644 index 0000000..a651258 --- /dev/null +++ b/include/Debug.props @@ -0,0 +1,26 @@ + + + + + + <_PropertySheetDisplayName>MSICA Debug + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + EnableFastChecks + true + + + _DEBUG;%(PreprocessorDefinitions) + + + + + + + + + \ No newline at end of file diff --git a/include/Release.props b/include/Release.props new file mode 100644 index 0000000..e75c4a6 --- /dev/null +++ b/include/Release.props @@ -0,0 +1,49 @@ + + + + + + <_PropertySheetDisplayName>MSICA Release + + + + Full + + + + + OnlyExplicitInline + + + + + true + + + + + Speed + + + + + true + + + + + true + NDEBUG;%(PreprocessorDefinitions) + MultiThreadedDLL + + + NDEBUG;%(PreprocessorDefinitions) + + + + + + + + + \ No newline at end of file diff --git a/include/Win32.props b/include/Win32.props new file mode 100644 index 0000000..fbd0e31 --- /dev/null +++ b/include/Win32.props @@ -0,0 +1,18 @@ + + + + + + <_PropertySheetDisplayName>MSICA Win32 + + + + MachineX86 + + + Windows + MachineX86 + + + + \ No newline at end of file diff --git a/include/common.props b/include/common.props new file mode 100644 index 0000000..762da3d --- /dev/null +++ b/include/common.props @@ -0,0 +1,26 @@ + + + + + + temp\$(ProjectName).$(Platform).$(Configuration)\ + <_PropertySheetDisplayName>MSICA Common + temp\$(ProjectName).$(Platform).$(Configuration)\ + + + + Level3 + WIN32;%(PreprocessorDefinitions) + Use + stdafx.h + ProgramDatabase + true + + + true + true + true + + + + \ No newline at end of file diff --git a/include/x64.props b/include/x64.props new file mode 100644 index 0000000..ff52cec --- /dev/null +++ b/include/x64.props @@ -0,0 +1,18 @@ + + + + + + <_PropertySheetDisplayName>MSICA x64 + + + + MachineX64 + + + Windows + MachineX64 + + + + \ No newline at end of file