Commit 69bc1e84 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf Committed by Rémi Denis-Courmont

Mozilla: More (final?) Win32 compile fixes for XulRunner 1.9.2

parent c3553a64
...@@ -57,7 +57,7 @@ NPVariant copyNPVariant(const NPVariant& original) ...@@ -57,7 +57,7 @@ NPVariant copyNPVariant(const NPVariant& original)
NPVariant res; NPVariant res;
if (NPVARIANT_IS_STRING(original)) if (NPVARIANT_IS_STRING(original))
STRINGZ_TO_NPVARIANT(strdup(NPVARIANT_TO_STRING(original).utf8characters), res); STRINGZ_TO_NPVARIANT(strdup(NPVARIANT_TO_STRING(original).UTF8Characters), res);
else if (NPVARIANT_IS_INT32(original)) else if (NPVARIANT_IS_INT32(original))
INT32_TO_NPVARIANT(NPVARIANT_TO_INT32(original), res); INT32_TO_NPVARIANT(NPVARIANT_TO_INT32(original), res);
else if (NPVARIANT_IS_DOUBLE(original)) else if (NPVARIANT_IS_DOUBLE(original))
...@@ -1639,7 +1639,7 @@ LibvlcMarqueeNPObject::setProperty(int index, const NPVariant &value) ...@@ -1639,7 +1639,7 @@ LibvlcMarqueeNPObject::setProperty(int index, const NPVariant &value)
case ID_marquee_position: case ID_marquee_position:
if( !NPVARIANT_IS_STRING(value) || if( !NPVARIANT_IS_STRING(value) ||
!position_byname( NPVARIANT_TO_STRING(value).utf8characters, i ) ) !position_byname( NPVARIANT_TO_STRING(value).UTF8Characters, i ) )
return INVOKERESULT_INVALID_VALUE; return INVOKERESULT_INVALID_VALUE;
libvlc_video_set_marquee_int(p_md, libvlc_marquee_Position, i); libvlc_video_set_marquee_int(p_md, libvlc_marquee_Position, i);
...@@ -1785,7 +1785,7 @@ LibvlcLogoNPObject::setProperty(int index, const NPVariant &value) ...@@ -1785,7 +1785,7 @@ LibvlcLogoNPObject::setProperty(int index, const NPVariant &value)
case ID_logo_position: case ID_logo_position:
if( !NPVARIANT_IS_STRING(value) || if( !NPVARIANT_IS_STRING(value) ||
!position_byname( NPVARIANT_TO_STRING(value).utf8characters, i ) ) !position_byname( NPVARIANT_TO_STRING(value).UTF8Characters, i ) )
return INVOKERESULT_INVALID_VALUE; return INVOKERESULT_INVALID_VALUE;
libvlc_video_set_logo_int(p_md, libvlc_logo_position, i); libvlc_video_set_logo_int(p_md, libvlc_logo_position, i);
...@@ -1843,7 +1843,7 @@ LibvlcLogoNPObject::invoke(int index, const NPVariant *args, ...@@ -1843,7 +1843,7 @@ LibvlcLogoNPObject::invoke(int index, const NPVariant *args,
{ {
if( !NPVARIANT_IS_STRING(args[i]) ) if( !NPVARIANT_IS_STRING(args[i]) )
return INVOKERESULT_INVALID_VALUE; return INVOKERESULT_INVALID_VALUE;
len+=NPVARIANT_TO_STRING(args[i]).utf8length+1; len+=NPVARIANT_TO_STRING(args[i]).UTF8Length+1;
} }
buf = (char *)malloc( len+1 ); buf = (char *)malloc( len+1 );
...@@ -1853,8 +1853,8 @@ LibvlcLogoNPObject::invoke(int index, const NPVariant *args, ...@@ -1853,8 +1853,8 @@ LibvlcLogoNPObject::invoke(int index, const NPVariant *args,
for( h=buf,i=0;i<argCount;++i ) for( h=buf,i=0;i<argCount;++i )
{ {
if(i) *h++=';'; if(i) *h++=';';
len=NPVARIANT_TO_STRING(args[i]).utf8length; len=NPVARIANT_TO_STRING(args[i]).UTF8Length;
memcpy(h,NPVARIANT_TO_STRING(args[i]).utf8characters,len); memcpy(h,NPVARIANT_TO_STRING(args[i]).UTF8Characters,len);
h+=len; h+=len;
} }
*h='\0'; *h='\0';
......
...@@ -544,7 +544,7 @@ const char* NPN_UserAgent(NPP instance) ...@@ -544,7 +544,7 @@ const char* NPN_UserAgent(NPP instance)
/* allocates memory from the Navigator's memory space. Necessary so that /* allocates memory from the Navigator's memory space. Necessary so that
* saved instance data may be freed by Navigator when exiting. * saved instance data may be freed by Navigator when exiting.
*/ */
void *NPN_MemAlloc(uint32 size) void *NPN_MemAlloc(uint32_t size)
{ {
return g_pNavigatorFuncs->memalloc(size); return g_pNavigatorFuncs->memalloc(size);
} }
......
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
#include "control/npolibvlc.h" #include "control/npolibvlc.h"
#include <ctype.h> #include <ctype.h>
#if defined(XP_UNIX) #if defined(XP_UNIX)
# include <pthread.h> # include <pthread.h>
#elif defined(XP_WIN) #elif defined(XP_WIN)
...@@ -236,7 +237,7 @@ inline EventObj::event_t EventObj::find_event(const char *s) const ...@@ -236,7 +237,7 @@ inline EventObj::event_t EventObj::find_event(const char *s) const
bool EventObj::insert(const NPString &s, NPObject *l, bool b) bool EventObj::insert(const NPString &s, NPObject *l, bool b)
{ {
event_t e = find_event(s.utf8characters); event_t e = find_event(s.UTF8Characters);
if( e>=maxbit() ) if( e>=maxbit() )
return false; return false;
...@@ -261,7 +262,7 @@ bool EventObj::insert(const NPString &s, NPObject *l, bool b) ...@@ -261,7 +262,7 @@ bool EventObj::insert(const NPString &s, NPObject *l, bool b)
bool EventObj::remove(const NPString &s, NPObject *l, bool b) bool EventObj::remove(const NPString &s, NPObject *l, bool b)
{ {
event_t e = find_event(s.utf8characters); event_t e = find_event(s.UTF8Characters);
if( e>=maxbit() || !get(e) ) if( e>=maxbit() || !get(e) )
return false; return false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment