Fix relative parent ResourceDirectory loading.

Author: jixunmoe

Confuser.Renamer/Analyzers/WPFAnalyzer.cs

@@ -177,7 +177,7 @@ void AnalyzeMethod(ConfuserContext context, INameService service, MethodDef meth
 						if (match.Success)
 							operand = match.Groups[1].Value;
 						else if (operand.Contains("/"))
-							context.Logger.WarnFormat("Fail to extract XAML name from '{0}'.", instr.Operand);
+							context.Logger.WarnFormat("[WPF] Fail to extract XAML name from '{0}'.", instr.Operand);
 
 						var reference = new BAMLStringReference(instr);
 						operand = operand.TrimStart('/');

Confuser.Renamer/BAML/BAMLAnalyzer.cs

@@ -503,16 +503,27 @@ void ProcessConverter(PropertyWithConverterRecord rec, TypeDef type) {
 				if (declType == "System.Windows.ResourceDictionary") {
 					var src = rec.Value.ToUpperInvariant();
 					if (src.EndsWith(".BAML") || src.EndsWith(".XAML")) {
-						var match = WPFAnalyzer.UriPattern.Match(src);
-						if (match.Success)
-							src = match.Groups[1].Value;
-						else if (rec.Value.Contains("/"))
-							context.Logger.WarnFormat("Fail to extract XAML name from '{0}'.", rec.Value);
-
-						if (!src.Contains("//")) {
-							var rel = new Uri(new Uri(packScheme + "application:,,,/" + CurrentBAMLName), src);
-							src = rel.LocalPath;
+						// Relative address
+						if (src.StartsWith("../")) {
+							var oldSrc = src;
+							var fake_domain = "http://Confuser.Ex/";
+							var uri = new Uri(fake_domain + CurrentBAMLName + "/../" + src);
+							src = uri.ToString().Substring(fake_domain.Length);
+
+							context.Logger.InfoFormat("Convert [{0}] at [{1}] to [{2}].", oldSrc, CurrentBAMLName, src);
+						} else {
+							var match = WPFAnalyzer.UriPattern.Match(src);
+							if (match.Success)
+								src = match.Groups[1].Value;
+							else if (rec.Value.Contains("/"))
+								context.Logger.WarnFormat("[BAML] Fail to extract XAML name from '{0}'.", rec.Value);
+
+							if (!src.Contains("//")) {
+								var rel = new Uri(new Uri(packScheme + "application:,,,/" + CurrentBAMLName), src);
+								src = rel.LocalPath;
+							}
 						}
+
 						var reference = new BAMLPropertyReference(rec);
 						src = src.TrimStart('/');
 						var baml = src.Substring(0, src.Length - 5) + ".BAML";