105093 - Combine code for JRE BIN and JRE LIB

Status: VERIFIED FIXED

(SeaMonkey :: Installer, defect)

Description

[Curt Patrick (gone)]

In extra.c, JRE LIB PATH is determined relative to JRE BIN PATH so we should not
be looking up the JRE BIN PATH in two places.

Comment 1

[Curt Patrick (gone)]

See bugzilla bug #9979 for the patch with the code that needs cleaned up.

Comment 2

[Curt Patrick (gone)]

Attachment: Patch 0.1

Comment 3

[Henrik Gemal]

why is stuff like:
"Java Plug-in\\1.3"
hardcoded in the extra.c file?
what about 1.4 etc...?

is this also the scope of this bug?

Comment 4

[Curt Patrick (gone)]

I believe that you raise a different issue from this bug, albeit a legitimate
one.  This bug is dealing with a specific bit of code duplication.  The issue
you raise has to do with support for multiple versions of pluggins.  I believe
that, for any given release we support installation of only one specific version
of any pluggin we include with the release.  So, for this case, for ns6.2 the
only version of JRE we care about is 1.3.  That doesn't mean, however, that
there might not be a better way to maintain this info from release to release. 
It does seem kinda wrong that, if for 6.3 we want to include jre 1.4 that we
have to recompile extra.c to do it.  Sean what do you think?  If this something
we want to pursue I think we should open a separate bug for it.

In the meantime I could use a r= and sr= on the above patch.

Comment 5

[Sean Su]

Comment on attachment 59631 [details] [diff] [review]
Patch 0.1

In the following place:

+    GetWinReg(HKEY_LOCAL_MACHINE,
"Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\javaw.Exe", NULL,
szBuf, dwVariableSize);
+    if(*szBuf == '\0')
       return(FALSE);

You should set *szVariable = '\0' before returning because the previous code
did that.

r=ssu if you do that one change.

Comment 6

[Curt Patrick (gone)]

Right you are.  I changed it to:

    if(*szBuf == '\0')
    {
      *szVariable = '\0';
      return(FALSE);
    }

Comment 7

[Daniel Veditz [:dveditz]]

Comment on attachment 59631 [details] [diff] [review]
Patch 0.1

sr=dveditz

Comment 8

[Curt Patrick (gone)]

Checked it in.

Comment 9

[Grace Bush]

verified code fix