diff options
author | Moonchild <moonchild@palemoon.org> | 2022-05-09 22:38:16 +0000 |
---|---|---|
committer | Moonchild <moonchild@palemoon.org> | 2022-05-09 22:38:16 +0000 |
commit | 9edf1b7bea5ff893f88911fc1a6a2dca3faeece9 (patch) | |
tree | 98bd9b0c7e3ca3e517e9e43dea157707b13f6bdb /dom/plugins/base/nsPluginHost.cpp | |
parent | 930ddd693be251c86ee904dafbaef38234b692c0 (diff) | |
download | uxp-getnativepath-work.tar.gz |
Issue #1896 - Port GetNativePath changes from GRE.getnativepath-work
Diffstat (limited to 'dom/plugins/base/nsPluginHost.cpp')
-rw-r--r-- | dom/plugins/base/nsPluginHost.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp index c9c1b71fe0..cb9990bdd5 100644 --- a/dom/plugins/base/nsPluginHost.cpp +++ b/dom/plugins/base/nsPluginHost.cpp @@ -2037,10 +2037,14 @@ nsresult nsPluginHost::ScanPluginsDirectory(nsIFile *pluginsDir, #ifdef PLUGIN_LOGGING nsAutoCString dirPath; +#ifdef XP_WIN + pluginsDir->GetPersistentDescriptor(dirPath); +#else pluginsDir->GetNativePath(dirPath); +#endif PLUGIN_LOG(PLUGIN_LOG_BASIC, ("nsPluginHost::ScanPluginsDirectory dir=%s\n", dirPath.get())); -#endif +#endif // PLUGIN_LOGGING nsCOMPtr<nsISimpleEnumerator> iter; rv = pluginsDir->GetDirectoryEntries(getter_AddRefs(iter)); @@ -3615,7 +3619,11 @@ nsPluginHost::CreateTempFileToPost(const char *aPostDataURL, nsIFile **aTmpFile) } rv = inFile->GetFileSize(&fileSize); if (NS_FAILED(rv)) return rv; +#ifdef XP_WIN + rv = inFile->GetPersistentDescriptor(filename); +#else rv = inFile->GetNativePath(filename); +#endif if (NS_FAILED(rv)) return rv; if (fileSize != 0) { |