Ros-diffs December 2014

ros-diffs@reactos.org

17 participants
387 discussions

[jimtabor] 65743: - Fix a crash while moving minimized MDI window in ConTEXT.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Thu Dec 18 22:38:40 2014 New Revision: 65743 URL: http://svn.reactos.org/svn/reactos?rev=65743&view=rev Log: - Fix a crash while moving minimized MDI window in ConTEXT. Modified: trunk/reactos/win32ss/user/ntuser/defwnd.c Modified: trunk/reactos/win32ss/user/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/defwnd… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] Thu Dec 18 22:38:40 2014 @@ -599,7 +599,7 @@ * so we must unreference whatever cursor was current at the time we restored the old one. * Maybe it is DragCursor, but maybe it is another one and DragCursor got already freed. */ - UserDereferenceObject(OldCursor); + if (OldCursor) UserDereferenceObject(OldCursor); #else IntDestroyCursor( hDragCursor, FALSE ); #endif

9 years, 9 months

[gadamopoulos] 65742: [RSHELL] * Implement using a thin border for the start menu when themes are enabled CORE-8925

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Thu Dec 18 18:24:01 2014 New Revision: 65742 URL: http://svn.reactos.org/svn/reactos?rev=65742&view=rev Log: [RSHELL] * Implement using a thin border for the start menu when themes are enabled CORE-8925 Modified: trunk/reactos/base/shell/rshell/CMenuBand.cpp trunk/reactos/base/shell/rshell/CMenuBand.h trunk/reactos/base/shell/rshell/CMenuDeskBar.cpp trunk/reactos/base/shell/rshell/CMenuDeskBar.h trunk/reactos/base/shell/rshell/CMenuToolbars.cpp trunk/reactos/include/reactos/shlguid_undoc.h Modified: trunk/reactos/base/shell/rshell/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMenuBan… ============================================================================== --- trunk/reactos/base/shell/rshell/CMenuBand.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CMenuBand.cpp [iso-8859-1] Thu Dec 18 18:24:01 2014 @@ -699,6 +699,14 @@ { *theResult = 0; + if (uMsg == WM_WININICHANGE && wParam == SPI_SETFLATMENU) + { + BOOL bFlatMenus; + SystemParametersInfo(SPI_GETFLATMENU, 0, &bFlatMenus, 0); + AdjustForTheme(bFlatMenus); + return S_OK; + } + if (m_staticToolbar && m_staticToolbar->IsWindowOwner(hWnd) == S_OK) { return m_staticToolbar->OnWinEvent(hWnd, uMsg, wParam, lParam, theResult); @@ -1123,6 +1131,11 @@ return m_popupBar ? S_OK : S_FALSE; } +HRESULT CMenuBand::AdjustForTheme(BOOL bFlatStyle) +{ + return IUnknown_QueryServiceExec(m_site, SID_SMenuPopup, &CGID_MenuDeskBar, 4, bFlatStyle, NULL, NULL); +} + HRESULT STDMETHODCALLTYPE CMenuBand::InvalidateItem(LPSMDATA psmd, DWORD dwFlags) { UNIMPLEMENTED; Modified: trunk/reactos/base/shell/rshell/CMenuBand.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMenuBan… ============================================================================== --- trunk/reactos/base/shell/rshell/CMenuBand.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CMenuBand.h [iso-8859-1] Thu Dec 18 18:24:01 2014 @@ -200,6 +200,8 @@ HRESULT _MenuBarMouseUp(HWND hwnd, INT item); HRESULT _HasSubMenu(); + HRESULT AdjustForTheme(BOOL bFlatStyle); + BOOL UseBigIcons() { return m_useBigIcons; Modified: trunk/reactos/base/shell/rshell/CMenuDeskBar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMenuDes… ============================================================================== --- trunk/reactos/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] Thu Dec 18 18:24:01 2014 @@ -25,8 +25,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(CMenuDeskBar); -const static GUID CGID_MenuDeskBar = { 0x5C9F0A12, 0x959E, 0x11D0, { 0xA3, 0xA4, 0x00, 0xA0, 0xC9, 0x08, 0x26, 0x36 } }; - extern "C" HRESULT WINAPI CMenuDeskBar_Constructor(REFIID riid, LPVOID *ppv) { @@ -110,7 +108,7 @@ case 3: // load complete return S_OK; case 4: // set font metrics - return S_OK; + return _AdjustForTheme(nCmdexecopt); } } if (IsEqualIID(*pguidCmdGroup, CGID_Explorer)) @@ -693,3 +691,19 @@ #endif return 0; } + +LRESULT CMenuDeskBar::_OnWinIniChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + if (wParam == SPI_SETFLATMENU) + return _OnNotify(uMsg, wParam, lParam, bHandled); + + return 0; +} + +HRESULT CMenuDeskBar::_AdjustForTheme(BOOL bFlatStyle) +{ + DWORD style = bFlatStyle ? WS_BORDER : WS_CLIPCHILDREN|WS_DLGFRAME; + DWORD mask = WS_BORDER|WS_CLIPCHILDREN|WS_DLGFRAME; + SHSetWindowBits(m_hWnd, GWL_STYLE, mask, style); + return S_OK; +} Modified: trunk/reactos/base/shell/rshell/CMenuDeskBar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMenuDes… ============================================================================== --- trunk/reactos/base/shell/rshell/CMenuDeskBar.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CMenuDeskBar.h [iso-8859-1] Thu Dec 18 18:24:01 2014 @@ -70,6 +70,7 @@ MESSAGE_HANDLER(WM_ACTIVATE, _OnActivate) MESSAGE_HANDLER(WM_ACTIVATEAPP, _OnAppActivate) MESSAGE_HANDLER(WM_MOUSEACTIVATE, _OnMouseActivate) + MESSAGE_HANDLER(WM_WININICHANGE , _OnWinIniChange) END_MSG_MAP() BEGIN_COM_MAP(CMenuDeskBar) @@ -136,7 +137,9 @@ LRESULT _OnActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT _OnMouseActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT _OnAppActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT _OnWinIniChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + HRESULT _AdjustForTheme(BOOL bFlatStyle); BOOL _IsSubMenuParent(HWND hwnd); HRESULT _CloseBar(); }; Modified: trunk/reactos/base/shell/rshell/CMenuToolbars.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMenuToo… ============================================================================== --- trunk/reactos/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] Thu Dec 18 18:24:01 2014 @@ -383,6 +383,9 @@ SetWindowTheme(m_hWnd, L"", L""); + SystemParametersInfo(SPI_GETFLATMENU, 0, &m_useFlatMenus, 0); + m_menuBand->AdjustForTheme(m_useFlatMenus); + // If needed, create the pager. if (m_usePager) { Modified: trunk/reactos/include/reactos/shlguid_undoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/shlguid_un… ============================================================================== --- trunk/reactos/include/reactos/shlguid_undoc.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/shlguid_undoc.h [iso-8859-1] Thu Dec 18 18:24:01 2014 @@ -112,12 +112,15 @@ DEFINE_GUID(IID_IAugmentedShellFolder2, 0x8DB3B3F4, 0x6CFE, 0x11D1, 0x8A, 0xE9, 0x00, 0xC0, 0x4F, 0xD9, 0x18, 0xD0); DEFINE_GUID(IID_IAugmentedShellFolder3, 0x4F755EA8, 0x247D, 0x479B, 0x91, 0x81, 0x22, 0x7D, 0x09, 0xC2, 0xE0, 0x01); +DEFINE_GUID(CGID_MenuDeskBar, 0x5C9F0A12, 0x959E, 0x11D0, 0xA3, 0xA4, 0x00, 0xA0, 0xC9, 0x08, 0x26, 0x36); + #define CGID_IExplorerToolbar IID_IExplorerToolbar #define SID_IExplorerToolbar IID_IExplorerToolbar #define SID_ITargetFrame2 IID_ITargetFrame2 #define SID_IWebBrowserApp IID_IWebBrowserApp #define CGID_IDeskBand IID_IDeskBand #define CGID_MenuBand CLSID_MenuBand + #define SID_STravelLogCursor IID_ITravelLogStg #define SID_IBandSite IID_IBandSite #define SID_IFolderView IID_IFolderView

9 years, 9 months

[pschweitzer] 65741: [BOOTDATA] Add the NtfsMftZoneReservation registry key on installation See http://support.microsoft.com/kb/174619 for more information

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Thu Dec 18 18:15:15 2014 New Revision: 65741 URL: http://svn.reactos.org/svn/reactos?rev=65741&view=rev Log: [BOOTDATA] Add the NtfsMftZoneReservation registry key on installation See http://support.microsoft.com/kb/174619 for more information Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Thu Dec 18 18:15:15 2014 @@ -329,6 +329,7 @@ 00,00,00,00,00,00,f0,ff,00,00,00,00,ff,ff,ff,ff,00,00,00,00 HKLM,"SYSTEM\CurrentControlSet\Control\FileSystem","NtfsDisable8dot3NameCreation",0x00010003,0 +HKLM,"SYSTEM\CurrentControlSet\Control\FileSystem","NtfsMftZoneReservation",0x00010003,1 HKLM,"SYSTEM\CurrentControlSet\Control\FileSystem","Win31FileSystem",0x00010001,0 HKLM,"SYSTEM\CurrentControlSet\Control\FileSystem","Win95TruncatedExtensions",0x00010001,1

9 years, 9 months

[dquintana] 65740: [RSHELL] * Fix the focus manager to properly close the shell menus when clicking outside the menu area. * Close the shell menus when activating a context menu action. * Open the ...

by dquintana＠svn.reactos.org

