Changeset 364

Timestamp:

May 10, 2012, 11:42:02 PM (13 years ago)

Author:

dmik

Message:

icedtea-web: Export OS/2 plugin entry points.

Location:

trunk/icedtea-web

Files:

• plugin/icedteanp/IcedTeaNPPlugin.cc (modified) (10 diffs)
• plugin/icedteanp/Makefile.kmk (modified) (1 diff)
• plugin_os2.def (added)

trunk/icedtea-web/plugin/icedteanp/IcedTeaNPPlugin.cc

@@ -1094 +1094 @@
   msg = g_strdup_printf (FAILURE_MESSAGE, appletviewer_executable);
   WinMessageBox (HWND_DESKTOP, HWND_DESKTOP,
-                 msg, "Error", 0, MB_ERROR | MB_OK);
+                 msg, "Error", 0, MB_ERROR | MB_OK | MB_MOVEABLE);
   g_free(msg);
 #else
@@ -2000 +2000 @@
 }
 
+static NPError
+plugin_get_entry_points (NPPluginFuncs* pluginTable)
+{
+  // Ensure that the plugin function table we've received is large
+  // enough to store the number of functions that we may provide.
+  if (pluginTable->size < sizeof (NPPluginFuncs))
+    {
+      PLUGIN_ERROR ("Invalid plugin function table.");
+
+      return NPERR_INVALID_FUNCTABLE_ERROR;
+    }
+
+  // Return to the browser the plugin functions that we implement.
+  pluginTable->version = (NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR;
+  pluginTable->size = sizeof (NPPluginFuncs);
+
+#if MOZILLA_VERSION_COLLAPSED < 1090100
+  pluginTable->newp = NewNPP_NewProc (ITNP_New);
+  pluginTable->destroy = NewNPP_DestroyProc (ITNP_Destroy);
+  pluginTable->setwindow = NewNPP_SetWindowProc (ITNP_SetWindow);
+  pluginTable->newstream = NewNPP_NewStreamProc (ITNP_NewStream);
+  pluginTable->destroystream = NewNPP_DestroyStreamProc (ITNP_DestroyStream);
+  pluginTable->asfile = NewNPP_StreamAsFileProc (ITNP_StreamAsFile);
+  pluginTable->writeready = NewNPP_WriteReadyProc (ITNP_WriteReady);
+  pluginTable->write = NewNPP_WriteProc (ITNP_Write);
+  pluginTable->print = NewNPP_PrintProc (ITNP_Print);
+  pluginTable->urlnotify = NewNPP_URLNotifyProc (ITNP_URLNotify);
+  pluginTable->getvalue = NewNPP_GetValueProc (ITNP_GetValue);
+#else
+  pluginTable->newp = NPP_NewProcPtr (ITNP_New);
+  pluginTable->destroy = NPP_DestroyProcPtr (ITNP_Destroy);
+  pluginTable->setwindow = NPP_SetWindowProcPtr (ITNP_SetWindow);
+  pluginTable->newstream = NPP_NewStreamProcPtr (ITNP_NewStream);
+  pluginTable->destroystream = NPP_DestroyStreamProcPtr (ITNP_DestroyStream);
+  pluginTable->asfile = NPP_StreamAsFileProcPtr (ITNP_StreamAsFile);
+  pluginTable->writeready = NPP_WriteReadyProcPtr (ITNP_WriteReady);
+  pluginTable->write = NPP_WriteProcPtr (ITNP_Write);
+  pluginTable->print = NPP_PrintProcPtr (ITNP_Print);
+  pluginTable->urlnotify = NPP_URLNotifyProcPtr (ITNP_URLNotify);
+  pluginTable->getvalue = NPP_GetValueProcPtr (ITNP_GetValue);
+#endif
+
+  return NPERR_NO_ERROR;
+}
+
 // FACTORY FUNCTIONS
 
@@ -2012 +2057 @@
 // this workaround avoids any duplicate calls.
 NPError
-NP_Initialize (NPNetscapeFuncs* browserTable, NPPluginFuncs* pluginTable)
+#if defined(_WIN32) || defined (__OS2__)
+OSCALL NP_Initialize (NPNetscapeFuncs* browserTable)
+#else
+OSCALL NP_Initialize (NPNetscapeFuncs* browserTable, NPPluginFuncs* pluginTable)
+#endif
 {
   PLUGIN_DEBUG ("NP_Initialize\n");
 
+#if defined(_WIN32) || defined (__OS2__)
+  if (browserTable == NULL)
+  {
+    PLUGIN_ERROR ("Browser function table is NULL.");
+
+    return NPERR_INVALID_FUNCTABLE_ERROR;
+  }
+#else
   if ((browserTable == NULL) || (pluginTable == NULL))
   {
@@ -2022 +2079 @@
     return NPERR_INVALID_FUNCTABLE_ERROR;
   }
+#endif
 
   // Ensure that the major version of the plugin API that the browser
@@ -2031 +2089 @@
 
       return NPERR_INCOMPATIBLE_VERSION_ERROR;
-    }
-
-  // Ensure that the plugin function table we've received is large
-  // enough to store the number of functions that we may provide.
-  if (pluginTable->size < sizeof (NPPluginFuncs))
-    {
-      PLUGIN_ERROR ("Invalid plugin function table.");
-
-      return NPERR_INVALID_FUNCTABLE_ERROR;
     }
 
@@ -2098 +2147 @@
 #endif
 
-  // Return to the browser the plugin functions that we implement.
-  pluginTable->version = (NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR;
-  pluginTable->size = sizeof (NPPluginFuncs);
-
-#if MOZILLA_VERSION_COLLAPSED < 1090100
-  pluginTable->newp = NewNPP_NewProc (ITNP_New);
-  pluginTable->destroy = NewNPP_DestroyProc (ITNP_Destroy);
-  pluginTable->setwindow = NewNPP_SetWindowProc (ITNP_SetWindow);
-  pluginTable->newstream = NewNPP_NewStreamProc (ITNP_NewStream);
-  pluginTable->destroystream = NewNPP_DestroyStreamProc (ITNP_DestroyStream);
-  pluginTable->asfile = NewNPP_StreamAsFileProc (ITNP_StreamAsFile);
-  pluginTable->writeready = NewNPP_WriteReadyProc (ITNP_WriteReady);
-  pluginTable->write = NewNPP_WriteProc (ITNP_Write);
-  pluginTable->print = NewNPP_PrintProc (ITNP_Print);
-  pluginTable->urlnotify = NewNPP_URLNotifyProc (ITNP_URLNotify);
-  pluginTable->getvalue = NewNPP_GetValueProc (ITNP_GetValue);
-#else
-  pluginTable->newp = NPP_NewProcPtr (ITNP_New);
-  pluginTable->destroy = NPP_DestroyProcPtr (ITNP_Destroy);
-  pluginTable->setwindow = NPP_SetWindowProcPtr (ITNP_SetWindow);
-  pluginTable->newstream = NPP_NewStreamProcPtr (ITNP_NewStream);
-  pluginTable->destroystream = NPP_DestroyStreamProcPtr (ITNP_DestroyStream);
-  pluginTable->asfile = NPP_StreamAsFileProcPtr (ITNP_StreamAsFile);
-  pluginTable->writeready = NPP_WriteReadyProcPtr (ITNP_WriteReady);
-  pluginTable->write = NPP_WriteProcPtr (ITNP_Write);
-  pluginTable->print = NPP_PrintProcPtr (ITNP_Print);
-  pluginTable->urlnotify = NPP_URLNotifyProcPtr (ITNP_URLNotify);
-  pluginTable->getvalue = NPP_GetValueProcPtr (ITNP_GetValue);
+  NPError np_error = NPERR_NO_ERROR;
+#if !defined(_WIN32) && !defined (__OS2__)
+  np_error = plugin_get_entry_points (pluginTable);
+  if (np_error != NPERR_NO_ERROR)
+    return np_error;
 #endif
 
@@ -2142 +2168 @@
       return NPERR_OUT_OF_MEMORY_ERROR;
     }
-  NPError np_error = NPERR_NO_ERROR;
   gchar* filename = NULL;
 
@@ -2280 +2305 @@
 }
 
