Changeset 101

Timestamp:

08/24/10 14:00:17 (18 months ago)

Author:

jay

Message:

-- fixed bug in starting server normally.

Location:

trunk/sources/win32service

Files:

• svcconfig/src/svcconfig.cpp (modified) (5 diffs)
• win32service/include/svc/serviceregistry.h (modified) (1 diff)
• win32service/src/svc/serviceregistry.cpp (modified) (5 diffs)
• win32service/src/svc/svc.cpp (modified) (3 diffs)

trunk/sources/win32service/svcconfig/src/svcconfig.cpp

@@ -132 +132 @@
         {
             printf("QueryServiceConfig failed (%d)", dwError);
+            goto cleanup; 
                         return false;
-            goto cleanup; 
         }
     }
@@ -144 +144 @@
     {
         printf("QueryServiceConfig failed (%d)", GetLastError());
+        goto cleanup;
                 return false;
-        goto cleanup;
     }
 
@@ -164 +164 @@
         {
             printf("QueryServiceConfig2 failed (%d)", dwError);
+            goto cleanup; 
                         return false;
-            goto cleanup; 
         }
     }
@@ -177 +177 @@
     {
         printf("QueryServiceConfig2 failed (%d)", GetLastError());
+        goto cleanup;
                 return false;
-        goto cleanup;
     }
  
@@ -201 +201 @@
     LocalFree(lpsc); 
     LocalFree(lpsd);
-        return true;
+        goto success;
+
 cleanup:
     CloseServiceHandle(schService); 
     CloseServiceHandle(schSCManager);
+
+success:
+        return true;
 }
 

trunk/sources/win32service/win32service/include/svc/serviceregistry.h

@@ -5 +5 @@
 char * QueryKey(HKEY hKey);
 HKEY AddKey();
-void SetKeyValue(HKEY hKey);
+DWORD SetKeyValue(HKEY hKey);
 
-char * GetSvcRegistry();
+char * SvcRegistry(int action);
 char * FormatWindowsError(int nError);

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;
 }
 

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

@@ -28 +28 @@
     if( lstrcmpi( argv[1], TEXT("installService")) == 0 )
     {
-                if(GetSvcRegistry() != REGIST_ERROR)
+                if(SvcRegistry(ADD_KEY) != REGIST_ERROR)
                         SvcInstall();
                 else
@@ -65 +65 @@
                 if ( argc == 1 ) //if no argument, assume that rtmpserver is started normally
                 {
-                        if (!DoQuerySvc){
+                        if (!DoQuerySvc()){
                                 printf("Server will start normally.\n\n");
-                                rtmpserver(GetSvcRegistry());
+                                rtmpserver(SvcRegistry(GET_KEY_VALUE));
                                 return;
                         }else{
                                 printf("\nERROR: Server cannot be started normally because the service described above is already installed. .\n\n");
                                 printf("Start/Stop the server by starting/stopping the service.\n\n");
-                                printf("To start server normally, enter 'uninstallService' command to delete the service.\n\n");
                                 return;
                         }
@@ -96 +95 @@
     printf("\t  stopService\n");
         printf("Run as stand-alone:\n");
-        printf("\twin32service <configfile path>\n");
-        printf("\twin32service --use-implicit-console-appender\n");
+        printf("\twin32service\n");
 }
 //