rpms/nspluginwrapper/devel nspluginwrapper-20090625-fix-npident-array-sending.patch, NONE, 1.1 nspluginwrapper.spec, 1.79, 1.80

Martin Stransky stransky at fedoraproject.org
Wed Jul 15 12:59:01 UTC 2009


Author: stransky

Update of /cvs/pkgs/rpms/nspluginwrapper/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30940

Modified Files:
	nspluginwrapper.spec 
Added Files:
	nspluginwrapper-20090625-fix-npident-array-sending.patch 
Log Message:
NPIdentifiers fix by Tristan Schmelcher (Google)

nspluginwrapper-20090625-fix-npident-array-sending.patch:

--- NEW FILE nspluginwrapper-20090625-fix-npident-array-sending.patch ---
Index: src/npw-viewer.c
===================================================================
--- src/npw-viewer.c	(revision 942)
+++ src/npw-viewer.c	(working copy)
@@ -2059,7 +2059,7 @@
 								RPC_METHOD_NPN_INVOKE,
 								RPC_TYPE_NPW_PLUGIN_INSTANCE, plugin,
 								RPC_TYPE_NP_OBJECT, npobj,
-								RPC_TYPE_NP_IDENTIFIER, methodName,
+								RPC_TYPE_NP_IDENTIFIER, &methodName,
 								RPC_TYPE_ARRAY, RPC_TYPE_NP_VARIANT, argCount, args,
 								RPC_TYPE_INVALID);
 
@@ -2249,7 +2249,7 @@
 								RPC_METHOD_NPN_GET_PROPERTY,
 								RPC_TYPE_NPW_PLUGIN_INSTANCE, plugin,
 								RPC_TYPE_NP_OBJECT, npobj,
-								RPC_TYPE_NP_IDENTIFIER, propertyName,
+								RPC_TYPE_NP_IDENTIFIER, &propertyName,
 								RPC_TYPE_INVALID);
 
   if (error != RPC_ERROR_NO_ERROR) {
@@ -2311,7 +2311,7 @@
 								RPC_METHOD_NPN_SET_PROPERTY,
 								RPC_TYPE_NPW_PLUGIN_INSTANCE, plugin,
 								RPC_TYPE_NP_OBJECT, npobj,
-								RPC_TYPE_NP_IDENTIFIER, propertyName,
+								RPC_TYPE_NP_IDENTIFIER, &propertyName,
 								RPC_TYPE_NP_VARIANT, value,
 								RPC_TYPE_INVALID);
 
@@ -2370,7 +2370,7 @@
 								RPC_METHOD_NPN_REMOVE_PROPERTY,
 								RPC_TYPE_NPW_PLUGIN_INSTANCE, plugin,
 								RPC_TYPE_NP_OBJECT, npobj,
