VS2010 project: reverted zstdlib.rc

diff --git a/Makefile b/Makefile
index 3c600f54ac472be4de5f0ec335db89b0fc47574a..db58d430c470610862234e22670fb882a95cf10a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -68,8 +68,9 @@ clean:
 
 #------------------------------------------------------------------------
 #make install is validated only for Linux, OSX, kFreeBSD and Hurd targets
+#------------------------------------------------------------------------
 ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU))
-
+HOST_OS = POSIX
 install:
        $(MAKE) -C $(ZSTDDIR) $@
        $(MAKE) -C $(PRGDIR) $@
@@ -81,43 +82,13 @@ uninstall:
 travis-install:
        $(MAKE) install PREFIX=~/install_test_dir
 
-cmaketest:
-       cmake --version
-       rm -rf projects/cmake/build
-       mkdir projects/cmake/build
-       cd projects/cmake/build ; cmake .. ; $(MAKE)
+gpptest: clean
+       $(MAKE) all CC=g++ CFLAGS="-O3 -Wall -Wextra -Wundef -Wshadow -Wcast-align -Werror"
 
 clangtest: clean
        clang -v
        $(MAKE) all CC=clang MOREFLAGS="-Werror -Wconversion -Wno-sign-conversion"
 
-gpptest: clean
-       $(MAKE) all CC=g++ CFLAGS="-O3 -Wall -Wextra -Wundef -Wshadow -Wcast-align -Werror"
-
-c90test: clean
-       CFLAGS="-std=c90" $(MAKE) all  # will fail, due to // and long long
-
-gnu90test: clean
-       CFLAGS="-std=gnu90" $(MAKE) all
-
-c99test: clean
-       CFLAGS="-std=c99" $(MAKE) all
-
-gnu99test: clean
-       CFLAGS="-std=gnu99" $(MAKE) all
-
-c11test: clean
-       CFLAGS="-std=c11" $(MAKE) all
-
-bmix64test: clean
-       CFLAGS="-O3 -mbmi -Werror" $(MAKE) -C $(PRGDIR) test
-
-bmix32test: clean
-       CFLAGS="-O3 -mbmi -mx32 -Werror" $(MAKE) -C $(PRGDIR) test
-
-bmi32test: clean
-       CFLAGS="-O3 -mbmi -m32 -Werror" $(MAKE) -C $(PRGDIR) test
-
 armtest: clean
        $(MAKE) -C $(PRGDIR) datagen   # use native, faster
        $(MAKE) -C $(PRGDIR) test CC=arm-linux-gnueabi-gcc ZSTDRTTEST= MOREFLAGS="-Werror -static"
@@ -168,3 +139,45 @@ uasan: clean
        $(MAKE) test CC=clang MOREFLAGS="-g -fsanitize=address -fsanitize=undefined"
 
 endif
+
+
+ifneq (,$(filter MSYS%,$(shell uname)))
+HOST_OS = MSYS
+CMAKE_PARAMS = -G"MSYS Makefiles"
+endif
+
+
+#------------------------------------------------------------------------
+#make tests validated only for MSYS, Linux, OSX, kFreeBSD and Hurd targets
+#------------------------------------------------------------------------
+ifneq (,$(filter $(HOST_OS),MSYS POSIX))
+cmaketest:
+       cmake --version
+       rm -rf projects/cmake/build
+       mkdir projects/cmake/build
+       cd projects/cmake/build ; cmake $(CMAKE_PARAMS) .. ; $(MAKE)
+
+c90test: clean
+       CFLAGS="-std=c90" $(MAKE) all  # will fail, due to // and long long
+
+gnu90test: clean
+       CFLAGS="-std=gnu90" $(MAKE) all
+
+c99test: clean
+       CFLAGS="-std=c99" $(MAKE) all
+
+gnu99test: clean
+       CFLAGS="-std=gnu99" $(MAKE) all
+
+c11test: clean
+       CFLAGS="-std=c11" $(MAKE) all
+
+bmix64test: clean
+       CFLAGS="-O3 -mbmi -Werror" $(MAKE) -C $(PRGDIR) test
+
+bmix32test: clean
+       CFLAGS="-O3 -mbmi -mx32 -Werror" $(MAKE) -C $(PRGDIR) test
+
+bmi32test: clean
+       CFLAGS="-O3 -mbmi -m32 -Werror" $(MAKE) -C $(PRGDIR) test
+endif

