[Fix] Fix for Windows compilation

other-pro/ultracopier-core.pro

@@ -11,7 +11,7 @@ macx {
     LIBS += /usr/local/Cellar/opus/1.3.1/lib/libopus.a
     INCLUDEPATH += /usr/local/Cellar/opus/1.3.1/include/
 }
-#DEFINES += NOAUDIO
+DEFINES += NOAUDIO
 !contains(DEFINES, NOAUDIO) {
 QT += multimedia
 linux:LIBS += -lopus
@@ -165,5 +165,6 @@ INCLUDEPATH += \
 OTHER_FILES += $$PWD/../resources/resources-windows.rc
 
 win32: {
+DEFINES += WIDESTRING
 QT += winextras
 }

plugins/CopyEngine/Ultracopier-Spec/CopyEngine.pro

@@ -105,6 +105,7 @@ RESOURCES += \
 
 win32 {
     LIBS += -ladvapi32
+    DEFINES += WIDESTRING
 }
 HEADERS         += $$PWD/async/TransferThreadAsync.h
 SOURCES         += $$PWD/async/TransferThreadAsync.cpp

plugins/CopyEngine/Ultracopier-Spec/FileExistsDialog.cpp

@@ -79,7 +79,7 @@ FileExistsDialog::FileExistsDialog(QWidget *parent, INTERNALTYPEPATH source,
     #ifdef Q_OS_UNIX
     if(lstat(TransferThread::wstringTostring(destination).c_str(), &destination_statbuf)==0)
     #else
-    if(stat(TransferThread::wstringTostring(destination.c_str()), &destination_statbuf)==0)
+    if(stat(TransferThread::wstringTostring(destination).c_str(), &destination_statbuf)==0)
     #endif
     {
         #ifdef Q_OS_UNIX

plugins/CopyEngine/Ultracopier-Spec/ListThread.cpp

@@ -557,7 +557,7 @@ uint64_t ListThread::addToTransfer(const INTERNALTYPEPATH &source, const INTERNA
     {
         struct stat p_statbuf;
         #ifdef Q_OS_WIN32
-        if(stat(TransferThread::wstringTostring(source.)c_str(), &p_statbuf)==0 && S_ISREG(p_statbuf.st_mode)==1)
+        if(stat(TransferThread::wstringTostring(source).c_str(), &p_statbuf)==0 && S_ISREG(p_statbuf.st_mode)==1)
         #else
         if(lstat(TransferThread::wstringTostring(source).c_str(), &p_statbuf)==0 && S_ISREG(p_statbuf.st_mode)==1)
         #endif

plugins/CopyEngine/Ultracopier-Spec/MkPath.cpp

@@ -331,11 +331,11 @@ void MkPath::internalDoThisPath()
         PSECURITY_DESCRIPTOR PSecurityD;
         PACL dacl;
 
-        HANDLE hFile = CreateFileA(item.source.c_str(), GENERIC_READ ,
+        HANDLE hFile = CreateFileW(item.source.c_str(), GENERIC_READ ,
                 FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
         if (hFile == INVALID_HANDLE_VALUE)
             ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,
-                                     std::string("CreateFile() failed. Error: INVALID_HANDLE_VALUE ")+item.source.c_str()+", GetLastError(): "+std::to_string(GetLastError())
+                                     std::string("CreateFile() failed. Error: INVALID_HANDLE_VALUE ")+TransferThread::wstringTostring(item.source).c_str()+", GetLastError(): "+std::to_string(GetLastError())
                                      );
         else
         {
@@ -346,7 +346,7 @@ void MkPath::internalDoThisPath()
               ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"GetSecurityInfo() failed. Error"+std::to_string(lasterror));
             else
             {
-                hFile = CreateFileA(item.destination.c_str(),READ_CONTROL | WRITE_OWNER | WRITE_DAC | ACCESS_SYSTEM_SECURITY ,
+                hFile = CreateFileW(item.destination.c_str(),READ_CONTROL | WRITE_OWNER | WRITE_DAC | ACCESS_SYSTEM_SECURITY ,
                                    0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
                 if (hFile == INVALID_HANDLE_VALUE)
                   ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"CreateFile() failed. Error: INVALID_HANDLE_VALUE");
@@ -495,28 +495,43 @@ bool MkPath::rmpath(const INTERNALTYPEPATH &dir
         }
     }
     #else
-    WIN32_FIND_DATAA fdFile;
     HANDLE hFind = NULL;
+    #ifdef WIDESTRING
+    WIN32_FIND_DATAW fdFile;
+    wchar_t finalpath[MAX_PATH];
+    wcscpy(finalpath,dir.c_str());
+    wcscat(finalpath,L"\\*");
+    #else
+    WIN32_FIND_DATAA fdFile;
     char finalpath[MAX_PATH];
     strcpy(finalpath,dir.c_str());
     strcat(finalpath,"\\*");
+    #endif
 
     allHaveWork=true;
-    if((hFind = FindFirstFileA(finalpath, &fdFile)) == INVALID_HANDLE_VALUE)
+    if((hFind = FindFirstFileW(finalpath, &fdFile)) == INVALID_HANDLE_VALUE)
     {
-        ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"folder list error: "+dir+", errno: "+std::to_string(errno));
+        ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"folder list error: "+TransferThread::wstringTostring(dir)+", errno: "+std::to_string(errno));
         return false;
     }
 
     if(allHaveWork)
     do
     {
+        #ifdef WIDESTRING
+        if(wcscmp(fdFile.cFileName, L".")!=0 && wcscmp(fdFile.cFileName, L"..")!=0)
+        #else
         if(strcmp(fdFile.cFileName, ".")!=0 && strcmp(fdFile.cFileName, "..")!=0)
+        #endif
         {
             if(fdFile.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
             {
                 //return the fonction for scan the new folder
+                #ifdef WIDESTRING
+                if(!rmpath(dir+L'\\'+fdFile.cFileName+L'/'))
+                #else
                 if(!rmpath(dir+'\\'+fdFile.cFileName+'/'))
+                #endif
                     allHaveWork=false;
             }
             else
@@ -541,13 +556,13 @@ bool MkPath::rmpath(const INTERNALTYPEPATH &dir
                     allHaveWork=false;
                 }
                 #else
-                ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"found a file: "+std::string(fdFile.cFileName));
+                ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"found a file: "+TransferThread::wstringTostring(fdFile.cFileName));
                 allHaveWork=false;
                 #endif
             }
         }
     }
-    while(FindNextFileA(hFind, &fdFile));
+    while(FindNextFileW(hFind, &fdFile));
     FindClose(hFind);
     #endif
     if(!allHaveWork)
@@ -588,7 +603,7 @@ bool MkPath::readFileDateTime(const INTERNALTYPEPATH &source)
         #ifdef Q_OS_WIN32
             #ifdef ULTRACOPIER_PLUGIN_SET_TIME_UNIX_WAY
                 struct stat info;
-                if(stat(source.c_str(),&info)!=0)
+                if(stat(TransferThread::wstringTostring(source).c_str(),&info)!=0)
                     return false;
                 time_t ctime=info.st_ctime;
                 time_t actime=info.st_atime;
@@ -646,7 +661,7 @@ bool MkPath::writeFileDateTime(const INTERNALTYPEPATH &destination)
     #else
         #ifdef Q_OS_WIN32
             #ifdef ULTRACOPIER_PLUGIN_SET_TIME_UNIX_WAY
-                return utime(destination.c_str(),&butime)==0;
+                return utime(TransferThread::wstringTostring(destination).c_str(),&butime)==0;
             #else
                 wchar_t filePath[65535];
                 if(std::regex_match(destination,regRead))

plugins/CopyEngine/Ultracopier-Spec/TransferThread.cpp

@@ -702,7 +702,7 @@ int64_t TransferThread::readFileMDateTime(const INTERNALTYPEPATH &source)
         #ifdef Q_OS_WIN32
             #ifdef ULTRACOPIER_PLUGIN_SET_TIME_UNIX_WAY
                 struct stat info;
-                if(stat(source.c_str(),&info)!=0)
+                if(stat(TransferThread::wstringTostring(source).c_str(),&info)!=0)
                     return -1;
                 return info.st_mtime;
             #else
@@ -767,7 +767,7 @@ bool TransferThread::readSourceFileDateTime(const INTERNALTYPEPATH &source)
         #ifdef Q_OS_WIN32
             #ifdef ULTRACOPIER_PLUGIN_SET_TIME_UNIX_WAY
                 struct stat info;
-                if(stat(source.c_str(),&info)!=0)
+                if(stat(TransferThread::wstringTostring(source).c_str(),&info)!=0)
                     return false;
                 time_t ctime=info.st_ctime;
                 time_t actime=info.st_atime;
@@ -777,7 +777,7 @@ bool TransferThread::readSourceFileDateTime(const INTERNALTYPEPATH &source)
                 butime.modtime=modtime;
                 if((uint64_t)modtime<ULTRACOPIER_PLUGIN_MINIMALYEAR_TIMESTAMPS)
                 {
-                    ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] the sources is older to copy the time: "+source+": "+source);
+                    ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] the sources is older to copy the time: "+TransferThread::wstringTostring(source));
                     return false;
                 }
                 Q_UNUSED(ctime);
@@ -832,7 +832,7 @@ bool TransferThread::writeDestinationFileDateTime(const INTERNALTYPEPATH &destin
     #else
         #ifdef Q_OS_WIN32
             #ifdef ULTRACOPIER_PLUGIN_SET_TIME_UNIX_WAY
-                return utime(destination.c_str(),&butime)==0;
+                return utime(TransferThread::wstringTostring(destination).c_str(),&butime)==0;
             #else
                 wchar_t filePath[65535];
                 if(std::regex_match(destination,regRead))
@@ -876,7 +876,7 @@ bool TransferThread::readSourceFilePermissions(const INTERNALTYPEPATH &source)
     else
         return true;
     #else
-    HANDLE hFile = CreateFileA(source.c_str(), GENERIC_READ ,
+    HANDLE hFile = CreateFileW(source.c_str(), GENERIC_READ ,
             FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
     if (hFile == INVALID_HANDLE_VALUE) {
       ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] CreateFile() failed. Error: INVALID_HANDLE_VALUE: "+std::to_string(GetLastError()));
@@ -902,7 +902,7 @@ bool TransferThread::writeDestinationFilePermissions(const INTERNALTYPEPATH &des
         return false;
     return true;
     #else
-    HANDLE hFile = CreateFileA(destination.c_str(),READ_CONTROL | WRITE_OWNER | WRITE_DAC | ACCESS_SYSTEM_SECURITY,0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
+    HANDLE hFile = CreateFileW(destination.c_str(),READ_CONTROL | WRITE_OWNER | WRITE_DAC | ACCESS_SYSTEM_SECURITY,0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
     if (hFile == INVALID_HANDLE_VALUE) {
       ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] CreateFile() failed. Error: INVALID_HANDLE_VALUE: "+std::to_string(GetLastError()));
       return false;
@@ -1129,16 +1129,27 @@ bool TransferThread::entryInfoList(const INTERNALTYPEPATH &path,std::vector<dire
 #else
 bool TransferThread::entryInfoList(const INTERNALTYPEPATH &path,std::vector<dirent_uc> &list)
 {
-    WIN32_FIND_DATAA fdFile;
     HANDLE hFind = NULL;
+    #ifdef WIDESTRING
+    WIN32_FIND_DATAW fdFile;
+    wchar_t finalpath[MAX_PATH];
+    wcscpy(finalpath,path.c_str());
+    wcscat(finalpath,L"\\*");
+    #else
+    WIN32_FIND_DATAA fdFile;
     char finalpath[MAX_PATH];
     strcpy(finalpath,path.c_str());
     strcat(finalpath,"\\*");
-    if((hFind = FindFirstFileA(finalpath, &fdFile)) == INVALID_HANDLE_VALUE)
+    #endif
+    if((hFind = FindFirstFileW(finalpath, &fdFile)) == INVALID_HANDLE_VALUE)
         return false;
     do
     {
+        #ifdef WIDESTRING
+        if(wcscmp(fdFile.cFileName, L".")!=0 && wcscmp(fdFile.cFileName, L"..")!=0)
+        #else
         if(strcmp(fdFile.cFileName, ".")!=0 && strcmp(fdFile.cFileName, "..")!=0)
+        #endif
         {
             dirent_uc tempValue;
             tempValue.isFolder=fdFile.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY;
@@ -1147,7 +1158,7 @@ bool TransferThread::entryInfoList(const INTERNALTYPEPATH &path,std::vector<dire
             list.push_back(tempValue);
         }
     }
-    while(FindNextFileA(hFind, &fdFile));
+    while(FindNextFileW(hFind, &fdFile));
     FindClose(hFind);
     return true;
 }

plugins/CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp

@@ -292,7 +292,7 @@ void TransferThreadAsync::ifCanStartTransfer()
     transfer_stat=TransferStat_Transfer;
     emit pushStat(transfer_stat,transferId);
 #ifdef Q_OS_WIN32
-    if(CopyFileExA(source.c_str(),destination.c_str(),(LPPROGRESS_ROUTINE)progressRoutine,this,&stopItWin,
+    if(CopyFileExW(source.c_str(),destination.c_str(),(LPPROGRESS_ROUTINE)progressRoutine,this,&stopItWin,
                    COPY_FILE_ALLOW_DECRYPTED_DESTINATION | 0x00000800/*COPY_FILE_COPY_SYMLINK*/ | 0x00001000/*COPY_FILE_NO_BUFFERING*/
                    )==0)
 #else

ultracopier.pro

@@ -127,7 +127,14 @@ SOURCES += \
     $$PWD/plugins/Themes/Oxygen2/radialMap/labels.cpp \
     $$PWD/plugins/Themes/Oxygen2/radialMap/map.cpp \
     $$PWD/plugins/Themes/Oxygen2/radialMap/widgetEvents.cpp \
-    $$PWD/plugins/Themes/Oxygen2/radialMap/widget.cpp
+    $$PWD/plugins/Themes/Oxygen2/radialMap/widget.cpp \
+    plugins/CopyEngine/Ultracopier-Spec/ListThreadListChange.cpp \
+    plugins/CopyEngine/Ultracopier-Spec/ListThreadActions.cpp \
+    plugins/CopyEngine/Ultracopier-Spec/ListThreadMedia.cpp \
+    plugins/CopyEngine/Ultracopier-Spec/ListThreadNew.cpp \
+    plugins/CopyEngine/Ultracopier-Spec/ListThreadOptions.cpp \
+    plugins/CopyEngine/Ultracopier-Spec/ListThreadScan.cpp \
+    plugins/CopyEngine/Ultracopier-Spec/ListThreadStat.cpp
 
 win32 {
     RESOURCES -= $$PWD/resources/resources-windows-qt-plugin.qrc