From 73c9707d5d7d83f542a9be2091270bb541c25e46 Mon Sep 17 00:00:00 2001
From: James Chen <jianhua.chen@cocos2d-x.org>
Date: Sat, 16 Jun 2012 12:48:20 +0800
Subject: [PATCH] CCBIReader fixes + building and running flawless on iOS and
 Android. Made it works on win32.

---
 cocos2dx/cocoa/CCString.h                     |   1 +
 cocos2dx/extensions/CCBReader/CCBReader.cpp   |  15 +-
 tests/proj.win32/test.win32.vcproj            | 134 ++++++++++++------
 .../ButtonTest/ButtonTestLayer.h              |   6 +-
 .../HelloCocosBuilderLayer.h                  |   7 +-
 .../CocosBuilderTest/MenuTest/MenuTestLayer.h |   6 +-
 .../TestHeader/TestHeaderLayer.h              |   5 +-
 7 files changed, 121 insertions(+), 53 deletions(-)

diff --git a/cocos2dx/cocoa/CCString.h b/cocos2dx/cocoa/CCString.h
index 49c619a742..b1d2e55bb8 100644
--- a/cocos2dx/cocoa/CCString.h
+++ b/cocos2dx/cocoa/CCString.h
@@ -25,6 +25,7 @@ THE SOFTWARE.
 #define __CCSTRING_H__
 
 #include <string>
+#include <functional>
 #include "CCObject.h"
 
 NS_CC_BEGIN
