PATCH: [ 899145 ] Check if patch path is absolute

diff --git a/Src/Languages/Brazilian/MergeBrazilian.rc b/Src/Languages/Brazilian/MergeBrazilian.rc
index bddff04..8c51a6d 100644 (file)
--- a/Src/Languages/Brazilian/MergeBrazilian.rc
+++ b/Src/Languages/Brazilian/MergeBrazilian.rc
@@ -1195,6 +1195,7 @@ BEGIN
     IDR_MERGETYPE           "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Document"
     IDS_WINMERGE_THIS_DIRECTORY "WinMerge this directory"
     IDS_UNKNOWN_ARCHIVE_FORMAT "Unknown archive format"
+    IDS_ELAPSED_TIME        "Elapsed time: %ld ms"
 END
 
 STRINGTABLE PRELOAD DISCARDABLE
@@ -1363,6 +1364,7 @@ BEGIN
     IDS_SELECT_DESTFOLDER   "Select destination folder"
     IDS_COMPMETHOD_CONTENTS "Contents"
     IDS_COMPMETHOD_MODDATE  "Modified date"
+    IDS_PATH_NOT_ABSOLUTE   "%1\n is not absolute path!"
 END
 
 STRINGTABLE DISCARDABLE

diff --git a/Src/Languages/Brazilian/resource.h b/Src/Languages/Brazilian/resource.h
index 9b790e6..b6b7850 100644 (file)
--- a/Src/Languages/Brazilian/resource.h
+++ b/Src/Languages/Brazilian/resource.h
@@ -18,6 +18,7 @@
 #define IDD_EDITFILE                    107
 #define IDS_UNKNOWN_ARCHIVE_FORMAT      107
 #define IDD_VSS                         108
+#define IDS_ELAPSED_TIME                108
 #define IDD_PROPPAGE_LARGE              109
 #define IDD_CLEARCASE                   110
 #define IDD_PROPPAGE_FILTER             111
@@ -178,6 +179,7 @@
 #define IDS_SELECT_DESTFOLDER           261
 #define IDS_COMPMETHOD_CONTENTS         262
 #define IDS_COMPMETHOD_MODDATE          263
+#define IDS_PATH_NOT_ABSOLUTE           264
 #define IDC_LEFT_EDIT                   1000
 #define IDC_FILE_EDIT                   1000
 #define IDC_LEFT_BUTTON                 1001

diff --git a/Src/Languages/Catalan/MergeCatalan.rc b/Src/Languages/Catalan/MergeCatalan.rc
index bbe7573..6dbceed 100644 (file)
--- a/Src/Languages/Catalan/MergeCatalan.rc
+++ b/Src/Languages/Catalan/MergeCatalan.rc
@@ -1204,6 +1204,7 @@ BEGIN
     IDR_MERGETYPE           "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nDocument WinMerge"
     IDS_WINMERGE_THIS_DIRECTORY "WinMerge aquest directori"
     IDS_UNKNOWN_ARCHIVE_FORMAT "Unknown archive format"
+    IDS_ELAPSED_TIME        "Elapsed time: %ld ms"
 END
 
 STRINGTABLE PRELOAD DISCARDABLE
@@ -1372,6 +1373,7 @@ BEGIN
     IDS_SELECT_DESTFOLDER   "Select destination folder"
     IDS_COMPMETHOD_CONTENTS "Contents"
     IDS_COMPMETHOD_MODDATE  "Modified date"
+    IDS_PATH_NOT_ABSOLUTE   "%1\n is not absolute path!"
 END
 
 STRINGTABLE DISCARDABLE

diff --git a/Src/Languages/Catalan/resource.h b/Src/Languages/Catalan/resource.h
index 9b790e6..b6b7850 100644 (file)
--- a/Src/Languages/Catalan/resource.h
+++ b/Src/Languages/Catalan/resource.h
@@ -18,6 +18,7 @@
 #define IDD_EDITFILE                    107
 #define IDS_UNKNOWN_ARCHIVE_FORMAT      107
 #define IDD_VSS                         108
+#define IDS_ELAPSED_TIME                108
 #define IDD_PROPPAGE_LARGE              109
 #define IDD_CLEARCASE                   110
 #define IDD_PROPPAGE_FILTER             111
@@ -178,6 +179,7 @@
 #define IDS_SELECT_DESTFOLDER           261
 #define IDS_COMPMETHOD_CONTENTS         262
 #define IDS_COMPMETHOD_MODDATE          263
+#define IDS_PATH_NOT_ABSOLUTE           264
 #define IDC_LEFT_EDIT                   1000
 #define IDC_FILE_EDIT                   1000
 #define IDC_LEFT_BUTTON                 1001

diff --git a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
index 1df8eff..14a17ce 100644 (file)
--- a/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
+++ b/Src/Languages/ChineseSimplified/MergeChineseSimplified.rc
@@ -1058,6 +1058,7 @@ BEGIN
     IDR_MERGETYPE           "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Document"
     IDS_WINMERGE_THIS_DIRECTORY "WinMerge Õâ¸öÎļþ¼Ð"
     IDS_UNKNOWN_ARCHIVE_FORMAT "Unknown archive format"
+    IDS_ELAPSED_TIME        "Elapsed time: %ld ms"
 END
 
 STRINGTABLE FIXED IMPURE
@@ -1224,6 +1225,7 @@ BEGIN
     IDS_SELECT_DESTFOLDER   "Select destination folder"
     IDS_COMPMETHOD_CONTENTS "Contents"
     IDS_COMPMETHOD_MODDATE  "Modified date"
+    IDS_PATH_NOT_ABSOLUTE   "%1\n is not absolute path!"
 END
 
 STRINGTABLE DISCARDABLE

diff --git a/Src/Languages/ChineseSimplified/resource.h b/Src/Languages/ChineseSimplified/resource.h
index 9b790e6..b6b7850 100644 (file)
--- a/Src/Languages/ChineseSimplified/resource.h
+++ b/Src/Languages/ChineseSimplified/resource.h
@@ -18,6 +18,7 @@
 #define IDD_EDITFILE                    107
 #define IDS_UNKNOWN_ARCHIVE_FORMAT      107
 #define IDD_VSS                         108
+#define IDS_ELAPSED_TIME                108
 #define IDD_PROPPAGE_LARGE              109
 #define IDD_CLEARCASE                   110
 #define IDD_PROPPAGE_FILTER             111
@@ -178,6 +179,7 @@
 #define IDS_SELECT_DESTFOLDER           261
 #define IDS_COMPMETHOD_CONTENTS         262
 #define IDS_COMPMETHOD_MODDATE          263
+#define IDS_PATH_NOT_ABSOLUTE           264
 #define IDC_LEFT_EDIT                   1000
 #define IDC_FILE_EDIT                   1000
 #define IDC_LEFT_BUTTON                 1001

diff --git a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
index 8744833..05e4393 100644 (file)
--- a/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
+++ b/Src/Languages/ChineseTraditional/MergeChineseTraditional.rc
@@ -1173,6 +1173,7 @@ BEGIN
     IDR_MERGETYPE           "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Document"
     IDS_WINMERGE_THIS_DIRECTORY "WinMerge ³o­Ó¸ê®Æ§¨"
     IDS_UNKNOWN_ARCHIVE_FORMAT "Unknown archive format"
+    IDS_ELAPSED_TIME        "Elapsed time: %ld ms"
 END
 
 STRINGTABLE PRELOAD DISCARDABLE
@@ -1339,6 +1340,7 @@ BEGIN
     IDS_SELECT_DESTFOLDER   "Select destination folder"
     IDS_COMPMETHOD_CONTENTS "Contents"
     IDS_COMPMETHOD_MODDATE  "Modified date"
+    IDS_PATH_NOT_ABSOLUTE   "%1\n is not absolute path!"
 END
 
 STRINGTABLE DISCARDABLE

diff --git a/Src/Languages/ChineseTraditional/resource.h b/Src/Languages/ChineseTraditional/resource.h
index 9b790e6..b6b7850 100644 (file)
--- a/Src/Languages/ChineseTraditional/resource.h
+++ b/Src/Languages/ChineseTraditional/resource.h
@@ -18,6 +18,7 @@
 #define IDD_EDITFILE                    107
 #define IDS_UNKNOWN_ARCHIVE_FORMAT      107
 #define IDD_VSS                         108
+#define IDS_ELAPSED_TIME                108
 #define IDD_PROPPAGE_LARGE              109
 #define IDD_CLEARCASE                   110
 #define IDD_PROPPAGE_FILTER             111
@@ -178,6 +179,7 @@
 #define IDS_SELECT_DESTFOLDER           261
 #define IDS_COMPMETHOD_CONTENTS         262
 #define IDS_COMPMETHOD_MODDATE          263
+#define IDS_PATH_NOT_ABSOLUTE           264
 #define IDC_LEFT_EDIT                   1000
 #define IDC_FILE_EDIT                   1000
 #define IDC_LEFT_BUTTON                 1001

diff --git a/Src/Languages/Czech/MergeCzech.rc b/Src/Languages/Czech/MergeCzech.rc
index a1897b4..2bed315 100644 (file)
--- a/Src/Languages/Czech/MergeCzech.rc
+++ b/Src/Languages/Czech/MergeCzech.rc
@@ -1190,6 +1190,7 @@ BEGIN
     IDR_MERGETYPE           "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Document"
     IDS_WINMERGE_THIS_DIRECTORY "WinMerge this directory"
     IDS_UNKNOWN_ARCHIVE_FORMAT "Unknown archive format"
+    IDS_ELAPSED_TIME        "Elapsed time: %ld ms"
 END
 
 STRINGTABLE PRELOAD DISCARDABLE
@@ -1359,6 +1360,7 @@ BEGIN
     IDS_SELECT_DESTFOLDER   "Select destination folder"
     IDS_COMPMETHOD_CONTENTS "Contents"
     IDS_COMPMETHOD_MODDATE  "Modified date"
+    IDS_PATH_NOT_ABSOLUTE   "%1\n is not absolute path!"
 END
 
 STRINGTABLE DISCARDABLE

diff --git a/Src/Languages/Czech/resource.h b/Src/Languages/Czech/resource.h
index 9b790e6..b6b7850 100644 (file)
--- a/Src/Languages/Czech/resource.h
+++ b/Src/Languages/Czech/resource.h
@@ -18,6 +18,7 @@
 #define IDD_EDITFILE                    107
 #define IDS_UNKNOWN_ARCHIVE_FORMAT      107
 #define IDD_VSS                         108
+#define IDS_ELAPSED_TIME                108
 #define IDD_PROPPAGE_LARGE              109
 #define IDD_CLEARCASE                   110
 #define IDD_PROPPAGE_FILTER             111
@@ -178,6 +179,7 @@
 #define IDS_SELECT_DESTFOLDER           261
 #define IDS_COMPMETHOD_CONTENTS         262
 #define IDS_COMPMETHOD_MODDATE          263
+#define IDS_PATH_NOT_ABSOLUTE           264
 #define IDC_LEFT_EDIT                   1000
 #define IDC_FILE_EDIT                   1000
 #define IDC_LEFT_BUTTON                 1001

diff --git a/Src/Languages/Danish/MergeDanish.rc b/Src/Languages/Danish/MergeDanish.rc
index 2482f5d..bdbbb49 100644 (file)
--- a/Src/Languages/Danish/MergeDanish.rc
+++ b/Src/Languages/Danish/MergeDanish.rc
@@ -1187,6 +1187,7 @@ BEGIN
     IDR_MERGETYPE           "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Document"
     IDS_WINMERGE_THIS_DIRECTORY "WinMerge denne folder"
     IDS_UNKNOWN_ARCHIVE_FORMAT "Unknown archive format"
