1 files changed, 2 insertions, 43 deletions
diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi
index 889cf20b0..8ee07ca54 100644
--- a/xorg-server/installer/vcxsrv.nsi
+++ b/xorg-server/installer/vcxsrv.nsi
@@ -205,52 +205,11 @@ Section "Uninstall"
   DeleteRegKey HKCR "Applications\xlaunch.exe"
 
   ; Remove files and uninstaller
-  Delete "$INSTDIR\vcxsrv.exe"
-  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\xclock"
-  Delete "$INSTDIR\xclock-color"
-  Delete "$INSTDIR\xwininfo.exe"
-  Delete "$INSTDIR\XKeysymDB"
-  Delete "$INSTDIR\XErrorDB"
-  Delete "$INSTDIR\Xcms.txt"
-  Delete "$INSTDIR\XtErrorDB"
-  Delete "$INSTDIR\.Xdefaults"
-  Delete "$INSTDIR\xlaunch.exe"
-  Delete "$INSTDIR\plink.exe"
-  Delete "$INSTDIR\swrast_dri.dll"
-  Delete "$INSTDIR\dxtn.dll"
-  Delete "$INSTDIR\swrastwgl_dri.dll"
-  Delete "$INSTDIR\libxcb.dll"
-  Delete "$INSTDIR\libXau.dll"
-  Delete "$INSTDIR\libX11.dll"
-  Delete "$INSTDIR\libXext.dll"
-  Delete "$INSTDIR\libXmu.dll"
-  Delete "$INSTDIR\libxml2.dll"
-  Delete "$INSTDIR\zlib1.dll"
-  Delete "$INSTDIR\iconv.dll"
-  Delete "$INSTDIR\msvcr120.dll"
-  Delete "$INSTDIR\msvcp120.dll"
-  Delete "$INSTDIR\msvcr120d.dll"
-  Delete "$INSTDIR\msvcp120d.dll"
-
-  RMDir /r "$INSTDIR\fonts"
-  RMDir /r "$INSTDIR\xkbdata"
-  RMDir /r "$INSTDIR\locale"
+  RMDir /r "$INSTDIR"
 
   ; Remove shortcuts, if any
-  Delete "$SMPROGRAMS\VcXsrv\*.*"
+  RMDir /r "$SMPROGRAMS\VcXsrv"
   Delete "$DESKTOP\VcXsrv.lnk"
   Delete "$DESKTOP\XLaunch.lnk"
 
-  ; Remove directories used
-  RMDir "$SMPROGRAMS\VcXsrv"
-  RMDir "$INSTDIR"
-
 SectionEnd