3.2.4

- Fixed miniz-cpp not extracting more than one file successfully
sitewaerts · Dec 14, 2021 · 19c18aa · 19c18aa
1 parent 55eb31a
commit 19c18aa
Show file tree

Hide file tree

Showing 18 changed files with 7 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -43,9 +43,12 @@ Note that 'jszip' is the only algorithm that doesn't extract empty folders.
 
 ## Release Notes
 
+### 3.2.4 (Dec 14, 2021)
+* Fixed miniz-cpp not extracting more than one file successfully
+
 ### 3.2.3 (Dec 8, 2021)
 * Fixed miniz-cpp returning error when unzipping empty files
-* Fixed andyzip crashing when unzipping invalid archives### 3.2.2 (Jul 19, 2021)
+* Fixed andyzip crashing when unzipping invalid archives
 
 ### 3.2.2 (Jul 19, 2021)
 * Fixed miniz-cpp not creating folders

diff --git a/src/windows/ZipComponentUWP/Bin/ZipComponentUWP_ARM64_Release/ZipComponentUWP.dll b/src/windows/ZipComponentUWP/Bin/ZipComponentUWP_ARM64_Release/ZipComponentUWP.dll
diff --git a/src/windows/ZipComponentUWP/Bin/ZipComponentUWP_ARM64_Release/ZipComponentUWP.winmd b/src/windows/ZipComponentUWP/Bin/ZipComponentUWP_ARM64_Release/ZipComponentUWP.winmd
diff --git a/src/windows/ZipComponentUWP/Bin/ZipComponentUWP_ARM_Release/ZipComponentUWP.dll b/src/windows/ZipComponentUWP/Bin/ZipComponentUWP_ARM_Release/ZipComponentUWP.dll
diff --git a/src/windows/ZipComponentUWP/Bin/ZipComponentUWP_ARM_Release/ZipComponentUWP.winmd b/src/windows/ZipComponentUWP/Bin/ZipComponentUWP_ARM_Release/ZipComponentUWP.winmd
diff --git a/src/windows/ZipComponentUWP/Bin/ZipComponentUWP_x64_Release/ZipComponentUWP.dll b/src/windows/ZipComponentUWP/Bin/ZipComponentUWP_x64_Release/ZipComponentUWP.dll
diff --git a/src/windows/ZipComponentUWP/Bin/ZipComponentUWP_x64_Release/ZipComponentUWP.winmd b/src/windows/ZipComponentUWP/Bin/ZipComponentUWP_x64_Release/ZipComponentUWP.winmd
diff --git a/src/windows/ZipComponentUWP/Bin/ZipComponentUWP_x86_Release/ZipComponentUWP.dll b/src/windows/ZipComponentUWP/Bin/ZipComponentUWP_x86_Release/ZipComponentUWP.dll
diff --git a/src/windows/ZipComponentUWP/Bin/ZipComponentUWP_x86_Release/ZipComponentUWP.winmd b/src/windows/ZipComponentUWP/Bin/ZipComponentUWP_x86_Release/ZipComponentUWP.winmd
diff --git a/...otNetComponentUWP/Bin/EmptyDotNetComponentUWP_ARM64_Release/EmptyDotNetComponentUWP.winmd b/...otNetComponentUWP/Bin/EmptyDotNetComponentUWP_ARM64_Release/EmptyDotNetComponentUWP.winmd
diff --git a/...yDotNetComponentUWP/Bin/EmptyDotNetComponentUWP_ARM_Release/EmptyDotNetComponentUWP.winmd b/...yDotNetComponentUWP/Bin/EmptyDotNetComponentUWP_ARM_Release/EmptyDotNetComponentUWP.winmd
diff --git a/...tNetComponentUWP/Bin/EmptyDotNetComponentUWP_AnyCPU_Release/EmptyDotNetComponentUWP.winmd b/...tNetComponentUWP/Bin/EmptyDotNetComponentUWP_AnyCPU_Release/EmptyDotNetComponentUWP.winmd
diff --git a/...yDotNetComponentUWP/Bin/EmptyDotNetComponentUWP_x64_Release/EmptyDotNetComponentUWP.winmd b/...yDotNetComponentUWP/Bin/EmptyDotNetComponentUWP_x64_Release/EmptyDotNetComponentUWP.winmd
diff --git a/...yDotNetComponentUWP/Bin/EmptyDotNetComponentUWP_x86_Release/EmptyDotNetComponentUWP.winmd b/...yDotNetComponentUWP/Bin/EmptyDotNetComponentUWP_x86_Release/EmptyDotNetComponentUWP.winmd
diff --git a/src/windows/ZipComponentUWP/Source/ZipAlgorithm_miniz-cpp.cpp b/src/windows/ZipComponentUWP/Source/ZipAlgorithm_miniz-cpp.cpp
@@ -86,8 +86,6 @@ bool ZipAlgorithm_miniz_cpp::UnzipEntry(const size_t szEntryIndex)
 		return false;
 
 	ofFile << m_pZipFile->open(strEntryName).rdbuf();
-	if( ofFile.rdstate() != 0 && m_pZipFile->getinfo(strEntryName).file_size == 0 )
-		return true;
 
-	return false;
+	return ofFile.rdstate() == 0 || m_pZipFile->getinfo(strEntryName).file_size == 0;
 }
diff --git a/src/windows/ZipComponentUWP/Source/ZipComponent.Version.cpp b/src/windows/ZipComponentUWP/Source/ZipComponent.Version.cpp
@@ -16,5 +16,5 @@ using namespace ZipComponentUWP;
 
 String^ ZipComponent::GetVersion() 
 { 
-	return "1.0.3.0"; 
+	return "1.0.4.0"; 
 } 
diff --git a/src/windows/ZipComponentUWP/Source/ZipTest.cpp b/src/windows/ZipComponentUWP/Source/ZipTest.cpp
@@ -59,7 +59,7 @@ int main(int argc, const char* argv[])
 
 		std::cout << "Duration: " << std::chrono::duration_cast<std::chrono::milliseconds>(timeEnd - timeBegin).count() << " ms";
 		if( iResult != EXIT_SUCCESS )
-			std::cout << "Error: " << iResult << std::endl;
+			std::cout << ", Error: " << iResult << std::endl;
 
 		return iResult;
 	}

diff --git a/src/windows/ZipComponentUWP/ZipComponentUWP.rc b/src/windows/ZipComponentUWP/ZipComponentUWP.rc