Remove unused resources (patch by tetyys) (1/2)

Author: dmex

ProcessHacker/include/mainwnd.h

@@ -1,8 +1,6 @@
 #ifndef PH_MAINWND_H
 #define PH_MAINWND_H
 
-#define PH_MAINWND_CLASSNAME L"ProcessHacker" // phapppub
-
 PHAPPAPI extern HWND PhMainWndHandle; // phapppub
 extern BOOLEAN PhMainWndExiting;
 

ProcessHacker/include/mainwndp.h

@@ -33,7 +33,7 @@ LRESULT CALLBACK PhMwpWndProc(
 
 // Initialization
 
-BOOLEAN PhMwpInitializeWindowClass(
+RTL_ATOM PhMwpInitializeWindowClass(
     VOID
     );
 

ProcessHacker/mainwnd.c

@@ -3,6 +3,7 @@
  *   Main window
  *
  * Copyright (C) 2009-2016 wj32
+ * Copyright (C) 2017 dmex
  *
  * This file is part of Process Hacker.
  *
@@ -99,6 +100,7 @@ BOOLEAN PhMainWndInitialization(
     _In_ INT ShowCommand
     )
 {
+    RTL_ATOM windowAtom;
     PH_STRING_BUILDER stringBuilder;
     PH_RECTANGLE windowRectangle;
 
@@ -118,7 +120,7 @@ BOOLEAN PhMainWndInitialization(
 
     PhMwpInitializeProviders();
 
-    if (!PhMwpInitializeWindowClass())
+    if ((windowAtom = PhMwpInitializeWindowClass()) == INVALID_ATOM)
         return FALSE;
 
     windowRectangle.Position = PhGetIntegerPairSetting(L"MainWindowPosition");
@@ -127,23 +129,27 @@ BOOLEAN PhMainWndInitialization(
     // Create the window title.
 
     PhInitializeStringBuilder(&stringBuilder, 100);
-    PhAppendStringBuilder2(&stringBuilder, L"Process Hacker");
 
-    if (PhCurrentUserName)
+    if (PhGetIntegerSetting(L"EnableWindowText"))
     {
-        PhAppendStringBuilder2(&stringBuilder, L" [");
-        PhAppendStringBuilder(&stringBuilder, &PhCurrentUserName->sr);
-        PhAppendCharStringBuilder(&stringBuilder, ']');
-        if (KphIsConnected()) PhAppendCharStringBuilder(&stringBuilder, '+');
-    }
+        PhAppendStringBuilder2(&stringBuilder, L"Process Hacker");
+
+        if (PhCurrentUserName)
+        {
+            PhAppendStringBuilder2(&stringBuilder, L" [");
+            PhAppendStringBuilder(&stringBuilder, &PhCurrentUserName->sr);
+            PhAppendCharStringBuilder(&stringBuilder, ']');
+            if (KphIsConnected()) PhAppendCharStringBuilder(&stringBuilder, '+');
+        }
 
-    if (WINDOWS_HAS_UAC && PhGetOwnTokenAttributes().ElevationType == TokenElevationTypeFull)
-        PhAppendStringBuilder2(&stringBuilder, L" (Administrator)");
+        if (WINDOWS_HAS_UAC && PhGetOwnTokenAttributes().ElevationType == TokenElevationTypeFull)
+            PhAppendStringBuilder2(&stringBuilder, L" (Administrator)");
+    }
 
     // Create the window.
 
     PhMainWndHandle = CreateWindow(
-        PH_MAINWND_CLASSNAME,
+        MAKEINTATOM(windowAtom),
         stringBuilder.String->Buffer,
         WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN,
         windowRectangle.Left,
@@ -329,30 +335,28 @@ LRESULT CALLBACK PhMwpWndProc(
     return DefWindowProc(hWnd, uMsg, wParam, lParam);
 }
 
-BOOLEAN PhMwpInitializeWindowClass(
+RTL_ATOM PhMwpInitializeWindowClass(
     VOID
     )
 {
     WNDCLASSEX wcex;
-
+    PPH_STRING className;
+    
     memset(&wcex, 0, sizeof(WNDCLASSEX));
     wcex.cbSize = sizeof(WNDCLASSEX);
     wcex.style = 0;
     wcex.lpfnWndProc = PhMwpWndProc;
     wcex.cbClsExtra = 0;
     wcex.cbWndExtra = 0;
     wcex.hInstance = PhInstanceHandle;
-    wcex.hIcon = PH_LOAD_SHARED_ICON_LARGE(PhLibImageBase, MAKEINTRESOURCE(IDI_PROCESSHACKER));
-    wcex.hCursor = LoadCursor(NULL, IDC_ARROW);
-    //wcex.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
+    className = PhaGetStringSetting(L"MainWindowClassName");
+    wcex.lpszClassName = PhGetStringOrDefault(className, L"MainWindowClassName");
     wcex.lpszMenuName = MAKEINTRESOURCE(IDR_MAINWND);
-    wcex.lpszClassName = PH_MAINWND_CLASSNAME;
+    wcex.hCursor = LoadCursor(NULL, IDC_ARROW);
+    wcex.hIcon = PH_LOAD_SHARED_ICON_LARGE(PhLibImageBase, MAKEINTRESOURCE(IDI_PROCESSHACKER));
     wcex.hIconSm = PH_LOAD_SHARED_ICON_SMALL(PhLibImageBase, MAKEINTRESOURCE(IDI_PROCESSHACKER));
 
-    if (!RegisterClassEx(&wcex))
-        return FALSE;
-
-    return TRUE;
+    return RegisterClassEx(&wcex);
 }
 
 VOID PhMwpInitializeProviders(
@@ -425,7 +429,7 @@ VOID PhMwpInitializeControls(
         3,
         3,
         PhMainWndHandle,
-        (HMENU)ID_MAINWND_PROCESSTL,
+        NULL,
         PhLibImageBase,
         NULL
         );
@@ -440,7 +444,7 @@ VOID PhMwpInitializeControls(
         3,
         3,
         PhMainWndHandle,
-        (HMENU)ID_MAINWND_SERVICETL,
+        NULL,
         PhLibImageBase,
         NULL
         );
@@ -455,7 +459,7 @@ VOID PhMwpInitializeControls(
         3,
         3,
         PhMainWndHandle,
-        (HMENU)ID_MAINWND_NETWORKTL,
+        NULL,
         PhLibImageBase,
         NULL
         );

ProcessHacker/resource.h

@@ -534,10 +534,6 @@
 #define IDC_HANDLESEARCH                1385
 #define IDC_SEARCH                      1387
 #define IDC_FILTEROPTIONS               1389
-#define ID_MAINWND_PROCESSTL            2001
-#define ID_MAINWND_SERVICETL            2002
-#define ID_MAINWND_NETWORKTL            2003
-#define ID_MAINWND_PROCESSLV            2004
 #define ID_HACKER_EXIT                  40001
 #define ID_PROCESS_PROPERTIES           40006
 #define ID_PROCESS_TERMINATE            40007

ProcessHacker/settings.c

@@ -81,6 +81,7 @@ VOID PhAddDefaultSettings(
     PhpAddIntegerPairSetting(L"LogWindowPosition", L"300,300");
     PhpAddScalableIntegerPairSetting(L"LogWindowSize", L"@96|450,500");
     PhpAddIntegerSetting(L"MainWindowAlwaysOnTop", L"0");
+    PhpAddStringSetting(L"MainWindowClassName", L"MainWindowClassName");
     PhpAddIntegerSetting(L"MainWindowOpacity", L"0"); // means 100%
     PhpAddIntegerPairSetting(L"MainWindowPosition", L"100,100");
     PhpAddScalableIntegerPairSetting(L"MainWindowSize", L"@96|800,600");