#3473 TDx

[crea.git] / src / creaSystem.cxx

diff --git a/src/creaSystem.cxx b/src/creaSystem.cxx
index 26a071e8fa1179a765dadaf9374f244071bf9a5b..7966999a85a09bd20a10321cda879a546be4cd73 100644 (file)
--- a/src/creaSystem.cxx
+++ b/src/creaSystem.cxx
@@ -30,11 +30,6 @@
 #include <stdlib.h>
 #include <iostream>
 
-#ifdef WIN32
-       #include <windows.h> /* GetModuleFileName */
-       #include <io.h>
-       
-#endif /* WIN32 */
 
 #ifdef LINUX
        #include <sys/types.h>
@@ -78,6 +73,34 @@ namespace crea
    }
 #endif
 
+
+  
+#ifdef _WIN32
+  
+//=====================================================================================
+/*  http://forums.codeguru.com/showthread.php?336106-WCHAR*-to-CHAR*
+|| ::DESCRIPTION::
+|| This function will convert a WCHAR string to a CHAR string.
+||
+|| Param 1 :: Pointer to a buffer that will contain the converted string. Ensure this
+||            buffer is large enough; if not, buffer overrun errors will occur.
+|| Param 2 :: Constant pointer to a source WCHAR string to be converted to CHAR
+*/
+void System::wtoc(const WCHAR* Source,CHAR* Dest)
+{
+    int i = 0;
+    while(Source[i] != '\0')
+    {
+        Dest[i] = (CHAR)Source[i];
+        ++i;
+    } // while
+}
+
+
+#endif
+
+
+
 int System::GetAppPath(char *pname, size_t pathsize)
    {
 #ifdef LINUX   
@@ -97,7 +120,13 @@ int System::GetAppPath(char *pname, size_t pathsize)
 #endif /* LINUX */
     
 #ifdef WIN32
-    long result = GetModuleFileName(NULL, pname, pathsize);
+
+//2018-07-06 mingw64
+    wchar_t pname2[512];
+    long result = GetModuleFileName(NULL, pname2, pathsize);
+       crea::System::wtoc(pname2,pname);
+//    long result = GetModuleFileName(NULL, pname, pathsize);
+
     if (result > 0)
        {
                /* fix up the dir slashes... */
@@ -204,9 +233,18 @@ std::string System::GetDllAppPath(std::string &nomdll){
        std::string path = ".";
 #ifdef WIN32
        char currentPath[_MAX_PATH];
-       HMODULE hand = GetModuleHandle(nomdll.c_str());
-       GetModuleFileName(hand, currentPath, _MAX_PATH);
+       
+//2018-07-06 mingw64
+    wchar_t nomdll2[512];
+       mbstowcs(nomdll2,nomdll.c_str(),strlen(nomdll.c_str())+1);
+       HMODULE hand = GetModuleHandle(nomdll2);
+//     HMODULE hand = GetModuleHandle(nomdll.c_str());
 
+//2018-07-06 mingw64
+    wchar_t currentPath2[512];
+       GetModuleFileName(hand, currentPath2, _MAX_PATH);
+       crea::System::wtoc(currentPath2,currentPath);
+//     GetModuleFileName(hand, currentPath, _MAX_PATH);
        path = currentPath;
 
        path = path.substr(0,path.find_last_of("\\"));
@@ -219,17 +257,24 @@ std::string System::GetDllAppPath(const char *nomdll){
        std::string path = ".";
 #ifdef WIN32
        char currentPath[_MAX_PATH];
-       HMODULE hand = GetModuleHandle(nomdll);
-       GetModuleFileName(hand, currentPath, _MAX_PATH);
 
+//2018-07-06 mingw64
+    wchar_t nomdll2[512];
+       mbstowcs(nomdll2,nomdll,strlen(nomdll)+1);
+       HMODULE hand = GetModuleHandle(nomdll2);
+//     HMODULE hand = GetModuleHandle(nomdll);
+       
+//2018-07-06 mingw64
+    wchar_t currentPath2[512];
+       GetModuleFileName(hand, currentPath2, _MAX_PATH);
+       crea::System::wtoc(currentPath2,currentPath);
+//     GetModuleFileName(hand, currentPath, _MAX_PATH);
        path = currentPath;
-
        path = path.substr(0,path.find_last_of("\\"));
 #endif
        return path;
 }
 
-
 #if defined(_WIN32)
 #define CREACONTOUR_VALID_FILE_SEPARATOR_CHAR '\\'
 #else
@@ -237,10 +282,12 @@ std::string System::GetDllAppPath(const char *nomdll){
 #endif 
        
        //=========================================================================
-std::string System::GetExecutablePath(){
+std::string System::GetExecutablePath()
+{
                char name[PATH_MAX];
                //EED    int err = get_app_path(name, PATH_MAX);
                int err = System::GetAppPath(name,PATH_MAX);
+printf("EED creaSystem::GetExecutablePath %s \n",name);
                if (err) 
                {
                        printf("Could not determine current executable path ?  ");  
@@ -257,10 +304,16 @@ std::string System::GetExecutablePath(){
        
        void System::createDirectory(const char* directorypath){
                #ifdef WIN32
-                       if (CreateDirectory(directorypath, NULL) == ERROR_ALREADY_EXISTS) 
+               
+//2018-07-06 mingw64
+    wchar_t directorypath2[512];
+       mbstowcs(directorypath2,directorypath,strlen(directorypath)+1);
+                       if (CreateDirectory(directorypath2, NULL) == ERROR_ALREADY_EXISTS) 
+//                     if (CreateDirectory(directorypath, NULL) == ERROR_ALREADY_EXISTS) 
                        { 
                                std::cout<<"directory already exists "<<directorypath<<std::endl;
-                       }else if(CreateDirectory(directorypath, NULL) == ERROR_PATH_NOT_FOUND){
+                       }else if(CreateDirectory(directorypath2, NULL) == ERROR_PATH_NOT_FOUND){
+//                     }else if(CreateDirectory(directorypath, NULL) == ERROR_PATH_NOT_FOUND){
                                std::string error = "Directory could not be created ";
                                error.append(directorypath);
                                throw error.c_str();