mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-24 03:19:06 +00:00
Remove the "magic" hack because we now have the real thing
in XPCOM/repository
This commit is contained in:
ebina%netscape.com
parent
3aade9514b
commit
4e60464b22
@ -26,7 +26,6 @@ MODULE = netcnvts
|
||||
LIBRARY_NAME = netcnvts
|
||||
|
||||
CPPSRCS = \
|
||||
magic.cpp \
|
||||
cvplugin.cpp \
|
||||
nsNetConverterStream.cpp \
|
||||
$(NULL)
|
||||
@ -52,8 +51,6 @@ CSRCS += \
|
||||
endif
|
||||
|
||||
EXPORTS= \
|
||||
magic.h \
|
||||
magicCID.h \
|
||||
nsINetPlugin.h \
|
||||
nsINetPluginInstance.h \
|
||||
nsINetOStream.h \
|
||||
|
||||
@ -25,7 +25,6 @@
|
||||
#include "nsINetPluginInstance.h"
|
||||
#include "nsRepository.h"
|
||||
#include "nsNetConverterStream.h"
|
||||
#include "magic.h"
|
||||
|
||||
|
||||
static NS_DEFINE_CID(kINetPluginCID, NS_INET_PLUGIN_CID);
|
||||
@ -164,6 +163,7 @@ NET_PluginStream(int fmt, void* data_obj, URL_Struct* URL_s, MWContext* w)
|
||||
nsINetOStream *instance_stream;
|
||||
nsINetOStream *out_stream;
|
||||
nsNetConverterStream *converter_stream;
|
||||
nsCID classID = {0};
|
||||
|
||||
if (URL_s->transfer_encoding != NULL)
|
||||
{
|
||||
@ -186,18 +186,14 @@ NET_PluginStream(int fmt, void* data_obj, URL_Struct* URL_s, MWContext* w)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
const nsCID &magicCID = MAGIC_FindCID(mime_type);
|
||||
if (magicCID.Equals(kINetPluginCID))
|
||||
if (nsRepository::ProgIDToCLSID(mime_type, &classID) != NS_OK)
|
||||
{
|
||||
unregister_converter(mime_type, (void *)URL_s);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
nsRepository::CreateInstance(magicCID, (nsISupports *)nsnull, kINetPluginInstanceIID, (void **)&plugin_inst);
|
||||
nsRepository::CreateInstance(classID, (nsISupports *)nsnull, kINetPluginInstanceIID, (void **)&plugin_inst);
|
||||
|
||||
/*
|
||||
plugin_inst = (nsINetPluginInstance *)MAGIC_FindAndLoadDLL(kINetPluginInstanceIID, mime_type);
|
||||
*/
|
||||
if (plugin_inst == NULL)
|
||||
{
|
||||
unregister_converter(mime_type, (void *)URL_s);
|
||||
|
||||
@ -1,124 +0,0 @@
|
||||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
|
||||
*
|
||||
* The contents of this file are subject to the Netscape Public License
|
||||
* Version 1.0 (the "NPL"); you may not use this file except in
|
||||
* compliance with the NPL. You may obtain a copy of the NPL at
|
||||
* http://www.mozilla.org/NPL/
|
||||
*
|
||||
* Software distributed under the NPL is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
|
||||
* for the specific language governing rights and limitations under the
|
||||
* NPL.
|
||||
*
|
||||
* The Initial Developer of this code under the NPL is Netscape
|
||||
* Communications Corporation. Portions created by Netscape are
|
||||
* Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
* Reserved.
|
||||
*/
|
||||
|
||||
|
||||
#include "nspr.h"
|
||||
#include "nsRepository.h"
|
||||
#include "nsINetPlugin.h"
|
||||
#include "nsINetPluginInstance.h"
|
||||
#include "plstr.h"
|
||||
#include "nscore.h"
|
||||
#include "magicCID.h"
|
||||
|
||||
|
||||
static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
|
||||
static NS_DEFINE_IID(kINetPluginInstanceIID, NS_INETPLUGININSTANCE_IID);
|
||||
|
||||
|
||||
static NS_DEFINE_CID(kINetPluginCID, NS_INET_PLUGIN_CID);
|
||||
static NS_DEFINE_CID(kINetPluginEBMCID, NS_INET_PLUGIN_EBM_CID);
|
||||
static NS_DEFINE_CID(kINetPluginHTMLCID, NS_INET_PLUGIN_HTML_CID);
|
||||
static NS_DEFINE_CID(kINetPluginPLAINCID, NS_INET_PLUGIN_PLAIN_CID);
|
||||
static NS_DEFINE_CID(kINetPluginTARCID, NS_INET_PLUGIN_TAR_CID);
|
||||
|
||||
|
||||
extern "C" const nsCID &
|
||||
MAGIC_FindCID(const char *mime_type)
|
||||
{
|
||||
if (PL_strcmp(mime_type, "image/x-ebm") == 0)
|
||||
{
|
||||
return kINetPluginEBMCID;
|
||||
}
|
||||
else if (PL_strcmp(mime_type, "application/x-tar") == 0)
|
||||
{
|
||||
return kINetPluginTARCID;
|
||||
}
|
||||
else if (PL_strcmp(mime_type, "text/html") == 0)
|
||||
{
|
||||
return kINetPluginHTMLCID;
|
||||
}
|
||||
else if (PL_strcmp(mime_type, "text/plain") == 0)
|
||||
{
|
||||
return kINetPluginPLAINCID;
|
||||
}
|
||||
else
|
||||
{
|
||||
return kINetPluginCID;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
extern "C" void *
|
||||
MAGIC_FindAndLoadDLL(const nsIID& aIID, const char *index_str)
|
||||
{
|
||||
char *path;
|
||||
PRLibrary *the_dll;
|
||||
nsFactoryProc get_factory;
|
||||
nsIFactory *factory;
|
||||
nsINetPluginInstance *instance;
|
||||
|
||||
path = (char *)PR_Malloc(8192);
|
||||
if (path == NULL)
|
||||
{
|
||||
return nsnull;
|
||||
}
|
||||
if (PL_strcmp(index_str, "image/x-ebm") == 0)
|
||||
{
|
||||
PL_strcpy(path, "/home/ebina/plugins/");
|
||||
PL_strcat(path, "ebm.so");
|
||||
}
|
||||
else if (PL_strcmp(index_str, "application/x-tar") == 0)
|
||||
{
|
||||
PL_strcpy(path, "/home/ebina/plugins/");
|
||||
PL_strcat(path, "tar.so");
|
||||
}
|
||||
else if (PL_strcmp(index_str, "text/html") == 0)
|
||||
{
|
||||
PL_strcpy(path, "/home/ebina/plugins/");
|
||||
PL_strcat(path, "html.so");
|
||||
}
|
||||
else if (PL_strcmp(index_str, "text/plain") == 0)
|
||||
{
|
||||
PL_strcpy(path, "/home/ebina/plugins/");
|
||||
PL_strcat(path, "plain.so");
|
||||
}
|
||||
else
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
the_dll = PR_LoadLibrary(path);
|
||||
if (the_dll == NULL)
|
||||
{
|
||||
return nsnull;
|
||||
}
|
||||
|
||||
get_factory = (nsFactoryProc)PR_FindSymbol(the_dll, "NSGetFactory");
|
||||
if (nsnull == get_factory)
|
||||
{
|
||||
return nsnull;
|
||||
}
|
||||
|
||||
if (NS_OK == (get_factory)(kIFactoryIID, (nsISupports *)nsnull, &factory))
|
||||
{
|
||||
factory->CreateInstance(nsnull, kINetPluginInstanceIID, (void **)&instance);
|
||||
NS_RELEASE(factory);
|
||||
}
|
||||
return (void *)instance;
|
||||
}
|
||||
|
||||
@ -1,21 +0,0 @@
|
||||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
|
||||
*
|
||||
* The contents of this file are subject to the Netscape Public License
|
||||
* Version 1.0 (the "NPL"); you may not use this file except in
|
||||
* compliance with the NPL. You may obtain a copy of the NPL at
|
||||
* http://www.mozilla.org/NPL/
|
||||
*
|
||||
* Software distributed under the NPL is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
|
||||
* for the specific language governing rights and limitations under the
|
||||
* NPL.
|
||||
*
|
||||
* The Initial Developer of this code under the NPL is Netscape
|
||||
* Communications Corporation. Portions created by Netscape are
|
||||
* Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
* Reserved.
|
||||
*/
|
||||
|
||||
extern "C" void *MAGIC_FindAndLoadDLL(const nsIID& aIID, const char *index_str);
|
||||
extern "C" const nsCID &MAGIC_FindCID(const char *mime_type);
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
|
||||
#define NS_INET_PLUGIN_EBM_CID \
|
||||
{ /* dc26e0e0-0199-11d2-815b-016008119d7b */ \
|
||||
0xdc26e0e0, \
|
||||
0x0199, \
|
||||
0x11d2, \
|
||||
{0x81, 0x5b, 0x01, 0x60, 0x08, 0x11, 0x9d, 0x7b} \
|
||||
}
|
||||
|
||||
#define NS_INET_PLUGIN_HTML_CID \
|
||||
{ /* dc26e0e0-0199-11d2-815b-026008119d7b */ \
|
||||
0xdc26e0e0, \
|
||||
0x0199, \
|
||||
0x11d2, \
|
||||
{0x81, 0x5b, 0x02, 0x60, 0x08, 0x11, 0x9d, 0x7b} \
|
||||
}
|
||||
|
||||
#define NS_INET_PLUGIN_PLAIN_CID \
|
||||
{ /* dc26e0e0-0199-11d2-815b-036008119d7b */ \
|
||||
0xdc26e0e0, \
|
||||
0x0199, \
|
||||
0x11d2, \
|
||||
{0x81, 0x5b, 0x03, 0x60, 0x08, 0x11, 0x9d, 0x7b} \
|
||||
}
|
||||
|
||||
#define NS_INET_PLUGIN_TAR_CID \
|
||||
{ /* dc26e0e0-0199-11d2-815b-046008119d7b */ \
|
||||
0xdc26e0e0, \
|
||||
0x0199, \
|
||||
0x11d2, \
|
||||
{0x81, 0x5b, 0x04, 0x60, 0x08, 0x11, 0x9d, 0x7b} \
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user