Jacek Caban : jscript: Don' t expose properties belonging to Object prototype from Object instance.

Alexandre Julliard julliard at winehq.org
Mon Jul 23 13:54:24 CDT 2012


Module: wine
Branch: master
Commit: a2c2103cd3c78e3a570d80bba27b1355ce543465
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a2c2103cd3c78e3a570d80bba27b1355ce543465

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Mon Jul 23 15:53:22 2012 +0200

jscript: Don't expose properties belonging to Object prototype from Object instance.

---

 dlls/jscript/object.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c
index ce43eb5..173c227 100644
--- a/dlls/jscript/object.c
+++ b/dlls/jscript/object.c
@@ -211,6 +211,14 @@ static const builtin_info_t Object_info = {
     NULL
 };
 
+static const builtin_info_t ObjectInst_info = {
+    JSCLASS_OBJECT,
+    {NULL, Object_value, 0},
+    0, NULL,
+    Object_destructor,
+    NULL
+};
+
 static HRESULT ObjectConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, VARIANT *argv,
         VARIANT *retv, jsexcept_t *ei)
 {
@@ -282,7 +290,7 @@ HRESULT create_object(script_ctx_t *ctx, jsdisp_t *constr, jsdisp_t **ret)
     if(!object)
         return E_OUTOFMEMORY;
 
-    hres = init_dispex_from_constr(object, ctx, &Object_info, constr ? constr : ctx->object_constr);
+    hres = init_dispex_from_constr(object, ctx, &ObjectInst_info, constr ? constr : ctx->object_constr);
     if(FAILED(hres)) {
         heap_free(object);
         return hres;




More information about the wine-cvs mailing list