From 07709f657949f41e3745f7edc95adcc6facfd2c9 Mon Sep 17 00:00:00 2001
From: easly1989 <caesar.themaster@gmail.com>
Date: Wed, 13 Feb 2019 15:38:24 +0100
Subject: [PATCH] Removed injection project... Updated data to 4.55

---
 DFAssist.sln                              |  15 --
 DFAssist/MainControl.cs                   |   5 +-
 InjectAssist/InjectAssist.cpp             |   6 -
 InjectAssist/InjectAssist.vcxproj         | 169 ----------------------
 InjectAssist/InjectAssist.vcxproj.filters |  36 -----
 InjectAssist/dllmain.cpp                  |  40 -----
 InjectAssist/stdafx.cpp                   |   1 -
 InjectAssist/stdafx.h                     |  16 --
 InjectAssist/targetver.h                  |   8 -
 data/en-us.json                           |   2 +-
 data/fr-fr.json                           |   2 +-
 data/ja-jp.json                           |   2 +-
 data/ko-kr.json                           |   6 +-
 13 files changed, 7 insertions(+), 301 deletions(-)
 delete mode 100644 InjectAssist/InjectAssist.cpp
 delete mode 100644 InjectAssist/InjectAssist.vcxproj
 delete mode 100644 InjectAssist/InjectAssist.vcxproj.filters
 delete mode 100644 InjectAssist/dllmain.cpp
 delete mode 100644 InjectAssist/stdafx.cpp
 delete mode 100644 InjectAssist/stdafx.h
 delete mode 100644 InjectAssist/targetver.h

diff --git a/DFAssist.sln b/DFAssist.sln
index 144964e..da5056e 100644
--- a/DFAssist.sln
+++ b/DFAssist.sln
@@ -4,11 +4,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 VisualStudioVersion = 15.0.27130.2026
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DFAssist", "DFAssist\DFAssist.csproj", "{1D6BA59A-FB85-4ED2-90E1-DEB79FD5AFFC}"
-	ProjectSection(ProjectDependencies) = postProject
-		{8563E6B5-78D6-4097-AF58-C3B08713B922} = {8563E6B5-78D6-4097-AF58-C3B08713B922}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InjectAssist", "InjectAssist\InjectAssist.vcxproj", "{8563E6B5-78D6-4097-AF58-C3B08713B922}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -32,16 +27,6 @@ Global
 		{1D6BA59A-FB85-4ED2-90E1-DEB79FD5AFFC}.Release|x64.Build.0 = Release|x64
 		{1D6BA59A-FB85-4ED2-90E1-DEB79FD5AFFC}.Release|x86.ActiveCfg = Release|Any CPU
 		{1D6BA59A-FB85-4ED2-90E1-DEB79FD5AFFC}.Release|x86.Build.0 = Release|Any CPU
-		{8563E6B5-78D6-4097-AF58-C3B08713B922}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{8563E6B5-78D6-4097-AF58-C3B08713B922}.Debug|x64.ActiveCfg = Debug|x64
-		{8563E6B5-78D6-4097-AF58-C3B08713B922}.Debug|x64.Build.0 = Debug|x64
-		{8563E6B5-78D6-4097-AF58-C3B08713B922}.Debug|x86.ActiveCfg = Debug|Win32
-		{8563E6B5-78D6-4097-AF58-C3B08713B922}.Debug|x86.Build.0 = Debug|Win32
-		{8563E6B5-78D6-4097-AF58-C3B08713B922}.Release|Any CPU.ActiveCfg = Release|Win32
-		{8563E6B5-78D6-4097-AF58-C3B08713B922}.Release|x64.ActiveCfg = Release|x64
-		{8563E6B5-78D6-4097-AF58-C3B08713B922}.Release|x64.Build.0 = Release|x64
-		{8563E6B5-78D6-4097-AF58-C3B08713B922}.Release|x86.ActiveCfg = Release|Win32
-		{8563E6B5-78D6-4097-AF58-C3B08713B922}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/DFAssist/MainControl.cs b/DFAssist/MainControl.cs
index f1d869f..6a85f44 100644
--- a/DFAssist/MainControl.cs
+++ b/DFAssist/MainControl.cs
@@ -12,7 +12,6 @@
 using System.IO;
 using System.Linq;
 using System.Text;
-using System.Threading;
 using System.Windows.Forms;
 using System.Xml;
 using Windows.UI.Notifications;
@@ -242,9 +241,7 @@ private void OnInit()
             _timer.Enabled = true;
 
             // show a test toast
-            //ToastWindowNotification(Localization.GetText("ui-toast-notification-test-title"), Localization.GetText("ui-toast-notification-test-message"));
-            var result = DllInjector.GetInstance.Inject("Advanced Combat Tracker", "InjectAssist.dll");
-            ToastWindowNotification(result.ToString(), "RESULT: " + result);
+            ToastWindowNotification(Localization.GetText("ui-toast-notification-test-title"), Localization.GetText("ui-toast-notification-test-message"));
 
             _pluginInitializing = false;
         }
diff --git a/InjectAssist/InjectAssist.cpp b/InjectAssist/InjectAssist.cpp
deleted file mode 100644
index 39410e6..0000000
--- a/InjectAssist/InjectAssist.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-// InjectAssist.cpp : Defines the exported functions for the DLL application.
-//
-
-#include "stdafx.h"
-
-
diff --git a/InjectAssist/InjectAssist.vcxproj b/InjectAssist/InjectAssist.vcxproj
deleted file mode 100644
index 74a30d1..0000000
--- a/InjectAssist/InjectAssist.vcxproj
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{8563E6B5-78D6-4097-AF58-C3B08713B922}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>InjectAssist</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;INJECTASSIST_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;INJECTASSIST_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;INJECTASSIST_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;INJECTASSIST_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="stdafx.h" />
-    <ClInclude Include="targetver.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="dllmain.cpp" />
-    <ClCompile Include="InjectAssist.cpp" />
-    <ClCompile Include="stdafx.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/InjectAssist/InjectAssist.vcxproj.filters b/InjectAssist/InjectAssist.vcxproj.filters
deleted file mode 100644
index 17998df..0000000
--- a/InjectAssist/InjectAssist.vcxproj.filters
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="stdafx.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="targetver.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="stdafx.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="InjectAssist.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="dllmain.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/InjectAssist/dllmain.cpp b/InjectAssist/dllmain.cpp
deleted file mode 100644
index 86f7822..0000000
--- a/InjectAssist/dllmain.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-// dllmain.cpp : Defines the entry point for the DLL application.
-#include "stdafx.h"
-
-DWORD AttachFunction(HMODULE hModule);
-DWORD DetachFunction();
-
-BOOL APIENTRY DllMain(HMODULE hModule, DWORD  fdwReason, LPVOID lpReserved)
-{
-	hModule;
-    lpReserved;
-
-    switch (fdwReason)
-    {
-		case DLL_PROCESS_ATTACH:
-			DisableThreadLibraryCalls( hModule );
-			CreateThread( NULL, NULL, ( LPTHREAD_START_ROUTINE )AttachFunction, hModule, NULL, NULL );
-			break;
-		case DLL_PROCESS_DETACH:
-			DetachFunction();
-			break;
-		case DLL_THREAD_DETACH:
-		case DLL_THREAD_ATTACH:
-			break;
-    }
-
-    return TRUE;
-}
-
-DWORD AttachFunction( HMODULE hModule )
-{   
-	MessageBox(0, TEXT("Attach"), TEXT("Attached to dll"), MB_OK);
-	FreeLibraryAndExitThread(hModule, NULL);
-	return 1;
-}
-
-DWORD DetachFunction()
-{
-	MessageBox(0, TEXT("Detach"), TEXT("Detached from dll"), MB_OK);
-	return 1;
-}
\ No newline at end of file
diff --git a/InjectAssist/stdafx.cpp b/InjectAssist/stdafx.cpp
deleted file mode 100644
index fd4f341..0000000
--- a/InjectAssist/stdafx.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "stdafx.h"
diff --git a/InjectAssist/stdafx.h b/InjectAssist/stdafx.h
deleted file mode 100644
index f380517..0000000
--- a/InjectAssist/stdafx.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// stdafx.h : include file for standard system include files,
-// or project specific include files that are used frequently, but
-// are changed infrequently
-//
-
-#pragma once
-
-#include "targetver.h"
-
-#define WIN32_LEAN_AND_MEAN             // Exclude rarely-used stuff from Windows headers
-// Windows Header Files
-#include <windows.h>
-
-
-
-// reference additional headers your program requires here
diff --git a/InjectAssist/targetver.h b/InjectAssist/targetver.h
deleted file mode 100644
index 87c0086..0000000
--- a/InjectAssist/targetver.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#pragma once
-
-// Including SDKDDKVer.h defines the highest available Windows platform.
-
-// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and
-// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h.
-
-#include <SDKDDKVer.h>
diff --git a/data/en-us.json b/data/en-us.json
index d1c2f68..e5f8663 100644
--- a/data/en-us.json
+++ b/data/en-us.json
@@ -1,6 +1,6 @@
 {
   // Version
-  "version": "20190113.1",
+  "version": "20190205.1",
 
   // Duty
   "instances": {
diff --git a/data/fr-fr.json b/data/fr-fr.json
index e8aaf2f..ff78b9a 100644
--- a/data/fr-fr.json
+++ b/data/fr-fr.json
@@ -1,6 +1,6 @@
 {
   // Version
-  "version": "20190113.1",
+  "version": "20190205.1",
 
   // Duty
   "instances": {
diff --git a/data/ja-jp.json b/data/ja-jp.json
index 32e7abd..4d2aa5b 100644
--- a/data/ja-jp.json
+++ b/data/ja-jp.json
@@ -1,6 +1,6 @@
 {
   // Version
-  "version": "20190113.1",
+  "version": "20190205.1",
 
   // Duty
   "instances": {
diff --git a/data/ko-kr.json b/data/ko-kr.json
index 422801c..e2f23e8 100644
--- a/data/ko-kr.json
+++ b/data/ko-kr.json
@@ -1,6 +1,6 @@
 {
   // 버전
-  "version": "20190202.1",
+  "version": "20190206.1",
 
   // 임무
   "instances": {
@@ -1272,7 +1272,7 @@
     // 4.4 광란의 전주곡
     // 4.4 던전
     "585": {
-      "name": "더 번",
+      "name": "영구 초토지대",
       "tank": "1",
       "healer": "1",
       "dps": "2"
@@ -2028,7 +2028,7 @@
       "dps": "0"
     },
     "598": {
-      "name": "금단의 땅 에우레카 : 파이로스",
+      "name": "금단의 땅 에우레카 : 피로스",
       "tank": "0",
       "healer": "0",
       "dps": "0"