From 4066e4a4f04000414a7716d9b153cdbe0d2f5189 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 12 Nov 2012 16:59:50 +0100 Subject: Enable NPP_Initialize/Shutdown again ...calling which had erroneously been dropped in bdead69dd3c947743907681c8a2f16ca1f50cd9c "Add switch for system/internal npapi.h." This makes the npsoplugin browser plugin work again. (Also, init write_fd to -1 instead of 0, so that a missing do_init_pipe does not accidentally cause writing to write_fd succeed in writing to stdin.) (cherry picked from commit 9081e07c9c92267d86a90752b28bd42b592782a8 plus follow- up 6ce21d57d9a627a95bfb2f10519ae3cd032f521b "Typo") Conflicts: extensions/Library_npsoplugin.mk Change-Id: Iced734512a43c8dfea46088f7ac16f159e7dd807 Reviewed-on: https://gerrit.libreoffice.org/1042 Reviewed-by: Tor Lillqvist Tested-by: Tor Lillqvist --- extensions/Library_npsoplugin.mk | 6 ++-- extensions/source/nsplugin/source/npshell.cxx | 8 +++-- np_sdk/Package_inc.mk | 1 + np_sdk/mozsrc/npunix.c | 4 ++- np_sdk/mozsrc/npwin.cxx | 4 ++- np_sdk/mozsrc/plugin.h | 44 +++++++++++++++++++++++++++ 6 files changed, 60 insertions(+), 7 deletions(-) create mode 100644 np_sdk/mozsrc/plugin.h diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk index 7e8b400d6eb8..2f1d8f61512c 100644 --- a/extensions/Library_npsoplugin.mk +++ b/extensions/Library_npsoplugin.mk @@ -30,6 +30,10 @@ $(eval $(call gb_Library_Library,npsoplugin)) +$(eval $(call gb_Library_use_packages,npsoplugin,\ + np_sdk_inc \ +)) + $(eval $(call gb_Library_use_external,npsoplugin,mozilla_headers)) $(eval $(call gb_Library_use_static_libraries,npsoplugin,\ @@ -90,8 +94,6 @@ $(eval $(call gb_Library_add_defs,npsoplugin,\ ifeq ($(COM),MSC) $(eval $(call gb_Library_add_ldflags,npsoplugin,\ /EXPORT:NPP_GetMIMEDescription \ - /EXPORT:NPP_Initialize \ - /EXPORT:NPP_Shutdown \ /EXPORT:NPP_New \ /EXPORT:NPP_Destroy \ /EXPORT:NPP_SetWindow \ diff --git a/extensions/source/nsplugin/source/npshell.cxx b/extensions/source/nsplugin/source/npshell.cxx index e9aae6561a84..52e85b627d58 100644 --- a/extensions/source/nsplugin/source/npshell.cxx +++ b/extensions/source/nsplugin/source/npshell.cxx @@ -82,6 +82,8 @@ #include "nsp_func.hxx" +#include "npsdk/plugin.h" + #include #ifdef _MSC_VER @@ -97,7 +99,7 @@ ***********************************************************************/ static NSP_Mute_Obj send_lock = NSP_New_Mute_Obj(); -static NSP_PIPE_FD write_fd = 0; +static NSP_PIPE_FD write_fd = -1; long int NSP_WriteToPipe(NSP_PIPE_FD fp, void* buf, unsigned long int len) @@ -416,7 +418,7 @@ dupMimeType(NPMIMEType type) } #endif // end of UNIX -NP_DLLPUBLIC NPError +NPError NPP_Initialize(void) { debug_fprintf(NSP_LOG_NEW, "NS Plugin begin initialize.\n"); @@ -431,7 +433,7 @@ NPP_GetJavaClass() } #endif -NP_DLLPUBLIC void +void NPP_Shutdown(void) { PLUGIN_MSG msg; diff --git a/np_sdk/Package_inc.mk b/np_sdk/Package_inc.mk index 841b1bd33b4e..2a656b9e0ab1 100644 --- a/np_sdk/Package_inc.mk +++ b/np_sdk/Package_inc.mk @@ -31,5 +31,6 @@ $(eval $(call gb_Package_add_file,np_sdk_inc,inc/npsdk/jri.h,mozsrc/jri.h)) $(eval $(call gb_Package_add_file,np_sdk_inc,inc/npsdk/jri_md.h,mozsrc/jri_md.h)) $(eval $(call gb_Package_add_file,np_sdk_inc,inc/npsdk/jritypes.h,mozsrc/jritypes.h)) $(eval $(call gb_Package_add_file,np_sdk_inc,inc/npsdk/npupp.h,mozsrc/npupp.h)) +$(eval $(call gb_Package_add_file,np_sdk_inc,inc/npsdk/plugin.h,mozsrc/plugin.h)) # vim: set noet sw=4 ts=4: diff --git a/np_sdk/mozsrc/npunix.c b/np_sdk/mozsrc/npunix.c index 0b5ff3876161..24ef766873dd 100644 --- a/np_sdk/mozsrc/npunix.c +++ b/np_sdk/mozsrc/npunix.c @@ -58,6 +58,7 @@ #include #include "npapi.h" #include "npupp.h" +#include "plugin.h" /* * Define PLUGIN_TRACE to have the wrapper functions print @@ -485,7 +486,7 @@ NP_Initialize(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs) pluginFuncs->javaClass = Private_GetJavaClass(); #endif - err = NPERR_NO_ERROR; + err = NPP_Initialize(); } return err; @@ -502,4 +503,5 @@ SAL_DLLPUBLIC_EXPORT void NP_Shutdown(void) { PLUGINDEBUGSTR("NP_Shutdown"); + NPP_Shutdown(); } diff --git a/np_sdk/mozsrc/npwin.cxx b/np_sdk/mozsrc/npwin.cxx index 204f5d159c4f..9021c635993c 100644 --- a/np_sdk/mozsrc/npwin.cxx +++ b/np_sdk/mozsrc/npwin.cxx @@ -37,6 +37,7 @@ #include "npapi.h" #include "npupp.h" +#include "plugin.h" //\\// DEFINE #define NP_EXPORT @@ -149,7 +150,7 @@ NP_Initialize(NPNetscapeFuncs* pFuncs) } #endif - return NPERR_NO_ERROR; + return NPP_Initialize(); } //\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\//\\. @@ -163,6 +164,7 @@ NP_Initialize(NPNetscapeFuncs* pFuncs) void WINAPI NP_EXPORT NP_Shutdown() { + NPP_Shutdown(); g_pNavigatorFuncs = NULL; } diff --git a/np_sdk/mozsrc/plugin.h b/np_sdk/mozsrc/plugin.h new file mode 100644 index 000000000000..67e049e4b5f6 --- /dev/null +++ b/np_sdk/mozsrc/plugin.h @@ -0,0 +1,44 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#ifndef INCLUDED_NP_SDK_MOZSRC_PLUGIN_H +#define INCLUDED_NP_SDK_MOZSRC_PLUGIN_H + +#include "npapi.h" + +/* OpenOffice.org/LibreOffice modified the implementations of NP_Initialize and + NP_Shutdown in np_sdk/mozsrc/ to call NPP_Initialize and NPP_Shutdown, resp., + defined in extensions/source/nsplugin/source/npshell.cxx: +*/ + +#if defined __cplusplus +extern "C" { +#endif + +NPError NPP_Initialize(void); + +void NPP_Shutdown(void); + +#if defined __cplusplus +} +#endif + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit