Fierelier/notepad-plus-plus-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,182 Commits 1 Branch 0 Tags 185 MiB
6b0485f458
Commit Graph

1182 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christian Grasser
90229782a3 Merge branch 'master' of https://github.com/notepad-plus-plus/notepad-plus-plus 2015-06-03 21:49:19 +02:00
NN
def5952213 Merge branch 'master' into DlgProc 2015-06-03 07:19:34 +03:00
NN
6de87e3ecc Add _WIN32_WINNT=0x0501 to defines list. 2015-06-03 07:16:01 +03:00
Christian Grasser
4a14960090 correct whitespace merge difference to master 2015-06-03 01:38:44 +02:00
Christian Grasser
d11cba6798 merge with master and resolve confilcts 2015-06-03 01:31:39 +02:00
Don Ho
bc94d07766 [UPDATE] Unprecompile headers (part 4 - final) 2015-06-03 00:55:28 +02:00
Christian Grasser
7089022006 Merge branch 'master' of https://github.com/notepad-plus-plus/notepad-plus-plus 2015-06-02 23:45:35 +02:00
Don Ho
246c8bd168 [UPDATE] Unprecompile headers (part 3) 2015-06-02 18:01:47 +02:00
Don HO
3f1e3da7d2 Merge pull request #153 from NN---/VS2015 
[UPDATE] Make compilation on VS2015
 2015-06-01 23:48:04 +02:00
Don HO
ea4b409c3d Merge pull request #149 from milipili/xml-memory-leaks 
[BUG_FIXED] fixed minor memory leak when exporting the parameters to XML.
 2015-06-01 23:36:30 +02:00
Don HO
f1d5c9f081 Merge pull request #145 from milipili/fix-invalid-read-via-strlen-when-loading 
[BUG_FIXED] buffer: fixed invalid read via strlen when loading a file
 2015-06-01 23:08:59 +02:00
Don HO
ed8a51334d Merge pull request #150 from andreas-jonsson/finder_copy2 
[ENHANCEMENT] Improve copy found lines to clipboard.
 2015-06-01 20:54:29 +02:00
Don HO
6df7762c1d Merge pull request #144 from milipili/fix-invalid-stack-read-when-loading-file 
[BUG_FIXED] buffer: fixed invalid read in the stack when loading a file
 2015-06-01 20:45:42 +02:00
NN
c18101823a Add missing files. 
Add warning 4091 to be ignored.
Define _CRT_NON_CONFORMING_WCSTOK globally.
 2015-06-01 21:40:20 +03:00
NN
dbb43a729f DlgProc returns INT_PTR and not BOOL. Use correct prototype and remove casts. 
See https://msdn.microsoft.com/en-us/library/windows/desktop/ms645469(v=vs.85).aspx
 2015-06-01 21:30:41 +03:00
NN
485c7f21d0 Use correct prototype of EnumFontFamExProc. 2015-06-01 21:09:10 +03:00
Andreas Jönsson
f3934fadb7 Fix array termination error. 2015-06-01 18:55:25 +02:00
Andreas Jönsson
23ac5e3da8 Mark some methods as const. 2015-06-01 18:48:49 +02:00
Andreas Jönsson
933aae4fc2 Improve str2Clipboard. 
Make it take generic_string instead of TCHAR*, since at most callsites
we already have a generic_string.

Improve error handling. Depending on where we are in the function when
we get an error, we need to free the memory, unlock the memory, or
close the clipboard.

Note that if SetClipboardData succeeds then we should not do anything
more to the memory.
 2015-06-01 18:47:24 +02:00
Andreas Jönsson
d6081a5f37 Improve copy functionality in find results window 
Just copy the actual results, without the additional formatting with
line and file name. It respects the hierarchy in the results, i.e.
you can copy all results from a search operation, or from a specific
file, or just the lines you selected.
 2015-06-01 18:39:22 +02:00
Andreas Jönsson
54c8fd7ac8 Make case of "all" consistent. 2015-06-01 18:10:43 +02:00
Don HO
2002ecfbd2 Merge pull request #140 from Morange21/master 
[UPDATE] Remove extra space when creating a new document
 2015-06-01 01:04:22 +02:00
Don HO
57664ff70e Merge pull request #142 from NN---/thread 
[UPDATE] Remove unnecessary casts.
 2015-06-01 00:56:05 +02:00
Don HO
4979760b57 Merge pull request #148 from milipili/gitignore-scintilla-generated-files 
[UPDATE] ignore scintilla generated files
 2015-06-01 00:51:22 +02:00
Don HO
7f2af7a264 Merge pull request #146 from milipili/fix-documentmap-uninitialized-variables-drawzone 
documentmap: ViewZoneDlg: fixed uninitialized variables
 2015-06-01 00:38:40 +02:00
