X64 build adaptions by chcg · Pull Request #178 · notepad-plus-plus/notepad-plus-plus

chcg · 2015-06-11T11:08:43Z

Followup of Gwlp 648, Use GWLP_* instead of GWL_* and DWLP_* instead of DWL_* #129 with more intrusive code changes
Contains further changes necessary for x64 builds in npp code
added x64 section in npp vcxprj file
adapted scintilla vcxprj file to be in line with npp one to build from single solution file containing both projects
further commit adds npps boost regex to scintilla vcxprj file and retrieves boost via nuget
avoid x64 crashes with user defined lexer, tab resorting
open issues:
- plenty of compiler warnings for x64 due to data loss by automatic casting of data types
- text is not visible in key shortcut mapper dialog under x64 only, also text is available during debugging and in modify dialog, maybe part of one of the compiler warnings
- influence on plugins
- adapt scintilla, npp boostregex nmakes to be x64 ready
- adapt vs2005 (should be removed according to notepadPlus.vs2005.vcproj #121 ) and vs2015 project files to be in sync with vs2013

…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.

…ead of reinterpret_cast<LONG> for SetWindowLongPtr

…ngPtrW, SetWindowLongPtrA -> SetWindowLongPtr; GetWindowLongPtrW -> GetWindowLongPtr

…to GWLP_648

…-plus-plus

…to GWLP_648

…tyle is not available and bitmap buttons are not working correctly

… crashes as bufferid aka buffer * differs from int under x64

…-plus-plus

…into x64_build_adaptions

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

…n INT_PTR vs. BOOL

…ing as error, as multiple errors show up due to x64 type truncations on assignments

…ons 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>

- add boost via nuget package

- build also without SCI_OWNREGEX

ariccio · 2015-06-15T22:06:17Z

PowerEditor/src/WinControls/FunctionList/functionParser.cpp

Two things:

std::make_pair(begin, end) is more concise.

Why the C-style casts? Why not static_cast<int>(begin), static_cast<int>(end) more on this in a second

more on this in a second

FunctionParser::getInvertZones is called from three places:

FunctionMixParser::parse, declared as: void FunctionMixParser::parse(std::vector<foundInfo> & foundInfos, size_t begin, size_t end, ScintillaEditView **ppEditView, generic_string classStructName)

FunctionZoneParser::parse, declared as: void FunctionZoneParser::parse(std::vector<foundInfo> & foundInfos, size_t begin, size_t end, ScintillaEditView **ppEditView, generic_string classStructName)

FunctionUnitParser::parse, declared as: void FunctionUnitParser::parse(std::vector<foundInfo> & foundInfos, size_t begin, size_t end, ScintillaEditView **ppEditView, generic_string classStructName)

All three of which are virtually called from FunctionParsersManager::parse, where docLen(end) is an int, that's apparently coerced to an int.

If we change the declaration/definition of FunctionMixParser::parse, FunctionZoneParser::parse, FunctionUnitParser::parse, to accept begin & end as ints, then we can also change FunctionParser::getInvertZones to accept begin & end as ints.

As best as I can tell, many internal function calls (in FunctionMixParser::parse, FunctionZoneParser::parse, and FunctionUnitParser::parse) accept begin & end as ints as they are now, so this won't require any rippling changes. But, we'd avoid all the casting.

cleaning up this area seems to be a different story, just slightly related to x64, so I just made it compilable and used the casting style from the rest of the file
so I would consider that as a separate PR for cleaning up the plenty of x64 compiler warnings regarding:

warning C4267|C4244: 'Z' : conversion from 'X' to 'Y', possible loss of data

Fair enough, so long as we don't forget it.

ariccio · 2015-06-16T00:54:56Z

The boost NuGet package is a great idea! If it was a header-only library, git-subtree would probably be better.

Aside from the core scintilla edits and the FunctionParsersManager casting, everything looks good.

chcg · 2015-06-16T11:18:25Z

Got the idea from #139, but it is still not clear to me how to integrate it with the nmake build, but from my point of view it is easier to build both parts npp and scilexer from within one VS solution instead of switching to commandline and nmake and dealing with additional boost sources.

…-plus-plus into x64_build_adaptions

chcg · 2015-06-18T08:18:58Z

Fixed open issue:

text is not visible in key shortcut mapper dialog under x64 only, also text is available during debugging and in modify dialog, maybe part of one of the compiler warnings

ariccio · 2015-06-18T19:45:02Z

I'm thinking that you might want to squash all of the commits in this Pull Request, as it's getting very big.

ariccio · 2015-06-18T19:49:22Z

there are a multitude of tutorials on squashing commits, but I'm not sure which to suggest.

[UPDATE] X64 build adaptions

ariccio · 2015-06-24T00:20:08Z

@milipili I really like how you're using milestones to organize issues & pull requests, but it seems like you were beaten to it?

milipili · 2015-06-24T08:31:34Z

yep :) I was a bit too careful. But this merge was planned actually.

update to Scinitlla Release 5.3.6 (https://www.scintilla.org/scintilla536.zip) Released 26 July 2023. Redraw calltip after showing as didn't update when size of new text exactly same as previous. Feature notepad-plus-plus#1486. On Win32 fix reverse arrow cursor when scaled. Bug notepad-plus-plus#2382. On Win32 hide cursor when typing if that system preference has been chosen. Bug notepad-plus-plus#2333. On Win32 and Qt, stop aligning IME candidate window to target. It is now always aligned to start of composition string. This undoes part of feature notepad-plus-plus#1300. Feature notepad-plus-plus#1488, Bug notepad-plus-plus#2391, Feature notepad-plus-plus#1300. On Qt, for IMEs, update micro focus when selection changes. This may move the location of IME popups to align with the caret. On Qt, implement replacement for IMEs which may help with actions like reconversion. This is similar to delete-surrounding on GTK. and Lexilla Release 5.2.6 (https://www.scintilla.org/lexilla526.zip) Released 26 July 2023. Include empty word list names in value returned by DescribeWordListSets and SCI_DESCRIBEKEYWORDSETS. Issue notepad-plus-plus#175, Pull request notepad-plus-plus#176. Bash: style here-doc end delimiters as SCE_SH_HERE_DELIM instead of SCE_SH_HERE_Q. Issue notepad-plus-plus#177. Bash: allow '$' as last character in string. Issue notepad-plus-plus#180, Pull request notepad-plus-plus#181. Bash: fix state after expansion. Highlight all numeric and file test operators. Don't highlight dash in long option as operator. Issue notepad-plus-plus#182, Pull request notepad-plus-plus#183. Bash: strict checking of special parameters ($*, $@, $$, ...) with property lexer.bash.special.parameter to specify valid parameters. Issue notepad-plus-plus#184, Pull request notepad-plus-plus#186. Bash: recognize keyword before redirection operators (< and >). Issue notepad-plus-plus#188, Pull request notepad-plus-plus#189. Errorlist: recognize Bash diagnostic messages. HTML: allow ASP block to terminate inside line comment. Issue notepad-plus-plus#185. HTML: fix folding with JSP/ASP.NET <%-- comment. Issue notepad-plus-plus#191. HTML: fix incremental styling of multi-line ASP.NET directive. Issue notepad-plus-plus#191. Matlab: improve arguments blocks. Add support for multiple arguments blocks. Prevent "arguments" from being keyword in function declaration line. Fix semicolon handling. Pull request notepad-plus-plus#179. Visual Prolog: add support for embedded syntax with SCE_VISUALPROLOG_EMBEDDED and SCE_VISUALPROLOG_PLACEHOLDER. Styling of string literals changed with no differentiation between literals with quotes and those that are prefixed with "@". Quote characters are in a separate style (SCE_VISUALPROLOG_STRING_QUOTE) to contents (SCE_VISUALPROLOG_STRING). SCE_VISUALPROLOG_CHARACTER, SCE_VISUALPROLOG_CHARACTER_TOO_MANY, SCE_VISUALPROLOG_CHARACTER_ESCAPE_ERROR, SCE_VISUALPROLOG_STRING_EOL_OPEN, and SCE_VISUALPROLOG_STRING_VERBATIM_SPECIAL were removed (replaced with SCE_VISUALPROLOG_UNUSED[1-5]). Pull request notepad-plus-plus#178.

update to Scinitlla Release 5.3.6 (https://www.scintilla.org/scintilla536.zip) Released 26 July 2023. Redraw calltip after showing as didn't update when size of new text exactly same as previous. Feature notepad-plus-plus#1486. On Win32 fix reverse arrow cursor when scaled. Bug notepad-plus-plus#2382. On Win32 hide cursor when typing if that system preference has been chosen. Bug notepad-plus-plus#2333. On Win32 and Qt, stop aligning IME candidate window to target. It is now always aligned to start of composition string. This undoes part of feature notepad-plus-plus#1300. Feature notepad-plus-plus#1488, Bug notepad-plus-plus#2391, Feature notepad-plus-plus#1300. On Qt, for IMEs, update micro focus when selection changes. This may move the location of IME popups to align with the caret. On Qt, implement replacement for IMEs which may help with actions like reconversion. This is similar to delete-surrounding on GTK. and Lexilla Release 5.2.6 (https://www.scintilla.org/lexilla526.zip) Released 26 July 2023. Include empty word list names in value returned by DescribeWordListSets and SCI_DESCRIBEKEYWORDSETS. Issue notepad-plus-plus#175, Pull request notepad-plus-plus#176. Bash: style here-doc end delimiters as SCE_SH_HERE_DELIM instead of SCE_SH_HERE_Q. Issue notepad-plus-plus#177. Bash: allow '$' as last character in string. Issue notepad-plus-plus#180, Pull request notepad-plus-plus#181. Bash: fix state after expansion. Highlight all numeric and file test operators. Don't highlight dash in long option as operator. Issue notepad-plus-plus#182, Pull request notepad-plus-plus#183. Bash: strict checking of special parameters ($*, $@, $$, ...) with property lexer.bash.special.parameter to specify valid parameters. Issue notepad-plus-plus#184, Pull request notepad-plus-plus#186. Bash: recognize keyword before redirection operators (< and >). Issue notepad-plus-plus#188, Pull request notepad-plus-plus#189. Errorlist: recognize Bash diagnostic messages. HTML: allow ASP block to terminate inside line comment. Issue notepad-plus-plus#185. HTML: fix folding with JSP/ASP.NET <%-- comment. Issue notepad-plus-plus#191. HTML: fix incremental styling of multi-line ASP.NET directive. Issue notepad-plus-plus#191. Matlab: improve arguments blocks. Add support for multiple arguments blocks. Prevent "arguments" from being keyword in function declaration line. Fix semicolon handling. Pull request notepad-plus-plus#179. Visual Prolog: add support for embedded syntax with SCE_VISUALPROLOG_EMBEDDED and SCE_VISUALPROLOG_PLACEHOLDER. Styling of string literals changed with no differentiation between literals with quotes and those that are prefixed with "@". Quote characters are in a separate style (SCE_VISUALPROLOG_STRING_QUOTE) to contents (SCE_VISUALPROLOG_STRING). SCE_VISUALPROLOG_CHARACTER, SCE_VISUALPROLOG_CHARACTER_TOO_MANY, SCE_VISUALPROLOG_CHARACTER_ESCAPE_ERROR, SCE_VISUALPROLOG_STRING_EOL_OPEN, and SCE_VISUALPROLOG_STRING_VERBATIM_SPECIAL were removed (replaced with SCE_VISUALPROLOG_UNUSED[1-5]). Pull request notepad-plus-plus#178. Fix notepad-plus-plus#13901, fix notepad-plus-plus#13911, fix notepad-plus-plus#13943, close notepad-plus-plus#13940

chcg added 27 commits May 27, 2015 22:06

Further x86, x64 compatibility fix by reinterpret_cast<LONG_PTR> inst…

311c7d5

…ead of reinterpret_cast<LONG> for SetWindowLongPtr

Cleanup usage of remaining Pre-Unicode interface usage of SetWindowLo…

c3697d2

…ngPtrW, SetWindowLongPtrA -> SetWindowLongPtr; GetWindowLongPtrW -> GetWindowLongPtr

Correct build issue on donho master

f45f58b

renamed missed CallWindowProcW Unicode version also to CallWindowProc

c8254f8

Merge branch 'master' of https://github.com/chcg/notepad-plus-plus in…

e1d8e05

…to GWLP_648

Merge branch 'master' of https://github.com/donho/notepad-plus-plus

ebd90df

Merge branch 'master' of https://github.com/chcg/notepad-plus-plus in…

6d654be

…to GWLP_648

Merge branch 'master' of https://github.com/notepad-plus-plus/notepad…

7089022

…-plus-plus

merge with master and resolve confilcts

d11cba6

correct whitespace merge difference to master

4a14960

Merge branch 'master' of https://github.com/notepad-plus-plus/notepad…

9022978

…-plus-plus

Merge branch 'master' of https://github.com/chcg/notepad-plus-plus in…

10d1c91

…to GWLP_648

Further changes for x64 builds

73dee04

avoid x64 pointer issues, leading to crash on tab resorting

6ec31f4

enable common controls als for amd64\x64 architecture, otherwise xp s…

581c7b2

…tyle is not available and bitmap buttons are not working correctly

x64 issue, replace int for bufferid by bufferid itself, otherwise x64…

edfa987

… crashes as bufferid aka buffer * differs from int under x64

avoid level 2 warning about variable size mismatch for x64

a371ddf

Merge branch 'master' of https://github.com/notepad-plus-plus/notepad…

e8dfab6

…-plus-plus

merge with master

10dfc33

Merge branch 'GWLP_648' of https://github.com/chcg/notepad-plus-plus …

324a29a

…into x64_build_adaptions

- avoid compiler warning about unused parameter

e0bc440

avoid build issue due to difference between declaration and definitio…

4cfdd40

…n INT_PTR vs. BOOL

avoid access violation with empty string s -> length == 0

9d9be04

added x64 build target, copied from win32 version, relaxed treat warn…

0d1297b

…ing as error, as multiple errors show up due to x64 type truncations on assignments

adapted scintilla vs project to notepad++ naming of build configurati…

a6e0dd9

…ons 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>

milipili modified the milestone: 7.x (next) Jun 11, 2015

milipili added the enhancement Proposed enhancements of existing features label Jun 11, 2015

chcg added 2 commits June 11, 2015 17:37

- add npp boostregex dir/sources and define SCI_OWNREGEX

fdd2dbc

- add boost via nuget package

- avoid some compiler warning

a8a6f2c

- build also without SCI_OWNREGEX

ariccio reviewed Jun 15, 2015
View reviewed changes

NN--- mentioned this pull request Jun 16, 2015

Gwlp 648, Use GWLP_* instead of GWL_* and DWLP_* instead of DWL_* #129

Merged

chcg added 2 commits June 18, 2015 07:22

Correct issue with missing text in keyboard shortcut mapper grid

1c25ae9

Merge branch 'master' of https://github.com/notepad-plus-plus/notepad…

d6c72fa

…-plus-plus into x64_build_adaptions

donho added a commit that referenced this pull request Jun 23, 2015

Merge pull request #178 from chcg/x64_build_adaptions

c6e101b

[UPDATE] X64 build adaptions

donho merged commit c6e101b into notepad-plus-plus:master Jun 23, 2015

milipili modified the milestones: 6.x (master), 7.x (next) Jun 23, 2015

ariccio mentioned this pull request Jun 25, 2015

Crazy casting in FunctionParsersManager! #321

Closed

chcg deleted the x64_build_adaptions branch January 2, 2021 09:44

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

X64 build adaptions#178

X64 build adaptions#178
donho merged 31 commits intonotepad-plus-plus:masterfrom
chcg:x64_build_adaptions

chcg commented Jun 11, 2015

Uh oh!

ariccio Jun 15, 2015

Uh oh!

ariccio Jun 15, 2015

Uh oh!

chcg Jun 18, 2015

Uh oh!

ariccio Jun 18, 2015

Uh oh!

ariccio commented Jun 16, 2015

Uh oh!

chcg commented Jun 16, 2015

Uh oh!

chcg commented Jun 18, 2015

Uh oh!

ariccio commented Jun 18, 2015

Uh oh!

ariccio commented Jun 18, 2015

Uh oh!

ariccio commented Jun 24, 2015

Uh oh!

milipili commented Jun 24, 2015

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

chcg commented Jun 11, 2015

Uh oh!

ariccio Jun 15, 2015

Choose a reason for hiding this comment

Uh oh!

ariccio Jun 15, 2015

Choose a reason for hiding this comment

Uh oh!

chcg Jun 18, 2015

Choose a reason for hiding this comment

Uh oh!

ariccio Jun 18, 2015

Choose a reason for hiding this comment

Uh oh!

ariccio commented Jun 16, 2015

Uh oh!

chcg commented Jun 16, 2015

Uh oh!

chcg commented Jun 18, 2015

Uh oh!

ariccio commented Jun 18, 2015

Uh oh!

ariccio commented Jun 18, 2015

Uh oh!

ariccio commented Jun 24, 2015

Uh oh!

milipili commented Jun 24, 2015

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants