Add MD5 functionalities

This commit is contained in:
Don Ho 2017-01-01 18:28:25 +01:00
parent c95e098500
commit 8fc1a2ed30
21 changed files with 959 additions and 44 deletions

2
.gitignore vendored
View File

@ -139,3 +139,5 @@ PowerEditor/bin/SourceCodePro-Regular.ttf
/PowerEditor/bin/libgcc_s_sjlj-1.dll
/PowerEditor/bin/libstdc++-6.dll
/PowerEditor/bin/libwinpthread-1.dll
PowerEditor/src/MISC/md5/RCa06792

View File

@ -12,6 +12,7 @@
<Item menuId="encoding" name="編碼(&amp;N)"/>
<Item menuId="language" name="語言(&amp;L)"/>
<Item menuId="settings" name="設定(&amp;T)"/>
<Item menuId="tools" name="工具(&amp;O)"/>
<Item menuId="macro" name="巨集(&amp;M)"/>
<Item menuId="run" name="執行(&amp;R)"/>
<Item idName="Plugins" name="外掛(&amp;P)"/>
@ -62,7 +63,7 @@
<Item subMenuId="encoding-westernEuropean" name="西歐語系"/>
<Item subMenuId="encoding-vietnamese" name="越南文"/>
<Item subMenuId="settings-import" name="匯入"/>
<Item subMenuId="tools-md5" name="MD5"/>
</SubEntries>
<!-- all menu item -->
@ -295,6 +296,9 @@
<Item id="48018" name="編輯彈跳選單"/>
<Item id="48009" name="快速鍵管理..."/>
<Item id="48011" name="使用者自訂..."/>
<Item id="48501" name="計算生成..."/>
<Item id="48502" name="從檔案生成..."/>
<Item id="48503" name="直接生成至剪貼簿內"/>
<Item id="49000" name="執行(&amp;R)..."/>
<Item id="50000" name="函式自動完成"/>
<Item id="50001" name="字詞自動完成"/>
@ -400,6 +404,18 @@
<Item id="2" name="取消"/>
<Item id="1904" name="儲存"/>
</Run>
<MD5FromFilesDlg title="從檔案計算生成 MD5">
<Item id="1922" name="從檔案生成 MD5..."/>
<Item id="1924" name="複製到剪貼簿"/>
<Item id="2" name="關閉"/>
</MD5FromFilesDlg>
<MD5FromTextDlg title="計算生成 MD5">
<Item id="1932" name="將每一行視為獨立的字串"/>
<Item id="1934" name="複製到剪貼簿"/>
<Item id="2" name="關閉"/>
</MD5FromTextDlg>
<StyleConfig title="設定程式語言格式">
<Item id="2" name="取消"/>

View File

@ -12,6 +12,7 @@
<Item menuId="encoding" name="E&amp;ncoding"/>
<Item menuId="language" name="&amp;Language"/>
<Item menuId="settings" name="Se&amp;ttings"/>
<Item menuId="tools" name="To&amp;ols"/>
<Item menuId="macro" name="Macro"/>
<Item menuId="run" name="Run"/>
<Item idName="Plugins" name="Plugins"/>
@ -62,6 +63,7 @@
<Item subMenuId="encoding-westernEuropean" name="Western European"/>
<Item subMenuId="encoding-vietnamese" name="Vietnamese"/>
<Item subMenuId="settings-import" name="Import"/>
<Item subMenuId="tools-md5" name="MD5"/>
</SubEntries>
<!-- all menu item -->
@ -292,6 +294,9 @@
<Item id="48018" name="Edit Popup ContextMenu"/>
<Item id="48009" name="Shortcut Mapper..."/>
<Item id="48011" name="Preferences..."/>
<Item id="48501" name="Generate..."/>
<Item id="48502" name="Generate from files..."/>
<Item id="48503" name="Generate into clipboard"/>
<Item id="49000" name="&amp;Run..."/>
<Item id="50000" name="Function Completion"/>
@ -401,6 +406,18 @@
<Item id="1904" name="Save..."/>
</Run>
<MD5FromFilesDlg title="Generate MD5 digest from files">
<Item id="1922" name="Choose files to generate MD5..."/>
<Item id="1924" name="Copy to Clipboard"/>
<Item id="2" name="Close"/>
</MD5FromFilesDlg>
<MD5FromTextDlg title="Generate MD5 digest">
<Item id="1932" name="Treat each line as a separate string"/>
<Item id="1934" name="Copy to Clipboard"/>
<Item id="2" name="Close"/>
</MD5FromTextDlg>
<StyleConfig title="Style Configurator">
<Item id="2" name="Cancel"/>
<Item id="2301" name="Save &amp;&amp; Close"/>

View File

@ -12,6 +12,7 @@
<Item menuId="encoding" name="E&amp;ncodage"/>
<Item menuId="language" name="&amp;Langage"/>
<Item menuId="settings" name="&amp;Paramétrage"/>
<Item menuId="tools" name="&amp;Outils"/>
<Item menuId="macro" name="&amp;Macro"/>
<Item menuId="run" name="E&amp;xécution"/>
<Item idName="Plugins" name="&amp;Compléments"/>
@ -62,6 +63,7 @@
<Item subMenuId="encoding-westernEuropean" name="Langues dEurope occidentale"/>
<Item subMenuId="encoding-vietnamese" name="Vietnamien"/>
<Item subMenuId="settings-import" name="Importer"/>
<Item subMenuId="tools-md5" name="MD5"/>
</SubEntries>
<!-- all menu item -->
@ -91,8 +93,8 @@
<Item id="41015" name="Enregistrer une copie..."/>
<Item id="41016" name="Supprimer"/>
<Item id="41017" name="Renommer..."/>
<Item id="41021" name="Ouvrir le fichier récemment fermé"/>
<Item id="41022" name="Ouvrir Dossier en tant qu'Espace de travail"/>
<Item id="41021" name="Ouvrir le fichier récemment fermé"/>
<Item id="41022" name="Ouvrir Dossier en tant qu'Espace de travail"/>
<Item id="42001" name="Cou&amp;per"/>
<Item id="42002" name="&amp;Copier"/>
<Item id="42003" name="&amp;Annuler"/>
@ -245,7 +247,7 @@
<Item id="44083" name="Panneau de Projet #3"/>
<Item id="44080" name="Plan du Document"/>
<Item id="44084" name="Liste des Fonctions"/>
<Item id="44085" name="Dossier en tant qu'Espace de travail"/>
<Item id="44085" name="Dossier en tant qu'Espace de travail"/>
<Item id="44086" name="Onglet 1"/>
<Item id="44087" name="Onglet 2"/>
<Item id="44088" name="Onglet 3"/>
@ -292,6 +294,9 @@
<Item id="48006" name="Importer un thème..."/>
<Item id="48009" name="Raccourcis clavier..."/>
<Item id="48011" name="Préférences..."/>
<Item id="48501" name="Générer..."/>
<Item id="48502" name="Générer depuis les fichiers..."/>
<Item id="48503" name="Générer dans le presse-papiers"/>
<Item id="48016" name="Modifier/Supprimer Macro..."/>
<Item id="48017" name="Modifier/Supprimer Commande..."/>
<Item id="48018" name="Éditer le menu contextuel"/>
@ -395,6 +400,18 @@
<Item id="1904" name="Enregistrer..."/>
<Item id="2" name="Annuler"/>
</Run>
<MD5FromFilesDlg title="Calculer les empreintes md5 depuis les fichiers">
<Item id="1922" name="Choisir les fichiers pour générer les empreintes..."/>
<Item id="1924" name="Copier dans le presse-papiers"/>
<Item id="2" name="Fermer"/>
</MD5FromFilesDlg>
<MD5FromTextDlg title="Calculer l'empreinte md5">
<Item id="1932" name="Chaque ligne est une chaine de caractères"/>
<Item id="1934" name="Copier dans le presse-papiers"/>
<Item id="2" name="Fermer"/>
</MD5FromTextDlg>
<StyleConfig title="Configurateur de coloration syntaxique">
<Item id="2" name="Annuler"/>
@ -616,7 +633,7 @@
<Item id="6118" name="Cacher"/>
<Item id="6119" name="Multiligne"/>
<Item id="6120" name="Verticale"/>
<Item id="6121" name="Quitter lors de la fermeture de dernier onglet"/>
<Item id="6121" name="Quitter lors de la fermeture de dernier onglet"/>
<Item id="6122" name="Cachée (Alt ou F10 pour afficher)"/>
<Item id="6123" name="Langue"/>
<Item id="6125" name="Commutateur de documents"/>

