From 5ec274ca0a2df5420236afef83d25da0ac026e14 Mon Sep 17 00:00:00 2001
From: "Jake.Stine" <Jake.Stine@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Sat, 15 May 2010 13:13:55 +0000
Subject: [PATCH] NSIS Installer:  * Added banner image  * (UAC) Re-enabled
 forced-admin mode for now  * Fixed a bug in the vc redist installer.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3016 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 nsis/IsUserAdmin.nsi            |  97 ++++----
 nsis/banner.bmp                 | Bin 0 -> 27414 bytes
 nsis/pcsx2_installer_script.nsi | 426 +++++++++++++++++---------------
 nsis/templates/svnrev_zzogl.nsh |   1 +
 4 files changed, 281 insertions(+), 243 deletions(-)
 create mode 100644 nsis/banner.bmp
 create mode 100644 nsis/templates/svnrev_zzogl.nsh

diff --git a/nsis/IsUserAdmin.nsi b/nsis/IsUserAdmin.nsi
index fee1c81eb..698beeff1 100644
--- a/nsis/IsUserAdmin.nsi
+++ b/nsis/IsUserAdmin.nsi
@@ -1,53 +1,60 @@
-; Author: Lilla (lilla@earthlink.net) 2003-06-13
-; function IsUserAdmin uses plugin \NSIS\PlusgIns\UserInfo.dll
-; This function is based upon code in \NSIS\Contrib\UserInfo\UserInfo.nsi
-; This function was tested under NSIS 2 beta 4 (latest CVS as of this writing).
-;
-; Usage:
-;   Call IsUserAdmin
-;   Pop $R0   ; at this point $R0 is "true" or "false"
-;
+
 Function IsUserAdmin
-  Push $R0
-  Push $R1
-  Push $R2
- 
+
   ClearErrors
   UserInfo::GetName
   IfErrors Win9x
-  Pop $R1
-  UserInfo::GetAccountType
-  Pop $R2
- 
-  StrCmp $R2 "Admin" 0 Continue
 
-  ; Observation: I get here when running Win98SE. (Lilla)
-  ; The functions UserInfo.dll looks for are there on Win98 too, 
-  ; but just don't work. So UserInfo.dll, knowing that admin isn't required
-  ; on Win98, returns admin anyway. (per kichik)
-  ; MessageBox MB_OK 'User "$R1" is in the Administrators group'
-  StrCpy $R0 "true"
-  Goto Done
+  Pop $0
+  UserInfo::GetAccountType
+  Pop $1
  
-  Continue:
-    ; You should still check for an empty string because the functions
-    ; UserInfo.dll looks for may not be present on Windows 95. (per kichik)
-    StrCmp $R2 "" Win9x
-    StrCpy $R0 "false"
-    ;MessageBox MB_OK 'User "$R1" is in the "$R2" group'
-  Goto Done
+  # GetOriginalAccountType will check the tokens of the original user of the
+  # current thread/process. If the user tokens were elevated or limited for
+  # this process, GetOriginalAccountType will return the non-restricted
+  # account type.
+  # On Vista with UAC, for example, this is not the same value when running
+  # with `RequestExecutionLevel user`. GetOriginalAccountType will return
+  # "admin" while GetAccountType will return "user".
+  UserInfo::GetOriginalAccountType
+  Pop $2
+
+  ; Windows9x can sometimes return empty strings... 
+  StrCmp $1 "" 0 +2
+    Goto Win9x
+
+  StrCmp $1 "Admin" 0 +3
+    DetailPrint '(UAC) User "$0" is in the Administrators group'
+    Goto done
+  
+  StrCmp $1 "Power" 0 +3
+    DetailPrint '(UAC) User "$0" is in the Power Users group'
+    Goto done
+  
+  StrCmp $1 "User" 0 +3
+    DetailPrint '(UAC) User "$0" is just a regular user'
+    Goto done
+
+  StrCmp $1 "Guest" 0 +3
+    ; Guest account?  Probably doomed to failure, but might as well try, just in case some shit
+    ; is being mis-reported.
+    DetailPrint '(UAC) User "$0" is a guest -- this installer is probably going to fail.  Good luck.'
+    Goto done
+
+  ;MessageBox MB_OK "Unknown error while trying to detect "
+  DetailPrint "(UAC) Unknown error while trying to detect account type; assuming USER mode."
+  StrCpy $1 "User"
+  Goto done
+
+Win9x:
+  # This one means you don't need to care about admin or
+  # not admin because Windows 9x doesn't either
+  MessageBox MB_OK "Error! PCSX2 requires Windows 2000 or newer to install and run!"
+  Quit
+
+done:
+
+  ; How to return the admin modeas a variable?  NSIS confuses me -- air
+  ;Exch $R0
  
