From 9853989d0475bb155614b344ac9f148e81cdc7a7 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Thu, 19 May 2016 13:41:25 +0200 Subject: [PATCH] EAP method DLL registration added --- EAPMethods/MSIBuild/Makefile | 32 ++++++++++++ EAPMethods/build/EAPTTLS.rc | Bin 4872 -> 5206 bytes Makefile | 94 +++++++++++++++++++++++++---------- 3 files changed, 100 insertions(+), 26 deletions(-) diff --git a/EAPMethods/MSIBuild/Makefile b/EAPMethods/MSIBuild/Makefile index 22ab217..0b26b58 100644 --- a/EAPMethods/MSIBuild/Makefile +++ b/EAPMethods/MSIBuild/Makefile @@ -82,12 +82,18 @@ compEAPMethodEvents.dll.Win32 {E0A1F106-D904-4BAF-9324-94FE6DD12089} $(MSIBUILD_ !IF "$(PLAT)" == "x64" compEAPMethodEvents.dll.x64 {594109D7-8FA0-43DF-8CA6-FE1562AAC1C1} $(MSIBUILD_PRODUCT_NAME_UC)BINDIR 256 fileEAPMethodEvents.dll.x64 !ENDIF +compEAPHostAuthor {086E042A-6741-459D-92F0-F5CCFA4E34D4} $(MSIBUILD_PRODUCT_NAME_UC)BINDIR $(MSIBUILD_COMPONENT_ATTRIB_REGISTRY) regEAPHostAuthor !IF "$(PLAT)" == "Win32" compEAPTTLS.dll.Win32 {A4A62D2F-DA90-4765-BD8C-D59EA2C01DFE} $(MSIBUILD_PRODUCT_NAME_UC)BINDIR 0 fileEAPTTLS.dll.Win32 !ENDIF !IF "$(PLAT)" == "x64" compEAPTTLS.dll.x64 {A1F62401-03F1-4D4E-A1FA-0FD4858D90B6} $(MSIBUILD_PRODUCT_NAME_UC)BINDIR 256 fileEAPTTLS.dll.x64 !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 < 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 +<Uwq^Ca3|tKQK&ZeF%uvEm#E{95$B+)>g)k&CBr)VLq%y!%fM^g7 z2Fe97cry4gxC2>^3{DI_46Z;OE*} delta 11 Scmcbn(V@11OK5V0@IL?=qXcyT diff --git a/Makefile b/Makefile index a5226c4..47d0f11 100644 --- a/Makefile +++ b/Makefile @@ -73,6 +73,8 @@ Setup \ SetupDebug \ Register \ Unregister \ +StopServices \ +StartServices \ Publish :: "MSI\MSIBuild\Version\Version.mak" $(MAKE) /f "Makefile" /$(MAKEFLAGS) HAS_VERSION=1 $@ @@ -137,30 +139,62 @@ SetupDebug :: \ # "$(OUTPUT_DIR)\Setup\$(PRODUCT_NAME)Sl32D.msi" \ # "$(OUTPUT_DIR)\Setup\$(PRODUCT_NAME)Sl64D.msi" -#Register :: \ -# RegisterSettings \ +Register :: \ + StopServices \ + RegisterDLLs \ + StartServices \ # RegisterShortcuts -# -#Unregister :: \ + +Unregister :: \ # UnregisterShortcuts \ -# UnregisterSettings -# -#RegisterSettings :: -# 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 -#!IF "$(PROCESSOR_ARCHITECTURE)" == "AMD64" -# reg.exe add "HKLM\Software\Amebis\$(PRODUCT_NAME)" /v "LocalizationRepositoryPath" /t REG_SZ /d "$(MAKEDIR)\$(OUTPUT_DIR)\locale" $(REG_FLAGS32) > NUL -# reg.exe add "HKLM\Software\Amebis\$(PRODUCT_NAME)" /v "DatabasePath" /t REG_SZ /d "$(MAKEDIR)\$(OUTPUT_DIR)\data" $(REG_FLAGS32) > NUL -#!ENDIF -# -#UnregisterSettings :: -# -reg.exe delete "HKLM\Software\Amebis\$(PRODUCT_NAME)" /v "LocalizationRepositoryPath" $(REG_FLAGS) > NUL -# -reg.exe delete "HKLM\Software\Amebis\$(PRODUCT_NAME)" /v "DatabasePath" $(REG_FLAGS) > NUL -#!IF "$(PROCESSOR_ARCHITECTURE)" == "AMD64" -# -reg.exe delete "HKLM\Software\Amebis\$(PRODUCT_NAME)" /v "LocalizationRepositoryPath" $(REG_FLAGS32) > NUL -# -reg.exe delete "HKLM\Software\Amebis\$(PRODUCT_NAME)" /v "DatabasePath" $(REG_FLAGS32) > NUL -#!ENDIF -# + StopServices \ + UnregisterDLLs \ + StartServices + +StartServices :: + cmd.exe /c <<"$(TEMP)\start_EapHost.bat" +@echo off +net.exe start EapHost +if errorlevel 3 exit %errorlevel% +if errorlevel 2 exit 0 +exit %errorlevel% +< 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 :: \ # "$(PROGRAMDATA)\Microsoft\Windows\Start Menu\Programs\$(PRODUCT_NAME)" \ # "$(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 ###################################################################### -#"$(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)Sl32.3.msi" \ :: 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)Sl32D.3.msi" :: 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)Sl64.3.msi" :: 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)Sl64D.3.msi" ::