* fixed service handle leaks

* bumped to 2.6
* bumped ExtendedServices to 1.1

git-svn-id: svn://svn.code.sf.net/p/processhacker/code@3651 21ef857c-d57f-4fe0-8362-d861dc6d29cd

2.x/trunk/CHANGELOG.txt

@@ -1,5 +1,10 @@
 Process Hacker
 
+2.6
+ * NEW/IMPROVED:
+ * FIXED:
+   * Fixed service handle leak
+
 2.5
  * NEW/IMPROVED:
    * Unmap section views in Memory tab

2.x/trunk/ProcessHacker/ProcessHacker.rc

@@ -433,8 +433,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,5,0,0
- PRODUCTVERSION 2,5,0,0
+ FILEVERSION 2,6,0,0
+ PRODUCTVERSION 2,6,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -451,12 +451,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "wj32"
             VALUE "FileDescription", "Process Hacker"
-            VALUE "FileVersion", "2.5"
+            VALUE "FileVersion", "2.6"
             VALUE "InternalName", "Process Hacker"
             VALUE "LegalCopyright", "Licensed under the GNU GPL, v3."
             VALUE "OriginalFilename", "ProcessHacker.exe"
             VALUE "ProductName", "Process Hacker"
-            VALUE "ProductVersion", "2.5"
+            VALUE "ProductVersion", "2.6"
         END
     END
     BLOCK "VarFileInfo"

2.x/trunk/ProcessHacker/srvprp.c

@@ -436,13 +436,14 @@ INT_PTR CALLBACK PhpServiceGeneralDlgProc(
                             }
 
                             PhMarkNeedsConfigUpdateServiceItem(serviceItem);
+
+                            CloseServiceHandle(serviceHandle);
                         }
                         else
                         {
+                            CloseServiceHandle(serviceHandle);
                             goto ErrorCase;
                         }
-
-                        CloseServiceHandle(serviceHandle);
                     }
                     else
                     {

2.x/trunk/plugins/ExtendedServices/CHANGELOG.txt

@@ -0,0 +1,5 @@
+1.1
+ * Fixed service handle leak
+
+1.0
+ * Initial release

2.x/trunk/plugins/ExtendedServices/ExtendedServices.rc

@@ -53,8 +53,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,0
- PRODUCTVERSION 1,0,0,0
+ FILEVERSION 1,1,0,0
+ PRODUCTVERSION 1,1,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -71,12 +71,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "wj32"
             VALUE "FileDescription", "Extended Services for Process Hacker"
-            VALUE "FileVersion", "1.0"
+            VALUE "FileVersion", "1.1"
             VALUE "InternalName", "ExtendedServices"
             VALUE "LegalCopyright", "Licensed under the GNU GPL, v3."
             VALUE "OriginalFilename", "ExtendedServices.dll"
             VALUE "ProductName", "Extended Services for Process Hacker"
-            VALUE "ProductVersion", "1.0"
+            VALUE "ProductVersion", "1.1"
         END
     END
     BLOCK "VarFileInfo"

2.x/trunk/plugins/ExtendedServices/ExtendedServices.vcproj

@@ -377,6 +377,10 @@
 				>
 			</File>
 		</Filter>
+		<File
+			RelativePath=".\CHANGELOG.txt"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>

2.x/trunk/plugins/ExtendedServices/recovery.c

@@ -507,13 +507,14 @@ INT_PTR CALLBACK EspServiceRecoveryDlgProc(
                                     &failureActionsFlag
                                     );
                             }
+
+                            CloseServiceHandle(serviceHandle);
                         }
                         else
                         {
+                            CloseServiceHandle(serviceHandle);
                             goto ErrorCase;
                         }
-
-                        CloseServiceHandle(serviceHandle);
                     }
                     else
                     {