fixing bug 108530 - Setup.exe error on install, mozilla launches with full screen empty page. r=curt sr=dveditz

xpinstall/packager/windows/browser.jst

@@ -122,13 +122,13 @@ function createShortcuts()
     // locate the Quick Launch folder
     szFolderQuickLaunch     = szFolderAppData + "\\Microsoft\\Internet Explorer\\Quick Launch";
     fFolderQuickLaunch      = getFolder("file:///", szFolderQuickLaunch);
-    folderQuickLaunchExists = File.exists(fFolderQuickLaunch);
+    folderQuickLaunchExists = File.isDirectory(fFolderQuickLaunch);
     if(!folderQuickLaunchExists)
     {
       subkey                  = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\GrpConv\\MapGroups";
       valname                 = "Quick Launch";
       szFolderQuickLaunch     = winreg.getValueString(subkey, valname);
-      folderQuickLaunchExists = File.exists(fFolderPath);
+      folderQuickLaunchExists = File.isDirectory(fFolderPath);
       if(folderQuickLaunchExists)
         fFolderQuickLaunch = getFolder("file:///", szFolderQuickLaunch);
     }

xpinstall/packager/windows/mail.jst

@@ -135,13 +135,13 @@ function createShortcuts()
     // locate the Quick Launch folder
     szFolderQuickLaunch     = szFolderAppData + "\\Microsoft\\Internet Explorer\\Quick Launch";
     fFolderQuickLaunch      = getFolder("file:///", szFolderQuickLaunch);
-    folderQuickLaunchExists = File.exists(fFolderQuickLaunch);
+    folderQuickLaunchExists = File.isDirectory(fFolderQuickLaunch);
     if(!folderQuickLaunchExists)
     {
       subkey                  = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\GrpConv\\MapGroups";
       valname                 = "Quick Launch";
       szFolderQuickLaunch     = winreg.getValueString(subkey, valname);
-      folderQuickLaunchExists = File.exists(fFolderPath);
+      folderQuickLaunchExists = File.isDirectory(fFolderPath);
       if(folderQuickLaunchExists)
         fFolderQuickLaunch = getFolder("file:///", szFolderQuickLaunch);
     }

xpinstall/src/nsInstallFileOpItem.cpp

@@ -1314,7 +1314,7 @@ nsInstallFileOpItem::NativeFileOpWindowsShortcutComplete()
     if(mIcon)
       mIcon->GetPath(&iconNativePathStr);
 
-    ret = CreateALink(targetNativePathStr,
+    CreateALink(targetNativePathStr,
                       shortcutNativePathStr,
                       cDescription,
                       workingpathNativePathStr,
@@ -1322,7 +1322,6 @@ nsInstallFileOpItem::NativeFileOpWindowsShortcutComplete()
                       iconNativePathStr,
                       mIconId);
 
-    if(nsInstall::SUCCESS == ret)
     mAction = nsInstallFileOpItem::ACTION_SUCCESS;
   }
 
@@ -1342,12 +1341,16 @@ nsInstallFileOpItem::NativeFileOpWindowsShortcutAbort()
   nsString   shortcutDescription;
   nsCOMPtr<nsIFile> shortcutTarget;
 
+  if(mShortcutPath && mDescription)
+  {
     shortcutDescription = *mDescription;
     shortcutDescription.AppendWithConversion(".lnk");
     mShortcutPath->Clone(getter_AddRefs(shortcutTarget));
     shortcutTarget->Append(NS_LossyConvertUCS2toASCII(shortcutDescription).get());
 
     NativeFileOpFileDeleteComplete(shortcutTarget);
+  }
+
 #endif
 
   return nsInstall::SUCCESS;