-  Win9x:
-    ; comment/message below is by UserInfo.nsi author:
-    ; This one means you don't need to care about admin or
-    ; not admin because Windows 9x doesn't either
-    ;MessageBox MB_OK "Error! This DLL can't run under Windows 9x!"
-    StrCpy $R0 "true"
- 
-  Done:
-    ;MessageBox MB_OK 'User= "$R1"  AccountType= "$R2"  IsUserAdmin= "$R0"'
- 
-  Pop $R2
-  Pop $R1
-  Exch $R0
 FunctionEnd
\ No newline at end of file
diff --git a/nsis/banner.bmp b/nsis/banner.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..2a288f9fc750130403117cc229887801ed73d3e3
GIT binary patch
literal 27414
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
PhDRyLnm|SPrLz71*m*N_

literal 0
HcmV?d00001

diff --git a/nsis/pcsx2_installer_script.nsi b/nsis/pcsx2_installer_script.nsi
index 896ede3bb..647b3891c 100644
--- a/nsis/pcsx2_installer_script.nsi
+++ b/nsis/pcsx2_installer_script.nsi
@@ -1,16 +1,60 @@
 
 ; PCSX2 NSIS installer script
-; loosely based on a collection of examples and on information from the wikipedia
+; Copyright 2009-2010  PCSX2 Dev Team
 
 ; Application version, changed for each release to match the version
 
-; Always include plugins for now
+; Uncomment this to create a package that includes binaries and binary dependencies only.
 !define INC_PLUGINS
 
-; ----------------------------------------
-; Determine the revision numbers of the various components
-
 !system 'SubWCRev.exe ..\pcsx2 templates\svnrev_pcsx2.nsh svnrev_pcsx2.nsh'
