Fierelier/notepad-plus-plus-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #178 from chcg/x64_build_adaptions

Browse Source 
[UPDATE] X64 build adaptions
This commit is contained in:
Don HO 2015-06-24 00:55:41 +02:00
commit c6e101b655
46 changed files with 306 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h
View File

@ -228,13 +228,13 @@ enum winVer{WV_UNKNOWN, WV_WIN32S, WV_95, WV_98, WV_ME, WV_NT, WV_W2K, WV_XP, WV
// allocate fullFilePath with the return values + 1, then call it again to get full path file name // allocate fullFilePath with the return values + 1, then call it again to get full path file name
#define NPPM_GETBUFFERIDFROMPOS (NPPMSG + 59) #define NPPM_GETBUFFERIDFROMPOS (NPPMSG + 59)
// INT NPPM_GETBUFFERIDFROMPOS(INT index, INT iView) // LRESULT NPPM_GETBUFFERIDFROMPOS(INT index, INT iView)
// wParam: Position of document // wParam: Position of document
// lParam: View to use, 0 = Main, 1 = Secondary // lParam: View to use, 0 = Main, 1 = Secondary
// Returns 0 if invalid // Returns 0 if invalid
#define NPPM_GETCURRENTBUFFERID (NPPMSG + 60) #define NPPM_GETCURRENTBUFFERID (NPPMSG + 60)
// INT NPPM_GETCURRENTBUFFERID(0, 0) // LRESULT NPPM_GETCURRENTBUFFERID(0, 0)
// Returns active Buffer // Returns active Buffer
#define NPPM_RELOADBUFFERID (NPPMSG + 61) #define NPPM_RELOADBUFFERID (NPPMSG + 61)

2
PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp
View File

@ -417,7 +417,7 @@ void PluginsManager::notify(const SCNotification *notification)
::MessageBoxA(NULL, e.what(), "Exception", MB_OK); ::MessageBoxA(NULL, e.what(), "Exception", MB_OK);
} catch (...) { } catch (...) {
TCHAR funcInfo[128]; TCHAR funcInfo[128];
generic_sprintf(funcInfo, TEXT("notify(SCNotification *notification) : \r notification->nmhdr.code == %d\r notification->nmhdr.hwndFrom == %d\r notification->nmhdr.idFrom == %d"),\ generic_sprintf(funcInfo, TEXT("notify(SCNotification *notification) : \r notification->nmhdr.code == %d\r notification->nmhdr.hwndFrom == %p\r notification->nmhdr.idFrom == %d"),\
scNotif.nmhdr.code, scNotif.nmhdr.hwndFrom, scNotif.nmhdr.idFrom); scNotif.nmhdr.code, scNotif.nmhdr.hwndFrom, scNotif.nmhdr.idFrom);
pluginCrashAlert(_pluginsCommands[i]._pluginName.c_str(), funcInfo); pluginCrashAlert(_pluginsCommands[i]._pluginName.c_str(), funcInfo);
} }

6
PowerEditor/src/Notepad_plus.cpp
View File

@ -3197,7 +3197,7 @@ void Notepad_plus::loadBufferIntoView(BufferID id, int whichOne, bool dontClose)
activateBuffer(id, whichOne); //activate. DocTab already activated but not a problem activateBuffer(id, whichOne); //activate. DocTab already activated but not a problem
MainFileManager->closeBuffer(idToClose, viewToOpen); //delete the buffer MainFileManager->closeBuffer(idToClose, viewToOpen); //delete the buffer
if (_pFileSwitcherPanel) if (_pFileSwitcherPanel)
_pFileSwitcherPanel->closeItem((int)idToClose, whichOne); _pFileSwitcherPanel->closeItem(idToClose, whichOne);
} }
else else
{ {
@ -4728,7 +4728,7 @@ void Notepad_plus::notifyBufferChanged(Buffer * buffer, int mask)
} }
if (_pFileSwitcherPanel) if (_pFileSwitcherPanel)
_pFileSwitcherPanel->setItemIconStatus((int)buffer); _pFileSwitcherPanel->setItemIconStatus(buffer);
if (!mainActive && !subActive) if (!mainActive && !subActive)
{ {
@ -4828,7 +4828,7 @@ void Notepad_plus::notifyBufferActivated(BufferID bufid, int view)
if (_pFileSwitcherPanel) if (_pFileSwitcherPanel)
{ {
_pFileSwitcherPanel->activateItem((int)bufid, currentView()); _pFileSwitcherPanel->activateItem(bufid, currentView());
} }
if (_pDocMap && (!_pDocMap->isClosed()) && _pDocMap->isVisible()) if (_pDocMap && (!_pDocMap->isClosed()) && _pDocMap->isVisible())

4
PowerEditor/src/NppBigSwitch.cpp
View File

@ -71,7 +71,7 @@ LRESULT CALLBACK Notepad_plus_Window::Notepad_plus_Proc(HWND hwnd, UINT Message,
switch(Message) switch(Message)
{ {
case WM_NCCREATE : // First message we get the ptr of instantiated object case WM_NCCREATE : // First message we get the ptr of instantiated object
// then stock it into GWL_USERDATA index in order to retrieve afterward // then stock it into GWLP_USERDATA index in order to retrieve afterward
{ {
Notepad_plus_Window *pM30ide = (Notepad_plus_Window *)(((LPCREATESTRUCT)lParam)->lpCreateParams); Notepad_plus_Window *pM30ide = (Notepad_plus_Window *)(((LPCREATESTRUCT)lParam)->lpCreateParams);
pM30ide->_hSelf = hwnd; pM30ide->_hSelf = hwnd;
@ -82,7 +82,7 @@ LRESULT CALLBACK Notepad_plus_Window::Notepad_plus_Proc(HWND hwnd, UINT Message,
default : default :
{ {
return ((Notepad_plus_Window *)::GetWindowLongPtr(hwnd, GWL_USERDATA))->runProc(hwnd, Message, wParam, lParam); return ((Notepad_plus_Window *)::GetWindowLongPtr(hwnd, GWLP_USERDATA))->runProc(hwnd, Message, wParam, lParam);
} }
} }
} }

2
PowerEditor/src/NppCommands.cpp
View File

@ -101,7 +101,7 @@ void Notepad_plus::command(int id)
if (id == IDM_FILESWITCHER_FILESCLOSEOTHERS) if (id == IDM_FILESWITCHER_FILESCLOSEOTHERS)
{ {
// Get current buffer and its view // Get current buffer and its view
_pFileSwitcherPanel->activateItem(int(_pEditView->getCurrentBufferID()), currentView()); _pFileSwitcherPanel->activateItem(_pEditView->getCurrentBufferID(), currentView());
} }
} }
break; break;

14
PowerEditor/src/NppIO.cpp
View File

@ -244,7 +244,7 @@ BufferID Notepad_plus::doOpen(const TCHAR *fileName, bool isRecursive, bool isRe
scnN.nmhdr.code = NPPN_FILEOPENED; scnN.nmhdr.code = NPPN_FILEOPENED;
_pluginsManager.notify(&scnN); _pluginsManager.notify(&scnN);
if (_pFileSwitcherPanel) if (_pFileSwitcherPanel)
_pFileSwitcherPanel->newItem((int)buf, currentView()); _pFileSwitcherPanel->newItem(buf, currentView());
} }
else else
{ {
@ -533,14 +533,14 @@ void Notepad_plus::doClose(BufferID id, int whichOne, bool doDeleteBackup)
//Do all the works //Do all the works
bool isBufRemoved = removeBufferFromView(id, whichOne); bool isBufRemoved = removeBufferFromView(id, whichOne);
int hiddenBufferID = -1; BufferID hiddenBufferID = BUFFER_INVALID;
if (nrDocs == 1 && canHideView(whichOne)) if (nrDocs == 1 && canHideView(whichOne))
{ //close the view if both visible { //close the view if both visible
hideView(whichOne); hideView(whichOne);
// if the current activated buffer is in this view, // if the current activated buffer is in this view,
// then get buffer ID to remove the entry from File Switcher Pannel // then get buffer ID to remove the entry from File Switcher Pannel
hiddenBufferID = ::SendMessage(_pPublicInterface->getHSelf(), NPPM_GETBUFFERIDFROMPOS, 0, whichOne); hiddenBufferID = reinterpret_cast<BufferID>(::SendMessage(_pPublicInterface->getHSelf(), NPPM_GETBUFFERIDFROMPOS, 0, whichOne));
} }
// Notify plugins that current file is closed // Notify plugins that current file is closed
@ -550,15 +550,15 @@ void Notepad_plus::doClose(BufferID id, int whichOne, bool doDeleteBackup)
_pluginsManager.notify(&scnN); _pluginsManager.notify(&scnN);
// The document could be clonned. // The document could be clonned.
// if the same buffer ID is not found then remove the entry from File Switcher Pannel // if the same buffer ID is not found then remove the entry from File Switcher Panel
if (_pFileSwitcherPanel) if (_pFileSwitcherPanel)
{ {
//int posInfo = ::SendMessage(_pPublicInterface->getHSelf(), NPPM_GETPOSFROMBUFFERID, (WPARAM)id ,0); //int posInfo = ::SendMessage(_pPublicInterface->getHSelf(), NPPM_GETPOSFROMBUFFERID, (WPARAM)id ,0);
_pFileSwitcherPanel->closeItem((int)id, whichOne); _pFileSwitcherPanel->closeItem(id, whichOne);
if (hiddenBufferID != -1) if (hiddenBufferID != BUFFER_INVALID)
_pFileSwitcherPanel->closeItem((int)hiddenBufferID, whichOne); _pFileSwitcherPanel->closeItem(hiddenBufferID, whichOne);
} }
} }
command(IDM_VIEW_REFRESHTABAR); command(IDM_VIEW_REFRESHTABAR);

2
PowerEditor/src/Parameters.h
View File

