[ros-diffs] [cwittich] 29430: -fix a warning in charmap.c -use LocalFree when memory was allocated by LocalAlloc

Author: cwittich
Date: Sun Oct  7 04:03:57 2007
New Revision: 29430

URL: http://svn.reactos.org/svn/reactos?rev=29430&view=rev
Log:
-fix a warning in charmap.c
-use LocalFree when memory was allocated by LocalAlloc

Modified:
    trunk/reactos/base/applications/charmap/charmap.c
    trunk/reactos/base/applications/mscutils/servman/about.c
    trunk/reactos/base/applications/mscutils/servman/listview.c
    trunk/reactos/base/applications/mscutils/servman/mainwnd.c
    trunk/reactos/base/applications/mscutils/servman/misc.c
    trunk/reactos/base/applications/mscutils/servman/propsheet.c

Modified: trunk/reactos/base/applications/charmap/charmap.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/…
==============================================================================
--- trunk/reactos/base/applications/charmap/charmap.c (original)
+++ trunk/reactos/base/applications/charmap/charmap.c Sun Oct  7 04:03:57 2007
@@ -269,7 +269,7 @@
                     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)
                     {

Modified: trunk/reactos/base/applications/mscutils/servman/about.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/about.c (original)
+++ trunk/reactos/base/applications/mscutils/servman/about.c Sun Oct  7 04:03:57 2007
@@ -31,9 +31,7 @@
                 SetWindowText(hLicenseEditWnd,
                               lpString);
 
-                HeapFree(GetProcessHeap(),
-                         0,
-                         lpString);
+                LocalFree(lpString);
             }
         }
 

Modified: trunk/reactos/base/applications/mscutils/servman/listview.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/listview.c (original)
+++ trunk/reactos/base/applications/mscutils/servman/listview.c Sun Oct  7 04:03:57 2007
@@ -312,9 +312,7 @@
                             lvItem.iItem,
                             (LPARAM)&lvItem);
 
-                HeapFree(ProcessHeap,
-                         0,
-                         lpStartup);
+                LocalFree(lpStartup);
 
                 /* set Log On As */
                 lvItem.pszText = pServiceConfig->lpServiceStartName;

Modified: trunk/reactos/base/applications/mscutils/servman/mainwnd.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/mainwnd.c (original)
+++ trunk/reactos/base/applications/mscutils/servman/mainwnd.c Sun Oct  7 04:03:57 2007
@@ -144,9 +144,7 @@
                     0,
                     (LPARAM)szNumServices);
 
-        HeapFree(ProcessHeap,
-                 0,
-                 lpNumServices);
+        LocalFree(lpNumServices);
     }
 }
 

Modified: trunk/reactos/base/applications/mscutils/servman/misc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/misc.c (original)
+++ trunk/reactos/base/applications/mscutils/servman/misc.c Sun Oct  7 04:03:57 2007
@@ -224,7 +224,8 @@
 {
     HBITMAP hBitmap;
     HIMAGELIST hImageList;
-    INT i, Ret;
+    UINT i;
+	INT Ret;
 
     /* Create the toolbar icon image list */
     hImageList = ImageList_Create(Width,

Modified: trunk/reactos/base/applications/mscutils/servman/propsheet.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…
==============================================================================
--- trunk/reactos/base/applications/mscutils/servman/propsheet.c (original)
+++ trunk/reactos/base/applications/mscutils/servman/propsheet.c Sun Oct  7 04:03:57 2007
@@ -76,9 +76,7 @@
                            WM_SETTEXT,
                            0,
                            (LPARAM)lpStatus);
-        HeapFree(ProcessHeap,
-                 0,
-                 lpStatus);
+        LocalFree(lpStatus);
     }
 }
 
@@ -108,9 +106,7 @@
                         CB_ADDSTRING,
                         0,
                         (LPARAM)lpBuf);
-            HeapFree(ProcessHeap,
-                     0,
-                     lpBuf);
+            LocalFree(lpBuf);
         }
     }