Fix #223 and use CCOMPLB in the 7zip.mak makefile

mcmilk · Oct 5, 2021 · a9e1808 · a9e1808
1 parent f5dc5b2
commit a9e1808
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/C/7zVersion.h b/C/7zVersion.h
@@ -1,7 +1,7 @@
 #define MY_VER_MAJOR 21
 #define MY_VER_MINOR 03
-#define MY_VER_BUILD 0
-#define MY_VERSION_NUMBERS "21.03 ZS v1.5.0 R1"
+#define MY_VER_BUILD 2
+#define MY_VERSION_NUMBERS "21.03 ZS v1.5.0 R2"
 #define MY_VERSION MY_VERSION_NUMBERS
 
 #ifdef MY_CPU_NAME
@@ -10,7 +10,7 @@
   #define MY_VERSION_CPU MY_VERSION
 #endif
 
-#define MY_DATE "2021-08-26"
+#define MY_DATE "2021-10-05"
 #undef MY_COPYRIGHT
 #undef MY_VERSION_COPYRIGHT_DATE
 #define MY_AUTHOR_NAME "Igor Pavlov, Tino Reichardt"

diff --git a/CPP/7zip/7zip.mak b/CPP/7zip/7zip.mak
@@ -272,33 +272,33 @@ $(FASTLZMA2_OBJS): ../../../../C/fast-lzma2/$(*B).c
 	$(COMPLB)
 
 {../../Compress}.cpp{$O}.obj::
-	$(COMPLB_O2)
+	$(COMPLB)
 {../../Crypto}.cpp{$O}.obj::
-	$(COMPLB_O2)
+	$(CCOMPLB)
 {../../../../C}.c{$O}.obj::
-	$(COMPLB_O2)
+	$(CCOMPLB)
 {../../../../C/brotli}.c{$O}.obj::
-	$(COMPLB_O2)
+	$(CCOMPLB)
 {../../../../C/hashes}.c{$O}.obj::
-	$(COMPLB_O2)
+	$(CCOMPLB)
 {../../../../C/lizard}.c{$O}.obj::
-	$(COMPLB_O2)
+	$(CCOMPLB)
 {../../../../C/lz4}.c{$O}.obj::
-	$(COMPLB_O2)
+	$(CCOMPLB)
 {../../../../C/lz5}.c{$O}.obj::
-	$(COMPLB_O2)
+	$(CCOMPLB)
 {../../../../C/zstd}.c{$O}.obj::
-	$(COMPLB_O2)
+	$(CCOMPLB)
 {../../../../C/zstdmt}.c{$O}.obj::
-	$(COMPLB_O2) \
+	$(CCOMPLB) \
 	-I ../../../../C/brotli \
 	-I ../../../../C/hashes \
 	-I ../../../../C/lizard \
 	-I ../../../../C/lz4 \
 	-I ../../../../C/lz5 \
 	-I ../../../../C/zstd
 {../../../../C/fast-lzma2}.c{$O}.obj::
-	$(COMPLB_O2) -DNO_XXHASH -DFL2_7ZIP_BUILD
+	$(CCOMPLB) -DNO_XXHASH -DFL2_7ZIP_BUILD
 
 !ENDIF
 

diff --git a/CPP/7zip/UI/GUI/CompressDialog.cpp b/CPP/7zip/UI/GUI/CompressDialog.cpp
@@ -2178,7 +2178,7 @@ UInt64 CCompressDialog::GetMemoryUsage_Dict_DecompMem(UInt64 dict64, UInt64 &dec
     }
   }
 
-  return (UInt64)(Int64)-1;
+  return 0;
 }
 
 UInt64 CCompressDialog::GetMemoryUsage_DecompMem(UInt64 &decompressMemory)