Changeset 385

Timestamp:

Jul 2, 2012, 10:10:25 AM (13 years ago)

Author:

dmik

Message:

icedtea-web: Add proper cleanup code.

This is necessary so that further re-initialization (caused by a new
plugin instance) does't fail.

Location:

trunk/icedtea-web/plugin/icedteanp

Files:

• IcedTeaNPPlugin.cc (modified) (1 diff)
• os2/OS_OS2.cc (modified) (1 diff)
• os2/OS_OS2.h (modified) (1 diff)
• os2/OS_OS2_WinOS2.cc (modified) (1 diff)
• os2/OS_OS2_WinOS2.h (modified) (1 diff)

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

@@ -2587 +2587 @@
   pthread_mutex_destroy(&pluginAsyncCallMutex);
 
+#ifdef __OS2__
+  // perform OS-specific uninitialization
+  done_os();
+#endif
+
   initialized = false;
 

trunk/icedtea-web/plugin/icedteanp/os2/OS_OS2.cc

@@ -66 +66 @@
     return init_os_winos2();
 }
+
+void done_os()
+{
+    done_os_winos2();
+}

trunk/icedtea-web/plugin/icedteanp/os2/OS_OS2.h

@@ -44 +44 @@
 
 bool init_os();
+void done_os();
 
 void *wrap_window_handle (void *handle);

trunk/icedtea-web/plugin/icedteanp/os2/OS_OS2_WinOS2.cc

@@ -60 +60 @@
     if (!WrapperClass)
     {
-        PLUGIN_DEBUG ("RegisterClass failed.");
+        PLUGIN_DEBUG ("RegisterClass failed.\n");
         return FALSE;
     }
 
     return TRUE;
+}
+
+void done_os_winos2()
+{
+    if (!UnregisterClass ("WC_ICEDTEANP_WRAPPER", 0));
+        PLUGIN_DEBUG ("UnregisterClass failed.\n");
 }
 

trunk/icedtea-web/plugin/icedteanp/os2/OS_OS2_WinOS2.h

@@ -41 +41 @@
 
 bool init_os_winos2();
+void done_os_winos2();
 
 #endif // __OS_OS2_WINOS2_H__