Bug 1373373 - Use x64 compatible macro for MapiProxy_InUse.dll registration. r=rsx11m
--- a/suite/installer/windows/nsis/shared.nsh
+++ b/suite/installer/windows/nsis/shared.nsh
@@ -466,17 +466,17 @@
; The MapiProxy dll can be used by multiple applications but
; is only registered for the last application installed. When the last
; application installed is uninstalled MapiProxy.dll will no longer be
; registered.
!ifndef NO_LOG
${LogHeader} "DLL Registration"
!endif
ClearErrors
- RegDLL "$INSTDIR\MapiProxy_InUse.dll"
+ ${RegisterDLL} "$INSTDIR\MapiProxy_InUse.dll"
!ifndef NO_LOG
${If} ${Errors}
${LogMsg} "** ERROR Registering: $INSTDIR\MapiProxy_InUse.dll **"
${Else}
${LogUninstall} "DLLReg: \MapiProxy_InUse.dll"
${LogMsg} "Registered: $INSTDIR\MapiProxy_InUse.dll"
${EndIf}
!endif
@@ -550,23 +550,22 @@
WriteRegStr HKLM "$0\DefaultIcon" "" "$8,0"
WriteRegStr HKLM "$0" "DLLPath" "$6"
; The MapiProxy dll can exist in multiple installs of the application.
; Registration occurs as follows with the last action to occur being the one
; that wins: On install and software update when helper.exe runs with the
; /PostUpdate argument. On setting the application as the system's default
; application using Window's "Set program access and defaults".
-
!ifndef NO_LOG
${LogHeader} "DLL Registration"
!endif
ClearErrors
- RegDLL "$INSTDIR\MapiProxy_InUse.dll"
- !ifndef NO_LOG
+ ${RegisterDLL} "$INSTDIR\MapiProxy_InUse.dll"
+ !ifndef NO_LOG
${If} ${Errors}
${LogMsg} "** ERROR Registering: $INSTDIR\MapiProxy_InUse.dll **"
${Else}
${LogUninstall} "DLLReg: \MapiProxy_InUse.dll"
${LogMsg} "Registered: $INSTDIR\MapiProxy_InUse.dll"
${EndIf}
!endif