Reorganisation of files

YAYA-shiori · Aug 5, 2022 · d39c90d · d39c90d
1 parent f4f7d1a
commit d39c90d
Show file tree

Hide file tree

Showing 29 changed files with 106 additions and 105 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,4 @@
+
+.vs/
+tama.aps
+tama.vcxproj.user
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 
-- [cn](./README_CN.md)
-- [jp](./README_JP.md)
-- [en](./README_EN.md)
+- [cn](docs/README_CN.md)
+- [jp](docs/README_JP.md)
+- [en](docs/README_EN.md)
 
 _____
 

diff --git a/src/.gitignore → builds/.gitignore b/src/.gitignore → builds/.gitignore
@@ -1,5 +1,3 @@
 
-.vs/
 Release/
 Debug/
-tama.aps
diff --git a/src/auto_upx.bat → builds/auto_upx.bat b/src/auto_upx.bat → builds/auto_upx.bat
diff --git a/README_CN.md → docs/README_CN.md b/README_CN.md → docs/README_CN.md
diff --git a/README_EN.md → docs/README_EN.md b/README_EN.md → docs/README_EN.md
diff --git a/README_JP.md → docs/README_JP.md b/README_JP.md → docs/README_JP.md
diff --git a/src/CheckUpdate.cpp b/src/CheckUpdate.cpp
@@ -1,8 +1,8 @@
 #include <Windows.h>
 #include <string>
-#include "resource.h"
+#include "header_files/resource.h"
+#include "header_files/Version.h"
 #include "my-gists/windows/LoadStringFromResource.h"
-#include "Version.h"
 
 //更新检查用
 #include <wininet.h>

diff --git a/src/Events.cpp b/src/Events.cpp
@@ -1,9 +1,9 @@
-#include "tama.h"
-#include "GhostStuff.hpp"
+#include "header_files/tama.h"
+#include "header_files/GhostStuff.hpp"
+#include "header_files/Parameter.hpp"
+#include "header_files/resource.h"
+#include "header_files/UItools.hpp"
 #include "my-gists/windows/SetIcon.h"
