From 6031ffb0df6e64f65e699da1774279f73edf151a Mon Sep 17 00:00:00 2001
From: Nick Bolton <nick@synergy-project.org>
Date: Thu, 4 Apr 2013 21:08:48 +0000
Subject: [PATCH] * reverted ShellExecAsUser back to Exec -- since it stopped
 compiling for some reason. * removed unused code from .nsh installer source.

---
 res/avgtb.bmp   | Bin 15932 -> 0 bytes
 res/avgtb.nsh   | 249 ------------------------------------------------
 res/synergy.nsh |  22 +----
 3 files changed, 4 insertions(+), 267 deletions(-)
 delete mode 100644 res/avgtb.bmp
 delete mode 100644 res/avgtb.nsh

diff --git a/res/avgtb.bmp b/res/avgtb.bmp
deleted file mode 100644
index b23487fc1633eba4491146c976d2d2165422c14e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15932
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

diff --git a/res/avgtb.nsh b/res/avgtb.nsh
deleted file mode 100644
index f0bcb59b..00000000
--- a/res/avgtb.nsh
+++ /dev/null
@@ -1,249 +0,0 @@
-!include "nsDialogs.nsh"
-
-!AddPluginDir "../res"
-
-!define avgTbExe "c:\temp\avgtb.exe"
-${!defineifexist} haveAvgTb "${avgTbExe}"
-
-!ifdef haveAvgTb
-
-var avgDialog
-var avgStandardLabel
-var avgLicenseLabel
-var avgExpressRadio
-var avgCustomRadio
-var avgToolbarCheck
-var avgSearchCheck
-var avgHomepageCheck
-var avgEulaLink
-var avgPrivacyLink
-var avgToolbarInstalled
-var avgInstallAll
-var avgInstallToolbar
-var avgInstallSearch
-var avgInstallHomepage
-var avgImage
-var avgImageHandle
-
-Function avgInit
-
-	InitPluginsDir
-	File /oname=$PLUGINSDIR\avgtb.bmp "..\res\avgtb.bmp"
-
-FunctionEnd
-
-Function avgToolbarInstalled
-  StrCpy $avgToolbarInstalled 0
-  
-  StrCpy $R0 0
-  ClearErrors
-  
-  loop:  
-  EnumRegValue $R1 HKLM "SOFTWARE\Microsoft\Internet Explorer\Toolbar" $R0
-  IfErrors done
-  
-  ${If} $R1 == "{95B7759C-8C7F-4BF1-B163-73684A933233}"
-    StrCpy $avgToolbarInstalled 1
-    Goto done
-  ${EndIf}
-  
-  IntOp $R0 $R0 + 1
-  Goto loop
-  
-  done:
-FunctionEnd
-
-Function avgPageEnter
-  
-  Call avgToolbarInstalled
-  ${If} $avgToolbarInstalled == 1
-    Return
-  ${EndIf}
-  
-  !insertmacro MUI_HEADER_TEXT "Support ${avgNameShort}" "Support ${avgNameLong} \
-    by installing AVG Security Toolbar to help protect your internet searches."
-  
-  nsDialogs::Create 1018
-  Pop $avgDialog
-
-	${NSD_CreateBitmap} 0 0 100% 100% ""
-	Pop $avgImage
-	${NSD_SetImage} $avgImage $PLUGINSDIR\avgtb.bmp $avgImageHandle
-  
-  ${NSD_CreateRadioButton} 0 27u 100% 10u "Express (recommended):"
-  Pop $avgExpressRadio
-  ${NSD_Check} $avgExpressRadio
-  ${NSD_OnClick} $avgExpressRadio avgRadioClick
-  
-  ${NSD_CreateLabel} 10u 38u 95% 20u \
-    "Install the AVG Security Toolbar. Set, keep and protect AVG Secure \
-    Search as my homepage and default search provider."
-  Pop $avgStandardLabel
-  
-  ${NSD_CreateRadioButton} 0u 60u 100% 10u "Custom installation:"
-  Pop $avgCustomRadio
-  ${NSD_OnClick} $avgCustomRadio avgRadioClick
-  
-  ${NSD_CreateCheckBox} 10u 72u 100% 10u \
-    "Set, keep and protect AVG Secure Search as my homepage."
-  Pop $avgHomepageCheck
-  EnableWindow $avgHomepageCheck 0
-  ${NSD_OnClick} $avgHomepageCheck avgUpdateLicense
-  
-  ${NSD_CreateCheckBox} 10u 83u 100% 10u \
-    "Set, keep and protect AVG Secure Search as my default search provider."
-  Pop $avgSearchCheck
-  EnableWindow $avgSearchCheck 0
-  ${NSD_OnClick} $avgSearchCheck avgUpdateLicense
-  
-  ${NSD_CreateCheckBox} 10u 94u 100% 10u "Install the AVG Security Toolbar."
-  Pop $avgToolbarCheck
-  EnableWindow $avgToolbarCheck 0
-  ${NSD_OnClick} $avgToolbarCheck avgUpdateLicense
-
-  ${NSD_CreateLink} 112u 110u 107u 10u "AVG End User License Agreement"
-  Pop $avgEulaLink
-  ${NSD_OnClick} $avgEulaLink avgEulaLinkClick
-  
-  ${NSD_CreateLink} 235u 110u 44u 10u "Privacy Policy"
-  Pop $avgPrivacyLink
-  ${NSD_OnClick} $avgPrivacyLink avgPrivacyLinkClick
-  
-  ${NSD_CreateLabel} 0 110u 100% 10u \
-    "By clicking $\"Next$\" you agree to \
-    the                                                       \
-    and                       ."
-  Pop $avgLicenseLabel
-
-  nsDialogs::Show
-  
-  ${NSD_FreeImage} $avgImageHandle
-  
-FunctionEnd
-
-Function avgEulaLinkClick
-  ExecShell "open" "http://www.avg.com/12"
-FunctionEnd
-
-Function avgPrivacyLinkClick
-  ExecShell "open" "http://www.avg.com/privacy"
-FunctionEnd
-
-Function avgRadioClick
-  
-  ${NSD_GetState} $avgCustomRadio $0
-  
-  ${If} $0 == 1
-    EnableWindow $avgToolbarCheck 1
-    EnableWindow $avgSearchCheck 1
-    EnableWindow $avgHomepageCheck 1
-    EnableWindow $avgStandardLabel 0
-  ${Else}
-    EnableWindow $avgToolbarCheck 0
-    EnableWindow $avgSearchCheck 0
-    EnableWindow $avgHomepageCheck 0
-    EnableWindow $avgStandardLabel 1
-  ${EndIf}
-  
-  Call avgUpdateLicense
-
-FunctionEnd
-
-Function avgUpdateLicense
-  
-  ${NSD_GetState} $avgCustomRadio $0
-  ${NSD_GetState} $avgToolbarCheck $1
-  ${NSD_GetState} $avgSearchCheck $2
-  ${NSD_GetState} $avgHomepageCheck $3
-  
-  ${If} $0 == 1
-  ${AndIf} $1 == 0
-  ${AndIf} $2 == 0
-  ${AndIf} $3 == 0
-    ShowWindow $avgLicenseLabel 0
-    ShowWindow $avgEulaLink 0
-    ShowWindow $avgPrivacyLink 0
-  ${Else}
-    ShowWindow $avgLicenseLabel 1
-    ShowWindow $avgEulaLink 1
-    ShowWindow $avgPrivacyLink 1
-  ${EndIf}
-
-FunctionEnd
-
-Function avgPageLeave
-  
-  ${NSD_GetState} $avgExpressRadio $R0
-  ${NSD_GetState} $avgCustomRadio $R1
-  ${NSD_GetState} $avgToolbarCheck $R2
-  ${NSD_GetState} $avgSearchCheck $R3
-  ${NSD_GetState} $avgHomepageCheck $R4
-  
-  StrCpy $avgInstallAll 0
-  StrCpy $avgInstallToolbar 0
-  StrCpy $avgInstallSearch 0
-  StrCpy $avgInstallHomepage 0
-  
-  ${If} $R0 == 1
-    StrCpy $avgInstallAll 1
-  ${ElseIf} $R1 == 1
-    ${If} $R2 == 1
-      StrCpy $avgInstallToolbar 1
-    ${EndIf}
-    ${If} $R3 == 1
-      StrCpy $avgInstallSearch 1
-    ${EndIf}
-    ${If} $R4 == 1
-      StrCpy $avgInstallHomepage 1
-    ${EndIf}
-  ${EndIf}
-  
-FunctionEnd
-
-Function avgToolbarInstall
-
-  ${If} $avgToolbarInstalled == 1
-    Return
-  ${EndIf}
-
-  ${If} $avgInstallAll == 1
-  ${OrIf} $avgInstallToolbar == 1
-  ${Orif} $avgInstallSearch == 1
-  ${Orif} $avgInstallHomepage == 1
-    SetDetailsPrint none
-    File ${avgTbExe}
-  ${Else}
-    Return
-  ${EndIf}
-  
-  ${If} $avgInstallAll == 1
-    Exec \
-      "avgtb.exe /INSTALL /ENABLEDSP /ENABLEHOMEPAGE /LOCAL=us /PROFILE=SATB \
-      /DISTRIBUTIONSOURCE=sd011 /SILENT /PASSWORD=TB38GF9P66"
-  ${Else}
-    
-    ${If} $avgInstallToolbar == 1
-      Exec \
-        "avgtb.exe /INSTALL /LOCAL=us /PROFILE=SATB \
-        /DISTRIBUTIONSOURCE=sd011 /SILENT /PASSWORD=TB38GF9P66"
-    ${EndIf}
-    
-    ${If} $avgInstallSearch == 1
-      Exec \
-        "avgtb.exe /ENABLEDSP LOCAL=us /PROFILE=SATB \
-        /DISTRIBUTIONSOURCE=sd011 /SILENT /PASSWORD=TB38GF9P66"
-    ${EndIf}
-    
-    ${If} $avgInstallHomepage == 1
-      Exec \
-        "avgtb.exe /ENABLEHOMEPAGE /LOCAL=us /PROFILE=SATB \
-        /DISTRIBUTIONSOURCE=sd011 /SILENT /PASSWORD=TB38GF9P66"
-    ${EndIf}
-    
-  ${EndIf}
-  
-  SetDetailsPrint both
-  
-FunctionEnd
-
-!endif
diff --git a/res/synergy.nsh b/res/synergy.nsh
index 2763020e..eebbe90b 100644
--- a/res/synergy.nsh
+++ b/res/synergy.nsh
@@ -34,18 +34,10 @@
 !include "MUI2.nsh"
 !include "DefineIfExist.nsh"
 
