Skip to content

Commit 0dcf83f

Browse files
author
joshuastray
committed
fix newobject failed on windows
1 parent 31295b4 commit 0dcf83f

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

frameworks/js-bindings/bindings/manual/chipmunk/js_bindings_chipmunk_auto_classes.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2556,8 +2556,8 @@ bool JSB_cpSpace_constructor(JSContext *cx, uint32_t argc, jsval *vp)
25562556
{
25572557
JSB_PRECONDITION2(argc==0, cx, false, "Invalid number of arguments");
25582558
JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
2559-
JSObject* jsobj = JS_NewObjectForConstructor(cx, JSB_cpSpace_class, args);
2560-
//JSObject *jsobj = JS_NewObject(cx, JSB_cpSpace_class, JS::RootedObject(cx, JSB_cpSpace_object), JS::NullPtr());
2559+
//JSObject* jsobj = JS_NewObjectForConstructor(cx, JSB_cpSpace_class, args);
2560+
JSObject *jsobj = JS_NewObject(cx, JSB_cpSpace_class, JS::RootedObject(cx, JSB_cpSpace_object), JS::NullPtr());
25612561
void* ret_val = cpSpaceNew( );
25622562

25632563
jsb_set_jsobject_for_proxy(jsobj, ret_val);

frameworks/js-bindings/bindings/manual/chipmunk/js_bindings_chipmunk_manual.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,8 @@ bool JSB_CCPhysicsDebugNode_constructor(JSContext *cx, uint32_t argc, jsval *vp)
272272
CCASSERT(typeMapIter != _js_global_type_map.end(), "Can't find the class type!");
273273
typeClass = typeMapIter->second;
274274
CCASSERT(typeClass, "The value is null.");
275-
JS::RootedObject obj(cx, JS_NewObjectForConstructor(cx, typeClass->jsclass, args));
275+
//JS::RootedObject obj(cx, JS_NewObjectForConstructor(cx, typeClass->jsclass, args));
276+
JS::RootedObject obj(cx, JS_NewObject(cx, typeClass->jsclass, JS::RootedObject(cx, typeClass->proto), JS::RootedObject(cx, typeClass->parentProto)));
276277
args.rval().set(OBJECT_TO_JSVAL(obj));
277278
// link the native object with the javascript object
278279
js_proxy_t* p = jsb_new_proxy(cobj, obj);
@@ -494,7 +495,8 @@ bool JSPROXY_CCPhysicsSprite_constructor(JSContext *cx, uint32_t argc, jsval *vp
494495
CCASSERT(typeMapIter != _js_global_type_map.end(), "Can't find the class type!");
495496
typeClass = typeMapIter->second;
496497
CCASSERT(typeClass, "The value is null.");
497-
JS::RootedObject obj(cx, JS_NewObjectForConstructor(cx, typeClass->jsclass, args));
498+
//JS::RootedObject obj(cx, JS_NewObjectForConstructor(cx, typeClass->jsclass, args));
499+
JS::RootedObject obj(cx, JS_NewObject(cx, typeClass->jsclass, JS::RootedObject(cx, typeClass->proto), JS::RootedObject(cx, typeClass->parentProto)));
498500
args.rval().set(OBJECT_TO_JSVAL(obj));
499501
// link the native object with the javascript object
500502
js_proxy_t* p = jsb_new_proxy(cobj, obj);

frameworks/js-bindings/bindings/manual/network/jsb_websocket.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,8 +252,8 @@ bool js_cocos2dx_extension_WebSocket_constructor(JSContext *cx, uint32_t argc, j
252252
JSB_PRECONDITION2( ok, cx, false, "Error processing arguments");
253253
} while (0);
254254

255-
//JS::RootedObject obj(cx, JS_NewObject(cx, js_cocos2dx_websocket_class, JS::RootedObject(cx, js_cocos2dx_websocket_prototype), JS::NullPtr()));
256-
JS::RootedObject obj(cx, JS_NewObjectForConstructor(cx, js_cocos2dx_websocket_class, args));
255+
JS::RootedObject obj(cx, JS_NewObject(cx, js_cocos2dx_websocket_class, JS::RootedObject(cx, js_cocos2dx_websocket_prototype), JS::NullPtr()));
256+
//JS::RootedObject obj(cx, JS_NewObjectForConstructor(cx, js_cocos2dx_websocket_class, args));
257257

258258
WebSocket* cobj = new WebSocket();
259259
JSB_WebSocketDelegate* delegate = new JSB_WebSocketDelegate();

0 commit comments

Comments
 (0)