edfa987f4e
x64 issue, replace int for bufferid by bufferid itself, otherwise x64 crashes as bufferid aka buffer * differs from int under x64
2015-06-08 12:11:10 +02:00
581c7b2a72
enable common controls als for amd64\x64 architecture, otherwise xp style is not available and bitmap buttons are not working correctly
2015-06-08 09:26:24 +02:00
6ec31f4f85
avoid x64 pointer issues, leading to crash on tab resorting
2015-06-08 09:07:41 +02:00
73dee04dea
Further changes for x64 builds
2015-06-08 08:48:05 +02:00
10d1c91c39
Merge branch 'master' of https://github.com/chcg/notepad-plus-plus into GWLP_648
2015-06-03 21:58:28 +02:00
4a14960090
correct whitespace merge difference to master
2015-06-03 01:38:44 +02:00
d11cba6798
merge with master and resolve confilcts
2015-06-03 01:31:39 +02:00
bc94d07766
[UPDATE] Unprecompile headers (part 4 - final)
2015-06-03 00:55:28 +02:00
246c8bd168
[UPDATE] Unprecompile headers (part 3)
2015-06-02 18:01:47 +02:00
3f1e3da7d2
Merge pull request #153 from NN---/VS2015
...
[UPDATE] Make compilation on VS2015
2015-06-01 23:48:04 +02:00
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
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
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
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
c18101823a
Add missing files.
...
Add warning 4091 to be ignored.
Define _CRT_NON_CONFORMING_WCSTOK globally.
2015-06-01 21:40:20 +03:00
f3934fadb7
Fix array termination error.
2015-06-01 18:55:25 +02:00
23ac5e3da8
Mark some methods as const.
2015-06-01 18:48:49 +02:00
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
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
54c8fd7ac8
Make case of "all" consistent.
2015-06-01 18:10:43 +02:00
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
57664ff70e
Merge pull request #142 from NN---/thread
...
[UPDATE] Remove unnecessary casts.
2015-06-01 00:56:05 +02:00
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
6d654bef5a
Merge branch 'master' of https://github.com/chcg/notepad-plus-plus into GWLP_648
2015-05-31 22:55:50 +02:00
e9e710a3d4
[UPDATE] Unprecompile headers (part 2)
2015-05-31 22:40:07 +02:00
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
b35e759d11
[UPDATE] Unprecompile headers
2015-05-31 15:57:17 +02:00
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
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
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
3319bcc581
Fix incorrect thread procedure prototype. It has to be __stdcall.
...
Remove unnecessary casts.
2015-05-30 21:06:32 +03:00
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
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
3ca488d0bc
Also sync when pasting.
...
See Sourceforge #5327 .
2015-05-30 10:16:19 +02:00
8976240dcd
Merge pull request #138 from milipili/master
...
[ScitillaComponent: Buffer: _currentStatus is used uninitialized in ctor
2015-05-30 02:41:46 +02:00
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
da262dd975
[FIX] Fix not compling issue.
2015-05-30 01:26:00 +02:00
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
62120359e0
Merge remote-tracking branch 'base/master'
2015-05-28 21:07:47 +03:00
e1d8e055c8
Merge branch 'master' of https://github.com/chcg/notepad-plus-plus into GWLP_648
2015-05-28 19:37:24 +02:00
c8254f89d1
renamed missed CallWindowProcW Unicode version also to CallWindowProc
2015-05-28 19:33:39 +02:00
f45f58b4b2
Correct build issue on donho master
2015-05-28 19:26:16 +02:00
9d50da76b1
[CODE_ENHANCEMENT] Code enhancement.
2015-05-28 18:11:35 +02:00
c8e0943286
Synchronize VS2015 project with VS2013.
2015-05-28 07:39:27 +03:00
39ccda99ce
More XML based formats
2015-05-28 07:00:50 +03:00
7f6dd17f03
[CODE_ENHANCEMENT] Code enhancement.
2015-05-28 01:22:28 +02:00
c123fd1a01
[CODE_ENHANCEMENT] Init some uninitialized vars.
2015-05-27 23:47:06 +02:00
c3697d2055
Cleanup usage of remaining Pre-Unicode interface usage of SetWindowLongPtrW, SetWindowLongPtrA -> SetWindowLongPtr; GetWindowLongPtrW -> GetWindowLongPtr
2015-05-27 22:59:46 +02:00
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
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
Christian Grasser