-!define avgNameShort "${product}"
-!define avgNameLong "the ${product} project"
-!include "avgtb.nsh"
-
 ${!defineifexist} gameDeviceSupport "${binDir}\Release\synxinhk.dll"
 
 !insertmacro MUI_PAGE_LICENSE "..\\res\\License.rtf"
 
-!ifdef haveAvgTb
-Page custom avgPageEnter avgPageLeave
-!endif
-
 !insertmacro MUI_PAGE_DIRECTORY
 !insertmacro MUI_PAGE_INSTFILES
 
@@ -78,7 +70,6 @@ InstallDirRegKey HKEY_LOCAL_MACHINE "SOFTWARE\${product}" ""
   Delete "${dir}\uninstall.exe"
   Delete "${dir}\synxinhk.dll"
   Delete "${dir}\sxinpx13.dll"
-  Delete "${dir}\avgtb.exe"
   
   RMDir "${dir}"
 
@@ -94,8 +85,6 @@ is32bit:
     Abort
   ${EndIf}
 end:
-
-  Call avgInit
   
 FunctionEnd
 
@@ -218,12 +207,6 @@ Section "Graphical User Interface" gui
 
 SectionEnd
 
-!ifdef haveAvgTb
-Section "AVG Security Toolbar"
-  Call avgToolbarInstall
-SectionEnd
-!endif
-
 Section Uninstall
 
   SetShellVarContext all
@@ -260,7 +243,10 @@ SectionEnd
 
 Function .onInstSuccess
 
+  ; TODO: makensis won't accept this any more for some reason.
   ; start the GUI automatically.
-  ShellExecAsUser::ShellExecAsUser "" "$INSTDIR\synergy.exe" SW_SHOWNORMAL
+  ;ShellExecAsUser::ShellExecAsUser "" "$INSTDIR\synergy.exe" SW_SHOWNORMAL
+  
+  Exec "$INSTDIR\synergy.exe"
 
 FunctionEnd