+    IDS_ELAPSED_TIME        "Elapsed time: %ld ms"
 END
 
 STRINGTABLE PRELOAD DISCARDABLE
@@ -1357,6 +1358,7 @@ BEGIN
     IDS_SELECT_DESTFOLDER   "Select destination folder"
     IDS_COMPMETHOD_CONTENTS "Contents"
     IDS_COMPMETHOD_MODDATE  "Modified date"
+    IDS_PATH_NOT_ABSOLUTE   "%1\n is not absolute path!"
 END
 
 STRINGTABLE DISCARDABLE

diff --git a/Src/Languages/Danish/resource.h b/Src/Languages/Danish/resource.h
index 9b790e6..b6b7850 100644 (file)
--- a/Src/Languages/Danish/resource.h
+++ b/Src/Languages/Danish/resource.h
@@ -18,6 +18,7 @@
 #define IDD_EDITFILE                    107
 #define IDS_UNKNOWN_ARCHIVE_FORMAT      107
 #define IDD_VSS                         108
+#define IDS_ELAPSED_TIME                108
 #define IDD_PROPPAGE_LARGE              109
 #define IDD_CLEARCASE                   110
 #define IDD_PROPPAGE_FILTER             111
@@ -178,6 +179,7 @@
 #define IDS_SELECT_DESTFOLDER           261
 #define IDS_COMPMETHOD_CONTENTS         262
 #define IDS_COMPMETHOD_MODDATE          263
+#define IDS_PATH_NOT_ABSOLUTE           264
 #define IDC_LEFT_EDIT                   1000
 #define IDC_FILE_EDIT                   1000
 #define IDC_LEFT_BUTTON                 1001

diff --git a/Src/Languages/Dutch/MergeDutch.rc b/Src/Languages/Dutch/MergeDutch.rc
index ff68fc0..430c18a 100644 (file)
--- a/Src/Languages/Dutch/MergeDutch.rc
+++ b/Src/Languages/Dutch/MergeDutch.rc
@@ -1191,6 +1191,7 @@ BEGIN
     IDR_MERGETYPE           "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Document"
     IDS_WINMERGE_THIS_DIRECTORY "WinMerge this directory"
     IDS_UNKNOWN_ARCHIVE_FORMAT "Unknown archive format"
+    IDS_ELAPSED_TIME        "Elapsed time: %ld ms"
 END
 
 STRINGTABLE PRELOAD DISCARDABLE
@@ -1361,6 +1362,7 @@ BEGIN
     IDS_SELECT_DESTFOLDER   "Select destination folder"
     IDS_COMPMETHOD_CONTENTS "Contents"
     IDS_COMPMETHOD_MODDATE  "Modified date"
+    IDS_PATH_NOT_ABSOLUTE   "%1\n is not absolute path!"
 END
 
 STRINGTABLE DISCARDABLE

diff --git a/Src/Languages/Dutch/resource.h b/Src/Languages/Dutch/resource.h
index 9b790e6..b6b7850 100644 (file)
--- a/Src/Languages/Dutch/resource.h
+++ b/Src/Languages/Dutch/resource.h
@@ -18,6 +18,7 @@
 #define IDD_EDITFILE                    107
 #define IDS_UNKNOWN_ARCHIVE_FORMAT      107
 #define IDD_VSS                         108
+#define IDS_ELAPSED_TIME                108
 #define IDD_PROPPAGE_LARGE              109
 #define IDD_CLEARCASE                   110
 #define IDD_PROPPAGE_FILTER             111
@@ -178,6 +179,7 @@
 #define IDS_SELECT_DESTFOLDER           261
 #define IDS_COMPMETHOD_CONTENTS         262
 #define IDS_COMPMETHOD_MODDATE          263
+#define IDS_PATH_NOT_ABSOLUTE           264
 #define IDC_LEFT_EDIT                   1000
 #define IDC_FILE_EDIT                   1000
 #define IDC_LEFT_BUTTON                 1001

diff --git a/Src/Languages/French/MergeFrench.rc b/Src/Languages/French/MergeFrench.rc
index b55641a..758ad1f 100644 (file)
--- a/Src/Languages/French/MergeFrench.rc
+++ b/Src/Languages/French/MergeFrench.rc
@@ -1189,6 +1189,7 @@ BEGIN
     IDR_MERGETYPE           "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nDocument WinMerge"
     IDS_WINMERGE_THIS_DIRECTORY "WinMerge ce répertoire"
     IDS_UNKNOWN_ARCHIVE_FORMAT "Unknown archive format"
+    IDS_ELAPSED_TIME        "Elapsed time: %ld ms"
 END
 
 STRINGTABLE PRELOAD DISCARDABLE
@@ -1360,6 +1361,7 @@ BEGIN
     IDS_SELECT_DESTFOLDER   "Select destination folder"
     IDS_COMPMETHOD_CONTENTS "Contents"
     IDS_COMPMETHOD_MODDATE  "Modified date"
+    IDS_PATH_NOT_ABSOLUTE   "%1\n is not absolute path!"
 END
 
 STRINGTABLE DISCARDABLE

diff --git a/Src/Languages/French/resource.h b/Src/Languages/French/resource.h
index 9b790e6..b6b7850 100644 (file)
--- a/Src/Languages/French/resource.h
+++ b/Src/Languages/French/resource.h
@@ -18,6 +18,7 @@
 #define IDD_EDITFILE                    107
 #define IDS_UNKNOWN_ARCHIVE_FORMAT      107
 #define IDD_VSS                         108
+#define IDS_ELAPSED_TIME                108
 #define IDD_PROPPAGE_LARGE              109
 #define IDD_CLEARCASE                   110
 #define IDD_PROPPAGE_FILTER             111
@@ -178,6 +179,7 @@
 #define IDS_SELECT_DESTFOLDER           261
 #define IDS_COMPMETHOD_CONTENTS         262
 #define IDS_COMPMETHOD_MODDATE          263
+#define IDS_PATH_NOT_ABSOLUTE           264
 #define IDC_LEFT_EDIT                   1000
 #define IDC_FILE_EDIT                   1000
 #define IDC_LEFT_BUTTON                 1001

diff --git a/Src/Languages/German/MergeGerman.rc b/Src/Languages/German/MergeGerman.rc
index 219412d..76c6ea2 100644 (file)
--- a/Src/Languages/German/MergeGerman.rc
+++ b/Src/Languages/German/MergeGerman.rc
@@ -1198,6 +1198,7 @@ BEGIN
     IDR_MERGETYPE           "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Dokument"
     IDS_WINMERGE_THIS_DIRECTORY "WinMerge dieses Verzeichnis"
     IDS_UNKNOWN_ARCHIVE_FORMAT "Unknown archive format"
+    IDS_ELAPSED_TIME        "Elapsed time: %ld ms"
 END
 
 STRINGTABLE PRELOAD DISCARDABLE
@@ -1369,6 +1370,7 @@ BEGIN
     IDS_SELECT_DESTFOLDER   "Select destination folder"
     IDS_COMPMETHOD_CONTENTS "Contents"
     IDS_COMPMETHOD_MODDATE  "Modified date"
+    IDS_PATH_NOT_ABSOLUTE   "%1\n is not absolute path!"
 END
 
 STRINGTABLE DISCARDABLE

diff --git a/Src/Languages/German/resource.h b/Src/Languages/German/resource.h
index 9b790e6..b6b7850 100644 (file)
--- a/Src/Languages/German/resource.h
+++ b/Src/Languages/German/resource.h
@@ -18,6 +18,7 @@
 #define IDD_EDITFILE                    107
 #define IDS_UNKNOWN_ARCHIVE_FORMAT      107
 #define IDD_VSS                         108
+#define IDS_ELAPSED_TIME                108
 #define IDD_PROPPAGE_LARGE              109
 #define IDD_CLEARCASE                   110
 #define IDD_PROPPAGE_FILTER             111
@@ -178,6 +179,7 @@
 #define IDS_SELECT_DESTFOLDER           261
 #define IDS_COMPMETHOD_CONTENTS         262
 #define IDS_COMPMETHOD_MODDATE          263
+#define IDS_PATH_NOT_ABSOLUTE           264
 #define IDC_LEFT_EDIT                   1000
 #define IDC_FILE_EDIT                   1000
 #define IDC_LEFT_BUTTON                 1001

diff --git a/Src/Languages/Italian/MergeItalian.rc b/Src/Languages/Italian/MergeItalian.rc
index c489833..34506be 100644 (file)
--- a/Src/Languages/Italian/MergeItalian.rc
+++ b/Src/Languages/Italian/MergeItalian.rc
@@ -1188,6 +1188,7 @@ BEGIN
     IDR_MERGETYPE           "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Document"
     IDS_WINMERGE_THIS_DIRECTORY "WinMerge this directory"
     IDS_UNKNOWN_ARCHIVE_FORMAT "Unknown archive format"
+    IDS_ELAPSED_TIME        "Elapsed time: %ld ms"
 END
 
 STRINGTABLE PRELOAD DISCARDABLE
@@ -1358,6 +1359,7 @@ BEGIN
     IDS_SELECT_DESTFOLDER   "Select destination folder"
     IDS_COMPMETHOD_CONTENTS "Contents"
     IDS_COMPMETHOD_MODDATE  "Modified date"
+    IDS_PATH_NOT_ABSOLUTE   "%1\n is not absolute path!"
 END
 
 STRINGTABLE DISCARDABLE

diff --git a/Src/Languages/Italian/resource.h b/Src/Languages/Italian/resource.h
index 9b790e6..b6b7850 100644 (file)
--- a/Src/Languages/Italian/resource.h
+++ b/Src/Languages/Italian/resource.h
@@ -18,6 +18,7 @@
 #define IDD_EDITFILE                    107
 #define IDS_UNKNOWN_ARCHIVE_FORMAT      107
 #define IDD_VSS                         108
+#define IDS_ELAPSED_TIME                108
 #define IDD_PROPPAGE_LARGE              109
 #define IDD_CLEARCASE                   110
 #define IDD_PROPPAGE_FILTER             111
@@ -178,6 +179,7 @@
 #define IDS_SELECT_DESTFOLDER           261
 #define IDS_COMPMETHOD_CONTENTS         262
 #define IDS_COMPMETHOD_MODDATE          263
+#define IDS_PATH_NOT_ABSOLUTE           264
 #define IDC_LEFT_EDIT                   1000
 #define IDC_FILE_EDIT                   1000
 #define IDC_LEFT_BUTTON                 1001

diff --git a/Src/Languages/Korean/MergeKorean.rc b/Src/Languages/Korean/MergeKorean.rc
index 9b5126a..d516d9a 100644 (file)
--- a/Src/Languages/Korean/MergeKorean.rc
+++ b/Src/Languages/Korean/MergeKorean.rc
@@ -1155,6 +1155,7 @@ BEGIN
     IDR_MERGETYPE           "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Document"
     IDS_WINMERGE_THIS_DIRECTORY "WinMerge this directory"
     IDS_UNKNOWN_ARCHIVE_FORMAT "Unknown archive format"
+    IDS_ELAPSED_TIME        "Elapsed time: %ld ms"
 END
 
 STRINGTABLE PRELOAD DISCARDABLE
@@ -1325,6 +1326,7 @@ BEGIN
     IDS_SELECT_DESTFOLDER   "Select destination folder"
     IDS_COMPMETHOD_CONTENTS "Contents"
     IDS_COMPMETHOD_MODDATE  "Modified date"
+    IDS_PATH_NOT_ABSOLUTE   "%1\n is not absolute path!"
 END
 
 STRINGTABLE DISCARDABLE

