Merge branch 'irp49'

gui/IRPMon.dproj

@@ -129,15 +129,15 @@
   <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
     <BT_BuildType>Debug</BT_BuildType>
     <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
-    <VerInfo_Build>331</VerInfo_Build>
-    <VerInfo_Keys>CompanyName=Martin Drab;FileDescription=IRPMon Application;FileVersion=1.0.0.331;InternalName=IRPMON.EXE;LegalCopyright=Copyright (c) Martin Drab, 2015-2020;LegalTrademarks=;OriginalFilename=IRPMon.exe;ProductName=IRP Monitor;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+    <VerInfo_Build>332</VerInfo_Build>
+    <VerInfo_Keys>CompanyName=Martin Drab;FileDescription=IRPMon Application;FileVersion=1.0.0.332;InternalName=IRPMON.EXE;LegalCopyright=Copyright (c) Martin Drab, 2015-2020;LegalTrademarks=;OriginalFilename=IRPMon.exe;ProductName=IRP Monitor;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
     <DCC_ExeOutput>..\bin\x64\$(Config)</DCC_ExeOutput>
     <BT_BuildType>Debug</BT_BuildType>
     <AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
-    <VerInfo_Build>7</VerInfo_Build>
-    <VerInfo_Keys>CompanyName=Martin Drab;FileDescription=IRPMon Application;FileVersion=1.0.0.7;InternalName=IRPMON.EXE;LegalCopyright=Copyright (c) Martin Drab, 2015-2020;LegalTrademarks=;OriginalFilename=IRPMon.exe;ProductName=IRP Monitor;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
+    <VerInfo_Build>8</VerInfo_Build>
+    <VerInfo_Keys>CompanyName=Martin Drab;FileDescription=IRPMon Application;FileVersion=1.0.0.8;InternalName=IRPMON.EXE;LegalCopyright=Copyright (c) Martin Drab, 2015-2020;LegalTrademarks=;OriginalFilename=IRPMon.exe;ProductName=IRP Monitor;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
   </PropertyGroup>
   <ItemGroup>
     <DelphiCompile Include="$(MainSource)">

gui/MainForm.dfm

@@ -1144,6 +1144,18 @@ object MainFrm: TMainFrm
       Caption = 'Exclude'
       OnClick = PopupFilterClick
     end
+    object RPIncludeAllMenuItem: TMenuItem
+      Caption = 'Include'
+      OnClick = PopupFilterClick
+    end
+    object RPHighlightAllMenuItem: TMenuItem
+      Caption = 'Highlight'
+      OnClick = PopupFilterClick
+    end
+    object RPExcludeAllMenuItem: TMenuItem
+      Caption = 'Exclude'
+      OnClick = PopupFilterClick
+    end
   end
   object HighlightColorDialog: TColorDialog
     Left = 300

gui/MainForm.pas

@@ -77,6 +77,9 @@
     IgnoreLogFileHeadersMenuItem: TMenuItem;
     StripRequestDataMenuItem: TMenuItem;
     MaxRequestDataSizeMenuItem: TMenuItem;
+    RPIncludeAllMenuItem: TMenuItem;
+    RPHighlightAllMenuItem: TMenuItem;
+    RPExcludeAllMenuItem: TMenuItem;
     Procedure ClearMenuItemClick(Sender: TObject);
     procedure FormCreate(Sender: TObject);
     procedure CaptureEventsMenuItemClick(Sender: TObject);
@@ -584,6 +587,7 @@
   clientP : TPoint;
   selectedIndex : Integer;
   columnFound : Boolean;
+  requestTypeString : WideString;
 begin
 w := 0;
 value := '';
@@ -601,13 +605,23 @@
       Inc(w, c.Width);
       If clientP.X <= w Then
         begin
+        requestTypeString := TDriverRequest.RequestTypeToString(FModel.Items[selectedIndex].RequestType);
         value := FModel.Item(selectedIndex, I);
-        RPIncludeMenuItem.Caption := Format('Include "%s"', [value]);
-        RPHighlightMenuItem.Caption := Format('Highlight "%s"', [value]);
-        RPExcludeMenuItem.Caption := Format('IExclude "%s"', [value]);
+        RPIncludeMenuItem.Caption := Format('Include "%s" (%s)', [value, requestTypeString]);
+        RPHighlightMenuItem.Caption := Format('Highlight "%s" (%s)...', [value, requestTypeString]);
+        RPExcludeMenuItem.Caption := Format('IExclude "%s" (%s)', [value, requestTypeString]);
+
+        RPIncludeAllMenuItem.Caption := Format('Include "%s" (all requests)', [value]);
+        RPHighlightAllMenuItem.Caption := Format('Highlight "%s" (all requests)...', [value]);
+        RPExcludeAllMenuItem.Caption := Format('IExclude "%s" (all requests)', [value]);
+
         RPHighlightMenuItem.Tag := c.Tag;
         RPIncludeMenuItem.Tag := c.Tag;
         RPExcludeMenuItem.Tag := c.Tag;
+        RPHighlightAllMenuItem.Tag := c.Tag;
+        RPIncludeAllMenuItem.Tag := c.Tag;
+        RPExcludeAllMenuItem.Tag := c.Tag;
+
         RequestPopupMenu.Tag := I;
         columnFound := True;
         Break;
@@ -619,6 +633,9 @@
 RPIncludeMenuItem.Enabled := columnFound;
 RPHighlightMenuItem.Enabled := columnFound;
 RPExcludeMenuItem.Enabled := columnFound;
+RPIncludeAllMenuItem.Enabled := columnFound;
+RPHighlightAllMenuItem.Enabled := columnFound;
+RPExcludeAllMenuItem.Enabled := columnFound;
 end;
 
 Procedure TMainFrm.RPDetailsMenuItemClick(Sender: TObject);
@@ -880,22 +897,32 @@ procedure TMainFrm.PopupFilterClick(Sender: TObject);
   l : Cardinal;
   ret : Boolean;
   columnType : ERequestListModelColumnType;
+  filterType : ERequestType;
 begin
 invalidButton := False;
 M := Sender As TMenuItem;
-If Sender = RPHighlightMenuItem Then
+If (Sender = RPHighlightMenuItem) Or
+   (Sender = RPHighlightAllMenuItem) Then
   filterAction := ffaHighlight
-Else If Sender = RPIncludeMenuItem Then
+Else If (Sender = RPIncludeMenuItem) Or
+        (Sender = RPIncludeAllMenuItem) Then
   filterAction := ffaInclude
-Else If Sender = RPExcludeMenuItem Then
+Else If (Sender = RPExcludeMenuItem) Or
+        (Sender = RPExcludeAllMenuItem) Then
   filterAction := ffaExclude
 Else invalidButton := True;
 
 If Not invalidButton Then
   begin
   value := FModel.Item(FModel.SelectedIndex, RequestPopupMenu.Tag);
   rq := FModel.Selected;
-  rf := TRequestFilter.NewInstance(rq.RequestType);
+  filterType := ertUndefined;
+  If (Sender = RPIncludeMenuItem) Or
+     (Sender = RPHighlightMenuItem) Or
+     (Sender = RPExcludeMenuItem) Then
+     filterType := rq.RequestType;
+
+  rf := TRequestFilter.NewInstance(filterType);
   rf.Enabled := True;
   rf.Ephemeral := True;
   columnType := ERequestListModelColumnType(M.Tag);