+!include "svnrev_pcsx2.nsh"
+
+;LoadLanguageFile "${NSISDIR}\Contrib\Language files\english.nlf"
+
+; =======================================================================
+;                          Global Names and Such
+; =======================================================================
+
+!define APP_VERSION      "0.9.7"
+!define APP_NAME         "PCSX2 ${APP_VERSION} (r${SVNREV})"
+!define APP_FILENAME     "pcsx2-r${SVNREV}"
+
+!define UNINSTALL_LOG    "Uninst-${APP_FILENAME}"
+
+!define INSTDIR_REG_ROOT "HKLM"
+
+
+; The name of the installer
+Name "${APP_NAME}"
+
+OutFile "${APP_FILENAME}-setup.exe"
+
+; The default installation directory
+InstallDir "$PROGRAMFILES\PCSX2 ${APP_VERSION}"
+
+; Registry key to check for directory (so if you install again, it will 
+; overwrite the old one automatically)
+InstallDirRegKey ${INSTDIR_REG_ROOT} "Software\PCSX2" "Install_Dir"
+
+XPStyle on
+
+; LZMA is the best, by far, so let's make sure it's always in use:
+;  (dictionaries larger than 24MB don't seem to help)
+SetCompressor /SOLID lzma
+SetCompressorDictSize 24
+
+; These defines are dependent on NSIS vars assigned above.
+
+!define APP_EXE          "$INSTDIR\${APP_FILENAME}.exe"
+!define INSTDIR_REG_KEY  "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_FILENAME}"
+
+Var DirectXSetupError
+
+; =======================================================================
+;                             Plugin Includes
+; =======================================================================
+; Note that zzOgl is disabled for now because it requires CG dependencies to be installed.
 
 !ifdef INC_PLUGINS
   !system 'SubWCRev.exe ..\plugins\gsdx       templates\svnrev_gsdx.nsh     svnrev_gsdx.nsh'
@@ -18,38 +62,72 @@
   !system 'SubWCRev.exe ..\plugins\cdvdiso    templates\svnrev_cdvdiso.nsh  svnrev_cdvdiso.nsh'
   !system 'SubWCRev.exe ..\plugins\lilypad    templates\svnrev_lilypad.nsh  svnrev_lilypad.nsh'
   !system 'SubWCRev.exe ..\plugins\zerogs\dx  templates\svnrev_zerogs.nsh   svnrev_zerogs.nsh'
+  ;!system 'SubWCRev.exe ..\plugins\zzogl-pg   templates\svnrev_zzogl.nsh    svnrev_zzogl.nsh'
   !system 'SubWCRev.exe ..\plugins\zerospu2   templates\svnrev_zerospu2.nsh svnrev_zerospu2.nsh'
-!endif
 
-!include "svnrev_pcsx2.nsh"
-
-!ifdef INC_PLUGINS
   !include "svnrev_gsdx.nsh"
   !include "svnrev_spu2x.nsh"
   !include "svnrev_cdvdiso.nsh"
   !include "svnrev_lilypad.nsh"
   !include "svnrev_zerogs.nsh"
+  ;!include "svnrev_zzogl.nsh"
   !include "svnrev_zerospu2.nsh"
 !endif
 
-; ----------------------------------------
-
-!define APP_NAME "PCSX2 0.9.7 (r${SVNREV})"
-!define APP_FILENAME "pcsx2-r${SVNREV}"
-!define APP_EXE "${APP_FILENAME}.exe"
-
-!define UNINSTALL_LOG "Uninst-${APP_FILENAME}"
-
-!define INSTDIR_REG_ROOT "HKLM"
-!define INSTDIR_REG_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}"
-
-
-; ----------------------------------------
-; Include Modern UI 2 and advanced log uninstaller.
 
 !include "MUI2.nsh"
 !include "AdvUninstLog.nsh"
 
+; =======================================================================
+;                          Vista/Win7 UAC Stuff
+; =======================================================================
+
+!include "IsUserAdmin.nsi"
+
+; Allow admin-rights PCSX2 users to be hardcore!
+AllowRootDirInstall true
+
+; FIXME !!
+; Request application privileges for Windows Vista/7; I'd love for this to be sensible about which
+; execution level it requests, but UAC is breaking my mind.  I included some code for User type
+; detection in function IsUserAdmin, but not really using it constructively yet.  (see also our
+; uses of SetShellVarContext in the installer sections) 
+RequestExecutionLevel admin
+
+; This defines the Advanced Uninstaller mode of operation...
+!insertmacro UNATTENDED_UNINSTALL
+
+!define MUI_HEADERIMAGE
+!define MUI_HEADERIMAGE_BITMAP "banner.bmp"
+!define MUI_COMPONENTSPAGE_NODESC
+
+!insertmacro MUI_PAGE_COMPONENTS 
+!insertmacro MUI_PAGE_DIRECTORY
+!insertmacro MUI_PAGE_INSTFILES
+  
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_COMPONENTS
+!insertmacro MUI_UNPAGE_INSTFILES
+
+!insertmacro MUI_LANGUAGE "English"
+
+; =======================================================================
+;                            Setup.exe Properties
+; =======================================================================
+; (for the professionalism!!)
+
+VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName"     "${APP_NAME}"
+;VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments"        "A test comment"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright"  "© 2010 PCSX2 Dev Team"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "Installs PCSX2, a Playstation 2 Emulator for the PC"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion"     "${APP_VERSION}.${SVNREV}"
+
+VIProductVersion "${APP_VERSION}.${SVNREV}"
+
+; =======================================================================
+;                            Installer Sections
+; =======================================================================
+
 ; -------------------------------------
 ; Test if Visual Studio Redistributables 2008 SP1 installed
 ; Returns -1 if there is no VC redistributables intstalled
