From 8e06903fc9742eccde118b30c642ddea1fe31937 Mon Sep 17 00:00:00 2001 From: kichik Date: Thu, 20 Nov 2008 23:39:45 +0000 Subject: [PATCH] support for uninstaller git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5779 212acab6-be3b-0410-9dea-997c60f758d6 --- Include/WinVer.nsh | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/Include/WinVer.nsh b/Include/WinVer.nsh index 1b94880d..11af7ac2 100644 --- a/Include/WinVer.nsh +++ b/Include/WinVer.nsh @@ -95,15 +95,21 @@ !define WINVER_VISTA 0x600 !macro CallArtificialFunction NAME - Call :.${NAME} - !ifndef ${NAME}_DEFINED - Goto ${NAME}_DONE - !define ${NAME}_DEFINED - .${NAME}: + !ifndef __UNINSTALL__ + !define CallArtificialFunction_TYPE inst + !else + !define CallArtificialFunction_TYPE uninst + !endif + Call :.${NAME}${CallArtificialFunction_TYPE} + !ifndef ${NAME}${CallArtificialFunction_TYPE}_DEFINED + Goto ${NAME}${CallArtificialFunction_TYPE}_DONE + !define ${NAME}${CallArtificialFunction_TYPE}_DEFINED + .${NAME}${CallArtificialFunction_TYPE}: !insertmacro ${NAME} Return - ${NAME}_DONE: + ${NAME}${CallArtificialFunction_TYPE}_DONE: !endif + !undef CallArtificialFunction_TYPE !macroend !define CallArtificialFunction `!insertmacro CallArtificialFunction`