From 752a29449fecf2884b87b33b99afb133af61141f Mon Sep 17 00:00:00 2001 From: Gravit Date: Thu, 24 Jan 2019 16:09:41 +0700 Subject: [PATCH 1/4] =?UTF-8?q?[FIX]=20=D0=92=D1=80=D0=B0=D0=BF=D0=BF?= =?UTF-8?q?=D0=B5=D1=80=D1=8B=20=D0=BD=D0=B5=20=D1=80=D0=B0=D1=81=D0=BF?= =?UTF-8?q?=D0=B0=D0=BA=D0=BE=D0=B2=D1=8B=D0=B2=D0=B0=D1=8E=D1=82=D1=81?= =?UTF-8?q?=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru/gravit/launcher/guard/LauncherWrapperGuard.java | 10 +++++----- modules | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherWrapperGuard.java b/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherWrapperGuard.java index 946110d3..b05b5d02 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherWrapperGuard.java +++ b/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherWrapperGuard.java @@ -26,10 +26,10 @@ public Path getJavaBinPath() { @Override public void init(boolean clientInstance) { - try { - UnpackHelper.unpack(IOHelper.getResourceURL(JVMHelper.JVM_BITS == 64 ? "guard/wrapper64.exe" : "guard/wrapper32.exe"),DirBridge.getGuardDir()); - } catch (IOException e) { - throw new SecurityException(e); - } + //try { + // UnpackHelper.unpack(IOHelper.getResourceURL(JVMHelper.JVM_BITS == 64 ? "guard/wrapper64.exe" : "guard/wrapper32.exe"),DirBridge.getGuardDir()); + //} catch (IOException e) { + // throw new SecurityException(e); + //} } } diff --git a/modules b/modules index 38e11640..79e24c86 160000 --- a/modules +++ b/modules @@ -1 +1 @@ -Subproject commit 38e11640ce4a4ed3e9745718db02a888770a22bb +Subproject commit 79e24c862b2324b7751f1520f9732eed31416c6d From 44d9be49da26d29abab3134dca76c8d22fdfde3f Mon Sep 17 00:00:00 2001 From: Gravit Date: Thu, 24 Jan 2019 16:38:56 +0700 Subject: [PATCH 2/4] =?UTF-8?q?[FIX]=20=D0=A4=D0=B8=D0=BA=D1=81=20=D1=80?= =?UTF-8?q?=D0=B0=D1=81=D0=BF=D0=B0=D0=BA=D0=BE=D0=B2=D0=BA=D0=B8=20=D0=B2?= =?UTF-8?q?=D1=80=D0=B0=D0=BF=D0=BF=D0=B5=D1=80=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gravit/launcher/guard/LauncherWrapperGuard.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherWrapperGuard.java b/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherWrapperGuard.java index b05b5d02..4c6036bf 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherWrapperGuard.java +++ b/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherWrapperGuard.java @@ -26,10 +26,13 @@ public Path getJavaBinPath() { @Override public void init(boolean clientInstance) { - //try { - // UnpackHelper.unpack(IOHelper.getResourceURL(JVMHelper.JVM_BITS == 64 ? "guard/wrapper64.exe" : "guard/wrapper32.exe"),DirBridge.getGuardDir()); - //} catch (IOException e) { - // throw new SecurityException(e); - //} + try { + String wrapperName = JVMHelper.JVM_BITS == 64 ? "wrapper64.exe" : "wrapper32.exe"; + String antiInjectName = JVMHelper.JVM_BITS == 64 ? "AntiInject64.exe" : "AntiInject32.exe"; + UnpackHelper.unpack(IOHelper.getResourceURL("guard/" + wrapperName),DirBridge.getGuardDir().resolve(wrapperName)); + UnpackHelper.unpack(IOHelper.getResourceURL("guard/" + antiInjectName),DirBridge.getGuardDir().resolve(antiInjectName)); + } catch (IOException e) { + throw new SecurityException(e); + } } } From 51ce84152ccf2c123d3e4e18008faab27a6962a7 Mon Sep 17 00:00:00 2001 From: Gravit Date: Thu, 24 Jan 2019 17:08:45 +0700 Subject: [PATCH 3/4] =?UTF-8?q?[FIX]=20=D0=A4=D0=B8=D0=BA=D1=81=20=D1=80?= =?UTF-8?q?=D0=B0=D1=81=D0=BF=D0=B0=D0=BA=D0=BE=D0=B2=D0=BA=D0=B8=20=D0=B2?= =?UTF-8?q?=D1=80=D0=B0=D0=BF=D0=BF=D0=B5=D1=80=D0=BE=D0=B2=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/ru/gravit/launcher/guard/LauncherWrapperGuard.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherWrapperGuard.java b/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherWrapperGuard.java index 4c6036bf..58152bb5 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherWrapperGuard.java +++ b/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherWrapperGuard.java @@ -28,7 +28,7 @@ public Path getJavaBinPath() { public void init(boolean clientInstance) { try { String wrapperName = JVMHelper.JVM_BITS == 64 ? "wrapper64.exe" : "wrapper32.exe"; - String antiInjectName = JVMHelper.JVM_BITS == 64 ? "AntiInject64.exe" : "AntiInject32.exe"; + String antiInjectName = JVMHelper.JVM_BITS == 64 ? "AntiInject64.dll" : "AntiInject32.dll"; UnpackHelper.unpack(IOHelper.getResourceURL("guard/" + wrapperName),DirBridge.getGuardDir().resolve(wrapperName)); UnpackHelper.unpack(IOHelper.getResourceURL("guard/" + antiInjectName),DirBridge.getGuardDir().resolve(antiInjectName)); } catch (IOException e) { From f5ef34ce3230425864179ffe48b7d7e31a75d0dd Mon Sep 17 00:00:00 2001 From: Gravit Date: Thu, 24 Jan 2019 17:16:03 +0700 Subject: [PATCH 4/4] =?UTF-8?q?[FIX]=20=D0=A4=D0=B8=D0=BA=D1=81=20=D1=80?= =?UTF-8?q?=D0=B0=D1=81=D0=BF=D0=B0=D0=BA=D0=BE=D0=B2=D0=BA=D0=B8=20=D0=B2?= =?UTF-8?q?=D1=80=D0=B0=D0=BF=D0=BF=D0=B5=D1=80=D0=BE=D0=B2=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/ru/gravit/launcher/guard/LauncherWrapperGuard.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherWrapperGuard.java b/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherWrapperGuard.java index 58152bb5..42da5172 100644 --- a/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherWrapperGuard.java +++ b/Launcher/src/main/java/ru/gravit/launcher/guard/LauncherWrapperGuard.java @@ -1,5 +1,6 @@ package ru.gravit.launcher.guard; +import ru.gravit.launcher.Launcher; import ru.gravit.launcher.client.DirBridge; import ru.gravit.utils.helper.IOHelper; import ru.gravit.utils.helper.JVMHelper; @@ -29,8 +30,8 @@ public void init(boolean clientInstance) { try { String wrapperName = JVMHelper.JVM_BITS == 64 ? "wrapper64.exe" : "wrapper32.exe"; String antiInjectName = JVMHelper.JVM_BITS == 64 ? "AntiInject64.dll" : "AntiInject32.dll"; - UnpackHelper.unpack(IOHelper.getResourceURL("guard/" + wrapperName),DirBridge.getGuardDir().resolve(wrapperName)); - UnpackHelper.unpack(IOHelper.getResourceURL("guard/" + antiInjectName),DirBridge.getGuardDir().resolve(antiInjectName)); + UnpackHelper.unpack(Launcher.getResourceURL(wrapperName, "guard"),DirBridge.getGuardDir().resolve(wrapperName)); + UnpackHelper.unpack(Launcher.getResourceURL(antiInjectName, "guard"),DirBridge.getGuardDir().resolve(antiInjectName)); } catch (IOException e) { throw new SecurityException(e); }