Christian Grasser
6d654bef5a Merge branch 'master' of https://github.com/chcg/notepad-plus-plus into GWLP_648 2015-05-31 22:55:50 +02:00
Don Ho
e9e710a3d4 [UPDATE] Unprecompile headers (part 2) 2015-05-31 22:40:07 +02:00
milipili
25b3a712fb fixed minor memory leak when exporting the parameters to XML 
When writing the parameters as a XML file (when the application quits), a new
node was created but not destroyed (`InsertEndChild` makes a clone of the
given node).
 2015-05-31 21:27:27 +02:00
milipili
41c2d99327 ignore scintilla generated files 2015-05-31 20:59:49 +02:00
Christian Grasser
ebd90df66c Merge branch 'master' of https://github.com/donho/notepad-plus-plus 2015-05-31 20:15:35 +02:00
Don Ho
b35e759d11 [UPDATE] Unprecompile headers 2015-05-31 15:57:17 +02:00
milipili
9f5f8d13c5 documentmap: ViewZoneDlg: fixed uninitialized variables 
The real problem is `_viewZoneCanvas`, which can be used unitialized by `drawZone`.
 2015-05-30 23:34:58 +02:00
milipili
d09947d22d Scintilla: Buffer: fixed invalid read via strlen when loading a file 
When loading a file via `FileManager::loadFileData`, a fixed-length buffer
is filled via `fread`. Then, in some cases, a conversion is done with the help
of `Utf8_16_Read`. However, the method `Utf8_16_Read::convert` performs a call
to `strlen` on this buffer. This is obviously wrong: `\0` char should be
accepted (even if a bit strange) and the buffer is not zero-terminated.

The changes merely consist in adding an additional parameter `length` to
not have to guess the size of the buffer.
 2015-05-30 21:28:51 +02:00
milipili
6adc3b35fc scintilla: buffer: fixed invalid read in the stack when loading a file 
The method `FileManager::loadFileData` uses a stack-based buffer for reading
a file. However, due to the optimization used by `Utf8_16_Read` (`UnicodeConvertor`),
this buffer is not copied, but a pointer to this object is kept.
After `loadFileData`, this object is destroyed, but is used afterward
(via `UnicodeConvertor.getNewBuf`).
 2015-05-30 21:19:01 +02:00
NN
3319bcc581 Fix incorrect thread procedure prototype. It has to be __stdcall. 
Remove unnecessary casts.
 2015-05-30 21:06:32 +03:00
Joshua Noel
bc0b68b2ba Fixed extra space between UNTITLED_STR and document number when creating a new document through the function FileManager::newEmptyDocument() 2015-05-30 13:40:41 -04:00
Don HO
17e8ca3c15 Merge pull request #120 from andreas-jonsson/tempfix_corruption 
[BUG_FIXED] Prevent big file corruption on some long period operations.
 2015-05-30 18:00:16 +02:00
Andreas Jönsson
3ca488d0bc Also sync when pasting. 
See Sourceforge #5327.
 2015-05-30 10:16:19 +02:00
Don HO
8976240dcd Merge pull request #138 from milipili/master 
[ScitillaComponent: Buffer: _currentStatus is used uninitialized in ctor
 2015-05-30 02:41:46 +02:00
milipili
0ce219566a ScitillaComponent: Buffer: fixed an uninitialized variable in ctor 
The non-default constructor of the class Buffer calls the inner method
`checkFileState()`, using the private variable `_currentStatus` to determine
whether some checks on the file attached to the buffer are required or not.
However this variable is properly initialized _after_.
 2015-05-30 02:26:55 +02:00
Don Ho
da262dd975 [FIX] Fix not compling issue. 2015-05-30 01:26:00 +02:00
Don HO
7fec9fa070 Merge pull request #130 from NN---/patch-2 
[UPDATE] Add more file extensions of XML based formats.
 2015-05-29 22:38:48 +02:00
Don HO
7bde130c0b Merge pull request #131 from NN---/master 
Synchronize VS2015 project with VS2013.
 2015-05-29 10:36:11 +02:00
Don HO
14a9ec6d19 [UPDATE] Add Section "Coding Style" 2015-05-29 03:56:29 +02:00
NN
1f5f5db147 Add .vs folder to ignore 2015-05-28 21:59:41 +03:00
NN
62120359e0 Merge remote-tracking branch 'base/master' 2015-05-28 21:07:47 +03:00
Christian Grasser
e1d8e055c8 Merge branch 'master' of https://github.com/chcg/notepad-plus-plus into GWLP_648 2015-05-28 19:37:24 +02:00
Christian Grasser
c8254f89d1 renamed missed CallWindowProcW Unicode version also to CallWindowProc 2015-05-28 19:33:39 +02:00
Christian Grasser
f45f58b4b2 Correct build issue on donho master 2015-05-28 19:26:16 +02:00
Don Ho
9d50da76b1 [CODE_ENHANCEMENT] Code enhancement. 2015-05-28 18:11:35 +02:00