Skip to content
Merged
Changes from all commits
Commits
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
16 changes: 11 additions & 5 deletions Confuser.Renamer/Analyzers/WPFAnalyzer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,14 @@ public void PreRename(ConfuserContext context, INameService service, ProtectionP
var decodedName = HttpUtility.UrlDecode(doc.DocumentName);
var encodedName = doc.DocumentName;
if (bamlRefs.TryGetValue(decodedName, out var references)) {
var decodedDirectory = decodedName.Substring(0, decodedName.LastIndexOf('/') + 1);
var encodedDirectory = encodedName.Substring(0, encodedName.LastIndexOf('/') + 1);
var decodedLastSlash = decodedName.LastIndexOf('/') + 1;
var encodedLastSlash = encodedName.LastIndexOf('/') + 1;

var decodedDirectory = decodedName.Substring(0, decodedLastSlash);
var encodedDirectory = encodedName.Substring(0, encodedLastSlash);

var decodedFileName = decodedName.Substring(decodedLastSlash);
var encodedFileName = encodedName.Substring(encodedLastSlash);

var fileName = service.RandomName(renameMode).ToLowerInvariant();
if (decodedName.EndsWith(".BAML", StringComparison.OrdinalIgnoreCase))
Expand All @@ -78,8 +84,8 @@ public void PreRename(ConfuserContext context, INameService service, ProtectionP

if (renameOk) {
foreach (var bamlRef in references) {
bamlRef.Rename(module, decodedName, decodedNewName);
bamlRef.Rename(module, encodedName, encodedNewName);
bamlRef.Rename(module, decodedFileName, fileName);
bamlRef.Rename(module, encodedFileName, fileName);
}
doc.DocumentName = encodedNewName;
}
Expand Down Expand Up @@ -349,4 +355,4 @@ void AnalyzeResources(ConfuserContext context, INameService service, ModuleDefMD
context.Annotations.Set(module, BAMLKey, wpfResInfo);
}
}
}
}
Loading