diff --git a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp index 0646d6a02..b42efeacd 100644 --- a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp +++ b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp @@ -24,28 +24,37 @@ -void addText2Combo(const char * txt2add, HWND hCombo, bool isUTF8) +void FindReplaceDlg::addText2Combo(const char * txt2add, HWND hCombo, bool isUTF8) { if (!hCombo) return; if (!strcmp(txt2add, "")) return; + bool bMustDie9x = _winVer <= WV_ME; char text[MAX_PATH]; - WCHAR textW[MAX_PATH*2]; + WCHAR textW[MAX_PATH]; int count = ::SendMessage(hCombo, CB_GETCOUNT, 0, 0); bool hasFound = false; int i = 0; - WCHAR wchars2Add[256]; + WCHAR wchars2Add[MAX_PATH]; if (isUTF8) - ::MultiByteToWideChar(CP_UTF8, 0, txt2add, -1, wchars2Add, 256 / sizeof(WCHAR)); + ::MultiByteToWideChar(CP_UTF8, 0, txt2add, -1, wchars2Add, MAX_PATH - 1); for ( ; i < count ; i++) { if (isUTF8) { - ::SendMessageW(hCombo, CB_GETLBTEXT, i, (LPARAM)textW); + if ( !bMustDie9x ) + { + ::SendMessageW(hCombo, CB_GETLBTEXT, i, (LPARAM)textW); + } + else + { + ::SendMessageA(hCombo, CB_GETLBTEXT, i, (LPARAM)text); + ::MultiByteToWideChar(CP_ACP, 0, text, -1, textW, MAX_PATH - 1); + } if (!wcscmp(wchars2Add, textW)) { hasFound = true; @@ -69,25 +78,43 @@ void addText2Combo(const char * txt2add, HWND hCombo, bool isUTF8) i = ::SendMessage(hCombo, CB_ADDSTRING, 0, (LPARAM)txt2add); else { - i = ::SendMessageW(hCombo, CB_ADDSTRING, 0, (LPARAM)wchars2Add); + if ( !bMustDie9x ) + { + i = ::SendMessageW(hCombo, CB_ADDSTRING, 0, (LPARAM)wchars2Add); + } + else + { + ::WideCharToMultiByte(CP_ACP, 0, wchars2Add, -1, text, MAX_PATH - 1, NULL, NULL); + i = ::SendMessageA(hCombo, CB_ADDSTRING, 0, (LPARAM)text); + } } } ::SendMessage(hCombo, CB_SETCURSEL, i, 0); } -string getTextFromCombo(HWND hCombo, bool isUnicode) +string FindReplaceDlg::getTextFromCombo(HWND hCombo, bool isUnicode) const { + bool bMustDie9x = _winVer <= WV_ME; char str[MAX_PATH]; if (isUnicode) { WCHAR wchars[MAX_PATH]; - ::SendMessageW(hCombo, WM_GETTEXT, MAX_PATH, (LPARAM)wchars); - ::WideCharToMultiByte(CP_UTF8, 0, wchars, -1, str, 256, NULL, NULL); + if ( !bMustDie9x ) + { + ::SendMessageW(hCombo, WM_GETTEXT, MAX_PATH - 1, (LPARAM)wchars); + } + else + { + char achars[MAX_PATH]; + ::SendMessageA(hCombo, WM_GETTEXT, MAX_PATH - 1, (LPARAM)achars); + ::MultiByteToWideChar(CP_ACP, 0, achars, -1, wchars, MAX_PATH - 1); + } + ::WideCharToMultiByte(CP_UTF8, 0, wchars, -1, str, MAX_PATH - 1, NULL, NULL); } else { - ::SendMessage(hCombo, WM_GETTEXT, MAX_PATH, (LPARAM)str); + ::SendMessage(hCombo, WM_GETTEXT, MAX_PATH - 1, (LPARAM)str); } return string(str); } @@ -1310,7 +1337,7 @@ BOOL CALLBACK FindIncrementDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM if (LOWORD(wParam) == IDC_INCFINDPREVOK) fo._whichDirection = DIR_UP; - string str2Search = getTextFromCombo(::GetDlgItem(_hSelf, IDC_INCFINDTEXT), isUnicode); + string str2Search = _pFRDlg->getTextFromCombo(::GetDlgItem(_hSelf, IDC_INCFINDTEXT), isUnicode); _pFRDlg->processFindNext(str2Search.c_str(), &fo); } return TRUE; @@ -1325,7 +1352,7 @@ BOOL CALLBACK FindIncrementDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM fo._isIncremental = true; fo._isMatchCase = (BST_CHECKED == ::SendDlgItemMessage(_hSelf, IDC_INCFINDMATCHCASE, BM_GETCHECK, 0, 0)); - string str2Search = getTextFromCombo(::GetDlgItem(_hSelf, IDC_INCFINDTEXT), isUnicode); + string str2Search = _pFRDlg->getTextFromCombo(::GetDlgItem(_hSelf, IDC_INCFINDTEXT), isUnicode); _pFRDlg->processFindNext(str2Search.c_str(), &fo); } else diff --git a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.h b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.h index 1d2f9f208..a79cd2e5f 100644 --- a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.h +++ b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.h @@ -154,8 +154,6 @@ struct FindOption { _isWrapAround(true), _whichDirection(DIR_DOWN), _isIncremental(false){}; }; -void addText2Combo(const char * txt2add, HWND comboID, bool isUTF8 = false); -string getTextFromCombo(HWND hCombo, bool isUnicode); class FindReplaceDlg : public StaticDialog { @@ -165,7 +163,7 @@ public : _line = new char[_maxNbCharAllocated + 3]; _uniCharLine = new char[(_maxNbCharAllocated + 3) * 2]; _uniFileName = new char[(_fileNameLenMax + 3) * 2]; - + _winVer = (winVer)::SendMessage(_hParent, NPPM_GETWINDOWSVERSION, 0, 0); //strcpy(_findAllResultStr, FIND_RESULT_DEFAULT_TITLE); }; ~FindReplaceDlg() { @@ -292,6 +290,8 @@ public : protected : virtual BOOL CALLBACK run_dlgProc(UINT message, WPARAM wParam, LPARAM lParam); + void addText2Combo(const char * txt2add, HWND comboID, bool isUTF8 = false); + string getTextFromCombo(HWND hCombo, bool isUnicode) const; private : DIALOG_TYPE _currentStatus; @@ -325,6 +325,7 @@ private : char *_uniFileName; TabBar _tab; + winVer _winVer; void enableReplaceFunc(bool isEnable); void enableFindInFilesControls(bool isEnable = true); diff --git a/scintilla/src/Document.cxx b/scintilla/src/Document.cxx index 06a945f04..cc9720f0b 100644 --- a/scintilla/src/Document.cxx +++ b/scintilla/src/Document.cxx @@ -24,12 +24,47 @@ //Vitaliy #include "UniConversion.h" +// Win32 only !!! +static bool IsMustDie9x(void) +{ + OSVERSIONINFO osver; + osver.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + if ( GetVersionEx( &osver ) ) + { + if ( (osver.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) && + (osver.dwMajorVersion == 4) ) + { + //MessageBox(NULL, "MustDie9x == true", "Test", MB_OK); + return true; + } + } + //MessageBox(NULL, "MustDie9x == false", "Test", MB_OK); + return false; +} -static inline void Platform_MakeUpperW(wchar_t* wstr, unsigned int) { +static inline void Platform_MakeUpperW(wchar_t* wstr, unsigned int len) { // TODO: Add platform-specific function here // Win32 example: - ::CharUpperW(wstr); + static bool bIsMustDie9x = IsMustDie9x(); + + if ( !bIsMustDie9x ) + { + ::CharUpperW(wstr); + } + else + { + char* str = new char[len + 1]; + if ( str ) + { + ::WideCharToMultiByte(CP_ACP, 0, wstr, len, str, len, NULL, NULL); + str[len] = 0; + ::CharUpperA(str); + ::MultiByteToWideChar(CP_ACP, 0, str, len, wstr, len); + wstr[len] = 0; + delete [] str; + } + } } static inline char Platform_MakeUpperChar(char ch) { diff --git a/scintilla/vcbuild/SciLexer.ncb b/scintilla/vcbuild/SciLexer.ncb index 82b66ca79..b97ceffad 100644 Binary files a/scintilla/vcbuild/SciLexer.ncb and b/scintilla/vcbuild/SciLexer.ncb differ diff --git a/scintilla/vcbuild/SciLexer.opt b/scintilla/vcbuild/SciLexer.opt index 56b1e9982..d582ede0e 100644 Binary files a/scintilla/vcbuild/SciLexer.opt and b/scintilla/vcbuild/SciLexer.opt differ diff --git a/scintilla/vcbuild/SciLexer.plg b/scintilla/vcbuild/SciLexer.plg index c5bc5bc63..58e8d9150 100644 --- a/scintilla/vcbuild/SciLexer.plg +++ b/scintilla/vcbuild/SciLexer.plg @@ -6,101 +6,101 @@ --------------------Configuration: SciLexer - Win32 Release--------------------

Command Lines

-Creating command line "rc.exe /l 0x409 /fo"Release/ScintRes.res" /i "\SOURCES\notepad++\scintilla\win32" /d "NDEBUG" "D:\SOURCES\notepad++\scintilla\win32\ScintRes.rc"" -Creating temporary file "C:\DOCUME~1\Don\LOCALS~1\Temp\RSP1A.tmp" with contents +Creating command line "rc.exe /l 0x409 /fo"Release/ScintRes.res" /i "\Users\Don\source\notepad++\scintilla\win32" /d "NDEBUG" "C:\Users\Don\source\notepad++\scintilla\win32\ScintRes.rc"" +Creating temporary file "C:\Users\Don\AppData\Local\Temp\RSPB5EC.tmp" with contents [ /nologo /G6 /MT /W4 /O1 /I "..\include" /I "..\src" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SCI_LEXER" /Fr"Release/" /Fo"Release/" /Fd"Release/" /FD /c -"D:\SOURCES\notepad++\scintilla\src\AutoComplete.cxx" -"D:\SOURCES\notepad++\scintilla\src\CallTip.cxx" -"D:\SOURCES\notepad++\scintilla\src\CellBuffer.cxx" -"D:\SOURCES\notepad++\scintilla\src\CharClassify.cxx" -"D:\SOURCES\notepad++\scintilla\src\ContractionState.cxx" -"D:\SOURCES\notepad++\scintilla\src\Document.cxx" -"D:\SOURCES\notepad++\scintilla\src\DocumentAccessor.cxx" -"D:\SOURCES\notepad++\scintilla\src\Editor.cxx" -"D:\SOURCES\notepad++\scintilla\src\ExternalLexer.cxx" -"D:\SOURCES\notepad++\scintilla\src\Indicator.cxx" -"D:\SOURCES\notepad++\scintilla\src\KeyMap.cxx" -"D:\SOURCES\notepad++\scintilla\src\KeyWords.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexAda.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexAPDL.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexAsm.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexAsn1.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexAU3.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexAVE.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexBaan.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexBash.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexBasic.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexBullant.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexCaml.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexCLW.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexCmake.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexConf.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexCPP.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexCrontab.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexCsound.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexCSS.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexD.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexEiffel.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexErlang.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexEScript.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexFlagship.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexForth.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexFortran.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexGui4Cli.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexHaskell.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexHTML.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexInno.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexKix.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexLisp.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexLout.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexLua.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexMatlab.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexMetapost.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexMMIXAL.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexMPT.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexMSSQL.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexNsis.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexObjC.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexOpal.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexOthers.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexPascal.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexPB.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexPerl.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexPOV.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexPS.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexPython.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexRebol.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexRuby.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexScriptol.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexSearchResult.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexSmalltalk.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexSpecman.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexSpice.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexSQL.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexTADS3.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexTCL.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexTeX.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexUser.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexVB.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexVerilog.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexVHDL.cxx" -"D:\SOURCES\notepad++\scintilla\src\LexYAML.cxx" -"D:\SOURCES\notepad++\scintilla\src\LineMarker.cxx" -"D:\SOURCES\notepad++\scintilla\win32\PlatWin.cxx" -"D:\SOURCES\notepad++\scintilla\src\PropSet.cxx" -"D:\SOURCES\notepad++\scintilla\src\RESearch.cxx" -"D:\SOURCES\notepad++\scintilla\src\ScintillaBase.cxx" -"D:\SOURCES\notepad++\scintilla\win32\ScintillaWin.cxx" -"D:\SOURCES\notepad++\scintilla\src\Style.cxx" -"D:\SOURCES\notepad++\scintilla\src\StyleContext.cxx" -"D:\SOURCES\notepad++\scintilla\src\UniConversion.cxx" -"D:\SOURCES\notepad++\scintilla\src\ViewStyle.cxx" -"D:\SOURCES\notepad++\scintilla\src\WindowAccessor.cxx" -"D:\SOURCES\notepad++\scintilla\src\XPM.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\AutoComplete.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\CallTip.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\CellBuffer.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\CharClassify.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\ContractionState.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\Document.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\DocumentAccessor.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\Editor.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\ExternalLexer.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\Indicator.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\KeyMap.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\KeyWords.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexAda.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexAPDL.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexAsm.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexAsn1.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexAU3.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexAVE.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexBaan.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexBash.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexBasic.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexBullant.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexCaml.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexCLW.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexCmake.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexConf.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexCPP.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexCrontab.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexCsound.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexCSS.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexD.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexEiffel.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexErlang.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexEScript.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexFlagship.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexForth.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexFortran.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexGui4Cli.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexHaskell.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexHTML.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexInno.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexKix.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexLisp.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexLout.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexLua.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexMatlab.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexMetapost.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexMMIXAL.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexMPT.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexMSSQL.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexNsis.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexObjC.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexOpal.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexOthers.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexPascal.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexPB.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexPerl.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexPOV.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexPS.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexPython.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexRebol.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexRuby.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexScriptol.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexSearchResult.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexSmalltalk.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexSpecman.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexSpice.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexSQL.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexTADS3.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexTCL.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexTeX.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexUser.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexVB.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexVerilog.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexVHDL.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LexYAML.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\LineMarker.cxx" +"C:\Users\Don\source\notepad++\scintilla\win32\PlatWin.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\PropSet.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\RESearch.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\ScintillaBase.cxx" +"C:\Users\Don\source\notepad++\scintilla\win32\ScintillaWin.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\Style.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\StyleContext.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\UniConversion.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\ViewStyle.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\WindowAccessor.cxx" +"C:\Users\Don\source\notepad++\scintilla\src\XPM.cxx" ] -Creating command line "cl.exe @C:\DOCUME~1\Don\LOCALS~1\Temp\RSP1A.tmp" -Creating temporary file "C:\DOCUME~1\Don\LOCALS~1\Temp\RSP1B.tmp" with contents +Creating command line "cl.exe @C:\Users\Don\AppData\Local\Temp\RSPB5EC.tmp" +Creating temporary file "C:\Users\Don\AppData\Local\Temp\RSPB5ED.tmp" with contents [ kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib imm32.lib comctl32.lib /nologo /dll /pdb:none /map:"Release/SciLexer.map" /machine:I386 /out:"../bin/SciLexer.dll" /implib:"../bin/SciLexer.lib" /opt:nowin98 ".\Release\AutoComplete.obj" @@ -193,7 +193,7 @@ kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32 ".\Release\XPM.obj" ".\Release\ScintRes.res" ] -Creating command line "link.exe @C:\DOCUME~1\Don\LOCALS~1\Temp\RSP1B.tmp" +Creating command line "link.exe @C:\Users\Don\AppData\Local\Temp\RSPB5ED.tmp"

Output Window

Compiling resources... Compiling... @@ -218,11 +218,11 @@ LexAVE.cxx LexBaan.cxx LexBash.cxx Generating Code... -D:\SOURCES\notepad++\scintilla\src\Editor.cxx(3313) : warning C4702: unreachable code -D:\SOURCES\notepad++\scintilla\src\Editor.cxx(4220) : warning C4702: unreachable code -D:\SOURCES\notepad++\scintilla\src\Editor.cxx(4220) : warning C4702: unreachable code -D:\SOURCES\notepad++\scintilla\src\Editor.cxx(5706) : warning C4702: unreachable code -D:\SOURCES\notepad++\scintilla\src\Editor.cxx(5706) : warning C4702: unreachable code +C:\Users\Don\source\notepad++\scintilla\src\Editor.cxx(3313) : warning C4702: unreachable code +C:\Users\Don\source\notepad++\scintilla\src\Editor.cxx(4220) : warning C4702: unreachable code +C:\Users\Don\source\notepad++\scintilla\src\Editor.cxx(4220) : warning C4702: unreachable code +C:\Users\Don\source\notepad++\scintilla\src\Editor.cxx(5706) : warning C4702: unreachable code +C:\Users\Don\source\notepad++\scintilla\src\Editor.cxx(5706) : warning C4702: unreachable code Compiling... LexBasic.cxx LexBullant.cxx