[CHARMAP]

[reactos.git] / reactos / base / applications / charmap / settings.c

diff --git a/reactos/base/applications/charmap/settings.c b/reactos/base/applications/charmap/settings.c
index 4eae8d9..ff75d78 100644 (file)
--- a/reactos/base/applications/charmap/settings.c
+++ b/reactos/base/applications/charmap/settings.c
@@ -7,8 +7,11 @@
  *
  */
 
-#include <precomp.h>
+#include "precomp.h"
 
+#include <winreg.h>
+#include <windowsx.h>
+#include <tchar.h>
 
 const TCHAR g_szGeneralRegKey[] = _T("Software\\Microsoft\\CharMap");
 HWND hWnd;
@@ -87,8 +90,9 @@ extern void LoadSettings(void)
         }
 
         RegQueryValueEx(hKey, _T("Advanced"), NULL, &type, (LPBYTE)&dwAdvanChecked, &size);
+
         if(dwAdvanChecked == TRUE)
-            SendDlgItemMessage(hCharmapDlg, IDC_CHECK_ADVANCED, BM_CLICK, (dwAdvanChecked ? MF_CHECKED : MF_UNCHECKED), 0);
+            SendDlgItemMessage(hCharmapDlg, IDC_CHECK_ADVANCED, BM_CLICK, MF_CHECKED, 0);
 
     RegCloseKey(hKey);
     }
@@ -119,13 +123,13 @@ extern void SaveSettings(void)
             hWnd = GetDlgItem(hCharmapDlg, IDC_FONTCOMBO);
             ComboBox_GetText(hWnd, szBuffer, MAX_PATH);
 
-            if(szBuffer != NULL && *szBuffer != '\0')
+            if(*szBuffer != '\0')
                 RegSetValueEx(hKey, _T("Font"), 0, REG_SZ, (LPBYTE) szBuffer, (DWORD) MAX_PATH);
 
             hWnd = GetDlgItem(hCharmapDlg, IDC_COMBO_CHARSET);
             ComboBox_GetText(hWnd, szBuffer, MAX_PATH);
 
-            if(szBuffer != NULL && *szBuffer != '\0')
+            if(*szBuffer != '\0')
                 RegSetValueEx(hKey, _T("CodePage"), 0, REG_SZ, (LPBYTE) szBuffer, (DWORD) MAX_PATH);
 
             RegSetValueEx(hKey, _T("Advanced"), 0, REG_DWORD, (LPBYTE)&Settings.IsAdvancedView, (DWORD) sizeof(DWORD));