@ -1365,7 +1365,7 @@ public:
// if (percent == 255) then opacq // if (percent == 255) then opacq
void SetTransparent(HWND hwnd, int percent) { void SetTransparent(HWND hwnd, int percent) {
if (!_transparentFuncAddr) return; if (!_transparentFuncAddr) return;
::SetWindowLongPtr(hwnd, GWL_EXSTYLE, ::GetWindowLongPtrW(hwnd, GWL_EXSTYLE) | 0x00080000); ::SetWindowLongPtr(hwnd, GWL_EXSTYLE, ::GetWindowLongPtr(hwnd, GWL_EXSTYLE) | 0x00080000);
if (percent > 255) if (percent > 255)
percent = 255; percent = 255;
if (percent < 0) if (percent < 0)

6
PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp
View File

@ -197,7 +197,7 @@ void Searching::displaySectionCentered(int posStart, int posEnd, ScintillaEditVi
pEditView->execute(SCI_SETANCHOR, posStart); pEditView->execute(SCI_SETANCHOR, posStart);
} }
LONG FindReplaceDlg::originalFinderProc = NULL; LONG_PTR FindReplaceDlg::originalFinderProc = NULL;
void FindReplaceDlg::addText2Combo(const TCHAR * txt2add, HWND hCombo, bool) void FindReplaceDlg::addText2Combo(const TCHAR * txt2add, HWND hCombo, bool)
{ {
@ -2264,8 +2264,8 @@ LRESULT FAR PASCAL FindReplaceDlg::finderProc(HWND hwnd, UINT message, WPARAM wP
{ {
if (message == WM_KEYDOWN && (wParam == VK_DELETE || wParam == VK_RETURN)) if (message == WM_KEYDOWN && (wParam == VK_DELETE || wParam == VK_RETURN))
{ {
ScintillaEditView *pScint = (ScintillaEditView *)(::GetWindowLongPtr(hwnd, GWL_USERDATA)); ScintillaEditView *pScint = (ScintillaEditView *)(::GetWindowLongPtr(hwnd, GWLP_USERDATA));
Finder *pFinder = (Finder *)(::GetWindowLongPtr(pScint->getHParent(), GWL_USERDATA)); Finder *pFinder = (Finder *)(::GetWindowLongPtr(pScint->getHParent(), GWLP_USERDATA));
if (wParam == VK_RETURN) if (wParam == VK_RETURN)
pFinder->GotoFoundLine(); pFinder->GotoFoundLine();
else // VK_DELETE else // VK_DELETE

2
PowerEditor/src/ScitillaComponent/FindReplaceDlg.h
View File

@ -308,7 +308,7 @@ protected :
virtual INT_PTR CALLBACK run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam); virtual INT_PTR CALLBACK run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam);
void addText2Combo(const TCHAR * txt2add, HWND comboID, bool isUTF8 = false); void addText2Combo(const TCHAR * txt2add, HWND comboID, bool isUTF8 = false);
generic_string getTextFromCombo(HWND hCombo, bool isUnicode = false) const; generic_string getTextFromCombo(HWND hCombo, bool isUnicode = false) const;
static LONG originalFinderProc; static LONG_PTR originalFinderProc;
// Window procedure for the finder // Window procedure for the finder
static LRESULT FAR PASCAL finderProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam); static LRESULT FAR PASCAL finderProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);

20
PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp
View File

@ -257,19 +257,9 @@ void ScintillaEditView::init(HINSTANCE hInst, HWND hPere)
_codepage = ::GetACP(); _codepage = ::GetACP();
//Use either Unicode or ANSI setwindowlong, depending on environment ::SetWindowLongPtr(_hSelf, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(this));
if (::IsWindowUnicode(_hSelf)) _callWindowProc = CallWindowProc;
{ _scintillaDefaultProc = reinterpret_cast<WNDPROC>(::SetWindowLongPtr(_hSelf, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(scintillaStatic_Proc)));
::SetWindowLongPtrW(_hSelf, GWL_USERDATA, reinterpret_cast<LONG>(this));
_callWindowProc = CallWindowProcW;
_scintillaDefaultProc = reinterpret_cast<WNDPROC>(::SetWindowLongPtrW(_hSelf, GWL_WNDPROC, reinterpret_cast<LONG>(scintillaStatic_Proc)));
}
else
{
::SetWindowLongPtrA(_hSelf, GWL_USERDATA, reinterpret_cast<LONG>(this));
_callWindowProc = CallWindowProcA;
_scintillaDefaultProc = reinterpret_cast<WNDPROC>(::SetWindowLongPtrA(_hSelf, GWL_WNDPROC, reinterpret_cast<LONG>(scintillaStatic_Proc)));
}
//Get the startup document and make a buffer for it so it can be accessed like a file //Get the startup document and make a buffer for it so it can be accessed like a file
attachDefaultDoc(); attachDefaultDoc();
@ -277,7 +267,7 @@ void ScintillaEditView::init(HINSTANCE hInst, HWND hPere)
LRESULT CALLBACK ScintillaEditView::scintillaStatic_Proc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) LRESULT CALLBACK ScintillaEditView::scintillaStatic_Proc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
{ {
ScintillaEditView *pScint = (ScintillaEditView *)(::GetWindowLongPtr(hwnd, GWL_USERDATA)); ScintillaEditView *pScint = (ScintillaEditView *)(::GetWindowLongPtr(hwnd, GWLP_USERDATA));
if (Message == WM_MOUSEWHEEL || Message == WM_MOUSEHWHEEL) if (Message == WM_MOUSEWHEEL || Message == WM_MOUSEHWHEEL)
{ {
@ -295,7 +285,7 @@ LRESULT CALLBACK ScintillaEditView::scintillaStatic_Proc(HWND hwnd, UINT Message
if (isSynpnatic || makeTouchPadCompetible) if (isSynpnatic || makeTouchPadCompetible)
return (pScint->scintillaNew_Proc(hwnd, Message, wParam, lParam)); return (pScint->scintillaNew_Proc(hwnd, Message, wParam, lParam));
ScintillaEditView *pScintillaOnMouse = (ScintillaEditView *)(::GetWindowLongPtr(hwndOnMouse, GWL_USERDATA)); ScintillaEditView *pScintillaOnMouse = (ScintillaEditView *)(::GetWindowLongPtr(hwndOnMouse, GWLP_USERDATA));
if (pScintillaOnMouse != pScint) if (pScintillaOnMouse != pScint)
return ::SendMessage(hwndOnMouse, Message, wParam, lParam); return ::SendMessage(hwndOnMouse, Message, wParam, lParam);
} }

4
PowerEditor/src/ScitillaComponent/ScintillaEditView.h
View File

@ -83,7 +83,7 @@ class NppParameters;
#define NB_WORD_LIST 4 #define NB_WORD_LIST 4
#define WORD_LIST_LEN 256 #define WORD_LIST_LEN 256
typedef int (* SCINTILLA_FUNC) (void*, int, int, int); typedef sptr_t(*SCINTILLA_FUNC) (void *, unsigned int, uptr_t, sptr_t);
typedef void * SCINTILLA_PTR; typedef void * SCINTILLA_PTR;
#define WM_DOCK_USERDEFINE_DLG (SCINTILLA_USER + 1) #define WM_DOCK_USERDEFINE_DLG (SCINTILLA_USER + 1)
@ -238,7 +238,7 @@ public:
virtual void init(HINSTANCE hInst, HWND hPere); virtual void init(HINSTANCE hInst, HWND hPere);
LRESULT execute(UINT Msg, WPARAM wParam=0, LPARAM lParam=0) const { LRESULT execute(UINT Msg, WPARAM wParam=0, LPARAM lParam=0) const {
return _pScintillaFunc(_pScintillaPtr, static_cast<int>(Msg), static_cast<int>(wParam), static_cast<int>(lParam)); return _pScintillaFunc(_pScintillaPtr, Msg, wParam, lParam);
}; };
void activateBuffer(BufferID buffer); void activateBuffer(BufferID buffer);

2
PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp
View File

@ -33,7 +33,7 @@
#include "AboutDlg.h" #include "AboutDlg.h"
#include "Parameters.h" #include "Parameters.h"
BOOL CALLBACK AboutDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK AboutDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam)
{ {
switch (message) switch (message)
{ {

2
PowerEditor/src/WinControls/AboutDlg/URLCtrl.h
View File

@ -56,7 +56,7 @@ protected :
bool _clicking; bool _clicking;
static LRESULT CALLBACK URLCtrlProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam){ static LRESULT CALLBACK URLCtrlProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam){
return ((URLCtrl *)(::GetWindowLongPtr(hwnd, GWL_USERDATA)))->runProc(hwnd, Message, wParam, lParam); return ((URLCtrl *)(::GetWindowLongPtr(hwnd, GWLP_USERDATA)))->runProc(hwnd, Message, wParam, lParam);
}; };
LRESULT runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam); LRESULT runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam);
}; };

2
PowerEditor/src/WinControls/AnsiCharPanel/ListView.h
View File

@ -52,7 +52,7 @@ protected:
LRESULT runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam); LRESULT runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam);
static LRESULT CALLBACK staticProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) { static LRESULT CALLBACK staticProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) {
return (((ListView *)(::GetWindowLongPtr(hwnd, GWL_USERDATA)))->runProc(hwnd, Message, wParam, lParam)); return (((ListView *)(::GetWindowLongPtr(hwnd, GWLP_USERDATA)))->runProc(hwnd, Message, wParam, lParam));
}; };
}; };

2
PowerEditor/src/WinControls/ColourPicker/ColourPicker.h
View File

@ -57,7 +57,7 @@ private :
bool _isEnabled; bool _isEnabled;
static LRESULT CALLBACK staticWinProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) { static LRESULT CALLBACK staticWinProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) {
return (((ColourPicker *)(::GetWindowLongPtr(hwnd, GWL_USERDATA)))->runProc(Message, wParam, lParam)); return (((ColourPicker *)(::GetWindowLongPtr(hwnd, GWLP_USERDATA)))->runProc(Message, wParam, lParam));
}; };
LRESULT runProc(UINT Message, WPARAM wParam, LPARAM lParam); LRESULT runProc(UINT Message, WPARAM wParam, LPARAM lParam);
void drawForeground(HDC hDC); void drawForeground(HDC hDC);

4
PowerEditor/src/WinControls/ColourPicker/ColourPopup.cpp
View File

