Fix the issue with language ID-based unloading

LayOff/Program.cs

@@ -45,9 +45,12 @@ private string GetCultureInfoName(ushort cultureId)
 			}
 		}
 
+		[DllImport("user32.dll")]
+		private static extern bool UnloadKeyboardLayout(uint hkl);
+
 		public bool Equals(KeyboardLayout other)
 		{
-			return Id == other.Id;
+			return MatchLanguage ? Id == (other.Id & 0xFFFF) : Id == other.Id;
 		}
 
 		public override string ToString()
@@ -74,6 +77,14 @@ public void PrintLayoutInfo()
 					KeyboardId);
 			}
 		}
+
+		public bool Unload()
+		{
+#if DEBUG
+			Console.WriteLine("Unloading {0}.", ToString());
+#endif
+			return UnloadKeyboardLayout(Id);
+		}
 	}
 
 	class Program
@@ -221,10 +232,13 @@ static int Main(string[] args)
 
 			foreach (var layout in klList)
 			{
+#if DEBUG
+				layout.PrintLayoutInfo();
+#endif
 				if (layoutList.Contains(layout))
 				{
 					Console.WriteLine("Found a layout to lay off: {0}.", layout);
-					if (!UnloadKeyboardLayout(layout.Id))
+					if (!layout.Unload())
 					{
 						Console.WriteLine("Failed to unload {0}.", layout);
 					}