lywsvip/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2026-05-23 07:40:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

[MSPAINT] Fix Copy and Paste

Browse Source 
Call GetSelectionContents in SelectionModel::GetBitmap.
CORE-18920, CORE-18867
This commit is contained in:
Katayama Hirofumi MZ
2023-04-09 09:14:32 +09:00
parent 639739a7cd
commit 96c7fe4ccd
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
base/applications/mspaint/selectionmodel.cpp
View File

@@ -349,8 +349,10 @@ void SelectionModel::StretchSkew(int nStretchPercentX, int nStretchPercentY, int
NotifyRefreshNeeded();
}
HBITMAP SelectionModel::GetBitmap() const
HBITMAP SelectionModel::GetBitmap()
{
if (m_hbmColor == NULL)
GetSelectionContents(imageModel.GetDC());
return m_hbmColor;
}

2
base/applications/mspaint/selectionmodel.h
View File

@@ -34,7 +34,7 @@ public:
BOOL TakeOff();
void Landing();
HBITMAP GetBitmap() const;
HBITMAP GetBitmap();
void GetSelectionContents(HDC hDCImage);
void DrawFramePoly(HDC hDCImage);
void DrawBackgroundPoly(HDC hDCImage, COLORREF crBg);

10
base/applications/mspaint/winproc.cpp
View File

@@ -648,10 +648,12 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH
canvasWindow.Invalidate(FALSE);
break;
case IDM_EDITCOPY:
OpenClipboard();
EmptyClipboard();
SetClipboardData(CF_BITMAP, CopyDIBImage(selectionModel.GetBitmap()));
CloseClipboard();
if (OpenClipboard())
{
EmptyClipboard();
SetClipboardData(CF_BITMAP, CopyDIBImage(selectionModel.GetBitmap()));
CloseClipboard();
}
break;
case IDM_EDITCUT:
/* Copy */