diff --git a/Src/Languages/Korean/resource.h b/Src/Languages/Korean/resource.h
index 9b790e6..b6b7850 100644 (file)
--- a/Src/Languages/Korean/resource.h
+++ b/Src/Languages/Korean/resource.h
@@ -18,6 +18,7 @@
 #define IDD_EDITFILE                    107
 #define IDS_UNKNOWN_ARCHIVE_FORMAT      107
 #define IDD_VSS                         108
+#define IDS_ELAPSED_TIME                108
 #define IDD_PROPPAGE_LARGE              109
 #define IDD_CLEARCASE                   110
 #define IDD_PROPPAGE_FILTER             111
@@ -178,6 +179,7 @@
 #define IDS_SELECT_DESTFOLDER           261
 #define IDS_COMPMETHOD_CONTENTS         262
 #define IDS_COMPMETHOD_MODDATE          263
+#define IDS_PATH_NOT_ABSOLUTE           264
 #define IDC_LEFT_EDIT                   1000
 #define IDC_FILE_EDIT                   1000
 #define IDC_LEFT_BUTTON                 1001

diff --git a/Src/Languages/Norwegian/MergeNorwegian.rc b/Src/Languages/Norwegian/MergeNorwegian.rc
index 1cae899..b5636e8 100644 (file)
--- a/Src/Languages/Norwegian/MergeNorwegian.rc
+++ b/Src/Languages/Norwegian/MergeNorwegian.rc
@@ -1188,6 +1188,7 @@ BEGIN
     IDR_MERGETYPE           "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Document"
     IDS_WINMERGE_THIS_DIRECTORY "WinMerge denne folder"
     IDS_UNKNOWN_ARCHIVE_FORMAT "Unknown archive format"
+    IDS_ELAPSED_TIME        "Elapsed time: %ld ms"
 END
 
 STRINGTABLE PRELOAD DISCARDABLE
@@ -1358,6 +1359,7 @@ BEGIN
     IDS_SELECT_DESTFOLDER   "Select destination folder"
     IDS_COMPMETHOD_CONTENTS "Contents"
     IDS_COMPMETHOD_MODDATE  "Modified date"
+    IDS_PATH_NOT_ABSOLUTE   "%1\n is not absolute path!"
 END
 
 STRINGTABLE DISCARDABLE

diff --git a/Src/Languages/Norwegian/resource.h b/Src/Languages/Norwegian/resource.h
index 9b790e6..b6b7850 100644 (file)
--- a/Src/Languages/Norwegian/resource.h
+++ b/Src/Languages/Norwegian/resource.h
@@ -18,6 +18,7 @@
 #define IDD_EDITFILE                    107
 #define IDS_UNKNOWN_ARCHIVE_FORMAT      107
 #define IDD_VSS                         108
+#define IDS_ELAPSED_TIME                108
 #define IDD_PROPPAGE_LARGE              109
 #define IDD_CLEARCASE                   110
 #define IDD_PROPPAGE_FILTER             111
@@ -178,6 +179,7 @@
 #define IDS_SELECT_DESTFOLDER           261
 #define IDS_COMPMETHOD_CONTENTS         262
 #define IDS_COMPMETHOD_MODDATE          263
+#define IDS_PATH_NOT_ABSOLUTE           264
 #define IDC_LEFT_EDIT                   1000
 #define IDC_FILE_EDIT                   1000
 #define IDC_LEFT_BUTTON                 1001

diff --git a/Src/Languages/Polish/MergePolish.rc b/Src/Languages/Polish/MergePolish.rc
index 372288f..ace2b3b 100644 (file)
--- a/Src/Languages/Polish/MergePolish.rc
+++ b/Src/Languages/Polish/MergePolish.rc
@@ -1188,6 +1188,7 @@ BEGIN
     IDR_MERGETYPE           "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nDocument WinMerge"
     IDS_WINMERGE_THIS_DIRECTORY "Scalaj ten katalog"
     IDS_UNKNOWN_ARCHIVE_FORMAT "Unknown archive format"
+    IDS_ELAPSED_TIME        "Elapsed time: %ld ms"
 END
 
 STRINGTABLE PRELOAD DISCARDABLE
@@ -1356,6 +1357,7 @@ BEGIN
     IDS_SELECT_DESTFOLDER   "Select destination folder"
     IDS_COMPMETHOD_CONTENTS "Contents"
     IDS_COMPMETHOD_MODDATE  "Modified date"
+    IDS_PATH_NOT_ABSOLUTE   "%1\n is not absolute path!"
 END
 
 STRINGTABLE DISCARDABLE

diff --git a/Src/Languages/Polish/resource.h b/Src/Languages/Polish/resource.h
index 9b790e6..b6b7850 100644 (file)
--- a/Src/Languages/Polish/resource.h
+++ b/Src/Languages/Polish/resource.h
@@ -18,6 +18,7 @@
 #define IDD_EDITFILE                    107
 #define IDS_UNKNOWN_ARCHIVE_FORMAT      107
 #define IDD_VSS                         108
+#define IDS_ELAPSED_TIME                108
 #define IDD_PROPPAGE_LARGE              109
 #define IDD_CLEARCASE                   110
 #define IDD_PROPPAGE_FILTER             111
@@ -178,6 +179,7 @@
 #define IDS_SELECT_DESTFOLDER           261
 #define IDS_COMPMETHOD_CONTENTS         262
 #define IDS_COMPMETHOD_MODDATE          263
+#define IDS_PATH_NOT_ABSOLUTE           264
 #define IDC_LEFT_EDIT                   1000
 #define IDC_FILE_EDIT                   1000
 #define IDC_LEFT_BUTTON                 1001

diff --git a/Src/Languages/Russian/MergeRussian.rc b/Src/Languages/Russian/MergeRussian.rc
index 275eb58..aff92e4 100644 (file)
--- a/Src/Languages/Russian/MergeRussian.rc
+++ b/Src/Languages/Russian/MergeRussian.rc
@@ -1193,6 +1193,7 @@ BEGIN
     IDR_MERGETYPE           "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Document"
     IDS_WINMERGE_THIS_DIRECTORY "Îáðàáîòàòü ýòó äèðåêòîðèþ â WinMerge"
     IDS_UNKNOWN_ARCHIVE_FORMAT "Unknown archive format"
