773958 - Fix calling convention conflicts of NPN_xxx funciton pointer

Status: RESOLVED FIXED

(Core Graveyard :: Plug-ins, defect)

Description

[KO Myung-Hun]

User Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:13.0) Gecko/20100101 Firefox/13.0.1
Build ID: 20120614114901

Comment 1

[KO Myung-Hun]

NPN_xxx function pointers should use NP_CALLBACK calling convention.

Comment 2

[KO Myung-Hun]

Attachment: Prepend NP_CALLBACK to NPN_xxx function pointers

Comment 3

[Benjamin Smedberg]

Comment on attachment 642225 [details] [diff] [review]
Prepend NP_CALLBACK to NPN_xxx function pointers

The NPAPI headers are now imported directly from the npapi-sdk project shared between vendors. Any patches to this need to be directed upstream.

Comment 4

[Benjamin Smedberg]

http://code.google.com/p/npapi-sdk/

Comment 5

[KO Myung-Hun]

Thanks for your advice.

I've submitted a patch for npfunctions.h to the upstream.

And I attach a patch for nsNPAPIPlugin.h, here.

Comment 6

[KO Myung-Hun]

Attachment: Remove NP_CALLBACK from nsNPAPIPlugin.h

Comment 7

[Benjamin Smedberg]

Comment on attachment 642246 [details] [diff] [review]
Remove NP_CALLBACK from nsNPAPIPlugin.h

I thought we removed NP_CALLBACK on purpose, so I'm going to bump this to josh.

Comment 8

[Josh Aas]

Comment on attachment 642246 [details] [diff] [review]
Remove NP_CALLBACK from nsNPAPIPlugin.h

Review of attachment 642246 [details] [diff] [review]:
-----------------------------------------------------------------

We don't need to change this, we're not defining NP_CALLBACK in the NPAPI headers.

Comment 9

[KO Myung-Hun]

Attachment: Define NP_CALLBACK as NP_LOADDS

Comment 10

[Ryan VanderMeulen [:RyanVM]]

Comment on attachment 642225 [details] [diff] [review]
Prepend NP_CALLBACK to NPN_xxx function pointers

Please mark obsolete patches as such before adding checkin-needed to a bug.

Comment 11

[Ryan VanderMeulen [:RyanVM]]

This also fails to build.

https://tbpl.mozilla.org/php/getParsedLog.php?id=14448366&tree=Try

PluginModuleParent.cpp
cc1plus: warnings being treated as errors
In file included from /builds/slave/try-lnx/build/dom/plugins/ipc/PluginModuleChild.cpp:46:0:
/builds/slave/try-lnx/build/dom/plugins/ipc/../base/nsNPAPIPlugin.h:23:0: error: "NP_CALLBACK" redefined
../../../dist/include/mozilla/plugins/PluginModuleChild.h:46:0: note: this is the location of the previous definition
cc1plus: warnings being treated as errors
In file included from /builds/slave/try-lnx/build/dom/plugins/ipc/PluginScriptableObjectUtils.h:11:0,
                 from /builds/slave/try-lnx/build/dom/plugins/ipc/PluginIdentifierParent.cpp:12:
/builds/slave/try-lnx/build/dom/plugins/ipc/PluginModuleChild.h:46:0: error: "NP_CALLBACK" redefined
/builds/slave/try-lnx/build/dom/plugins/ipc/../base/nsNPAPIPlugin.h:23:0: note: this is the location of the previous definition

Please include a link to passing Try results when requesting checkin again.

Comment 12

[KO Myung-Hun]

Attachment: Define NP_CALLBACK as NP_LOADDS v2

Comment 13

[Ryan VanderMeulen [:RyanVM]]

Green on Try. (The Windows test failure is unrelated to this patch)
https://tbpl.mozilla.org/?tree=Try&rev=bb4178a63464

https://hg.mozilla.org/integration/mozilla-inbound/rev/7a1ab48fc876

Comment 14

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/7a1ab48fc876