From 8565a1aab5747121abcfebcf49c537e6ee6abd4a Mon Sep 17 00:00:00 2001
From: Christoph von Wittich <christoph_vw@reactos.org>
Date: Sun, 7 Oct 2007 00:03:57 +0000
Subject: [PATCH] -fix a warning in charmap.c -use LocalFree when memory was
 allocated by LocalAlloc

svn path=/trunk/; revision=29430
---
 reactos/base/applications/charmap/charmap.c            | 2 +-
 reactos/base/applications/mscutils/servman/about.c     | 4 +---
 reactos/base/applications/mscutils/servman/listview.c  | 4 +---
 reactos/base/applications/mscutils/servman/mainwnd.c   | 4 +---
 reactos/base/applications/mscutils/servman/misc.c      | 3 ++-
 reactos/base/applications/mscutils/servman/propsheet.c | 8 ++------
 6 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/reactos/base/applications/charmap/charmap.c b/reactos/base/applications/charmap/charmap.c
index 0d4e56a07cd..f9a1f102e5c 100644
--- a/reactos/base/applications/charmap/charmap.c
+++ b/reactos/base/applications/charmap/charmap.c
@@ -269,7 +269,7 @@ DlgProc(HWND hDlg,
                     TCHAR ch;
                     HWND hMap = GetDlgItem(hDlg, IDC_FONTMAP);
 
-                    ch = SendMessage(hMap, FM_GETCHAR, 0, 0);
+                    ch = (TCHAR) SendMessage(hMap, FM_GETCHAR, 0, 0);
 
                     if (ch)
                     {
diff --git a/reactos/base/applications/mscutils/servman/about.c b/reactos/base/applications/mscutils/servman/about.c
index d54eb0afc3c..18a2abfcc5a 100644
--- a/reactos/base/applications/mscutils/servman/about.c
+++ b/reactos/base/applications/mscutils/servman/about.c
@@ -31,9 +31,7 @@ AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
                 SetWindowText(hLicenseEditWnd,
                               lpString);
 
-                HeapFree(GetProcessHeap(),
-                         0,
-                         lpString);
+                LocalFree(lpString);
             }
         }
 
diff --git a/reactos/base/applications/mscutils/servman/listview.c b/reactos/base/applications/mscutils/servman/listview.c
index 77b407a08ad..a6d426de32b 100644
--- a/reactos/base/applications/mscutils/servman/listview.c
+++ b/reactos/base/applications/mscutils/servman/listview.c
@@ -312,9 +312,7 @@ RefreshServiceList(PMAIN_WND_INFO Info)
                             lvItem.iItem,
                             (LPARAM)&lvItem);
 
-                HeapFree(ProcessHeap,
-                         0,
-                         lpStartup);
+                LocalFree(lpStartup);
 
                 /* set Log On As */
                 lvItem.pszText = pServiceConfig->lpServiceStartName;
diff --git a/reactos/base/applications/mscutils/servman/mainwnd.c b/reactos/base/applications/mscutils/servman/mainwnd.c
index 4d2ca918e8b..156fba88dd4 100644
--- a/reactos/base/applications/mscutils/servman/mainwnd.c
+++ b/reactos/base/applications/mscutils/servman/mainwnd.c
@@ -144,9 +144,7 @@ UpdateServiceCount(PMAIN_WND_INFO Info)
                     0,
                     (LPARAM)szNumServices);
 
-        HeapFree(ProcessHeap,
-                 0,
-                 lpNumServices);
+        LocalFree(lpNumServices);
     }
 }
 
diff --git a/reactos/base/applications/mscutils/servman/misc.c b/reactos/base/applications/mscutils/servman/misc.c
index 7591d0add90..b5662dddd6e 100644
--- a/reactos/base/applications/mscutils/servman/misc.c
+++ b/reactos/base/applications/mscutils/servman/misc.c
@@ -224,7 +224,8 @@ InitImageList(UINT StartResource,
 {
     HBITMAP hBitmap;
     HIMAGELIST hImageList;
-    INT i, Ret;
+    UINT i;
+	INT Ret;
 
     /* Create the toolbar icon image list */
     hImageList = ImageList_Create(Width,
diff --git a/reactos/base/applications/mscutils/servman/propsheet.c b/reactos/base/applications/mscutils/servman/propsheet.c
index 7e5b9c2b186..f1eac06499c 100644
--- a/reactos/base/applications/mscutils/servman/propsheet.c
+++ b/reactos/base/applications/mscutils/servman/propsheet.c
@@ -76,9 +76,7 @@ SetServiceStatusText(PSERVICEPROPSHEET dlgInfo,
                            WM_SETTEXT,
                            0,
                            (LPARAM)lpStatus);
-        HeapFree(ProcessHeap,
-                 0,
-                 lpStatus);
+        LocalFree(lpStatus);
     }
 }
 
@@ -108,9 +106,7 @@ SetStartupType(LPTSTR lpServiceName,
                         CB_ADDSTRING,
                         0,
                         (LPARAM)lpBuf);
-            HeapFree(ProcessHeap,
-                     0,
-                     lpBuf);
+            LocalFree(lpBuf);
         }
     }