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

Timestamp:

Jun 5, 2012, 9:51:10 AM (13 years ago)

Author:

dmik

Message:

icedtea-web: Wrap OS/2 HWND in WinOS2 HWND.

Java expects WinOS2 HWNDs while the plugin gets the OS/2 HWND
from the browser.

This commit also includes some source file reorganization (for clarity).

File:

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

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

@@ -45 +45 @@
 #include <emx/startup.h>
 #include <sys/socket.h>
+#include "OS_OS2.h"
 #endif
 
@@ -61 +62 @@
 #include "IcedTeaScriptablePluginObject.h"
 #include "IcedTeaNPPlugin.h"
-
-#include "OS.h"
 
 #ifdef __OS2__
@@ -777 +776 @@
     }
 
+#ifdef __OS2__
+  void *wnd = wrap_window_handle (window->window);
+  if (!wnd)
+      return NPERR_GENERIC_ERROR;
+
+  PLUGIN_DEBUG ("ITNP_SetWindow: wrapped window handle %d (%x) in %d (%x)\n",
+                window->window, window->window, wnd, wnd);
+#endif
+
   if (data->window_handle)
     {
       // The window already exists.
-      if (data->window_handle == window->window)
+      if (data->window_handle == wnd)
     {
           // The parent window is the same as in previous calls.
@@ -851 +859 @@
 
       // Store the window handle and dimensions
-      data->window_handle = window->window;
+      data->window_handle = wnd;
       data->window_width = window->width;
       data->window_height = window->height;
@@ -2249 +2257 @@
     return NPERR_NO_ERROR;
 
+#ifdef __OS2__
+  // perform OS-specific initialization
+  if (!init_os())
+    {
+      PLUGIN_ERROR ("Failed to perform OS-specific initialization.");
+      return NPERR_GENERIC_ERROR;
+    }
+#endif
+
   // Make sure the plugin data directory exists, creating it if
   // necessary.