Amebis/GEANTLink
Amebis/GEANTLink
1
1
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 50 Wiki Activity

EAP method DLL registration added

Browse Source
This commit is contained in:
Simon Rozman 2016-05-19 13:41:25 +02:00
parent ba4618e288
commit 9853989d04
3 changed files with 100 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
EAPMethods/MSIBuild/Makefile
View File

@ -82,12 +82,18 @@ compEAPMethodEvents.dll.Win32 {E0A1F106-D904-4BAF-9324-94FE6DD12089} $(MSIBUILD_
!IF "$(PLAT)" == "x64" !IF "$(PLAT)" == "x64"
compEAPMethodEvents.dll.x64 {594109D7-8FA0-43DF-8CA6-FE1562AAC1C1} $(MSIBUILD_PRODUCT_NAME_UC)BINDIR 256 fileEAPMethodEvents.dll.x64 compEAPMethodEvents.dll.x64 {594109D7-8FA0-43DF-8CA6-FE1562AAC1C1} $(MSIBUILD_PRODUCT_NAME_UC)BINDIR 256 fileEAPMethodEvents.dll.x64
!ENDIF !ENDIF
compEAPHostAuthor {086E042A-6741-459D-92F0-F5CCFA4E34D4} $(MSIBUILD_PRODUCT_NAME_UC)BINDIR $(MSIBUILD_COMPONENT_ATTRIB_REGISTRY) regEAPHostAuthor
!IF "$(PLAT)" == "Win32" !IF "$(PLAT)" == "Win32"
compEAPTTLS.dll.Win32 {A4A62D2F-DA90-4765-BD8C-D59EA2C01DFE} $(MSIBUILD_PRODUCT_NAME_UC)BINDIR 0 fileEAPTTLS.dll.Win32 compEAPTTLS.dll.Win32 {A4A62D2F-DA90-4765-BD8C-D59EA2C01DFE} $(MSIBUILD_PRODUCT_NAME_UC)BINDIR 0 fileEAPTTLS.dll.Win32
!ENDIF !ENDIF
!IF "$(PLAT)" == "x64" !IF "$(PLAT)" == "x64"
compEAPTTLS.dll.x64 {A1F62401-03F1-4D4E-A1FA-0FD4858D90B6} $(MSIBUILD_PRODUCT_NAME_UC)BINDIR 256 fileEAPTTLS.dll.x64 compEAPTTLS.dll.x64 {A1F62401-03F1-4D4E-A1FA-0FD4858D90B6} $(MSIBUILD_PRODUCT_NAME_UC)BINDIR 256 fileEAPTTLS.dll.x64
!ENDIF !ENDIF
compEAPTTLSPeerDllPath {29FD2FDC-9289-47F0-96A3-C21AEE587B5B} $(MSIBUILD_PRODUCT_NAME_UC)BINDIR $(MSIBUILD_COMPONENT_ATTRIB_REGISTRY) regEAPTTLSPeerDllPath
compEAPTTLSPeerFriendlyName {E3250ECE-E59F-4693-B290-925B80929EAE} $(MSIBUILD_PRODUCT_NAME_UC)BINDIR $(MSIBUILD_COMPONENT_ATTRIB_REGISTRY) regEAPTTLSPeerFriendlyName
compEAPTTLSPeerInvokePasswordDialog {9A426E96-6E79-4BA9-83DD-7A205CA43810} $(MSIBUILD_PRODUCT_NAME_UC)BINDIR $(MSIBUILD_COMPONENT_ATTRIB_REGISTRY) regEAPTTLSPeerInvokePasswordDialog
compEAPTTLSPeerInvokeUsernameDialog {92E9B700-3D91-4C6F-BBD8-99888D7A2387} $(MSIBUILD_PRODUCT_NAME_UC)BINDIR $(MSIBUILD_COMPONENT_ATTRIB_REGISTRY) regEAPTTLSPeerInvokeUsernameDialog
compEAPTTLSProperties {266DE96B-8115-407A-B69C-1D2FDC8FEF42} $(MSIBUILD_PRODUCT_NAME_UC)BINDIR $(MSIBUILD_COMPONENT_ATTRIB_REGISTRY) regEAPTTLSProperties
<<NOKEEP <<NOKEEP
@ -122,7 +128,13 @@ Feature_ Component_
s$(MSIBUILD_LENGTH_ID) s$(MSIBUILD_LENGTH_ID) s$(MSIBUILD_LENGTH_ID) s$(MSIBUILD_LENGTH_ID)
FeatureComponents Feature_ Component_ FeatureComponents Feature_ Component_
featEAPTTLS compEAPMethodEvents.dll.$(PLAT) featEAPTTLS compEAPMethodEvents.dll.$(PLAT)
featEAPTTLS compEAPHostAuthor
featEAPTTLS compEAPTTLS.dll.$(PLAT) featEAPTTLS compEAPTTLS.dll.$(PLAT)
featEAPTTLS compEAPTTLSPeerDllPath
featEAPTTLS compEAPTTLSPeerFriendlyName
featEAPTTLS compEAPTTLSPeerInvokePasswordDialog
featEAPTTLS compEAPTTLSPeerInvokeUsernameDialog
featEAPTTLS compEAPTTLSProperties
<<NOKEEP <<NOKEEP
@ -142,6 +154,26 @@ fileEAPTTLS.dll.$(PLAT) compEAPTTLS.dll.$(PLAT) EAPTTLS.dll 0 0 1536 1
<<NOKEEP <<NOKEEP
######################################################################
# Registry
All :: "$(LANG).$(PLAT).$(CFG).Registry-1.idt"
"$(LANG).$(PLAT).$(CFG).Registry-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
-if exist $@ del /f /q $@
move /y << $@ > NUL
Registry Root Key Name Value Component_
s$(MSIBUILD_LENGTH_ID) i2 l255 L255 L0 s$(MSIBUILD_LENGTH_ID)
Registry Registry
regEAPHostAuthor 2 SYSTEM\CurrentControlSet\services\EapHost\Methods\67532 $(MSIBUILD_PRODUCT_NAME) compEAPHostAuthor
regEAPTTLSPeerDllPath 2 SYSTEM\CurrentControlSet\services\EapHost\Methods\67532\21 PeerDllPath [#fileEAPTTLS.dll.$(PLAT)] compEAPTTLSPeerDllPath
regEAPTTLSPeerFriendlyName 2 SYSTEM\CurrentControlSet\services\EapHost\Methods\67532\21 PeerFriendlyName @[#fileEAPTTLS.dll.$(PLAT)],-1 compEAPTTLSPeerFriendlyName
regEAPTTLSPeerInvokePasswordDialog 2 SYSTEM\CurrentControlSet\services\EapHost\Methods\67532\21 PeerInvokePasswordDialog #0 compEAPTTLSPeerInvokePasswordDialog
regEAPTTLSPeerInvokeUsernameDialog 2 SYSTEM\CurrentControlSet\services\EapHost\Methods\67532\21 PeerInvokeUsernameDialog #0 compEAPTTLSPeerInvokeUsernameDialog
regEAPTTLSProperties 2 SYSTEM\CurrentControlSet\services\EapHost\Methods\67532\21 Properties #389871807 compEAPTTLSProperties
<<NOKEEP
###################################################################### ######################################################################
# Build MSM module! # Build MSM module!
###################################################################### ######################################################################

BIN
EAPMethods/build/EAPTTLS.rc
View File

Binary file not shown.

94
Makefile
View File

@ -73,6 +73,8 @@ Setup \
SetupDebug \ SetupDebug \
Register \ Register \
Unregister \ Unregister \
StopServices \
StartServices \
Publish :: "MSI\MSIBuild\Version\Version.mak" Publish :: "MSI\MSIBuild\Version\Version.mak"
$(MAKE) /f "Makefile" /$(MAKEFLAGS) HAS_VERSION=1 $@ $(MAKE) /f "Makefile" /$(MAKEFLAGS) HAS_VERSION=1 $@
@ -137,30 +139,62 @@ SetupDebug :: \
# "$(OUTPUT_DIR)\Setup\$(PRODUCT_NAME)Sl32D.msi" \ # "$(OUTPUT_DIR)\Setup\$(PRODUCT_NAME)Sl32D.msi" \
# "$(OUTPUT_DIR)\Setup\$(PRODUCT_NAME)Sl64D.msi" # "$(OUTPUT_DIR)\Setup\$(PRODUCT_NAME)Sl64D.msi"
#Register :: \ Register :: \
# RegisterSettings \ StopServices \
RegisterDLLs \
StartServices \
# RegisterShortcuts # RegisterShortcuts
#
#Unregister :: \ Unregister :: \
# UnregisterShortcuts \ # UnregisterShortcuts \
# UnregisterSettings StopServices \
# UnregisterDLLs \
#RegisterSettings :: StartServices
# reg.exe add "HKLM\Software\Amebis\$(PRODUCT_NAME)" /v "LocalizationRepositoryPath" /t REG_SZ /d "$(MAKEDIR)\$(OUTPUT_DIR)\locale" $(REG_FLAGS) > NUL
# reg.exe add "HKLM\Software\Amebis\$(PRODUCT_NAME)" /v "DatabasePath" /t REG_SZ /d "$(MAKEDIR)\$(OUTPUT_DIR)\data" $(REG_FLAGS) > NUL StartServices ::
#!IF "$(PROCESSOR_ARCHITECTURE)" == "AMD64" cmd.exe /c <<"$(TEMP)\start_EapHost.bat"
# reg.exe add "HKLM\Software\Amebis\$(PRODUCT_NAME)" /v "LocalizationRepositoryPath" /t REG_SZ /d "$(MAKEDIR)\$(OUTPUT_DIR)\locale" $(REG_FLAGS32) > NUL @echo off
# reg.exe add "HKLM\Software\Amebis\$(PRODUCT_NAME)" /v "DatabasePath" /t REG_SZ /d "$(MAKEDIR)\$(OUTPUT_DIR)\data" $(REG_FLAGS32) > NUL net.exe start EapHost
#!ENDIF if errorlevel 3 exit %errorlevel%
# if errorlevel 2 exit 0
#UnregisterSettings :: exit %errorlevel%
# -reg.exe delete "HKLM\Software\Amebis\$(PRODUCT_NAME)" /v "LocalizationRepositoryPath" $(REG_FLAGS) > NUL <<NOKEEP
# -reg.exe delete "HKLM\Software\Amebis\$(PRODUCT_NAME)" /v "DatabasePath" $(REG_FLAGS) > NUL # Enable dot3svc service (Wired AutoConfig) and start it
#!IF "$(PROCESSOR_ARCHITECTURE)" == "AMD64" sc.exe config dot3svc start= auto
# -reg.exe delete "HKLM\Software\Amebis\$(PRODUCT_NAME)" /v "LocalizationRepositoryPath" $(REG_FLAGS32) > NUL cmd.exe /c <<"$(TEMP)\start_dot3svc.bat"
# -reg.exe delete "HKLM\Software\Amebis\$(PRODUCT_NAME)" /v "DatabasePath" $(REG_FLAGS32) > NUL @echo off
#!ENDIF net.exe start dot3svc
# if errorlevel 3 exit %errorlevel%
if errorlevel 2 exit 0
exit %errorlevel%
<<NOKEEP
# Enable Wlansvc service (WLAN AutoConfig) and start it
sc.exe config Wlansvc start= auto
cmd.exe /c <<"$(TEMP)\start_Wlansvc.bat"
@echo off
net.exe start Wlansvc
if errorlevel 3 exit %errorlevel%
if errorlevel 2 exit 0
exit %errorlevel%
<<NOKEEP
StopServices ::
-net.exe stop Wlansvc
-net.exe stop dot3svc
-net.exe stop EapHost
RegisterDLLs :: \
"$(OUTPUT_DIR)\$(PLAT).Debug\EAPTTLS.dll"
reg.exe add "HKLM\SYSTEM\CurrentControlSet\services\EapHost\Methods\67532" /ve /t REG_SZ /d "$(PRODUCT_NAME)" /f > NUL
reg.exe add "HKLM\SYSTEM\CurrentControlSet\services\EapHost\Methods\67532\21" /v "PeerDllPath" /t REG_SZ /d "$(MAKEDIR)\$(OUTPUT_DIR)\$(PLAT).Debug\EAPTTLS.dll" /f > NUL
reg.exe add "HKLM\SYSTEM\CurrentControlSet\services\EapHost\Methods\67532\21" /v "PeerFriendlyName" /t REG_SZ /d "@$(MAKEDIR)\$(OUTPUT_DIR)\$(PLAT).Debug\EAPTTLS.dll,-1" /f > NUL
reg.exe add "HKLM\SYSTEM\CurrentControlSet\services\EapHost\Methods\67532\21" /v "PeerInvokePasswordDialog" /t REG_DWORD /d 0 /f > NUL
reg.exe add "HKLM\SYSTEM\CurrentControlSet\services\EapHost\Methods\67532\21" /v "PeerInvokeUsernameDialog" /t REG_DWORD /d 0 /f > NUL
reg.exe add "HKLM\SYSTEM\CurrentControlSet\services\EapHost\Methods\67532\21" /v "Properties" /t REG_DWORD /d 389871807 /f > NUL
UnregisterDLLs ::
-reg.exe delete "HKLM\SYSTEM\CurrentControlSet\services\EapHost\Methods\67532" /f > NUL
#RegisterShortcuts :: \ #RegisterShortcuts :: \
# "$(PROGRAMDATA)\Microsoft\Windows\Start Menu\Programs\$(PRODUCT_NAME)" \ # "$(PROGRAMDATA)\Microsoft\Windows\Start Menu\Programs\$(PRODUCT_NAME)" \
# "$(PROGRAMDATA)\Microsoft\Windows\Start Menu\Programs\$(PRODUCT_NAME)\$(PRODUCT_NAME).lnk" # "$(PROGRAMDATA)\Microsoft\Windows\Start Menu\Programs\$(PRODUCT_NAME)\$(PRODUCT_NAME).lnk"
@ -237,25 +271,33 @@ $(REDIST_EN_X64) : "$(OUTPUT_DIR)\$(PRODUCT_NAME)64.3.msi"
# Building # Building
###################################################################### ######################################################################
#"$(OUTPUT_DIR)\Win32.Release\$(PRODUCT_NAME).exe" \ "$(OUTPUT_DIR)\Win32.Release\CredWrite.exe" \
"$(OUTPUT_DIR)\Win32.Release\EAPMethodEvents.dll" \
"$(OUTPUT_DIR)\Win32.Release\EAPTTLS.dll" \
"$(OUTPUT_DIR)\$(PRODUCT_NAME)32.3.msi" \ "$(OUTPUT_DIR)\$(PRODUCT_NAME)32.3.msi" \
#"$(OUTPUT_DIR)\$(PRODUCT_NAME)Sl32.3.msi" \ #"$(OUTPUT_DIR)\$(PRODUCT_NAME)Sl32.3.msi" \
:: ::
devenv.com "VS10Solution.sln" /build "Release|Win32" devenv.com "VS10Solution.sln" /build "Release|Win32"
#"$(OUTPUT_DIR)\Win32.Debug\$(PRODUCT_NAME).exe" \ "$(OUTPUT_DIR)\Win32.Debug\CredWrite.exe" \
"$(OUTPUT_DIR)\Win32.Debug\EAPMethodEvents.dll" \
"$(OUTPUT_DIR)\Win32.Debug\EAPTTLS.dll" \
"$(OUTPUT_DIR)\$(PRODUCT_NAME)32D.3.msi" \ "$(OUTPUT_DIR)\$(PRODUCT_NAME)32D.3.msi" \
#"$(OUTPUT_DIR)\$(PRODUCT_NAME)Sl32D.3.msi" #"$(OUTPUT_DIR)\$(PRODUCT_NAME)Sl32D.3.msi"
:: ::
devenv.com "VS10Solution.sln" /build "Debug|Win32" devenv.com "VS10Solution.sln" /build "Debug|Win32"
#"$(OUTPUT_DIR)\x64.Release\$(PRODUCT_NAME).exe" \ "$(OUTPUT_DIR)\x64.Release\CredWrite.exe" \
"$(OUTPUT_DIR)\x64.Release\EAPMethodEvents.dll" \
"$(OUTPUT_DIR)\x64.Release\EAPTTLS.dll" \
"$(OUTPUT_DIR)\$(PRODUCT_NAME)64.3.msi" \ "$(OUTPUT_DIR)\$(PRODUCT_NAME)64.3.msi" \
#"$(OUTPUT_DIR)\$(PRODUCT_NAME)Sl64.3.msi" #"$(OUTPUT_DIR)\$(PRODUCT_NAME)Sl64.3.msi"
:: ::
devenv.com "VS10Solution.sln" /build "Release|x64" devenv.com "VS10Solution.sln" /build "Release|x64"
#"$(OUTPUT_DIR)\x64.Debug\$(PRODUCT_NAME).exe" \ "$(OUTPUT_DIR)\x64.Debug\CredWrite.exe" \
"$(OUTPUT_DIR)\x64.Debug\EAPMethodEvents.dll" \
"$(OUTPUT_DIR)\x64.Debug\EAPTTLS.dll" \
"$(OUTPUT_DIR)\$(PRODUCT_NAME)64D.3.msi" \ "$(OUTPUT_DIR)\$(PRODUCT_NAME)64D.3.msi" \
#"$(OUTPUT_DIR)\$(PRODUCT_NAME)Sl64D.3.msi" #"$(OUTPUT_DIR)\$(PRODUCT_NAME)Sl64D.3.msi"
:: ::