Changeset 431 for trunk/icedtea-web/plugin/icedteanp/IcedTeaNPPlugin.cc

Timestamp:

Oct 2, 2014, 1:13:59 AM (11 years ago)

Author:

dmik

Message:

icedtea-web: Adapt 1.5.1 changes to OS/2.

File:

• trunk/icedtea-web/plugin/icedteanp/IcedTeaNPPlugin.cc (modified) (8 diffs)

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

@@ -221 +221 @@
 
 #ifdef __OS2__
-struct QueueProcessorData
-{
-    PluginRequestProcessor *processor;
-    bool stopRequested;
-};
-
 static QueueProcessorData queue_processor_data1 = { NULL, false };
 static QueueProcessorData queue_processor_data2 = { NULL, false };
@@ -314 +308 @@
             }
       }
+#ifdef __OS2___
+      custom_jre = icedtea_web_jre_dir();
+      if (custom_jre.length())
+          return custom_jre+"/bin/java";
+#endif
       return appletviewer_default_executable;      
 }
@@ -327 +326 @@
             }
       }
-      return appletviewer_default_rtjar;      
+#ifdef __OS2___
+      custom_jre = icedtea_web_jre_dir();
+      if (custom_jre.length())
+          return custom_jre+"/lib/rt.jar";
+#endif
+      return appletviewer_default_rtjar;
 }
 
@@ -513 +517 @@
   if (socketpair (AF_LOCAL, SOCK_STREAM, 0, in_pipe) == -1)
     {
-      PLUGIN_ERROR_TWO ("Failed to create input pipe", strerror (errno));
+      PLUGIN_ERROR ("Failed to create input pipe", strerror (errno));
       np_error = NPERR_GENERIC_ERROR;
       goto cleanup_in_pipe;
@@ -550 +554 @@
   if (socketpair (AF_LOCAL, SOCK_STREAM, 0, out_pipe) == -1)
     {
-      PLUGIN_ERROR_TWO ("Failed to create output pipe", strerror (errno));
+      PLUGIN_ERROR ("Failed to create output pipe", strerror (errno));
       np_error = NPERR_GENERIC_ERROR;
       goto cleanup_out_pipe;
@@ -1594 +1598 @@
   }
 
+#ifdef __OS2__
+  {
+    std::string path = PLUGIN_BOOTCLASSPATH;
+    static const std::string datadir = "@DATADIR@";
+    size_t pos = 0;
+    while ((pos = path.find(datadir, pos)) != std::string::npos) {
+      path.replace(pos, datadir.length(), icedtea_web_data_dir());
+      pos += datadir.length();
+    }
+    command_line.push_back(path);
+  }
+#else
   command_line.push_back(PLUGIN_BOOTCLASSPATH);
+#endif
   // set the classpath to avoid using the default (cwd).
   command_line.push_back("-classpath");
@@ -1617 +1634 @@
   command_line.push_back("sun.applet.PluginMain");
 #ifdef __OS2__
-  command_line.push_back((std::ostrstream() << out_pipe[1]).str());
-  command_line.push_back((std::ostrstream() << in_pipe[1]).str());
+  command_line.push_back(static_cast<std::ostringstream &>(std::ostringstream() << out_pipe[1]).str());
+  command_line.push_back(static_cast<std::ostringstream &>(std::ostringstream() << in_pipe[1]).str());
 #else
   command_line.push_back(out_pipe_name);
@@ -2443 +2460 @@
 
 #ifdef __OS2__
-  // pthread_cancel() isn't implemented on OS?2, so use an old good flag
+  // pthread_cancel() isn't implemented on OS/2, so use an old good flag
   queue_processor_data1.stopRequested = true;
   queue_processor_data2.stopRequested = true;
   queue_processor_data3.stopRequested = true;
-  pthread_cond_broadcast(&cond_message_available);
+  plugin_req_proc->cancelWait();
 #else
   pthread_cancel(plugin_request_processor_thread1);