From 4b4aece4d79aa2b7f8fef033184379ba2bcb4deb Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Sun, 12 Dec 2021 11:34:09 +0100 Subject: [PATCH] #3479 Bug compilation windows dlfcn.h include --- kernel/src/bbtkConfigurationFile.cxx | 23 ++++++++++++----------- kernel/src/bbtkUtilities.cxx | 9 +++++---- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/kernel/src/bbtkConfigurationFile.cxx b/kernel/src/bbtkConfigurationFile.cxx index e91dcfd..753e912 100644 --- a/kernel/src/bbtkConfigurationFile.cxx +++ b/kernel/src/bbtkConfigurationFile.cxx @@ -378,12 +378,12 @@ namespace bbtk } sprintf(copyFile,"copy %s\\bbtk_config.xml.tmp \"%s\"\\bbtk_config.xml ",bbtk_path,rootDirectory ); - - WCHAR rootDirectory2[200]; - MultiByteToWideChar( 0,0, rootDirectory, 200, rootDirectory2, 6); - LPCWSTR rootDirectory3 = rootDirectory2; - int attribs = GetFileAttributes (rootDirectory3); -// int attribs = GetFileAttributes (rootDirectory3); +// EED 2021-12-12 +// WCHAR rootDirectory2[200]; +// MultiByteToWideChar( 0,0, rootDirectory, 200, rootDirectory2, 6); +// LPCWSTR rootDirectory3 = rootDirectory2; +// int attribs = GetFileAttributes (rootDirectory3); + int attribs = GetFileAttributes (rootDirectory); bbtkMessage("config",1,std::hex << attribs << " " << FILE_ATTRIBUTE_DIRECTORY << std::endl); @@ -391,11 +391,12 @@ namespace bbtk { if ((attribs & FILE_ATTRIBUTE_DIRECTORY) == FILE_ATTRIBUTE_DIRECTORY ) /// \TODO : check ! { - WCHAR configPath2[200]; - MultiByteToWideChar( 0,0, configPath, 200, configPath2, 6); - LPCWSTR configPath3 = configPath2; - if ( GetFileAttributes( configPath3 ) == 0xFFFFFFFF) - //if ( GetFileAttributes( configPath ) == 0xFFFFFFFF) +// EED 2021-12-12 +// WCHAR configPath2[200]; +// MultiByteToWideChar( 0,0, configPath, 200, configPath2, 6); +// LPCWSTR configPath3 = configPath2; +// if ( GetFileAttributes( configPath3 ) == 0xFFFFFFFF) + if ( GetFileAttributes( configPath ) == 0xFFFFFFFF) { system(copyFile); } diff --git a/kernel/src/bbtkUtilities.cxx b/kernel/src/bbtkUtilities.cxx index c7cce81..85323d4 100644 --- a/kernel/src/bbtkUtilities.cxx +++ b/kernel/src/bbtkUtilities.cxx @@ -671,10 +671,11 @@ void wtoc(const WCHAR* Source,CHAR* Dest) #ifdef WIN32 //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); +//2021-12-12 +// 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... */ -- 2.47.1