DXGL r853 - Code Review

Jump to navigation Jump to search
Repository:DXGL
Revision:< r852‎ | r853 | r854 >
Date:20:14, 2 September 2018
Author:admin
Status:new
Tags:
Comment:
Remove registry changes for COM registration and Wine DLL overrides on uninstall.
Modified paths:
  • /Installer/dxgl.nsi (modified) (history)

Diff [purge]

Index: Installer/dxgl.nsi
——@@ -220,11 +220,13 @@
221221
222222 Section "Set Wine DLL Overrides" SEC_WINEDLLOVERRIDE
223223 DetailPrint "Setting Wine DLL Overrides"
 224+ WriteRegDWORD HKLM "Software\DXGL" "WineDLLOverride" 1
224225 WriteRegStr HKCU "Software\Wine\DllOverrides" "ddraw" "native,builtin"
225226 SectionEnd
226227
227228 Section "Fix DDraw COM registration" SEC_COMFIX
228229 DetailPrint "Setting DDraw Runtime path in registry"
 230+ WriteRegDWORD HKLM "Software\DXGL" "COMFix" 1
229231 ${If} ${RunningX64}
230232 SetRegView 32
231233 ${EndIf}
——@@ -403,6 +405,19 @@
404406 RMDir "$SMPROGRAMS\DXGL"
405407 RMDir "$INSTDIR"
406408
 409+ ReadRegDWORD $0 HKLM "Software\DXGL" "WineDLLOverride"
 410+ ${If} $0 == "1"
 411+ DeleteRegValue HKCU "Software\Wine\DllOverrides" "ddraw"
 412+ ${EndIf}
 413+
 414+ ReadRegDWORD $1 HKLM "Software\DXGL" "COMFix"
 415+ ${If} $1 == "1"
 416+ SetRegView 32
 417+ DeleteRegKey HKCU "Software\Classes\CLSID\{D7B70EE0-4340-11CF-B063-0020AFC2CD35}"
 418+ DeleteRegKey HKCU "Software\Classes\CLSID\{3C305196-50DB-11D3-9CFE-00C04FD930C5}"
 419+ DeleteRegKey HKCU "Software\Classes\CLSID\{593817A0-7DB3-11CF-A2DE-00AA00B93356}"
 420+ ${EndIf}
 421+
407422 DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
408423 DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
409424 DeleteRegKey HKLM "Software\DXGL"
Retrieved from "https://dxgl.org/wiki/Special:Code/DXGL/853"