@@ -60,7 +138,6 @@ Function CheckVCRedist
    ClearErrors
    ReadRegDword $R0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{9A25302D-30C0-39D9-BD6F-21E6EC160475}" "Version"
 
-   ; if VS 2008+ redist SP1 not installed, install it
    IfErrors 0 VSRedistInstalled
    StrCpy $R0 "-1"
 
@@ -69,64 +146,28 @@ VSRedistInstalled:
    
 FunctionEnd
 
-; ----------------------------------------
-
-; The name of the installer
-Name "${APP_NAME}"
-
-OutFile "${APP_FILENAME}-setup.exe"
-
-; The default installation directory
-InstallDir "$PROGRAMFILES\PCSX2 0.9.7"
-
-; Registry key to check for directory (so if you install again, it will 
-; overwrite the old one automatically)
-InstallDirRegKey HKLM "Software\PCSX2" "Install_Dir"
-
-; Allow PCSX2 users to be hardcore!
-AllowRootDirInstall true
-
-XPStyle on
-
-; [TODO] / FIXME !!
-; We need to detect the user's accessibility mode in order to select the right shell context.  If the
-; user is an admin, Windows7 and Vista will DEFAULT to an "all" shell context (installing shortcuts for all
-; users), even if we don't want it to (which causes the uninstaller to fail!)
-; If the user is not an admin, setting Shell Context to all will cause the installer to fail because the
-; user won't have permission enough to install it at all (sigh).
-;
-; Solution! Detect the user's permission level, and install accordingly.  I've included a script to do
-; the detection in IsUserAdmin.nsh (untested, dunno if it compiles with latest NSIS).  Now we just
-; need to include it and call it, etc. :)
-
-SetShellVarContext all
-
-; Request application privileges for Windows Vista (shouldn't be needed anymore!  -- air)
-;RequestExecutionLevel admin
-
-
-Var DirectXSetupError
-
-
-; ----------------------------------------
-; Pages
-
-  !insertmacro UNATTENDED_UNINSTALL
-  !define MUI_COMPONENTSPAGE_NODESC ;no decription is really necessary at this stage...
-  !insertmacro MUI_PAGE_COMPONENTS 
-  !insertmacro MUI_PAGE_DIRECTORY
-  !insertmacro MUI_PAGE_INSTFILES
-  
-  !insertmacro MUI_UNPAGE_CONFIRM
-  !insertmacro MUI_UNPAGE_COMPONENTS
-  !insertmacro MUI_UNPAGE_INSTFILES
-
-
-; ----------------------------------------
+; -----------------------------------------------------------------------
 ; Basic section (emulation proper)
 Section "${APP_NAME} (required)"
 
   SectionIn RO
+
+  ; --- UAC NIGHTMARES ---
+  ; Ideally this would default to 'current' for user-level installs and 'all' for admin-level installs.
+  ; There are problems to be aware of, however!
+  ;
+  ; * If the user is an admin, Windows Vista/7 will DEFAULT to an "all" shell context (installing shortcuts
+  ;   for all users), even if we don't want it to (which causes the uninstaller to fail!)
+  ; * If the user is not an admin, setting Shell Context to all will cause the installer to fail because the
+  ;   user won't have permission enough to install it at all (sigh).
+  ;
+  ; For now we just require Admin rights to install PCSX2.  An ideal solution would be to use our IsUserAdmin
+  ; function to auto-detect and modify nsis installer behavior accordingly.
+  ;
+  ; (note!  the SetShellVarContext use in the uninstaller section must match this one!)
+
+  SetShellVarContext all
+  ;SetShellVarContext current
   
   ; Note that v3 pthreads is compatible with v4 pthreads, so we just copy v4 oover both
   ; filenames.  This allows many older plugin versions to continue to work.  (note that
@@ -140,41 +181,41 @@ Section "${APP_NAME} (required)"
   File           /oname=w32pthreads.v3.dll        ..\bin\w32pthreads.v4.dll
   !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
 
-  ; -- Languages and Patches --
+  ; ------------------------------------------
+  ;        -- Languages and Patches --
+  ; ------------------------------------------
 
   ; In 0.9.7 there is only English, so including the other mo files (for now) is pointless.
   ; This code will be re-enabled when the new GUI is translated.
   
-  ;SetOutPath $INSTDIR\Langs
-  ;!insertmacro UNINSTALL.LOG_OPEN_INSTALL
-  ;File /nonfatal /r ..\bin\Langs\*.mo
-  ;!insertmacro UNINSTALL.LOG_CLOSE_INSTALL
-
-  SetOutPath $INSTDIR\Patches
-  !insertmacro UNINSTALL.LOG_OPEN_INSTALL
-  File /r ..\bin\Patches\*.pnach
-  !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
+  !ifdef INC_LANGS
+    SetOutPath $INSTDIR\Langs
+    !insertmacro UNINSTALL.LOG_OPEN_INSTALL
+    File /nonfatal /r ..\bin\Langs\*.mo
+    !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
+!endif
 
+  ; ------------------------------------------
+  ;          -- Plugins Section --
+  ; ------------------------------------------
+  SetOutPath $INSTDIR\Plugins
 
   ; NULL plugins are required, and really there should be more but we don't have working
-  ; SPU2 null plugins right now.  (note: no install logging performed here -- nulls
-  ; are removed manually by name)
-  
-  SetOutPath $INSTDIR\Plugins
+  ; SPU2 null plugins right now.
+ 
+  !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
   File ..\bin\Plugins\GSnull.dll
   ;File ..\bin\Plugins\SPU2null.dll            
   File ..\bin\Plugins\USBnull.dll
   File ..\bin\Plugins\DEV9null.dll
   File ..\bin\Plugins\FWnull.dll
   File ..\bin\Plugins\CDVDnull.dll
+  !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
 
   ; -- Other plugins --
 
 !ifdef INC_PLUGINS
 
-  SetOutPath "$INSTDIR\Plugins"
-  !insertmacro UNINSTALL.LOG_OPEN_INSTALL
-
   File /nonfatal /oname=gsdx-sse2-r${SVNREV_GSDX}.dll    ..\bin\Plugins\gsdx-sse2.dll
   File /nonfatal /oname=gsdx-ssse3-r${SVNREV_GSDX}.dll   ..\bin\Plugins\gsdx-ssse3.dll 
   File /nonfatal /oname=gsdx-sse4-r${SVNREV_GSDX}.dll    ..\bin\Plugins\gsdx-sse4.dll  
@@ -185,9 +226,14 @@ Section "${APP_NAME} (required)"
   File /nonfatal /oname=zerogs-r${SVNREV_ZEROGS}.dll     ..\bin\Plugins\zerogs.dll     
   File /nonfatal /oname=zerospu2-r${SVNREV_ZEROSPU2}.dll ..\bin\Plugins\zerospu2.dll   
 
-  !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
 !endif
 
+  !insertmacro UNINSTALL.LOG_CLOSE_INSTALL
+
+  ; ------------------------------------------
+  ;         -- Registry Section --
+  ; ------------------------------------------
+
   ; Write the installation path into the registry
   WriteRegStr HKLM Software\PCSX2 "Install_Dir" "$INSTDIR"
   
@@ -200,30 +246,7 @@ Section "${APP_NAME} (required)"
 
 SectionEnd
 
-; ----------------------------------------
-; MSVC Redistributable - required if the user des not already have it
-; Note: if your NSIS generates an error here it means you need to download the latest
-; visual studio redist package from microsoft.  Any redist 2008/SP1 or newer will do.
-Section "Microsoft Visual C++ 2008 SP1 Redist (required)"
-
-  SectionIn RO
-
-  SetOutPath "$TEMP"
-  
-  File "vcredist_x86.exe"
-  Call CheckVCRedist
-  StrCmp $R0 "-1" installRedist
-    DetailPrint "Visual C++ 2008 SP1 Redistributable already installed, skipping..."
-    Goto skipRedist
-
-  installRedist:
-    ExecWait "$TEMP\vcredist_x86.exe"
-
-SkipRedist:  
-SectionEnd
-
-
-; ----------------------------------------
+; -----------------------------------------------------------------------
 ; Start Menu - Optional section (can be disabled by the user)
 Section "Start Menu Shortcuts"
 
@@ -231,8 +254,8 @@ Section "Start Menu Shortcuts"
   SetOutPath "$INSTDIR"
   
   CreateDirectory "$SMPROGRAMS\PCSX2"
-  CreateShortCut "$SMPROGRAMS\PCSX2\Uninstall ${APP_NAME}.lnk"  "${UNINST_EXE}"   "" "${UNINST_EXE}"  0
-  CreateShortCut "$SMPROGRAMS\PCSX2\${APP_NAME}.lnk"            "$INSTDIR\${APP_EXE}"      "" "$INSTDIR\${APP_EXE}"     0
+  CreateShortCut "$SMPROGRAMS\PCSX2\Uninstall ${APP_NAME}.lnk"  "${UNINST_EXE}"      ""    "${UNINST_EXE}"    0
+  CreateShortCut "$SMPROGRAMS\PCSX2\${APP_NAME}.lnk"            "${APP_EXE}"         ""    "${APP_EXE}"       0
 
   ;IfFileExists ..\bin\pcsx2-dev.exe 0 +2
   ;  CreateShortCut "PCSX2\pcsx2-dev-r${SVNREV}.lnk"  "$INSTDIR\pcsx2-dev-r${SVNREV}.exe"  "" "$INSTDIR\pcsx2-dev-r${SVNREV}.exe" 0 "" "" \
@@ -240,7 +263,7 @@ Section "Start Menu Shortcuts"
 
 SectionEnd
 
-; ----------------------------------------
+; -----------------------------------------------------------------------
 ; Desktop Icon - Optional section (can be disabled by the user)
 Section "Desktop Shortcut"
 
@@ -251,14 +274,36 @@ Section "Desktop Shortcut"
     
 SectionEnd
 
-; ----------------------------------------
+; -----------------------------------------------------------------------
+; MSVC Redistributable - required if the user does not already have it
+; Note: if your NSIS generates an error here it means you need to download the latest
+; visual studio redist package from microsoft.  Any redist 2008/SP1 or newer will do.
+Section "Microsoft Visual C++ 2008 SP1 Redist (required)"
+
+  SectionIn RO
+
+  SetOutPath "$TEMP"
+  
+  File "vcredist_x86.exe"
+  Call CheckVCRedist
+  StrCmp $R0 "-1" skipRedist
+  ExecWait "$TEMP\vcredist_x86.exe"
+
+skipRedist:  
+  DetailPrint "Visual C++ 2008 SP1 Redistributable already installed, skipping..."
+SectionEnd
+
+; -----------------------------------------------------------------------
 ; This section needs to be last, so that in case it fails, the rest of the program will
-; be installed cleanly.  It's also optional, just because (though highly recommended).
-;                                    
-Section "DirectX Web Setup (recommended)" SEC_DIRECTX
-                                                                              
- ;SectionIn RO                                                                
+; be installed cleanly.
+; 
+; This section could be optional, but why not?  It's pretty painless to double-check that
+; all the libraries are up-to-date.
+;
+Section "DirectX Web Setup (required)" SEC_DIRECTX
                                                                               
+ SectionIn RO
+
  SetOutPath "$TEMP"
  File "dxwebsetup.exe"
  DetailPrint "Running DirectX Web Setup..."
@@ -270,31 +315,37 @@ Section "DirectX Web Setup (recommended)" SEC_DIRECTX
 SectionEnd
 
 ;--------------------------------
-
 Function .onInit
 
-        ;prepare log always within .onInit function
-        !insertmacro UNINSTALL.LOG_PREPARE_INSTALL
+  ;prepare Advanced Uninstall log always within .onInit function
+  !insertmacro UNINSTALL.LOG_PREPARE_INSTALL
+
+  ; MORE UAC HELL ---------- >
+  call IsUserAdmin
 
 FunctionEnd
 
 
 Function .onInstSuccess
 
-         ;create/update log always within .onInstSuccess function
-         !insertmacro UNINSTALL.LOG_UPDATE_INSTALL
+  ;create/update log always within .onInstSuccess function
+  !insertmacro UNINSTALL.LOG_UPDATE_INSTALL
 
 FunctionEnd
 
 
-; ---------------------------------------------------
-;                 Uninstaller Section
-; ---------------------------------------------------
+; =======================================================================
+;                           Un.Installer Sections
+; =======================================================================
 
-; -------------------------------------
 ; Safe directory deletion code. :)
 ; 
 Function un.DeleteDirIfEmpty
+
+  ; Use $TEMP as the out dir when removing directories, since NSIS won't let us remove the
+  ; "current" directory.
+  SetOutPath "$TEMP"
+
   FindFirst $R0 $R1 "$0\*.*"
   strcmp $R1 "." 0 NoDelete
    FindNext $R0 $R1
@@ -311,60 +362,63 @@ FunctionEnd
 
 Function un.removeShorties
 
-    ; Remove shortcuts, if any
+  ; Remove shortcuts, if any
 
-    Delete "$DESKTOP\${APP_NAME}.lnk"
+  Delete "$DESKTOP\${APP_NAME}.lnk"
 
-    Delete "$SMPROGRAMS\PCSX2\Uninstall ${APP_NAME}.lnk"
-    Delete "$SMPROGRAMS\PCSX2\${APP_NAME}.lnk"
-    ;Delete "$SMPROGRAMS\PCSX2\pcsx2-dev-r${SVNREV}.lnk"
-    
-    StrCpy $0 "$SMPROGRAMS\PCSX2"
-    Call un.DeleteDirIfEmpty
+  Delete "$SMPROGRAMS\PCSX2\Uninstall ${APP_NAME}.lnk"
+  Delete "$SMPROGRAMS\PCSX2\${APP_NAME}.lnk"
+  ;Delete "$SMPROGRAMS\PCSX2\pcsx2-dev-r${SVNREV}.lnk"
+
+  StrCpy $0 "$SMPROGRAMS\PCSX2"
+  Call un.DeleteDirIfEmpty
 
 FunctionEnd
 
-; Languages, patches, and null plugins should only be removed if all previous versions of 
-; PCSX2 have been uninstalled.  And we know that's happened when the pcsx2\versions registry
-; key is empty.
-Function un.removeSharedJunk
-    !insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR\Langs"
-    !insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR\Patches"
+; -----------------------------------------------------------------------
+Section "Un.Core Executables ${APP_NAME}"
 
-    Delete "$INSTDIR\Plugins\GSnull.dll"
-    ;Delete "$INSTDIR\Plugins\SPU2null.dll"
-    Delete "$INSTDIR\Plugins\USBnull.dll"
-    Delete "$INSTDIR\Plugins\DEV9null.dll"
-    Delete "$INSTDIR\Plugins\FWnull.dll"
-    Delete "$INSTDIR\Plugins\CDVDnull.dll"
-FunctionEnd
-
-
-Section "Un.Basic Removal (removes only files installed by this package) ${APP_NAME}"
+  SetShellVarContext all
 
   !insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR"
 
-  MessageBox MB_YESNO "Also remove plugins that were installed with this package?" IDYES true IDNO false
-  true:
-    !insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR\Plugins"
-  false:
-    !insertmacro UNINSTALL.LOG_END_UNINSTALL
-
   ; Remove registry keys (but only the ones related to the installer -- user options remain)
   DeleteRegKey HKLM "${INSTDIR_REG_KEY}"
   DeleteRegKey ${INSTDIR_REG_ROOT} "${INSTDIR_REG_KEY}"
 
   Call un.removeShorties
 
-  ; Use $TEMP as the out dir when removing directories, since NSIS won't let us remove the
-  ; "current" directory.
+SectionEnd
 
-  SetOutPath "$TEMP"
+; -----------------------------------------------------------------------
+Section "Un.Shared Components (DLLs, Languages, etc)"
+
+  MessageBox MB_YESNO "WARNING!  If you have multiple versions of PCSX2 installed, removing all shared files will probably break them.  Are you sure you want to proceed?" \
+    IDYES true IDNO false
+
+  true:
+    !insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR\Langs"
+    !insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR\Plugins"
+
+    ; Kill the entire PCSX2 registry key.
+    DeleteRegKey HKLM Software\PCSX2
+
+  false:
+    ; User cancelled -- do nothing!!
+
+SectionEnd
+
+; begin uninstall, could be added on top of uninstall section instead
+Function un.onInit
+  !insertmacro UNINSTALL.LOG_BEGIN_UNINSTALL
+FunctionEnd
+
+
+Function un.onUninstSuccess
+  !insertmacro UNINSTALL.LOG_END_UNINSTALL
 
   ; And remove the various install dir(s) but only if they're clean of user content:
-  StrCpy $0 "$INSTDIR\patches"
-  Call un.DeleteDirIfEmpty
-
+  
   StrCpy $0 "$INSTDIR\langs"
   Call un.DeleteDirIfEmpty
 
@@ -373,29 +427,5 @@ Section "Un.Basic Removal (removes only files installed by this package) ${APP_N
 
   StrCpy $0 "$INSTDIR"
   Call un.DeleteDirIfEmpty
-
-SectionEnd
-
-Section "Un.Full Removal (completely removes all PCSX2 program files and folders)"
-
-  MessageBox MB_YESNO "WARNING!  This will remove *all* files in $INSTDIR.  If you have multiple versions of PCSX2 installed, this *will* break them all!  Are you sure you want to proceed?" IDYES true IDNO false
-  true:
-
-  RMDir /r "$INSTDIR"
-  Call un.removeShorties
-
-  ; Kill the entire PCSX2 registry key, along with installer junk.
-  DeleteRegKey HKLM Software\PCSX2
-  DeleteRegKey ${INSTDIR_REG_ROOT} "${INSTDIR_REG_KEY}"
-
-  false:
-SectionEnd
-
-; --------------------------------------
-Function un.onInit
-
-         ;begin uninstall, could be added on top of uninstall section instead
-         !insertmacro UNINSTALL.LOG_BEGIN_UNINSTALL
-
 FunctionEnd
 
diff --git a/nsis/templates/svnrev_zzogl.nsh b/nsis/templates/svnrev_zzogl.nsh
new file mode 100644
index 000000000..918f5a78d
--- /dev/null
+++ b/nsis/templates/svnrev_zzogl.nsh
@@ -0,0 +1 @@
+!define SVNREV_ZZOGL      $WCREV$
\ No newline at end of file