View File

@ -0,0 +1,392 @@
#ifndef MD5_H
#define MD5_H
// Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
// rights reserved.
// License to copy and use this software is granted provided that it
// is identified as the "RSA Data Security, Inc. MD5 Message-Digest
// Algorithm" in all material mentioning or referencing this software
// or this function.
//
// License is also granted to make and use derivative works provided
// that such works are identified as "derived from the RSA Data
// Security, Inc. MD5 Message-Digest Algorithm" in all material
// mentioning or referencing the derived work.
//
// RSA Data Security, Inc. makes no representations concerning either
// the merchantability of this software or the suitability of this
// software for any particular purpose. It is provided "as is"
// without express or implied warranty of any kind.
//
// These notices must be retained in any copies of any part of this
// documentation and/or software.
// The original md5 implementation avoids external libraries.
// This version has dependency on stdio.h for file input and
// string.h for memcpy.
//
// http://www.ietf.org/ietf-ftp/IPR/RSA-MD-all
#include <stdio.h>
#include <string.h>
#pragma region MD5 defines
// Constants for MD5Transform routine.
#define S11 7
#define S12 12
#define S13 17
#define S14 22
#define S21 5
#define S22 9
#define S23 14
#define S24 20
#define S31 4
#define S32 11
#define S33 16
#define S34 23
#define S41 6
#define S42 10
#define S43 15
#define S44 21
static unsigned char PADDING[64] = {
0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
};
// F, G, H and I are basic MD5 functions.
#define F(x, y, z) (((x) & (y)) | ((~x) & (z)))
#define G(x, y, z) (((x) & (z)) | ((y) & (~z)))
#define H(x, y, z) ((x) ^ (y) ^ (z))
#define I(x, y, z) ((y) ^ ((x) | (~z)))
// ROTATE_LEFT rotates x left n bits.
#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))
// FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4.
// Rotation is separate from addition to prevent recomputation.
#define FF(a, b, c, d, x, s, ac) { \
(a) += F ((b), (c), (d)) + (x) + (UINT4)(ac); \
(a) = ROTATE_LEFT ((a), (s)); \
(a) += (b); \
}
#define GG(a, b, c, d, x, s, ac) { \
(a) += G ((b), (c), (d)) + (x) + (UINT4)(ac); \
(a) = ROTATE_LEFT ((a), (s)); \
(a) += (b); \
}
#define HH(a, b, c, d, x, s, ac) { \
(a) += H ((b), (c), (d)) + (x) + (UINT4)(ac); \
(a) = ROTATE_LEFT ((a), (s)); \
(a) += (b); \
}
#define II(a, b, c, d, x, s, ac) { \
(a) += I ((b), (c), (d)) + (x) + (UINT4)(ac); \
(a) = ROTATE_LEFT ((a), (s)); \
(a) += (b); \
}
#pragma endregion
typedef unsigned char BYTE ;
// POINTER defines a generic pointer type
typedef unsigned char *POINTER;
// UINT2 defines a two byte word
typedef unsigned short int UINT2;
// UINT4 defines a four byte word
typedef unsigned long int UINT4;
// convenient object that wraps
// the C-functions for use in C++ only
class MD5
{
private:
struct __context_t {
UINT4 state[4]; /* state (ABCD) */
UINT4 count[2]; /* number of bits, modulo 2^64 (lsb first) */
unsigned char buffer[64]; /* input buffer */
} context ;
#pragma region static helper functions
// The core of the MD5 algorithm is here.
// MD5 basic transformation. Transforms state based on block.
static void MD5Transform( UINT4 state[4], unsigned char block[64] )
{
UINT4 a = state[0], b = state[1], c = state[2], d = state[3], x[16];
Decode (x, block, 64);
/* Round 1 */
FF (a, b, c, d, x[ 0], S11, 0xd76aa478); /* 1 */
FF (d, a, b, c, x[ 1], S12, 0xe8c7b756); /* 2 */
FF (c, d, a, b, x[ 2], S13, 0x242070db); /* 3 */
FF (b, c, d, a, x[ 3], S14, 0xc1bdceee); /* 4 */
FF (a, b, c, d, x[ 4], S11, 0xf57c0faf); /* 5 */
FF (d, a, b, c, x[ 5], S12, 0x4787c62a); /* 6 */
FF (c, d, a, b, x[ 6], S13, 0xa8304613); /* 7 */
FF (b, c, d, a, x[ 7], S14, 0xfd469501); /* 8 */
FF (a, b, c, d, x[ 8], S11, 0x698098d8); /* 9 */
FF (d, a, b, c, x[ 9], S12, 0x8b44f7af); /* 10 */
FF (c, d, a, b, x[10], S13, 0xffff5bb1); /* 11 */
FF (b, c, d, a, x[11], S14, 0x895cd7be); /* 12 */
FF (a, b, c, d, x[12], S11, 0x6b901122); /* 13 */
FF (d, a, b, c, x[13], S12, 0xfd987193); /* 14 */
FF (c, d, a, b, x[14], S13, 0xa679438e); /* 15 */
FF (b, c, d, a, x[15], S14, 0x49b40821); /* 16 */
/* Round 2 */
GG (a, b, c, d, x[ 1], S21, 0xf61e2562); /* 17 */
GG (d, a, b, c, x[ 6], S22, 0xc040b340); /* 18 */
GG (c, d, a, b, x[11], S23, 0x265e5a51); /* 19 */
GG (b, c, d, a, x[ 0], S24, 0xe9b6c7aa); /* 20 */
GG (a, b, c, d, x[ 5], S21, 0xd62f105d); /* 21 */
GG (d, a, b, c, x[10], S22, 0x2441453); /* 22 */
GG (c, d, a, b, x[15], S23, 0xd8a1e681); /* 23 */
GG (b, c, d, a, x[ 4], S24, 0xe7d3fbc8); /* 24 */
GG (a, b, c, d, x[ 9], S21, 0x21e1cde6); /* 25 */
GG (d, a, b, c, x[14], S22, 0xc33707d6); /* 26 */
GG (c, d, a, b, x[ 3], S23, 0xf4d50d87); /* 27 */
GG (b, c, d, a, x[ 8], S24, 0x455a14ed); /* 28 */
GG (a, b, c, d, x[13], S21, 0xa9e3e905); /* 29 */
GG (d, a, b, c, x[ 2], S22, 0xfcefa3f8); /* 30 */
GG (c, d, a, b, x[ 7], S23, 0x676f02d9); /* 31 */
GG (b, c, d, a, x[12], S24, 0x8d2a4c8a); /* 32 */
/* Round 3 */
HH (a, b, c, d, x[ 5], S31, 0xfffa3942); /* 33 */
HH (d, a, b, c, x[ 8], S32, 0x8771f681); /* 34 */
HH (c, d, a, b, x[11], S33, 0x6d9d6122); /* 35 */
HH (b, c, d, a, x[14], S34, 0xfde5380c); /* 36 */
HH (a, b, c, d, x[ 1], S31, 0xa4beea44); /* 37 */
HH (d, a, b, c, x[ 4], S32, 0x4bdecfa9); /* 38 */
HH (c, d, a, b, x[ 7], S33, 0xf6bb4b60); /* 39 */
HH (b, c, d, a, x[10], S34, 0xbebfbc70); /* 40 */
HH (a, b, c, d, x[13], S31, 0x289b7ec6); /* 41 */
HH (d, a, b, c, x[ 0], S32, 0xeaa127fa); /* 42 */
HH (c, d, a, b, x[ 3], S33, 0xd4ef3085); /* 43 */
HH (b, c, d, a, x[ 6], S34, 0x4881d05); /* 44 */
HH (a, b, c, d, x[ 9], S31, 0xd9d4d039); /* 45 */
HH (d, a, b, c, x[12], S32, 0xe6db99e5); /* 46 */
HH (c, d, a, b, x[15], S33, 0x1fa27cf8); /* 47 */
HH (b, c, d, a, x[ 2], S34, 0xc4ac5665); /* 48 */
/* Round 4 */
II (a, b, c, d, x[ 0], S41, 0xf4292244); /* 49 */
II (d, a, b, c, x[ 7], S42, 0x432aff97); /* 50 */
II (c, d, a, b, x[14], S43, 0xab9423a7); /* 51 */
II (b, c, d, a, x[ 5], S44, 0xfc93a039); /* 52 */
II (a, b, c, d, x[12], S41, 0x655b59c3); /* 53 */
II (d, a, b, c, x[ 3], S42, 0x8f0ccc92); /* 54 */
II (c, d, a, b, x[10], S43, 0xffeff47d); /* 55 */
II (b, c, d, a, x[ 1], S44, 0x85845dd1); /* 56 */
II (a, b, c, d, x[ 8], S41, 0x6fa87e4f); /* 57 */
II (d, a, b, c, x[15], S42, 0xfe2ce6e0); /* 58 */
II (c, d, a, b, x[ 6], S43, 0xa3014314); /* 59 */
II (b, c, d, a, x[13], S44, 0x4e0811a1); /* 60 */
II (a, b, c, d, x[ 4], S41, 0xf7537e82); /* 61 */
II (d, a, b, c, x[11], S42, 0xbd3af235); /* 62 */
II (c, d, a, b, x[ 2], S43, 0x2ad7d2bb); /* 63 */
II (b, c, d, a, x[ 9], S44, 0xeb86d391); /* 64 */
state[0] += a;
state[1] += b;
state[2] += c;
state[3] += d;
// Zeroize sensitive information.
memset((POINTER)x, 0, sizeof (x));
}
// Encodes input (UINT4) into output (unsigned char). Assumes len is
// a multiple of 4.
static void Encode( unsigned char *output, UINT4 *input, unsigned int len )
{
unsigned int i, j;
for (i = 0, j = 0; j < len; i++, j += 4) {
output[j] = (unsigned char)(input[i] & 0xff);
output[j+1] = (unsigned char)((input[i] >> 8) & 0xff);
output[j+2] = (unsigned char)((input[i] >> 16) & 0xff);
output[j+3] = (unsigned char)((input[i] >> 24) & 0xff);
}
}
// Decodes input (unsigned char) into output (UINT4). Assumes len is
// a multiple of 4.
static void Decode( UINT4 *output, unsigned char *input, unsigned int len )
{
unsigned int i, j;
for (i = 0, j = 0; j < len; i++, j += 4)
output[i] = ((UINT4)input[j]) | (((UINT4)input[j+1]) << 8) |
(((UINT4)input[j+2]) << 16) | (((UINT4)input[j+3]) << 24);
}
#pragma endregion
public:
// MAIN FUNCTIONS
MD5()
{
Init() ;
}
// MD5 initialization. Begins an MD5 operation, writing a new context.
void Init()
{
context.count[0] = context.count[1] = 0;
// Load magic initialization constants.
context.state[0] = 0x67452301;
context.state[1] = 0xefcdab89;
context.state[2] = 0x98badcfe;
context.state[3] = 0x10325476;
}
// MD5 block update operation. Continues an MD5 message-digest
// operation, processing another message block, and updating the
// context.
void Update(
unsigned char *input, // input block
unsigned int inputLen ) // length of input block
{
unsigned int i, index, partLen;
// Compute number of bytes mod 64
index = (unsigned int)((context.count[0] >> 3) & 0x3F);
// Update number of bits
if ((context.count[0] += ((UINT4)inputLen << 3))
< ((UINT4)inputLen << 3))
context.count[1]++;
context.count[1] += ((UINT4)inputLen >> 29);
partLen = 64 - index;
// Transform as many times as possible.
if (inputLen >= partLen) {
memcpy((POINTER)&context.buffer[index], (POINTER)input, partLen);
MD5Transform (context.state, context.buffer);
for (i = partLen; i + 63 < inputLen; i += 64)
MD5Transform (context.state, &input[i]);
index = 0;
}
else
i = 0;
/* Buffer remaining input */
memcpy((POINTER)&context.buffer[index], (POINTER)&input[i], inputLen-i);
}
// MD5 finalization. Ends an MD5 message-digest operation, writing the
// the message digest and zeroizing the context.
// Writes to digestRaw
void Final()
{
unsigned char bits[8];
unsigned int index, padLen;
// Save number of bits
Encode( bits, context.count, 8 );
// Pad out to 56 mod 64.
index = (unsigned int)((context.count[0] >> 3) & 0x3f);
padLen = (index < 56) ? (56 - index) : (120 - index);
Update( PADDING, padLen );
// Append length (before padding)
Update( bits, 8 );
// Store state in digest
Encode( digestRaw, context.state, 16);
// Zeroize sensitive information.
memset((POINTER)&context, 0, sizeof (context));
writeToString() ;
}
/// Buffer must be 32+1 (nul) = 33 chars long at least
void writeToString()
{
int pos ;
for( pos = 0 ; pos < 16 ; pos++ )
sprintf( digestChars+(pos*2), "%02x", digestRaw[pos] ) ;
}
public:
// an MD5 digest is a 16-byte number (32 hex digits)
BYTE digestRaw[ 16 ] ;
// This version of the digest is actually
// a "printf'd" version of the digest.
char digestChars[ 33 ] ;
/// Load a file from disk and digest it
// Digests a file and returns the result.
char* digestFile(const char *filename)
{
Init() ;
FILE *file;
int len;
unsigned char buffer[1024] ;
if ((file = fopen(filename, "rb")) == NULL)
{
//printf("%s can't be opened\n", filename);
return NULL;
}
else
{
while ((len = static_cast<int>(fread( buffer, 1, 1024, file )) ) != 0)
Update( buffer, len ) ;
Final();
fclose( file );
}
return digestChars ;
}
/// Digests a byte-array already in memory
char* digestMemory( BYTE *memchunk, int len )
{
Init() ;
Update( memchunk, len ) ;
Final() ;
return digestChars ;
}
// Digests a string and prints the result.
char* digestString(const char *string )
{
Init() ;
Update( (unsigned char*)string, static_cast<unsigned int>(strlen(string)) ) ;
Final() ;
return digestChars ;
}
} ;
#endif

