Load MAPI When Outlook.exe isn't Present (#883)

* Consume mapistub olmap32 load changes

* remove unused var

* update mapistub

* formatting

* fix formatting

Author: stephenegriffin

UI/Dialogs/Editors/Options.cpp

@@ -117,8 +117,7 @@ namespace dialog::editor
 		COptions MyOptions(lpParentWnd);
 		MyOptions.DoModal();
 
-		mapistub::ForceOutlookMAPI(registry::forceOutlookMAPI);
-		mapistub::ForceSystemMAPI(registry::forceSystemMAPI);
+		registry::PushOptionsToStub();
 		return MyOptions.NeedPropRefresh();
 	}
 } // namespace dialog::editor

UI/ParentWnd.cpp

@@ -76,8 +76,7 @@ namespace ui
 		m_hwinEventHook = SetWinEventHook(
 			EVENT_OBJECT_REORDER, EVENT_OBJECT_REORDER, nullptr, &MyWinEventProc, GetCurrentProcessId(), NULL, NULL);
 
-		mapistub::ForceOutlookMAPI(registry::forceOutlookMAPI);
-		mapistub::ForceSystemMAPI(registry::forceSystemMAPI);
+		registry::PushOptionsToStub();
 
 		addin::LoadAddIns();
 

core/mapi/version.cpp

