
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4772 212acab6-be3b-0410-9dea-997c60f758d6
167 lines
4.5 KiB
Diff
167 lines
4.5 KiB
Diff
Only in 7zip: 7zGuids.cpp
|
|
Only in 7zip-orig/7zip: Archive
|
|
Only in 7zip/7zip: CVS
|
|
Only in 7zip/7zip/Common: CVS
|
|
Only in 7zip-orig/7zip/Common: FileStreams.cpp
|
|
Only in 7zip-orig/7zip/Common: FileStreams.h
|
|
diff -ru 7zip-orig/7zip/Common/StdAfx.h 7zip/7zip/Common/StdAfx.h
|
|
--- 7zip-orig/7zip/Common/StdAfx.h Mon Jul 11 15:14:54 2005
|
|
+++ 7zip/7zip/Common/StdAfx.h Mon Oct 16 10:39:10 2006
|
|
@@ -4,6 +4,5 @@
|
|
#define __STDAFX_H
|
|
|
|
#include "../../Common/MyWindows.h"
|
|
-#include "../../Common/NewHandler.h"
|
|
|
|
#endif
|
|
Only in 7zip-orig/7zip/Compress: Branch
|
|
Only in 7zip/7zip/Compress: CVS
|
|
Only in 7zip/7zip/Compress/LZ/BinTree: BinTree3ZMain.h
|
|
Only in 7zip/7zip/Compress/LZ/BinTree: BinTree4b.h
|
|
Only in 7zip/7zip/Compress/LZ/BinTree: BinTreeMF.h
|
|
Only in 7zip/7zip/Compress/LZ/BinTree: BinTreeMFMain.h
|
|
Only in 7zip/7zip/Compress/LZ/BinTree: CVS
|
|
Only in 7zip/7zip/Compress/LZ: CVS
|
|
Only in 7zip-orig/7zip/Compress/LZ: HashChain
|
|
Only in 7zip/7zip/Compress/LZMA: CVS
|
|
Only in 7zip-orig/7zip/Compress/LZMA: LZMADecoder.cpp
|
|
Only in 7zip-orig/7zip/Compress/LZMA: LZMADecoder.h
|
|
diff -ru 7zip-orig/7zip/Compress/LZMA/LZMAEncoder.cpp 7zip/7zip/Compress/LZMA/LZMAEncoder.cpp
|
|
--- 7zip-orig/7zip/Compress/LZMA/LZMAEncoder.cpp Sat May 20 08:23:48 2006
|
|
+++ 7zip/7zip/Compress/LZMA/LZMAEncoder.cpp Mon Oct 16 10:26:43 2006
|
|
@@ -55,13 +55,13 @@
|
|
kHC4
|
|
};
|
|
|
|
-static const wchar_t *kMatchFinderIDs[] =
|
|
+/*static const wchar_t *kMatchFinderIDs[] =
|
|
{
|
|
L"BT2",
|
|
L"BT3",
|
|
L"BT4",
|
|
L"HC4"
|
|
-};
|
|
+};*/
|
|
|
|
Byte g_FastPos[1 << 11];
|
|
|
|
@@ -318,7 +318,7 @@
|
|
return S_OK;
|
|
}
|
|
|
|
-static bool AreStringsEqual(const wchar_t *base, const wchar_t *testString)
|
|
+/*static bool AreStringsEqual(const wchar_t *base, const wchar_t *testString)
|
|
{
|
|
while (true)
|
|
{
|
|
@@ -340,7 +340,7 @@
|
|
if (AreStringsEqual(kMatchFinderIDs[m], s))
|
|
return m;
|
|
return -1;
|
|
-}
|
|
+}*/
|
|
|
|
STDMETHODIMP CEncoder::SetCoderProperties(const PROPID *propIDs,
|
|
const PROPVARIANT *properties, UInt32 numProperties)
|
|
@@ -378,7 +378,8 @@
|
|
}
|
|
case NCoderPropID::kMatchFinder:
|
|
{
|
|
- if (prop.vt != VT_BSTR)
|
|
+ return E_NOTIMPL;
|
|
+ /*if (prop.vt != VT_BSTR)
|
|
return E_INVALIDARG;
|
|
int matchFinderIndexPrev = _matchFinderIndex;
|
|
int m = FindMatchFinder(prop.bstrVal);
|
|
@@ -390,7 +391,7 @@
|
|
_dictionarySizePrev = (UInt32)-1;
|
|
ReleaseMatchFinder();
|
|
}
|
|
- break;
|
|
+ break;*/
|
|
}
|
|
#ifdef COMPRESS_MF_MT
|
|
case NCoderPropID::kMultiThread:
|
|
Only in 7zip-orig/7zip/Compress: LZMA_Alone
|
|
Only in 7zip-orig/7zip/Compress: LZMA_C
|
|
Only in 7zip/7zip/Compress/RangeCoder: CVS
|
|
Only in 7zip: CVS
|
|
Only in 7zip/Common: CVS
|
|
Only in 7zip-orig/Common: C_FileIO.cpp
|
|
Only in 7zip-orig/Common: C_FileIO.h
|
|
Only in 7zip-orig/Common: ComTry.h
|
|
Only in 7zip-orig/Common: CommandLineParser.cpp
|
|
Only in 7zip-orig/Common: CommandLineParser.h
|
|
Only in 7zip-orig/Common: MyInitGuid.h
|
|
diff -ru 7zip-orig/Common/MyWindows.h 7zip/Common/MyWindows.h
|
|
--- 7zip-orig/Common/MyWindows.h Sun Apr 16 16:53:43 2006
|
|
+++ 7zip/Common/MyWindows.h Mon Oct 16 10:20:04 2006
|
|
@@ -3,17 +3,22 @@
|
|
#ifndef __MYWINDOWS_H
|
|
#define __MYWINDOWS_H
|
|
|
|
+#include "../../Platform.h"
|
|
+
|
|
#ifdef _WIN32
|
|
|
|
#include <windows.h>
|
|
|
|
+/*
|
|
#define CHAR_PATH_SEPARATOR '\\'
|
|
#define WCHAR_PATH_SEPARATOR L'\\'
|
|
#define STRING_PATH_SEPARATOR "\\"
|
|
#define WSTRING_PATH_SEPARATOR L"\\"
|
|
+*/
|
|
|
|
#else
|
|
|
|
+/*
|
|
#define CHAR_PATH_SEPARATOR '/'
|
|
#define WCHAR_PATH_SEPARATOR L'/'
|
|
#define STRING_PATH_SEPARATOR "/"
|
|
@@ -21,9 +26,9 @@
|
|
|
|
#include <stddef.h> // for wchar_t
|
|
#include <string.h>
|
|
-
|
|
+*/
|
|
#include "MyGuidDef.h"
|
|
-
|
|
+/*
|
|
typedef char CHAR;
|
|
typedef unsigned char UCHAR;
|
|
|
|
@@ -62,7 +67,7 @@
|
|
typedef OLECHAR *BSTR;
|
|
typedef const OLECHAR *LPCOLESTR;
|
|
typedef OLECHAR *LPOLESTR;
|
|
-
|
|
+*/
|
|
typedef struct _FILETIME
|
|
{
|
|
DWORD dwLowDateTime;
|
|
Only in 7zip-orig/Common: NewHandler.cpp
|
|
Only in 7zip-orig/Common: NewHandler.h
|
|
diff -ru 7zip-orig/Common/StdAfx.h 7zip/Common/StdAfx.h
|
|
--- 7zip-orig/Common/StdAfx.h Mon Jul 11 15:16:00 2005
|
|
+++ 7zip/Common/StdAfx.h Mon Oct 16 10:39:16 2006
|
|
@@ -4,6 +4,5 @@
|
|
#define __STDAFX_H
|
|
|
|
// #include "MyWindows.h"
|
|
-#include "NewHandler.h"
|
|
|
|
#endif
|
|
Only in 7zip-orig/Common: String.cpp
|
|
Only in 7zip-orig/Common: String.h
|
|
Only in 7zip-orig/Common: StringConvert.cpp
|
|
Only in 7zip-orig/Common: StringConvert.h
|
|
Only in 7zip-orig/Common: StringToInt.cpp
|
|
Only in 7zip-orig/Common: StringToInt.h
|
|
Only in 7zip-orig/Common: Vector.cpp
|
|
Only in 7zip-orig/Common: Vector.h
|
|
Only in 7zip: LZMADecode.c
|
|
Only in 7zip: LZMADecode.h
|
|
Only in 7zip-orig: Windows
|
|
Only in 7zip: copying.txt
|
|
Only in 7zip: readme.txt
|