Changeset 101 for trunk/sources/win32service/win32service/src/svc/serviceregistry.cpp

Timestamp:

08/24/10 15:00:17 (21 months ago)

Author:

jay

Message:

-- fixed bug in starting server normally.

File:

• trunk/sources/win32service/win32service/src/svc/serviceregistry.cpp (modified) (5 diffs)

trunk/sources/win32service/win32service/src/svc/serviceregistry.cpp

@@ -8 +8 @@
 #define MAX_VALUE_NAME 16383
 
-char * GetSvcRegistry()
+char * SvcRegistry(int action)
 {
         HKEY hTestKey;
         HKEY hSvcKey;
         DWORD retCode;
-        char * config_path = "path";
+        char * config_path = "";
 
         retCode = RegOpenKeyEx( HKEY_LOCAL_MACHINE,
@@ -23 +23 @@
    if( retCode == ERROR_SUCCESS)
    {
-           hSvcKey = AddKey();
-           if(hSvcKey != NULL)
+           hSvcKey = AddKey();//Creates the key if the key does not exist. If it does, it reads the key value.
+           if(hSvcKey != NULL){
+                   switch (action)
+                   {
+                   case ADD_KEY:
+                           if(SetKeyValue(hSvcKey) != ERROR_SUCCESS)
+                                   return REGIST_ERROR;
+                           else {
+                                   RegCloseKey(hTestKey);
+                                   return REGIST_SUCCESS;
+                           }
+                           break;
+
+                   case GET_KEY_VALUE:
+                           config_path = QueryKey(hSvcKey);
+                           printf("\n configuration path: %s\n", config_path);
+                           RegCloseKey(hTestKey);
+                           return config_path; //Return the config file path
+                           break;
+                   }
+           }else
            {
-                   SetKeyValue(hSvcKey);
-                   config_path = QueryKey(AddKey());
-                   printf("\n configuration path: %s\n", config_path);
+                   return REGIST_ERROR;
            }
+
    } else
    {
@@ -35 +53 @@
            return REGIST_ERROR;
    }
-   
-   RegCloseKey(hTestKey);
-   
-   return config_path;
-
 }
 
@@ -67 +80 @@
 }
 
-void SetKeyValue(HKEY hKey)
+DWORD SetKeyValue(HKEY hKey)
 {
         DWORD retCode;
@@ -77 +90 @@
         else
            printf("\n ERROR setting path as key value (%d): %s\n", retCode, FormatWindowsError(retCode));
+
+        return retCode;
 }