Skip to content

fix winform control complie #420

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix winform control complie #420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0530d33
fix winform control complie
oolanlongoo Apr 2, 2025
991dce4
fix xaml type name
oolanlongoo Apr 2, 2025
b2117b4
Add a new context menu command to load dependencies
oolanlongoo Apr 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
120 changes: 120 additions & 0 deletions Extensions/dnSpy.AsmEditor/Compiler/LoadAllDependenciesCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.Composition;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Text;
using System.Windows.Threading;
using dnlib.DotNet;
using dnSpy.AsmEditor.Commands;
using dnSpy.AsmEditor.Properties;
using dnSpy.AsmEditor.UndoRedo;
using dnSpy.Contracts.AsmEditor.Compiler;
using dnSpy.Contracts.Documents;
using dnSpy.Contracts.Documents.Tabs;
using dnSpy.Contracts.Documents.TreeView;
using dnSpy.Contracts.Images;
using dnSpy.Contracts.Menus;
using dnSpy.Contracts.MVVM;
using dnSpy.Contracts.Utilities;

namespace dnSpy.AsmEditor.Compiler {
[DebuggerDisplay("{Description}")]
sealed class LoadAllDependenciesCommand : EditCodeCommandBase {
[ExportMenuItem(Header = "res:LoadAllDependenciesCommand", Group = MenuConstants.GROUP_CTX_DOCUMENTS_ASMED_ILED, Order = 29.999)]
sealed class DocumentsCommand : DocumentsContextMenuHandler {
readonly Lazy<IUndoCommandService> undoCommandService;
readonly Lazy<IAddUpdatedNodesHelperProvider> addUpdatedNodesHelperProvider;
readonly IAppService appService;

[ImportingConstructor]
DocumentsCommand(Lazy<IUndoCommandService> undoCommandService, Lazy<IAddUpdatedNodesHelperProvider> addUpdatedNodesHelperProvider, IAppService appService) {
this.undoCommandService = undoCommandService;
this.addUpdatedNodesHelperProvider = addUpdatedNodesHelperProvider;
this.appService = appService;
}

public override bool IsVisible(AsmEditorContext context) => LoadAllDependenciesCommand.CanExecute(context.Nodes);
public override void Execute(AsmEditorContext context) => LoadAllDependenciesCommand.Execute(addUpdatedNodesHelperProvider, undoCommandService, appService, context.Nodes);
}

[ExportMenuItem(OwnerGuid = MenuConstants.APP_MENU_EDIT_GUID, Header = "res:LoadAllDependenciesCommand", Group = MenuConstants.GROUP_APP_MENU_EDIT_ASMED_SETTINGS, Order = 59.999)]
sealed class EditMenuCommand : EditMenuHandler {
readonly Lazy<IUndoCommandService> undoCommandService;
readonly Lazy<IAddUpdatedNodesHelperProvider> addUpdatedNodesHelperProvider;
readonly IAppService appService;

[ImportingConstructor]
EditMenuCommand(Lazy<IUndoCommandService> undoCommandService, Lazy<IAddUpdatedNodesHelperProvider> addUpdatedNodesHelperProvider, IAppService appService)
: base(appService.DocumentTreeView) {
this.undoCommandService = undoCommandService;
this.addUpdatedNodesHelperProvider = addUpdatedNodesHelperProvider;
this.appService = appService;
}

public override bool IsVisible(AsmEditorContext context) => LoadAllDependenciesCommand.CanExecute(context.Nodes);
public override void Execute(AsmEditorContext context) => LoadAllDependenciesCommand.Execute(addUpdatedNodesHelperProvider, undoCommandService, appService, context.Nodes);
}

static bool CanExecute(DocumentTreeNodeData[] nodes) => nodes.Length == 1 && GetModuleNode(nodes[0]) is not null;

static ModuleDocumentNode? GetModuleNode(DocumentTreeNodeData node) {
if (node is AssemblyDocumentNode asmNode) {
asmNode.TreeNode.EnsureChildrenLoaded();
return asmNode.TreeNode.DataChildren.FirstOrDefault() as ModuleDocumentNode;
}
else
return node.GetModuleNode();
}

static void Execute(Lazy<IAddUpdatedNodesHelperProvider> addUpdatedNodesHelperProvider, Lazy<IUndoCommandService> undoCommandService, IAppService appService, DocumentTreeNodeData[] nodes) {
if (!CanExecute(nodes))
return;

var modNode = GetModuleNode(nodes[0]);
Debug2.Assert(modNode is not null);
if (modNode is null)
return;
var module = modNode.Document.ModuleDef;
Debug2.Assert(module is not null);
if (module is null)
throw new InvalidOperationException();

var loadeds = new HashSet<ModuleDef>();
LoadAllDependencies(modNode.Context.DocumentTreeView, module, loadeds);
}

static void LoadAllDependencies(IDocumentTreeView documentTreeView, ModuleDef module, HashSet<ModuleDef> loadeds) {
if (loadeds.Contains(module))
return;

loadeds.Add(module);
foreach (var assemblyRef in module.GetAssemblyRefs()) {
var asm = documentTreeView.DocumentService.Resolve(assemblyRef, module);
if (asm?.ModuleDef is null)
continue;
if (FrameworkFileUtils.IsFrameworkAssembly("", assemblyRef.Name))
continue;
LoadAllDependencies(documentTreeView, asm.ModuleDef, loadeds);
}
}

readonly struct ModuleResult {
public IAssembly? Assembly { get; }
public byte[] RawBytes { get; }
public DebugFileResult DebugFile { get; }
public ModuleResult(IAssembly? assembly, byte[] bytes, DebugFileResult debugFile) {
Assembly = assembly;
RawBytes = bytes;
DebugFile = debugFile;
}
}

LoadAllDependenciesCommand(Lazy<IAddUpdatedNodesHelperProvider> addUpdatedNodesHelperProvider, ModuleDocumentNode modNode, ModuleImporter importer)
: base(addUpdatedNodesHelperProvider, modNode, importer) {
}

public override string Description => dnSpy_AsmEditor_Resources.LoadAllDependenciesCommand;
}
}
104 changes: 104 additions & 0 deletions Extensions/dnSpy.AsmEditor/Compiler/LoadDependenciesCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
using System;
using System.ComponentModel.Composition;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Text;
using System.Windows.Threading;
using dnlib.DotNet;
using dnSpy.AsmEditor.Commands;
using dnSpy.AsmEditor.Properties;
using dnSpy.AsmEditor.UndoRedo;
using dnSpy.Contracts.AsmEditor.Compiler;
using dnSpy.Contracts.Documents.Tabs;
using dnSpy.Contracts.Documents.TreeView;
using dnSpy.Contracts.Images;
using dnSpy.Contracts.Menus;
using dnSpy.Contracts.MVVM;