+#if defined(_WIN32) || defined (__OS2__)
+NPError
+OSCALL NP_GetEntryPoints (NPPluginFuncs* pluginTable)
+{
+  PLUGIN_DEBUG ("NP_GetEntryPoints\n");
+
+  if (pluginTable == NULL)
+  {
+    PLUGIN_ERROR ("Plugin function table is NULL.");
+
+    return NPERR_INVALID_FUNCTABLE_ERROR;
+  }
+
+  return plugin_get_entry_points (pluginTable);
+}
+#endif
+
 // Returns a string describing the MIME type that this plugin
 // handles.
 const char*
-NP_GetMIMEDescription ()
+OSCALL NP_GetMIMEDescription ()
 {
   PLUGIN_DEBUG ("NP_GetMIMEDescription\n");
@@ -2295 +2337 @@
 // calls this function to obtain information about the plugin.
 NPError
-NP_GetValue (void* future, NPPVariable variable, void* value)
+OSCALL NP_GetValue (void* future, NPPVariable variable, void* value)
 {
   PLUGIN_DEBUG ("NP_GetValue\n");
@@ -2328 +2370 @@
 // destroyed.
 NPError
-NP_Shutdown (void)
+OSCALL NP_Shutdown (void)
 {
   PLUGIN_DEBUG ("NP_Shutdown\n");

trunk/icedtea-web/plugin/icedteanp/Makefile.kmk

@@ -36 +36 @@
     IcedTeaPluginRequestProcessor.cc \
     IcedTeaPluginUtils.cc \
-    $(PATH_ROOT)/extra/OS.cc
+    $(PATH_ROOT)/extra/OS.cc \
+    $(PATH_ROOT)/plugin_os2.def
 
 PLUGIN_RC           = $(npicedt_0_OUTDIR)/plugin_os2.rc