fixed build

Author: cfrankb

.github/workflows/windows_release.yml

@@ -38,6 +38,17 @@ jobs:
         run: |
           git fetch --all --tags -f
 
+      - name: Download JOM
+        uses: suisei-cn/actions-download-file@v1
+        with:
+          url: http://download.qt.io/official_releases/jom/jom.zip
+          target: ${{ runner.temp }}\
+
+      - name: Unzip JOM
+        working-directory: ${{ runner.temp }}
+        run: |
+          7z x jom.zip -ojom
+
       - name: Download zlib
         uses: suisei-cn/actions-download-file@v1
         with:
@@ -50,13 +61,6 @@ jobs:
           7z x zlib1213.zip -ozlib
           dir /w zlib
 
-      - name: compile zlib
-        working-directory: ${{ runner.temp }}
-        run: |
-          cd zlib
-          nmake /f win32/Makefile.msc
-          dir /w
-
       - name: Install Qt
         uses: jurplel/install-qt-action@v2
         with:
@@ -68,17 +72,6 @@ jobs:
           modules: qtcore qtwidgets qtgui #qtcharts qt3d
           setup-python: false
 
-      - name: Download JOM
-        uses: suisei-cn/actions-download-file@v1
-        with:
-          url: http://download.qt.io/official_releases/jom/jom.zip
-          target: ${{ runner.temp }}\
-
-      - name: Unzip JOM
-        working-directory: ${{ runner.temp }}
-        run: |
-          7z x jom.zip -ojom
-
       - name: Create build directory
         run: mkdir ${{ runner.temp }}\build
 
@@ -87,10 +80,28 @@ jobs:
         with:
           arch: ${{ env.VSARCH }}
 
+      - name: compile zlib
+        working-directory: ${{ runner.temp }}
+        run: |
+          cd zlib\\zlib-1.2.13
+          dir /w
+          nmake /f win32/Makefile.msc
+          dir /w
+
+          mkdir ${{ runner.temp }}\build\libs
+          mkdir ${{ runner.temp }}\build\headers
+          copy zlib.lib ${{ runner.temp }}\build\libs
+          copy zlib.h ${{ runner.temp }}\build\headers
+          copy zconf.h ${{ runner.temp }}\build\headers
+
+          mkdir ${{ env.SOURCE_DIR }}\libs
+          copy zlib.lib ${{ env.SOURCE_DIR }}\libs
+
       - name: Build
         working-directory: ${{ runner.temp }}\build
         run: |
           qmake -r ${{ env.SOURCE_DIR }}\\mapedit.pro
+          cat Makefile.Release
           ${{ runner.temp }}\jom\jom -j2
           dir /s
           cd release

map.cpp

@@ -135,8 +135,8 @@ bool CMap::write(FILE *tfile)
         fwrite(&m_len, sizeof(uint8_t), 1, tfile);
         fwrite(&m_hei, sizeof(uint8_t), 1, tfile);
         fwrite(m_map, m_len * m_hei, 1, tfile);
