From dfbf705a843e22e88ea42511fc59ea788c84aeca Mon Sep 17 00:00:00 2001
From: wj32 <wj32@21ef857c-d57f-4fe0-8362-d861dc6d29cd>
Date: Sun, 19 Sep 2010 07:55:01 +0000
Subject: [PATCH] * 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                                   | 5 +++++
 2.x/trunk/ProcessHacker/ProcessHacker.rc                  | 8 ++++----
 2.x/trunk/ProcessHacker/srvprp.c                          | 5 +++--
 2.x/trunk/plugins/ExtendedServices/CHANGELOG.txt          | 5 +++++
 2.x/trunk/plugins/ExtendedServices/ExtendedServices.rc    | 8 ++++----
 .../plugins/ExtendedServices/ExtendedServices.vcproj      | 4 ++++
 2.x/trunk/plugins/ExtendedServices/recovery.c             | 5 +++--
 7 files changed, 28 insertions(+), 12 deletions(-)
 create mode 100644 2.x/trunk/plugins/ExtendedServices/CHANGELOG.txt

diff --git a/2.x/trunk/CHANGELOG.txt b/2.x/trunk/CHANGELOG.txt
index bd3d88290..f3ee82d2d 100644
--- a/2.x/trunk/CHANGELOG.txt
+++ b/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
diff --git a/2.x/trunk/ProcessHacker/ProcessHacker.rc b/2.x/trunk/ProcessHacker/ProcessHacker.rc
index f31e30a05..f96a27bb8 100644
--- a/2.x/trunk/ProcessHacker/ProcessHacker.rc
+++ b/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"
diff --git a/2.x/trunk/ProcessHacker/srvprp.c b/2.x/trunk/ProcessHacker/srvprp.c
index dc1b62e49..f49bc4849 100644
--- a/2.x/trunk/ProcessHacker/srvprp.c
+++ b/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
                     {
diff --git a/2.x/trunk/plugins/ExtendedServices/CHANGELOG.txt b/2.x/trunk/plugins/ExtendedServices/CHANGELOG.txt
new file mode 100644
index 000000000..59cc5790c
--- /dev/null
+++ b/2.x/trunk/plugins/ExtendedServices/CHANGELOG.txt
@@ -0,0 +1,5 @@
+1.1
+ * Fixed service handle leak
+
+1.0
+ * Initial release
diff --git a/2.x/trunk/plugins/ExtendedServices/ExtendedServices.rc b/2.x/trunk/plugins/ExtendedServices/ExtendedServices.rc
index 89215ccac..c4fa70ef3 100644
--- a/2.x/trunk/plugins/ExtendedServices/ExtendedServices.rc
+++ b/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"
diff --git a/2.x/trunk/plugins/ExtendedServices/ExtendedServices.vcproj b/2.x/trunk/plugins/ExtendedServices/ExtendedServices.vcproj
index 48f9731ef..b3fe48eb4 100644
--- a/2.x/trunk/plugins/ExtendedServices/ExtendedServices.vcproj
+++ b/2.x/trunk/plugins/ExtendedServices/ExtendedServices.vcproj
@@ -377,6 +377,10 @@
 				>
 			</File>
 		</Filter>
+		<File
+			RelativePath=".\CHANGELOG.txt"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/2.x/trunk/plugins/ExtendedServices/recovery.c b/2.x/trunk/plugins/ExtendedServices/recovery.c
index be4492dae..7ad3b1e77 100644
--- a/2.x/trunk/plugins/ExtendedServices/recovery.c
+++ b/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
                     {