-diff -urN lzma432/C/7zip/Compress/LZMA/LZMADecoder.cpp lzma/C/7zip/Compress/LZMA/LZMADecoder.cpp
---- lzma432/C/7zip/Compress/LZMA/LZMADecoder.cpp 2005-09-22 12:55:34.000000000 +0400
-+++ lzma/C/7zip/Compress/LZMA/LZMADecoder.cpp 2006-03-24 13:23:09.634551840 +0300
+diff -Nur lzma/C/7zip/Compress/LZMA/LZMADecoder.cpp lzma.patched/C/7zip/Compress/LZMA/LZMADecoder.cpp
+--- lzma/C/7zip/Compress/LZMA/LZMADecoder.cpp 2005-09-22 10:55:34.000000000 +0200
++++ lzma.patched/C/7zip/Compress/LZMA/LZMADecoder.cpp 2006-03-25 11:04:53.000000000 +0100
@@ -274,12 +274,17 @@
Byte remainder = (Byte)(properties[0] / 9);\r
int lp = remainder % 5;\r
if (!_outWindowStream.Create(dictionarySize))\r
return E_OUTOFMEMORY;\r
if (!_literalDecoder.Create(lp, lc))\r
-diff -urN lzma432/C/7zip/Compress/LZMA/LZMADecoder.h lzma/C/7zip/Compress/LZMA/LZMADecoder.h
---- lzma432/C/7zip/Compress/LZMA/LZMADecoder.h 2005-09-19 10:10:06.000000000 +0400
-+++ lzma/C/7zip/Compress/LZMA/LZMADecoder.h 2006-03-24 13:23:09.635551552 +0300
+diff -Nur lzma/C/7zip/Compress/LZMA/LZMADecoder.h lzma.patched/C/7zip/Compress/LZMA/LZMADecoder.h
+--- lzma/C/7zip/Compress/LZMA/LZMADecoder.h 2005-09-19 08:10:06.000000000 +0200
++++ lzma.patched/C/7zip/Compress/LZMA/LZMADecoder.h 2006-03-25 11:04:53.000000000 +0100
@@ -228,6 +228,7 @@
ICompressProgressInfo *progress);\r
\r
\r
STDMETHOD(GetInStreamProcessedSize)(UInt64 *value);\r
\r
-diff -urN lzma432/C/7zip/Compress/LZMA_Lib/makefile lzma/C/7zip/Compress/LZMA_Lib/makefile
---- lzma432/C/7zip/Compress/LZMA_Lib/makefile 1970-01-01 03:00:00.000000000 +0300
-+++ lzma/C/7zip/Compress/LZMA_Lib/makefile 2006-03-24 13:26:58.254841791 +0300
-@@ -0,0 +1,88 @@
-+PROG = liblzma.a\r
-+CXX = g++ -O3 -Wall\r
+diff -Nur lzma/C/7zip/Compress/LZMA_Lib/makefile lzma.patched/C/7zip/Compress/LZMA_Lib/makefile
+--- lzma/C/7zip/Compress/LZMA_Lib/makefile 1970-01-01 01:00:00.000000000 +0100
++++ lzma.patched/C/7zip/Compress/LZMA_Lib/makefile 2006-03-25 11:29:46.000000000 +0100
+@@ -0,0 +1,92 @@
++PROG = liblzma.a
++CXX = g++ -O3 -Wall
+AR = ar
-+RM = rm -f\r
-+CFLAGS = -c -I ../../../\r
-+\r
-+OBJS = \\r
-+ ZLib.o \\r
-+ LZMADecoder.o \\r
-+ LZMAEncoder.o \\r
-+ LZInWindow.o \\r
-+ LZOutWindow.o \\r
-+ RangeCoderBit.o \\r
-+ InBuffer.o \\r
-+ OutBuffer.o \\r
-+ FileStreams.o \\r
-+ Alloc.o \\r
-+ C_FileIO.o \\r
-+ CommandLineParser.o \\r
-+ CRC.o \\r
-+ String.o \\r
-+ StringConvert.o \\r
-+ StringToInt.o \\r
-+ Vector.o \\r
-+\r
-+\r
-+all: $(PROG)\r
-+\r
-+$(PROG): $(OBJS)\r
-+ $(AR) r $(PROG) $(OBJS)\r
-+\r
-+ZLib.o: ZLib.cpp\r
-+ $(CXX) $(CFLAGS) ZLib.cpp\r
-+\r
-+LZMADecoder.o: ../LZMA/LZMADecoder.cpp\r
-+ $(CXX) $(CFLAGS) ../LZMA/LZMADecoder.cpp\r
-+\r
-+LZMAEncoder.o: ../LZMA/LZMAEncoder.cpp\r
-+ $(CXX) $(CFLAGS) ../LZMA/LZMAEncoder.cpp\r
-+\r
-+LZInWindow.o: ../LZ/LZInWindow.cpp\r
-+ $(CXX) $(CFLAGS) ../LZ/LZInWindow.cpp\r
-+\r
-+LZOutWindow.o: ../LZ/LZOutWindow.cpp\r
-+ $(CXX) $(CFLAGS) ../LZ/LZOutWindow.cpp\r
-+\r
-+RangeCoderBit.o: ../RangeCoder/RangeCoderBit.cpp\r
-+ $(CXX) $(CFLAGS) ../RangeCoder/RangeCoderBit.cpp\r
-+\r
-+InBuffer.o: ../../Common/InBuffer.cpp\r
-+ $(CXX) $(CFLAGS) ../../Common/InBuffer.cpp\r
-+\r
-+OutBuffer.o: ../../Common/OutBuffer.cpp\r
-+ $(CXX) $(CFLAGS) ../../Common/OutBuffer.cpp\r
-+\r
-+FileStreams.o: ../../Common/FileStreams.cpp\r
-+ $(CXX) $(CFLAGS) ../../Common/FileStreams.cpp\r
-+\r
-+Alloc.o: ../../../Common/Alloc.cpp\r
-+ $(CXX) $(CFLAGS) ../../../Common/Alloc.cpp\r
-+\r
-+C_FileIO.o: ../../../Common/C_FileIO.cpp\r
-+ $(CXX) $(CFLAGS) ../../../Common/C_FileIO.cpp\r
-+\r
-+CommandLineParser.o: ../../../Common/CommandLineParser.cpp\r
-+ $(CXX) $(CFLAGS) ../../../Common/CommandLineParser.cpp\r
-+\r
-+CRC.o: ../../../Common/CRC.cpp\r
-+ $(CXX) $(CFLAGS) ../../../Common/CRC.cpp\r
-+\r
-+MyWindows.o: ../../../Common/MyWindows.cpp\r
-+ $(CXX) $(CFLAGS) ../../../Common/MyWindows.cpp\r
-+\r
-+String.o: ../../../Common/String.cpp\r
-+ $(CXX) $(CFLAGS) ../../../Common/String.cpp\r
-+\r
-+StringConvert.o: ../../../Common/StringConvert.cpp\r
-+ $(CXX) $(CFLAGS) ../../../Common/StringConvert.cpp\r
-+\r
-+StringToInt.o: ../../../Common/StringToInt.cpp\r
-+ $(CXX) $(CFLAGS) ../../../Common/StringToInt.cpp\r
-+\r
-+Vector.o: ../../../Common/Vector.cpp\r
-+ $(CXX) $(CFLAGS) ../../../Common/Vector.cpp\r
-+\r
-+clean:\r
-+ -$(RM) $(PROG) $(OBJS)\r
-+\r
-diff -urN lzma432/C/7zip/Compress/LZMA_Lib/ZLib.cpp lzma/C/7zip/Compress/LZMA_Lib/ZLib.cpp
---- lzma432/C/7zip/Compress/LZMA_Lib/ZLib.cpp 1970-01-01 03:00:00.000000000 +0300
-+++ lzma/C/7zip/Compress/LZMA_Lib/ZLib.cpp 2006-03-24 13:23:09.638550690 +0300
++RM = rm -f
++CFLAGS = -c -I ../../../
++
++OBJS = \
++ ZLib.o \
++ LZMADecoder.o \
++ LZMAEncoder.o \
++ LZInWindow.o \
++ LZOutWindow.o \
++ RangeCoderBit.o \
++ InBuffer.o \
++ OutBuffer.o \
++ FileStreams.o \
++ Alloc.o \
++ C_FileIO.o \
++ CommandLineParser.o \
++ CRC.o \
++ StreamUtils.o \
++ String.o \
++ StringConvert.o \
++ StringToInt.o \
++ Vector.o \
++
++
++all: $(PROG)
++
++$(PROG): $(OBJS)
++ $(AR) r $(PROG) $(OBJS)
++
++ZLib.o: ZLib.cpp
++ $(CXX) $(CFLAGS) ZLib.cpp
++
++LZMADecoder.o: ../LZMA/LZMADecoder.cpp
++ $(CXX) $(CFLAGS) ../LZMA/LZMADecoder.cpp
++
++LZMAEncoder.o: ../LZMA/LZMAEncoder.cpp
++ $(CXX) $(CFLAGS) ../LZMA/LZMAEncoder.cpp
++
++LZInWindow.o: ../LZ/LZInWindow.cpp
++ $(CXX) $(CFLAGS) ../LZ/LZInWindow.cpp
++
++LZOutWindow.o: ../LZ/LZOutWindow.cpp
++ $(CXX) $(CFLAGS) ../LZ/LZOutWindow.cpp
++
++RangeCoderBit.o: ../RangeCoder/RangeCoderBit.cpp
++ $(CXX) $(CFLAGS) ../RangeCoder/RangeCoderBit.cpp
++
++InBuffer.o: ../../Common/InBuffer.cpp
++ $(CXX) $(CFLAGS) ../../Common/InBuffer.cpp
++
++OutBuffer.o: ../../Common/OutBuffer.cpp
++ $(CXX) $(CFLAGS) ../../Common/OutBuffer.cpp
++
++StreamUtils.o: ../../Common/StreamUtils.cpp
++ $(CXX) $(CFLAGS) ../../Common/StreamUtils.cpp
++
++FileStreams.o: ../../Common/FileStreams.cpp
++ $(CXX) $(CFLAGS) ../../Common/FileStreams.cpp
++
++Alloc.o: ../../../Common/Alloc.cpp
++ $(CXX) $(CFLAGS) ../../../Common/Alloc.cpp
++
++C_FileIO.o: ../../../Common/C_FileIO.cpp
++ $(CXX) $(CFLAGS) ../../../Common/C_FileIO.cpp
++
++CommandLineParser.o: ../../../Common/CommandLineParser.cpp
++ $(CXX) $(CFLAGS) ../../../Common/CommandLineParser.cpp
++
++CRC.o: ../../../Common/CRC.cpp
++ $(CXX) $(CFLAGS) ../../../Common/CRC.cpp
++
++MyWindows.o: ../../../Common/MyWindows.cpp
++ $(CXX) $(CFLAGS) ../../../Common/MyWindows.cpp
++
++String.o: ../../../Common/String.cpp
++ $(CXX) $(CFLAGS) ../../../Common/String.cpp
++
++StringConvert.o: ../../../Common/StringConvert.cpp
++ $(CXX) $(CFLAGS) ../../../Common/StringConvert.cpp
++
++StringToInt.o: ../../../Common/StringToInt.cpp
++ $(CXX) $(CFLAGS) ../../../Common/StringToInt.cpp
++
++Vector.o: ../../../Common/Vector.cpp
++ $(CXX) $(CFLAGS) ../../../Common/Vector.cpp
++
++clean:
++ -$(RM) $(PROG) $(OBJS)
++
+diff -Nur lzma/C/7zip/Compress/LZMA_Lib/ZLib.cpp lzma.patched/C/7zip/Compress/LZMA_Lib/ZLib.cpp
+--- lzma/C/7zip/Compress/LZMA_Lib/ZLib.cpp 1970-01-01 01:00:00.000000000 +0100
++++ lzma.patched/C/7zip/Compress/LZMA_Lib/ZLib.cpp 2006-03-25 11:04:53.000000000 +0100
@@ -0,0 +1,273 @@
+/*\r
+ * lzma zlib simplified wrapper\r