Merge branch 'master' of https://github.com/durs/node-activex

durs · durs · commit 2ca20a705df5 · 2026-02-11T21:21:34.000+03:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,7 +7,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: ['18.x', '20.x', '22.x', '23.x']
+        node-version: ['18.x', '20.x', '22.x', '24.x', '25.x']
         os: [windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
diff --git a/src/disp.cpp b/src/disp.cpp
@@ -1123,12 +1123,18 @@ void VariantObject::NodeGet(Local<Name> name, const PropertyCallbackInfoGetter&
         if ((self->value.vt & VT_ARRAY) != 0) {
             args.GetReturnValue().Set((uint32_t)self->value.ArrayLength());
         }
-    }
+		else {
+			args.GetReturnValue().SetUndefined();
+		}
+	}
     else {
         Local<Function> func;
         if (clazz_methods.get(isolate, id, &func)) {
             args.GetReturnValue().Set(func);
         }
+        else {
+            args.GetReturnValue().SetUndefined();
+        }
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1123,12 +1123,18 @@ void VariantObject::NodeGet(Local<Name> name, const PropertyCallbackInfoGetter&`
`1123`	`1123`	`if ((self->value.vt & VT_ARRAY) != 0) {`
`1124`	`1124`	`args.GetReturnValue().Set((uint32_t)self->value.ArrayLength());`
`1125`	`1125`	`}`
`1126`		`- }`
	`1126`	`+ else {`
	`1127`	`+ args.GetReturnValue().SetUndefined();`
	`1128`	`+ }`
	`1129`	`+ }`
`1127`	`1130`	`else {`
`1128`	`1131`	`Local<Function> func;`
`1129`	`1132`	`if (clazz_methods.get(isolate, id, &func)) {`
`1130`	`1133`	`args.GetReturnValue().Set(func);`
`1131`	`1134`	`}`
	`1135`	`+ else {`
	`1136`	`+ args.GetReturnValue().SetUndefined();`
	`1137`	`+ }`
`1132`	`1138`	`}`
`1133`	`1139`	`}`
`1134`	`1140`