1 files changed, 16 insertions, 10 deletions

diff --git a/main.cpp b/main.cpp
index 44e4b35..cbb77cf 100644
--- a/main.cpp
+++ b/main.cpp
@@ -38,6 +38,12 @@ void set_label(HWND root, int id, bool val)
     SetWindowTextW(label, val ? L"True" : L"False");
 }
 
+void set_label(HWND root, int id, const wchar_t* s)
+{
+    const auto label = GetDlgItem(root, id);
+    SetWindowTextW(label, s);
+}
+
 void set_label(HWND root, int id, const std::wstring& s)
 {
     const auto label = GetDlgItem(root, id);
@@ -48,21 +54,21 @@ BOOL on_init_dialog(HWND wnd, HWND, LPARAM)
 {
     try
     {
-        set_label(wnd, IDC_STATIC_ADMINISTRATOR, is_user_in_administrators());
+        set_label(wnd, IDC_ADMINISTRATOR, is_user_in_administrators());
     }
     catch (const Error& e)
     {
-        set_label(wnd, IDC_STATIC_ADMINISTRATOR, L"N/A");
+        set_label(wnd, IDC_ADMINISTRATOR, L"N/A");
         error::report(e);
     }
 
     try
     {
-        set_label(wnd, IDC_STATIC_RUN_AS_ADMINISTRATOR, is_run_as_administrator());
+        set_label(wnd, IDC_RUN_AS_ADMINISTRATOR, is_run_as_administrator());
     }
     catch (const Error& e)
     {
-        set_label(wnd, IDC_STATIC_RUN_AS_ADMINISTRATOR, L"N/A");
+        set_label(wnd, IDC_RUN_AS_ADMINISTRATOR, L"N/A");
         error::report(e);
     }
 
@@ -71,32 +77,32 @@ BOOL on_init_dialog(HWND wnd, HWND, LPARAM)
         try
         {
             const auto elevated = is_elevated();
-            set_label(wnd, IDC_STATIC_ELEVATED, elevated);
+            set_label(wnd, IDC_ELEVATED, elevated);
 
             const auto elevate_button = GetDlgItem(wnd, IDC_BUTTON_ELEVATE);
             Button_SetElevationRequiredState(elevate_button, !elevated);
         }
         catch (const Error& e)
         {
-            set_label(wnd, IDC_STATIC_ELEVATED, L"N/A");
+            set_label(wnd, IDC_ELEVATED, L"N/A");
             error::report(e);
         }
 
         try
         {
-            set_label(wnd, IDC_STATIC_INTEGRITY_LEVEL, token::integrity_level_to_string(
+            set_label(wnd, IDC_INTEGRITY_LEVEL, token::integrity_level_to_string(
                 token::query_integrity_level(token::open_for_current_process())));
         }
         catch (const Error& e)
         {
-            set_label(wnd, IDC_STATIC_INTEGRITY_LEVEL, L"N/A");
+            set_label(wnd, IDC_INTEGRITY_LEVEL, L"N/A");
             error::report(e);
         }
     }
     else
     {
-        set_label(wnd, IDC_STATIC_ELEVATED, L"N/A");
-        set_label(wnd, IDC_STATIC_INTEGRITY_LEVEL, L"N/A");
+        set_label(wnd, IDC_ELEVATED, L"N/A");
+        set_label(wnd, IDC_INTEGRITY_LEVEL, L"N/A");
     }
 
     return TRUE;