re-create system tray icon if explorer restarts

Author: Bailey Brown

INSTALL.md

@@ -102,9 +102,7 @@ set PATH=%LOCALAPPDATA%\bin\NASM;%PATH%
 Then run the batch file that comes with Visual Studio that sets up the environment variables for compiling from the command line.
 
 ```
-
 "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
-
 ```
 
 Use "x86" in place of "amd64" if you are doing a 32-bit build.

changelog.md

@@ -2,6 +2,9 @@
 
 Changelog
 ------------
+v1.4.4.5 11 Nov 2024
+* Re-create system tray icon if explorer is restarted.
+
 v1.4.4.4 31 Aug 2024
 * Use Dokany 2.2 (2.2.0.1000)
 

cppcryptfs/cppcryptfs.cpp

@@ -47,6 +47,7 @@ THE SOFTWARE.
 #include "dokan/cryptdokan.h"
 #include "util/getopt.h"
 #include "util/LockZeroBuffer.h"
+#include "../libcommonutil/commonutil.h"
 #include "util/util.h"
 #include "crypt/crypt.h"
 #include "ui/uiutil.h"
@@ -70,14 +71,14 @@ END_MESSAGE_MAP()
 
 CcppcryptfsApp::CcppcryptfsApp()
 {
+	m_bIsRunningAsAdministrator = ::IsRunningAsAdministrator(&m_bIsReallyAdministrator);
+
 	// support Restart Manager
 	m_dwRestartManagerSupportFlags = AFX_RESTART_MANAGER_SUPPORT_RESTART;
 
 	// TODO: add construction code here,
 	// Place all significant initialization in InitInstance
 
-	m_mountedLetters = 0;
-
 	// get a shared ptr to an OpenSSL EVP context to force detection of AES-NI instructions
 	// so we can use AES-NI even if EVP is never used
 
@@ -277,13 +278,16 @@ BOOL CcppcryptfsApp::InitInstance()
 
 	m_pMainWnd = &dlg;
 
-	HICON hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
+	m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
 
-	CMenuTrayIcon TI(L"cppcryptfs", hIcon, IDR_PopUps, ID_IDR_SHOWCPPCRYPTFS);
+	RecreateSystemTrayIcon();
 
 	crypt_at_start();
 
 	INT_PTR nResponse = dlg.DoModal();
+
+	m_system_tray_icon = nullptr;
+
 	if (nResponse == IDOK)
 	{
 		// TODO: Place code here to handle when the dialog is
@@ -321,6 +325,15 @@ BOOL CcppcryptfsApp::InitInstance()
 	return FALSE;
 }
 
+void CcppcryptfsApp::RecreateSystemTrayIcon()
+{
+	// Destroy it first in case there's any singleton behavior with the CMenuTrayIcon class or anything that
+	// replaces it in the future.
+	m_system_tray_icon.reset(); 
+
+	m_system_tray_icon = make_shared<CMenuTrayIcon>(L"cppcryptfs", m_hIcon, IDR_PopUps, ID_IDR_SHOWCPPCRYPTFS);
+}
+
 BOOL CcppcryptfsApp::WriteProfileInt(LPCWSTR section, LPCWSTR entry, INT val)
 {
 	if (lstrcmpi(section, CryptSettingsRegValName) && NeverSaveHistory()) {

cppcryptfs/cppcryptfs.h

@@ -31,6 +31,8 @@ THE SOFTWARE.
 
 #pragma once
 
+#include "stdafx.h"
+
 #ifndef __AFXWIN_H__
 	#error "include 'stdafx.h' before including this file for PCH"
 #endif
@@ -39,6 +41,7 @@ THE SOFTWARE.
 
 #include <unordered_map>
 #include <string>
+#include <memory>
 #include "crypt/cryptdefs.h"
 
 using namespace std;
@@ -63,25 +66,32 @@ typedef struct struct_CopyDataCmdLine {
 // See cppcryptfs.cpp for the implementation of this class
 //
 
+class CMenuTrayIcon;
+
 class CcppcryptfsApp : public CWinApp
 {
+private:
+	bool m_bIsRunningAsAdministrator = false;
+	bool m_bIsReallyAdministrator = false;
 public:
 	void SendCmdArgsToSelf(HANDLE hPipe);
 public:
 	CcppcryptfsApp();
-#if 0
-	unordered_map<wstring, wstring> m_mountedMountPoints; // used for tracking all mounted mountpoints (dirs and drive letters)
-																		 // drive letters are stored with colon e.g drive M as L"M:"
-#endif
-	DWORD m_mountedLetters;        // used for tracking mounted (by cpppcryptfs) drive letters
-// Overrides
+	HICON m_hIcon = NULL;
+	DWORD m_mountedLetters = 0; // used for tracking mounted (by cpppcryptfs) drive letters
+	std::shared_ptr<CMenuTrayIcon> m_system_tray_icon;
+	// Overrides
 public:
 	virtual BOOL InitInstance() override;
 
 	virtual BOOL WriteProfileInt(LPCWSTR section, LPCWSTR entry, INT val) override;
 	virtual BOOL WriteProfileString(LPCWSTR section, LPCWSTR entry, LPCWSTR val) override;
 	virtual BOOL WriteProfileBinary(LPCWSTR section, LPCWSTR entry, LPBYTE pData, UINT nBytes) override;
 
+	void RecreateSystemTrayIcon();
+
+	bool IsRunningAsAdministrator() { return m_bIsRunningAsAdministrator; }
+	bool IsReallyAdministrator() { return m_bIsReallyAdministrator; }
 // Implementation
 
 	DECLARE_MESSAGE_MAP()

cppcryptfs/cppcryptfs.rc

@@ -651,10 +651,13 @@ BOOL CCryptAboutPropertyPage::OnInitDialog()
 
 	SetDlgItemText(IDC_LINKAGES, L"linked with " + openssl_ver + dokany_version);
 
+	bool is_admin = theApp.IsRunningAsAdministrator();
+
 	CString prod_ver = prod.c_str();
-	prod_ver += L", Version ";
-	prod_ver += &ver[0];
+	prod_ver += L" ";
+	prod_ver += ver.c_str();	
 	prod_ver += sizeof(void*) == 8 ? L" 64-bit" : L" 32-bit";
+	prod_ver += (is_admin ? L" (admin)" : L"");
 
 	SetDlgItemText(IDC_PROD_VERSION, prod_ver + CString(aes_ni.c_str()));
 	SetDlgItemText(IDC_COPYRIGHT, copyright.c_str());

cppcryptfs/ui/CryptAboutPropertyPage.cpp

@@ -39,6 +39,7 @@ THE SOFTWARE.
 #include "dokan/cryptdokan.h"
 #include "util/LockZeroBuffer.h"
 #include "util/util.h"
+#include "../libcommonutil/commonutil.h"
 #include "dokan/MountPointManager.h"
 #include "ui/uiutil.h"
 #include "ui/CryptSettings.h"
@@ -48,6 +49,9 @@ THE SOFTWARE.
 
 // CryptPropertySheet
 
+static const int kSysTrayiTimerId = 1;
+static const int kSysTrayTimerInterval = 2000; // milliseconds
+
 IMPLEMENT_DYNAMIC(CCryptPropertySheet, CPropertySheet)
 
 CCryptPropertySheet::CCryptPropertySheet(UINT nIDCaption, CWnd* pParentWnd, UINT iSelectPage)
@@ -106,6 +110,7 @@ BOOL CCryptPropertySheet::CanClose()
 	}
 }
 
+UINT CCryptPropertySheet::WM_TASKBARCREATED = ::RegisterWindowMessage(_T("TaskbarCreated"));
 
 BEGIN_MESSAGE_MAP(CCryptPropertySheet, CPropertySheet)
 	ON_WM_NCCREATE()
@@ -119,12 +124,22 @@ BEGIN_MESSAGE_MAP(CCryptPropertySheet, CPropertySheet)
 //	ON_WM_QUERYENDSESSION()
 ON_WM_ENDSESSION()
 ON_WM_POWERBROADCAST()
+// custom messages
+ON_REGISTERED_MESSAGE(WM_TASKBARCREATED, OnTaskbarCreated)
+ON_WM_TIMER()
+ON_WM_DESTROY()
 END_MESSAGE_MAP()
 
 
 // CryptPropertySheet message handlers
 
 
+LRESULT CCryptPropertySheet::OnTaskbarCreated(WPARAM wParam, LPARAM lParam)
+{
+	theApp.RecreateSystemTrayIcon();
+	return 0;
+}
+
 BOOL CCryptPropertySheet::OnInitDialog()
 {
 
@@ -144,6 +159,14 @@ BOOL CCryptPropertySheet::OnInitDialog()
 	if (pWnd)
 		pWnd->ShowWindow(SW_HIDE);
 
+	if (theApp.IsRunningAsAdministrator()) {
+
+		// We want to know if explorer gets restarted so we can re-create our system tray icon.
+		// However, if we're running as administrator, we never get any TaskbarCreated messages,
+		// so we need to poll using a timer.
+
+		SetTimer(kSysTrayiTimerId, kSysTrayTimerInterval, nullptr);
+	}
 
 	return bResult;
 }
@@ -401,3 +424,43 @@ BOOL CCryptPropertySheet::PreTranslateMessage(MSG* pMsg)
 
 	return CPropertySheet::PreTranslateMessage(pMsg);
 }
+
+
+void CCryptPropertySheet::OnTimer(UINT_PTR nIDEvent)
+{
+	// TODO: Add your message handler code here and/or call default
+	
+	if (nIDEvent == kSysTrayiTimerId) {
+		const HWND hWnd = ::FindWindow(L"Shell_TrayWnd", NULL);
+
+		if (hWnd)
+		{
+			if (m_bDoRecreateSysTrayIcon)
+			{
+				m_bDoRecreateSysTrayIcon = false;
+				theApp.RecreateSystemTrayIcon();
+			} 
+			else if (hWnd != m_hSysTrayWnd) 
+			{
+				m_hSysTrayWnd = hWnd;
+				// We seem to need some sort of delay before recreating it.
+				m_bDoRecreateSysTrayIcon = true;				
+			}
+		}
+	}
+
+	CPropertySheet::OnTimer(nIDEvent);
+}
+
+
+void CCryptPropertySheet::OnDestroy()
+{
+	CPropertySheet::OnDestroy();
+
+	// TODO: Add your message handler code here
+
+	if (theApp.IsRunningAsAdministrator())
+	{
+		KillTimer(kSysTrayiTimerId);
+	}
+}

cppcryptfs/ui/CryptPropertySheet.cpp

@@ -36,8 +36,7 @@ class CCryptPropertySheet : public CPropertySheet
 {
 	DECLARE_DYNAMIC(CCryptPropertySheet)
 
-public:
-
+public:	
 	// disallow copying
 	CCryptPropertySheet(CCryptPropertySheet const&) = delete;
 	void operator=(CCryptPropertySheet const&) = delete;
@@ -52,8 +51,15 @@ class CCryptPropertySheet : public CPropertySheet
 
 	int m_nMountPageIndex;	
 
+	HWND m_hSysTrayWnd = NULL;
+
+	bool m_bDoRecreateSysTrayIcon = false;
+
 protected:
 	DECLARE_MESSAGE_MAP()
+
+	static UINT WM_TASKBARCREATED;
+	afx_msg LRESULT OnTaskbarCreated(WPARAM wParam, LPARAM lParam);
 public:
 	virtual BOOL OnInitDialog();
 	virtual BOOL OnCommand(WPARAM wParam, LPARAM lParam);
@@ -68,6 +74,8 @@ class CCryptPropertySheet : public CPropertySheet
 	afx_msg void OnEndSession(BOOL bEnding);
 	afx_msg UINT OnPowerBroadcast(UINT nPowerEvent, LPARAM nEventData);
 	virtual BOOL PreTranslateMessage(MSG* pMsg);
+	afx_msg void OnTimer(UINT_PTR nIDEvent);
+	afx_msg void OnDestroy();
 };
 
 

cppcryptfs/ui/CryptPropertySheet.h

@@ -51,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,4,4,4
- PRODUCTVERSION 1,4,4,4
+ FILEVERSION 1,4,4,5
+ PRODUCTVERSION 1,4,4,5
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -69,12 +69,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Bailey Brown"
             VALUE "FileDescription", "cppcryptfsctl"
-            VALUE "FileVersion", "1.4.4.4"
+            VALUE "FileVersion", "1.4.4.5"
             VALUE "InternalName", "cppcryptfsctl.exe"
             VALUE "LegalCopyright", "Copyright (C) 2020-2024 Bailey Brown. All rights reserved."
             VALUE "OriginalFilename", "cppcryptfsctl.exe"
             VALUE "ProductName", "cppcryptfsctl"
-            VALUE "ProductVersion", "1.4.4.4"
+            VALUE "ProductVersion", "1.4.4.5"
         END
     END
     BLOCK "VarFileInfo"

cppcryptfsctl/cppcryptfsctl.rc

@@ -168,3 +168,60 @@ wstring GetWindowsErrorString(DWORD dwLastErr)
 	return mes;
 }
 
+static bool IsProcessElevated()
+{
+	HANDLE hToken = NULL;
+	TOKEN_ELEVATION elevation;
+	DWORD size;
+
+	if (OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken))
+	{
+		if (GetTokenInformation(hToken, TokenElevation, &elevation, sizeof(elevation), &size))
+		{
+			CloseHandle(hToken);
+			return elevation.TokenIsElevated != 0;
+		}
+		CloseHandle(hToken);
+	}
+	return false;
+}
+
+bool IsRunningAsAdministrator(bool *pIsReallyAdmin)
+{
+	BOOL isAdmin = FALSE;
+	HANDLE hToken = NULL;
+
+	if (pIsReallyAdmin)
+		*pIsReallyAdmin = false;
+
+	// Open the process token
+	if (OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken))
+	{
+		// Create a SID for the Administrators group
+		PSID administratorsGroup = NULL;
+		SID_IDENTIFIER_AUTHORITY ntAuthority = SECURITY_NT_AUTHORITY;
+		if (AllocateAndInitializeSid(&ntAuthority, 2,
+			SECURITY_BUILTIN_DOMAIN_RID,
+			DOMAIN_ALIAS_RID_ADMINS,
+			0, 0, 0, 0, 0, 0,
+			&administratorsGroup))
+		{
+			// Check if the token has the Administrators group SID
+			CheckTokenMembership(hToken, administratorsGroup, &isAdmin);
+			FreeSid(administratorsGroup);
+		}
+		CloseHandle(hToken);
+	}
+
+	if (isAdmin)
+	{
+		if (pIsReallyAdmin)
+			*pIsReallyAdmin = true;
+
+		return true;
+	}
+	else
+	{
+		return IsProcessElevated();
+	}
+}