From 47a849b20db4b8329385e8d8ac38239c59b8301c Mon Sep 17 00:00:00 2001 From: Alexey Date: Fri, 13 Dec 2024 05:54:50 +0300 Subject: [PATCH] [CKPE] - Added show dialog tool #93 --- .../jdiashow/jdiashow.cpp | 167 ++++++++++++++++++ .../jdiashow/jdiashow.vcxproj | 117 ++++++++++++ .../jdiashow/jdiashow.vcxproj.filters | 49 +++++ .../jdiashow/version/build_version.txt | Bin 0 -> 10 bytes .../jdiashow}/version/resource_version.aps | Bin .../jdiashow}/version/resource_version.h | 0 .../jdiashow}/version/resource_version.rc | 6 +- .../jdiashow}/version/resource_version2.h | Bin 2004 -> 2002 bytes .../jdiashow}/version/resource_version2.tmp | 0 .../jdiashow}/version/scripts.ps1 | 0 .../rc2json}/rc2json.cpp | 0 .../rc2json}/rc2json.vcxproj | 2 +- .../rc2json}/rc2json.vcxproj.filters | 0 .../rc2json/version/build_version.txt | Bin 0 -> 12 bytes .../rc2json/version/resource_version.aps | Bin 0 -> 2840 bytes .../rc2json/version/resource_version.h | 18 ++ .../rc2json/version/resource_version.rc | 105 +++++++++++ .../rc2json/version/resource_version2.h | Bin 0 -> 2004 bytes .../rc2json/version/resource_version2.tmp | 29 +++ .../rc2json/version/scripts.ps1 | 6 + Creation Kit Platform Extended.sln | 69 +++++++- rc2json/version/build_version.txt | Bin 12 -> 0 bytes 22 files changed, 563 insertions(+), 5 deletions(-) create mode 100644 Creation Kit Platform Extended Tools/jdiashow/jdiashow.cpp create mode 100644 Creation Kit Platform Extended Tools/jdiashow/jdiashow.vcxproj create mode 100644 Creation Kit Platform Extended Tools/jdiashow/jdiashow.vcxproj.filters create mode 100644 Creation Kit Platform Extended Tools/jdiashow/version/build_version.txt rename {rc2json => Creation Kit Platform Extended Tools/jdiashow}/version/resource_version.aps (100%) rename {rc2json => Creation Kit Platform Extended Tools/jdiashow}/version/resource_version.h (100%) rename {rc2json => Creation Kit Platform Extended Tools/jdiashow}/version/resource_version.rc (95%) rename {rc2json => Creation Kit Platform Extended Tools/jdiashow}/version/resource_version2.h (99%) rename {rc2json => Creation Kit Platform Extended Tools/jdiashow}/version/resource_version2.tmp (100%) rename {rc2json => Creation Kit Platform Extended Tools/jdiashow}/version/scripts.ps1 (100%) rename {rc2json => Creation Kit Platform Extended Tools/rc2json}/rc2json.cpp (100%) rename {rc2json => Creation Kit Platform Extended Tools/rc2json}/rc2json.vcxproj (98%) rename {rc2json => Creation Kit Platform Extended Tools/rc2json}/rc2json.vcxproj.filters (100%) create mode 100644 Creation Kit Platform Extended Tools/rc2json/version/build_version.txt create mode 100644 Creation Kit Platform Extended Tools/rc2json/version/resource_version.aps create mode 100644 Creation Kit Platform Extended Tools/rc2json/version/resource_version.h create mode 100644 Creation Kit Platform Extended Tools/rc2json/version/resource_version.rc create mode 100644 Creation Kit Platform Extended Tools/rc2json/version/resource_version2.h create mode 100644 Creation Kit Platform Extended Tools/rc2json/version/resource_version2.tmp create mode 100644 Creation Kit Platform Extended Tools/rc2json/version/scripts.ps1 delete mode 100644 rc2json/version/build_version.txt diff --git a/Creation Kit Platform Extended Tools/jdiashow/jdiashow.cpp b/Creation Kit Platform Extended Tools/jdiashow/jdiashow.cpp new file mode 100644 index 00000000..2fd53f8b --- /dev/null +++ b/Creation Kit Platform Extended Tools/jdiashow/jdiashow.cpp @@ -0,0 +1,167 @@ +// jdiashow.cpp : Этот файл содержит функцию "main". Здесь начинается и заканчивается выполнение программы. +// + +#include "../../Dependencies/jDialogs/include/jdialogs.h" + +namespace jDialogs = perchik71::jDialogs; + +#include +#include +#include + +static bool get_file_version(const char* a_filename, char* a_buffer, size_t a_buffersize) +{ + uint32_t dwSize = 0; + VS_FIXEDFILEINFO* pFileInfo = nullptr; + uint32_t puLenFileInfo = 0; + + dwSize = GetFileVersionInfoSizeA(a_filename, nullptr); + if (dwSize == 0) + return false; + + auto pbVersionInfo = std::make_unique(dwSize); + if (!pbVersionInfo) + return false; + + if (!GetFileVersionInfoA(a_filename, 0, dwSize, pbVersionInfo.get())) + return false; + + if (!VerQueryValueA(pbVersionInfo.get(), "\\", (LPVOID*)&pFileInfo, &puLenFileInfo)) + return false; + + sprintf_s(a_buffer, a_buffersize, "n%u.%u-%u", (pFileInfo->dwFileVersionMS >> 16) & 0xFFFF, + (pFileInfo->dwFileVersionMS) & 0xFFFF, pFileInfo->dwFileVersionLS); + + return true; +} + +static void hello() +{ + char modulePath[MAX_PATH]; + GetModuleFileNameA((HMODULE)GetModuleHandleA(nullptr), modulePath, MAX_PATH); + + char szBuffer[100]; + if (get_file_version(modulePath, szBuffer, _ARRAYSIZE(szBuffer))) + { + std::cout << "jdiashow version " << szBuffer << " copyright (c) 2024 the CKPE developers.\n"; + std::cout << "Show dialog from .json files.\n\n\n"; + } +} + +static void example() +{ + std::cout << "usage: jdiashow [infile]...\n"; +} + +static LRESULT CALLBACK WndProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) +{ + switch (Msg) + { + case WM_CREATE: + break; + case WM_DESTROY: + PostQuitMessage(WM_QUIT); + break; + default: + return DefWindowProc(hWnd, Msg, wParam, lParam); + } + return 0; +} + +static INT_PTR CALLBACK DlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch (uMsg) + { + case WM_INITDIALOG: + break; + case WM_CLOSE: + case WM_DESTROY: + EndDialog(hWnd, 0); + break; + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDOK: + case IDCANCEL: + EndDialog(hWnd, 0); + break; + } + break; + default: + return FALSE; + } + + return TRUE; +} + +static void run_unsafe(int a_argc, char* a_argv[]) +{ + WNDCLASSA wc = { 0 }; + wc.hInstance = GetModuleHandleA(0); + wc.lpszClassName = "jWndTEST"; + wc.style = CS_VREDRAW | CS_HREDRAW; + wc.hbrBackground = (HBRUSH)GetStockObject(WHITE_BRUSH); + wc.hCursor = LoadCursorA(NULL, IDC_ARROW); + wc.hIcon = LoadIconA(NULL, IDI_APPLICATION); + wc.lpfnWndProc = WndProc; + if (!RegisterClassA(&wc)) + return; + + auto wnd = CreateWindowA(wc.lpszClassName, "", WS_POPUP, + 0, 0, 10, 10, NULL, NULL, wc.hInstance, NULL); + if (!wnd) + return; + + for (int i = 1; i < a_argc; ++i) + { + if (!std::filesystem::exists(a_argv[i])) + { + std::cout << "File \"" << a_argv[i] <<"\" no found!\n"; + continue; + } + + auto dialog = new jDialogs::jDialogA(); + if (!dialog) + { + std::cout << "File \"" << a_argv[i] << "\" init failed!\n"; + continue; + } + + if (dialog->LoadFromFile(a_argv[i]) && !dialog->GenerateBinary()) + { + delete dialog; + std::cout << "File \"" << a_argv[i] << "\" no dialog!\n"; + continue; + } + + dialog->ShowModal(wnd, DlgProc, NULL); + delete dialog; + } + + DestroyWindow(wnd); +} + +int main(int a_argc, char* a_argv[]) +{ + if (a_argc == 1) + { + hello(); + example(); + + return 0; + } + + hello(); + + __try + { + run_unsafe(a_argc, a_argv); + + return 0; + } + __except (1) + { + std::cout << "FATAL ERROR!!!\n"; + return -1; + } +} \ No newline at end of file diff --git a/Creation Kit Platform Extended Tools/jdiashow/jdiashow.vcxproj b/Creation Kit Platform Extended Tools/jdiashow/jdiashow.vcxproj new file mode 100644 index 00000000..10d437b1 --- /dev/null +++ b/Creation Kit Platform Extended Tools/jdiashow/jdiashow.vcxproj @@ -0,0 +1,117 @@ + + + + + Release + Win32 + + + Release + x64 + + + + 17.0 + Win32Proj + {2ac659ea-3097-49d0-9b96-fceff4928559} + jdiashow + 10.0 + + + + Application + false + v143 + true + Unicode + + + Application + false + v143 + true + MultiByte + + + + + + + + + + + + + + + $(SolutionDir)$(Platform)\$(ProjectName)\$(Configuration)\ + $(SolutionDir)$(Platform)\ + + + + Level3 + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + Level3 + true + true + true + NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + stdcpplatest + AnySuitable + Speed + MultiThreaded + Fast + StdCall + 4996;4244 + + + Console + true + true + false + version.lib;%(AdditionalDependencies) + + + powershell -ExecutionPolicy Bypass -File "$(SolutionDir)Creation Kit Platform Extended Tools\$(ProjectName)\Version\scripts.ps1" + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Creation Kit Platform Extended Tools/jdiashow/jdiashow.vcxproj.filters b/Creation Kit Platform Extended Tools/jdiashow/jdiashow.vcxproj.filters new file mode 100644 index 00000000..721c7f3a --- /dev/null +++ b/Creation Kit Platform Extended Tools/jdiashow/jdiashow.vcxproj.filters @@ -0,0 +1,49 @@ + + + + + + jDialogs + + + + + {92765b5b-348b-4226-854e-25e269d6bec1} + + + {c7402277-2103-4534-9b2d-6f0a75a304d7} + + + + + res + + + res + + + jDialogs + + + + + res + + + + + res + + + res + + + res + + + + + res + + + \ No newline at end of file diff --git a/Creation Kit Platform Extended Tools/jdiashow/version/build_version.txt b/Creation Kit Platform Extended Tools/jdiashow/version/build_version.txt new file mode 100644 index 0000000000000000000000000000000000000000..07ab6d48ee14879d6eefc7996333af71e413780c GIT binary patch literal 10 RcmezW&yc~KftP`c0RR>V0(}4g literal 0 HcmV?d00001 diff --git a/rc2json/version/resource_version.aps b/Creation Kit Platform Extended Tools/jdiashow/version/resource_version.aps similarity index 100% rename from rc2json/version/resource_version.aps rename to Creation Kit Platform Extended Tools/jdiashow/version/resource_version.aps diff --git a/rc2json/version/resource_version.h b/Creation Kit Platform Extended Tools/jdiashow/version/resource_version.h similarity index 100% rename from rc2json/version/resource_version.h rename to Creation Kit Platform Extended Tools/jdiashow/version/resource_version.h diff --git a/rc2json/version/resource_version.rc b/Creation Kit Platform Extended Tools/jdiashow/version/resource_version.rc similarity index 95% rename from rc2json/version/resource_version.rc rename to Creation Kit Platform Extended Tools/jdiashow/version/resource_version.rc index 4c6b0c82..7500bf78 100644 --- a/rc2json/version/resource_version.rc +++ b/Creation Kit Platform Extended Tools/jdiashow/version/resource_version.rc @@ -75,9 +75,9 @@ BEGIN VALUE "CompanyName", "aka perchik71" VALUE "FileDescription", "" VALUE "FileVersion", VER_FILE_VERSION_STR - VALUE "InternalName", "winhttp" - VALUE "LegalCopyright", "Copyright (C) aka perchik71 2023-2024" - VALUE "OriginalFilename", "winhttp.dll" + VALUE "InternalName", "jdiashow" + VALUE "LegalCopyright", "Copyright (C) aka perchik71 2024" + VALUE "OriginalFilename", "jdiashow.exe" VALUE "ProductName", "Creation Kit Platform Extended Project" VALUE "ProductVersion", VER_PRODUCT_VERSION_STR END diff --git a/rc2json/version/resource_version2.h b/Creation Kit Platform Extended Tools/jdiashow/version/resource_version2.h similarity index 99% rename from rc2json/version/resource_version2.h rename to Creation Kit Platform Extended Tools/jdiashow/version/resource_version2.h index dab35a1c301f086b28c360549adbc4c246a85994..f4308abc32a9ddb5001472333b471b4b6fa01fc2 100644 GIT binary patch delta 26 icmcb@e~Ev?17=n;23`iP$&Ad>lOtHAHp{T=UC;2Gh+CnLjcE060VjO#lD@ diff --git a/rc2json/version/resource_version2.tmp b/Creation Kit Platform Extended Tools/jdiashow/version/resource_version2.tmp similarity index 100% rename from rc2json/version/resource_version2.tmp rename to Creation Kit Platform Extended Tools/jdiashow/version/resource_version2.tmp diff --git a/rc2json/version/scripts.ps1 b/Creation Kit Platform Extended Tools/jdiashow/version/scripts.ps1 similarity index 100% rename from rc2json/version/scripts.ps1 rename to Creation Kit Platform Extended Tools/jdiashow/version/scripts.ps1 diff --git a/rc2json/rc2json.cpp b/Creation Kit Platform Extended Tools/rc2json/rc2json.cpp similarity index 100% rename from rc2json/rc2json.cpp rename to Creation Kit Platform Extended Tools/rc2json/rc2json.cpp diff --git a/rc2json/rc2json.vcxproj b/Creation Kit Platform Extended Tools/rc2json/rc2json.vcxproj similarity index 98% rename from rc2json/rc2json.vcxproj rename to Creation Kit Platform Extended Tools/rc2json/rc2json.vcxproj index dd459302..f6703438 100644 --- a/rc2json/rc2json.vcxproj +++ b/Creation Kit Platform Extended Tools/rc2json/rc2json.vcxproj @@ -83,7 +83,7 @@ version.lib;%(AdditionalDependencies) - powershell -ExecutionPolicy Bypass -File "$(SolutionDir)$(ProjectName)\Version\scripts.ps1" + powershell -ExecutionPolicy Bypass -File "$(SolutionDir)Creation Kit Platform Extended Tools\$(ProjectName)\Version\scripts.ps1" diff --git a/rc2json/rc2json.vcxproj.filters b/Creation Kit Platform Extended Tools/rc2json/rc2json.vcxproj.filters similarity index 100% rename from rc2json/rc2json.vcxproj.filters rename to Creation Kit Platform Extended Tools/rc2json/rc2json.vcxproj.filters diff --git a/Creation Kit Platform Extended Tools/rc2json/version/build_version.txt b/Creation Kit Platform Extended Tools/rc2json/version/build_version.txt new file mode 100644 index 0000000000000000000000000000000000000000..18e1b06b30c6d2fc5b3f77ae35ee16837f2dd434 GIT binary patch literal 12 TcmezW&yc~0!JL7Yfr|kE8}f(*PA_bMuBhXo-+(4Gq-$q5|q2sVenw)otBL!f#Z&y z@sh2PttD(NVQc!#bF6{m`Ltkpjz3#?BgcLm5h~sYc$JPDoP8KL;?qPMI$AhHlav%= z6)DCwLnpv%|7hm|C4j7*w1^WCXyv4I^)h8%;5;9bNaSsa;#0cNNDsr8 zmwTJ__w<5T9pC^qp9XqdndmTLTgAQ4wTvH%fBpp&Ac%kE5k<&>4;2?E@|VzJ5{^hH z&|Ux!6Sz3WKL4k1XxYUB$k{iPOqH=!@d0N8U+@Xs!ZqsZlsUy5L&|?iOhdjo%KQ+I z_@;`$V@ge_@8VtRcd0)kZNYsDGSLZEkFg9% zjrLK)U9JKm?NVRpa;_e|Xw0T3e0OMb%;#9ih~0;L6T31RYCrS-R!<^(4w4&9&H}S_ zNIywrX+}vuk=D^CSMtV>ai!;esrX&-9`i2WcYdT!R6k^?@n-y7t?hc{g#IxwdIx5w zZGU$A(@u{^aV0}C+a%R-H6`_ofhpn?yp~e$9Ga~r8aHcrNfGURvt`(^<-CXYw53C_ zp1vlQQ%Yp@mB?bZ*J&Q={eNw=itFpp?1Mf#MZagZKQ`|h+e>7!6+2p~QqrEm6xf@X zNf4X(Dx@8}{>+&EQ#92Q-T;zZNV+l;pfET{Hq|!U`yKY4>nNB_op5gVO�i+764e zpmgQ=J3oT)_=*XX&%d7(M|yLTe_=efiU#&z#Z{S9k59^KHJ0OQEU#5#d951PwV$t+ zrISf7uvm%GgOko_DXLHIf~ygEHXi3Bq^I)p$nQ}!wu*WtzGG@hm(rHC?Q^}&Uh+P6 z*%K|^6r`_>>EVoC6V$RFHCC6Uy7P!tzfgTAqDEc3&YIlitf{VUQR0;HQ7@EO{1_SV z3-RU8=jXNa=^ICVv#qxdn}+)Ch(;J@sdc5ZO1-h9)^@45nnwTQRcB8j7JRL>e2lU% zn~(CnZgQS?SChNbADqu~canQjmHs#Dq*y4bhTL|(K38Y`J|uUcZ>Y2BE+pTC?~B>^ e(r-fS7E-sjUd+m*b(_dY?)-K!E0g9 +// License: https://www.gnu.org/licenses/gpl-3.0.html + +// Следующие стандартные значения для новых объектов +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 1101 +#define _APS_NEXT_COMMAND_VALUE 50001 +#define _APS_NEXT_CONTROL_VALUE 11001 +#define _APS_NEXT_SYMED_VALUE 1101 +#endif +#endif diff --git a/Creation Kit Platform Extended Tools/rc2json/version/resource_version.rc b/Creation Kit Platform Extended Tools/rc2json/version/resource_version.rc new file mode 100644 index 00000000..3a77fddf --- /dev/null +++ b/Creation Kit Platform Extended Tools/rc2json/version/resource_version.rc @@ -0,0 +1,105 @@ +// Copyright © 2023-2024 aka perchik71. All rights reserved. +// Contacts: +// License: https://www.gnu.org/licenses/gpl-3.0.html + +// Microsoft Visual C++ generated resource script. +// +#pragma code_page(65001) + +#include "resource_version2.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "winres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// Русский (Россия) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS) +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource_version.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""winres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION VER_FILE_VERSION + PRODUCTVERSION VER_PRODUCT_VERSION + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "aka perchik71" + VALUE "FileDescription", "" + VALUE "FileVersion", VER_FILE_VERSION_STR + VALUE "InternalName", "rc2json" + VALUE "LegalCopyright", "Copyright (C) aka perchik71 2024" + VALUE "OriginalFilename", "rc2json.exe" + VALUE "ProductName", "Creation Kit Platform Extended Project" + VALUE "ProductVersion", VER_PRODUCT_VERSION_STR + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // Русский (Россия) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/Creation Kit Platform Extended Tools/rc2json/version/resource_version2.h b/Creation Kit Platform Extended Tools/rc2json/version/resource_version2.h new file mode 100644 index 0000000000000000000000000000000000000000..6ec3f150b4f7afc8488dfa8fb2d4531f499d9a97 GIT binary patch literal 2004 zcmd^qs!{~R1UG+N;*hEzsb8}2 zn>DLA#tGrnL$%uVdUoc`n>TCU{H>{`K<}04r+#aoSZ!Tuh;8x7AJ$dXnQIE~b}zA= zs>2M3h=@4HKgRM}E2?6Bt1ctRVWsXZQtJFitSvmB=_$E=_C7gJ!5ZSVf&V66JuER; z8(3rBBK7fzG{WBH*>Q+Jv<+wPTg4;cZ7YYrPqfALoxh=5g+usTF5~dajVd^OUBfMb zeH(jsA~MC&CaQ}XYk1X}hSbAi)!3|XK7e1wC;%zr?9a1`i}_PftojcArq4hZU?#Bg z_0)6)Gt&aj)> zE%v5D4~sDg*{2Sz&Hg-BX^Zm +// License: https://www.gnu.org/licenses/gpl-3.0.html + +#pragma once + +// https://stackoverflow.com/questions/638053/how-to-increment-visual-studio-build-number-using-c + +#define STRINGIZE2(s) #s +#define STRINGIZE(s) STRINGIZE2(s) + +#define VERSION_MAJOR 1 +#define VERSION_MINOR 0 +#define VERSION_REVISION 0 +#define VERSION_BUILD + +#define VER_FILE_VERSION VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION, VERSION_BUILD +#define VER_PRODUCT_VERSION VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION, 0 + +#define VER_FILE_VERSION_STR STRINGIZE(VERSION_MAJOR) \ +"." STRINGIZE(VERSION_MINOR) \ +"." STRINGIZE(VERSION_REVISION) \ +"." STRINGIZE(VERSION_BUILD) + +#define VER_PRODUCT_VERSION_STR STRINGIZE(VERSION_MAJOR) \ +"." STRINGIZE(VERSION_MINOR) \ +"." STRINGIZE(VERSION_REVISION) \ +".0" + diff --git a/Creation Kit Platform Extended Tools/rc2json/version/scripts.ps1 b/Creation Kit Platform Extended Tools/rc2json/version/scripts.ps1 new file mode 100644 index 00000000..7cc0e29d --- /dev/null +++ b/Creation Kit Platform Extended Tools/rc2json/version/scripts.ps1 @@ -0,0 +1,6 @@ +[int]$buildverint = Get-Content -Path ".\Version\build_version.txt" +$buildverint+1 | out-file -FilePath ".\Version\build_version.txt" -Force + +$verfile = Get-Content -Path ".\Version\resource_version2.tmp" +$verfile = $verfile -Replace "", $buildverint +$verfile | out-file -FilePath ".\Version\resource_version2.h" -Force \ No newline at end of file diff --git a/Creation Kit Platform Extended.sln b/Creation Kit Platform Extended.sln index 50929fda..6eaf7b64 100644 --- a/Creation Kit Platform Extended.sln +++ b/Creation Kit Platform Extended.sln @@ -33,16 +33,28 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VoltekLib", "VoltekLib", "{ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RelocationDatabase", "Dependencies\Voltek\Relocation Database\RelocationDatabase.vcxproj", "{2E2B6346-5155-45BC-AF2D-CFB47BE95CAB}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rc2json", "rc2json\rc2json.vcxproj", "{77DA7F78-EDE5-4343-8CF4-751A70D50039}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{9BE6A4FA-4E77-49CF-85EF-4CE0579B0A77}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{94AEDB43-1EE2-49F1-9336-52B9E0ACB7F7}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rc2json", "Creation Kit Platform Extended Tools\rc2json\rc2json.vcxproj", "{77DA7F78-EDE5-4343-8CF4-751A70D50039}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jdiashow", "Creation Kit Platform Extended Tools\jdiashow\jdiashow.vcxproj", "{2AC659EA-3097-49D0-9B96-FCEFF4928559}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 Release|x64 = Release|x64 Release|x86 = Release|x86 Release-Qt|x64 = Release-Qt|x64 Release-Qt|x86 = Release-Qt|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0794F1B4-68C6-4F5A-AD4A-767B1B4D9783}.Debug|x64.ActiveCfg = Release-Qt|x64 + {0794F1B4-68C6-4F5A-AD4A-767B1B4D9783}.Debug|x64.Build.0 = Release-Qt|x64 + {0794F1B4-68C6-4F5A-AD4A-767B1B4D9783}.Debug|x86.ActiveCfg = Release-Qt|x64 + {0794F1B4-68C6-4F5A-AD4A-767B1B4D9783}.Debug|x86.Build.0 = Release-Qt|x64 {0794F1B4-68C6-4F5A-AD4A-767B1B4D9783}.Release|x64.ActiveCfg = Release|x64 {0794F1B4-68C6-4F5A-AD4A-767B1B4D9783}.Release|x64.Build.0 = Release|x64 {0794F1B4-68C6-4F5A-AD4A-767B1B4D9783}.Release|x86.ActiveCfg = Release|x64 @@ -50,6 +62,10 @@ Global {0794F1B4-68C6-4F5A-AD4A-767B1B4D9783}.Release-Qt|x64.Build.0 = Release-Qt|x64 {0794F1B4-68C6-4F5A-AD4A-767B1B4D9783}.Release-Qt|x86.ActiveCfg = Release-Qt|x64 {0794F1B4-68C6-4F5A-AD4A-767B1B4D9783}.Release-Qt|x86.Build.0 = Release-Qt|x64 + {2026AFE7-6063-466A-A335-C76A888DB202}.Debug|x64.ActiveCfg = Debug|x64 + {2026AFE7-6063-466A-A335-C76A888DB202}.Debug|x64.Build.0 = Debug|x64 + {2026AFE7-6063-466A-A335-C76A888DB202}.Debug|x86.ActiveCfg = Debug|x64 + {2026AFE7-6063-466A-A335-C76A888DB202}.Debug|x86.Build.0 = Debug|x64 {2026AFE7-6063-466A-A335-C76A888DB202}.Release|x64.ActiveCfg = Release|x64 {2026AFE7-6063-466A-A335-C76A888DB202}.Release|x64.Build.0 = Release|x64 {2026AFE7-6063-466A-A335-C76A888DB202}.Release|x86.ActiveCfg = Release|x64 @@ -57,6 +73,10 @@ Global {2026AFE7-6063-466A-A335-C76A888DB202}.Release-Qt|x64.Build.0 = Release|x64 {2026AFE7-6063-466A-A335-C76A888DB202}.Release-Qt|x86.ActiveCfg = Release|x64 {2026AFE7-6063-466A-A335-C76A888DB202}.Release-Qt|x86.Build.0 = Release|x64 + {C52CA55B-1B6E-4725-8FA8-9817113801DC}.Debug|x64.ActiveCfg = Debug|x64 + {C52CA55B-1B6E-4725-8FA8-9817113801DC}.Debug|x64.Build.0 = Debug|x64 + {C52CA55B-1B6E-4725-8FA8-9817113801DC}.Debug|x86.ActiveCfg = Debug|Win32 + {C52CA55B-1B6E-4725-8FA8-9817113801DC}.Debug|x86.Build.0 = Debug|Win32 {C52CA55B-1B6E-4725-8FA8-9817113801DC}.Release|x64.ActiveCfg = Release|x64 {C52CA55B-1B6E-4725-8FA8-9817113801DC}.Release|x64.Build.0 = Release|x64 {C52CA55B-1B6E-4725-8FA8-9817113801DC}.Release|x86.ActiveCfg = Release|Win32 @@ -65,6 +85,10 @@ Global {C52CA55B-1B6E-4725-8FA8-9817113801DC}.Release-Qt|x64.Build.0 = Release|x64 {C52CA55B-1B6E-4725-8FA8-9817113801DC}.Release-Qt|x86.ActiveCfg = Release|Win32 {C52CA55B-1B6E-4725-8FA8-9817113801DC}.Release-Qt|x86.Build.0 = Release|Win32 + {9E771CA4-04D9-4ED8-80F2-FFD379413688}.Debug|x64.ActiveCfg = Debug|x64 + {9E771CA4-04D9-4ED8-80F2-FFD379413688}.Debug|x64.Build.0 = Debug|x64 + {9E771CA4-04D9-4ED8-80F2-FFD379413688}.Debug|x86.ActiveCfg = Debug|Win32 + {9E771CA4-04D9-4ED8-80F2-FFD379413688}.Debug|x86.Build.0 = Debug|Win32 {9E771CA4-04D9-4ED8-80F2-FFD379413688}.Release|x64.ActiveCfg = Release|x64 {9E771CA4-04D9-4ED8-80F2-FFD379413688}.Release|x64.Build.0 = Release|x64 {9E771CA4-04D9-4ED8-80F2-FFD379413688}.Release|x86.ActiveCfg = Release|Win32 @@ -73,6 +97,10 @@ Global {9E771CA4-04D9-4ED8-80F2-FFD379413688}.Release-Qt|x64.Build.0 = Release|x64 {9E771CA4-04D9-4ED8-80F2-FFD379413688}.Release-Qt|x86.ActiveCfg = Release|Win32 {9E771CA4-04D9-4ED8-80F2-FFD379413688}.Release-Qt|x86.Build.0 = Release|Win32 + {42E22F45-AC50-49BF-AABB-D0FFE480333C}.Debug|x64.ActiveCfg = Release|x64 + {42E22F45-AC50-49BF-AABB-D0FFE480333C}.Debug|x64.Build.0 = Release|x64 + {42E22F45-AC50-49BF-AABB-D0FFE480333C}.Debug|x86.ActiveCfg = Release|x64 + {42E22F45-AC50-49BF-AABB-D0FFE480333C}.Debug|x86.Build.0 = Release|x64 {42E22F45-AC50-49BF-AABB-D0FFE480333C}.Release|x64.ActiveCfg = Release|x64 {42E22F45-AC50-49BF-AABB-D0FFE480333C}.Release|x64.Build.0 = Release|x64 {42E22F45-AC50-49BF-AABB-D0FFE480333C}.Release|x86.ActiveCfg = Release|x64 @@ -80,6 +108,10 @@ Global {42E22F45-AC50-49BF-AABB-D0FFE480333C}.Release-Qt|x64.Build.0 = Release|x64 {42E22F45-AC50-49BF-AABB-D0FFE480333C}.Release-Qt|x86.ActiveCfg = Release|x64 {42E22F45-AC50-49BF-AABB-D0FFE480333C}.Release-Qt|x86.Build.0 = Release|x64 + {D9D13FA6-38C4-443A-A610-18A0DB488DB5}.Debug|x64.ActiveCfg = Debug|x64 + {D9D13FA6-38C4-443A-A610-18A0DB488DB5}.Debug|x64.Build.0 = Debug|x64 + {D9D13FA6-38C4-443A-A610-18A0DB488DB5}.Debug|x86.ActiveCfg = Debug|Win32 + {D9D13FA6-38C4-443A-A610-18A0DB488DB5}.Debug|x86.Build.0 = Debug|Win32 {D9D13FA6-38C4-443A-A610-18A0DB488DB5}.Release|x64.ActiveCfg = Release|x64 {D9D13FA6-38C4-443A-A610-18A0DB488DB5}.Release|x64.Build.0 = Release|x64 {D9D13FA6-38C4-443A-A610-18A0DB488DB5}.Release|x86.ActiveCfg = Release|Win32 @@ -88,6 +120,10 @@ Global {D9D13FA6-38C4-443A-A610-18A0DB488DB5}.Release-Qt|x64.Build.0 = Release|x64 {D9D13FA6-38C4-443A-A610-18A0DB488DB5}.Release-Qt|x86.ActiveCfg = Release|Win32 {D9D13FA6-38C4-443A-A610-18A0DB488DB5}.Release-Qt|x86.Build.0 = Release|Win32 + {5E4F0CA1-5093-48F0-8660-E649765D6A1E}.Debug|x64.ActiveCfg = Debug|x64 + {5E4F0CA1-5093-48F0-8660-E649765D6A1E}.Debug|x64.Build.0 = Debug|x64 + {5E4F0CA1-5093-48F0-8660-E649765D6A1E}.Debug|x86.ActiveCfg = Debug|Win32 + {5E4F0CA1-5093-48F0-8660-E649765D6A1E}.Debug|x86.Build.0 = Debug|Win32 {5E4F0CA1-5093-48F0-8660-E649765D6A1E}.Release|x64.ActiveCfg = Release|x64 {5E4F0CA1-5093-48F0-8660-E649765D6A1E}.Release|x64.Build.0 = Release|x64 {5E4F0CA1-5093-48F0-8660-E649765D6A1E}.Release|x86.ActiveCfg = Release|Win32 @@ -96,6 +132,10 @@ Global {5E4F0CA1-5093-48F0-8660-E649765D6A1E}.Release-Qt|x64.Build.0 = Release|x64 {5E4F0CA1-5093-48F0-8660-E649765D6A1E}.Release-Qt|x86.ActiveCfg = Release|Win32 {5E4F0CA1-5093-48F0-8660-E649765D6A1E}.Release-Qt|x86.Build.0 = Release|Win32 + {1A04D2B1-EBB3-4569-BD03-915631B4BFB1}.Debug|x64.ActiveCfg = Debug|x64 + {1A04D2B1-EBB3-4569-BD03-915631B4BFB1}.Debug|x64.Build.0 = Debug|x64 + {1A04D2B1-EBB3-4569-BD03-915631B4BFB1}.Debug|x86.ActiveCfg = Debug|Win32 + {1A04D2B1-EBB3-4569-BD03-915631B4BFB1}.Debug|x86.Build.0 = Debug|Win32 {1A04D2B1-EBB3-4569-BD03-915631B4BFB1}.Release|x64.ActiveCfg = Release|x64 {1A04D2B1-EBB3-4569-BD03-915631B4BFB1}.Release|x64.Build.0 = Release|x64 {1A04D2B1-EBB3-4569-BD03-915631B4BFB1}.Release|x86.ActiveCfg = Release|Win32 @@ -104,6 +144,10 @@ Global {1A04D2B1-EBB3-4569-BD03-915631B4BFB1}.Release-Qt|x64.Build.0 = Release|x64 {1A04D2B1-EBB3-4569-BD03-915631B4BFB1}.Release-Qt|x86.ActiveCfg = Release|Win32 {1A04D2B1-EBB3-4569-BD03-915631B4BFB1}.Release-Qt|x86.Build.0 = Release|Win32 + {C0228B22-F83A-4EB2-A9FF-27461D8428B5}.Debug|x64.ActiveCfg = Debug|x64 + {C0228B22-F83A-4EB2-A9FF-27461D8428B5}.Debug|x64.Build.0 = Debug|x64 + {C0228B22-F83A-4EB2-A9FF-27461D8428B5}.Debug|x86.ActiveCfg = Debug|Win32 + {C0228B22-F83A-4EB2-A9FF-27461D8428B5}.Debug|x86.Build.0 = Debug|Win32 {C0228B22-F83A-4EB2-A9FF-27461D8428B5}.Release|x64.ActiveCfg = Release|x64 {C0228B22-F83A-4EB2-A9FF-27461D8428B5}.Release|x64.Build.0 = Release|x64 {C0228B22-F83A-4EB2-A9FF-27461D8428B5}.Release|x86.ActiveCfg = Release|Win32 @@ -112,6 +156,10 @@ Global {C0228B22-F83A-4EB2-A9FF-27461D8428B5}.Release-Qt|x64.Build.0 = Release|x64 {C0228B22-F83A-4EB2-A9FF-27461D8428B5}.Release-Qt|x86.ActiveCfg = Release|Win32 {C0228B22-F83A-4EB2-A9FF-27461D8428B5}.Release-Qt|x86.Build.0 = Release|Win32 + {2E2B6346-5155-45BC-AF2D-CFB47BE95CAB}.Debug|x64.ActiveCfg = Debug|x64 + {2E2B6346-5155-45BC-AF2D-CFB47BE95CAB}.Debug|x64.Build.0 = Debug|x64 + {2E2B6346-5155-45BC-AF2D-CFB47BE95CAB}.Debug|x86.ActiveCfg = Debug|Win32 + {2E2B6346-5155-45BC-AF2D-CFB47BE95CAB}.Debug|x86.Build.0 = Debug|Win32 {2E2B6346-5155-45BC-AF2D-CFB47BE95CAB}.Release|x64.ActiveCfg = Release|x64 {2E2B6346-5155-45BC-AF2D-CFB47BE95CAB}.Release|x64.Build.0 = Release|x64 {2E2B6346-5155-45BC-AF2D-CFB47BE95CAB}.Release|x86.ActiveCfg = Release|Win32 @@ -120,6 +168,10 @@ Global {2E2B6346-5155-45BC-AF2D-CFB47BE95CAB}.Release-Qt|x64.Build.0 = Release|x64 {2E2B6346-5155-45BC-AF2D-CFB47BE95CAB}.Release-Qt|x86.ActiveCfg = Release|Win32 {2E2B6346-5155-45BC-AF2D-CFB47BE95CAB}.Release-Qt|x86.Build.0 = Release|Win32 + {77DA7F78-EDE5-4343-8CF4-751A70D50039}.Debug|x64.ActiveCfg = Release|x64 + {77DA7F78-EDE5-4343-8CF4-751A70D50039}.Debug|x64.Build.0 = Release|x64 + {77DA7F78-EDE5-4343-8CF4-751A70D50039}.Debug|x86.ActiveCfg = Release|Win32 + {77DA7F78-EDE5-4343-8CF4-751A70D50039}.Debug|x86.Build.0 = Release|Win32 {77DA7F78-EDE5-4343-8CF4-751A70D50039}.Release|x64.ActiveCfg = Release|x64 {77DA7F78-EDE5-4343-8CF4-751A70D50039}.Release|x64.Build.0 = Release|x64 {77DA7F78-EDE5-4343-8CF4-751A70D50039}.Release|x86.ActiveCfg = Release|Win32 @@ -128,6 +180,18 @@ Global {77DA7F78-EDE5-4343-8CF4-751A70D50039}.Release-Qt|x64.Build.0 = Release|x64 {77DA7F78-EDE5-4343-8CF4-751A70D50039}.Release-Qt|x86.ActiveCfg = Release|Win32 {77DA7F78-EDE5-4343-8CF4-751A70D50039}.Release-Qt|x86.Build.0 = Release|Win32 + {2AC659EA-3097-49D0-9B96-FCEFF4928559}.Debug|x64.ActiveCfg = Release|x64 + {2AC659EA-3097-49D0-9B96-FCEFF4928559}.Debug|x64.Build.0 = Release|x64 + {2AC659EA-3097-49D0-9B96-FCEFF4928559}.Debug|x86.ActiveCfg = Release|Win32 + {2AC659EA-3097-49D0-9B96-FCEFF4928559}.Debug|x86.Build.0 = Release|Win32 + {2AC659EA-3097-49D0-9B96-FCEFF4928559}.Release|x64.ActiveCfg = Release|x64 + {2AC659EA-3097-49D0-9B96-FCEFF4928559}.Release|x64.Build.0 = Release|x64 + {2AC659EA-3097-49D0-9B96-FCEFF4928559}.Release|x86.ActiveCfg = Release|Win32 + {2AC659EA-3097-49D0-9B96-FCEFF4928559}.Release|x86.Build.0 = Release|Win32 + {2AC659EA-3097-49D0-9B96-FCEFF4928559}.Release-Qt|x64.ActiveCfg = Release|x64 + {2AC659EA-3097-49D0-9B96-FCEFF4928559}.Release-Qt|x64.Build.0 = Release|x64 + {2AC659EA-3097-49D0-9B96-FCEFF4928559}.Release-Qt|x86.ActiveCfg = Release|Win32 + {2AC659EA-3097-49D0-9B96-FCEFF4928559}.Release-Qt|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -136,11 +200,14 @@ Global {2026AFE7-6063-466A-A335-C76A888DB202} = {DBF8B066-7523-44A5-8F55-02E3212A048F} {C52CA55B-1B6E-4725-8FA8-9817113801DC} = {DBF8B066-7523-44A5-8F55-02E3212A048F} {9E771CA4-04D9-4ED8-80F2-FFD379413688} = {DBF8B066-7523-44A5-8F55-02E3212A048F} + {D9D13FA6-38C4-443A-A610-18A0DB488DB5} = {94AEDB43-1EE2-49F1-9336-52B9E0ACB7F7} {5E4F0CA1-5093-48F0-8660-E649765D6A1E} = {E3CCD384-8F82-4300-9B4A-DCAE5BA8DB89} {1A04D2B1-EBB3-4569-BD03-915631B4BFB1} = {E3CCD384-8F82-4300-9B4A-DCAE5BA8DB89} {C0228B22-F83A-4EB2-A9FF-27461D8428B5} = {E3CCD384-8F82-4300-9B4A-DCAE5BA8DB89} {E3CCD384-8F82-4300-9B4A-DCAE5BA8DB89} = {DBF8B066-7523-44A5-8F55-02E3212A048F} {2E2B6346-5155-45BC-AF2D-CFB47BE95CAB} = {E3CCD384-8F82-4300-9B4A-DCAE5BA8DB89} + {77DA7F78-EDE5-4343-8CF4-751A70D50039} = {9BE6A4FA-4E77-49CF-85EF-4CE0579B0A77} + {2AC659EA-3097-49D0-9B96-FCEFF4928559} = {9BE6A4FA-4E77-49CF-85EF-4CE0579B0A77} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {3D7FAA7F-23AA-467B-BFB7-39DF25721450} diff --git a/rc2json/version/build_version.txt b/rc2json/version/build_version.txt deleted file mode 100644 index 2fadc38dc0971505fa0e4d13369d36c6de98e947..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12 TcmezW&yc~0!Hj{Ifr|kE8}I_I