Merge pull request #4471 from Dhilan007/compile_error_vs_131210

fix compile error for vs project.

cocos/2d/TGAlib.cpp

@@ -272,7 +272,7 @@ tImageTGA* tgaLoadBuffer(unsigned char* buffer, long size)
 // this is the function to call when we want to load an image
 tImageTGA * tgaLoad(const char *filename)
 {
-    long size = 0;
+    ssize_t size = 0;
     unsigned char* buffer = FileUtils::getInstance()->getFileData(filename, "rb", &size);
 
     if (buffer != nullptr)

cocos/2d/ZipUtils.cpp

@@ -306,7 +306,7 @@ bool ZipUtils::isCCZFile(const char *path)
     // load file into memory
     unsigned char* compressed = NULL;
 
-    long fileLen = 0;
+    ssize_t fileLen = 0;
     compressed = FileUtils::getInstance()->getFileData(path, "rb", &fileLen);
 
     if(compressed == NULL || fileLen == 0)
@@ -321,7 +321,7 @@ bool ZipUtils::isCCZFile(const char *path)
     return ret;
 }
 
-bool ZipUtils::isCCZBuffer(const unsigned char *buffer, long len)
+bool ZipUtils::isCCZBuffer(const unsigned char *buffer, ssize_t len)
 {
     if (static_cast<size_t>(len) < sizeof(struct CCZHeader))
     {
@@ -338,7 +338,7 @@ bool ZipUtils::isGZipFile(const char *path)
     // load file into memory
     unsigned char* compressed = NULL;
 
-    long fileLen = 0;
+    ssize_t fileLen = 0;
     compressed = FileUtils::getInstance()->getFileData(path, "rb", &fileLen);
 
     if(NULL == compressed || 0 == fileLen)
@@ -352,7 +352,7 @@ bool ZipUtils::isGZipFile(const char *path)
     return ret;
 }
 
-bool ZipUtils::isGZipBuffer(const unsigned char *buffer, long len)
+bool ZipUtils::isGZipBuffer(const unsigned char *buffer, ssize_t len)
 {
     if (len < 2)
     {
@@ -461,7 +461,7 @@ int ZipUtils::inflateCCZFile(const char *path, unsigned char **out)
     // load file into memory
     unsigned char* compressed = NULL;
     
-    long fileLen = 0;
+    ssize_t fileLen = 0;
     compressed = FileUtils::getInstance()->getFileData(path, "rb", &fileLen);
     
     if(NULL == compressed || 0 == fileLen)

cocos/2d/ZipUtils.h

@@ -31,6 +31,9 @@ THE SOFTWARE.
 
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
 #include "platform/android/CCFileUtilsAndroid.h"
+#elif(CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
+// for import ssize_t on win32 platform
+#include "CCStdC.h"
 #endif
 
 namespace cocos2d

cocos/2d/platform/win32/CCFileUtilsWin32.cpp

@@ -121,7 +121,7 @@ bool FileUtilsWin32::isAbsolutePath(const std::string& strPath) const
     return false;
 }
 
-unsigned char* FileUtilsWin32::getFileData(const char* filename, const char* mode, long* size)
+unsigned char* FileUtilsWin32::getFileData(const char* filename, const char* mode, ssize_t* size)
 {
     unsigned char * pBuffer = NULL;
     CCASSERT(filename != NULL && size != NULL && mode != NULL, "Invalid parameters.");

cocos/2d/platform/win32/CCFileUtilsWin32.h

@@ -58,7 +58,7 @@ protected:
      *  @return Upon success, a pointer to the data is returned, otherwise NULL.
      *  @warning Recall: you are responsible for calling delete[] on any Non-NULL pointer returned.
      */
-    virtual unsigned char* getFileData(const char* filename, const char* mode, long * size) override;
+    virtual unsigned char* getFileData(const char* filename, const char* mode, ssize_t * size) override;
 
     /**
      *  Gets full path for filename, resolution directory and search path.

cocos/2d/platform/win32/CCStdC.h

@@ -25,6 +25,11 @@ THE SOFTWARE.
 #ifndef __CC_STD_C_H__
 #define __CC_STD_C_H__
 
+//typedef SSIZE_T ssize_t;
+// ssize_t was redefined as int in libwebsockets.h.
+// Therefore, to avoid conflict, we needs the same definition.
+typedef int ssize_t;
+
 #include "CCPlatformMacros.h"
 #include <float.h>
 

cocos/base/CCAutoreleasePool.cpp

@@ -64,7 +64,7 @@ void AutoreleasePool::clear()
         int nIndex = _managedObjectArray.size() - 1;
 #endif
 
-        _managedObjectArray.forEachReverse([](Object* obj){
+        _managedObjectArray.forEachReverse([&](Object* obj){
             --(obj->_autoReleaseCount);
             //(*it)->release();
             //delete (*it);

cocos/base/CCVector.h

@@ -51,7 +51,7 @@ public:
         reserve(capacity);
     }
 
-    virtual ~Vector<T>()
+    ~Vector<T>()
     {
         CCLOGINFO("In the destructor of Vector.");
         clear();

cocos/editor-support/cocosbuilder/CCBReader.cpp

@@ -218,7 +218,7 @@ Node* CCBReader::readNodeGraphFromFile(const char *pCCBFileName, Object *pOwner,
     }
 
     std::string strPath = FileUtils::getInstance()->fullPathForFilename(strCCBFileName.c_str());
-    long size = 0;
+    ssize_t size = 0;
 
     unsigned char * pBytes = FileUtils::getInstance()->getFileData(strPath.c_str(), "rb", &size);
     Data *data = new Data(pBytes, size);

cocos/editor-support/cocosbuilder/CCNodeLoader.cpp

@@ -923,7 +923,7 @@ Node * NodeLoader::parsePropTypeCCBFile(Node * pNode, Node * pParent, CCBReader
     
     // Load sub file
     std::string path = FileUtils::getInstance()->fullPathForFilename(ccbFileName.c_str());
-    long size = 0;
+    ssize_t size = 0;
     unsigned char * pBytes = FileUtils::getInstance()->getFileData(path.c_str(), "rb", &size);
 
     CCBReader * reader = new CCBReader(pCCBReader);

cocos/editor-support/cocostudio/CCDataReaderHelper.cpp

@@ -291,7 +291,7 @@ void DataReaderHelper::addDataFromFile(const char *filePath)
     size_t startPos = filePathStr.find_last_of(".");
     std::string str = &filePathStr[startPos];
 
-    long size;
+    ssize_t size;
     std::string fullPath = CCFileUtils::getInstance()->fullPathForFilename(filePath);
     char *pFileContent = (char *)CCFileUtils::getInstance()->getFileData(fullPath.c_str() , "r", &size);
 
@@ -391,7 +391,7 @@ void DataReaderHelper::addDataFromFileAsync(const char *imagePath, const char *p
     std::string str = &filePathStr[startPos];
 
     std::string fullPath = CCFileUtils::getInstance()->fullPathForFilename(filePath);
-    long size;
+    ssize_t size;
 
     // XXX fileContent is being leaked
     data->fileContent = (char *)CCFileUtils::getInstance()->getFileData(fullPath.c_str() , "r", &size);

cocos/editor-support/cocostudio/CCSGUIReader.cpp

@@ -128,7 +128,7 @@ UIWidget* GUIReader::widgetFromJsonFile(const char *fileName)
     jsonpath = CCFileUtils::getInstance()->fullPathForFilename(fileName);
     int pos = jsonpath.find_last_of('/');
     m_strFilePath = jsonpath.substr(0,pos+1);
-    long size = 0;
+    ssize_t size = 0;
     des = (char*)(CCFileUtils::getInstance()->getFileData(jsonpath.c_str(),"r" , &size));
     if(nullptr == des || strcmp(des, "") == 0)
     {

cocos/editor-support/cocostudio/CCSSceneReader.cpp

@@ -47,7 +47,7 @@ namespace cocostudio {
 
     cocos2d::Node* SceneReader::createNodeWithSceneFile(const char* pszFileName)
     {
-        long size = 0;
+        ssize_t size = 0;
         char* pData = 0;
         cocos2d::Node *pNode = nullptr;
         do 
@@ -215,7 +215,7 @@ namespace cocostudio {
                     {
                         file_path = reDir.substr(0, pos+1);
                     }
-                    long size = 0;
+                    ssize_t size = 0;
                     char *des = (char*)(cocos2d::FileUtils::getInstance()->getFileData(pPath.c_str(),"r" , &size));
                     JsonDictionary *jsonDict = new JsonDictionary();
                     jsonDict->initWithDescription(des);
@@ -285,7 +285,7 @@ namespace cocostudio {
                     if (nResType == 0)
                     {
                         pAttribute = ComAttribute::create();
-                        long size = 0;
+                        ssize_t size = 0;
                         char* pData = 0;
                         pData = (char*)(cocos2d::FileUtils::getInstance()->getFileData(pPath.c_str(), "r", &size));
                         if(pData != nullptr && strcmp(pData, "") != 0)

cocos/editor-support/spine/extension.h

@@ -54,6 +54,11 @@
 #ifndef SPINE_EXTENSION_H_
 #define SPINE_EXTENSION_H_
 
+// for import ssize_t on win32 platform
+#if defined(_MSC_VER)
+#include "CCStdC.h"
+#endif
+
 /* All allocation uses these. */
 #define MALLOC(TYPE,COUNT) ((TYPE*)_malloc(sizeof(TYPE) * COUNT))
 #define CALLOC(TYPE,COUNT) ((TYPE*)_calloc(1, sizeof(TYPE) * COUNT))

samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj

@@ -138,6 +138,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$
     <ClCompile Include="..\Classes\ChipmunkTest\ChipmunkTest.cpp" />
     <ClCompile Include="..\Classes\ClippingNodeTest\ClippingNodeTest.cpp" />
     <ClCompile Include="..\Classes\ConfigurationTest\ConfigurationTest.cpp" />
+    <ClCompile Include="..\Classes\ConsoleTest\ConsoleTest.cpp" />
     <ClCompile Include="..\Classes\DataVisitorTest\DataVisitorTest.cpp" />
     <ClCompile Include="..\Classes\ExtensionsTest\CocosBuilderTest\AnimationsTest\AnimationsTestLayer.cpp" />
     <ClCompile Include="..\Classes\ExtensionsTest\CocosBuilderTest\TimelineCallbackTest\TimelineCallbackTestLayer.cpp" />
@@ -278,6 +279,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\websockets\prebuilt\win32\*.*" "$
     <ClInclude Include="..\Classes\ChipmunkTest\ChipmunkTest.h" />
     <ClInclude Include="..\Classes\ClippingNodeTest\ClippingNodeTest.h" />
     <ClInclude Include="..\Classes\ConfigurationTest\ConfigurationTest.h" />
+    <ClInclude Include="..\Classes\ConsoleTest\ConsoleTest.h" />
     <ClInclude Include="..\Classes\DataVisitorTest\DataVisitorTest.h" />
     <ClInclude Include="..\Classes\ExtensionsTest\CocosBuilderTest\AnimationsTest\AnimationsLayerLoader.h" />
     <ClInclude Include="..\Classes\ExtensionsTest\CocosBuilderTest\AnimationsTest\AnimationsTestLayer.h" />

samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj.filters

@@ -304,6 +304,9 @@
     <Filter Include="Classes\InputTest">
       <UniqueIdentifier>{8e8124bd-adb2-4a8f-8727-9868a9c42d80}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Classes\ConsoleTest">
+      <UniqueIdentifier>{709f8a27-ecc2-4fe2-abd2-f13da4b70fe8}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="main.cpp">
@@ -703,6 +706,9 @@
     <ClCompile Include="..\Classes\InputTest\MouseTest.cpp">
       <Filter>Classes\InputTest</Filter>
     </ClCompile>
+    <ClCompile Include="..\Classes\ConsoleTest\ConsoleTest.cpp">
+      <Filter>Classes\ConsoleTest</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="main.h">
@@ -1294,5 +1300,8 @@
     <ClInclude Include="..\Classes\Box2DTestBed\Tests\MotorJoint.h">
       <Filter>Classes\Box2DTestBed\Tests</Filter>
     </ClInclude>
+    <ClInclude Include="..\Classes\ConsoleTest\ConsoleTest.h">
+      <Filter>Classes\ConsoleTest</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>