Remove local copies of Mozilla plugin and ActiveX dlls

Fix #525 Fixes #525

vlc.win32.nsi.in

@@ -256,6 +256,16 @@ FunctionEnd
 
 Var UninstallLog
 
+!macro OpenUninstallLog
+  FileOpen $UninstallLog "$INSTDIR\uninstall.log" w
+  FileSeek $UninstallLog 0 END
+!macroend
+
+!macro CloseUninstallLog
+  FileClose $UninstallLog
+  SetFileAttributes "$INSTDIR\uninstall.log" HIDDEN
+!macroend
+
 !macro InstallFile FILEREGEX
   File "${FILEREGEX}"
   !define Index 'Line${__LINE__}'
@@ -312,8 +322,7 @@ Section "Media player (required)" SEC01
   SetShellVarContext all
   SetOutPath "$INSTDIR"
 
-  FileOpen $UninstallLog "$INSTDIR\uninstall.log" w
-  FileSeek $UninstallLog 0 END
+  !insertmacro OpenUninstallLog
 
   !insertmacro InstallFile vlc.exe
   !insertmacro InstallFile vlc.exe.manifest
@@ -333,8 +342,7 @@ Section "Media player (required)" SEC01
     "${PRODUCT_WEB_SITE}/doc/"
   FileWrite $UninstallLog "Documentation.url$\r$\n"
 
-  FileClose $UninstallLog
-  SetFileAttributes "$INSTDIR\uninstall.log" HIDDEN
+  !insertmacro CloseUninstallLog
 
   ; Add VLC to "recomended programs" for the following extensions
   WriteRegStr HKCR Applications\vlc.exe "" ""
@@ -402,7 +410,10 @@ SectionEnd
 
 Section /o "Mozilla plugin" SEC03
   SectionIn 2 3
-  File /r mozilla
+
+  !insertmacro InitUninstallLog
+  !insertmacro InstallFolder mozilla
+  !insertmacro CloseUninstallLog
 
   ; doesn't work. bug in mozilla/mozilla firefox or moz documentation (xpt file isn't loaded)
   ; see mozilla bugs 184506 and 159445
@@ -441,7 +452,9 @@ SectionEnd
 Section "ActiveX plugin" SEC04
   SectionIn 2 3
   SetOutPath "$INSTDIR"
-  File activex\axvlc.dll
+  !insertmacro InitUninstallLog
+  !insertmacro InstallFile activex\axvlc.dll
+  !insertmacro CloseUninstallLog
   RegDLL "$INSTDIR\axvlc.dll"
 SectionEnd