Merge pull request #523 from stephenegriffin/res

Res
microsoft · Jan 5, 2022 · b808449 · b808449
2 parents 6a7e43f + 9166cc3
commit b808449
Show file tree

Hide file tree

Showing 27 changed files with 1,719 additions and 1,491 deletions.
diff --git a/MFCMapi.vcxproj b/MFCMapi.vcxproj
@@ -594,7 +594,16 @@ copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)"
     <ClInclude Include="UI\Controls\SortList\SortHeader.h" />
     <ClInclude Include="UI\Controls\SortList\SortListCtrl.h" />
     <ClInclude Include="UI\Controls\PaneHeader\PaneHeader.h" />
+    <ClInclude Include="UI\Dialogs\Editors\restriction\ResExistEditor.h" />
+    <ClInclude Include="UI\Dialogs\Editors\restriction\ResSubResEditor.h" />
     <ClInclude Include="UI\Dialogs\Editors\propeditor\ipropeditor.h" />
+    <ClInclude Include="UI\Dialogs\Editors\restriction\CriteriaEditor.h" />
+    <ClInclude Include="UI\Dialogs\Editors\restriction\ResCompareEditor.h" />
+    <ClInclude Include="UI\Dialogs\Editors\restriction\ResCombinedEditor.h" />
+    <ClInclude Include="UI\Dialogs\Editors\restriction\ResBitmaskEditor.h" />
+    <ClInclude Include="UI\Dialogs\Editors\restriction\ResSizeEditor.h" />
+    <ClInclude Include="UI\Dialogs\Editors\restriction\ResAndOrEditor.h" />
+    <ClInclude Include="UI\Dialogs\Editors\restriction\ResCommentEditor.h" />
     <ClInclude Include="UI\Dialogs\propList\AccountsDialog.h" />
     <ClInclude Include="UI\Dialogs\propList\RegistryDialog.h" />
     <ClInclude Include="UI\enums.h" />
@@ -658,7 +667,7 @@ copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)"
     <ClInclude Include="UI\Dialogs\ContentsTable\PublicFolderTableDlg.h" />
     <ClInclude Include="UI\QuickStart.h" />
     <ClInclude Include="UI\Dialogs\ContentsTable\RecipientsDlg.h" />
-    <ClInclude Include="UI\Dialogs\Editors\RestrictEditor.h" />
+    <ClInclude Include="UI\Dialogs\Editors\restriction\RestrictEditor.h" />
     <ClInclude Include="UI\Dialogs\ContentsTable\RulesDlg.h" />
     <ClInclude Include="UI\Dialogs\propList\SingleMessageDialog.h" />
     <ClInclude Include="UI\Controls\SortList\SingleMAPIPropListCtrl.h" />
@@ -677,7 +686,16 @@ copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)"
     <ClCompile Include="UI\Controls\SortList\SortHeader.cpp" />
     <ClCompile Include="UI\Controls\SortList\SortListCtrl.cpp" />
     <ClCompile Include="UI\Controls\PaneHeader\PaneHeader.cpp" />
+    <ClCompile Include="UI\Dialogs\Editors\restriction\ResExistEditor.cpp" />
     <ClCompile Include="UI\Dialogs\Editors\propeditor\ipropeditor.cpp" />
+    <ClCompile Include="UI\Dialogs\Editors\restriction\CriteriaEditor.cpp" />
+    <ClCompile Include="UI\Dialogs\Editors\restriction\ResCompareEditor.cpp" />
+    <ClCompile Include="UI\Dialogs\Editors\restriction\ResCombinedEditor.cpp" />
+    <ClCompile Include="UI\Dialogs\Editors\restriction\ResBitmaskEditor.cpp" />
+    <ClCompile Include="UI\Dialogs\Editors\restriction\ResSizeEditor.cpp" />
+    <ClCompile Include="UI\Dialogs\Editors\restriction\ResSubResEditor.cpp" />
+    <ClCompile Include="UI\Dialogs\Editors\restriction\ResAndOrEditor.cpp" />
+    <ClCompile Include="UI\Dialogs\Editors\restriction\ResCommentEditor.cpp" />
     <ClCompile Include="UI\Dialogs\propList\AccountsDialog.cpp" />
     <ClCompile Include="UI\Dialogs\propList\RegistryDialog.cpp" />
     <ClCompile Include="UI\file\exporter.cpp" />
@@ -728,7 +746,7 @@ copy "$(TargetDir)$(TargetName).pdb" "$(SolutionDir)"
     <ClCompile Include="UI\Dialogs\Editors\QSSpecialFolders.cpp" />
     <ClCompile Include="UI\QuickStart.cpp" />
     <ClCompile Include="UI\Dialogs\ContentsTable\RecipientsDlg.cpp" />
-    <ClCompile Include="UI\Dialogs\Editors\RestrictEditor.cpp" />
+    <ClCompile Include="UI\Dialogs\Editors\restriction\RestrictEditor.cpp" />
     <ClCompile Include="UI\RichEditOleCallback.cpp" />
     <ClCompile Include="UI\Dialogs\ContentsTable\RulesDlg.cpp" />
     <ClCompile Include="UI\Controls\SortList\SingleMAPIPropListCtrl.cpp" />

diff --git a/MFCMapi.vcxproj.filters b/MFCMapi.vcxproj.filters
@@ -123,6 +123,15 @@
       <Filter>Source Files\UI\Dialogs\propList</Filter>
     </ClInclude>
     <ClInclude Include="UI\Controls\PaneHeader\PaneHeader.h" />
