edburns%acm.org
b81470eb5b
checkpoint
...
git-svn-id: svn://10.0.0.236/trunk@214162 18797224-902f-48f8-a5cc-f745e15eee43
2006-10-26 13:46:57 +00:00
edburns%acm.org
0ad64df91a
M mozilla/Makefile.in
...
- add nspr to libs
M mozilla/nppluglet.cpp
- make sure to store instance pointer for return to browser, this enables
shutdown to work properly
- When HasPlugletForMimeType is called multiple times, actually check
the mime type.
M mozilla/nsISimplePlugin.idl
- Fix this so it's callable from JavaScript
M src/PlugletsDir.cpp
- Fix bug for multiple plugin instances
Index: mozilla/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/java/plugins/mozilla/Makefile.in,v
retrieving revision 1.1
diff -u -r1.1 Makefile.in
--- mozilla/Makefile.in 7 Oct 2006 23:31:52 -0000 1.1
+++ mozilla/Makefile.in 14 Oct 2006 12:26:06 -0000
@@ -59,7 +59,7 @@
XPIDLSRCS = nsISimplePlugin.idl
-SHARED_LIBRARY_LIBS = $(PLUGIN_SDK)/samples/common/$(LIB_PREFIX)plugingate_s.$(LIB_SUFFIX) ../src/$(LIB_PREFIX)pluglet_s.$(LIB_SUFFIX)
+SHARED_LIBRARY_LIBS = $(PLUGIN_SDK)/samples/common/$(LIB_PREFIX)plugingate_s.$(LIB_SUFFIX) ../src/$(LIB_PREFIX)pluglet.$(LIB_SUFFIX) $(XPCOM_LIBS) $(NSPR_LIBS)
ifeq ($(OS_ARCH),WINNT)
DEFFILE = $(win_srcdir)/nppluglet.def
Index: mozilla/nppluglet.cpp
===================================================================
RCS file: /cvsroot/mozilla/java/plugins/mozilla/nppluglet.cpp,v
retrieving revision 1.3
diff -u -r1.3 nppluglet.cpp
--- mozilla/nppluglet.cpp 13 Oct 2006 14:45:14 -0000 1.3
+++ mozilla/nppluglet.cpp 14 Oct 2006 12:26:07 -0000
@@ -47,6 +47,8 @@
#include "nsServiceManagerUtils.h"
+#include "plstr.h"
+
// service manager which will give the access to all public browser services
// we will use memory service as an illustration
nsIServiceManager * gServiceManager = NULL;
@@ -153,17 +155,21 @@
// nsPluginInstance class implementation
//
nsPluginInstance::nsPluginInstance(nsPluginCreateData * aCreateDataStruct) : nsPluginInstanceBase(),
- mInstance(aCreateDataStruct->instance),
mInitialized(PR_FALSE),
mScriptablePeer(nsnull),
mPluglet(nsnull)
{
+ mInstance = aCreateDataStruct->instance;
+
mCreateDataStruct.instance = aCreateDataStruct->instance;
mCreateDataStruct.type = aCreateDataStruct->type;
mCreateDataStruct.mode = aCreateDataStruct->mode;
mCreateDataStruct.argc = aCreateDataStruct->argc;
mCreateDataStruct.argn = aCreateDataStruct->argn;
mCreateDataStruct.saved = aCreateDataStruct->saved;
+
+ mCreateDataStruct.instance->pdata = this;
+ mInstance->pdata = this;
mString[0] = '\0';
}
@@ -256,19 +262,27 @@
PRBool *outResult)
{
nsresult rv = NS_ERROR_FAILURE;
-
- nsCOMPtr<nsIPlugin> plugletEngine =
- do_GetService(PLUGLETENGINE_ContractID, &rv);
*outResult = PR_FALSE;
+ nsCOMPtr<nsIPlugin> plugletEngine = nsnull;
nsIID scriptableIID = NS_ISIMPLEPLUGIN_IID;
+
+ if (!mPluglet) {
+ plugletEngine = do_GetService(PLUGLETENGINE_ContractID, &rv);
- if (NS_SUCCEEDED(rv)) {
- rv = plugletEngine->CreatePluginInstance(nsnull, scriptableIID,
- aMimeType,
- getter_AddRefs(mPluglet));
- if (NS_SUCCEEDED(rv) && mPluglet) {
+ if (NS_SUCCEEDED(rv)) {
+ rv = plugletEngine->CreatePluginInstance(nsnull, scriptableIID,
+ aMimeType,
+ getter_AddRefs(mPluglet));
+ if (NS_SUCCEEDED(rv) && mPluglet) {
+ *outResult = PR_TRUE;
+ }
+ }
+ }
+ else {
+ if (0 == PL_strcmp(aMimeType, mCreateDataStruct.type)) {
*outResult = PR_TRUE;
}
+ rv = NS_OK;
}
return rv;
Index: mozilla/nsISimplePlugin.idl
===================================================================
RCS file: /cvsroot/mozilla/java/plugins/mozilla/nsISimplePlugin.idl,v
retrieving revision 1.2
diff -u -r1.2 nsISimplePlugin.idl
--- mozilla/nsISimplePlugin.idl 12 Oct 2006 21:22:47 -0000 1.2
+++ mozilla/nsISimplePlugin.idl 14 Oct 2006 12:26:07 -0000
@@ -40,5 +40,5 @@
[scriptable, uuid(482e1890-1fe5-11d5-9cf8-0060b0fbd8ac)]
interface nsISimplePlugin : nsISupports {
- void hasPlugletForMimeType(in string aMimeType, out boolean isSupported);
+ boolean hasPlugletForMimeType(in string aMimeType);
};
Index: src/PlugletsDir.cpp
===================================================================
RCS file: /cvsroot/mozilla/java/plugins/src/PlugletsDir.cpp,v
retrieving revision 1.10
diff -u -r1.10 PlugletsDir.cpp
--- src/PlugletsDir.cpp 12 Oct 2006 21:22:47 -0000 1.10
+++ src/PlugletsDir.cpp 14 Oct 2006 12:26:07 -0000
@@ -124,6 +124,9 @@
if(!mMimeTypeToPlugletFacoryHash) {
res = LoadPluglets();
}
+ else {
+ res = NS_OK;
+ }
if (NS_SUCCEEDED(res) && mMimeTypeToPlugletFacoryHash) {
*plugletFactory = (PlugletFactory *)
PL_HashTableLookup(mMimeTypeToPlugletFacoryHash,
git-svn-id: svn://10.0.0.236/trunk@213638 18797224-902f-48f8-a5cc-f745e15eee43
2006-10-14 12:28:15 +00:00
edburns%acm.org
53efe6b0fd
M mozilla/nppluglet.cpp
...
M mozilla/nppluglet.h
M src/Pluglet.cpp
M src/Pluglet.h
M src/PlugletEngine.cpp
SetWindow works. Next step is to try hook up scriptability.
git-svn-id: svn://10.0.0.236/trunk@213586 18797224-902f-48f8-a5cc-f745e15eee43
2006-10-13 14:45:14 +00:00
edburns%acm.org
bf79c9482d
checkpoint
...
git-svn-id: svn://10.0.0.236/trunk@213561 18797224-902f-48f8-a5cc-f745e15eee43
2006-10-12 21:22:47 +00:00
bugzilla%standard8.demon.co.uk
9d56ba413c
Bug 351921 Remove xpcom/obsolete/nsSpecialSystemDirectory.{h,cpp} r=darin,edburns
...
git-svn-id: svn://10.0.0.236/trunk@213549 18797224-902f-48f8-a5cc-f745e15eee43
2006-10-12 16:44:32 +00:00
edburns%acm.org
908f89a2bf
I now have the pluglet.dll XPCOM module loading. The reason it was not
...
loading: it depends on jvm.dll, which was not on my path. I had to add
%JDKHOME%\jre\bin\client to my path and now it loaded. Thanks to shaver
and plasticmillion on #developers for the tip to use depends.exe, the
Dependency Walker. What a nice tool.
Of course, there is now a crash after it loads, which will be my next
step after this checkin.
A plugins/src/iPlugletEngine.idl
A plugins/src/iPlugletManager.idl
- make IDL files for our external interfaces.
M plugins/src/Makefile.in
- move PlugletEngine.cpp to the top of the list.
M plugins/src/PlugletEngine.cpp
M plugins/src/PlugletEngine.h
- big changes here. Make this a proper generic XPCOM component.
- use the iPlugletManager interface, and the nsICategoryManager
to make sure we get called at startup.
M plugins/src/Pluglet.cpp
M plugins/src/Pluglet.h
M plugins/src/PlugletFactory.cpp
M plugins/src/PlugletFactory.h
M plugins/src/PlugletInputStream.cpp
M plugins/src/PlugletInputStream.h
M plugins/src/PlugletLoader.cpp
M plugins/src/PlugletManager.cpp
M plugins/src/PlugletPeer.cpp
M plugins/src/PlugletStreamInfo.cpp
M plugins/src/PlugletStreamListener.cpp
M plugins/src/PlugletViewWindows.cpp
M plugins/src/PlugletsDir.cpp
M plugins/src/Registry.cpp
- remove static method PlugletEngine::GetJNIEnv, in favor of instance
method and use of nsIServiceManager.
git-svn-id: svn://10.0.0.236/trunk@200339 18797224-902f-48f8-a5cc-f745e15eee43
2006-06-19 18:50:01 +00:00
edburns%acm.org
62d191460c
Make plugletjni.lib and .dll build.
...
M makefiles
- remove plugins/Makefile, this'll be replaced by ant
- add jni Makefile
R plugins/makefile.win
R plugins/jni/makefile.win
R plugins/src/makefile.win
- obsolete.
M plugins/jni/Makefile.in
- new includes and such
M plugins/jni/org_mozilla_pluglet_mozilla_PlugletOutputStream.cpp
- cast to const char *.
git-svn-id: svn://10.0.0.236/trunk@192921 18797224-902f-48f8-a5cc-f745e15eee43
2006-03-24 17:57:24 +00:00
edburns%acm.org
a046234a53
pluglet.dll_now_builds
...
git-svn-id: svn://10.0.0.236/trunk@192920 18797224-902f-48f8-a5cc-f745e15eee43
2006-03-24 17:41:16 +00:00
edburns%acm.org
4cf929cbd3
This change-bundle starts the process of re-activating pluglets.
...
Next step is to figure out the best way to fix these unresolved symbols
at link time when building pluglet.dll
/cygdrive/d/Projects/mozilla/MOZILLA_NIH/FIREFOX_1_5_0_1/mozilla/./build/cygwin-wrapper link -NOLOGO -DLL -OUT:pluglet.dll -PDB:pluglet.pdb -SUBSYSTEM:WINDOWS List.obj Pluglet.obj PlugletEngine.obj PlugletFactory.obj PlugletInputStream.obj PlugletLoader.obj PlugletManager.obj PlugletPeer.obj PlugletStreamInfo.obj PlugletStreamListener.obj PlugletsDir.obj Registry.obj PlugletViewFactory.obj ./module.res -DEBUG -DEBUGTYPE:CV kernel32.lib user32.lib gdi32.lib winmm.lib wsock32.lib advapi32.lib D:\Files_2k\j2sdk1.4.2_03/lib/jvm.lib ../../../dist/lib/xpcom.lib ../../../dist/lib/xpcom_core.lib ../../../dist/lib/nspr4.lib ../../../dist/lib/plc4.lib ../../../dist/lib/plds4.lib
Creating library pluglet.lib and object pluglet.exp
PlugletsDir.obj : error LNK2001: unresolved external symbol "__declspec(dllimport) public: virtual __thiscall nsFileSpec::~nsFileSpec(void)" (__imp_??1nsFileSpec@@UAE@XZ)
PlugletsDir.obj : error LNK2001: unresolved external symbol "__declspec(dllimport) public: virtual __thiscall nsDirectoryIterator::~nsDirectoryIterator(void)" (__imp_??1nsDirectoryIterator@@UAE@XZ)
PlugletsDir.obj : error LNK2001: unresolved external symbol "__declspec(dllimport) public: class nsDirectoryIterator & __thiscall nsDirectoryIterator::operator++(void)" (__imp_??EnsDirectoryIterator@@QAEAAV0@XZ)
PlugletsDir.obj : error LNK2001: unresolved external symbol "__declspec(dllimport) public: __thiscall nsDirectoryIterator::nsDirectoryIterator(class nsFileSpec const &,int)" (__imp_??0nsDirectoryIterator@@QAE@ABVnsFileSpec@@H@Z)
PlugletsDir.obj : error LNK2001: unresolved external symbol "__declspec(dllimport) public: __thiscall nsFileSpec::nsFileSpec(char const *,int)" (__imp_??0nsFileSpec@@QAE@PBDH@Z)
PlugletsDir.obj : error LNK2001: unresolved external symbol "__declspec(dllimport) public: virtual __thiscall nsSpecialSystemDirectory::~nsSpecialSystemDirectory(void)" (__imp_??1nsSpecialSystemDirectory@@UAE@XZ)
PlugletsDir.obj : error LNK2001: unresolved external symbol "__declspec(dllimport) public: void __thiscall nsFileSpec::operator+=(char const *)" (__imp_??YnsFileSpec@@QAEXPBD@Z)
PlugletsDir.obj : error LNK2001: unresolved external symbol "__declspec(dllimport) public: __thiscall nsSpecialSystemDirectory::nsSpecialSystemDirectory(enum nsSpecialSystemDirectory::SystemDirectories)" (__imp_??0nsSpecialSystemDirectory@@QAE@W4SystemDirectories@0@@Z)
PlugletsDir.obj : error LNK2001: unresolved external symbol "__declspec(dllimport) public: char const * __thiscall nsFileSpec::GetCString(void)const " (__imp_?GetCString@nsFileSpec@@QBEPBDXZ)
PlugletViewFactory.obj : error LNK2001: unresolved external symbol "public: __thiscall PlugletViewWindows::PlugletViewWindows(void)" (??0PlugletViewWindows@@QAE@XZ)
pluglet.dll : fatal error LNK1120: 10 unresolved externals
M makefiles
+java/plugins/Makefile
+java/plugins/src/Makefile
Add generation of these Makefiles
M plugins/src/Makefile.in
- copy some content from webclient
M plugins/src/Pluglet.cpp
M plugins/src/PlugletEngine.cpp
M plugins/src/PlugletStreamListener.cpp
- Changes from John Sublet.
git-svn-id: svn://10.0.0.236/trunk@192678 18797224-902f-48f8-a5cc-f745e15eee43
2006-03-21 03:25:34 +00:00
timeless%mozdev.org
f9bdb44b34
Bug 106386 Correct misspellings in source code
...
patch by unknown@simplemachines.org r=timeless rs=brendan
git-svn-id: svn://10.0.0.236/trunk@185269 18797224-902f-48f8-a5cc-f745e15eee43
2005-11-25 08:16:51 +00:00
idk%eng.sun.com
74644f740e
*not part of the build*
...
fix for 77579
r=yiming.chung@eng.sun.com
git-svn-id: svn://10.0.0.236/trunk@96227 18797224-902f-48f8-a5cc-f745e15eee43
2001-06-02 04:44:35 +00:00
idk%eng.sun.com
74f56ba670
*not part of the build*
...
fix for 83735
git-svn-id: svn://10.0.0.236/trunk@96223 18797224-902f-48f8-a5cc-f745e15eee43
2001-06-02 03:14:02 +00:00
idk%eng.sun.com
49ac13f299
*not part of te build*
...
checking the right fix for 83320
git-svn-id: svn://10.0.0.236/trunk@96132 18797224-902f-48f8-a5cc-f745e15eee43
2001-05-31 20:59:28 +00:00
idk%eng.sun.com
f31ee1309b
*not part of the build*
...
fix for 83320
git-svn-id: svn://10.0.0.236/trunk@96126 18797224-902f-48f8-a5cc-f745e15eee43
2001-05-31 19:04:36 +00:00
idk%eng.sun.com
3a9dfe353b
*not part of tbox builds*
...
fixed build problem on windows
git-svn-id: svn://10.0.0.236/trunk@89347 18797224-902f-48f8-a5cc-f745e15eee43
2001-03-12 19:01:19 +00:00
edburns%acm.org
aee4ebbf93
Merged branch JAVADEV_PR3_20001002 into trunk.
...
git-svn-id: svn://10.0.0.236/trunk@82247 18797224-902f-48f8-a5cc-f745e15eee43
2000-11-02 23:33:21 +00:00
idk%eng.sun.com
ab0393e100
* NOT PART OF TBOX BUILDS *
...
Updated Pluglets to tip of the tree and latest jdk1.3 on solaris
Fixed 40615
git-svn-id: svn://10.0.0.236/trunk@79966 18797224-902f-48f8-a5cc-f745e15eee43
2000-09-26 06:53:53 +00:00
idk%eng.sun.com
32d14fbb0f
(36174) Added null checking
...
a = idk@eng.sun.com
git-svn-id: svn://10.0.0.236/trunk@66299 18797224-902f-48f8-a5cc-f745e15eee43
2000-04-18 18:38:01 +00:00
idk%eng.sun.com
b41e3abee5
Added new method :
...
public Object PlugletTagInfo.getDOMElement();
(It is possible to use JavaDOM from pluglets now.)
a=idk@eng.sun.com
r=sdv@sparc.spb.su
git-svn-id: svn://10.0.0.236/trunk@60968 18797224-902f-48f8-a5cc-f745e15eee43
2000-02-16 00:03:38 +00:00
idk%eng.sun.com
818eb6a8db
Fixed crasher bug.
...
Now PlugletEngine do not crache mozilla
in case of missing jvm
git-svn-id: svn://10.0.0.236/trunk@60166 18797224-902f-48f8-a5cc-f745e15eee43
2000-02-09 00:34:54 +00:00
idk%eng.sun.com
d626601f14
Removed workaround for 24194
...
Fixed build probelem (included plstr.h instead of string.h into src/PlugletFactory.cpp)
git-svn-id: svn://10.0.0.236/trunk@58728 18797224-902f-48f8-a5cc-f745e15eee43
2000-01-26 04:20:22 +00:00
idk%eng.sun.com
cf9eee7ecd
Fixed problem with awt on Solaris.
...
Start using XmNvisual, XmNcolormap, XmNdepth values from awt for shell createing
git-svn-id: svn://10.0.0.236/trunk@58646 18797224-902f-48f8-a5cc-f745e15eee43
2000-01-25 23:28:17 +00:00
laa%sparc.spb.su
ca2ed4adfe
Fixed bug 21785.
...
Mozilla crashes if PLUGLET environment is not set.
Reviewed by idk@eng.sun.com
git-svn-id: svn://10.0.0.236/trunk@58584 18797224-902f-48f8-a5cc-f745e15eee43
2000-01-25 12:30:52 +00:00
idk%eng.sun.com
5633d0bbfb
Added logging to pluglet module
...
a = laa@sparc.spb.su
r = idk@eng.sun.com
Added workaround for 24194
a = idk@eng.sun.com
git-svn-id: svn://10.0.0.236/trunk@58067 18797224-902f-48f8-a5cc-f745e15eee43
2000-01-18 02:53:58 +00:00
idk%eng.sun.com
a8b311c760
Followup bug 19559
...
Make pluglets using SuperWin
git-svn-id: svn://10.0.0.236/trunk@55781 18797224-902f-48f8-a5cc-f745e15eee43
1999-12-09 00:58:30 +00:00
idk%eng.sun.com
c76f9909a2
19465
...
Port pluglets to linux and Solaris
(This is not part of the build)
git-svn-id: svn://10.0.0.236/trunk@54082 18797224-902f-48f8-a5cc-f745e15eee43
1999-11-20 23:19:40 +00:00
idk%eng.sun.com
e2e8a47460
no bug id
...
fixed typo OJI_DISABLED->OJI_DISABLE
git-svn-id: svn://10.0.0.236/trunk@53794 18797224-902f-48f8-a5cc-f745e15eee43
1999-11-18 00:32:33 +00:00
idk%eng.sun.com
56c7b4556f
no bug id
...
converted pluglet runner to XPCOM module
(see bug 15217)
(not a part of regular build)
git-svn-id: svn://10.0.0.236/trunk@53648 18797224-902f-48f8-a5cc-f745e15eee43
1999-11-16 10:44:25 +00:00
idk%eng.sun.com
51254cf0e7
bug 18180
...
Names changed
Pluglet->PlugletFactory, *PlugletInstance*->*Pluglet*
git-svn-id: svn://10.0.0.236/trunk@52992 18797224-902f-48f8-a5cc-f745e15eee43
1999-11-09 10:28:46 +00:00
dmose%mozilla.org
ce50f7d151
updated license boilerplate to xPL 1.1, a=chofmann@netscape.com,r=endico@mozilla.org
...
git-svn-id: svn://10.0.0.236/trunk@52900 18797224-902f-48f8-a5cc-f745e15eee43
1999-11-06 02:47:15 +00:00
idk%eng.sun.com
4a0f268246
17747
...
Added "ifdef OJI_DISABLE"
in case OJI_DISABLE we will have binaries working without oji
Apdated README
git-svn-id: svn://10.0.0.236/trunk@52541 18797224-902f-48f8-a5cc-f745e15eee43
1999-11-02 08:07:09 +00:00
idk%eng.sun.com
307fe1df58
fix for 17454
...
changed strncmp to PL_strncasecmp
git-svn-id: svn://10.0.0.236/trunk@52405 18797224-902f-48f8-a5cc-f745e15eee43
1999-11-01 20:04:57 +00:00
idk%eng.sun.com
3b03dc263a
bugId 17329
...
Added PlugletSecurityContext class.
Set ProxyJNI security context to PlugletSecurityContext
(see 15902)
git-svn-id: svn://10.0.0.236/trunk@51969 18797224-902f-48f8-a5cc-f745e15eee43
1999-10-27 09:33:06 +00:00
idk%eng.sun.com
9599670719
Fix 16230
...
Call AddRef for newly created PlugletInsance
r = akhil.arora@sun.com
git-svn-id: svn://10.0.0.236/trunk@50499 18797224-902f-48f8-a5cc-f745e15eee43
1999-10-12 23:01:44 +00:00
idk%eng.sun.com
651e1ddd8a
Bug <a href= http://bugzilla.mozilla.org/show_bug.cgi?id=15892 > 15892 </a>
...
increment pointer to mime description string before calling strchr
git-svn-id: svn://10.0.0.236/trunk@50417 18797224-902f-48f8-a5cc-f745e15eee43
1999-10-12 03:29:27 +00:00
idk%eng.sun.com
ab18209f8a
Add Registry class for storing information about java-c++
...
objects binding
git-svn-id: svn://10.0.0.236/trunk@49026 18797224-902f-48f8-a5cc-f745e15eee43
1999-09-25 02:53:56 +00:00
idk%eng.sun.com
3f8850f8d2
Add support for multiple pluglets
...
add some checkings
git-svn-id: svn://10.0.0.236/trunk@48900 18797224-902f-48f8-a5cc-f745e15eee43
1999-09-23 06:17:12 +00:00
idk%eng.sun.com
26cb2cc2d2
bug fix.
...
Call AddRef for StreamListener in PlugletInstance.NewStream
git-svn-id: svn://10.0.0.236/trunk@48865 18797224-902f-48f8-a5cc-f745e15eee43
1999-09-22 20:16:11 +00:00
idk%eng.sun.com
c3a4459049
Moved to OJI.
...
Added AWT support.
Added some classes
git-svn-id: svn://10.0.0.236/trunk@47982 18797224-902f-48f8-a5cc-f745e15eee43
1999-09-17 18:41:34 +00:00
idk%eng.sun.com
58c108ead3
Added PlugletTagInfo
...
Updated test.java
Fixed some build problems
git-svn-id: svn://10.0.0.236/trunk@46992 18797224-902f-48f8-a5cc-f745e15eee43
1999-09-11 23:47:47 +00:00
idk%eng.sun.com
f363d1453d
Add this files
...
git-svn-id: svn://10.0.0.236/trunk@46266 18797224-902f-48f8-a5cc-f745e15eee43
1999-09-08 00:21:03 +00:00
idk%eng.sun.com
fae3440cff
Add implemenataion of PlugletInputStream and PlugletStreamInfo
...
git-svn-id: svn://10.0.0.236/trunk@45633 18797224-902f-48f8-a5cc-f745e15eee43
1999-09-02 03:36:53 +00:00
idk%eng.sun.com
9d2f8ed652
Initial pluglets checkin.
...
git-svn-id: svn://10.0.0.236/trunk@44978 18797224-902f-48f8-a5cc-f745e15eee43
1999-08-28 04:39:56 +00:00