@ -77,7 +77,7 @@ INT_PTR CALLBACK ColourPopup::dlgProc(HWND hwnd, UINT message, WPARAM wParam, LP
default : default :
{ {
ColourPopup *pColourPopup = reinterpret_cast<ColourPopup *>(::GetWindowLongPtr(hwnd, GWL_USERDATA)); ColourPopup *pColourPopup = reinterpret_cast<ColourPopup *>(::GetWindowLongPtr(hwnd, GWLP_USERDATA));
if (!pColourPopup) if (!pColourPopup)
return FALSE; return FALSE;
return pColourPopup->run_dlgProc(message, wParam, lParam); return pColourPopup->run_dlgProc(message, wParam, lParam);
@ -85,7 +85,7 @@ INT_PTR CALLBACK ColourPopup::dlgProc(HWND hwnd, UINT message, WPARAM wParam, LP
} }
} }
BOOL CALLBACK ColourPopup::run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam) INT_PTR CALLBACK ColourPopup::run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam)
{ {
switch (message) switch (message)

2
PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.h
View File

@ -60,7 +60,7 @@ private :
WNDPROC _oldProc; WNDPROC _oldProc;
static LRESULT CALLBACK staticProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam){ static LRESULT CALLBACK staticProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam){
ColourStaticTextHooker *pColourStaticTextHooker = reinterpret_cast<ColourStaticTextHooker *>(::GetWindowLongPtr(hwnd, GWL_USERDATA)); ColourStaticTextHooker *pColourStaticTextHooker = reinterpret_cast<ColourStaticTextHooker *>(::GetWindowLongPtr(hwnd, GWLP_USERDATA));
return pColourStaticTextHooker->colourStaticProc(hwnd, message, wParam, lParam); return pColourStaticTextHooker->colourStaticProc(hwnd, message, wParam, lParam);
}; };
LRESULT CALLBACK colourStaticProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam); LRESULT CALLBACK colourStaticProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam);

4
PowerEditor/src/WinControls/DockingWnd/DockingCont.h
View File

@ -154,13 +154,13 @@ protected :
// Subclassing caption // Subclassing caption
LRESULT runProcCaption(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam); LRESULT runProcCaption(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam);
static LRESULT CALLBACK wndCaptionProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) { static LRESULT CALLBACK wndCaptionProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) {
return (((DockingCont *)(::GetWindowLongPtr(hwnd, GWL_USERDATA)))->runProcCaption(hwnd, Message, wParam, lParam)); return (((DockingCont *)(::GetWindowLongPtr(hwnd, GWLP_USERDATA)))->runProcCaption(hwnd, Message, wParam, lParam));
}; };
// Subclassing tab // Subclassing tab
LRESULT runProcTab(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam); LRESULT runProcTab(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam);
static LRESULT CALLBACK wndTabProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) { static LRESULT CALLBACK wndTabProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) {
return (((DockingCont *)(::GetWindowLongPtr(hwnd, GWL_USERDATA)))->runProcTab(hwnd, Message, wParam, lParam)); return (((DockingCont *)(::GetWindowLongPtr(hwnd, GWLP_USERDATA)))->runProcTab(hwnd, Message, wParam, lParam));
}; };
virtual INT_PTR CALLBACK run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam); virtual INT_PTR CALLBACK run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam);

6
PowerEditor/src/WinControls/DockingWnd/DockingManager.cpp
View File

@ -48,7 +48,7 @@ LRESULT CALLBACK FocusWndProc(int nCode, WPARAM wParam, LPARAM lParam)
{ {
if (nCode == HC_ACTION && hWndServer) if (nCode == HC_ACTION && hWndServer)
{ {
DockingManager *pDockingManager = (DockingManager *)::GetWindowLongPtr(hWndServer, GWL_USERDATA); DockingManager *pDockingManager = (DockingManager *)::GetWindowLongPtr(hWndServer, GWLP_USERDATA);
if (pDockingManager) if (pDockingManager)
{ {
vector<DockingCont*> & vcontainer = pDockingManager->getContainerInfo(); vector<DockingCont*> & vcontainer = pDockingManager->getContainerInfo();
@ -194,7 +194,7 @@ LRESULT CALLBACK DockingManager::staticWinProc(HWND hwnd, UINT message, WPARAM w
return TRUE; return TRUE;
default : default :
pDockingManager = (DockingManager *)::GetWindowLongPtr(hwnd, GWL_USERDATA); pDockingManager = (DockingManager *)::GetWindowLongPtr(hwnd, GWLP_USERDATA);
if (!pDockingManager) if (!pDockingManager)
return ::DefWindowProc(hwnd, message, wParam, lParam); return ::DefWindowProc(hwnd, message, wParam, lParam);
return pDockingManager->runProc(hwnd, message, wParam, lParam); return pDockingManager->runProc(hwnd, message, wParam, lParam);
@ -717,7 +717,7 @@ LRESULT DockingManager::SendNotify(HWND hWnd, UINT message)
nmhdr.hwndFrom = _hParent; nmhdr.hwndFrom = _hParent;
nmhdr.idFrom = ::GetDlgCtrlID(_hParent); nmhdr.idFrom = ::GetDlgCtrlID(_hParent);
::SendMessage(hWnd, WM_NOTIFY, nmhdr.idFrom, (LPARAM)&nmhdr); ::SendMessage(hWnd, WM_NOTIFY, nmhdr.idFrom, (LPARAM)&nmhdr);
return ::GetWindowLongPtr(hWnd, DWL_MSGRESULT); return ::GetWindowLongPtr(hWnd, DWLP_MSGRESULT);
} }
void DockingManager::setDockedContSize(int iCont, int iSize) void DockingManager::setDockedContSize(int iCont, int iSize)

2
PowerEditor/src/WinControls/DockingWnd/DockingSplitter.cpp
View File

@ -135,7 +135,7 @@ LRESULT CALLBACK DockingSplitter::staticWinProc(HWND hwnd, UINT message, WPARAM
return TRUE; return TRUE;
default : default :
pDockingSplitter = (DockingSplitter *)::GetWindowLongPtr(hwnd, GWL_USERDATA); pDockingSplitter = (DockingSplitter *)::GetWindowLongPtr(hwnd, GWLP_USERDATA);
if (!pDockingSplitter) if (!pDockingSplitter)
return ::DefWindowProc(hwnd, message, wParam, lParam); return ::DefWindowProc(hwnd, message, wParam, lParam);
return pDockingSplitter->runProc(hwnd, message, wParam, lParam); return pDockingSplitter->runProc(hwnd, message, wParam, lParam);

2
PowerEditor/src/WinControls/DockingWnd/Gripper.cpp
View File

@ -179,7 +179,7 @@ LRESULT CALLBACK Gripper::staticWinProc(HWND hwnd, UINT message, WPARAM wParam,
return TRUE; return TRUE;
default : default :
pDlgMoving = (Gripper *)::GetWindowLongPtr(hwnd, GWL_USERDATA); pDlgMoving = (Gripper *)::GetWindowLongPtr(hwnd, GWLP_USERDATA);
if (!pDlgMoving) if (!pDlgMoving)
return ::DefWindowProc(hwnd, message, wParam, lParam); return ::DefWindowProc(hwnd, message, wParam, lParam);
return pDlgMoving->runProc(message, wParam, lParam); return pDlgMoving->runProc(message, wParam, lParam);

6
PowerEditor/src/WinControls/DocumentMap/documentMap.cpp
View File

@ -441,8 +441,8 @@ INT_PTR CALLBACK ViewZoneDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lP
_viewZoneCanvas = ::GetDlgItem(_hSelf, IDC_VIEWZONECANVAS); _viewZoneCanvas = ::GetDlgItem(_hSelf, IDC_VIEWZONECANVAS);
if (NULL != _viewZoneCanvas) if (NULL != _viewZoneCanvas)
{ {
::SetWindowLongPtrW(_viewZoneCanvas, GWL_USERDATA, reinterpret_cast<LONG>(this)); ::SetWindowLongPtr(_viewZoneCanvas, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(this));
_canvasDefaultProc = reinterpret_cast<WNDPROC>(::SetWindowLongPtr(_viewZoneCanvas, GWL_WNDPROC, reinterpret_cast<LONG>(canvasStaticProc))); _canvasDefaultProc = reinterpret_cast<WNDPROC>(::SetWindowLongPtr(_viewZoneCanvas, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(canvasStaticProc)));
return TRUE; return TRUE;
} }
break; break;
@ -495,7 +495,7 @@ INT_PTR CALLBACK ViewZoneDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM lP
LRESULT CALLBACK ViewZoneDlg::canvasStaticProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) LRESULT CALLBACK ViewZoneDlg::canvasStaticProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
{ {
ViewZoneDlg *pViewZoneDlg = reinterpret_cast<ViewZoneDlg *>(::GetWindowLongPtr(hwnd, GWL_USERDATA)); ViewZoneDlg *pViewZoneDlg = reinterpret_cast<ViewZoneDlg *>(::GetWindowLongPtr(hwnd, GWLP_USERDATA));
if (!pViewZoneDlg) if (!pViewZoneDlg)
return FALSE; return FALSE;
return pViewZoneDlg->canvas_runProc(hwnd, message, wParam, lParam); return pViewZoneDlg->canvas_runProc(hwnd, message, wParam, lParam);

2
PowerEditor/src/WinControls/FunctionList/functionListPanel.cpp
View File

@ -573,7 +573,7 @@ INT_PTR CALLBACK FunctionListPanel::run_dlgProc(UINT message, WPARAM wParam, LPA
_hToolbarMenu = CreateWindowEx(0,TOOLBARCLASSNAME,NULL, style, _hToolbarMenu = CreateWindowEx(0,TOOLBARCLASSNAME,NULL, style,
0,0,0,0,_hSelf,(HMENU)0, _hInst, NULL); 0,0,0,0,_hSelf,(HMENU)0, _hInst, NULL);
//::GetWindowLongPtr(_hToolbarMenu, GWL_WNDPROC); //::GetWindowLongPtr(_hToolbarMenu, GWLP_WNDPROC);
oldFunclstToolbarProc = (WNDPROC)::SetWindowLongPtr(_hToolbarMenu, GWLP_WNDPROC, (LONG_PTR)funclstToolbarProc); oldFunclstToolbarProc = (WNDPROC)::SetWindowLongPtr(_hToolbarMenu, GWLP_WNDPROC, (LONG_PTR)funclstToolbarProc);
TBBUTTON tbButtons[3]; TBBUTTON tbButtons[3];

6
PowerEditor/src/WinControls/FunctionList/functionParser.cpp
View File

@ -598,14 +598,14 @@ void FunctionParser::getInvertZones(vector< pair<int, int> > & destZones, vecto
{ {
if (sourceZones.size() == 0) if (sourceZones.size() == 0)
{ {
destZones.push_back(pair<int, int>(begin, end)); destZones.push_back(pair<int, int>((int)begin, (int)end));
} }
else else
{ {
// check the begin // check the begin
if (int(begin) < sourceZones[0].first) if (int(begin) < sourceZones[0].first)
{ {
destZones.push_back(pair<int, int>(begin, sourceZones[0].first - 1)); destZones.push_back(pair<int, int>((int)begin, sourceZones[0].first - 1));
} }
size_t i = 0; size_t i = 0;
@ -618,7 +618,7 @@ void FunctionParser::getInvertZones(vector< pair<int, int> > & destZones, vecto
} }
int lastBegin = sourceZones[i].second + 1; int lastBegin = sourceZones[i].second + 1;
if (lastBegin < int(end)) if (lastBegin < int(end))
destZones.push_back(pair<int, int>(lastBegin, end)); destZones.push_back(pair<int, int>(lastBegin, (int)end));
} }
} }

2
PowerEditor/src/WinControls/Grid/BabyGrid.cpp
View File

@ -1745,7 +1745,7 @@ LRESULT CALLBACK GridProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
int j,k,c; int j,k,c;
TCHAR tbuffer[1000]; TCHAR tbuffer[1000];
//it was found, get it //it was found, get it
SendMessage(BGHS[SelfIndex].hlist1,LB_GETTEXT,FindResult,(long)lParam); SendMessage(BGHS[SelfIndex].hlist1,LB_GETTEXT,FindResult,(LPARAM)lParam);
lstrcpy(tbuffer,(TCHAR*)lParam); lstrcpy(tbuffer,(TCHAR*)lParam);
k=lstrlen(tbuffer); k=lstrlen(tbuffer);
c=0; c=0;

6
PowerEditor/src/WinControls/Grid/BabyGridWrapper.h
View File

@ -49,7 +49,7 @@ public :
}; };
void setCursorColour(COLORREF coulour) { void setCursorColour(COLORREF coulour) {
::SendMessage(_hSelf, BGM_SETCURSORCOLOR, (UINT)coulour, 0); ::SendMessage(_hSelf, BGM_SETCURSORCOLOR, (WPARAM)coulour, 0);
}; };
void hideCursor() { void hideCursor() {
@ -64,7 +64,7 @@ public :
_BGCELL cell; _BGCELL cell;
cell.row = row; cell.row = row;
cell.col = col; cell.col = col;
::SendMessage(_hSelf, BGM_SETCELLDATA, (UINT)&cell, (long)text); ::SendMessage(_hSelf, BGM_SETCELLDATA, (WPARAM)&cell, (LPARAM)text);
}; };
void makeColAutoWidth(bool autoWidth = true) { void makeColAutoWidth(bool autoWidth = true) {
@ -79,7 +79,7 @@ public :
_BGCELL cell; _BGCELL cell;
cell.row = row; cell.row = row;
cell.col = col; cell.col = col;
::SendMessage(_hSelf, BGM_DELETECELL, (UINT)&cell, 0); ::SendMessage(_hSelf, BGM_DELETECELL, (WPARAM)&cell, 0);
}; };
void setColWidth(unsigned int col, unsigned int width) { void setColWidth(unsigned int col, unsigned int width) {

4
PowerEditor/src/WinControls/OpenSaveFileDialog/FileDialog.cpp
View File

@ -368,7 +368,7 @@ UINT_PTR CALLBACK FileDialog::OFNHookProc(HWND hWnd, UINT uMsg, WPARAM wParam, L
} }
// Don't touch the following 3 lines, they are cursed !!! // Don't touch the following 3 lines, they are cursed !!!
oldProc = (WNDPROC)::GetWindowLongPtr(hFileDlg, GWL_WNDPROC); oldProc = (WNDPROC)::GetWindowLongPtr(hFileDlg, GWLP_WNDPROC);
if ((long)oldProc > 0) if ((long)oldProc > 0)
::SetWindowLongPtr(hFileDlg, GWLP_WNDPROC, (LONG_PTR)fileDlgProc); ::SetWindowLongPtr(hFileDlg, GWLP_WNDPROC, (LONG_PTR)fileDlgProc);
@ -377,7 +377,7 @@ UINT_PTR CALLBACK FileDialog::OFNHookProc(HWND hWnd, UINT uMsg, WPARAM wParam, L
default : default :
{ {
FileDialog *pFileDialog = reinterpret_cast<FileDialog *>(::GetWindowLongPtr(hWnd, GWL_USERDATA)); FileDialog *pFileDialog = reinterpret_cast<FileDialog *>(::GetWindowLongPtr(hWnd, GWLP_USERDATA));
if (!pFileDialog) if (!pFileDialog)
{ {
return FALSE; return FALSE;

2
PowerEditor/src/WinControls/ProjectPanel/TreeView.h
View File

@ -118,7 +118,7 @@ protected:
LRESULT runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam); LRESULT runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam);
static LRESULT CALLBACK staticProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) { static LRESULT CALLBACK staticProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) {
return (((TreeView *)(::GetWindowLongPtr(hwnd, GWL_USERDATA)))->runProc(hwnd, Message, wParam, lParam)); return (((TreeView *)(::GetWindowLongPtr(hwnd, GWLP_USERDATA)))->runProc(hwnd, Message, wParam, lParam));
}; };
void cleanSubEntries(HTREEITEM hTreeItem); void cleanSubEntries(HTREEITEM hTreeItem);
void dupTree(HTREEITEM hTree2Dup, HTREEITEM hParentItem); void dupTree(HTREEITEM hTree2Dup, HTREEITEM hParentItem);

2
PowerEditor/src/WinControls/SplitterContainer/Splitter.cpp
View File

@ -251,7 +251,7 @@ LRESULT CALLBACK Splitter::staticWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LP
} }
default: default:
{ {
Splitter * pSplitter = (Splitter *)::GetWindowLongPtr(hWnd, GWL_USERDATA); Splitter * pSplitter = (Splitter *)::GetWindowLongPtr(hWnd, GWLP_USERDATA);
if (!pSplitter) if (!pSplitter)
return ::DefWindowProc(hWnd, uMsg, wParam, lParam); return ::DefWindowProc(hWnd, uMsg, wParam, lParam);

2
PowerEditor/src/WinControls/SplitterContainer/SplitterContainer.cpp
View File

@ -127,7 +127,7 @@ LRESULT CALLBACK SplitterContainer::staticWinProc(HWND hwnd, UINT message, WPARA
return TRUE; return TRUE;
default : default :
pSplitterContainer = (SplitterContainer *)::GetWindowLongPtr(hwnd, GWL_USERDATA); pSplitterContainer = (SplitterContainer *)::GetWindowLongPtr(hwnd, GWLP_USERDATA);
if (!pSplitterContainer) if (!pSplitterContainer)
return ::DefWindowProc(hwnd, message, wParam, lParam); return ::DefWindowProc(hwnd, message, wParam, lParam);
return pSplitterContainer->runProc(message, wParam, lParam); return pSplitterContainer->runProc(message, wParam, lParam);

2
PowerEditor/src/WinControls/StaticDialog/StaticDialog.cpp
View File

@ -148,7 +148,7 @@ INT_PTR CALLBACK StaticDialog::dlgProc(HWND hwnd, UINT message, WPARAM wParam, L
default : default :
{ {
StaticDialog *pStaticDlg = reinterpret_cast<StaticDialog *>(::GetWindowLongPtr(hwnd, GWL_USERDATA)); StaticDialog *pStaticDlg = reinterpret_cast<StaticDialog *>(::GetWindowLongPtr(hwnd, GWLP_USERDATA));
if (!pStaticDlg) if (!pStaticDlg)
return FALSE; return FALSE;
return pStaticDlg->run_dlgProc(message, wParam, lParam); return pStaticDlg->run_dlgProc(message, wParam, lParam);

18
PowerEditor/src/WinControls/TabBar/TabBar.cpp
View File

@ -152,7 +152,7 @@ void TabBar::activateAt(int index) const
TBHDR nmhdr; TBHDR nmhdr;
nmhdr.hdr.hwndFrom = _hSelf; nmhdr.hdr.hwndFrom = _hSelf;
nmhdr.hdr.code = TCN_SELCHANGE; nmhdr.hdr.code = TCN_SELCHANGE;
nmhdr.hdr.idFrom = reinterpret_cast<unsigned int>(this); nmhdr.hdr.idFrom = reinterpret_cast<UINT_PTR>(this);
nmhdr.tabOrigin = index; nmhdr.tabOrigin = index;
} }
@ -339,7 +339,7 @@ void TabBarPlus::doOwnerDrawTab()
{ {
if (_hwndArray[i]) if (_hwndArray[i])
{ {
DWORD style = ::GetWindowLongPtr(_hwndArray[i], GWL_STYLE); LONG_PTR style = ::GetWindowLongPtr(_hwndArray[i], GWL_STYLE);
if (isOwnerDrawTab()) if (isOwnerDrawTab())
style |= TCS_OWNERDRAWFIXED; style |= TCS_OWNERDRAWFIXED;
else else
@ -405,9 +405,7 @@ LRESULT TabBarPlus::runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPara
// Custom window message to change tab control style on the fly // Custom window message to change tab control style on the fly
case WM_TABSETSTYLE: case WM_TABSETSTYLE:
{ {
DWORD style; LONG_PTR style = ::GetWindowLongPtr(hwnd, GWL_STYLE);
//::SendMessage(upDownWnd, UDM_SETBUDDY, NULL, 0);
style = ::GetWindowLongPtr(hwnd, GWL_STYLE);
if (wParam > 0) if (wParam > 0)
style |= lParam; style |= lParam;
@ -463,7 +461,7 @@ LRESULT TabBarPlus::runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPara
TBHDR nmhdr; TBHDR nmhdr;
nmhdr.hdr.hwndFrom = _hSelf; nmhdr.hdr.hwndFrom = _hSelf;
nmhdr.hdr.code = NM_CLICK; nmhdr.hdr.code = NM_CLICK;
nmhdr.hdr.idFrom = reinterpret_cast<unsigned int>(this); nmhdr.hdr.idFrom = reinterpret_cast<UINT_PTR>(this);
nmhdr.tabOrigin = currentTabOn; nmhdr.tabOrigin = currentTabOn;
::SendMessage(_hParent, WM_NOTIFY, 0, reinterpret_cast<LPARAM>(&nmhdr)); ::SendMessage(_hParent, WM_NOTIFY, 0, reinterpret_cast<LPARAM>(&nmhdr));
@ -558,7 +556,7 @@ LRESULT TabBarPlus::runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPara
TBHDR nmhdr; TBHDR nmhdr;
nmhdr.hdr.hwndFrom = _hSelf; nmhdr.hdr.hwndFrom = _hSelf;
nmhdr.hdr.code = _isDraggingInside?TCN_TABDROPPED:TCN_TABDROPPEDOUTSIDE; nmhdr.hdr.code = _isDraggingInside?TCN_TABDROPPED:TCN_TABDROPPEDOUTSIDE;
nmhdr.hdr.idFrom = reinterpret_cast<unsigned int>(this); nmhdr.hdr.idFrom = reinterpret_cast<UINT_PTR>(this);
nmhdr.tabOrigin = currentTabOn; nmhdr.tabOrigin = currentTabOn;
::SendMessage(_hParent, WM_NOTIFY, 0, reinterpret_cast<LPARAM>(&nmhdr)); ::SendMessage(_hParent, WM_NOTIFY, 0, reinterpret_cast<LPARAM>(&nmhdr));
@ -572,7 +570,7 @@ LRESULT TabBarPlus::runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPara
TBHDR nmhdr; TBHDR nmhdr;
nmhdr.hdr.hwndFrom = _hSelf; nmhdr.hdr.hwndFrom = _hSelf;
nmhdr.hdr.code = TCN_TABDELETE; nmhdr.hdr.code = TCN_TABDELETE;
nmhdr.hdr.idFrom = reinterpret_cast<unsigned int>(this); nmhdr.hdr.idFrom = reinterpret_cast<UINT_PTR>(this);
nmhdr.tabOrigin = currentTabOn; nmhdr.tabOrigin = currentTabOn;
::SendMessage(_hParent, WM_NOTIFY, 0, reinterpret_cast<LPARAM>(&nmhdr)); ::SendMessage(_hParent, WM_NOTIFY, 0, reinterpret_cast<LPARAM>(&nmhdr));
@ -617,7 +615,7 @@ LRESULT TabBarPlus::runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPara
TBHDR nmhdr; TBHDR nmhdr;
nmhdr.hdr.hwndFrom = _hSelf; nmhdr.hdr.hwndFrom = _hSelf;
nmhdr.hdr.code = TCN_TABDELETE; nmhdr.hdr.code = TCN_TABDELETE;
nmhdr.hdr.idFrom = reinterpret_cast<unsigned int>(this); nmhdr.hdr.idFrom = reinterpret_cast<UINT_PTR>(this);
nmhdr.tabOrigin = currentTabOn; nmhdr.tabOrigin = currentTabOn;
::SendMessage(_hParent, WM_NOTIFY, 0, reinterpret_cast<LPARAM>(&nmhdr)); ::SendMessage(_hParent, WM_NOTIFY, 0, reinterpret_cast<LPARAM>(&nmhdr));
@ -634,7 +632,7 @@ LRESULT TabBarPlus::runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPara
TBHDR nmhdr; TBHDR nmhdr;
nmhdr.hdr.hwndFrom = _hSelf; nmhdr.hdr.hwndFrom = _hSelf;
nmhdr.hdr.code = TCN_TABDELETE; nmhdr.hdr.code = TCN_TABDELETE;
nmhdr.hdr.idFrom = reinterpret_cast<unsigned int>(this); nmhdr.hdr.idFrom = reinterpret_cast<UINT_PTR>(this);
nmhdr.tabOrigin = currentTabOn; nmhdr.tabOrigin = currentTabOn;
::SendMessage(_hParent, WM_NOTIFY, 0, reinterpret_cast<LPARAM>(&nmhdr)); ::SendMessage(_hParent, WM_NOTIFY, 0, reinterpret_cast<LPARAM>(&nmhdr));

2
PowerEditor/src/WinControls/TabBar/TabBar.h
View File

@ -245,7 +245,7 @@ protected:
LRESULT runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam); LRESULT runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam);
static LRESULT CALLBACK TabBarPlus_Proc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) { static LRESULT CALLBACK TabBarPlus_Proc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) {
return (((TabBarPlus *)(::GetWindowLongPtr(hwnd, GWL_USERDATA)))->runProc(hwnd, Message, wParam, lParam)); return (((TabBarPlus *)(::GetWindowLongPtr(hwnd, GWLP_USERDATA)))->runProc(hwnd, Message, wParam, lParam));
}; };
void exchangeItemData(POINT point); void exchangeItemData(POINT point);

2
PowerEditor/src/WinControls/TaskList/TaskList.h
View File

@ -67,7 +67,7 @@ protected:
LRESULT runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam); LRESULT runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam);
static LRESULT CALLBACK staticProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) { static LRESULT CALLBACK staticProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) {
return (((TaskList *)(::GetWindowLongPtr(hwnd, GWL_USERDATA)))->runProc(hwnd, Message, wParam, lParam)); return (((TaskList *)(::GetWindowLongPtr(hwnd, GWLP_USERDATA)))->runProc(hwnd, Message, wParam, lParam));
}; };
HFONT _hFont; HFONT _hFont;

2
PowerEditor/src/WinControls/ToolTip/ToolTip.h
View File

@ -57,7 +57,7 @@ protected:
TOOLINFO _ti; TOOLINFO _ti;
static LRESULT CALLBACK staticWinProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) { static LRESULT CALLBACK staticWinProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) {
return (((ToolTip *)(::GetWindowLongPtr(hwnd, GWL_USERDATA)))->runProc(Message, wParam, lParam)); return (((ToolTip *)(::GetWindowLongPtr(hwnd, GWLP_USERDATA)))->runProc(Message, wParam, lParam));
}; };
LRESULT runProc(UINT Message, WPARAM wParam, LPARAM lParam); LRESULT runProc(UINT Message, WPARAM wParam, LPARAM lParam);
void SendHitMessage(); void SendHitMessage();

6
PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher.cpp
View File

@ -205,15 +205,15 @@ INT_PTR CALLBACK VerticalFileSwitcher::run_dlgProc(UINT message, WPARAM wParam,
void VerticalFileSwitcher::activateDoc(TaskLstFnStatus *tlfs) const void VerticalFileSwitcher::activateDoc(TaskLstFnStatus *tlfs) const
{ {
int view = tlfs->_iView; int view = tlfs->_iView;
int bufferID = (int)tlfs->_bufID; BufferID bufferID = static_cast<BufferID>(tlfs->_bufID);
int currentView = ::SendMessage(_hParent, NPPM_GETCURRENTVIEW, 0, 0); int currentView = ::SendMessage(_hParent, NPPM_GETCURRENTVIEW, 0, 0);
int currentBufID = ::SendMessage(_hParent, NPPM_GETCURRENTBUFFERID, 0, 0); BufferID currentBufID = reinterpret_cast<BufferID>(::SendMessage(_hParent, NPPM_GETCURRENTBUFFERID, 0, 0));
if (bufferID == currentBufID && view == currentView) if (bufferID == currentBufID && view == currentView)
return; return;
int docPosInfo = ::SendMessage(_hParent, NPPM_GETPOSFROMBUFFERID, bufferID, view); int docPosInfo = ::SendMessage(_hParent, NPPM_GETPOSFROMBUFFERID, (WPARAM)bufferID, view);
int view2set = docPosInfo >> 30; int view2set = docPosInfo >> 30;
int index2Switch = (docPosInfo << 2) >> 2 ; int index2Switch = (docPosInfo << 2) >> 2 ;

8
PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher.h
View File

@ -55,19 +55,19 @@ public:
//Activate document in scintilla by using the internal index //Activate document in scintilla by using the internal index
void activateDoc(TaskLstFnStatus *tlfs) const; void activateDoc(TaskLstFnStatus *tlfs) const;
int newItem(int bufferID, int iView){ int newItem(BufferID bufferID, int iView){
return _fileListView.newItem(bufferID, iView); return _fileListView.newItem(bufferID, iView);
}; };
int closeItem(int bufferID, int iView){ int closeItem(BufferID bufferID, int iView){
return _fileListView.closeItem(bufferID, iView); return _fileListView.closeItem(bufferID, iView);
}; };
void activateItem(int bufferID, int iView) { void activateItem(BufferID bufferID, int iView) {
_fileListView.activateItem(bufferID, iView); _fileListView.activateItem(bufferID, iView);
}; };
void setItemIconStatus(int bufferID) { void setItemIconStatus(BufferID bufferID) {
_fileListView.setItemIconStatus(bufferID) ; _fileListView.setItemIconStatus(bufferID) ;
}; };

24
PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcherListView.cpp
View File

@ -157,11 +157,11 @@ void VerticalFileSwitcherListView::reload()
initList(); initList();
} }
int VerticalFileSwitcherListView::getBufferInfoFromIndex(int index, int & view) const BufferID VerticalFileSwitcherListView::getBufferInfoFromIndex(int index, int & view) const
{ {
int nbItem = ListView_GetItemCount(_hSelf); int nbItem = ListView_GetItemCount(_hSelf);
if (index < 0 || index >= nbItem) if (index < 0 || index >= nbItem)
return -1; return BUFFER_INVALID;
LVITEM item; LVITEM item;
item.mask = LVIF_PARAM; item.mask = LVIF_PARAM;
@ -170,10 +170,10 @@ int VerticalFileSwitcherListView::getBufferInfoFromIndex(int index, int & view)
TaskLstFnStatus *tlfs = (TaskLstFnStatus *)item.lParam; TaskLstFnStatus *tlfs = (TaskLstFnStatus *)item.lParam;
view = tlfs->_iView; view = tlfs->_iView;
return int(tlfs->_bufID); return static_cast<BufferID>(tlfs->_bufID);
} }
int VerticalFileSwitcherListView::newItem(int bufferID, int iView) int VerticalFileSwitcherListView::newItem(BufferID bufferID, int iView)
{ {
int i = find(bufferID, iView); int i = find(bufferID, iView);
if (i == -1) if (i == -1)
@ -183,7 +183,7 @@ int VerticalFileSwitcherListView::newItem(int bufferID, int iView)
return i; return i;
} }
void VerticalFileSwitcherListView::setItemIconStatus(int bufferID) void VerticalFileSwitcherListView::setItemIconStatus(BufferID bufferID)
{ {
Buffer *buf = (Buffer *)bufferID; Buffer *buf = (Buffer *)bufferID;
@ -207,7 +207,7 @@ void VerticalFileSwitcherListView::setItemIconStatus(int bufferID)
item.iItem = i; item.iItem = i;
ListView_GetItem(_hSelf, &item); ListView_GetItem(_hSelf, &item);
TaskLstFnStatus *tlfs = (TaskLstFnStatus *)(item.lParam); TaskLstFnStatus *tlfs = (TaskLstFnStatus *)(item.lParam);
if (int(tlfs->_bufID) == bufferID) if (tlfs->_bufID == bufferID)
{ {
item.mask = LVIF_TEXT | LVIF_IMAGE; item.mask = LVIF_TEXT | LVIF_IMAGE;
ListView_SetItem(_hSelf, &item); ListView_SetItem(_hSelf, &item);
@ -236,7 +236,7 @@ generic_string VerticalFileSwitcherListView::getFullFilePath(size_t i) const
return tlfs->_fn; return tlfs->_fn;
} }
int VerticalFileSwitcherListView::closeItem(int bufferID, int iView) int VerticalFileSwitcherListView::closeItem(BufferID bufferID, int iView)
{ {
int i = find(bufferID, iView); int i = find(bufferID, iView);
if (i != -1) if (i != -1)
@ -244,7 +244,7 @@ int VerticalFileSwitcherListView::closeItem(int bufferID, int iView)
return i; return i;
} }
void VerticalFileSwitcherListView::activateItem(int bufferID, int iView) void VerticalFileSwitcherListView::activateItem(BufferID bufferID, int iView)
{ {
// Clean all selection // Clean all selection
int nbItem = ListView_GetItemCount(_hSelf); int nbItem = ListView_GetItemCount(_hSelf);
@ -255,7 +255,7 @@ void VerticalFileSwitcherListView::activateItem(int bufferID, int iView)
ListView_SetItemState(_hSelf, i, LVIS_FOCUSED|LVIS_SELECTED, LVIS_FOCUSED|LVIS_SELECTED); ListView_SetItemState(_hSelf, i, LVIS_FOCUSED|LVIS_SELECTED, LVIS_FOCUSED|LVIS_SELECTED);
} }
int VerticalFileSwitcherListView::add(int bufferID, int iView) int VerticalFileSwitcherListView::add(BufferID bufferID, int iView)
{ {
int index = ListView_GetItemCount(_hSelf); int index = ListView_GetItemCount(_hSelf);
Buffer *buf = (Buffer *)bufferID; Buffer *buf = (Buffer *)bufferID;
@ -311,7 +311,7 @@ void VerticalFileSwitcherListView::removeAll()
} }
} }
int VerticalFileSwitcherListView::find(int bufferID, int iView) const int VerticalFileSwitcherListView::find(BufferID bufferID, int iView) const
{ {
LVITEM item; LVITEM item;
bool found = false; bool found = false;
@ -323,7 +323,7 @@ int VerticalFileSwitcherListView::find(int bufferID, int iView) const
item.iItem = i; item.iItem = i;
ListView_GetItem(_hSelf, &item); ListView_GetItem(_hSelf, &item);
TaskLstFnStatus *tlfs = (TaskLstFnStatus *)item.lParam; TaskLstFnStatus *tlfs = (TaskLstFnStatus *)item.lParam;
if (int(tlfs->_bufID) == bufferID && tlfs->_iView == iView) if (tlfs->_bufID == bufferID && tlfs->_iView == iView)
{ {
found = true; found = true;
break; break;
@ -374,7 +374,7 @@ std::vector<SwitcherFileInfo> VerticalFileSwitcherListView::getSelectedFiles(boo
ListView_GetItem(_hSelf, &item); ListView_GetItem(_hSelf, &item);
TaskLstFnStatus *tlfs = (TaskLstFnStatus *)item.lParam; TaskLstFnStatus *tlfs = (TaskLstFnStatus *)item.lParam;
files.push_back(SwitcherFileInfo(int(tlfs->_bufID), tlfs->_iView)); files.push_back(SwitcherFileInfo(static_cast<BufferID>(tlfs->_bufID), tlfs->_iView));
} }
} }

23
PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcherListView.h
View File

@ -32,13 +32,16 @@
#include "window.h" #include "window.h"
#include "TaskListDlg.h" #include "TaskListDlg.h"
class Buffer;
typedef Buffer * BufferID; //each buffer has unique ID by which it can be retrieved
#define SORT_DIRECTION_UP 0 #define SORT_DIRECTION_UP 0
#define SORT_DIRECTION_DOWN 1 #define SORT_DIRECTION_DOWN 1
struct SwitcherFileInfo { struct SwitcherFileInfo {
int _bufID; BufferID _bufID;
int _iView; int _iView;
SwitcherFileInfo(int buf, int view): _bufID(buf), _iView(view){}; SwitcherFileInfo(BufferID buf, int view) : _bufID(buf), _iView(view){};
}; };
class VerticalFileSwitcherListView : public Window class VerticalFileSwitcherListView : public Window
@ -50,14 +53,14 @@ public:
virtual void init(HINSTANCE hInst, HWND parent, HIMAGELIST hImaLst); virtual void init(HINSTANCE hInst, HWND parent, HIMAGELIST hImaLst);
virtual void destroy(); virtual void destroy();
void initList(); void initList();
int getBufferInfoFromIndex(int index, int & view) const; BufferID getBufferInfoFromIndex(int index, int & view) const;
void setBgColour(int i) { void setBgColour(int i) {
ListView_SetItemState(_hSelf, i, LVIS_SELECTED|LVIS_FOCUSED, 0xFF); ListView_SetItemState(_hSelf, i, LVIS_SELECTED|LVIS_FOCUSED, 0xFF);
} }
int newItem(int bufferID, int iView); int newItem(BufferID bufferID, int iView);
int closeItem(int bufferID, int iView); int closeItem(BufferID bufferID, int iView);
void activateItem(int bufferID, int iView); void activateItem(BufferID bufferID, int iView);
void setItemIconStatus(int bufferID); void setItemIconStatus(BufferID bufferID);
generic_string getFullFilePath(size_t i) const; generic_string getFullFilePath(size_t i) const;
void insertColumn(const TCHAR *name, int width, int index); void insertColumn(const TCHAR *name, int width, int index);
@ -89,11 +92,11 @@ protected:
LRESULT runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam); LRESULT runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam);
static LRESULT CALLBACK staticProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) { static LRESULT CALLBACK staticProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) {
return (((VerticalFileSwitcherListView *)(::GetWindowLongPtr(hwnd, GWL_USERDATA)))->runProc(hwnd, Message, wParam, lParam)); return (((VerticalFileSwitcherListView *)(::GetWindowLongPtr(hwnd, GWLP_USERDATA)))->runProc(hwnd, Message, wParam, lParam));
}; };
int find(int bufferID, int iView) const; int find(BufferID bufferID, int iView) const;
int add(int bufferID, int iView); int add(BufferID bufferID, int iView);
void remove(int index); void remove(int index);
void removeAll(); void removeAll();
}; };

4
PowerEditor/src/notepad++.exe.manifest
View File

@ -3,7 +3,7 @@
manifestVersion="1.0"> manifestVersion="1.0">
<assemblyIdentity <assemblyIdentity
version="1.0.0.0" version="1.0.0.0"
processorArchitecture="X86" processorArchitecture="*"
name="Notepad++" name="Notepad++"
type="win32" type="win32"
/> />
@ -14,7 +14,7 @@
type="win32" type="win32"
name="Microsoft.Windows.Common-Controls" name="Microsoft.Windows.Common-Controls"
version="6.0.0.0" version="6.0.0.0"
processorArchitecture="X86" processorArchitecture="*"
publicKeyToken="6595b64144ccf1df" publicKeyToken="6595b64144ccf1df"
language="*" language="*"
/> />

123
PowerEditor/visual.net/notepadPlus.vcxproj
View File

@ -5,10 +5,18 @@
<Configuration>Unicode Debug</Configuration> <Configuration>Unicode Debug</Configuration>
<Platform>Win32</Platform> <Platform>Win32</Platform>
</ProjectConfiguration> </ProjectConfiguration>
<ProjectConfiguration Include="Unicode Debug|x64">
<Configuration>Unicode Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Unicode Release|Win32"> <ProjectConfiguration Include="Unicode Release|Win32">
<Configuration>Unicode Release</Configuration> <Configuration>Unicode Release</Configuration>
<Platform>Win32</Platform> <Platform>Win32</Platform>
</ProjectConfiguration> </ProjectConfiguration>
<ProjectConfiguration Include="Unicode Release|x64">
<Configuration>Unicode Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectName>Notepad++</ProjectName> <ProjectName>Notepad++</ProjectName>
@ -23,11 +31,22 @@
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v120_xp</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v120_xp</PlatformToolset> <PlatformToolset>v120_xp</PlatformToolset>
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v120_xp</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings"> <ImportGroup Label="ExtensionSettings">
</ImportGroup> </ImportGroup>
@ -35,10 +54,18 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" /> <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" /> <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC70.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion> <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
@ -48,11 +75,17 @@
<IntDir>$(Configuration)\</IntDir> <IntDir>$(Configuration)\</IntDir>
<LinkIncremental>false</LinkIncremental> <LinkIncremental>false</LinkIncremental>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|x64'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'">
<OutDir>..\bin\</OutDir> <OutDir>..\bin\</OutDir>
<IntDir>$(Configuration)\</IntDir> <IntDir>$(Configuration)\</IntDir>
<LinkIncremental>false</LinkIncremental> <LinkIncremental>false</LinkIncremental>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|x64'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'">
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
@ -87,6 +120,40 @@
<Command /> <Command />
</PostBuildEvent> </PostBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
<FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
<AdditionalIncludeDirectories>..\src\WinControls\AboutDlg;..\..\scintilla\include;..\include;..\src\WinControls;..\src\WinControls\ImageListSet;..\src\WinControls\OpenSaveFileDialog;..\src\WinControls\SplitterContainer;..\src\WinControls\StaticDialog;..\src\WinControls\TabBar;..\src\WinControls\ToolBar;..\src\MISC\Process;..\src\ScitillaComponent;..\src\MISC;..\src\MISC\SysMsg;..\src\WinControls\StatusBar;..\src;..\src\WinControls\StaticDialog\RunDlg;..\src\tinyxml;..\src\WinControls\ColourPicker;..\src\Win32Explr;..\src\MISC\RegExt;..\src\WinControls\TrayIcon;..\src\WinControls\shortcut;..\src\WinControls\Grid;..\src\WinControls\ContextMenu;..\src\MISC\PluginsManager;..\src\WinControls\Preference;..\src\WinControls\WindowsDlg;..\src\WinControls\TaskList;..\src\WinControls\DockingWnd;..\src\WinControls\ToolTip;..\src\MISC\Exception;..\src\MISC\Common;..\src\tinyxml\tinyXmlA;..\src\WinControls\AnsiCharPanel;..\src\WinControls\ClipboardHistory;..\src\WinControls\FindCharsInRange;..\src\WinControls\VerticalFileSwitcher;..\src\WinControls\ProjectPanel;..\src\WinControls\DocumentMap;..\src\WinControls\FunctionList;..\src\uchardet;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WIN32_WINNT=0x0501;_WINDOWS;_USE_64BIT_TIME_T;TIXML_USE_STL;TIXMLA_USE_STL;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<WarningLevel>Level4</WarningLevel>
<TreatWarningAsError>false</TreatWarningAsError>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalOptions>/fixed:no %(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>comctl32.lib;shlwapi.lib;shell32.lib;Oleacc.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ShowProgress>LinkVerboseLib</ShowProgress>
<OutputFile>$(OutDir)notepad++.exe</OutputFile>
<Version>1.0</Version>
<TypeLibraryFile>/TLBID</TypeLibraryFile>
<TypeLibraryResourceID>5</TypeLibraryResourceID>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)notepadPlus.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
</Link>
<Manifest>
<AdditionalManifestFiles>..\src\dpiAware.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
</Manifest>
<PostBuildEvent>
<Command>
</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'">
<ClCompile> <ClCompile>
<Optimization>Full</Optimization> <Optimization>Full</Optimization>
@ -134,6 +201,56 @@ copy ..\src\shortcuts.xml ..\bin\shortcuts.xml
copy ..\src\functionList.xml ..\bin\functionList.xml copy ..\src\functionList.xml ..\bin\functionList.xml
copy ..\src\contextMenu.xml ..\bin\contextMenu.xml copy ..\src\contextMenu.xml ..\bin\contextMenu.xml
..\misc\vistaIconTool\changeIcon.bat "..\misc\vistaIconTool\ChangeIcon.exe" "$(OutDir)notepad++.exe" ..\misc\vistaIconTool\changeIcon.bat "..\misc\vistaIconTool\ChangeIcon.exe" "$(OutDir)notepad++.exe"
</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|x64'">
<ClCompile>
<Optimization>Full</Optimization>
<InlineFunctionExpansion>Default</InlineFunctionExpansion>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<OmitFramePointers>false</OmitFramePointers>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\src\WinControls\AboutDlg;..\..\scintilla\include;..\include;..\src\WinControls;..\src\WinControls\ImageListSet;..\src\WinControls\OpenSaveFileDialog;..\src\WinControls\SplitterContainer;..\src\WinControls\StaticDialog;..\src\WinControls\TabBar;..\src\WinControls\ToolBar;..\src\MISC\Process;..\src\ScitillaComponent;..\src\MISC;..\src\MISC\SysMsg;..\src\WinControls\StatusBar;..\src;..\src\WinControls\StaticDialog\RunDlg;..\src\tinyxml;..\src\WinControls\ColourPicker;..\src\Win32Explr;..\src\MISC\RegExt;..\src\WinControls\TrayIcon;..\src\WinControls\shortcut;..\src\WinControls\Grid;..\src\WinControls\ContextMenu;..\src\MISC\PluginsManager;..\src\WinControls\Preference;..\src\WinControls\WindowsDlg;..\src\WinControls\TaskList;..\src\WinControls\DockingWnd;..\src\WinControls\ToolTip;..\src\MISC\Exception;..\src\MISC\Common;..\src\tinyxml\tinyXmlA;..\src\WinControls\AnsiCharPanel;..\src\WinControls\ClipboardHistory;..\src\WinControls\FindCharsInRange;..\src\WinControls\VerticalFileSwitcher;..\src\WinControls\ProjectPanel;..\src\WinControls\DocumentMap;..\src\WinControls\FunctionList;..\src\uchardet;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WIN32_WINNT=0x0501;NDEBUG;_WINDOWS;_USE_64BIT_TIME_T;TIXML_USE_STL;TIXMLA_USE_STL;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessToFile>false</PreprocessToFile>
<PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<WarningLevel>Level4</WarningLevel>
<TreatWarningAsError>false</TreatWarningAsError>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalDependencies>comctl32.lib;shlwapi.lib;shell32.lib;Oleacc.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ShowProgress>LinkVerboseLib</ShowProgress>
<OutputFile>$(OutDir)notepad++.exe</OutputFile>
<Version>1.0</Version>
<TypeLibraryFile>
</TypeLibraryFile>
<TypeLibraryResourceID>1</TypeLibraryResourceID>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)npp.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
</Link>
<Manifest>
<AdditionalManifestFiles>..\src\dpiAware.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
</Manifest>
<PostBuildEvent>
<Command>copy ..\src\config.model.xml ..\bin\config.model.xml
copy ..\src\langs.model.xml ..\bin\langs.model.xml
copy ..\src\stylers.model.xml ..\bin\stylers.model.xml
copy ..\src\shortcuts.xml ..\bin\shortcuts.xml
copy ..\src\functionList.xml ..\bin\functionList.xml
copy ..\src\contextMenu.xml ..\bin\contextMenu.xml
..\misc\vistaIconTool\changeIcon.bat "..\misc\vistaIconTool\ChangeIcon.exe" "$(OutDir)notepad++.exe"
</Command> </Command>
</PostBuildEvent> </PostBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
@ -225,10 +342,16 @@ copy ..\src\contextMenu.xml ..\bin\contextMenu.xml
<ClCompile Include="..\src\sqlite\sqlite3.c"> <ClCompile Include="..\src\sqlite\sqlite3.c">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'">
</PrecompiledHeader> </PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|x64'">
</PrecompiledHeader>
<WarningLevel Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'">TurnOffAllWarnings</WarningLevel> <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'">TurnOffAllWarnings</WarningLevel>
<WarningLevel Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|x64'">TurnOffAllWarnings</WarningLevel>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'">
</PrecompiledHeader> </PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Unicode Release|x64'">
</PrecompiledHeader>
<WarningLevel Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'">TurnOffAllWarnings</WarningLevel> <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'">TurnOffAllWarnings</WarningLevel>
<WarningLevel Condition="'$(Configuration)|$(Platform)'=='Unicode Release|x64'">TurnOffAllWarnings</WarningLevel>
</ClCompile> </ClCompile>
<ClCompile Include="..\src\WinControls\StaticDialog\StaticDialog.cpp" /> <ClCompile Include="..\src\WinControls\StaticDialog\StaticDialog.cpp" />
<ClCompile Include="..\src\WinControls\StatusBar\StatusBar.cpp" /> <ClCompile Include="..\src\WinControls\StatusBar\StatusBar.cpp" />

10
scintilla/boostregex/BoostRegExSearch.cxx
View File

@ -241,10 +241,12 @@ namespace Scintilla
{ {
#endif #endif
#ifdef SCI_OWNREGEX
RegexSearchBase *CreateRegexSearch(CharClassify* /* charClassTable */) RegexSearchBase *CreateRegexSearch(CharClassify* /* charClassTable */)
{ {
return new BoostRegexSearch(); return new BoostRegexSearch();
} }
#endif
#ifdef SCI_NAMESPACE #ifdef SCI_NAMESPACE
} }
@ -444,14 +446,14 @@ const char *BoostRegexSearch::SubstituteByPosition(Document* doc, const char *te
template <class CharT, class CharacterIterator> template <class CharT, class CharacterIterator>
char *BoostRegexSearch::EncodingDependent<CharT, CharacterIterator>::SubstituteByPosition(const char *text, int *length) { char *BoostRegexSearch::EncodingDependent<CharT, CharacterIterator>::SubstituteByPosition(const char *text, int *length) {
char *substituted = stringToCharPtr(_match.format((const CharT*)CharTPtr(text), boost::format_all)); char *substituted = stringToCharPtr(_match.format((const CharT*)CharTPtr(text), boost::format_all));
*length = strlen(substituted); *length = static_cast<int>(strlen(substituted));
return substituted; return substituted;
} }
wchar_t *BoostRegexSearch::utf8ToWchar(const char *utf8) wchar_t *BoostRegexSearch::utf8ToWchar(const char *utf8)
{ {
int utf8Size = strlen(utf8); size_t utf8Size = strlen(utf8);
int wcharSize = UTF16Length(utf8, utf8Size); size_t wcharSize = UTF16Length(utf8, utf8Size);
wchar_t *w = new wchar_t[wcharSize + 1]; wchar_t *w = new wchar_t[wcharSize + 1];
UTF16FromUTF8(utf8, utf8Size, w, wcharSize + 1); UTF16FromUTF8(utf8, utf8Size, w, wcharSize + 1);
w[wcharSize] = 0; w[wcharSize] = 0;
@ -460,7 +462,7 @@ wchar_t *BoostRegexSearch::utf8ToWchar(const char *utf8)
char *BoostRegexSearch::wcharToUtf8(const wchar_t *w) char *BoostRegexSearch::wcharToUtf8(const wchar_t *w)
{ {
int wcharSize = wcslen(w); int wcharSize = static_cast<int>(wcslen(w));
int charSize = UTF8Length(w, wcharSize); int charSize = UTF8Length(w, wcharSize);
char *c = new char[charSize + 1]; char *c = new char[charSize + 1];
UTF8FromUTF16(w, wcharSize, c, charSize); UTF8FromUTF16(w, wcharSize, c, charSize);

2
scintilla/lexers/LexSearchResult.cxx
View File

@ -96,7 +96,7 @@ static void ColouriseSearchResultLine(SearchResultMarkings* pMarkings, char *lin
} }
} }
static void ColouriseSearchResultDoc(unsigned int startPos, int length, int, WordList *keywordlists[], Accessor &styler) { static void ColouriseSearchResultDoc(unsigned int startPos, int length, int, WordList *[], Accessor &styler) {
char lineBuffer[SC_SEARCHRESULT_LINEBUFFERMAXLENGTH]; char lineBuffer[SC_SEARCHRESULT_LINEBUFFERMAXLENGTH];
styler.StartAt(startPos); styler.StartAt(startPos);

62
scintilla/lexers/LexUser.cxx
View File

@ -635,13 +635,13 @@ static inline void SubGroup(const char * s, vvstring & vec, bool group=false)
for (unsigned int j=0; j<length+1; ++j) for (unsigned int j=0; j<length+1; ++j)
temp[j] = 0; temp[j] = 0;
if (s[0] == '(' && s[1] == '(') if (length >= 2 && s[0] == '(' && s[1] == '(')
{ {
i = 2; i = 2;
group = true; group = true;
} }
if (s[length-1] == ')' && s[length-2] == ')') if (length >= 2 && s[length - 1] == ')' && s[length - 2] == ')')
length -= 2; length -= 2;
if (!group && *s) if (!group && *s)
@ -1403,36 +1403,36 @@ static void ColouriseUserDoc(unsigned int startPos, int length, int initStyle, W
const char * sComments = styler.pprops->Get("userDefine.comments"); const char * sComments = styler.pprops->Get("userDefine.comments");
// 'GenerateVector' converts strings into vvstring objects // 'GenerateVector' converts strings into vvstring objects
GenerateVector(commentLineOpen, sComments, TEXT("00"), 0); GenerateVector(commentLineOpen, sComments, "00", 0);
GenerateVector(commentLineContinue, sComments, TEXT("01"), commentLineOpen.size()); GenerateVector(commentLineContinue, sComments, "01", commentLineOpen.size());
GenerateVector(commentLineClose, sComments, TEXT("02"), commentLineOpen.size()); GenerateVector(commentLineClose, sComments, "02", commentLineOpen.size());
GenerateVector(commentOpen, sComments, TEXT("03"), 0); GenerateVector(commentOpen, sComments, "03", 0);
GenerateVector(commentClose, sComments, TEXT("04"), commentOpen.size()); GenerateVector(commentClose, sComments, "04", commentOpen.size());
GenerateVector(delim1Open, sDelimiters, TEXT("00"), 0); GenerateVector(delim1Open, sDelimiters, "00", 0);
GenerateVector(delim1Escape, sDelimiters, TEXT("01"), delim1Open.size()); GenerateVector(delim1Escape, sDelimiters, "01", delim1Open.size());
GenerateVector(delim1Close, sDelimiters, TEXT("02"), delim1Open.size()); GenerateVector(delim1Close, sDelimiters, "02", delim1Open.size());
GenerateVector(delim2Open, sDelimiters, TEXT("03"), 0); GenerateVector(delim2Open, sDelimiters, "03", 0);
GenerateVector(delim2Escape, sDelimiters, TEXT("04"), delim2Open.size()); GenerateVector(delim2Escape, sDelimiters, "04", delim2Open.size());
GenerateVector(delim2Close, sDelimiters, TEXT("05"), delim2Open.size()); GenerateVector(delim2Close, sDelimiters, "05", delim2Open.size());
GenerateVector(delim3Open, sDelimiters, TEXT("06"), 0); GenerateVector(delim3Open, sDelimiters, "06", 0);
GenerateVector(delim3Escape, sDelimiters, TEXT("07"), delim3Open.size()); GenerateVector(delim3Escape, sDelimiters, "07", delim3Open.size());
GenerateVector(delim3Close, sDelimiters, TEXT("08"), delim3Open.size()); GenerateVector(delim3Close, sDelimiters, "08", delim3Open.size());
GenerateVector(delim4Open, sDelimiters, TEXT("09"), 0); GenerateVector(delim4Open, sDelimiters, "09", 0);
GenerateVector(delim4Escape, sDelimiters, TEXT("10"), delim4Open.size()); GenerateVector(delim4Escape, sDelimiters, "10", delim4Open.size());
GenerateVector(delim4Close, sDelimiters, TEXT("11"), delim4Open.size()); GenerateVector(delim4Close, sDelimiters, "11", delim4Open.size());
GenerateVector(delim5Open, sDelimiters, TEXT("12"), 0); GenerateVector(delim5Open, sDelimiters, "12", 0);
GenerateVector(delim5Escape, sDelimiters, TEXT("13"), delim5Open.size()); GenerateVector(delim5Escape, sDelimiters, "13", delim5Open.size());
GenerateVector(delim5Close, sDelimiters, TEXT("14"), delim5Open.size()); GenerateVector(delim5Close, sDelimiters, "14", delim5Open.size());
GenerateVector(delim6Open, sDelimiters, TEXT("15"), 0); GenerateVector(delim6Open, sDelimiters, "15", 0);
GenerateVector(delim6Escape, sDelimiters, TEXT("16"), delim6Open.size()); GenerateVector(delim6Escape, sDelimiters, "16", delim6Open.size());
GenerateVector(delim6Close, sDelimiters, TEXT("17"), delim6Open.size()); GenerateVector(delim6Close, sDelimiters, "17", delim6Open.size());
GenerateVector(delim7Open, sDelimiters, TEXT("18"), 0); GenerateVector(delim7Open, sDelimiters, "18", 0);
GenerateVector(delim7Escape, sDelimiters, TEXT("19"), delim7Open.size()); GenerateVector(delim7Escape, sDelimiters, "19", delim7Open.size());
GenerateVector(delim7Close, sDelimiters, TEXT("20"), delim7Open.size()); GenerateVector(delim7Close, sDelimiters, "20", delim7Open.size());
GenerateVector(delim8Open, sDelimiters, TEXT("21"), 0); GenerateVector(delim8Open, sDelimiters, "21", 0);
GenerateVector(delim8Escape, sDelimiters, TEXT("22"), delim8Open.size()); GenerateVector(delim8Escape, sDelimiters, "22", delim8Open.size());
GenerateVector(delim8Close, sDelimiters, TEXT("23"), delim8Open.size()); GenerateVector(delim8Close, sDelimiters, "23", delim8Open.size());
operators1.clear(); operators1.clear();
foldersInCode1Open.clear(); foldersInCode1Open.clear();

53
scintilla/win32/SciLexer.vcxproj
View File

@ -1,20 +1,20 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations"> <ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32"> <ProjectConfiguration Include="Unicode Debug|Win32">
<Configuration>Debug</Configuration> <Configuration>Unicode Debug</Configuration>
<Platform>Win32</Platform> <Platform>Win32</Platform>
</ProjectConfiguration> </ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64"> <ProjectConfiguration Include="Unicode Debug|x64">
<Configuration>Debug</Configuration> <Configuration>Unicode Debug</Configuration>
<Platform>x64</Platform> <Platform>x64</Platform>
</ProjectConfiguration> </ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32"> <ProjectConfiguration Include="Unicode Release|Win32">
<Configuration>Release</Configuration> <Configuration>Unicode Release</Configuration>
<Platform>Win32</Platform> <Platform>Win32</Platform>
</ProjectConfiguration> </ProjectConfiguration>
<ProjectConfiguration Include="Release|x64"> <ProjectConfiguration Include="Unicode Release|x64">
<Configuration>Release</Configuration> <Configuration>Unicode Release</Configuration>
<Platform>x64</Platform> <Platform>x64</Platform>
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
@ -27,19 +27,19 @@
<PropertyGroup> <PropertyGroup>
<ConfigurationType>DynamicLibrary</ConfigurationType> <ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
<PlatformToolset>v120</PlatformToolset> <PlatformToolset>v120_xp</PlatformToolset>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'" Label="Configuration">
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|x64'" Label="Configuration">
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'" Label="Configuration">
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|x64'" Label="Configuration">
<UseDebugLibraries>false</UseDebugLibraries> <UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup> </PropertyGroup>
@ -52,11 +52,12 @@
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup> <PropertyGroup>
<LinkIncremental>false</LinkIncremental> <LinkIncremental>false</LinkIncremental>
<NuGetPackageImportStamp>ba6a8a13</NuGetPackageImportStamp>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup> <ItemDefinitionGroup>
<ClCompile> <ClCompile>
<WarningLevel>Level4</WarningLevel> <WarningLevel>Level4</WarningLevel>
<PreprocessorDefinitions>WIN32;SCI_LEXER;_CRT_SECURE_NO_DEPRECATE;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;SCI_LEXER;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES;_CRT_SECURE_NO_DEPRECATE;_WINDOWS;_USRDLL;SCI_OWNREGEX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\include;..\src;..\lexlib;</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\include;..\src;..\lexlib;</AdditionalIncludeDirectories>
<BrowseInformation>true</BrowseInformation> <BrowseInformation>true</BrowseInformation>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
@ -69,7 +70,7 @@
<AdditionalDependencies>imm32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>imm32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'">
<ClCompile> <ClCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
@ -77,7 +78,7 @@
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration> <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|x64'">
<ClCompile> <ClCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
@ -85,7 +86,7 @@
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration> <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'">
<ClCompile> <ClCompile>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
@ -96,7 +97,7 @@
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|x64'">
<ClCompile> <ClCompile>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
@ -114,17 +115,31 @@
<ClCompile Include="..\win32\HanjaDic.cxx" /> <ClCompile Include="..\win32\HanjaDic.cxx" />
<ClCompile Include="..\win32\PlatWin.cxx" /> <ClCompile Include="..\win32\PlatWin.cxx" />
<ClCompile Include="..\win32\ScintillaWin.cxx" /> <ClCompile Include="..\win32\ScintillaWin.cxx" />
<ClCompile Include="..\boostregex\*.cxx" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\include\*.h" /> <ClInclude Include="..\include\*.h" />
<ClInclude Include="..\src\*.h" /> <ClInclude Include="..\src\*.h" />
<ClInclude Include="..\lexlib\*.h" /> <ClInclude Include="..\lexlib\*.h" />
<ClInclude Include="..\win32\*.h" /> <ClInclude Include="..\win32\*.h" />
<ClInclude Include="..\boostregex\*.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="..\win32\ScintRes.rc" /> <ResourceCompile Include="..\win32\ScintRes.rc" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
<Import Project="..\..\PowerEditor\visual.net\packages\boost.1.58.0.0\build\native\boost.targets" Condition="Exists('..\..\PowerEditor\visual.net\packages\boost.1.58.0.0\build\native\boost.targets')" />
<Import Project="..\..\PowerEditor\visual.net\packages\boost_regex-vc120.1.58.0.0\build\native\boost_regex-vc120.targets" Condition="Exists('..\..\PowerEditor\visual.net\packages\boost_regex-vc120.1.58.0.0\build\native\boost_regex-vc120.targets')" />
</ImportGroup> </ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\PowerEditor\visual.net\packages\boost.1.58.0.0\build\native\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\PowerEditor\visual.net\packages\boost.1.58.0.0\build\native\boost.targets'))" />
<Error Condition="!Exists('..\..\PowerEditor\visual.net\packages\boost_regex-vc120.1.58.0.0\build\native\boost_regex-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\PowerEditor\visual.net\packages\boost_regex-vc120.1.58.0.0\build\native\boost_regex-vc120.targets'))" />
</Target>
</Project> </Project>

5
scintilla/win32/packages.config Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="boost" version="1.58.0.0" targetFramework="Native" />
<package id="boost_regex-vc120" version="1.58.0.0" targetFramework="Native" />
</packages>