update lib: HDiffPatch,lzma;

sisong · Sep 10, 2023 · 98d4bcc · 98d4bcc
1 parent 20f9e89
commit 98d4bcc
Show file tree

Hide file tree

Showing 10 changed files with 49 additions and 33 deletions.
diff --git a/HDiffPatch b/HDiffPatch
diff --git a/Makefile b/Makefile
@@ -58,6 +58,7 @@ ZIPDIFF_OBJ := \
     HDiffPatch/libHDiffPatch/HDiff/private_diff/libdivsufsort/divsufsort.o \
     lzma/C/Lzma2Enc.o \
     lzma/C/LzmaEnc.o \
+    lzma/C/7zStream.o \
     lzma/C/LzFind.o \
     lzma/C/LzFindMt.o \
     lzma/C/LzFindOpt.o \

diff --git a/builds/android_ndk_jni_mk/Android.mk b/builds/android_ndk_jni_mk/Android.mk
@@ -43,7 +43,7 @@ ifneq ($(TARGET_ARCH_ABI),armeabi)
 LOCAL_CFLAGS     += -DUNALIGNED_OK 
 endif
 ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
-LOCAL_CFLAGS     += -D_LZMA_DEC_OPT 
+LOCAL_CFLAGS     += -DZ7_LZMA_DEC_OPT 
 endif
 
 include $(BUILD_SHARED_LIBRARY)

diff --git a/builds/android_ndk_jni_mk/Android_DEBUG.mk b/builds/android_ndk_jni_mk/Android_DEBUG.mk
@@ -38,9 +38,9 @@ Src_Files := $(LOCAL_PATH)/apk_patch_jni.cpp \
 
 LOCAL_SRC_FILES  := $(Src_Files) $(Lzma_Files) $(Zlib_Files) $(Hdp_Files) $(Adp_Files)
 
-DEF_FLAGS := -O1 -D_7ZIP_ST -D_IS_USED_MULTITHREAD=1 -D_IS_USED_PTHREAD=1
+DEF_FLAGS := -O1 -DZ7_ST -D_IS_USED_MULTITHREAD=1 -D_IS_USED_PTHREAD=1
 ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
-  DEF_FLAGS += -D_LZMA_DEC_OPT 
+  DEF_FLAGS += -DZ7_LZMA_DEC_OPT 
 endif
 
 LOCAL_LDLIBS     := -llog
@@ -49,7 +49,7 @@ ifneq ($(TARGET_ARCH_ABI),armeabi)
 LOCAL_CFLAGS     += -DUNALIGNED_OK 
 endif
 ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
-LOCAL_CFLAGS     += -D_LZMA_DEC_OPT 
+LOCAL_CFLAGS     += -DZ7_LZMA_DEC_OPT 
 endif
 
 LOCAL_SANITIZE   := address

diff --git a/builds/codeblocks/ZipDiff.cbp b/builds/codeblocks/ZipDiff.cbp
@@ -95,6 +95,9 @@
 		<Unit filename="../../lzma/C/Lzma2Enc.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="../../lzma/C/7zStream.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="../../lzma/C/LzmaDec.c">
 			<Option compilerVar="CC" />
 		</Unit>

