summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Wilhelm <daniel@wili.li>2014-04-18 17:19:32 +0200
committerDaniel Wilhelm <daniel@wili.li>2014-04-18 17:19:32 +0200
commitfb92b230692aa7809620ef7ab72a514f840c877e (patch)
treeed711496dbbc9f56366c90a920ebf56622909a95
parent5.1 (diff)
downloadFreeFileSync-fb92b230692aa7809620ef7ab72a514f840c877e.tar.gz
FreeFileSync-fb92b230692aa7809620ef7ab72a514f840c877e.tar.bz2
FreeFileSync-fb92b230692aa7809620ef7ab72a514f840c877e.zip
5.2
-rw-r--r--BUILD/Changelog.txt5
-rw-r--r--BUILD/Resources.zipbin271235 -> 271346 bytes
-rw-r--r--version/version.h2
-rw-r--r--version/version.rc4
-rw-r--r--zen/zstring.cpp2
5 files changed, 9 insertions, 4 deletions
diff --git a/BUILD/Changelog.txt b/BUILD/Changelog.txt
index 95f324da..c62c13e5 100644
--- a/BUILD/Changelog.txt
+++ b/BUILD/Changelog.txt
@@ -2,6 +2,11 @@
|FreeFileSync|
--------------
+Changelog v5.2
+--------------
+Fixed runtime error "Error comparing strings! (LCMapString)" (Windows XP only)
+
+
Changelog v5.1
--------------
New category for time span filter: last x days
diff --git a/BUILD/Resources.zip b/BUILD/Resources.zip
index 9cae0887..14244da2 100644
--- a/BUILD/Resources.zip
+++ b/BUILD/Resources.zip
Binary files differ
diff --git a/version/version.h b/version/version.h
index 64e9edc3..de76a783 100644
--- a/version/version.h
+++ b/version/version.h
@@ -3,7 +3,7 @@
namespace zen
{
- const wchar_t currentVersion[] = L"5.1"; //internal linkage!
+ const wchar_t currentVersion[] = L"5.2"; //internal linkage!
}
#endif
diff --git a/version/version.rc b/version/version.rc
index 2ba8abb6..d43c8cb0 100644
--- a/version/version.rc
+++ b/version/version.rc
@@ -1,2 +1,2 @@
-#define VER_FREEFILESYNC 5,1,0,0
-#define VER_FREEFILESYNC_STR "5.1\0"
+#define VER_FREEFILESYNC 5,2,0,0
+#define VER_FREEFILESYNC_STR "5.2\0"
diff --git a/zen/zstring.cpp b/zen/zstring.cpp
index d37fa522..622fb975 100644
--- a/zen/zstring.cpp
+++ b/zen/zstring.cpp
@@ -127,7 +127,7 @@ int z_impl::compareFilenamesWin(const wchar_t* lhs, const wchar_t* rhs, size_t s
const auto minSize = static_cast<unsigned int>(std::min(sizeLhs, sizeRhs));
int rv = 0;
- if (minSize >= 0) //LCMapString does not allow input sizes of 0!
+ if (minSize > 0) //LCMapString does not allow input sizes of 0!
{
if (minSize <= MAX_PATH) //performance optimization: stack
{
bgstack15