Author: dquintana Date: Thu Dec 18 17:34:46 2014 New Revision: 65740 URL: http://svn.reactos.org/svn/reactos?rev=65740&view=rev Log: [RSHELL] * Fix the focus manager to properly close the shell menus when clicking outside the menu area. * Close the shell menus when activating a context menu action. * Open the shell menus without activating. Fixes titlebar color changing to inactive for the Favorites menu. [RSHELL] [SHELL32] [BROWSEUI] * Remove a few DbgPrints and downgrade some others into TRACEs. CORE-8836 #resolve Modified: trunk/reactos/base/shell/explorer/taskswnd.cpp trunk/reactos/base/shell/rshell/CMenuBand.cpp trunk/reactos/base/shell/rshell/CMenuBand.h trunk/reactos/base/shell/rshell/CMenuDeskBar.cpp trunk/reactos/base/shell/rshell/CMenuFocusManager.cpp trunk/reactos/base/shell/rshell/CMenuFocusManager.h trunk/reactos/base/shell/rshell/CMenuToolbars.cpp trunk/reactos/base/shell/rshell/CMenuToolbars.h trunk/reactos/base/shell/rshell/ShellDDE.cpp trunk/reactos/dll/win32/shell32/CDefView.cpp trunk/reactos/dll/win32/shell32/CDesktopBrowser.cpp trunk/reactos/dll/win32/shell32/dde.cpp Modified: trunk/reactos/base/shell/explorer/taskswnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/tasksw… ============================================================================== --- trunk/reactos/base/shell/explorer/taskswnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskswnd.cpp [iso-8859-1] Thu Dec 18 17:34:46 2014 @@ -1131,7 +1131,6 @@ if (Horizontal) { - DbgPrint("HORIZONTAL!\n"); TBMETRICS tbm = { 0 }; tbm.cbSize = sizeof(tbm); tbm.dwMask = TBMF_BUTTONSPACING; @@ -1145,7 +1144,6 @@ } else { - DbgPrint("VERTICAL!\n"); uiBtnsPerLine = 1; uiRows = m_ButtonCount; } Modified: trunk/reactos/base/shell/rshell/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMenuBan… ============================================================================== --- trunk/reactos/base/shell/rshell/CMenuBand.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CMenuBand.cpp [iso-8859-1] Thu Dec 18 17:34:46 2014 @@ -439,7 +439,7 @@ if (m_subMenuChild) { - DbgPrint("Child object should have removed itself.\n"); + TRACE("Child object should have removed itself.\n"); } ShowDW(FALSE); @@ -781,6 +781,10 @@ { HRESULT hr; UINT uCommand; + + // Ensure that the menu doesn't disappear on us + CComPtr<IContextMenu> ctxMenu = contextMenu; + HMENU popup = CreatePopupMenu(); if (popup == NULL) @@ -806,12 +810,15 @@ if (uCommand != 0) { + _MenuItemSelect(MPOS_FULLCANCEL); + TRACE("Before InvokeCommand\n"); CMINVOKECOMMANDINFO cmi = { 0 }; cmi.cbSize = sizeof(cmi); cmi.lpVerb = MAKEINTRESOURCEA(uCommand); cmi.hwnd = hwnd; hr = contextMenu->InvokeCommand(&cmi); + TRACE("InvokeCommand returned hr=%08x\n", hr); } else { @@ -843,7 +850,7 @@ if (m_staticToolbar) m_staticToolbar->ChangeHotItem(tb, id, dwFlags); if (m_SFToolbar) m_SFToolbar->ChangeHotItem(tb, id, dwFlags); - _MenuItemHotTrack(MPOS_CHILDTRACKING); + _MenuItemSelect(MPOS_CHILDTRACKING); return S_OK; @@ -904,7 +911,7 @@ return tb->KeyboardItemChange(change == VK_DOWN ? VK_HOME : VK_END); } -HRESULT CMenuBand::_MenuItemHotTrack(DWORD changeType) +HRESULT CMenuBand::_MenuItemSelect(DWORD changeType) { CComPtr<CMenuBand> safeThis = this; HRESULT hr; @@ -959,7 +966,7 @@ } case MPOS_SELECTLEFT: if (m_parentBand && m_parentBand->_IsPopup()==S_FALSE) - return m_parentBand->_MenuItemHotTrack(VK_LEFT); + return m_parentBand->_MenuItemSelect(VK_LEFT); if (m_subMenuChild) return m_subMenuChild->OnSelect(MPOS_CANCELLEVEL); if (!m_subMenuParent) @@ -970,7 +977,7 @@ if (m_hotBar && m_hotItem >= 0 && m_hotBar->PopupItem(m_hotItem, TRUE) == S_OK) return S_FALSE; if (m_parentBand) - return m_parentBand->_MenuItemHotTrack(VK_RIGHT); + return m_parentBand->_MenuItemSelect(VK_RIGHT); if (!m_subMenuParent) return S_OK; return m_subMenuParent->OnSelect(MPOS_SELECTRIGHT); @@ -1093,12 +1100,12 @@ return hr; } -HRESULT CMenuBand::_MenuBarMouseDown(HWND hwnd, INT item) +HRESULT CMenuBand::_MenuBarMouseDown(HWND hwnd, INT item, BOOL isLButton) { if (m_staticToolbar && m_staticToolbar->IsWindowOwner(hwnd) == S_OK) - m_staticToolbar->MenuBarMouseDown(item); + m_staticToolbar->MenuBarMouseDown(item, isLButton); if (m_SFToolbar && m_SFToolbar->IsWindowOwner(hwnd) == S_OK) - m_SFToolbar->MenuBarMouseDown(item); + m_SFToolbar->MenuBarMouseDown(item, isLButton); return S_OK; } Modified: trunk/reactos/base/shell/rshell/CMenuBand.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMenuBan… ============================================================================== --- trunk/reactos/base/shell/rshell/CMenuBand.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CMenuBand.h [iso-8859-1] Thu Dec 18 17:34:46 2014 @@ -186,7 +186,7 @@ HRESULT _GetTopLevelWindow(HWND*topLevel); HRESULT _ChangeHotItem(CMenuToolbarBase * tb, INT id, DWORD dwFlags); HRESULT _ChangePopupItem(CMenuToolbarBase * tb, INT id); - HRESULT _MenuItemHotTrack(DWORD changeType); + HRESULT _MenuItemSelect(DWORD changeType); HRESULT _CancelCurrentPopup(); HRESULT _OnPopupSubMenu(IShellMenu * childShellMenu, POINTL * pAt, RECTL * pExclude, BOOL mouseInitiated); HRESULT _BeforeCancelPopup(); @@ -196,7 +196,7 @@ HRESULT _IsPopup(); HRESULT _IsTracking(); HRESULT _KillPopupTimers(); - HRESULT _MenuBarMouseDown(HWND hwnd, INT item); + HRESULT _MenuBarMouseDown(HWND hwnd, INT item, BOOL isLButton); HRESULT _MenuBarMouseUp(HWND hwnd, INT item); HRESULT _HasSubMenu(); Modified: trunk/reactos/base/shell/rshell/CMenuDeskBar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMenuDes… ============================================================================== --- trunk/reactos/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] Thu Dec 18 17:34:46 2014 @@ -372,7 +372,9 @@ y = rcWorkArea.bottom - cy; } - this->SetWindowPos(HWND_TOPMOST, x, y, cx, cy, SWP_SHOWWINDOW); + int flags = SWP_SHOWWINDOW | SWP_NOACTIVATE; + + this->SetWindowPos(HWND_TOPMOST, x, y, cx, cy, flags); m_ShowFlags = dwFlags; m_Shown = true; Modified: trunk/reactos/base/shell/rshell/CMenuFocusManager.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMenuFoc… ============================================================================== --- trunk/reactos/base/shell/rshell/CMenuFocusManager.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CMenuFocusManager.cpp [iso-8859-1] Thu Dec 18 17:34:46 2014 @@ -163,7 +163,8 @@ m_isLButtonDown(FALSE), m_movedSinceDown(FALSE), m_windowAtDown(NULL), - m_bandCount(0) + m_bandCount(0), + m_menuDepth(0) { m_ptPrev.x = 0; m_ptPrev.y = 0; @@ -207,7 +208,7 @@ m_mouseTrackDisabled = lastDisable; } -void CMenuFocusManager::SetCapture(HWND child) +void CMenuFocusManager::SetMenuCapture(HWND child) { if (m_captureHwnd != child) { @@ -215,13 +216,13 @@ { ::SetCapture(child); m_captureHwnd = child; - TRACE("MouseTrack is now capturing %p\n", child); + TRACE("Capturing %p\n", child); } else { ::ReleaseCapture(); m_captureHwnd = NULL; - TRACE("MouseTrack is now off\n"); + TRACE("Capture is now off\n"); } } @@ -305,7 +306,6 @@ if (cCapture && cCapture != m_captureHwnd && m_current->type != TrackedMenuEntry) return TRUE; - m_movedSinceDown = TRUE; m_ptPrev = pt; @@ -344,8 +344,6 @@ { m_entryUnderMouse->mb->_ChangeHotItem(NULL, -1, HICF_MOUSE); } - if (cCapture == m_captureHwnd) - SetCapture(NULL); } if (m_hwndUnderMouse != child) @@ -373,7 +371,7 @@ return TRUE; } -LRESULT CMenuFocusManager::ProcessMouseDown(MSG* msg) +LRESULT CMenuFocusManager::ProcessMouseDown(MSG* msg, BOOL isLButton) { HWND child; int iHitTestResult = -1; @@ -418,7 +416,7 @@ if (iHitTestResult >= 0) { TRACE("MouseDown send %d\n", iHitTestResult); - entry->mb->_MenuBarMouseDown(child, iHitTestResult); + entry->mb->_MenuBarMouseDown(child, iHitTestResult, isLButton); } } @@ -521,13 +519,13 @@ case VK_LEFT: if (m_current->hmenu == m_selectedMenu) { - m_parent->mb->_MenuItemHotTrack(VK_LEFT); + m_parent->mb->_MenuItemSelect(VK_LEFT); } break; case VK_RIGHT: if (m_selectedItem < 0 || !(m_selectedItemFlags & MF_POPUP)) { - m_parent->mb->_MenuItemHotTrack(VK_RIGHT); + m_parent->mb->_MenuItemSelect(VK_RIGHT); } break; } @@ -555,9 +553,18 @@ switch (msg->message) { + case WM_CAPTURECHANGED: + if (m_captureHwnd) + { + TRACE("Capture lost.\n"); + m_captureHwnd = NULL; + } + break; + case WM_NCLBUTTONDOWN: case WM_LBUTTONDOWN: isLButton = TRUE; + TRACE("LB\n"); // fallthrough; case WM_NCRBUTTONDOWN: @@ -569,7 +576,7 @@ BOOL hoveringMenuBar = m_menuBar->mb->IsWindowOwner(child) == S_OK; if (hoveringMenuBar) { - m_current->mb->_MenuItemHotTrack(MPOS_FULLCANCEL); + m_current->mb->_MenuItemSelect(MPOS_FULLCANCEL); break; } } @@ -580,16 +587,13 @@ if (IsTrackedWindowOrParent(child) != S_OK) { - SetCapture(NULL); - m_current->mb->_MenuItemHotTrack(MPOS_FULLCANCEL); + m_current->mb->_MenuItemSelect(MPOS_FULLCANCEL); break; } } - - if (isLButton) - { - ProcessMouseDown(msg); - } + + ProcessMouseDown(msg, isLButton); + break; case WM_NCLBUTTONUP: case WM_LBUTTONUP: @@ -613,22 +617,22 @@ case VK_MENU: case VK_LMENU: case VK_RMENU: - m_current->mb->_MenuItemHotTrack(MPOS_FULLCANCEL); + m_current->mb->_MenuItemSelect(MPOS_FULLCANCEL); break; case VK_RETURN: - m_current->mb->_MenuItemHotTrack(MPOS_EXECUTE); + m_current->mb->_MenuItemSelect(MPOS_EXECUTE); break; case VK_LEFT: - m_current->mb->_MenuItemHotTrack(VK_LEFT); + m_current->mb->_MenuItemSelect(VK_LEFT); break; case VK_RIGHT: - m_current->mb->_MenuItemHotTrack(VK_RIGHT); + m_current->mb->_MenuItemSelect(VK_RIGHT); break; case VK_UP: - m_current->mb->_MenuItemHotTrack(VK_UP); + m_current->mb->_MenuItemSelect(VK_UP); break; case VK_DOWN: - m_current->mb->_MenuItemHotTrack(VK_DOWN); + m_current->mb->_MenuItemSelect(VK_DOWN); break; } msg->message = WM_NULL; @@ -672,13 +676,18 @@ HRESULT CMenuFocusManager::RemoveHooks() { - TRACE("Removing all hooks...\n"); if (m_hMsgFilterHook) + { + TRACE("Removing MSGFILTER hook...\n"); UnhookWindowsHookEx(m_hMsgFilterHook); + m_hMsgFilterHook = NULL; + } if (m_hGetMsgHook) + { + TRACE("Removing GETMESSAGE hook...\n"); UnhookWindowsHookEx(m_hGetMsgHook); - m_hMsgFilterHook = NULL; - m_hGetMsgHook = NULL; + m_hGetMsgHook = NULL; + } return S_OK; } @@ -688,15 +697,15 @@ StackEntry * old = m_current; TRACE("UpdateFocus\n"); - - if (old) - SetCapture(NULL); if (m_bandCount > 0) m_current = &(m_bandStack[m_bandCount - 1]); else m_current = NULL; + if (!m_current || m_current->type != MenuPopupEntry) + SetMenuCapture(NULL); + if (m_current && m_current->type != TrackedMenuEntry) { hr = m_current->mb->_GetTopLevelWindow(&(m_current->hwnd)); @@ -747,24 +756,42 @@ DisableMouseTrack(m_parent->hwnd, TRUE); } - if ((m_current && m_current->type == MenuPopupEntry) && - (!m_parent || m_parent->type == MenuBarEntry)) - { - // When the mouse moves, it should set itself to the proper band - SetCapture(m_current->hwnd); - - if (old && old->type == TrackedMenuEntry) - { - // FIXME: Debugging code, probably not right - POINT pt2; - RECT rc2; - GetCursorPos(&pt2); - ScreenToClient(m_current->hwnd, &pt2); - GetClientRect(m_current->hwnd, &rc2); - if (PtInRect(&rc2, pt2)) - SendMessage(m_current->hwnd, WM_MOUSEMOVE, 0, MAKELPARAM(pt2.x, pt2.y)); - else - SendMessage(m_current->hwnd, WM_MOUSELEAVE, 0, 0); + if (m_current && m_current->type == MenuPopupEntry) + { + if (m_captureHwnd == NULL) + { + // We need to restore the capture after a non-shell submenu or context menu is shown + StackEntry * topMenu = m_bandStack; + if (topMenu->type == MenuBarEntry) + topMenu++; + + // Get the top-level window from the top popup + CComPtr<IServiceProvider> bandSite; + CComPtr<IOleWindow> deskBar; + hr = topMenu->mb->GetSite(IID_PPV_ARG(IServiceProvider, &bandSite)); + hr = bandSite->QueryService(SID_SMenuBandParent, IID_PPV_ARG(IOleWindow, &deskBar)); + + // Get the HWND of the top-level window + HWND hWndSite; + hr = deskBar->GetWindow(&hWndSite); + SetMenuCapture(hWndSite); + } + + if (!m_parent || m_parent->type == MenuBarEntry) + { + if (old && old->type == TrackedMenuEntry) + { + // FIXME: Debugging code, probably not right + POINT pt2; + RECT rc2; + GetCursorPos(&pt2); + ScreenToClient(m_current->hwnd, &pt2); + GetClientRect(m_current->hwnd, &rc2); + if (PtInRect(&rc2, pt2)) + SendMessage(m_current->hwnd, WM_MOUSEMOVE, 0, MAKELPARAM(pt2.x, pt2.y)); + else + SendMessage(m_current->hwnd, WM_MOUSELEAVE, 0, 0); + } } } @@ -775,7 +802,7 @@ HRESULT CMenuFocusManager::PushMenuBar(CMenuBand * mb) { - DbgPrint("PushMenuBar %p\n", mb); + TRACE("PushMenuBar %p\n", mb); mb->AddRef(); @@ -790,7 +817,7 @@ HRESULT CMenuFocusManager::PushMenuPopup(CMenuBand * mb) { - DbgPrint("PushTrackedPopup %p\n", mb); + TRACE("PushTrackedPopup %p\n", mb); mb->AddRef(); @@ -802,6 +829,8 @@ hr = UpdateFocus(); + m_menuDepth++; + if (m_parent && m_parent->type != TrackedMenuEntry) { m_parent->mb->_SetChildBand(mb); @@ -813,7 +842,7 @@ HRESULT CMenuFocusManager::PushTrackedPopup(HMENU popup) { - DbgPrint("PushTrackedPopup %p\n", popup); + TRACE("PushTrackedPopup %p\n", popup); _ASSERT(m_bandCount > 0); _ASSERT(!m_current || m_current->type != TrackedMenuEntry); @@ -822,7 +851,7 @@ if (FAILED_UNEXPECTEDLY(hr)) return hr; - DbgPrint("PushTrackedPopup %p\n", popup); + TRACE("PushTrackedPopup %p\n", popup); m_selectedMenu = popup; m_selectedItem = -1; m_selectedItemFlags = 0; @@ -836,7 +865,7 @@ CMenuBand * mbc; HRESULT hr; - DbgPrint("PopMenuBar %p\n", mb); + TRACE("PopMenuBar %p\n", mb); if (m_current == m_entryUnderMouse) { @@ -880,12 +909,14 @@ CMenuBand * mbc; HRESULT hr; - DbgPrint("PopMenuPopup %p\n", mb); + TRACE("PopMenuPopup %p\n", mb); if (m_current == m_entryUnderMouse) { m_entryUnderMouse = NULL; } + + m_menuDepth--; hr = PopFromArray(&type, &mbc, NULL); if (FAILED_UNEXPECTEDLY(hr)) @@ -924,7 +955,7 @@ HMENU hmenu; HRESULT hr; - DbgPrint("PopTrackedPopup %p\n", popup); + TRACE("PopTrackedPopup %p\n", popup); hr = PopFromArray(&type, NULL, &hmenu); if (FAILED_UNEXPECTEDLY(hr)) Modified: trunk/reactos/base/shell/rshell/CMenuFocusManager.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMenuFoc… ============================================================================== --- trunk/reactos/base/shell/rshell/CMenuFocusManager.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CMenuFocusManager.h [iso-8859-1] Thu Dec 18 17:34:46 2014 @@ -85,6 +85,7 @@ #define MAX_RECURSE 20 StackEntry m_bandStack[MAX_RECURSE]; int m_bandCount; + int m_menuDepth; HRESULT PushToArray(StackEntryType type, CMenuBand * mb, HMENU hmenu); HRESULT PopFromArray(StackEntryType * pType, CMenuBand ** pMb, HMENU * pHmenu); @@ -110,10 +111,10 @@ HRESULT IsTrackedWindowOrParent(HWND hWnd); void DisableMouseTrack(HWND parent, BOOL disableThis); - void SetCapture(HWND child); + void SetMenuCapture(HWND child); LRESULT ProcessMouseMove(MSG* msg); - LRESULT ProcessMouseDown(MSG* msg); + LRESULT ProcessMouseDown(MSG* msg, BOOL isLButton); LRESULT ProcessMouseUp(MSG* msg); public: HRESULT PushMenuBar(CMenuBand * mb); Modified: trunk/reactos/base/shell/rshell/CMenuToolbars.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMenuToo… ============================================================================== --- trunk/reactos/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] Thu Dec 18 17:34:46 2014 @@ -73,9 +73,6 @@ //return OnHotItemChange(reinterpret_cast<LPNMTBHOTITEM>(hdr), theResult); return S_OK; - case NM_RCLICK: - return OnContextMenu(reinterpret_cast<LPNMMOUSE>(hdr)); - case NM_CUSTOMDRAW: return OnCustomDraw(reinterpret_cast<LPNMTBCUSTOMDRAW>(hdr), theResult); @@ -770,7 +767,7 @@ HRESULT CMenuToolbarBase::BeforeCancelPopup() { m_cancelingPopup = TRUE; - DbgPrint("BeforeCancelPopup\n"); + TRACE("BeforeCancelPopup\n"); return S_OK; } @@ -797,12 +794,29 @@ TRACE("Executing...\n"); - return m_menuBand->_MenuItemHotTrack(MPOS_EXECUTE); -} - -HRESULT CMenuToolbarBase::MenuBarMouseDown(INT iIndex) + return m_menuBand->_MenuItemSelect(MPOS_EXECUTE); +} + +HRESULT CMenuToolbarBase::ProcessContextMenu(INT iItem) +{ + INT index; + DWORD_PTR data; + + GetDataFromId(iItem, &index, &data); + + DWORD pos = GetMessagePos(); + POINT pt = { GET_X_LPARAM(pos), GET_Y_LPARAM(pos) }; + + return InternalContextMenu(iItem, index, data, pt); +} + +HRESULT CMenuToolbarBase::MenuBarMouseDown(INT iIndex, BOOL isLButton) { TBBUTTON btn; + + GetButton(iIndex, &btn); + if (!isLButton) + return ProcessContextMenu(btn.idCommand); if ((m_initFlags & SMINIT_VERTICAL) || m_popupBar @@ -812,23 +826,22 @@ return S_OK; } + return ProcessClick(btn.idCommand); +} + +HRESULT CMenuToolbarBase::MenuBarMouseUp(INT iIndex) +{ + TBBUTTON btn; + + m_cancelingPopup = FALSE; + + if (!(m_initFlags & SMINIT_VERTICAL)) + return S_OK; + GetButton(iIndex, &btn); return ProcessClick(btn.idCommand); } -HRESULT CMenuToolbarBase::MenuBarMouseUp(INT iIndex) -{ - TBBUTTON btn; - - m_cancelingPopup = FALSE; - - if (!(m_initFlags & SMINIT_VERTICAL)) - return S_OK; - - GetButton(iIndex, &btn); - return ProcessClick(btn.idCommand); -} - HRESULT CMenuToolbarBase::PrepareExecuteItem(INT iItem) { this->m_menuBand->_KillPopupTimers(); @@ -840,17 +853,6 @@ HRESULT CMenuToolbarBase::ExecuteItem() { return InternalExecuteItem(m_executeItem, m_executeItem, m_executeData); -} - -HRESULT CMenuToolbarBase::OnContextMenu(NMMOUSE * rclick) -{ - INT iItem = rclick->dwItemSpec; - INT index = rclick->dwHitInfo; - DWORD_PTR data = rclick->dwItemData; - - GetDataFromId(iItem, &index, &data); - - return InternalContextMenu(iItem, index, data, rclick->pt); } HRESULT CMenuToolbarBase::KeyboardItemChange(DWORD dwSelectType) Modified: trunk/reactos/base/shell/rshell/CMenuToolbars.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMenuToo… ============================================================================== --- trunk/reactos/base/shell/rshell/CMenuToolbars.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CMenuToolbars.h [iso-8859-1] Thu Dec 18 17:34:46 2014 @@ -96,9 +96,10 @@ HRESULT KillPopupTimer(); - HRESULT MenuBarMouseDown(INT iIndex); + HRESULT MenuBarMouseDown(INT iIndex, BOOL isLButton); HRESULT MenuBarMouseUp(INT iIndex); HRESULT ProcessClick(INT iItem); + HRESULT ProcessContextMenu(INT iItem); HRESULT BeforeCancelPopup(); protected: @@ -121,7 +122,6 @@ HRESULT UpdateImageLists(); HRESULT OnPagerCalcSize(LPNMPGCALCSIZE csize); - HRESULT OnContextMenu(NMMOUSE * rclick); HRESULT OnCustomDraw(LPNMTBCUSTOMDRAW cdraw, LRESULT * theResult); HRESULT OnGetInfoTip(NMTBGETINFOTIP * tip); Modified: trunk/reactos/base/shell/rshell/ShellDDE.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/ShellDDE… ============================================================================== --- trunk/reactos/base/shell/rshell/ShellDDE.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/ShellDDE.cpp [iso-8859-1] Thu Dec 18 17:34:46 2014 @@ -56,7 +56,7 @@ DdeQueryStringW(dwDDEInst, hszTopic, szTopic, _countof(szTopic), CP_WINUNICODE); DdeQueryStringW(dwDDEInst, hszService, szService, _countof(szService), CP_WINUNICODE); - DbgPrint("Dde_OnConnect: topic=%S, service=%S\n", szTopic, szService); + TRACE("Dde_OnConnect: topic=%S, service=%S\n", szTopic, szService); return TRUE; } @@ -69,7 +69,7 @@ DdeQueryStringW(dwDDEInst, hszTopic, szTopic, _countof(szTopic), CP_WINUNICODE); DdeQueryStringW(dwDDEInst, hszService, szService, _countof(szService), CP_WINUNICODE); - DbgPrint("Dde_OnConnectConfirm: hconv=%p, topic=%S, service=%S\n", hconv, szTopic, szService); + TRACE("Dde_OnConnectConfirm: hconv=%p, topic=%S, service=%S\n", hconv, szTopic, szService); } static BOOL Dde_OnWildConnect(HSZ hszTopic, HSZ hszService) @@ -80,7 +80,7 @@ DdeQueryStringW(dwDDEInst, hszTopic, szTopic, _countof(szTopic), CP_WINUNICODE); DdeQueryStringW(dwDDEInst, hszService, szService, _countof(szService), CP_WINUNICODE); - DbgPrint("Dde_OnWildConnect: topic=%S, service=%S\n", szTopic, szService); + TRACE("Dde_OnWildConnect: topic=%S, service=%S\n", szTopic, szService); return FALSE; } @@ -93,7 +93,7 @@ DdeQueryStringW(dwDDEInst, hszTopic, szTopic, _countof(szTopic), CP_WINUNICODE); DdeQueryStringW(dwDDEInst, hszItem, szItem, _countof(szItem), CP_WINUNICODE); - DbgPrint("Dde_OnRequest: uFmt=%d, hconv=%p, topic=%S, item=%S\n", hconv, szTopic, szItem); + TRACE("Dde_OnRequest: uFmt=%d, hconv=%p, topic=%S, item=%S\n", hconv, szTopic, szItem); return NULL; } @@ -140,7 +140,7 @@ DdeUnaccessData(hdata); - DbgPrint("Dde_OnExecute: hconv=%p, topic=%S, command=%S\n", hconv, szTopic, pszCommand); + TRACE("Dde_OnExecute: hconv=%p, topic=%S, command=%S\n", hconv, szTopic, pszCommand); /* [ViewFolder("%l", %I, %S)] -- Open a folder in standard mode @@ -261,7 +261,7 @@ UnknownParameter = StrToIntW(cmd); } - DbgPrint("Parse end: cmd=%S, S=%d, pidl=%p, path=%S\n", Command, UnknownParameter, IdList, Path); + TRACE("Parse end: cmd=%S, S=%d, pidl=%p, path=%S\n", Command, UnknownParameter, IdList, Path); // Find handler in list for (int i = 0; i < HandlerListLength; i++) @@ -280,7 +280,7 @@ static void Dde_OnDisconnect(HCONV hconv) { - DbgPrint("Dde_OnDisconnect: hconv=%p\n", hconv); + TRACE("Dde_OnDisconnect: hconv=%p\n", hconv); } static HDDEDATA CALLBACK DdeCallback( @@ -312,7 +312,7 @@ case XTYP_REGISTER: return NULL; default: - DbgPrint("DdeCallback: unknown uType=%d\n", uType); + TRACE("DdeCallback: unknown uType=%d\n", uType); return NULL; } } @@ -330,7 +330,7 @@ */ EXTERN_C void WINAPI ShellDDEInit(BOOL bInit) { - DbgPrint("ShellDDEInit bInit = %s\n", bInit ? "TRUE" : "FALSE"); + TRACE("ShellDDEInit bInit = %s\n", bInit ? "TRUE" : "FALSE"); if (bInit && !bInitialized) { Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefView… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] Thu Dec 18 17:34:46 2014 @@ -1898,14 +1898,14 @@ MENUITEMINFOW mii = { 0 }; HMENU hSubmenu = (HMENU) wParam; - DbgPrint("OnInitMenuPopup lParam=%d\n", lParam); + TRACE("OnInitMenuPopup lParam=%d\n", lParam); mii.cbSize = sizeof(mii); mii.fMask = MIIM_ID | MIIM_SUBMENU; if (!GetMenuItemInfoW(this->m_hMenu, lParam, TRUE, &mii)) { - DbgPrint("OnInitMenuPopup GetMenuItemInfoW failed!\n"); + TRACE("OnInitMenuPopup GetMenuItemInfoW failed!\n"); return FALSE; } @@ -1913,11 +1913,11 @@ if (mii.hSubMenu != hSubmenu) { - DbgPrint("OnInitMenuPopup submenu does not match!!!!\n"); + TRACE("OnInitMenuPopup submenu does not match!!!!\n"); return FALSE; } - DbgPrint("OnInitMenuPopup id=%d\n", menuItemId); + TRACE("OnInitMenuPopup id=%d\n", menuItemId); switch (menuItemId) { Modified: trunk/reactos/dll/win32/shell32/CDesktopBrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDesktop… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDesktopBrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDesktopBrowser.cpp [iso-8859-1] Thu Dec 18 17:34:46 2014 @@ -519,7 +519,7 @@ } case WM_EXPLORER_OPEN_NEW_WINDOW: - DbgPrint("Proxy Desktop message 1035 received.\n"); + TRACE("Proxy Desktop message 1035 received.\n"); SHOnCWMCommandLine((HANDLE)lParam); break; Modified: trunk/reactos/dll/win32/shell32/dde.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/dde.cpp?… ============================================================================== --- trunk/reactos/dll/win32/shell32/dde.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/dde.cpp [iso-8859-1] Thu Dec 18 17:34:46 2014 @@ -55,7 +55,7 @@ DdeQueryStringW(dwDDEInst, hszTopic, szTopic, _countof(szTopic), CP_WINUNICODE); DdeQueryStringW(dwDDEInst, hszService, szService, _countof(szService), CP_WINUNICODE); - DbgPrint("Dde_OnConnect: topic=%S, service=%S\n", szTopic, szService); + TRACE("Dde_OnConnect: topic=%S, service=%S\n", szTopic, szService); return TRUE; } @@ -68,7 +68,7 @@ DdeQueryStringW(dwDDEInst, hszTopic, szTopic, _countof(szTopic), CP_WINUNICODE); DdeQueryStringW(dwDDEInst, hszService, szService, _countof(szService), CP_WINUNICODE); - DbgPrint("Dde_OnConnectConfirm: hconv=%p, topic=%S, service=%S\n", hconv, szTopic, szService); + TRACE("Dde_OnConnectConfirm: hconv=%p, topic=%S, service=%S\n", hconv, szTopic, szService); } static BOOL Dde_OnWildConnect(HSZ hszTopic, HSZ hszService) @@ -79,7 +79,7 @@ DdeQueryStringW(dwDDEInst, hszTopic, szTopic, _countof(szTopic), CP_WINUNICODE); DdeQueryStringW(dwDDEInst, hszService, szService, _countof(szService), CP_WINUNICODE); - DbgPrint("Dde_OnWildConnect: topic=%S, service=%S\n", szTopic, szService); + TRACE("Dde_OnWildConnect: topic=%S, service=%S\n", szTopic, szService); return FALSE; } @@ -92,7 +92,7 @@ DdeQueryStringW(dwDDEInst, hszTopic, szTopic, _countof(szTopic), CP_WINUNICODE); DdeQueryStringW(dwDDEInst, hszItem, szItem, _countof(szItem), CP_WINUNICODE); - DbgPrint("Dde_OnRequest: uFmt=%d, hconv=%p, topic=%S, item=%S\n", hconv, szTopic, szItem); + TRACE("Dde_OnRequest: uFmt=%d, hconv=%p, topic=%S, item=%S\n", hconv, szTopic, szItem); return NULL; } @@ -139,7 +139,7 @@ DdeUnaccessData(hdata); - DbgPrint("Dde_OnExecute: hconv=%p, topic=%S, command=%S\n", hconv, szTopic, pszCommand); + TRACE("Dde_OnExecute: hconv=%p, topic=%S, command=%S\n", hconv, szTopic, pszCommand); /* [ViewFolder("%l", %I, %S)] -- Open a folder in standard mode @@ -260,7 +260,7 @@ UnknownParameter = StrToIntW(cmd); } - DbgPrint("Parse end: cmd=%S, S=%d, pidl=%p, path=%S\n", Command, UnknownParameter, IdList, Path); + TRACE("Parse end: cmd=%S, S=%d, pidl=%p, path=%S\n", Command, UnknownParameter, IdList, Path); // Find handler in list for (int i = 0; i < HandlerListLength; i++) @@ -279,7 +279,7 @@ static void Dde_OnDisconnect(HCONV hconv) { - DbgPrint("Dde_OnDisconnect: hconv=%p\n", hconv); + TRACE("Dde_OnDisconnect: hconv=%p\n", hconv); } static HDDEDATA CALLBACK DdeCallback( @@ -311,7 +311,7 @@ case XTYP_REGISTER: return NULL; default: - DbgPrint("DdeCallback: unknown uType=%d\n", uType); + WARN("DdeCallback: unknown uType=%d\n", uType); return NULL; } } @@ -329,7 +329,7 @@ */ EXTERN_C void WINAPI ShellDDEInit(BOOL bInit) { - DbgPrint("ShellDDEInit bInit = %s\n", bInit ? "TRUE" : "FALSE"); + TRACE("ShellDDEInit bInit = %s\n", bInit ? "TRUE" : "FALSE"); if (bInit && !bInitialized) {