diff --git a/builds/vc/ApkDiffPatch.sln b/builds/vc/ApkDiffPatch.sln
@@ -1,13 +1,18 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.31402.337
+# Visual Studio Version 17
+VisualStudioVersion = 17.7.34024.191
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ApkNormalized", "ApkNormalized.vcxproj", "{B7BA5C32-5DC9-431D-BFD7-35ED679CD797}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZipPatch", "ZipPatch.vcxproj", "{69753A53-0320-4AF9-ADE7-A70F0C38358F}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZipDiff", "ZipDiff.vcxproj", "{96E107FE-4A2E-4008-9FDE-8CEAA695BFCA}"
+	ProjectSection(ProjectDependencies) = postProject
+		{0849CD0E-1B9B-44EB-8937-A278B6A7E2CF} = {0849CD0E-1B9B-44EB-8937-A278B6A7E2CF}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lzma", "..\..\HDiffPatch\builds\vc\lzma.vcxproj", "{0849CD0E-1B9B-44EB-8937-A278B6A7E2CF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -41,8 +46,19 @@ Global
 		{96E107FE-4A2E-4008-9FDE-8CEAA695BFCA}.Release|x64.Build.0 = Release|x64
 		{96E107FE-4A2E-4008-9FDE-8CEAA695BFCA}.Release|x86.ActiveCfg = Release|Win32
 		{96E107FE-4A2E-4008-9FDE-8CEAA695BFCA}.Release|x86.Build.0 = Release|Win32
+		{0849CD0E-1B9B-44EB-8937-A278B6A7E2CF}.Debug|x64.ActiveCfg = Debug|x64
+		{0849CD0E-1B9B-44EB-8937-A278B6A7E2CF}.Debug|x64.Build.0 = Debug|x64
+		{0849CD0E-1B9B-44EB-8937-A278B6A7E2CF}.Debug|x86.ActiveCfg = Debug|Win32
+		{0849CD0E-1B9B-44EB-8937-A278B6A7E2CF}.Debug|x86.Build.0 = Debug|Win32
+		{0849CD0E-1B9B-44EB-8937-A278B6A7E2CF}.Release|x64.ActiveCfg = Release|x64
+		{0849CD0E-1B9B-44EB-8937-A278B6A7E2CF}.Release|x64.Build.0 = Release|x64
+		{0849CD0E-1B9B-44EB-8937-A278B6A7E2CF}.Release|x86.ActiveCfg = Release|Win32
+		{0849CD0E-1B9B-44EB-8937-A278B6A7E2CF}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {AAE76966-D194-4E24-AFFF-7E3CAB6E7F9C}
+	EndGlobalSection
 EndGlobal
diff --git a/builds/vc/ZipDiff.vcxproj b/builds/vc/ZipDiff.vcxproj
@@ -34,18 +34,6 @@
     <ClCompile Include="..\..\HDiffPatch\libHDiffPatch\HPatch\patch.c" />
     <ClCompile Include="..\..\HDiffPatch\libParallel\parallel_channel.cpp" />
     <ClCompile Include="..\..\HDiffPatch\libParallel\parallel_import.cpp" />
-    <ClCompile Include="..\..\lzma\C\Alloc.c" />
-    <ClCompile Include="..\..\lzma\C\CpuArch.c" />
-    <ClCompile Include="..\..\lzma\C\LzFind.c" />
-    <ClCompile Include="..\..\lzma\C\LzFindMt.c" />
-    <ClCompile Include="..\..\lzma\C\LzFindOpt.c" />
-    <ClCompile Include="..\..\lzma\C\Lzma2Enc.c" />
-    <ClCompile Include="..\..\lzma\C\LzmaDec.c" />
-    <ClCompile Include="..\..\lzma\C\Lzma2Dec.c" />
-    <ClCompile Include="..\..\lzma\C\LzmaEnc.c" />
-    <ClCompile Include="..\..\lzma\C\MtCoder.c" />
-    <ClCompile Include="..\..\lzma\C\MtDec.c" />
-    <ClCompile Include="..\..\lzma\C\Threads.c" />
     <ClCompile Include="..\..\src\diff\DiffData.cpp" />
     <ClCompile Include="..\..\src\diff\Differ.cpp" />
     <ClCompile Include="..\..\src\diff\OldRef.cpp" />
@@ -67,6 +55,11 @@
     <ClCompile Include="..\..\zlib1.2.11\uncompr.c" />
     <ClCompile Include="..\..\zlib1.2.11\zutil.c" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\HDiffPatch\builds\vc\lzma.vcxproj">
+      <Project>{0849cd0e-1b9b-44eb-8937-a278b6a7e2cf}</Project>
+    </ProjectReference>
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{96E107FE-4A2E-4008-9FDE-8CEAA695BFCA}</ProjectGuid>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

diff --git a/builds/xcode/lzma.xcodeproj/project.pbxproj b/builds/xcode/lzma.xcodeproj/project.pbxproj
@@ -9,6 +9,7 @@
 /* Begin PBXBuildFile section */
 		0D5B125B28F1862700D12B51 /* Lzma2Dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D5B125A28F1862700D12B51 /* Lzma2Dec.c */; };
 		0D5B125D28F1865800D12B51 /* Lzma2Enc.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D5B125C28F1865800D12B51 /* Lzma2Enc.c */; };
