From 57aad18abb5f2a36f325ec37ba430cd12efb462c Mon Sep 17 00:00:00 2001
From: Denis Fokin <Denis.Fokin@jetbrains.com>
Date: Mon, 11 Sep 2017 07:01:52 +0300
Subject: [PATCH] Eliminate focus killer

---
 native/fileWatcher/fileWatcher3.vcxproj                |  2 +-
 native/runner/runnerw/runnerw.vcxproj.filters          |  2 +-
 .../src/com/intellij/idea/StartupUtil.java             | 10 ----------
 updater/testSrc/com/intellij/updater/DigesterTest.java |  1 -
 .../intellij/updater/PatchApplyingRevertingTest.java   |  1 -
 5 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/native/fileWatcher/fileWatcher3.vcxproj b/native/fileWatcher/fileWatcher3.vcxproj
index 9fa524bd8186..d6bca3ceb906 100644
--- a/native/fileWatcher/fileWatcher3.vcxproj
+++ b/native/fileWatcher/fileWatcher3.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
diff --git a/native/runner/runnerw/runnerw.vcxproj.filters b/native/runner/runnerw/runnerw.vcxproj.filters
index 1440d88b668e..76143adc1caa 100644
--- a/native/runner/runnerw/runnerw.vcxproj.filters
+++ b/native/runner/runnerw/runnerw.vcxproj.filters
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
diff --git a/platform/platform-impl/src/com/intellij/idea/StartupUtil.java b/platform/platform-impl/src/com/intellij/idea/StartupUtil.java
index 9cbdcebb3653..b13b5082a747 100644
--- a/platform/platform-impl/src/com/intellij/idea/StartupUtil.java
+++ b/platform/platform-impl/src/com/intellij/idea/StartupUtil.java
@@ -346,16 +346,6 @@ public class StartupUtil {
       IdeaWin32.isAvailable();  // logging is done there
     }
 
-    if (SystemInfo.isWin2kOrNewer && !Main.isHeadless()) {
-      try {
-        UrlClassLoader.loadPlatformLibrary("focusKiller");
-        log.info("Using \"FocusKiller\" library to prevent focus stealing.");
-      }
-      catch (Throwable t) {
-        log.info("\"FocusKiller\" library not found or there were problems loading it.", t);
-      }
-    }
-
     if (SystemInfo.isWindows) {
       // WinP should not unpack .dll files into parent directory
       System.setProperty("winp.unpack.dll.to.parent.dir", "false");
diff --git a/updater/testSrc/com/intellij/updater/DigesterTest.java b/updater/testSrc/com/intellij/updater/DigesterTest.java
index 87af92b00e3a..9639b2048327 100644
--- a/updater/testSrc/com/intellij/updater/DigesterTest.java
+++ b/updater/testSrc/com/intellij/updater/DigesterTest.java
@@ -33,7 +33,6 @@ public class DigesterTest extends UpdaterTestCase {
     assertEquals(Digester.DIRECTORY, Digester.digestRegularFile(libDir, true));
 
     assertEquals(CHECKSUMS.README_TXT, Digester.digestRegularFile(new File(dataDir, "Readme.txt"), false));
-    assertEquals(CHECKSUMS.FOCUS_KILLER_DLL, Digester.digestRegularFile(new File(binDir, "focuskiller.dll"), false));
     assertEquals(CHECKSUMS.BOOTSTRAP_JAR_BIN, Digester.digestRegularFile(new File(libDir, "bootstrap.jar"), false));
     assertEquals(CHECKSUMS.ANNOTATIONS_JAR, Digester.digestRegularFile(new File(libDir, "annotations.jar"), true));
     assertEquals(CHECKSUMS.ANNOTATIONS_CHANGED_JAR, Digester.digestRegularFile(new File(libDir, "annotations_changed.jar"), true));
diff --git a/updater/testSrc/com/intellij/updater/PatchApplyingRevertingTest.java b/updater/testSrc/com/intellij/updater/PatchApplyingRevertingTest.java
index 62162aa936fe..3c1f3938f3df 100644
--- a/updater/testSrc/com/intellij/updater/PatchApplyingRevertingTest.java
+++ b/updater/testSrc/com/intellij/updater/PatchApplyingRevertingTest.java
@@ -554,7 +554,6 @@ public abstract class PatchApplyingRevertingTest extends PatchTestCase {
   @Test
   public void testUpdatingMissingOptionalDirectory() throws Exception {
     FileUtil.copy(new File(myOlderDir, "bin/idea.bat"), new File(myOlderDir, "jre/bin/java"));
-    FileUtil.copy(new File(myOlderDir, "bin/focuskiller.dll"), new File(myOlderDir, "jre/bin/jvm.dll"));
     FileUtil.copy(new File(myOlderDir, "lib/annotations.jar"), new File(myOlderDir, "jre/lib/rt.jar"));
     FileUtil.copy(new File(myOlderDir, "lib/boot.jar"), new File(myOlderDir, "jre/lib/tools.jar"));
     resetNewerDir();