-#include "Parameter.hpp"
-#include "resource.h"
-#include "UItools.hpp"
 
 void On_tamaOpen(HWND hWnd, wstring ghost_path) {
  tamaOpen_called = 1;

diff --git a/src/GhostStuff.cpp b/src/GhostStuff.cpp
@@ -1,11 +1,11 @@
 #define _CRT_SECURE_NO_WARNINGS
 
-#include "tama.h"
-#include "GhostStuff.hpp"
+#include "header_files/tama.h"
+#include "header_files/GhostStuff.hpp"
 #include "my-gists/windows/LoadStringFromResource.h"
-#include "resource.h"
-#include "ToolFunctions.hpp"
-#include "UItools.hpp"
+#include "header_files/resource.h"
+#include "header_files/ToolFunctions.hpp"
+#include "header_files/UItools.hpp"
 
 [[noreturn]] void LostGhostLink() {
  MessageBoxW(NULL, LoadCStringFromResource(IDS_ERROR_LOST_GHOST_LINK), LoadCStringFromResource(IDS_ERROR_TITLE), MB_ICONERROR | MB_OK);

diff --git a/src/Parameter.cpp b/src/Parameter.cpp
@@ -1,10 +1,10 @@
 #define _CRT_SECURE_NO_WARNINGS
 
-#include "tama.h"
-#include "ToolFunctions.hpp"
+#include "header_files/tama.h"
+#include "header_files/ToolFunctions.hpp"
+#include "header_files/Parameter.hpp"
+#include "header_files/UItools.hpp"
 #include <dwmapi.h>
-#include "Parameter.hpp"
-#include "UItools.hpp"
 
 #ifndef DWMWA_USE_IMMERSIVE_DARK_MODE
  #define DWMWA_USE_IMMERSIVE_DARK_MODE 20

diff --git a/src/ToolFunctions.cpp b/src/ToolFunctions.cpp
@@ -1,6 +1,6 @@
 #include <string>
 #include <windows.h>
-#include "tama.h"
+#include "header_files/tama.h"
 using namespace std;
 
 int HexStrToInt(const wchar_t *str) {

diff --git a/src/UItools.cpp b/src/UItools.cpp
@@ -1,6 +1,6 @@
 #include <Richedit.h>
-#include "tama.h"
-#include "UItools.hpp"
+#include "header_files/tama.h"
+#include "header_files/UItools.hpp"
 
 bool SetFontShape(int shapeid) {
  // IDでフォント属性を設定

diff --git a/src/_gists.cpp b/src/_gists.cpp
@@ -2,3 +2,4 @@
 #include "my-gists/ukagaka/shiori_loader.cpp"
 #include "my-gists/windows/GenerateDump.cpp"
 #include "my-gists/windows/LoadStringFromResource.cpp"
+#include "my-gists/windows/OSinfo.cpp"
diff --git a/src/Events.hpp → src/header_files/Events.hpp b/src/Events.hpp → src/header_files/Events.hpp
diff --git a/src/GhostStuff.hpp → src/header_files/GhostStuff.hpp b/src/GhostStuff.hpp → src/header_files/GhostStuff.hpp
diff --git a/src/Parameter.hpp → src/header_files/Parameter.hpp b/src/Parameter.hpp → src/header_files/Parameter.hpp
diff --git a/src/ToolFunctions.hpp → src/header_files/ToolFunctions.hpp b/src/ToolFunctions.hpp → src/header_files/ToolFunctions.hpp
diff --git a/src/UItools.hpp → src/header_files/UItools.hpp b/src/UItools.hpp → src/header_files/UItools.hpp
diff --git a/src/Version.h → src/header_files/Version.h b/src/Version.h → src/header_files/Version.h
diff --git a/src/resource.h → src/header_files/resource.h b/src/resource.h → src/header_files/resource.h
diff --git a/src/tama.h → src/header_files/tama.h b/src/tama.h → src/header_files/tama.h
diff --git a/src/my-gists b/src/my-gists
diff --git a/src/tama.cpp b/src/tama.cpp
@@ -1,15 +1,16 @@
 #include "my-gists/codepage.hpp"
 #include "my-gists/windows/LoadStringFromResource.h"
+#include "my-gists/windows/OSinfo.hpp"
 
 #include <Richedit.h>
 
-#include "resource.h"
-#include "tama.h"
-#include "GhostStuff.hpp"
-#include "ToolFunctions.hpp"
-#include "Events.hpp"
-#include "UItools.hpp"
-#include "Parameter.hpp"
+#include "header_files/resource.h"
+#include "header_files/tama.h"
+#include "header_files/GhostStuff.hpp"
+#include "header_files/ToolFunctions.hpp"
+#include "header_files/Events.hpp"
+#include "header_files/UItools.hpp"
+#include "header_files/Parameter.hpp"
 
 using namespace std;
 
@@ -336,15 +337,12 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
  logbuf.resize(cds->cbData);
  wcscpy_s(logbuf.data(), (size_t)cds->cbData, (wchar_t *)cds->lpData);
 
- static OSVERSIONINFO osi = {sizeof(osi)};
- static bool osiiniter = GetVersionEx(&osi);
-
- if(osi.dwPlatformId == VER_PLATFORM_WIN32_NT) {
+ if(IsWinNT()) [[likely]] {
  EOS(logbuf.size());
  SetFontShape(cds->dwData);
  SendMessageW(hEdit, EM_REPLACESEL, (WPARAM)0, (LPARAM)logbuf.c_str());
  }
- else {
+ else [[unlikely]] {
  string mstr = CODEPAGE_n::UnicodeToMultiByte(logbuf, CODEPAGE_n::CP_ACP);
  if(!mstr.empty()) {
  EOS(mstr.size());
@@ -649,3 +647,7 @@ LRESULT CALLBACK GhostSelectDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPAR
  return FALSE;
  }
 }
+
+void OnError(PEXCEPTION_POINTERS pExceptionPointers) {
+ MessageBoxW(NULL, LoadCStringFromResource(IDS_ERROR_UNEXPECTED_EXCEPTION), LoadCStringFromResource(IDS_ERROR_TITLE), MB_ICONERROR | MB_OK);
+}
diff --git a/src/tama.rc b/src/tama.rc
diff --git a/src/tama.vcxproj.user b/src/tama.vcxproj.user
diff --git a/src/tama.sln → tama.sln b/src/tama.sln → tama.sln
diff --git a/src/tama.vcxproj → tama.vcxproj b/src/tama.vcxproj → tama.vcxproj
@@ -43,14 +43,14 @@
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <OutDir>.\Release\</OutDir>
- <IntDir>.\Release\</IntDir>
+ <OutDir>.\builds\$(Configuration)\</OutDir>
+ <IntDir>.\builds\$(Configuration)\temp\</IntDir>
  <LinkIncremental>false</LinkIncremental>
  <TargetName>$(ProjectName)</TargetName>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <OutDir>.\Debug\</OutDir>
- <IntDir>.\Debug\</IntDir>
+ <OutDir>.\builds\$(Configuration)\</OutDir>
+ <IntDir>.\builds\$(Configuration)\temp\</IntDir>
  <LinkIncremental>true</LinkIncremental>
  <TargetName>$(ProjectName)</TargetName>
  </PropertyGroup>
@@ -64,12 +64,12 @@
  <SuppressStartupBanner>true</SuppressStartupBanner>
  <WarningLevel>Level3</WarningLevel>
  <PreprocessorDefinitions>_AFX_NO_MFC_CONTROLS_IN_DIALOGS;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AssemblerListingLocation>.\Release\</AssemblerListingLocation>
- <PrecompiledHeaderOutputFile>.\Release\tama.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(OutputPath)\asm\</AssemblerListingLocation>
+ <PrecompiledHeaderOutputFile>$(OutputPath)$(AssemblyName).pch</PrecompiledHeaderOutputFile>
  <PrecompiledHeader>NotUsing</PrecompiledHeader>
  <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
- <ObjectFileName>.\Release\</ObjectFileName>
- <ProgramDataBaseFileName>.\Release\</ProgramDataBaseFileName>
+ <ObjectFileName>$(OutputPath)\objs\</ObjectFileName>
+ <ProgramDataBaseFileName>$(OutputPath)\pdb\</ProgramDataBaseFileName>
  <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
  <IntrinsicFunctions>true</IntrinsicFunctions>
  <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
@@ -95,7 +95,7 @@
  <Link>
  <SuppressStartupBanner>true</SuppressStartupBanner>
  <SubSystem>Windows</SubSystem>
- <OutputFile>Release/tama.exe</OutputFile>
+ <OutputFile>$(OutputPath)$(AssemblyName).$(OutputType)</OutputFile>
  <AdditionalDependencies>odbc32.lib;odbccp32.lib;Dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
  <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
  <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -117,12 +117,12 @@
  <WarningLevel>Level3</WarningLevel>
  <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
  <PreprocessorDefinitions>_AFX_NO_MFC_CONTROLS_IN_DIALOGS;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AssemblerListingLocation>.\Debug\</AssemblerListingLocation>
- <PrecompiledHeaderOutputFile>.\Debug\tama.pch</PrecompiledHeaderOutputFile>
+ <AssemblerListingLocation>$(OutputPath)\asm\</AssemblerListingLocation>
+ <PrecompiledHeaderOutputFile>$(OutputPath)$(AssemblyName).pch</PrecompiledHeaderOutputFile>
  <PrecompiledHeader>NotUsing</PrecompiledHeader>
  <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
- <ObjectFileName>.\Debug\</ObjectFileName>
- <ProgramDataBaseFileName>.\Debug\</ProgramDataBaseFileName>
+ <ObjectFileName>$(OutputPath)\objs\</ObjectFileName>
+ <ProgramDataBaseFileName>$(OutputPath)\pdb\</ProgramDataBaseFileName>
  <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
  <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
  <LanguageStandard>stdcpplatest</LanguageStandard>
@@ -147,38 +147,38 @@
  <SuppressStartupBanner>true</SuppressStartupBanner>
  <GenerateDebugInformation>true</GenerateDebugInformation>
  <SubSystem>Windows</SubSystem>
- <OutputFile>Debug/tama.exe</OutputFile>
+ <OutputFile>$(OutputPath)$(AssemblyName).$(OutputType)</OutputFile>
  <AdditionalDependencies>odbc32.lib;odbccp32.lib;Dwmapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
  <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
  <RandomizedBaseAddress>false</RandomizedBaseAddress>
  </Link>
  </ItemDefinitionGroup>
  <ItemGroup>
- <ClCompile Include="CheckUpdate.cpp" />
- <ClCompile Include="Events.cpp" />
- <ClCompile Include="GhostStuff.cpp" />
- <ClCompile Include="GhostStuff.hpp" />
- <ClCompile Include="ToolFunctions.cpp" />
- <ClCompile Include="Parameter.cpp" />
- <ClCompile Include="tama.cpp" />
- <ClCompile Include="UItools.cpp" />
- <ClCompile Include="_gists.cpp" />
+ <ClCompile Include="src\CheckUpdate.cpp" />
+ <ClCompile Include="src\Events.cpp" />
+ <ClCompile Include="src\GhostStuff.cpp" />
+ <ClCompile Include="src\ToolFunctions.cpp" />
+ <ClCompile Include="src\Parameter.cpp" />
+ <ClCompile Include="src\tama.cpp" />
+ <ClCompile Include="src\UItools.cpp" />
+ <ClCompile Include="src\_gists.cpp" />
  </ItemGroup>
  <ItemGroup>
- <ResourceCompile Include="tama.rc" />
+ <ResourceCompile Include="src\tama.rc" />
  </ItemGroup>
  <ItemGroup>
- <ClInclude Include="Events.hpp" />
- <ClInclude Include="Parameter.hpp" />
- <ClInclude Include="resource.h" />
- <ClInclude Include="tama.h" />
- <ClInclude Include="ToolFunctions.hpp" />
- <ClInclude Include="UItools.hpp" />
- <ClInclude Include="Version.h" />
+ <Image Include="src\icon\small.ico" />
+ <Image Include="src\icon\tama.ico" />
  </ItemGroup>
  <ItemGroup>
- <Image Include="icon\small.ico" />
- <Image Include="icon\tama.ico" />
+ <ClInclude Include="src\header_files\Events.hpp" />
+ <ClInclude Include="src\header_files\GhostStuff.hpp" />
+ <ClInclude Include="src\header_files\Parameter.hpp" />
+ <ClInclude Include="src\header_files\resource.h" />
+ <ClInclude Include="src\header_files\tama.h" />
+ <ClInclude Include="src\header_files\ToolFunctions.hpp" />
+ <ClInclude Include="src\header_files\UItools.hpp" />
+ <ClInclude Include="src\header_files\Version.h" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">

diff --git a/src/tama.vcxproj.filters → tama.vcxproj.filters b/src/tama.vcxproj.filters → tama.vcxproj.filters
@@ -15,68 +15,68 @@
  </Filter>
  </ItemGroup>
  <ItemGroup>
- <ClCompile Include="tama.cpp">
+ <ClCompile Include="src\tama.cpp">
  <Filter>Source Files</Filter>
  </ClCompile>
- <ClCompile Include="CheckUpdate.cpp">
+ <ClCompile Include="src\CheckUpdate.cpp">
  <Filter>Source Files</Filter>
  </ClCompile>
- <ClCompile Include="_gists.cpp">
+ <ClCompile Include="src\_gists.cpp">
  <Filter>Source Files</Filter>
  </ClCompile>
- <ClCompile Include="ToolFunctions.cpp">
+ <ClCompile Include="src\ToolFunctions.cpp">
  <Filter>Source Files</Filter>
  </ClCompile>
- <ClCompile Include="Events.cpp">
+ <ClCompile Include="src\Events.cpp">
  <Filter>Source Files</Filter>
  </ClCompile>
- <ClCompile Include="GhostStuff.hpp">
- <Filter>Header Files</Filter>
- </ClCompile>
- <ClCompile Include="Parameter.cpp">
+ <ClCompile Include="src\Parameter.cpp">
  <Filter>Source Files</Filter>
  </ClCompile>
- <ClCompile Include="GhostStuff.cpp">
+ <ClCompile Include="src\GhostStuff.cpp">
  <Filter>Source Files</Filter>
  </ClCompile>
- <ClCompile Include="UItools.cpp">
+ <ClCompile Include="src\UItools.cpp">
  <Filter>Source Files</Filter>
  </ClCompile>
  </ItemGroup>
  <ItemGroup>
- <ClInclude Include="resource.h">
+ <ResourceCompile Include="src\tama.rc">
+ <Filter>Resource Files</Filter>
+ </ResourceCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <Image Include="src\icon\small.ico">
+ <Filter>Resource Files</Filter>
+ </Image>
+ <Image Include="src\icon\tama.ico">
+ <Filter>Resource Files</Filter>
+ </Image>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="src\header_files\Events.hpp">
  <Filter>Header Files</Filter>
  </ClInclude>
- <ClInclude Include="Version.h">
+ <ClInclude Include="src\header_files\GhostStuff.hpp">
  <Filter>Header Files</Filter>
  </ClInclude>
- <ClInclude Include="tama.h">
+ <ClInclude Include="src\header_files\Parameter.hpp">
  <Filter>Header Files</Filter>
  </ClInclude>
- <ClInclude Include="ToolFunctions.hpp">
+ <ClInclude Include="src\header_files\resource.h">
  <Filter>Header Files</Filter>
  </ClInclude>
- <ClInclude Include="Parameter.hpp">
+ <ClInclude Include="src\header_files\tama.h">
  <Filter>Header Files</Filter>
  </ClInclude>
- <ClInclude Include="Events.hpp">
+ <ClInclude Include="src\header_files\ToolFunctions.hpp">
  <Filter>Header Files</Filter>
  </ClInclude>
- <ClInclude Include="UItools.hpp">
+ <ClInclude Include="src\header_files\UItools.hpp">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="src\header_files\Version.h">
  <Filter>Header Files</Filter>
  </ClInclude>
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="tama.rc">
- <Filter>Resource Files</Filter>
- </ResourceCompile>
- </ItemGroup>
- <ItemGroup>
- <Image Include="icon\small.ico">
- <Filter>Resource Files</Filter>
- </Image>
- <Image Include="icon\tama.ico">
- <Filter>Resource Files</Filter>
- </Image>
  </ItemGroup>
 </Project>