[GExperts-CVS] gexperts/unstable GExperts.iss,1.20,1.21

[Erik B. <eb...@us...>]

Update of /cvsroot/gexperts/gexperts/unstable
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv7238

Modified Files:
	GExperts.iss 
Log Message:
Deal with both HKLM and HKCU registry keys to handle users who have not executed the IDE yet

Index: GExperts.iss
===================================================================
RCS file: /cvsroot/gexperts/gexperts/unstable/GExperts.iss,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- GExperts.iss	17 Mar 2007 07:24:05 -0000	1.20
+++ GExperts.iss	25 Mar 2007 07:30:43 -0000	1.21
@@ -92,7 +92,7 @@
 
 [Setup]
 AllowNoIcons=true
-AppCopyright=Copyright 1996-2006 by GExperts, Inc. and Erik Berry
+AppCopyright=Copyright 1996-2007 by GExperts, Inc. and Erik Berry
 AppName={#Product}
 AppVerName={#FullName}
 AppID={#AppIDValue}
@@ -129,15 +129,19 @@
 Name: {group}\Grep Search; Filename: {app}\Grep.exe
 
 [Registry]
-Root: HKCU; Subkey: Software\Borland\{#IDERegName}\{#IDERegVer}.0\Experts; ValueType: STRING; ValueName: GExperts; ValueData: {app}\{#DLLName}; Flags: uninsdeletevalue
-Root: HKCU; Subkey: Software\Borland\{#IDERegName}\{#IDERegVer}.0\GExperts-{#VerRegKey}\Misc; ValueType: STRING; ValueName: ConfigPath; ValueData: {app}
-Root: HKCU; Subkey: Software\Borland\{#IDERegName}\{#IDERegVer}.0\GExperts-{#VerRegKey}\Misc; ValueType: STRING; ValueName: HelpFile; ValueData: {app}\GExperts.hlp
+Root: HKCU; Subkey: Software\Borland\{#IDERegName}\{#IDERegVer}.0\Experts; ValueType: STRING; ValueName: GExperts; ValueData: {app}\{#DLLName}; Flags: uninsdeletevalue; Check: IDEExecuted
+Root: HKLM; Subkey: Software\Borland\{#IDERegName}\{#IDERegVer}.0\Experts; ValueType: STRING; ValueName: GExperts; ValueData: {app}\{#DLLName}; Flags: uninsdeletevalue uninsdeletekeyifempty
+Root: HKCU; Subkey: Software\Borland\{#IDERegName}\{#IDERegVer}.0\GExperts-{#VerRegKey}\Misc; ValueType: STRING; ValueName: ConfigPath; ValueData: {app}; Check: IDEExecuted
+Root: HKCU; Subkey: Software\Borland\{#IDERegName}\{#IDERegVer}.0\GExperts-{#VerRegKey}\Misc; ValueType: STRING; ValueName: HelpFile; ValueData: {app}\GExperts.hlp; Check: IDEExecuted
 Root: HKCU; Subkey: Software\GExperts\Debug; ValueType: STRING; ValueName: FilePath; ValueData: {app}\GDebug.exe
 
 [Code]
 procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep);
 begin
   if CurUninstallStep = usPostUninstall then
+  begin
+    // Delete the DLL reference even if it was copied from the HKLM tree
+    RegDeleteValue(HKEY_CURRENT_USER, 'Software\Borland\{#IDERegName}\{#IDERegVer}.0\Experts', 'GExperts');
     case MsgBox('Do you want to delete all of your GExperts preferences and data files?',
                 mbConfirmation, MB_YESNOCANCEL or MB_DEFBUTTON2) of
       IDYES:
@@ -154,5 +158,10 @@
       IDCANCEL:
         Abort;
     end;
+  end;
 end;
 
+function IDEExecuted: Boolean;
+begin
+  Result := RegKeyExists(HKEY_CURRENT_USER, 'Software\Borland\{#IDERegName}\{#IDERegVer}.0');
+end;