+    <ClInclude Include="UI\Dialogs\Editors\restriction\CriteriaEditor.h" />
+    <ClInclude Include="UI\Dialogs\Editors\restriction\ResCompareEditor.h" />
+    <ClInclude Include="UI\Dialogs\Editors\restriction\ResCombinedEditor.h" />
+    <ClInclude Include="UI\Dialogs\Editors\restriction\ResBitmaskEditor.h" />
+    <ClInclude Include="UI\Dialogs\Editors\restriction\ResSizeEditor.h" />
+    <ClInclude Include="UI\Dialogs\Editors\restriction\ResAndOrEditor.h" />
+    <ClInclude Include="UI\Dialogs\Editors\restriction\ResCommentEditor.h" />
+    <ClInclude Include="UI\Dialogs\Editors\restriction\ResSubResEditor.h" />
+    <ClInclude Include="UI\Dialogs\Editors\restriction\ResExistEditor.h" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="StdAfx.h">
@@ -202,6 +211,33 @@
     <ClCompile Include="UI\Controls\PaneHeader\PaneHeader.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="UI\Dialogs\Editors\restriction\CriteriaEditor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="UI\Dialogs\Editors\restriction\ResCompareEditor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="UI\Dialogs\Editors\restriction\ResCombinedEditor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="UI\Dialogs\Editors\restriction\ResBitmaskEditor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="UI\Dialogs\Editors\restriction\ResSizeEditor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="UI\Dialogs\Editors\restriction\ResSubResEditor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="UI\Dialogs\Editors\restriction\ResAndOrEditor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="UI\Dialogs\Editors\restriction\ResCommentEditor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="UI\Dialogs\Editors\restriction\ResExistEditor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="UI\DoubleBuffer.cpp">
@@ -420,10 +456,10 @@
     <ClInclude Include="UI\Dialogs\Editors\QSSpecialFolders.h">
       <Filter>Source Files\UI\Dialogs\Editors</Filter>
     </ClInclude>
-    <ClCompile Include="UI\Dialogs\Editors\RestrictEditor.cpp">
+    <ClCompile Include="UI\Dialogs\Editors\restriction\RestrictEditor.cpp">
       <Filter>Source Files\UI\Dialogs\Editors</Filter>
     </ClCompile>
-    <ClInclude Include="UI\Dialogs\Editors\RestrictEditor.h">
+    <ClInclude Include="UI\Dialogs\Editors\restriction\RestrictEditor.h">
       <Filter>Source Files\UI\Dialogs\Editors</Filter>
     </ClInclude>
     <ClCompile Include="UI\Dialogs\Editors\SearchEditor.cpp">

diff --git a/UI/Controls/SortList/SingleMAPIPropListCtrl.cpp b/UI/Controls/SortList/SingleMAPIPropListCtrl.cpp
@@ -16,7 +16,7 @@
 #include <core/utility/strings.h>
 #include <core/mapi/cache/globalCache.h>
 #include <UI/Dialogs/Editors/Editor.h>
-#include <UI/Dialogs/Editors/RestrictEditor.h>
+#include <UI/Dialogs/Editors/restriction/RestrictEditor.h>
 #include <UI/Dialogs/Editors/StreamEditor.h>
 #include <UI/Dialogs/Editors/TagArrayEditor.h>
 #include <UI/Dialogs/Editors/propeditor/ipropeditor.h>
@@ -914,7 +914,7 @@ namespace controls::sortlistctrl
 
 		output::DebugPrint(output::dbgLevel::Generic, L"Source restriction before editing:\n");
 		output::outputRestriction(output::dbgLevel::Generic, nullptr, lpResIn, lpPropBag->GetMAPIProp());
-		dialog::editor::CRestrictEditor MyResEditor(
+		dialog::editor::RestrictEditor MyResEditor(
 			this,
 			m_lpMapiObjects, 
 			nullptr, // No alloc parent - we must MAPIFreeBuffer the result
@@ -927,7 +927,7 @@ namespace controls::sortlistctrl
 				output::DebugPrint(output::dbgLevel::Generic, L"Modified restriction:\n");
 				output::outputRestriction(output::dbgLevel::Generic, nullptr, lpModRes, lpPropBag->GetMAPIProp());
 
-				// need to merge the data we got back from the CRestrictEditor with our current prop set
+				// need to merge the data we got back from the RestrictEditor with our current prop set
 				// so that we can free lpModRes
 				SPropValue ResProp = {};
 				if (lpEditProp)

diff --git a/UI/Dialogs/ContentsTable/ContentsTableDlg.cpp b/UI/Dialogs/ContentsTable/ContentsTableDlg.cpp
@@ -7,7 +7,7 @@
 #include <core/mapi/cache/mapiObjects.h>
 #include <UI/Dialogs/MFCUtilityFunctions.h>
 #include <UI/Dialogs/Editors/Editor.h>
-#include <UI/Dialogs/Editors/RestrictEditor.h>
+#include <UI/Dialogs/Editors/restriction/RestrictEditor.h>
 #include <UI/Dialogs/Editors/PropertyTagEditor.h>
 #include <UI/Dialogs/Editors/SearchEditor.h>
 #include <core/mapi/mapiMemory.h>
@@ -354,7 +354,7 @@ namespace dialog
 	{
 		if (!m_lpContentsTableListCtrl || !m_lpContentsTableListCtrl->IsContentsTableSet()) return;
 
-		editor::CRestrictEditor MyRestrict(
+		editor::RestrictEditor MyRestrict(
 			this,
 			m_lpMapiObjects,
 			nullptr, // No alloc parent - we must MAPIFreeBuffer the result