Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC
Commits:
236b3184 by Steve Lhomme at 2023-09-27T15:13:37+02:00
nsis: always use the regsvr32.exe from the system
We should not use whatever is in the PATH. Especially as the current directory
is set the a temporary directory during uninstallation.
(cherry picked from commit d13608f8867b66dec2e8079b4d07d1b8567ffa0a)
Signed-off-by: Steve Lhomme <rob...@ycbcr.xyz>
- - - - -
1 changed file:
- extras/package/win32/NSIS/vlc.win32.nsi.in
Changes:
=====================================
extras/package/win32/NSIS/vlc.win32.nsi.in
=====================================
@@ -416,7 +416,7 @@ ${MementoSection} "$(Name_Section04)" SEC04
!insertmacro InstallFile axvlc.dll
!insertmacro CloseUninstallLog
@HAVE_WIN64_FALSE@ RegDLL "$INSTDIR\axvlc.dll"
-@HAVE_WIN64_TRUE@ ExecWait 'regsvr32.exe /s "$INSTDIR\axvlc.dll"'
+@HAVE_WIN64_TRUE@ ExecWait '"$SYSDIR\regsvr32.exe" /s "$INSTDIR\axvlc.dll"'
${MementoSectionEnd}
!endif
SectionGroupEnd
@@ -836,7 +836,7 @@ Section "un.$(Name_Section91)" SEC91
;remove activex plugin
@HAVE_WIN64_FALSE@ UnRegDLL "$INSTDIR\axvlc.dll"
-@HAVE_WIN64_TRUE@ ExecWait 'regsvr32.exe /s /u "$INSTDIR\axvlc.dll"'
+@HAVE_WIN64_TRUE@ ExecWait '"$SYSDIR\regsvr32.exe" /s /u "$INSTDIR\axvlc.dll"'
Delete /REBOOTOK "$INSTDIR\axvlc.dll"
;remove mozilla plugin
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/236b3184d75a3eeb4a56340b5eeab746c407157f
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/236b3184d75a3eeb4a56340b5eeab746c407157f
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