-        uint16_t attrCount =  m_attrs.size();
-        fwrite(&attrCount, sizeof(attrCount), 1, tfile);
+        size_t attrCount =  m_attrs.size();
+        fwrite(&attrCount, sizeof(uint16_t), 1, tfile);
         for (auto& it: m_attrs) {
             uint16_t key = it.first;
             uint8_t x = key & 0xff;

mapedit.pro

@@ -8,7 +8,7 @@ CONFIG += c++17
 # In order to do so, uncomment the following line.
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
 
-INCLUDEPATH += shared/
+INCLUDEPATH += shared/ headers/
 DEFINES += USE_QFILE=1
 
 SOURCES += \
@@ -69,3 +69,4 @@ RESOURCES += \
     mapedit.qrc
 
 unix:LIBS += -lz
+win32:LIBS += -L"libs" -lzlib

shared/Frame.cpp

@@ -962,7 +962,8 @@ void CFrame::enlarge()
 
 void CFrame::shiftUP()
 {
-    uint32_t t[m_nLen];
+
+    uint32_t *t = new uint32_t[m_nLen];
 
     // copy first line to buffer
     memcpy(t, m_rgb, sizeof(uint32_t) * m_nLen);
@@ -975,11 +976,13 @@ void CFrame::shiftUP()
 
     // copy first line to last
     memcpy(&at(0, m_nHei - 1), t, sizeof(uint32_t) * m_nLen);
+
+    delete []t;
 }
 
 void CFrame::shiftDOWN()
 {
-    uint32_t t[m_nLen];
+    uint32_t *t = new uint32_t[m_nLen];
 
     // copy first line to buffer
     memcpy(t, &at(0, m_nHei - 1), sizeof(uint32_t) * m_nLen);
@@ -992,6 +995,8 @@ void CFrame::shiftDOWN()
 
     // copy first line to last
     memcpy(m_rgb, t, sizeof(uint32_t) * m_nLen);
+    delete []t;
+
 }
 
 void CFrame::shiftLEFT()

shared/FrameSet.cpp

@@ -905,8 +905,8 @@ void CFrameSet::toPng(unsigned char *&data, int &size)
 {
     if (m_size > 1)
     {
-        short xx[m_size];
-        short yy[m_size];
+        short *xx = new short[m_size];
+        short *yy = new short[m_size];
         int width = 0;
         int height = 0;
         for (int i = 0; i < m_size; ++i)
@@ -953,6 +953,8 @@ void CFrameSet::toPng(unsigned char *&data, int &size)
         frame->toPng(data, size, buf, t_size);
         delete frame;
         delete[] buf;
+        delete []xx;
+        delete []yy;
     }
     else
     {
@@ -986,10 +988,9 @@ void CFrameSet::setTag(const char *tag, const char *v)
 void CFrameSet::toSubset(CFrameSet &dest, int start, int end)
 {
     int last = end == -1 ? getSize() - 1 : end;
-    CFrameSet &me = *this;
     for (int i = start; i <= last; ++i)
     {
-        CFrame *p = new CFrame(me[i]);
+        CFrame *p = new CFrame(m_arrFrames[i]);
         dest.add(p);
     }
 }

shared/helper.cpp

@@ -22,7 +22,6 @@
 #include <string>
 #include <list>
 #include <zlib.h>
-//#include "FileWrap.h"
 #ifdef USE_QFILE
     #define FILEWRAP QFileWrap
     #include "../shared/qtgui/qfilewrap.h"
@@ -75,17 +74,19 @@ bool copyFile(const std::string in, const std::string out, std::string & errMsg)
             tfile.write(buf, size);
             tfile.close();
         } else {
-            char tmp[out.length() + 128];
+            char * tmp = new char[out.length() + 128];
             sprintf(tmp, "couldn't write: %s", out.c_str());
             errMsg = tmp;
             result = false;
+            delete[] tmp;
         }
         delete [] buf;
     } else {
-        char tmp[in.length() + 128];
+        char * tmp =  new char[in.length() + 128];
         sprintf(tmp, "couldn't read: %s", in.c_str());
         errMsg = tmp;
         result = false;
+        delete []tmp;
     }
     return result;
 }
@@ -106,154 +107,25 @@ bool concat(const std::list<std::string> files, std::string out, std::string & m
                 tfile.write(buf, size);
                 delete [] buf;
             } else {
-                char tmp[in.length() + 128];
+                char *tmp = new char[in.length() + 128];
                 sprintf(tmp, "couldn't read: %s", in.c_str());
                 msg = tmp;
                 result = false;
+                delete []tmp;
                 break;
             }
         }
         tfile.close();
     } else {
-        char tmp[out.length() + 128];
+        char *tmp = new char[out.length() + 128];
         sprintf(tmp, "couldn't write: %s", out.c_str());
         msg = tmp;
         result = false;
+        delete []tmp;
     }
     return result;
 }
 
