From 3cf00fd4e72a6a2c3696965e1c0e3f55130ebe98 Mon Sep 17 00:00:00 2001
From: Geoffroy Couprie <geal@videolan.org>
Date: Fri, 5 Mar 2010 19:48:17 +0100
Subject: [PATCH] Win32: don't launch VLC as admin after installing

Fixes 3192
---
 Makefile.am                           |   4 +
 extras/package/win32/UAC.dll          | Bin 0 -> 17408 bytes
 extras/package/win32/UAC.nsh          | 191 ++++++++++++++++++++++++++
 extras/package/win32/vlc.win32.nsi.in |  86 +++++++++++-
 4 files changed, 274 insertions(+), 7 deletions(-)
 create mode 100644 extras/package/win32/UAC.dll
 create mode 100644 extras/package/win32/UAC.nsh

diff --git a/Makefile.am b/Makefile.am
index 08ac51d154..d4ad59e62b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,6 +48,8 @@ EXTRA_DIST = \
 	extras/package/rpm/vlc.altlinux.spec \
 	extras/package/win32/vlc.win32.nsi.in \
 	extras/package/win32/spad.nsi.in \
+	extras/package/win32/UAC.nsh \
+	extras/package/win32/UAC.dll \
 	extras/package/win32/languages/declaration.nsh \
 	extras/package/win32/languages/english.nsh \
 	extras/package/win32/languages/french.nsh
@@ -772,6 +774,8 @@ package-win32-base-debug: package-win-common
 # Script installer
 	cp "$(top_builddir)/extras/package/win32/vlc.win32.nsi" "$(win32_destdir)/"
 	cp "$(top_builddir)/extras/package/win32/spad.nsi" "$(win32_destdir)/"