9 years, 9 months

[tkreuzer] 65739: [GDI32] - Rename SetRectRgnEx to IntSetRectRgn and make it usermode only - Implement IntSetNullRgn - Improve SetRectRgn code and enable the usermode part

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Dec 18 08:13:14 2014 New Revision: 65739 URL: http://svn.reactos.org/svn/reactos?rev=65739&view=rev Log: [GDI32] - Rename SetRectRgnEx to IntSetRectRgn and make it usermode only - Implement IntSetNullRgn - Improve SetRectRgn code and enable the usermode part Modified: trunk/reactos/win32ss/gdi/gdi32/objects/region.c Modified: trunk/reactos/win32ss/gdi/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/region.c [iso-8859-1] Thu Dec 18 08:13:14 2014 @@ -189,21 +189,36 @@ FORCEINLINE ULONG -SetRectRgnEx( - HRGN hrgn, - PRGN_ATTR prgnattr, - INT xLeft, - INT yTop, - INT xRight, - INT yBottom) -{ - if (!SetRectRgn(hrgn, xLeft, yTop, xRight, yBottom)) - { - return ERROR; - } - - return prgnattr->iComplexity; - +IntSetNullRgn( + _Inout_ PRGN_ATTR prgnattr) +{ + prgnattr->iComplexity = NULLREGION; + prgnattr->AttrFlags |= ATTR_RGN_DIRTY; + return NULLREGION; +} + +FORCEINLINE +ULONG +IntSetRectRgn( + _Inout_ PRGN_ATTR prgnattr, + _In_ INT xLeft, + _In_ INT yTop, + _In_ INT xRight, + _In_ INT yBottom) +{ + ASSERT(xLeft <= xRight); + ASSERT(yTop <= yBottom); + + if ((xLeft == xRight) || (yTop == yBottom)) + return IntSetNullRgn(prgnattr); + + prgnattr->iComplexity = SIMPLEREGION; + prgnattr->Rect.left = xLeft; + prgnattr->Rect.top = yTop; + prgnattr->Rect.right = xRight; + prgnattr->Rect.bottom = yBottom; + prgnattr->AttrFlags |= ATTR_RGN_DIRTY; + return SIMPLEREGION; } /* @@ -240,17 +255,16 @@ if (prngattrSrc1->iComplexity == NULLREGION) { /* The dest region is a NULLREGION, too */ - return SetRectRgn(hrgnDest, 0, 0, 0, 0) ? NULLREGION : ERROR; + return IntSetNullRgn(prngattrDest); } /* We already know that the source region cannot be complex, so create a rect region from the bounds of the source rect */ - return SetRectRgnEx(hrgnDest, - prngattrDest, - prngattrSrc1->Rect.left, - prngattrSrc1->Rect.top, - prngattrSrc1->Rect.right, - prngattrSrc1->Rect.bottom); + return IntSetRectRgn(prngattrDest, + prngattrSrc1->Rect.left, + prngattrSrc1->Rect.top, + prngattrSrc1->Rect.right, + prngattrSrc1->Rect.bottom); } /* For all other operations we need hrgnSrc2 */ @@ -270,23 +284,22 @@ (prngattrSrc2->iComplexity == NULLREGION)) { /* Result is also a NULLREGION */ - return SetRectRgn(hrgnDest, 0, 0, 0, 0) ? NULLREGION : ERROR; + return IntSetNullRgn(prngattrDest); } /* Get the intersection of the 2 rects */ if (!IntersectRect(&rcTemp, &prngattrSrc1->Rect, &prngattrSrc2->Rect)) { /* The rects do not intersect, result is a NULLREGION */ - return SetRectRgn(hrgnDest, 0, 0, 0, 0) ? NULLREGION : ERROR; + return IntSetNullRgn(prngattrDest); } /* Use the intersection of the rects */ - return SetRectRgnEx(hrgnDest, - prngattrDest, - rcTemp.left, - rcTemp.top, - rcTemp.right, - rcTemp.bottom); + return IntSetRectRgn(prngattrDest, + rcTemp.left, + rcTemp.top, + rcTemp.right, + rcTemp.bottom); } /* Handle RGN_DIFF */ @@ -296,7 +309,7 @@ if (prngattrSrc1->iComplexity == NULLREGION) { /* The result is a NULLREGION as well */ - return SetRectRgn(hrgnDest, 0, 0, 0, 0) ? NULLREGION : ERROR; + return IntSetNullRgn(prngattrDest); } /* Get the intersection of the 2 rects */ @@ -304,12 +317,11 @@ !IntersectRect(&rcTemp, &prngattrSrc1->Rect, &prngattrSrc2->Rect)) { /* The rects do not intersect, dest equals source 1 */ - return SetRectRgnEx(hrgnDest, - prngattrDest, - prngattrSrc1->Rect.left, - prngattrSrc1->Rect.top, - prngattrSrc1->Rect.right, - prngattrSrc1->Rect.bottom); + return IntSetRectRgn(prngattrDest, + prngattrSrc1->Rect.left, + prngattrSrc1->Rect.top, + prngattrSrc1->Rect.right, + prngattrSrc1->Rect.bottom); } /* We need to check is whether we can subtract the rects. For that @@ -319,7 +331,7 @@ if (!SubtractRect(&rcTemp, &prngattrSrc1->Rect, &rcTemp)) { /* The result is a NULLREGION */ - return SetRectRgn(hrgnDest, 0, 0, 0, 0) ? NULLREGION : ERROR; + return IntSetNullRgn(prngattrDest); } /* Now check if the result of SubtractRect matches the source 1 rect. @@ -330,12 +342,11 @@ if (!EqualRect(&rcTemp, &prngattrSrc1->Rect)) { /* We got a properly subtracted rect, so use it. */ - return SetRectRgnEx(hrgnDest, - prngattrDest, - rcTemp.left, - rcTemp.top, - rcTemp.right, - rcTemp.bottom); + return IntSetRectRgn(prngattrDest, + rcTemp.left, + rcTemp.top, + rcTemp.right, + rcTemp.bottom); } /* The result would be a complex region, go to win32k */ @@ -352,28 +363,26 @@ if (prngattrSrc2->iComplexity == NULLREGION) { /* Both are NULLREGIONs, result is also a NULLREGION */ - return SetRectRgn(hrgnDest, 0, 0, 0, 0) ? NULLREGION : ERROR; + return IntSetNullRgn(prngattrDest); } /* The result is equal to source 2 */ - return SetRectRgnEx(hrgnDest, - prngattrDest, - prngattrSrc2->Rect.left, - prngattrSrc2->Rect.top, - prngattrSrc2->Rect.right, - prngattrSrc2->Rect.bottom ); + return IntSetRectRgn(prngattrDest, + prngattrSrc2->Rect.left, + prngattrSrc2->Rect.top, + prngattrSrc2->Rect.right, + prngattrSrc2->Rect.bottom ); } /* Check if only source 2 is a NULLREGION */ if (prngattrSrc2->iComplexity == NULLREGION) { /* The result is equal to source 1 */ - return SetRectRgnEx(hrgnDest, - prngattrDest, - prngattrSrc1->Rect.left, - prngattrSrc1->Rect.top, - prngattrSrc1->Rect.right, - prngattrSrc1->Rect.bottom); + return IntSetRectRgn(prngattrDest, + prngattrSrc1->Rect.left, + prngattrSrc1->Rect.top, + prngattrSrc1->Rect.right, + prngattrSrc1->Rect.bottom); } /* Do the rects have the same x extent */ @@ -388,17 +397,16 @@ if (iCombineMode == RGN_OR) { /* The result is equal to source 1 */ - return SetRectRgnEx(hrgnDest, - prngattrDest, - prngattrSrc1->Rect.left, - prngattrSrc1->Rect.top, - prngattrSrc1->Rect.right, - prngattrSrc1->Rect.bottom ); + return IntSetRectRgn(prngattrDest, + prngattrSrc1->Rect.left, + prngattrSrc1->Rect.top, + prngattrSrc1->Rect.right, + prngattrSrc1->Rect.bottom ); } else { /* XORing with itself yields an empty region */ - return SetRectRgn(hrgnDest, 0, 0, 0, 0) ? NULLREGION : ERROR; + return IntSetNullRgn(prngattrDest); } } @@ -414,34 +422,31 @@ if (iCombineMode == RGN_OR) { /* Use the maximum extent of both rects combined */ - return SetRectRgnEx(hrgnDest, - prngattrDest, - prngattrSrc1->Rect.left, - min(prngattrSrc1->Rect.top, prngattrSrc2->Rect.top), - prngattrSrc1->Rect.right, - max(prngattrSrc1->Rect.bottom, prngattrSrc2->Rect.bottom)); + return IntSetRectRgn(prngattrDest, + prngattrSrc1->Rect.left, + min(prngattrSrc1->Rect.top, prngattrSrc2->Rect.top), + prngattrSrc1->Rect.right, + max(prngattrSrc1->Rect.bottom, prngattrSrc2->Rect.bottom)); } /* Check if the rects are adjacent */ if (prngattrSrc2->Rect.bottom == prngattrSrc1->Rect.top) { /* The result is the combined rects */ - return SetRectRgnEx(hrgnDest, - prngattrDest, - prngattrSrc1->Rect.left, - prngattrSrc2->Rect.top, - prngattrSrc1->Rect.right, - prngattrSrc1->Rect.bottom ); + return IntSetRectRgn(prngattrDest, + prngattrSrc1->Rect.left, + prngattrSrc2->Rect.top, + prngattrSrc1->Rect.right, + prngattrSrc1->Rect.bottom ); } else if (prngattrSrc2->Rect.top == prngattrSrc1->Rect.bottom) { /* The result is the combined rects */ - return SetRectRgnEx(hrgnDest, - prngattrDest, - prngattrSrc1->Rect.left, - prngattrSrc1->Rect.top, - prngattrSrc1->Rect.right, - prngattrSrc2->Rect.bottom ); + return IntSetRectRgn(prngattrDest, + prngattrSrc1->Rect.left, + prngattrSrc1->Rect.top, + prngattrSrc1->Rect.right, + prngattrSrc2->Rect.bottom ); } /* When we are here, this is RGN_XOR and the rects overlap */ @@ -464,34 +469,31 @@ if (iCombineMode == RGN_OR) { /* Use the maximum extent of both rects combined */ - return SetRectRgnEx(hrgnDest, - prngattrDest, - min(prngattrSrc1->Rect.left, prngattrSrc2->Rect.left), - prngattrSrc1->Rect.top, - max(prngattrSrc1->Rect.right, prngattrSrc2->Rect.right), - prngattrSrc1->Rect.bottom); + return IntSetRectRgn(prngattrDest, + min(prngattrSrc1->Rect.left, prngattrSrc2->Rect.left), + prngattrSrc1->Rect.top, + max(prngattrSrc1->Rect.right, prngattrSrc2->Rect.right), + prngattrSrc1->Rect.bottom); } /* Check if the rects are adjacent */ if (prngattrSrc2->Rect.right == prngattrSrc1->Rect.left) { /* The result is the combined rects */ - return SetRectRgnEx(hrgnDest, - prngattrDest, - prngattrSrc2->Rect.left, - prngattrSrc1->Rect.top, - prngattrSrc1->Rect.right, - prngattrSrc1->Rect.bottom ); + return IntSetRectRgn(prngattrDest, + prngattrSrc2->Rect.left, + prngattrSrc1->Rect.top, + prngattrSrc1->Rect.right, + prngattrSrc1->Rect.bottom ); } else if (prngattrSrc2->Rect.left == prngattrSrc1->Rect.right) { /* The result is the combined rects */ - return SetRectRgnEx(hrgnDest, - prngattrDest, - prngattrSrc1->Rect.left, - prngattrSrc1->Rect.top, - prngattrSrc2->Rect.right, - prngattrSrc1->Rect.bottom ); + return IntSetRectRgn(prngattrDest, + prngattrSrc1->Rect.left, + prngattrSrc1->Rect.top, + prngattrSrc2->Rect.right, + prngattrSrc1->Rect.bottom ); } /* When we are here, this is RGN_XOR and the rects overlap */ @@ -510,12 +512,11 @@ (prngattrSrc1->Rect.bottom >= prngattrSrc2->Rect.bottom)) { /* Rect 1 contains rect 2, use it */ - return SetRectRgnEx(hrgnDest, - prngattrDest, - prngattrSrc1->Rect.left, - prngattrSrc1->Rect.top, - prngattrSrc1->Rect.right, - prngattrSrc1->Rect.bottom ); + return IntSetRectRgn(prngattrDest, + prngattrSrc1->Rect.left, + prngattrSrc1->Rect.top, + prngattrSrc1->Rect.right, + prngattrSrc1->Rect.bottom ); } } else @@ -526,12 +527,11 @@ (prngattrSrc2->Rect.bottom >= prngattrSrc1->Rect.bottom)) { /* Rect 2 contains rect 1, use it */ - return SetRectRgnEx(hrgnDest, - prngattrDest, - prngattrSrc2->Rect.left, - prngattrSrc2->Rect.top, - prngattrSrc2->Rect.right, - prngattrSrc2->Rect.bottom ); + return IntSetRectRgn(prngattrDest, + prngattrSrc2->Rect.left, + prngattrSrc2->Rect.top, + prngattrSrc2->Rect.right, + prngattrSrc2->Rect.bottom ); } } } @@ -1154,44 +1154,54 @@ */ BOOL WINAPI -SetRectRgn(HRGN hrgn, - int nLeftRect, - int nTopRect, - int nRightRect, - int nBottomRect) -{ - PRGN_ATTR Rgn_Attr; - - //if (!GdiGetHandleUserData((HGDIOBJ) hrgn, GDI_OBJECT_TYPE_REGION, (PVOID) &Rgn_Attr)) - return NtGdiSetRectRgn(hrgn, nLeftRect, nTopRect, nRightRect, nBottomRect); - - if ((nLeftRect == nRightRect) || (nTopRect == nBottomRect)) - { - Rgn_Attr->AttrFlags |= ATTR_RGN_DIRTY; - Rgn_Attr->iComplexity = NULLREGION; - Rgn_Attr->Rect.left = Rgn_Attr->Rect.top = - Rgn_Attr->Rect.right = Rgn_Attr->Rect.bottom = 0; +SetRectRgn( + _In_ HRGN hrgn, + _In_ INT xLeft, + _In_ INT yTop, + _In_ INT xRight, + _In_ INT yBottom) +{ + PRGN_ATTR prngattr; + + /* Try to get the region attribute */ + prngattr = GdiGetRgnAttr(hrgn); + if (prngattr == NULL) + { + return NtGdiSetRectRgn(hrgn, xLeft, yTop, xRight, yBottom); + } + + /* check for NULL region */ + if ((xLeft == xRight) || (yTop == yBottom)) + { + IntSetNullRgn(prngattr); return TRUE; } - Rgn_Attr->Rect.left = nLeftRect; - Rgn_Attr->Rect.top = nTopRect; - Rgn_Attr->Rect.right = nRightRect; - Rgn_Attr->Rect.bottom = nBottomRect; - - if(nLeftRect > nRightRect) - { - Rgn_Attr->Rect.left = nRightRect; - Rgn_Attr->Rect.right = nLeftRect; - } - if(nTopRect > nBottomRect) - { - Rgn_Attr->Rect.top = nBottomRect; - Rgn_Attr->Rect.bottom = nTopRect; - } - - Rgn_Attr->AttrFlags |= ATTR_RGN_DIRTY ; - Rgn_Attr->iComplexity = SIMPLEREGION; + if (xLeft > xRight) + { + prngattr->Rect.left = xRight; + prngattr->Rect.right = xLeft; + } + else + { + prngattr->Rect.left = xLeft; + prngattr->Rect.right = xRight; + } + + if (yTop > yBottom) + { + prngattr->Rect.top = yBottom; + prngattr->Rect.bottom = yTop; + } + else + { + prngattr->Rect.top = yTop; + prngattr->Rect.bottom = yBottom; + } + + prngattr->AttrFlags |= ATTR_RGN_DIRTY ; + prngattr->iComplexity = SIMPLEREGION; + return TRUE; }

