- vlcshell.cpp: fix for a couple of crashing scenarios

mozilla/control/npovlc.cpp

@@ -630,7 +630,12 @@ RuntimeNPObject::InvokeResult VlcNPObject::invoke(int index, const NPVariant *ar
                     libvlc_input_t *p_input = libvlc_playlist_get_input(p_plugin->getVLC(), &ex);
                     if( p_input )
                     {
-                        vlc_int64_t pos = numberValue(args[0])*1000LL;
+                        vlc_int64_t pos = 0;
+                        if( NPVARIANT_IS_INT32(args[0]) )
+                            pos = (vlc_int64_t)NPVARIANT_TO_INT32(args[0]);
+                        else
+                            pos = (vlc_int64_t)NPVARIANT_TO_DOUBLE(args[0]);
+
                         if( NPVARIANT_TO_BOOLEAN(args[1]) )
                         {
                             /* relative seek */
@@ -649,7 +654,6 @@ RuntimeNPObject::InvokeResult VlcNPObject::invoke(int index, const NPVariant *ar
                         libvlc_input_free(p_input);
                         if( libvlc_exception_raised(&ex) )
                         {
-                            libvlc_input_free(p_input);
                             NPN_SetException(this, libvlc_exception_get_message(&ex));
                             libvlc_exception_clear(&ex);
                             return INVOKERESULT_GENERIC_ERROR;

mozilla/vlcshell.cpp

@@ -276,6 +276,16 @@ NPError NPP_Destroy( NPP instance, NPSavedData** save )
 
     VlcPlugin* p_plugin = reinterpret_cast<VlcPlugin*>(instance->pdata);
 
+#if XP_WIN
+    HWND win = (HWND)p_plugin->getWindow()->window;
+    WNDPROC winproc = p_plugin->getWindowProc();
+    if( winproc )
+    {
+        /* reset WNDPROC */
+        SetWindowLong( win, GWL_WNDPROC, (LONG)winproc );
+    }
+#endif
+
     if( p_plugin )
         delete p_plugin;
 
@@ -361,13 +371,13 @@ NPError NPP_SetWindow( NPP instance, NPWindow* window )
                 /* reset WNDPROC */
                 SetWindowLong( oldwin, GWL_WNDPROC, (LONG)oldproc );
             }
+            /* attach our plugin object */
+            SetWindowLongPtr((HWND)drawable, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(p_plugin));
+
             /* install our WNDPROC */
             p_plugin->setWindowProc( (WNDPROC)SetWindowLong( drawable,
                                                            GWL_WNDPROC, (LONG)Manage ) );
 
-            /* attach our plugin object */
-            SetWindowLongPtr((HWND)drawable, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(p_plugin));
-
             /* change window style to our liking */
             LONG style = GetWindowLong((HWND)drawable, GWL_STYLE);
             style |= WS_CLIPCHILDREN|WS_CLIPSIBLINGS;