From 4619755e33ca4e108cffbdcfb0461d7e6b724faf Mon Sep 17 00:00:00 2001
From: "ssu%netscape.com" <ssu%netscape.com>
Date: Wed, 15 Mar 2000 23:44:57 +0000
Subject: [PATCH] fixing bug #31875 under win95.  a=chofmann r=cathleen

---
 xpinstall/packager/windows/config.it   | 11 ++++++++++-
 xpinstall/wizard/windows/setup/extra.c | 18 ++++++++++++++++--
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/xpinstall/packager/windows/config.it b/xpinstall/packager/windows/config.it
index bed5882aee1e..17ce32b0ef90 100644
--- a/xpinstall/packager/windows/config.it
+++ b/xpinstall/packager/windows/config.it
@@ -56,8 +56,17 @@ Program Folder Path=[COMMON_PROGRAMS]
 Default Setup Type=Setup Type 0
 
 Setup Title0=Mozilla Seamonkey Setup
+Setup Title0 Font Size=
+Setup Title0 Font Color=
+Setup Title0 Font Shadow=TRUE
 Setup Title1=Build $Version$
+Setup Title0 Font Size=
+Setup Title0 Font Color=
+Setup Title0 Font Shadow=TRUE
 Setup Title2=
+Setup Title0 Font Size=
+Setup Title0 Font Color=
+Setup Title0 Font Shadow=TRUE
 
 ; HKey:              valid decryptable setup keys are [Mozilla Seamonkey CurrentVersion]
 ;                    and [Mozilla Seamonkey CurrentVersion].
@@ -400,7 +409,7 @@ WorkingDir=[SETUP PATH]
 ;                    original size and position. An application should specify
 ;                    this flag when displaying the window for the first time.
 [Program Folder0]
-Timing=post download
+Timing=post smartupdate
 Show Folder=SHOW
 Program Folder=[Default Folder]
 
diff --git a/xpinstall/wizard/windows/setup/extra.c b/xpinstall/wizard/windows/setup/extra.c
index 777a15bfe933..cae7fd993d14 100644
--- a/xpinstall/wizard/windows/setup/extra.c
+++ b/xpinstall/wizard/windows/setup/extra.c
@@ -3586,7 +3586,14 @@ HRESULT DecryptVariable(LPSTR szVariable, DWORD dwVariableSize)
   else if(lstrcmpi(szVariable, "COMMON_STARTUP") == 0)
   {
     /* parse for the "C:\WINNT40\Profiles\All Users\Start Menu\\Programs\\Startup" directory */
-    GetWinReg(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", "Common Startup", szVariable, dwVariableSize);
+    if((dwOSType & OS_WIN95) || (dwOSType & OS_WIN98))
+    {
+      GetWinReg(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", "Startup", szVariable, dwVariableSize);
+    }
+    else
+    {
+      GetWinReg(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", "Common Startup", szVariable, dwVariableSize);
+    }
   }
   else if(lstrcmpi(szVariable, "COMMON_PROGRAMS") == 0)
   {
@@ -3615,7 +3622,14 @@ HRESULT DecryptVariable(LPSTR szVariable, DWORD dwVariableSize)
   else if(lstrcmpi(szVariable, "COMMON_DESKTOP") == 0)
   {
     /* parse for the "C:\WINNT40\Profiles\All Users\Desktop" directory */
-    GetWinReg(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", "Common Desktop", szVariable, dwVariableSize);
+    if((dwOSType & OS_WIN95) || (dwOSType & OS_WIN98))
+    {
+      GetWinReg(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", "Desktop", szVariable, dwVariableSize);
+    }
+    else
+    {
+      GetWinReg(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", "Common Desktop", szVariable, dwVariableSize);
+    }
   }
   else if(lstrcmpi(szVariable, "PERSONAL_STARTUP") == 0)
   {