+    IDS_ELAPSED_TIME        "Elapsed time: %ld ms"
 END
 
 STRINGTABLE PRELOAD DISCARDABLE
@@ -1361,6 +1362,7 @@ BEGIN
     IDS_SELECT_DESTFOLDER   "Âûáåðèòå ïàïêó íàçíà÷åíèÿ"
     IDS_COMPMETHOD_CONTENTS "Contents"
     IDS_COMPMETHOD_MODDATE  "Modified date"
+    IDS_PATH_NOT_ABSOLUTE   "%1\n is not absolute path!"
 END
 
 STRINGTABLE DISCARDABLE

diff --git a/Src/Languages/Russian/resource.h b/Src/Languages/Russian/resource.h
index 9b790e6..b6b7850 100644 (file)
--- a/Src/Languages/Russian/resource.h
+++ b/Src/Languages/Russian/resource.h
@@ -18,6 +18,7 @@
 #define IDD_EDITFILE                    107
 #define IDS_UNKNOWN_ARCHIVE_FORMAT      107
 #define IDD_VSS                         108
+#define IDS_ELAPSED_TIME                108
 #define IDD_PROPPAGE_LARGE              109
 #define IDD_CLEARCASE                   110
 #define IDD_PROPPAGE_FILTER             111
@@ -178,6 +179,7 @@
 #define IDS_SELECT_DESTFOLDER           261
 #define IDS_COMPMETHOD_CONTENTS         262
 #define IDS_COMPMETHOD_MODDATE          263
+#define IDS_PATH_NOT_ABSOLUTE           264
 #define IDC_LEFT_EDIT                   1000
 #define IDC_FILE_EDIT                   1000
 #define IDC_LEFT_BUTTON                 1001

diff --git a/Src/Languages/Slovak/MergeSlovak.rc b/Src/Languages/Slovak/MergeSlovak.rc
index 7e87521..224b2b0 100644 (file)
--- a/Src/Languages/Slovak/MergeSlovak.rc
+++ b/Src/Languages/Slovak/MergeSlovak.rc
@@ -1189,6 +1189,7 @@ BEGIN
     IDR_MERGETYPE           "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Document"
     IDS_WINMERGE_THIS_DIRECTORY "WinMerge this directory"
     IDS_UNKNOWN_ARCHIVE_FORMAT "Unknown archive format"
+    IDS_ELAPSED_TIME        "Elapsed time: %ld ms"
 END
 
 STRINGTABLE PRELOAD DISCARDABLE
@@ -1358,6 +1359,7 @@ BEGIN
     IDS_SELECT_DESTFOLDER   "Select destination folder"
     IDS_COMPMETHOD_CONTENTS "Contents"
     IDS_COMPMETHOD_MODDATE  "Modified date"
+    IDS_PATH_NOT_ABSOLUTE   "%1\n is not absolute path!"
 END
 
 STRINGTABLE DISCARDABLE

diff --git a/Src/Languages/Slovak/resource.h b/Src/Languages/Slovak/resource.h
index 9b790e6..b6b7850 100644 (file)
--- a/Src/Languages/Slovak/resource.h
+++ b/Src/Languages/Slovak/resource.h
@@ -18,6 +18,7 @@
 #define IDD_EDITFILE                    107
 #define IDS_UNKNOWN_ARCHIVE_FORMAT      107
 #define IDD_VSS                         108
+#define IDS_ELAPSED_TIME                108
 #define IDD_PROPPAGE_LARGE              109
 #define IDD_CLEARCASE                   110
 #define IDD_PROPPAGE_FILTER             111
@@ -178,6 +179,7 @@
 #define IDS_SELECT_DESTFOLDER           261
 #define IDS_COMPMETHOD_CONTENTS         262
 #define IDS_COMPMETHOD_MODDATE          263
+#define IDS_PATH_NOT_ABSOLUTE           264
 #define IDC_LEFT_EDIT                   1000
 #define IDC_FILE_EDIT                   1000
 #define IDC_LEFT_BUTTON                 1001

diff --git a/Src/Languages/Spanish/MergeSpanish.rc b/Src/Languages/Spanish/MergeSpanish.rc
index a80dd60..6f266b9 100644 (file)
--- a/Src/Languages/Spanish/MergeSpanish.rc
+++ b/Src/Languages/Spanish/MergeSpanish.rc
@@ -1189,6 +1189,7 @@ BEGIN
     IDR_MERGETYPE           "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Document"
     IDS_WINMERGE_THIS_DIRECTORY "WinMerge this directory"
     IDS_UNKNOWN_ARCHIVE_FORMAT "Unknown archive format"
+    IDS_ELAPSED_TIME        "Elapsed time: %ld ms"
 END
 
 STRINGTABLE PRELOAD DISCARDABLE
@@ -1359,6 +1360,7 @@ BEGIN
     IDS_SELECT_DESTFOLDER   "Select destination folder"
     IDS_COMPMETHOD_CONTENTS "Contents"
     IDS_COMPMETHOD_MODDATE  "Modified date"
+    IDS_PATH_NOT_ABSOLUTE   "%1\n is not absolute path!"
 END
 
 STRINGTABLE DISCARDABLE

diff --git a/Src/Languages/Spanish/resource.h b/Src/Languages/Spanish/resource.h
index 9b790e6..b6b7850 100644 (file)
--- a/Src/Languages/Spanish/resource.h
+++ b/Src/Languages/Spanish/resource.h
@@ -18,6 +18,7 @@
 #define IDD_EDITFILE                    107
 #define IDS_UNKNOWN_ARCHIVE_FORMAT      107
 #define IDD_VSS                         108
+#define IDS_ELAPSED_TIME                108
 #define IDD_PROPPAGE_LARGE              109
 #define IDD_CLEARCASE                   110
 #define IDD_PROPPAGE_FILTER             111
