]>
Commit | Line | Data |
---|---|---|
13701c20 JB |
1 | --- gpac/applications/osmozilla/npplat.h.orig 2005-07-13 16:34:30.000000000 +0200 |
2 | +++ gpac/applications/osmozilla/npplat.h 2011-03-20 09:34:57.624712082 +0100 | |
3 | @@ -49,7 +49,7 @@ | |
4 | #endif | |
5 | ||
6 | #include "npapi.h" | |
7 | -#include "npupp.h" | |
8 | +#include "npfunctions.h" | |
9 | ||
10 | /**************************************************/ | |
11 | /* */ | |
12 | --- gpac/applications/osmozilla/osmozilla.h.orig 2008-10-06 17:17:57.000000000 +0200 | |
13 | +++ gpac/applications/osmozilla/osmozilla.h 2011-03-20 10:04:41.876713758 +0100 | |
14 | @@ -39,6 +39,7 @@ | |
15 | #define __PLUGIN_H__ | |
16 | ||
17 | #include <nsIClassInfo.h> | |
18 | +#include <nsIProgrammingLanguage.h> | |
19 | ||
20 | #include "npplat.h" | |
21 | #include "nsIOsmozilla.h" | |
22 | --- gpac/applications/osmozilla/osmozilla.cpp.orig 2008-10-06 17:17:57.000000000 +0200 | |
23 | +++ gpac/applications/osmozilla/osmozilla.cpp 2011-03-20 10:12:46.068709568 +0100 | |
24 | @@ -856,19 +856,19 @@ | |
25 | return NS_ERROR_NULL_POINTER; | |
26 | ||
27 | if (aIID.Equals(kIZillaPluginIID)) { | |
28 | - *aInstancePtr = NS_STATIC_CAST(nsIOsmozilla *, this); | |
29 | + *aInstancePtr = static_cast<nsIOsmozilla *>(this); | |
30 | AddRef(); | |
31 | return NS_OK; | |
32 | } | |
33 | ||
34 | if (aIID.Equals(kIClassInfoIID)) { | |
35 | - *aInstancePtr = NS_STATIC_CAST(nsIClassInfo *, this); | |
36 | + *aInstancePtr = static_cast<nsIClassInfo *>(this); | |
37 | AddRef(); | |
38 | return NS_OK; | |
39 | } | |
40 | ||
41 | if (aIID.Equals(kISupportsIID)) { | |
42 | - *aInstancePtr = NS_STATIC_CAST(nsISupports *, (NS_STATIC_CAST (nsIOsmozilla *, this))); | |
43 | + *aInstancePtr = static_cast<nsISupports *>((static_cast<nsIOsmozilla *>(this))); | |
44 | AddRef(); | |
45 | return NS_OK; | |
46 | } | |
47 | --- gpac/applications/osmozilla/npn_gate.cpp.orig 2005-07-13 16:34:29.000000000 +0200 | |
48 | +++ gpac/applications/osmozilla/npn_gate.cpp 2011-03-20 10:24:21.496702863 +0100 | |
49 | @@ -58,7 +58,7 @@ | |
50 | NPError rv = NPERR_NO_ERROR; | |
51 | ||
52 | if( navMinorVers >= NPVERS_HAS_NOTIFICATION ) | |
53 | - rv = CallNPN_GetURLNotifyProc(NPNFuncs.geturlnotify, instance, url, target, notifyData); | |
54 | + rv = (*NPNFuncs.geturlnotify)(instance, url, target, notifyData); | |
55 | else | |
56 | rv = NPERR_INCOMPATIBLE_VERSION_ERROR; | |
57 | ||
58 | @@ -67,32 +67,32 @@ | |
59 | ||
60 | NPError NPN_GetURL(NPP instance, const char *url, const char *target) | |
61 | { | |
62 | - NPError rv = CallNPN_GetURLProc(NPNFuncs.geturl, instance, url, target); | |
63 | + NPError rv = (*NPNFuncs.geturl)(instance, url, target); | |
64 | return rv; | |
65 | } | |
66 | ||
67 | -NPError NPN_PostURLNotify(NPP instance, const char* url, const char* window, uint32 len, const char* buf, NPBool file, void* notifyData) | |
68 | +NPError NPN_PostURLNotify(NPP instance, const char* url, const char* window, uint32_t len, const char* buf, NPBool file, void* notifyData) | |
69 | { | |
70 | int navMinorVers = NPNFuncs.version & 0xFF; | |
71 | NPError rv = NPERR_NO_ERROR; | |
72 | ||
73 | if( navMinorVers >= NPVERS_HAS_NOTIFICATION ) | |
74 | - rv = CallNPN_PostURLNotifyProc(NPNFuncs.posturlnotify, instance, url, window, len, buf, file, notifyData); | |
75 | + rv = (*NPNFuncs.posturlnotify)(instance, url, window, len, buf, file, notifyData); | |
76 | else | |
77 | rv = NPERR_INCOMPATIBLE_VERSION_ERROR; | |
78 | ||
79 | return rv; | |
80 | } | |
81 | ||
82 | -NPError NPN_PostURL(NPP instance, const char* url, const char* window, uint32 len, const char* buf, NPBool file) | |
83 | +NPError NPN_PostURL(NPP instance, const char* url, const char* window, uint32_t len, const char* buf, NPBool file) | |
84 | { | |
85 | - NPError rv = CallNPN_PostURLProc(NPNFuncs.posturl, instance, url, window, len, buf, file); | |
86 | + NPError rv = (*NPNFuncs.posturl)(instance, url, window, len, buf, file); | |
87 | return rv; | |
88 | } | |
89 | ||
90 | NPError NPN_RequestRead(NPStream* stream, NPByteRange* rangeList) | |
91 | { | |
92 | - NPError rv = CallNPN_RequestReadProc(NPNFuncs.requestread, stream, rangeList); | |
93 | + NPError rv = (*NPNFuncs.requestread)(stream, rangeList); | |
94 | return rv; | |
95 | } | |
96 | ||
97 | @@ -103,20 +103,20 @@ | |
98 | NPError rv = NPERR_NO_ERROR; | |
99 | ||
100 | if( navMinorVersion >= NPVERS_HAS_STREAMOUTPUT ) | |
101 | - rv = CallNPN_NewStreamProc(NPNFuncs.newstream, instance, type, target, stream); | |
102 | + rv = (*NPNFuncs.newstream)(instance, type, target, stream); | |
103 | else | |
104 | rv = NPERR_INCOMPATIBLE_VERSION_ERROR; | |
105 | ||
106 | return rv; | |
107 | } | |
108 | ||
109 | -int32 NPN_Write(NPP instance, NPStream *stream, int32 len, void *buffer) | |
110 | +int32_t NPN_Write(NPP instance, NPStream *stream, int32_t len, void *buffer) | |
111 | { | |
112 | int navMinorVersion = NPNFuncs.version & 0xFF; | |
113 | - int32 rv = 0; | |
114 | + int32_t rv = 0; | |
115 | ||
116 | if( navMinorVersion >= NPVERS_HAS_STREAMOUTPUT ) | |
117 | - rv = CallNPN_WriteProc(NPNFuncs.write, instance, stream, len, buffer); | |
118 | + rv = (*NPNFuncs.write)(instance, stream, len, buffer); | |
119 | else | |
120 | rv = -1; | |
121 | ||
122 | @@ -129,7 +129,7 @@ | |
123 | NPError rv = NPERR_NO_ERROR; | |
124 | ||
125 | if( navMinorVersion >= NPVERS_HAS_STREAMOUTPUT ) | |
126 | - rv = CallNPN_DestroyStreamProc(NPNFuncs.destroystream, instance, stream, reason); | |
127 | + rv = (*NPNFuncs.destroystream)(instance, stream, reason); | |
128 | else | |
129 | rv = NPERR_INCOMPATIBLE_VERSION_ERROR; | |
130 | ||
131 | @@ -138,78 +138,78 @@ | |
132 | ||
133 | void NPN_Status(NPP instance, const char *message) | |
134 | { | |
135 | - CallNPN_StatusProc(NPNFuncs.status, instance, message); | |
136 | + (*NPNFuncs.status)(instance, message); | |
137 | } | |
138 | ||
139 | const char* NPN_UserAgent(NPP instance) | |
140 | { | |
141 | const char * rv = NULL; | |
142 | - rv = CallNPN_UserAgentProc(NPNFuncs.uagent, instance); | |
143 | + rv = (*NPNFuncs.uagent)(instance); | |
144 | return rv; | |
145 | } | |
146 | ||
147 | -void* NPN_MemAlloc(uint32 size) | |
148 | +void* NPN_MemAlloc(uint32_t size) | |
149 | { | |
150 | void * rv = NULL; | |
151 | - rv = CallNPN_MemAllocProc(NPNFuncs.memalloc, size); | |
152 | + rv = (*NPNFuncs.memalloc)(size); | |
153 | return rv; | |
154 | } | |
155 | ||
156 | void NPN_MemFree(void* ptr) | |
157 | { | |
158 | - CallNPN_MemFreeProc(NPNFuncs.memfree, ptr); | |
159 | + (*NPNFuncs.memfree)(ptr); | |
160 | } | |
161 | ||
162 | -uint32 NPN_MemFlush(uint32 size) | |
163 | +uint32_t NPN_MemFlush(uint32_t size) | |
164 | { | |
165 | - uint32 rv = CallNPN_MemFlushProc(NPNFuncs.memflush, size); | |
166 | + uint32_t rv = (*NPNFuncs.memflush)(size); | |
167 | return rv; | |
168 | } | |
169 | ||
170 | void NPN_ReloadPlugins(NPBool reloadPages) | |
171 | { | |
172 | - CallNPN_ReloadPluginsProc(NPNFuncs.reloadplugins, reloadPages); | |
173 | + (*NPNFuncs.reloadplugins)(reloadPages); | |
174 | } | |
175 | ||
176 | #ifdef OJI | |
177 | JRIEnv* NPN_GetJavaEnv(void) | |
178 | { | |
179 | JRIEnv * rv = NULL; | |
180 | - rv = CallNPN_GetJavaEnvProc(NPNFuncs.getJavaEnv); | |
181 | + rv = (*NPNFuncs.getJavaEnv)(); | |
182 | return rv; | |
183 | } | |
184 | ||
185 | jref NPN_GetJavaPeer(NPP instance) | |
186 | { | |
187 | jref rv; | |
188 | - rv = CallNPN_GetJavaPeerProc(NPNFuncs.getJavaPeer, instance); | |
189 | + rv = (*NPNFuncs.getJavaPeer)(instance); | |
190 | return rv; | |
191 | } | |
192 | #endif | |
193 | ||
194 | NPError NPN_GetValue(NPP instance, NPNVariable variable, void *value) | |
195 | { | |
196 | - NPError rv = CallNPN_GetValueProc(NPNFuncs.getvalue, instance, variable, value); | |
197 | + NPError rv = (*NPNFuncs.getvalue)(instance, variable, value); | |
198 | return rv; | |
199 | } | |
200 | ||
201 | NPError NPN_SetValue(NPP instance, NPPVariable variable, void *value) | |
202 | { | |
203 | - NPError rv = CallNPN_SetValueProc(NPNFuncs.setvalue, instance, variable, value); | |
204 | + NPError rv = (*NPNFuncs.setvalue)(instance, variable, value); | |
205 | return rv; | |
206 | } | |
207 | ||
208 | void NPN_InvalidateRect(NPP instance, NPRect *invalidRect) | |
209 | { | |
210 | - CallNPN_InvalidateRectProc(NPNFuncs.invalidaterect, instance, invalidRect); | |
211 | + (*NPNFuncs.invalidaterect)(instance, invalidRect); | |
212 | } | |
213 | ||
214 | void NPN_InvalidateRegion(NPP instance, NPRegion invalidRegion) | |
215 | { | |
216 | - CallNPN_InvalidateRegionProc(NPNFuncs.invalidateregion, instance, invalidRegion); | |
217 | + (*NPNFuncs.invalidateregion)(instance, invalidRegion); | |
218 | } | |
219 | ||
220 | void NPN_ForceRedraw(NPP instance) | |
221 | { | |
222 | - CallNPN_ForceRedrawProc(NPNFuncs.forceredraw, instance); | |
223 | + (*NPNFuncs.forceredraw)(instance); | |
224 | } | |
a8c7bdfb JB |
225 | --- gpac/configure.orig 2011-05-29 21:09:10.138301981 +0200 |
226 | +++ gpac/configure 2011-05-29 21:27:39.248339117 +0200 | |
227 | @@ -1145,6 +1145,7 @@ | |
228 | ||
229 | #look for GECKO support | |
230 | cat > $TMPCPP << EOF | |
231 | +#include <mozilla-config.h> | |
232 | #include <nsIServiceManager.h> | |
233 | int main( void ) { return 0; } | |
234 | EOF |