Muldersoft/LameXP
Muldersoft/LameXP
1
0
Fork 0
Code Releases 2 Activity

Updated SFX EXE-header (7zSD.sfx).

Browse Source
This commit is contained in:
LoRd_MuldeR 2016-10-23 15:25:24 +02:00
parent c60307d7ce
commit 85ada31934
3 changed files with 44 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
etc/Utilities/7zSD.diff
View File

@ -1,14 +1,14 @@
CPP/7zip/Bundles/SFXSetup/Compat.xml | 1 + CPP/7zip/Bundles/SFXSetup/Compat.xml | 1 +
CPP/7zip/Bundles/SFXSetup/SfxSetup.cpp | 51 +++++++++++++++++---- CPP/7zip/Bundles/SFXSetup/SfxSetup.cpp | 51 +++++++++++++---
CPP/7zip/Bundles/SFXSetup/resource.rc | 4 +- CPP/7zip/Bundles/SFXSetup/resource.rc | 4 +-
CPP/7zip/UI/Explorer/MyMessages.cpp | 4 +- CPP/7zip/UI/Explorer/MyMessages.cpp | 4 +-
CPP/7zip/UI/Explorer/MyMessages.h | 2 +- CPP/7zip/UI/Explorer/MyMessages.h | 2 +-
CPP/7zip/UI/FileManager/FormatUtils.cpp | 2 +- CPP/7zip/UI/FileManager/FormatUtils.cpp | 2 +-
CPP/7zip/UI/FileManager/ProgressDialog.cpp | 4 +- CPP/7zip/UI/FileManager/ProgressDialog.cpp | 4 +-
CPP/Common/MyWindows.h | 1 + CPP/Common/MyWindows.h | 1 +
CPP/Windows/FileDir.cpp | 73 ++++++++++++++++++++++++++---- CPP/Windows/FileDir.cpp | 97 ++++++++++++++++++++++++++----
CPP/Windows/FileDir.h | 1 + CPP/Windows/FileDir.h | 1 +
10 files changed, 117 insertions(+), 26 deletions(-) 10 files changed, 137 insertions(+), 30 deletions(-)
diff --git a/CPP/7zip/Bundles/SFXSetup/Compat.xml b/CPP/7zip/Bundles/SFXSetup/Compat.xml diff --git a/CPP/7zip/Bundles/SFXSetup/Compat.xml b/CPP/7zip/Bundles/SFXSetup/Compat.xml
new file mode 100644 new file mode 100644
@ -217,7 +217,7 @@ index 139a4e8..c40767f 100644
#ifdef UNDER_CE #ifdef UNDER_CE
#undef VARIANT_TRUE #undef VARIANT_TRUE
diff --git a/CPP/Windows/FileDir.cpp b/CPP/Windows/FileDir.cpp diff --git a/CPP/Windows/FileDir.cpp b/CPP/Windows/FileDir.cpp
index da71b71..36d89fc 100644 index da71b71..dae9f93 100644
--- a/CPP/Windows/FileDir.cpp --- a/CPP/Windows/FileDir.cpp
+++ b/CPP/Windows/FileDir.cpp +++ b/CPP/Windows/FileDir.cpp
@@ -14,6 +14,8 @@ @@ -14,6 +14,8 @@
@ -323,7 +323,26 @@ index da71b71..36d89fc 100644
return false; return false;
_mustBeDeleted = true; _mustBeDeleted = true;
return true; return true;
@@ -670,10 +728,7 @@ bool CTempDir::Create(CFSTR prefix) @@ -652,8 +710,16 @@ bool CTempFile::Remove()
{
if (!_mustBeDeleted)
return true;
- _mustBeDeleted = !DeleteFileAlways(_path);
- return !_mustBeDeleted;
+ for(UInt32 i = 0; i < 256; ++i)
+ {
+ if(DeleteFileAlways(_path))
+ {
+ _mustBeDeleted = false;
+ return true;
+ }
+ ::Sleep(1);
+ }
+ return false;
}
bool CTempFile::MoveTo(CFSTR name, bool deleteDestBefore)
@@ -670,10 +736,7 @@ bool CTempDir::Create(CFSTR prefix)
{ {
if (!Remove()) if (!Remove())
return false; return false;
@ -335,6 +354,25 @@ index da71b71..36d89fc 100644
return false; return false;
_mustBeDeleted = true; _mustBeDeleted = true;
return true; return true;
@@ -683,8 +746,16 @@ bool CTempDir::Remove()
{
if (!_mustBeDeleted)
return true;
- _mustBeDeleted = !RemoveDirWithSubItems(_path);
- return !_mustBeDeleted;
+ for(UInt32 i = 0; i < 256; ++i)
+ {
+ if(RemoveDirWithSubItems(_path))
+ {
+ _mustBeDeleted = false;
+ return true;
+ }
+ ::Sleep(1);
+ }
+ return false;
}
}}}
diff --git a/CPP/Windows/FileDir.h b/CPP/Windows/FileDir.h diff --git a/CPP/Windows/FileDir.h b/CPP/Windows/FileDir.h
index b13d1cc..1d87bbf 100644 index b13d1cc..1d87bbf 100644
--- a/CPP/Windows/FileDir.h --- a/CPP/Windows/FileDir.h

BIN
etc/Utilities/7zSD.sfx
View File

Binary file not shown.

2
src/Config.h
View File

@ -35,7 +35,7 @@
#define VER_LAMEXP_MINOR_LO 4 #define VER_LAMEXP_MINOR_LO 4
#define VER_LAMEXP_TYPE RC #define VER_LAMEXP_TYPE RC
#define VER_LAMEXP_PATCH 2 #define VER_LAMEXP_PATCH 2
#define VER_LAMEXP_BUILD 1920 #define VER_LAMEXP_BUILD 1921
#define VER_LAMEXP_CONFG 1818 #define VER_LAMEXP_CONFG 1818
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////