2008-10-29 05:40 Gwenole Beauchesne * src/npruntime.c, src/npw-common.h, src/npw-wrapper.c: Don't claim we support interfaces we currently don't, i.e. NPAPI >= 0.18 is not fully implemented yet. Index: src/npw-common.h =================================================================== --- src/npw-common.h (revision 697) +++ src/npw-common.h (revision 698) @@ -33,6 +33,10 @@ #include #include "npruntime-impl.h" +/* Supported NPAPI interfaces */ +#define NPW_NPAPI_VERSION 17 +#define NPW_NP_CLASS_STRUCT_VERSION 1 + /* What are we building? */ #if defined BUILD_WRAPPER # define NPW_IS_BROWSER (1) Index: src/npruntime.c =================================================================== --- src/npruntime.c (revision 697) +++ src/npruntime.c (revision 698) @@ -38,7 +38,7 @@ /* ====================================================================== */ NPClass npclass_bridge = { - NP_CLASS_STRUCT_VERSION, + NPW_NP_CLASS_STRUCT_VERSION, NULL, NULL, npclass_invoke_Invalidate, Index: src/npw-wrapper.c =================================================================== --- src/npw-wrapper.c (revision 697) +++ src/npw-wrapper.c (revision 698) @@ -2550,7 +2550,7 @@ memset(plugin_funcs, 0, sizeof(*plugin_funcs)); plugin_funcs->size = sizeof(NPPluginFuncs); - plugin_funcs->version = (NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR; + plugin_funcs->version = NPW_NPAPI_VERSION; plugin_funcs->newp = NewNPP_NewProc(g_NPP_New); plugin_funcs->destroy = NewNPP_DestroyProc(g_NPP_Destroy); plugin_funcs->setwindow = NewNPP_SetWindowProc(g_NPP_SetWindow);