- Fixed failing unit test: TestWorkspace.testImportDirectoryUtf8.

- Enabled printing services status on CI servers. This will allow debugging failing unit test: TestPlugins.testServices.
- Fixed a bug in sa_plugin_services.cpp to get correct error messages in logs.

Author: end2endzone

appveyor.yml

@@ -60,7 +60,7 @@ matrix:
   fast_finish: true
 
 before_build:
-#- cmd: call %APPVEYOR_BUILD_FOLDER%\ci\appveyor\list_services_status.bat
+- cmd: call %APPVEYOR_BUILD_FOLDER%\ci\appveyor\list_services_status.bat
 - cmd: call %APPVEYOR_BUILD_FOLDER%\ci\appveyor\install_doxygen.bat
 - cmd: call %APPVEYOR_BUILD_FOLDER%\ci\appveyor\install_googletest.bat
 - cmd: call %APPVEYOR_BUILD_FOLDER%\ci\appveyor\install_tinyxml2.bat

src/plugins/sa_plugin_services/sa_plugin_services.cpp

@@ -55,7 +55,7 @@ void get_service_last_error(DWORD * error_code, char ** buffer, size_t * buffer_
                                NULL, (*error_code), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPSTR)&messageBuffer, 0, NULL);
 
   //Copy the error message into the output buffer.
-  char* message_copy = _strdup(messageBuffer);
+  *buffer = _strdup(messageBuffer);
   *buffer_size = size;
 
   //Free the Win32's string's buffer.
@@ -87,7 +87,7 @@ const char* get_service_status(const char* name)
     get_service_last_error(&win32_error_code, &error_desc, &error_desc_size);
 
     // Print a nice logging message
-    sa_logging_print_format(SA_LOG_LEVEL_WARNING, PLUGIN_NAME_IDENTIFIER, "Failed openning service '%s'. Error: %u, %s.", name, win32_error_code, error_desc);
+    sa_logging_print_format(SA_LOG_LEVEL_WARNING, PLUGIN_NAME_IDENTIFIER, "Failed openning service '%s'. Error: 0x%x, %s.", name, win32_error_code, error_desc);
 
     // Cleanup
     free(error_desc);
@@ -107,7 +107,7 @@ const char* get_service_status(const char* name)
     get_service_last_error(&win32_error_code, &error_desc, &error_desc_size);
 
     // Print a nice logging message
-    sa_logging_print_format(SA_LOG_LEVEL_WARNING, PLUGIN_NAME_IDENTIFIER, "QueryServiceStatusEx has failed for service '%s'. Error: %u, %s.", name, win32_error_code, error_desc);
+    sa_logging_print_format(SA_LOG_LEVEL_WARNING, PLUGIN_NAME_IDENTIFIER, "QueryServiceStatusEx has failed for service '%s'. Error: 0x%x, %s.", name, win32_error_code, error_desc);
 
     // Cleanup
     free(error_desc);

src/tests/Workspace.cpp

@@ -121,6 +121,10 @@ namespace shellanything
     {
       const std::string& source_file = files[i];
 
+      // Check that values returned by FindFilesUtf8() are actually files and not directories.
+      if (ra::filesystem::DirectoryExistsUtf8(source_file.c_str()))
+        continue;
+
       //Remove the parent path of the source directory to make the file paths relative to the parent directory.
       std::string target_relative = source_file;
       target_relative.replace(0, parent_dir.size(), ""); //make the source relative