Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [COMCTL32][USER32] EDIT: Fix caret position for IME
by Katayama Hirofumi MZ 09 Apr '23

09 Apr '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8f2c2c1defb56aa4f559c… commit 8f2c2c1defb56aa4f559c75b5d0e0746db877f5a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Apr 10 08:27:50 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Apr 10 08:27:50 2023 +0900 [COMCTL32][USER32] EDIT: Fix caret position for IME CORE-11700 --- dll/win32/comctl32/edit.c | 4 ++++ win32ss/user/user32/controls/edit.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/dll/win32/comctl32/edit.c b/dll/win32/comctl32/edit.c index b37bf8cffb5..d17c7f20d30 100644 --- a/dll/win32/comctl32/edit.c +++ b/dll/win32/comctl32/edit.c @@ -4392,7 +4392,11 @@ static void EDIT_ImeComposition(HWND hwnd, LPARAM CompFlag, EDITSTATE *es) { if (CompFlag & GCS_COMPSTR) EDIT_GetCompositionStr(hIMC, CompFlag, es); +#ifdef __REACTOS__ + cursor = 0; +#else cursor = ImmGetCompositionStringW(hIMC, GCS_CURSORPOS, 0, 0); +#endif } ImmReleaseContext(hwnd, hIMC); EDIT_SetCaretPos(es, es->selection_start + cursor, es->flags & EF_AFTER_WRAP); diff --git a/win32ss/user/user32/controls/edit.c b/win32ss/user/user32/controls/edit.c index 9a38353eb59..bfe910c8cde 100644 --- a/win32ss/user/user32/controls/edit.c +++ b/win32ss/user/user32/controls/edit.c @@ -4617,7 +4617,11 @@ static void EDIT_ImeComposition(HWND hwnd, LPARAM CompFlag, EDITSTATE *es) { if (CompFlag & GCS_COMPSTR) EDIT_GetCompositionStr(hIMC, CompFlag, es); +#ifdef __REACTOS__ + cursor = 0; +#else cursor = ImmGetCompositionStringW(hIMC, GCS_CURSORPOS, 0, 0); +#endif } ImmReleaseContext(hwnd, hIMC); EDIT_SetCaretPos(es, es->selection_start + cursor, es->flags & EF_AFTER_WRAP);

1 0