+	cp "$(srcdir)/extras/package/win32/UAC.nsh" "$(win32_destdir)/"
+	cp "$(srcdir)/extras/package/win32/UAC.dll" "$(win32_destdir)/"
 	mkdir "$(win32_destdir)/languages"
 	cp $(srcdir)/extras/package/win32/languages/*.nsh "$(win32_destdir)/languages/"
 
diff --git a/extras/package/win32/UAC.dll b/extras/package/win32/UAC.dll
new file mode 100644
index 0000000000000000000000000000000000000000..edf21305a459975db7d2f35056acda77e48bdfa8
GIT binary patch
literal 17408
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

literal 0
HcmV?d00001

diff --git a/extras/package/win32/UAC.nsh b/extras/package/win32/UAC.nsh
new file mode 100644
index 0000000000..9df8cefd69
--- /dev/null
+++ b/extras/package/win32/UAC.nsh
@@ -0,0 +1,191 @@
+/*
+=======================
+UAC helper include file
+.......................
+
+Macros starting with UAC.I should only be called from the installer and vice versa for UAC.U macros.
+
+*/
+!ifndef UAC_HDR__INC
+!define UAC_HDR__INC
+!include LogicLib.nsh
+
+!define UAC.RunElevatedAndProcessMessages 'UAC::RunElevated '
+!define UAC.Unload 'UAC::Unload '
+!define UAC.StackPush 'UAC::StackPush '
+
+/*!macro _UAC.BuildOnInitElevationFunc _funcprefix
+Function ${_funcprefix}onInit
+!ifmacrodef
+FunctionEnd
+!macroend*/
+
+!macro _UAC.GenerateSimpleFunction _funcprefix _funcName _funcCode
+Function ${_funcprefix}${_funcName}
+${_funcCode}
+#messagebox mb_ok "${_funcprefix}${_funcName}"
+FunctionEnd
+!macroend
+
+!macro _UAC.TryDef _d _v
+!ifndef ${_d}
+!define ${_d} "${_v}"
+!endif
+!macroend
+
+!macro _UAC.InitStrings _modeprefix
+!insertmacro _UAC.TryDef UACSTR.UnDataFile "UAC.dat"
+!insertmacro _UAC.TryDef UACSTR.${_modeprefix}ElvWinErr "Unable to elevate , error $0"
+!ifNdef __UNINSTALL__
+	!insertmacro _UAC.TryDef UACSTR.${_modeprefix}ElvAbortReqAdmin "This installer requires admin access, aborting!"
+	!insertmacro _UAC.TryDef UACSTR.${_modeprefix}ElvMustTryAgain "This installer requires admin access, try again"
+	!else
+	!insertmacro _UAC.TryDef UACSTR.${_modeprefix}ElvAbortReqAdmin "This uninstaller requires admin access, aborting!"
+	!insertmacro _UAC.TryDef UACSTR.${_modeprefix}ElvMustTryAgain "This uninstaller requires admin access, try again"
+	!endif
+!macroend
+
+!ifmacroNdef _UAC.GenerateUninstallerTango
+!macro _UAC.GenerateUninstallerTango UninstallerFileName
+!ifdef __GLOBAL__
+	!error "UAC: Needs to be called inside a function"
+	!endif
+!ifNdef __UNINSTALL__
+	!error "UAC: _UAC.GenerateUninstallerTango should only be called by uninstaller, see http://forums.winamp.com/showthread.php?threadid=280330"
+	!endif
+!ifNdef UAC_UNINSTALLERTANGOFORALLPLATFORMS
+	!include WinVer.nsh
+	!endif
+!insertmacro _UAC.InitStrings 'U.'
+ReadIniStr $0 "$ExeDir\${UACSTR.UnDataFile}" UAC "Un.Ready"
+${IF} $0 != 1
+!ifNdef UAC_UNINSTALLERTANGOFORALLPLATFORMS
+${AndIf} ${AtLeastWinVista}
+!endif
+	InitPluginsDir
+	WriteIniStr "$PluginsDir\${UACSTR.UnDataFile}" UAC "Un.Ready" 1
+	CopyFiles /SILENT "$EXEPATH" "$PluginsDir\${UninstallerFileName}"
+	StrCpy $0 ""
+	${IfThen} ${Silent} ${|} StrCpy $0 "/S " ${|}
+	ExecWait '"$PluginsDir\${UninstallerFileName}" $0/NCRC _?=$INSTDIR' $0
+	SetErrorLevel $0
+	Quit
+	${EndIf}
+!macroend
+!endif
+
+!ifmacroNdef _UAC.GenerateOnInitElevationCode
+!macro _UAC.GenerateOnInitElevationCode _modeprefix
+!ifndef __FUNCTION__
+	!error "UAC: Needs to be called inside a function"
+	!endif
+!insertmacro _UAC.InitStrings ${_modeprefix}
+!define _UAC.GOIECUniq L${__LINE__}
+UAC_Elevate_${_UAC.GOIECUniq}:
+UAC::RunElevated 
+StrCmp 1223 $0 UAC_ElevationAborted_${_UAC.GOIECUniq} ; UAC dialog aborted by user?
+StrCmp 0 $0 0 UAC_Err_${_UAC.GOIECUniq} ; Error?
+StrCmp 1 $1 0 UAC_Success_${_UAC.GOIECUniq} ;Are we the real deal or just the wrapper?
+Quit
+UAC_Err_${_UAC.GOIECUniq}:
+MessageBox mb_iconstop "${UACSTR.${_modeprefix}ElvWinErr}"
+Abort
+UAC_ElevationAborted_${_UAC.GOIECUniq}:
+MessageBox mb_iconstop "${UACSTR.${_modeprefix}ElvAbortReqAdmin}"
+Abort
+UAC_Success_${_UAC.GOIECUniq}:
+# if $0==0 && $3==1, we are a member of the admin group (Any OS)
+# if $0==0 && $1==0, UAC not supported (Probably <NT6), run as normal?
+# if $0==0 && $1==3, we can try to elevate again
+StrCmp 1 $3 /*+4*/ UAC_Done_${_UAC.GOIECUniq} ;Admin?
+StrCmp 3 $1 0 UAC_ElevationAborted_${_UAC.GOIECUniq} ;Try again or abort?
+MessageBox mb_iconexclamation "${UACSTR.${_modeprefix}ElvMustTryAgain}" ;Inform user...
+goto UAC_Elevate_${_UAC.GOIECUniq} ;...lets try again
+UAC_Done_${_UAC.GOIECUniq}:
+!undef _UAC.GOIECUniq
+!macroend
+!endif
+
+!define UAC.I.Elevate.AdminOnly '!insertmacro UAC.I.Elevate.AdminOnly '
+!macro UAC.I.Elevate.AdminOnly
+!insertmacro _UAC.GenerateOnInitElevationCode 'I.'
+!macroend
+
+!define UAC.U.Elevate.AdminOnly '!insertmacro UAC.U.Elevate.AdminOnly '
+!macro UAC.U.Elevate.AdminOnly _UninstallerName
+!ifNdef UAC_DISABLEUNINSTALLERTANGO
+	!insertmacro _UAC.GenerateUninstallerTango "${_UninstallerName}"
+	!endif
+!insertmacro _UAC.GenerateOnInitElevationCode 'U.'
+!macroend
+
+!define UAC.AutoCodeUnload '!insertmacro UAC.AutoCodeUnload '
+!macro UAC.AutoCodeUnload _HasUninstaller
+!insertmacro _UAC.GenerateSimpleFunction "" .OnInstFailed '${UAC.Unload}'
+!insertmacro _UAC.GenerateSimpleFunction "" .OnInstSuccess '${UAC.Unload}'
+!ifNdef MUI_INCLUDED
+	!insertmacro _UAC.GenerateSimpleFunction "" .onUserAbort '${UAC.Unload}'
+	!else
+	!ifNdef MUI_CUSTOMFUNCTION_ABORT
+		!error "UAC: must call $$ {UAC.Unload} in MUI_CUSTOMFUNCTION_ABORT!"
+		!endif
+	!endif
+!if "${_HasUninstaller}" != ""
+	!insertmacro _UAC.GenerateSimpleFunction "un" .onUninstFailed '${UAC.Unload}'
+	!insertmacro _UAC.GenerateSimpleFunction "un" .onUninstSuccess '${UAC.Unload}'
+	!ifNdef MUI_INCLUDED
+		!insertmacro _UAC.GenerateSimpleFunction "un" .onUserAbort '${UAC.Unload}'
+		!else
+		!ifNdef MUI_CUSTOMFUNCTION_ABORT
+			!error "UAC: must call $$ {UAC.Unload} in MUI_CUSTOMFUNCTION_(UN)ABORT!"
+			!endif
+		!endif
+	!endif
+!macroend
+
+!define UAC.FastCallFunctionAsUser '!insertmacro UAC.FastCallFunctionAsUser '
+!macro UAC.FastCallFunctionAsUser _func _var
+GetFunctionAddress ${_var} ${_func}
+UAC::ExecCodeSegment ${_var}
+!macroend
+!define UAC.CallFunctionAsUser '!insertmacro UAC.CallFunctionAsUser '
+!macro UAC.CallFunctionAsUser _func
+push $R9
+!insertmacro UAC.FastCallFunctionAsUser ${_func} $R9
+pop $R9
+!macroend
+
+!define UAC.FastCallGetOuterInstanceHwndParent UAC::GetOuterHwnd
+!define UAC.GetOuterInstanceHwndParent '!insertmacro UAC.GetOuterInstanceHwndParent '
+!macro UAC.GetOuterInstanceHwndParent _var
+push $0
+${UAC.FastCallGetOuterInstanceHwndParent}
+Exch $0
+Pop ${_var}
+!macroend
+
+
+
+!macro _UAC.DumpEx _disp _f _fp _v
+${_f} ${_fp}
+DetailPrint "${_disp}=${_v}"
+!macroend
+!macro _UAC.Dump _f _fp _v
+!insertmacro _UAC.DumpEx `${_f}` `${_f}` `${_fp}` `${_v}`
+!macroend
+!macro _UAC.DbgDetailPrint
+push $0
+push $1
+System::Call /NoUnload "advapi32::GetUserName(t.r0,*i${NSIS_MAX_STRLEN})"
+System::Call "Kernel32::GetComputerName(t.r1,*i${NSIS_MAX_STRLEN})"
+DetailPrint "$1\$0"
+;!insertmacro _UAC.DumpEx "User" System::Call "advapi32::GetUserName(t.r0,*i${NSIS_MAX_STRLEN})" $0
+!insertmacro _UAC.DumpEx "CmdLine" "" "" "$CmdLine"
+!insertmacro _UAC.Dump UAC::IsAdmin "" $0
+!insertmacro _UAC.Dump UAC::SupportsUAC "" $0
+!insertmacro _UAC.Dump UAC::GetElevationType "" $0
+pop $1
+pop $0
+!macroend
+
+!endif /* ifndef UAC_HDR__INC */
\ No newline at end of file
diff --git a/extras/package/win32/vlc.win32.nsi.in b/extras/package/win32/vlc.win32.nsi.in
index f7712f9fa5..8c462a008e 100644
--- a/extras/package/win32/vlc.win32.nsi.in
+++ b/extras/package/win32/vlc.win32.nsi.in
@@ -48,6 +48,11 @@ InstType $Name_InstTypeRecommended
 InstType $Name_InstTypeMinimum
 InstType $Name_InstTypeFull
 
