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

1110 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christian Grasser
fdd2dbc21f - add npp boostregex dir/sources and define SCI_OWNREGEX 
- add boost via nuget package
 2015-06-11 17:37:54 +02:00
Christian Grasser
a6e0dd9a53 adapted scintilla vs project to notepad++ naming of build configurations from 
Debug -> Unicode Debug and Release -> Unicode Release, to hav a consistent look in VS solution
Used same
ToolsVersion="12.0"
and
<PlatformToolset>v120_xp</PlatformToolset>
 2015-06-11 11:31:59 +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
9d9be045ae avoid access violation with empty string s -> length == 0 2015-06-11 11:22:05 +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
Christian Grasser
e0bc440df7 - avoid compiler warning about unused parameter 2015-06-11 10:10:43 +02:00
Christian Grasser
2a9b099a08 - avoid build issue for unicode: 
2>..\lexers\LexUser.cxx(1406): error C2664: 'void GenerateVector(vvstring &,const char *,char *,int)' : cannot convert argument 3 from 'const wchar_t [3]' to 'char *'
2>          Types pointed to are unrelated; conversion requires reinterpret_cast, C-style cast or function-style cast
 2015-06-11 10:10:19 +02: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
e8dfab6711 Merge branch 'master' of https://github.com/notepad-plus-plus/notepad-plus-plus 2015-06-08 13:09:18 +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
Don HO
aa944fdfe3 Merge pull request #105 from NN---/unordered_map 
[ENHANCEMENT] Use unordered_map instead map for better performance.
 2015-06-07 00:16:39 +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
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
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