Project reorganization

This commit is contained in:
Simon Rozman 2016-03-12 07:32:45 +01:00
parent c02b69950f
commit d3565edc39
23 changed files with 533 additions and 699 deletions

17
.gitattributes vendored
View File

@ -13,23 +13,6 @@ MSICA/res/MSICA.rc -text svneol=unset#unset
MSICA/res/MSICA.rcx -text svneol=unset#unset MSICA/res/MSICA.rcx -text svneol=unset#unset
MSICA/stdafx.cpp -text MSICA/stdafx.cpp -text
MSICA/stdafx.h -text MSICA/stdafx.h -text
MSICALib/L10N/sl_SI.po -text
MSICALib/MSIBuild/Makefile -text
MSICALib/MSIBuild/build_all.bat -text
MSICALib/MSIBuild/clean_all.bat -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/OpCert.cpp -text
MSICALib/OpFile.cpp -text
MSICALib/OpReg.cpp -text
MSICALib/OpSvc.cpp -text
MSICALib/OpTS.cpp -text
MSICALib/OpWLAN.cpp -text
MSICALib/stdafx.cpp -text
MSICALib/stdafx.h -text
/TODO.rtf -text svneol=unset#text/rtf
include/Debug.props -text svneol=unset#text/xml include/Debug.props -text svneol=unset#text/xml
include/Release.props -text svneol=unset#text/xml include/Release.props -text svneol=unset#text/xml
include/Win32.props -text svneol=unset#text/xml include/Win32.props -text svneol=unset#text/xml

24
.gitignore vendored
View File

