My favorites | Sign in
Project Home Downloads
READ-ONLY: This project has been archived. For more information see this post.
Search
for
  Advanced search   Search tips   Subscriptions

Issue 18 attachment: array.txt (756 bytes)

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
diff -r 14e849830355 ff-activex-host/ffactivex/variants.cpp
--- a/ff-activex-host/ffactivex/variants.cpp Mon Apr 11 14:33:40 2011 +0300
+++ b/ff-activex-host/ffactivex/variants.cpp Fri Oct 21 15:39:23 2011 -0700
@@ -304,11 +304,6 @@
VOID_TO_NPVARIANT(*npvar);

switch (var->vt & ~VT_BYREF) {
- case VT_ARRAY:
- obj = SafeArray2NPObject(GETVALUE(var, parray), 0, NULL, instance);
- OBJECT_TO_NPVARIANT(obj, (*npvar));
- break;
-
case VT_EMPTY:
VOID_TO_NPVARIANT((*npvar));
break;
@@ -371,7 +366,10 @@
break;

default:
- // Some unsupported type
+ if (var->vt & VT_ARRAY){
+ obj = SafeArray2NPObject(GETVALUE(var, parray), 0, NULL, instance);
+ OBJECT_TO_NPVARIANT(obj, (*npvar));
+ }
break;
}
}
Powered by Google Project Hosting