Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [MSPAINT][SDK] Add <ui/CWaitCursor.h> (#5680)
by Katayama Hirofumi MZ 11 Sep '23

11 Sep '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ea5d2c5f7a1644797824f… commit ea5d2c5f7a1644797824f751dd8c61787d128b66 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Sep 12 05:39:08 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Sep 12 05:39:08 2023 +0900 [MSPAINT][SDK] Add <ui/CWaitCursor.h> (#5680) CORE-19094 --- base/applications/mspaint/precomp.h | 2 +- .../mspaint/waitcursor.h => sdk/include/reactos/ui/CWaitCursor.h | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/base/applications/mspaint/precomp.h b/base/applications/mspaint/precomp.h index 0c1d6b33ba8..51413a4ed6c 100644 --- a/base/applications/mspaint/precomp.h +++ b/base/applications/mspaint/precomp.h @@ -50,7 +50,7 @@ #include "toolsmodel.h" #include "winproc.h" #include "dialogs.h" -#include "waitcursor.h" +#include <ui/CWaitCursor.h> #include "globalvar.h" #endif /* _MSPAINT_H */ diff --git a/base/applications/mspaint/waitcursor.h b/sdk/include/reactos/ui/CWaitCursor.h similarity index 89% rename from base/applications/mspaint/waitcursor.h rename to sdk/include/reactos/ui/CWaitCursor.h index 20269ed16eb..38bc74d614d 100644 --- a/base/applications/mspaint/waitcursor.h +++ b/sdk/include/reactos/ui/CWaitCursor.h @@ -1,5 +1,5 @@ /* - * PROJECT: PAINT for ReactOS + * PROJECT: ReactOS headers * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) * PURPOSE: Wait cursor management * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> @@ -31,14 +31,18 @@ public: s_hOldCursor = NULL; } } + CWaitCursor(const CWaitCursor&) = delete; CWaitCursor& operator=(const CWaitCursor&) = delete; + void *operator new(size_t) = delete; + void operator delete(void*) = delete; static BOOL IsWaiting() { return s_nLock > 0; } - static void KeepWait() + + static void Restore() { ::SetCursor(s_hWaitCursor); }

1 0

[reactos] 02/02: [USER32] Pure Whitespace sync from comctl32/combo.c, no functional change
by Joachim Henze 11 Sep '23

11 Sep '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e13ebd44c60053cf58a5a… commit e13ebd44c60053cf58a5aed104a1950f06152f62 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sun Sep 10 23:36:21 2023 +0200 Commit: Joachim Henze <joachim.henze(a)reactos.org> CommitDate: Mon Sep 11 17:57:40 2023 +0200 [USER32] Pure Whitespace sync from comctl32/combo.c, no functional change This will make future syncs between those files much easier, and fixes tons of mixed tab-space-indentation. Please no whitespace nitpicks when reviewing this commit, it is a SYNC! --- win32ss/user/user32/controls/combo.c | 868 +++++++++++++++++------------------ 1 file changed, 425 insertions(+), 443 deletions(-) diff --git a/win32ss/user/user32/controls/combo.c b/win32ss/user/user32/controls/combo.c index 0ec58666bbf..8e3d07dc216 100644 --- a/win32ss/user/user32/controls/combo.c +++ b/win32ss/user/user32/controls/combo.c @@ -173,18 +173,17 @@ static LRESULT COMBO_NCCreate(HWND hwnd, LONG style) */ static LRESULT COMBO_NCDestroy( LPHEADCOMBO lphc ) { + if (lphc) + { + TRACE("[%p]: freeing storage\n", lphc->self); - if( lphc ) - { - TRACE("[%p]: freeing storage\n", lphc->self); - - if( (CB_GETTYPE(lphc) != CBS_SIMPLE) && lphc->hWndLBox ) - DestroyWindow( lphc->hWndLBox ); + if ( (CB_GETTYPE(lphc) != CBS_SIMPLE) && lphc->hWndLBox ) + DestroyWindow( lphc->hWndLBox ); - SetWindowLongPtrW( lphc->self, 0, 0 ); - HeapFree( GetProcessHeap(), 0, lphc ); - } - return 0; + SetWindowLongPtrW( lphc->self, 0, 0 ); + HeapFree( GetProcessHeap(), 0, lphc ); + } + return 0; } /*********************************************************************** @@ -663,7 +662,7 @@ static HBRUSH COMBO_PrepareColors( hBkgBrush = GetControlColor(lphc->owner, lphc->self, hDC, WM_CTLCOLORSTATIC); #else hBkgBrush = (HBRUSH)SendMessageW(lphc->owner, WM_CTLCOLORSTATIC, - (WPARAM)hDC, (LPARAM)lphc->self ); + (WPARAM)hDC, (LPARAM)lphc->self ); #endif /* * We have to change the text color since WM_CTLCOLORSTATIC will @@ -679,7 +678,7 @@ static HBRUSH COMBO_PrepareColors( hBkgBrush = GetControlColor(lphc->owner, lphc->self, hDC, WM_CTLCOLOREDIT); #else hBkgBrush = (HBRUSH)SendMessageW(lphc->owner, WM_CTLCOLOREDIT, - (WPARAM)hDC, (LPARAM)lphc->self ); + (WPARAM)hDC, (LPARAM)lphc->self ); #endif } @@ -856,24 +855,22 @@ static void CBPaintBorder( static LRESULT COMBO_Paint(LPHEADCOMBO lphc, HDC hParamDC) { PAINTSTRUCT ps; - HDC hDC; + HDC hDC; - hDC = (hParamDC) ? hParamDC - : BeginPaint( lphc->self, &ps); + hDC = (hParamDC) ? hParamDC : BeginPaint(lphc->self, &ps); TRACE("hdc=%p\n", hDC); if( hDC && !(lphc->wState & CBF_NOREDRAW) ) { - HBRUSH hPrevBrush, hBkgBrush; + HBRUSH hPrevBrush, hBkgBrush; /* * Retrieve the background brush and select it in the * DC. */ hBkgBrush = COMBO_PrepareColors(lphc, hDC); - - hPrevBrush = SelectObject( hDC, hBkgBrush ); + hPrevBrush = SelectObject(hDC, hBkgBrush); if (!(lphc->wState & CBF_EDIT)) FillRect(hDC, &lphc->textRect, hBkgBrush); @@ -882,10 +879,8 @@ static LRESULT COMBO_Paint(LPHEADCOMBO lphc, HDC hParamDC) */ CBPaintBorder(lphc->self, lphc, hDC); - if( !IsRectEmpty(&lphc->buttonRect) ) - { - CBPaintButton(lphc, hDC, lphc->buttonRect); - } + if (!IsRectEmpty(&lphc->buttonRect)) + CBPaintButton(lphc, hDC, lphc->buttonRect); /* paint the edit control padding area */ if (CB_GETTYPE(lphc) != CBS_DROPDOWNLIST) @@ -894,14 +889,14 @@ static LRESULT COMBO_Paint(LPHEADCOMBO lphc, HDC hParamDC) InflateRect(&rPadEdit, EDIT_CONTROL_PADDING(), EDIT_CONTROL_PADDING()); - FrameRect( hDC, &rPadEdit, GetSysColorBrush(COLOR_WINDOW) ); + FrameRect(hDC, &rPadEdit, GetSysColorBrush(COLOR_WINDOW)); } - if( !(lphc->wState & CBF_EDIT) ) - CBPaintText( lphc, hDC ); + if (!(lphc->wState & CBF_EDIT)) + CBPaintText( lphc, hDC ); - if( hPrevBrush ) - SelectObject( hDC, hPrevBrush ); + if (hPrevBrush) + SelectObject( hDC, hPrevBrush ); } if( !hParamDC ) @@ -923,7 +918,7 @@ static INT CBUpdateLBox( LPHEADCOMBO lphc, BOOL bSelect ) idx = LB_ERR; length = SendMessageW( lphc->hWndEdit, WM_GETTEXTLENGTH, 0, 0 ); - if( length > 0 ) + if (length > 0) pText = HeapAlloc( GetProcessHeap(), 0, (length + 1) * sizeof(WCHAR)); TRACE("\t edit text length %i\n", length ); @@ -962,10 +957,8 @@ static void CBUpdateEdit( LPHEADCOMBO lphc , INT index ) length = SendMessageW(lphc->hWndLBox, LB_GETTEXTLEN, (WPARAM)index, 0); if( length != LB_ERR) { - if( (pText = HeapAlloc( GetProcessHeap(), 0, (length + 1) * sizeof(WCHAR))) ) - { + if ((pText = HeapAlloc(GetProcessHeap(), 0, (length + 1) * sizeof(WCHAR)))) SendMessageW(lphc->hWndLBox, LB_GETTEXT, (WPARAM)index, (LPARAM)pText ); - } } } @@ -1015,7 +1008,7 @@ static void CBDropDown( LPHEADCOMBO lphc ) lphc->droppedIndex = SendMessageW(lphc->hWndLBox, LB_GETCURSEL, 0, 0); SendMessageW(lphc->hWndLBox, LB_SETTOPINDEX, - (WPARAM)(lphc->droppedIndex == LB_ERR ? 0 : lphc->droppedIndex), 0 ); + (WPARAM)(lphc->droppedIndex == LB_ERR ? 0 : lphc->droppedIndex), 0); SendMessageW(lphc->hWndLBox, LB_CARETON, 0, 0); } @@ -1199,7 +1192,7 @@ static void COMBO_KillFocus( LPHEADCOMBO lphc ) if( CB_GETTYPE(lphc) == CBS_DROPDOWNLIST ) SendMessageW(lphc->hWndLBox, LB_CARETOFF, 0, 0); - lphc->wState &= ~CBF_FOCUSED; + lphc->wState &= ~CBF_FOCUSED; /* redraw text */ if( !(lphc->wState & CBF_EDIT) ) @@ -1820,429 +1813,419 @@ static char *strdupA(LPCSTR str) */ LRESULT WINAPI ComboWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, BOOL unicode ) { - LPHEADCOMBO lphc = (LPHEADCOMBO)GetWindowLongPtrW( hwnd, 0 ); + LPHEADCOMBO lphc = (LPHEADCOMBO)GetWindowLongPtrW( hwnd, 0 ); #ifdef __REACTOS__ - PWND pWnd; + PWND pWnd; - pWnd = ValidateHwnd(hwnd); - if (pWnd) - { - if (!pWnd->fnid) - { + pWnd = ValidateHwnd(hwnd); + if (pWnd) + { + if (!pWnd->fnid) + { NtUserSetWindowFNID(hwnd, FNID_COMBOBOX); - } - else - { + } + else + { if (pWnd->fnid != FNID_COMBOBOX) { - ERR("Wrong window class for ComboBox! fnId 0x%x\n",pWnd->fnid); - return 0; + ERR("Wrong window class for ComboBox! fnId 0x%x\n",pWnd->fnid); + return 0; } } - } + } #endif - TRACE("[%p]: msg %s wp %08lx lp %08lx\n", - hwnd, SPY_GetMsgName(message, hwnd), wParam, lParam ); + TRACE("[%p]: msg %s wp %08lx lp %08lx\n", hwnd, SPY_GetMsgName(message, hwnd), wParam, lParam); #ifndef __REACTOS__ - if (!IsWindow(hwnd)) return 0; + if (!IsWindow(hwnd)) return 0; #endif - if( lphc || message == WM_NCCREATE ) - switch(message) - { - - /* System messages */ - - case WM_NCCREATE: - { - LONG style = unicode ? ((LPCREATESTRUCTW)lParam)->style : - ((LPCREATESTRUCTA)lParam)->style; - return COMBO_NCCreate(hwnd, style); - } - case WM_NCDESTROY: - COMBO_NCDestroy(lphc); + if (lphc || message == WM_NCCREATE) + switch(message) + { + case WM_NCCREATE: + { + LONG style = unicode ? ((LPCREATESTRUCTW)lParam)->style : ((LPCREATESTRUCTA)lParam)->style; + return COMBO_NCCreate(hwnd, style); + } + case WM_NCDESTROY: + COMBO_NCDestroy(lphc); #ifdef __REACTOS__ - NtUserSetWindowFNID(hwnd, FNID_DESTROY); + NtUserSetWindowFNID(hwnd, FNID_DESTROY); #endif - break;/* -> DefWindowProc */ + break;/* -> DefWindowProc */ - case WM_CREATE: - { - HWND hwndParent; - LONG style; - if(unicode) - { - hwndParent = ((LPCREATESTRUCTW)lParam)->hwndParent; - style = ((LPCREATESTRUCTW)lParam)->style; - } - else - { - hwndParent = ((LPCREATESTRUCTA)lParam)->hwndParent; - style = ((LPCREATESTRUCTA)lParam)->style; - } - return COMBO_Create(hwnd, lphc, hwndParent, style, unicode); - } - - case WM_PRINTCLIENT: - /* Fallthrough */ - case WM_PAINT: - /* wParam may contain a valid HDC! */ - return COMBO_Paint(lphc, (HDC)wParam); - - case WM_ERASEBKGND: - /* do all painting in WM_PAINT like Windows does */ - return 1; - - case WM_GETDLGCODE: - { - LRESULT result = DLGC_WANTARROWS | DLGC_WANTCHARS; - if (lParam && (((LPMSG)lParam)->message == WM_KEYDOWN)) - { - int vk = (int)((LPMSG)lParam)->wParam; + case WM_CREATE: + { + HWND hwndParent; + LONG style; + if(unicode) + { + hwndParent = ((LPCREATESTRUCTW)lParam)->hwndParent; + style = ((LPCREATESTRUCTW)lParam)->style; + } + else + { + hwndParent = ((LPCREATESTRUCTA)lParam)->hwndParent; + style = ((LPCREATESTRUCTA)lParam)->style; + } + return COMBO_Create(hwnd, lphc, hwndParent, style, unicode); + } + case WM_PRINTCLIENT: + /* Fallthrough */ + case WM_PAINT: + /* wParam may contain a valid HDC! */ + return COMBO_Paint(lphc, (HDC)wParam); + case WM_ERASEBKGND: + /* do all painting in WM_PAINT like Windows does */ + return 1; + + case WM_GETDLGCODE: + { + LRESULT result = DLGC_WANTARROWS | DLGC_WANTCHARS; + if (lParam && (((LPMSG)lParam)->message == WM_KEYDOWN)) + { + int vk = (int)((LPMSG)lParam)->wParam; - if ((vk == VK_RETURN || vk == VK_ESCAPE) && (lphc->wState & CBF_DROPPED)) - result |= DLGC_WANTMESSAGE; - } - return result; - } - case WM_SIZE: - if( lphc->hWndLBox && - !(lphc->wState & CBF_NORESIZE) ) COMBO_Size( lphc ); - return TRUE; - case WM_SETFONT: - COMBO_Font( lphc, (HFONT)wParam, (BOOL)lParam ); - return TRUE; - case WM_GETFONT: - return (LRESULT)lphc->hFont; - case WM_SETFOCUS: - if( lphc->wState & CBF_EDIT ) { - SetFocus( lphc->hWndEdit ); - /* The first time focus is received, select all the text */ - if( !(lphc->wState & CBF_BEENFOCUSED) ) { - SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, -1); - lphc->wState |= CBF_BEENFOCUSED; - } - } - else - COMBO_SetFocus( lphc ); - return TRUE; - case WM_KILLFOCUS: + if ((vk == VK_RETURN || vk == VK_ESCAPE) && (lphc->wState & CBF_DROPPED)) + result |= DLGC_WANTMESSAGE; + } + return result; + } + case WM_SIZE: + if (lphc->hWndLBox && !(lphc->wState & CBF_NORESIZE)) + COMBO_Size( lphc ); + return TRUE; + case WM_SETFONT: + COMBO_Font( lphc, (HFONT)wParam, (BOOL)lParam ); + return TRUE; + case WM_GETFONT: + return (LRESULT)lphc->hFont; + case WM_SETFOCUS: + if (lphc->wState & CBF_EDIT) + { + SetFocus( lphc->hWndEdit ); + /* The first time focus is received, select all the text */ + if (!(lphc->wState & CBF_BEENFOCUSED)) { - HWND hwndFocus = WIN_GetFullHandle( (HWND)wParam ); - if( !hwndFocus || - (hwndFocus != lphc->hWndEdit && hwndFocus != lphc->hWndLBox )) - COMBO_KillFocus( lphc ); - return TRUE; + SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, -1); + lphc->wState |= CBF_BEENFOCUSED; } - case WM_COMMAND: - return COMBO_Command( lphc, wParam, WIN_GetFullHandle( (HWND)lParam ) ); - case WM_GETTEXT: - return unicode ? COMBO_GetTextW( lphc, wParam, (LPWSTR)lParam ) - : COMBO_GetTextA( lphc, wParam, (LPSTR)lParam ); - case WM_SETTEXT: - case WM_GETTEXTLENGTH: - case WM_CLEAR: - if ((message == WM_GETTEXTLENGTH) && !ISWIN31 && !(lphc->wState & CBF_EDIT)) - { - int j = SendMessageW(lphc->hWndLBox, LB_GETCURSEL, 0, 0); - if (j == -1) return 0; - return unicode ? SendMessageW(lphc->hWndLBox, LB_GETTEXTLEN, j, 0) : - SendMessageA(lphc->hWndLBox, LB_GETTEXTLEN, j, 0); - } - else if( lphc->wState & CBF_EDIT ) - { - LRESULT ret; - lphc->wState |= CBF_NOEDITNOTIFY; - ret = unicode ? SendMessageW(lphc->hWndEdit, message, wParam, lParam) : - SendMessageA(lphc->hWndEdit, message, wParam, lParam); - lphc->wState &= ~CBF_NOEDITNOTIFY; - return ret; - } - else return CB_ERR; - case WM_CUT: - case WM_PASTE: - case WM_COPY: - if( lphc->wState & CBF_EDIT ) - { - return unicode ? SendMessageW(lphc->hWndEdit, message, wParam, lParam) : - SendMessageA(lphc->hWndEdit, message, wParam, lParam); - } - else return CB_ERR; - - case WM_DRAWITEM: - case WM_DELETEITEM: - case WM_COMPAREITEM: - case WM_MEASUREITEM: - return COMBO_ItemOp(lphc, message, lParam); - case WM_ENABLE: - if( lphc->wState & CBF_EDIT ) - EnableWindow( lphc->hWndEdit, (BOOL)wParam ); - EnableWindow( lphc->hWndLBox, (BOOL)wParam ); - - /* Force the control to repaint when the enabled state changes. */ - InvalidateRect(lphc->self, NULL, TRUE); - return TRUE; - case WM_SETREDRAW: - if( wParam ) - lphc->wState &= ~CBF_NOREDRAW; - else - lphc->wState |= CBF_NOREDRAW; + } + else + COMBO_SetFocus( lphc ); + return TRUE; + case WM_KILLFOCUS: + { + HWND hwndFocus = WIN_GetFullHandle((HWND)wParam); + if (!hwndFocus || (hwndFocus != lphc->hWndEdit && hwndFocus != lphc->hWndLBox)) + COMBO_KillFocus( lphc ); + return TRUE; + } + case WM_COMMAND: + return COMBO_Command( lphc, wParam, WIN_GetFullHandle((HWND)lParam) ); + case WM_GETTEXT: + return unicode ? COMBO_GetTextW( lphc, wParam, (LPWSTR)lParam ) + : COMBO_GetTextA( lphc, wParam, (LPSTR)lParam ); + case WM_SETTEXT: + case WM_GETTEXTLENGTH: + case WM_CLEAR: + if ((message == WM_GETTEXTLENGTH) && !ISWIN31 && !(lphc->wState & CBF_EDIT)) + { + int j = SendMessageW(lphc->hWndLBox, LB_GETCURSEL, 0, 0); + if (j == -1) return 0; + return unicode ? SendMessageW(lphc->hWndLBox, LB_GETTEXTLEN, j, 0) : + SendMessageA(lphc->hWndLBox, LB_GETTEXTLEN, j, 0); + } + else if ( lphc->wState & CBF_EDIT ) + { + LRESULT ret; + lphc->wState |= CBF_NOEDITNOTIFY; + ret = unicode ? SendMessageW(lphc->hWndEdit, message, wParam, lParam) : + SendMessageA(lphc->hWndEdit, message, wParam, lParam); + lphc->wState &= ~CBF_NOEDITNOTIFY; + return ret; + } + else + return CB_ERR; + case WM_CUT: + case WM_PASTE: + case WM_COPY: + if (lphc->wState & CBF_EDIT) + { + return unicode ? SendMessageW(lphc->hWndEdit, message, wParam, lParam) : + SendMessageA(lphc->hWndEdit, message, wParam, lParam); + } + else return CB_ERR; + + case WM_DRAWITEM: + case WM_DELETEITEM: + case WM_COMPAREITEM: + case WM_MEASUREITEM: + return COMBO_ItemOp(lphc, message, lParam); + case WM_ENABLE: + if (lphc->wState & CBF_EDIT) + EnableWindow( lphc->hWndEdit, (BOOL)wParam ); + EnableWindow( lphc->hWndLBox, (BOOL)wParam ); + + /* Force the control to repaint when the enabled state changes. */ + InvalidateRect(lphc->self, NULL, TRUE); + return TRUE; + case WM_SETREDRAW: + if (wParam) + lphc->wState &= ~CBF_NOREDRAW; + else + lphc->wState |= CBF_NOREDRAW; - if( lphc->wState & CBF_EDIT ) - SendMessageW(lphc->hWndEdit, message, wParam, lParam); - SendMessageW(lphc->hWndLBox, message, wParam, lParam); - return 0; - case WM_SYSKEYDOWN: + if ( lphc->wState & CBF_EDIT ) + SendMessageW(lphc->hWndEdit, message, wParam, lParam); + SendMessageW(lphc->hWndLBox, message, wParam, lParam); + return 0; + case WM_SYSKEYDOWN: #ifdef __REACTOS__ - if( KF_ALTDOWN & HIWORD(lParam) ) + if ( KF_ALTDOWN & HIWORD(lParam) ) #else - if( KEYDATA_ALT & HIWORD(lParam) ) + if ( KEYDATA_ALT & HIWORD(lParam) ) #endif - if( wParam == VK_UP || wParam == VK_DOWN ) - COMBO_FlipListbox( lphc, FALSE, FALSE ); - return 0; + if( wParam == VK_UP || wParam == VK_DOWN ) + COMBO_FlipListbox( lphc, FALSE, FALSE ); + return 0; - case WM_KEYDOWN: - if ((wParam == VK_RETURN || wParam == VK_ESCAPE) && - (lphc->wState & CBF_DROPPED)) - { - CBRollUp( lphc, wParam == VK_RETURN, FALSE ); - return TRUE; - } - else if ((wParam == VK_F4) && !(lphc->wState & CBF_EUI)) - { - COMBO_FlipListbox( lphc, FALSE, FALSE ); - return TRUE; - } - /* fall through */ - case WM_CHAR: - case WM_IME_CHAR: - { - HWND hwndTarget; + case WM_KEYDOWN: + if ((wParam == VK_RETURN || wParam == VK_ESCAPE) && + (lphc->wState & CBF_DROPPED)) + { + CBRollUp( lphc, wParam == VK_RETURN, FALSE ); + return TRUE; + } + else if ((wParam == VK_F4) && !(lphc->wState & CBF_EUI)) + { + COMBO_FlipListbox( lphc, FALSE, FALSE ); + return TRUE; + } + /* fall through */ + case WM_CHAR: + case WM_IME_CHAR: + { + HWND hwndTarget; - if( lphc->wState & CBF_EDIT ) - hwndTarget = lphc->hWndEdit; - else - hwndTarget = lphc->hWndLBox; - - return unicode ? SendMessageW(hwndTarget, message, wParam, lParam) : - SendMessageA(hwndTarget, message, wParam, lParam); - } - case WM_LBUTTONDOWN: - if( !(lphc->wState & CBF_FOCUSED) ) SetFocus( lphc->self ); - if( lphc->wState & CBF_FOCUSED ) COMBO_LButtonDown( lphc, lParam ); - return TRUE; - case WM_LBUTTONUP: - COMBO_LButtonUp( lphc ); - return TRUE; - case WM_MOUSEMOVE: - if( lphc->wState & CBF_CAPTURE ) - COMBO_MouseMove( lphc, wParam, lParam ); - return TRUE; - - case WM_MOUSEWHEEL: - if (wParam & (MK_SHIFT | MK_CONTROL)) - return unicode ? DefWindowProcW(hwnd, message, wParam, lParam) : - DefWindowProcA(hwnd, message, wParam, lParam); - - if (GET_WHEEL_DELTA_WPARAM(wParam) > 0) return SendMessageW(hwnd, WM_KEYDOWN, VK_UP, 0); - if (GET_WHEEL_DELTA_WPARAM(wParam) < 0) return SendMessageW(hwnd, WM_KEYDOWN, VK_DOWN, 0); - return TRUE; - - case WM_CTLCOLOR: - case WM_CTLCOLORMSGBOX: - case WM_CTLCOLOREDIT: - case WM_CTLCOLORLISTBOX: - case WM_CTLCOLORBTN: - case WM_CTLCOLORDLG: - case WM_CTLCOLORSCROLLBAR: - case WM_CTLCOLORSTATIC: + if ( lphc->wState & CBF_EDIT ) + hwndTarget = lphc->hWndEdit; + else + hwndTarget = lphc->hWndLBox; + + return unicode ? SendMessageW(hwndTarget, message, wParam, lParam) : + SendMessageA(hwndTarget, message, wParam, lParam); + } + case WM_LBUTTONDOWN: + if ( !(lphc->wState & CBF_FOCUSED) ) SetFocus( lphc->self ); + if ( lphc->wState & CBF_FOCUSED ) COMBO_LButtonDown( lphc, lParam ); + return TRUE; + case WM_LBUTTONUP: + COMBO_LButtonUp( lphc ); + return TRUE; + case WM_MOUSEMOVE: + if ( lphc->wState & CBF_CAPTURE ) + COMBO_MouseMove( lphc, wParam, lParam ); + return TRUE; + + case WM_MOUSEWHEEL: + if (wParam & (MK_SHIFT | MK_CONTROL)) + return unicode ? DefWindowProcW(hwnd, message, wParam, lParam) : + DefWindowProcA(hwnd, message, wParam, lParam); + + if (GET_WHEEL_DELTA_WPARAM(wParam) > 0) return SendMessageW(hwnd, WM_KEYDOWN, VK_UP, 0); + if (GET_WHEEL_DELTA_WPARAM(wParam) < 0) return SendMessageW(hwnd, WM_KEYDOWN, VK_DOWN, 0); + return TRUE; + + case WM_CTLCOLOR: + case WM_CTLCOLORMSGBOX: + case WM_CTLCOLOREDIT: + case WM_CTLCOLORLISTBOX: + case WM_CTLCOLORBTN: + case WM_CTLCOLORDLG: + case WM_CTLCOLORSCROLLBAR: + case WM_CTLCOLORSTATIC: #ifdef __REACTOS__ - if ( pWnd && !(pWnd->state2 & WNDS2_WIN40COMPAT) ) break; // Must be Win 4.0 and above. + if (pWnd && !(pWnd->state2 & WNDS2_WIN40COMPAT)) break; // Must be Win 4.0 and above. #endif - if (lphc->owner) - return SendMessageW(lphc->owner, message, wParam, lParam); - break; + if (lphc->owner) + return SendMessageW(lphc->owner, message, wParam, lParam); + break; - /* Combo messages */ + /* Combo messages */ + case CB_ADDSTRING: + if (unicode) + { + if (lphc->dwStyle & CBS_LOWERCASE) + CharLowerW((LPWSTR)lParam); + else if (lphc->dwStyle & CBS_UPPERCASE) + CharUpperW((LPWSTR)lParam); + return SendMessageW(lphc->hWndLBox, LB_ADDSTRING, 0, lParam); + } + else /* unlike the unicode version, the ansi version does not overwrite + the string if converting case */ + { + char *string = NULL; + LRESULT ret; + if (lphc->dwStyle & CBS_LOWERCASE) + { + string = strdupA((LPSTR)lParam); + CharLowerA(string); + } - case CB_ADDSTRING: - if( unicode ) - { - if( lphc->dwStyle & CBS_LOWERCASE ) - CharLowerW((LPWSTR)lParam); - else if( lphc->dwStyle & CBS_UPPERCASE ) - CharUpperW((LPWSTR)lParam); - return SendMessageW(lphc->hWndLBox, LB_ADDSTRING, 0, lParam); - } - else /* unlike the unicode version, the ansi version does not overwrite - the string if converting case */ - { - char *string = NULL; - LRESULT ret; - if( lphc->dwStyle & CBS_LOWERCASE ) - { - string = strdupA((LPSTR)lParam); - CharLowerA(string); - } - - else if( lphc->dwStyle & CBS_UPPERCASE ) - { - string = strdupA((LPSTR)lParam); - CharUpperA(string); - } - - ret = SendMessageA(lphc->hWndLBox, LB_ADDSTRING, 0, string ? (LPARAM)string : lParam); - HeapFree(GetProcessHeap(), 0, string); - return ret; - } - case CB_INSERTSTRING: - if( unicode ) - { - if( lphc->dwStyle & CBS_LOWERCASE ) - CharLowerW((LPWSTR)lParam); - else if( lphc->dwStyle & CBS_UPPERCASE ) - CharUpperW((LPWSTR)lParam); - return SendMessageW(lphc->hWndLBox, LB_INSERTSTRING, wParam, lParam); - } - else - { - if( lphc->dwStyle & CBS_LOWERCASE ) - CharLowerA((LPSTR)lParam); - else if( lphc->dwStyle & CBS_UPPERCASE ) - CharUpperA((LPSTR)lParam); + else if (lphc->dwStyle & CBS_UPPERCASE) + { + string = strdupA((LPSTR)lParam); + CharUpperA(string); + } - return SendMessageA(lphc->hWndLBox, LB_INSERTSTRING, wParam, lParam); - } - case CB_DELETESTRING: - return unicode ? SendMessageW(lphc->hWndLBox, LB_DELETESTRING, wParam, 0) : - SendMessageA(lphc->hWndLBox, LB_DELETESTRING, wParam, 0); - case CB_SELECTSTRING: - return COMBO_SelectString(lphc, (INT)wParam, lParam, unicode); - case CB_FINDSTRING: - return unicode ? SendMessageW(lphc->hWndLBox, LB_FINDSTRING, wParam, lParam) : - SendMessageA(lphc->hWndLBox, LB_FINDSTRING, wParam, lParam); - case CB_FINDSTRINGEXACT: - return unicode ? SendMessageW(lphc->hWndLBox, LB_FINDSTRINGEXACT, wParam, lParam) : - SendMessageA(lphc->hWndLBox, LB_FINDSTRINGEXACT, wParam, lParam); - case CB_SETITEMHEIGHT: - return COMBO_SetItemHeight( lphc, (INT)wParam, (INT)lParam); - case CB_GETITEMHEIGHT: - if( (INT)wParam >= 0 ) /* listbox item */ - return SendMessageW(lphc->hWndLBox, LB_GETITEMHEIGHT, wParam, 0); - return CBGetTextAreaHeight(hwnd, lphc); - case CB_RESETCONTENT: - SendMessageW(lphc->hWndLBox, LB_RESETCONTENT, 0, 0); - if( (lphc->wState & CBF_EDIT) && CB_HASSTRINGS(lphc) ) - { - static const WCHAR empty_stringW[] = { 0 }; - SendMessageW(lphc->hWndEdit, WM_SETTEXT, 0, (LPARAM)empty_stringW); - } - else - InvalidateRect(lphc->self, NULL, TRUE); - return TRUE; - case CB_INITSTORAGE: - return SendMessageW(lphc->hWndLBox, LB_INITSTORAGE, wParam, lParam); - case CB_GETHORIZONTALEXTENT: - return SendMessageW(lphc->hWndLBox, LB_GETHORIZONTALEXTENT, 0, 0); - case CB_SETHORIZONTALEXTENT: - return SendMessageW(lphc->hWndLBox, LB_SETHORIZONTALEXTENT, wParam, 0); - case CB_GETTOPINDEX: - return SendMessageW(lphc->hWndLBox, LB_GETTOPINDEX, 0, 0); - case CB_GETLOCALE: - return SendMessageW(lphc->hWndLBox, LB_GETLOCALE, 0, 0); - case CB_SETLOCALE: - return SendMessageW(lphc->hWndLBox, LB_SETLOCALE, wParam, 0); - case CB_SETDROPPEDWIDTH: - if( (CB_GETTYPE(lphc) == CBS_SIMPLE) || - (INT)wParam >= 32768 ) - return CB_ERR; - /* new value must be higher than combobox width */ - if((INT)wParam >= lphc->droppedRect.right - lphc->droppedRect.left) - lphc->droppedWidth = wParam; - else if(wParam) - lphc->droppedWidth = 0; - - /* recalculate the combobox area */ - CBCalcPlacement(hwnd, lphc, &lphc->textRect, &lphc->buttonRect, &lphc->droppedRect ); - - /* fall through */ - case CB_GETDROPPEDWIDTH: - if( lphc->droppedWidth ) - return lphc->droppedWidth; - return lphc->droppedRect.right - lphc->droppedRect.left; - case CB_GETDROPPEDCONTROLRECT: - if( lParam ) CBGetDroppedControlRect(lphc, (LPRECT)lParam ); - return CB_OKAY; - case CB_GETDROPPEDSTATE: - return (lphc->wState & CBF_DROPPED) != 0; - case CB_DIR: - return unicode ? SendMessageW(lphc->hWndLBox, LB_DIR, wParam, lParam) : - SendMessageA(lphc->hWndLBox, LB_DIR, wParam, lParam); - - case CB_SHOWDROPDOWN: - if( CB_GETTYPE(lphc) != CBS_SIMPLE ) - { - if( wParam ) - { - if( !(lphc->wState & CBF_DROPPED) ) - CBDropDown( lphc ); - } - else - if( lphc->wState & CBF_DROPPED ) - CBRollUp( lphc, FALSE, TRUE ); - } - return TRUE; - case CB_GETCOUNT: - return SendMessageW(lphc->hWndLBox, LB_GETCOUNT, 0, 0); - case CB_GETCURSEL: - return SendMessageW(lphc->hWndLBox, LB_GETCURSEL, 0, 0); - case CB_SETCURSEL: - lParam = SendMessageW(lphc->hWndLBox, LB_SETCURSEL, wParam, 0); - if( lParam >= 0 ) - SendMessageW(lphc->hWndLBox, LB_SETTOPINDEX, wParam, 0); - - /* no LBN_SELCHANGE in this case, update manually */ - CBPaintText( lphc, NULL ); - lphc->wState &= ~CBF_SELCHANGE; - return lParam; - case CB_GETLBTEXT: - return unicode ? SendMessageW(lphc->hWndLBox, LB_GETTEXT, wParam, lParam) : - SendMessageA(lphc->hWndLBox, LB_GETTEXT, wParam, lParam); - case CB_GETLBTEXTLEN: - return unicode ? SendMessageW(lphc->hWndLBox, LB_GETTEXTLEN, wParam, 0) : - SendMessageA(lphc->hWndLBox, LB_GETTEXTLEN, wParam, 0); - case CB_GETITEMDATA: - return SendMessageW(lphc->hWndLBox, LB_GETITEMDATA, wParam, 0); - case CB_SETITEMDATA: - return SendMessageW(lphc->hWndLBox, LB_SETITEMDATA, wParam, lParam); - case CB_GETEDITSEL: - /* Edit checks passed parameters itself */ - if( lphc->wState & CBF_EDIT ) - return SendMessageW(lphc->hWndEdit, EM_GETSEL, wParam, lParam); - return CB_ERR; - case CB_SETEDITSEL: - if( lphc->wState & CBF_EDIT ) - return SendMessageW(lphc->hWndEdit, EM_SETSEL, - (INT)(INT16)LOWORD(lParam), (INT)(INT16)HIWORD(lParam) ); - return CB_ERR; - case CB_SETEXTENDEDUI: - if( CB_GETTYPE(lphc) == CBS_SIMPLE ) - return CB_ERR; - if( wParam ) - lphc->wState |= CBF_EUI; - else lphc->wState &= ~CBF_EUI; - return CB_OKAY; - case CB_GETEXTENDEDUI: - return (lphc->wState & CBF_EUI) != 0; - case CB_GETCOMBOBOXINFO: - return COMBO_GetComboBoxInfo(lphc, (COMBOBOXINFO *)lParam); - case CB_LIMITTEXT: - if( lphc->wState & CBF_EDIT ) - return SendMessageW(lphc->hWndEdit, EM_LIMITTEXT, wParam, lParam); - return TRUE; + ret = SendMessageA(lphc->hWndLBox, LB_ADDSTRING, 0, string ? (LPARAM)string : lParam); + HeapFree(GetProcessHeap(), 0, string); + return ret; + } + case CB_INSERTSTRING: + if (unicode) + { + if (lphc->dwStyle & CBS_LOWERCASE) + CharLowerW((LPWSTR)lParam); + else if (lphc->dwStyle & CBS_UPPERCASE) + CharUpperW((LPWSTR)lParam); + return SendMessageW(lphc->hWndLBox, LB_INSERTSTRING, wParam, lParam); + } + else + { + if (lphc->dwStyle & CBS_LOWERCASE) + CharLowerA((LPSTR)lParam); + else if (lphc->dwStyle & CBS_UPPERCASE) + CharUpperA((LPSTR)lParam); + return SendMessageA(lphc->hWndLBox, LB_INSERTSTRING, wParam, lParam); + } + case CB_DELETESTRING: + return unicode ? SendMessageW(lphc->hWndLBox, LB_DELETESTRING, wParam, 0) : + SendMessageA(lphc->hWndLBox, LB_DELETESTRING, wParam, 0); + case CB_SELECTSTRING: + return COMBO_SelectString(lphc, (INT)wParam, lParam, unicode); + case CB_FINDSTRING: + return unicode ? SendMessageW(lphc->hWndLBox, LB_FINDSTRING, wParam, lParam) : + SendMessageA(lphc->hWndLBox, LB_FINDSTRING, wParam, lParam); + case CB_FINDSTRINGEXACT: + return unicode ? SendMessageW(lphc->hWndLBox, LB_FINDSTRINGEXACT, wParam, lParam) : + SendMessageA(lphc->hWndLBox, LB_FINDSTRINGEXACT, wParam, lParam); + case CB_SETITEMHEIGHT: + return COMBO_SetItemHeight( lphc, (INT)wParam, (INT)lParam); + case CB_GETITEMHEIGHT: + if ((INT)wParam >= 0) /* listbox item */ + return SendMessageW(lphc->hWndLBox, LB_GETITEMHEIGHT, wParam, 0); + return CBGetTextAreaHeight(hwnd, lphc); + case CB_RESETCONTENT: + SendMessageW(lphc->hWndLBox, LB_RESETCONTENT, 0, 0); + if ((lphc->wState & CBF_EDIT) && CB_HASSTRINGS(lphc)) + { + static const WCHAR empty_stringW[] = { 0 }; + SendMessageW(lphc->hWndEdit, WM_SETTEXT, 0, (LPARAM)empty_stringW); + } + else + InvalidateRect(lphc->self, NULL, TRUE); + return TRUE; + case CB_INITSTORAGE: + return SendMessageW(lphc->hWndLBox, LB_INITSTORAGE, wParam, lParam); + case CB_GETHORIZONTALEXTENT: + return SendMessageW(lphc->hWndLBox, LB_GETHORIZONTALEXTENT, 0, 0); + case CB_SETHORIZONTALEXTENT: + return SendMessageW(lphc->hWndLBox, LB_SETHORIZONTALEXTENT, wParam, 0); + case CB_GETTOPINDEX: + return SendMessageW(lphc->hWndLBox, LB_GETTOPINDEX, 0, 0); + case CB_GETLOCALE: + return SendMessageW(lphc->hWndLBox, LB_GETLOCALE, 0, 0); + case CB_SETLOCALE: + return SendMessageW(lphc->hWndLBox, LB_SETLOCALE, wParam, 0); + case CB_SETDROPPEDWIDTH: + if ((CB_GETTYPE(lphc) == CBS_SIMPLE) || (INT)wParam >= 32768) + return CB_ERR; + /* new value must be higher than combobox width */ + if ((INT)wParam >= lphc->droppedRect.right - lphc->droppedRect.left) + lphc->droppedWidth = wParam; + else if (wParam) + lphc->droppedWidth = 0; + + /* recalculate the combobox area */ + CBCalcPlacement(hwnd, lphc, &lphc->textRect, &lphc->buttonRect, &lphc->droppedRect ); + + /* fall through */ + case CB_GETDROPPEDWIDTH: + if (lphc->droppedWidth) + return lphc->droppedWidth; + return lphc->droppedRect.right - lphc->droppedRect.left; + case CB_GETDROPPEDCONTROLRECT: + if (lParam) CBGetDroppedControlRect(lphc, (LPRECT)lParam ); + return CB_OKAY; + case CB_GETDROPPEDSTATE: + return (lphc->wState & CBF_DROPPED) != 0; + case CB_DIR: + return unicode ? SendMessageW(lphc->hWndLBox, LB_DIR, wParam, lParam) : + SendMessageA(lphc->hWndLBox, LB_DIR, wParam, lParam); + + case CB_SHOWDROPDOWN: + if (CB_GETTYPE(lphc) != CBS_SIMPLE) + { + if (wParam) + { + if (!(lphc->wState & CBF_DROPPED)) + CBDropDown( lphc ); + } + else if (lphc->wState & CBF_DROPPED) + CBRollUp( lphc, FALSE, TRUE ); + } + return TRUE; + case CB_GETCOUNT: + return SendMessageW(lphc->hWndLBox, LB_GETCOUNT, 0, 0); + case CB_GETCURSEL: + return SendMessageW(lphc->hWndLBox, LB_GETCURSEL, 0, 0); + case CB_SETCURSEL: + lParam = SendMessageW(lphc->hWndLBox, LB_SETCURSEL, wParam, 0); + if (lParam >= 0) + SendMessageW(lphc->hWndLBox, LB_SETTOPINDEX, wParam, 0); + + /* no LBN_SELCHANGE in this case, update manually */ + CBPaintText(lphc, NULL); + lphc->wState &= ~CBF_SELCHANGE; + return lParam; + case CB_GETLBTEXT: + return unicode ? SendMessageW(lphc->hWndLBox, LB_GETTEXT, wParam, lParam) : + SendMessageA(lphc->hWndLBox, LB_GETTEXT, wParam, lParam); + case CB_GETLBTEXTLEN: + return unicode ? SendMessageW(lphc->hWndLBox, LB_GETTEXTLEN, wParam, 0) : + SendMessageA(lphc->hWndLBox, LB_GETTEXTLEN, wParam, 0); + case CB_GETITEMDATA: + return SendMessageW(lphc->hWndLBox, LB_GETITEMDATA, wParam, 0); + case CB_SETITEMDATA: + return SendMessageW(lphc->hWndLBox, LB_SETITEMDATA, wParam, lParam); + case CB_GETEDITSEL: + /* Edit checks passed parameters itself */ + if (lphc->wState & CBF_EDIT) + return SendMessageW(lphc->hWndEdit, EM_GETSEL, wParam, lParam); + return CB_ERR; + case CB_SETEDITSEL: + if (lphc->wState & CBF_EDIT) + return SendMessageW(lphc->hWndEdit, EM_SETSEL, (INT)(INT16)LOWORD(lParam), (INT)(INT16)HIWORD(lParam) ); + return CB_ERR; + case CB_SETEXTENDEDUI: + if (CB_GETTYPE(lphc) == CBS_SIMPLE ) + return CB_ERR; + if (wParam) + lphc->wState |= CBF_EUI; + else lphc->wState &= ~CBF_EUI; + return CB_OKAY; + case CB_GETEXTENDEDUI: + return (lphc->wState & CBF_EUI) != 0; + case CB_GETCOMBOBOXINFO: + return COMBO_GetComboBoxInfo(lphc, (COMBOBOXINFO *)lParam); + case CB_LIMITTEXT: + if (lphc->wState & CBF_EDIT) + return SendMessageW(lphc->hWndEdit, EM_LIMITTEXT, wParam, lParam); + return TRUE; #ifdef __REACTOS__ case WM_UPDATEUISTATE: @@ -2254,7 +2237,7 @@ LRESULT WINAPI ComboWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPAR if (COMBO_update_uistate(lphc)) { /* redraw text */ - if( !(lphc->wState & CBF_EDIT) ) + if (!(lphc->wState & CBF_EDIT)) NtUserInvalidateRect(lphc->self, &lphc->textRect, TRUE); } break; @@ -2266,19 +2249,17 @@ LRESULT WINAPI ComboWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPAR SendMessage(lphc->hWndEdit, EM_SETSEL, 0, 0); lphc->wState &= ~(CBF_FOCUSED | CBF_BEENFOCUSED); CB_NOTIFY(lphc, CBN_KILLFOCUS); - } + } return TRUE; - #endif - default: - if (message >= WM_USER) - WARN("unknown msg WM_USER+%04x wp=%04lx lp=%08lx\n", - message - WM_USER, wParam, lParam ); - break; - } - return unicode ? DefWindowProcW(hwnd, message, wParam, lParam) : - DefWindowProcA(hwnd, message, wParam, lParam); + default: + if (message >= WM_USER) + WARN("unknown msg WM_USER+%04x wp=%04lx lp=%08lx\n", message - WM_USER, wParam, lParam ); + break; + } + return unicode ? DefWindowProcW(hwnd, message, wParam, lParam) : + DefWindowProcA(hwnd, message, wParam, lParam); } #ifdef __REACTOS__ @@ -2289,19 +2270,19 @@ LRESULT WINAPI ComboWndProc_common( HWND hwnd, UINT message, WPARAM wParam, LPAR * This is just a wrapper for the real ComboWndProc which locks/unlocks * window structs. */ -LRESULT WINAPI ComboWndProcA( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) +LRESULT WINAPI ComboWndProcA(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { if (!IsWindow(hwnd)) return 0; - return ComboWndProc_common( hwnd, message, wParam, lParam, FALSE ); + return ComboWndProc_common(hwnd, message, wParam, lParam, FALSE); } /*********************************************************************** * ComboWndProcW */ -LRESULT WINAPI ComboWndProcW( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) +LRESULT WINAPI ComboWndProcW(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { if (!IsWindow(hwnd)) return 0; - return ComboWndProc_common( hwnd, message, wParam, lParam, TRUE ); + return ComboWndProc_common(hwnd, message, wParam, lParam, TRUE); } #endif /* __REACTOS__ */ @@ -2309,8 +2290,9 @@ LRESULT WINAPI ComboWndProcW( HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa /************************************************************************* * GetComboBoxInfo (USER32.@) */ -BOOL WINAPI GetComboBoxInfo(HWND hwndCombo, /* [in] handle to combo box */ - PCOMBOBOXINFO pcbi /* [in/out] combo box information */) +BOOL WINAPI GetComboBoxInfo( + HWND hwndCombo, /* [in] handle to combo box */ + PCOMBOBOXINFO pcbi /* [in/out] combo box information */) { TRACE("(%p, %p)\n", hwndCombo, pcbi); #ifdef __REACTOS__

1 0

[reactos] 01/02: [USER32] Sync comctl32 combo.c code in context of CORE-17883
by Joachim Henze 11 Sep '23

11 Sep '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d97313181e2ed5112d530… commit d97313181e2ed5112d530cc4ae3f3bc85451059a Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sun Sep 10 21:17:33 2023 +0200 Commit: Joachim Henze <joachim.henze(a)reactos.org> CommitDate: Mon Sep 11 17:57:40 2023 +0200 [USER32] Sync comctl32 combo.c code in context of CORE-17883 --- win32ss/user/user32/controls/combo.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/win32ss/user/user32/controls/combo.c b/win32ss/user/user32/controls/combo.c index 4cc5f40e640..0ec58666bbf 100644 --- a/win32ss/user/user32/controls/combo.c +++ b/win32ss/user/user32/controls/combo.c @@ -1074,8 +1074,7 @@ static void CBDropDown( LPHEADCOMBO lphc ) if( !(lphc->wState & CBF_NOREDRAW) ) - RedrawWindow( lphc->self, NULL, 0, RDW_INVALIDATE | - RDW_ERASE | RDW_UPDATENOW | RDW_NOCHILDREN ); + RedrawWindow( lphc->self, NULL, 0, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW ); EnableWindow( lphc->hWndLBox, TRUE ); if (GetCapture() != lphc->self)

1 0

[reactos] 01/01: [MSPAINT] IDM_IMAGEROTATEMIRROR: Fix indent
by Katayama Hirofumi MZ 10 Sep '23

10 Sep '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e4512e6af250d261c8ff4… commit e4512e6af250d261c8ff4b0ece6b3411c503d6b0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Sep 11 07:44:39 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Sep 11 07:44:39 2023 +0900 [MSPAINT] IDM_IMAGEROTATEMIRROR: Fix indent Follow-up to #5660. CORE-19094 --- base/applications/mspaint/winproc.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index c85b61b10c3..8a6e259b12f 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -916,35 +916,45 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH switch (mirrorRotateDialog.DoModal(mainWindow.m_hWnd)) { case 1: /* flip horizontally */ + { if (selectionModel.m_bShow) selectionModel.FlipHorizontally(); else imageModel.FlipHorizontally(); break; + } case 2: /* flip vertically */ + { if (selectionModel.m_bShow) selectionModel.FlipVertically(); else imageModel.FlipVertically(); break; + } case 3: /* rotate 90 degrees */ + { if (selectionModel.m_bShow) selectionModel.RotateNTimes90Degrees(1); else imageModel.RotateNTimes90Degrees(1); break; + } case 4: /* rotate 180 degrees */ + { if (selectionModel.m_bShow) selectionModel.RotateNTimes90Degrees(2); else imageModel.RotateNTimes90Degrees(2); break; + } case 5: /* rotate 270 degrees */ + { if (selectionModel.m_bShow) selectionModel.RotateNTimes90Degrees(3); else imageModel.RotateNTimes90Degrees(3); break; + } } } break;

1 0

[reactos] 01/01: [SDK][CRT][MSVCRT] Implement _CrtSetReportMode and _CrtSetReportFile (#5662)
by Katayama Hirofumi MZ 10 Sep '23

10 Sep '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=85377ee3dbe2373d40dc4… commit 85377ee3dbe2373d40dc401b1d6349c391cd9d94 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Sep 11 04:37:27 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Sep 11 04:37:27 2023 +0900 [SDK][CRT][MSVCRT] Implement _CrtSetReportMode and _CrtSetReportFile (#5662) - Implement reporting to file. CORE-11835, CORE-15517, ROSTESTS-386 --- dll/win32/msvcrt/msvcrt.spec | 8 +++--- sdk/include/crt/crtdbg.h | 9 ++++--- sdk/lib/crt/misc/dbgrpt.cpp | 60 +++++++++++++++++++++++++++++++++++++++----- sdk/lib/crt/misc/misc.cmake | 1 + 4 files changed, 64 insertions(+), 14 deletions(-) diff --git a/dll/win32/msvcrt/msvcrt.spec b/dll/win32/msvcrt/msvcrt.spec index e80a290e2fd..9f2c5a55eb6 100644 --- a/dll/win32/msvcrt/msvcrt.spec +++ b/dll/win32/msvcrt/msvcrt.spec @@ -199,9 +199,9 @@ @ cdecl -arch=i386 _CItanh() @ stub -version=0x600+ _CrtCheckMemory @ stub -version=0x600+ _CrtDbgBreak -@ stub -version=0x600+ _CrtDbgReport +@ cdecl -version=0x600+ _CrtDbgReport(long str long str str) @ stub -version=0x600+ _CrtDbgReportV -@ stub -version=0x600+ _CrtDbgReportW +@ cdecl -version=0x600+ _CrtDbgReportW(long wstr long wstr wstr) @ stub -version=0x600+ _CrtDbgReportWV @ stub -version=0x600+ _CrtDoForAllClientObjects @ stub -version=0x600+ _CrtDumpMemoryLeaks @@ -218,10 +218,10 @@ @ stub -version=0x600+ _CrtSetDbgBlockType @ stub -version=0x600+ _CrtSetDbgFlag @ stub -version=0x600+ _CrtSetDumpClient -@ stub -version=0x600+ _CrtSetReportFile +@ cdecl -version=0x600+ _CrtSetReportFile(long ptr) @ stub -version=0x600+ _CrtSetReportHook @ stub -version=0x600+ _CrtSetReportHook2 -@ stub -version=0x600+ _CrtSetReportMode +@ cdecl -version=0x600+ _CrtSetReportMode(long long) @ stdcall _CxxThrowException(long long) @ cdecl -arch=i386 -norelay _EH_prolog() @ cdecl _Getdays() diff --git a/sdk/include/crt/crtdbg.h b/sdk/include/crt/crtdbg.h index 3a20d5316fb..f9545698e89 100644 --- a/sdk/include/crt/crtdbg.h +++ b/sdk/include/crt/crtdbg.h @@ -91,8 +91,6 @@ extern "C" { #endif - - // Assertion and error reporting #ifndef _DEBUG @@ -124,6 +122,8 @@ extern "C" { #define _RPTFW0(rptno,msg) #define _RPTFWN(rptno,msg,...) + #define _CrtSetReportMode(t,f) ((int)0) + #define _CrtSetReportFile(t,f) ((_HFILE)0) #else // _DEBUG @@ -161,6 +161,9 @@ extern "C" { #define _RPTFW0(rptno,msg) _RPT_BASEW(rptno, _CRT_WIDE(__FILE__), __LINE__, NULL, L"%s", msg) #define _RPTFWN(rptno,msg,...) _RPT_BASEW(rptno, _CRT_WIDE(__FILE__), __LINE__, NULL, msg, __VA_ARGS__) + int __cdecl _CrtSetReportMode(int reportType, int reportMode); + _HFILE __cdecl _CrtSetReportFile(int reportType, _HFILE reportFile); + #endif @@ -230,8 +233,6 @@ extern "C" { #define _CrtGetReportHook() ((_CRT_REPORT_HOOK)0) #define _CrtSetReportHook2(t,f) ((int)0) #define _CrtSetReportHookW2(t,f) ((int)0) -#define _CrtSetReportMode(t,f) ((int)0) -#define _CrtSetReportFile(t,f) ((_HFILE)0) #define _CrtSetBreakAlloc(a) ((long)0) #define _CrtSetAllocHook(f) ((_CRT_ALLOC_HOOK)0) diff --git a/sdk/lib/crt/misc/dbgrpt.cpp b/sdk/lib/crt/misc/dbgrpt.cpp index dbb1ebbc966..131a918a2e2 100644 --- a/sdk/lib/crt/misc/dbgrpt.cpp +++ b/sdk/lib/crt/misc/dbgrpt.cpp @@ -16,6 +16,8 @@ #include <windows.h> #undef OutputDebugString +#undef _CrtSetReportMode +#undef _CrtSetReportFile #define DBGRPT_MAX_BUFFER_SIZE 4096 #define DBGRPT_ASSERT_PREFIX_MESSAGE "Assertion failed: " @@ -38,6 +40,13 @@ static const wchar_t* _CrtModeMessages[_CRT_ERRCNT] = L"Error", L"Assertion Failed" }; +// Report files +static _HFILE _CrtReportFiles[_CRT_ERRCNT] = +{ + _CRTDBG_INVALID_HFILE, + _CRTDBG_INVALID_HFILE, + _CRTDBG_INVALID_HFILE +}; // Manually delay-load as to not have a dependency on user32 typedef int (WINAPI *tMessageBoxW)(_In_opt_ HWND hWnd, _In_opt_ LPCWSTR lpText, _In_opt_ LPCWSTR lpCaption, _In_ UINT uType); @@ -57,6 +66,7 @@ struct dbgrpt_char_traits<char> static const char_t* szUnknownFile; static void OutputDebugString(const char_t* message); + static size_t StringLength(const char_t* str) { return strlen(str); } }; template<> @@ -69,13 +79,13 @@ struct dbgrpt_char_traits<wchar_t> static const char_t* szUnknownFile; static void OutputDebugString(const char_t* message); + static size_t StringLength(const char_t* str) { return wcslen(str); }; }; // Shortcut typedef dbgrpt_char_traits<char> achar_traits; typedef dbgrpt_char_traits<wchar_t> wchar_traits; - const wchar_t* achar_traits::szAssertionMessage = L"Debug %s!\n" L"%s%hs" /* module */ @@ -97,17 +107,16 @@ const wchar_traits::char_t* wchar_traits::szEmptyString = L""; const achar_traits::char_t* achar_traits::szUnknownFile = "<unknown file>"; const wchar_traits::char_t* wchar_traits::szUnknownFile = L"<unknown file>"; -void achar_traits::OutputDebugString(const char* message) +inline void achar_traits::OutputDebugString(const char* message) { OutputDebugStringA(message); } -void wchar_traits::OutputDebugString(const wchar_t* message) +inline void wchar_traits::OutputDebugString(const wchar_t* message) { OutputDebugStringW(message); } - static HMODULE _CrtGetUser32() { @@ -221,6 +230,46 @@ void _CrtLeaveDbgReport(int reportType) _InterlockedDecrement(&_CrtInAssert); } +EXTERN_C +int __cdecl _CrtSetReportMode(int reportType, int reportMode) +{ + if (reportType >= _CRT_ERRCNT || reportType < 0) + return 0; + + int oldReportMode = _CrtModeOutputFormat[reportType]; + if (reportMode != _CRTDBG_REPORT_MODE) + _CrtModeOutputFormat[reportType] = reportMode; + return oldReportMode; +} + +EXTERN_C +_HFILE __cdecl _CrtSetReportFile(int reportType, _HFILE reportFile) +{ + if (reportType >= _CRT_ERRCNT || reportType < 0) + return NULL; + + _HFILE oldReportFile = _CrtReportFiles[reportType]; + if (reportFile != _CRTDBG_REPORT_FILE) + _CrtReportFiles[reportType] = reportFile; + return oldReportFile; +} + +template <typename char_t> +static inline BOOL _CrtDbgReportToFile(HANDLE hFile, const char_t* szMsg) +{ + typedef dbgrpt_char_traits<char_t> traits; + + if (hFile == _CRTDBG_INVALID_HFILE || hFile == NULL) + return FALSE; + + if (hFile == _CRTDBG_FILE_STDOUT) + hFile = ::GetStdHandle(STD_OUTPUT_HANDLE); + else if (hFile == _CRTDBG_FILE_STDERR) + hFile = ::GetStdHandle(STD_ERROR_HANDLE); + + DWORD cbMsg = (DWORD)(traits::StringLength(szMsg) * sizeof(char_t)); + return ::WriteFile(hFile, szMsg, cbMsg, &cbMsg, NULL); +} template <typename char_t> static int _CrtHandleDbgReport(int reportType, const char_t* szCompleteMessage, const char_t* szFormatted, @@ -230,8 +279,7 @@ static int _CrtHandleDbgReport(int reportType, const char_t* szCompleteMessage, if (_CrtModeOutputFormat[reportType] & _CRTDBG_MODE_FILE) { - OutputDebugStringA("ERROR: Please implement _CrtSetReportFile first\n"); - _CrtDbgBreak(); + _CrtDbgReportToFile<char_t>(_CrtReportFiles[reportType], szCompleteMessage); } if (_CrtModeOutputFormat[reportType] & _CRTDBG_MODE_DEBUG) diff --git a/sdk/lib/crt/misc/misc.cmake b/sdk/lib/crt/misc/misc.cmake index d5cea9dd5cc..7b8bb4c9efd 100644 --- a/sdk/lib/crt/misc/misc.cmake +++ b/sdk/lib/crt/misc/misc.cmake @@ -15,6 +15,7 @@ list(APPEND CRT_MISC_SOURCE misc/amsg.c misc/assert.c misc/crt_init.c + misc/dbgrpt.cpp misc/environ.c misc/getargs.c misc/i10output.c

1 0

[reactos] 01/01: [MSPAINT] Use wait cursor (#5660)
by Katayama Hirofumi MZ 10 Sep '23

10 Sep '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=993a45024e5e9467d5dda… commit 993a45024e5e9467d5dda67dd4c5532463e883f6 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Sep 10 22:28:28 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 10 22:28:28 2023 +0900 [MSPAINT] Use wait cursor (#5660) - Implement CWaitCursor class in newly-added "waitcursor.h". - Use CWaitCursor to manage the wait cursor. - Improve WM_SETCURSOR handlings. CORE-19094 --- base/applications/mspaint/canvas.cpp | 6 +++ base/applications/mspaint/dib.cpp | 16 ++++++++ base/applications/mspaint/precomp.h | 1 + base/applications/mspaint/textedit.cpp | 6 +++ base/applications/mspaint/waitcursor.h | 54 +++++++++++++++++++++++++++ base/applications/mspaint/winproc.cpp | 67 ++++++++++++++++++---------------- 6 files changed, 119 insertions(+), 31 deletions(-) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index 3568657a21f..186b88dc044 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -635,6 +635,12 @@ LRESULT CCanvasWindow::OnRButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL LRESULT CCanvasWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { + if (CWaitCursor::IsWaiting()) + { + bHandled = FALSE; + return 0; + } + POINT pt; ::GetCursorPos(&pt); ScreenToClient(&pt); diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index e770f5494d0..ee899c74e98 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -151,6 +151,8 @@ GetDIBHeight(HBITMAP hBitmap) BOOL SaveDIBToFile(HBITMAP hBitmap, LPCWSTR FileName, BOOL fIsMainFile, REFGUID guidFileType) { + CWaitCursor waitCursor; + CImageDx img; img.Attach(hBitmap); HRESULT hr = img.SaveDx(FileName, guidFileType, g_xDpi, g_yDpi); @@ -250,6 +252,8 @@ HBITMAP SetBitmapAndInfo(HBITMAP hBitmap, LPCWSTR name, LPWIN32_FIND_DATAW pFoun HBITMAP DoLoadImageFile(HWND hwnd, LPCWSTR name, BOOL fIsMainFile) { + CWaitCursor waitCursor; + // find the file WIN32_FIND_DATA find; HANDLE hFind = ::FindFirstFileW(name, &find); @@ -341,6 +345,8 @@ HBITMAP Rotate90DegreeBlt(HDC hDC1, INT cx, INT cy, BOOL bRight, BOOL bMono) HBITMAP SkewDIB(HDC hDC1, HBITMAP hbm, INT nDegree, BOOL bVertical, BOOL bMono) { + CWaitCursor waitCursor; + if (nDegree == 0) return CopyDIBImage(hbm); @@ -402,6 +408,8 @@ struct BITMAPINFODX : BITMAPINFO HGLOBAL BitmapToClipboardDIB(HBITMAP hBitmap) { + CWaitCursor waitCursor; + BITMAP bm; if (!GetObject(hBitmap, sizeof(BITMAP), &bm)) return NULL; @@ -463,6 +471,8 @@ HGLOBAL BitmapToClipboardDIB(HBITMAP hBitmap) HBITMAP BitmapFromClipboardDIB(HGLOBAL hGlobal) { + CWaitCursor waitCursor; + LPBYTE pb = (LPBYTE)GlobalLock(hGlobal); if (!pb) return NULL; @@ -508,6 +518,8 @@ HBITMAP BitmapFromClipboardDIB(HGLOBAL hGlobal) HBITMAP BitmapFromHEMF(HENHMETAFILE hEMF) { + CWaitCursor waitCursor; + ENHMETAHEADER header; if (!GetEnhMetaFileHeader(hEMF, sizeof(header), &header)) return NULL; @@ -529,6 +541,8 @@ HBITMAP BitmapFromHEMF(HENHMETAFILE hEMF) BOOL IsBitmapBlackAndWhite(HBITMAP hbm) { + CWaitCursor waitCursor; + BITMAP bm; if (!::GetObjectW(hbm, sizeof(bm), &bm)) return FALSE; @@ -578,6 +592,8 @@ Finish: HBITMAP ConvertToBlackAndWhite(HBITMAP hbm) { + CWaitCursor waitCursor; + BITMAP bm; if (!::GetObject(hbm, sizeof(bm), &bm)) return NULL; diff --git a/base/applications/mspaint/precomp.h b/base/applications/mspaint/precomp.h index 385cc985a4f..0c1d6b33ba8 100644 --- a/base/applications/mspaint/precomp.h +++ b/base/applications/mspaint/precomp.h @@ -50,6 +50,7 @@ #include "toolsmodel.h" #include "winproc.h" #include "dialogs.h" +#include "waitcursor.h" #include "globalvar.h" #endif /* _MSPAINT_H */ diff --git a/base/applications/mspaint/textedit.cpp b/base/applications/mspaint/textedit.cpp index e5b51aa3de3..376b1214045 100644 --- a/base/applications/mspaint/textedit.cpp +++ b/base/applications/mspaint/textedit.cpp @@ -187,6 +187,12 @@ LRESULT CTextEditWindow::OnNCHitTest(UINT nMsg, WPARAM wParam, LPARAM lParam, BO LRESULT CTextEditWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { + if (CWaitCursor::IsWaiting()) + { + bHandled = FALSE; + return 0; + } + UINT nHitTest = LOWORD(lParam); if (nHitTest == HTCAPTION) { diff --git a/base/applications/mspaint/waitcursor.h b/base/applications/mspaint/waitcursor.h new file mode 100644 index 00000000000..20269ed16eb --- /dev/null +++ b/base/applications/mspaint/waitcursor.h @@ -0,0 +1,54 @@ +/* + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Wait cursor management + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#pragma once + +class CWaitCursor +{ +public: + CWaitCursor() + { + if (s_nLock++ == 0) + { + if (!s_hWaitCursor) + s_hWaitCursor = ::LoadCursor(NULL, IDC_WAIT); + s_hOldCursor = ::SetCursor(s_hWaitCursor); + } + else + { + ::SetCursor(s_hWaitCursor); + } + } + ~CWaitCursor() + { + if (--s_nLock == 0) + { + ::SetCursor(s_hOldCursor); + s_hOldCursor = NULL; + } + } + CWaitCursor(const CWaitCursor&) = delete; + CWaitCursor& operator=(const CWaitCursor&) = delete; + + static BOOL IsWaiting() + { + return s_nLock > 0; + } + static void KeepWait() + { + ::SetCursor(s_hWaitCursor); + } + +protected: + static LONG s_nLock; + static HCURSOR s_hOldCursor; + static HCURSOR s_hWaitCursor; +}; + +DECLSPEC_SELECTANY LONG CWaitCursor::s_nLock = 0; +DECLSPEC_SELECTANY HCURSOR CWaitCursor::s_hOldCursor = NULL; +DECLSPEC_SELECTANY HCURSOR CWaitCursor::s_hWaitCursor = NULL; diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 3db01639a34..c85b61b10c3 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -911,44 +911,48 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH imageModel.NotifyImageChanged(); break; case IDM_IMAGEROTATEMIRROR: - switch (mirrorRotateDialog.DoModal(mainWindow.m_hWnd)) { - case 1: /* flip horizontally */ - if (selectionModel.m_bShow) - selectionModel.FlipHorizontally(); - else - imageModel.FlipHorizontally(); - break; - case 2: /* flip vertically */ - if (selectionModel.m_bShow) - selectionModel.FlipVertically(); - else - imageModel.FlipVertically(); - break; - case 3: /* rotate 90 degrees */ - if (selectionModel.m_bShow) - selectionModel.RotateNTimes90Degrees(1); - else - imageModel.RotateNTimes90Degrees(1); - break; - case 4: /* rotate 180 degrees */ - if (selectionModel.m_bShow) - selectionModel.RotateNTimes90Degrees(2); - else - imageModel.RotateNTimes90Degrees(2); - break; - case 5: /* rotate 270 degrees */ - if (selectionModel.m_bShow) - selectionModel.RotateNTimes90Degrees(3); - else - imageModel.RotateNTimes90Degrees(3); - break; + CWaitCursor waitCursor; + switch (mirrorRotateDialog.DoModal(mainWindow.m_hWnd)) + { + case 1: /* flip horizontally */ + if (selectionModel.m_bShow) + selectionModel.FlipHorizontally(); + else + imageModel.FlipHorizontally(); + break; + case 2: /* flip vertically */ + if (selectionModel.m_bShow) + selectionModel.FlipVertically(); + else + imageModel.FlipVertically(); + break; + case 3: /* rotate 90 degrees */ + if (selectionModel.m_bShow) + selectionModel.RotateNTimes90Degrees(1); + else + imageModel.RotateNTimes90Degrees(1); + break; + case 4: /* rotate 180 degrees */ + if (selectionModel.m_bShow) + selectionModel.RotateNTimes90Degrees(2); + else + imageModel.RotateNTimes90Degrees(2); + break; + case 5: /* rotate 270 degrees */ + if (selectionModel.m_bShow) + selectionModel.RotateNTimes90Degrees(3); + else + imageModel.RotateNTimes90Degrees(3); + break; + } } break; case IDM_IMAGEATTRIBUTES: { if (attributesDialog.DoModal(mainWindow.m_hWnd)) { + CWaitCursor waitCursor; if (attributesDialog.m_bBlackAndWhite && !imageModel.IsBlackAndWhite()) { CString strText(MAKEINTRESOURCE(IDS_LOSECOLOR)); @@ -972,6 +976,7 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH { if (stretchSkewDialog.DoModal(mainWindow.m_hWnd)) { + CWaitCursor waitCursor; if (selectionModel.m_bShow) { selectionModel.StretchSkew(stretchSkewDialog.percentage.x, stretchSkewDialog.percentage.y,

1 0

[reactos] 01/01: [NOTEPAD] Use wait cursor (#5659)
by Katayama Hirofumi MZ 10 Sep '23

10 Sep '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0ef9cfb04e819a88bf4d5… commit 0ef9cfb04e819a88bf4d5721cce0800193824e02 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Sep 10 22:27:16 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 10 22:27:16 2023 +0900 [NOTEPAD] Use wait cursor (#5659) - Add WaitCursor helper function to display the wait cursor while heavy operation. - Manage the wait cursor by using a lock count. CORE-18837 --- base/applications/notepad/dialog.c | 43 ++++++++++++++++++++++++++++++++++++++ base/applications/notepad/dialog.h | 1 + base/applications/notepad/main.c | 6 +++++- 3 files changed, 49 insertions(+), 1 deletion(-) diff --git a/base/applications/notepad/dialog.c b/base/applications/notepad/dialog.c index 111d0428a1d..82c6c5c57bc 100644 --- a/base/applications/notepad/dialog.c +++ b/base/applications/notepad/dialog.c @@ -111,6 +111,33 @@ void UpdateWindowCaption(BOOL clearModifyAlert) SetWindowText(Globals.hMainWnd, szCaption); } +VOID WaitCursor(BOOL bBegin) +{ + static HCURSOR s_hWaitCursor = NULL; + static HCURSOR s_hOldCursor = NULL; + static INT s_nLock = 0; + + if (bBegin) + { + if (s_nLock++ == 0) + { + if (s_hWaitCursor == NULL) + s_hWaitCursor = LoadCursor(NULL, IDC_WAIT); + s_hOldCursor = SetCursor(s_hWaitCursor); + } + else + { + SetCursor(s_hWaitCursor); + } + } + else + { + if (--s_nLock == 0) + SetCursor(s_hOldCursor); + } +} + + VOID DIALOG_StatusBarAlignParts(VOID) { static const int defaultWidths[] = {120, 120, 120}; @@ -220,11 +247,14 @@ static BOOL DoSaveFile(VOID) HANDLE hFile; DWORD cchText; + WaitCursor(TRUE); + hFile = CreateFileW(Globals.szFileName, GENERIC_WRITE, FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); if (hFile == INVALID_HANDLE_VALUE) { ShowLastError(); + WaitCursor(FALSE); return FALSE; } @@ -259,6 +289,7 @@ static BOOL DoSaveFile(VOID) SetFileName(Globals.szFileName); } + WaitCursor(FALSE); return bRet; } @@ -307,6 +338,8 @@ VOID DoOpenFile(LPCTSTR szFileName) if (!DoCloseFile()) return; + WaitCursor(TRUE); + hFile = CreateFile(szFileName, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); if (hFile == INVALID_HANDLE_VALUE) @@ -347,6 +380,7 @@ VOID DoOpenFile(LPCTSTR szFileName) done: if (hFile != INVALID_HANDLE_VALUE) CloseHandle(hFile); + WaitCursor(FALSE); } VOID DIALOG_FileNew(VOID) @@ -355,6 +389,8 @@ VOID DIALOG_FileNew(VOID) if (!DoCloseFile()) return; + WaitCursor(TRUE); + SetWindowText(Globals.hEdit, NULL); SendMessage(Globals.hEdit, EM_EMPTYUNDOBUFFER, 0, 0); Globals.iEoln = EOLN_CRLF; @@ -362,13 +398,20 @@ VOID DIALOG_FileNew(VOID) NOTEPAD_EnableSearchMenu(); DIALOG_StatusBarUpdateAll(); + + WaitCursor(FALSE); } VOID DIALOG_FileNewWindow(VOID) { TCHAR pszNotepadExe[MAX_PATH]; + + WaitCursor(TRUE); + GetModuleFileName(NULL, pszNotepadExe, _countof(pszNotepadExe)); ShellExecute(NULL, NULL, pszNotepadExe, NULL, NULL, SW_SHOWNORMAL); + + WaitCursor(FALSE); } VOID DIALOG_FileOpen(VOID) diff --git a/base/applications/notepad/dialog.h b/base/applications/notepad/dialog.h index c9681df92f0..7b62a58063a 100644 --- a/base/applications/notepad/dialog.h +++ b/base/applications/notepad/dialog.h @@ -57,3 +57,4 @@ VOID DoOpenFile(LPCTSTR szFileName); VOID DoShowHideStatusBar(VOID); VOID DoCreateEditWindow(VOID); void UpdateWindowCaption(BOOL clearModifyAlert); +VOID WaitCursor(BOOL bBegin); diff --git a/base/applications/notepad/main.c b/base/applications/notepad/main.c index 599ad5c60df..77100a2e26a 100644 --- a/base/applications/notepad/main.c +++ b/base/applications/notepad/main.c @@ -433,6 +433,8 @@ NOTEPAD_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) FINDREPLACE *pFindReplace = (FINDREPLACE *) lParam; Globals.find = *(FINDREPLACE *) lParam; + WaitCursor(TRUE); + if (pFindReplace->Flags & FR_FINDNEXT) NOTEPAD_FindNext(pFindReplace, FALSE, TRUE); else if (pFindReplace->Flags & FR_REPLACE) @@ -441,6 +443,8 @@ NOTEPAD_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) NOTEPAD_ReplaceAll(pFindReplace); else if (pFindReplace->Flags & FR_DIALOGTERM) NOTEPAD_FindTerm(); + + WaitCursor(FALSE); break; } @@ -587,7 +591,7 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE prev, LPTSTR cmdline, int sh wndclass.lpfnWndProc = NOTEPAD_WndProc; wndclass.hInstance = Globals.hInstance; wndclass.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_NPICON)); - wndclass.hCursor = LoadCursor(0, IDC_ARROW); + wndclass.hCursor = LoadCursor(NULL, IDC_ARROW); wndclass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); wndclass.lpszMenuName = MAKEINTRESOURCE(MAIN_MENU); wndclass.lpszClassName = className;

1 0

[reactos] 02/02: [KERNEL32_APITEST] Improve InitOnce test
by Timo Kreuzer 10 Sep '23

10 Sep '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7497f028f4adaef0eb26a… commit 7497f028f4adaef0eb26abe6206c07396efe8bde Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Sep 8 11:51:41 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 10 14:58:54 2023 +0300 [KERNEL32_APITEST] Improve InitOnce test --- modules/rostests/apitests/kernel32/InitOnce.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/modules/rostests/apitests/kernel32/InitOnce.c b/modules/rostests/apitests/kernel32/InitOnce.c index 66014197f96..1d20dc445a2 100644 --- a/modules/rostests/apitests/kernel32/InitOnce.c +++ b/modules/rostests/apitests/kernel32/InitOnce.c @@ -154,6 +154,7 @@ _test_sync: /* Re-initialize One-Time initialization structure by using INIT_ONCE_STATIC_INIT */ InitOnce = (INIT_ONCE)INIT_ONCE_STATIC_INIT; + ulContextData = 0xdeadbeef; /* Perform synchronous initialization by using InitOnceBeginInitialize */ fPending = FALSE; @@ -169,6 +170,16 @@ _test_sync: goto _test_async; } + /* Call again to check whether initialization has completed */ + fPending = 0xdeadbeef; + bRet = pfnInitOnceBeginInitialize(&InitOnce, + INIT_ONCE_CHECK_ONLY, + &fPending, + (LPVOID*)&ulContextData); + ok(bRet == FALSE, "InitOnceBeginInitialize should fail\n"); + ok(fPending == 0xdeadbeef, "fPending should be unmodified\n"); + ok(ulContextData == 0xdeadbeef, "ulContextData should be unmodified\n"); + /* Complete the initialization */ InitWorker(&ulInitCount, &ulTempContext); bRet = pfnInitOnceComplete(&InitOnce, 0, (LPVOID)ulTempContext);

1 0

[reactos] 01/02: [KERNEL32_APITEST] Fix stack corruption in InitOnce test on x64
by Timo Kreuzer 10 Sep '23

10 Sep '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6286475d711a4348df057… commit 6286475d711a4348df05750df8ee6d22b6eeaea0 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Sep 8 11:51:00 2023 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 10 14:58:54 2023 +0300 [KERNEL32_APITEST] Fix stack corruption in InitOnce test on x64 --- modules/rostests/apitests/kernel32/InitOnce.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/rostests/apitests/kernel32/InitOnce.c b/modules/rostests/apitests/kernel32/InitOnce.c index 586e87bac9d..66014197f96 100644 --- a/modules/rostests/apitests/kernel32/InitOnce.c +++ b/modules/rostests/apitests/kernel32/InitOnce.c @@ -72,8 +72,8 @@ InitOnceProc( START_TEST(InitOnce) { BOOL bRet, fPending; - ULONG i, ulInitCount, ulSeed, ulContextData; - ULONG_PTR ulTempContext; + ULONG i, ulInitCount, ulSeed; + ULONG_PTR ulContextData, ulTempContext; DWORD dwError; HMODULE hKernel32;

1 0

[reactos] 01/01: [GETUNAME] Build only english on DBG builds (#5670)
by Timo Kreuzer 10 Sep '23

10 Sep '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4459b4f42be00a869f833… commit 4459b4f42be00a869f833fd7bc5f1fe165f00eff Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Sep 10 14:43:41 2023 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 10 14:43:41 2023 +0300 [GETUNAME] Build only english on DBG builds (#5670) This massively cuts down build time on MSVC builds. Co-authored-by: Stanislav Motylkov <x86corez(a)gmail.com> --- dll/win32/getuname/getuname.rc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dll/win32/getuname/getuname.rc b/dll/win32/getuname/getuname.rc index ef05599696e..a326803e90e 100644 --- a/dll/win32/getuname/getuname.rc +++ b/dll/win32/getuname/getuname.rc @@ -9,6 +9,10 @@ /* UTF-8 */ #pragma code_page(65001) +/* Only use english on debug builds to reduce compile time */ +#if DBG + #include "lang/en-US.rc" +#else #ifdef LANGUAGE_DE_DE #include "lang/de-DE.rc" #endif @@ -39,3 +43,4 @@ #ifdef LANGUAGE_ZH_TW #include "lang/zh-TW.rc" #endif +#endif /* DBG */

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs