зеркало из https://github.com/mozilla/gecko-dev.git
Bug #81352 --> hook up the bin hex stream decoder for Windows and Unix.
r=ducarroz sr=sspitzer
This commit is contained in:
Родитель
d15d3fb519
Коммит
e1c1c8e3c0
|
@ -258,6 +258,9 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsAboutCacheEntry)
|
||||||
#include "nsUnknownDecoder.h"
|
#include "nsUnknownDecoder.h"
|
||||||
#include "nsTXTToHTMLConv.h"
|
#include "nsTXTToHTMLConv.h"
|
||||||
#include "nsIndexedToHTML.h"
|
#include "nsIndexedToHTML.h"
|
||||||
|
#ifndef XP_MAC
|
||||||
|
#include "nsBinHexDecoder.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
nsresult NS_NewFTPDirListingConv(nsFTPDirListingConv** result);
|
nsresult NS_NewFTPDirListingConv(nsFTPDirListingConv** result);
|
||||||
nsresult NS_NewGopherDirListingConv(nsGopherDirListingConv** result);
|
nsresult NS_NewGopherDirListingConv(nsGopherDirListingConv** result);
|
||||||
|
@ -285,7 +288,15 @@ nsresult NS_NewStreamConv(nsStreamConverterService **aStreamConv);
|
||||||
#define DEFLATE_TO_UNCOMPRESSED "?from=deflate&to=uncompressed"
|
#define DEFLATE_TO_UNCOMPRESSED "?from=deflate&to=uncompressed"
|
||||||
#define PLAIN_TO_HTML "?from=text/plain&to=text/html"
|
#define PLAIN_TO_HTML "?from=text/plain&to=text/html"
|
||||||
|
|
||||||
|
#ifndef XP_MAC
|
||||||
|
#define BINHEX_TO_WILD "?from=application/mac-binhex40&to=*/*"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef XP_MAC
|
||||||
|
static PRUint32 g_StreamConverterCount = 16;
|
||||||
|
#else
|
||||||
static PRUint32 g_StreamConverterCount = 15;
|
static PRUint32 g_StreamConverterCount = 15;
|
||||||
|
#endif
|
||||||
|
|
||||||
static char *g_StreamConverterArray[] = {
|
static char *g_StreamConverterArray[] = {
|
||||||
FTP_UNIX_TO_INDEX,
|
FTP_UNIX_TO_INDEX,
|
||||||
|
@ -303,6 +314,9 @@ static char *g_StreamConverterArray[] = {
|
||||||
COMPRESS_TO_UNCOMPRESSED,
|
COMPRESS_TO_UNCOMPRESSED,
|
||||||
XCOMPRESS_TO_UNCOMPRESSED,
|
XCOMPRESS_TO_UNCOMPRESSED,
|
||||||
DEFLATE_TO_UNCOMPRESSED,
|
DEFLATE_TO_UNCOMPRESSED,
|
||||||
|
#ifndef XP_MAC
|
||||||
|
BINHEX_TO_WILD,
|
||||||
|
#endif
|
||||||
PLAIN_TO_HTML
|
PLAIN_TO_HTML
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -355,6 +369,9 @@ UnregisterStreamConverters(nsIComponentManager *aCompMgr, nsIFile *aPath,
|
||||||
}
|
}
|
||||||
return rv;
|
return rv;
|
||||||
}
|
}
|
||||||
|
#ifndef XP_MAC
|
||||||
|
NS_GENERIC_FACTORY_CONSTRUCTOR(nsBinHexDecoder);
|
||||||
|
#endif
|
||||||
|
|
||||||
static NS_IMETHODIMP
|
static NS_IMETHODIMP
|
||||||
CreateNewStreamConvServiceFactory(nsISupports* aOuter, REFNSIID aIID, void **aResult)
|
CreateNewStreamConvServiceFactory(nsISupports* aOuter, REFNSIID aIID, void **aResult)
|
||||||
|
@ -835,7 +852,13 @@ static nsModuleComponentInfo gNetModuleInfo[] = {
|
||||||
NS_NSTXTTOHTMLCONVERTER_CID,
|
NS_NSTXTTOHTMLCONVERTER_CID,
|
||||||
NS_ISTREAMCONVERTER_KEY PLAIN_TO_HTML,
|
NS_ISTREAMCONVERTER_KEY PLAIN_TO_HTML,
|
||||||
CreateNewNSTXTToHTMLConvFactory
|
CreateNewNSTXTToHTMLConvFactory
|
||||||
},
|
},
|
||||||
|
#ifndef XP_MAC
|
||||||
|
{ "nsBinHexConverter", NS_BINHEXDECODER_CID,
|
||||||
|
NS_ISTREAMCONVERTER_KEY BINHEX_TO_WILD,
|
||||||
|
nsBinHexDecoderConstructor
|
||||||
|
},
|
||||||
|
#endif
|
||||||
// This is not a real stream converter, it's just
|
// This is not a real stream converter, it's just
|
||||||
// registering it's cid factory here.
|
// registering it's cid factory here.
|
||||||
{ "HACK-TXTToHTMLConverter",
|
{ "HACK-TXTToHTMLConverter",
|
||||||
|
|
Загрузка…
Ссылка в новой задаче