Fixed issue #124: Property 'application.path' resolves to sa.core.dll instead of sa.shellextension.dll.

Author: end2endzone

CHANGES

@@ -18,6 +18,7 @@ Changes for 0.8.0
 * Fixed issue #118: Registry corruption while registering the extension.
 * Fixed issue #119: Disable logs when the shell extension is loaded by registry editor (regedit.exe).
 * Fixed issue #121: ShellAnything Errors out when opening a context on Google Docs/Sheets/etc.
+* Fixed issue #124: Property 'application.path' resolves to sa.core.dll instead of sa.shellextension.dll.
 
 
 Changes for 0.7.0

src/core/PropertyManager.cpp

@@ -38,6 +38,8 @@ namespace shellanything
   const std::string PropertyManager::SYSTEM_FALSE_PROPERTY_NAME = "system.false";
   const std::string PropertyManager::SYSTEM_FALSE_DEFAULT_VALUE = "false";
 
+  std::string PropertyManager::application_path;
+
   PropertyManager::PropertyManager()
   {
     RegisterEnvironmentVariables();
@@ -200,6 +202,16 @@ namespace shellanything
     return output;
   }
 
+  const std::string& PropertyManager::GetApplicationPath()
+  {
+    return application_path;
+  }
+
+  void PropertyManager::SetApplicationPath(const std::string& value)
+  {
+    application_path = value;
+  }
+
   void PropertyManager::SplitAndExpand(const std::string& input_value, const char* separator, StringList& output_list)
   {
     PropertyManager& pmgr = PropertyManager::GetInstance();
@@ -261,11 +273,19 @@ namespace shellanything
   void PropertyManager::RegisterDefaultProperties()
   {
     //define global properties
-    std::string prop_application_path = GetCurrentModulePathUtf8();
-    std::string prop_application_directory = ra::filesystem::GetParentPath(prop_application_path);
+    std::string prop_core_module_path = GetCurrentModulePathUtf8();
+    std::string prop_application_directory = ra::filesystem::GetParentPath(prop_core_module_path);
     std::string prop_path_separator = ra::filesystem::GetPathSeparatorStr();
     std::string prop_line_separator = ra::environment::GetLineSeparator();
 
+    // Issue #124. Define property 'application.path'.
+    // We can not call usual function to detect the path of the application.
+    // For example,
+    //   GetCurrentModulePathUtf8() returns the path of sa.core.dll. Not sa.tests.exe or sa.shellextension.dll.
+    //   GetCurrentProcessPath() would return the path of explorer.exe when the shell extension is loaded.
+    //
+    std::string prop_application_path = PropertyManager::GetApplicationPath();
+    
     SetProperty("application.path", prop_application_path);
     SetProperty("application.directory", prop_application_directory);
     SetProperty("path.separator", prop_path_separator);

src/core/PropertyManager.h

@@ -144,6 +144,18 @@ namespace shellanything
     /// <returns>Returns a copy of the given value with the property references expanded.</returns>
     std::string ExpandOnce(const std::string& value) const;
 
+    /// <summary>
+    /// Gets the path of the current application or module running ShellAnything. Must be set manually by the application.
+    /// </summary>
+    /// <returns>Returns the value of the path. Returns an empty string if never set.</returns>
+    static const std::string& GetApplicationPath();
+
+    /// <summary>
+    /// Sets the path of the current application or module running ShellAnything. Must be set manually by the application.
+    /// </summary>
+    /// <param name="value">The value of the path.</param>
+    static void SetApplicationPath(const std::string& value);
+
     /// <summary>
     /// Split a given string that contains multiple joined values and then expand each values individually.
     /// </summary>
@@ -165,6 +177,7 @@ namespace shellanything
     void RegisterEnvironmentVariables();
     void RegisterDefaultProperties();
     PropertyStore properties;
+    static std::string application_path;
   };
 
 } //namespace shellanything

src/shellextension/dllmain.cpp

@@ -355,6 +355,10 @@ extern "C" int APIENTRY DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpRe
     {
       // Initialize Google's logging library.
       shellanything::InitLogger();
+
+      //Issue #124. Define property 'application.path'.
+      std::string dll_path = GetCurrentModulePathUtf8();
+      shellanything::PropertyManager::SetApplicationPath(dll_path);
     }
 
     LogEnvironment();

src/tests/main.cpp

@@ -120,14 +120,13 @@ int main(int argc, char** argv)
   std::string log_dir = fLS::FLAGS_log_dir;
   printf("Using log directory: '%s'.\n", log_dir.c_str());
 
-  //define global properties
-  std::string prop_application_path = GetCurrentModulePathUtf8();
-  std::string prop_application_directory = ra::filesystem::GetParentPath(prop_application_path);
-  std::string prop_log_directory = ra::unicode::AnsiToUtf8(shellanything::GetLogDirectory());
+  //Issue #124. Define property 'application.path'.
+  std::string exec_path = ra::process::GetCurrentProcessPathUtf8();
+  shellanything::PropertyManager::SetApplicationPath(exec_path);
 
+  //define global properties
   shellanything::PropertyManager& pmgr = shellanything::PropertyManager::GetInstance();
-  pmgr.SetProperty("application.path", prop_application_path);
-  pmgr.SetProperty("application.directory", prop_application_directory);
+  std::string prop_log_directory = ra::unicode::AnsiToUtf8(shellanything::GetLogDirectory());
   pmgr.SetProperty("log.directory", prop_log_directory);
 
   int exit_code = SetTestPreferedRootDirectory();