View File

@ -0,0 +1,262 @@
//this file is part of notepad++
//Copyright (C)2016 Don HO <don.h@fee.fr>
//
//This program is free software; you can redistribute it and/or
//modify it under the terms of the GNU General Public License
//as published by the Free Software Foundation; either
//version 2 of the License, or (at your option) any later version.
//
//This program is distributed in the hope that it will be useful,
//but WITHOUT ANY WARRANTY; without even the implied warranty of
//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
//GNU General Public License for more details.
//
//You should have received a copy of the GNU General Public License
//along with this program; if not, write to the Free Software
//Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include "md5.h"
#include "md5Dlgs.h"
#include "md5Dlgs_rc.h"
#include "FileDialog.h"
#include "Parameters.h"
#include <shlwapi.h>
INT_PTR CALLBACK MD5FromFilesDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM /*lParam*/)
{
switch (message)
{
case WM_INITDIALOG:
{
int fontDpiDynamicalHeight = NppParameters::getInstance()->_dpiManager.scaleY(13);
HFONT hFont = ::CreateFontA(fontDpiDynamicalHeight, 0, 0, 0, 0, FALSE, FALSE, FALSE, ANSI_CHARSET,
OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY,
DEFAULT_PITCH | FF_DONTCARE, "Courier New");
::SendMessage(::GetDlgItem(_hSelf, IDC_MD5_PATH_EDIT), WM_SETFONT, reinterpret_cast<WPARAM>(hFont), TRUE);
::SendMessage(::GetDlgItem(_hSelf, IDC_MD5_RESULT_EDIT), WM_SETFONT, reinterpret_cast<WPARAM>(hFont), TRUE);
}
return TRUE;
case WM_COMMAND :
{
switch (wParam)
{
case IDCANCEL :
display(false);
return TRUE;
case IDOK :
{
return TRUE;
}
case IDC_MD5_FILEBROWSER_BUTTON:
{
FileDialog fDlg(_hSelf, ::GetModuleHandle(NULL));
fDlg.setExtFilter(TEXT("All types"), TEXT(".*"), NULL);
if (stringVector *pfns = fDlg.doOpenMultiFilesDlg())
{
std::wstring files2check, md5resultStr;
for (auto it = pfns->begin(); it != pfns->end(); ++it)
{
WcharMbcsConvertor *wmc = WcharMbcsConvertor::getInstance();
const char *path = wmc->wchar2char(it->c_str(), CP_ACP);
MD5 md5;
char *md5Result = md5.digestFile(path);
if (md5Result)
{
files2check += *it;
files2check += TEXT("\r\n");
wchar_t* fileName = ::PathFindFileName(it->c_str());
md5resultStr += wmc->char2wchar(md5Result, CP_ACP);
md5resultStr += TEXT(" ");
md5resultStr += fileName;
md5resultStr += TEXT("\r\n");
}
}
if (not files2check.empty() && not md5resultStr.empty())
{
::SetDlgItemText(_hSelf, IDC_MD5_PATH_EDIT, files2check.c_str());
::SetDlgItemText(_hSelf, IDC_MD5_RESULT_EDIT, md5resultStr.c_str());
}
}
}
return TRUE;
case IDC_MD5_TOCLIPBOARD_BUTTON:
{
int len = static_cast<int>(::SendMessage(::GetDlgItem(_hSelf, IDC_MD5_RESULT_EDIT), WM_GETTEXTLENGTH, 0, 0));
if (len)
{
wchar_t *rStr = new wchar_t[len+1];
::GetDlgItemText(_hSelf, IDC_MD5_RESULT_EDIT, rStr, len + 1);
str2Clipboard(rStr, _hSelf);
delete[] rStr;
}
}
return TRUE;
default :
break;
}
}
}
return FALSE;
}
void MD5FromFilesDlg::doDialog(bool isRTL)
{
if (!isCreated())
create(IDD_MD5FROMFILES_DLG, isRTL);
// Adjust the position in the center
goToCenter();
//::SetFocus(::GetDlgItem(_hSelf, IDC_COMBO_RUN_PATH));
};
void MD5FromTextDlg::generateMD5()
{
int len = static_cast<int>(::SendMessage(::GetDlgItem(_hSelf, IDC_MD5_TEXT_EDIT), WM_GETTEXTLENGTH, 0, 0));
if (len)
{
char *text = new char[len + 1];
::GetDlgItemTextA(_hSelf, IDC_MD5_TEXT_EDIT, text, len + 1);
MD5 md5;
char* md5Result = md5.digestString(text);
::SetDlgItemTextA(_hSelf, IDC_MD5_RESULT_FOMTEXT_EDIT, md5Result);
delete[] text;
}
else
{
::SetDlgItemTextA(_hSelf, IDC_MD5_RESULT_FOMTEXT_EDIT, "");
}
}
void MD5FromTextDlg::generateMD5PerLine()
{
int len = static_cast<int>(::SendMessage(::GetDlgItem(_hSelf, IDC_MD5_TEXT_EDIT), WM_GETTEXTLENGTH, 0, 0));
if (len)
{
char *text = new char[len + 1];
::GetDlgItemTextA(_hSelf, IDC_MD5_TEXT_EDIT, text, len + 1);
std::stringstream ss(text);
std::string aLine;
std::string result;
MD5 md5;
while (std::getline(ss, aLine))
{
// getline() detect only '\n' but not "\r\n" under windows
// this hack is to walk around such bug
if (aLine.back() == '\r')
aLine = aLine.substr(0, aLine.size() - 1);
if (aLine.empty())
result += "\r\n";
else
{
char* md5Result = md5.digestString(const_cast<char *>(aLine.c_str()));
result += md5Result;
result += "\r\n";
}
}
delete[] text;
::SetDlgItemTextA(_hSelf, IDC_MD5_RESULT_FOMTEXT_EDIT, result.c_str());
}
else
{
::SetDlgItemTextA(_hSelf, IDC_MD5_RESULT_FOMTEXT_EDIT, "");
}
}
INT_PTR CALLBACK MD5FromTextDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM /*lParam*/)
{
switch (message)
{
case WM_INITDIALOG:
{
int fontDpiDynamicalHeight = NppParameters::getInstance()->_dpiManager.scaleY(13);
HFONT hFont = ::CreateFontA(fontDpiDynamicalHeight, 0, 0, 0, 0, FALSE, FALSE, FALSE, ANSI_CHARSET,
OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY,
DEFAULT_PITCH | FF_DONTCARE, "Courier New");
::SendMessage(::GetDlgItem(_hSelf, IDC_MD5_TEXT_EDIT), WM_SETFONT, reinterpret_cast<WPARAM>(hFont), TRUE);
::SendMessage(::GetDlgItem(_hSelf, IDC_MD5_RESULT_FOMTEXT_EDIT), WM_SETFONT, reinterpret_cast<WPARAM>(hFont), TRUE);
}
return TRUE;
case WM_COMMAND :
{
if (HIWORD(wParam) == EN_CHANGE && LOWORD(wParam) == IDC_MD5_TEXT_EDIT)
{
if (isCheckedOrNot(IDC_MD5_EACHLINE_CHECK))
{
generateMD5PerLine();
}
else
{
generateMD5();
}
}
switch (wParam)
{
case IDCANCEL :
display(false);
return TRUE;
case IDOK :
{
return TRUE;
}
case IDC_MD5_EACHLINE_CHECK:
{
if (isCheckedOrNot(IDC_MD5_EACHLINE_CHECK))
{
generateMD5PerLine();
}
else
{
generateMD5();
}
}
return TRUE;
case IDC_MD5_FROMTEXT_TOCLIPBOARD_BUTTON:
{
int len = static_cast<int>(::SendMessage(::GetDlgItem(_hSelf, IDC_MD5_RESULT_FOMTEXT_EDIT), WM_GETTEXTLENGTH, 0, 0));
if (len)
{
wchar_t *rStr = new wchar_t[len+1];
::GetDlgItemText(_hSelf, IDC_MD5_RESULT_FOMTEXT_EDIT, rStr, len + 1);
str2Clipboard(rStr, _hSelf);
delete[] rStr;
}
}
return TRUE;
default :
break;
}
}
}
return FALSE;
}
void MD5FromTextDlg::doDialog(bool isRTL)
{
if (!isCreated())
create(IDD_MD5FROMTEXT_DLG, isRTL);
// Adjust the position in the center
goToCenter();
//::SetFocus(::GetDlgItem(_hSelf, IDC_COMBO_RUN_PATH));
};

View File

@ -0,0 +1,48 @@
//this file is part of notepad++
//Copyright (C)2016 Don HO <don.h@free.fr>
//
//This program is free software; you can redistribute it and/or
//modify it under the terms of the GNU General Public License
//as published by the Free Software Foundation; either
//version 2 of the License, or (at your option) any later version.
//
//This program is distributed in the hope that it will be useful,
//but WITHOUT ANY WARRANTY; without even the implied warranty of
//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
//GNU General Public License for more details.
//
//You should have received a copy of the GNU General Public License
//along with this program; if not, write to the Free Software
//Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#pragma once
#include "StaticDialog.h"
class MD5FromFilesDlg : public StaticDialog
{
public :
MD5FromFilesDlg() : StaticDialog() {};
void doDialog(bool isRTL = false);
virtual void destroy() {};
protected :
virtual INT_PTR CALLBACK run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam);
};
class MD5FromTextDlg : public StaticDialog
{
public :
MD5FromTextDlg() : StaticDialog() {};
void doDialog(bool isRTL = false);
virtual void destroy() {};
void generateMD5();
void generateMD5PerLine();
protected :
virtual INT_PTR CALLBACK run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam);
};

View File

@ -0,0 +1,47 @@
/*
this file is part of notepad++
Copyright (C)2016 Don HO < don.h@free.fr >
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <windows.h>
#include "md5Dlgs_rc.h"
IDD_MD5FROMFILES_DLG DIALOGEX 0, 0, 357, 213
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_TOOLWINDOW
CAPTION "Generate MD5 digest from files"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
EDITTEXT IDC_MD5_PATH_EDIT, 9,21,263,64, ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | NOT WS_BORDER | WS_VSCROLL | WS_HSCROLL, WS_EX_CLIENTEDGE
PUSHBUTTON "Choose files to generate MD5...",IDC_MD5_FILEBROWSER_BUTTON,278,21,76,28, BS_MULTILINE
EDITTEXT IDC_MD5_RESULT_EDIT,9,105,262,64,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | NOT WS_BORDER | WS_VSCROLL | WS_HSCROLL, WS_EX_CLIENTEDGE
PUSHBUTTON "Copy to Clipboard",IDC_MD5_TOCLIPBOARD_BUTTON,278,105,76,28,BS_MULTILINE
PUSHBUTTON "Close",IDCANCEL,148,188,60,14
END
IDD_MD5FROMTEXT_DLG DIALOGEX 0, 0, 357, 213
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_TOOLWINDOW
CAPTION "Generate MD5 digest"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
EDITTEXT IDC_MD5_TEXT_EDIT, 9,21,263,64, ES_MULTILINE | ES_AUTOVSCROLL | NOT WS_BORDER | WS_VSCROLL | WS_HSCROLL, WS_EX_CLIENTEDGE
CONTROL "Treat each line as a separate string", IDC_MD5_EACHLINE_CHECK, "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP, 278,21,76,28
EDITTEXT IDC_MD5_RESULT_FOMTEXT_EDIT,9,105,262,64,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | NOT WS_BORDER | WS_VSCROLL | WS_HSCROLL, WS_EX_CLIENTEDGE
PUSHBUTTON "Copy to Clipboard",IDC_MD5_FROMTEXT_TOCLIPBOARD_BUTTON,278,105,76,28,BS_MULTILINE
PUSHBUTTON "Close",IDCANCEL,148,188,60,14
END

View File

@ -0,0 +1,30 @@
/*
this file is part of notepad++
Copyright (C)2016 Don HO < don.h@free.fr >
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#define IDD_MD5FROMFILES_DLG 1920
#define IDC_MD5_PATH_EDIT (IDD_MD5FROMFILES_DLG + 1)
#define IDC_MD5_FILEBROWSER_BUTTON (IDD_MD5FROMFILES_DLG + 2)
#define IDC_MD5_RESULT_EDIT (IDD_MD5FROMFILES_DLG + 3)
#define IDC_MD5_TOCLIPBOARD_BUTTON (IDD_MD5FROMFILES_DLG + 4)
#define IDD_MD5FROMTEXT_DLG 1930
#define IDC_MD5_TEXT_EDIT (IDD_MD5FROMTEXT_DLG + 1)
#define IDC_MD5_EACHLINE_CHECK (IDD_MD5FROMTEXT_DLG + 2)
#define IDC_MD5_RESULT_FOMTEXT_EDIT (IDD_MD5FROMTEXT_DLG + 3)
#define IDC_MD5_FROMTEXT_TOCLIPBOARD_BUTTON (IDD_MD5FROMTEXT_DLG + 4)

View File

@ -630,6 +630,8 @@ LRESULT Notepad_plus::init(HWND hwnd)
_aboutDlg.init(_pPublicInterface->getHinst(), hwnd);
_debugInfoDlg.init(_pPublicInterface->getHinst(), hwnd, _isAdministrator, _pluginsManager.getLoadedPluginNames());
_runDlg.init(_pPublicInterface->getHinst(), hwnd);
_md5FromFilesDlg.init(_pPublicInterface->getHinst(), hwnd);
_md5FromTextDlg.init(_pPublicInterface->getHinst(), hwnd);
_runMacroDlg.init(_pPublicInterface->getHinst(), hwnd);
//--User Define Dialog Section--//
@ -3045,7 +3047,7 @@ void Notepad_plus::updateStatusBar()
_pEditView->getSelectedCount(selByte, selLine);
long selected_length = _pEditView->getSelectedLength();
long selected_length = _pEditView->getUnicodeSelectedLength();
if (selected_length != -1)
wsprintf(strSel, TEXT("Sel : %s | %s"), commafyInt(selected_length).c_str(), commafyInt(selLine).c_str());
else
@ -5506,6 +5508,16 @@ bool Notepad_plus::reloadLang()
_nativeLangSpeaker.changeDlgLang(_runDlg.getHSelf(), "Run");
}
if (_md5FromFilesDlg.isCreated())
{
_nativeLangSpeaker.changeDlgLang(_md5FromFilesDlg.getHSelf(), "MD5FromFilesDlg");
}
if (_md5FromTextDlg.isCreated())
{
_nativeLangSpeaker.changeDlgLang(_md5FromTextDlg.getHSelf(), "MD5FromTextDlg");
}
if (_runMacroDlg.isCreated())
{
_nativeLangSpeaker.changeDlgLang(_runMacroDlg.getHSelf(), "MultiMacro");

View File

@ -125,6 +125,7 @@
#endif //SIZE_DLG_H
#include "localization.h"
#include "md5Dlgs.h"
#include <vector>
#include <iso646.h>
@ -346,6 +347,8 @@ private:
AboutDlg _aboutDlg;
DebugInfoDlg _debugInfoDlg;
RunDlg _runDlg;
MD5FromFilesDlg _md5FromFilesDlg;
MD5FromTextDlg _md5FromTextDlg;
GoToLineDlg _goToLineDlg;
ColumnEditorDlg _colEditorDlg;
WordStyleDlg _configStyleDlg;

View File

@ -855,7 +855,17 @@ BEGIN
MENUITEM "Edit Popup ContextMenu", IDM_SETTING_EDITCONTEXTMENU
END
POPUP "&Macro"
POPUP "T&ools"
BEGIN
POPUP "MD5"
BEGIN
MENUITEM "Generate...", IDM_TOOL_MD5_GENERATE
MENUITEM "Generate from files...", IDM_TOOL_MD5_GENERATEFROMFILE
MENUITEM "Generate into clipboard", IDM_TOOL_MD5_GENERATEINTOCLIPBOARD
END
END
POPUP "&Macro"
BEGIN
MENUITEM "Start Re&cording", IDM_MACRO_STARTRECORDINGMACRO
MENUITEM "S&top Recording", IDM_MACRO_STOPRECORDINGMACRO
@ -868,7 +878,17 @@ BEGIN
BEGIN
MENUITEM "&Run...", IDM_EXECUTE
END
/*
POPUP "Tools"
BEGIN
POPUP "MD5"
BEGIN
MENUITEM "Generate...", IDM_TOOL_MD5_GENERATE
MENUITEM "Generate from a file...", IDM_TOOL_MD5_GENERATEFROMFILE
MENUITEM "Generate into clipboard", IDM_TOOL_MD5_GENERATEINTOCLIPBOARD
END
END
*/
POPUP "&?"
BEGIN
//MENUITEM "Help Contents", IDM_HELP

View File

@ -38,6 +38,7 @@
#include "fileBrowser.h"
#include "Sorters.h"
#include "LongRunningOperation.h"
#include "md5.h"
using namespace std;
@ -2472,6 +2473,49 @@ void Notepad_plus::command(int id)
break;
}
case IDM_TOOL_MD5_GENERATE:
{
bool isFirstTime = !_md5FromTextDlg.isCreated();
_md5FromTextDlg.doDialog(_nativeLangSpeaker.isRTL());
if (isFirstTime)
_nativeLangSpeaker.changeDlgLang(_md5FromTextDlg.getHSelf(), "MD5FromTextDlg");
}
break;
case IDM_TOOL_MD5_GENERATEFROMFILE:
{
bool isFirstTime = !_md5FromFilesDlg.isCreated();
_md5FromFilesDlg.doDialog(_nativeLangSpeaker.isRTL());
if (isFirstTime)
_nativeLangSpeaker.changeDlgLang(_md5FromFilesDlg.getHSelf(), "MD5FromFilesDlg");
}
break;
case IDM_TOOL_MD5_GENERATEINTOCLIPBOARD:
{
if (_pEditView->execute(SCI_GETSELECTIONS) == 1)
{
size_t selectionStart = _pEditView->execute(SCI_GETSELECTIONSTART);
size_t selectionEnd = _pEditView->execute(SCI_GETSELECTIONEND);
int32_t strLen = static_cast<int32_t>(selectionEnd - selectionStart);
if (strLen)
{
int strSize = strLen + 1;
char *selectedStr = new char[strSize];
_pEditView->execute(SCI_GETSELTEXT, 0, reinterpret_cast<LPARAM>(selectedStr));
MD5 md5;
std::string md5ResultA = md5.digestString(selectedStr);
std::wstring md5ResultW(md5ResultA.begin(), md5ResultA.end());
str2Clipboard(md5ResultW, _pPublicInterface->getHSelf());
delete [] selectedStr;
}
}
}
break;
case IDM_DEBUGINFO:
{
_debugInfoDlg.doDialog();

View File

@ -551,7 +551,7 @@ struct NewDocDefaultSettings final
};
struct LangMenuItem
struct LangMenuItem final
{
LangType _langType;
int _cmdID;
@ -561,31 +561,29 @@ struct LangMenuItem
_langType(lt), _cmdID(cmdID), _langName(langName){};
};
struct PrintSettings {
bool _printLineNumber;
int _printOption;
struct PrintSettings final {
bool _printLineNumber = true;
int _printOption = SC_PRINT_COLOURONWHITE;
generic_string _headerLeft;
generic_string _headerMiddle;
generic_string _headerRight;
generic_string _headerFontName;
int _headerFontStyle;
int _headerFontSize;
int _headerFontStyle = 0;
int _headerFontSize = 0;
generic_string _footerLeft;
generic_string _footerMiddle;
generic_string _footerRight;
generic_string _footerFontName;
int _footerFontStyle;
int _footerFontSize;
int _footerFontStyle = 0;
int _footerFontSize = 0;
RECT _marge;
PrintSettings() : _printLineNumber(true), _printOption(SC_PRINT_NORMAL), _headerLeft(TEXT("")), _headerMiddle(TEXT("")), _headerRight(TEXT("")),\
_headerFontName(TEXT("")), _headerFontStyle(0), _headerFontSize(0), _footerLeft(TEXT("")), _footerMiddle(TEXT("")), _footerRight(TEXT("")),\
_footerFontName(TEXT("")), _footerFontStyle(0), _footerFontSize(0) {
_marge.left = 0; _marge.top = 0; _marge.right = 0; _marge.bottom = 0;
};
PrintSettings() {
_marge.left = 0; _marge.top = 0; _marge.right = 0; _marge.bottom = 0;
};
bool isHeaderPresent() const {
return ((_headerLeft != TEXT("")) || (_headerMiddle != TEXT("")) || (_headerRight != TEXT("")));

View File

@ -463,7 +463,7 @@ public:
return true;
};
long getSelectedLength() const
long getUnicodeSelectedLength() const
{
// return -1 if it's multi-selection or rectangle selection
if ((execute(SCI_GETSELECTIONS) > 1) || execute(SCI_SELECTIONISRECTANGLE))

View File

@ -15,15 +15,11 @@
//along with this program; if not, write to the Free Software
//Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#ifndef RUN_DLG_H
#define RUN_DLG_H
#pragma once
#include <oleacc.h>
#include "Common.h"
#ifndef RUN_DLG_RC_H
#include "RunDlg_rc.h"
#endif //RUN_DLG_RC_H
#define CURRENTWORD_MAXLENGTH 2048
@ -70,4 +66,3 @@ private :
void removeTextFromCombo(const TCHAR *txt2Remove) const;
};
#endif //RUN_DLG_H

View File

@ -15,8 +15,7 @@
//along with this program; if not, write to the Free Software
//Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#ifndef RUN_DLG_RC_H
#define RUN_DLG_RC_H
#pragma once
#define IDD_RUN_DLG 1900
#define IDC_BUTTON_FILE_BROWSER (IDD_RUN_DLG + 1)
@ -24,4 +23,3 @@
#define IDC_MAINTEXT_STATIC (IDD_RUN_DLG + 3)
#define IDC_BUTTON_SAVE (IDD_RUN_DLG + 4)
#endif //RUN_DLG_RC_H

View File

@ -46,8 +46,9 @@ MenuPosition menuPos[] = {
{ 4, -1, -1, "encoding" },
{ 5, -1, -1, "language" },
{ 6, -1, -1, "settings" },
{ 7, -1, -1, "macro" },
{ 8, -1, -1, "run" },
{ 7, -1, -1, "tools" },
{ 8, -1, -1, "macro" },
{ 9, -1, -1, "run" },
{ 0, 2, -1, "file-openFolder" },
{ 0, 12, -1, "file-closeMore" },
@ -97,6 +98,8 @@ MenuPosition menuPos[] = {
{ 4, 5, 15, "encoding-vietnamese" },
{ 6, 4, -1, "settings-import" },
{ 7, 0, -1, "tools-md5" },
{ -1, -1, -1, "" } // End of array
};

View File

@ -523,6 +523,12 @@
#define IDM_SETTING_SHORTCUT_MAPPER_RUN (IDM_SETTING + 17)
#define IDM_SETTING_EDITCONTEXTMENU (IDM_SETTING + 18)
#define IDM_TOOL (IDM + 8500)
#define IDM_TOOL_MD5_GENERATE (IDM_TOOL + 1)
#define IDM_TOOL_MD5_GENERATEFROMFILE (IDM_TOOL + 2)
#define IDM_TOOL_MD5_GENERATEINTOCLIPBOARD (IDM_TOOL + 3)
#define IDM_EXECUTE (IDM + 9000)
#define IDM_SYSTRAYPOPUP (IDM + 3100)

View File

@ -283,16 +283,17 @@
#define IDC_EMAIL_ADDR 1703
#define IDC_ONLINEHELP_ADDR 1704
#define IDC_AUTHOR_NAME 1705
#define IDC_BUILD_DATETIME 1706 //LS: CompileDateInAboutDialog: Automatically insert compile date as additional version info in About-dialog!
#define IDC_BUILD_DATETIME 1706
#define IDC_VERSION_BIT 1707
#define IDD_DEBUGINFOBOX 1750
#define IDC_DEBUGINFO_EDIT 1751
#define IDC_DEBUGINFO_COPYLINK 1752
//#define IDD_USER_DEFINE_BOX 1800
//#define IDD_RUN_DLG 1900
//#define IDD_USER_DEFINE_BOX 1800
//#define IDD_RUN_DLG 1900
//#define IDD_MD5FROMFILES_DLG 1920
//#define IDD_MD5FROMTEXT_DLG 1930
#define IDD_GOLINE 2000
#define ID_GOLINE_EDIT (IDD_GOLINE + 1)
@ -470,6 +471,7 @@
#define MENUINDEX_FORMAT 4
#define MENUINDEX_LANGUAGE 5
#define MENUINDEX_SETTINGS 6
#define MENUINDEX_MACRO 7
#define MENUINDEX_RUN 8
#define MENUINDEX_PLUGINS 9
#define MENUINDEX_TOOLS 7
#define MENUINDEX_MACRO 8
#define MENUINDEX_RUN 9
#define MENUINDEX_PLUGINS 10

View File

@ -94,7 +94,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>..\src\WinControls\AboutDlg;..\..\scintilla\include;..\include;..\src\WinControls;..\src\WinControls\ImageListSet;..\src\WinControls\OpenSaveFileDialog;..\src\WinControls\SplitterContainer;..\src\WinControls\StaticDialog;..\src\WinControls\TabBar;..\src\WinControls\ToolBar;..\src\MISC\Process;..\src\ScitillaComponent;..\src\MISC;..\src\MISC\SysMsg;..\src\WinControls\StatusBar;..\src;..\src\WinControls\StaticDialog\RunDlg;..\src\tinyxml;..\src\WinControls\ColourPicker;..\src\Win32Explr;..\src\MISC\RegExt;..\src\WinControls\TrayIcon;..\src\WinControls\shortcut;..\src\WinControls\Grid;..\src\WinControls\ContextMenu;..\src\MISC\PluginsManager;..\src\WinControls\Preference;..\src\WinControls\WindowsDlg;..\src\WinControls\TaskList;..\src\WinControls\DockingWnd;..\src\WinControls\ToolTip;..\src\MISC\Exception;..\src\MISC\Common;..\src\tinyxml\tinyXmlA;..\src\WinControls\AnsiCharPanel;..\src\WinControls\ClipboardHistory;..\src\WinControls\FindCharsInRange;..\src\WinControls\VerticalFileSwitcher;..\src\WinControls\ProjectPanel;..\src\WinControls\DocumentMap;..\src\WinControls\FunctionList;..\src\uchardet;..\src\WinControls\FileBrowser;..\src\WinControls\ReadDirectoryChanges;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\src\WinControls\AboutDlg;..\..\scintilla\include;..\include;..\src\WinControls;..\src\WinControls\ImageListSet;..\src\WinControls\OpenSaveFileDialog;..\src\WinControls\SplitterContainer;..\src\WinControls\StaticDialog;..\src\WinControls\TabBar;..\src\WinControls\ToolBar;..\src\MISC\Process;..\src\ScitillaComponent;..\src\MISC;..\src\MISC\SysMsg;..\src\WinControls\StatusBar;..\src;..\src\WinControls\StaticDialog\RunDlg;..\src\tinyxml;..\src\WinControls\ColourPicker;..\src\Win32Explr;..\src\MISC\RegExt;..\src\WinControls\TrayIcon;..\src\WinControls\shortcut;..\src\WinControls\Grid;..\src\WinControls\ContextMenu;..\src\MISC\PluginsManager;..\src\WinControls\Preference;..\src\WinControls\WindowsDlg;..\src\WinControls\TaskList;..\src\WinControls\DockingWnd;..\src\WinControls\ToolTip;..\src\MISC\Exception;..\src\MISC\Common;..\src\tinyxml\tinyXmlA;..\src\WinControls\AnsiCharPanel;..\src\WinControls\ClipboardHistory;..\src\WinControls\FindCharsInRange;..\src\WinControls\VerticalFileSwitcher;..\src\WinControls\ProjectPanel;..\src\WinControls\DocumentMap;..\src\WinControls\FunctionList;..\src\uchardet;..\src\WinControls\FileBrowser;..\src\WinControls\ReadDirectoryChanges;..\src\MISC\md5;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WIN32_WINNT=0x0501;_WINDOWS;_USE_64BIT_TIME_T;TIXML_USE_STL;TIXMLA_USE_STL;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
@ -129,7 +129,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>..\src\WinControls\AboutDlg;..\..\scintilla\include;..\include;..\src\WinControls;..\src\WinControls\ImageListSet;..\src\WinControls\OpenSaveFileDialog;..\src\WinControls\SplitterContainer;..\src\WinControls\StaticDialog;..\src\WinControls\TabBar;..\src\WinControls\ToolBar;..\src\MISC\Process;..\src\ScitillaComponent;..\src\MISC;..\src\MISC\SysMsg;..\src\WinControls\StatusBar;..\src;..\src\WinControls\StaticDialog\RunDlg;..\src\tinyxml;..\src\WinControls\ColourPicker;..\src\Win32Explr;..\src\MISC\RegExt;..\src\WinControls\TrayIcon;..\src\WinControls\shortcut;..\src\WinControls\Grid;..\src\WinControls\ContextMenu;..\src\MISC\PluginsManager;..\src\WinControls\Preference;..\src\WinControls\WindowsDlg;..\src\WinControls\TaskList;..\src\WinControls\DockingWnd;..\src\WinControls\ToolTip;..\src\MISC\Exception;..\src\MISC\Common;..\src\tinyxml\tinyXmlA;..\src\WinControls\AnsiCharPanel;..\src\WinControls\ClipboardHistory;..\src\WinControls\FindCharsInRange;..\src\WinControls\VerticalFileSwitcher;..\src\WinControls\ProjectPanel;..\src\WinControls\DocumentMap;..\src\WinControls\FunctionList;..\src\uchardet;..\src\WinControls\FileBrowser;..\src\WinControls\ReadDirectoryChanges;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\src\WinControls\AboutDlg;..\..\scintilla\include;..\include;..\src\WinControls;..\src\WinControls\ImageListSet;..\src\WinControls\OpenSaveFileDialog;..\src\WinControls\SplitterContainer;..\src\WinControls\StaticDialog;..\src\WinControls\TabBar;..\src\WinControls\ToolBar;..\src\MISC\Process;..\src\ScitillaComponent;..\src\MISC;..\src\MISC\SysMsg;..\src\WinControls\StatusBar;..\src;..\src\WinControls\StaticDialog\RunDlg;..\src\tinyxml;..\src\WinControls\ColourPicker;..\src\Win32Explr;..\src\MISC\RegExt;..\src\WinControls\TrayIcon;..\src\WinControls\shortcut;..\src\WinControls\Grid;..\src\WinControls\ContextMenu;..\src\MISC\PluginsManager;..\src\WinControls\Preference;..\src\WinControls\WindowsDlg;..\src\WinControls\TaskList;..\src\WinControls\DockingWnd;..\src\WinControls\ToolTip;..\src\MISC\Exception;..\src\MISC\Common;..\src\tinyxml\tinyXmlA;..\src\WinControls\AnsiCharPanel;..\src\WinControls\ClipboardHistory;..\src\WinControls\FindCharsInRange;..\src\WinControls\VerticalFileSwitcher;..\src\WinControls\ProjectPanel;..\src\WinControls\DocumentMap;..\src\WinControls\FunctionList;..\src\uchardet;..\src\WinControls\FileBrowser;..\src\WinControls\ReadDirectoryChanges;..\src\MISC\md5;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WIN32_WINNT=0x0501;_WINDOWS;_USE_64BIT_TIME_T;TIXML_USE_STL;TIXMLA_USE_STL;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
@ -167,7 +167,7 @@
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>false</OmitFramePointers>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\src\WinControls\AboutDlg;..\..\scintilla\include;..\include;..\src\WinControls;..\src\WinControls\ImageListSet;..\src\WinControls\OpenSaveFileDialog;..\src\WinControls\SplitterContainer;..\src\WinControls\StaticDialog;..\src\WinControls\TabBar;..\src\WinControls\ToolBar;..\src\MISC\Process;..\src\ScitillaComponent;..\src\MISC;..\src\MISC\SysMsg;..\src\WinControls\StatusBar;..\src;..\src\WinControls\StaticDialog\RunDlg;..\src\tinyxml;..\src\WinControls\ColourPicker;..\src\Win32Explr;..\src\MISC\RegExt;..\src\WinControls\TrayIcon;..\src\WinControls\shortcut;..\src\WinControls\Grid;..\src\WinControls\ContextMenu;..\src\MISC\PluginsManager;..\src\WinControls\Preference;..\src\WinControls\WindowsDlg;..\src\WinControls\TaskList;..\src\WinControls\DockingWnd;..\src\WinControls\ToolTip;..\src\MISC\Exception;..\src\MISC\Common;..\src\tinyxml\tinyXmlA;..\src\WinControls\AnsiCharPanel;..\src\WinControls\ClipboardHistory;..\src\WinControls\FindCharsInRange;..\src\WinControls\VerticalFileSwitcher;..\src\WinControls\ProjectPanel;..\src\WinControls\DocumentMap;..\src\WinControls\FunctionList;..\src\uchardet;..\src\WinControls\FileBrowser;..\src\WinControls\ReadDirectoryChanges;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\src\WinControls\AboutDlg;..\..\scintilla\include;..\include;..\src\WinControls;..\src\WinControls\ImageListSet;..\src\WinControls\OpenSaveFileDialog;..\src\WinControls\SplitterContainer;..\src\WinControls\StaticDialog;..\src\WinControls\TabBar;..\src\WinControls\ToolBar;..\src\MISC\Process;..\src\ScitillaComponent;..\src\MISC;..\src\MISC\SysMsg;..\src\WinControls\StatusBar;..\src;..\src\WinControls\StaticDialog\RunDlg;..\src\tinyxml;..\src\WinControls\ColourPicker;..\src\Win32Explr;..\src\MISC\RegExt;..\src\WinControls\TrayIcon;..\src\WinControls\shortcut;..\src\WinControls\Grid;..\src\WinControls\ContextMenu;..\src\MISC\PluginsManager;..\src\WinControls\Preference;..\src\WinControls\WindowsDlg;..\src\WinControls\TaskList;..\src\WinControls\DockingWnd;..\src\WinControls\ToolTip;..\src\MISC\Exception;..\src\MISC\Common;..\src\tinyxml\tinyXmlA;..\src\WinControls\AnsiCharPanel;..\src\WinControls\ClipboardHistory;..\src\WinControls\FindCharsInRange;..\src\WinControls\VerticalFileSwitcher;..\src\WinControls\ProjectPanel;..\src\WinControls\DocumentMap;..\src\WinControls\FunctionList;..\src\uchardet;..\src\WinControls\FileBrowser;..\src\WinControls\ReadDirectoryChanges;..\src\MISC\md5;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WIN32_WINNT=0x0501;NDEBUG;_WINDOWS;_USE_64BIT_TIME_T;TIXML_USE_STL;TIXMLA_USE_STL;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessToFile>false</PreprocessToFile>
<PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
@ -215,7 +215,7 @@ copy ..\src\contextMenu.xml ..\bin\contextMenu.xml
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>false</OmitFramePointers>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\src\WinControls\AboutDlg;..\..\scintilla\include;..\include;..\src\WinControls;..\src\WinControls\ImageListSet;..\src\WinControls\OpenSaveFileDialog;..\src\WinControls\SplitterContainer;..\src\WinControls\StaticDialog;..\src\WinControls\TabBar;..\src\WinControls\ToolBar;..\src\MISC\Process;..\src\ScitillaComponent;..\src\MISC;..\src\MISC\SysMsg;..\src\WinControls\StatusBar;..\src;..\src\WinControls\StaticDialog\RunDlg;..\src\tinyxml;..\src\WinControls\ColourPicker;..\src\Win32Explr;..\src\MISC\RegExt;..\src\WinControls\TrayIcon;..\src\WinControls\shortcut;..\src\WinControls\Grid;..\src\WinControls\ContextMenu;..\src\MISC\PluginsManager;..\src\WinControls\Preference;..\src\WinControls\WindowsDlg;..\src\WinControls\TaskList;..\src\WinControls\DockingWnd;..\src\WinControls\ToolTip;..\src\MISC\Exception;..\src\MISC\Common;..\src\tinyxml\tinyXmlA;..\src\WinControls\AnsiCharPanel;..\src\WinControls\ClipboardHistory;..\src\WinControls\FindCharsInRange;..\src\WinControls\VerticalFileSwitcher;..\src\WinControls\ProjectPanel;..\src\WinControls\DocumentMap;..\src\WinControls\FunctionList;..\src\uchardet;..\src\WinControls\FileBrowser;..\src\WinControls\ReadDirectoryChanges;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\src\WinControls\AboutDlg;..\..\scintilla\include;..\include;..\src\WinControls;..\src\WinControls\ImageListSet;..\src\WinControls\OpenSaveFileDialog;..\src\WinControls\SplitterContainer;..\src\WinControls\StaticDialog;..\src\WinControls\TabBar;..\src\WinControls\ToolBar;..\src\MISC\Process;..\src\ScitillaComponent;..\src\MISC;..\src\MISC\SysMsg;..\src\WinControls\StatusBar;..\src;..\src\WinControls\StaticDialog\RunDlg;..\src\tinyxml;..\src\WinControls\ColourPicker;..\src\Win32Explr;..\src\MISC\RegExt;..\src\WinControls\TrayIcon;..\src\WinControls\shortcut;..\src\WinControls\Grid;..\src\WinControls\ContextMenu;..\src\MISC\PluginsManager;..\src\WinControls\Preference;..\src\WinControls\WindowsDlg;..\src\WinControls\TaskList;..\src\WinControls\DockingWnd;..\src\WinControls\ToolTip;..\src\MISC\Exception;..\src\MISC\Common;..\src\tinyxml\tinyXmlA;..\src\WinControls\AnsiCharPanel;..\src\WinControls\ClipboardHistory;..\src\WinControls\FindCharsInRange;..\src\WinControls\VerticalFileSwitcher;..\src\WinControls\ProjectPanel;..\src\WinControls\DocumentMap;..\src\WinControls\FunctionList;..\src\uchardet;..\src\WinControls\FileBrowser;..\src\WinControls\ReadDirectoryChanges;..\src\MISC\md5;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WIN32_WINNT=0x0501;NDEBUG;_WINDOWS;_USE_64BIT_TIME_T;TIXML_USE_STL;TIXMLA_USE_STL;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessToFile>false</PreprocessToFile>
<PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
@ -259,6 +259,7 @@ copy ..\src\contextMenu.xml ..\bin64\contextMenu.xml
<ItemGroup>
<ClCompile Include="..\src\MISC\Common\LongRunningOperation.cpp" />
<ClCompile Include="..\src\MISC\Common\mutex.cpp" />
<ClCompile Include="..\src\MISC\md5\md5Dlgs.cpp" />
<ClCompile Include="..\src\MISC\Process\Processus.cpp" />
<ClCompile Include="..\src\WinControls\AboutDlg\AboutDlg.cpp" />
<ClCompile Include="..\src\WinControls\AnsiCharPanel\ansiCharPanel.cpp" />
@ -484,6 +485,7 @@ copy ..\src\contextMenu.xml ..\bin64\contextMenu.xml
<Image Include="..\src\icons\zoomOut_on.ico" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\src\MISC\md5\md5Dlgs.rc" />
<ResourceCompile Include="..\src\WinControls\AnsiCharPanel\ansiCharPanel.rc" />
<ResourceCompile Include="..\src\WinControls\ClipboardHistory\clipboardHistoryPanel.rc" />
<ResourceCompile Include="..\src\WinControls\ColourPicker\ColourPopup.rc" />
@ -517,6 +519,7 @@ copy ..\src\contextMenu.xml ..\bin64\contextMenu.xml
<ClInclude Include="..\src\MISC\Common\LongRunningOperation.h" />
<ClInclude Include="..\src\MISC\Common\mutex.h" />
<ClInclude Include="..\src\MISC\Common\mutex.hxx" />
<ClInclude Include="..\src\MISC\md5\md5Dlgs.h" />
<ClInclude Include="..\src\MISC\Process\Processus.h" />
<ClInclude Include="..\src\WinControls\AboutDlg\AboutDlg.h" />
<ClInclude Include="..\src\WinControls\AnsiCharPanel\ansiCharPanel.h" />