зеркало из https://github.com/mozilla/gecko-dev.git
Ressurect post necko. Streams broken for now.
This commit is contained in:
ramiro%netscape.com
Родитель
af558bfe20
Коммит
feab886864
|
|
@ -94,7 +94,7 @@ static void stream_clicked(GtkWidget *button,
|
|||
size = sizeof(buf);
|
||||
i = 0;
|
||||
while (size>0) {
|
||||
c = gtk_mozilla_stream_write(moz, &buf[i], size );
|
||||
c = gtk_mozilla_stream_write(moz, &buf[i], 0, size );
|
||||
size -= c;
|
||||
i += c;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,7 +39,11 @@ GtkMozillaContainer::GtkMozillaContainer(GtkMozilla *moz)
|
|||
width = height = 0;
|
||||
mStream = nsnull;
|
||||
|
||||
mChannel = nsnull;
|
||||
mContext = nsnull;
|
||||
|
||||
mozilla = moz;
|
||||
|
||||
gtk_widget_set_app_paintable(GTK_WIDGET(moz), PR_TRUE);
|
||||
}
|
||||
|
||||
|
|
@ -118,7 +122,11 @@ GtkMozillaContainer::Stop()
|
|||
void
|
||||
GtkMozillaContainer::Reload(GtkMozillaReloadType type)
|
||||
{
|
||||
#ifdef NECKO
|
||||
mWebShell->Reload((nsLoadFlags)type);
|
||||
#else
|
||||
mWebShell->Reload((nsURLReloadType)type);
|
||||
#endif
|
||||
}
|
||||
|
||||
gint
|
||||
|
|
@ -270,7 +278,8 @@ GtkMozillaContainer::BeginLoadURL(nsIWebShell* aShell, const PRUnichar* aURL)
|
|||
|
||||
NS_IMETHODIMP
|
||||
GtkMozillaContainer::EndLoadURL(nsIWebShell* aShell,
|
||||
const PRUnichar* aURL, PRInt32 aStatus)
|
||||
const PRUnichar* aURL,
|
||||
nsresult aStatus)
|
||||
{
|
||||
char *url = simple_unicode_to_char(aURL);
|
||||
gtk_signal_emit_by_name(GTK_OBJECT(mozilla), "end_load_url",
|
||||
|
|
@ -282,9 +291,10 @@ GtkMozillaContainer::EndLoadURL(nsIWebShell* aShell,
|
|||
|
||||
|
||||
nsresult
|
||||
GtkMozillaContainer::CreateContentViewer(nsIURI* aURL,
|
||||
GtkMozillaContainer::CreateContentViewer(const char *aCommand,
|
||||
nsIChannel * aChannel,
|
||||
nsILoadGroup * aLoadGroup,
|
||||
const char* aContentType,
|
||||
const char *aCommand,
|
||||
nsIContentViewerContainer* aContainer,
|
||||
nsISupports* aExtraInfo,
|
||||
nsIStreamListener** aDocListenerResult,
|
||||
|
|
@ -311,9 +321,15 @@ GtkMozillaContainer::CreateContentViewer(nsIURI* aURL,
|
|||
}
|
||||
|
||||
// Now create an instance of the content viewer
|
||||
rv = factory->CreateInstance(aURL, aContentType, aCommand, aContainer,
|
||||
aExtraInfo, aDocListenerResult,
|
||||
rv = factory->CreateInstance(aCommand,
|
||||
aChannel,
|
||||
aLoadGroup,
|
||||
aContentType,
|
||||
aContainer,
|
||||
aExtraInfo,
|
||||
aDocListenerResult,
|
||||
aDocViewerResult);
|
||||
|
||||
NS_RELEASE(factory);
|
||||
return rv;
|
||||
}
|
||||
|
|
@ -399,9 +415,12 @@ GtkMozillaContainer::FocusAvailable(nsIWebShell* aFocusedWebShell, PRBool& aFocu
|
|||
}
|
||||
|
||||
gint
|
||||
GtkMozillaContainer::StartStream(const char *base_url, const char *action,
|
||||
const char *content_type)
|
||||
GtkMozillaContainer::StartStream(const char *base_url,
|
||||
const char *action,
|
||||
nsISupports * ctxt)
|
||||
// const char *content_type
|
||||
{
|
||||
#if 0
|
||||
nsresult rv = NS_OK;
|
||||
nsString url_str(base_url);
|
||||
nsIURI* url = nsnull;
|
||||
|
|
@ -451,7 +470,11 @@ GtkMozillaContainer::StartStream(const char *base_url, const char *action,
|
|||
}
|
||||
|
||||
mStream = new GtkMozillaInputStream();
|
||||
mStreamURL = url;
|
||||
|
||||
mChannel = url;
|
||||
|
||||
mContext = ctxt;
|
||||
|
||||
mListener = listener;
|
||||
|
||||
done:
|
||||
|
|
@ -461,21 +484,29 @@ GtkMozillaContainer::StartStream(const char *base_url, const char *action,
|
|||
return 0;
|
||||
else
|
||||
return -1;
|
||||
#endif
|
||||
}
|
||||
|
||||
gint
|
||||
GtkMozillaContainer::WriteStream(const char *data, gint len)
|
||||
GtkMozillaContainer::WriteStream(const char *data,
|
||||
gint offset,
|
||||
gint len)
|
||||
{
|
||||
nsresult rv = NS_OK;
|
||||
PRUint32 Count;
|
||||
|
||||
mStream->Fill(data, len);
|
||||
|
||||
rv = mListener->OnDataAvailable(mStreamURL, mStream, len);
|
||||
rv = mListener->OnDataAvailable(mChannel,
|
||||
mContext,
|
||||
mStream,
|
||||
offset,
|
||||
len);
|
||||
if (NS_FAILED(rv))
|
||||
return 0;
|
||||
|
||||
rv = mListener->OnProgress(mStreamURL, len, len+1);
|
||||
// Busted in NECKO
|
||||
// rv = mListener->OnProgress(mChannel, len, len+1);
|
||||
if (NS_FAILED(rv))
|
||||
return 0;
|
||||
|
||||
|
|
@ -491,19 +522,27 @@ GtkMozillaContainer::EndStream(void)
|
|||
|
||||
mStream->Fill(NULL, 0);
|
||||
|
||||
rv = mListener->OnDataAvailable(mStreamURL, mStream, 0);
|
||||
rv = mListener->OnDataAvailable(mChannel,
|
||||
mContext,
|
||||
mStream,
|
||||
0,
|
||||
0);
|
||||
if (NS_FAILED(rv))
|
||||
return;
|
||||
|
||||
rv = mListener->OnStopRequest(mStreamURL, NS_OK, NULL);
|
||||
rv = mListener->OnStopRequest(mChannel,
|
||||
mContext,
|
||||
NS_OK,
|
||||
NULL);
|
||||
if (NS_FAILED(rv))
|
||||
return;
|
||||
|
||||
rv = mListener->OnProgress(mStreamURL, 10, 10);
|
||||
// Busted in NECKO
|
||||
// rv = mListener->OnProgress(mChannel, 10, 10);
|
||||
if (NS_FAILED(rv))
|
||||
return;
|
||||
|
||||
NS_IF_RELEASE(mStreamURL);
|
||||
NS_IF_RELEASE(mChannel);
|
||||
NS_IF_RELEASE(mListener);
|
||||
NS_IF_RELEASE(mStream);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,7 +35,8 @@ public:
|
|||
NS_IMETHOD WillLoadURL(nsIWebShell* aShell, const PRUnichar* aURL, nsLoadType aReason);
|
||||
NS_IMETHOD BeginLoadURL(nsIWebShell* aShell, const PRUnichar* aURL);
|
||||
NS_IMETHOD ProgressLoadURL(nsIWebShell* aShell, const PRUnichar* aURL, PRInt32 aProgress, PRInt32 aProgressMax);
|
||||
NS_IMETHOD EndLoadURL(nsIWebShell* aShell, const PRUnichar* aURL, PRInt32 aStatus);
|
||||
NS_IMETHOD EndLoadURL(nsIWebShell* aShell, const PRUnichar* aURL, nsresult aStatus);
|
||||
|
||||
|
||||
NS_IMETHOD NewWebShell(PRUint32 aChromeMask, PRBool aVisible,
|
||||
nsIWebShell *&aNewWebShell);
|
||||
|
|
@ -82,15 +83,20 @@ public:
|
|||
gint GetHistoryIndex();
|
||||
|
||||
/* Stream stuff: */
|
||||
gint StartStream(const char *base_url, const char *action,
|
||||
const char *content_type);
|
||||
gint WriteStream(const char *data, gint len);
|
||||
gint StartStream(const char *base_url,
|
||||
const char *action,
|
||||
nsISupports * ctxt);
|
||||
|
||||
gint WriteStream(const char *data,
|
||||
gint offset,
|
||||
gint len);
|
||||
void EndStream(void);
|
||||
|
||||
protected:
|
||||
nsresult CreateContentViewer(nsIURI* aURL,
|
||||
nsresult CreateContentViewer(const char *aCommand,
|
||||
nsIChannel * aChannel,
|
||||
nsILoadGroup * aLoadGroup,
|
||||
const char* aContentType,
|
||||
const char *aCommand,
|
||||
nsIContentViewerContainer* aContainer,
|
||||
nsISupports* aExtraInfo,
|
||||
nsIStreamListener** aDocListenerResult,
|
||||
|
|
@ -102,7 +108,11 @@ protected:
|
|||
|
||||
/* Stream stuff: */
|
||||
GtkMozillaInputStream *mStream;
|
||||
nsIURI *mStreamURL;
|
||||
// nsIURI *mStreamURL;
|
||||
|
||||
nsIChannel * mChannel;
|
||||
nsISupports * mContext;
|
||||
|
||||
nsIStreamListener *mListener;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -22,59 +22,27 @@ MOZ_LIB_UTIL_PREFIX=moz
|
|||
|
||||
ZLIB_LIBS = -lz
|
||||
|
||||
TIMER_LIBS -ltimer_gtk_s
|
||||
TIMER_LIBS = -ltimer_s
|
||||
|
||||
BASE_LIBS = \
|
||||
-lpref \
|
||||
$(ZLIB_LIBS) \
|
||||
-lmozreg \
|
||||
-l$(MOZ_LIB_JS_PREFIX)js \
|
||||
-lmozjs \
|
||||
$(TIMER_LIBS) \
|
||||
-lxpcom \
|
||||
-lsecfree \
|
||||
-l$(MOZ_LIB_UTIL_PREFIX)util \
|
||||
-lmozutil \
|
||||
$(NULL)
|
||||
|
||||
MOZ_WIDGET_TOOLKIT_LDFLAGS=-lwidget_gtk
|
||||
|
||||
GECKO_LIBS =\
|
||||
-lraptorwebwidget \
|
||||
$(MOZ_WIDGET_TOOLKIT_LDFLAGS) \
|
||||
-lraptorgfx \
|
||||
-lraptorhtmlpars \
|
||||
-lexpat \
|
||||
-lxmltok \
|
||||
-ljsdom \
|
||||
-ljsurl \
|
||||
$(NULL)
|
||||
|
||||
JPEG_LIBS=-ljpeg
|
||||
PNG_LIBS=-lpng
|
||||
|
||||
IMGLIB_LIBS = \
|
||||
-limg \
|
||||
$(JPEG_LIBS) \
|
||||
$(PNG_LIBS) \
|
||||
$(NULL)
|
||||
MOZ_LIB_DBM_PREFIX=moz
|
||||
|
||||
NETLIB_LIBS = \
|
||||
-labouturl \
|
||||
-lfileurl \
|
||||
-lftpurl \
|
||||
-lgophurl \
|
||||
-lhttpurl \
|
||||
-lremoturl \
|
||||
-lsockstuburl \
|
||||
-lmimetype \
|
||||
-lnetcache \
|
||||
-lnetcnvts \
|
||||
-lnetlib \
|
||||
-lnetwork \
|
||||
-lxp \
|
||||
-ljsurl \
|
||||
-l$(MOZ_LIB_DBM_PREFIX)dbm \
|
||||
-lpwcac \
|
||||
$(NULL)
|
||||
NETLIB_LIBS=-lneckoutil_s
|
||||
|
||||
JSJ_LIB =
|
||||
TK_LIBS =
|
||||
|
|
@ -94,7 +62,7 @@ MOZILLA_LIBS=-L$(MOZILLA_DIR)/dist/lib \
|
|||
|
||||
INCLUDES = $(MOZILLA_INCLUDES) @GTK_CFLAGS@ @DEBUG_FLAGS@
|
||||
|
||||
CPPFLAGS = -DXP_UNIX -DMOZ_DLL_SUFFIX=\".so\"
|
||||
CPPFLAGS = -DXP_UNIX -DMOZ_DLL_SUFFIX=\".so\" -DNECKO
|
||||
|
||||
libgtkmozilla_la_LIBADD = $(MOZILLA_LIBS) @GTK_LIBS@
|
||||
|
||||
|
|
|
|||
|
|
@ -91,28 +91,28 @@ MOZILLA_INCLUDES = -I@MOZILLA_DIR@/dist/include
|
|||
NULL =
|
||||
NSPR_LIBS = -lplds3 -lplc3 -lnspr3 -lpthread
|
||||
|
||||
MOZ_LIB_JS_PREFIX = moz
|
||||
MOZ_LIB_UTIL_PREFIX = moz
|
||||
|
||||
ZLIB_LIBS = -lz
|
||||
|
||||
BASE_LIBS = -lpref $(ZLIB_LIBS) -lmozreg -lmozjs -ltimer_s -lxpcom -lsecfree -lmozutil
|
||||
TIMER_LIBS = -ltimer_s
|
||||
|
||||
BASE_LIBS = -lmozreg -lmozjs $(TIMER_LIBS) -lxpcom -lmozutil $(NULL)
|
||||
|
||||
|
||||
MOZ_WIDGET_TOOLKIT_LDFLAGS = -lwidget_gtk
|
||||
|
||||
GECKO_LIBS = -lraptorwebwidget $(MOZ_WIDGET_TOOLKIT_LDFLAGS) -lraptorgfx -lraptorhtmlpars -lexpat -lxmltok -ljsdom
|
||||
GECKO_LIBS = -lraptorgfx -ljsdom -ljsurl $(NULL)
|
||||
|
||||
|
||||
JPEG_LIBS = -ljpeg
|
||||
PNG_LIBS = -lpng
|
||||
IMGLIB_LIBS = -limg $(NULL)
|
||||
|
||||
IMGLIB_LIBS = -limg $(JPEG_LIBS) $(PNG_LIBS)
|
||||
|
||||
NETLIB_LIBS = -labouturl -lfileurl -lftpurl -lgophurl -lhttpurl -lremoturl -lsockstuburl -lmimetype -lnetcache -lnetcnvts -lnetlib -lnetwork -lxp -ljsurl -lmozdbm -lpwcac
|
||||
|
||||
NETLIB_LIBS = -lneckoutil_s
|
||||
|
||||
JSJ_LIB =
|
||||
TK_LIBS =
|
||||
|
||||
ALL_MOZ_LIBS = $(GECKO_LIBS) $(NETLIB_LIBS) $(IMGLIB_LIBS) $(BASE_LIBS) $(JSJ_LIB) $(NSPR_LIBS) $(TK_LIBS)
|
||||
ALL_MOZ_LIBS = $(GECKO_LIBS) $(NETLIB_LIBS) $(IMGLIB_LIBS) $(BASE_LIBS) $(JSJ_LIB) $(NSPR_LIBS) $(TK_LIBS) $(NULL)
|
||||
|
||||
|
||||
MOZILLA_LIBS = -L$(MOZILLA_DIR)/dist/lib $(ALL_MOZ_LIBS)
|
||||
|
|
@ -120,7 +120,7 @@ MOZILLA_LIBS = -L$(MOZILLA_DIR)/dist/lib $(ALL_MOZ_LIBS)
|
|||
|
||||
INCLUDES = $(MOZILLA_INCLUDES) @GTK_CFLAGS@ @DEBUG_FLAGS@
|
||||
|
||||
CPPFLAGS = -DXP_UNIX -DMOZ_DLL_SUFFIX=\".so\"
|
||||
CPPFLAGS = -DXP_UNIX -DMOZ_DLL_SUFFIX=\".so\" -DNECKO
|
||||
|
||||
libgtkmozilla_la_LIBADD = $(MOZILLA_LIBS) @GTK_LIBS@
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||
|
|
|
|||
|
|
@ -213,7 +213,9 @@ gtk_mozilla_get_type (void)
|
|||
|
||||
//printf("Initializing NetService.\n");
|
||||
|
||||
#ifndef NECKO
|
||||
NS_InitINetService();
|
||||
#endif
|
||||
|
||||
gdk_input_add(EQueue->GetEventQueueSelectFD(),
|
||||
GDK_INPUT_READ,
|
||||
|
|
@ -367,7 +369,7 @@ gtk_mozilla_stream_start(GtkMozilla *moz,
|
|||
class GtkMozillaContainer *moz_container;
|
||||
|
||||
moz_container = (class GtkMozillaContainer *)moz->mozilla_container;
|
||||
return moz_container->StartStream(base_url, action, content_type);
|
||||
// return moz_container->StartStream(base_url, action, content_type);
|
||||
}
|
||||
|
||||
gint
|
||||
|
|
@ -380,6 +382,7 @@ gtk_mozilla_stream_start_html(GtkMozilla *moz,
|
|||
gint
|
||||
gtk_mozilla_stream_write(GtkMozilla *moz,
|
||||
const char *data,
|
||||
gint offset,
|
||||
gint len)
|
||||
{
|
||||
class GtkMozillaContainer *moz_container;
|
||||
|
|
@ -387,7 +390,7 @@ gtk_mozilla_stream_write(GtkMozilla *moz,
|
|||
moz_container = (class GtkMozillaContainer *)moz->mozilla_container;
|
||||
|
||||
// Returns the number of bytes written!
|
||||
return moz_container->WriteStream(data, len);
|
||||
return moz_container->WriteStream(data, offset, len);
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
|||
|
|
@ -89,7 +89,9 @@ extern gint gtk_mozilla_stream_start(GtkMozilla *moz,
|
|||
const char *content_type);
|
||||
extern gint gtk_mozilla_stream_start_html(GtkMozilla *moz,
|
||||
const char *base_url);
|
||||
extern gint gtk_mozilla_stream_write(GtkMozilla *moz, const char *data,
|
||||
extern gint gtk_mozilla_stream_write(GtkMozilla *moz,
|
||||
const char *data,
|
||||
gint offset,
|
||||
gint len);
|
||||
extern void gtk_mozilla_stream_end(GtkMozilla *moz);
|
||||
|
||||
|
|
|
|||
|
|
@ -16,271 +16,6 @@
|
|||
* Corporation. Portions created by Netscape are Copyright (C) 1998
|
||||
* Netscape Communications Corporation. All Rights Reserved.
|
||||
*/
|
||||
#define NS_IMPL_IDS
|
||||
#include "nsCOMPtr.h"
|
||||
#include "nsIPref.h"
|
||||
#include "nsIComponentManager.h"
|
||||
#include "nsWidgetsCID.h"
|
||||
#include "nsViewsCID.h"
|
||||
#include "nsPluginsCID.h"
|
||||
|
||||
#include "nsIBrowserWindow.h"
|
||||
#include "nsIWebShell.h"
|
||||
#include "nsIDocumentLoader.h"
|
||||
#include "nsIThrobber.h"
|
||||
#include "../../../../webshell/tests/viewer/nsSetupRegistry.cpp"
|
||||
|
||||
#include "nsParserCIID.h"
|
||||
#include "nsDOMCID.h"
|
||||
#ifndef NECKO
|
||||
#include "nsINetService.h"
|
||||
#else
|
||||
#include "nsIIOService.h"
|
||||
#endif // NECKO
|
||||
#ifdef OJI
|
||||
#include "nsICapsManager.h"
|
||||
#include "nsILiveconnect.h"
|
||||
#endif
|
||||
#include "nsIPluginManager.h"
|
||||
#include "nsIProperties.h"
|
||||
|
||||
#include "nsIObserverService.h"
|
||||
#include "nsIObserver.h"
|
||||
#include "nsIAllocator.h"
|
||||
#include "nsIEventQueue.h"
|
||||
#include "nsIEventQueueService.h"
|
||||
#include "nsIGenericFactory.h"
|
||||
#include "nsGfxCIID.h"
|
||||
#include "nsSpecialSystemDirectory.h"
|
||||
|
||||
#include "nsISound.h"
|
||||
#include "nsIFileSpecWithUI.h"
|
||||
|
||||
#include "prprf.h"
|
||||
#include "prmem.h"
|
||||
#include "prlog.h" // PR_ASSERT
|
||||
|
||||
#ifdef XP_PC
|
||||
#define WIDGET_DLL "raptorwidget.dll"
|
||||
#define GFXWIN_DLL "raptorgfxwin.dll"
|
||||
#define VIEW_DLL "raptorview.dll"
|
||||
#define WEB_DLL "raptorweb.dll"
|
||||
#define PREF_DLL "xppref32.dll"
|
||||
#define PARSER_DLL "raptorhtmlpars.dll"
|
||||
#define DOM_DLL "jsdom.dll"
|
||||
#ifdef NECKO
|
||||
#define NECKO_DLL "necko.dll"
|
||||
#else
|
||||
#define NETLIB_DLL "netlib.dll"
|
||||
#endif // NECKO
|
||||
#define PLUGIN_DLL "raptorplugin.dll"
|
||||
#define CAPS_DLL "caps.dll"
|
||||
#define LIVECONNECT_DLL "jsj3250.dll"
|
||||
#define OJI_DLL "oji.dll"
|
||||
#elif defined(XP_MAC)
|
||||
#define WIDGET_DLL "WIDGET_DLL"
|
||||
#define GFXWIN_DLL "GFXWIN_DLL"
|
||||
#define VIEW_DLL "VIEW_DLL"
|
||||
#define WEB_DLL "WEB_DLL"
|
||||
#define PREF_DLL "PREF_DLL"
|
||||
#define PARSER_DLL "PARSER_DLL"
|
||||
#define DOM_DLL "DOM_DLL"
|
||||
#ifdef NECKO
|
||||
#define NECKO_DLL "NECKO_DLL"
|
||||
#else
|
||||
#define NETLIB_DLL "NETLIB_DLL"
|
||||
#endif // NECKO
|
||||
#define PLUGIN_DLL "PLUGIN_DLL"
|
||||
#define CAPS_DLL "CAPS_DLL"
|
||||
#define LIVECONNECT_DLL "LIVECONNECT_DLL"
|
||||
#define OJI_DLL "OJI_DLL"
|
||||
#else
|
||||
/** Currently CFLAGS defines WIDGET_DLL and GFXWIN_DLL. If, for some
|
||||
* reason, the cflags value doesn't get defined, use gtk,
|
||||
* since that is the default.
|
||||
**/
|
||||
#ifndef WIDGET_DLL
|
||||
#define WIDGET_DLL "libwidget_gtk"MOZ_DLL_SUFFIX
|
||||
#endif
|
||||
#ifndef GFXWIN_DLL
|
||||
#define GFXWIN_DLL "libgfx_gtk"MOZ_DLL_SUFFIX
|
||||
#endif
|
||||
#define VIEW_DLL "libraptorview"MOZ_DLL_SUFFIX
|
||||
#define WEB_DLL "libraptorwebwidget"MOZ_DLL_SUFFIX
|
||||
#define PREF_DLL "libpref"MOZ_DLL_SUFFIX
|
||||
#define PARSER_DLL "libraptorhtmlpars"MOZ_DLL_SUFFIX
|
||||
#define DOM_DLL "libjsdom"MOZ_DLL_SUFFIX
|
||||
#ifdef NECKO
|
||||
#define NECKO_DLL "libnecko"MOZ_DLL_SUFFIX
|
||||
#else
|
||||
#define NETLIB_DLL "libnetlib"MOZ_DLL_SUFFIX
|
||||
#endif // NECKO
|
||||
#define PLUGIN_DLL "libraptorplugin"MOZ_DLL_SUFFIX
|
||||
#define CAPS_DLL "libcaps"MOZ_DLL_SUFFIX
|
||||
#define LIVECONNECT_DLL "libliveconnect"MOZ_DLL_SUFFIX
|
||||
#define OJI_DLL "liboji"MOZ_DLL_SUFFIX
|
||||
#endif
|
||||
|
||||
// Class ID's
|
||||
|
||||
// WIDGET
|
||||
static NS_DEFINE_IID(kCLookAndFeelCID, NS_LOOKANDFEEL_CID);
|
||||
static NS_DEFINE_IID(kCWindowCID, NS_WINDOW_CID);
|
||||
static NS_DEFINE_IID(kCVScrollbarCID, NS_VERTSCROLLBAR_CID);
|
||||
static NS_DEFINE_IID(kCHScrollbarCID, NS_HORZSCROLLBAR_CID);
|
||||
static NS_DEFINE_IID(kCDialogCID, NS_DIALOG_CID);
|
||||
static NS_DEFINE_IID(kCLabelCID, NS_LABEL_CID);
|
||||
static NS_DEFINE_IID(kCButtonCID, NS_BUTTON_CID);
|
||||
static NS_DEFINE_IID(kCComboBoxCID, NS_COMBOBOX_CID);
|
||||
static NS_DEFINE_IID(kCFileWidgetCID, NS_FILEWIDGET_CID);
|
||||
static NS_DEFINE_IID(kCListBoxCID, NS_LISTBOX_CID);
|
||||
static NS_DEFINE_IID(kCRadioButtonCID, NS_RADIOBUTTON_CID);
|
||||
static NS_DEFINE_IID(kCTextAreaCID, NS_TEXTAREA_CID);
|
||||
static NS_DEFINE_IID(kCTextFieldCID, NS_TEXTFIELD_CID);
|
||||
static NS_DEFINE_IID(kCCheckButtonCID, NS_CHECKBUTTON_CID);
|
||||
static NS_DEFINE_IID(kCChildCID, NS_CHILD_CID);
|
||||
static NS_DEFINE_IID(kCAppShellCID, NS_APPSHELL_CID);
|
||||
static NS_DEFINE_IID(kCToolkitCID, NS_TOOLKIT_CID);
|
||||
static NS_DEFINE_IID(kClipboardCID, NS_CLIPBOARD_CID);
|
||||
static NS_DEFINE_CID(kCTransferableCID, NS_TRANSFERABLE_CID);
|
||||
static NS_DEFINE_IID(kDataFlavorCID, NS_DATAFLAVOR_CID);
|
||||
static NS_DEFINE_IID(kCXIFFormatConverterCID, NS_XIFFORMATCONVERTER_CID);
|
||||
static NS_DEFINE_IID(kCDragServiceCID, NS_DRAGSERVICE_CID);
|
||||
//static NS_DEFINE_IID(kCFileListTransferableCID, NS_FILELISTTRANSFERABLE_CID);
|
||||
static NS_DEFINE_IID(kCFontRetrieverServiceCID, NS_FONTRETRIEVERSERVICE_CID);
|
||||
static NS_DEFINE_IID(kCMenuBarCID, NS_MENUBAR_CID);
|
||||
static NS_DEFINE_IID(kCMenuCID, NS_MENU_CID);
|
||||
static NS_DEFINE_IID(kCMenuItemCID, NS_MENUITEM_CID);
|
||||
static NS_DEFINE_IID(kCContextMenuCID, NS_CONTEXTMENU_CID);
|
||||
//static NS_DEFINE_IID(kCXULCommandCID, NS_XULCOMMAND_CID);
|
||||
static NS_DEFINE_IID(kSoundCID, NS_SOUND_CID);
|
||||
static NS_DEFINE_CID(kFileSpecWithUICID, NS_FILESPECWITHUI_CID);
|
||||
|
||||
// GFXWIN
|
||||
static NS_DEFINE_IID(kCRenderingContextIID, NS_RENDERING_CONTEXT_CID);
|
||||
static NS_DEFINE_IID(kCDeviceContextIID, NS_DEVICE_CONTEXT_CID);
|
||||
static NS_DEFINE_IID(kCFontMetricsIID, NS_FONT_METRICS_CID);
|
||||
static NS_DEFINE_IID(kCImageIID, NS_IMAGE_CID);
|
||||
static NS_DEFINE_IID(kCRegionIID, NS_REGION_CID);
|
||||
static NS_DEFINE_IID(kCBlenderIID, NS_BLENDER_CID);
|
||||
static NS_DEFINE_IID(kCDeviceContextSpecCID, NS_DEVICE_CONTEXT_SPEC_CID);
|
||||
static NS_DEFINE_IID(kCDeviceContextSpecFactoryCID, NS_DEVICE_CONTEXT_SPEC_FACTORY_CID);
|
||||
|
||||
|
||||
// VIEW
|
||||
static NS_DEFINE_IID(kCViewManagerCID, NS_VIEW_MANAGER_CID);
|
||||
static NS_DEFINE_IID(kCViewCID, NS_VIEW_CID);
|
||||
static NS_DEFINE_IID(kCScrollingViewCID, NS_SCROLLING_VIEW_CID);
|
||||
|
||||
// WEB
|
||||
static NS_DEFINE_IID(kCWebShellCID, NS_WEB_SHELL_CID);
|
||||
static NS_DEFINE_IID(kCDocLoaderServiceCID, NS_DOCUMENTLOADER_SERVICE_CID);
|
||||
static NS_DEFINE_IID(kCThrobberCID, NS_THROBBER_CID);
|
||||
|
||||
// PREF
|
||||
static NS_DEFINE_CID(kCPrefCID, NS_PREF_CID);
|
||||
|
||||
// PARSER
|
||||
static NS_DEFINE_IID(kCParserCID, NS_PARSER_IID);
|
||||
static NS_DEFINE_CID(kCWellFormedDTDCID, NS_WELLFORMEDDTD_CID);
|
||||
|
||||
// DOM
|
||||
static NS_DEFINE_IID(kCDOMScriptObjectFactory, NS_DOM_SCRIPT_OBJECT_FACTORY_CID);
|
||||
static NS_DEFINE_IID(kCScriptNameSetRegistry, NS_SCRIPT_NAMESET_REGISTRY_CID);
|
||||
|
||||
// NETLIB
|
||||
#ifndef NECKO
|
||||
static NS_DEFINE_CID(kCNetServiceCID, NS_NETSERVICE_CID);
|
||||
#else
|
||||
static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
|
||||
#endif // NECKO
|
||||
|
||||
// PLUGIN
|
||||
static NS_DEFINE_IID(kCPluginHostCID, NS_PLUGIN_HOST_CID);
|
||||
static NS_DEFINE_CID(kCPluginManagerCID, NS_PLUGINMANAGER_CID);
|
||||
#ifdef OJI
|
||||
static NS_DEFINE_CID(kCapsManagerCID, NS_CCAPSMANAGER_CID);
|
||||
static NS_DEFINE_CID(kCLiveconnectCID, NS_CLIVECONNECT_CID);
|
||||
#endif
|
||||
|
||||
extern "C" void
|
||||
NS_SetupRegistry()
|
||||
{
|
||||
// WIDGET
|
||||
nsComponentManager::RegisterComponentLib(kCLookAndFeelCID, NULL, NULL, WIDGET_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kCWindowCID, NULL, NULL, WIDGET_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kCVScrollbarCID, NULL, NULL, WIDGET_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kCHScrollbarCID, NULL, NULL, WIDGET_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kCDialogCID, NULL, NULL, WIDGET_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kCLabelCID, NULL, NULL, WIDGET_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kCButtonCID, NULL, NULL, WIDGET_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kCComboBoxCID, NULL, NULL, WIDGET_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kCFileWidgetCID, NULL, NULL, WIDGET_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kCListBoxCID, NULL, NULL, WIDGET_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kCRadioButtonCID, NULL, NULL, WIDGET_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kCTextAreaCID, NULL, NULL, WIDGET_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kCTextFieldCID, NULL, NULL, WIDGET_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kCCheckButtonCID, NULL, NULL, WIDGET_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kCChildCID, NULL, NULL, WIDGET_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kCAppShellCID, NULL, NULL, WIDGET_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kCToolkitCID, NULL, NULL, WIDGET_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kClipboardCID, NULL, NULL, WIDGET_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kCTransferableCID, NULL, NULL, WIDGET_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kDataFlavorCID, NULL, NULL, WIDGET_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kCXIFFormatConverterCID, NULL, NULL, WIDGET_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kCDragServiceCID, NULL, NULL, WIDGET_DLL, PR_FALSE, PR_FALSE);
|
||||
//nsComponentManager::RegisterComponentLib(kCFileListTransferableCID, NULL, NULL, WIDGET_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kCFontRetrieverServiceCID, NULL, NULL, WIDGET_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kCMenuBarCID, NULL, NULL, WIDGET_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kCMenuCID, NULL, NULL, WIDGET_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kCMenuItemCID, NULL, NULL, WIDGET_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kCContextMenuCID, NULL, NULL, WIDGET_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kSoundCID, "Sound Services", "component://netscape/sound", WIDGET_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kFileSpecWithUICID, NS_FILESPECWITHUI_CLASSNAME, NS_FILESPECWITHUI_PROGID, WIDGET_DLL, PR_FALSE, PR_FALSE);
|
||||
|
||||
// GFXWIN
|
||||
nsComponentManager::RegisterComponentLib(kCRenderingContextIID, NULL, NULL, GFXWIN_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kCDeviceContextIID, NULL, NULL, GFXWIN_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kCFontMetricsIID, NULL, NULL, GFXWIN_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kCImageIID, NULL, NULL, GFXWIN_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kCRegionIID, NULL, NULL, GFXWIN_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kCBlenderIID, NULL, NULL, GFXWIN_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kCDeviceContextSpecCID, NULL, NULL, GFXWIN_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kCDeviceContextSpecFactoryCID, NULL, NULL, GFXWIN_DLL, PR_FALSE, PR_FALSE);
|
||||
|
||||
// VIEW
|
||||
nsComponentManager::RegisterComponentLib(kCViewManagerCID, NULL, NULL, VIEW_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kCViewCID, NULL, NULL, VIEW_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kCScrollingViewCID, NULL, NULL, VIEW_DLL, PR_FALSE, PR_FALSE);
|
||||
|
||||
// WEB
|
||||
nsComponentManager::RegisterComponentLib(kCWebShellCID, NULL, NULL, WEB_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kCDocLoaderServiceCID, NULL, NULL, WEB_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kCThrobberCID, NULL, NULL, WEB_DLL, PR_FALSE, PR_FALSE);
|
||||
|
||||
// PREF
|
||||
nsComponentManager::RegisterComponentLib(kCPrefCID, "Preferences Services", "component://netscape/preferences", PREF_DLL, PR_FALSE, PR_FALSE);
|
||||
|
||||
// PARSER
|
||||
nsComponentManager::RegisterComponentLib(kCParserCID, NULL, NULL, PARSER_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kCWellFormedDTDCID, NULL, NULL, PARSER_DLL, PR_FALSE, PR_FALSE);
|
||||
|
||||
// DOM
|
||||
nsComponentManager::RegisterComponentLib(kCDOMScriptObjectFactory, NULL, NULL, DOM_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kCScriptNameSetRegistry, NULL, NULL, DOM_DLL, PR_FALSE, PR_FALSE);
|
||||
|
||||
// NETLIB
|
||||
#ifndef NECKO
|
||||
nsComponentManager::RegisterComponentLib(kCNetServiceCID, NULL, NULL, NETLIB_DLL, PR_FALSE, PR_FALSE);
|
||||
#else
|
||||
nsComponentManager::RegisterComponentLib(kIOServiceCID, NULL, NULL, NECKO_DLL, PR_FALSE, PR_FALSE);
|
||||
#endif // NECKO
|
||||
|
||||
// PLUGIN
|
||||
nsComponentManager::RegisterComponentLib(kCPluginHostCID, NULL, NULL, PLUGIN_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kCPluginManagerCID, NULL, NULL, PLUGIN_DLL, PR_FALSE, PR_FALSE);
|
||||
|
||||
#ifdef OJI
|
||||
nsComponentManager::RegisterComponentLib(kCapsManagerCID, NULL, NULL, CAPS_DLL, PR_FALSE, PR_FALSE);
|
||||
nsComponentManager::RegisterComponentLib(kCLiveconnectCID, NULL, NULL, LIVECONNECT_DLL, PR_FALSE, PR_FALSE);
|
||||
#endif
|
||||
}
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче