diff --git a/Version.ini b/Version.ini
index 0bb040ef4..5af461c1e 100644
--- a/Version.ini
+++ b/Version.ini
@@ -3,7 +3,7 @@
; Minor
; Maintenance: 0 - prototype, 1 - beta, 2 - release candidate, 3 - final release
; Build number auto increments.
-Version=1.0.2.350
+Version=1.0.2.386
[Templates]
Versions\VersionEx.h.tpl = src\VersionEx.h
diff --git a/distrib/Changes.txt b/distrib/Changes.txt
index e231eeeef..6d326ff20 100644
--- a/distrib/Changes.txt
+++ b/distrib/Changes.txt
@@ -1,14 +1,28 @@
-================================================================================
-Notepad3 1 Build 000 (05 September 2016)
-================================================================================
+==================================================
+Rizonesoft Notepad3 CHANGES
+==================================================
+
+--------------------------------------------------
+Version 1 Build 386 (08 December 2016)
+--------------------------------------------------
+- Crypto Module: code cleanup
+- Crypto Module: Replaced LocalAlloc/GlobalAlloc by HeapAlloc methods.
+- Integration of DeelX RegExpr engine (http://www.regexlab.com/en/deelx/)
+- Update to Scintilla 371 (NP2 adaption due to deprecated data types).
+- clean-code Solution (instead of "magic numbers").
+- Fixed block selecting cause crash.
+- Added RaPeHoff to the contributors list.
+
+--------------------------------------------------
+Version 1 Build 350 (05 September 2016)
+--------------------------------------------------
- Updated HTML Keywords
- Updated Scintilla to version 3.6.7
- Added Microsoft Visual C++ Update 3 version number
--
-================================================================================
-Notepad3 1 Build 330 (24 June 2016)
-================================================================================
+--------------------------------------------------
+Version 1 Build 330 (24 June 2016)
+--------------------------------------------------
- Fixed Compiler warnings
- Updated to Scintilla 3.6.6
- Updated Apache Keywords for version 2.4
diff --git a/minipath/Version.ini b/minipath/Version.ini
index b39c36de0..63f65c551 100644
--- a/minipath/Version.ini
+++ b/minipath/Version.ini
@@ -3,7 +3,7 @@
; Minor
; Maintenance: 0 - prototype, 1 - beta, 2 - release candidate, 3 - final release
; Build number auto increments.
-Version=1.0.2.123
+Version=1.0.2.125
[Templates]
Versions\VersionEx.h.tpl = src\VersionEx.h
diff --git a/minipath/res/Notepad3.exe.manifest.conf b/minipath/res/Notepad3.exe.manifest.conf
index c3df7f244..4033d2c56 100644
--- a/minipath/res/Notepad3.exe.manifest.conf
+++ b/minipath/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
metapath
diff --git a/minipath/src/VersionEx.h b/minipath/src/VersionEx.h
index 3bdcfd08e..ebb52d7d9 100644
--- a/minipath/src/VersionEx.h
+++ b/minipath/src/VersionEx.h
@@ -1,4 +1,4 @@
#define VERSION_MAJOR 1
#define VERSION_MINOR 0
#define VERSION_REV 2
-#define VERSION_BUILD 123
+#define VERSION_BUILD 125
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 7a9a23117..29b2dc9c0 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
Notepad3
diff --git a/src/Notepad3.rc b/src/Notepad3.rc
index f167dba2d..e363faec1 100644
--- a/src/Notepad3.rc
+++ b/src/Notepad3.rc
@@ -25,6 +25,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
1 RT_MANIFEST "..\\res\\Notepad3.exe.manifest"
+
/////////////////////////////////////////////////////////////////////////////
//
// Icon
@@ -33,21 +34,30 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDR_MAINWND ICON "..\\res\\Notepad3.ico"
+
IDI_RUN ICON "..\\res\\Run.ico"
+
IDI_STYLES ICON "..\\res\\Styles.ico"
+
/////////////////////////////////////////////////////////////////////////////
//
// Bitmap
//
IDR_MAINWND BITMAP "..\\res\\Toolbar.bmp"
+
IDB_OPEN BITMAP "..\\res\\Open.bmp"
+
IDB_NEXT BITMAP "..\\res\\Next.bmp"
+
IDB_PREV BITMAP "..\\res\\Prev.bmp"
+
IDB_PICK BITMAP "..\\res\\Pick.bmp"
+
IDB_ENCODING BITMAP "..\\res\\Encoding.bmp"
+
/////////////////////////////////////////////////////////////////////////////
//
// Cursor
@@ -55,6 +65,7 @@ IDB_ENCODING BITMAP "..\\res\\Encoding.bmp"
IDC_COPY CURSOR "..\\res\\Copy.cur"
+
/////////////////////////////////////////////////////////////////////////////
//
// Menu
@@ -199,7 +210,7 @@ BEGIN
MENUITEM "&Filename\tCtrl+F9", IDM_EDIT_INSERT_FILENAME
MENUITEM "&Path and Filename\tCtrl+Shift+F9", IDM_EDIT_INSERT_PATHNAME
MENUITEM SEPARATOR
- MENUITEM "&GUID\tCtrl+Shift+." IDM_EDIT_INSERT_GUID
+ MENUITEM "&GUID\tCtrl+Shift+.", IDM_EDIT_INSERT_GUID
END
POPUP "Spec&ial"
BEGIN
@@ -559,7 +570,7 @@ CAPTION "About Notepad3"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
DEFPUSHBUTTON "OK",IDOK,195,204,50,14
- ICON IDR_MAINWND,IDC_STATIC,7,7,20,20
+ ICON IDR_MAINWND,IDC_STATIC,7,7,21,20
LTEXT "",IDC_VERSION,45,10,200,17
LTEXT "Compiled with:",IDC_COMPILER2,45,24,200,8
LTEXT "",IDC_COMPILER,96,24,200,8
@@ -572,7 +583,7 @@ BEGIN
LTEXT "Florian Balmer et al. ( Notepad2 )",IDC_STATIC,45,110,200,8
LTEXT "",IDC_NOTE2WEBPAGE2,45,119,200,8,NOT WS_VISIBLE | WS_DISABLED
CONTROL "",IDC_NOTE2WEBPAGE,"SysLink",WS_TABSTOP,45,119,200,10
- LTEXT "Contributors: Derick Payne (Rizonesoft), XhmikosR (Notepad2-mod), Kai Liu, RL Vision, Aleksandar Lekov, Bruno Barbieri, Florian Balmer (Notepad2), Neil Hodgson (SciTE), Matthew Ellis (MinimizeToTray), Dave Dyer (Crypto-mod)",IDC_STATIC,45,153,200,48
+ LTEXT "Contributors: Derick Payne (Rizonesoft), RaPeHoff, XhmikosR (Notepad2-mod), Kai Liu, RL Vision, Aleksandar Lekov, Bruno Barbieri, Florian Balmer (Notepad2), Neil Hodgson (SciTE), Matthew Ellis (MinimizeToTray), Dave Dyer (Crypto-mod)",IDC_STATIC,45,150,200,44
END
IDD_FIND DIALOGEX 0, 0, 272, 101
@@ -897,26 +908,17 @@ BEGIN
CONTROL "Reuse Master Key",IDC_CHECK3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,218,60,76,10
GROUPBOX "Passphrase",IDC_STATIC,7,7,297,108
END
-STRINGTABLE
-BEGIN
- IDS_PASS_FAILURE "The passphrase is incorrect."
- IDS_NOPASS "Cancelled - no passphrase."
-END
-IDD_READPW DIALOG 0, 0, 299, 84
-STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE |
- WS_CAPTION | WS_SYSMENU
+IDD_READPW DIALOG 0, 0, 299, 84
+STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Decrypt File"
FONT 8, "MS Shell Dlg"
BEGIN
DEFPUSHBUTTON "OK",IDOK,233,54,50,14
PUSHBUTTON "Cancel",IDCANCEL,175,54,50,14
- EDITTEXT IDC_EDIT3,16,24,267,14,ES_PASSWORD | ES_AUTOHSCROLL |
- WS_GROUP
- CONTROL "decrypt using the master key",IDC_CHECK3,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,17,60,148,10
- LTEXT "This file has a master key",IDC_STATICPW,16,47,89,11,
- NOT WS_GROUP
+ EDITTEXT IDC_EDIT3,16,24,267,14,ES_PASSWORD | ES_AUTOHSCROLL | WS_GROUP
+ CONTROL "decrypt using the master key",IDC_CHECK3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,60,148,10
+ LTEXT "This file has a master key",IDC_STATICPW,16,47,89,11,NOT WS_GROUP
GROUPBOX "Passphrase",IDC_STATIC,7,7,285,70
END
@@ -1236,7 +1238,6 @@ BEGIN
BOTTOMMARGIN, 115
END
-
IDD_COLUMNWRAP, DIALOG
BEGIN
LEFTMARGIN, 7
@@ -1333,6 +1334,12 @@ END
// String Table
//
+STRINGTABLE
+BEGIN
+ IDS_PASS_FAILURE "The passphrase is incorrect."
+ IDS_NOPASS "Cancelled - no passphrase."
+END
+
STRINGTABLE
BEGIN
IDS_APPTITLE "Notepad3"
@@ -1353,18 +1360,14 @@ BEGIN
IDS_FILTER_EXE "Executable files (*.exe;*.com;*.bat;*.cmd;*.lnk;*.pif)|*.exe;*.com;*.bat;*.cmd;*.lnk;*.pif|All files (*.*)|*.*|"
END
-STRINGTABLE
-BEGIN
- IDS_BACKSLASHHELP "Backslash Transformations\n\n\\a\tAlert (BEL, Ascii 7)\n\\b\tBackspace (BS, Ascii 8)\n\\f\tFormfeed (FF, Ascii 12)\n\\n\tNewline (LF, Ascii 10)\n\\r\tCarriage return (CR, Ascii 13)\n\\t\tHorizontal Tab (HT, Ascii 9)\n\\v\tVertical Tab (VT, Ascii 11)\n\\ooo\tOctal Value\n\\u####\tHexadecimal Value\n\\xhh\tHexadecimal Value\n\\\\\tBackslash"
- IDS_REGEXPHELP "RegExp Syntax (Multi Lines)\n\n.\tAny character, except line-breaks\n^\tStart of a line\n$\tEnd of a line\n\\<\tStart of a word\n\\>\tEnd of a word\n[...]\tA set of chars ([abc]) or a range ([a-z])\n[^...]\tChars NOT in the set or range\n\\d\tAny decimal digit\n\\D\tAny non-digit char\n\\s\tAny whitespace char\n\\S\tNot a whitespace char\n\\w\tAny ""word"" char\n\\W\tAny ""non-word"" char\n\\x\tEscape character with otherwise special meaning\n\\xHH\tChar with hex code HH\n?\tMatches preceding 0 or 1 times\n*\tMatches preceding 0 or more times\n+\tMatches preceding 1 or more times\n*? or +?\tNon greedy matching of quantifiers ""?"" and ""+""\n(\tStart of a region\n)\tEnd of a region\n\\n\tRefers to a region when replacing (n is 1-9)\n"
- IDS_WILDCARDHELP "Wildcard Search\n\n*\tMatches zero or more characters.\n?\tMatches exactly one character. "
-END
-
STRINGTABLE
BEGIN
IDS_FILTER_INI "Configuration files (*.ini)|*.ini|All files (*.*)|*.*|"
IDS_OPENWITH "Select the directory with links to your favorite applications."
IDS_FAVORITES "Select the directory with links to your favorite files."
+ IDS_BACKSLASHHELP "Backslash Transformations\n\n\\a\tAlert (BEL, Ascii 7)\n\\b\tBackspace (BS, Ascii 8)\n\\f\tFormfeed (FF, Ascii 12)\n\\n\tNewline (LF, Ascii 10)\n\\r\tCarriage return (CR, Ascii 13)\n\\t\tHorizontal Tab (HT, Ascii 9)\n\\v\tVertical Tab (VT, Ascii 11)\n\\ooo\tOctal Value\n\\u####\tHexadecimal Value\n\\xhh\tHexadecimal Value\n\\\\\tBackslash"
+ IDS_REGEXPHELP "RegExp Syntax (Multi Lines)\n\n.\tAny character, except line-breaks\n^\tStart of a line\n$\tEnd of a line\n\\<\tStart of a word\n\\>\tEnd of a word\n[...]\tA set of chars ([abc]) or a range ([a-z])\n[^...]\tChars NOT in the set or range\n\\d\tAny decimal digit\n\\D\tAny non-digit char\n\\s\tAny whitespace char\n\\S\tNot a whitespace char\n\\w\tAny ""word"" char\n\\W\tAny ""non-word"" char\n\\x\tEscape character with otherwise special meaning\n\\xHH\tChar with hex code HH\n?\tMatches preceding 0 or 1 times\n*\tMatches preceding 0 or more times\n+\tMatches preceding 1 or more times\n*? or +?\tNon greedy matching of quantifiers ""?"" and ""+""\n(\tStart of a region\n)\tEnd of a region\n\\n\tRefers to a region when replacing (n is 1-9)\n"
+ IDS_WILDCARDHELP "Wildcard Search\n\n*\tMatches zero or more characters.\n?\tMatches exactly one character. "
END
STRINGTABLE
diff --git a/src/VersionEx.h b/src/VersionEx.h
index 13f321620..451dae8e8 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -1,4 +1,4 @@
#define VERSION_MAJOR 1
#define VERSION_MINOR 0
#define VERSION_REV 2
-#define VERSION_BUILD 350
+#define VERSION_BUILD 386
diff --git a/src/resource.h b/src/resource.h
index 6452bdbe3..6d06ce681 100644
--- a/src/resource.h
+++ b/src/resource.h
@@ -2,7 +2,6 @@
// Microsoft Visual C++ generated include file.
// Used by Notepad3.rc
//
-#define IDC_STATIC -1
#define IDR_MAINWND 100
#define IDC_FINDTEXT 100
#define IDC_LINENUM 100
@@ -55,10 +54,7 @@
#define IDC_AUTOSTRIPBLANKS 103
#define IDC_ENCODINGFROMFILEVARS 103
#define IDC_WEBPAGE2 103
-#define IDC_MODWEBPAGE 105
-#define IDC_MODWEBPAGE2 104
-#define IDC_NOTE2WEBPAGE 106
-#define IDC_NOTE2WEBPAGE2 107
+#define IDC_MODWEBPAGE2 104
#define IDD_ENCODING 104
#define IDC_MOD_PAGE2 104
#define IDC_FINDSTART 104
@@ -66,15 +62,18 @@
#define IDC_STYLEBACK 104
#define IDC_AUTHORNAME 104
#define IDC_WEBPAGE4 104
+#define IDC_MODWEBPAGE 105
#define IDD_RECODE 105
#define IDC_FINDREGEXP 105
#define IDC_STYLEFONT 105
#define IDB_ENCODING 105
#define IDC_EMAIL 105
+#define IDC_NOTE2WEBPAGE 106
#define IDD_DEFEOLMODE 106
#define IDC_FINDTRANSFORMBS 106
#define IDC_PREVIEW 106
#define IDC_EMAIL2 106
+#define IDC_NOTE2WEBPAGE2 107
#define IDD_FAVORITES 107
#define IDC_NOWRAP 107
#define IDC_STYLEDEFAULT 107
@@ -82,6 +81,7 @@
#define IDC_PREVSTYLE 108
#define IDC_FINDCLOSE 108
#define IDC_EMAIL3 108
+#define IDC_VERSION2 108
#define IDD_FILEMRU 109
#define IDC_FINDPREV 109
#define IDC_NEXTSTYLE 109
@@ -445,6 +445,7 @@
#define IDS_EXPORT_FAIL 50040
#define IDS_CMDLINEHELP 60000
#define IDM_EDIT_INSERT_GUID 60001
+#define IDC_STATIC -1
// Next default values for new objects
//