Commit Graph

1203 Commits

Author SHA1 Message Date
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
NN
c8e0943286 Synchronize VS2015 project with VS2013. 2015-05-28 07:39:27 +03:00
NN
39ccda99ce More XML based formats 2015-05-28 07:00:50 +03:00
Don Ho
7f6dd17f03 [CODE_ENHANCEMENT] Code enhancement. 2015-05-28 01:22:28 +02:00
Don Ho
c123fd1a01 [CODE_ENHANCEMENT] Init some uninitialized vars. 2015-05-27 23:47:06 +02:00
Christian Grasser
c3697d2055 Cleanup usage of remaining Pre-Unicode interface usage of SetWindowLongPtrW, SetWindowLongPtrA -> SetWindowLongPtr; GetWindowLongPtrW -> GetWindowLongPtr 2015-05-27 22:59:46 +02:00
Christian Grasser
311c7d578e Further x86, x64 compatibility fix by reinterpret_cast<LONG_PTR> instead of reinterpret_cast<LONG> for SetWindowLongPtr 2015-05-27 22:47:40 +02:00
Christian Grasser
4d694ea704 Add patch from http://sourceforge.net/p/notepad-plus/patches/648/ by Xileer Torias with comment:
Updated the GetWindowLongPtr and SetWindowLongPtrW nIndex reference as per https://msdn.microsoft.com/en-us/library/windows/desktop/ms633585%28v=vs.85%29.aspx and https://msdn.microsoft.com/en-us/library/windows/desktop/ms644898(v=vs.85).aspx

This alters the function to be compatible with both x86, and x64 as to simplify future x64 builds.
2015-05-27 22:06:53 +02:00
Don HO
084d3c60a8 Update CONTRIBUTING.md 2015-05-27 17:11:08 +02:00
Don HO
2216c19dd0 Update CONTRIBUTING.md 2015-05-27 16:56:49 +02:00
Don HO
ad5788d266 Merge pull request #114 from pnedev/findinfiles_1
Enhance FindInFiles - part 1
2015-05-27 02:42:48 +02:00
Andreas Jönsson
5b28e27b3d Add "static" to get internal linkage. 2015-05-26 22:54:11 +02:00
Andreas Jönsson
2a7ef2ecf0 Guard long-running operations with a mutex
The session snapshot feature runs in its own thread and access to
Scintilla etc is not thread-safe. As a *temporary* and *non-exhaustive*
fix we guard some long-running operations (undo, redo, replace, sort)
with a mutex to prevent data corruption.
2015-05-26 15:58:46 +02:00
Don Ho
2beb7e2dfe Update .gitIgnore file 2015-05-26 09:25:36 +02:00
Don HO
56ceaf5546 Merge pull request #117 from NN---/VS2015
[ADD] Add VS2015 project file and make notepad++ project compatible with VS2015.
2015-05-26 09:12:03 +02:00
Don HO
07968d7ed6 Merge pull request #116 from jay1109/master
[UPDATE] Optimize font quality for LCD.
2015-05-26 03:00:03 +02:00
Don HO
805ab2b9ff Merge pull request #86 from andreas-jonsson/decimal_sort
[NEW_FEATURE] Refine sort lines feature: Add Sort Lines Lexicographically/Integer/Decimal (comma) /Decimal (dot) with Ascending and Descending commands.
2015-05-25 22:59:26 +02:00
Andreas Jönsson
f43c9875b3 Fix menu options. 2015-05-25 20:50:57 +02:00
NN
7ead0542cc Add special project for VS2015 2015-05-25 13:04:18 +03:00
jay1109
e2472bce88 Optimize font quality for LCD 2015-05-25 11:40:38 +02:00
Pavel Nedev
d6b321d2d5 Properly position on screen FindInFiles progress window
Use Search Dialog position as bias for the progress window position to avoid bad appearence on multiple monitors setups.
2015-05-25 11:04:31 +03:00
Pavel Nedev
df7ddabff0 Make FindInFiles progress window behave like modal 2015-05-25 11:03:21 +03:00
Pavel Nedev
4409277180 Display find progress status on cancel operation also 2015-05-25 11:01:50 +03:00
Pavel Nedev
43ac186d2b Auto-fit filename in FindInFiles progress window
This way the filename doesn't spread on multiple lines.
2015-05-25 11:01:16 +03:00
Pavel Nedev
ccee6ea29d Refresh N++ window on Finder creation
This makes Notepad++ window look clean when starting Find/Replace InFiles operation for the first time.
2015-05-25 11:00:47 +03:00
Don HO
a7e00affb4 Merge pull request #110 from andreas-jonsson/remove_struct
[UPDATE] Remove OPENFILENAMENPP structure.
2015-05-25 01:10:53 +02:00
Don Ho
bdb06f3861 [UPDATE] Update a quote. 2015-05-25 00:55:00 +02:00
Don HO
ec9712665a Merge pull request #104 from NN---/patch-2
[UPDATE] Add more xml file extensions.
2015-05-25 00:45:59 +02:00
Don HO
af664e49c5 Merge pull request #112 from Croydon/master
[UPDATE] Add jsm to the Javascript extensions.
2015-05-25 00:36:27 +02:00
Michael
b8adf46489 Add jsm to the Javascript extensions
.jsm is short for Javascript module and is at least used in Mozilla Addons for shared code.
2015-05-25 00:03:48 +02:00