Commit Graph

1126 Commits

Author SHA1 Message Date
Don HO
223caa25d0 Merge pull request #164 from turbanoff/master
[BUG_FIXED] Fix Uninitialized read in tinyxmlparser
2015-06-24 01:01:52 +02:00
Don HO
c6e101b655 Merge pull request #178 from chcg/x64_build_adaptions
[UPDATE] X64 build adaptions
2015-06-24 00:55:41 +02:00
Don HO
95d7f45ff0 Merge pull request #184 from rddim/master
[UPDATE] Bulgarian language update
2015-06-24 00:41:58 +02:00
Don HO
4f0896df30 Merge pull request #231 from stenox/master
[UPDATE] Update ukrainian.xml
2015-06-24 00:39:51 +02:00
Don HO
3df3636f09 Merge pull request #268 from Rikk/patch-2
[UPDATE] Add CSS to languages that are auto-indented
2015-06-24 00:38:18 +02:00
Don HO
b0ec01b19e Merge pull request #278 from hrwatahiki/Japanese-localization
[UPDATE] Japanese localization for Notepad++ 6.7.7
2015-06-24 00:36:45 +02:00
Don HO
14b2fe1339 Merge pull request #283 from Rikk/patch-3
[UPDATE] Add "php" string to PHP auto-complete
2015-06-24 00:34:48 +02:00
Don Ho
b828ed21d2 [NEW_RELEASE] Notepad++ 6.7.9.2 release. 2015-06-23 00:06:27 +02:00
Ricardo
2ad0a7df57 Add "php" string to PHP auto-complete
Fix https://github.com/notepad-plus-plus/notepad-plus-plus/issues/279
2015-06-22 05:13:35 -03:00
hrwatahiki
83964662bb Japanese localization for Notepad++ 6.7.7 (same version as english.xml) 2015-06-21 21:43:51 +09:00
Don Ho
e3450defc0 [RELEASE] Notepad++ release 6.7.9.1 2015-06-21 10:44:17 +02:00
rddim
2147bcc0d2 [UPDATE] Bulgarian language
added <Item id="47011" name="Live Support"/>
2015-06-20 11:16:33 +03:00
Don HO
0d768dd289 Update langs.model.xml 2015-06-20 02:56:27 +02:00
Ricardo
3f7dedfeb7 Add CSS to languages that are auto-indented
Possible fix for https://github.com/notepad-plus-plus/notepad-plus-plus/issues/257

Needs testing. Someone that can compile Npp, please test this!
2015-06-19 19:59:54 -03:00
Christian Grasser
d6c72fa3f7 Merge branch 'master' of https://github.com/notepad-plus-plus/notepad-plus-plus into x64_build_adaptions 2015-06-18 07:23:03 +02:00
Christian Grasser
1c25ae96e6 Correct issue with missing text in keyboard shortcut mapper grid 2015-06-18 07:22:27 +02:00
Don Ho
d1ed7683f4 [UPDATE] Change the print default option
from WYSIWYG to "without background coloour".
2015-06-18 02:50:28 +02:00
Don Ho
c14f87c4b0 [UPDATE] Replace "Forum" command by "Live Support" one. 2015-06-18 01:35:15 +02:00
Artem Polivanchuk
8b0c4c0732 Update ukrainian.xml 2015-06-15 22:21:13 +03:00
Jon Fritzler
7986366249 Add missing Mutex files to VS2015 project :) 2015-06-15 12:09:29 -06:00
Don HO
fed0ff5b73 Merge pull request #167 from Rikk/patch-1
[UPDATE] Add some more keywords to JS auto-completion.
2015-06-14 18:39:54 +02:00
Don Ho
856924658b [NEW] Add "Google Search" in the context menu. 2015-06-14 17:50:10 +02:00
Don Ho
4ace901a07 [UPDATE] Method getContextMenuFromXmlTree refactoring
The method getContextMenuFromXmlTree of NppParameters is too long to
maintain. Making 2 new methods to make the method in question more
readable.
2015-06-14 17:49:27 +02:00
Don Ho
9ad71107e9 [BUG_FIXED] Lock some operations for data integrality.
Use mutex of Yuni library to lock critical operation for the
compatibility of windows xp sp2.
For more info of Yuni library: https://github.com/libyuni
2015-06-12 22:10:37 +02:00
rddim
34c6a542e5 [UPDATE]Bulgarian language update
Bulgarian language update for version 6.7.9
2015-06-12 17:55:44 +03:00
Don Ho
acb713d9e6 [RELEASE] Notepad++ 6.7.9 release 2015-06-12 00:53:35 +02:00
Don Ho
0ee535b263 [BUG_FIXED] Make retro-compatibility with xp sp2 2015-06-12 00:26:00 +02:00
Christian Grasser
a8a6f2c881 - avoid some compiler warning
- build also without SCI_OWNREGEX
2015-06-11 17:41:07 +02:00
Christian Grasser
0d1297b9c7 added x64 build target, copied from win32 version, relaxed treat warning as error, as multiple errors show up due to x64 type truncations on assignments 2015-06-11 11:25:16 +02:00
Christian Grasser
4cfdd40497 avoid build issue due to difference between declaration and definition INT_PTR vs. BOOL 2015-06-11 11:19:14 +02:00
Ricardo
dcfcd13a30 Add more keywords to JS auto-complete
Add more keywords to JS auto-complete.
This list is indeed in need of a complete update...
2015-06-08 19:36:34 -03:00
Christian Grasser
324a29a848 Merge branch 'GWLP_648' of https://github.com/chcg/notepad-plus-plus into x64_build_adaptions 2015-06-08 13:51:57 +02:00
Christian Grasser
10dfc331bf merge with master 2015-06-08 13:39:07 +02:00
Christian Grasser
a371ddf822 avoid level 2 warning about variable size mismatch for x64 2015-06-08 13:07:45 +02:00
Christian Grasser
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
Christian Grasser
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
Christian Grasser
6ec31f4f85 avoid x64 pointer issues, leading to crash on tab resorting 2015-06-08 09:07:41 +02:00
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