diff --git a/cocos2dx/extensions/CCBReader/CCBReader.cpp b/cocos2dx/extensions/CCBReader/CCBReader.cpp
index 2a17be97f9..3ad4472939 100644
--- a/cocos2dx/extensions/CCBReader/CCBReader.cpp
+++ b/cocos2dx/extensions/CCBReader/CCBReader.cpp
@@ -51,7 +51,7 @@ CCBReader::CCBReader(CCBReader * pCCBReader) {
 }
 
 CCBReader::~CCBReader() {
-    CC_SAFE_DELETE(this->mBytes);
+    CC_SAFE_DELETE_ARRAY(this->mBytes);
 
     this->mCCNodeLoaderLibrary->release();
 
@@ -104,8 +104,6 @@ CCNode * CCBReader::readNodeGraphFromFile(CCString * pCCBRootPath, CCString * pC
 
     const char * path = CCFileUtils::sharedFileUtils()->fullPathFromRelativePath(ccbFullFilePath->getCString());
 
-    CC_SAFE_FREE(ccbFullFilePath);
-
     unsigned long size = 0;
     this->mBytes = CCFileUtils::sharedFileUtils()->getFileData(path, "rb", &size);
 
@@ -390,15 +388,16 @@ CCString * CCBReader::toLowerCase(CCString * pString) {
 }
 
 CCString * CCBReader::concat(CCString * pStringA, CCString * pStringB) {
-    int concatenatedLength = pStringA->length() + pStringB->length() + 1;
-    char concatenated[concatenatedLength];
-
+    int concatenatedLength = pStringA->length() + pStringB->length();
+    char* concatenated = (char*) malloc(concatenatedLength+1);
+    CCString* pRet = NULL;
     strcpy(concatenated, pStringA->getCString());
     strcat(concatenated, pStringB->getCString());
 
     concatenated[concatenatedLength] = '\0';
-
-    return CCString::stringWithCString(concatenated);
+    pRet = CCString::stringWithCString(concatenated);
+    CC_SAFE_FREE(concatenated);
+    return pRet;
 }
 
 bool CCBReader::endsWith(CCString * pString, CCString * pEnding) {
diff --git a/tests/proj.win32/test.win32.vcproj b/tests/proj.win32/test.win32.vcproj
index 3a0a332e6f..b948c75801 100644
--- a/tests/proj.win32/test.win32.vcproj
+++ b/tests/proj.win32/test.win32.vcproj
@@ -893,22 +893,6 @@
 					<Filter
 						Name="CocosBuilderTest"
 						>
-						<File
-							RelativePath="..\tests\ExtensionsTest\CocosBuilderTest\ButtonTestLayer.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\tests\ExtensionsTest\CocosBuilderTest\ButtonTestLayer.h"
-							>
-						</File>
-						<File
-							RelativePath="..\tests\ExtensionsTest\CocosBuilderTest\ButtonTestLayerLoader.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\tests\ExtensionsTest\CocosBuilderTest\ButtonTestLayerLoader.h"
-							>
-						</File>
 						<File
 							RelativePath="..\tests\ExtensionsTest\CocosBuilderTest\CocosBuilderTest.cpp"
 							>
@@ -917,38 +901,106 @@
 							RelativePath="..\tests\ExtensionsTest\CocosBuilderTest\CocosBuilderTest.h"
 							>
 						</File>
-						<File
-							RelativePath="..\tests\ExtensionsTest\CocosBuilderTest\HelloCocosBuilderLayer.cpp"
+						<Filter
+							Name="ButtonTest"
 							>
-						</File>
-						<File
-							RelativePath="..\tests\ExtensionsTest\CocosBuilderTest\HelloCocosBuilderLayer.h"
+							<File
+								RelativePath="..\tests\ExtensionsTest\CocosBuilderTest\ButtonTest\ButtonTestLayer.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\tests\ExtensionsTest\CocosBuilderTest\ButtonTest\ButtonTestLayer.h"
+								>
+							</File>
+							<File
+								RelativePath="..\tests\ExtensionsTest\CocosBuilderTest\ButtonTest\ButtonTestLayerLoader.h"
+								>
+							</File>
+						</Filter>
+						<Filter
+							Name="HelloCocosBuilder"
 							>
-						</File>
-						<File
-							RelativePath="..\tests\ExtensionsTest\CocosBuilderTest\HelloCocosBuilderLayerLoader.cpp"
+							<File
+								RelativePath="..\tests\ExtensionsTest\CocosBuilderTest\HelloCocosBuilder\HelloCocosBuilderLayer.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\tests\ExtensionsTest\CocosBuilderTest\HelloCocosBuilder\HelloCocosBuilderLayer.h"
+								>
+							</File>
+							<File
+								RelativePath="..\tests\ExtensionsTest\CocosBuilderTest\HelloCocosBuilder\HelloCocosBuilderLayerLoader.h"
+								>
+							</File>
+						</Filter>
+						<Filter
+							Name="LabelTest"
 							>
-						</File>
-						<File
-							RelativePath="..\tests\ExtensionsTest\CocosBuilderTest\HelloCocosBuilderLayerLoader.h"
+							<File
+								RelativePath="..\tests\ExtensionsTest\CocosBuilderTest\LabelTest\LabelTestLayer.h"
+								>
+							</File>
+							<File
+								RelativePath="..\tests\ExtensionsTest\CocosBuilderTest\LabelTest\LabelTestLayerLoader.h"
+								>
+							</File>
+						</Filter>
+						<Filter
+							Name="MenuTest"
 							>
-						</File>
-						<File
-							RelativePath="..\tests\ExtensionsTest\CocosBuilderTest\TestHeaderLayer.cpp"
+							<File
+								RelativePath="..\tests\ExtensionsTest\CocosBuilderTest\MenuTest\MenuTestLayer.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\tests\ExtensionsTest\CocosBuilderTest\MenuTest\MenuTestLayer.h"
+								>
+							</File>
+							<File
+								RelativePath="..\tests\ExtensionsTest\CocosBuilderTest\MenuTest\MenuTestLayerLoader.h"
+								>
+							</File>
+						</Filter>
+						<Filter
+							Name="ParticleSystemTest"
 							>
-						</File>
-						<File
-							RelativePath="..\tests\ExtensionsTest\CocosBuilderTest\TestHeaderLayer.h"
+							<File
+								RelativePath="..\tests\ExtensionsTest\CocosBuilderTest\ParticleSystemTest\ParticleSystemTestLayer.h"
+								>
+							</File>
+							<File
+								RelativePath="..\tests\ExtensionsTest\CocosBuilderTest\ParticleSystemTest\ParticleSystemTestLayerLoader.h"
+								>
+							</File>
+						</Filter>
+						<Filter
+							Name="SpriteTest"
 							>
-						</File>
-						<File
-							RelativePath="..\tests\ExtensionsTest\CocosBuilderTest\TestHeaderLayerLoader.cpp"
+							<File
+								RelativePath="..\tests\ExtensionsTest\CocosBuilderTest\SpriteTest\SpriteTestLayer.h"
+								>
+							</File>
+							<File
+								RelativePath="..\tests\ExtensionsTest\CocosBuilderTest\SpriteTest\SpriteTestLayerLoader.h"
+								>
+							</File>
+						</Filter>
+						<Filter
+							Name="TestHeader"
 							>
-						</File>
-						<File
-							RelativePath="..\tests\ExtensionsTest\CocosBuilderTest\TestHeaderLayerLoader.h"
-							>
-						</File>
+							<File
+								RelativePath="..\tests\ExtensionsTest\CocosBuilderTest\TestHeader\TestHeaderLayer.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\tests\ExtensionsTest\CocosBuilderTest\TestHeader\TestHeaderLayer.h"
+								>
+							</File>
+							<File
+								RelativePath="..\tests\ExtensionsTest\CocosBuilderTest\TestHeader\TestHeaderLayerLoader.h"
+								>
+							</File>
+						</Filter>
 					</Filter>
 				</Filter>
 				<Filter
diff --git a/tests/tests/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.h b/tests/tests/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.h
index e63798a69c..f9dfc63e82 100644
--- a/tests/tests/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.h
+++ b/tests/tests/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.h
@@ -6,7 +6,11 @@
 #include "extensions/CCBReader/CCBSelectorResolver.h"
 #include "extensions/CCBReader/CCBMemberVariableAssigner.h"
 
-class ButtonTestLayer : public cocos2d::extension::CCBSelectorResolver, public cocos2d::extension::CCBMemberVariableAssigner, public cocos2d::CCLayer {
+class ButtonTestLayer 
+    : public cocos2d::CCLayer
+    , public cocos2d::extension::CCBMemberVariableAssigner
+    , public cocos2d::extension::CCBSelectorResolver
+{
     public:
         CCB_STATIC_NEW_AUTORELEASE_OBJECT_WITH_INIT_METHOD(ButtonTestLayer, node);
 
diff --git a/tests/tests/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.h b/tests/tests/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.h
index 6244a042dc..a93531b190 100644
--- a/tests/tests/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.h
+++ b/tests/tests/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder/HelloCocosBuilderLayer.h
@@ -17,7 +17,12 @@
  * This thread describes the problem:
  * http://www.cocoabuilder.com/archive/xcode/265549-crash-in-virtual-method-call.html
  */
-class HelloCocosBuilderLayer : public cocos2d::extension::CCBSelectorResolver, public cocos2d::extension::CCBMemberVariableAssigner, public cocos2d::extension::CCNodeLoaderListener, public cocos2d::CCLayer {
+class HelloCocosBuilderLayer
+    : public cocos2d::CCLayer
+    , public cocos2d::extension::CCBSelectorResolver
+    , public cocos2d::extension::CCBMemberVariableAssigner
+    , public cocos2d::extension::CCNodeLoaderListener
+{
     public:
         CCB_STATIC_NEW_AUTORELEASE_OBJECT_WITH_INIT_METHOD(HelloCocosBuilderLayer, node);
 
diff --git a/tests/tests/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.h b/tests/tests/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.h
index a764368082..fd4ff6538e 100644
--- a/tests/tests/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.h
+++ b/tests/tests/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.h
@@ -6,7 +6,11 @@
 #include "extensions/CCBReader/CCBSelectorResolver.h"
 #include "extensions/CCBReader/CCBMemberVariableAssigner.h"
 
-class MenuTestLayer : public cocos2d::extension::CCBSelectorResolver, public cocos2d::extension::CCBMemberVariableAssigner, public cocos2d::CCLayer {
+class MenuTestLayer
+    : public cocos2d::CCLayer
+    , public cocos2d::extension::CCBSelectorResolver
+    , public cocos2d::extension::CCBMemberVariableAssigner 
+{
     public:
         CCB_STATIC_NEW_AUTORELEASE_OBJECT_WITH_INIT_METHOD(MenuTestLayer, node);
 
diff --git a/tests/tests/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.h b/tests/tests/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.h
index 6cbe677b1a..91730d19bd 100644
--- a/tests/tests/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.h
+++ b/tests/tests/ExtensionsTest/CocosBuilderTest/TestHeader/TestHeaderLayer.h
@@ -5,7 +5,10 @@
 #include "extensions/CCBReader/CCNodeLoader.h"
 #include "extensions/CCBReader/CCBSelectorResolver.h"
 
-class TestHeaderLayer : public cocos2d::extension::CCBSelectorResolver, public cocos2d::CCLayer {
+class TestHeaderLayer
+    : public cocos2d::CCLayer
+    , public cocos2d::extension::CCBSelectorResolver
+{
     public:
         CCB_STATIC_NEW_AUTORELEASE_OBJECT_WITH_INIT_METHOD(TestHeaderLayer, node);