[reactos] 01/01: [NTUSER] IntImmActivateLayout: Set CI_IMMACTIVATE if not pImeWnd (#5231)
by Katayama Hirofumi MZ 09 Apr '23

09 Apr '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5ff0ef403e3299541da55… commit 5ff0ef403e3299541da55da4b6e025bc57883423 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Apr 9 15:19:47 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Apr 9 15:19:47 2023 +0900 [NTUSER] IntImmActivateLayout: Set CI_IMMACTIVATE if not pImeWnd (#5231) In IntImmActivateLayout function, if pImeWnd was NULL and pti->spDefaultImc was non-NULL, then set CI_IMMACTIVATE flag. CORE-11700 --- win32ss/user/ntuser/kbdlayout.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/win32ss/user/ntuser/kbdlayout.c b/win32ss/user/ntuser/kbdlayout.c index 2f9ea599ab7..f3971cf5c67 100644 --- a/win32ss/user/ntuser/kbdlayout.c +++ b/win32ss/user/ntuser/kbdlayout.c @@ -650,6 +650,11 @@ IntImmActivateLayout( co_IntSendMessage(hImeWnd, WM_IME_SYSTEM, IMS_ACTIVATELAYOUT, (LPARAM)pKL->hkl); UserDerefObjectCo(pImeWnd); } + else if (pti->spDefaultImc) + { + /* IME Activation is needed */ + pti->pClientInfo->CI_flags |= CI_IMMACTIVATE; + } UserAssignmentLock((PVOID*)&(pti->KeyboardLayout), pKL); pti->pClientInfo->hKL = pKL->hkl;

1 0

[reactos] 01/01: [COMCTL32][USER32] EDIT: CompForm and CandForm (#5226)
by Katayama Hirofumi MZ 09 Apr '23

09 Apr '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=66c8ded4548bd1d886431… commit 66c8ded4548bd1d886431152bc8a7e5cacc411d1 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Apr 9 15:19:19 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Apr 9 15:19:19 2023 +0900 [COMCTL32][USER32] EDIT: CompForm and CandForm (#5226) The changes of this PR are on EDIT controls. - Delete composition_len and composition_start members. - Add EDIT_ImmSetCompositionWindow helper function. - At EDIT_SetCaretPos, set the position of the composition window. - We don't use internal composition string. Rely on the composition window. - Improve WM_IME_STARTCOMPOSITION, WM_IME_COMPOSITION and WM_IME_ENDCOMPOSITION message handling. CORE-11700 --- dll/win32/comctl32/edit.c | 71 +++++++++++++++++++++++++++++++-- win32ss/user/user32/controls/edit.c | 79 ++++++++++++++++++++++++++++++++++--- 2 files changed, 141 insertions(+), 9 deletions(-) diff --git a/dll/win32/comctl32/edit.c b/dll/win32/comctl32/edit.c index 2e7322077fa..b37bf8cffb5 100644 --- a/dll/win32/comctl32/edit.c +++ b/dll/win32/comctl32/edit.c @@ -150,8 +150,10 @@ typedef struct /* * IME Data */ +#ifndef __REACTOS__ /* Rely on the composition window */ UINT composition_len; /* length of composition, 0 == no composition */ int composition_start; /* the character position for the composition */ +#endif /* * Uniscribe Data */ @@ -1711,6 +1713,33 @@ static LRESULT EDIT_EM_Scroll(EDITSTATE *es, INT action) } +#ifdef __REACTOS__ +static void EDIT_ImmSetCompositionWindow(EDITSTATE *es, POINT pt) +{ + COMPOSITIONFORM CompForm; + HIMC hIMC = ImmGetContext(es->hwndSelf); + if (!hIMC) + { + ERR("!hIMC\n"); + return; + } + + CompForm.ptCurrentPos = pt; + if (es->style & ES_MULTILINE) + { + CompForm.dwStyle = CFS_RECT; + CompForm.rcArea = es->format_rect; + } + else + { + CompForm.dwStyle = CFS_POINT; + SetRectEmpty(&CompForm.rcArea); + } + + ImmSetCompositionWindow(hIMC, &CompForm); + ImmReleaseContext(es->hwndSelf, hIMC); +} +#endif /********************************************************************* * * EDIT_SetCaretPos @@ -1720,8 +1749,19 @@ static void EDIT_SetCaretPos(EDITSTATE *es, INT pos, BOOL after_wrap) { LRESULT res = EDIT_EM_PosFromChar(es, pos, after_wrap); +#ifdef __REACTOS__ + HKL hKL = GetKeyboardLayout(0); + POINT pt = { (short)LOWORD(res), (short)HIWORD(res) }; + SetCaretPos(pt.x, pt.y); + + if (!ImmIsIME(hKL)) + return; + + EDIT_ImmSetCompositionWindow(es, pt); +#else TRACE("%d - %dx%d\n", pos, (short)LOWORD(res), (short)HIWORD(res)); SetCaretPos((short)LOWORD(res), (short)HIWORD(res)); +#endif } @@ -2076,7 +2116,11 @@ static INT EDIT_PaintText(EDITSTATE *es, HDC dc, INT x, INT y, INT line, INT col BkColor = GetBkColor(dc); TextColor = GetTextColor(dc); if (rev) { +#ifdef __REACTOS__ + if (TRUE) +#else if (es->composition_len == 0) +#endif { SetBkColor(dc, GetSysColor(COLOR_HIGHLIGHT)); SetTextColor(dc, GetSysColor(COLOR_HIGHLIGHTTEXT)); @@ -2101,7 +2145,11 @@ static INT EDIT_PaintText(EDITSTATE *es, HDC dc, INT x, INT y, INT line, INT col ret = size.cx; } if (rev) { +#ifdef __REACTOS__ + if (TRUE) +#else if (es->composition_len == 0) +#endif { SetBkColor(dc, BkColor); SetTextColor(dc, TextColor); @@ -4256,6 +4304,7 @@ static void EDIT_GetCompositionStr(HIMC hIMC, LPARAM CompFlag, EDITSTATE *es) } } +#ifndef __REACTOS__ /* We don't use internal composition string. Rely on the composition window */ /* check for change in composition start */ if (es->selection_end < es->composition_start) es->composition_start = es->selection_end; @@ -4273,6 +4322,7 @@ static void EDIT_GetCompositionStr(HIMC hIMC, LPARAM CompFlag, EDITSTATE *es) es->selection_start = es->composition_start; es->selection_end = es->selection_start + es->composition_len; +#endif heap_free(lpCompStrAttr); heap_free(lpCompStr); @@ -4298,6 +4348,7 @@ static void EDIT_GetResultStr(HIMC hIMC, EDITSTATE *es) ImmGetCompositionStringW(hIMC, GCS_RESULTSTR, lpResultStr, buflen); +#ifndef __REACTOS__ /* check for change in composition start */ if (es->selection_end < es->composition_start) es->composition_start = es->selection_end; @@ -4307,6 +4358,7 @@ static void EDIT_GetResultStr(HIMC hIMC, EDITSTATE *es) EDIT_EM_ReplaceSel(es, TRUE, lpResultStr, buflen / sizeof(WCHAR), TRUE, TRUE); es->composition_start = es->selection_end; es->composition_len = 0; +#endif heap_free(lpResultStr); } @@ -4316,11 +4368,16 @@ static void EDIT_ImeComposition(HWND hwnd, LPARAM CompFlag, EDITSTATE *es) HIMC hIMC; int cursor; +#ifdef __REACTOS__ + if (es->selection_start != es->selection_end) + EDIT_EM_ReplaceSel(es, TRUE, NULL, 0, TRUE, TRUE); +#else if (es->composition_len == 0 && es->selection_start != es->selection_end) { EDIT_EM_ReplaceSel(es, TRUE, NULL, 0, TRUE, TRUE); es->composition_start = es->selection_end; } +#endif hIMC = ImmGetContext(hwnd); if (!hIMC) @@ -5015,26 +5072,34 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR break; case WM_IME_STARTCOMPOSITION: - es->composition_start = es->selection_end; - es->composition_len = 0; #ifdef __REACTOS__ if (FALSE) /* FIXME: Condition */ return TRUE; - result = DefWindowProcW(hwnd, WM_IME_STARTCOMPOSITION, wParam, lParam); + result = DefWindowProcW(hwnd, msg, wParam, lParam); +#else + es->composition_start = es->selection_end; + es->composition_len = 0; #endif break; case WM_IME_COMPOSITION: EDIT_ImeComposition(hwnd, lParam, es); +#ifdef __REACTOS__ + result = DefWindowProcW(hwnd, msg, wParam, lParam); +#endif break; case WM_IME_ENDCOMPOSITION: +#ifdef __REACTOS__ + result = DefWindowProcW(hwnd, msg, wParam, lParam); +#else if (es->composition_len > 0) { EDIT_EM_ReplaceSel(es, TRUE, NULL, 0, TRUE, TRUE); es->selection_end = es->selection_start; es->composition_len= 0; } +#endif break; case WM_IME_COMPOSITIONFULL: diff --git a/win32ss/user/user32/controls/edit.c b/win32ss/user/user32/controls/edit.c index c9e4faaed53..9a38353eb59 100644 --- a/win32ss/user/user32/controls/edit.c +++ b/win32ss/user/user32/controls/edit.c @@ -47,14 +47,16 @@ #include <usp10.h> #ifdef __REACTOS__ #include <immdev.h> -#define ImmGetContext IMM_FN(ImmGetContext) #define ImmGetCompositionStringW IMM_FN(ImmGetCompositionStringW) -#define ImmReleaseContext IMM_FN(ImmReleaseContext) +#define ImmGetCompositionWindow IMM_FN(ImmGetCompositionWindow) +#define ImmGetContext IMM_FN(ImmGetContext) +#define ImmIsIME IMM_FN(ImmIsIME) #define ImmLockIMC IMM_FN(ImmLockIMC) -#define ImmUnlockIMC IMM_FN(ImmUnlockIMC) #define ImmNotifyIME IMM_FN(ImmNotifyIME) -#define ImmIsIME IMM_FN(ImmIsIME) +#define ImmReleaseContext IMM_FN(ImmReleaseContext) #define ImmSetCompositionFontW IMM_FN(ImmSetCompositionFontW) +#define ImmSetCompositionWindow IMM_FN(ImmSetCompositionWindow) +#define ImmUnlockIMC IMM_FN(ImmUnlockIMC) #endif WINE_DEFAULT_DEBUG_CHANNEL(edit); @@ -154,8 +156,10 @@ typedef struct /* * IME Data */ +#ifndef __REACTOS__ /* Rely on the composition window */ UINT composition_len; /* length of composition, 0 == no composition */ int composition_start; /* the character position for the composition */ +#endif /* * Uniscribe Data */ @@ -1864,6 +1868,33 @@ static LRESULT EDIT_EM_Scroll(EDITSTATE *es, INT action) } +#ifdef __REACTOS__ +static void EDIT_ImmSetCompositionWindow(EDITSTATE *es, POINT pt) +{ + COMPOSITIONFORM CompForm; + HIMC hIMC = ImmGetContext(es->hwndSelf); + if (!hIMC) + { + ERR("!hIMC\n"); + return; + } + + CompForm.ptCurrentPos = pt; + if (es->style & ES_MULTILINE) + { + CompForm.dwStyle = CFS_RECT; + CompForm.rcArea = es->format_rect; + } + else + { + CompForm.dwStyle = CFS_POINT; + SetRectEmpty(&CompForm.rcArea); + } + + ImmSetCompositionWindow(hIMC, &CompForm); + ImmReleaseContext(es->hwndSelf, hIMC); +} +#endif /********************************************************************* * * EDIT_SetCaretPos @@ -1873,8 +1904,19 @@ static void EDIT_SetCaretPos(EDITSTATE *es, INT pos, BOOL after_wrap) { LRESULT res = EDIT_EM_PosFromChar(es, pos, after_wrap); +#ifdef __REACTOS__ + HKL hKL = GetKeyboardLayout(0); + POINT pt = { (short)LOWORD(res), (short)HIWORD(res) }; + SetCaretPos(pt.x, pt.y); + + if (!ImmIsIME(hKL)) + return; + + EDIT_ImmSetCompositionWindow(es, pt); +#else TRACE("%d - %dx%d\n", pos, (short)LOWORD(res), (short)HIWORD(res)); SetCaretPos((short)LOWORD(res), (short)HIWORD(res)); +#endif } @@ -2229,7 +2271,11 @@ static INT EDIT_PaintText(EDITSTATE *es, HDC dc, INT x, INT y, INT line, INT col BkColor = GetBkColor(dc); TextColor = GetTextColor(dc); if (rev) { +#ifdef __REACTOS__ + if (TRUE) +#else if (es->composition_len == 0) +#endif { SetBkColor(dc, GetSysColor(COLOR_HIGHLIGHT)); SetTextColor(dc, GetSysColor(COLOR_HIGHLIGHTTEXT)); @@ -2254,7 +2300,11 @@ static INT EDIT_PaintText(EDITSTATE *es, HDC dc, INT x, INT y, INT line, INT col ret = size.cx; } if (rev) { +#ifdef __REACTOS__ + if (TRUE) +#else if (es->composition_len == 0) +#endif { SetBkColor(dc, BkColor); SetTextColor(dc, TextColor); @@ -4478,6 +4528,7 @@ static void EDIT_GetCompositionStr(HIMC hIMC, LPARAM CompFlag, EDITSTATE *es) } } +#ifndef __REACTOS__ /* We don't use internal composition string. Rely on the composition window */ /* check for change in composition start */ if (es->selection_end < es->composition_start) es->composition_start = es->selection_end; @@ -4495,6 +4546,7 @@ static void EDIT_GetCompositionStr(HIMC hIMC, LPARAM CompFlag, EDITSTATE *es) es->selection_start = es->composition_start; es->selection_end = es->selection_start + es->composition_len; +#endif HeapFree(GetProcessHeap(),0,lpCompStrAttr); HeapFree(GetProcessHeap(),0,lpCompStr); @@ -4521,6 +4573,7 @@ static void EDIT_GetResultStr(HIMC hIMC, EDITSTATE *es) ImmGetCompositionStringW(hIMC, GCS_RESULTSTR, lpResultStr, buflen); lpResultStr[buflen/sizeof(WCHAR)] = 0; +#ifndef __REACTOS__ /* check for change in composition start */ if (es->selection_end < es->composition_start) es->composition_start = es->selection_end; @@ -4530,6 +4583,7 @@ static void EDIT_GetResultStr(HIMC hIMC, EDITSTATE *es) EDIT_EM_ReplaceSel(es, TRUE, lpResultStr, TRUE, TRUE); es->composition_start = es->selection_end; es->composition_len = 0; +#endif HeapFree(GetProcessHeap(),0,lpResultStr); } @@ -4539,11 +4593,16 @@ static void EDIT_ImeComposition(HWND hwnd, LPARAM CompFlag, EDITSTATE *es) HIMC hIMC; int cursor; +#ifdef __REACTOS__ + if (es->selection_start != es->selection_end) + EDIT_EM_ReplaceSel(es, TRUE, empty_stringW, TRUE, TRUE); +#else if (es->composition_len == 0 && es->selection_start != es->selection_end) { EDIT_EM_ReplaceSel(es, TRUE, empty_stringW, TRUE, TRUE); es->composition_start = es->selection_end; } +#endif hIMC = ImmGetContext(hwnd); if (!hIMC) @@ -5333,26 +5392,34 @@ LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP break; case WM_IME_STARTCOMPOSITION: - es->composition_start = es->selection_end; - es->composition_len = 0; #ifdef __REACTOS__ if (FALSE) /* FIXME: Condition */ return TRUE; result = DefWindowProcT(hwnd, msg, wParam, lParam, unicode); +#else + es->composition_start = es->selection_end; + es->composition_len = 0; #endif break; case WM_IME_COMPOSITION: EDIT_ImeComposition(hwnd, lParam, es); +#ifdef __REACTOS__ + result = DefWindowProcT(hwnd, msg, wParam, lParam, unicode); +#endif break; case WM_IME_ENDCOMPOSITION: +#ifdef __REACTOS__ + result = DefWindowProcT(hwnd, msg, wParam, lParam, unicode); +#else if (es->composition_len > 0) { EDIT_EM_ReplaceSel(es, TRUE, empty_stringW, TRUE, TRUE); es->selection_end = es->selection_start; es->composition_len= 0; } +#endif break; case WM_IME_COMPOSITIONFULL:

1 0

[reactos] 01/01: [MSPAINT] Fix handle leaks about memory bitmap
by Katayama Hirofumi MZ 09 Apr '23

09 Apr '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a9284b566482e18962209… commit a9284b566482e18962209c642b0e22aacaf1d2fa Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Apr 9 11:15:51 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Apr 9 11:17:17 2023 +0900 [MSPAINT] Fix handle leaks about memory bitmap This fixes CORE-18919. CORE-18867 --- base/applications/mspaint/canvas.cpp | 2 +- base/applications/mspaint/palette.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index 3b260b8a5b3..4ce162aa18a 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -164,7 +164,7 @@ VOID CCanvasWindow::DoDraw(HDC hDC, RECT& rcClient, RECT& rcPaint) rcPaint.right - rcPaint.left, rcPaint.bottom - rcPaint.top, hdcMem, rcPaint.left, rcPaint.top, SRCCOPY); - ::SelectObject(hdcMem, hbmOld); + ::DeleteObject(::SelectObject(hdcMem, hbmOld)); ::DeleteDC(hdcMem); } diff --git a/base/applications/mspaint/palette.cpp b/base/applications/mspaint/palette.cpp index 920af27d250..acd5552defc 100644 --- a/base/applications/mspaint/palette.cpp +++ b/base/applications/mspaint/palette.cpp @@ -121,7 +121,7 @@ LRESULT CPaletteWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& b /* Transfer bits (hDC <-- hMemDC) */ ::BitBlt(hDC, 0, 0, rcClient.right, rcClient.bottom, hMemDC, 0, 0, SRCCOPY); - ::SelectObject(hMemDC, hbmOld); + ::DeleteObject(::SelectObject(hMemDC, hbmOld)); ::DeleteDC(hMemDC); EndPaint(&ps); return 0;

1 0

[reactos] 01/01: [ADVAPI32] Do not fail on creating a registry key if the security attributes have an invalid length. (#5230)
by Doug Lyons 09 Apr '23

09 Apr '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bfc6a119c57c367f8cb6a… commit bfc6a119c57c367f8cb6a8e782ec2c81901719a0 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Sat Apr 8 21:04:04 2023 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Apr 9 04:04:04 2023 +0200 [ADVAPI32] Do not fail on creating a registry key if the security attributes have an invalid length. (#5230) Provide graceful handling of RegCreateKeyExW when lpSecurityAttributes->nLength is zero. This reverts commit cc0716b65 (SVN r24491). JIRA issue: CORE-15471 --- dll/win32/advapi32/reg/reg.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dll/win32/advapi32/reg/reg.c b/dll/win32/advapi32/reg/reg.c index 904ca010eca..58515793c4e 100644 --- a/dll/win32/advapi32/reg/reg.c +++ b/dll/win32/advapi32/reg/reg.c @@ -1108,9 +1108,6 @@ RegCreateKeyExW( TRACE("RegCreateKeyExW() called\n"); - if (lpSecurityAttributes && lpSecurityAttributes->nLength != sizeof(SECURITY_ATTRIBUTES)) - return ERROR_INVALID_USER_BUFFER; - /* get the real parent key */ Status = MapDefaultKey(&ParentKey, hKey);

1 0

[reactos] 01/01: [MSPAINT] Fix Copy and Paste
by Katayama Hirofumi MZ 09 Apr '23

09 Apr '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=96c7fe4ccd336c9cb82bb… commit 96c7fe4ccd336c9cb82bb800451ec3cd5c17c2f2 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Apr 9 09:14:32 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Apr 9 09:14:32 2023 +0900 [MSPAINT] Fix Copy and Paste Call GetSelectionContents in SelectionModel::GetBitmap. CORE-18920, CORE-18867 --- base/applications/mspaint/selectionmodel.cpp | 4 +++- base/applications/mspaint/selectionmodel.h | 2 +- base/applications/mspaint/winproc.cpp | 10 ++++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/base/applications/mspaint/selectionmodel.cpp b/base/applications/mspaint/selectionmodel.cpp index 59aaa382ac9..56d74ce877e 100644 --- a/base/applications/mspaint/selectionmodel.cpp +++ b/base/applications/mspaint/selectionmodel.cpp @@ -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; } diff --git a/base/applications/mspaint/selectionmodel.h b/base/applications/mspaint/selectionmodel.h index fc1420de7fd..af285e380d8 100644 --- a/base/applications/mspaint/selectionmodel.h +++ b/base/applications/mspaint/selectionmodel.h @@ -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); diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 828bf0855ff..857eedd81ae 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -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 */

1 0

[reactos] 01/01: [MSPAINT] Fix SelectionModel::InsertFromHBITMAP bug
by Katayama Hirofumi MZ 09 Apr '23

09 Apr '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=639739a7cd915a3f63976… commit 639739a7cd915a3f63976a4b2c356b54a5005985 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Apr 9 09:01:14 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Apr 9 09:01:14 2023 +0900 [MSPAINT] Fix SelectionModel::InsertFromHBITMAP bug CORE-18867, CORE-18920 --- base/applications/mspaint/selectionmodel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/mspaint/selectionmodel.cpp b/base/applications/mspaint/selectionmodel.cpp index 3609632f63b..59aaa382ac9 100644 --- a/base/applications/mspaint/selectionmodel.cpp +++ b/base/applications/mspaint/selectionmodel.cpp @@ -199,8 +199,8 @@ void SelectionModel::Landing() void SelectionModel::InsertFromHBITMAP(HBITMAP hBm, INT x, INT y) { - m_hbmColor = CopyDIBImage(hBm); ::DeleteObject(m_hbmColor); + m_hbmColor = CopyDIBImage(hBm); m_rc.left = x; m_rc.top = y;

1 0

[reactos] 01/01: [MSPAINT] Canvas: Don't draw new frame if HIT_NONE
by Katayama Hirofumi MZ 08 Apr '23

08 Apr '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f45d80adc94be42cda84a… commit f45d80adc94be42cda84ae5cc88c49049e249d33 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Apr 9 08:49:18 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Apr 9 08:49:18 2023 +0900 [MSPAINT] Canvas: Don't draw new frame if HIT_NONE CORE-18867 --- base/applications/mspaint/canvas.cpp | 6 ++++-- base/applications/mspaint/winproc.cpp | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index 4b69c9d25f7..3b260b8a5b3 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -155,7 +155,7 @@ VOID CCanvasWindow::DoDraw(HDC hDC, RECT& rcClient, RECT& rcPaint) } // Draw new frame if any - if (!::IsRectEmpty(&m_rcNew)) + if (m_whereHit != HIT_NONE && !::IsRectEmpty(&m_rcNew)) DrawXorRect(hdcMem, &m_rcNew); // Transfer the bits @@ -668,8 +668,9 @@ LRESULT CCanvasWindow::OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& if (wParam == VK_ESCAPE && ::GetCapture() == m_hWnd) { // Cancel dragging - m_whereHit = HIT_NONE; ::ReleaseCapture(); + m_whereHit = HIT_NONE; + ::SetRectEmpty(&m_rcNew); Invalidate(TRUE); } @@ -680,6 +681,7 @@ LRESULT CCanvasWindow::OnCancelMode(UINT nMsg, WPARAM wParam, LPARAM lParam, BOO { // Cancel dragging m_whereHit = HIT_NONE; + ::SetRectEmpty(&m_rcNew); Invalidate(TRUE); return 0; } diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 09fc9e4b139..828bf0855ff 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -439,7 +439,7 @@ LRESULT CMainWindow::OnInitMenuPopup(UINT nMsg, WPARAM wParam, LPARAM lParam, BO EnableMenuItem(menu, IDM_EDITINVERTSELECTION, ENABLED_IF(trueSelection)); EnableMenuItem(menu, IDM_EDITCOPYTO, ENABLED_IF(trueSelection)); OpenClipboard(); - EnableMenuItem(menu, IDM_EDITPASTE, ENABLED_IF(GetClipboardData(CF_BITMAP) != NULL)); + EnableMenuItem(menu, IDM_EDITPASTE, ENABLED_IF(IsClipboardFormatAvailable(CF_BITMAP))); CloseClipboard(); break; case 2: /* View menu */ @@ -661,7 +661,7 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH break; case IDM_EDITPASTE: OpenClipboard(); - if (GetClipboardData(CF_BITMAP) != NULL) + if (IsClipboardFormatAvailable(CF_BITMAP)) { InsertSelectionFromHBITMAP((HBITMAP) GetClipboardData(CF_BITMAP), m_hWnd); }

1 0

[reactos] 01/01: [MSPAINT] imageSaved = FALSE after image size change
by Katayama Hirofumi MZ 08 Apr '23

08 Apr '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=132f482de2d997d573c24… commit 132f482de2d997d573c24b03e521cb2c122d49ce Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Apr 9 08:23:44 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Apr 9 08:23:44 2023 +0900 [MSPAINT] imageSaved = FALSE after image size change ...and redraw canvas after image resizing is canceled. CORE-18867 --- base/applications/mspaint/canvas.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index 000a44d7987..4b69c9d25f7 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -596,6 +596,8 @@ LRESULT CCanvasWindow::OnLRButtonUp(BOOL bLeftButton, UINT nMsg, WPARAM wParam, } ::SetRectEmpty(&m_rcNew); + imageSaved = FALSE; + m_whereHit = HIT_NONE; toolsModel.resetTool(); // resets the point-buffer of the polygon and bezier functions Update(NULL); @@ -668,6 +670,7 @@ LRESULT CCanvasWindow::OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& // Cancel dragging m_whereHit = HIT_NONE; ::ReleaseCapture(); + Invalidate(TRUE); } return 0;

1 0

[reactos] 01/01: [RAPPS] Calculate download listview position (#5232)
by Katayama Hirofumi MZ 08 Apr '23

08 Apr '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fc5311aaf23ce688f8fd3… commit fc5311aaf23ce688f8fd39b088bdeea445ef9ec4 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Apr 9 05:51:23 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Apr 9 05:51:23 2023 +0900 [RAPPS] Calculate download listview position (#5232) Correctly display Download ListView at right position in any languages. CORE-18706 --- base/applications/rapps/loaddlg.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/base/applications/rapps/loaddlg.cpp b/base/applications/rapps/loaddlg.cpp index 9063954ece0..d76e666e042 100644 --- a/base/applications/rapps/loaddlg.cpp +++ b/base/applications/rapps/loaddlg.cpp @@ -264,7 +264,12 @@ class CDowloadingAppsListView : public CListView HWND Create(HWND hwndParent) { - RECT r = {10, 150, 320, 350}; + RECT r; + ::GetClientRect(hwndParent, &r); + r.top = (2 * r.top + 1 * r.bottom) / 3; /* The vertical position at ratio 1 : 2 */ +#define MARGIN 10 + ::InflateRect(&r, -MARGIN, -MARGIN); + const DWORD style = WS_CHILD | WS_VISIBLE | LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | LVS_NOCOLUMNHEADER;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs