diff options
| author | marha <marha@users.sourceforge.net> | 2010-02-21 13:33:20 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-02-21 13:33:20 +0000 |
| commit | 38eb5d4eed017f0c460761830f622d4cdb18da15 (patch) | |
| tree | 5e8910eccd0987c5448b253b20e12049156c199c /xorg-server | |
| parent | 9bf3de388baac7331ae22a6e06207822228ba3c5 (diff) | |
| download | vcxsrv-38eb5d4eed017f0c460761830f622d4cdb18da15.tar.gz vcxsrv-38eb5d4eed017f0c460761830f622d4cdb18da15.tar.bz2 vcxsrv-38eb5d4eed017f0c460761830f622d4cdb18da15.zip | |
- .xlaunch extension was not correctly registered in vista
- uninstall: not everything was removed
Diffstat (limited to 'xorg-server')
| -rw-r--r-- | xorg-server/installer/vcxsrv.nsi | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi index f8ed16f85..9ed285e6e 100644 --- a/xorg-server/installer/vcxsrv.nsi +++ b/xorg-server/installer/vcxsrv.nsi @@ -108,6 +108,7 @@ Section "VcXsrv (required)" WriteRegStr HKCR ".xlaunch" "" "XLaunchFile"
WriteRegStr HKCR "XLaunchFile" "" "XLaunch Configuration"
WriteRegStr HKCR "XLaunchFile\DefaultIcon" "" "$INSTDIR\xlaunch.exe,0"
+ WriteRegStr HKCR "XLaunchFile\shell" "" 'open'
WriteRegStr HKCR "XLaunchFile\shell\open\command" "" '"$INSTDIR\XLaunch.exe" -run "%1"'
WriteRegStr HKCR "XLaunchFile\shell\open\ddeexec\Application" "" "XLaunch"
WriteRegStr HKCR "XLaunchFile\shell\open\ddeexec\Topic" "" "System"
@@ -118,6 +119,17 @@ Section "VcXsrv (required)" WriteRegStr HKCR "XLaunchFile\shell\Validate\ddeexec\Application" "" "XLaunch"
WriteRegStr HKCR "XLaunchFile\shell\Validate\ddeexec\Topic" "" "System"
+ WriteRegStr HKCR "Applications\xlaunch.exe\shell" "" 'open'
+ WriteRegStr HKCR "Applications\xlaunch.exe\shell\open\command" "" '"$INSTDIR\XLaunch.exe" -run "%1"'
+ WriteRegStr HKCR "Applications\xlaunch.exe\shell\open\ddeexec\Application" "" "XLaunch"
+ WriteRegStr HKCR "Applications\xlaunch.exe\shell\open\ddeexec\Topic" "" "System"
+ WriteRegStr HKCR "Applications\xlaunch.exe\shell\edit\command" "" '"$INSTDIR\XLaunch.exe" -load "%1"'
+ WriteRegStr HKCR "Applications\xlaunch.exe\shell\edit\ddeexec\Application" "" "XLaunch"
+ WriteRegStr HKCR "Applications\xlaunch.exe\shell\edit\ddeexec\Topic" "" "System"
+ WriteRegStr HKCR "Applications\xlaunch.exe\shell\Validate\command" "" '"$INSTDIR\XLaunch.exe" -validate "%1"'
+ WriteRegStr HKCR "Applications\xlaunch.exe\shell\Validate\ddeexec\Application" "" "XLaunch"
+ WriteRegStr HKCR "Applications\xlaunch.exe\shell\Validate\ddeexec\Topic" "" "System"
+
InitPluginsDir
SetOutPath $PLUGINSDIR
File "${MSVCR90_DLL}"
@@ -201,16 +213,27 @@ Section "Uninstall" ; Register the xlaunch file extension
DeleteRegKey HKCR ".xlaunch"
DeleteRegKey HKCR "XLaunchFile"
+ DeleteRegKey HKCR "Applications\xlaunch.exe"
; Remove files and uninstaller
Delete "$INSTDIR\vcxsrv.exe"
+ Delete "$INSTDIR\vcxsrv_dbg.exe"
+ Delete "$INSTDIR\vcxsrv_dbg.pdb"
Delete "$INSTDIR\uninstall.exe"
Delete "$INSTDIR\protocol.txt"
Delete "$INSTDIR\system.XWinrc"
Delete "$INSTDIR\xkbcomp.exe"
+ Delete "$INSTDIR\xcalc.exe"
+ Delete "$INSTDIR\xcalc"
+ Delete "$INSTDIR\xcalc-color"
+ Delete "$INSTDIR\xclock.exe"
+ Delete "$INSTDIR\xwininfo.exe"
Delete "$INSTDIR\XKeysymDB"
Delete "$INSTDIR\XErrorDB"
Delete "$INSTDIR\xlaunch.exe"
+ Delete "$INSTDIR\plink.exe"
+ Delete "$INSTDIR\swrast_dri.dll"
+ Delete "$INSTDIR\swrast_dri_dbg.dll"
RMDir /r "$INSTDIR\fonts"
RMDir /r "$INSTDIR\xkbdata"
|