Commit 751b5ec7 authored by bonnell's avatar bonnell
Browse files

Fix path-parsing for VISITPLUGINDIR on Windows systems that prevented plugins...

Fix path-parsing for VISITPLUGINDIR on Windows systems that prevented plugins from loading on diskless configurations. Also fixed a memory leak found on windows systems, updated release notes.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@4268 18c085ea-50e0-402c-830e-de6fd14e8384
parent 81131f54
......@@ -602,6 +602,9 @@ ReadKey(const char *key, char **keyval)
* Use "Application Data" path for private plugins, as users have write-
* privileges there (and it better supports roaming profiles).
*
* Kathleen Bonnell, Wed May 21 08:12:16 PDT 2008
* Use ';' to separate different paths for VISITPLUGINDIR.
*
*****************************************************************************/
char *
......@@ -710,7 +713,7 @@ AddEnvironment(int useShortFileName)
{
PathAppend(appData, "LLNL");
PathAppend(appData, "VisIt");
sprintf(tmp, "VISITPLUGINDIR=%s:%s", appData, visitpath);
sprintf(tmp, "VISITPLUGINDIR=%s;%s", appData, visitpath);
}
else
{
......
......@@ -593,6 +593,9 @@ PluginManager::GetPluginList(vector<pair<string,string> > &libs)
// Jeremy Meredith, Wed Dec 12 16:09:38 EST 2007
// Allow plugins to be compatible across point releases.
//
// Kathleen Bonnell, Wed May 21 08:12:16 PDT 2008
// Fix libs indexing when searching for match.
//
// ****************************************************************************
void
......@@ -635,7 +638,7 @@ PluginManager::ReadPluginInfo()
bool match = false;
for (size_t j=0; j<libs.size() && !match; j++)
{
if (libs[i].first == dirname &&
if (libs[j].first == dirname &&
libs[j].second == str)
match = true;
}
......@@ -1411,6 +1414,10 @@ void *dlsym(void *handle, const char *symbol)
// Only fail the environment exception if the plugin directory hasn't been
// set in a prior call to SetPluginDir.
//
// Kathleen Bonnell, Wed May 21 08:12:16 PDT 2008
// Modified path-parsing for Windows. ';' is the only valid separator
// between paths since ':' could indicate a drive.
//
// ****************************************************************************
void
......@@ -1470,7 +1477,11 @@ PluginManager::SetPluginDir(const char *PluginDir)
while (*c)
{
string dir;
#ifndef _WIN32
while (*c && *c!=':' && *c!=';')
#else
while (*c && *c!=';')
#endif
{
dir += *c;
c++;
......
......@@ -984,9 +984,14 @@ GetSystemVisItRCFile()
}
#if defined(_WIN32)
// ***************************************************************************
//
// Functions to get at VisIt data stored in the Windows registry.
//
// Modifications:
// Kathleen Bonnell, Wed May 21 08:12:16 PDT 2008
// Only malloc keyval if it hasn't already been done.
// ***************************************************************************
int
ReadKeyFromRoot(HKEY which_root, const char *ver, const char *key,
char **keyval)
......@@ -997,7 +1002,8 @@ ReadKeyFromRoot(HKEY which_root, const char *ver, const char *key,
/* Try and read the key from the system registry. */
sprintf(regkey, "VISIT%s", ver);
*keyval = (char *)malloc(500);
if (*keyval == 0)
*keyval = (char *)malloc(500);
if(RegOpenKeyEx(which_root, regkey, 0, KEY_QUERY_VALUE, &hkey) == ERROR_SUCCESS)
{
DWORD keyType, strSize = 500;
......
<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<meta http-equiv="Content-Language" content="en-us">
<meta name="GENERATOR" content="Microsoft FrontPage 5.0">
<meta name="ProgId" content="FrontPage.Editor.Document">
<title>VisIt 1.9.1 Release Notes</title>
</head>
<body>
<center><b><font size="6">VisIt 1.9.1 Release Notes</font></b></center>
<p>Welcome to VisIt's release notes page. Release 1.9.1 is primarily a bug fix release to release 1.9. Look <a href="relnotes1.9.0.html">here</a> to see a complete list of bugs fixed in release 1.9.</p>
<p><b><font size="4">Bugs fixed in version 1.9.1</font></b></p>
<ul>
<li>Fixed path-parsing problem on Windows systems that prevented plugins from loading.
</li>
</ul>
<p>Click the following link to view the release notes for the previous version
of VisIt: <a href="relnotes1.9.0.html">VisIt 1.9.0 Release Notes</a>.</p>
<p>Click the following link to view the release notes for the next version
of VisIt: <a href="relnotes1.10.0.html">VisIt 1.10.0 Release Notes</a>.</p>
</body>
</html>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment