[SYSDM] Rename some functions. #179

[reactos.git] / dll / cpl / sysdm / environment.c

diff --git a/dll/cpl/sysdm/environment.c b/dll/cpl/sysdm/environment.c
index 9a4b192..e6d9fe3 100644 (file)
--- a/dll/cpl/sysdm/environment.c
+++ b/dll/cpl/sysdm/environment.c
@@ -9,7 +9,6 @@
 
 #include "precomp.h"
 
-
 typedef struct _VARIABLE_DATA
 {
     DWORD dwType;
@@ -200,7 +199,7 @@ GetEnvironmentVariables(HWND hwndListView,
     lpData = GlobalAlloc(GPTR, (dwMaxValueDataLength + 1) * sizeof(TCHAR));
     if (lpData == NULL)
     {
-        GlobalFree(lpData);
+        GlobalFree(lpName);
         RegCloseKey(hKey);
         return;
     }
@@ -228,6 +227,7 @@ GetEnvironmentVariables(HWND hwndListView,
                          (LPBYTE)lpData,
                          &dwDataLength))
         {
+            GlobalFree(lpExpandData);
             GlobalFree(lpName);
             GlobalFree(lpData);
             RegCloseKey(hKey);
@@ -270,7 +270,7 @@ GetEnvironmentVariables(HWND hwndListView,
 
 
 static VOID
-SetListViewColumns(HWND hwndListView)
+SetEnvironmentDialogListViewColumns(HWND hwndListView)
 {
     RECT rect;
     LV_COLUMN column;
@@ -296,7 +296,7 @@ SetListViewColumns(HWND hwndListView)
 
 
 static VOID
-OnInitDialog(HWND hwndDlg)
+OnInitEnvironmentDialog(HWND hwndDlg)
 {
     HWND hwndListView;
 
@@ -305,7 +305,7 @@ OnInitDialog(HWND hwndDlg)
 
     (void)ListView_SetExtendedListViewStyle(hwndListView, LVS_EX_FULLROWSELECT);
 
-    SetListViewColumns(hwndListView);
+    SetEnvironmentDialogListViewColumns(hwndListView);
 
     GetEnvironmentVariables(hwndListView,
                             HKEY_CURRENT_USER,
@@ -324,7 +324,7 @@ OnInitDialog(HWND hwndDlg)
 
     (void)ListView_SetExtendedListViewStyle(hwndListView, LVS_EX_FULLROWSELECT);
 
-    SetListViewColumns(hwndListView);
+    SetEnvironmentDialogListViewColumns(hwndListView);
 
     GetEnvironmentVariables(hwndListView,
                             HKEY_LOCAL_MACHINE,
@@ -353,11 +353,11 @@ OnNewVariable(HWND hwndDlg,
 
     VarData = GlobalAlloc(GPTR, sizeof(VARIABLE_DATA));
 
-    if (!DialogBoxParam(hApplet,
-                        MAKEINTRESOURCE(IDD_EDIT_VARIABLE),
-                        hwndDlg,
-                        (DLGPROC)EditVariableDlgProc,
-                        (LPARAM)VarData) > 0)
+    if (DialogBoxParam(hApplet,
+                       MAKEINTRESOURCE(IDD_EDIT_VARIABLE),
+                       hwndDlg,
+                       EditVariableDlgProc,
+                       (LPARAM)VarData) <= 0)
     {
         if (VarData->lpName != NULL)
             GlobalFree(VarData->lpName);
@@ -412,7 +412,7 @@ OnEditVariable(HWND hwndDlg,
             if (DialogBoxParam(hApplet,
                                MAKEINTRESOURCE(IDD_EDIT_VARIABLE),
                                hwndDlg,
-                               (DLGPROC)EditVariableDlgProc,
+                               EditVariableDlgProc,
                                (LPARAM)VarData) > 0)
             {
                 ListView_SetItemText(hwndListView, iItem, 0, VarData->lpName);
@@ -538,7 +538,7 @@ SetAllVars(HWND hwndDlg,
     hwndListView = GetDlgItem(hwndDlg, iDlgItem);
     /* First item is 0 */
     iItem = 0;
-    /* Set up struct to retreive item */
+    /* Set up struct to retrieve item */
     lvi.mask = LVIF_PARAM;
     lvi.iItem = iItem;
 
@@ -690,7 +690,7 @@ EnvironmentDlgProc(HWND hwndDlg,
     switch (uMsg)
     {
         case WM_INITDIALOG:
-            OnInitDialog(hwndDlg);
+            OnInitEnvironmentDialog(hwndDlg);
             break;
 
         case WM_COMMAND: