From 8c9ec7b626e6e0def0fa5319aa3190812ad090f0 Mon Sep 17 00:00:00 2001
From: Siegfried Pammer <siegfriedpammer@gmail.com>
Date: Fri, 18 Apr 2014 09:28:12 +0200
Subject: [PATCH] fix #445 - Baml Decompiler Exception: ArgumentException:
 Cannot find StaticResource

---
 .../XmlBamlReader.cs                                  |  2 +-
 ILSpy.BamlDecompiler/Tests/Cases/Issue445.xaml        | 11 +++--------
 ILSpy.BamlDecompiler/Tests/TestRunner.cs              |  2 +-
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/ILSpy.BamlDecompiler/Ricciolo.StylesExplorer.MarkupReflection/XmlBamlReader.cs b/ILSpy.BamlDecompiler/Ricciolo.StylesExplorer.MarkupReflection/XmlBamlReader.cs
index 12c55ae18..f45e9f4ab 100644
--- a/ILSpy.BamlDecompiler/Ricciolo.StylesExplorer.MarkupReflection/XmlBamlReader.cs
+++ b/ILSpy.BamlDecompiler/Ricciolo.StylesExplorer.MarkupReflection/XmlBamlReader.cs
@@ -1553,7 +1553,7 @@ namespace Ricciolo.StylesExplorer.MarkupReflection
 
 		object GetStaticResource(short identifier)
 		{
-			int keyIndex = currentKey - 1;
+			int keyIndex = Math.Max(0, currentKey - 1);
 			while (keyIndex >= 0 && !keys[keyIndex].HasStaticResources)
 				keyIndex--;
 			if (keyIndex >= 0 && identifier < keys[keyIndex].StaticResources.Count)
diff --git a/ILSpy.BamlDecompiler/Tests/Cases/Issue445.xaml b/ILSpy.BamlDecompiler/Tests/Cases/Issue445.xaml
index d6eba3b8f..1c447620d 100644
--- a/ILSpy.BamlDecompiler/Tests/Cases/Issue445.xaml
+++ b/ILSpy.BamlDecompiler/Tests/Cases/Issue445.xaml
@@ -1,17 +1,12 @@
-<UserControl x:Class="BamlTest.UserControl1"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             mc:Ignorable="d">
+<UserControl x:Class="BamlTest.UserControl1" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" mc:Ignorable="d">
 	<UserControl.Resources>
-		<Style TargetType="Control" x:Key="baseStyle" />
+		<Style x:Key="baseStyle" TargetType="{x:Type Control}" />
 	</UserControl.Resources>
 	<Grid>
 		<Grid.ContextMenu>
 			<ContextMenu>
 				<ContextMenu.Resources>
-					<Style TargetType="Control" BasedOn="{StaticResource baseStyle}" />
+					<Style TargetType="{x:Type Control}" BasedOn="{StaticResource baseStyle}" />
 				</ContextMenu.Resources>
 			</ContextMenu>
 		</Grid.ContextMenu>
diff --git a/ILSpy.BamlDecompiler/Tests/TestRunner.cs b/ILSpy.BamlDecompiler/Tests/TestRunner.cs
index 98a964f33..abd24346a 100644
--- a/ILSpy.BamlDecompiler/Tests/TestRunner.cs
+++ b/ILSpy.BamlDecompiler/Tests/TestRunner.cs
@@ -79,7 +79,7 @@ namespace ILSpy.BamlDecompiler.Tests
 			RunTest("cases/simplepropertyelement");
 		}
 		
-		[Test, Ignore]
+		[Test]
 		public void Issue445()
 		{
 			RunTest("cases/issue445");