PatchUnicode-1051 v0.8 タグジャンプに対応 sakura-editor#1607

Author: dep5

sakura_core/cmd/CViewCommander_TagJump.cpp

@@ -71,7 +71,7 @@ static bool IsFileExists2( const wchar_t* pszFile )
 	return IsFileExists(pszFile, true);
 }
 
-static bool IsHWNDTag( const wchar_t* pLine, wchar_t* pFile, int* pnLen = NULL )
+static bool IsHWNDTag( const wchar_t* pLine, std::wstring& str, int* pnLen = NULL )
 {
 	if( 0 == wcsncmp(pLine, L":HWND:[", 7) ){
 		const wchar_t* pFileEnd = wcsstr( pLine, L"]" );
@@ -84,12 +84,11 @@ static bool IsHWNDTag( const wchar_t* pLine, wchar_t* pFile, int* pnLen = NULL )
 				}
 			}
 			if( i != nLen && nLen <= 16 + 8 ){
-				if( pFile ){
-					wmemcpy(szJumpToFile, pLine, nLen);
-				}
 				if( pnLen ){
 					*pnLen = nLen;
+					return true;
 				}
+				str.assign(pLine, nLen);
 				return true;
 			}
 		}
@@ -291,15 +290,12 @@ bool CViewCommander::Command_TagJumpNoMessage( bool bClose )
 				break;
 			}else if (!GetQuoteFilePath(&pLine[2], strFile, MAX_TAG_PATH)) {
 				break;
-			}else if( IsHWNDTag(&pLine[2], szJumpToFile) ){
-				break;
 			}
 			searchMode = TAGLIST_ROOT;
 		}else if( 0 == wmemcmp( pLine, L"◆\"", 2 ) ){
 			if (!GetQuoteFilePath(&pLine[2], strFile, MAX_TAG_PATH)) {
 				break;
-			}
-			if( IsHWNDTag(&pLine[2], szJumpToFile) ){
+			}else if( IsHWNDTag(&pLine[2], strJumpToFile) ){
 				break;
 			}
 			searchMode = TAGLIST_SUBPATH;
@@ -309,6 +305,9 @@ bool CViewCommander::Command_TagJumpNoMessage( bool bClose )
 				if (!GetQuoteFilePath(&pLine[2], strFile, MAX_TAG_PATH)) {
 					break;
 				}
+			if( IsHWNDTag(&pLine[2], strJumpToFile) ){
+				break;
+			}
 				searchMode = TAGLIST_SUBPATH;
 			}else if( pLine[1] == L'(' ){
 				// ファイル毎(WZ風)
@@ -322,11 +321,10 @@ bool CViewCommander::Command_TagJumpNoMessage( bool bClose )
 				// ・subpath\FileName.ext(123,45): str
 				// ・:HWND:[01234567](無題)2(123,45): str
 				int fileEnd = GetLineColumnPos(pLine);
-				if( 0 < fileEnd && fileEnd - 1 < (int)_countof(szFile) ){
-					wmemcpy( szFile, pLine + 1, fileEnd - 1 );
-					szFile[fileEnd - 1] = L'\0';
+				if (1 < fileEnd && L'(' == pLine[fileEnd] && fileEnd - 1 < MAX_TAG_PATH) {
+					strFile.assign(pLine + 1, fileEnd - 1);
 					GetLineColumn( &pLine[fileEnd + 1], &nJumpToLine, &nJumpToColumn );
-					if( IsHWNDTag(pLine + 1, szJumpToFile) ){
+					if( IsHWNDTag(pLine + 1, strJumpToFile) ){
 						break;
 					}
 					searchMode = TAGLIST_SUBPATH;
@@ -350,7 +348,7 @@ bool CViewCommander::Command_TagJumpNoMessage( bool bClose )
 				if( searchMode == TAGLIST_SUBPATH || searchMode == TAGLIST_ROOT ){
 					continue;
 				}
-				if( IsHWNDTag(&pLine[2], szJumpToFile) ){
+				if( IsHWNDTag(&pLine[2], strJumpToFile) ){
 					break;
 				}
 				// フォルダ毎：ファイル名
@@ -369,7 +367,7 @@ bool CViewCommander::Command_TagJumpNoMessage( bool bClose )
 				if( searchMode == TAGLIST_ROOT ){
 					continue;
 				}
-				if( IsHWNDTag(&pLine[2], szJumpToFile) ){
+				if( IsHWNDTag(&pLine[2], strJumpToFile) ){
 					break;
 				}
 				// ファイル毎(WZ風)：フルパス
@@ -424,16 +422,16 @@ bool CViewCommander::Command_TagJumpNoMessage( bool bClose )
 			return false;
 		}
 		int nLen = 0;
-		if( IsHWNDTag(pLine, NULL, &nLen) ){
+		std::wstring test;
+		if (IsHWNDTag(pLine, test, &nLen)) {
 			int nFileEnd = GetLineColumnPos(pLine);
 			if( nFileEnd ){
-				auto_memcpy(szJumpToFile, pLine, nLen);
-				szJumpToFile[nLen] = L'\0';
+				strJumpToFile.assign(pLine, nLen);
 				GetLineColumn(&pLine[nFileEnd + 1], &nJumpToLine, &nJumpToColumn);
 			}
 		}
 	}
-	if( szJumpToFile[0] == L'\0' ){
+	if (strJumpToFile.empty()) {
 		//@@@ 2001.12.31 YAZAKI
 		const wchar_t *p = pLine;
 		const wchar_t *p_end = p + nLineLen;
@@ -470,8 +468,6 @@ bool CViewCommander::Command_TagJumpNoMessage( bool bClose )
 	//	Apr. 21, 2003 genta bClose追加
 	if (strJumpToFile.empty() == false &&
 		m_pCommanderView->TagJumpSub(strJumpToFile.c_str(), CMyPoint(nJumpToColumn, nJumpToLine), bClose ) ){	//@@@ 2003.04.13
-		std::wstring tstrFile = szJumpToFile;
-		if( m_pCommanderView->TagJumpSub( tstrFile.c_str(), CMyPoint(nJumpToColumn, nJumpToLine), bClose ) ){	//@@@ 2003.04.13
 		return true;
 	}
 

sakura_core/view/CEditView_Command.cpp

@@ -61,7 +61,7 @@ bool CEditView::TagJumpSub(
 	bool*			pbJumpToSelf	//!< [out] オプションNULL可。自分にジャンプしたか
 )
 {
-	HWND	hwndOwner;
+	HWND	hwndOwner = NULL;
 	POINT	poCaret;
 	// 2004/06/21 novice タグジャンプ機能追加
 	TagJump	tagJump;