From fea93fe664499e6dee644a35dba5feeeeb6b1403 Mon Sep 17 00:00:00 2001 From: "bnesse%netscape.com" Date: Thu, 7 Feb 2002 23:03:22 +0000 Subject: [PATCH] Fix for bug 122997. Repair the 4.x MRJ plugin build. r=sfraser, sr=beard. --- plugin/oji/MRJ/plugin/MRJPlugin.xml | 1565 ++++++++++++++--- plugin/oji/MRJ/plugin/Resources/Version.rsrc | Bin 838 -> 0 bytes .../oji/MRJ/plugin/Source/BackwardAdapter.cpp | 99 +- .../oji/MRJ/plugin/Source/MRJNetworking.cpp | 2 +- 4 files changed, 1388 insertions(+), 278 deletions(-) diff --git a/plugin/oji/MRJ/plugin/MRJPlugin.xml b/plugin/oji/MRJ/plugin/MRJPlugin.xml index daed505e5f3..8bee12bb997 100644 --- a/plugin/oji/MRJ/plugin/MRJPlugin.xml +++ b/plugin/oji/MRJ/plugin/MRJPlugin.xml @@ -627,7 +627,7 @@ MWFTP_Post_hostName MWFTP_Post_username - MWFTP_Post_password2637t2an633daaiLp'ŒþŒô¿ÿÙ + MWFTP_Post_password MWFTP_Post_remoteDir MWFTP_Post_ftp_PathVersion0 MWFTP_Post_ftp_PathType0 @@ -1174,14 +1174,6 @@ Text Debug - - RootRelative - Project - :BackwardAdaptor.lib - MacOS - Unknown - Debug, TargetOutputFile - PathRelative Project @@ -1299,6 +1291,15 @@ Library Debug + + PathRelative + Project + : + :BackwardAdaptor.lib + MacOS + Library + Debug, TargetOutputFile + @@ -1322,12 +1323,6 @@ :Resources:Dialogs.rsrc MacOS - - RootRelative - Project - :BackwardAdaptor.lib - MacOS - PathRelative Project @@ -1510,14 +1505,22 @@ :Libraries:Runtime:Libs:MSL_Runtime_PPC.Lib MacOS + + PathRelative + Project + : + :BackwardAdaptor.lib + MacOS + BackwardAdaptor LinkAgainst - RootRelative + PathRelative Project + : :BackwardAdaptor.lib MacOS @@ -2055,7 +2058,7 @@ MWFTP_Post_hostName MWFTP_Post_username - MWFTP_Post_password2637t2an633daaiMp'ŒþŒô¿ÿÙ + MWFTP_Post_password MWFTP_Post_remoteDir MWFTP_Post_ftp_PathVersion0 MWFTP_Post_ftp_PathType0 @@ -2654,6 +2657,16 @@ FrameworkPathfalse HostFlagsAll + + SearchPath + Path:Java_Support:VM_Support:MRJ_Support: + PathFormatMacOS + PathRootCodeWarrior + + Recursivetrue + FrameworkPathfalse + HostFlagsAll + SearchPath Path:MSL: @@ -3074,7 +3087,7 @@ MWFTP_Post_hostName MWFTP_Post_username - MWFTP_Post_password2657j2un6535auiNp'ŒþŒô¿ÿÙ + MWFTP_Post_password MWFTP_Post_remoteDir MWFTP_Post_ftp_PathVersion0 MWFTP_Post_ftp_PathType0 @@ -3344,7 +3357,7 @@ MWProject_PPC_typeSharedLibrary - MWProject_PPC_outfileMRJPlugin + MWProject_PPC_outfileMRJPlugin (4.X) MWProject_PPC_filecreatorMOSS MWProject_PPC_filetypeNSPL MWProject_PPC_size0 @@ -3478,113 +3491,145 @@ - Name - Strings.rsrc + PathRelative + Project + : + :Resources:Strings.rsrc MacOS Resource Debug - Name - MRJContext.cp + PathRelative + Project + : + :Source:MRJContext.cp MacOS Text Debug - Name - MRJSession.cpp + PathRelative + Project + : + :Source:MRJSession.cpp MacOS Text Debug - Name - PluginNew.cpp + PathRelative + Project + : + :Source:PluginNew.cpp MacOS Text Debug - Name - SupportsMixin.cpp + PathRelative + Project + : + :Source:SupportsMixin.cpp MacOS Text Debug - Name - MRJPlugin.cpp + PathRelative + Project + : + :Source:MRJPlugin.cpp MacOS Text Debug - Name - Version.rsrc + PathRelative + Project + : + :Resources:Version.rsrc MacOS Resource Debug - Name - TopLevelFrame.cpp + PathRelative + Project + : + :Source:TopLevelFrame.cpp MacOS Text Debug - Name - MRJFrame.cpp + PathRelative + Project + : + :Source:MRJFrame.cpp MacOS Text Debug - Name - MRJConsole.cpp + PathRelative + Project + : + :Source:MRJConsole.cpp MacOS Text Debug - Name - MRJPage.cpp + PathRelative + Project + : + :Source:MRJPage.cpp MacOS Text Debug - Name - StringUtils.cpp + PathRelative + Project + : + :Source:StringUtils.cpp MacOS Text Debug - Name - LiveConnectNativeMethods.cpp + PathRelative + Project + : + :Source:LiveConnectNativeMethods.cpp MacOS Text Debug - Name - MRJMonitor.cpp + PathRelative + Project + : + :Source:MRJMonitor.cpp MacOS Text Debug - Name - CSecureEnv.cpp + PathRelative + Project + : + :Source:CSecureEnv.cpp MacOS Text Debug - Name - NativeMonitor.cpp + PathRelative + Project + : + :Source:NativeMonitor.cpp MacOS Text Debug @@ -3598,92 +3643,127 @@ Debug, TargetOutputFile - Name - JSEvaluator.cpp + PathRelative + Project + : + :Source:JSEvaluator.cpp MacOS Text Debug - Name - EmbeddedFrame.cpp + PathRelative + Project + : + :Source:EmbeddedFrame.cpp MacOS Text Debug - Name - EmbeddedFramePluginInstance.cpp + PathRelative + Project + : + :Source:EmbeddedFramePluginInstance.cpp MacOS Text Debug - Name - RunnableMixin.cpp + PathRelative + Project + : + :Source:RunnableMixin.cpp MacOS Text Debug - Name - Dialogs.rsrc + PathRelative + Project + : + :Resources:Dialogs.rsrc MacOS Resource Debug - Name - JManagerLib + PathRelative + CodeWarrior + :MacOS Support: + :Universal:Libraries:StubLibraries:JManagerLib MacOS Library Debug - Name - InterfaceLib + PathRelative + CodeWarrior + :MacOS Support: + :Universal:Libraries:StubLibraries:InterfaceLib MacOS Library Debug - Name - AppearanceLib + PathRelative + CodeWarrior + :MacOS Support: + :Universal:Libraries:StubLibraries:AppearanceLib MacOS Library Debug - Name - StdCLib + PathRelative + CodeWarrior + :MacOS Support: + :Universal:Libraries:StubLibraries:TextCommon MacOS Library Debug - Name - TextCommon + PathRelative + CodeWarrior + :MacOS Support: + :Libraries:Runtime:Libs:MSL_Runtime_PPC.Lib MacOS Library Debug - Name - MSL_Runtime_PPC.Lib + PathRelative + CodeWarrior + :MSL: + :MSL_C:MSL_MacOS:Lib:PPC:MSL_C_PPC.Lib MacOS Library Debug - Name - MSL_C_PPC.Lib + PathRelative + CodeWarrior + :MacOS Support: + :Universal:Libraries:StubLibraries:MathLib MacOS Library Debug - Name - MathLib + PathRelative + Project + : + :Source:MRJNetworking.cpp + MacOS + Text + Debug + + + PathRelative + Project + : + :Source:JMURLConnection MacOS Library Debug @@ -3691,18 +3771,24 @@ - Name - Version.rsrc + PathRelative + Project + : + :Resources:Version.rsrc MacOS - Name - Strings.rsrc + PathRelative + Project + : + :Resources:Strings.rsrc MacOS - Name - Dialogs.rsrc + PathRelative + Project + : + :Resources:Dialogs.rsrc MacOS @@ -3712,133 +3798,192 @@ MacOS - Name - MRJPlugin.cpp + PathRelative + Project + : + :Source:MRJPlugin.cpp MacOS - Name - MRJContext.cp + PathRelative + Project + : + :Source:MRJContext.cp MacOS - Name - MRJSession.cpp + PathRelative + Project + : + :Source:MRJSession.cpp MacOS - Name - MRJFrame.cpp + PathRelative + Project + : + :Source:MRJFrame.cpp MacOS - Name - TopLevelFrame.cpp + PathRelative + Project + : + :Source:TopLevelFrame.cpp MacOS - Name - MRJConsole.cpp + PathRelative + Project + : + :Source:MRJConsole.cpp MacOS - Name - PluginNew.cpp + PathRelative + Project + : + :Source:PluginNew.cpp MacOS - Name - SupportsMixin.cpp + PathRelative + Project + : + :Source:SupportsMixin.cpp MacOS - Name - MRJPage.cpp + PathRelative + Project + : + :Source:MRJPage.cpp MacOS - Name - StringUtils.cpp + PathRelative + Project + : + :Source:StringUtils.cpp MacOS - Name - LiveConnectNativeMethods.cpp + PathRelative + Project + : + :Source:LiveConnectNativeMethods.cpp MacOS - Name - MRJMonitor.cpp + PathRelative + Project + : + :Source:MRJMonitor.cpp MacOS - Name - CSecureEnv.cpp + PathRelative + Project + : + :Source:CSecureEnv.cpp MacOS - Name - NativeMonitor.cpp + PathRelative + Project + : + :Source:NativeMonitor.cpp MacOS - Name - JSEvaluator.cpp + PathRelative + Project + : + :Source:JSEvaluator.cpp MacOS - Name - EmbeddedFrame.cpp + PathRelative + Project + : + :Source:EmbeddedFrame.cpp MacOS - Name - EmbeddedFramePluginInstance.cpp + PathRelative + Project + : + :Source:EmbeddedFramePluginInstance.cpp MacOS - Name - RunnableMixin.cpp + PathRelative + Project + : + :Source:RunnableMixin.cpp MacOS - Name - JManagerLib + PathRelative + CodeWarrior + :MacOS Support: + :Universal:Libraries:StubLibraries:JManagerLib MacOS - Name - InterfaceLib + PathRelative + CodeWarrior + :MacOS Support: + :Universal:Libraries:StubLibraries:InterfaceLib MacOS - Name - AppearanceLib + PathRelative + CodeWarrior + :MacOS Support: + :Universal:Libraries:StubLibraries:AppearanceLib MacOS - Name - StdCLib + PathRelative + CodeWarrior + :MacOS Support: + :Universal:Libraries:StubLibraries:TextCommon MacOS - Name - TextCommon + PathRelative + CodeWarrior + :MacOS Support: + :Libraries:Runtime:Libs:MSL_Runtime_PPC.Lib MacOS - Name - MSL_Runtime_PPC.Lib + PathRelative + CodeWarrior + :MSL: + :MSL_C:MSL_MacOS:Lib:PPC:MSL_C_PPC.Lib MacOS - Name - MSL_C_PPC.Lib + PathRelative + CodeWarrior + :MacOS Support: + :Universal:Libraries:StubLibraries:MathLib MacOS - Name - MathLib + PathRelative + Project + : + :Source:MRJNetworking.cpp + MacOS + + + PathRelative + Project + : + :Source:JMURLConnection MacOS @@ -4244,7 +4389,7 @@ MWFTP_Post_hostName MWFTP_Post_username - MWFTP_Post_password2657j2un6535auiOp'ŒþŒô¿ÿÙ + MWFTP_Post_password MWFTP_Post_remoteDir MWFTP_Post_ftp_PathVersion0 MWFTP_Post_ftp_PathType0 @@ -5184,7 +5329,7 @@ MWFTP_Post_hostName MWFTP_Post_username - MWFTP_Post_password2657j2un6535auiPp'ŒþŒô¿ÿÙ + MWFTP_Post_password MWFTP_Post_remoteDir MWFTP_Post_ftp_PathVersion0 MWFTP_Post_ftp_PathType0 @@ -5255,7 +5400,7 @@ MWJava_Output_outputtypeJarFile - MWJava_Output_outfileJavaClasses.jar + MWJava_Output_outfileMRJPlugin.jar MWJava_Output_ftype1514754080 MWJava_Output_fcreator1297570384 MWJava_Output_compress0 @@ -5588,99 +5733,125 @@ - Name - JNIUtils.java + PathRelative + Project + : + :Source:JNIUtils.java MacOS Text Debug - Name - JNIThread.java + PathRelative + Project + : + :Source:JNIThread.java MacOS Text Debug - Name - JDKClasses.zip + PathRelative + System + :Extensions:MRJ Libraries:MRJClasses: + :JDKClasses.zip MacOS Unknown - Name + PathRelative ConsoleApplet.jar MacOS Unknown - MergeLibrary + MergeLibrary, TargetOutputFile - Name - netscape.plugin.jar + PathRelative + Project + : + :netscape.plugin.jar MacOS Unknown - Name - MRJPlugin.java + PathRelative + Project + : + :Source:MRJPlugin.java MacOS Text Debug - Name - AWTUtils.java + PathRelative + Project + : + :Source:AWTUtils.java MacOS Text Debug - Name - MRJClasses.zip + PathRelative + System + :Extensions:MRJ Libraries:MRJClasses: + :MRJClasses.zip MacOS Unknown - Name - PrintingPort.java + PathRelative + Project + : + :Source:PrintingPort.java MacOS Text Debug - Name - JSException.java + PathRelative + Project + :::::js:src:liveconnect:classes:netscape:javascript: + :JSException.java MacOS Text Debug - Name - JSObject.java + PathRelative + Project + :::::js:src:liveconnect:classes:netscape:javascript: + :JSObject.java MacOS Text Debug - Name - JSProxy.java + PathRelative + Project + :::::js:src:liveconnect:classes:netscape:javascript: + :JSProxy.java MacOS Text Debug - Name - JSRunnable.java + PathRelative + Project + :::::js:src:liveconnect:classes:netscape:javascript: + :JSRunnable.java MacOS Text Debug - Name - JSUtil.java + PathRelative + Project + :::::js:src:liveconnect:classes:netscape:javascript: + :JSUtil.java MacOS Text Debug @@ -5688,73 +5859,1050 @@ - Name - JNIUtils.java + PathRelative + Project + : + :Source:JNIUtils.java MacOS - Name - JNIThread.java + PathRelative + Project + : + :Source:JNIThread.java MacOS - Name - JDKClasses.zip + PathRelative + System + :Extensions:MRJ Libraries:MRJClasses: + :JDKClasses.zip MacOS - Name - MRJClasses.zip + PathRelative + System + :Extensions:MRJ Libraries:MRJClasses: + :MRJClasses.zip MacOS - Name + PathRelative ConsoleApplet.jar MacOS - Name - netscape.plugin.jar + PathRelative + Project + : + :netscape.plugin.jar MacOS - Name - MRJPlugin.java + PathRelative + Project + : + :Source:MRJPlugin.java MacOS - Name - AWTUtils.java + PathRelative + Project + : + :Source:AWTUtils.java MacOS - Name - PrintingPort.java + PathRelative + Project + : + :Source:PrintingPort.java MacOS - Name - JSException.java + PathRelative + Project + :::::js:src:liveconnect:classes:netscape:javascript: + :JSException.java MacOS - Name - JSObject.java + PathRelative + Project + :::::js:src:liveconnect:classes:netscape:javascript: + :JSObject.java MacOS - Name - JSProxy.java + PathRelative + Project + :::::js:src:liveconnect:classes:netscape:javascript: + :JSProxy.java MacOS - Name - JSRunnable.java + PathRelative + Project + :::::js:src:liveconnect:classes:netscape:javascript: + :JSRunnable.java MacOS - Name - JSUtil.java + PathRelative + Project + :::::js:src:liveconnect:classes:netscape:javascript: + :JSUtil.java + MacOS + + + + + ConsoleApplet.jar + LinkAgainst + + PathRelative + ConsoleApplet.jar + MacOS + + + + + + ConsoleApplet.jar + + + + UserSourceTrees + + + AlwaysSearchUserPathsfalse + InterpretDOSAndUnixPathsfalse + RequireFrameworkStyleIncludesfalse + UserSearchPaths + + SearchPath + Path: + PathFormatMacOS + PathRootProject + + Recursivetrue + FrameworkPathfalse + HostFlagsAll + + + SearchPath + Path:::::js:src:liveconnect:classes:netscape:javascript: + PathFormatMacOS + PathRootProject + + Recursivetrue + FrameworkPathfalse + HostFlagsAll + + + SystemSearchPaths + + SearchPath + Path:Extensions:MRJ Libraries:MRJClasses: + PathFormatMacOS + PathRootSystem + + Recursivetrue + FrameworkPathfalse + HostFlagsAll + + + SearchPath + Path: + PathFormatMacOS + PathRootCodeWarrior + + Recursivetrue + FrameworkPathfalse + HostFlagsAll + + + + + MWRuntimeSettings_WorkingDirectory + MWRuntimeSettings_CommandLine + MWRuntimeSettings_HostApplication + Path + PathFormatGeneric + PathRootAbsolute + + MWRuntimeSettings_EnvVars + + + LinkerJava Linker + PreLinker + PostLinker + TargetnameConsoleApplet.jar + OutputDirectory + Path: + PathFormatMacOS + PathRootProject + + SaveEntriesUsingRelativePathsfalse + + + FileMappings + + FileTypeAPPL + FileExtension + Compiler + EditLanguage + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeAppl + FileExtension + Compiler + EditLanguage + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeGIFf + FileExtension.gif + CompilerJAR Importer + EditLanguage + Precompilefalse + Launchabletrue + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeJPEG + FileExtension.jpg + CompilerJAR Importer + EditLanguage + Precompilefalse + Launchabletrue + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeMWCD + FileExtension + Compiler + EditLanguage + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeRSRC + FileExtension + Compiler + EditLanguage + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.bh + CompilerBalloon Help + EditLanguage + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.c + CompilerRunTSScript + EditLanguage + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.html + Compiler + EditLanguage + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMaketrue + + + FileTypeTEXT + FileExtension.java + CompilerMW Java + EditLanguage + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.mf + Compiler + EditLanguage + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypeTEXT + FileExtension.r + CompilerRez + EditLanguage + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypedocu + FileExtension + Compiler + EditLanguage + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileTypersrc + FileExtension + Compiler + EditLanguage + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileExtension.au + CompilerJAR Importer + EditLanguage + Precompilefalse + Launchabletrue + ResourceFilefalse + IgnoredByMakefalse + + + FileExtension.class + CompilerMW Java + EditLanguage + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMakefalse + + + FileExtension.gif + CompilerJAR Importer + EditLanguage + Precompilefalse + Launchabletrue + ResourceFilefalse + IgnoredByMakefalse + + + FileExtension.jar + CompilerMW Java + EditLanguage + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMaketrue + + + FileExtension.jpeg + CompilerJAR Importer + EditLanguage + Precompilefalse + Launchabletrue + ResourceFilefalse + IgnoredByMakefalse + + + FileExtension.zip + CompilerMW Java + EditLanguage + Precompilefalse + Launchablefalse + ResourceFilefalse + IgnoredByMaketrue + + + + + CacheModDatesfalse + ActivateBrowsertrue + DumpBrowserInfofalse + CacheSubprojectsfalse + UseThirdPartyDebuggerfalse + DebuggerAppPath + Path + PathFormatGeneric + PathRootAbsolute + + DebuggerCmdLineArgs + DebuggerWorkingDir + Path + PathFormatGeneric + PathRootAbsolute + + + + LogSystemMessagestrue + AutoTargetDLLsfalse + StopAtWatchpointstrue + PauseWhileRunningfalse + PauseInterval5 + PauseUIFlags0 + AltExePath + Path + PathFormatGeneric + PathRootAbsolute + + StopAtTempBPOnLaunchtrue + CacheSymbolicstrue + TempBPFunctionNamemain + TempBPType0 + + + Enabledfalse + ConnectionName + DownloadPath + LaunchRemoteAppfalse + RemoteAppPath + + + OtherExecutables + + + CustomColor1 + Red0 + Green32767 + Blue0 + + CustomColor2 + Red0 + Green32767 + Blue0 + + CustomColor3 + Red0 + Green32767 + Blue0 + + CustomColor4 + Red0 + Green32767 + Blue0 + + + + MWFrontEnd_C_cplusplus0 + MWFrontEnd_C_checkprotos0 + MWFrontEnd_C_arm0 + MWFrontEnd_C_trigraphs0 + MWFrontEnd_C_onlystdkeywords0 + MWFrontEnd_C_enumsalwaysint0 + MWFrontEnd_C_mpwpointerstyle0 + MWFrontEnd_C_prefixname + MWFrontEnd_C_ansistrict0 + MWFrontEnd_C_mpwcnewline0 + MWFrontEnd_C_wchar_type1 + MWFrontEnd_C_enableexceptions1 + MWFrontEnd_C_dontreusestrings0 + MWFrontEnd_C_poolstrings0 + MWFrontEnd_C_dontinline0 + MWFrontEnd_C_useRTTI1 + MWFrontEnd_C_multibyteaware0 + MWFrontEnd_C_unsignedchars0 + MWFrontEnd_C_autoinline0 + MWFrontEnd_C_booltruefalse1 + MWFrontEnd_C_direct_to_som0 + MWFrontEnd_C_som_env_check0 + MWFrontEnd_C_alwaysinline0 + MWFrontEnd_C_inlinelevel0 + MWFrontEnd_C_ecplusplus0 + MWFrontEnd_C_objective_c0 + MWFrontEnd_C_defer_codegen0 + + + MWWarning_C_warn_illpragma0 + MWWarning_C_warn_emptydecl0 + MWWarning_C_warn_possunwant0 + MWWarning_C_warn_unusedvar0 + MWWarning_C_warn_unusedarg0 + MWWarning_C_warn_extracomma0 + MWWarning_C_pedantic0 + MWWarning_C_warningerrors0 + MWWarning_C_warn_hidevirtual0 + MWWarning_C_warn_implicitconv0 + MWWarning_C_warn_notinlined0 + MWWarning_C_warn_structclass0 + + + MWFTP_Post_hostName + MWFTP_Post_username + MWFTP_Post_password + MWFTP_Post_remoteDir + MWFTP_Post_ftp_PathVersion0 + MWFTP_Post_ftp_PathType0 + MWFTP_Post_ftp_PathFormat0 + MWFTP_Post_ftp_tree + MWFTP_Post_uploadDir + MWFTP_Post_ftp_port21 + MWFTP_Post_SendBin1 + MWFTP_Post_ShouldLog1 + + + MWCommandLine_Java_clsName + MWCommandLine_Java_args + + + MWVJavaDebugging_Protocol1 + MWVJavaDebugging_JDKVersion1 + MWVJavaDebugging_TimeOut25 + MWVJavaDebugging_SupportSlowDevicesfalse + + + MWJava_Language_optimizefalse + MWJava_Language_warnDeprecatedfalse + MWJava_Language_emitMapfalse + MWJava_Language_strictFileNamesfalse + MWJava_Language_strictFileHierarchyfalse + MWJava_Language_1_1_Compatiblefalse + MWJava_Language_emitHeaders0 + MWJava_Language_headerTypeJNINativeHeaders + MWJava_Language_packageFilter + MWJava_Language_genCommentstrue + MWJava_Language_genHeadersfalse + + + MWJava_MRJAppBuilder_outFileMRJApplication + MWJava_MRJAppBuilder_mergefalse + MWJava_MRJAppBuilder_quitMenutrue + MWJava_MRJAppBuilder_growfalse + MWJava_MRJAppBuilder_stdoutTypeConsole + MWJava_MRJAppBuilder_stderrTypeConsole + MWJava_MRJAppBuilder_stdinTypeConsole + MWJava_MRJAppBuilder_appIconPVersion0 + MWJava_MRJAppBuilder_appIconPType0 + MWJava_MRJAppBuilder_appIconPFormat0 + MWJava_MRJAppBuilder_appIconPTree + MWJava_MRJAppBuilder_appIconFile + MWJava_MRJAppBuilder_splashScreenPVersion0 + MWJava_MRJAppBuilder_splashScreenPType0 + MWJava_MRJAppBuilder_splashScreenPFormat0 + MWJava_MRJAppBuilder_splashScreenPTree + MWJava_MRJAppBuilder_splashScreenPICTFile + MWJava_MRJAppBuilder_aboutName + MWJava_MRJAppBuilder_stdoutPVersion0 + MWJava_MRJAppBuilder_stdoutPType0 + MWJava_MRJAppBuilder_stdoutPFormat0 + MWJava_MRJAppBuilder_stdoutPTree + MWJava_MRJAppBuilder_stdoutFile + MWJava_MRJAppBuilder_stdoutAppendfalse + MWJava_MRJAppBuilder_stderrPType0 + MWJava_MRJAppBuilder_stderrPFormat0 + MWJava_MRJAppBuilder_stderrPTree + MWJava_MRJAppBuilder_stderrFile + MWJava_MRJAppBuilder_stderrAppendfalse + MWJava_MRJAppBuilder_stdinPType0 + MWJava_MRJAppBuilder_stdinPFormat0 + MWJava_MRJAppBuilder_stdinPTree + MWJava_MRJAppBuilder_stdinFile + + + MWJava_Output_outputtypeJarFile + MWJava_Output_outfileConsoleApplet.jar + MWJava_Output_ftype1514754080 + MWJava_Output_fcreator1297570384 + MWJava_Output_compress0 + MWJava_Output_genManifest0 + MWJava_Output_trunctypeFront + MWJava_Output_deleteClasses0 + MWJava_Output_consoleApp1 + + + MWJava_Proj_projtypeApplet + MWJava_Proj_mainClassName + MWJava_Proj_HTMLAppCreator1145457748 + MWJava_Proj_HTMLAppNameMetrowerks Java + MWJava_Proj_PathVersion1 + MWJava_Proj_PathType0 + MWJava_Proj_PathFormat0 + MWJava_Proj_tree + MWJava_Proj_HTMLAppWin32NameInternet Explorer + MWJava_Proj_compress0 + MWJava_Proj_useVM1 + MWJava_Proj_vmarguments + MWJava_Proj_vmName + MWJava_Proj_simPropFile + + + MWJavaDoc_Proj_Version1 + MWJavaDoc_Proj_Depricated1 + MWJavaDoc_Proj_Author1 + MWJavaDoc_Proj_Index1 + MWJavaDoc_Proj_Tree1 + MWJavaDoc_Proj_SunResolveToSame0 + MWJavaDoc_Proj_Shortnames1 + MWJavaDoc_Proj_Folder0 + MWJavaDoc_Proj_GenerateAPILinks0 + MWJavaDoc_Proj_scopePublic + MWJavaDoc_Proj_fcreator1297303877 + MWJavaDoc_Proj_encodingName + MWJavaDoc_Proj_decodingName + MWJavaDoc_Proj_javaPackagePathhttp://java.sun.com/products/jdk/1.1/docs/api/ + + + MWMerge_MacOS_projectTypeApplication + MWMerge_MacOS_outputNameMerge Out + MWMerge_MacOS_outputCreator???? + MWMerge_MacOS_outputTypeAPPL + MWMerge_MacOS_suppressWarning0 + MWMerge_MacOS_copyFragments1 + MWMerge_MacOS_copyResources1 + MWMerge_MacOS_flattenResource0 + MWMerge_MacOS_flatFileNamea.rsrc + MWMerge_MacOS_flatFileOutputPath + Path: + PathFormatMacOS + PathRootProject + + MWMerge_MacOS_skipResources + + + i£ø + + + + + FileLockedfalse + ResourcesMapIsReadOnlyfalse + PrinterDriverIsMultiFinderCompatiblefalse + Invisiblefalse + HasBundlefalse + NameLockedfalse + Stationeryfalse + HasCustomIconfalse + Sharedfalse + HasBeenInitedfalse + Label0 + Comments + + + MWMacOSPackager_UsePackager0 + MWMacOSPackager_FolderToPackage + Path: + PathFormatMacOS + PathRootProject + + MWMacOSPackager_CreateClassicAlias0 + MWMacOSPackager_ClassicAliasMethodUseTargetOutput + MWMacOSPackager_ClassicAliasPath + Path: + PathFormatMacOS + PathRootProject + + MWMacOSPackager_CreatePkgInfo0 + MWMacOSPackager_PkgCreatorType???? + MWMacOSPackager_PkgFileTypeAPPL + + + MWCodeGen_PPC_structalignmentMC68K + MWCodeGen_PPC_tracebacktablesNone + MWCodeGen_PPC_processorGeneric + MWCodeGen_PPC_readonlystrings0 + MWCodeGen_PPC_tocdata1 + MWCodeGen_PPC_profiler0 + MWCodeGen_PPC_fpcontract1 + MWCodeGen_PPC_schedule0 + MWCodeGen_PPC_peephole1 + MWCodeGen_PPC_processorspecific0 + MWCodeGen_PPC_altivec0 + MWCodeGen_PPC_vectortocdata0 + MWCodeGen_PPC_vrsave0 + + + MWCodeGen_MachO_structalignmentPPC + MWCodeGen_MachO_tracebacktablesNone + MWCodeGen_MachO_processorGeneric + MWCodeGen_MachO_readonlystrings0 + MWCodeGen_MachO_profiler0 + MWCodeGen_MachO_fpcontract1 + MWCodeGen_MachO_schedule0 + MWCodeGen_MachO_peephole1 + MWCodeGen_MachO_processorspecific0 + MWCodeGen_MachO_altivec0 + MWCodeGen_MachO_vrsave1 + MWCodeGen_MachO_common0 + MWCodeGen_MachO_implicit_templates1 + + + MWDisassembler_PPC_showcode1 + MWDisassembler_PPC_extended1 + MWDisassembler_PPC_mix0 + MWDisassembler_PPC_nohex0 + MWDisassembler_PPC_showdata1 + MWDisassembler_PPC_showexceptions1 + MWDisassembler_PPC_showsym0 + MWDisassembler_PPC_shownames1 + + + GlobalOptimizer_PPC_optimizationlevelLevel0 + GlobalOptimizer_PPC_optforSpeed + + + MWLinker_PPC_linksym1 + MWLinker_PPC_symfullpath1 + MWLinker_PPC_linkmap0 + MWLinker_PPC_nolinkwarnings0 + MWLinker_PPC_dontdeadstripinitcode0 + MWLinker_PPC_permitmultdefs0 + MWLinker_PPC_linkmodeFast + MWLinker_PPC_initname + MWLinker_PPC_mainname__start + MWLinker_PPC_termname + + + MWLinker_MachO_exportsNone + MWLinker_MachO_mainnamestart + MWLinker_MachO_currentversion0 + MWLinker_MachO_compatibleversion0 + MWLinker_MachO_symfullpath0 + MWLinker_MachO_supresswarnings0 + MWLinker_MachO_multisymerror0 + MWLinker_MachO_prebind1 + MWLinker_MachO_deadstrip1 + MWLinker_MachO_objectivecsemantics0 + MWLinker_MachO_whichfileloaded0 + MWLinker_MachO_whyfileloaded0 + MWLinker_MachO_readonlyrelocsErrors + MWLinker_MachO_undefinedsymbolsErrors + MWLinker_MachO_twolevelnamespace1 + MWLinker_MachO_stripdebugsymbols0 + + + MWProject_MachO_typeExecutable + MWProject_MachO_outfilea.exe + MWProject_MachO_filecreator???? + MWProject_MachO_filetypeMEXE + MWProject_MachO_stacksize64 + MWProject_MachO_stackaddress0 + MWProject_MachO_flatrsrc1 + MWProject_MachO_flatrsrcfilenamea.rsrc + MWProject_MachO_flatrsrcoutputdir + Path: + PathFormatMacOS + PathRootProject + + MWProject_MachO_installpath./ + + + MWPEF_exportsNone + MWPEF_libfolder0 + MWPEF_sortcodeNone + MWPEF_expandbss0 + MWPEF_sharedata0 + MWPEF_olddefversion0 + MWPEF_oldimpversion0 + MWPEF_currentversion0 + MWPEF_fragmentname + MWPEF_collapsereloads0 + + + MWProject_PPC_typeApplication + MWProject_PPC_outfilea.out + MWProject_PPC_filecreator???? + MWProject_PPC_filetypeAPPL + MWProject_PPC_size384 + MWProject_PPC_minsize384 + MWProject_PPC_stacksize64 + MWProject_PPC_flags22720 + MWProject_PPC_symfilename + MWProject_PPC_rsrcname + MWProject_PPC_rsrcheaderNative + MWProject_PPC_rsrctype???? + MWProject_PPC_rsrcid0 + MWProject_PPC_rsrcflags0 + MWProject_PPC_rsrcstore0 + MWProject_PPC_rsrcmerge0 + MWProject_PPC_flatrsrc0 + MWProject_PPC_flatrsrcoutputdir + Path: + PathFormatMacOS + PathRootProject + + MWProject_PPC_flatrsrcfilename + + + MWAssembler_PPC_auxheader0 + MWAssembler_PPC_symmodeMac + MWAssembler_PPC_dialectPPC + MWAssembler_PPC_prefixfile + MWAssembler_PPC_typecheck0 + MWAssembler_PPC_warnings0 + MWAssembler_PPC_casesensitive0 + + + MWRez_Language_maxwidth80 + MWRez_Language_scriptRoman + MWRez_Language_alignmentAlign1 + MWRez_Language_filtermodeFilterSkip + MWRez_Language_suppresswarnings0 + MWRez_Language_escapecontrolchars1 + MWRez_Language_prefixname + MWRez_Language_filteredtypes'CODE' 'DATA' 'PICT' + + + MWWinRC_prefixname + + + MWCodeGen_X86_processorGeneric + MWCodeGen_X86_alignmentbytes8 + MWCodeGen_X86_exceptionsZeroOverhead + MWCodeGen_X86_extinst_mmx0 + MWCodeGen_X86_extinst_3dnow0 + MWCodeGen_X86_use_mmx_3dnow_convention0 + MWCodeGen_X86_machinecodelisting0 + MWCodeGen_X86_intrinsics0 + MWCodeGen_X86_syminfo0 + MWCodeGen_X86_codeviewinfo1 + MWCodeGen_X86_extinst_cmov_fcomi0 + MWCodeGen_X86_extinst_sse0 + + + PDisasmX86_showHeaderstrue + PDisasmX86_showSymTabtrue + PDisasmX86_showCodetrue + PDisasmX86_showSourcefalse + PDisasmX86_showHextrue + PDisasmX86_showRelocationtrue + PDisasmX86_showCommentsfalse + PDisasmX86_showDebugfalse + PDisasmX86_showExceptionsfalse + PDisasmX86_showDatatrue + PDisasmX86_showRawfalse + PDisasmX86_verbosetrue + + + MWDebugger_X86_Exceptions + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + + GlobalOptimizer_X86_optimizationlevelLevel0 + GlobalOptimizer_X86_optforSpeed + + + MWLinker_X86_entrypointusageDefault + MWLinker_X86_entrypoint + MWLinker_X86_subsystemWinGUI + MWLinker_X86_subsysmajorid4 + MWLinker_X86_subsysminorid0 + MWLinker_X86_usrmajorid0 + MWLinker_X86_usrminorid0 + MWLinker_X86_commandfile + MWLinker_X86_generatemap0 + MWLinker_X86_linksym0 + MWLinker_X86_linkCV1 + + + MWProject_X86_typeApplication + MWProject_X86_outfilenoname.exe + MWProject_X86_baseaddress4194304 + MWProject_X86_maxstacksize1024 + MWProject_X86_minstacksize4 + MWProject_X86_size1024 + MWProject_X86_minsize4 + MWProject_X86_importlib + xpidl Settings + 0001000101000000000000000000000000000000000000000000000000000000 + 0000000000000000 + + + + + PathRelative + Project + : + :Source:JNIUtils.java + MacOS + Text + Debug + + + PathRelative + Project + : + :Source:JNIThread.java + MacOS + Text + Debug + + + PathRelative + System + :Extensions:MRJ Libraries:MRJClasses: + :JDKClasses.zip + MacOS + Unknown + + + + PathRelative + Project + : + :Source:MRJConsole.java + MacOS + Text + Debug + + + PathRelative + Project + :::::js:src:liveconnect:classes:netscape:javascript: + :JSException.java + MacOS + Text + Debug + + + PathRelative + Project + :::::js:src:liveconnect:classes:netscape:javascript: + :JSObject.java + MacOS + Text + Debug + + + PathRelative + Project + :::::js:src:liveconnect:classes:netscape:javascript: + :JSProxy.java + MacOS + Text + Debug + + + PathRelative + Project + :::::js:src:liveconnect:classes:netscape:javascript: + :JSRunnable.java + MacOS + Text + Debug + + + PathRelative + Project + :::::js:src:liveconnect:classes:netscape:javascript: + :JSUtil.java + MacOS + Text + Debug + + + + + PathRelative + Project + : + :Source:JNIUtils.java + MacOS + + + PathRelative + Project + : + :Source:JNIThread.java + MacOS + + + PathRelative + System + :Extensions:MRJ Libraries:MRJClasses: + :JDKClasses.zip + MacOS + + + PathRelative + Project + : + :Source:MRJConsole.java + MacOS + + + PathRelative + Project + :::::js:src:liveconnect:classes:netscape:javascript: + :JSException.java + MacOS + + + PathRelative + Project + :::::js:src:liveconnect:classes:netscape:javascript: + :JSObject.java + MacOS + + + PathRelative + Project + :::::js:src:liveconnect:classes:netscape:javascript: + :JSProxy.java + MacOS + + + PathRelative + Project + :::::js:src:liveconnect:classes:netscape:javascript: + :JSRunnable.java + MacOS + + + PathRelative + Project + :::::js:src:liveconnect:classes:netscape:javascript: + :JSUtil.java MacOS @@ -5767,6 +6915,7 @@ BackwardAdaptor MRJPlugin.jar MRJPlugin.jar (4.X) + ConsoleApplet.jar @@ -5819,6 +6968,14 @@ :Source:MRJFrame.cpp MacOS + + MRJPlugin (4.X) + PathRelative + Project + : + :Source:MRJNetworking.cpp + MacOS + MRJPlugin PathRelative @@ -6013,8 +7170,10 @@ MRJPlugin (4.X) - Name - StdCLib + PathRelative + Project + : + :Source:JMURLConnection MacOS @@ -6026,7 +7185,7 @@ MacOS - MRJPlugin + MRJPlugin (4.X) RootRelative Project :BackwardAdaptor.lib @@ -6080,20 +7239,24 @@ MRJPlugin.jar (4.X) MRJPlugin.jar (4.X) - Name + PathRelative ConsoleApplet.jar MacOS MRJPlugin.jar (4.X) - Name - netscape.plugin.jar + PathRelative + Project + : + :netscape.plugin.jar MacOS MRJPlugin.jar (4.X) - Name - MRJPlugin.java + PathRelative + Project + : + :Source:MRJPlugin.java MacOS diff --git a/plugin/oji/MRJ/plugin/Resources/Version.rsrc b/plugin/oji/MRJ/plugin/Resources/Version.rsrc index 113a33c0a27c00cf318b2fab8434ee8930529120..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 GIT binary patch literal 0 HcmV?d00001 literal 838 zcmZuvPiqrF6o1*Zhk{7;pi*Ny7ylH}&1Rt~38aN?t3-&Dv{Z`-P9~Fd)7_mgv)gJf z_Tok9m+&A6BJ@%eKZ8doK1y zWk7qQ?XHTrkEK5*^~drZ|9bZ|g^cgufe#$nr~Hkn#f|5myUCrFhwdb4ev*z0W zPcNa<8KU{u(AGW4ukEuRFzOXtcpsP*tBRrK{B9?I<3S(}Jm06~p&$3Xuq*~%xz&C$ za@$;qSTe5g&e7XHAATN00=&X*PgE?s z<6KA9WIcHVS>X{S4n{oAN7R$J68TJAF?=Jv{!WCsQ-%lyK^%IFMmQ0wM4BP9NTpV* z%{#VjkB?UI?!u}09t#wq2Zknx{g@8ep6-*wcD*j@B{0s buffer_t; + typedef std::vector buffer_t; buffer_t mBuffer; size_t mOffset; bool mComplete;