mkdefrag

MarekKnapek · Jun 27, 2024 · f7b8757 · f7b8757
1 parent b146ad1
commit f7b8757
Show file tree

Hide file tree

Showing 10 changed files with 2,439 additions and 1 deletion.
diff --git a/.github/workflows/workflow1.yml b/.github/workflows/workflow1.yml
@@ -63,7 +63,7 @@
   "build_run_win":
     "strategy":
       "matrix":
-        "proj": ["mkcc", "mkcfct", "mkcflt", "mkch", "mkci", "mkct", "mkvc"]
+        "proj": ["mkcc", "mkcfct", "mkcflt", "mkch", "mkci", "mkct", "mkdefrag", "mkvc"]
         "conf": ["debug", "release"]
         "plat": ["x86", "x64", "arm32", "arm64", "arm64ec"]
     "runs-on": "windows-latest"

diff --git a/mk_clib/app/mkdefrag.c b/mk_clib/app/mkdefrag.c
@@ -0,0 +1,29 @@
+#include "../src/mk_clib_app_defrag.h"
+
+
+#if (mk_lang_platform == mk_lang_platform_windows_61 || mk_lang_platform == mk_lang_platform_windows_60 || mk_lang_platform == mk_lang_platform_windows) && (defined mk_lang_nodefaultlib_want && mk_lang_nodefaultlib_want == 1)
+
+mk_lang_extern_c mk_lang_types_sint_t mkentry(mk_lang_types_void_pt const peb) mk_lang_noexcept
+{
+	return mk_clib_app_defrag_peb(peb);
+}
+
+#elif mk_lang_platform == mk_lang_platform_windows_61 || mk_lang_platform == mk_lang_platform_windows_60 || mk_lang_platform == mk_lang_platform_windows
+
+mk_lang_types_sint_t wmain(mk_lang_types_sint_t const argc, mk_lang_types_wchar_pcpct const argv) mk_lang_noexcept
+{
+	return mk_clib_app_defrag_arg(mk_lang_true, argc, ((mk_lang_types_pchar_pcpct)(argv)));
+}
+
+#elif mk_lang_platform == mk_lang_platform_linux || mk_lang_platform == mk_lang_platform_portable
+
+mk_lang_types_sint_t main(mk_lang_types_sint_t const argc, mk_lang_types_pchar_pcpct const argv) mk_lang_noexcept
+{
+	return mk_clib_app_defrag_arg(mk_lang_false, argc, ((mk_lang_types_pchar_pcpct)(argv)));
+}
+
+#else
+
+#error toto xxxxxxxxxx
+
+#endif
diff --git a/mk_clib/projects/vs2022/mk_clib.sln b/mk_clib/projects/vs2022/mk_clib.sln
@@ -64,6 +64,11 @@ Project("{8bc9ceb8-8b4a-11d0-8d11-00a0c91bc942}") = "mkvc", "mkvc\mkvc.vcxproj",
 		{8286250d-5be4-4739-befc-05c1fef305be} = {8286250d-5be4-4739-befc-05c1fef305be}
 	EndProjectSection
 EndProject
+Project("{8bc9ceb8-8b4a-11d0-8d11-00a0c91bc942}") = "mkdefrag", "mkdefrag\mkdefrag.vcxproj", "{323d819f-23f2-459e-bb5d-eed8e09079f2}"
+	ProjectSection(ProjectDependencies) = postProject
+		{8286250d-5be4-4739-befc-05c1fef305be} = {8286250d-5be4-4739-befc-05c1fef305be}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x86 = Debug|x86
@@ -336,6 +341,26 @@ Global
 		{6416563a-41fe-42cd-950d-0ab99f9bf8f3}.Debug|ARM64EC.Build.0 = Debug|ARM64EC
 		{6416563a-41fe-42cd-950d-0ab99f9bf8f3}.Release|ARM64EC.ActiveCfg = Release|ARM64EC
 		{6416563a-41fe-42cd-950d-0ab99f9bf8f3}.Release|ARM64EC.Build.0 = Release|ARM64EC