diff --git a/lib/decompress/zstd_decompress.c b/lib/decompress/zstd_decompress.c
index 6d79e678a66b3e10fd2cd57e4d89f7b3648b735b..e88b873c8ee7b865395a68ef0275322594731089 100644 (file)
--- a/lib/decompress/zstd_decompress.c
+++ b/lib/decompress/zstd_decompress.c
@@ -333,7 +333,8 @@ size_t ZSTD_getFrameParams(ZSTD_frameParams* fparamsPtr, const void* src, size_t
     if (MEM_readLE32(src) != ZSTD_MAGICNUMBER) {
         if ((MEM_readLE32(src) & 0xFFFFFFF0U) == ZSTD_MAGIC_SKIPPABLE_START) {
             if (srcSize < ZSTD_skippableHeaderSize) return ZSTD_skippableHeaderSize; /* magic number + skippable frame length */
-            fparamsPtr->frameContentSize = 0;
+            memset(fparamsPtr, 0, sizeof(*fparamsPtr));
+            fparamsPtr->frameContentSize = MEM_readLE32((const char *)src + 4);
             fparamsPtr->windowLog = ZSTD_WINDOWLOG_ABSOLUTEMIN;
             return 0;
         }

diff --git a/projects/VS2010/zstdlib/zstdlib.rc b/projects/VS2010/zstdlib/zstdlib.rc
new file mode 100644 (file)
index 0000000..6c4dde4
--- /dev/null
+++ b/projects/VS2010/zstdlib/zstdlib.rc
@@ -0,0 +1,51 @@
+// Microsoft Visual C++ generated resource script.\r
+//\r
+\r
+#include "zstd.h" /* ZSTD_VERSION_STRING */\r
+#define APSTUDIO_READONLY_SYMBOLS\r
+#include "verrsrc.h"\r
+#undef APSTUDIO_READONLY_SYMBOLS\r
+\r
+\r
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r
+LANGUAGE 9, 1\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// Version\r
+//\r
+\r
+VS_VERSION_INFO     VERSIONINFO\r
+  FILEVERSION       ZSTD_LIB_VERSION\r
+  PRODUCTVERSION    ZSTD_LIB_VERSION\r
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK\r
+#ifdef _DEBUG\r
+ FILEFLAGS VS_FF_DEBUG\r
+#else\r
+ FILEFLAGS 0x0L\r
+#endif\r
+ FILEOS VOS_NT_WINDOWS32\r
+ FILETYPE VFT_DLL\r
+ FILESUBTYPE VFT2_UNKNOWN\r
+BEGIN\r
+    BLOCK "StringFileInfo"\r
+    BEGIN\r
+        BLOCK "040904B0"\r
+        BEGIN\r
+            VALUE "CompanyName", "Yann Collet"\r
+            VALUE "FileDescription", "Fast and efficient compression algorithm"\r
+            VALUE "FileVersion", ZSTD_VERSION_STRING\r
+            VALUE "InternalName", "zstdlib.dll"\r
+            VALUE "LegalCopyright", "Copyright (C) 2013-2015, Yann Collet"\r
+            VALUE "OriginalFilename", "zstdlib.dll"\r
+            VALUE "ProductName", "Zstandard"\r
+            VALUE "ProductVersion", ZSTD_VERSION_STRING\r
+        END\r
+    END\r
+    BLOCK "VarFileInfo"\r
+    BEGIN\r
+        VALUE "Translation", 0x0409, 1200\r
+    END\r
+END\r
+\r
+#endif\r

diff --git a/projects/VS2010/zstdlib/zstdlib.vcxproj b/projects/VS2010/zstdlib/zstdlib.vcxproj
index 79900501e953b1c3b2fac05680ac6fe106212073..e0e3dbb6ae8dca253aec4d7b5e1575fe51204967 100644 (file)
--- a/projects/VS2010/zstdlib/zstdlib.vcxproj
+++ b/projects/VS2010/zstdlib/zstdlib.vcxproj
@@ -48,7 +48,9 @@
     <ClInclude Include="..\..\..\lib\common\zstd_static.h" />
     <ClInclude Include="..\..\..\lib\compress\zstd_opt.h" />
     <ClInclude Include="..\..\..\programs\util.h" />
-    <ClInclude Include="resource.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="zstdlib.rc" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{8BFD8150-94D5-4BF9-8A50-7BD9929A0850}</ProjectGuid>