From b81aac947baccecf9a81d15b8fe017441fb7ff34 Mon Sep 17 00:00:00 2001 From: anders_k Date: Wed, 2 Dec 2015 21:07:21 +0000 Subject: [PATCH] Use P<> and not <> when checking pointers git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6651 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/nsDialogs/nsDialogs.nsh | 2 +- Include/Win/COM.nsh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Contrib/nsDialogs/nsDialogs.nsh b/Contrib/nsDialogs/nsDialogs.nsh index 593a64a6..5959ae70 100644 --- a/Contrib/nsDialogs/nsDialogs.nsh +++ b/Contrib/nsDialogs/nsDialogs.nsh @@ -566,7 +566,7 @@ Header file for creating custom installer pages with nsDialogs !macro __NSD_FreeImage IMAGE - ${If} ${IMAGE} <> 0 + ${If} ${IMAGE} P<> 0 System::Call gdi32::DeleteObject(ps) ${IMAGE} ${EndIf} diff --git a/Include/Win/COM.nsh b/Include/Win/COM.nsh index 649ea987..9d01ebf6 100644 --- a/Include/Win/COM.nsh +++ b/Include/Win/COM.nsh @@ -10,7 +10,7 @@ COM defines and helper macros !include Win\COM.nsh !include Win\Propkey.nsh !insertmacro ComHlpr_CreateInProcInstance ${CLSID_ShellLink} ${IID_IShellLink} r0 "" -${If} $0 <> 0 +${If} $0 P<> 0 ${IShellLink::SetPath} $0 '("%COMSPEC%").r1' ${IShellLink::SetArguments} $0 '("/k echo HelloWorld").r2' ${If} $1 = 0 @@ -74,12 +74,12 @@ System::Call 'OLE32::CoCreateInstance(g "${clsid}",i 0,i ${CLSCTX_INPROC_SERVER} !macroend !macro ComHlpr_SafeRelease _p -${If} ${_p} <> 0 +${If} ${_p} P<> 0 ${IUnknown::Release} ${_p} "" ${EndIf} !macroend !macro ComHlpr_SafeReleaseAndNull _p -${If} ${_p} <> 0 +${If} ${_p} P<> 0 ${IUnknown::Release} ${_p} "" StrCpy ${_p} 0 ${EndIf}