Commit Graph

1089 Commits (11a51aa05e794f59bba85dfed0b69008010da946)

Author SHA1 Message Date
Christian Grasser 73dee04dea Further changes for x64 builds 2015-06-08 08:48:05 +02:00
Don Ho 251e987a71 [NEW_FEATURE] Add 2 context menus on status bar
Add language context menu and EOL conversion context menu on status bar.
2015-06-08 03:19:34 +02:00
Don Ho 7edd53a535 Merge branch 'master' of https://github.com/notepad-plus-plus/notepad-plus-plus 2015-06-07 23:23:26 +02:00
Don Ho 4ac665d0ce [UPGRADE] Upgrade Scintilla from v3.34 to v3.56. 2015-06-07 23:19:26 +02:00
Don HO a2acbede53 Merge pull request #165 from Rikk/patch-1
[UPDATE] Add key words "let" and "of" for JavaScript lang.
2015-06-07 13:56:46 +02:00
Ricardo 92df4f6840 Add "let" and "of" for JavaScript lang
Add `let` and `of` for JavaScript lang.

Refs:
https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/let
https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/for...of
2015-06-06 18:23:26 -03:00
NN 3ef870227d Use unordered_map 2015-06-06 23:25:05 +03:00
turbanoff 40bb92c0af Fix Uninitialized read in tinyxmlparser 2015-06-06 18:55:43 +03:00
Don HO 3ff0ad484d Merge pull request #151 from NN---/EnumFonts
[UPDATE] Use updated prototype of EnumFontFamExProc.
2015-06-06 14:34:50 +02:00
Don HO 76b77ac8c4 Merge pull request #152 from NN---/DlgProc
[UPDATE] Make DlgProc returns INT_PTR but not BOOL.
2015-06-06 12:36:23 +02:00
Don HO 33fd37a6f4 Merge pull request #157 from NN---/VS2015
[UPDATE] Update VS projects
2015-06-06 01:15:01 +02:00
Don Ho 4cca41267e [NEW_FEATURE] Save in new instance with admin privileges.
While user tries to save a file which requires administrator privileges,
another instance in admin mode could be launched to save the file in
question.
2015-06-05 18:51:52 +02:00
Don HO c3037a91df [TYPO] Fix a typo. 2015-06-05 14:21:06 +02:00
Don HO 0774106a40 Update langs.model.xml 2015-06-04 16:25:16 +02:00
Christian Grasser 10d1c91c39 Merge branch 'master' of https://github.com/chcg/notepad-plus-plus into GWLP_648 2015-06-03 21:58:28 +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
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 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
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
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 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 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
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
Don HO f7e5be4e2b Merge pull request #12 from dail8859/splitlines
[ENHANCEMENT] "Split Lines" uses the edge mode if enabled.
2015-05-24 19:18:59 +02:00
Don HO e70eb054b0 Merge pull request #46 from andreas-jonsson/repeat
[ENHANCEMENT] Add "repeat" option to column editor.
2015-05-24 18:40:04 +02:00
Don Ho 0628508ef0 [REMOVE] Remove solution file from git index. 2015-05-24 01:28:43 +02:00
Don Ho ec105d7b5f [UPDATE] Remove solution file from git index.
VisualStudioVersion could be different.
2015-05-24 01:23:59 +02:00
Don HO 99eca7b1bf Merge pull request #90 from rcdailey/multi-processor-build
[UPDATE] Enable multiprocessor compiling; Remove pre-compiling method.
2015-05-23 20:21:15 +02:00
Don Ho 6870368034 Update gitIgnore file. 2015-05-23 18:57:06 +02:00
Andreas Jönsson 4bd32caa5c Remove OPENFILENAMENPP structure. 2015-05-23 15:48:58 +02:00
Don Ho b85fc02841 [RELEASE] Notepad++ 6.7.8.2 release 2015-05-23 14:14:33 +02:00
Don Ho d3c7ade18c [NEW] Prevent from launching updater under XP due to the obsolet security
layer
2015-05-22 21:11:08 +02:00
Don HO f74bb0813b Merge pull request #95 from NN---/patch-1
[REMOVE] Remove binary file npp.pdb.
2015-05-22 13:20:18 +02:00
Andreas Jönsson 7c3376ae6b Use a rectangular selection as sort key. 2015-05-21 15:53:48 +02:00
NN 3644983bcb Add more xml file extensions 2015-05-20 20:37:08 +03:00
NN f867f40cb9 Add warnings description. 2015-05-20 12:39:28 +03:00
Andreas Jönsson 626dc02c4c Use old-style loop to be compatible with VS2010. 2015-05-20 08:25:14 +02:00
NN 2ef5e5eca3 Support compilation in VS2015.
Changes:
_CRT_NON_CONFORMING_WCSTOK - to have old wcstok behaviour
dbghelp.h doesn't disable warnings, do it manually.
Better casting from pointer to integral.
Disable warnings in tinyXml headers.
Disable warnings 4456;4457;4459 to not touch the source.
More details about the warnings: http://blogs.msdn.com/b/vcblog/archive/2014/11/12/improvements-to-warnings-in-the-c-compiler.aspx
2015-05-19 14:01:27 +03:00
Don Ho a76ff09ac0 [RELEASE] Notepad++ 6.7.8.1 release (WinGup bug-fix: remove the dependency of msvcr120.dll) 2015-05-19 03:40:56 +02:00
NN eca9471ba8 This file is not intended to be committed 2015-05-18 16:18:19 +03:00
Andreas Jönsson 7b9c342bda Fix outdated comment. 2015-05-18 09:32:24 +02:00