9 years, 9 months

[tkreuzer] 65738: [GDI32] Rewrite CombineRgn, enabling full handling in usermode if the resulting region is either a rectangular or a NULL region.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Dec 18 08:13:10 2014 New Revision: 65738 URL: http://svn.reactos.org/svn/reactos?rev=65738&view=rev Log: [GDI32] Rewrite CombineRgn, enabling full handling in usermode if the resulting region is either a rectangular or a NULL region. Modified: trunk/reactos/win32ss/gdi/gdi32/objects/region.c Modified: trunk/reactos/win32ss/gdi/gdi32/objects/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/region.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/region.c [iso-8859-1] Thu Dec 18 08:13:10 2014 @@ -187,215 +187,364 @@ /* FUNCTIONS *****************************************************************/ +FORCEINLINE +ULONG +SetRectRgnEx( + HRGN hrgn, + PRGN_ATTR prgnattr, + INT xLeft, + INT yTop, + INT xRight, + INT yBottom) +{ + if (!SetRectRgn(hrgn, xLeft, yTop, xRight, yBottom)) + { + return ERROR; + } + + return prgnattr->iComplexity; + +} + /* * @implemented */ INT WINAPI -CombineRgn(HRGN hDest, - HRGN hSrc1, - HRGN hSrc2, - INT CombineMode) -{ - PRGN_ATTR pRgn_Attr_Dest = NULL; - PRGN_ATTR pRgn_Attr_Src1 = NULL; - PRGN_ATTR pRgn_Attr_Src2 = NULL; - INT Complexity; - BOOL Ret; - -// HACK - return NtGdiCombineRgn(hDest, hSrc1, hSrc2, CombineMode); - - Ret = GdiGetHandleUserData((HGDIOBJ) hDest, GDI_OBJECT_TYPE_REGION, (PVOID) &pRgn_Attr_Dest); - Ret = GdiGetHandleUserData((HGDIOBJ) hSrc1, GDI_OBJECT_TYPE_REGION, (PVOID) &pRgn_Attr_Src1); - - if ( !Ret || - !pRgn_Attr_Dest || - !pRgn_Attr_Src1 || - pRgn_Attr_Src1->iComplexity > SIMPLEREGION ) - return NtGdiCombineRgn(hDest, hSrc1, hSrc2, CombineMode); - - /* Handle COPY and use only src1. */ - if ( CombineMode == RGN_COPY ) - { - switch (pRgn_Attr_Src1->iComplexity) - { - case NULLREGION: - Ret = SetRectRgn( hDest, 0, 0, 0, 0); - if (Ret) - return NULLREGION; - goto ERROR_Exit; - - case SIMPLEREGION: - Ret = SetRectRgn( hDest, - pRgn_Attr_Src1->Rect.left, - pRgn_Attr_Src1->Rect.top, - pRgn_Attr_Src1->Rect.right, - pRgn_Attr_Src1->Rect.bottom ); - if (Ret) - return SIMPLEREGION; - goto ERROR_Exit; - - case COMPLEXREGION: - default: - return NtGdiCombineRgn(hDest, hSrc1, hSrc2, CombineMode); - } - } - - Ret = GdiGetHandleUserData((HGDIOBJ) hSrc2, GDI_OBJECT_TYPE_REGION, (PVOID) &pRgn_Attr_Src2); - if ( !Ret || - !pRgn_Attr_Src2 || - pRgn_Attr_Src2->iComplexity > SIMPLEREGION ) - return NtGdiCombineRgn(hDest, hSrc1, hSrc2, CombineMode); - - /* All but AND. */ - if ( CombineMode != RGN_AND) - { - if ( CombineMode <= RGN_AND) - { - /* - There might be some type of junk in the call, so go K. - If this becomes a problem, need to setup parameter check at the top. - */ - DPRINT1("Might be junk! CombineMode %d\n",CombineMode); - return NtGdiCombineRgn(hDest, hSrc1, hSrc2, CombineMode); - } - - if ( CombineMode > RGN_XOR) /* Handle DIFF. */ - { - if ( CombineMode != RGN_DIFF) - { - /* Filter check! Well, must be junk?, so go K. */ - DPRINT1("RGN_COPY was handled! CombineMode %d\n",CombineMode); - return NtGdiCombineRgn(hDest, hSrc1, hSrc2, CombineMode); - } - /* Now handle DIFF. */ - if ( pRgn_Attr_Src1->iComplexity == NULLREGION ) - { - if (SetRectRgn( hDest, 0, 0, 0, 0)) - return NULLREGION; - goto ERROR_Exit; - } - - if ( pRgn_Attr_Src2->iComplexity != NULLREGION ) - { - Complexity = ComplexityFromRects( &pRgn_Attr_Src1->Rect, &pRgn_Attr_Src2->Rect); - - if ( Complexity != DIFF_RGN ) +CombineRgn( + _In_ HRGN hrgnDest, + _In_ HRGN hrgnSrc1, + _In_ HRGN hrgnSrc2, + _In_ INT iCombineMode) +{ + PRGN_ATTR prngattrDest = NULL; + PRGN_ATTR prngattrSrc1 = NULL; + PRGN_ATTR prngattrSrc2 = NULL; + RECT rcTemp; + + /* Get the region attribute for dest and source 1 */ + prngattrDest = GdiGetRgnAttr(hrgnDest); + prngattrSrc1 = GdiGetRgnAttr(hrgnSrc1); + + /* If that failed or if the source 1 region is complex, go to win32k */ + if ((prngattrDest == NULL) || (prngattrSrc1 == NULL) || + (prngattrSrc1->iComplexity > SIMPLEREGION)) + { + return NtGdiCombineRgn(hrgnDest, hrgnSrc1, hrgnSrc2, iCombineMode); + } + + /* Handle RGN_COPY first, it needs only hrgnSrc1 */ + if (iCombineMode == RGN_COPY) + { + /* Check if the source region is a NULLREGION */ + if (prngattrSrc1->iComplexity == NULLREGION) + { + /* The dest region is a NULLREGION, too */ + return SetRectRgn(hrgnDest, 0, 0, 0, 0) ? NULLREGION : ERROR; + } + + /* We already know that the source region cannot be complex, so + create a rect region from the bounds of the source rect */ + return SetRectRgnEx(hrgnDest, + prngattrDest, + prngattrSrc1->Rect.left, + prngattrSrc1->Rect.top, + prngattrSrc1->Rect.right, + prngattrSrc1->Rect.bottom); + } + + /* For all other operations we need hrgnSrc2 */ + prngattrSrc2 = GdiGetRgnAttr(hrgnSrc2); + + /* If we got no attribute or the region is complex, go to win32k */ + if ((prngattrSrc2 == NULL) || (prngattrSrc2->iComplexity > SIMPLEREGION)) + { + return NtGdiCombineRgn(hrgnDest, hrgnSrc1, hrgnSrc2, iCombineMode); + } + + /* Handle RGN_AND */ + if (iCombineMode == RGN_AND) + { + /* Check if either of the regions is a NULLREGION */ + if ((prngattrSrc1->iComplexity == NULLREGION) || + (prngattrSrc2->iComplexity == NULLREGION)) + { + /* Result is also a NULLREGION */ + return SetRectRgn(hrgnDest, 0, 0, 0, 0) ? NULLREGION : ERROR; + } + + /* Get the intersection of the 2 rects */ + if (!IntersectRect(&rcTemp, &prngattrSrc1->Rect, &prngattrSrc2->Rect)) + { + /* The rects do not intersect, result is a NULLREGION */ + return SetRectRgn(hrgnDest, 0, 0, 0, 0) ? NULLREGION : ERROR; + } + + /* Use the intersection of the rects */ + return SetRectRgnEx(hrgnDest, + prngattrDest, + rcTemp.left, + rcTemp.top, + rcTemp.right, + rcTemp.bottom); + } + + /* Handle RGN_DIFF */ + if (iCombineMode == RGN_DIFF) + { + /* Check if source 1 is a NULLREGION */ + if (prngattrSrc1->iComplexity == NULLREGION) + { + /* The result is a NULLREGION as well */ + return SetRectRgn(hrgnDest, 0, 0, 0, 0) ? NULLREGION : ERROR; + } + + /* Get the intersection of the 2 rects */ + if ((prngattrSrc2->iComplexity == NULLREGION) || + !IntersectRect(&rcTemp, &prngattrSrc1->Rect, &prngattrSrc2->Rect)) + { + /* The rects do not intersect, dest equals source 1 */ + return SetRectRgnEx(hrgnDest, + prngattrDest, + prngattrSrc1->Rect.left, + prngattrSrc1->Rect.top, + prngattrSrc1->Rect.right, + prngattrSrc1->Rect.bottom); + } + + /* We need to check is whether we can subtract the rects. For that + we call SubtractRect, which will give us the bounding box of the + subtraction. The function returns FALSE if the resulting rect is + empty */ + if (!SubtractRect(&rcTemp, &prngattrSrc1->Rect, &rcTemp)) + { + /* The result is a NULLREGION */ + return SetRectRgn(hrgnDest, 0, 0, 0, 0) ? NULLREGION : ERROR; + } + + /* Now check if the result of SubtractRect matches the source 1 rect. + Since we already know that the rects intersect, the result can + only match the source 1 rect, if it could not be "cut" on either + side, but the overlapping was on a corner, so the new bounding box + equals the previous rect */ + if (!EqualRect(&rcTemp, &prngattrSrc1->Rect)) + { + /* We got a properly subtracted rect, so use it. */ + return SetRectRgnEx(hrgnDest, + prngattrDest, + rcTemp.left, + rcTemp.top, + rcTemp.right, + rcTemp.bottom); + } + + /* The result would be a complex region, go to win32k */ + return NtGdiCombineRgn(hrgnDest, hrgnSrc1, hrgnSrc2, iCombineMode); + } + + /* Handle OR and XOR */ + if ((iCombineMode == RGN_OR) || (iCombineMode == RGN_XOR)) + { + /* Check if source 1 is a NULLREGION */ + if (prngattrSrc1->iComplexity == NULLREGION) + { + /* Check if source 2 is also a NULLREGION */ + if (prngattrSrc2->iComplexity == NULLREGION) + { + /* Both are NULLREGIONs, result is also a NULLREGION */ + return SetRectRgn(hrgnDest, 0, 0, 0, 0) ? NULLREGION : ERROR; + } + + /* The result is equal to source 2 */ + return SetRectRgnEx(hrgnDest, + prngattrDest, + prngattrSrc2->Rect.left, + prngattrSrc2->Rect.top, + prngattrSrc2->Rect.right, + prngattrSrc2->Rect.bottom ); + } + + /* Check if only source 2 is a NULLREGION */ + if (prngattrSrc2->iComplexity == NULLREGION) + { + /* The result is equal to source 1 */ + return SetRectRgnEx(hrgnDest, + prngattrDest, + prngattrSrc1->Rect.left, + prngattrSrc1->Rect.top, + prngattrSrc1->Rect.right, + prngattrSrc1->Rect.bottom); + } + + /* Do the rects have the same x extent */ + if ((prngattrSrc1->Rect.left == prngattrSrc2->Rect.left) && + (prngattrSrc1->Rect.right == prngattrSrc2->Rect.right)) + { + /* Do the rects also have the same y extent */ + if ((prngattrSrc1->Rect.top == prngattrSrc2->Rect.top) && + (prngattrSrc1->Rect.bottom == prngattrSrc2->Rect.bottom)) + { + /* Rects are equal, if this is RGN_OR, the result is source 1 */ + if (iCombineMode == RGN_OR) { - if ( Complexity != INVERTED_RGN) - /* If same or overlapping and norm just go K. */ - return NtGdiCombineRgn(hDest, hSrc1, hSrc2, CombineMode); - - if (SetRectRgn( hDest, 0, 0, 0, 0)) - return NULLREGION; - goto ERROR_Exit; + /* The result is equal to source 1 */ + return SetRectRgnEx(hrgnDest, + prngattrDest, + prngattrSrc1->Rect.left, + prngattrSrc1->Rect.top, + prngattrSrc1->Rect.right, + prngattrSrc1->Rect.bottom ); } - } - } - else /* Handle OR or XOR. */ - { - if ( pRgn_Attr_Src1->iComplexity == NULLREGION ) - { - if ( pRgn_Attr_Src2->iComplexity != NULLREGION ) + else { - /* Src1 null and not NULL, set from src2. */ - Ret = SetRectRgn( hDest, - pRgn_Attr_Src2->Rect.left, - pRgn_Attr_Src2->Rect.top, - pRgn_Attr_Src2->Rect.right, - pRgn_Attr_Src2->Rect.bottom ); - if (Ret) - return SIMPLEREGION; - goto ERROR_Exit; + /* XORing with itself yields an empty region */ + return SetRectRgn(hrgnDest, 0, 0, 0, 0) ? NULLREGION : ERROR; } - /* Both are NULL. */ - if (SetRectRgn( hDest, 0, 0, 0, 0)) - return NULLREGION; - goto ERROR_Exit; - } - /* Src1 is not NULL. */ - if ( pRgn_Attr_Src2->iComplexity != NULLREGION ) - { - if ( CombineMode != RGN_OR ) /* Filter XOR, so go K. */ - return NtGdiCombineRgn(hDest, hSrc1, hSrc2, CombineMode); - - Complexity = ComplexityFromRects( &pRgn_Attr_Src1->Rect, &pRgn_Attr_Src2->Rect); - /* If inverted use Src2. */ - if ( Complexity == INVERTED_RGN) + } + + /* Check if the rects are disjoint */ + if ((prngattrSrc2->Rect.bottom < prngattrSrc1->Rect.top) || + (prngattrSrc2->Rect.top > prngattrSrc1->Rect.bottom)) + { + /* The result would be a complex region, go to win32k */ + return NtGdiCombineRgn(hrgnDest, hrgnSrc1, hrgnSrc2, iCombineMode); + } + + /* Check if this is OR */ + if (iCombineMode == RGN_OR) + { + /* Use the maximum extent of both rects combined */ + return SetRectRgnEx(hrgnDest, + prngattrDest, + prngattrSrc1->Rect.left, + min(prngattrSrc1->Rect.top, prngattrSrc2->Rect.top), + prngattrSrc1->Rect.right, + max(prngattrSrc1->Rect.bottom, prngattrSrc2->Rect.bottom)); + } + + /* Check if the rects are adjacent */ + if (prngattrSrc2->Rect.bottom == prngattrSrc1->Rect.top) + { + /* The result is the combined rects */ + return SetRectRgnEx(hrgnDest, + prngattrDest, + prngattrSrc1->Rect.left, + prngattrSrc2->Rect.top, + prngattrSrc1->Rect.right, + prngattrSrc1->Rect.bottom ); + } + else if (prngattrSrc2->Rect.top == prngattrSrc1->Rect.bottom) + { + /* The result is the combined rects */ + return SetRectRgnEx(hrgnDest, + prngattrDest, + prngattrSrc1->Rect.left, + prngattrSrc1->Rect.top, + prngattrSrc1->Rect.right, + prngattrSrc2->Rect.bottom ); + } + + /* When we are here, this is RGN_XOR and the rects overlap */ + return NtGdiCombineRgn(hrgnDest, hrgnSrc1, hrgnSrc2, iCombineMode); + } + + /* Do the rects have the same y extent */ + if ((prngattrSrc1->Rect.top == prngattrSrc2->Rect.top) && + (prngattrSrc1->Rect.bottom == prngattrSrc2->Rect.bottom)) + { + /* Check if the rects are disjoint */ + if ((prngattrSrc2->Rect.right < prngattrSrc1->Rect.left) || + (prngattrSrc2->Rect.left > prngattrSrc1->Rect.right)) + { + /* The result would be a complex region, go to win32k */ + return NtGdiCombineRgn(hrgnDest, hrgnSrc1, hrgnSrc2, iCombineMode); + } + + /* Check if this is OR */ + if (iCombineMode == RGN_OR) + { + /* Use the maximum extent of both rects combined */ + return SetRectRgnEx(hrgnDest, + prngattrDest, + min(prngattrSrc1->Rect.left, prngattrSrc2->Rect.left), + prngattrSrc1->Rect.top, + max(prngattrSrc1->Rect.right, prngattrSrc2->Rect.right), + prngattrSrc1->Rect.bottom); + } + + /* Check if the rects are adjacent */ + if (prngattrSrc2->Rect.right == prngattrSrc1->Rect.left) + { + /* The result is the combined rects */ + return SetRectRgnEx(hrgnDest, + prngattrDest, + prngattrSrc2->Rect.left, + prngattrSrc1->Rect.top, + prngattrSrc1->Rect.right, + prngattrSrc1->Rect.bottom ); + } + else if (prngattrSrc2->Rect.left == prngattrSrc1->Rect.right) + { + /* The result is the combined rects */ + return SetRectRgnEx(hrgnDest, + prngattrDest, + prngattrSrc1->Rect.left, + prngattrSrc1->Rect.top, + prngattrSrc2->Rect.right, + prngattrSrc1->Rect.bottom ); + } + + /* When we are here, this is RGN_XOR and the rects overlap */ + return NtGdiCombineRgn(hrgnDest, hrgnSrc1, hrgnSrc2, iCombineMode); + } + + /* Last case: RGN_OR and one rect is completely within the other */ + if (iCombineMode == RGN_OR) + { + /* Check if rect 1 can contain rect 2 */ + if (prngattrSrc1->Rect.left <= prngattrSrc2->Rect.left) + { + /* rect 1 might be the outer one, check of that is true */ + if ((prngattrSrc1->Rect.right >= prngattrSrc2->Rect.right) && + (prngattrSrc1->Rect.top <= prngattrSrc2->Rect.top) && + (prngattrSrc1->Rect.bottom >= prngattrSrc2->Rect.bottom)) { - Ret = SetRectRgn( hDest, - pRgn_Attr_Src2->Rect.left, - pRgn_Attr_Src2->Rect.top, - pRgn_Attr_Src2->Rect.right, - pRgn_Attr_Src2->Rect.bottom ); - if (Ret) - return SIMPLEREGION; - goto ERROR_Exit; + /* Rect 1 contains rect 2, use it */ + return SetRectRgnEx(hrgnDest, + prngattrDest, + prngattrSrc1->Rect.left, + prngattrSrc1->Rect.top, + prngattrSrc1->Rect.right, + prngattrSrc1->Rect.bottom ); } - /* Not NULL or overlapping or differentiated, go to K. */ - if ( Complexity != SAME_RGN) - return NtGdiCombineRgn(hDest, hSrc1, hSrc2, CombineMode); - /* If same, just fall through. */ - } - } - Ret = SetRectRgn( hDest, - pRgn_Attr_Src1->Rect.left, - pRgn_Attr_Src1->Rect.top, - pRgn_Attr_Src1->Rect.right, - pRgn_Attr_Src1->Rect.bottom ); - if (Ret) - return SIMPLEREGION; - goto ERROR_Exit; - } - - /* Handle AND. */ - if ( pRgn_Attr_Src1->iComplexity != NULLREGION && - pRgn_Attr_Src2->iComplexity != NULLREGION ) - { - Complexity = ComplexityFromRects( &pRgn_Attr_Src1->Rect, &pRgn_Attr_Src2->Rect); - - if ( Complexity == DIFF_RGN ) /* Differentiated in anyway just NULL rgn. */ - { - if (SetRectRgn( hDest, 0, 0, 0, 0)) - return NULLREGION; - goto ERROR_Exit; - } - - if ( Complexity != INVERTED_RGN) /* Not inverted and overlapping. */ - { - if ( Complexity != SAME_RGN) /* Must be norm and overlapping. */ - return NtGdiCombineRgn(hDest, hSrc1, hSrc2, CombineMode); - /* Merge from src2. */ - Ret = SetRectRgn( hDest, - pRgn_Attr_Src2->Rect.left, - pRgn_Attr_Src2->Rect.top, - pRgn_Attr_Src2->Rect.right, - pRgn_Attr_Src2->Rect.bottom ); - if (Ret) - return SIMPLEREGION; - goto ERROR_Exit; - } - /* Inverted so merge from src1. */ - Ret = SetRectRgn( hDest, - pRgn_Attr_Src1->Rect.left, - pRgn_Attr_Src1->Rect.top, - pRgn_Attr_Src1->Rect.right, - pRgn_Attr_Src1->Rect.bottom ); - if (Ret) - return SIMPLEREGION; - goto ERROR_Exit; - } - - /* It's all NULL! */ - if (SetRectRgn( hDest, 0, 0, 0, 0)) - return NULLREGION; - -ERROR_Exit: - /* Even on error the flag is set dirty and force server side to redraw. */ - pRgn_Attr_Dest->AttrFlags |= ATTR_RGN_DIRTY; + } + else + { + /* rect 2 might be the outer one, check of that is true */ + if ((prngattrSrc2->Rect.right >= prngattrSrc1->Rect.right) && + (prngattrSrc2->Rect.top <= prngattrSrc1->Rect.top) && + (prngattrSrc2->Rect.bottom >= prngattrSrc1->Rect.bottom)) + { + /* Rect 2 contains rect 1, use it */ + return SetRectRgnEx(hrgnDest, + prngattrDest, + prngattrSrc2->Rect.left, + prngattrSrc2->Rect.top, + prngattrSrc2->Rect.right, + prngattrSrc2->Rect.bottom ); + } + } + } + + /* We couldn't handle the operation, go to win32k */ + return NtGdiCombineRgn(hrgnDest, hrgnSrc1, hrgnSrc2, iCombineMode); + } + + DPRINT1("Invalid iCombineMode %d\n", iCombineMode); + SetLastError(ERROR_INVALID_PARAMETER); return ERROR; } + /* * @implemented @@ -670,7 +819,7 @@ } else { - Ret = pDc_Attr->VisRectRegion.iComplexity; + Ret = pDc_Attr->VisRectRegion.Flags; pgO->fnMode |= 0x80000000; // Set no hrgn mode. } pTeb->GdiTebBatch.Offset += sizeof(GDIBSEXTSELCLPRGN);

