Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for bug 129250. Re-enable the MRJ plugin live connect code which was broken by the AUTF8 string landing. r=beard, sr=darin, a=asa.

Browse Source
This commit is contained in:
bnesse%netscape.com 2002-03-11 19:56:59 +00:00
parent b739ebef10
commit 3190fc2970
3 changed files with 19 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
plugin/oji/MRJ/plugin/MRJPlugin.xml
View File

@ -115,16 +115,6 @@
<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
</SETTING>
<SETTING>
<SETTING><NAME>SearchPath</NAME>
<SETTING><NAME>Path</NAME><VALUE>:::::dist:dom:</VALUE></SETTING>
<SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
<SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
</SETTING>
<SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
</SETTING>
<SETTING>
<SETTING><NAME>SearchPath</NAME>
<SETTING><NAME>Path</NAME><VALUE>:::::dist:js:</VALUE></SETTING>
@ -165,26 +155,6 @@
<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
</SETTING>
<SETTING>
<SETTING><NAME>SearchPath</NAME>
<SETTING><NAME>Path</NAME><VALUE>:::::dist:string:</VALUE></SETTING>
<SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
<SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
</SETTING>
<SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
</SETTING>
<SETTING>
<SETTING><NAME>SearchPath</NAME>
<SETTING><NAME>Path</NAME><VALUE>:::::dist:netwerk:</VALUE></SETTING>
<SETTING><NAME>PathFormat</NAME><VALUE>MacOS</VALUE></SETTING>
<SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
</SETTING>
<SETTING><NAME>Recursive</NAME><VALUE>true</VALUE></SETTING>
<SETTING><NAME>FrameworkPath</NAME><VALUE>false</VALUE></SETTING>
<SETTING><NAME>HostFlags</NAME><VALUE>All</VALUE></SETTING>
</SETTING>
<SETTING>
<SETTING><NAME>SearchPath</NAME>
<SETTING><NAME>Path</NAME><VALUE>:MacOS Support:</VALUE></SETTING>

52
plugin/oji/MRJ/plugin/Source/LiveConnectNativeMethods.cpp
View File

@ -42,17 +42,12 @@
#include "LiveConnectNativeMethods.h"
#include "nsIComponentManager.h"
#include "nsIComponentManagerObsolete.h"
#include "nsIServiceManager.h"
#include "nsIPluginManager.h"
#include "nsIJVMManager.h"
#include "nsILiveconnect.h"
#include "nsIPluginInstancePeer2.h"
#include "nsIIOService.h"
#include "nsIURI.h"
#include "nsNetCID.h"
#include "nsString.h"
#include "nsDependentString.h"
#include "MRJPlugin.h"
#include "MRJContext.h"
@ -72,7 +67,7 @@ extern nsIServiceManager* theServiceManager; // needs to be in badaptor.cpp.
static MRJPlugin* theJVMPlugin = NULL;
static nsILiveconnect* theLiveConnectManager = NULL;
static nsIComponentManager* theComponentManager = NULL;
static nsIComponentManagerObsolete* theComponentManager = NULL;
static jclass netscape_javascript_JSObject = NULL;
static jmethodID netscape_javascript_JSObject_JSObject;
@ -87,9 +82,9 @@ static jmethodID netscape_oji_JNIUtils_GetObjectClassLoader = NULL;
static NS_DEFINE_IID(kLiveConnectCID, NS_CLIVECONNECT_CID);
static NS_DEFINE_IID(kComponentManagerCID, NS_COMPONENTMANAGER_CID);
static nsresult getGlobalComponentManager(nsIComponentManager* *result)
static nsresult getGlobalComponentManager(nsIComponentManagerObsolete* *result)
{
return theServiceManager->GetService(kComponentManagerCID, NS_GET_IID(nsIComponentManager),
return theServiceManager->GetService(kComponentManagerCID, NS_GET_IID(nsIComponentManagerObsolete),
(void**)result);
}
@ -157,7 +152,6 @@ nsresult InitLiveConnectSupport(MRJPlugin* jvmPlugin)
nsresult ShutdownLiveConnectSupport()
{
NS_IF_RELEASE(theLiveConnectManager);
NS_IF_RELEASE(theComponentManager);
if (theJVMPlugin != NULL) {
@ -206,28 +200,22 @@ static jobject GetCurrentThread(JNIEnv* env)
* Security Considerations.
*/
static nsresult
NS_NewURI(nsIURI* *result,
const char* spec,
nsIURI* baseURI = nsnull) // pass in nsIIOService to optimize callers
{
nsIIOService* ioService;
static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
nsresult rv = theServiceManager->GetService(kIOServiceCID, NS_GET_IID(nsIIOService), (void**)&ioService);
#ifdef NOT_BROKEN_BY_DARIN
if (rv == NS_OK)
rv = ioService->NewURI(nsDependentCString(spec), nsnull, baseURI, result);
#endif
NS_RELEASE(ioService);
return rv;
}
MRJSecurityContext::MRJSecurityContext(const char* location)
: mLocation(nsnull), mConnection(nsnull)
{
NS_INIT_REFCNT();
NS_NewURI(&mLocation, location, nsnull);
mLocation = ::strdup(location);
if (mLocation) {
// find the 3rd slash of the URL, hopefully it's in canonical form.
char* colon = ::strchr(mLocation, ':');
if (colon) {
if (colon[1] == '/' && colon[2] == '/') {
char* slash = ::strchr(colon + 3, '/');
if (slash) *slash = '\0';
}
}
}
if (theComponentManager) {
theComponentManager->CreateInstance(kLiveConnectCID, nsnull, NS_GET_IID(nsILiveconnect),
@ -240,7 +228,7 @@ MRJSecurityContext::MRJSecurityContext(const char* location)
MRJSecurityContext::~MRJSecurityContext()
{
NS_IF_RELEASE(mLocation);
delete[] mLocation;
NS_IF_RELEASE(mConnection);
}
@ -256,13 +244,10 @@ NS_METHOD MRJSecurityContext::Implies(const char* target, const char* action, PR
NS_METHOD
MRJSecurityContext::GetOrigin(char* buf, int len)
{
#ifdef NOT_BROKEN_BY_DARIN
nsCAutoString origin;
if (mLocation && NS_SUCCEEDED(mLocation->GetPrePath(origin))) {
::strncpy(buf, origin.get(), len);
if (mLocation) {
::strncpy(buf, mLocation, len);
return NS_OK;
}
#endif
return NS_ERROR_FAILURE;
}
@ -270,7 +255,6 @@ NS_METHOD
MRJSecurityContext::GetCertificateID(char* buf, int len)
{
// ACTION: Implement me.
return NS_ERROR_NOT_IMPLEMENTED;
}

3
plugin/oji/MRJ/plugin/Source/MRJSecurityContext.h
View File

@ -38,7 +38,6 @@
#include "nsISecurityContext.h"
class nsIURI;
class nsILiveconnect;
class MRJSecurityContext : public nsISecurityContext {
@ -55,6 +54,6 @@ public:
nsILiveconnect* getConnection() { return mConnection; }
private:
nsIURI* mLocation;
char* mLocation;
nsILiveconnect* mConnection;
};