@@ -17,7 +17,7 @@ namespace version
 		for (const auto component : mapistub::g_pszOutlookQualifiedComponents)
 		{
 			auto b64 = false;
-			auto lpszTempPath = mapistub::GetOutlookPath(component, &b64);
+			auto lpszTempPath = mapistub::GetOLMAPI32Path(component);
 
 			if (!lpszTempPath.empty())
 			{
@@ -34,6 +34,8 @@ namespace version
 				{
 					szOut = strings::formatmessage(
 						IDS_OUTLOOKVERSIONSTRING, lpszTempPath.c_str(), lpszTempVer.c_str(), lpszTempLang.c_str());
+					b64 = Is64BitModule(lpszTempPath);
+
 					szOut += strings::formatmessage(b64 ? IDS_TRUE : IDS_FALSE);
 					szOut += L"\n"; // STRING_OK
 				}
@@ -194,4 +196,71 @@ namespace version
 
 		return szVersionString;
 	}
+
+	bool Is64BitModule(const std::wstring& modulePath)
+	{
+		if (modulePath.empty()) return false;
+
+		const auto hFile = CreateFileW(
+			modulePath.c_str(), GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
+
+		if (hFile == INVALID_HANDLE_VALUE)
+		{
+			output::DebugPrint(
+				output::dbgLevel::Generic, L"Is64BitModule: Failed to open file %ws\n", modulePath.c_str());
+			return false;
+		}
+
+		// Read DOS header
+		IMAGE_DOS_HEADER dosHeader = {};
+		DWORD bytesRead = 0;
+		if (!ReadFile(hFile, &dosHeader, sizeof(dosHeader), &bytesRead, nullptr) || bytesRead != sizeof(dosHeader) ||
+			dosHeader.e_magic != IMAGE_DOS_SIGNATURE)
+		{
+			CloseHandle(hFile);
+			return false;
+		}
+
+		// Seek to PE header
+		if (SetFilePointer(hFile, dosHeader.e_lfanew, nullptr, FILE_BEGIN) == INVALID_SET_FILE_POINTER)
+		{
+			CloseHandle(hFile);
+			return false;
+		}
+
+		// Read PE signature
+		DWORD peSignature = 0;
+		if (!ReadFile(hFile, &peSignature, sizeof(peSignature), &bytesRead, nullptr) ||
+			bytesRead != sizeof(peSignature) || peSignature != IMAGE_NT_SIGNATURE)
+		{
+			CloseHandle(hFile);
+			return false;
+		}
+
+		// Read file header to get machine type
+		IMAGE_FILE_HEADER fileHeader = {};
+		if (!ReadFile(hFile, &fileHeader, sizeof(fileHeader), &bytesRead, nullptr) || bytesRead != sizeof(fileHeader))
+		{
+			CloseHandle(hFile);
+			return false;
+		}
+
+		CloseHandle(hFile);
+
+		// Check machine type to determine if it's 64-bit
+		switch (fileHeader.Machine)
+		{
+		case IMAGE_FILE_MACHINE_AMD64:
+		case IMAGE_FILE_MACHINE_IA64:
+		case IMAGE_FILE_MACHINE_ARM64:
+			return true;
+		case IMAGE_FILE_MACHINE_I386:
+		case IMAGE_FILE_MACHINE_ARM:
+		case IMAGE_FILE_MACHINE_ARMNT:
+			return false;
+		default:
+			// Unknown architecture, assume 32-bit
+			return false;
+		}
+	}
 } // namespace version

core/mapi/version.h

@@ -3,4 +3,5 @@
 namespace version
 {
 	std::wstring GetOutlookVersionString();
+	bool Is64BitModule(const std::wstring& modulePath);
 } // namespace version

core/res/MFCMapi.rc2

@@ -341,7 +341,7 @@ Set ulEventMask"
 IDS_COMPUTESTOREHASH             "Compute Store Hash"
 IDS_COMPUTESTOREHASHPROMPT       "Enter store entry ID and file name"
 IDS_OUTLOOKVERSIONTITLE          "Outlook Version"
-IDS_OUTLOOKVERSIONPROMPT         "Outlook path, version and language obtained through MsiProvideQualifiedComponent and MsiGetFileVersion:"
+IDS_OUTLOOKVERSIONPROMPT         "OLMAPI32 path, version and language obtained through MsiProvideQualifiedComponent and MsiGetFileVersion:"
 IDS_OUTLOOKVERSIONSTRING         "Path: %1!ws!\nVersion: %2!ws!\nLang: %3!ws!\n64 bit: "
 IDS_NOOUTLOOK                    "Outlook does not appear to be installed on this machine."
 
@@ -993,6 +993,7 @@ IDS_REGKEY_HEAPENABLETERMINATIONONCORRUPTION "Terminate on heap corruption (requ
 IDS_REGKEY_LOADADDINS "Load add-ins (requires restart)"
 IDS_REGKEY_FORCEOUTLOOKMAPI "Force the use of Outlook's MAPI files"
 IDS_REGKEY_FORCESYSTEMMAPI "Force the use of the system's MAPI files"
+IDS_REGKEY_PREFER_OLMAPI32 "Prefer olmapi32.dll over other MAPI files"
 IDS_REGKEY_UIDIAG "Show UI diagnostics"
 
 // RestrictEditor.cpp
@@ -1708,7 +1709,7 @@ IDS_EDMAPIINITIALIZEFAILED "MAPIInitialize failed with error 0x%08X == %ws.\r\n\
 \r\n\
 Here are some known causes for this.\r\n\
 1 - A 64 bit version of Outlook is not installed. The 64 bit version of MFCMAPI only works with a 64 bit version of Outlook.\r\n\
-\tSee https://github.com/microsoft/mfcmapifor the latest 32 bit bit build of MFCMAPI.\r\n\
+\tSee https://github.com/microsoft/mfcmapi for the latest 32 bit bit build of MFCMAPI.\r\n\
 2 - Windows Mail is registered as the Default Mail Client.\r\n\
 \tSee http://msdn.microsoft.com/en-gb/library/dd162409.aspx for information on setting the Default Mail Client."
 #else

core/res/Resource.h

@@ -1234,3 +1234,4 @@
 #define IDS_RESERVED 35871
 #define IDS_CAPABILITIES_FOLDER 35872
 #define IDS_CAPABILITIES_RESTRICTION 35873
+#define IDS_REGKEY_PREFER_OLMAPI32 35874

core/utility/registry.cpp

@@ -4,6 +4,7 @@
 #include <core/utility/output.h>
 #include <core/utility/error.h>
 #include <core/utility/import.h>
+#include <mapistub/library/stubutils.h>
 
 namespace registry
 {
@@ -63,6 +64,7 @@ namespace registry
 	boolRegKey loadAddIns{L"LoadAddIns", true, false, IDS_REGKEY_LOADADDINS};
 	boolRegKey forceOutlookMAPI{L"ForceOutlookMAPI", false, false, IDS_REGKEY_FORCEOUTLOOKMAPI};
 	boolRegKey forceSystemMAPI{L"ForceSystemMAPI", false, false, IDS_REGKEY_FORCESYSTEMMAPI};
+	boolRegKey preferOlmapi32{L"PreferOlmapi32", true, false, IDS_REGKEY_PREFER_OLMAPI32};
 	boolRegKey uiDiag{L"UIDiag", false, false, IDS_REGKEY_UIDIAG};
 	boolRegKey displayAboutDialog{L"DisplayAboutDialog", true, false, NULL};
 	wstringRegKey propertyColumnOrder{L"PropertyColumnOrder", L"", false, NULL};
@@ -96,6 +98,7 @@ namespace registry
 		&loadAddIns,
 		&forceOutlookMAPI,
 		&forceSystemMAPI,
+		&preferOlmapi32,
 		&uiDiag,
 		&displayAboutDialog,
 		&propertyColumnOrder,
@@ -331,4 +334,11 @@ namespace registry
 
 		if (hRootKey) EC_W32_S(RegCloseKey(hRootKey));
 	}
+
+	void PushOptionsToStub()
+	{
+		mapistub::ForceOutlookMAPI(forceOutlookMAPI);
+		mapistub::ForceSystemMAPI(forceSystemMAPI);
+		mapistub::PreferOlmapi32(preferOlmapi32);
+	}
 } // namespace registry

core/utility/registry.h

@@ -166,6 +166,7 @@ namespace registry
 	{
 		WriteBinToRegistry(hKey, szValueName, std::vector<BYTE>(lpbin, lpbin + cb), bSecure);
 	}
+	void PushOptionsToStub();
 
 	extern dwordRegKey debugTag;
 	extern boolRegKey debugToFile;
@@ -194,6 +195,7 @@ namespace registry
 	extern boolRegKey loadAddIns;
 	extern boolRegKey forceOutlookMAPI;
 	extern boolRegKey forceSystemMAPI;
+	extern boolRegKey preferOlmapi32;
 	extern boolRegKey uiDiag;
 	extern boolRegKey displayAboutDialog;
 	extern wstringRegKey propertyColumnOrder;