@@ -178,6 +179,7 @@
 #define IDS_SELECT_DESTFOLDER           261
 #define IDS_COMPMETHOD_CONTENTS         262
 #define IDS_COMPMETHOD_MODDATE          263
+#define IDS_PATH_NOT_ABSOLUTE           264
 #define IDC_LEFT_EDIT                   1000
 #define IDC_FILE_EDIT                   1000
 #define IDC_LEFT_BUTTON                 1001

diff --git a/Src/Languages/Swedish/MergeSwedish.rc b/Src/Languages/Swedish/MergeSwedish.rc
index e421b74..6dd4276 100644 (file)
--- a/Src/Languages/Swedish/MergeSwedish.rc
+++ b/Src/Languages/Swedish/MergeSwedish.rc
@@ -1188,6 +1188,7 @@ BEGIN
     IDR_MERGETYPE           "\nWinMerge\nWinMerge\n\n\nWinMerge.Document\nWinMerge Document"
     IDS_WINMERGE_THIS_DIRECTORY "Jämför filerna i den här mappen med WinMerge"
     IDS_UNKNOWN_ARCHIVE_FORMAT "Unknown archive format"
+    IDS_ELAPSED_TIME        "Elapsed time: %ld ms"
 END
 
 STRINGTABLE PRELOAD DISCARDABLE 
@@ -1356,6 +1357,7 @@ BEGIN
     IDS_SELECT_DESTFOLDER   "Select destination folder"
     IDS_COMPMETHOD_CONTENTS "Contents"
     IDS_COMPMETHOD_MODDATE  "Modified date"
+    IDS_PATH_NOT_ABSOLUTE   "%1\n is not absolute path!"
 END
 
 STRINGTABLE DISCARDABLE

diff --git a/Src/Languages/Swedish/resource.h b/Src/Languages/Swedish/resource.h
index 9b790e6..b6b7850 100644 (file)
--- a/Src/Languages/Swedish/resource.h
+++ b/Src/Languages/Swedish/resource.h
@@ -18,6 +18,7 @@
 #define IDD_EDITFILE                    107
 #define IDS_UNKNOWN_ARCHIVE_FORMAT      107
 #define IDD_VSS                         108
+#define IDS_ELAPSED_TIME                108
 #define IDD_PROPPAGE_LARGE              109
 #define IDD_CLEARCASE                   110
 #define IDD_PROPPAGE_FILTER             111
@@ -178,6 +179,7 @@
 #define IDS_SELECT_DESTFOLDER           261
 #define IDS_COMPMETHOD_CONTENTS         262
 #define IDS_COMPMETHOD_MODDATE          263
+#define IDS_PATH_NOT_ABSOLUTE           264
 #define IDC_LEFT_EDIT                   1000
 #define IDC_FILE_EDIT                   1000
 #define IDC_LEFT_BUTTON                 1001

diff --git a/Src/Merge.rc b/Src/Merge.rc
index 75a4970..dc2339f 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -1358,6 +1358,7 @@ BEGIN
     IDS_SELECT_DESTFOLDER   "Select destination folder"
     IDS_COMPMETHOD_CONTENTS "Contents"
     IDS_COMPMETHOD_MODDATE  "Modified date"
+    IDS_PATH_NOT_ABSOLUTE   "%1\n is not absolute path!"
 END
 
 STRINGTABLE DISCARDABLE
@@ -1669,4 +1670,3 @@ LANGUAGE 9, 1
 #endif
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
-

diff --git a/Src/PatchDlg.cpp b/Src/PatchDlg.cpp
index b9d0b8c..b41d612 100644 (file)
--- a/Src/PatchDlg.cpp
+++ b/Src/PatchDlg.cpp
@@ -27,8 +27,7 @@
 #include "PatchDlg.h"
 #include "diff.h"
 #include "coretools.h"
-#include <sys/types.h> // struct stat
-#include <sys/stat.h>  // struct stat & _fstat()
+#include "paths.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -45,12 +44,17 @@ CPatchDlg::CPatchDlg(CWnd* pParent /*=NULL*/)
        : CDialog(CPatchDlg::IDD, pParent)
 {
        //{{AFX_DATA_INIT(CPatchDlg)
-       m_caseSensitive = FALSE;
+       m_caseSensitive = TRUE;
        m_file1 = _T("");
        m_file2 = _T("");
        m_fileResult = _T("");
-       m_ignoreBlanks = FALSE;
-       m_whitespaceCompare = -1;
+       m_ignoreBlanks = 0;
+       m_whitespaceCompare = 0;
+       m_appendFile = FALSE;
+       m_openToEditor = FALSE;
+       m_includeCmdLine = FALSE;
+       m_outputStyle = OUTPUT_NORMAL;
+       m_contextLines = 0;
        //}}AFX_DATA_INIT
 }
 
@@ -62,9 +66,6 @@ void CPatchDlg::DoDataExchange(CDataExchange* pDX)
        DDX_Control(pDX, IDC_DIFF_STYLE, m_comboStyle);
        DDX_Control(pDX, IDC_DIFF_CONTEXT, m_comboContext);
        DDX_Check(pDX, IDC_DIFF_CASESENSITIVE, m_caseSensitive);
-       DDX_Text(pDX, IDC_DIFF_FILE1, m_file1);
-       DDX_Text(pDX, IDC_DIFF_FILE2, m_file2);
-       DDX_Text(pDX, IDC_DIFF_FILERESULT, m_fileResult);
        DDX_Check(pDX, IDC_DIFF_WHITESPACE_IGNOREBLANKS, m_ignoreBlanks);
        DDX_Radio(pDX, IDC_DIFF_WHITESPACE_COMPARE, m_whitespaceCompare);
        DDX_Check(pDX, IDC_DIFF_APPENDFILE, m_appendFile);
