mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Landing changes in the OJI_19980727_BRANCH since the OJI_19980727_TIP_MERGE tag.

This commit is contained in:
warren%netscape.com 1998-07-31 20:31:14 +00:00
Родитель c9bd5d8074
Коммит 1a973ebf48
6 изменённых файлов: 70 добавлений и 89 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

15
cmd/winfe/cxpane.cpp
Просмотреть файл

@ -1541,6 +1541,16 @@ char* getBuiltInAttribute (LO_BuiltinStruct *pBuiltin_struct, char* att) {
int n = 0;
if (!pBuiltin_struct || !att)
return NULL;
#ifdef OJI
while (n < pBuiltin_struct->attributes.n) {
char* attName = *(pBuiltin_struct->attributes.names + n);
char* attValue = *(pBuiltin_struct->attributes.values + n);
if (attName && (stricmp(attName, att) == 0)) {
return attValue;
}
n++;
}
#else
while (n < pBuiltin_struct->attribute_cnt) {
char* attName = *(pBuiltin_struct->attribute_list + n);
char* attValue = *(pBuiltin_struct->value_list + n);
@ -1549,6 +1559,7 @@ char* getBuiltInAttribute (LO_BuiltinStruct *pBuiltin_struct, char* att) {
}
n++;
}
#endif
return NULL;
}
@ -1577,7 +1588,11 @@ void CPaneCX::DisplayBuiltin(MWContext *pContext, int iLocation, LO_BuiltinStruc
char* url = getBuiltInAttribute(pBuiltin_struct, "data");
char* target = getBuiltInAttribute(pBuiltin_struct, "target");
if (pBuiltin_struct->FE_Data == NULL ){
#ifdef OJI
CRDFContentView* pWnd = CRDFContentView::DisplayRDFTreeFromSHACK(cWnd, xPos, yPos, width, height, url == NULL ? "" :url , pBuiltin_struct->attributes.n, pBuiltin_struct->attributes.names, pBuiltin_struct->attributes.values);
#else
CRDFContentView* pWnd = CRDFContentView::DisplayRDFTreeFromSHACK(cWnd, xPos, yPos, width, height, url == NULL ? "" :url , pBuiltin_struct->attribute_cnt, pBuiltin_struct->attribute_list, pBuiltin_struct->value_list);
#endif
((CRDFOutliner*)pWnd->GetOutlinerParent()->GetOutliner())->SetWindowTarget(target);
pBuiltin_struct->FE_Data = pWnd;
}

4
cmd/winfe/feorphan.cpp
Просмотреть файл

@ -650,10 +650,10 @@ BOOL fe_ShutdownJava()
#if defined(OJI)
JVMMgr* jvmMgr = JVM_GetJVMMgr();
nsJVMMgr* jvmMgr = JVM_GetJVMMgr();
if (jvmMgr == NULL)
return FALSE;
bRetval = (jvmMgr->ShutdownJVM() == JVMStatus_Enabled);
bRetval = (jvmMgr->ShutdownJVM() == nsJVMStatus_Enabled);
// XXX suspend all java threads
jvmMgr->Release();

32
cmd/winfe/genframe.cpp
Просмотреть файл

@ -2370,19 +2370,7 @@ void CGenericFrame::OnDisplayPrivacyTutorial()
void CGenericFrame::OnToggleJavaConsole()
{
#ifdef OJI
JVMMgr* jvmMgr = JVM_GetJVMMgr();
if (jvmMgr == NULL)
return;
NPIJVMPlugin* jvm = jvmMgr->GetJVM();
if (jvm) {
if (jvm->IsConsoleVisible()) {
jvm->HideConsole();
} else {
jvm->ShowConsole();
}
jvm->Release();
}
jvmMgr->Release();
JVM_ToggleConsole();
#else
if( LJ_IsConsoleShowing() ) {
LJ_HideConsole();
@ -2395,20 +2383,10 @@ void CGenericFrame::OnToggleJavaConsole()
void CGenericFrame::OnUpdateJavaConsole(CCmdUI* pCmdUI)
{
#ifdef OJI
JVMMgr* jvmMgr = JVM_GetJVMMgr();
if (jvmMgr == NULL) {
pCmdUI->Enable(FALSE);
}
NPIJVMPlugin* jvm = jvmMgr->GetJVM();
if (jvm) {
if (jvm->GetJVMStatus() != JVMStatus_Failed) {
pCmdUI->SetCheck(jvm->IsConsoleVisible());
} else {
pCmdUI->Enable(FALSE);
}
jvm->Release();
}
jvmMgr->Release();
if (JVM_IsJVMAvailable())
pCmdUI->SetCheck(JVM_IsConsoleVisible());
else
pCmdUI->Enable(FALSE);
#else
if (LJJavaStatus_Failed != LJ_GetJavaStatus()) {
pCmdUI->SetCheck( LJ_IsConsoleShowing() );

69
cmd/winfe/mkfiles32/mozilla.mak
Просмотреть файл

@ -366,10 +366,9 @@ LINK_LIBS= \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\libmsgc21.lib \
!endif
!if defined(MOZ_OJI)
!elseif defined(MOZ_JAVA)
!if defined(MOZ_JAVA)
$(DIST)\lib\jrt32$(VERSION_NUMBER).lib \
!else
!elseif !defined(NSJVM)
$(DIST)\lib\libsjs32.lib \
$(DIST)\lib\libnjs32.lib \
!endif
@ -377,7 +376,9 @@ LINK_LIBS= \
!ifdef MOZ_JAVA
$(DIST)\lib\jsd32$(VERSION_NUMBER).lib \
!endif
!ifdef MOZ_OJI
$(DIST)\lib\jsj32$(VERSION_NUMBER).lib \
!endif
!ifdef MOZ_JAVA
$(DIST)\lib\nsn32.lib \
!endif
@ -389,6 +390,7 @@ LINK_LIBS= \
!ifdef MOZ_JAVA
$(DIST)\lib\libapplet32.lib \
!endif
$(DIST)\lib\plug.lib \
!ifdef MOZ_OJI
$(DIST)\lib\oji32.lib \
!endif
@ -397,7 +399,7 @@ LINK_LIBS= \
!endif
#!if defined(EDITOR)
!if !defined(MOZ_LITE)
!ifdef JAVA_OR_OJI
!ifdef JAVA_OR_NSJVM
$(DIST)\lib\edtplug.lib \
!endif
!endif
@ -421,14 +423,12 @@ LINK_LIBS= \
$(DIST)\lib\secfreenav32.lib \
!endif
$(DIST)\lib\htmldg32.lib \
!ifdef JAVA_OR_OJI
$(DIST)\lib\libcaps.lib \
!endif
!ifdef MOZ_JAVA
$(DIST)\lib\libnsc32.lib \
!endif
$(DIST)\lib\img32.lib \
!ifdef JAVA_OR_OJI # XXX remove later
!ifdef JAVA_OR_NSJVM
$(DIST)\lib\jmc.lib \
!endif
!ifndef MOZ_NGLAYOUT
@ -471,7 +471,7 @@ LINK_LIBS= \
$(DIST)\lib\nsldap32v30.lib \
!endif
$(DIST)\lib\unicvt32.lib \
!ifdef JAVA_OR_OJI
!ifdef JAVA_OR_NSJVM
!ifdef MOZ_SMARTUPDATE
$(DIST)\lib\softup32.lib \
!endif
@ -620,7 +620,6 @@ CINCLUDES= \
/I$(DEPTH)\lib\libcnv \
/I$(DEPTH)\lib\libi18n \
/I$(DEPTH)\lib\libparse \
/I$(DEPTH)\lib\plugin \
!else
/I$(EXPORTINC)
!endif
@ -639,8 +638,13 @@ CDISTINCLUDES1= \
/I$(DIST)\include \
/I$(XPDIST)\public\dbm \
/I$(XPDIST)\public\java \
/I$(XPDIST)\public\raptor \
/I$(XPDIST)\public\plugin \
/I$(XPDIST)\public\plugimpl \
/I$(XPDIST)\public\caps \
!if defined(MOZ_OJI)
/I$(XPDIST)\public\oji \
/I$(XPDIST)\public\ojiimpl \
/I$(XPDIST)\public\npj \
/I$(XPDIST)\public\softupdt \
!elseif defined(MOZ_JAVA)
@ -685,7 +689,7 @@ CDISTINCLUDES3= \
/I$(XPDIST)\public\calendar \
!endif
#!ifdef EDITOR
!ifdef JAVA_OR_OJI
!ifdef JAVA_OR_NSJVM
/I$(XPDIST)\public\edtplug \
!endif
/I$(XPDIST)\public\spellchk \
@ -1100,17 +1104,14 @@ $(OUTDIR)\mozilla.dep: $(DEPTH)\cmd\winfe\mkfiles32\mozilla.mak
$(DEPTH)\modules\libimg\src\xbm.c
$(DEPTH)\modules\libimg\src\ipng.c
$(DEPTH)\modules\libimg\src\png_png.c
!if defined(JAVA_OR_OJI) # XXX remove later
!if defined(JAVA_OR_NSJVM)
$(DEPTH)\sun-java\jtools\src\jmc.c
!endif
!endif
!ifndef MOZ_NGLAYOUT
$(DEPTH)\lib\plugin\npassoc.c
$(DEPTH)\lib\plugin\npglue.cpp
$(DEPTH)\lib\plugin\npwplat.cpp
$(DEPTH)\lib\plugin\nsplugin.cpp
$(DEPTH)\cmd\winfe\npwplat.cpp
!ifndef MOZ_NGLAYOUT
$(DEPTH)\lib\xlate\isotab.c
$(DEPTH)\lib\xlate\stubs.c
$(DEPTH)\lib\xlate\tblprint.c
@ -1717,8 +1718,10 @@ install: \
!IF EXIST($(DIST)\bin\jsd32$(VERSION_NUMBER).dll)
$(OUTDIR)\jsd32$(VERSION_NUMBER).dll \
!ENDIF
!ifdef MOZ_OJI
!IF EXIST($(DIST)\bin\jsj32$(VERSION_NUMBER).dll)
$(OUTDIR)\jsj32$(VERSION_NUMBER).dll \
!endif
!ENDIF
!IF EXIST($(DIST)\bin\xppref32.dll)
$(OUTDIR)\xppref32.dll \
@ -1740,7 +1743,7 @@ install: \
$(OUTDIR)\trackgdi.dll \
!ENDIF
!endif
!if defined(MOZ_OJI)
!if defined(NSJVM)
!IF EXIST($(DIST)\bin\jrt32$(VERSION_NUMBER).dll)
$(JAVABIN_DIR)\jrt32$(VERSION_NUMBER).dll \
!ENDIF
@ -1749,7 +1752,7 @@ install: \
$(OUTDIR)\jrt32$(VERSION_NUMBER).dll \
!ENDIF
!endif
!if defined(JAVA_OR_OJI)
!if defined(JAVA_OR_NSJVM)
!IF EXIST($(DIST)\bin\npj32$(VERSION_NUMBER).dll)
$(JAVABIN_DIR)\npj32$(VERSION_NUMBER).dll \
!ENDIF
@ -1777,7 +1780,7 @@ install: \
!IF EXIST($(DIST)\bin\zpw32$(VERSION_NUMBER).dll)
$(JAVABIN_DIR)\zpw32$(VERSION_NUMBER).dll \
!ENDIF
!endif # JAVA_OR_OJI
!endif # JAVA_OR_NSJVM
!IF EXIST($(DEPTH)\cmd\winfe\nstdfp32.dll)
$(OUTDIR)\dynfonts\nstdfp32.dll \
!ENDIF
@ -1817,7 +1820,7 @@ install: \
!ENDIF
!endif
!ELSE # MOZ_BITS==32 way above
!IFDEF JAVA_OR_OJI
!IFDEF JAVA_OR_NSJVM
!IF EXIST($(DIST)\bin\npj16$(VERSION_NUMBER).dll)
$(JAVABIN_DIR)\npj16$(VERSION_NUMBER).dll \
!ENDIF
@ -1842,7 +1845,7 @@ install: \
#!IF EXIST($(DIST)\bin\jdb16$(VERSION_NUMBER).dll)
# $(JAVABIN_DIR)\jdb16$(VERSION_NUMBER).dll \
#!ENDIF
!ENDIF # JAVA_OR_OJI
!ENDIF # JAVA_OR_NSJVM
!ifndef NSPR20
!IF EXIST($(DIST)\bin\pr16$(VERSION_NUMBER).dll)
$(OUTDIR)\pr16$(VERSION_NUMBER).dll \
@ -1864,9 +1867,11 @@ install: \
!IF EXIST($(DIST)\bin\js16$(VERSION_NUMBER).dll)
$(OUTDIR)\js16$(VERSION_NUMBER).dll \
!ENDIF
!ifdef MOZ_OJI
!IF EXIST($(DIST)\bin\jsj16$(VERSION_NUMBER).dll)
$(OUTDIR)\jsj16$(VERSION_NUMBER).dll \
!ENDIF
!ENDIF
!IF EXIST($(DIST)\bin\xppref16.dll)
$(OUTDIR)\xppref16.dll \
!ENDIF
@ -1894,7 +1899,7 @@ install: \
!ENDIF
!endif
!ENDIF # MOZ_BITS==32 (end of "else" clause)
!if defined(JAVA_OR_OJI)
!if defined(JAVA_OR_NSJVM)
$(JAVACLS_DIR)\$(JAR_NAME) \
!endif
$(OUTDIR)\netscape.cfg \
@ -2090,7 +2095,7 @@ $(JAVABIN_DIR)\npj32$(VERSION_NUMBER).dll: $(DIST)\bin\npj32$(VERSION_NUMBER).
@IF NOT EXIST "$(JAVABIN_DIR)/$(NULL)" mkdir "$(JAVABIN_DIR)"
@IF EXIST $(DIST)\bin\npj32$(VERSION_NUMBER).dll copy $(DIST)\bin\npj32$(VERSION_NUMBER).dll $(JAVABIN_DIR)\npj32$(VERSION_NUMBER).dll
!if defined(MOZ_OJI)
!if defined(NSJVM)
$(JAVABIN_DIR)\jrt32$(VERSION_NUMBER).dll: $(DIST)\bin\jrt32$(VERSION_NUMBER).dll
@IF NOT EXIST "$(JAVAPARENT_DIR)/$(NULL)" mkdir "$(JAVAPARENT_DIR)"
@IF NOT EXIST "$(JAVABIN_DIR)/$(NULL)" mkdir "$(JAVABIN_DIR)"
@ -2255,7 +2260,7 @@ $(OUTDIR)\nscnv3230.dll: $(DIST)\bin\nscnv3230.dll
$(JAVACLS_DIR)\$(JAR_NAME): $(JAVA_DESTPATH)\$(JAR_NAME)
@IF NOT EXIST "$(JAVAPARENT_DIR)/$(NULL)" mkdir "$(JAVAPARENT_DIR)"
@IF NOT EXIST "$(JAVACLS_DIR)/$(NULL)" mkdir "$(JAVACLS_DIR)"
!if defined(JAVA_OR_OJI)
!if defined(JAVA_OR_NSJVM)
!ifdef MOZ_COPY_ALL_JARS
@copy $(JAVA_DESTPATH)\*.jar "$(JAVACLS_DIR)\"
!else
@ -2482,9 +2487,7 @@ BUILD_SOURCE: $(OBJ_FILES)
!ifdef MOZ_LDAP
$(DIST)\lib\nsldap.lib +
!endif
!ifdef JAVA_OR_OJI
$(DIST)\lib\libcaps.lib +
!endif
!if defined(MOZ_JAVA)
$(DIST)\lib\jrt16$(VERSION_NUMBER).lib +
$(DIST)\lib\libapp~1.lib +
@ -2494,7 +2497,7 @@ BUILD_SOURCE: $(OBJ_FILES)
$(DIST)\lib\li16.lib +
$(DIST)\lib\prgrss16.lib +
!ifdef EDITOR
!ifdef JAVA_OR_OJI
!ifdef JAVA_OR_NSJVM
$(DIST)\lib\edtplug.lib +
!endif
!endif
@ -2505,7 +2508,7 @@ BUILD_SOURCE: $(OBJ_FILES)
$(DIST)\lib\libsjs16.lib +
$(DIST)\lib\libnjs16.lib +
!endif
!ifdef JAVA_OR_OJI
!ifdef JAVA_OR_NSJVM
!ifndef NO_SECURITY
$(DIST)\lib\jsl16.lib +
!endif
@ -2885,11 +2888,10 @@ exports:
-xcopy $(XPDIST)\public\ldap\*.h $(EXPORTINC) $(XCF)
!endif
!ifdef EDITOR
!ifdef JAVA_OR_OJI
!ifdef JAVA_OR_NSJVM
-xcopy $(DEPTH)\modules\edtplug\include\*.h $(EXPORTINC) $(XCF)
!endif
!endif
-xcopy $(DEPTH)\lib\plugin\*.h $(EXPORTINC) $(XCF)
!if defined(MOZ_JAVA)
-xcopy $(DEPTH)\modules\applet\include\*.h $(EXPORTINC) $(XCF)
!endif
@ -2917,18 +2919,19 @@ exports:
-xcopy $(XPDIST)\public\applet\*.h $(EXPORTINC) $(XCF)
!endif
-xcopy $(XPDIST)\public\libreg\*.h $(EXPORTINC) $(XCF)
-xcopy $(XPDIST)\public\caps\*.h $(EXPORTINC) $(XCF)
!if defined(MOZ_OJI)
-xcopy $(XPDIST)\public\oji\*.h $(EXPORTINC) $(XCF)
!endif
-xcopy $(XPDIST)\public\hook\*.h $(EXPORTINC) $(XCF)
-xcopy $(XPDIST)\public\pref\*.h $(EXPORTINC) $(XCF)
!if defined(JAVA_OR_OJI)
!if defined(JAVA_OR_NSJVM)
-xcopy $(XPDIST)\public\edtplug\*.h $(EXPORTINC) $(XCF)
!endif
-xcopy $(XPDIST)\public\htmldlgs\*.h $(EXPORTINC) $(XCF)
-xcopy $(XPDIST)\public\softupdt\*.h $(EXPORTINC) $(XCF)
-xcopy $(XPDIST)\public\li\*.h $(EXPORTINC) $(XCF)
!if defined(JAVA_OR_OJI)
!if defined(JAVA_OR_NSJVM)
-xcopy $(XPDIST)\public\progress\*.h $(EXPORTINC) $(XCF)
!endif
-xcopy $(XPDIST)\public\schedulr\*.h $(EXPORTINC) $(XCF)
@ -2963,7 +2966,7 @@ ns.zip:
cd $(OUTDIR)
zip -9rpu ns.zip \
mozilla.exe \
!if defined(JAVA_OR_OJI)
!if defined(MOZ_JAVA)
java/bin/awt3240.dll \
java/bin/jbn3240.dll \
java/bin/jdb3240.dll \

21
cmd/winfe/mozilla.cpp
Просмотреть файл

@ -972,9 +972,6 @@ BOOL CNetscapeApp::InitInstance()
// Get the main NSPR event queue
mozilla_event_queue = PR_GetMainEventQueue();
#ifndef MOZ_NGLAYOUT
LM_InitMocha();
#endif /* MOZ_NGLAYOUT */
// Initialize the XP file extension mapping
NET_InitFileFormatTypes(NULL, NULL);
@ -1625,6 +1622,11 @@ BOOL CNetscapeApp::InitInstance()
STARTUP_np();
#ifndef MOZ_NGLAYOUT
LM_InitMocha();
#endif /* MOZ_NGLAYOUT */
// if PE mode, start up java too!
#if defined(OJI) || defined(JAVA)
if (m_bAccountSetupStartupJava) {
@ -1653,22 +1655,19 @@ BOOL CNetscapeApp::InitInstance()
#if defined(OJI) || defined(JAVA)
// if PE mode, check if java environment is valid
if (m_bAccountSetupStartupJava) {
PRBool started = PR_FALSE;
#ifdef OJI
JRIEnv* ee = NULL;
JVMMgr* jvmMgr = JVM_GetJVMMgr();
nsJVMMgr* jvmMgr = JVM_GetJVMMgr();
if (jvmMgr) {
NPIJVMPlugin* jvm = jvmMgr->GetJVM();
if (jvm) {
ee = jvm->EnsureExecEnv();
jvm->Release();
}
started = jvmMgr->StartupJVM() == nsJVMStatus_Running;
jvmMgr->Release();
}
#else
JRIEnv * ee = JRI_GetCurrentEnv();
started = ee != NULL;
#endif
if (ee == NULL) {
if (started) {
CString szJavaStartupErr = "You are starting up an application that needs java.\nPlease turn on java in your navigator's preference and try again.";
AfxMessageBox(szJavaStartupErr, MB_OK);
m_bAccountSetupStartupJava = FALSE;

18
cmd/winfe/woohoo.cpp
Просмотреть файл

@ -1198,7 +1198,7 @@ inline UINT CMapStringToObNoCase::HashKey(LPCTSTR key) const
void WFE_LJ_StartupJava(void)
{
#ifdef OJI
JVMMgr* jvmMgr = JVM_GetJVMMgr();
nsJVMMgr* jvmMgr = JVM_GetJVMMgr();
if (jvmMgr) {
jvmMgr->StartupJVM();
jvmMgr->Release();
@ -1211,21 +1211,7 @@ void WFE_LJ_StartupJava(void)
void WFE_LJ_StartDebugger(void)
{
#ifdef OJI
JVMMgr* jvmMgr = JVM_GetJVMMgr();
if (jvmMgr) {
NPIJVMPlugin* jvm = jvmMgr->GetJVM();
if (jvm) {
static NS_DEFINE_IID(kISymantecDebuggerIID, NP_ISYMANTECDEBUGGER_IID);
NPISymantecDebugger* debugger;
if (jvm->QueryInterface(kISymantecDebuggerIID, (void**)&debugger) == NS_OK) {
// XXX should we make sure the vm is started first?
debugger->StartDebugger(NPSymantecDebugPort_SharedMemory);
debugger->Release();
}
jvm->Release();
}
jvmMgr->Release();
}
JVM_StartDebugger();
#elif defined(JAVA)
LJ_StartDebugger(LJDebugPort_SharedMemory);
#endif