From 6b76fa2fbce1f1fdf771ee9b9338290400d98994 Mon Sep 17 00:00:00 2001 From: mthiru270 Date: Tue, 14 Apr 2020 03:01:40 -0400 Subject: [PATCH 01/11] fix crash on app load fail --- examples/pxScene2d/src/pxScene2d.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/pxScene2d/src/pxScene2d.cpp b/examples/pxScene2d/src/pxScene2d.cpp index fa32987855..13edc084b9 100755 --- a/examples/pxScene2d/src/pxScene2d.cpp +++ b/examples/pxScene2d/src/pxScene2d.cpp @@ -3915,7 +3915,7 @@ rtError pxScriptView::makeReady(int numArgs, const rtValue* args, rtValue* /*res else { success = false; - v->mReady.send("reject", new rtObject); // TODO JRJR Why does this fail if I leave the argment as null... + v->mReady.send("reject", (rtObject*)NULL); // TODO JRJR Why does this fail if I leave the argment as null... } rtValue urlValue(v->mUrl); From 41556a550f62c630a1339db08fb63d21fe27717c Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Tue, 14 Apr 2020 03:24:17 -0400 Subject: [PATCH 02/11] Update rtScriptNode.cpp --- src/rtScriptV8/rtScriptNode.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/rtScriptV8/rtScriptNode.cpp b/src/rtScriptV8/rtScriptNode.cpp index 1019592c9b..10976af64e 100644 --- a/src/rtScriptV8/rtScriptNode.cpp +++ b/src/rtScriptV8/rtScriptNode.cpp @@ -457,7 +457,8 @@ void rtNodeContext::createEnvironment() #ifdef USE_NODE_PLATFORM rtString currentPath; rtGetCurrentDirectory(currentPath); - node::InspectorStart(mEnv, currentPath.cString(), platform); + //node::InspectorStart(mEnv, currentPath.cString(), platform); + node::InspectorStart(mEnv, currentPath.cString(), "", 0); #endif //USE_NODE_PLATFORM #endif #endif From 070d09521ebdb9f5eb4d41361ed5c3e2be095f91 Mon Sep 17 00:00:00 2001 From: mthiru270 Date: Tue, 14 Apr 2020 03:01:40 -0400 Subject: [PATCH 03/11] fix crash on app load fail --- src/rtPromise.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/rtPromise.h b/src/rtPromise.h index dc08c72e6d..c1121de5c0 100644 --- a/src/rtPromise.h +++ b/src/rtPromise.h @@ -91,18 +91,18 @@ class rtPromise: public rtObject if (resolve) { - resolve.send(mObject); + resolve.send(mObject.getPtr()); newPromise = new rtPromise; - newPromise.send("resolve",mObject); + newPromise.send("resolve",mObject.getPtr()); } } else if (mState == REJECTED) { if (reject) { - reject.send(mObject); + reject.send(mObject.getPtr()); newPromise = new rtPromise; - newPromise.send("reject",mObject); + newPromise.send("reject",mObject.getPtr()); } } else @@ -137,8 +137,8 @@ class rtPromise: public rtObject { if (it->mResolve) { - it->mResolve.send(mObject); - it->mNextPromise.send("resolve",mObject); + it->mResolve.send(mObject.getPtr()); + it->mNextPromise.send("resolve",mObject.getPtr()); } } mThenData.clear(); @@ -169,8 +169,8 @@ class rtPromise: public rtObject { if (it->mReject) { - it->mReject.send(mObject); - it->mNextPromise.send("reject",mObject); + it->mReject.send(mObject.getPtr()); + it->mNextPromise.send("reject",mObject.getPtr()); } } } @@ -208,7 +208,7 @@ class rtPromise: public rtObject private: rtPromiseState mState; std::vector mThenData; - rtIObject* mObject; + rtRef mObject; }; // uint32_t rtPromise::promiseID = 0; From f3f7d346cbcc6447524f56bd3522410ea6315fb0 Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Tue, 14 Apr 2020 15:37:47 +0530 Subject: [PATCH 04/11] Review --- examples/pxScene2d/src/pxScene2d.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/pxScene2d/src/pxScene2d.cpp b/examples/pxScene2d/src/pxScene2d.cpp index 13edc084b9..fa32987855 100755 --- a/examples/pxScene2d/src/pxScene2d.cpp +++ b/examples/pxScene2d/src/pxScene2d.cpp @@ -3915,7 +3915,7 @@ rtError pxScriptView::makeReady(int numArgs, const rtValue* args, rtValue* /*res else { success = false; - v->mReady.send("reject", (rtObject*)NULL); // TODO JRJR Why does this fail if I leave the argment as null... + v->mReady.send("reject", new rtObject); // TODO JRJR Why does this fail if I leave the argment as null... } rtValue urlValue(v->mUrl); From afe62f519895c7ecb85fc782c1ab5c0471f92c36 Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Tue, 14 Apr 2020 06:52:31 -0400 Subject: [PATCH 05/11] Update pxScene2d.cpp --- examples/pxScene2d/src/pxScene2d.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/pxScene2d/src/pxScene2d.cpp b/examples/pxScene2d/src/pxScene2d.cpp index fa32987855..13edc084b9 100755 --- a/examples/pxScene2d/src/pxScene2d.cpp +++ b/examples/pxScene2d/src/pxScene2d.cpp @@ -3915,7 +3915,7 @@ rtError pxScriptView::makeReady(int numArgs, const rtValue* args, rtValue* /*res else { success = false; - v->mReady.send("reject", new rtObject); // TODO JRJR Why does this fail if I leave the argment as null... + v->mReady.send("reject", (rtObject*)NULL); // TODO JRJR Why does this fail if I leave the argment as null... } rtValue urlValue(v->mUrl); From 697bd571075e16b5a0d335e3d66979ec93777dc9 Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Tue, 14 Apr 2020 06:55:49 -0400 Subject: [PATCH 06/11] Update rtPromise.h --- src/rtPromise.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/rtPromise.h b/src/rtPromise.h index c1121de5c0..dc08c72e6d 100644 --- a/src/rtPromise.h +++ b/src/rtPromise.h @@ -91,18 +91,18 @@ class rtPromise: public rtObject if (resolve) { - resolve.send(mObject.getPtr()); + resolve.send(mObject); newPromise = new rtPromise; - newPromise.send("resolve",mObject.getPtr()); + newPromise.send("resolve",mObject); } } else if (mState == REJECTED) { if (reject) { - reject.send(mObject.getPtr()); + reject.send(mObject); newPromise = new rtPromise; - newPromise.send("reject",mObject.getPtr()); + newPromise.send("reject",mObject); } } else @@ -137,8 +137,8 @@ class rtPromise: public rtObject { if (it->mResolve) { - it->mResolve.send(mObject.getPtr()); - it->mNextPromise.send("resolve",mObject.getPtr()); + it->mResolve.send(mObject); + it->mNextPromise.send("resolve",mObject); } } mThenData.clear(); @@ -169,8 +169,8 @@ class rtPromise: public rtObject { if (it->mReject) { - it->mReject.send(mObject.getPtr()); - it->mNextPromise.send("reject",mObject.getPtr()); + it->mReject.send(mObject); + it->mNextPromise.send("reject",mObject); } } } @@ -208,7 +208,7 @@ class rtPromise: public rtObject private: rtPromiseState mState; std::vector mThenData; - rtRef mObject; + rtIObject* mObject; }; // uint32_t rtPromise::promiseID = 0; From b540e34ee2c464f3b13ec17532260b537fd63a42 Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Tue, 14 Apr 2020 06:58:52 -0400 Subject: [PATCH 07/11] Update rtPromise.h --- src/rtPromise.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/rtPromise.h b/src/rtPromise.h index dc08c72e6d..f0979ff4fe 100644 --- a/src/rtPromise.h +++ b/src/rtPromise.h @@ -162,6 +162,10 @@ class rtPromise: public rtObject { mObject = objRef.getPtr(); } + else + { + mObject = new rtObject; + } if (mObject != NULL) { for (std::vector::iterator it = mThenData.begin(); @@ -175,7 +179,6 @@ class rtPromise: public rtObject } } mThenData.clear(); - mObject = objRef.getPtr(); return RT_OK; } From f10f9122c485797cc4874f4a732a9380fa3d4aae Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Wed, 15 Apr 2020 06:59:50 -0400 Subject: [PATCH 08/11] Update rtPromise.h --- src/rtPromise.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/rtPromise.h b/src/rtPromise.h index e233ee3fb7..7fa29c16c6 100644 --- a/src/rtPromise.h +++ b/src/rtPromise.h @@ -170,7 +170,8 @@ class rtPromise: public rtObject if (mThenData.size() == 0) { mRcvdRejectBeforeThen = true; } - + if (mObject != NULL) + { for (std::vector::iterator it = mThenData.begin(); it != mThenData.end(); ++it) { @@ -180,6 +181,7 @@ class rtPromise: public rtObject it->mNextPromise.send("reject",mObject); } } + } mThenData.clear(); return RT_OK; } From 61d63030fa736319575799f3dcbff8ca25200090 Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Wed, 15 Apr 2020 07:00:19 -0400 Subject: [PATCH 09/11] Update rtPromise.h --- src/rtPromise.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rtPromise.h b/src/rtPromise.h index 7fa29c16c6..5a1f17e929 100644 --- a/src/rtPromise.h +++ b/src/rtPromise.h @@ -181,7 +181,7 @@ class rtPromise: public rtObject it->mNextPromise.send("reject",mObject); } } - } + } mThenData.clear(); return RT_OK; } From 08f74fa3fc5b05d6a68152ad8629a124accbeb6d Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Wed, 15 Apr 2020 08:27:01 -0400 Subject: [PATCH 10/11] Update rtScriptNode.cpp --- src/rtScriptV8/rtScriptNode.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/rtScriptV8/rtScriptNode.cpp b/src/rtScriptV8/rtScriptNode.cpp index 10976af64e..6ee4f05731 100644 --- a/src/rtScriptV8/rtScriptNode.cpp +++ b/src/rtScriptV8/rtScriptNode.cpp @@ -457,8 +457,11 @@ void rtNodeContext::createEnvironment() #ifdef USE_NODE_PLATFORM rtString currentPath; rtGetCurrentDirectory(currentPath); - //node::InspectorStart(mEnv, currentPath.cString(), platform); + #ifdef WIN32 + node::InspectorStart(mEnv, currentPath.cString(), platform); + #else node::InspectorStart(mEnv, currentPath.cString(), "", 0); + #endif #endif //USE_NODE_PLATFORM #endif #endif From 1edde47c95bf7b8b4c6b8e56eb45dae341e8f8b4 Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Thu, 16 Apr 2020 06:58:20 +0530 Subject: [PATCH 11/11] Update rtPromise.h --- src/rtPromise.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/rtPromise.h b/src/rtPromise.h index 5a1f17e929..b43ca55e4d 100644 --- a/src/rtPromise.h +++ b/src/rtPromise.h @@ -166,7 +166,6 @@ class rtPromise: public rtObject { mObject = objRef.getPtr(); } - if (mThenData.size() == 0) { mRcvdRejectBeforeThen = true; }