+		0D5B125D28F1865800D12B51 /* 7zStream.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D5B125C28F1865800D12B51 /* 7zStream.c */; };
 		0D5B126328F189B300D12B51 /* CpuArch.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D5B126028F189B300D12B51 /* CpuArch.c */; };
 		0D5B126428F189B300D12B51 /* LzFindOpt.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D5B126128F189B300D12B51 /* LzFindOpt.c */; };
 		0D5B126528F189B300D12B51 /* MtCoder.c in Sources */ = {isa = PBXBuildFile; fileRef = 0D5B126228F189B300D12B51 /* MtCoder.c */; };
@@ -22,6 +23,7 @@
 /* Begin PBXFileReference section */
 		0D5B125A28F1862700D12B51 /* Lzma2Dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = Lzma2Dec.c; path = ../../lzma/C/Lzma2Dec.c; sourceTree = "<group>"; };
 		0D5B125C28F1865800D12B51 /* Lzma2Enc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = Lzma2Enc.c; path = ../../lzma/C/Lzma2Enc.c; sourceTree = "<group>"; };
+		0D5B125C28F1865800D12B51 /* 7zStream.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = 7zStream.c; path = ../../lzma/C/7zStream.c; sourceTree = "<group>"; };
 		0D5B126028F189B300D12B51 /* CpuArch.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = CpuArch.c; path = ../../lzma/C/CpuArch.c; sourceTree = "<group>"; };
 		0D5B126128F189B300D12B51 /* LzFindOpt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = LzFindOpt.c; path = ../../lzma/C/LzFindOpt.c; sourceTree = "<group>"; };
 		0D5B126228F189B300D12B51 /* MtCoder.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = MtCoder.c; path = ../../lzma/C/MtCoder.c; sourceTree = "<group>"; };
@@ -51,6 +53,7 @@
 				0D5B126128F189B300D12B51 /* LzFindOpt.c */,
 				0D5B126228F189B300D12B51 /* MtCoder.c */,
 				0D5B125C28F1865800D12B51 /* Lzma2Enc.c */,
+				0D5B125C28F1865800D12B51 /* 7zStream.c */,
 				0D5B125A28F1862700D12B51 /* Lzma2Dec.c */,
 				D676B254220FB46900874D63 /* LzFindMt.c */,
 				D676B253220FB46900874D63 /* Threads.c */,
@@ -139,6 +142,7 @@
 			files = (
 				0D5B126328F189B300D12B51 /* CpuArch.c in Sources */,
 				0D5B125D28F1865800D12B51 /* Lzma2Enc.c in Sources */,
+				0D5B125D28F1865800D12B51 /* 7zStream.c in Sources */,
 				D68B02D7205A4551001F3C40 /* LzmaEnc.c in Sources */,
 				0D5B125B28F1862700D12B51 /* Lzma2Dec.c in Sources */,
 				D68B02D9205A4626001F3C40 /* LzFind.c in Sources */,
@@ -196,7 +200,7 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
-					_7ZIP_ST,
+					Z7_ST,
 					"$(inherited)",
 				);
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -252,7 +256,7 @@
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = s;
-				GCC_PREPROCESSOR_DEFINITIONS = _7ZIP_ST;
+				GCC_PREPROCESSOR_DEFINITIONS = Z7_ST;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;