-#ifdef _WIN32
-#include <windows.h>
-#include <limits.h>
-#include <errno.h>
-#include <sys/stat.h>
-
-char *realpath(const char *path, char resolved_path[PATH_MAX])
-{
-  char *return_path = 0;
-
-  if (path) //Else EINVAL
-  {
-    if (resolved_path)
-    {
-      return_path = resolved_path;
-    }
-    else
-    {
-      //Non standard extension that glibc uses
-      return_path = (char*)malloc(PATH_MAX);
-    }
-
-    if (return_path) //Else EINVAL
-    {
-      //This is a Win32 API function similar to what realpath() is supposed to do
-      size_t size = GetFullPathNameA(path, PATH_MAX, return_path, 0);
-
-      //GetFullPathNameA() returns a size larger than buffer if buffer is too small
-      if (size > PATH_MAX)
-      {
-        if (return_path != resolved_path) //Malloc'd buffer - Unstandard extension retry
-        {
-          size_t new_size;
-
-          free(return_path);
-          return_path = (char*)malloc(size);
-
-          if (return_path)
-          {
-            new_size = GetFullPathNameA(path, size, return_path, 0); //Try again
-
-            if (new_size > size) //If it's still too large, we have a problem, don't try again
-            {
-              free(return_path);
-              return_path = 0;
-              errno = ENAMETOOLONG;
-            }
-            else
-            {
-              size = new_size;
-            }
-          }
-          else
-          {
-            //I wasn't sure what to return here, but the standard does say to return EINVAL
-            //if resolved_path is null, and in this case we couldn't malloc large enough buffer
-            errno = EINVAL;
-          }
-        }
-        else //resolved_path buffer isn't big enough
-        {
-          return_path = 0;
-          errno = ENAMETOOLONG;
-        }
-      }
-
-      //GetFullPathNameA() returns 0 if some path resolve problem occured
-      if (!size)
-      {
-        if (return_path != resolved_path) //Malloc'd buffer
-        {
-          free(return_path);
-        }
-
-        return_path = 0;
-
-        //Convert MS errors into standard errors
-        switch (GetLastError())
-        {
-          case ERROR_FILE_NOT_FOUND:
-            errno = ENOENT;
-            break;
-
-          case ERROR_PATH_NOT_FOUND: case ERROR_INVALID_DRIVE:
-            errno = ENOTDIR;
-            break;
-
-          case ERROR_ACCESS_DENIED:
-            errno = EACCES;
-            break;
-
-          default: //Unknown Error
-            errno = EIO;
-            break;
-        }
-      }
-
-      //If we get to here with a valid return_path, we're still doing good
-      if (return_path)
-      {
-        struct stat stat_buffer;
-
-        //Make sure path exists, stat() returns 0 on success
-        if (stat(return_path, &stat_buffer))
-        {
-          if (return_path != resolved_path)
-          {
-            free(return_path);
-          }
-
-          return_path = 0;
-          //stat() will set the correct errno for us
-        }
-        //else we succeeded!
-      }
-    }
-    else
-    {
-      errno = EINVAL;
-    }
-  }
-  else
-  {
-    errno = EINVAL;
-  }
-
-  return return_path;
-}
-#else
-#endif
-
 int compressData(unsigned char *in_data, unsigned long in_size, unsigned char **out_data, unsigned long & out_size)
 {
     out_size = ::compressBound(in_size);

shared/helper.h

@@ -25,7 +25,6 @@ bool copyFile(const std::string in, const std::string out, std::string & errMsg)
 bool concat(const std::list<std::string> files, std::string out, std::string & msg);
 int upperClean(int c);
 #ifdef _WIN32
-    char *realpath(const char *path, char resolved_path[PATH_MAX]);
 #else
     #include <stdlib.h>
     #include <linux/limits.h>