@ -1,17 +1,17 @@
/*.opensdf /*.opensdf
/*.sdf /*.sdf
/*.suo /*.suo
MSICA/*.user build/*.user
MSICA/L10N/*.mo build/temp
MSICA/MSIBuild/*-1.idt L10N/*.mo
MSICA/MSIBuild/*-2.idt MSIBuild/*-1.idt
MSICA/MSIBuild/*-2.idtx MSIBuild/*-2.idt
MSICA/MSIBuild/*.Binary-1 MSIBuild/*-2.idtx
MSICA/MSIBuild/*.Binary-2 MSIBuild/*.Binary-1
MSICA/MSIBuild/*.Icon-1 MSIBuild/*.Binary-2
MSICA/MSIBuild/*.Icon-2 MSIBuild/*.Icon-1
MSICA/MSIBuild/*.lst MSIBuild/*.Icon-2
MSICA/MSIBuild/*.msm MSIBuild/*.lst
MSICA/temp MSIBuild/*.msm
/ipch /ipch
/output /output

6
.gitmodules vendored
View File

@ -1,6 +0,0 @@
[submodule "lib/atlex"]
path = lib/atlex
url = https://github.com/Amebis/atlex.git
[submodule "lib/MSICALib"]
path = lib/MSICALib
url = https://github.com/Amebis/MSICALib.git

View File

@ -1,302 +1,302 @@
# #
# Copyright 1991-2015 Amebis # Copyright 1991-2015 Amebis
# #
# This file is part of MSICA. # This file is part of MSICA.
# #
# MSICA is free software: you can redistribute it and/or modify # MSICA is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or # the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version. # (at your option) any later version.
# #
# MSICA is distributed in the hope that it will be useful, # MSICA is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with MSICA. If not, see <http://www.gnu.org/licenses/>. # along with MSICA. If not, see <http://www.gnu.org/licenses/>.
# #
!INCLUDE "..\..\..\include\MSIBuildCfg.mak" !INCLUDE "..\..\include\MSIBuildCfg.mak"
MSIBUILD_IS_LOCALIZEABLE=1 MSIBUILD_IS_LOCALIZEABLE=1
###################################################################### ######################################################################
# _Validation # _Validation
All :: "$(LANG).$(PLAT).$(CFG)._Validation-1.idt" All :: "$(LANG).$(PLAT).$(CFG)._Validation-1.idt"
"$(LANG).$(PLAT).$(CFG)._Validation-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" "$(LANG).$(PLAT).$(CFG)._Validation-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
-if exist $@ del /f /q $@ -if exist $@ del /f /q $@
move /y << $@ > NUL move /y << $@ > NUL
Table Column Nullable MinValue MaxValue KeyTable KeyColumn Category Set Description Table Column Nullable MinValue MaxValue KeyTable KeyColumn Category Set Description
s32 s32 s4 I4 I4 S255 I2 S32 S255 S255 s32 s32 s4 I4 I4 S255 I2 S32 S255 S255
_Validation Table Column _Validation Table Column
Certificate Certificate N Identifier Primary key, non-localized token. Certificate Certificate N Identifier Primary key, non-localized token.
Certificate Store N Formatted MY;Root;Trust;CA Certificate store name for CertOpenStore() function call. The store provider is always CERT_STORE_PROV_SYSTEM. Therefore, possible values are: MY, Root, Trust, or CA. Certificate Store N Formatted MY;Root;Trust;CA Certificate store name for CertOpenStore() function call. The store provider is always CERT_STORE_PROV_SYSTEM. Therefore, possible values are: MY, Root, Trust, or CA.
Certificate Flags N DoubleInteger Flags for CertOpenStore() function call. Certificate Flags N DoubleInteger Flags for CertOpenStore() function call.
Certificate Encoding N DoubleInteger 0;1;65536;65537 Certificate encoding (combination of X509_ASN_ENCODING(1) and PKCS_7_ASN_ENCODING(65536) flags). Certificate Encoding N DoubleInteger 0;1;65536;65537 Certificate encoding (combination of X509_ASN_ENCODING(1) and PKCS_7_ASN_ENCODING(65536) flags).
Certificate Binary_ N Binary 1 Identifier The certificate file. The binary information is looked up from the Binary Table. Certificate Binary_ N Binary 1 Identifier The certificate file. The binary information is looked up from the Binary Table.
Certificate Condition Y Condition Optional expression which skips the certificate if evaluates to expFalse. If the expression syntax is invalid, the engine will terminate, returning iesBadActionData. Certificate Condition Y Condition Optional expression which skips the certificate if evaluates to expFalse. If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.
Certificate Component_ N Component 1 Identifier Component the certificate is part of. Certificate Component_ N Component 1 Identifier Component the certificate is part of.
ScheduledTask Task N Identifier Primary key, non-localized token. ScheduledTask Task N Identifier Primary key, non-localized token.
ScheduledTask DisplayName N Formatted Task name. ScheduledTask DisplayName N Formatted Task name.
ScheduledTask Application N Formatted Task application name. ScheduledTask Application N Formatted Task application name.
ScheduledTask Parameters Y Formatted Task command line parameters. ScheduledTask Parameters Y Formatted Task command line parameters.
ScheduledTask Directory_ N Directory 1 Identifier Task working directory. ScheduledTask Directory_ N Directory 1 Identifier Task working directory.
ScheduledTask Flags N DoubleInteger Task's flags to pass in IScheduledWorkItem::SetFlags() call. ScheduledTask Flags N DoubleInteger Task's flags to pass in IScheduledWorkItem::SetFlags() call.
ScheduledTask Priority N DoubleInteger 32;64;128;256;16384;32768 Task's priority to pass in ITask::SetPriority() call. ScheduledTask Priority N DoubleInteger 32;64;128;256;16384;32768 Task's priority to pass in ITask::SetPriority() call.
ScheduledTask User Y Formatted Account name to run task as. Use empty string for system account. ScheduledTask User Y Formatted Account name to run task as. Use empty string for system account.
ScheduledTask Password Y Formatted Account password to run task as. Use NULL for system account. ScheduledTask Password Y Formatted Account password to run task as. Use NULL for system account.
ScheduledTask Author Y Formatted Task author. ScheduledTask Author Y Formatted Task author.
ScheduledTask Description Y Formatted Task description. ScheduledTask Description Y Formatted Task description.
ScheduledTask IdleMin Y Integer A value that specifies how long, in minutes, the system must remain idle before the work item can run. ScheduledTask IdleMin Y Integer A value that specifies how long, in minutes, the system must remain idle before the work item can run.
ScheduledTask IdleDeadline Y Integer A value that specifies the maximum number of minutes that the Task Scheduler will wait for the idle-time period. ScheduledTask IdleDeadline Y Integer A value that specifies the maximum number of minutes that the Task Scheduler will wait for the idle-time period.
ScheduledTask MaxRuntime N DoubleInteger Specifies the maximum run time (in milliseconds), for the task. This parameter may be set to -1 to specify an unlimited time. ScheduledTask MaxRuntime N DoubleInteger Specifies the maximum run time (in milliseconds), for the task. This parameter may be set to -1 to specify an unlimited time.
ScheduledTask Condition Y Condition Optional expression which skips the task if evaluates to expFalse. If the expression syntax is invalid, the engine will terminate, returning iesBadActionData. ScheduledTask Condition Y Condition Optional expression which skips the task if evaluates to expFalse. If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.
ScheduledTask Component_ N Component 1 Identifier Component the task is part of. ScheduledTask Component_ N Component 1 Identifier Component the task is part of.
ServiceConfigure ServiceConfigure N Identifier Primary key, non-localized token. ServiceConfigure ServiceConfigure N Identifier Primary key, non-localized token.
ServiceConfigure Name N Formatted Name of a service. /, \, comma and space are invalid ServiceConfigure Name N Formatted Name of a service. /, \, comma and space are invalid
ServiceConfigure StartType N DoubleInteger -1;0;1;2;3;4 Start type: -1=don't change, 0=boot, 1=system, 2=auto, 3=demand, 4=disabled ServiceConfigure StartType N DoubleInteger -1;0;1;2;3;4 Start type: -1=don't change, 0=boot, 1=system, 2=auto, 3=demand, 4=disabled
ServiceConfigure Control N Integer 0;2;3;4;5;7 Bitwise combination of: 0=no action, 1=wait to finish, 2=start, 4=stop ServiceConfigure Control N Integer 0;2;3;4;5;7 Bitwise combination of: 0=no action, 1=wait to finish, 2=start, 4=stop
ServiceConfigure Condition Y Condition Optional expression which skips the service configuration if evaluates to expFalse. If the expression syntax is invalid, the engine will terminate, returning iesBadActionData. ServiceConfigure Condition Y Condition Optional expression which skips the service configuration if evaluates to expFalse. If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.
ServiceConfigure Sequence Y Number that determines the sort order in which the configurations are to be executed. ServiceConfigure Sequence Y Number that determines the sort order in which the configurations are to be executed.
TaskTrigger Trigger N Identifier Primary key, non-localized token. TaskTrigger Trigger N Identifier Primary key, non-localized token.
TaskTrigger BeginDate N DoubleInteger Date that the task trigger activates (counted in days from January 1st, 1980). The beginning date must be specified when setting a task. TaskTrigger BeginDate N DoubleInteger Date that the task trigger activates (counted in days from January 1st, 1980). The beginning date must be specified when setting a task.
TaskTrigger EndDate Y DoubleInteger Date that the task trigger deactivates (counted in days from January 1st, 1980). TaskTrigger EndDate Y DoubleInteger Date that the task trigger deactivates (counted in days from January 1st, 1980).
TaskTrigger StartTime N DoubleInteger Time of the day the task runs (counted in minutes since midnight). TaskTrigger StartTime N DoubleInteger Time of the day the task runs (counted in minutes since midnight).
TaskTrigger StartTimeRand Y Integer Maximum random number of minutes to add to start time. TaskTrigger StartTimeRand Y Integer Maximum random number of minutes to add to start time.
TaskTrigger MinutesDuration Y DoubleInteger Number of minutes after the task starts that the trigger will remain active. The number of minutes specified here must be greater than or equal to the MinutesInterval column. TaskTrigger MinutesDuration Y DoubleInteger Number of minutes after the task starts that the trigger will remain active. The number of minutes specified here must be greater than or equal to the MinutesInterval column.
TaskTrigger MinutesInterval Y DoubleInteger Number of minutes between consecutive task executions. This number is counted from the start of the previous scheduled task. The number of minutes specified here must be less than the MinutesDuration column. TaskTrigger MinutesInterval Y DoubleInteger Number of minutes between consecutive task executions. This number is counted from the start of the previous scheduled task. The number of minutes specified here must be less than the MinutesDuration column.
TaskTrigger Flags N DoubleInteger Value that describes the behavior of the trigger. This value is a combination of the flags in TASK_TRIGGER::rgFlags. TaskTrigger Flags N DoubleInteger Value that describes the behavior of the trigger. This value is a combination of the flags in TASK_TRIGGER::rgFlags.
TaskTrigger Type N 0 7 Integer A TASK_TRIGGER_TYPE enumerated value that specifies the type of trigger. This member is used with Type. The type of trigger specified here determines which fields of the TRIGGER_TYPE_UNION specified in Type member will be used. Trigger type is based on when the trigger will run the task. TaskTrigger Type N 0 7 Integer A TASK_TRIGGER_TYPE enumerated value that specifies the type of trigger. This member is used with Type. The type of trigger specified here determines which fields of the TRIGGER_TYPE_UNION specified in Type member will be used. Trigger type is based on when the trigger will run the task.
TaskTrigger DaysInterval Y Integer Specifies the number of days between task runs. TaskTrigger DaysInterval Y Integer Specifies the number of days between task runs.
TaskTrigger WeeksInterval Y Integer Number of weeks between invocations of a task. TaskTrigger WeeksInterval Y Integer Number of weeks between invocations of a task.
TaskTrigger DaysOfTheWeek Y 0 127 Integer Value that describes the days of the week the task runs. This value is a bitfield and is a combination of the following values: 1=Sun, 2=Mon, 4=Tue, 8=Wed, 16=Thu, 32=Fri, 64=Sat. TaskTrigger DaysOfTheWeek Y 0 127 Integer Value that describes the days of the week the task runs. This value is a bitfield and is a combination of the following values: 1=Sun, 2=Mon, 4=Tue, 8=Wed, 16=Thu, 32=Fri, 64=Sat.
TaskTrigger DaysOfMonth Y DoubleInteger Specifies the day of the month a task runs. This value is a bitfield that specifies the day(s) the task will run. Bit 0 corresponds to the first of the month, bit 1 to the second, and so forth. TaskTrigger DaysOfMonth Y DoubleInteger Specifies the day of the month a task runs. This value is a bitfield that specifies the day(s) the task will run. Bit 0 corresponds to the first of the month, bit 1 to the second, and so forth.
TaskTrigger WeekOfMonth Y Integer 1;2;3;4;5 Specifies the week of the month when the task runs. This value is exclusive and is one of the following: 1=The task will run between the first and seventh day of the month, 2=The task will run between the eighth and 14th day of the month, 3=The task will run between the 15th and 21st day of the month, 4=The task will run between the 22nd and 28th of the month, 5=The task will run between the last seven days of the month. TaskTrigger WeekOfMonth Y Integer 1;2;3;4;5 Specifies the week of the month when the task runs. This value is exclusive and is one of the following: 1=The task will run between the first and seventh day of the month, 2=The task will run between the eighth and 14th day of the month, 3=The task will run between the 15th and 21st day of the month, 4=The task will run between the 22nd and 28th of the month, 5=The task will run between the last seven days of the month.
TaskTrigger MonthsOfYear Y 0 4095 Integer Specifies the month(s) when the task runs. This value is a combination of the following values: 1=Jan, 2=Feb, 4=Mar, 8=Apr, 16=May, 32=Jun, 64=Jul, 128=Aug, 256=Sep, 512=Oct, 1024=Nov, 2048=Dec. TaskTrigger MonthsOfYear Y 0 4095 Integer Specifies the month(s) when the task runs. This value is a combination of the following values: 1=Jan, 2=Feb, 4=Mar, 8=Apr, 16=May, 32=Jun, 64=Jul, 128=Aug, 256=Sep, 512=Oct, 1024=Nov, 2048=Dec.
TaskTrigger Task_ N ScheduledTask 1 Identifier Key of the Trigger's task. TaskTrigger Task_ N ScheduledTask 1 Identifier Key of the Trigger's task.
WLANProfile WLANProfile N Identifier Primary key, non-localized token. WLANProfile WLANProfile N Identifier Primary key, non-localized token.
WLANProfile Name N Formatted Profile name WLANProfile Name N Formatted Profile name
WLANProfile Binary_ N Binary 1 Identifier The profile XML file. The binary information is looked up from the Binary Table. WLANProfile Binary_ N Binary 1 Identifier The profile XML file. The binary information is looked up from the Binary Table.
WLANProfile Condition Y Condition Optional expression which skips the profile if evaluates to expFalse. If the expression syntax is invalid, the engine will terminate, returning iesBadActionData. WLANProfile Condition Y Condition Optional expression which skips the profile if evaluates to expFalse. If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.
WLANProfile Component_ N Component 1 Identifier Component the profile is part of. WLANProfile Component_ N Component 1 Identifier Component the profile is part of.
<<NOKEEP <<NOKEEP
###################################################################### ######################################################################
# ActionText # ActionText
All :: "$(LANG).$(PLAT).$(CFG).ActionText-2.idt" All :: "$(LANG).$(PLAT).$(CFG).ActionText-2.idt"
"En.$(PLAT).$(CFG).ActionText-2.idtx" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" "En.$(PLAT).$(CFG).ActionText-2.idtx" : "Makefile" "..\..\include\MSIBuildCfg.mak"
-if exist $@ del /f /q $@ -if exist $@ del /f /q $@
move /y << $@ > NUL move /y << $@ > NUL
Action Description Template Action Description Template
s$(MSIBUILD_LENGTH_ID) L0 L0 s$(MSIBUILD_LENGTH_ID) L0 L0
1252 ActionText Action 1252 ActionText Action
RemoveScheduledTasksExec Removing scheduled tasks Scheduled task: [1] RemoveScheduledTasksExec Removing scheduled tasks Scheduled task: [1]
StopServicesExec Stopping services Service: [1] StopServicesExec Stopping services Service: [1]
RemoveWLANProfilesExec Removing WLAN profiles WLAN profile: [1] RemoveWLANProfilesExec Removing WLAN profiles WLAN profile: [1]
RemoveCertificatesExec Removing certificates Certificate: [1] RemoveCertificatesExec Removing certificates Certificate: [1]
InstallCertificatesExec Installing certificates Certificate: [1] InstallCertificatesExec Installing certificates Certificate: [1]
InstallWLANProfilesExec Installing WLAN profiles WLAN profile: [1] InstallWLANProfilesExec Installing WLAN profiles WLAN profile: [1]
SetServiceStartExec Configuring services Service: [1] SetServiceStartExec Configuring services Service: [1]
StartServicesExec Starting services Service: [1] StartServicesExec Starting services Service: [1]
InstallScheduledTasksExec Installing scheduled tasks Scheduled task: [1] InstallScheduledTasksExec Installing scheduled tasks Scheduled task: [1]
<<NOKEEP <<NOKEEP
"De.$(PLAT).$(CFG).ActionText-2.idt" : "En.$(PLAT).$(CFG).ActionText-2.idtx" "..\L10N\de_DE.po" "De.$(PLAT).$(CFG).ActionText-2.idt" : "En.$(PLAT).$(CFG).ActionText-2.idtx" "..\L10N\de_DE.po"
rcxgettext.exe idtp $@ $** rcxgettext.exe idtp $@ $**
"En.$(PLAT).$(CFG).ActionText-2.idt" : "En.$(PLAT).$(CFG).ActionText-2.idtx" "En.$(PLAT).$(CFG).ActionText-2.idt" : "En.$(PLAT).$(CFG).ActionText-2.idtx"
copy /y $** $@ > NUL copy /y $** $@ > NUL
"It.$(PLAT).$(CFG).ActionText-2.idt" : "En.$(PLAT).$(CFG).ActionText-2.idtx" "..\L10N\it_IT.po" "It.$(PLAT).$(CFG).ActionText-2.idt" : "En.$(PLAT).$(CFG).ActionText-2.idtx" "..\L10N\it_IT.po"
rcxgettext.exe idtp $@ $** rcxgettext.exe idtp $@ $**
"Sl.$(PLAT).$(CFG).ActionText-2.idt" : "En.$(PLAT).$(CFG).ActionText-2.idtx" "..\L10N\sl_SI.po" "Sl.$(PLAT).$(CFG).ActionText-2.idt" : "En.$(PLAT).$(CFG).ActionText-2.idtx" "..\L10N\sl_SI.po"
rcxgettext.exe idtp $@ $** rcxgettext.exe idtp $@ $**
###################################################################### ######################################################################
# Binary # Binary
All :: \ All :: \
"$(LANG).$(PLAT).$(CFG).Binary-1.idt" \ "$(LANG).$(PLAT).$(CFG).Binary-1.idt" \
"$(LANG).$(PLAT).$(CFG).Binary-1\MSICA.dll" "$(LANG).$(PLAT).$(CFG).Binary-1\MSICA.dll"
"$(LANG).$(PLAT).$(CFG).Binary-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" "$(LANG).$(PLAT).$(CFG).Binary-1" "$(LANG).$(PLAT).$(CFG).Binary-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" "$(LANG).$(PLAT).$(CFG).Binary-1"
-if exist $@ del /f /q $@ -if exist $@ del /f /q $@
move /y << $@ > NUL move /y << $@ > NUL
Name Data Name Data
s$(MSIBUILD_LENGTH_ID) v0 s$(MSIBUILD_LENGTH_ID) v0
Binary Name Binary Name
binMSICA.dll MSICA.dll binMSICA.dll MSICA.dll
<<NOKEEP <<NOKEEP
"$(LANG).$(PLAT).$(CFG).Binary-1\MSICA.dll" : "..\..\output\$(PLAT).$(CFG)\MSICA.dll" "$(LANG).$(PLAT).$(CFG).Binary-1\MSICA.dll" : "..\output\$(PLAT).$(CFG)\MSICA.dll"
copy /y $** $@ > NUL copy /y $** $@ > NUL
####################################################################### #######################################################################
## Certificate ## Certificate
# #
#All :: "$(LANG).$(PLAT).$(CFG).Certificate-1.idt" #All :: "$(LANG).$(PLAT).$(CFG).Certificate-1.idt"
# #
#"$(LANG).$(PLAT).$(CFG).Certificate-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" #"$(LANG).$(PLAT).$(CFG).Certificate-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
# -if exist $@ del /f /q $@ # -if exist $@ del /f /q $@
# move /y << $@ > NUL # move /y << $@ > NUL
#Certificate Store Flags Encoding Binary_ Condition Component_ #Certificate Store Flags Encoding Binary_ Condition Component_
#s$(MSIBUILD_LENGTH_ID) s255 i4 i4 s$(MSIBUILD_LENGTH_ID) S255 s$(MSIBUILD_LENGTH_ID) #s$(MSIBUILD_LENGTH_ID) s255 i4 i4 s$(MSIBUILD_LENGTH_ID) S255 s$(MSIBUILD_LENGTH_ID)
#Certificate Certificate #Certificate Certificate
#<<NOKEEP #<<NOKEEP
###################################################################### ######################################################################
# CustomAction # CustomAction
All :: "$(LANG).$(PLAT).$(CFG).CustomAction-1.idt" All :: "$(LANG).$(PLAT).$(CFG).CustomAction-1.idt"
"$(LANG).$(PLAT).$(CFG).CustomAction-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" "$(LANG).$(PLAT).$(CFG).CustomAction-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
-if exist $@ del /f /q $@ -if exist $@ del /f /q $@
move /y << $@ > NUL move /y << $@ > NUL
Action Type Source Target Action Type Source Target
s$(MSIBUILD_LENGTH_ID) i2 S$(MSIBUILD_LENGTH_ID) S255 s$(MSIBUILD_LENGTH_ID) i2 S$(MSIBUILD_LENGTH_ID) S255
CustomAction Action CustomAction Action
MSICAInitialize 1 binMSICA.dll MSICAInitialize MSICAInitialize 1 binMSICA.dll MSICAInitialize
RemoveScheduledTasksRollback 3329 binMSICA.dll ExecuteSequence RemoveScheduledTasksRollback 3329 binMSICA.dll ExecuteSequence
RemoveScheduledTasksExec 3073 binMSICA.dll ExecuteSequence RemoveScheduledTasksExec 3073 binMSICA.dll ExecuteSequence
RemoveScheduledTasksCommit 3585 binMSICA.dll ExecuteSequence RemoveScheduledTasksCommit 3585 binMSICA.dll ExecuteSequence
StopServicesRollback 3329 binMSICA.dll ExecuteSequence StopServicesRollback 3329 binMSICA.dll ExecuteSequence
StopServicesExec 3073 binMSICA.dll ExecuteSequence StopServicesExec 3073 binMSICA.dll ExecuteSequence
StopServicesCommit 3585 binMSICA.dll ExecuteSequence StopServicesCommit 3585 binMSICA.dll ExecuteSequence
RemoveWLANProfilesRollback 3329 binMSICA.dll ExecuteSequence RemoveWLANProfilesRollback 3329 binMSICA.dll ExecuteSequence
RemoveWLANProfilesExec 3073 binMSICA.dll ExecuteSequence RemoveWLANProfilesExec 3073 binMSICA.dll ExecuteSequence
RemoveWLANProfilesCommit 3585 binMSICA.dll ExecuteSequence RemoveWLANProfilesCommit 3585 binMSICA.dll ExecuteSequence
RemoveCertificatesRollback 3329 binMSICA.dll ExecuteSequence RemoveCertificatesRollback 3329 binMSICA.dll ExecuteSequence
RemoveCertificatesExec 3073 binMSICA.dll ExecuteSequence RemoveCertificatesExec 3073 binMSICA.dll ExecuteSequence
RemoveCertificatesCommit 3585 binMSICA.dll ExecuteSequence RemoveCertificatesCommit 3585 binMSICA.dll ExecuteSequence
InstallCertificatesRollback 3329 binMSICA.dll ExecuteSequence InstallCertificatesRollback 3329 binMSICA.dll ExecuteSequence
InstallCertificatesExec 3073 binMSICA.dll ExecuteSequence InstallCertificatesExec 3073 binMSICA.dll ExecuteSequence
InstallCertificatesCommit 3585 binMSICA.dll ExecuteSequence InstallCertificatesCommit 3585 binMSICA.dll ExecuteSequence
InstallWLANProfilesRollback 3329 binMSICA.dll ExecuteSequence InstallWLANProfilesRollback 3329 binMSICA.dll ExecuteSequence
InstallWLANProfilesExec 3073 binMSICA.dll ExecuteSequence InstallWLANProfilesExec 3073 binMSICA.dll ExecuteSequence
InstallWLANProfilesCommit 3585 binMSICA.dll ExecuteSequence InstallWLANProfilesCommit 3585 binMSICA.dll ExecuteSequence
SetServiceStartRollback 3329 binMSICA.dll ExecuteSequence SetServiceStartRollback 3329 binMSICA.dll ExecuteSequence
SetServiceStartExec 3073 binMSICA.dll ExecuteSequence SetServiceStartExec 3073 binMSICA.dll ExecuteSequence
SetServiceStartCommit 3585 binMSICA.dll ExecuteSequence SetServiceStartCommit 3585 binMSICA.dll ExecuteSequence
StartServicesRollback 3329 binMSICA.dll ExecuteSequence StartServicesRollback 3329 binMSICA.dll ExecuteSequence
StartServicesExec 3073 binMSICA.dll ExecuteSequence StartServicesExec 3073 binMSICA.dll ExecuteSequence
StartServicesCommit 3585 binMSICA.dll ExecuteSequence StartServicesCommit 3585 binMSICA.dll ExecuteSequence
InstallScheduledTasksRollback 3329 binMSICA.dll ExecuteSequence InstallScheduledTasksRollback 3329 binMSICA.dll ExecuteSequence
InstallScheduledTasksExec 3073 binMSICA.dll ExecuteSequence InstallScheduledTasksExec 3073 binMSICA.dll ExecuteSequence
InstallScheduledTasksCommit 3585 binMSICA.dll ExecuteSequence InstallScheduledTasksCommit 3585 binMSICA.dll ExecuteSequence
<<NOKEEP <<NOKEEP
###################################################################### ######################################################################
# InstallExecuteSequence # InstallExecuteSequence
All :: "$(LANG).$(PLAT).$(CFG).InstallExecuteSequence-1.idt" All :: "$(LANG).$(PLAT).$(CFG).InstallExecuteSequence-1.idt"
"$(LANG).$(PLAT).$(CFG).InstallExecuteSequence-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" "$(LANG).$(PLAT).$(CFG).InstallExecuteSequence-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
-if exist $@ del /f /q $@ -if exist $@ del /f /q $@
move /y << $@ > NUL move /y << $@ > NUL
Action Condition Sequence Action Condition Sequence
s$(MSIBUILD_LENGTH_ID) S255 I2 s$(MSIBUILD_LENGTH_ID) S255 I2
InstallExecuteSequence Action InstallExecuteSequence Action
MSICAInitialize 1510 MSICAInitialize 1510
RemoveScheduledTasksRollback 1850 RemoveScheduledTasksRollback 1850
RemoveScheduledTasksExec 1851 RemoveScheduledTasksExec 1851
RemoveScheduledTasksCommit 1852 RemoveScheduledTasksCommit 1852
StopServicesRollback 1853 StopServicesRollback 1853
StopServicesExec 1854 StopServicesExec 1854
StopServicesCommit 1855 StopServicesCommit 1855
RemoveWLANProfilesRollback 1856 RemoveWLANProfilesRollback 1856
RemoveWLANProfilesExec 1857 RemoveWLANProfilesExec 1857
RemoveWLANProfilesCommit 1858 RemoveWLANProfilesCommit 1858
RemoveCertificatesRollback 1859 RemoveCertificatesRollback 1859
RemoveCertificatesExec 1860 RemoveCertificatesExec 1860
RemoveCertificatesCommit 1861 RemoveCertificatesCommit 1861
InstallCertificatesRollback 6150 InstallCertificatesRollback 6150
InstallCertificatesExec 6151 InstallCertificatesExec 6151
InstallCertificatesCommit 6152 InstallCertificatesCommit 6152
InstallWLANProfilesRollback 6153 InstallWLANProfilesRollback 6153
InstallWLANProfilesExec 6154 InstallWLANProfilesExec 6154
InstallWLANProfilesCommit 6155 InstallWLANProfilesCommit 6155
SetServiceStartRollback 6156 SetServiceStartRollback 6156
SetServiceStartExec 6157 SetServiceStartExec 6157
SetServiceStartCommit 6158 SetServiceStartCommit 6158
StartServicesRollback 6159 StartServicesRollback 6159
StartServicesExec 6160 StartServicesExec 6160
StartServicesCommit 6161 StartServicesCommit 6161
InstallScheduledTasksRollback 6162 InstallScheduledTasksRollback 6162
InstallScheduledTasksExec 6163 InstallScheduledTasksExec 6163
InstallScheduledTasksCommit 6164 InstallScheduledTasksCommit 6164
<<NOKEEP <<NOKEEP
####################################################################### #######################################################################
## ScheduledTask ## ScheduledTask
# #
#All :: "$(LANG).$(PLAT).$(CFG).ScheduledTask-1.idt" #All :: "$(LANG).$(PLAT).$(CFG).ScheduledTask-1.idt"
# #
#"$(LANG).$(PLAT).$(CFG).ScheduledTask-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" #"$(LANG).$(PLAT).$(CFG).ScheduledTask-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
# -if exist $@ del /f /q $@ # -if exist $@ del /f /q $@
# move /y << $@ > NUL # move /y << $@ > NUL
#Task DisplayName Application Parameters Directory_ Flags Priority User Password Author Description IdleMin IdleDeadline MaxRuntime Condition Component_ #Task DisplayName Application Parameters Directory_ Flags Priority User Password Author Description IdleMin IdleDeadline MaxRuntime Condition Component_
#s$(MSIBUILD_LENGTH_ID) l255 s255 S255 s$(MSIBUILD_LENGTH_ID) i4 i4 S255 S255 L255 L0 I2 I2 i4 S255 s$(MSIBUILD_LENGTH_ID) #s$(MSIBUILD_LENGTH_ID) l255 s255 S255 s$(MSIBUILD_LENGTH_ID) i4 i4 S255 S255 L255 L0 I2 I2 i4 S255 s$(MSIBUILD_LENGTH_ID)
#ScheduledTask Task #ScheduledTask Task
#<<NOKEEP #<<NOKEEP
####################################################################### #######################################################################
## ServiceConfigure ## ServiceConfigure
# #
#All :: "$(LANG).$(PLAT).$(CFG).ServiceConfigure-1.idt" #All :: "$(LANG).$(PLAT).$(CFG).ServiceConfigure-1.idt"
# #
#"$(LANG).$(PLAT).$(CFG).ServiceConfigure-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" #"$(LANG).$(PLAT).$(CFG).ServiceConfigure-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
# -if exist $@ del /f /q $@ # -if exist $@ del /f /q $@
# move /y << $@ > NUL # move /y << $@ > NUL
#ServiceConfigure Name StartType Control Condition Sequence #ServiceConfigure Name StartType Control Condition Sequence
#s$(MSIBUILD_LENGTH_ID) l255 i4 i2 S255 I2 #s$(MSIBUILD_LENGTH_ID) l255 i4 i2 S255 I2
#ServiceConfigure ServiceConfigure #ServiceConfigure ServiceConfigure
#<<NOKEEP #<<NOKEEP
####################################################################### #######################################################################
## TaskTrigger ## TaskTrigger
# #
#All :: "$(LANG).$(PLAT).$(CFG).TaskTrigger-1.idt" #All :: "$(LANG).$(PLAT).$(CFG).TaskTrigger-1.idt"
# #
#"$(LANG).$(PLAT).$(CFG).TaskTrigger-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" #"$(LANG).$(PLAT).$(CFG).TaskTrigger-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
# -if exist $@ del /f /q $@ # -if exist $@ del /f /q $@
# move /y << $@ > NUL # move /y << $@ > NUL
#Trigger BeginDate EndDate StartTime StartTimeRand MinutesDuration MinutesInterval Flags Type DaysInterval WeeksInterval DaysOfTheWeek DaysOfMonth WeekOfMonth MonthsOfYear Task_ #Trigger BeginDate EndDate StartTime StartTimeRand MinutesDuration MinutesInterval Flags Type DaysInterval WeeksInterval DaysOfTheWeek DaysOfMonth WeekOfMonth MonthsOfYear Task_
#s$(MSIBUILD_LENGTH_ID) i2 I2 i2 I2 I4 I4 i4 i2 I2 I2 I2 I4 I2 I2 s$(MSIBUILD_LENGTH_ID) #s$(MSIBUILD_LENGTH_ID) i2 I2 i2 I2 I4 I4 i4 i2 I2 I2 I2 I4 I2 I2 s$(MSIBUILD_LENGTH_ID)
#TaskTrigger Trigger #TaskTrigger Trigger
#<<NOKEEP #<<NOKEEP
####################################################################### #######################################################################
## WLANProfile ## WLANProfile
# #
#All :: "$(LANG).$(PLAT).$(CFG).WLANProfile-1.idt" #All :: "$(LANG).$(PLAT).$(CFG).WLANProfile-1.idt"
# #
#"$(LANG).$(PLAT).$(CFG).WLANProfile-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" #"$(LANG).$(PLAT).$(CFG).WLANProfile-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
# -if exist $@ del /f /q $@ # -if exist $@ del /f /q $@
# move /y << $@ > NUL # move /y << $@ > NUL
#WLANProfile Name Binary_ Condition Component_ #WLANProfile Name Binary_ Condition Component_
#s$(MSIBUILD_LENGTH_ID) l255 s$(MSIBUILD_LENGTH_ID) S255 s$(MSIBUILD_LENGTH_ID) #s$(MSIBUILD_LENGTH_ID) l255 s$(MSIBUILD_LENGTH_ID) S255 s$(MSIBUILD_LENGTH_ID)
#WLANProfile WLANProfile #WLANProfile WLANProfile
#<<NOKEEP #<<NOKEEP
###################################################################### ######################################################################
# Build MSM module! # Build MSM module!
###################################################################### ######################################################################
!INCLUDE "..\..\..\MSIBuild\MSM.mak" !INCLUDE "..\..\MSIBuild\MSM.mak"

View File

@ -1,11 +1,11 @@
 
Microsoft Visual Studio Solution File, Format Version 11.00 Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010 # Visual Studio 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atlex", "lib\atlex\build\atlex.vcxproj", "{5A4EADF2-3237-457A-9DA8-BB9942A91019}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atlex", "..\..\lib\atlex\build\atlex.vcxproj", "{5A4EADF2-3237-457A-9DA8-BB9942A91019}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSICALib", "lib\MSICALib\build\MSICALib.vcxproj", "{8552EE55-177E-4F51-B51B-BAF7D6462CDE}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSICALib", "..\..\lib\MSICALib\build\MSICALib.vcxproj", "{8552EE55-177E-4F51-B51B-BAF7D6462CDE}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSICA", "MSICA\MSICA.vcxproj", "{A7D9EBC1-1E64-4399-9C88-6692F8742153}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSICA", "build\MSICA.vcxproj", "{A7D9EBC1-1E64-4399-9C88-6692F8742153}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{26350A68-2F55-4732-972C-4A5E9077699E}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{26350A68-2F55-4732-972C-4A5E9077699E}"
EndProject EndProject

View File

@ -1,21 +1,24 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" /> <ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup> <PropertyGroup>
<OutDir>..\output\$(Platform).$(Configuration)\</OutDir> <OutDir>..\output\$(Platform).$(Configuration)\</OutDir>
<IgnoreImportLibrary>true</IgnoreImportLibrary> <IgnoreImportLibrary>true</IgnoreImportLibrary>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup> <ItemDefinitionGroup>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
</Link> </Link>
<ResourceLocalizator> <ResourceLocalizator>
<LanguageCatalogs>L10N\sl_SI.po</LanguageCatalogs> <LanguageCatalogs>L10N\sl_SI.po</LanguageCatalogs>
</ResourceLocalizator> </ResourceLocalizator>
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>..\lib\MSICALib\include;..\lib\atlex\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\include;..\..\..\lib\MSICALib\include;..\..\..\lib\atlex\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
</ItemDefinitionGroup> <ResourceCompile>
<ItemGroup /> <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup />
</Project> </Project>

View File

@ -1,108 +1,108 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations"> <ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32"> <ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration> <Configuration>Debug</Configuration>
<Platform>Win32</Platform> <Platform>Win32</Platform>
</ProjectConfiguration> </ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64"> <ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration> <Configuration>Debug</Configuration>
<Platform>x64</Platform> <Platform>x64</Platform>
</ProjectConfiguration> </ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32"> <ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration> <Configuration>Release</Configuration>
<Platform>Win32</Platform> <Platform>Win32</Platform>
</ProjectConfiguration> </ProjectConfiguration>
<ProjectConfiguration Include="Release|x64"> <ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration> <Configuration>Release</Configuration>
<Platform>x64</Platform> <Platform>x64</Platform>
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{A7D9EBC1-1E64-4399-9C88-6692F8742153}</ProjectGuid> <ProjectGuid>{A7D9EBC1-1E64-4399-9C88-6692F8742153}</ProjectGuid>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfAtl>Static</UseOfAtl> <UseOfAtl>Static</UseOfAtl>
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfAtl>Static</UseOfAtl> <UseOfAtl>Static</UseOfAtl>
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfAtl>Static</UseOfAtl> <UseOfAtl>Static</UseOfAtl>
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfAtl>Static</UseOfAtl> <UseOfAtl>Static</UseOfAtl>
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings" /> <ImportGroup Label="ExtensionSettings" />
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\include\Win32.props" /> <Import Project="..\..\..\include\Win32.props" />
<Import Project="..\include\Release.props" /> <Import Project="..\..\..\include\Release.props" />
<Import Project="MSICA.props" /> <Import Project="MSICA.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\include\Win32.props" /> <Import Project="..\..\..\include\Win32.props" />
<Import Project="..\include\Debug.props" /> <Import Project="..\..\..\include\Debug.props" />
<Import Project="MSICA.props" /> <Import Project="MSICA.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\include\x64.props" /> <Import Project="..\..\..\include\x64.props" />
<Import Project="..\include\Release.props" /> <Import Project="..\..\..\include\Release.props" />
<Import Project="MSICA.props" /> <Import Project="MSICA.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\include\x64.props" /> <Import Project="..\..\..\include\x64.props" />
<Import Project="..\include\Debug.props" /> <Import Project="..\..\..\include\Debug.props" />
<Import Project="MSICA.props" /> <Import Project="MSICA.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<ItemGroup> <ItemGroup>
<ClCompile Include="MSICA.cpp" /> <ClCompile Include="..\src\MSICA.cpp" />
<ClCompile Include="stdafx.cpp"> <ClCompile Include="..\src\stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="MSICA.h" /> <ClInclude Include="..\include\MSICA.h" />
<ClInclude Include="stdafx.h" /> <ClInclude Include="..\src\stdafx.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="L10N\sl_SI.po" /> <None Include="..\L10N\sl_SI.po" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="MSICA.rc" /> <ResourceCompile Include="..\res\MSICA.rc" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\lib\MSICALib\build\MSICALib.vcxproj"> <ProjectReference Include="..\..\..\lib\MSICALib\build\MSICALib.vcxproj">
<Project>{8552ee55-177e-4f51-b51b-baf7d6462cde}</Project> <Project>{8552ee55-177e-4f51-b51b-baf7d6462cde}</Project>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets" /> <ImportGroup Label="ExtensionTargets" />
</Project> </Project>

View File

@ -1,43 +1,43 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<Filter Include="Source Files"> <Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter> </Filter>
<Filter Include="Header Files"> <Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter> </Filter>
<Filter Include="Resource Files"> <Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;rcx;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;po</Extensions> <Extensions>rc;rcx;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;po</Extensions>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="MSICA.cpp"> <ClCompile Include="..\src\MSICA.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="stdafx.cpp"> <ClCompile Include="..\src\stdafx.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="MSICA.h"> <ClInclude Include="..\include\MSICA.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="stdafx.h"> <ClInclude Include="..\src\stdafx.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="L10N\sl_SI.po"> <None Include="..\L10N\sl_SI.po">
<Filter>Resource Files</Filter> <Filter>Resource Files</Filter>
</None> </None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="MSICA.rc"> <ResourceCompile Include="..\res\MSICA.rc">
<Filter>Resource Files</Filter> <Filter>Resource Files</Filter>
</ResourceCompile> </ResourceCompile>
</ItemGroup> </ItemGroup>
</Project> </Project>

View File

@ -1,26 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_PropertySheetDisplayName>MSICA Debug</_PropertySheetDisplayName>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<SmallerTypeCheck>true</SmallerTypeCheck>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup />
<Target Name="Sign" Condition="'$(ManifestCertificateThumbprint)' != '' and ('$(ConfigurationType)' == 'Application' or '$(ConfigurationType)' == 'DynamicLibrary')" AfterTargets="_Manifest" BeforeTargets="RegisterOutput" Inputs="$(OutDir)$(TargetName)$(TargetExt)" Outputs="$(IntDir)$(TargetName).sign">
<Message Text="Signing output file..." />
<SignFile CertificateThumbprint="$(ManifestCertificateThumbprint)" SigningTarget="$(OutDir)$(TargetName)$(TargetExt)" />
<Touch Files="$(IntDir)$(TargetName).sign" AlwaysCreate="true" />
</Target>
</Project>

View File

@ -1,49 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_PropertySheetDisplayName>MSICA Release</_PropertySheetDisplayName>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<Optimization>Full</Optimization>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup>
<ClCompile>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup>
<ClCompile>
<IntrinsicFunctions>true</IntrinsicFunctions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup>
<ClCompile>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup>
<ClCompile>
<OmitFramePointers>true</OmitFramePointers>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup>
<ClCompile>
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup />
<Target Name="Sign" Condition="'$(ManifestCertificateThumbprint)' != '' and ('$(ConfigurationType)' == 'Application' or '$(ConfigurationType)' == 'DynamicLibrary')" AfterTargets="_Manifest" BeforeTargets="RegisterOutput" Inputs="$(OutDir)$(TargetName)$(TargetExt)" Outputs="$(IntDir)$(TargetName).sign">
<Message Text="Signing output file..." />
<SignFile CertificateThumbprint="$(ManifestCertificateThumbprint)" TimestampUrl="$(ManifestTimestampUrl)" SigningTarget="$(OutDir)$(TargetName)$(TargetExt)" />
<Touch Files="$(IntDir)$(TargetName).sign" AlwaysCreate="true" />
</Target>
</Project>

View File

@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="common.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_PropertySheetDisplayName>MSICA Win32</_PropertySheetDisplayName>
</PropertyGroup>
<ItemDefinitionGroup>
<Lib>
<TargetMachine>MachineX86</TargetMachine>
</Lib>
<Link>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemGroup />
</Project>

View File

@ -1,29 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<IntDir>temp\$(ProjectName).$(Platform).$(Configuration)\</IntDir>
<_PropertySheetDisplayName>MSICA Common</_PropertySheetDisplayName>
<OutDir>temp\$(ProjectName).$(Platform).$(Configuration)\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PreprocessorDefinitions>WIN32;STRICT;VC_EXTRALEAN;_WIN32_WINNT=0x0501;_WINSOCKAPI_;_ATL_APARTMENT_THREADED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<StringPooling>true</StringPooling>
</ClCompile>
<Link>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<ResourceCompile>
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup />
</Project>

View File

@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="common.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_PropertySheetDisplayName>MSICA x64</_PropertySheetDisplayName>
</PropertyGroup>
<ItemDefinitionGroup>
<Lib>
<TargetMachine>MachineX64</TargetMachine>
</Lib>
<Link>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX64</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemGroup />
</Project>

@ -1 +0,0 @@
Subproject commit fc7c3365bafd09a2b4211ce1dc4a922dde1be37c

@ -1 +0,0 @@
Subproject commit b04fe38b3f8956946b2b1961156f39dbac114424

Binary file not shown.

View File

@ -1,44 +1,44 @@
/* /*
Copyright 1991-2016 Amebis Copyright 1991-2016 Amebis
This file is part of MSICA. This file is part of MSICA.
MSICA is free software: you can redistribute it and/or modify MSICA is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or the Free Software Foundation, either version 3 of the License, or
(at your option) any later version. (at your option) any later version.
MSICA is distributed in the hope that it will be useful, MSICA is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with MSICA. If not, see <http://www.gnu.org/licenses/>. along with MSICA. If not, see <http://www.gnu.org/licenses/>.
*/ */
#pragma once #pragma once
#ifdef _WINDLL #ifdef _WINDLL
#define MSICA_DLL // This library is compiled as a DLL #define MSICA_DLL // This library is compiled as a DLL
#endif #endif
#include <atlbase.h> #include <atlbase.h>
#include <atlfile.h> #include <atlfile.h>
#include <atlstr.h> #include <atlstr.h>
#include <corerror.h> #include <corerror.h>
#include <stdlib.h> #include <stdlib.h>
#include <time.h> #include <time.h>
#include <wlanapi.h> #include <wlanapi.h>
// Must not statically link to Wlanapi.dll as it is not available on Windows // Must not statically link to Wlanapi.dll as it is not available on Windows
// without a WLAN interface. // without a WLAN interface.
extern VOID (WINAPI *pfnWlanFreeMemory)(__in PVOID pMemory); extern VOID (WINAPI *pfnWlanFreeMemory)(__in PVOID pMemory);
extern DWORD (WINAPI *pfnWlanOpenHandle)(__in DWORD dwClientVersion, __reserved PVOID pReserved, __out PDWORD pdwNegotiatedVersion, __out PHANDLE phClientHandle); extern DWORD (WINAPI *pfnWlanOpenHandle)(__in DWORD dwClientVersion, __reserved PVOID pReserved, __out PDWORD pdwNegotiatedVersion, __out PHANDLE phClientHandle);
extern DWORD (WINAPI *pfnWlanCloseHandle)(__in HANDLE hClientHandle, __reserved PVOID pReserved); extern DWORD (WINAPI *pfnWlanCloseHandle)(__in HANDLE hClientHandle, __reserved PVOID pReserved);
extern DWORD (WINAPI *pfnWlanEnumInterfaces)(__in HANDLE hClientHandle, __reserved PVOID pReserved, __deref_out PWLAN_INTERFACE_INFO_LIST *ppInterfaceList); extern DWORD (WINAPI *pfnWlanEnumInterfaces)(__in HANDLE hClientHandle, __reserved PVOID pReserved, __deref_out PWLAN_INTERFACE_INFO_LIST *ppInterfaceList);
#include <MSICALib.h> #include <MSICALib.h>
#include "MSICA.h" #include <MSICA.h>