Remove dependency to UI, use RAII to handle resources

src/analyzer/CMakeLists.txt

@@ -51,6 +51,7 @@ INSTALL(EXPORT antares-analyzer
 target_link_libraries(antares-${ANTARES_PRG_VERSION}-analyzer
 		PRIVATE
 			yuni-static-core
+			Antares::args_helper
 			${CMAKE_THREADS_LIBS_INIT}
 		antares-core #local.h
 		PUBLIC

src/analyzer/main.cpp

@@ -28,7 +28,7 @@
 #include <yuni/yuni.h>
 #include <antares/logs/logs.h>
 #include <yuni/core/getopt.h>
-#include "../ui/common/winmain.hxx"
+#include <antares/args/args_to_utf8.h>
 #include <antares/version.h>
 #include "atsp/atsp.h"
 #include <antares/logs/hostinfo.h>

src/libs/antares/CMakeLists.txt

@@ -1,6 +1,7 @@
 
 OMESSAGE("Antares Core library")
 
+add_subdirectory(args)
 add_subdirectory(writer)
 add_subdirectory(memory)
 

src/libs/antares/args/CMakeLists.txt

@@ -0,0 +1,22 @@
+set(SRC_ARGS_HELPER
+        args_to_utf8.h
+        args_to_utf8.cpp
+)
+
+source_group("misc\\args_helper" FILES ${SRC_ARGS_HELPER})
+
+add_library(args_helper
+        ${SRC_ARGS_HELPER}
+)
+
+add_library(Antares::args_helper ALIAS args_helper)
+
+target_link_libraries(args_helper
+        PRIVATE
+			yuni-static-core
+        )
+
+target_include_directories(args_helper
+        PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}
+)

src/libs/antares/args/args_to_utf8.cpp

@@ -0,0 +1,51 @@
+
+#include <yuni/yuni.h>
+#include "args_to_utf8.h"
+
+
+#ifdef YUNI_OS_WINDOWS
+#include <string.h>
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN 1
+#endif
+#include <windows.h>
+#include <shellapi.h>
+#include <stdlib.h>
+#include <stdio.h>
+#endif
+
+#ifdef YUNI_OS_WINDOWS
+char** AntaresGetUTF8Arguments(int argc, char**)
+{
+    wchar_t** wargv = CommandLineToArgvW(GetCommandLineW(), &argc);
+    char** argvUTF8 = (char**)malloc(argc * sizeof(char*));
+    for (int i = 0; i != argc; ++i)
+    {
+        const uint len = (uint)wcslen(wargv[i]);
+        const uint newLen = WideCharToMultiByte(CP_UTF8, 0, wargv[i], len, NULL, 0, NULL, NULL);
+        argvUTF8[i] = (char*)malloc((newLen + 1) * sizeof(char));
+        memset(argvUTF8[i], 0, (newLen + 1) * sizeof(char));
+        WideCharToMultiByte(CP_UTF8, 0, wargv[i], len, argvUTF8[i], newLen, NULL, NULL);
+        argvUTF8[i][newLen] = '\0';
+    }
+    return argvUTF8;
+}
+
+void FreeUTF8Arguments(int argc, char** argv)
+{
+    for (int i = 0; i != argc; ++i)
+        free(argv[i]);
+    free(argv);
+}
+
+#else
+
+char** AntaresGetUTF8Arguments(int argc, char** argv)
+{
+    return argv;
+}
+
+void FreeUTF8Arguments(int argc, char** argv)
+{}
+
+#endif

src/libs/antares/args/args_to_utf8.h

@@ -0,0 +1,4 @@
+#pragma once
+
+char** AntaresGetUTF8Arguments(int argc, char** argv);
+void FreeUTF8Arguments(int argc, char** argv);

src/solver/CMakeLists.txt

@@ -74,6 +74,7 @@ add_executable(antares-solver
 set_target_properties(antares-solver PROPERTIES OUTPUT_NAME ${exec_name})
 
 set(ANTARES_SOLVER_LIBS
+	Antares::args_helper
 	Antares::date
 	Antares::benchmarking
 	Antares::result_writer

src/solver/main.cpp

@@ -28,7 +28,7 @@
 
 #include <antares/logs/logs.h>
 #include "application.h"
-#include "../ui/common/winmain.hxx"  //TODO: remove that reverse dependency to UI
+#include <antares/args/args_to_utf8.h>
 
 #include <antares/fatal-error.h>
 #include <antares/memory/memory.h>

src/ui/simulator/cmake/application.cmake

@@ -54,8 +54,6 @@ SET(SRC_APPLICATION
 		application/study.h
 		application/study.cpp
 
-		# The main
-		../common/winmain.hxx
 		main.cpp
 )
 
@@ -72,7 +70,8 @@ target_link_libraries(antares-ui-application
 						PRIVATE
 							${wxWidgets_LIBRARIES}
 							antares-ui-common
-                            antares-core
+							antares-core
+							Antares::args_helper
 							Antares::sys
 							Antares::study
 )

src/ui/simulator/main.cpp

@@ -29,7 +29,7 @@
 #include "application/application.h"
 #include "application/main.h"
 #include <yuni/core/getopt.h>
-#include "../common/winmain.hxx"
+#include <antares/args/args_to_utf8.h>
 #include <antares/resources/resources.h>
 #include <antares/sys/policy.h>
 #include <antares/logs/logs.h>