9 years, 9 months

[tkreuzer] 65737: [WIN32K] Fix REGION_vSyncRegion and RGNOBJAPI_Unlock to actually make sense

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Dec 18 08:13:06 2014 New Revision: 65737 URL: http://svn.reactos.org/svn/reactos?rev=65737&view=rev Log: [WIN32K] Fix REGION_vSyncRegion and RGNOBJAPI_Unlock to actually make sense Modified: trunk/reactos/win32ss/gdi/ntgdi/region.c Modified: trunk/reactos/win32ss/gdi/ntgdi/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/region.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] Thu Dec 18 08:13:06 2014 @@ -2274,51 +2274,47 @@ return prgn; } +static VOID -NTAPI REGION_vSyncRegion( - PREGION pRgn) -{ - PRGN_ATTR pRgn_Attr = NULL; - - if (pRgn && pRgn->prgnattr != &pRgn->rgnattr) - { - pRgn_Attr = GDIOBJ_pvGetObjectAttr(&pRgn->BaseObject); - - if ( pRgn_Attr ) - { - _SEH2_TRY - { - if ( !(pRgn_Attr->AttrFlags & ATTR_CACHED) ) - { - if ( pRgn_Attr->AttrFlags & (ATTR_RGN_VALID|ATTR_RGN_DIRTY) ) - { - switch (pRgn_Attr->iComplexity) - { - case NULLREGION: - EMPTY_REGION( pRgn ); - break; - - case SIMPLEREGION: - REGION_SetRectRgn( pRgn, - pRgn_Attr->Rect.left, - pRgn_Attr->Rect.top, - pRgn_Attr->Rect.right, - pRgn_Attr->Rect.bottom ); - break; - } - pRgn_Attr->AttrFlags &= ~ATTR_RGN_DIRTY; - } - } - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - (VOID)0; - } - _SEH2_END; - } - } - + PREGION prgn) +{ + PRGN_ATTR prgnattr; + + NT_ASSERT(prgn != NULL); + NT_ASSERT(prgn->prgnattr != NULL); + NT_ASSERT((prgn->prgnattr == &prgn->rgnattr) || + (prgn->prgnattr->AttrFlags & ATTR_RGN_VALID)); + + /* Get the region attribute and check if it's dirty (modified) */ + prgnattr = prgn->prgnattr; + if (prgnattr->AttrFlags & ATTR_RGN_DIRTY) + { + NT_ASSERT(GreGetObjectOwner(prgn->BaseObject.hHmgr) == GDI_OBJ_HMGR_POWNED); + NT_ASSERT(prgnattr != &prgn->rgnattr); + + if (prgnattr->iComplexity == NULLREGION) + { + EMPTY_REGION(prgn); + } + else if (prgnattr->iComplexity == SIMPLEREGION) + { + REGION_SetRectRgn(prgn, + prgnattr->Rect.left, + prgnattr->Rect.top, + prgnattr->Rect.right, + prgnattr->Rect.bottom); + } + else + { + /* Should not happen, region attribute is corrupted! */ + DPRINT1("Region attribute is corrupted, ignoring\n"); + NT_ASSERT(FALSE); + } + } + + /* Reset the flags */ + prgnattr->AttrFlags &= ~(ATTR_RGN_DIRTY | ATTR_RGN_VALID); } PREGION @@ -2344,35 +2340,27 @@ VOID FASTCALL RGNOBJAPI_Unlock( - PREGION pRgn) -{ - PRGN_ATTR pRgn_Attr; - - if (pRgn && GreGetObjectOwner(pRgn->BaseObject.hHmgr) == GDI_OBJ_HMGR_POWNED) - { - pRgn_Attr = GDIOBJ_pvGetObjectAttr(&pRgn->BaseObject); - - if ( pRgn_Attr ) - { - _SEH2_TRY - { - if ( pRgn_Attr->AttrFlags & ATTR_RGN_VALID ) - { - pRgn_Attr->iComplexity = REGION_Complexity( pRgn ); - pRgn_Attr->Rect.left = pRgn->rdh.rcBound.left; - pRgn_Attr->Rect.top = pRgn->rdh.rcBound.top; - pRgn_Attr->Rect.right = pRgn->rdh.rcBound.right; - pRgn_Attr->Rect.bottom = pRgn->rdh.rcBound.bottom; - } - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - (VOID)0; - } - _SEH2_END; - } - } - REGION_UnlockRgn(pRgn); + PREGION prgn) +{ + PRGN_ATTR prgnattr; + + NT_ASSERT(prgn != NULL); + NT_ASSERT(prgn->prgnattr != NULL); + + /* Get the region attribute and check if it's user mode */ + prgnattr = prgn->prgnattr; + if (prgnattr != &prgn->rgnattr) + { + NT_ASSERT(GreGetObjectOwner(prgn->BaseObject.hHmgr) == GDI_OBJ_HMGR_POWNED); + prgnattr->iComplexity = REGION_Complexity(prgn); + prgnattr->Rect.left = prgn->rdh.rcBound.left; + prgnattr->Rect.top = prgn->rdh.rcBound.top; + prgnattr->Rect.right = prgn->rdh.rcBound.right; + prgnattr->Rect.bottom = prgn->rdh.rcBound.bottom; + prgnattr->AttrFlags |= ATTR_RGN_VALID; + } + + REGION_UnlockRgn(prgn); } /* @@ -2403,6 +2391,7 @@ /* Initialize it */ prgn->Buffer = &prgn->rdh.rcBound; prgn->prgnattr = &prgn->rgnattr; + prgn->prgnattr->AttrFlags = ATTR_RGN_VALID; REGION_SetRectRgn(prgn, LeftRect, TopRect, RightRect, BottomRect); return prgn; @@ -3522,19 +3511,19 @@ /* HACK: Sync usermode attributes */ REGION_vSyncRegion(aprgn[0]); - REGION_vSyncRegion(aprgn[1]); - if (aprgn[2]) REGION_vSyncRegion(aprgn[2]); + if (aprgn[1] != aprgn[0]) + REGION_vSyncRegion(aprgn[1]); + if ((aprgn[2] != NULL) && (aprgn[2] != aprgn[0]) && (aprgn[2] != aprgn[1])) + REGION_vSyncRegion(aprgn[2]); /* Call the internal function */ iResult = IntGdiCombineRgn(aprgn[0], aprgn[1], aprgn[2], iMode); - /// FIXME: need to sync user attr back - - /* Cleanup and return */ - REGION_UnlockRgn(aprgn[0]); - REGION_UnlockRgn(aprgn[1]); - if (aprgn[2]) - REGION_UnlockRgn(aprgn[2]); + /* Unlock and return */ + RGNOBJAPI_Unlock(aprgn[0]); + RGNOBJAPI_Unlock(aprgn[1]); + if (aprgn[2] != NULL) + RGNOBJAPI_Unlock(aprgn[2]); return iResult; }

