Patch by Johan to fix 391368

[inkscape.git] / src / registrytool.cpp

diff --git a/src/registrytool.cpp b/src/registrytool.cpp
index 69a2faaf9a169a69a04a590970c3fb521694808e..8bc9cbebf6e4b3520ab014c2e8ba1b8b88b35e93 100644 (file)
--- a/src/registrytool.cpp
+++ b/src/registrytool.cpp
@@ -8,7 +8,7 @@
  * Authors:
  *   Bob Jamison
  *
- * Copyright (C) 2005 Bob Jamison
+ * Copyright (C) 2005-2008 Bob Jamison
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -33,9 +33,9 @@
 
 typedef struct
 {
-    HKEY key;
-    int  strlen;
-    char *str;
+    HKEY       key;
+    int        strlen;
+    const char *str;
 } KeyTableEntry;
 
 
@@ -50,6 +50,10 @@ KeyTableEntry keyTable[] =
     { NULL,                 0, NULL                    }
 };
 
+
+/**
+ * Set the string value of a key/name registry entry
+ */ 
 bool RegistryTool::setStringValue(const Glib::ustring &keyNameArg,
                                   const Glib::ustring &valueName,
                                   const Glib::ustring &value)
@@ -74,7 +78,7 @@ bool RegistryTool::setStringValue(const Glib::ustring &keyNameArg,
                        0, NULL, REG_OPTION_NON_VOLATILE,
                        KEY_WRITE, NULL, &key, NULL))
        {
-       printf("RegistryTool: Could not create the registry key '%s'\n", keyName.c_str());
+       fprintf(stderr, "RegistryTool: Could not create the registry key '%s'\n", keyName.c_str());
        return false;
        }
 
@@ -82,7 +86,7 @@ bool RegistryTool::setStringValue(const Glib::ustring &keyNameArg,
     if (RegSetValueEx(key, valueName.c_str(),
           0,  REG_SZ, (LPBYTE) value.c_str(), (DWORD) value.size()))
        {
-       printf("RegistryTool: Could not set the value '%s'\n", value.c_str());
+       fprintf(stderr, "RegistryTool: Could not set the value '%s'\n", value.c_str());
        RegCloseKey(key);
        return false;
        }
@@ -93,6 +97,11 @@ bool RegistryTool::setStringValue(const Glib::ustring &keyNameArg,
     return true;
 }
 
+
+
+/**
+ * Get the full path, directory, and base file name of this running executable
+ */ 
 bool RegistryTool::getExeInfo(Glib::ustring &fullPath,
                               Glib::ustring &path,
                               Glib::ustring &exeName)
@@ -101,7 +110,7 @@ bool RegistryTool::getExeInfo(Glib::ustring &fullPath,
     char buf[MAX_PATH+1];
     if (!GetModuleFileName(NULL, buf, MAX_PATH))
         {
-        printf("Could not fetch executable file name\n");
+        fprintf(stderr, "Could not fetch executable file name\n");
         return false;
         }
     else
@@ -123,6 +132,11 @@ bool RegistryTool::getExeInfo(Glib::ustring &fullPath,
 }
 
 
+
+/**
+ * Append our subdirectories to the Application Path for this
+ * application
+ */  
 bool RegistryTool::setPathInfo()
 {
     Glib::ustring fullPath;
@@ -162,13 +176,22 @@ bool RegistryTool::setPathInfo()
 
 #ifdef TESTREG
 
+
+/**
+ * Compile this file with
+ *      g++ -DTESTREG registrytool.cpp -o registrytool
+ *  to run these tests.
+ */
+ 
+ 
+    
 void testReg()
 {
     RegistryTool rt;
     char *key =
     "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\inkscape.exe";
-    char *name  = "";
-    char *value = "c:\\inkscape\\inkscape.exe";
+    char const *name  = "";
+    char const *value = "c:\\inkscape\\inkscape.exe";
     if (!rt.setStringValue(key, name, value))
         {
         printf("Test failed\n");