+RequestExecutionLevel user
+!addincludedir .
+!addplugindir .
+!include UAC.nsh
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; NSIS Modern User Interface configuration ;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -75,7 +80,17 @@ InstType $Name_InstTypeFull
   ; Instfiles page
     !insertmacro MUI_PAGE_INSTFILES
   ; Finish page
-    !define MUI_FINISHPAGE_RUN "$INSTDIR\vlc.exe"
+
+    Function ExecAppFile
+      Exec '$INSTDIR\vlc.exe'
+    FunctionEnd
+
+    Function AppRunAs
+      !insertmacro UAC.CallFunctionAsUser ExecAppFile
+    FunctionEnd
+
+    !define MUI_FINISHPAGE_RUN
+    !define MUI_FINISHPAGE_RUN_FUNCTION AppRunAs
     !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\README.txt"
     !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
     !define MUI_FINISHPAGE_LINK $Link_VisitWebsite
@@ -314,11 +329,15 @@ FunctionEnd
 ; 3. Delete prefs and cache ;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+Function ExecCacheGen
+  ExecWait "$INSTDIR\vlc-cache-gen.exe $APPDATA\\VideoLAN\\VLC"
+FunctionEnd
+
 !macro gencache
   SetShellVarContext all
   CreateDirectory "$APPDATA\\VideoLAN"
   CreateDirectory "$APPDATA\\VideoLAN\\VLC"