9 years, 9 months

[tkreuzer] 65736: [USER32] Fix copy-paste-bug in SubtractRect

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Dec 18 08:13:01 2014 New Revision: 65736 URL: http://svn.reactos.org/svn/reactos?rev=65736&view=rev Log: [USER32] Fix copy-paste-bug in SubtractRect Modified: trunk/reactos/win32ss/user/user32/windows/rect.c Modified: trunk/reactos/win32ss/user/user32/windows/rect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/rect.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/rect.c [iso-8859-1] Thu Dec 18 08:13:01 2014 @@ -218,8 +218,8 @@ { if(lprcDst->top == tempRect.top) lprcDst->top = tempRect.bottom; - else if(lprcDst->right == tempRect.right) - lprcDst->right = tempRect.left; + else if(lprcDst->bottom == tempRect.bottom) + lprcDst->bottom = tempRect.top; } return(TRUE);

9 years, 9 months

[tkreuzer] 65735: [WIN32K] - Rename xmemcheck to REGION_bGrowBufferSize - Implement REGION_bEnsureBufferSize and REGION_vAddRect helper functions - Replace MERGERECT macro with REGION_bMergeRect in...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Dec 18 08:12:55 2014 New Revision: 65735 URL: http://svn.reactos.org/svn/reactos?rev=65735&view=rev Log: [WIN32K] - Rename xmemcheck to REGION_bGrowBufferSize - Implement REGION_bEnsureBufferSize and REGION_vAddRect helper functions - Replace MERGERECT macro with REGION_bMergeRect inline function Modified: trunk/reactos/win32ss/gdi/ntgdi/region.c Modified: trunk/reactos/win32ss/gdi/ntgdi/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/region.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] Thu Dec 18 08:12:55 2014 @@ -405,43 +405,109 @@ #define LARGE_COORDINATE 0x7fffffff /* FIXME */ #define SMALL_COORDINATE 0x80000000 -/* - * Check to see if there is enough memory in the present region. - */ -static __inline INT xmemcheck(PREGION reg, PRECTL *rect, PRECTL *firstrect) -{ - if ((reg->rdh.nCount+1) * sizeof(RECT) >= reg->rdh.nRgnSize) - { - PRECTL temp; - DWORD NewSize = 2 * reg->rdh.nRgnSize; - - if (NewSize < (reg->rdh.nCount + 1) * sizeof(RECT)) - { - NewSize = (reg->rdh.nCount + 1) * sizeof(RECT); - } - - temp = ExAllocatePoolWithTag(PagedPool, NewSize, TAG_REGION); - if (temp == NULL) - { - return 0; - } - - /* Copy the rectangles */ - COPY_RECTS(temp, *firstrect, reg->rdh.nCount); - - reg->rdh.nRgnSize = NewSize; - if (*firstrect != &reg->rdh.rcBound) - { - ExFreePoolWithTag(*firstrect, TAG_REGION); - } - - *firstrect = temp; - *rect = (*firstrect) + reg->rdh.nCount; - } - return 1; -} - -#define MEMCHECK(reg, rect, firstrect) xmemcheck(reg,&(rect),(PRECTL *)&(firstrect)) +static +BOOL +REGION_bGrowBufferSize( + _Inout_ PREGION prgn, + _In_ UINT cRects) +{ + ULONG cjNewSize; + PVOID pvBuffer; + NT_ASSERT(cRects > 0); + + /* Make sure we don't overflow */ + if (cRects > MAXULONG / sizeof(RECTL)) + { + return FALSE; + } + + /* Calculate new buffer size */ + cjNewSize = cRects * sizeof(RECTL); + + /* Avoid allocating too often, by duplicating the old buffer size + Note: we don't do an overflow check, since the old size will never + get that large before running out of memory. */ + if (2 * prgn->rdh.nRgnSize > cjNewSize) + { + cjNewSize = 2 * prgn->rdh.nRgnSize; + } + + /* Allocate the new buffer */ + pvBuffer = ExAllocatePoolWithTag(PagedPool, cjNewSize, TAG_REGION); + if (pvBuffer == NULL) + { + return FALSE; + } + + /* Copy the rects into the new buffer */ + COPY_RECTS(pvBuffer, prgn->Buffer, prgn->rdh.nCount); + + /* Free the old buffer */ + if (prgn->Buffer != &prgn->rdh.rcBound) + { + ExFreePoolWithTag(prgn->Buffer, TAG_REGION); + } + + /* Set the new buffer */ + prgn->Buffer = pvBuffer; + prgn->rdh.nRgnSize = cjNewSize; + + return TRUE; +} + +static __inline +BOOL +REGION_bEnsureBufferSize( + _Inout_ PREGION prgn, + _In_ UINT cRects) +{ + /* Check if the current region size is too small */ + if (cRects > prgn->rdh.nRgnSize / sizeof(RECTL)) + { + /* Allocate a new buffer */ + return REGION_bGrowBufferSize(prgn, cRects); + } + + return TRUE; +} + +FORCEINLINE +VOID +REGION_vAddRect( + _Inout_ PREGION prgn, + _In_ LONG left, + _In_ LONG top, + _In_ LONG right, + _In_ LONG bottom) +{ + PRECTL prcl; + NT_ASSERT((prgn->rdh.nCount + 1) * sizeof(RECT) <= prgn->rdh.nRgnSize); + + prcl = &prgn->Buffer[prgn->rdh.nCount]; + prcl->left = left; + prcl->top = top; + prcl->right = right; + prcl->bottom = bottom; + prgn->rdh.nCount++; +} + +static __inline +BOOL +REGION_bAddRect( + _Inout_ PREGION prgn, + _In_ LONG left, + _In_ LONG top, + _In_ LONG right, + _In_ LONG bottom) +{ + if (!REGION_bEnsureBufferSize(prgn, prgn->rdh.nCount + 1)) + { + return FALSE; + } + + REGION_vAddRect(prgn, left, top, right, bottom); + return TRUE; +} typedef VOID (FASTCALL *overlapProcp)(PREGION, PRECT, PRECT, PRECT, PRECT, INT, INT); typedef VOID (FASTCALL *nonOverlapProcp)(PREGION, PRECT, PRECT, INT, INT); @@ -1180,10 +1246,7 @@ INT top, INT bottom) { - INT left, right; - RECTL *pNextRect; - - pNextRect = pReg->Buffer + pReg->rdh.nCount; + INT left, right; while ((r1 != r1End) && (r2 != r2End)) { @@ -1197,13 +1260,10 @@ * right next to each other. Since that should never happen... */ if (left < right) { - MEMCHECK(pReg, pNextRect, pReg->Buffer); - pNextRect->left = left; - pNextRect->top = top; - pNextRect->right = right; - pNextRect->bottom = bottom; - pReg->rdh.nCount += 1; - pNextRect++; + if (!REGION_bAddRect(pReg, left, top, right, bottom)) + { + return; + } } /* Need to advance the pointers. Shift the one that extends @@ -1290,23 +1350,52 @@ INT top, INT bottom) { - RECTL *pNextRect; - - pNextRect = pReg->Buffer + pReg->rdh.nCount; - - while (r != rEnd) - { - MEMCHECK(pReg, pNextRect, pReg->Buffer); - pNextRect->left = r->left; - pNextRect->top = top; - pNextRect->right = r->right; - pNextRect->bottom = bottom; - pReg->rdh.nCount += 1; - pNextRect++; - r++; + if (r != rEnd) + { + if (!REGION_bEnsureBufferSize(pReg, pReg->rdh.nCount + (rEnd - r))) + { + return; + } + + do + { + REGION_vAddRect(pReg, r->left, top, r->right, bottom); + r++; + } + while (r != rEnd); } return; +} + +static __inline +BOOL +REGION_bMergeRect( + _Inout_ PREGION prgn, + _In_ LONG left, + _In_ LONG top, + _In_ LONG right, + _In_ LONG bottom) +{ + if ((prgn->rdh.nCount != 0) && + (prgn->Buffer[prgn->rdh.nCount - 1].top == top) && + (prgn->Buffer[prgn->rdh.nCount - 1].bottom == bottom) && + (prgn->Buffer[prgn->rdh.nCount - 1].right >= left)) + { + if (prgn->Buffer[prgn->rdh.nCount - 1].right < right) + { + prgn->Buffer[prgn->rdh.nCount - 1].right = right; + } + } + else + { + if (!REGION_bAddRect(prgn, left, top, right, bottom)) + { + return FALSE; + } + } + + return TRUE; } /*! @@ -1333,42 +1422,17 @@ INT top, INT bottom) { - RECTL *pNextRect; - - pNextRect = pReg->Buffer + pReg->rdh.nCount; - -#define MERGERECT(r) \ - if ((pReg->rdh.nCount != 0) && \ - ((pNextRect-1)->top == top) && \ - ((pNextRect-1)->bottom == bottom) && \ - ((pNextRect-1)->right >= r->left)) \ - { \ - if ((pNextRect-1)->right < r->right) \ - { \ - (pNextRect-1)->right = r->right; \ - } \ - } \ - else \ - { \ - MEMCHECK(pReg, pNextRect, pReg->Buffer); \ - pNextRect->top = top; \ - pNextRect->bottom = bottom; \ - pNextRect->left = r->left; \ - pNextRect->right = r->right; \ - pReg->rdh.nCount += 1; \ - pNextRect += 1; \ - } \ - r++; - while ((r1 != r1End) && (r2 != r2End)) { if (r1->left < r2->left) { - MERGERECT(r1); + REGION_bMergeRect(pReg, r1->left, top, r1->right, bottom); + r1++; } else { - MERGERECT(r2); + REGION_bMergeRect(pReg, r2->left, top, r2->right, bottom); + r2++; } } @@ -1376,7 +1440,8 @@ { do { - MERGERECT(r1); + REGION_bMergeRect(pReg, r1->left, top, r1->right, bottom); + r1++; } while (r1 != r1End); } @@ -1384,7 +1449,8 @@ { while (r2 != r2End) { - MERGERECT(r2); + REGION_bMergeRect(pReg, r2->left, top, r2->right, bottom); + r2++; } } @@ -1497,20 +1563,19 @@ INT top, INT bottom) { - RECTL *pNextRect; - - pNextRect = pReg->Buffer + pReg->rdh.nCount; - - while (r != rEnd) - { - MEMCHECK(pReg, pNextRect, pReg->Buffer); - pNextRect->left = r->left; - pNextRect->top = top; - pNextRect->right = r->right; - pNextRect->bottom = bottom; - pReg->rdh.nCount += 1; - pNextRect++; - r++; + if (r != rEnd) + { + if (!REGION_bEnsureBufferSize(pReg, pReg->rdh.nCount + (rEnd - r))) + { + return; + } + + do + { + REGION_vAddRect(pReg, r->left, top, r->right, bottom); + r++; + } + while (r != rEnd); } return; @@ -1540,11 +1605,9 @@ INT top, INT bottom) { - RECTL *pNextRect; INT left; left = r1->left; - pNextRect = pReg->Buffer + pReg->rdh.nCount; while ((r1 != r1End) && (r2 != r2End)) { @@ -1576,13 +1639,11 @@ { /* Left part of subtrahend covers part of minuend: add uncovered * part of minuend to region and skip to next subtrahend. */ - MEMCHECK(pReg, pNextRect, pReg->Buffer); - pNextRect->left = left; - pNextRect->top = top; - pNextRect->right = r2->left; - pNextRect->bottom = bottom; - pReg->rdh.nCount += 1; - pNextRect++; + if (!REGION_bAddRect(pReg, left, top, r2->left, bottom)) + { + return; + } + left = r2->right; if (left >= r1->right) { @@ -1602,13 +1663,10 @@ /* Minuend used up: add any remaining piece before advancing. */ if (r1->right > left) { - MEMCHECK(pReg, pNextRect, pReg->Buffer); - pNextRect->left = left; - pNextRect->top = top; - pNextRect->right = r1->right; - pNextRect->bottom = bottom; - pReg->rdh.nCount += 1; - pNextRect++; + if (!REGION_bAddRect(pReg, left, top, r1->right, bottom)) + { + return; + } } r1++; @@ -1617,21 +1675,25 @@ } } - /* Add remaining minuend rectangles to region. */ - while (r1 != r1End) - { - MEMCHECK(pReg, pNextRect, pReg->Buffer); - pNextRect->left = left; - pNextRect->top = top; - pNextRect->right = r1->right; - pNextRect->bottom = bottom; - pReg->rdh.nCount += 1; - pNextRect++; - r1++; - if (r1 != r1End) - { - left = r1->left; - } + /* Make sure the buffer is large enough for all remaining operations */ + if (r1 != r1End) + { + if (!REGION_bEnsureBufferSize(pReg, pReg->rdh.nCount + (r1End - r1))) + { + return; + } + + /* Add remaining minuend rectangles to region. */ + do + { + REGION_vAddRect(pReg, left, top, r1->right, bottom); + r1++; + if (r1 != r1End) + { + left = r1->left; + } + } + while (r1 != r1End); } return;