diff --git a/lzma b/lzma
diff --git a/src/normalized/normalized.cpp b/src/normalized/normalized.cpp
@@ -39,17 +39,17 @@
 struct TFileValue{
     std::string fileName;
     int         fileIndex;
+    static bool inline isInSignDir(const std::string& s){
+        return (s.find("META-INF/")==0)||(s.find("META-INF\\")==0);
+    }
+    static bool inline isEndWith(const std::string& s,const char* sub){
+        return (s.find(sub)==s.size()-strlen(sub));
+    }
+    static bool inline isSignMFFile(const std::string& s){
+        return (s=="META-INF/MANIFEST.MF")||(s=="META-INF\\MANIFEST.MF");
+    }
     struct TCmp{
         inline TCmp(int fileCount):_fileCount(fileCount){}
-        static bool inline isInSignDir(const std::string& s){
-            return (s.find("META-INF/")==0)||(s.find("META-INF\\")==0);
-        }
-        static bool inline isEndWith(const std::string& s,const char* sub){
-            return (s.find(sub)==s.size()-strlen(sub));
-        }
-        static bool inline isSignMFFile(const std::string& s){
-            return (s=="META-INF/MANIFEST.MF")||(s=="META-INF\\MANIFEST.MF");
-        }
         size_t _v(const TFileValue& x)const{
             size_t xi=x.fileIndex;
             if (isInSignDir(x.fileName)){
@@ -111,8 +111,7 @@ bool ZipNormalized(const char* srcApk,const char* dstApk,
             if (UnZipper_file_isApkV1Sign(&unzipper,fileIndex)){
                 ++jarSignFileCount;
                 if (isHaveApkV2Sign){
-                    const char* fn=UnZipper_file_nameBegin(&unzipper,fileIndex);
-                    removedFiles.push_back(std::string(fn,fn+UnZipper_file_nameLen(&unzipper,fileIndex)));
+                    removedFiles.push_back(files[i].fileName);
                     continue; //remove JarSign(ApkV1Sign) when found ApkV2Sign
                 }
             }
+16 −0		CHANGELOG.md
+9 −3		Makefile
+8 −8		README.md
+1 −1		README_cmdline_cn.md
+3 −0		bsdiff_wrapper/bsdiff_wrapper.cpp
+51 −22		bsdiff_wrapper/bspatch_wrapper.c
+1 −0		bsdiff_wrapper/bspatch_wrapper.h
+30 −9		builds/android_ndk_jni_mk/Android.mk
+1 −1		builds/android_ndk_jni_mk/hpatch.c
+8 −3		builds/android_ndk_jni_mk/hpatch.h
+11 −13		builds/android_ndk_jni_mk/java/com/github/sisong/HPatch.java
+3 −0		builds/codeblocks/HDiffZ.cbp
+2 −1		builds/vc/lzma.vcxproj
+4 −4		builds/xcode/hdiffz.xcodeproj/project.pbxproj
+17 −4		builds/xcode/hpatchz.xcodeproj/project.pbxproj
+167 −3		builds/xcode/lzma.xcodeproj/project.pbxproj
+1 −0		builds/xcode/zstd.xcodeproj/project.pbxproj
+30 −0		builds/xcode_iOS_hpatchz/hpatch_objc/hpatch_objc.h
+40 −0		builds/xcode_iOS_hpatchz/hpatch_objc/hpatch_objc.m
+719 −0		builds/xcode_iOS_hpatchz/hpatchz.xcodeproj/project.pbxproj
+7 −0		builds/xcode_iOS_hpatchz/hpatchz.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+8 −0		builds/xcode_iOS_hpatchz/hpatchz.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+3 −3		compress_plugin_demo.h
+1 −1		dirDiffPatch/dir_diff/dir_diff.cpp
+1 −1		dirDiffPatch/dir_patch/ref_stream.c
+1 −1		dirDiffPatch/dir_patch/ref_stream.h
+64 −18		file_for_patch.c
+2 −2		hdiffz.cpp
+10 −8		hpatchz.c
+13 −6		libHDiffPatch/HDiff/private_diff/limit_mem_diff/digest_matcher.cpp
+1 −1		libHDiffPatch/HPatch/patch_types.h
+21 −11		vcdiff_wrapper/vcdiff_wrapper.cpp
+13 −9		vcdiff_wrapper/vcpatch_wrapper.c