Commit 741aa4ff authored by bonnell's avatar bonnell

merge from rc

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@11712 18c085ea-50e0-402c-830e-de6fd14e8384
parent 29c2a35e
......@@ -624,6 +624,9 @@ printf("=============\n");
* Kathleen Bonnell, Fri Feb 29 16:43:46 PST 2008
* Only malloc keyval if it is null.
*
* Kathleen Bonnell, Thu Jun 17 20:23:51 MST 2010
* Location of VisIt's registry keys has changed to Software\Classes.
*
*****************************************************************************/
int
......@@ -636,7 +639,7 @@ ReadKeyFromRoot(HKEY which_root, const char *key, char **keyval)
/*
* Try and read the key from the system registry.
*/
sprintf(regkey, "VISIT%s", VISIT_VERSION);
sprintf(regkey, "Software\\Classes\\VISIT%s", VISIT_VERSION);
if (*keyval == 0)
*keyval = (char *)malloc(500);
......@@ -678,6 +681,9 @@ ReadKeyFromRoot(HKEY which_root, const char *key, char **keyval)
* in a couple places. This is to avoid the situation where VisIt won't
* run when installed without Administrator access.
*
* Kathleen Bonnell, Thu Jun 17 20:23:51 MST 2010
* VisIt's registry keys are stored in HKLM or HKCU.
*
*****************************************************************************/
int
......@@ -685,7 +691,7 @@ ReadKey(const char *key, char **keyval)
{
int retval = 0;
if((retval = ReadKeyFromRoot(HKEY_CLASSES_ROOT, key, keyval)) == 0)
if((retval = ReadKeyFromRoot(HKEY_LOCAL_MACHINE, key, keyval)) == 0)
retval = ReadKeyFromRoot(HKEY_CURRENT_USER, key, keyval);
return retval;
......
......@@ -396,6 +396,10 @@ GetSystemVisItHostsDirectory()
// Modifications:
// Kathleen Bonnell, Wed May 21 08:12:16 PDT 2008
// Only malloc keyval if it hasn't already been done.
//
// Kathleen Bonnell, Thu Jun 17 20:25:44 MST 2010
// Location of VisIt's registry keys has changed to Software\Classes.
//
// ***************************************************************************
int
ReadKeyFromRoot(HKEY which_root, const char *ver, const char *key,
......@@ -406,7 +410,7 @@ ReadKeyFromRoot(HKEY which_root, const char *ver, const char *key,
HKEY hkey;
/* Try and read the key from the system registry. */
sprintf(regkey, "VISIT%s", ver);
sprintf(regkey, "Software\\Classes\\VisIt%s", ver);
if (*keyval == 0)
*keyval = (char *)malloc(500);
if(RegOpenKeyEx(which_root, regkey, 0, KEY_QUERY_VALUE, &hkey) == ERROR_SUCCESS)
......@@ -424,17 +428,31 @@ ReadKeyFromRoot(HKEY which_root, const char *ver, const char *key,
return readSuccess;
}
// ***************************************************************************
// Modifications:
// Kathleen Bonnell, Thu Jun 17 20:25:44 MST 2010
// VisIt's registry keys are stored in HKLM or HKCU.
//
// ***************************************************************************
int
ReadKey(const char *ver, const char *key, char **keyval)
{
int retval = 0;
if((retval = ReadKeyFromRoot(HKEY_CLASSES_ROOT, ver, key, keyval)) == 0)
if((retval = ReadKeyFromRoot(HKEY_LOCAL_MACHINE, ver, key, keyval)) == 0)
retval = ReadKeyFromRoot(HKEY_CURRENT_USER, ver, key, keyval);
return retval;
}
// ***************************************************************************
// Modifications:
// Kathleen Bonnell, Thu Jun 17 20:25:44 MST 2010
// Location of VisIt's registry keys has changed to Software\Classes.
//
// ***************************************************************************
int
WriteKeyToRoot(HKEY which_root, const char *ver, const char *key,
const char *keyval)
......@@ -444,7 +462,7 @@ WriteKeyToRoot(HKEY which_root, const char *ver, const char *key,
HKEY hkey;
/* Try and read the key from the system registry. */
sprintf(regkey, "VISIT%s", ver);
sprintf(regkey, "Software\\Classes\\VisIt%s", ver);
if(RegOpenKeyEx(which_root, regkey, 0, KEY_SET_VALUE, &hkey) == ERROR_SUCCESS)
{
DWORD strSize = strlen(keyval);
......@@ -460,12 +478,19 @@ WriteKeyToRoot(HKEY which_root, const char *ver, const char *key,
return writeSuccess;
}
// ***************************************************************************
// Modifications:
// Kathleen Bonnell, Thu Jun 17 20:25:44 MST 2010
// VisIt's registry keys are stored in HKLM or HKCU.
//
// ***************************************************************************
int
WriteKey(const char *ver, const char *key, const char *keyval)
{
int retval = 0;
if((retval = WriteKeyToRoot(HKEY_CLASSES_ROOT, ver, key, keyval)) == 0)
if((retval = WriteKeyToRoot(HKEY_LOCAL_MACHINE, ver, key, keyval)) == 0)
retval = WriteKeyToRoot(HKEY_CURRENT_USER, ver, key, keyval);
return retval;
......
......@@ -48,6 +48,7 @@ ${VISIT_INCLUDE_DIR}/avt/VisWindow/VisWindow
${VISIT_INCLUDE_DIR}/visit_vtk/full
${VISIT_INCLUDE_DIR}/visit_vtk/lightweight
${VTK_INCLUDE_DIRS}
${BOOST_INCLUDE_DIR}
)
IF(WIN32)
......
......@@ -89,7 +89,8 @@
#define H5_USE_16_API
#include <hdf5.h>
#include <visit-hdf5.h>
#include <boost/cstdint.hpp>
using boost::int32_t;
using std::string;
......
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