9 years, 9 months

[tkreuzer] 65734: [WIN32K] Improve REGION_bMakeFrameRegion and REGION_bMakeSimpleFrameRgn

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Dec 18 08:12:51 2014 New Revision: 65734 URL: http://svn.reactos.org/svn/reactos?rev=65734&view=rev Log: [WIN32K] Improve REGION_bMakeFrameRegion and REGION_bMakeSimpleFrameRgn Modified: trunk/reactos/win32ss/gdi/ntgdi/region.c Modified: trunk/reactos/win32ss/gdi/ntgdi/region.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/region.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] Thu Dec 18 08:12:51 2014 @@ -1759,80 +1759,92 @@ return REGION_Complexity(prgnDest); } +static BOOL -FASTCALL -REGION_CreateSimpleFrameRgn( - PREGION rgn, - INT x, - INT y) -{ - RECTL rc[4]; - PRECTL prc; - - if ((x != 0) || (y != 0)) - { - prc = rc; - - if ((rgn->rdh.rcBound.bottom - rgn->rdh.rcBound.top > y * 2) && - (rgn->rdh.rcBound.right - rgn->rdh.rcBound.left > x * 2)) - { - if (y != 0) - { - /* Top rectangle */ - prc->left = rgn->rdh.rcBound.left; - prc->top = rgn->rdh.rcBound.top; - prc->right = rgn->rdh.rcBound.right; - prc->bottom = prc->top + y; - prc++; - } - - if (x != 0) - { - /* Left rectangle */ - prc->left = rgn->rdh.rcBound.left; - prc->top = rgn->rdh.rcBound.top + y; - prc->right = prc->left + x; - prc->bottom = rgn->rdh.rcBound.bottom - y; - prc++; - - /* Right rectangle */ - prc->left = rgn->rdh.rcBound.right - x; - prc->top = rgn->rdh.rcBound.top + y; - prc->right = rgn->rdh.rcBound.right; - prc->bottom = rgn->rdh.rcBound.bottom - y; - prc++; - } - - if (y != 0) - { - /* Bottom rectangle */ - prc->left = rgn->rdh.rcBound.left; - prc->top = rgn->rdh.rcBound.bottom - y; - prc->right = rgn->rdh.rcBound.right; - prc->bottom = rgn->rdh.rcBound.bottom; - prc++; - } - } - - if (prc != rc) - { - /* The frame results in a complex region. rcBounds remains - the same, though. */ - rgn->rdh.nCount = (DWORD)(prc - rc); - ASSERT(rgn->rdh.nCount > 1); - rgn->rdh.nRgnSize = rgn->rdh.nCount * sizeof(RECT); - rgn->Buffer = ExAllocatePoolWithTag(PagedPool, - rgn->rdh.nRgnSize, - TAG_REGION); - if (rgn->Buffer == NULL) - { - rgn->rdh.nRgnSize = 0; - return FALSE; - } - - _PRAGMA_WARNING_SUPPRESS(__WARNING_MAYBE_UNINIT_VAR) // rc is initialized - COPY_RECTS(rgn->Buffer, rc, rgn->rdh.nCount); - } +REGION_bMakeSimpleFrameRgn( + _Inout_ PREGION prgn, + _In_ PRECTL prclSrc, + _In_ INT cx, + _In_ INT cy) +{ + RECTL arcl[4]; + UINT i; + + NT_ASSERT((cx >= 0) && (cy >= 0)); + NT_ASSERT((prclSrc->bottom > prclSrc->top) && + (prclSrc->right > prclSrc->left)); + + /* Start with an empty region */ + EMPTY_REGION(prgn); + + /* Check for the case where the frame covers the whole rect */ + if (((prclSrc->bottom - prclSrc->top) <= cy * 2) || + ((prclSrc->right - prclSrc->left) <= cx * 2)) + { + prgn->rdh.rcBound = *prclSrc; + prgn->Buffer[0] = *prclSrc; + prgn->rdh.nCount = 1; + return TRUE; + } + + i = 0; + + if (cy != 0) + { + /* Top rectangle */ + arcl[i].left = prclSrc->left; + arcl[i].top = prclSrc->top; + arcl[i].right = prclSrc->right; + arcl[i].bottom = prclSrc->top + cy; + i++; + } + + if (cx != 0) + { + /* Left rectangle */ + arcl[i].left = prclSrc->left; + arcl[i].top = prclSrc->top + cy; + arcl[i].right = prclSrc->left + cx; + arcl[i].bottom = prclSrc->bottom - cy; + i++; + + /* Right rectangle */ + arcl[i].left = prclSrc->right - cx; + arcl[i].top = prclSrc->top + cy; + arcl[i].right = prclSrc->right; + arcl[i].bottom = prclSrc->bottom - cy; + i++; + } + + if (cy != 0) + { + /* Bottom rectangle */ + arcl[i].left = prclSrc->left; + arcl[i].top = prclSrc->bottom - cy; + arcl[i].right = prclSrc->right; + arcl[i].bottom = prclSrc->bottom; + i++; + } + + if (i != 0) + { + /* The frame results in a complex region. rcBounds remains + the same, though. */ + prgn->rdh.nCount = i; + NT_ASSERT(prgn->rdh.nCount > 1); + prgn->rdh.nRgnSize = prgn->rdh.nCount * sizeof(RECT); + NT_ASSERT(prgn->Buffer == &prgn->rdh.rcBound); + prgn->Buffer = ExAllocatePoolWithTag(PagedPool, + prgn->rdh.nRgnSize, + TAG_REGION); + if (prgn->Buffer == NULL) + { + prgn->rdh.nRgnSize = 0; + return FALSE; + } + + _PRAGMA_WARNING_SUPPRESS(__WARNING_MAYBE_UNINIT_VAR) // arcl is initialized + COPY_RECTS(prgn->Buffer, arcl, prgn->rdh.nCount); } return TRUE; @@ -1842,60 +1854,83 @@ BOOL REGION_bMakeFrameRegion( _Inout_ PREGION prgnDest, - _In_ PREGION prgnSrc, + _Inout_ PREGION prgnSrc, _In_ INT cx, _In_ INT cy) { - + /* Handle negative cx / cy */ + cx = abs(cx); + cy = abs(cy); + + /* Check border size (the cast is necessary to catch cx/cy == INT_MIN!) */ + if (((UINT)cx > MAX_COORD) || ((UINT)cy > MAX_COORD)) + { + return FALSE; + } + + /* Fail on empty source region */ if (!REGION_NOT_EMPTY(prgnSrc)) { return FALSE; } + /* Handle trivial case */ + if ((cx == 0) && (cy == 0)) + { + EMPTY_REGION(prgnDest); + return TRUE; + } + + /* Handle simple source region */ + if (REGION_Complexity(prgnSrc) == SIMPLEREGION) + { + return REGION_bMakeSimpleFrameRgn(prgnDest, &prgnSrc->rdh.rcBound, cx, cy); + } + + /* Check if we can move the region to create the frame region */ + if ((prgnSrc->rdh.rcBound.left < (MIN_COORD + cx)) || + (prgnSrc->rdh.rcBound.top < (MIN_COORD + cy)) || + (prgnSrc->rdh.rcBound.right > (MAX_COORD - cx)) || + (prgnSrc->rdh.rcBound.bottom > (MAX_COORD - cy))) + { + return FALSE; + } + + /* Copy the source region */ if (!REGION_CopyRegion(prgnDest, prgnSrc)) { return FALSE; } - if (REGION_Complexity(prgnSrc) == SIMPLEREGION) - { - if (!REGION_CreateSimpleFrameRgn(prgnDest, cx, cy)) - { - return FALSE; - } - } - else - { - /* Move the source region to the bottom-right */ - REGION_bOffsetRgn(prgnSrc, cx, cy); - - /* Intersect with the source region (this crops the top-left frame) */ - REGION_IntersectRegion(prgnDest, prgnDest, prgnSrc); - - /* Move the source region to the bottom-left */ - REGION_bOffsetRgn(prgnSrc, -2 * cx, 0); - - /* Intersect with the source region (this crops the top-right frame) */ - REGION_IntersectRegion(prgnDest, prgnDest, prgnSrc); - - /* Move the source region to the top-left */ - REGION_bOffsetRgn(prgnSrc, 0, -2 * cy); - - /* Intersect with the source region (this crops the bottom-right frame) */ - REGION_IntersectRegion(prgnDest, prgnDest, prgnSrc); - - /* Move the source region to the top-right */ - REGION_bOffsetRgn(prgnSrc, 2 * cx, 0); - - /* Intersect with the source region (this crops the bottom-left frame) */ - REGION_IntersectRegion(prgnDest, prgnDest, prgnSrc); - - /* Move the source region back to the original position */ - REGION_bOffsetRgn(prgnSrc, -cx, cy); - - /* Finally subtract the cropped region from the source */ - REGION_SubtractRegion(prgnDest, prgnSrc, prgnDest); - } + /* Move the source region to the bottom-right */ + NT_VERIFY(REGION_bOffsetRgn(prgnSrc, cx, cy)); + + /* Intersect with the source region (this crops the top-left frame) */ + REGION_IntersectRegion(prgnDest, prgnDest, prgnSrc); + + /* Move the source region to the bottom-left */ + NT_VERIFY(REGION_bOffsetRgn(prgnSrc, -2 * cx, 0)); + + /* Intersect with the source region (this crops the top-right frame) */ + REGION_IntersectRegion(prgnDest, prgnDest, prgnSrc); + + /* Move the source region to the top-left */ + NT_VERIFY(REGION_bOffsetRgn(prgnSrc, 0, -2 * cy)); + + /* Intersect with the source region (this crops the bottom-right frame) */ + REGION_IntersectRegion(prgnDest, prgnDest, prgnSrc); + + /* Move the source region to the top-right */ + NT_VERIFY(REGION_bOffsetRgn(prgnSrc, 2 * cx, 0)); + + /* Intersect with the source region (this crops the bottom-left frame) */ + REGION_IntersectRegion(prgnDest, prgnDest, prgnSrc); + + /* Move the source region back to the original position */ + NT_VERIFY(REGION_bOffsetRgn(prgnSrc, -cx, cy)); + + /* Finally subtract the cropped region from the source */ + REGION_SubtractRegion(prgnDest, prgnSrc, prgnDest); return TRUE; }

9 years, 9 months

← Newer
1
...
16
17
18
19
20
21
22
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2014