--- a/webengine/osswebengine/WebKit/s60/plugins/NpnImplementation.cpp	Fri Jul 03 15:54:40 2009 +0100
+++ b/webengine/osswebengine/WebKit/s60/plugins/NpnImplementation.cpp	Thu Aug 27 07:44:59 2009 +0300
@@ -378,7 +378,17 @@
             *((TInt*) aRetValue) = apId;
             break;
             
-            
+       case NPNVGenericParameter: {   
+            PluginWin* pluginWin = (PluginWin*)aInstance->ndata;
+            if (pluginWin) {
+                void **v = (void **)aRetValue;
+                *v = pluginWin->pluginSkin()->genericElementArray();
+            }
+            else {
+                err = NPERR_GENERIC_ERROR;
+            }
+        }
+        break;  // for code consistency
         default:
             {
             *((TBool*) aRetValue) = EFalse;
@@ -460,7 +470,8 @@
             {
             PluginWin* pluginWin = (PluginWin*)aInstance->ndata;
             if (pluginWin) {
-                pluginWin->pluginDeactivate();
+                TPoint* cursorPos = static_cast<TPoint*>(aSetValue);
+                pluginWin->pluginDeactivate(*cursorPos);
             }
         }
         break;