Bug 470717 - Remove usage of deprecated GetPathFromRegStr macro. r=mcsmurf
authorRobert Strong <robert.bugzilla@gmail.com>
Mon, 22 Dec 2008 11:21:21 -0800
changeset 1483 7aa6eab65c6ee39acfc4f60878d6cc75a451906c
parent 1482 cf1802da787c12416b7a8c5ba23fb7f2f172aad6
child 1484 a75b66a8b2a4110000ac08447e5c10285d13636f
push idunknown
push userunknown
push dateunknown
reviewersmcsmurf
bugs470717
Bug 470717 - Remove usage of deprecated GetPathFromRegStr macro. r=mcsmurf
suite/installer/windows/nsis/installer.nsi
--- a/suite/installer/windows/nsis/installer.nsi
+++ b/suite/installer/windows/nsis/installer.nsi
@@ -341,20 +341,19 @@ Section "-Application" APP_IDX
                       "$(ERROR_CREATE_DIRECTORY_SUFFIX)"
 
   ${LogHeader} "Adding Additional Files"
   ; Check if QuickTime is installed and copy the nsIQTScriptablePlugin.xpt from 
   ; directory into the app's components directory.
   ClearErrors
   ReadRegStr $R0 HKLM "Software\Apple Computer, Inc.\QuickTime" "InstallDir"
   ${Unless} ${Errors}
-    Push $R0
-    ${GetPathFromRegStr}
-    Pop $R0
-    ${Unless} ${Errors}
+    ${GetLongPath} $R0 "$R0"
+    ${Unless} $R0 == ""
+      ClearErrors
       GetFullPathName $R0 "$R0\Plugins\nsIQTScriptablePlugin.xpt"
       ${Unless} ${Errors}
         ${LogHeader} "Copying QuickTime Scriptable Component"
         CopyFiles /SILENT "$R0" "$INSTDIR\components"
         ${If} ${Errors}
           ${LogMsg} "** ERROR Installing File: $INSTDIR\components\nsIQTScriptablePlugin.xpt **"
         ${Else}
           ${LogMsg} "Installed File: $INSTDIR\components\nsIQTScriptablePlugin.xpt"