From feeeb9c6e5d2b966885932048859e62f6c24976b Mon Sep 17 00:00:00 2001 From: "av%netscape.com" Date: Wed, 14 Nov 2001 01:54:11 +0000 Subject: [PATCH] 109973 -- passing plugin creation parameters to the plugin instance, not part of the build git-svn-id: svn://10.0.0.236/trunk@107999 18797224-902f-48f8-a5cc-f745e15eee43 --- .../plugin/tools/sdk/samples/basic/mac/plugin.cpp | 7 +++++-- .../plugin/tools/sdk/samples/basic/unix/plugin.cpp | 7 +++++-- .../tools/sdk/samples/basic/windows/plugin.cpp | 7 +++++-- .../plugin/tools/sdk/samples/common/npp_gate.cpp | 12 +++++++++++- .../tools/sdk/samples/scriptable/unix/plugin.cpp | 7 +++++-- .../tools/sdk/samples/scriptable/windows/plugin.cpp | 7 +++++-- .../plugin/tools/sdk/samples/simple/plugin.cpp | 7 +++++-- 7 files changed, 41 insertions(+), 13 deletions(-) diff --git a/mozilla/modules/plugin/tools/sdk/samples/basic/mac/plugin.cpp b/mozilla/modules/plugin/tools/sdk/samples/basic/mac/plugin.cpp index 98ae1b88758..455eca79ad3 100644 --- a/mozilla/modules/plugin/tools/sdk/samples/basic/mac/plugin.cpp +++ b/mozilla/modules/plugin/tools/sdk/samples/basic/mac/plugin.cpp @@ -57,9 +57,12 @@ void NS_PluginShutdown() // // construction and destruction of our plugin instance object // -nsPluginInstanceBase * NS_NewPluginInstance(NPP aInstance) +nsPluginInstanceBase * NS_NewPluginInstance(nsPluginCreateData * aCreateDataStruct) { - nsPluginInstance * plugin = new nsPluginInstance(aInstance); + if(!aCreateDataStruct) + return NULL; + + nsPluginInstance * plugin = new nsPluginInstance(aCreateDataStruct->instance); return plugin; } diff --git a/mozilla/modules/plugin/tools/sdk/samples/basic/unix/plugin.cpp b/mozilla/modules/plugin/tools/sdk/samples/basic/unix/plugin.cpp index 50e390d73b1..e70010fe1fc 100644 --- a/mozilla/modules/plugin/tools/sdk/samples/basic/unix/plugin.cpp +++ b/mozilla/modules/plugin/tools/sdk/samples/basic/unix/plugin.cpp @@ -62,9 +62,12 @@ void NS_PluginShutdown() // // construction and destruction of our plugin instance object // -nsPluginInstanceBase * NS_NewPluginInstance(NPP aInstance) +nsPluginInstanceBase * NS_NewPluginInstance(nsPluginCreateData * aCreateDataStruct) { - nsPluginInstance * plugin = new nsPluginInstance(aInstance); + if(!aCreateDataStruct) + return NULL; + + nsPluginInstance * plugin = new nsPluginInstance(aCreateDataStruct->instance); return plugin; } diff --git a/mozilla/modules/plugin/tools/sdk/samples/basic/windows/plugin.cpp b/mozilla/modules/plugin/tools/sdk/samples/basic/windows/plugin.cpp index 3ee82ead7c0..f31c4dcd355 100644 --- a/mozilla/modules/plugin/tools/sdk/samples/basic/windows/plugin.cpp +++ b/mozilla/modules/plugin/tools/sdk/samples/basic/windows/plugin.cpp @@ -58,9 +58,12 @@ void NS_PluginShutdown() // // construction and destruction of our plugin instance object // -nsPluginInstanceBase * NS_NewPluginInstance(NPP aInstance) +nsPluginInstanceBase * NS_NewPluginInstance(nsPluginCreateData * aCreateDataStruct) { - nsPluginInstance * plugin = new nsPluginInstance(aInstance); + if(!aCreateDataStruct) + return NULL; + + nsPluginInstance * plugin = new nsPluginInstance(aCreateDataStruct->instance); return plugin; } diff --git a/mozilla/modules/plugin/tools/sdk/samples/common/npp_gate.cpp b/mozilla/modules/plugin/tools/sdk/samples/common/npp_gate.cpp index 90705bbc5e1..981287795c2 100644 --- a/mozilla/modules/plugin/tools/sdk/samples/common/npp_gate.cpp +++ b/mozilla/modules/plugin/tools/sdk/samples/common/npp_gate.cpp @@ -76,7 +76,17 @@ NPError NPP_New(NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc, ch // create a new plugin instance object // initialization will be done when the associated window is ready - nsPluginInstanceBase * plugin = NS_NewPluginInstance(instance); + nsPluginCreateData ds; + + ds.instance = instance; + ds.type = pluginType; + ds.mode = mode; + ds.argc = argc; + ds.argn = argn; + ds.argv = argv; + ds.saved = saved; + + nsPluginInstanceBase * plugin = NS_NewPluginInstance(&ds); if(plugin == NULL) return NPERR_OUT_OF_MEMORY_ERROR; diff --git a/mozilla/modules/plugin/tools/sdk/samples/scriptable/unix/plugin.cpp b/mozilla/modules/plugin/tools/sdk/samples/scriptable/unix/plugin.cpp index 662482d2baa..6f6700f5d0f 100644 --- a/mozilla/modules/plugin/tools/sdk/samples/scriptable/unix/plugin.cpp +++ b/mozilla/modules/plugin/tools/sdk/samples/scriptable/unix/plugin.cpp @@ -69,9 +69,12 @@ void NS_PluginShutdown() // // construction and destruction of our plugin instance object // -nsPluginInstanceBase * NS_NewPluginInstance(NPP aInstance) +nsPluginInstanceBase * NS_NewPluginInstance(nsPluginCreateData * aCreateDataStruct) { - nsPluginInstance * plugin = new nsPluginInstance(aInstance); + if(!aCreateDataStruct) + return NULL; + + nsPluginInstance * plugin = new nsPluginInstance(aCreateDataStruct->instance); return plugin; } diff --git a/mozilla/modules/plugin/tools/sdk/samples/scriptable/windows/plugin.cpp b/mozilla/modules/plugin/tools/sdk/samples/scriptable/windows/plugin.cpp index 6dffe2f4e41..ac7aef2e54e 100644 --- a/mozilla/modules/plugin/tools/sdk/samples/scriptable/windows/plugin.cpp +++ b/mozilla/modules/plugin/tools/sdk/samples/scriptable/windows/plugin.cpp @@ -58,9 +58,12 @@ void NS_PluginShutdown() // // construction and destruction of our plugin instance object // -nsPluginInstanceBase * NS_NewPluginInstance(NPP aInstance) +nsPluginInstanceBase * NS_NewPluginInstance(nsPluginCreateData * aCreateDataStruct) { - nsPluginInstance * plugin = new nsPluginInstance(aInstance); + if(!aCreateDataStruct) + return NULL; + + nsPluginInstance * plugin = new nsPluginInstance(aCreateDataStruct->instance); return plugin; } diff --git a/mozilla/modules/plugin/tools/sdk/samples/simple/plugin.cpp b/mozilla/modules/plugin/tools/sdk/samples/simple/plugin.cpp index f31404733e7..d6b7e8f0246 100644 --- a/mozilla/modules/plugin/tools/sdk/samples/simple/plugin.cpp +++ b/mozilla/modules/plugin/tools/sdk/samples/simple/plugin.cpp @@ -89,9 +89,12 @@ void NS_PluginShutdown() // // construction and destruction of our plugin instance object // -nsPluginInstanceBase * NS_NewPluginInstance(NPP aInstance) +nsPluginInstanceBase * NS_NewPluginInstance(nsPluginCreateData * aCreateDataStruct) { - nsPluginInstance * plugin = new nsPluginInstance(aInstance); + if(!aCreateDataStruct) + return NULL; + + nsPluginInstance * plugin = new nsPluginInstance(aCreateDataStruct->instance); return plugin; }