This commit is contained in:
Igor Pavlov
2014-12-07 00:00:00 +00:00
committed by Kornel Lesiński
parent f08f4dcc3c
commit 0dc16c691d
24 changed files with 127 additions and 472 deletions

View File

@@ -1,9 +1,9 @@
#define MY_VER_MAJOR 9
#define MY_VER_MINOR 34
#define MY_VER_MINOR 35
#define MY_VER_BUILD 00
#define MY_VERSION "9.34 alpha"
// #define MY_7ZIP_VERSION "9.34 alpha"
#define MY_DATE "2014-06-22"
#define MY_VERSION "9.35 beta"
// #define MY_7ZIP_VERSION "9.35"
#define MY_DATE "2014-12-07"
#undef MY_COPYRIGHT
#undef MY_VERSION_COPYRIGHT_DATE
#define MY_COPYRIGHT ": Igor Pavlov : Public domain"

View File

@@ -1,4 +1,4 @@
MY_STATIC_LINK=1
# MY_STATIC_LINK=1
CFLAGS = $(CFLAGS) -D_7ZIP_PPMD_SUPPPORT
PROG = 7zDec.exe

View File

@@ -1,4 +1,4 @@
MY_STATIC_LINK=1
# MY_STATIC_LINK=1
PROG = LZMAc.exe
CFLAGS = $(CFLAGS) \

View File

@@ -1,5 +1,5 @@
/* SfxSetup.c - 7z SFX Setup
2014-06-15 : Igor Pavlov : Public domain */
2014-12-07 : Igor Pavlov : Public domain */
#include "Precomp.h"
@@ -21,28 +21,28 @@
#include "../../7zFile.h"
#include "../../CpuArch.h"
#define k_EXE_ExtIndex 1
#define k_EXE_ExtIndex 2
static const char *kExts[] =
{
"bat",
"cmd",
"exe",
"inf",
"msi",
"bat"
, "cmd"
, "exe"
, "inf"
, "msi"
#ifdef UNDER_CE
"cab",
, "cab"
#endif
"html",
"htm"
, "html"
, "htm"
};
static const char *kNames[] =
{
"setup",
"install",
"run",
"start"
"setup"
, "install"
, "run"
, "start"
};
static unsigned FindExt(const wchar_t *s, unsigned *extLen)
@@ -190,7 +190,7 @@ static WRes RemoveDirWithSubItems(WCHAR *path)
wcscpy(path + len, fd.cFileName);
if ((fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0)
{
wcscat(path, L"\\");
wcscat(path, WSTRING_PATH_SEPARATOR);
res = RemoveDirWithSubItems(path);
}
else
@@ -324,7 +324,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
continue;
if (CreateDirectoryW(path, NULL))
{
wcscat(path, L"\\");
wcscat(path, WSTRING_PATH_SEPARATOR);
pathLen = wcslen(path);
break;
}