v 1.1.0

small update
cvlabsio · Apr 17, 2017 · 7e4aec9 · 7e4aec9
1 parent 20a4e9b
commit 7e4aec9
Show file tree

Hide file tree

Showing 17 changed files with 1,415 additions and 1,462 deletions.
diff --git a/.gitattributes b/.gitattributes
diff --git a/Compiled/Furutaka.exe b/Compiled/Furutaka.exe
diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ In order to build from source you need Microsoft Visual Studio 2015 U1 and later
 
 # Authors
 
-(c) 2016 TDL Project
+(c) 2016 - 2017 TDL Project
 
 # Credits
 

diff --git a/Source/Furutaka/Furutaka.sln b/Source/Furutaka/Furutaka.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Furutaka", "Furutaka.vcxproj", "{8CC15B84-9FA8-4F5E-934F-7DAE7BAC4896}"
 EndProject

diff --git a/Source/Furutaka/Furutaka.vcxproj b/Source/Furutaka/Furutaka.vcxproj
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.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>
@@ -26,19 +18,6 @@
     <ProjectName>Furutaka</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
@@ -57,33 +36,17 @@
   </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>
-    <OutDir>.\output\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>.\output\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>.\output\$(Platform)\$(Configuration)\</OutDir>
     <IntDir>.\output\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>.\output\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>.\output\$(Platform)\$(Configuration)\</IntDir>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -93,23 +56,6 @@
     <CodeAnalysisRuleSet>NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <RunCodeAnalysis>false</RunCodeAnalysis>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EntryPointSymbol>TDLMain</EntryPointSymbol>
-      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
-    </Link>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PrecompiledHeader>
@@ -124,30 +70,7 @@
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EntryPointSymbol>TDLMain</EntryPointSymbol>
-      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-      <CompileAs>CompileAsC</CompileAs>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EntryPointSymbol>TDLMain</EntryPointSymbol>
-      <SetChecksum>true</SetChecksum>
-      <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
+      <UACExecutionLevel>AsInvoker</UACExecutionLevel>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -164,6 +87,8 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <StringPooling>true</StringPooling>
       <EnablePREfast>false</EnablePREfast>
+      <ControlFlowGuard>Guard</ControlFlowGuard>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>

diff --git a/Source/Furutaka/Furutaka.vcxproj.user b/Source/Furutaka/Furutaka.vcxproj.user
@@ -4,14 +4,6 @@
     <LocalDebuggerCommandArguments>C:\MAKEEXE\TurlaDriverLoader\Loader\drv\Tsugumi.sys</LocalDebuggerCommandArguments>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LocalDebuggerCommandArguments>C:\MAKEEXE\TurlaDriverLoader\Loader\drv\Tsugumi.sys</LocalDebuggerCommandArguments>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LocalDebuggerCommandArguments>C:\MAKEEXE\TurlaDriverLoader\Loader\drv\TsugumiKernel.sys</LocalDebuggerCommandArguments>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LocalDebuggerCommandArguments>C:\MAKEEXE\TurlaDriverLoader\Loader\drv\TsugumiKernel.sys</LocalDebuggerCommandArguments>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>

diff --git a/Source/Furutaka/cui.c b/Source/Furutaka/cui.c
@@ -1,12 +1,12 @@
 /*******************************************************************************
 *
-*  (C) COPYRIGHT AUTHORS, 2016
+*  (C) COPYRIGHT AUTHORS, 2016 - 2017
 *
 *  TITLE:       CUI.C
 *
-*  VERSION:     1.00
+*  VERSION:     1.10
 *
-*  DATE:        18 Jan 2016
+*  DATE:        20 Mar 2017
 *
 *  Console output.
 *
@@ -19,46 +19,95 @@
 #include "global.h"
 
 /*
-* cuiPrintText
+* cuiPrintTextA
 *
 * Purpose:
 *
 * Output text to the console or file.
 *
+* ANSI variant
+*
+*/
+VOID cuiPrintTextA(
+    _In_ HANDLE hOutConsole,
+    _In_ LPSTR lpText,
+    _In_ BOOL ConsoleOutputEnabled,
+    _In_ BOOL UseReturn
+)
+{
+    SIZE_T consoleIO;
+    DWORD bytesIO;
+    LPSTR Buffer;
+
+    if (lpText == NULL)
+        return;
+
+    consoleIO = _strlen_a(lpText);
+    if ((consoleIO == 0) || (consoleIO > MAX_PATH * 4))
+        return;
+
+    consoleIO = (5 + consoleIO);
+    Buffer = (LPSTR)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, consoleIO);
+    if (Buffer) {
+
+        _strcpy_a(Buffer, lpText);
+        if (UseReturn) _strcat_a(Buffer, "\r\n");
+
+        consoleIO = _strlen_a(Buffer);
+
+        if (ConsoleOutputEnabled != FALSE) {
+            WriteConsoleA(hOutConsole, Buffer, (DWORD)consoleIO, &bytesIO, NULL);
+        }
+        else {
+            WriteFile(hOutConsole, Buffer, (DWORD)(consoleIO * sizeof(CHAR)), &bytesIO, NULL);
+        }
+        HeapFree(GetProcessHeap(), 0, Buffer);
+    }
+}
+
+/*
+* cuiPrintTextW
+*
+* Purpose:
+*
+* Output text to the console or file.
+*
+* UNICODE variant
+*
 */