+		{323d819f-23f2-459e-bb5d-eed8e09079f2}.Debug|x86.ActiveCfg = Debug|Win32
+		{323d819f-23f2-459e-bb5d-eed8e09079f2}.Debug|x86.Build.0 = Debug|Win32
+		{323d819f-23f2-459e-bb5d-eed8e09079f2}.Release|x86.ActiveCfg = Release|Win32
+		{323d819f-23f2-459e-bb5d-eed8e09079f2}.Release|x86.Build.0 = Release|Win32
+		{323d819f-23f2-459e-bb5d-eed8e09079f2}.Debug|x64.ActiveCfg = Debug|x64
+		{323d819f-23f2-459e-bb5d-eed8e09079f2}.Debug|x64.Build.0 = Debug|x64
+		{323d819f-23f2-459e-bb5d-eed8e09079f2}.Release|x64.ActiveCfg = Release|x64
+		{323d819f-23f2-459e-bb5d-eed8e09079f2}.Release|x64.Build.0 = Release|x64
+		{323d819f-23f2-459e-bb5d-eed8e09079f2}.Debug|ARM.ActiveCfg = Debug|ARM
+		{323d819f-23f2-459e-bb5d-eed8e09079f2}.Debug|ARM.Build.0 = Debug|ARM
+		{323d819f-23f2-459e-bb5d-eed8e09079f2}.Release|ARM.ActiveCfg = Release|ARM
+		{323d819f-23f2-459e-bb5d-eed8e09079f2}.Release|ARM.Build.0 = Release|ARM
+		{323d819f-23f2-459e-bb5d-eed8e09079f2}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{323d819f-23f2-459e-bb5d-eed8e09079f2}.Debug|ARM64.Build.0 = Debug|ARM64
+		{323d819f-23f2-459e-bb5d-eed8e09079f2}.Release|ARM64.ActiveCfg = Release|ARM64
+		{323d819f-23f2-459e-bb5d-eed8e09079f2}.Release|ARM64.Build.0 = Release|ARM64
+		{323d819f-23f2-459e-bb5d-eed8e09079f2}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC
+		{323d819f-23f2-459e-bb5d-eed8e09079f2}.Debug|ARM64EC.Build.0 = Debug|ARM64EC
+		{323d819f-23f2-459e-bb5d-eed8e09079f2}.Release|ARM64EC.ActiveCfg = Release|ARM64EC
+		{323d819f-23f2-459e-bb5d-eed8e09079f2}.Release|ARM64EC.Build.0 = Release|ARM64EC
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/mk_clib/projects/vs2022/mk_clib_slib/mk_clib_slib.vcxproj b/mk_clib/projects/vs2022/mk_clib_slib/mk_clib_slib.vcxproj
@@ -160,6 +160,7 @@
 	</ItemGroup>
 	<ItemGroup>
 		<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_clib_app_crypt.h"/>
+		<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_clib_app_defrag.h"/>
 		<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_clib_app_double_analyzer.h"/>
 		<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_clib_app_factorial.h"/>
 		<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_clib_app_float_analyzer.h"/>
@@ -857,6 +858,7 @@
 	</ItemGroup>
 	<ItemGroup>
 		<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_clib_app_crypt.c"/>
+		<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_clib_app_defrag.c"/>
 		<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_clib_app_double_analyzer.c"/>
 		<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_clib_app_factorial.c"/>
 		<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_clib_app_float_analyzer.c"/>

diff --git a/mk_clib/projects/vs2022/mk_clib_slib/mk_clib_slib.vcxproj.filters b/mk_clib/projects/vs2022/mk_clib_slib/mk_clib_slib.vcxproj.filters
@@ -123,6 +123,7 @@
 	</ItemGroup>
 	<ItemGroup>
 		<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_clib_app_crypt.h"><Filter>src</Filter></ClInclude>
+		<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_clib_app_defrag.h"><Filter>src</Filter></ClInclude>
 		<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_clib_app_double_analyzer.h"><Filter>src</Filter></ClInclude>
 		<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_clib_app_factorial.h"><Filter>src</Filter></ClInclude>
 		<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_clib_app_float_analyzer.h"><Filter>src</Filter></ClInclude>
@@ -820,6 +821,7 @@
 	</ItemGroup>
 	<ItemGroup>
 		<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_clib_app_crypt.c"><Filter>src</Filter></ClCompile>
+		<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_clib_app_defrag.c"><Filter>src</Filter></ClCompile>
 		<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_clib_app_double_analyzer.c"><Filter>src</Filter></ClCompile>
 		<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_clib_app_factorial.c"><Filter>src</Filter></ClCompile>
 		<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\src\mk_clib_app_float_analyzer.c"><Filter>src</Filter></ClCompile>

diff --git a/mk_clib/projects/vs2022/mkdefrag/.gitignore b/mk_clib/projects/vs2022/mkdefrag/.gitignore
@@ -0,0 +1,8 @@
+/ARM/
+/ARM64/
+/ARM64EC/
+/Debug/
+/Release/
+/x64/
+
+mkdefrag.vcxproj.user