Skip to content

CF_UNICODETEXT形式のクリップボードデータをサクラエディタにペーストしたときに u+0000 が追加される不具合を修正 #2095

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
beru merged 2 commits into from
Jun 27, 2025
Merged

CF_UNICODETEXT形式のクリップボードデータをサクラエディタにペーストしたときに u+0000 が追加される不具合を修正 #2095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59227e2
CF_UNICODETEXT clipboard data always contains \0 at its end
beru Jun 27, 2025
c599ac9
remove some warnings
beru Jun 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sakura_core/_os/CClipboard.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ bool CClipboard::GetText(IWBuffer* cmemBuf, bool* pbColumnSelect, bool* pbLineSe
}
if( hUnicode != NULL ){
wchar_t* szData = static_cast<wchar_t*>(::GlobalLock(hUnicode));
cmemBuf->Append( szData, GlobalSize(hUnicode)/2);
cmemBuf->Append( szData, GlobalSize(hUnicode) / 2 - 1);

@berryzplus berryzplus Sep 27, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

なんとも言えないけど正しくはこんな感じなんでしょうね。

		cmemBuf->Append( szData, wcsnlen(szData, GlobalSize(hUnicode) / 2))

GlobalSizeの戻り値を信用できるかどうかは微妙なので、自前でNUL終端を検索してやるのがベターです。

::GlobalUnlock(hUnicode);
return true;
}
Expand Down
2 changes: 1 addition & 1 deletion sakura_core/_os/CClipboard.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ struct StdWStringBuffer : public IWBuffer {
try {
wstr->reserve(nDataLen);
}
catch (std::bad_alloc& exp) {
catch (std::bad_alloc&) {
;
}
}
Expand Down
2 changes: 1 addition & 1 deletion sakura_core/cmd/CViewCommander_Clipboard.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ void CViewCommander::Command_INSTEXT(
}

if( nTextLen < 0 ){
nTextLen = CLogicInt(wcslen( pszText ));
nTextLen = wcslen( pszText );
}

CWaitCursor cWaitCursor( m_pCommanderView->GetHwnd(),
Expand Down