-VOID cuiPrintText(
-	_In_ HANDLE hOutConsole,
-	_In_ LPWSTR lpText,
-	_In_ BOOL ConsoleOutputEnabled,
-	_In_ BOOL UseReturn
-	)
+VOID cuiPrintTextW(
+    _In_ HANDLE hOutConsole,
+    _In_ LPWSTR lpText,
+    _In_ BOOL ConsoleOutputEnabled,
+    _In_ BOOL UseReturn
+)
 {
-	SIZE_T consoleIO;
-	DWORD bytesIO;
-	LPWSTR Buffer;
+    SIZE_T consoleIO;
+    DWORD bytesIO;
+    LPWSTR Buffer;
 
-	if (lpText == NULL)
-		return;
+    if (lpText == NULL)
+        return;
 
-	consoleIO = _strlen(lpText);
-	if ((consoleIO == 0) || (consoleIO > MAX_PATH * 4))
-		return;
+    consoleIO = _strlen(lpText);
+    if ((consoleIO == 0) || (consoleIO > MAX_PATH * 4))
+        return;
 
-	consoleIO = consoleIO * sizeof(WCHAR) + 4 + sizeof(UNICODE_NULL);
-	Buffer = (LPWSTR)RtlAllocateHeap(RtlGetCurrentPeb()->ProcessHeap, HEAP_ZERO_MEMORY, consoleIO);
-	if (Buffer) {
+    consoleIO = (5 + consoleIO) * sizeof(WCHAR);
+    Buffer = (LPWSTR)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, consoleIO);
+    if (Buffer) {
 
-		_strcpy(Buffer, lpText);
-		if (UseReturn) _strcat(Buffer, TEXT("\r\n"));
+        _strcpy(Buffer, lpText);
+        if (UseReturn) _strcat(Buffer, TEXT("\r\n"));
 
-		consoleIO = _strlen(Buffer);
+        consoleIO = _strlen(Buffer);
 
-		if (ConsoleOutputEnabled == TRUE) {
-			WriteConsole(hOutConsole, Buffer, (DWORD)consoleIO, &bytesIO, NULL);
-		}
-		else {
-			WriteFile(hOutConsole, Buffer, (DWORD)(consoleIO * sizeof(WCHAR)), &bytesIO, NULL);
-		}
-		RtlFreeHeap(RtlGetCurrentPeb()->ProcessHeap, 0, Buffer);
-	}
+        if (ConsoleOutputEnabled != FALSE) {
+            WriteConsole(hOutConsole, Buffer, (DWORD)consoleIO, &bytesIO, NULL);
+        }
+        else {
+            WriteFile(hOutConsole, Buffer, (DWORD)(consoleIO * sizeof(WCHAR)), &bytesIO, NULL);
+        }
+        HeapFree(GetProcessHeap(), 0, Buffer);
+    }
 }
diff --git a/Source/Furutaka/cui.h b/Source/Furutaka/cui.h
@@ -1,12 +1,12 @@
 /*******************************************************************************
 *
-*  (C) COPYRIGHT AUTHORS, 2016
+*  (C) COPYRIGHT AUTHORS, 2016 - 2017
 *
 *  TITLE:       CUI.H
 *
-*  VERSION:     1.00
+*  VERSION:     1.10
 *
-*  DATE:        18 Jan 2016
+*  DATE:        04 Feb 2017
 *
 *  Common header file for console ui.
 *
@@ -18,11 +18,22 @@
 *******************************************************************************/
 #pragma once
 
-#include "global.h"
+VOID cuiPrintTextA(
+    _In_ HANDLE hOutConsole,
+    _In_ LPSTR lpText,
+    _In_ BOOL ConsoleOutputEnabled,
+    _In_ BOOL UseReturn
+);
 
-VOID cuiPrintText(
-	_In_ HANDLE hOutConsole,
-	_In_ LPWSTR lpText,
-	_In_ BOOL ConsoleOutputEnabled,
-	_In_ BOOL UseReturn
-	);
+VOID cuiPrintTextW(
+    _In_ HANDLE hOutConsole,
+    _In_ LPWSTR lpText,
+    _In_ BOOL ConsoleOutputEnabled,
+    _In_ BOOL UseReturn
+);
+
+#ifdef UNICODE
+#define cuiPrintText cuiPrintTextW
+#else
+#define cuiPrintText cuiPrintTextA
+#endif
diff --git a/Source/Furutaka/global.h b/Source/Furutaka/global.h
@@ -1,12 +1,12 @@
 /*******************************************************************************
 *
-*  (C) COPYRIGHT AUTHORS, 2016
+*  (C) COPYRIGHT AUTHORS, 2016 - 2017
 *
 *  TITLE:       GLOBAL.H
 *
-*  VERSION:     1.00
+*  VERSION:     1.10
 *
-*  DATE:        01 Feb 2016
+*  DATE:        17 Apr 2017
 *
 *  Common header file for the program support routines.
 *