-  ExecWait "$INSTDIR\vlc-cache-gen.exe $APPDATA\\VideoLAN\\VLC"
+  !insertmacro UAC.CallFunctionAsUser ExecCacheGen
   SetShellVarContext current
 !macroend
 
@@ -664,6 +683,27 @@ SectionEnd
 
 ;;; Start function
 Function .onInit
+
+UAC_Elevate:
+    UAC::RunElevated
+    StrCmp 1223 $0 UAC_ElevationAborted
+    StrCmp 0 $0 0 UAC_Err
+    StrCmp 1 $1 0 UAC_Success
+    Quit
+
+UAC_Err:
+    MessageBox mb_iconstop "Unable to elevate, error $0"
+    Abort
+
+UAC_ElevationAborted:
+    MessageBox mb_iconstop "This installer requires admin access, aborting!"
+    Abort
+
+UAC_Success:
+    StrCmp 1 $3 +4
+    StrCmp 3 $1 0 UAC_ElevationAborted
+    MessageBox mb_iconstop "This installer requires admin access, try again"
+    goto UAC_Elevate
   !insertmacro MUI_LANGDLL_DISPLAY
 
   !include "languages\english.nsh"
@@ -734,6 +774,13 @@ Function .onInit
 
 FunctionEnd
 
+Function .OnInstFailed
+    UAC::Unload
+FunctionEnd
+
+Function .OnInstSuccess
+    UAC::Unload
+FunctionEnd
 ;; End function
 Section -Post
   WriteUninstaller "$INSTDIR\uninstall.exe"
@@ -916,13 +963,38 @@ SectionEnd
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC92} $Desc_Section92
 !insertmacro MUI_UNFUNCTION_DESCRIPTION_END
 
-;Function un.onUninstSuccess
-;  HideWindow
-;  MessageBox MB_ICONINFORMATION|MB_OK \
-;    "$(^Name) was successfully removed from your computer."
-;FunctionEnd
+Function un.OnUnInstFailed
+    UAC::Unload
+FunctionEnd
+
+Function un.OnUnInstSuccess
+    UAC::Unload
+    Delete "$INSTDIR\UAC.dll"
+FunctionEnd
 
 Function un.onInit
+
+UAC_Elevate:
+    UAC::RunElevated
+    StrCmp 1223 $0 UAC_ElevationAborted
+    StrCmp 0 $0 0 UAC_Err
+    StrCmp 1 $1 0 UAC_Success
+    Quit
+
+UAC_Err:
+    MessageBox mb_iconstop "Unable to elevate, error $0"
+    Abort
+
+UAC_ElevationAborted:
+    MessageBox mb_iconstop "This installer requires admin access, aborting!"
+    Abort
+
+UAC_Success:
+    StrCmp 1 $3 +4
+    StrCmp 3 $1 0 UAC_ElevationAborted
+    MessageBox mb_iconstop "This installer requires admin access, try again"
+    goto UAC_Elevate
+
   !insertmacro MUI_UNGETLANGUAGE
 
   !include "languages\english.nsh"
-- 
2.39.2