-								RPC_TYPE_NP_IDENTIFIER, propertyName,
+								RPC_TYPE_NP_IDENTIFIER, &propertyName,
 								RPC_TYPE_INVALID);
 
   if (error != RPC_ERROR_NO_ERROR) {
@@ -2427,7 +2427,7 @@
 								RPC_METHOD_NPN_HAS_PROPERTY,
 								RPC_TYPE_NPW_PLUGIN_INSTANCE, plugin,
 								RPC_TYPE_NP_OBJECT, npobj,
-								RPC_TYPE_NP_IDENTIFIER, propertyName,
+								RPC_TYPE_NP_IDENTIFIER, &propertyName,
 								RPC_TYPE_INVALID);
 
   if (error != RPC_ERROR_NO_ERROR) {
@@ -2484,7 +2484,7 @@
 								RPC_METHOD_NPN_HAS_METHOD,
 								RPC_TYPE_NPW_PLUGIN_INSTANCE, plugin,
 								RPC_TYPE_NP_OBJECT, npobj,
-								RPC_TYPE_NP_IDENTIFIER, methodName,
+								RPC_TYPE_NP_IDENTIFIER, &methodName,
 								RPC_TYPE_INVALID);
 
   if (error != RPC_ERROR_NO_ERROR) {
@@ -2780,7 +2780,7 @@
 
   int error = rpc_method_invoke(g_rpc_connection,
 								RPC_METHOD_NPN_IDENTIFIER_IS_STRING,
-								RPC_TYPE_NP_IDENTIFIER, identifier,
+								RPC_TYPE_NP_IDENTIFIER, &identifier,
 								RPC_TYPE_INVALID);
 
   if (error != RPC_ERROR_NO_ERROR) {
@@ -2838,7 +2838,7 @@
 
   int error = rpc_method_invoke(g_rpc_connection,
 								RPC_METHOD_NPN_UTF8_FROM_IDENTIFIER,
-								RPC_TYPE_NP_IDENTIFIER, identifier,
+								RPC_TYPE_NP_IDENTIFIER, &identifier,
 								RPC_TYPE_INVALID);
 
   if (error != RPC_ERROR_NO_ERROR) {
@@ -2902,7 +2902,7 @@
 
   int error = rpc_method_invoke(g_rpc_connection,
 								RPC_METHOD_NPN_INT_FROM_IDENTIFIER,
-								RPC_TYPE_NP_IDENTIFIER, identifier,
+								RPC_TYPE_NP_IDENTIFIER, &identifier,
 								RPC_TYPE_INVALID);
 
   if (error != RPC_ERROR_NO_ERROR) {
Index: src/npw-wrapper.c
===================================================================
--- src/npw-wrapper.c	(revision 942)
+++ src/npw-wrapper.c	(working copy)
@@ -1528,7 +1528,7 @@
 	free(name);
 
   return rpc_method_send_reply(connection,
-							   RPC_TYPE_NP_IDENTIFIER, ident,
+							   RPC_TYPE_NP_IDENTIFIER, &ident,
 							   RPC_TYPE_INVALID);
 }
 
@@ -1601,7 +1601,7 @@
   NPIdentifier ident = g_NPN_GetIntIdentifier(intid);
 
   return rpc_method_send_reply(connection,
-							   RPC_TYPE_NP_IDENTIFIER, ident,
+							   RPC_TYPE_NP_IDENTIFIER, &ident,
 							   RPC_TYPE_INVALID);
 }
 
Index: src/npruntime.c
===================================================================
--- src/npruntime.c	(revision 942)
+++ src/npruntime.c	(working copy)
@@ -221,7 +221,7 @@
   int error = rpc_method_invoke(g_rpc_connection,
 								RPC_METHOD_NPCLASS_HAS_METHOD,
 								RPC_TYPE_NP_OBJECT, npobj,
-								RPC_TYPE_NP_IDENTIFIER, name,
+								RPC_TYPE_NP_IDENTIFIER, &name,
 								RPC_TYPE_INVALID);
 
   if (error != RPC_ERROR_NO_ERROR) {
@@ -327,7 +327,7 @@
   int error = rpc_method_invoke(g_rpc_connection,
 								RPC_METHOD_NPCLASS_INVOKE,
 								RPC_TYPE_NP_OBJECT, npobj,
-								RPC_TYPE_NP_IDENTIFIER, name,
+								RPC_TYPE_NP_IDENTIFIER, &name,
 								RPC_TYPE_ARRAY, RPC_TYPE_NP_VARIANT, argCount, args,
 								RPC_TYPE_INVALID);
 
@@ -509,7 +509,7 @@
   int error = rpc_method_invoke(g_rpc_connection,
 								RPC_METHOD_NPCLASS_HAS_PROPERTY,
 								RPC_TYPE_NP_OBJECT, npobj,
-								RPC_TYPE_NP_IDENTIFIER, name,
+								RPC_TYPE_NP_IDENTIFIER, &name,
 								RPC_TYPE_INVALID);
 
   if (error != RPC_ERROR_NO_ERROR) {
@@ -599,7 +599,7 @@
   int error = rpc_method_invoke(g_rpc_connection,
 								RPC_METHOD_NPCLASS_GET_PROPERTY,
 								RPC_TYPE_NP_OBJECT, npobj,
-								RPC_TYPE_NP_IDENTIFIER, name,
+								RPC_TYPE_NP_IDENTIFIER, &name,
 								RPC_TYPE_INVALID);
 
   if (error != RPC_ERROR_NO_ERROR) {
@@ -684,7 +684,7 @@
   int error = rpc_method_invoke(g_rpc_connection,
 								RPC_METHOD_NPCLASS_SET_PROPERTY,
 								RPC_TYPE_NP_OBJECT, npobj,
-								RPC_TYPE_NP_IDENTIFIER, name,
+								RPC_TYPE_NP_IDENTIFIER, &name,
 								RPC_TYPE_NP_VARIANT, value,
 								RPC_TYPE_INVALID);
 
@@ -763,7 +763,7 @@
   int error = rpc_method_invoke(g_rpc_connection,
 								RPC_METHOD_NPCLASS_REMOVE_PROPERTY,
 								RPC_TYPE_NP_OBJECT, npobj,
-								RPC_TYPE_NP_IDENTIFIER, name,
+								RPC_TYPE_NP_IDENTIFIER, &name,
 								RPC_TYPE_INVALID);
 
   if (error != RPC_ERROR_NO_ERROR) {
Index: src/npw-rpc.c
===================================================================
--- src/npw-rpc.c	(revision 942)
+++ src/npw-rpc.c	(working copy)
@@ -1252,7 +1252,7 @@
 // the browser side
 static int do_send_NPIdentifier(rpc_message_t *message, void *p_value)
 {
-  NPIdentifier ident = (NPIdentifier)p_value;
+  NPIdentifier ident = *(NPIdentifier *)p_value;
   int id = 0;
   if (ident) {
 #ifdef BUILD_WRAPPER


Index: nspluginwrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- nspluginwrapper.spec	15 Jul 2009 06:16:43 -0000	1.79
+++ nspluginwrapper.spec	15 Jul 2009 12:58:31 -0000	1.80
@@ -73,7 +73,7 @@
 Summary:	A compatibility layer for Netscape 4 plugins
 Name:		nspluginwrapper
 Version:	1.3.0
-Release:	6%{?dist}
+Release:	7%{?dist}
 Source0:	%{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2
 Source1:        %{plugin_config_name}.tar.gz
 Source2:        plugin-config.sh.in
@@ -81,6 +81,7 @@ Source3:        %{name}.sh.in
 Patch1:         nspluginwrapper-1.3.0-make.patch
 Patch2:         nspluginwrapper-1.3.0-configure.patch
 Patch3:         nspluginwrapper-1.3.0-directory.patch
+Patch4:         nspluginwrapper-20090625-fix-npident-array-sending.patch
 Patch100:       plugin-config-setuid.patch
 Patch101:       plugin-config-umask.patch
 Patch102:       plugin-config-print.patch
@@ -113,6 +114,7 @@ This package consists in:
 %patch1 -p1 -b .make
 %patch2 -p1 -b .conf
 %patch3 -p1 -b .dir
+%patch4 -p0 -b .array
 
 # Plugin-config patches
 pushd %plugin_config_name
@@ -244,6 +246,9 @@ fi;
 
 
 %changelog
+* Wed Jul 15 2009 Martin Stransky <stransky at redhat.com> 1.3.0-7
+- NPIdentifiers fix by Tristan Schmelcher (Google)
+
 * Wed Jul 15 2009 Martin Stransky <stransky at redhat.com> 1.3.0-6
 - Package kit plugin is ignored now (#511385)
 




More information about the fedora-extras-commits mailing list