mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-02-05 03:50:07 +00:00
Code Activity

Tarted up InterprocessLock and added a scoped lock for it. Minor safety checks in NPAPI. Jucer development.

Browse source
This commit is contained in:
Julian Storer 2010-04-11 15:14:44 +02:00
parent 671dde2ffa
commit f198f06e6a
8 changed files with 666 additions and 280 deletions
Download patch file Download diff file Expand all files Collapse all files

4
extras/browser plugins/wrapper/juce_NPAPI_GlueCode.cpp
View file

@ -849,7 +849,7 @@ static const var createValueFromNPVariant (NPP npp, const NPVariant& v)
return var (String::fromUTF8 ((const char*) (NPVARIANT_TO_STRING (v).utf8characters),
(int) NPVARIANT_TO_STRING (v).utf8length));
#endif
else if (NPVARIANT_IS_OBJECT (v))
else if (NPVARIANT_IS_OBJECT (v) && npp != 0)
return var (new DynamicObjectWrappingNPObject (npp, NPVARIANT_TO_OBJECT (v)));
return var();
@ -872,7 +872,7 @@ static void createNPVariantFromValue (NPP npp, NPVariant& out, const var& v)
memcpy (stringCopy, utf8, utf8Len);
STRINGZ_TO_NPVARIANT (stringCopy, out);
}
else if (v.isObject())
else if (v.isObject() && npp != 0)
OBJECT_TO_NPVARIANT (NPObjectWrappingDynamicObject::create (npp, v), out);
else
VOID_TO_NPVARIANT (out);