@@ -103,10 +104,11 @@ void CPatchDlg::OnOK()
 {
        int contextSel = 0;
        TCHAR contextText[50] = {0};
-       BOOL file1Ok = TRUE;
-       BOOL file2Ok = TRUE;
+       BOOL file1Ok = FALSE;
+       BOOL file2Ok = FALSE;
        BOOL fileExists = FALSE;
        BOOL fileResultOK = TRUE;
+       BOOL pathAbsolute = FALSE;
        int overWrite = 0;
        int selectCount = 0;
 
@@ -119,8 +121,10 @@ void CPatchDlg::OnOK()
        // Filenames read from Dirview must be valid ones.
        if (selectCount == 1)
        {
-               file1Ok = is_regfile2(m_file1);
-               file2Ok = is_regfile2(m_file2);
+               if (paths_DoesPathExist(m_file1) == IS_EXISTING_FILE)
+                       file1Ok = TRUE;
+               if (paths_DoesPathExist(m_file2) == IS_EXISTING_FILE)
+                       file2Ok = TRUE;
 
                if (file1Ok == FALSE)
                        AfxMessageBox(IDS_DIFF_ITEM1NOTFOUND, MB_ICONSTOP);
@@ -129,9 +133,22 @@ void CPatchDlg::OnOK()
                        AfxMessageBox(IDS_DIFF_ITEM2NOTFOUND, MB_ICONSTOP);
        }
 
+       // Check that result (patch) file is absolute path
        if (file1Ok && file2Ok)
        {
-               fileExists = is_regfile2(m_fileResult);
+               pathAbsolute = paths_IsPathAbsolute(m_fileResult);
+               if (pathAbsolute == FALSE)
+               {
+                       CString msg;
+                       AfxFormatString1(msg, IDS_PATH_NOT_ABSOLUTE, m_fileResult);
+                       AfxMessageBox(msg, MB_ICONSTOP);
+               }
+       }
+       
+       if (file1Ok && file2Ok && pathAbsolute)
+       {
+               if (paths_DoesPathExist(m_fileResult) == IS_EXISTING_FILE)
+                       fileExists = TRUE;
 
                // Result file already exists and append not selected
                if (fileExists && !m_appendFile)
@@ -140,11 +157,11 @@ void CPatchDlg::OnOK()
                        if (overWrite == IDNO)
                                fileResultOK = FALSE;
                }
-               else    // It's ok to write new file
+               else  // It's OK to write new file
                        fileResultOK = TRUE;
        }
 
-       if (file1Ok && file2Ok && fileResultOK)
+       if (file1Ok && file2Ok && pathAbsolute && fileResultOK)
        {
                m_outputStyle = (enum output_style) m_comboStyle.GetCurSel();
 
@@ -173,10 +190,6 @@ BOOL CPatchDlg::OnInitDialog()
 {
        CDialog::OnInitDialog();
 
-       m_ignoreBlanks = TRUE;
-       m_caseSensitive = TRUE;
-       m_whitespaceCompare = 0;
-
        // Load combobox history
        m_ctlFile1.LoadState(_T("Files\\DiffFile1"));
        m_ctlFile2.LoadState(_T("Files\\DiffFile2"));
@@ -467,4 +480,3 @@ void CPatchDlg::ClearItems()
 {
        m_fileList.RemoveAll();
 }
-

diff --git a/Src/paths.cpp b/Src/paths.cpp
index 68f83f1..9cb59d8 100644 (file)
--- a/Src/paths.cpp
+++ b/Src/paths.cpp
@@ -262,3 +262,31 @@ CString paths_GetParentPath(CString path)
        }
        return parentPath;
 }
+
+/** 
+ * @brief Checks if path is absolute path
+ */
+BOOL paths_IsPathAbsolute(CString path)
+{
+       int pos = path.ReverseFind('\\');
+
+       // Absolute path must have "\" and cannot start with it.
+       // Also "\\blahblah" is invalid.
+       if (pos < 2)
+               return FALSE;
+
+       // Maybe "X:\blahblah"?
+       if (pos == 2)
+       {
+               if (path[1] == ':')
+                       return TRUE;
+               else
+                       return FALSE;
+       }
+
+       // So "\\blahblah\"?
+       if (path[0] == '\\' && path[1] == '\\' && pos > 2)
+               return TRUE;
+       else
+               return FALSE;
+}

diff --git a/Src/paths.h b/Src/paths.h
index 4e5029d..7512645 100644 (file)
--- a/Src/paths.h
+++ b/Src/paths.h
@@ -19,5 +19,6 @@ PATH_EXISTENCE GetPairComparability(LPCTSTR pszLeft, LPCTSTR pszRight);
 CString ExpandShortcut(CString &inFile);
 CString paths_ConcatPath(const CString & path, const CString & subpath);
 CString paths_GetParentPath(CString path);
+BOOL paths_IsPathAbsolute(CString path);
 
 #endif // paths_h_included

diff --git a/Src/readme.txt b/Src/readme.txt
index 39ea543..7c96485 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,3 +1,8 @@
+2004-02-19 Kimmo
+ PATCH: [ 899145 ] Check if patch path is absolute
+  Src: Merge.rc PatchDlg.cpp paths.cpp paths.h resource.h
+  Languages: *.rc resource.h (incl. changes from #889357)
+
 2004-02-18 Jochen
  PATCH: [ 889357 ] Attempt to improve DirScan speed
   The VERIFY(::DeleteFile... ) in prepAndCompareTwoFiles() won't fire as long as

diff --git a/Src/resource.h b/Src/resource.h
index ec5fe71..b6b7850 100644 (file)
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -179,6 +179,7 @@
 #define IDS_SELECT_DESTFOLDER           261
 #define IDS_COMPMETHOD_CONTENTS         262
 #define IDS_COMPMETHOD_MODDATE          263
+#define IDS_PATH_NOT_ABSOLUTE           264
 #define IDC_LEFT_EDIT                   1000
 #define IDC_FILE_EDIT                   1000
 #define IDC_LEFT_BUTTON                 1001