namespace dnSpy.AsmEditor.Compiler {
[DebuggerDisplay("{Description}")]
sealed class LoadDependenciesCommand : EditCodeCommandBase {
[ExportMenuItem(Header = "res:LoadDependenciesCommand", Group = MenuConstants.GROUP_CTX_DOCUMENTS_ASMED_ILED, Order = 28.999)]
sealed class DocumentsCommand : DocumentsContextMenuHandler {
readonly Lazy<IUndoCommandService> undoCommandService;
readonly Lazy<IAddUpdatedNodesHelperProvider> addUpdatedNodesHelperProvider;
readonly IAppService appService;

[ImportingConstructor]
DocumentsCommand(Lazy<IUndoCommandService> undoCommandService, Lazy<IAddUpdatedNodesHelperProvider> addUpdatedNodesHelperProvider, IAppService appService) {
this.undoCommandService = undoCommandService;
this.addUpdatedNodesHelperProvider = addUpdatedNodesHelperProvider;
this.appService = appService;
}

public override bool IsVisible(AsmEditorContext context) => LoadDependenciesCommand.CanExecute(context.Nodes);
public override void Execute(AsmEditorContext context) => LoadDependenciesCommand.Execute(addUpdatedNodesHelperProvider, undoCommandService, appService, context.Nodes);
}

[ExportMenuItem(OwnerGuid = MenuConstants.APP_MENU_EDIT_GUID, Header = "res:LoadDependenciesCommand", Group = MenuConstants.GROUP_APP_MENU_EDIT_ASMED_SETTINGS, Order = 58.999)]
sealed class EditMenuCommand : EditMenuHandler {
readonly Lazy<IUndoCommandService> undoCommandService;
readonly Lazy<IAddUpdatedNodesHelperProvider> addUpdatedNodesHelperProvider;
readonly IAppService appService;

[ImportingConstructor]
EditMenuCommand(Lazy<IUndoCommandService> undoCommandService, Lazy<IAddUpdatedNodesHelperProvider> addUpdatedNodesHelperProvider, IAppService appService)
: base(appService.DocumentTreeView) {
this.undoCommandService = undoCommandService;
this.addUpdatedNodesHelperProvider = addUpdatedNodesHelperProvider;
this.appService = appService;
}

public override bool IsVisible(AsmEditorContext context) => LoadDependenciesCommand.CanExecute(context.Nodes);
public override void Execute(AsmEditorContext context) => LoadDependenciesCommand.Execute(addUpdatedNodesHelperProvider, undoCommandService, appService, context.Nodes);
}

static bool CanExecute(DocumentTreeNodeData[] nodes) => nodes.Length == 1 && GetModuleNode(nodes[0]) is not null;

static ModuleDocumentNode? GetModuleNode(DocumentTreeNodeData node) {
if (node is AssemblyDocumentNode asmNode) {
asmNode.TreeNode.EnsureChildrenLoaded();
return asmNode.TreeNode.DataChildren.FirstOrDefault() as ModuleDocumentNode;
}
else
return node.GetModuleNode();
}

static void Execute(Lazy<IAddUpdatedNodesHelperProvider> addUpdatedNodesHelperProvider, Lazy<IUndoCommandService> undoCommandService, IAppService appService, DocumentTreeNodeData[] nodes) {
if (!CanExecute(nodes))
return;

var modNode = GetModuleNode(nodes[0]);
Debug2.Assert(modNode is not null);
if (modNode is null)
return;

var module = modNode.Document.ModuleDef;
Debug2.Assert(module is not null);
if (module is null)
throw new InvalidOperationException();

foreach (var assemblyRef in module.GetAssemblyRefs()) {
modNode.Context.DocumentTreeView.DocumentService.Resolve(assemblyRef, module);
}
}

readonly struct ModuleResult {
public IAssembly? Assembly { get; }
public byte[] RawBytes { get; }
public DebugFileResult DebugFile { get; }
public ModuleResult(IAssembly? assembly, byte[] bytes, DebugFileResult debugFile) {
Assembly = assembly;
RawBytes = bytes;
DebugFile = debugFile;
}
}

LoadDependenciesCommand(Lazy<IAddUpdatedNodesHelperProvider> addUpdatedNodesHelperProvider, ModuleDocumentNode modNode, ModuleImporter importer)
: base(addUpdatedNodesHelperProvider, modNode, importer) {
}

public override string Description => dnSpy_AsmEditor_Resources.LoadDependenciesCommand;
}
}
32 changes: 25 additions & 7 deletions Extensions/dnSpy.AsmEditor/Properties/dnSpy.AsmEditor.Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions Extensions/dnSpy.AsmEditor/Properties/dnSpy.AsmEditor.Resources.cs.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2312,4 +2312,10 @@ nutný, pokud jsou metody obfuskovány</value>
<data name="Type_Flags_Visibility" xml:space="preserve">
<value>Viditelnost</value>
</data>
<data name="LoadDependenciesCommand" xml:space="preserve">
<value />
</data>
<data name="LoadAllDependenciesCommand" xml:space="preserve">
<value />
</data>
</root>
8 changes: 7 additions & 1 deletion Extensions/dnSpy.AsmEditor/Properties/dnSpy.AsmEditor.Resources.de.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Expand Down Expand Up @@ -2311,4 +2311,10 @@ Möchten Sie das Fenster wirklich schließen?</value>
<data name="Type_Flags_Visibility" xml:space="preserve">
<value>Visibilit_y</value>
</data>
<data name="LoadDependenciesCommand" xml:space="preserve">
<value />
</data>
<data name="LoadAllDependenciesCommand" xml:space="preserve">
<value />
</data>
</root>
8 changes: 7 additions & 1 deletion Extensions/dnSpy.AsmEditor/Properties/dnSpy.AsmEditor.Resources.es-ES.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Expand Down Expand Up @@ -2308,4 +2308,10 @@
<data name="Type_Flags_Visibility" xml:space="preserve">
<value>Visibilida_d</value>
</data>
<data name="LoadDependenciesCommand" xml:space="preserve">
<value />
</data>
<data name="LoadAllDependenciesCommand" xml:space="preserve">
<value />
</data>
</root>
8 changes: 7 additions & 1 deletion Extensions/dnSpy.AsmEditor/Properties/dnSpy.AsmEditor.Resources.fa.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Expand Down Expand Up @@ -2315,4 +2315,10 @@
<data name="Type_Flags_Visibility" xml:space="preserve">
<value>Visibilit_y</value>
</data>
<data name="LoadDependenciesCommand" xml:space="preserve">
<value />
</data>
<data name="LoadAllDependenciesCommand" xml:space="preserve">
<value />
</data>
</root>
8 changes: 7 additions & 1 deletion Extensions/dnSpy.AsmEditor/Properties/dnSpy.AsmEditor.Resources.fr.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Expand Down Expand Up @@ -2309,4 +2309,10 @@ La plupart des options seront réinitialisées si cette option est cochée</valu
<data name="Type_Flags_Visibility" xml:space="preserve">
<value>Visibili_té</value>
</data>
<data name="LoadDependenciesCommand" xml:space="preserve">
<value />
</data>
<data name="LoadAllDependenciesCommand" xml:space="preserve">
<value />
</data>
</root>
8 changes: 7 additions & 1 deletion Extensions/dnSpy.AsmEditor/Properties/dnSpy.AsmEditor.Resources.hu.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Expand Down Expand Up @@ -2315,4 +2315,10 @@ A legtöbb beállítás újra lesz inicializálva ha ez a jelölőnégyzet vált
<data name="Type_Flags_Visibility" xml:space="preserve">
<value>Lá_thatóság</value>
</data>
<data name="LoadDependenciesCommand" xml:space="preserve">
<value />
</data>
<data name="LoadAllDependenciesCommand" xml:space="preserve">
<value />
</data>
</root>
8 changes: 7 additions & 1 deletion Extensions/dnSpy.AsmEditor/Properties/dnSpy.AsmEditor.Resources.it.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Expand Down Expand Up @@ -2309,4 +2309,10 @@ Sei sicuro di volere uscire?</value>
<data name="Type_Flags_Visibility" xml:space="preserve">
<value>Visibilit_y</value>
</data>
<data name="LoadDependenciesCommand" xml:space="preserve">
<value />
</data>
<data name="LoadAllDependenciesCommand" xml:space="preserve">
<value />
</data>
</root>
8 changes: 7 additions & 1 deletion Extensions/dnSpy.AsmEditor/Properties/dnSpy.AsmEditor.Resources.pt-BR.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Expand Down Expand Up @@ -2312,4 +2312,10 @@ A maioria das opções são reinicializadas quando essa caixa de seleção é cl
<data name="Type_Flags_Visibility" xml:space="preserve">
<value>Visibilidade_y</value>
</data>
<data name="LoadDependenciesCommand" xml:space="preserve">
<value />
</data>
<data name="LoadAllDependenciesCommand" xml:space="preserve">
<value />
</data>
</root>
Loading