From e4ebcf4d318e0bc3c67cb6a8d53cc009ca8e3d06 Mon Sep 17 00:00:00 2001 From: "Xiaobin.Lu%eng.Sun.com" Date: Sat, 9 Jun 2001 01:03:53 +0000 Subject: [PATCH] Fix for bug 78840, got r=edburns & beard, sr=brendan, a=asa Fix the crash when invoke liveconnect call using File->Open File --- modules/plugin/base/src/nsPluginHostImpl.cpp | 47 +++++++++++++++++++- modules/plugin/nglsrc/nsPluginHostImpl.cpp | 47 +++++++++++++++++++- 2 files changed, 90 insertions(+), 4 deletions(-) diff --git a/modules/plugin/base/src/nsPluginHostImpl.cpp b/modules/plugin/base/src/nsPluginHostImpl.cpp index 37dfdc43817..5a997883583 100644 --- a/modules/plugin/base/src/nsPluginHostImpl.cpp +++ b/modules/plugin/base/src/nsPluginHostImpl.cpp @@ -102,6 +102,12 @@ #include "nsILocalFile.h" #include "nsIFileChannel.h" +#ifdef XP_WIN +#include "nsIDirectoryService.h" +#include "nsDirectoryServiceDefs.h" +#include "nsIFile.h" +#endif + #ifdef XP_UNIX #if defined(MOZ_WIDGET_GTK) #include // for GDK_DISPLAY() @@ -226,7 +232,6 @@ void DisplayNoDefaultPluginDialog(const char *mimeType) nsCOMPtr bundle; nsCOMPtr regionalBundle; nsCOMPtr uri; - char *spec = nsnull; PRBool displayDialogPrefValue = PR_FALSE, checkboxState = PR_FALSE; if (!prefs || !prompt || !io || !strings) { @@ -2790,7 +2795,6 @@ NS_IMETHODIMP nsPluginHostImpl::InstantiateFullPagePlugin(const char *aMimeType, { nsresult rv; nsIURI *url; - PRBool isJavaEnabled = PR_TRUE; #ifdef NS_DEBUG printf("InstantiateFullPagePlugin for %s\n",aMimeType); @@ -3022,13 +3026,52 @@ NS_IMETHODIMP nsPluginHostImpl::SetUpPluginInstance(const char *aMimeType, nsIPluginInstance::GetIID(), (void**)&instance); +#ifdef XP_WIN + PRBool isJavaPlugin = PR_FALSE; + if (aMimeType && + (PL_strcasecmp(aMimeType, "application/x-java-vm") == 0 || + PL_strcasecmp(aMimeType, "application/x-java-applet") == 0)) + { + isJavaPlugin = PR_TRUE; + } +#endif // couldn't create an XPCOM plugin, try to create wrapper for a legacy plugin if (NS_FAILED(result)) { if(plugin) + { +#ifdef XP_WIN + static BOOL firstJavaPlugin = FALSE; + BOOL restoreOrigDir = FALSE; + char origDir[_MAX_PATH]; + if (isJavaPlugin && !firstJavaPlugin) + { + DWORD dw = ::GetCurrentDirectory(_MAX_PATH, origDir); + NS_ASSERTION(dw <= _MAX_PATH, "Falied to obtain the current directory, which may leads to incorrect class laoding"); + nsCOMPtr binDirectory; + result = NS_GetSpecialDirectory(NS_XPCOM_CURRENT_PROCESS_DIR, + getter_AddRefs(binDirectory)); + + if (NS_SUCCEEDED(result)) + { + nsXPIDLCString path; + binDirectory->GetPath(getter_Copies(path)); + restoreOrigDir = ::SetCurrentDirectory(path); + } + } +#endif result = plugin->CreateInstance(NULL, kIPluginInstanceIID, (void **)&instance); +#ifdef XP_WIN + if (!firstJavaPlugin && restoreOrigDir) + { + BOOL bCheck = :: SetCurrentDirectory(origDir); + NS_ASSERTION(bCheck, " Error restoring driectoy"); + firstJavaPlugin = TRUE; + } +#endif + } if (NS_FAILED(result)) { NS_WITH_SERVICE(nsIPlugin, bwPlugin, "@mozilla.org/blackwood/pluglet-engine;1",&result); diff --git a/modules/plugin/nglsrc/nsPluginHostImpl.cpp b/modules/plugin/nglsrc/nsPluginHostImpl.cpp index 37dfdc43817..5a997883583 100644 --- a/modules/plugin/nglsrc/nsPluginHostImpl.cpp +++ b/modules/plugin/nglsrc/nsPluginHostImpl.cpp @@ -102,6 +102,12 @@ #include "nsILocalFile.h" #include "nsIFileChannel.h" +#ifdef XP_WIN +#include "nsIDirectoryService.h" +#include "nsDirectoryServiceDefs.h" +#include "nsIFile.h" +#endif + #ifdef XP_UNIX #if defined(MOZ_WIDGET_GTK) #include // for GDK_DISPLAY() @@ -226,7 +232,6 @@ void DisplayNoDefaultPluginDialog(const char *mimeType) nsCOMPtr bundle; nsCOMPtr regionalBundle; nsCOMPtr uri; - char *spec = nsnull; PRBool displayDialogPrefValue = PR_FALSE, checkboxState = PR_FALSE; if (!prefs || !prompt || !io || !strings) { @@ -2790,7 +2795,6 @@ NS_IMETHODIMP nsPluginHostImpl::InstantiateFullPagePlugin(const char *aMimeType, { nsresult rv; nsIURI *url; - PRBool isJavaEnabled = PR_TRUE; #ifdef NS_DEBUG printf("InstantiateFullPagePlugin for %s\n",aMimeType); @@ -3022,13 +3026,52 @@ NS_IMETHODIMP nsPluginHostImpl::SetUpPluginInstance(const char *aMimeType, nsIPluginInstance::GetIID(), (void**)&instance); +#ifdef XP_WIN + PRBool isJavaPlugin = PR_FALSE; + if (aMimeType && + (PL_strcasecmp(aMimeType, "application/x-java-vm") == 0 || + PL_strcasecmp(aMimeType, "application/x-java-applet") == 0)) + { + isJavaPlugin = PR_TRUE; + } +#endif // couldn't create an XPCOM plugin, try to create wrapper for a legacy plugin if (NS_FAILED(result)) { if(plugin) + { +#ifdef XP_WIN + static BOOL firstJavaPlugin = FALSE; + BOOL restoreOrigDir = FALSE; + char origDir[_MAX_PATH]; + if (isJavaPlugin && !firstJavaPlugin) + { + DWORD dw = ::GetCurrentDirectory(_MAX_PATH, origDir); + NS_ASSERTION(dw <= _MAX_PATH, "Falied to obtain the current directory, which may leads to incorrect class laoding"); + nsCOMPtr binDirectory; + result = NS_GetSpecialDirectory(NS_XPCOM_CURRENT_PROCESS_DIR, + getter_AddRefs(binDirectory)); + + if (NS_SUCCEEDED(result)) + { + nsXPIDLCString path; + binDirectory->GetPath(getter_Copies(path)); + restoreOrigDir = ::SetCurrentDirectory(path); + } + } +#endif result = plugin->CreateInstance(NULL, kIPluginInstanceIID, (void **)&instance); +#ifdef XP_WIN + if (!firstJavaPlugin && restoreOrigDir) + { + BOOL bCheck = :: SetCurrentDirectory(origDir); + NS_ASSERTION(bCheck, " Error restoring driectoy"); + firstJavaPlugin = TRUE; + } +#endif + } if (NS_FAILED(result)) { NS_WITH_SERVICE(nsIPlugin, bwPlugin, "@mozilla.org/blackwood/pluglet-engine;1",&result);